[doc] Update files about Android CI

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
[docs] Explanation of emergency access addresses
2026-01-18 08:54:37 +00:00 · 2026-01-18 09:40:35 +01:00 · 2026-01-17 17:20:27 +01:00 · 2026-01-17 16:07:50 +01:00 · 2026-01-17 14:24:40 +01:00 · 2026-01-17 13:57:22 +01:00
351 changed files with 5613 additions and 3997 deletions
--- a/.github/workflows/android-check.yaml
+++ b/.github/workflows/android-check.yaml
@@ -1,9 +1,6 @@
 name: Android Check
 on:
  workflow_dispatch: # Manual trigger
-  push:
-    branches:
-      - main

 env:
  JAVA_HOME: /usr/lib/jvm/temurin-21-jdk-amd64  # Java 21 is required for Android Gradle 8 plugin
--- a/.gitignore
+++ b/.gitignore
@@ -31,10 +31,9 @@ data/types.txt*
 data/visibility.txt*
 data/colors.txt*
 data/patterns.txt*
-# TODO: designer is not used at the moment
-# data/symbols/*/design/
-# data/colors_design.txt
-# data/patterns_design.txt
+data/symbols/*/design/
+data/colors_design.txt
+data/patterns_design.txt

 # Auto-generated from data/categories-strings/* by tools/unix/generate_categories.sh
 data/categories.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -104,7 +104,8 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
 elseif (${CMAKE_BUILD_TYPE} MATCHES "Rel")
  add_definitions(-DRELEASE)
  if (NOT MSVC)
-    add_compile_options(-O3 $<$<CXX_COMPILER_ID:GNU>:-flto=auto>)
+    add_compile_options(-O3)
+    set (CMAKE_INTERPROCEDURAL_OPTIMIZATION True)
  endif()
 else()
  message(FATAL_ERROR "Unknown build type: " ${CMAKE_BUILD_TYPE})
--- a/README.md
+++ b/README.md
@@ -22,8 +22,8 @@
    <a href="https://codeberg.org/comaps/comaps/src/branch/main/LICENSE">
      <img src="https://img.shields.io/github/license/comaps/comaps?style=for-the-badge&logo=opensourceinitiative&logoColor=white&color=588157" alt="License"/>
    </a>
-    <a href="https://github.com/comaps/comaps/actions/workflows/android-check.yaml">
-      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/android-check.yaml?label=Android%20Build&logo=android&logoColor=white&style=for-the-badge" alt="Android Build Status"/>
+    <a href="https://codeberg.org/comaps/comaps/actions?workflow=android-check.yaml">
+      <img src="https://codeberg.org/comaps/comaps/badges/workflows/android-check.yaml/badge.svg?label=Android%20Build&logo=android&logoColor=white&style=for-the-badge" alt="Android Build Status"/>
    </a>
    <a href="https://github.com/comaps/comaps/actions/workflows/ios-check.yaml">
      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/ios-check.yaml?label=iOS%20Build&logo=apple&logoColor=white&style=for-the-badge" alt="iOS Build Status"/>
--- a/android/app/src/fdroid/play/listings/id/title.txt
+++ b/android/app/src/fdroid/play/listings/id/title.txt
@@ -0,0 +1 @@
+CoMaps- Navigasi Offline dengan Privasi
--- a/android/app/src/google/play/listings/hr/full-description.txt
+++ b/android/app/src/google/play/listings/hr/full-description.txt
@@ -1,36 +1,36 @@
-Besplatna aplikacija otvorenog koda koju vodi zajednica i temelji se na podacima OpenStreetMap-a, usmjerana transparentnosti, privatnosti i neprofitnosti. 
+Besplatna aplikacija za karte otvorenog koda koju vodi zajednica, a temelji se na podacima OpenStreetMapa, a pojačana je predanošću transparentnosti, privatnosti i neprofitnosti.

-Pridružite se otvorenoj zajednici i pomozite izraditi najbolju aplikaciju za karte
-• Koristite aplikaciju i proširite glas o njoj
+Pridružite se zajednici i pomozite u izradi najbolje aplikacije za karte
+• Koristite aplikaciju i širite vijest o njoj
 • Dajte povratne informacije i prijavite probleme
-• Ažurirajte podatke na karti u aplikaciji ili na web stranici OpenStreetMap-a
+• Ažurirajte podatke karte u aplikaciji ili na web stranici OpenStreetMap

 <i>Vaše povratne informacije i recenzije s 5 zvjezdica najbolja su nam podrška!</i>

-‣ <b>Jednostavna i dotjerana</b>: aplikacija je trivijalna za korištenje i jednostavno radi.
-‣ <b>Fokusirana na Offline rad</b>: Planirajte i upravljajte svojim putovanjem u inozemstvo bez potrebe za mobilnom uslugom, tražite putne točke dok ste na udaljenom pješačenju itd. Sve funkcije aplikacije dizajnirane su za offline rad.
-‣ <b>Poštivanje privatnosti</b>: Aplikacija je dizajnirana imajući na umu privatnost - ne identificira ljude, ne prati i ne prikuplja osobne podatke. Bez reklama.
-‣ <b>Štedi vašu bateriju i prostor</b>: Ne troši bateriju kao druge navigacijske aplikacije. Kompaktne karte štede dragocjeni prostor na vašem telefonu.
-‣ <b>Otvorena i izrađena od strane zajednice</b>: Ljudi poput vas pomogli su izraditi aplikaciju dodavanjem lokacija na OpenStreetMap-u, testiranjem i davanjem povratnih informacija o aplikaciji te doprinoseći svojim razvojnim vještinama i novcem.
-‣ <b>Otvoreno i transparentno donošenje odluka i korištenja financija, Neprofitna i potpuno Otvorenog koda.</b>
+‣ <b>Jednostavno i dotjerano</b>: bitne značajke koje su jednostavne za korištenje i jednostavno rade.
+‣ <b>Usmjereno na rad izvan mreže</b>: Planirajte i upravljajte svojim putovanjem u inozemstvo bez potrebe za mobilnom mrežom, pretražujte točke puta tijekom udaljenog planinarenja itd. Sve funkcije aplikacije dizajnirane su za rad izvan mreže.
+‣ <b>Poštivanje privatnosti</b>: Aplikacija je dizajnirana imajući na umu privatnost - ne identificira ljude, ne prati i ne prikuplja osobne podatke. Bez oglasa.
+‣ <b>Štedi bateriju i prostor</b>: Ne prazni bateriju kao druge navigacijske aplikacije. Kompaktne karte štede dragocjeni prostor na vašem telefonu.
+‣ <b>Besplatno i izrađeno od strane zajednice</b>: Ljudi poput vas pomogli su u izgradnji aplikacije dodavanjem mjesta u OpenStreetMap, testiranjem i davanjem povratnih informacija o značajkama te doprinosom svojim razvojnim vještinama i novcem.
+‣ <b>Otvoreno i transparentno donošenje odluka i financije, neprofitno i potpuno otvorenog koda.</b>

 <b>Glavne značajke</b>:
-• Preuzimanje detaljnih karti s lokacijama koje nisu dostupne s Google kartama
-• Karte za izlete s istaknutim pješačkim stazama, kampovima, izvorima vode, planinskim vrhovima, konturnim linijama itd.
+• Detaljne karte za preuzimanje s mjestima koja nisu dostupna na Google kartama
+• Vanjski način rada s označenim planinarskim stazama, kampovima, izvorima vode, vrhovima, konturnim linijama itd.
 • Pješačke i biciklističke staze
-• Točke interesa kao što su restorani, benzinske crpke, hoteli, trgovine, vidikovci i još mnogo toga
-• Pretražujte po nazivu ili adresi ili po kategoriji interesa
-• Navigacija s glasovnim najavama za hodanje, vožnju biciklom ili automobilom
-• Obilježite svoja omiljena mjesta jednim dodirom
-• Offline članci Wikipedije
-• Tranzitni sloj podzemne željeznice sa navigacijom
-• Snimanje GPS tragova
-• Izvoz i uvoz oznaka i staza u KML, KMZ, i GPX formatima
+• Znamenitosti poput restorana, benzinskih postaja, hotela, trgovina, znamenitosti i mnogih drugih
+• Pretraživanje po imenu ili adresi ili po kategoriji znamenitosti
+• Navigacija s glasovnim najavama za hodanje, vožnju biciklom ili vožnju
+• Označavanje omiljenih mjesta jednim dodirom
+• Članci na Wikipediji izvan mreže
+• Sloj i upute za podzemnu željeznicu
+• Snimanje tragova
+• Izvoz i uvoz oznaka i tragova u KML, KMZ, GPX formatima
 • Tamni način rada za korištenje tijekom noći
-• Poboljšajte kartu za sve korisnike, koristeći osnovni ugrađeni uređivač karte
-• Android Auto podrška
+• Poboljšajte podatke karte za sve pomoću osnovnog ugrađenog uređivača
+• Podrška za Android Auto

 Prijavite probleme s aplikacijom, predložite ideje i pridružite se našoj zajednici na web stranici <b><i>comaps.app</i></b>.

 <b>Sloboda je ovdje</b>
-Otkrijte svoje putovanje, navigirajte svijetom s privatnošću i zajednicom na prvom mjestu!
+Otkrijte svoje putovanje, snađite se u svijetu s privatnošću i zajednicom u prvom planu!
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -400,8 +400,14 @@
        android:name="app.organicmaps.settings.SettingsActivity"
        android:configChanges="orientation|screenLayout|screenSize"
        android:screenOrientation="fullUser"
+        android:exported="true"
        android:label="@string/settings"
-        android:parentActivityName="app.organicmaps.MwmActivity" />
+        android:parentActivityName="app.organicmaps.MwmActivity" >
+        <intent-filter>
+            <action android:name="android.intent.action.APPLICATION_PREFERENCES"/>
+            <category android:name="android.intent.category.DEFAULT"/>
+        </intent-filter>
+    </activity>

    <activity
        android:name="app.organicmaps.help.HelpActivity"
--- a/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
@@ -237,7 +237,7 @@ public class EditorHostFragment
    for (LocalizedName name : sNames)
      languages.add(name.lang);
    args.putStringArrayList(LanguagesFragment.EXISTING_LOCALIZED_NAMES, languages);
-    args.putBoolean(LanguagesFragment.INCLUDE_LOCAL_LANGUAGE, false);
+    args.putBoolean(LanguagesFragment.IS_MAP_LANGUAGE_SELECTION, false);
    editWithFragment(Mode.LANGUAGE, R.string.choose_language, args, LanguagesFragment.class, false);
  }

--- a/android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java
@@ -25,7 +25,7 @@ import java.util.Set;
 public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
 {
  final static String EXISTING_LOCALIZED_NAMES = "ExistingLocalizedNames";
-  final static String INCLUDE_LOCAL_LANGUAGE = "IncludeLocalLanguage";
+  final static String IS_MAP_LANGUAGE_SELECTION = "IsMapLanguageSelection";

  public interface Listener
  {
@@ -39,8 +39,8 @@ public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
  protected LanguagesAdapter createAdapter()
  {
    Bundle args = getArguments();
-    boolean includeLocalLanguage =
-        args != null ? args.getBoolean(INCLUDE_LOCAL_LANGUAGE) : true;
+    boolean isMapLanguageSelection =
+        args != null ? args.getBoolean(IS_MAP_LANGUAGE_SELECTION) : true;
    Set<String> existingLanguages =
        args != null ? new HashSet<>(args.getStringArrayList(EXISTING_LOCALIZED_NAMES)) : new HashSet<>();

@@ -52,8 +52,14 @@ public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
    for (int i = 0; i < systemLocales.size(); i++)
      systemLanguages.add(null);

-    for (Language lang : Editor.nativeGetSupportedLanguages(false))
+    // service languages are old_name, alt_name, ...
+    boolean includeServiceLangs = !isMapLanguageSelection;
+
+    for (Language lang : Editor.nativeGetSupportedLanguages(includeServiceLangs))
    {
+      if (existingLanguages.contains(lang.code))
+        continue;
+
      // Separately extract system languages
      for (int i = 0; i < systemLocales.size(); i++)
      {
@@ -65,7 +71,7 @@ public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
        }
      }

-      if (existingLanguages.contains(lang.code) || systemLanguages.contains(lang))
+      if (systemLanguages.contains(lang))
        continue;

      languages.add(lang);
@@ -75,7 +81,7 @@ public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>

    languages.addAll(0, systemLanguages.stream().filter(Objects::nonNull).toList());

-    if (includeLocalLanguage) {
+    if (isMapLanguageSelection) {
      String localLanguageLabel = getString(R.string.pref_maplanguage_local);
      Language localLanguage = new Language(DEFAULT_LANG_CODE, localLanguageLabel);
      languages.add(0, localLanguage);
--- a/android/app/src/main/res/drawable-night/ic_category_atm.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_atm.xml
@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#51585E" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M20,8 C20.82725,8 21.5,8.67275 21.5,9.5 L21.5,18.5 C21.5,19.32725 20.82725,20 20,20 L8,20 C7.17275,20 6.5,19.32725 6.5,18.5 L6.5,9.5 C6.5,8.67275 7.17275,8 8,8 L20,8 Z M20.00075,14 L8,14 L8,18.5 L20.0015,18.5 L20.00075,14 Z M14,15.5 L14,17 L9.5,17 L9.5,15.5 L14,15.5 Z M20,9.5 L8,9.5 L8,11 L20,11 L20,9.5 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>
--- a/android/app/src/main/res/drawable-night/ic_category_bank.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_bank.xml
@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#51585E" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M7,9.53073333 L14,6.3 L21,9.53073333 L21,10.60766 L19.9230733,10.60766 L19.9230733,18.68461 L21,18.68461 L21,20.2999767 L7,20.2999767 L7,18.68461 L8.07692667,18.68461 L8.07692667,10.60766 L7,10.60766 L7,9.53073333 Z M16.6923167,15.2756333 C16.6923167,14.0852833 15.4814333,13.1208 13.9976667,13.1208 C13.50468,13.1208 13.09784,12.7993017 13.09784,12.4012583 C13.09784,12.003215 13.4998967,11.6817167 13.9976667,11.6817167 C14.4954483,11.6817167 14.8974933,12.0070417 14.8974933,12.4012583 L16.69241,12.4012583 C16.69241,11.4673883 15.94096,10.6789083 14.8974933,10.3803583 L14.8974933,9.53068667 L13.1025767,9.53068667 L13.1025767,10.3803583 C12.0591567,10.6788967 11.30766,11.46733 11.30766,12.4012583 C11.30766,13.5916083 12.5185433,14.5560917 14.00231,14.5560917 C14.5000917,14.5560917 14.9021367,14.87759 14.9021367,15.2756333 C14.9021367,15.6736767 14.50008,15.995175 14.00231,15.995175 C13.5045283,15.995175 13.1024833,15.66985 13.1024833,15.2756333 L11.3075667,15.2756333 C11.3075667,16.2095033 12.0590167,16.9979833 13.1024833,17.2965333 L13.1024833,18.146205 L14.8974,18.146205 L14.8974,17.2965333 C15.94082,16.997995 16.6923167,16.2095617 16.6923167,15.2756333 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>
--- a/android/app/src/main/res/drawable-night/ic_category_children.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_children.xml
@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-  <item>
-    <shape android:shape="oval">
-      <size
-          android:width="40dp"
-          android:height="40dp" />
-      <solid android:color="#802D19" />
-    </shape>
-  </item>
-  <item>
-    <vector
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="28"
-        android:viewportHeight="28">
-      <group
-          android:pivotX="12"
-          android:pivotY="12">
-  <path
-      android:pathData="M10.7398398,14.5988166 C11.2766539,14.5988166 11.7741396,14.7668787 12.1823664,15.0532612 C11.7724801,15.4914625 11.5235582,16.0775925 11.5235582,16.7240712 L11.529303,16.8892426 L11.5491056,17.0705775 C11.6012609,17.429281 11.7280184,17.7632492 11.9167798,18.0556079 L11.9546499,18.1104694 L11.9142567,18.13405 C11.1417478,18.5947243 10.6376499,19.4380664 10.6376499,20.3887564 L10.637,21.073 L5.952,21.073 L5.95232411,17.1079171 C5.95232411,15.7221656 7.06098553,14.5988166 8.46443574,14.5988166 L10.7398398,14.5988166 Z M14.7363802,18.7647355 C15.6343829,18.7647355 16.3623501,19.4913492 16.3623501,20.3887564 L16.362,21.073 L11.637,21.073 L11.6376499,20.3887564 C11.6376499,19.4918257 12.3552335,18.7647355 13.2636198,18.7647355 L14.7363802,18.7647355 Z M19.4916069,12.4068343 C20.8792516,12.4068343 22.0041478,13.5296391 22.0041478,14.9163636 L22.004,21.073 L17.362,21.073 L17.3623501,20.3887564 L17.3567032,20.2194334 L17.3385166,20.043376 C17.2273964,19.2299207 16.7526866,18.5346787 16.0784713,18.1328785 L16.0416499,18.1124694 L16.0806774,18.0575117 C16.336328,17.665886 16.4764418,17.2070581 16.4764418,16.7240712 C16.4764418,15.6254025 15.757471,14.7010059 14.7609634,14.3838791 C15.0006762,13.2537372 15.9971232,12.4068343 17.215814,12.4068343 L19.4916069,12.4068343 Z M14,15.2664694 C14.8194057,15.2664694 15.4764418,15.9151249 15.4764418,16.7240712 C15.4764418,17.5330608 14.819449,18.1816731 14,18.1816731 C13.1805943,18.1816731 12.5235582,17.5330175 12.5235582,16.7240712 C12.5235582,15.9150816 13.1805943,15.2664694 14,15.2664694 Z M9.60213775,9.19402109 C10.8681135,9.19402109 11.8832295,10.1961892 11.8832295,11.4460053 C11.8832295,12.6958883 10.8681805,13.6979895 9.60213775,13.6979895 C8.33616197,13.6979895 7.32104605,12.6958214 7.32104605,11.4460053 C7.32104605,10.1961223 8.33616197,9.19402109 9.60213775,9.19402109 Z M18.3537105,7.00111521 C19.6199026,7.00111521 20.635192,8.00345456 20.635192,9.25348422 C20.635192,10.5035808 19.6199695,11.5058532 18.3537105,11.5058532 C17.0875184,11.5058532 16.072229,10.5035139 16.072229,9.25348422 C16.072229,8.00338763 17.0875184,7.00111521 18.3537105,7.00111521 Z"
-      android:fillColor="#000" />
-      </group>
-</vector>
-  </item>
-</layer-list>
--- a/android/app/src/main/res/drawable-night/ic_category_eat.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_eat.xml
@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#8C491C" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:pathData="M12.5416667,11.1416783 L12.5416667,7.70257833 C12.5416667,7.31455667 12.232395,7 11.8466717,7 L11.7783342,7 C11.3945008,7 11.0833392,7.32498667 11.0833392,7.70257833 L11.0833392,11.1416783 L9.62500583,11.1416783 L9.62500583,7.70257833 C9.62500583,7.31455667 9.31573417,7 8.93001083,7 L8.86167333,7 C8.47784,7 8.16667833,7.32498667 8.16667833,7.70257833 L8.16667833,11.1416783 C8.16667833,12.749345 9.62501167,14.0000117 11.0104283,14.0000117 L10.8211833,20.055945 C10.8048897,20.5773283 11.2048417,21 11.7169383,21 L11.9080967,21 C12.4190967,21 12.815985,20.58308 12.7940167,20.055945 L12.54169,14.0000117 C14.0000233,14.0000117 15.7500233,12.749345 15.4583567,11.1416783 L15.4583567,7.70257833 C15.4583567,7.31455667 15.149085,7 14.7633617,7 L14.6950242,7 C14.3111908,7 14.0000292,7.32498667 14.0000292,7.70257833 L14.0000292,11.1416783 L12.5416958,11.1416783 L12.5416667,11.1416783 Z M16.3333333,14.933345 L18.0833333,14.933345 L18.0833333,20.130845 C18.0833333,20.6108933 18.4717167,21.0000467 18.9583333,21.0000467 C19.4415783,21.0000467 19.8333333,20.6109983 19.8333333,20.1242883 L19.8333333,7.000455 C17.3903333,7.000455 16.275,8.69912167 16.3333333,10.0337883 L16.3333333,14.9337883 L16.3333333,14.933345 Z"
-                    android:fillColor="#000" />
-            </group>
-        </vector>
-    </item>
-</layer-list>
--- a/android/app/src/main/res/drawable-night/ic_category_entertainment.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_entertainment.xml
@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#802D19" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:pathData="M14.8166667,12.2166667 L14.8166667,17.525 C14.8166667,20.0076667 12.8076667,22.0166667 10.325,22.0166667 C7.84233333,22.0166667 5.83333333,20.0076667 5.83333333,17.525 L5.83333333,12.2166667 L14.8166667,12.2166667 Z M12.3666667,17.9333333 L8.28333333,17.9333333 C8.28333333,18.6111667 9.198,19.1583333 10.325,19.1583333 C11.452,19.1583333 12.3666667,18.6111667 12.3666667,17.9333333 Z M22.1666667,6.5 L22.1666667,11.8083333 C22.1666667,14.291 20.1576667,16.3 17.675,16.3 C16.94,16.3 16.2458333,16.1121667 15.6333333,15.8018333 L15.6333333,11.4 L13.1833333,11.4 L13.1833333,6.5 L22.1666667,6.5 Z M12.3666667,14.6666667 C11.9175,14.6666667 11.55,15.0341667 11.55,15.4833333 C11.55,15.9325 11.9175,16.3 12.3666667,16.3 C12.8158333,16.3 13.1833333,15.9325 13.1833333,15.4833333 C13.1833333,15.0341667 12.8158333,14.6666667 12.3666667,14.6666667 Z M8.28333333,14.6666667 C7.83416667,14.6666667 7.46666667,15.0341667 7.46666667,15.4833333 C7.46666667,15.9325 7.83416667,16.3 8.28333333,16.3 C8.7325,16.3 9.1,15.9325 9.1,15.4833333 C9.1,15.0341667 8.7325,14.6666667 8.28333333,14.6666667 Z M17.675,12.2166667 C16.548,12.2166667 15.6333333,12.7638333 15.6333333,13.4416667 L19.7166667,13.4416667 C19.7166667,12.7638333 18.802,12.2166667 17.675,12.2166667 Z M15.6333333,9.01533333 C15.1841667,9.01533333 14.8166667,9.38283333 14.8166667,9.832 C14.8166667,10.2811667 15.1841667,10.6486667 15.6333333,10.6486667 C16.0825,10.6486667 16.45,10.2893333 16.45,9.832 C16.45,9.38283333 16.0825,9.01533333 15.6333333,9.01533333 Z M19.7166667,9.01533333 C19.2675,9.01533333 18.9,9.38283333 18.9,9.832 C18.9,10.2811667 19.2675,10.6486667 19.7166667,10.6486667 C20.1658333,10.6486667 20.5333333,10.2893333 20.5333333,9.832 C20.5333333,9.38283333 20.1658333,9.01533333 19.7166667,9.01533333 Z"
-                    android:fillColor="#000" />
-            </group>
-        </vector>
-    </item>
-</layer-list>
--- a/android/app/src/main/res/drawable-night/ic_category_food.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_food.xml
@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#6B425C" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M11.3735667,18.307716 C10.6313217,18.307716 10.0307333,18.9134843 10.0307333,19.653816 C10.0307333,20.394206 10.631275,20.999916 11.3735667,20.999916 C12.1158117,20.999916 12.72305,20.3941477 12.72305,19.653816 C12.72305,18.913426 12.115765,18.307716 11.3735667,18.307716 Z M6.8,7.48804933 C6.8,7.813281 7.06993167,8.07692433 7.38562,8.07692433 L8.2,8.07692433 L10.3,14.5385077 C9.55654167,14.5385077 8.9539,15.3205827 8.9539,16.286291 L8.9539,16.0215277 C8.9539,16.9867927 9.739055,17.769311 10.7023833,17.769311 L18.8085,17.769311 C19.1352133,17.769311 19.4000583,17.5195393 19.4000583,17.180436 L19.4000583,17.2812663 C19.4000583,16.9560347 19.129765,16.6923913 18.8139717,16.6923913 L10.6169717,16.6923913 C10.29328,16.6923913 10.030885,16.4426197 10.030885,16.1035163 L10.030885,16.2043467 C10.030885,15.879115 10.2980983,15.6154717 10.6084667,15.6154717 L18.0620667,15.6154717 C19.2169033,15.6154717 19.113315,15.3197567 19.2870667,14.969325 L20.7161167,10.1360583 C20.7721167,10.0380583 20.8001167,9.91905833 20.8001167,9.80005833 C20.8001167,9.41505833 20.4851167,9.10005833 20.2616533,9.1539 L9.74707,9.1539 L8.90007,7 L7.37395333,7 C7.05702833,7 6.8,7.24977167 6.8,7.588875 L6.8,7.48804467 L6.8,7.48804933 Z M17.8350333,18.307716 C17.0927883,18.307716 16.4922,18.9134843 16.4922,19.653816 C16.4922,20.394206 17.0927417,20.999916 17.8350333,20.999916 C18.577325,20.999916 19.1845167,20.3941477 19.1845167,19.653816 C19.1845167,18.913426 18.5772317,18.307716 17.8350333,18.307716 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>
--- a/android/app/src/main/res/drawable-night/ic_category_fuel.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_fuel.xml
@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#574469" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M17.846514,4.676 C17.5575662,4.7216586 17.3186367,4.92551065 17.2280519,5.20366514 C17.1374671,5.48181964 17.2105329,5.78727723 17.4171807,5.99433333 L19.428514,8.00566667 C19.799514,8.37666667 20.062014,8.83516667 20.1973474,9.33333333 L19.523014,9.33333333 C18.2431807,9.33333333 17.1896807,10.3868333 17.1896807,11.6666667 C17.1896807,12.9465 18.2431807,14 19.523014,14 L20.300007,14 L20.300007,19.4448333 C20.300007,19.8835 19.9616807,20.2218333 19.523014,20.2218333 C19.315878,20.2250062 19.1162779,20.1442015 18.9696836,19.997827 C18.8230893,19.8514525 18.7419852,19.6519738 18.7448474,19.4448333 L18.7448474,17.8885 C18.7448474,16.6098333 17.6913474,15.5551667 16.411514,15.5551667 L15.6333474,15.5551667 L15.6333474,7.77816667 C15.6345903,7.36522389 15.4711795,6.96881891 15.1792931,6.67671349 C14.8874066,6.38460807 14.4911243,6.22090001 14.0781807,6.22183333 L7.85634735,6.22183333 C7.44320185,6.22058891 7.04661893,6.38415963 6.75447962,6.67629894 C6.46234031,6.96843825 6.2987696,7.36502117 6.30000697,7.77816667 L6.30000697,20.2218333 C6.2987696,20.6349788 6.46234031,21.0315618 6.75447962,21.3237011 C7.04661893,21.6158404 7.44320185,21.7794111 7.85634735,21.7781737 L14.0781807,21.7781737 C14.4911243,21.7791 14.8874066,21.6153919 15.1792931,21.3232865 C15.4711795,21.0311811 15.6345903,20.6347761 15.6333474,20.2218333 L15.6333474,17.1115 L16.411514,17.1115 C16.8501807,17.1115 17.1896807,17.4498333 17.1896807,17.8885 L17.1896807,19.4448333 C17.1896807,20.7235 18.2431807,21.7781737 19.523014,21.7781737 C20.8016807,21.7781737 21.8563474,20.7235 21.8563474,19.4448333 L21.8563474,10.1115 C21.8563474,8.90940677 21.3788136,7.75655029 20.5286807,6.90666667 L18.5173474,4.89416667 C18.3411731,4.71808596 18.0913541,4.63698153 17.8453474,4.676 L17.846514,4.676 Z M8.63218069,7.77816667 L13.2988474,7.77816667 C13.730514,7.77816667 14.077014,8.12466667 14.077014,8.55516667 L14.077014,12.4448333 L7.85634735,12.4448333 L7.85634735,8.55516667 C7.85634735,8.12466667 8.20284735,7.77816667 8.63334735,7.77816667 L8.63218069,7.77816667 Z M19.523014,10.5 C20.1673462,10.5 20.6896807,11.0223345 20.6896807,11.6666667 C20.6896807,12.3109989 20.1673462,12.8333333 19.523014,12.8333333 C18.8786818,12.8333333 18.3563474,12.3109989 18.3563474,11.6666667 C18.3563474,11.0223345 18.8786818,10.5 19.523014,10.5 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>
--- a/android/app/src/main/res/drawable-night/ic_category_hospital.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_hospital.xml
@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#983E44" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M21.1291111,17.1111111 L17.1106444,17.1111111 L17.1106444,21.1295778 C17.1106444,21.9138422 16.4689778,22.5555089 15.6847133,22.5555089 L12.3142911,22.5555089 C11.5300267,22.5555089 10.88836,21.9138422 10.88836,21.1295778 L10.88836,17.1111111 L6.86973778,17.1111111 C6.08547333,17.1111111 5.44383778,16.4694444 5.44383778,15.68518 L5.44383778,12.3147578 C5.44383778,11.5304933 6.08550444,10.8888267 6.86973778,10.8888267 L10.88836,10.8888267 L10.88836,6.87036 C10.88836,6.08609556 11.5300267,5.44442889 12.3142911,5.44442889 L15.6847133,5.44442889 C16.4689778,5.44442889 17.1106444,6.08609556 17.1106444,6.87036 L17.1106444,10.8888267 L21.1291111,10.8888267 C21.9133756,10.8888267 22.5550422,11.5304933 22.5550422,12.3147578 L22.5550422,15.68518 C22.5550422,16.4694444 21.9133756,17.1111111 21.1291111,17.1111111 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>
--- a/android/app/src/main/res/drawable-night/ic_category_hotel.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_hotel.xml
@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#614A43" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M10.2879,14.1061667 C11.5203667,14.1061667 12.5151833,13.111315 12.5151833,11.8788833 C12.5151833,10.6464167 11.5203317,9.6516 10.2879,9.6516 C9.05543333,9.6516 8.06061667,10.6464517 8.06061667,11.8788833 C8.06061667,13.11135 9.05546833,14.1061667 10.2879,14.1061667 Z M19.1970333,9.6516 L14.7424667,9.6516 C13.9258,9.6516 13.25765,10.319785 13.25765,11.1364167 L13.25765,14.8485167 L7.31826667,14.8485167 L7.31826667,8.90913333 C7.31826667,8.5008 6.98418,8.16671333 6.57584667,8.16671333 C6.16751333,8.16671333 5.83342667,8.5008 5.83342667,8.90913333 L5.83342667,18.5606167 C5.83342667,18.96895 6.16751333,19.3030367 6.57584667,19.3030367 C6.98418,19.3030367 7.31826667,18.96895 7.31826667,18.5606167 L7.31826667,17.0758 L20.6824333,17.0758 L20.6824333,18.5606167 C20.6824333,18.96895 21.01652,19.3030367 21.4248533,19.3030367 C21.8331867,19.3030367 22.1672733,18.96895 22.1672733,18.5606167 L22.1672733,12.6212333 C22.1672733,10.9804333 20.8383233,9.65148333 19.1975233,9.65148333 L19.1970333,9.6516 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>
--- a/android/app/src/main/res/drawable-night/ic_category_luggagehero.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_luggagehero.xml
@@ -1,28 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#851F03" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:alpha="0.5"
-            android:viewportWidth="24"
-            android:viewportHeight="24">
-            <group
-                android:pivotX="12"
-                android:pivotY="12"
-                android:scaleX="0.5"
-                android:scaleY="0.5">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M8.5714,5.1429l6.8571,0l0,-1.7143l-6.8571,0ZM24,13.7143l0,6.4286c0,0.5893 -0.2098,1.0938 -0.6295,1.5134 -0.4196,0.4196 -0.9241,0.6295 -1.5134,0.6295l-19.7143,0c-0.5893,0 -1.0938,-0.2098 -1.5134,-0.6295 -0.4196,-0.4196 -0.6295,-0.9241 -0.6295,-1.5134l0,-6.4286l9,0l0,2.1429c0,0.2321 0.0848,0.433 0.2545,0.6027 0.1696,0.1696 0.3705,0.2545 0.6027,0.2545l4.2857,0c0.2321,0 0.433,-0.0848 0.6027,-0.2545 0.1696,-0.1696 0.2545,-0.3705 0.2545,-0.6027l0,-2.1429ZM13.7143,13.7143l0,1.7143l-3.4286,0l0,-1.7143ZM24,7.2857l0,5.1429l-24,0l0,-5.1429c0,-0.5893 0.2098,-1.0938 0.6295,-1.5134 0.4196,-0.4196 0.9241,-0.6295 1.5134,-0.6295l4.7143,0l0,-2.1429c0,-0.3571 0.125,-0.6607 0.375,-0.9107 0.25,-0.25 0.5536,-0.375 0.9107,-0.375l7.7143,0c0.3571,0 0.6607,0.125 0.9107,0.375 0.25,0.25 0.375,0.5536 0.375,0.9107l0,2.1429l4.7143,0c0.5893,0 1.0938,0.2098 1.5134,0.6295 0.4196,0.4196 0.6295,0.9241 0.6295,1.5134Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>
--- a/android/app/src/main/res/drawable-night/ic_category_nightlife.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_nightlife.xml
@@ -1,26 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#8C491C" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M21,8.42778167 C21,7.80556333 20.4944483,7.3 19.8722183,7.3 L8.127385,7.3 C7.50516667,7.3 6.99960333,7.80555167 6.99960333,8.42778167 C6.99960333,8.7 7.10071483,8.97223 7.287385,9.17444833 L13.2218683,15.8555983 L13.2218683,19.7444483 L10.1107183,19.7444483 C9.68293667,19.7444483 9.33293667,20.0944483 9.33293667,20.52223 C9.33293667,20.9500117 9.68293667,21.3000117 10.1107183,21.3000117 L17.888535,21.3000117 C18.3163167,21.3000117 18.6663167,20.9500117 18.6663167,20.52223 C18.6663167,20.0944483 18.3163167,19.7444483 17.888535,19.7444483 L14.777385,19.7444483 L14.777385,15.8555983 L20.7118683,9.17444833 C20.898535,8.97223 20.99965,8.7 20.99965,8.42778167 L21,8.42778167 Z M10.4455167,10.411115 L9.06885,8.85559833 L18.93885,8.85559833 L17.5543667,10.411115 L10.4455167,10.411115 L10.4455167,10.411115 Z" />
-            </group>
-        </vector>
-
-    </item>
-</layer-list>
--- a/android/app/src/main/res/drawable-night/ic_category_parking.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_parking.xml
@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#20607C" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M9.35,22.3 L13.1840042,22.3 L13.1840042,16.379733 L14.4487167,16.379733 C16.4953333,16.379733 18.0936417,15.9233039 19.1939042,14.9897598 C20.3178375,14.0448193 20.85,12.6687324 20.85,10.8925278 C20.85,9.17330503 20.3522033,7.86253173 19.3111083,6.99727004 C18.2581875,6.12060241 16.709425,5.7 14.6982667,5.7 L9.3502875,5.7002873 L9.35,22.3 Z M13.1840042,8.60425301 L14.5565292,8.60425301 C15.5029792,8.60425301 16.17755,8.78662355 16.6154125,9.17371683 C17.0649667,9.57220647 17.2884404,10.1637639 17.2884404,10.9949323 C17.2884404,11.8032888 17.0518663,12.4290544 16.5076479,12.8616374 C15.9752746,13.282891 15.1586979,13.5329885 14.0820104,13.5329885 L13.1840042,13.5329885 L13.1840042,8.60425301 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>
--- a/android/app/src/main/res/drawable-night/ic_category_pharmacy.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_pharmacy.xml
@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#983E44" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M16.961,6.99999417 C15.9026933,6.99999417 14.84875,7.41071333 14.0726833,8.17973333 L8.2299,13.9907833 C7.02531667,15.1842833 6.69806667,16.9171333 7.28183167,18.3600667 C7.28183167,18.3600667 7.71838667,19.382475 8.14171167,19.80195 C8.54021,20.1968083 9.021355,20.4748717 9.508695,20.675795 C9.64324667,20.7452082 9.744875,20.770512 9.86146,20.80687 C9.877112,20.8116985 9.88986133,20.8240783 9.9055565,20.8287158 C11.3082398,21.2432442 12.8732065,20.907362 13.9403565,19.8019442 L17.4680065,16.3064942 L19.7830232,13.9907775 C21.4057398,12.3828775 21.4057398,9.80501083 19.7830232,8.26711083 C19.0774815,7.42821917 18.0191398,6.99999417 16.9608565,6.99999417 L16.961,6.99999417 Z M16.961,8.39813333 C17.6665417,8.39813333 18.3852667,8.67339667 18.8792333,9.162755 C19.3732,9.65211333 19.6509133,10.364305 19.6509133,11.0633717 C19.6509133,11.76245 19.3731067,12.452755 18.8792333,12.9421717 L16.4760167,15.323455 L12.6658,11.523155 L14.9987833,9.22832167 C15.5632167,8.66905667 16.1849333,8.39813333 16.9611167,8.39813333 L16.961,8.39813333 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>
--- a/android/app/src/main/res/drawable-night/ic_category_police.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_police.xml
@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#51585E" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M14,5.833275 L7.31815,8.803025 L7.31815,13.2575917 C7.31815,17.378025 10.1690167,21.231175 14,22.166725 C17.8308667,21.2312683 20.68185,17.3781417 20.68185,13.2575917 L20.68185,8.803025 L14,5.833275 L14,5.833275 Z M15.85605,14.438025 L16.524235,17.3186417 L14.000035,15.796725 L11.475835,17.3186417 L12.14402,14.4454917 L9.91673667,12.5225917 L12.8567367,12.2701717 L14.00007,9.560355 L15.1434033,12.2628217 L18.0834033,12.5152417 L15.85612,14.4381417 L15.85605,14.438025 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>
--- a/android/app/src/main/res/drawable-night/ic_category_post.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_post.xml
@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#51585E" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M20.5333333,7 C21.4316667,7 22.1666667,7.735 22.1666667,8.63333333 L22.1666667,18.4333333 C22.1666667,19.3316667 21.4316667,20.0666667 20.5333333,20.0666667 L7.46666667,20.0666667 C6.56833333,20.0666667 5.83333333,19.3316667 5.83333333,18.4333333 L5.8415,8.63333333 C5.8415,7.735 6.56833333,7 7.46666667,7 L20.5333333,7 Z M20.5333333,9.88283333 C20.5333333,9.33566667 19.9371667,9.009 19.4716667,9.29483333 L14,12.7166667 L8.52833333,9.29483333 C8.06283333,9.009 7.46666667,9.33566667 7.46666667,9.88283333 C7.46666667,10.1196667 7.58916667,10.3401667 7.79333333,10.4708333 L13.5671667,14.0805 C13.8285,14.2438333 14.1715,14.2438333 14.4328333,14.0805 L20.2066667,10.4708333 C20.4108333,10.3401667 20.5333333,10.1196667 20.5333333,9.88283333 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>
--- a/android/app/src/main/res/drawable-night/ic_category_recycling.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_recycling.xml
@@ -1,26 +0,0 @@
-<layer-list
-  xmlns:android="http://schemas.android.com/apk/res/android">
-  <item>
-    <shape android:shape="oval">
-      <size
-        android:width="40dp"
-        android:height="40dp" />
-      <solid android:color="#51585E" />
-    </shape>
-  </item>
-  <item>
-    <vector
-      android:width="24dp"
-      android:height="24dp"
-      android:viewportWidth="28"
-      android:viewportHeight="28">
-      <group
-        android:pivotX="12"
-        android:pivotY="12">
-        <path
-            android:fillColor="#000"
-            android:pathData="M9.26178239,9.86916295 L10.4193833,7.95061481 L11.2531868,6.56634591 C11.5688972,6.04016587 12.3298444,6.04016587 12.6455913,6.56634591 L13.843676,8.5577503 L12.8479738,10.2253086 L12.0384558,11.5367213 L9.26178239,9.86916295 Z M22.1731256,14.5805343 L20.8778628,12.4272676 L18.0769039,14.0462551 L19.8658893,17.0333617 L20.7806361,17.0333617 C21.3958708,17.0333617 21.9544354,16.6852666 22.2296256,16.1348011 C22.3429572,15.9081332 22.3996236,15.665279 22.3996236,15.4143378 C22.3996236,15.1229127 22.3186718,14.8395869 22.1729556,14.5805343 L22.1731256,14.5805343 Z M17.5427461,21.0808911 L18.7570171,21.0808911 C19.3722518,21.0808911 19.9308164,20.732796 20.2060066,20.1823306 L21.379806,17.8427947 L17.5427097,17.8427947 L17.5427097,16.2238072 L14.3046133,19.4619036 L17.5427097,22.7 L17.5427097,21.0810125 L17.5427461,21.0808911 Z M12.6856622,17.8427947 L9.20471166,17.8427947 L8.52471991,18.9842094 C8.28186572,19.3889623 8.26567949,19.8908691 8.47614908,20.3199075 C8.70281704,20.7813304 9.18042624,21.0808547 9.70656985,21.0808547 L12.6855408,21.0808547 L12.6855408,17.8427583 L12.6856622,17.8427947 Z M9.54470753,15.6975422 L10.9451262,16.5394327 L9.83609613,12.0952009 L5.4,13.204231 L6.77613329,14.0299353 L6.44423661,14.5884999 C6.16091076,15.0661091 6.13662534,15.6489592 6.38757022,16.1427668 L7.70711848,18.7817419 L9.54467474,15.6974936 L9.54470753,15.6975422 Z M18.3684504,8.24191842 L17.3160782,6.48523261 C17.0165539,5.99952422 16.4903739,5.7 15.9236736,5.7 L13.0661298,5.7 L15.5918134,9.90951317 L14.1994089,10.7433166 L18.6436406,11.8523467 L19.7526707,7.40811497 L18.3684018,8.24191842 L18.3684504,8.24191842 Z" />
-      </group>
-    </vector>
-  </item>
-</layer-list>
--- a/android/app/src/main/res/drawable-night/ic_category_rv.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_rv.xml
@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#51585E" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M8.33758333,7.43983333 C6.95648333,7.43983333 5.83333333,8.590085 5.83333333,10.0056833 L5.83333333,16.9397667 C5.83333333,18.0495583 6.52384833,18.99765 7.48766667,19.3551167 C7.45779982,19.1965237 7.44027578,19.0357487 7.43526,18.87431 C7.43522971,18.0654358 7.74879599,17.2897014 8.30693531,16.7178646 C8.86507462,16.1460278 9.62203578,15.8249626 10.4111933,15.8253433 C12.0537082,15.8258056 13.3849729,17.1907579 13.38491,18.87431 C13.3830282,19.0874192 13.3593515,19.2997388 13.3142683,19.5077867 L23.3312683,19.5077867 C23.6679333,19.5077867 23.9419483,19.2262233 23.9419483,18.8811467 C23.9419483,18.53607 23.6679217,18.2567933 23.3312683,18.2567933 L21.4741683,18.2567933 C21.6999883,17.87135 21.82964,17.4210517 21.82964,16.9397433 L21.82964,13.3690433 C21.82964,10.09841 19.2349733,7.43983333 16.04414,7.43983333 L8.33772333,7.43983333 L8.33758333,7.43983333 Z M8.88445833,9.60225 L10.9944917,9.60225 C11.3312033,9.60225 11.6051833,9.88155 11.6051833,10.226615 L11.6051833,12.391365 C11.6051833,12.7364417 11.3311567,13.0157183 10.9944917,13.0157183 L8.88445833,13.0157183 C8.54779333,13.0157183 8.27376667,12.7364183 8.27376667,12.391365 L8.27376667,10.226615 C8.27376667,9.88153833 8.54779333,9.60225 8.88445833,9.60225 Z M16.647925,10.684625 L16.8097067,10.684625 C18.2658233,10.684625 19.4484733,11.8992417 19.4484733,13.3916417 L19.4484733,18.2566417 L18.2294233,18.2566417 L18.2294233,13.3916417 C18.2294233,12.5883683 17.5935433,11.9333083 16.8098233,11.9333083 L16.6480417,11.9333083 C15.8643567,11.9333083 15.2284417,12.5883683 15.2284417,13.3916417 L15.2284417,18.2566417 L14.0070583,18.2566417 L14.0070583,13.3916417 C14.0070583,11.8992417 15.191925,10.684625 16.6480417,10.684625 L16.647925,10.684625 Z M10.4111583,17.0581247 C9.94104172,17.0578394 9.49008616,17.2490609 9.15757567,17.5896894 C8.82506518,17.9303179 8.63829167,18.3924263 8.63829167,18.874275 C8.63829167,19.3561237 8.82506518,19.8182321 9.15757567,20.1588606 C9.49008616,20.4994891 9.94104172,20.6907106 10.4111583,20.6904253 C11.3892489,20.6896989 12.1817548,19.8767746 12.1816917,18.874275 C12.1817548,17.8717754 11.3892489,17.0588511 10.4111583,17.0581247 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>
--- a/android/app/src/main/res/drawable-night/ic_category_secondhand.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_secondhand.xml
@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#6B425C" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M13.9999526,5 C11.853286,5 10.110286,6.743 10.110286,8.88966667 L8.55628597,8.88966667 C7.7007343,8.88966667 7.00683597,9.58815 7.00683597,10.4436667 L7,19.777 C7,20.6325517 7.70075833,21.3333333 8.55633333,21.3333333 L19.4436667,21.3333333 C20.2992183,21.3333333 21,20.632575 21,19.777 L21,10.4436667 C21,9.588115 20.2992417,8.88966667 19.4436667,8.88966667 L17.8896667,8.88966667 C17.8896667,6.743 16.1466667,5 14,5 L13.9999526,5 Z M13.9999526,6.55633333 C15.2911026,6.55633333 16.333286,7.59855167 16.333286,8.88966667 L11.6666193,8.88966667 C11.6666193,7.59851667 12.7088376,6.55633333 13.9999526,6.55633333 Z M13.4348426,10.5098167 C13.4948839,10.5028588 13.5551031,10.5212898 13.6009647,10.5606609 C13.6468264,10.6000319 13.6741635,10.6567658 13.6763776,10.7171683 L13.7151145,11.8291533 C13.7184994,11.938957 13.6391949,12.0339269 13.5305478,12.0501783 C12.9058678,12.1446293 12.3049645,12.4314333 11.8238311,12.9160667 C10.7022678,14.04575 10.6473645,15.8238667 11.6255911,17.0426833 L12.6851578,15.97628 C12.7471434,15.914964 12.8398366,15.8967615 12.9204066,15.9300834 C13.0009766,15.9634054 13.0537346,16.0417631 13.0543028,16.12895 L13.0611383,19.2483833 C13.0611463,19.307801 13.0367599,19.3646163 12.9936828,19.4055408 C12.9506056,19.4464653 12.8926159,19.4679097 12.8332766,19.4648583 L9.88697663,19.3053517 C9.80143518,19.3012871 9.72630824,19.2472336 9.69526871,19.1674188 C9.66422918,19.0876039 9.68309816,18.996996 9.7434183,18.9362067 L10.54094,18.1295617 C8.97060663,16.3068783 9.02648997,13.5555283 10.7414666,11.829095 C11.495705,11.069245 12.4494666,10.629295 13.4348333,10.5097117 L13.4348426,10.5098167 Z M15.1711926,10.7559133 L18.1174926,10.917695 C18.2026243,10.9225973 18.2769698,10.9769641 18.3074479,11.056604 C18.3379261,11.1362439 18.3188721,11.2263546 18.2587643,11.28684 L17.4612426,12.0911983 C19.032976,13.9128317 18.980126,16.6660483 17.2652776,18.3938817 C17.2645181,18.3938777 17.2637586,18.3938777 17.2629991,18.3938817 C16.5080141,19.1533467 15.5524325,19.5913483 14.5674158,19.7109317 C14.5073745,19.7178895 14.4471553,19.6994585 14.4012937,19.6600875 C14.3554321,19.6207164 14.3280949,19.5639825 14.3258808,19.50358 L14.2894225,18.3938817 C14.2860376,18.284078 14.365342,18.1891081 14.4739891,18.1728567 C15.0982141,18.0784745 15.6977058,17.7894083 16.1783725,17.3046933 C16.179132,17.3046973 16.1798915,17.3046973 16.180651,17.3046933 C17.3022143,16.1759783 17.357351,14.4000433 16.378891,13.1802933 L15.3193243,14.2466967 C15.2573387,14.3080127 15.1646455,14.3262151 15.0840755,14.2928932 C15.0035055,14.2595713 14.9507475,14.1812135 14.9501793,14.0940267 L14.9433438,10.97226 C14.9433358,10.9128424 14.9677222,10.8560271 15.0107993,10.8151026 C15.0538765,10.7741781 15.1118662,10.7527337 15.1712055,10.755785 L15.1711926,10.7559133 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>
--- a/android/app/src/main/res/drawable-night/ic_category_shopping.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_shopping.xml
@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#6B425C" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M19.4443861,8.88885 L17.8888695,8.88885 C17.8888695,6.74218333 16.1466861,5 14.0000195,5 C11.8533528,5 10.1111695,6.74218333 10.1111695,8.88885 L8.55565282,8.88885 C7.70010115,8.88885 7.00783615,9.58885 7.00783615,10.4443667 L7.00005833,19.7777 C7.00005833,20.6332517 7.70005833,21.3332167 8.555575,21.3332167 L19.444425,21.3332167 C20.2999767,21.3332167 20.9999417,20.6332167 20.9999417,19.7777 L20.9999417,10.4443667 C20.9999417,9.588815 20.2999417,8.88885 19.444425,8.88885 L19.4443861,8.88885 Z M13.9999028,6.55551667 C15.2910528,6.55551667 16.3332362,7.597735 16.3332362,8.88885 L11.6665695,8.88885 C11.6665695,7.5977 12.7087878,6.55551667 13.9999028,6.55551667 Z M13.9999028,14.3333333 C11.8532362,14.3333333 10.1110528,12.59115 10.1110528,10.4444833 L11.6665695,10.4444833 C11.6665695,11.7356333 12.7087878,12.7778167 13.9999028,12.7778167 C15.2910178,12.7778167 16.3332362,11.7355983 16.3332362,10.4444833 L17.8887528,10.4444833 C17.8887528,12.59115 16.1465695,14.3333333 13.9999028,14.3333333 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>
--- a/android/app/src/main/res/drawable-night/ic_category_toilet.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_toilet.xml
@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#51585E" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M10.3454333,8.64113333 C11.22839,8.64113333 11.9363,7.94225333 11.9363,7.07056667 C11.9363,6.19892667 11.2283433,5.5 10.3454333,5.5 C9.46252333,5.5 8.75456667,6.19888 8.75456667,7.07056667 C8.75456667,7.94220667 9.46252333,8.64113333 10.3454333,8.64113333 L10.3454333,8.64113333 Z M19.2545667,17.43605 L19.2545667,21.83345 L16.7091333,21.83345 L16.7091333,17.43605 L14.1637,17.43605 L16.3909833,10.5257667 C16.3909833,10.5257667 16.7091683,9.26938333 17.98185,9.26938333 C19.2545317,9.26938333 19.5727167,10.5257667 19.5727167,10.5257667 L21.8,17.43605 L19.2545667,17.43605 L19.2545667,17.43605 Z M11.61815,15.5514167 L11.61815,21.83345 L9.07271667,21.83345 L9.07271667,15.5514167 L7.8,15.5514167 L7.8,11.0192667 C7.8,10.0528233 8.57319667,9.26938333 9.55198333,9.26938333 L11.1388833,9.26938333 C12.1064817,9.26938333 12.8908667,10.05231 12.8908667,11.0192667 L12.8908667,15.5514167 L11.61815,15.5514167 Z M19.7362833,7.07068333 C19.7362833,7.94232333 19.00161,8.64125 18.0853333,8.64125 C17.1690567,8.64125 16.4343833,7.94237 16.4343833,7.07068333 C16.4343833,6.19904333 17.1690567,5.50011667 18.0853333,5.50011667 C19.00161,5.50011667 19.7362833,6.19899667 19.7362833,7.07068333 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>
--- a/android/app/src/main/res/drawable-night/ic_category_tourism.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_tourism.xml
@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#6E4426" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M22.167,11.328l-5.717,-0.816l-2.45,-5.712l-2.45,5.712l-5.717,0.816l4.083,4.08l-0.817,5.726l4.9,-2.463l4.9,2.448l-0.817,-5.711z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>
--- a/android/app/src/main/res/drawable-night/ic_category_transport.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_transport.xml
@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#2F6499" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M17.7652425,5.6 C19.3205789,5.6 20.6007172,6.82330936 20.6712621,8.37700229 L21.1340668,18.5587623 C21.2018095,20.0490603 20.1357825,21.3284073 18.6981339,21.5620297 L18.2940892,21.5992497 L9.77120086,21.6 C8.27928213,21.6 7.04973517,20.4769811 6.88169744,19.0301853 L6.86287684,18.6248613 L7.3279318,8.37707196 C7.39855249,6.8233354 8.67873133,5.6 10.2339515,5.6 L17.7652425,5.6 Z M9.92695997,17.2362972 C9.28430184,17.2362972 8.76333027,17.7572687 8.76333027,18.3999268 C8.76333027,19.042585 9.28430184,19.5635566 9.92695997,19.5635566 C10.5696181,19.5635566 11.0905897,19.042585 11.0905897,18.3999268 C11.0905897,17.7572687 10.5696181,17.2362972 9.92695997,17.2362972 Z M18.0723679,17.2362972 C17.4297098,17.2362972 16.9087383,17.7572687 16.9087383,18.3999268 C16.9087383,19.042585 17.4297098,19.5635566 18.0723679,19.5635566 C18.7150261,19.5635566 19.2359977,19.042585 19.2359977,18.3999268 C19.2359977,17.7572687 18.7150261,17.2362972 18.0723679,17.2362972 Z M17.2628087,7.78180569 L10.736446,7.78180569 C9.95826161,7.78180569 9.31791619,8.39432582 9.28337093,9.17176139 L9.12032285,12.8726871 C9.12032285,13.675999 9.77154822,14.3272243 10.57486,14.3272243 L17.4890037,14.3257899 C18.2915299,14.2901216 18.9131848,13.6106375 18.8775195,12.8081258 L18.7159058,9.17178293 C18.6813533,8.39434738 18.0410005,7.78180569 17.2628087,7.78180569 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>
--- a/android/app/src/main/res/drawable-night/ic_category_water.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_water.xml
@@ -1,26 +0,0 @@
-<layer-list
-  xmlns:android="http://schemas.android.com/apk/res/android">
-  <item>
-    <shape android:shape="oval">
-      <size
-        android:width="40dp"
-        android:height="40dp" />
-      <solid android:color="#0A6074" />
-    </shape>
-  </item>
-  <item>
-    <vector
-      android:width="24dp"
-      android:height="24dp"
-      android:viewportWidth="28"
-      android:viewportHeight="28">
-      <group
-        android:pivotX="12"
-        android:pivotY="12">
-        <path
-          android:fillColor="#000"
-          android:pathData="M14,21.8749 C11.1749,21.8749 8.5482,19.4518 8.5482,16.4231 C8.5482,13.3606 12.6876,7.8747 14,6.1251 C15.3125,7.8751 19.4518,13.3606 19.4518,16.4231 C19.4518,19.4519 16.825,21.8749 14,21.8749 Z" />
-      </group>
-    </vector>
-  </item>
-</layer-list>
--- a/android/app/src/main/res/drawable-night/ic_category_wifi.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_wifi.xml
@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#51585E" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M14,16.98 C15.1045695,16.98 16.1045695,17.4277153 16.8284271,18.1515729 L14,20.98 L11.1715729,18.1515729 C11.8954305,17.4277153 12.8954305,16.98 14,16.98 Z M14,12.48 C16.3472102,12.48 18.4722102,13.4313949 20.0104076,14.9695924 L18.2426407,16.7373593 C17.1568542,15.6515729 15.6568542,14.98 14,14.98 C12.3431458,14.98 10.8431458,15.6515729 9.75735931,16.7373593 L7.98959236,14.9695924 C9.52778981,13.4313949 11.6527898,12.48 14,12.48 Z M14,7.98 C17.5898509,7.98 20.8398509,9.43507456 23.1923882,11.7876118 L21.4251209,13.5558785 C19.5249552,11.6554586 16.8997491,10.48 14,10.48 C11.1002509,10.48 8.47504482,11.6554586 6.57487909,13.5558785 L4.80761184,11.7876118 C7.16014913,9.43507456 10.4101491,7.98 14,7.98 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>
--- a/android/app/src/main/res/drawable/ic_category_atm.xml
+++ b/android/app/src/main/res/drawable/ic_category_atm.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#747E86" />
+            <solid android:color="@color/amenity" />
        </shape>
    </item>
    <item>
@@ -17,7 +17,7 @@
                android:pivotX="12"
                android:pivotY="12">
                <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                    android:pathData="M20,8 C20.82725,8 21.5,8.67275 21.5,9.5 L21.5,18.5 C21.5,19.32725 20.82725,20 20,20 L8,20 C7.17275,20 6.5,19.32725 6.5,18.5 L6.5,9.5 C6.5,8.67275 7.17275,8 8,8 L20,8 Z M20.00075,14 L8,14 L8,18.5 L20.0015,18.5 L20.00075,14 Z M14,15.5 L14,17 L9.5,17 L9.5,15.5 L14,15.5 Z M20,9.5 L8,9.5 L8,11 L20,11 L20,9.5 Z" />
            </group>
        </vector>
--- a/android/app/src/main/res/drawable/ic_category_bank.xml
+++ b/android/app/src/main/res/drawable/ic_category_bank.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#747E86" />
+            <solid android:color="@color/amenity" />
        </shape>
    </item>
    <item>
@@ -17,7 +17,7 @@
                android:pivotX="12"
                android:pivotY="12">
                <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                    android:pathData="M7,9.53073333 L14,6.3 L21,9.53073333 L21,10.60766 L19.9230733,10.60766 L19.9230733,18.68461 L21,18.68461 L21,20.2999767 L7,20.2999767 L7,18.68461 L8.07692667,18.68461 L8.07692667,10.60766 L7,10.60766 L7,9.53073333 Z M16.6923167,15.2756333 C16.6923167,14.0852833 15.4814333,13.1208 13.9976667,13.1208 C13.50468,13.1208 13.09784,12.7993017 13.09784,12.4012583 C13.09784,12.003215 13.4998967,11.6817167 13.9976667,11.6817167 C14.4954483,11.6817167 14.8974933,12.0070417 14.8974933,12.4012583 L16.69241,12.4012583 C16.69241,11.4673883 15.94096,10.6789083 14.8974933,10.3803583 L14.8974933,9.53068667 L13.1025767,9.53068667 L13.1025767,10.3803583 C12.0591567,10.6788967 11.30766,11.46733 11.30766,12.4012583 C11.30766,13.5916083 12.5185433,14.5560917 14.00231,14.5560917 C14.5000917,14.5560917 14.9021367,14.87759 14.9021367,15.2756333 C14.9021367,15.6736767 14.50008,15.995175 14.00231,15.995175 C13.5045283,15.995175 13.1024833,15.66985 13.1024833,15.2756333 L11.3075667,15.2756333 C11.3075667,16.2095033 12.0590167,16.9979833 13.1024833,17.2965333 L13.1024833,18.146205 L14.8974,18.146205 L14.8974,17.2965333 C15.94082,16.997995 16.6923167,16.2095617 16.6923167,15.2756333 Z" />
            </group>
        </vector>
--- a/android/app/src/main/res/drawable/ic_category_children.xml
+++ b/android/app/src/main/res/drawable/ic_category_children.xml
@@ -4,7 +4,7 @@
      <size
          android:width="40dp"
          android:height="40dp" />
-      <solid android:color="#EB785D" />
+      <solid android:color="@color/entertainment" />
    </shape>
  </item>
  <item>
@@ -18,7 +18,7 @@
          android:pivotY="12">
  <path
      android:pathData="M10.7398398,14.5988166 C11.2766539,14.5988166 11.7741396,14.7668787 12.1823664,15.0532612 C11.7724801,15.4914625 11.5235582,16.0775925 11.5235582,16.7240712 L11.529303,16.8892426 L11.5491056,17.0705775 C11.6012609,17.429281 11.7280184,17.7632492 11.9167798,18.0556079 L11.9546499,18.1104694 L11.9142567,18.13405 C11.1417478,18.5947243 10.6376499,19.4380664 10.6376499,20.3887564 L10.637,21.073 L5.952,21.073 L5.95232411,17.1079171 C5.95232411,15.7221656 7.06098553,14.5988166 8.46443574,14.5988166 L10.7398398,14.5988166 Z M14.7363802,18.7647355 C15.6343829,18.7647355 16.3623501,19.4913492 16.3623501,20.3887564 L16.362,21.073 L11.637,21.073 L11.6376499,20.3887564 C11.6376499,19.4918257 12.3552335,18.7647355 13.2636198,18.7647355 L14.7363802,18.7647355 Z M19.4916069,12.4068343 C20.8792516,12.4068343 22.0041478,13.5296391 22.0041478,14.9163636 L22.004,21.073 L17.362,21.073 L17.3623501,20.3887564 L17.3567032,20.2194334 L17.3385166,20.043376 C17.2273964,19.2299207 16.7526866,18.5346787 16.0784713,18.1328785 L16.0416499,18.1124694 L16.0806774,18.0575117 C16.336328,17.665886 16.4764418,17.2070581 16.4764418,16.7240712 C16.4764418,15.6254025 15.757471,14.7010059 14.7609634,14.3838791 C15.0006762,13.2537372 15.9971232,12.4068343 17.215814,12.4068343 L19.4916069,12.4068343 Z M14,15.2664694 C14.8194057,15.2664694 15.4764418,15.9151249 15.4764418,16.7240712 C15.4764418,17.5330608 14.819449,18.1816731 14,18.1816731 C13.1805943,18.1816731 12.5235582,17.5330175 12.5235582,16.7240712 C12.5235582,15.9150816 13.1805943,15.2664694 14,15.2664694 Z M9.60213775,9.19402109 C10.8681135,9.19402109 11.8832295,10.1961892 11.8832295,11.4460053 C11.8832295,12.6958883 10.8681805,13.6979895 9.60213775,13.6979895 C8.33616197,13.6979895 7.32104605,12.6958214 7.32104605,11.4460053 C7.32104605,10.1961223 8.33616197,9.19402109 9.60213775,9.19402109 Z M18.3537105,7.00111521 C19.6199026,7.00111521 20.635192,8.00345456 20.635192,9.25348422 C20.635192,10.5035808 19.6199695,11.5058532 18.3537105,11.5058532 C17.0875184,11.5058532 16.072229,10.5035139 16.072229,9.25348422 C16.072229,8.00338763 17.0875184,7.00111521 18.3537105,7.00111521 Z"
-      android:fillColor="#FFF" />
+      android:fillColor="@color/foreground_color" />
      </group>
 </vector>
  </item>
--- a/android/app/src/main/res/drawable/ic_category_eat.xml
+++ b/android/app/src/main/res/drawable/ic_category_eat.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#EC955E" />
+            <solid android:color="@color/food" />
        </shape>
    </item>
    <item>
@@ -18,7 +18,7 @@
                android:pivotY="12">
                <path
                    android:pathData="M12.5416667,11.1416783 L12.5416667,7.70257833 C12.5416667,7.31455667 12.232395,7 11.8466717,7 L11.7783342,7 C11.3945008,7 11.0833392,7.32498667 11.0833392,7.70257833 L11.0833392,11.1416783 L9.62500583,11.1416783 L9.62500583,7.70257833 C9.62500583,7.31455667 9.31573417,7 8.93001083,7 L8.86167333,7 C8.47784,7 8.16667833,7.32498667 8.16667833,7.70257833 L8.16667833,11.1416783 C8.16667833,12.749345 9.62501167,14.0000117 11.0104283,14.0000117 L10.8211833,20.055945 C10.8048897,20.5773283 11.2048417,21 11.7169383,21 L11.9080967,21 C12.4190967,21 12.815985,20.58308 12.7940167,20.055945 L12.54169,14.0000117 C14.0000233,14.0000117 15.7500233,12.749345 15.4583567,11.1416783 L15.4583567,7.70257833 C15.4583567,7.31455667 15.149085,7 14.7633617,7 L14.6950242,7 C14.3111908,7 14.0000292,7.32498667 14.0000292,7.70257833 L14.0000292,11.1416783 L12.5416958,11.1416783 L12.5416667,11.1416783 Z M16.3333333,14.933345 L18.0833333,14.933345 L18.0833333,20.130845 C18.0833333,20.6108933 18.4717167,21.0000467 18.9583333,21.0000467 C19.4415783,21.0000467 19.8333333,20.6109983 19.8333333,20.1242883 L19.8333333,7.000455 C17.3903333,7.000455 16.275,8.69912167 16.3333333,10.0337883 L16.3333333,14.9337883 L16.3333333,14.933345 Z"
-                    android:fillColor="#FFF" />
+                    android:fillColor="@color/foreground_color" />
            </group>
        </vector>
    </item>
--- a/android/app/src/main/res/drawable/ic_category_entertainment.xml
+++ b/android/app/src/main/res/drawable/ic_category_entertainment.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#EB785D" />
+            <solid android:color="@color/entertainment" />
        </shape>
    </item>
    <item>
@@ -18,7 +18,7 @@
                android:pivotY="12">
                <path
                    android:pathData="M14.8166667,12.2166667 L14.8166667,17.525 C14.8166667,20.0076667 12.8076667,22.0166667 10.325,22.0166667 C7.84233333,22.0166667 5.83333333,20.0076667 5.83333333,17.525 L5.83333333,12.2166667 L14.8166667,12.2166667 Z M12.3666667,17.9333333 L8.28333333,17.9333333 C8.28333333,18.6111667 9.198,19.1583333 10.325,19.1583333 C11.452,19.1583333 12.3666667,18.6111667 12.3666667,17.9333333 Z M22.1666667,6.5 L22.1666667,11.8083333 C22.1666667,14.291 20.1576667,16.3 17.675,16.3 C16.94,16.3 16.2458333,16.1121667 15.6333333,15.8018333 L15.6333333,11.4 L13.1833333,11.4 L13.1833333,6.5 L22.1666667,6.5 Z M12.3666667,14.6666667 C11.9175,14.6666667 11.55,15.0341667 11.55,15.4833333 C11.55,15.9325 11.9175,16.3 12.3666667,16.3 C12.8158333,16.3 13.1833333,15.9325 13.1833333,15.4833333 C13.1833333,15.0341667 12.8158333,14.6666667 12.3666667,14.6666667 Z M8.28333333,14.6666667 C7.83416667,14.6666667 7.46666667,15.0341667 7.46666667,15.4833333 C7.46666667,15.9325 7.83416667,16.3 8.28333333,16.3 C8.7325,16.3 9.1,15.9325 9.1,15.4833333 C9.1,15.0341667 8.7325,14.6666667 8.28333333,14.6666667 Z M17.675,12.2166667 C16.548,12.2166667 15.6333333,12.7638333 15.6333333,13.4416667 L19.7166667,13.4416667 C19.7166667,12.7638333 18.802,12.2166667 17.675,12.2166667 Z M15.6333333,9.01533333 C15.1841667,9.01533333 14.8166667,9.38283333 14.8166667,9.832 C14.8166667,10.2811667 15.1841667,10.6486667 15.6333333,10.6486667 C16.0825,10.6486667 16.45,10.2893333 16.45,9.832 C16.45,9.38283333 16.0825,9.01533333 15.6333333,9.01533333 Z M19.7166667,9.01533333 C19.2675,9.01533333 18.9,9.38283333 18.9,9.832 C18.9,10.2811667 19.2675,10.6486667 19.7166667,10.6486667 C20.1658333,10.6486667 20.5333333,10.2893333 20.5333333,9.832 C20.5333333,9.38283333 20.1658333,9.01533333 19.7166667,9.01533333 Z"
-                    android:fillColor="#FFF" />
+                    android:fillColor="@color/foreground_color" />
            </group>
        </vector>
    </item>
--- a/android/app/src/main/res/drawable/ic_category_food.xml
+++ b/android/app/src/main/res/drawable/ic_category_food.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#BE75A3" />
+            <solid android:color="@color/shop" />
        </shape>
    </item>
    <item>
@@ -17,7 +17,7 @@
                android:pivotX="12"
                android:pivotY="12">
                <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                    android:pathData="M11.3735667,18.307716 C10.6313217,18.307716 10.0307333,18.9134843 10.0307333,19.653816 C10.0307333,20.394206 10.631275,20.999916 11.3735667,20.999916 C12.1158117,20.999916 12.72305,20.3941477 12.72305,19.653816 C12.72305,18.913426 12.115765,18.307716 11.3735667,18.307716 Z M6.8,7.48804933 C6.8,7.813281 7.06993167,8.07692433 7.38562,8.07692433 L8.2,8.07692433 L10.3,14.5385077 C9.55654167,14.5385077 8.9539,15.3205827 8.9539,16.286291 L8.9539,16.0215277 C8.9539,16.9867927 9.739055,17.769311 10.7023833,17.769311 L18.8085,17.769311 C19.1352133,17.769311 19.4000583,17.5195393 19.4000583,17.180436 L19.4000583,17.2812663 C19.4000583,16.9560347 19.129765,16.6923913 18.8139717,16.6923913 L10.6169717,16.6923913 C10.29328,16.6923913 10.030885,16.4426197 10.030885,16.1035163 L10.030885,16.2043467 C10.030885,15.879115 10.2980983,15.6154717 10.6084667,15.6154717 L18.0620667,15.6154717 C19.2169033,15.6154717 19.113315,15.3197567 19.2870667,14.969325 L20.7161167,10.1360583 C20.7721167,10.0380583 20.8001167,9.91905833 20.8001167,9.80005833 C20.8001167,9.41505833 20.4851167,9.10005833 20.2616533,9.1539 L9.74707,9.1539 L8.90007,7 L7.37395333,7 C7.05702833,7 6.8,7.24977167 6.8,7.588875 L6.8,7.48804467 L6.8,7.48804933 Z M17.8350333,18.307716 C17.0927883,18.307716 16.4922,18.9134843 16.4922,19.653816 C16.4922,20.394206 17.0927417,20.999916 17.8350333,20.999916 C18.577325,20.999916 19.1845167,20.3941477 19.1845167,19.653816 C19.1845167,18.913426 18.5772317,18.307716 17.8350333,18.307716 Z" />
            </group>
        </vector>
--- a/android/app/src/main/res/drawable/ic_category_fuel.xml
+++ b/android/app/src/main/res/drawable/ic_category_fuel.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#AA96BC" />
+            <solid android:color="@color/cm_services" />
        </shape>
    </item>
    <item>
@@ -17,7 +17,7 @@
                android:pivotX="12"
                android:pivotY="12">
                <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                    android:pathData="M17.846514,4.676 C17.5575662,4.7216586 17.3186367,4.92551065 17.2280519,5.20366514 C17.1374671,5.48181964 17.2105329,5.78727723 17.4171807,5.99433333 L19.428514,8.00566667 C19.799514,8.37666667 20.062014,8.83516667 20.1973474,9.33333333 L19.523014,9.33333333 C18.2431807,9.33333333 17.1896807,10.3868333 17.1896807,11.6666667 C17.1896807,12.9465 18.2431807,14 19.523014,14 L20.300007,14 L20.300007,19.4448333 C20.300007,19.8835 19.9616807,20.2218333 19.523014,20.2218333 C19.315878,20.2250062 19.1162779,20.1442015 18.9696836,19.997827 C18.8230893,19.8514525 18.7419852,19.6519738 18.7448474,19.4448333 L18.7448474,17.8885 C18.7448474,16.6098333 17.6913474,15.5551667 16.411514,15.5551667 L15.6333474,15.5551667 L15.6333474,7.77816667 C15.6345903,7.36522389 15.4711795,6.96881891 15.1792931,6.67671349 C14.8874066,6.38460807 14.4911243,6.22090001 14.0781807,6.22183333 L7.85634735,6.22183333 C7.44320185,6.22058891 7.04661893,6.38415963 6.75447962,6.67629894 C6.46234031,6.96843825 6.2987696,7.36502117 6.30000697,7.77816667 L6.30000697,20.2218333 C6.2987696,20.6349788 6.46234031,21.0315618 6.75447962,21.3237011 C7.04661893,21.6158404 7.44320185,21.7794111 7.85634735,21.7781737 L14.0781807,21.7781737 C14.4911243,21.7791 14.8874066,21.6153919 15.1792931,21.3232865 C15.4711795,21.0311811 15.6345903,20.6347761 15.6333474,20.2218333 L15.6333474,17.1115 L16.411514,17.1115 C16.8501807,17.1115 17.1896807,17.4498333 17.1896807,17.8885 L17.1896807,19.4448333 C17.1896807,20.7235 18.2431807,21.7781737 19.523014,21.7781737 C20.8016807,21.7781737 21.8563474,20.7235 21.8563474,19.4448333 L21.8563474,10.1115 C21.8563474,8.90940677 21.3788136,7.75655029 20.5286807,6.90666667 L18.5173474,4.89416667 C18.3411731,4.71808596 18.0913541,4.63698153 17.8453474,4.676 L17.846514,4.676 Z M8.63218069,7.77816667 L13.2988474,7.77816667 C13.730514,7.77816667 14.077014,8.12466667 14.077014,8.55516667 L14.077014,12.4448333 L7.85634735,12.4448333 L7.85634735,8.55516667 C7.85634735,8.12466667 8.20284735,7.77816667 8.63334735,7.77816667 L8.63218069,7.77816667 Z M19.523014,10.5 C20.1673462,10.5 20.6896807,11.0223345 20.6896807,11.6666667 C20.6896807,12.3109989 20.1673462,12.8333333 19.523014,12.8333333 C18.8786818,12.8333333 18.3563474,12.3109989 18.3563474,11.6666667 C18.3563474,11.0223345 18.8786818,10.5 19.523014,10.5 Z" />
            </group>
        </vector>
--- a/android/app/src/main/res/drawable/ic_category_hospital.xml
+++ b/android/app/src/main/res/drawable/ic_category_hospital.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#D85961" />
+            <solid android:color="@color/medical" />
        </shape>
    </item>
    <item>
@@ -17,7 +17,7 @@
                android:pivotX="12"
                android:pivotY="12">
                <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                    android:pathData="M21.1291111,17.1111111 L17.1106444,17.1111111 L17.1106444,21.1295778 C17.1106444,21.9138422 16.4689778,22.5555089 15.6847133,22.5555089 L12.3142911,22.5555089 C11.5300267,22.5555089 10.88836,21.9138422 10.88836,21.1295778 L10.88836,17.1111111 L6.86973778,17.1111111 C6.08547333,17.1111111 5.44383778,16.4694444 5.44383778,15.68518 L5.44383778,12.3147578 C5.44383778,11.5304933 6.08550444,10.8888267 6.86973778,10.8888267 L10.88836,10.8888267 L10.88836,6.87036 C10.88836,6.08609556 11.5300267,5.44442889 12.3142911,5.44442889 L15.6847133,5.44442889 C16.4689778,5.44442889 17.1106444,6.08609556 17.1106444,6.87036 L17.1106444,10.8888267 L21.1291111,10.8888267 C21.9133756,10.8888267 22.5550422,11.5304933 22.5550422,12.3147578 L22.5550422,15.68518 C22.5550422,16.4694444 21.9133756,17.1111111 21.1291111,17.1111111 Z" />
            </group>
        </vector>
--- a/android/app/src/main/res/drawable/ic_category_hotel.xml
+++ b/android/app/src/main/res/drawable/ic_category_hotel.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#664E42" />
+            <solid android:color="@color/hotel" />
        </shape>
    </item>
    <item>
@@ -17,7 +17,7 @@
                android:pivotX="12"
                android:pivotY="12">
                <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                    android:pathData="M10.2879,14.1061667 C11.5203667,14.1061667 12.5151833,13.111315 12.5151833,11.8788833 C12.5151833,10.6464167 11.5203317,9.6516 10.2879,9.6516 C9.05543333,9.6516 8.06061667,10.6464517 8.06061667,11.8788833 C8.06061667,13.11135 9.05546833,14.1061667 10.2879,14.1061667 Z M19.1970333,9.6516 L14.7424667,9.6516 C13.9258,9.6516 13.25765,10.319785 13.25765,11.1364167 L13.25765,14.8485167 L7.31826667,14.8485167 L7.31826667,8.90913333 C7.31826667,8.5008 6.98418,8.16671333 6.57584667,8.16671333 C6.16751333,8.16671333 5.83342667,8.5008 5.83342667,8.90913333 L5.83342667,18.5606167 C5.83342667,18.96895 6.16751333,19.3030367 6.57584667,19.3030367 C6.98418,19.3030367 7.31826667,18.96895 7.31826667,18.5606167 L7.31826667,17.0758 L20.6824333,17.0758 L20.6824333,18.5606167 C20.6824333,18.96895 21.01652,19.3030367 21.4248533,19.3030367 C21.8331867,19.3030367 22.1672733,18.96895 22.1672733,18.5606167 L22.1672733,12.6212333 C22.1672733,10.9804333 20.8383233,9.65148333 19.1975233,9.65148333 L19.1970333,9.6516 Z" />
            </group>
        </vector>
--- a/android/app/src/main/res/drawable/ic_category_luggagehero.xml
+++ b/android/app/src/main/res/drawable/ic_category_luggagehero.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#FB3207" />
+            <solid android:color="@color/luggagehero" />
        </shape>
    </item>
    <item>
@@ -20,7 +20,7 @@
                android:scaleX="0.5"
                android:scaleY="0.5">
                <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                    android:pathData="M8.5714,5.1429l6.8571,0l0,-1.7143l-6.8571,0ZM24,13.7143l0,6.4286c0,0.5893 -0.2098,1.0938 -0.6295,1.5134 -0.4196,0.4196 -0.9241,0.6295 -1.5134,0.6295l-19.7143,0c-0.5893,0 -1.0938,-0.2098 -1.5134,-0.6295 -0.4196,-0.4196 -0.6295,-0.9241 -0.6295,-1.5134l0,-6.4286l9,0l0,2.1429c0,0.2321 0.0848,0.433 0.2545,0.6027 0.1696,0.1696 0.3705,0.2545 0.6027,0.2545l4.2857,0c0.2321,0 0.433,-0.0848 0.6027,-0.2545 0.1696,-0.1696 0.2545,-0.3705 0.2545,-0.6027l0,-2.1429ZM13.7143,13.7143l0,1.7143l-3.4286,0l0,-1.7143ZM24,7.2857l0,5.1429l-24,0l0,-5.1429c0,-0.5893 0.2098,-1.0938 0.6295,-1.5134 0.4196,-0.4196 0.9241,-0.6295 1.5134,-0.6295l4.7143,0l0,-2.1429c0,-0.3571 0.125,-0.6607 0.375,-0.9107 0.25,-0.25 0.5536,-0.375 0.9107,-0.375l7.7143,0c0.3571,0 0.6607,0.125 0.9107,0.375 0.25,0.25 0.375,0.5536 0.375,0.9107l0,2.1429l4.7143,0c0.5893,0 1.0938,0.2098 1.5134,0.6295 0.4196,0.4196 0.6295,0.9241 0.6295,1.5134Z" />
            </group>
        </vector>
--- a/android/app/src/main/res/drawable/ic_category_nightlife.xml
+++ b/android/app/src/main/res/drawable/ic_category_nightlife.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#EC955E" />
+            <solid android:color="@color/food" />
        </shape>
    </item>
    <item>
@@ -17,7 +17,7 @@
                android:pivotX="12"
                android:pivotY="12">
                <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                    android:pathData="M21,8.42778167 C21,7.80556333 20.4944483,7.3 19.8722183,7.3 L8.127385,7.3 C7.50516667,7.3 6.99960333,7.80555167 6.99960333,8.42778167 C6.99960333,8.7 7.10071483,8.97223 7.287385,9.17444833 L13.2218683,15.8555983 L13.2218683,19.7444483 L10.1107183,19.7444483 C9.68293667,19.7444483 9.33293667,20.0944483 9.33293667,20.52223 C9.33293667,20.9500117 9.68293667,21.3000117 10.1107183,21.3000117 L17.888535,21.3000117 C18.3163167,21.3000117 18.6663167,20.9500117 18.6663167,20.52223 C18.6663167,20.0944483 18.3163167,19.7444483 17.888535,19.7444483 L14.777385,19.7444483 L14.777385,15.8555983 L20.7118683,9.17444833 C20.898535,8.97223 20.99965,8.7 20.99965,8.42778167 L21,8.42778167 Z M10.4455167,10.411115 L9.06885,8.85559833 L18.93885,8.85559833 L17.5543667,10.411115 L10.4455167,10.411115 L10.4455167,10.411115 Z" />
            </group>
        </vector>
--- a/android/app/src/main/res/drawable/ic_category_parking.xml
+++ b/android/app/src/main/res/drawable/ic_category_parking.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#427BB8" />
+            <solid android:color="@color/parking" />
        </shape>
    </item>
    <item>
@@ -17,7 +17,7 @@
                android:pivotX="12"
                android:pivotY="12">
                <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                    android:pathData="M9.35,22.3 L13.1840042,22.3 L13.1840042,16.379733 L14.4487167,16.379733 C16.4953333,16.379733 18.0936417,15.9233039 19.1939042,14.9897598 C20.3178375,14.0448193 20.85,12.6687324 20.85,10.8925278 C20.85,9.17330503 20.3522033,7.86253173 19.3111083,6.99727004 C18.2581875,6.12060241 16.709425,5.7 14.6982667,5.7 L9.3502875,5.7002873 L9.35,22.3 Z M13.1840042,8.60425301 L14.5565292,8.60425301 C15.5029792,8.60425301 16.17755,8.78662355 16.6154125,9.17371683 C17.0649667,9.57220647 17.2884404,10.1637639 17.2884404,10.9949323 C17.2884404,11.8032888 17.0518663,12.4290544 16.5076479,12.8616374 C15.9752746,13.282891 15.1586979,13.5329885 14.0820104,13.5329885 L13.1840042,13.5329885 L13.1840042,8.60425301 Z" />
            </group>
        </vector>
--- a/android/app/src/main/res/drawable/ic_category_pharmacy.xml
+++ b/android/app/src/main/res/drawable/ic_category_pharmacy.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#D85961" />
+            <solid android:color="@color/medical" />
        </shape>
    </item>
    <item>
@@ -17,7 +17,7 @@
                android:pivotX="12"
                android:pivotY="12">
                <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                    android:pathData="M16.961,6.99999417 C15.9026933,6.99999417 14.84875,7.41071333 14.0726833,8.17973333 L8.2299,13.9907833 C7.02531667,15.1842833 6.69806667,16.9171333 7.28183167,18.3600667 C7.28183167,18.3600667 7.71838667,19.382475 8.14171167,19.80195 C8.54021,20.1968083 9.021355,20.4748717 9.508695,20.675795 C9.64324667,20.7452082 9.744875,20.770512 9.86146,20.80687 C9.877112,20.8116985 9.88986133,20.8240783 9.9055565,20.8287158 C11.3082398,21.2432442 12.8732065,20.907362 13.9403565,19.8019442 L17.4680065,16.3064942 L19.7830232,13.9907775 C21.4057398,12.3828775 21.4057398,9.80501083 19.7830232,8.26711083 C19.0774815,7.42821917 18.0191398,6.99999417 16.9608565,6.99999417 L16.961,6.99999417 Z M16.961,8.39813333 C17.6665417,8.39813333 18.3852667,8.67339667 18.8792333,9.162755 C19.3732,9.65211333 19.6509133,10.364305 19.6509133,11.0633717 C19.6509133,11.76245 19.3731067,12.452755 18.8792333,12.9421717 L16.4760167,15.323455 L12.6658,11.523155 L14.9987833,9.22832167 C15.5632167,8.66905667 16.1849333,8.39813333 16.9611167,8.39813333 L16.961,8.39813333 Z" />
            </group>
        </vector>
--- a/android/app/src/main/res/drawable/ic_category_police.xml
+++ b/android/app/src/main/res/drawable/ic_category_police.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#747E86" />
+            <solid android:color="@color/amenity" />
        </shape>
    </item>
    <item>
@@ -17,7 +17,7 @@
                android:pivotX="12"
                android:pivotY="12">
                <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                    android:pathData="M14,5.833275 L7.31815,8.803025 L7.31815,13.2575917 C7.31815,17.378025 10.1690167,21.231175 14,22.166725 C17.8308667,21.2312683 20.68185,17.3781417 20.68185,13.2575917 L20.68185,8.803025 L14,5.833275 L14,5.833275 Z M15.85605,14.438025 L16.524235,17.3186417 L14.000035,15.796725 L11.475835,17.3186417 L12.14402,14.4454917 L9.91673667,12.5225917 L12.8567367,12.2701717 L14.00007,9.560355 L15.1434033,12.2628217 L18.0834033,12.5152417 L15.85612,14.4381417 L15.85605,14.438025 Z" />
            </group>
        </vector>
--- a/android/app/src/main/res/drawable/ic_category_post.xml
+++ b/android/app/src/main/res/drawable/ic_category_post.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#747E86" />
+            <solid android:color="@color/amenity" />
        </shape>
    </item>
    <item>
@@ -17,7 +17,7 @@
                android:pivotX="12"
                android:pivotY="12">
                <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                    android:pathData="M20.5333333,7 C21.4316667,7 22.1666667,7.735 22.1666667,8.63333333 L22.1666667,18.4333333 C22.1666667,19.3316667 21.4316667,20.0666667 20.5333333,20.0666667 L7.46666667,20.0666667 C6.56833333,20.0666667 5.83333333,19.3316667 5.83333333,18.4333333 L5.8415,8.63333333 C5.8415,7.735 6.56833333,7 7.46666667,7 L20.5333333,7 Z M20.5333333,9.88283333 C20.5333333,9.33566667 19.9371667,9.009 19.4716667,9.29483333 L14,12.7166667 L8.52833333,9.29483333 C8.06283333,9.009 7.46666667,9.33566667 7.46666667,9.88283333 C7.46666667,10.1196667 7.58916667,10.3401667 7.79333333,10.4708333 L13.5671667,14.0805 C13.8285,14.2438333 14.1715,14.2438333 14.4328333,14.0805 L20.2066667,10.4708333 C20.4108333,10.3401667 20.5333333,10.1196667 20.5333333,9.88283333 Z" />
            </group>
        </vector>
--- a/android/app/src/main/res/drawable/ic_category_recycling.xml
+++ b/android/app/src/main/res/drawable/ic_category_recycling.xml
@@ -5,7 +5,7 @@
      <size
        android:width="40dp"
        android:height="40dp" />
-      <solid android:color="#747E86" />
+      <solid android:color="@color/amenity" />
    </shape>
  </item>
  <item>
@@ -18,7 +18,7 @@
        android:pivotX="12"
        android:pivotY="12">
        <path
-            android:fillColor="#FFF"
+            android:fillColor="@color/foreground_color"
            android:pathData="M9.26178239,9.86916295 L10.4193833,7.95061481 L11.2531868,6.56634591 C11.5688972,6.04016587 12.3298444,6.04016587 12.6455913,6.56634591 L13.843676,8.5577503 L12.8479738,10.2253086 L12.0384558,11.5367213 L9.26178239,9.86916295 Z M22.1731256,14.5805343 L20.8778628,12.4272676 L18.0769039,14.0462551 L19.8658893,17.0333617 L20.7806361,17.0333617 C21.3958708,17.0333617 21.9544354,16.6852666 22.2296256,16.1348011 C22.3429572,15.9081332 22.3996236,15.665279 22.3996236,15.4143378 C22.3996236,15.1229127 22.3186718,14.8395869 22.1729556,14.5805343 L22.1731256,14.5805343 Z M17.5427461,21.0808911 L18.7570171,21.0808911 C19.3722518,21.0808911 19.9308164,20.732796 20.2060066,20.1823306 L21.379806,17.8427947 L17.5427097,17.8427947 L17.5427097,16.2238072 L14.3046133,19.4619036 L17.5427097,22.7 L17.5427097,21.0810125 L17.5427461,21.0808911 Z M12.6856622,17.8427947 L9.20471166,17.8427947 L8.52471991,18.9842094 C8.28186572,19.3889623 8.26567949,19.8908691 8.47614908,20.3199075 C8.70281704,20.7813304 9.18042624,21.0808547 9.70656985,21.0808547 L12.6855408,21.0808547 L12.6855408,17.8427583 L12.6856622,17.8427947 Z M9.54470753,15.6975422 L10.9451262,16.5394327 L9.83609613,12.0952009 L5.4,13.204231 L6.77613329,14.0299353 L6.44423661,14.5884999 C6.16091076,15.0661091 6.13662534,15.6489592 6.38757022,16.1427668 L7.70711848,18.7817419 L9.54467474,15.6974936 L9.54470753,15.6975422 Z M18.3684504,8.24191842 L17.3160782,6.48523261 C17.0165539,5.99952422 16.4903739,5.7 15.9236736,5.7 L13.0661298,5.7 L15.5918134,9.90951317 L14.1994089,10.7433166 L18.6436406,11.8523467 L19.7526707,7.40811497 L18.3684018,8.24191842 L18.3684504,8.24191842 Z" />
      </group>
    </vector>
--- a/android/app/src/main/res/drawable/ic_category_rv.xml
+++ b/android/app/src/main/res/drawable/ic_category_rv.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#747E86" />
+            <solid android:color="@color/amenity" />
        </shape>
    </item>
    <item>
@@ -17,7 +17,7 @@
                android:pivotX="12"
                android:pivotY="12">
                <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                    android:pathData="M8.33758333,7.43983333 C6.95648333,7.43983333 5.83333333,8.590085 5.83333333,10.0056833 L5.83333333,16.9397667 C5.83333333,18.0495583 6.52384833,18.99765 7.48766667,19.3551167 C7.45779982,19.1965237 7.44027578,19.0357487 7.43526,18.87431 C7.43522971,18.0654358 7.74879599,17.2897014 8.30693531,16.7178646 C8.86507462,16.1460278 9.62203578,15.8249626 10.4111933,15.8253433 C12.0537082,15.8258056 13.3849729,17.1907579 13.38491,18.87431 C13.3830282,19.0874192 13.3593515,19.2997388 13.3142683,19.5077867 L23.3312683,19.5077867 C23.6679333,19.5077867 23.9419483,19.2262233 23.9419483,18.8811467 C23.9419483,18.53607 23.6679217,18.2567933 23.3312683,18.2567933 L21.4741683,18.2567933 C21.6999883,17.87135 21.82964,17.4210517 21.82964,16.9397433 L21.82964,13.3690433 C21.82964,10.09841 19.2349733,7.43983333 16.04414,7.43983333 L8.33772333,7.43983333 L8.33758333,7.43983333 Z M8.88445833,9.60225 L10.9944917,9.60225 C11.3312033,9.60225 11.6051833,9.88155 11.6051833,10.226615 L11.6051833,12.391365 C11.6051833,12.7364417 11.3311567,13.0157183 10.9944917,13.0157183 L8.88445833,13.0157183 C8.54779333,13.0157183 8.27376667,12.7364183 8.27376667,12.391365 L8.27376667,10.226615 C8.27376667,9.88153833 8.54779333,9.60225 8.88445833,9.60225 Z M16.647925,10.684625 L16.8097067,10.684625 C18.2658233,10.684625 19.4484733,11.8992417 19.4484733,13.3916417 L19.4484733,18.2566417 L18.2294233,18.2566417 L18.2294233,13.3916417 C18.2294233,12.5883683 17.5935433,11.9333083 16.8098233,11.9333083 L16.6480417,11.9333083 C15.8643567,11.9333083 15.2284417,12.5883683 15.2284417,13.3916417 L15.2284417,18.2566417 L14.0070583,18.2566417 L14.0070583,13.3916417 C14.0070583,11.8992417 15.191925,10.684625 16.6480417,10.684625 L16.647925,10.684625 Z M10.4111583,17.0581247 C9.94104172,17.0578394 9.49008616,17.2490609 9.15757567,17.5896894 C8.82506518,17.9303179 8.63829167,18.3924263 8.63829167,18.874275 C8.63829167,19.3561237 8.82506518,19.8182321 9.15757567,20.1588606 C9.49008616,20.4994891 9.94104172,20.6907106 10.4111583,20.6904253 C11.3892489,20.6896989 12.1817548,19.8767746 12.1816917,18.874275 C12.1817548,17.8717754 11.3892489,17.0588511 10.4111583,17.0581247 Z" />
            </group>
        </vector>
--- a/android/app/src/main/res/drawable/ic_category_secondhand.xml
+++ b/android/app/src/main/res/drawable/ic_category_secondhand.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#BE75A3" />
+            <solid android:color="@color/shop" />
        </shape>
    </item>
    <item>
@@ -17,7 +17,7 @@
                android:pivotX="12"
                android:pivotY="12">
                <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                    android:pathData="M13.9999526,5 C11.853286,5 10.110286,6.743 10.110286,8.88966667 L8.55628597,8.88966667 C7.7007343,8.88966667 7.00683597,9.58815 7.00683597,10.4436667 L7,19.777 C7,20.6325517 7.70075833,21.3333333 8.55633333,21.3333333 L19.4436667,21.3333333 C20.2992183,21.3333333 21,20.632575 21,19.777 L21,10.4436667 C21,9.588115 20.2992417,8.88966667 19.4436667,8.88966667 L17.8896667,8.88966667 C17.8896667,6.743 16.1466667,5 14,5 L13.9999526,5 Z M13.9999526,6.55633333 C15.2911026,6.55633333 16.333286,7.59855167 16.333286,8.88966667 L11.6666193,8.88966667 C11.6666193,7.59851667 12.7088376,6.55633333 13.9999526,6.55633333 Z M13.4348426,10.5098167 C13.4948839,10.5028588 13.5551031,10.5212898 13.6009647,10.5606609 C13.6468264,10.6000319 13.6741635,10.6567658 13.6763776,10.7171683 L13.7151145,11.8291533 C13.7184994,11.938957 13.6391949,12.0339269 13.5305478,12.0501783 C12.9058678,12.1446293 12.3049645,12.4314333 11.8238311,12.9160667 C10.7022678,14.04575 10.6473645,15.8238667 11.6255911,17.0426833 L12.6851578,15.97628 C12.7471434,15.914964 12.8398366,15.8967615 12.9204066,15.9300834 C13.0009766,15.9634054 13.0537346,16.0417631 13.0543028,16.12895 L13.0611383,19.2483833 C13.0611463,19.307801 13.0367599,19.3646163 12.9936828,19.4055408 C12.9506056,19.4464653 12.8926159,19.4679097 12.8332766,19.4648583 L9.88697663,19.3053517 C9.80143518,19.3012871 9.72630824,19.2472336 9.69526871,19.1674188 C9.66422918,19.0876039 9.68309816,18.996996 9.7434183,18.9362067 L10.54094,18.1295617 C8.97060663,16.3068783 9.02648997,13.5555283 10.7414666,11.829095 C11.495705,11.069245 12.4494666,10.629295 13.4348333,10.5097117 L13.4348426,10.5098167 Z M15.1711926,10.7559133 L18.1174926,10.917695 C18.2026243,10.9225973 18.2769698,10.9769641 18.3074479,11.056604 C18.3379261,11.1362439 18.3188721,11.2263546 18.2587643,11.28684 L17.4612426,12.0911983 C19.032976,13.9128317 18.980126,16.6660483 17.2652776,18.3938817 C17.2645181,18.3938777 17.2637586,18.3938777 17.2629991,18.3938817 C16.5080141,19.1533467 15.5524325,19.5913483 14.5674158,19.7109317 C14.5073745,19.7178895 14.4471553,19.6994585 14.4012937,19.6600875 C14.3554321,19.6207164 14.3280949,19.5639825 14.3258808,19.50358 L14.2894225,18.3938817 C14.2860376,18.284078 14.365342,18.1891081 14.4739891,18.1728567 C15.0982141,18.0784745 15.6977058,17.7894083 16.1783725,17.3046933 C16.179132,17.3046973 16.1798915,17.3046973 16.180651,17.3046933 C17.3022143,16.1759783 17.357351,14.4000433 16.378891,13.1802933 L15.3193243,14.2466967 C15.2573387,14.3080127 15.1646455,14.3262151 15.0840755,14.2928932 C15.0035055,14.2595713 14.9507475,14.1812135 14.9501793,14.0940267 L14.9433438,10.97226 C14.9433358,10.9128424 14.9677222,10.8560271 15.0107993,10.8151026 C15.0538765,10.7741781 15.1118662,10.7527337 15.1712055,10.755785 L15.1711926,10.7559133 Z" />
            </group>
        </vector>
--- a/android/app/src/main/res/drawable/ic_category_shopping.xml
+++ b/android/app/src/main/res/drawable/ic_category_shopping.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#BE75A3" />
+            <solid android:color="@color/shop" />
        </shape>
    </item>
    <item>
@@ -17,7 +17,7 @@
                android:pivotX="12"
                android:pivotY="12">
                <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                    android:pathData="M19.4443861,8.88885 L17.8888695,8.88885 C17.8888695,6.74218333 16.1466861,5 14.0000195,5 C11.8533528,5 10.1111695,6.74218333 10.1111695,8.88885 L8.55565282,8.88885 C7.70010115,8.88885 7.00783615,9.58885 7.00783615,10.4443667 L7.00005833,19.7777 C7.00005833,20.6332517 7.70005833,21.3332167 8.555575,21.3332167 L19.444425,21.3332167 C20.2999767,21.3332167 20.9999417,20.6332167 20.9999417,19.7777 L20.9999417,10.4443667 C20.9999417,9.588815 20.2999417,8.88885 19.444425,8.88885 L19.4443861,8.88885 Z M13.9999028,6.55551667 C15.2910528,6.55551667 16.3332362,7.597735 16.3332362,8.88885 L11.6665695,8.88885 C11.6665695,7.5977 12.7087878,6.55551667 13.9999028,6.55551667 Z M13.9999028,14.3333333 C11.8532362,14.3333333 10.1110528,12.59115 10.1110528,10.4444833 L11.6665695,10.4444833 C11.6665695,11.7356333 12.7087878,12.7778167 13.9999028,12.7778167 C15.2910178,12.7778167 16.3332362,11.7355983 16.3332362,10.4444833 L17.8887528,10.4444833 C17.8887528,12.59115 16.1465695,14.3333333 13.9999028,14.3333333 Z" />
            </group>
        </vector>
--- a/android/app/src/main/res/drawable/ic_category_toilet.xml
+++ b/android/app/src/main/res/drawable/ic_category_toilet.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#747E86" />
+            <solid android:color="@color/amenity" />
        </shape>
    </item>
    <item>
@@ -17,7 +17,7 @@
                android:pivotX="12"
                android:pivotY="12">
                <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                    android:pathData="M10.3454333,8.64113333 C11.22839,8.64113333 11.9363,7.94225333 11.9363,7.07056667 C11.9363,6.19892667 11.2283433,5.5 10.3454333,5.5 C9.46252333,5.5 8.75456667,6.19888 8.75456667,7.07056667 C8.75456667,7.94220667 9.46252333,8.64113333 10.3454333,8.64113333 L10.3454333,8.64113333 Z M19.2545667,17.43605 L19.2545667,21.83345 L16.7091333,21.83345 L16.7091333,17.43605 L14.1637,17.43605 L16.3909833,10.5257667 C16.3909833,10.5257667 16.7091683,9.26938333 17.98185,9.26938333 C19.2545317,9.26938333 19.5727167,10.5257667 19.5727167,10.5257667 L21.8,17.43605 L19.2545667,17.43605 L19.2545667,17.43605 Z M11.61815,15.5514167 L11.61815,21.83345 L9.07271667,21.83345 L9.07271667,15.5514167 L7.8,15.5514167 L7.8,11.0192667 C7.8,10.0528233 8.57319667,9.26938333 9.55198333,9.26938333 L11.1388833,9.26938333 C12.1064817,9.26938333 12.8908667,10.05231 12.8908667,11.0192667 L12.8908667,15.5514167 L11.61815,15.5514167 Z M19.7362833,7.07068333 C19.7362833,7.94232333 19.00161,8.64125 18.0853333,8.64125 C17.1690567,8.64125 16.4343833,7.94237 16.4343833,7.07068333 C16.4343833,6.19904333 17.1690567,5.50011667 18.0853333,5.50011667 C19.00161,5.50011667 19.7362833,6.19899667 19.7362833,7.07068333 Z" />
            </group>
        </vector>
--- a/android/app/src/main/res/drawable/ic_category_tourism.xml
+++ b/android/app/src/main/res/drawable/ic_category_tourism.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#9C6136" />
+            <solid android:color="@color/tourism" />
        </shape>
    </item>
    <item>
@@ -17,7 +17,7 @@
                android:pivotX="12"
                android:pivotY="12">
                <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                    android:pathData="M22.167,11.328l-5.717,-0.816l-2.45,-5.712l-2.45,5.712l-5.717,0.816l4.083,4.08l-0.817,5.726l4.9,-2.463l4.9,2.448l-0.817,-5.711z" />
            </group>
        </vector>
--- a/android/app/src/main/res/drawable/ic_category_transport.xml
+++ b/android/app/src/main/res/drawable/ic_category_transport.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#2F6499" />
+            <solid android:color="@color/transport" />
        </shape>
    </item>
    <item>
@@ -17,7 +17,7 @@
                android:pivotX="12"
                android:pivotY="12">
                <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                    android:pathData="M17.7652425,5.6 C19.3205789,5.6 20.6007172,6.82330936 20.6712621,8.37700229 L21.1340668,18.5587623 C21.2018095,20.0490603 20.1357825,21.3284073 18.6981339,21.5620297 L18.2940892,21.5992497 L9.77120086,21.6 C8.27928213,21.6 7.04973517,20.4769811 6.88169744,19.0301853 L6.86287684,18.6248613 L7.3279318,8.37707196 C7.39855249,6.8233354 8.67873133,5.6 10.2339515,5.6 L17.7652425,5.6 Z M9.92695997,17.2362972 C9.28430184,17.2362972 8.76333027,17.7572687 8.76333027,18.3999268 C8.76333027,19.042585 9.28430184,19.5635566 9.92695997,19.5635566 C10.5696181,19.5635566 11.0905897,19.042585 11.0905897,18.3999268 C11.0905897,17.7572687 10.5696181,17.2362972 9.92695997,17.2362972 Z M18.0723679,17.2362972 C17.4297098,17.2362972 16.9087383,17.7572687 16.9087383,18.3999268 C16.9087383,19.042585 17.4297098,19.5635566 18.0723679,19.5635566 C18.7150261,19.5635566 19.2359977,19.042585 19.2359977,18.3999268 C19.2359977,17.7572687 18.7150261,17.2362972 18.0723679,17.2362972 Z M17.2628087,7.78180569 L10.736446,7.78180569 C9.95826161,7.78180569 9.31791619,8.39432582 9.28337093,9.17176139 L9.12032285,12.8726871 C9.12032285,13.675999 9.77154822,14.3272243 10.57486,14.3272243 L17.4890037,14.3257899 C18.2915299,14.2901216 18.9131848,13.6106375 18.8775195,12.8081258 L18.7159058,9.17178293 C18.6813533,8.39434738 18.0410005,7.78180569 17.2628087,7.78180569 Z" />
            </group>
        </vector>
--- a/android/app/src/main/res/drawable/ic_category_water.xml
+++ b/android/app/src/main/res/drawable/ic_category_water.xml
@@ -5,7 +5,7 @@
      <size
        android:width="40dp"
        android:height="40dp" />
-      <solid android:color="#54A3B6" />
+      <solid android:color="@color/water" />
    </shape>
  </item>
  <item>
@@ -18,7 +18,7 @@
        android:pivotX="12"
        android:pivotY="12">
        <path
-          android:fillColor="#FFF"
+          android:fillColor="@color/foreground_color"
          android:pathData="M14,21.8749 C11.1749,21.8749 8.5482,19.4518 8.5482,16.4231 C8.5482,13.3606 12.6876,7.8747 14,6.1251 C15.3125,7.8751 19.4518,13.3606 19.4518,16.4231 C19.4518,19.4519 16.825,21.8749 14,21.8749 Z" />
      </group>
    </vector>
--- a/android/app/src/main/res/drawable/ic_category_wifi.xml
+++ b/android/app/src/main/res/drawable/ic_category_wifi.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#747E86" />
+            <solid android:color="@color/amenity" />
        </shape>
    </item>
    <item>
@@ -17,7 +17,7 @@
                android:pivotX="12"
                android:pivotY="12">
                <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                    android:pathData="M14,16.98 C15.1045695,16.98 16.1045695,17.4277153 16.8284271,18.1515729 L14,20.98 L11.1715729,18.1515729 C11.8954305,17.4277153 12.8954305,16.98 14,16.98 Z M14,12.48 C16.3472102,12.48 18.4722102,13.4313949 20.0104076,14.9695924 L18.2426407,16.7373593 C17.1568542,15.6515729 15.6568542,14.98 14,14.98 C12.3431458,14.98 10.8431458,15.6515729 9.75735931,16.7373593 L7.98959236,14.9695924 C9.52778981,13.4313949 11.6527898,12.48 14,12.48 Z M14,7.98 C17.5898509,7.98 20.8398509,9.43507456 23.1923882,11.7876118 L21.4251209,13.5558785 C19.5249552,11.6554586 16.8997491,10.48 14,10.48 C11.1002509,10.48 8.47504482,11.6554586 6.57487909,13.5558785 L4.80761184,11.7876118 C7.16014913,9.43507456 10.4101491,7.98 14,7.98 Z" />
            </group>
        </vector>
--- a/android/app/src/main/res/layout-land/dialog_stacked_buttons.xml
+++ b/android/app/src/main/res/layout-land/dialog_stacked_buttons.xml
@@ -3,12 +3,13 @@
  xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:app="http://schemas.android.com/apk/res-auto"
  xmlns:tools="http://schemas.android.com/tools"
-  style="@style/Widget.Material3.CardView.Filled"
+  style="@style/Widget.Material3.CardView.Elevated"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
  android:paddingBottom="@dimen/margin_half"
  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
-  app:cardCornerRadius="28dp">
+  app:cardCornerRadius="28dp"
+  app:cardElevation="@dimen/m3_sys_elevation_level3">
 <LinearLayout
  android:orientation="vertical"
  android:layout_width="match_parent"
--- a/android/app/src/main/res/layout-land/layout_nav.xml
+++ b/android/app/src/main/res/layout-land/layout_nav.xml
@@ -41,5 +41,5 @@
    android:layout_width="0dp"
    android:layout_height="0dp"
    android:layout_gravity="bottom|start"
-    android:background="?colorSurfaceContainerLow"/>
+    android:background="?appBackground"/>
 </FrameLayout>
--- a/android/app/src/main/res/layout/button_new_item.xml
+++ b/android/app/src/main/res/layout/button_new_item.xml
@@ -8,7 +8,7 @@
    android:layout_margin="4dp"
    android:clickable="true"
    android:focusable="true"
-    app:cardBackgroundColor="?cardBackground"
+    app:cardBackgroundColor="?appBackground"
    app:cardCornerRadius="12dp"
    app:cardElevation="2dp"
    tools:showIn="@layout/item_charging_sockets">
--- a/android/app/src/main/res/layout/choose_bookmark_category_fragment.xml
+++ b/android/app/src/main/res/layout/choose_bookmark_category_fragment.xml
@@ -5,9 +5,10 @@
  xmlns:tools="http://schemas.android.com/tools"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
-  style="@style/Widget.Material3.CardView.Filled"
+  style="@style/Widget.Material3.CardView.Elevated"
  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
-  app:cardCornerRadius="28dp">
+  app:cardCornerRadius="28dp"
+  app:cardElevation="@dimen/m3_sys_elevation_level3">
 <LinearLayout
  android:orientation="vertical"
  android:minWidth="@dimen/bookmark_purchase_img_width"
--- a/android/app/src/main/res/layout/dialog_sorting_types.xml
+++ b/android/app/src/main/res/layout/dialog_sorting_types.xml
@@ -2,14 +2,15 @@
 <com.google.android.material.card.MaterialCardView
  xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:app="http://schemas.android.com/apk/res-auto"
-  style="@style/Widget.Material3.CardView.Filled"
+  style="@style/Widget.Material3.CardView.Elevated"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
  android:layout_margin="@dimen/margin_double_and_half"
  android:minWidth="@dimen/dialog_min_width"
  android:minHeight="@dimen/dialog_min_height"
  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
-  app:cardCornerRadius="28dp">
+  app:cardCornerRadius="28dp"
+  app:cardElevation="@dimen/m3_sys_elevation_level3">
 <LinearLayout
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
--- a/android/app/src/main/res/layout/dialog_stacked_buttons.xml
+++ b/android/app/src/main/res/layout/dialog_stacked_buttons.xml
@@ -3,12 +3,13 @@
  xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:app="http://schemas.android.com/apk/res-auto"
  xmlns:tools="http://schemas.android.com/tools"
-  style="@style/Widget.Material3.CardView.Filled"
+  style="@style/Widget.Material3.CardView.Elevated"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
  android:paddingBottom="@dimen/margin_half"
  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
-  app:cardCornerRadius="28dp">
+  app:cardCornerRadius="28dp"
+  app:cardElevation="@dimen/m3_sys_elevation_level3">
 <LinearLayout
  android:orientation="vertical"
  android:layout_width="match_parent"
--- a/android/app/src/main/res/layout/fragment_editor.xml
+++ b/android/app/src/main/res/layout/fragment_editor.xml
@@ -6,6 +6,7 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:clipToPadding="false"
+    android:background="@color/bg_editor"
    tools:context=".editor.EditorActivity">
  <LinearLayout
      android:layout_width="match_parent"
@@ -430,7 +431,6 @@
        android:layout_height="wrap_content"
        android:gravity="center"
        android:layout_marginBottom="@dimen/margin_quarter"
-        app:backgroundTint="?cardBackground"
        android:textColor="@color/base_red"
        app:strokeColor="@color/base_red"
        android:text="@string/editor_business_vacant_button"/>
@@ -441,7 +441,6 @@
        android:layout_height="wrap_content"
        android:gravity="center"
        android:layout_marginBottom="@dimen/margin_base"
-        app:backgroundTint="?cardBackground"
        android:textColor="@color/base_red"
        app:strokeColor="@color/base_red"
        tools:text="Reset my changes"/>
--- a/android/app/src/main/res/layout/fragment_editor_host.xml
+++ b/android/app/src/main/res/layout/fragment_editor_host.xml
@@ -2,10 +2,9 @@
 <LinearLayout
  xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:tools="http://schemas.android.com/tools"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:background="?windowBackgroundForced"
  android:orientation="vertical">

  <com.google.android.material.appbar.MaterialToolbar
--- a/android/app/src/main/res/layout/fragment_phone.xml
+++ b/android/app/src/main/res/layout/fragment_phone.xml
@@ -10,13 +10,13 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:id="@+id/frameLayout"
-        android:background="?windowBackgroundForced">
+        android:background="@color/bg_editor"
+        android:layout_marginBottom="@dimen/margin_quarter">

        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/phones_recycler"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:background="?cardBackground"
            android:scrollbars="vertical" />

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

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

  <com.google.android.material.textview.MaterialTextView
    android:id="@+id/tv__mode_switch"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:layout_alignParentBottom="true"
-    android:background="?clickableBackground"
    android:gravity="center_vertical"
    android:padding="@dimen/margin_base"
    android:text="@string/editor_time_advanced"
@@ -35,7 +34,7 @@
    android:textColor="?colorSecondary" />

  <include
-    layout="@layout/shadow_bottom"
+    layout="@layout/item_divider"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:layout_above="@id/tv__mode_switch"/>
--- a/android/app/src/main/res/layout/fragment_timetable_advanced.xml
+++ b/android/app/src/main/res/layout/fragment_timetable_advanced.xml
@@ -5,7 +5,7 @@
  xmlns:tools="http://schemas.android.com/tools"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
-  android:background="?windowBackgroundForced">
+  android:background="@color/bg_editor">

  <LinearLayout
    android:layout_width="match_parent"
@@ -17,8 +17,7 @@
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
      android:layout_marginTop="@dimen/margin_half"
-      style="@style/MwmWidget.M3.Editor.CardView"
-      app:cardBackgroundColor="?cardBackground">
+      style="@style/MwmWidget.M3.Editor.CardView">

      <LinearLayout
        android:id="@+id/examples"
--- a/android/app/src/main/res/layout/fragment_timetable_simple.xml
+++ b/android/app/src/main/res/layout/fragment_timetable_simple.xml
@@ -4,7 +4,7 @@
  android:id="@+id/recycler"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
-  android:background="?windowBackgroundForced"
+  android:background="@color/bg_editor"
  android:paddingStart="@dimen/margin_half"
  android:paddingEnd="@dimen/margin_half"
  android:scrollbars="vertical"/>
--- a/android/app/src/main/res/layout/item_charge_socket.xml
+++ b/android/app/src/main/res/layout/item_charge_socket.xml
@@ -6,7 +6,7 @@
    android:layout_margin="4dp"
    android:clickable="true"
    android:focusable="true"
-    app:cardBackgroundColor="?cardBackground"
+    app:cardBackgroundColor="?appBackground"
    app:cardCornerRadius="12dp"
    app:cardElevation="2dp">

--- a/android/app/src/main/res/layout/item_charging_sockets.xml
+++ b/android/app/src/main/res/layout/item_charging_sockets.xml
@@ -21,5 +21,6 @@
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
      android:text="@string/edit_socket_info_tooltip"
-      android:textAppearance="?android:attr/textAppearanceSmall" />
+      android:textAppearance="?android:attr/textAppearanceSmall"
+      android:layout_marginBottom="@dimen/margin_quarter"/>
 </LinearLayout>
--- a/android/app/src/main/res/layout/item_layer.xml
+++ b/android/app/src/main/res/layout/item_layer.xml
@@ -3,7 +3,7 @@
  xmlns:tools="http://schemas.android.com/tools"
  android:layout_width="wrap_content"
  android:layout_height="match_parent"
-  android:layout_marginTop="@dimen/margin_direction_big"
+  android:layout_marginTop="@dimen/margin_base_plus_quarter"
  android:orientation="vertical">

  <FrameLayout
--- a/android/app/src/main/res/layout/layout_nav.xml
+++ b/android/app/src/main/res/layout/layout_nav.xml
@@ -40,5 +40,5 @@
    android:layout_width="0dp"
    android:layout_height="0dp"
    android:layout_gravity="bottom|center"
-    android:background="?colorSurfaceContainerLow"/>
+    android:background="?appBackground"/>
 </FrameLayout>
--- a/android/app/src/main/res/layout/localized_name.xml
+++ b/android/app/src/main/res/layout/localized_name.xml
@@ -7,6 +7,7 @@
  android:orientation="vertical"
  android:paddingEnd="@dimen/margin_base"
  android:paddingStart="@dimen/margin_base"
+  android:background="@color/fg_editor"
  android:animateLayoutChanges="true">

  <com.google.android.material.textview.MaterialTextView
@@ -20,7 +21,12 @@
    android:textAppearance="@style/MwmTextAppearance.Body3"
    tools:drawableEnd="@drawable/ic_expand_more" />

-  <include layout="@layout/recycler_default" />
+  <androidx.recyclerview.widget.RecyclerView
+    android:id="@+id/recycler"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/fg_editor"
+    android:scrollbars="vertical"/>

  <com.google.android.material.button.MaterialButton
    android:id="@+id/more_names"
--- a/android/app/src/main/res/layout/recycler_default.xml
+++ b/android/app/src/main/res/layout/recycler_default.xml
@@ -4,5 +4,5 @@
  android:id="@+id/recycler"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
-  android:background="?cardBackground"
+  android:background="?appBackground"
  android:scrollbars="vertical"/>
--- a/android/app/src/main/res/values-bg/strings.xml
+++ b/android/app/src/main/res/values-bg/strings.xml
@@ -9,7 +9,7 @@
    <string name="delete">Изтриване</string>
    <string name="download_maps">Изтегляне на карти</string>
    <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">Изтеглянето се провали. Натиснете, за да опитате отново.</string>
+    <string name="download_has_failed">Изтеглянето се провали, затиснете, за да опитате отново</string>
    <!-- Settings/Downloader - info for country which started downloading -->
    <string name="downloading">Теглене…</string>
    <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -27,7 +27,7 @@
    <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
    <string name="limited_accuracy">Ограничена точност</string>
    <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">За да осигурите точна навигация, активирайте функцията \"Точно местоположение\" в настройките.</string>
+    <string name="precise_location_is_disabled_long_text">За да осигурите точна навигация, активирайте функцията \"Точно местоположение\" в настройките</string>
    <!-- View and button titles for accessibility -->
    <string name="zoom_to_country">Показване на картата</string>
    <!-- Message to display at the center of the screen when the country download has failed -->
@@ -66,11 +66,11 @@
    <!-- "Add new bookmark list" dialog title -->
    <string name="add_new_set">Добавяне на нова група</string>
    <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Име на група</string>
+    <string name="bookmark_set_name">Име на списък</string>
    <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Отметки</string>
+    <string name="bookmarks">Места</string>
    <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Отметки и пътеки</string>
+    <string name="bookmarks_and_tracks">Любими</string>
    <!-- Add bookmark dialog - bookmark name -->
    <string name="name">Име</string>
    <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -66,11 +66,11 @@
    <!-- "Add new bookmark list" dialog title -->
    <string name="add_new_set">Afegeix una llista nova</string>
    <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Nom de la llista de marcadors</string>
+    <string name="bookmark_set_name">Nom de la llista</string>
    <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Marcadors</string>
+    <string name="bookmarks">Llocs</string>
    <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Marcadors i recorreguts</string>
+    <string name="bookmarks_and_tracks">Preferits</string>
    <!-- Add bookmark dialog - bookmark name -->
    <string name="name">Nom</string>
    <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -146,14 +146,14 @@
    <!-- Notes field in Bookmarks view -->
    <string name="description">Notes</string>
    <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Marcadors d\'CoMaps compartits</string>
-    <string name="share_bookmarks_email_body">Hola! \n \nAdjunto els meus marcadors de l\'aplicació CoMaps. Obriu-los si teniu l\'CoMaps instal·lat. O, si no teniu l\'aplicació, baixeu-la per al vostre aparell iOS o Android seguint aquest enllaç: https://www.comaps.app/download/ \n \nGaudiu viatjant amb l\'CoMaps!</string>
+    <string name="share_bookmarks_email_subject">Els meus preferits de CoMaps</string>
+    <string name="share_bookmarks_email_body">Hola! \n \nAdjunto els meus marcadors de l\'aplicació CoMaps. Obriu-los si teniu l\'CoMaps instal·lat. O, si no teniu l\'aplicació, baixeu-la per al vostre dispositiu iOS o Android seguint aquest enllaç: https://www.comaps.app/download/ \n \nGaudiu viatjant amb l\'CoMaps!</string>
    <!-- message title of loading file -->
-    <string name="load_kmz_title">S\'estan carregant els marcadors</string>
+    <string name="load_kmz_title">Carregant Preferits</string>
    <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Els marcadors s’han carregat correctament. Els trobareu al mapa i a la pantalla de gestió de marcadors.</string>
+    <string name="load_kmz_successful">Els preferits s’han carregat correctament. Els trobareu al mapa i a la pantalla de gestió de preferits.</string>
    <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">No s\'ha pogut carregar els marcadors. El fitxer pot ser malmès o defectuós.</string>
+    <string name="load_kmz_failed">No s\'han pogut carregar els preferits. El fitxer pot estar corromput o ser defectuós.</string>
    <!-- Failed to recognize the format of a bookmarks or tracks file. -->
    <string name="unknown_file_type">L\'aplicació no reconeix el tipus de fitxer: \n%1$s</string>
    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -499,7 +499,7 @@
    <string name="minute">min</string>
    <string name="day">d</string>
    <string name="placepage_more_button">Més</string>
-    <string name="placepage_edit_bookmark_button">Edita el marcador</string>
+    <string name="placepage_edit_bookmark_button">Edita el Lloc Desat</string>
    <string name="placepage_personal_notes_hint">Notes personals (text o html)</string>
    <string name="editor_reset_edits_message">Voleu descartar tots els canvis locals?</string>
    <string name="editor_reset_edits_button">Descartar canvis</string>
@@ -564,18 +564,18 @@
    <string name="dialog_error_storage_message">L\'emmagatzematg extern no és accessible. La targeta SD potser s\'ha retirat, malmès, o el sistema de fitxer és de només lectura. Comproveu la targeta SD o contacteu amb nosaltres a support@comaps.app</string>
    <string name="setting_emulate_bad_storage">Emula un emmagatzematge malmès</string>
    <string name="error_enter_correct_name">Introduïu un nom correcte</string>
-    <string name="bookmark_lists">Llistes</string>
+    <string name="bookmark_lists">Llista de Preferits</string>
    <!-- Do not display all bookmark lists on the map -->
    <string name="bookmark_lists_hide_all">Amaga-ho tot</string>
    <string name="bookmark_lists_show_all">Mostra-ho tot</string>
    <plurals name="bookmarks_places">
-        <item quantity="one">%d marcador</item>
-        <item quantity="many">%d marcadors</item>
-        <item quantity="other">%d marcadors</item>
+        <item quantity="one">%d lloc desat</item>
+        <item quantity="many">%d llocs desats</item>
+        <item quantity="other">%d llocs desats</item>
    </plurals>
    <string name="bookmarks_create_new_group">Crea una llista</string>
    <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Importa marcadors i recorreguts</string>
+    <string name="bookmarks_import">Importar preferits</string>
    <string name="bookmarks_error_message_share_general">No s\'ha pogut compartir a causa d\'un error de l\'aplicació</string>
    <string name="bookmarks_error_title_share_empty">Error al compartir</string>
    <string name="bookmarks_error_message_share_empty">No es pot compartir una llista buida</string>
@@ -606,7 +606,7 @@
    <string name="subway">Metro</string>
    <string name="layers_title">Estils i capes del mapa</string>
    <string name="bookmarks_empty_list_title">Aquesta llista és buida</string>
-    <string name="bookmarks_empty_list_message">Per a afegir un marcador, toqueu un lloc en el mapa i després toqueu la icona d\'estrella</string>
+    <string name="bookmarks_empty_list_message">Per a desar un lloc, toqueu-ne un en el mapa i després toqueu la icona d\'estrella</string>
    <string name="category_desc_more">…més</string>
    <string name="export_file">Exporta KMZ</string>
    <string name="export_file_gpx">Exporta GPX</string>
@@ -659,7 +659,7 @@
    <!-- max. 10 symbols, both iOS and Android -->
    <string name="sort">Ordena…</string>
    <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Ordena els marcadors</string>
+    <string name="sort_bookmarks">Ordenar preferits</string>
    <!-- Android -->
    <string name="by_default">Per defecte</string>
    <!-- Android -->
@@ -777,7 +777,7 @@
    <string name="browser_not_available">El navegador web no està disponible</string>
    <string name="volume">Volum</string>
    <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Exporta tots els marcadors i recorreguts</string>
+    <string name="bookmarks_export">Exporta tots els llocs i recorreguts</string>
    <!-- button in (app) TTS settings, to open the system TTS settings. -->
    <string name="pref_tts_open_system_settings">Paràmetres de la síntesi de veu del sistema</string>
    <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -809,7 +809,7 @@
    <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
    <string name="continue_recording">Continuar enregistrant</string>
    <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Voleu desar l’enregistrament a Marcadors i recorreguts?</string>
+    <string name="track_recording_alert_title">Desar en preferits?</string>
    <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
    <string name="track_recording_toast_nothing_to_save">El recorregut està buit; no hi ha res a desar</string>
    <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -839,11 +839,11 @@
    <string name="pref_left_button_disable">Desactivar</string>
    <string name="editor_level">Pis (0 és la planta baixa)</string>
    <string name="error_enter_correct_bluesky_page">Introdueix un nom d\'usuari o una adreça web de Bluesky vàlids</string>
-    <string name="pref_backup_title">Còpia de seguretat de marcadors i recorreguts</string>
+    <string name="pref_backup_title">Còpia de seguretat de preferits</string>
    <string name="pref_left_button_title">Configuració del botó esquerre</string>
    <string name="pref_backup_summary">Còpia de seguretat automàtica a un directori del teu dispositiu</string>
    <string name="pref_backup_now_summary_ok">Còpia de seguretat completada amb èxit</string>
-    <string name="pref_backup_now_summary_empty_lists">No hi ha marcadors o recorreguts per a fer una còpia de seguretat</string>
+    <string name="pref_backup_now_summary_empty_lists">No hi ha llocs o recorreguts per a fer una còpia de seguretat</string>
    <string name="pref_backup_now_summary_failed">Còpia de seguretat fallida</string>
    <string name="pref_backup_now_summary_folder_unavailable">El directori de la còpia de seguretat no està disponible</string>
    <string name="pref_backup_status_summary_success">Última còpia de seguretat amb èxit</string>
@@ -860,7 +860,7 @@
    <string name="pedestrian">A peu</string>
    <string name="bicycle">Bicicleta</string>
    <string name="ruler">Regle</string>
-    <string name="bookmark_color">Color del marcador</string>
+    <string name="bookmark_color">Color del preferit</string>
    <string name="about_help">Quant a i Ajuda</string>
    <string name="open_now">Obert ara</string>
    <string name="closed_now">Tancat ara</string>
@@ -925,4 +925,5 @@
    <string name="download_resources_custom_url_message">Sobreescriu el servidor de descàrrega de mapes per defecte. Deixa en blanc per a emprar el servidor per defecte de CoMaps.</string>
    <string name="download_resources_custom_url_summary_none">No establert</string>
    <string name="download_resources_custom_url_error_scheme">Per favor introdueix una URL que comence amb http:// o https://</string>
+    <string name="pref_maplanguage_local">Idioma Local</string>
 </resources>
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -892,7 +892,7 @@
    <string name="avoid_paved">Vyhnout se zpevněným cestám</string>
    <string name="opens_at">Otevírá v %s</string>
    <string name="closes_at">Zavírá v %s</string>
-    <string name="opens_day_at">Otevírá %1$s v %2$s</string>
+    <string name="opens_day_at">Otevírá v %1$s v %2$s</string>
    <string name="closes_day_at">Zavírá %1$s v %2$s</string>
    <string name="editor_business_vacant_button">Podnik je volný</string>
    <string name="editor_mark_business_vacant_title">Označit podnik jako volný</string>
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -68,11 +68,11 @@
    <!-- "Add new bookmark list" dialog title -->
    <string name="add_new_set">Tilføj en ny liste</string>
    <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Indstil navn for bogmærkeliste</string>
+    <string name="bookmark_set_name">Listenavn</string>
    <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Bogmærker</string>
+    <string name="bookmarks">Steder</string>
    <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Bogmærker og spor</string>
+    <string name="bookmarks_and_tracks">Favoritter</string>
    <!-- Add bookmark dialog - bookmark name -->
    <string name="name">Navn</string>
    <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -144,13 +144,13 @@
    <!-- Notes field in Bookmarks view -->
    <string name="description">Noter</string>
    <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">CoMaps bogmærker er blevet delt med dig</string>
+    <string name="share_bookmarks_email_subject">Mine CoMaps-favoritter</string>
    <!-- message title of loading file -->
-    <string name="load_kmz_title">Indlæser bogmærker</string>
+    <string name="load_kmz_title">Indlæser favoritter</string>
    <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Bogmærker er indlæst! Du kan finde dem på kortet eller på skærmen for bogmærkehåndtering.</string>
+    <string name="load_kmz_successful">Favoritter er indlæst! Du kan finde dem på kortet eller på skærmen for favorithåndtering.</string>
    <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Bogmærkerne kunne ikke indlæses. Filen kan være skadet eller defekt.</string>
+    <string name="load_kmz_failed">Favoritter kunne ikke indlæses. Filen kan være skadet eller defekt.</string>
    <!-- Failed to recognize the format of a bookmarks or tracks file. -->
    <string name="unknown_file_type">Filtypen genkendes ikke af appen: \n%1$s</string>
    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -486,7 +486,7 @@
    <string name="minute">min</string>
    <string name="day">d</string>
    <string name="placepage_more_button">Mere</string>
-    <string name="placepage_edit_bookmark_button">Rediger bogmærke</string>
+    <string name="placepage_edit_bookmark_button">Rediger gemt sted</string>
    <string name="placepage_personal_notes_hint">Personlige notater (tekst eller html)</string>
    <string name="editor_reset_edits_message">Kassér alle lokale ændringer?</string>
    <string name="editor_reset_edits_button">Kassér ændringer</string>
@@ -543,17 +543,17 @@
    <string name="dialog_error_storage_message">Eksternt lager er ikke tilgængeligt. SD-kortet kan være blevet fjernet eller beskadiget, eller filsystemet er skrivebeskyttet. Kontroller dit SD-kort eller kontakt os på support@comaps.app</string>
    <string name="setting_emulate_bad_storage">Emulér beskadiget lager</string>
    <string name="error_enter_correct_name">Angiv et korrekt navn</string>
-    <string name="bookmark_lists">Lister</string>
+    <string name="bookmark_lists">Favoritlister</string>
    <!-- Do not display all bookmark lists on the map -->
    <string name="bookmark_lists_hide_all">Skjul alle</string>
    <string name="bookmark_lists_show_all">Vis alle</string>
    <plurals name="bookmarks_places">
-        <item quantity="one">%d bogmærke</item>
-        <item quantity="other">%d bogmærker</item>
+        <item quantity="one">%d gemt sted</item>
+        <item quantity="other">%d gemte steder</item>
    </plurals>
    <string name="bookmarks_create_new_group">Opret ny liste</string>
    <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Importer bogmærker og spor</string>
+    <string name="bookmarks_import">Importer favoritter</string>
    <string name="bookmarks_error_message_share_general">Ikke i stand til at dele på grund af en applikationsfejl</string>
    <string name="bookmarks_error_title_share_empty">Delingsfejl</string>
    <string name="bookmarks_error_message_share_empty">Kan ikke dele en tom liste</string>
@@ -582,7 +582,7 @@
    <string name="subway">Undergrundsbane</string>
    <string name="layers_title">Kortstile og -lag</string>
    <string name="bookmarks_empty_list_title">Listen er tom</string>
-    <string name="bookmarks_empty_list_message">For at tilføje et bogmærke, så tryk et sted på kort og så på stjerneikonet</string>
+    <string name="bookmarks_empty_list_message">For at gemme et sted, så tryk et sted på kortet og dernæst på stjerneikonet</string>
    <string name="category_desc_more">…mere</string>
    <string name="export_file">Eksporter KMZ</string>
    <string name="export_file_gpx">Eksporter GPX</string>
@@ -635,7 +635,7 @@
    <!-- max. 10 symbols, both iOS and Android -->
    <string name="sort">Sorter…</string>
    <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Sorter bogmærker</string>
+    <string name="sort_bookmarks">Sorter favoritter</string>
    <!-- Android -->
    <string name="by_default">Som standard</string>
    <!-- Android -->
@@ -736,7 +736,7 @@
    <string name="browser_not_available">Webbrowser er ikke tilgængelig</string>
    <string name="volume">Lydstyrke</string>
    <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Eksporter alle bogmærker og spor</string>
+    <string name="bookmarks_export">Eksporter alle steder og spor</string>
    <!-- button in (app) TTS settings, to open the system TTS settings. -->
    <string name="pref_tts_open_system_settings">Indstillinger for talesyntese-system</string>
    <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -768,7 +768,7 @@
    <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
    <string name="continue_recording">Fortsæt optagelse</string>
    <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Gem i bogmærker og spor?</string>
+    <string name="track_recording_alert_title">Gem i favoritter?</string>
    <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
    <string name="track_recording_toast_nothing_to_save">Sporet er tomt - der er ikke noget at gemme</string>
    <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -787,7 +787,7 @@
    <string name="error_enter_correct_facebook_page">Indtast en gyldig Facebook-webadresse, -konto eller -sidenavn</string>
    <string name="connection_failure">Forbindelsesfejl</string>
    <string name="error_enter_correct_twitter_page">Indtast et gyldigt Twitter-brugernavn eller en webadresse</string>
-    <string name="share_bookmarks_email_body">Hej! \n \nVedhæftet er mine bogmærker; åbn dem venligst i CoMaps. Hvis du ikke har den installeret, kan du downloade den her: https://www.comaps.app/download/\n \nGod rejse med CoMaps!</string>
+    <string name="share_bookmarks_email_body">Hej! \n \nVedhæftet er mine favoritter; åbn dem i CoMaps. Hvis du ikke har den installeret, kan du downloade den her: https://www.comaps.app/download/\n \nGod rejse med CoMaps!</string>
    <string name="delete_place_empty_comment_error">Angiv begrundelsen for at slette stedet</string>
    <string name="disk_error_title">Diskfejl</string>
    <string name="error_enter_correct_instagram_page">Indtast et gyldigt Instagram-brugernavn eller en webadresse</string>
@@ -817,7 +817,7 @@
    <string name="error_enter_correct_bluesky_page">Indtast et gyldigt Bluesky-brugernavn eller en webadresse</string>
    <string name="editor_level">Etage (0 er stueetage)</string>
    <string name="pref_backup_now_summary_ok">Sikkerhedskopiering fuldført</string>
-    <string name="pref_backup_now_summary_empty_lists">Ingen bogmærker og spor at lave sikkerhedskopi af</string>
+    <string name="pref_backup_now_summary_empty_lists">Ingen steder og spor at lave sikkerhedskopi af</string>
    <string name="pref_backup_now_summary_failed">Sikkerhedskopiering mislykkedes</string>
    <string name="pref_backup_now_summary_folder_unavailable">Mappen til sikkerhedskopiering er ikke tilgængelig</string>
    <string name="pref_backup_status_summary_success">Sidste vellykkede sikkerhedskopiering</string>
@@ -832,7 +832,7 @@
    <string name="editor_building_levels">Etager (inkl. stueetage, ekskl. tag)</string>
    <string name="error_enter_correct_level">Indtast et gyldigt etagenummer</string>
    <string name="pref_left_button_title">Indstilling af venstre knap</string>
-    <string name="pref_backup_title">Sikkerhedskopi af bogmærker og spor</string>
+    <string name="pref_backup_title">Sikkerhedskopi af favoritter</string>
    <string name="pref_backup_now_title">Sikkerhedskopiér nu</string>
    <string name="pref_backup_now_summary">Opret en sikkerhedskopi straks</string>
    <string name="clear">Ryd</string>
@@ -841,7 +841,7 @@
    <string name="pedestrian">Fodgænger</string>
    <string name="bicycle">Cykel</string>
    <string name="ruler">Lineal</string>
-    <string name="bookmark_color">Bogmærkefarve</string>
+    <string name="bookmark_color">Favoritfarve</string>
    <string name="pref_backup_summary">Automatisk sikkerhedskopiering til en mappe på din enhed</string>
    <string name="pref_backup_now_summary_progress">Sikkerhedskopiering i gang…</string>
    <string name="pref_backup_location_title">Placering af sikkerhedskopi</string>
@@ -907,4 +907,5 @@
    <string name="download_resources_custom_url_message">Tilsidesæt den som standard anvendte server til download af kort. Lad feltet være tomt for at bruge CoMaps\' standardserver.</string>
    <string name="download_resources_custom_url_summary_none">Ikke indstillet</string>
    <string name="download_resources_custom_url_error_scheme">Indtast en URL, der starter med http:// eller https://</string>
+    <string name="pref_maplanguage_local">Lokalt sprog</string>
 </resources>
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -153,7 +153,7 @@
    <!-- message title of loading file -->
    <string name="load_kmz_title">Favoriten laden</string>
    <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Lesezeichen erfolgreich geladen! Du kannst dieses nun auf deiner Karte oder im Lesezeichen-Manager anzeigen lassen.</string>
+    <string name="load_kmz_successful">Lesezeichen erfolgreich geladen! Du kannst diese auf deiner Karte oder im Lesezeichen-Manager anzeigen lassen.</string>
    <!-- Kml file loading failed -->
    <string name="load_kmz_failed">Laden der Lesezeichen fehlgeschlagen. Die Datei könnte beschädigt oder defekt sein.</string>
    <!-- Failed to recognize the format of a bookmarks or tracks file. -->
@@ -258,7 +258,7 @@
    <!-- Update all button text -->
    <string name="downloader_update_all_button">Alle Karten aktualisieren</string>
    <!-- Cancel all button text -->
-    <string name="downloader_cancel_all">Alle abbrechen</string>
+    <string name="downloader_cancel_all">Alles abbrechen</string>
    <!-- Downloaded maps list header -->
    <string name="downloader_downloaded_subtitle">Heruntergeladen</string>
    <!-- Country queued for download -->
@@ -281,7 +281,7 @@
    <!-- Item in context menu. -->
    <string name="downloader_update_map">Karte aktualisieren</string>
    <!-- Preference title -->
-    <string name="google_play_services">Google Fused-Standortdienste</string>
+    <string name="google_play_services">Google-Standortverknüpfungsdienst</string>
    <!-- Preference text -->
    <string name="pref_use_google_play">Ein proprietärer Dienst, der GPS, Wi-Fi, Mobilfunknetzwerke etc. kombiniert, um den Standort genauer zu bestimmen. Er kann sich mit Google-Servern verbinden.</string>
    <!-- Preference title -->
@@ -370,13 +370,13 @@
    <!-- The message when user did not find anything in the search. -->
    <string name="search_not_found_query">Lade die Region herunter, in der du suchst, oder füge den Namen einer nahe gelegenen Stadt oder eines Dorfes hinzu.</string>
    <string name="search_history_title">Suchverlauf</string>
-    <string name="search_history_text">Ihre letzten Suchanfragen anzeigen</string>
+    <string name="search_history_text">Deine letzten Suchanfragen anzeigen</string>
    <string name="clear_search">Suchverlauf löschen</string>
    <string name="p2p_your_location">Dein Standort</string>
    <string name="p2p_start">Start</string>
    <string name="p2p_from_here">Route von</string>
    <string name="p2p_to_here">Route nach</string>
-    <string name="p2p_only_from_current">Die Navigation ist nur von Ihrem aktuellen Standort aus möglich</string>
+    <string name="p2p_only_from_current">Die Navigation ist nur von deinem aktuellen Standort aus möglich</string>
    <string name="p2p_reroute_from_current">Soll eine Route von deinem aktuellen Standort aus berechnet werden?</string>
    <!-- Edit open hours/set time and minutes dialog -->
    <string name="next_button">Weiter</string>
@@ -417,14 +417,14 @@
    <string name="edit_opening_hours">Öffnungszeiten bearbeiten</string>
    <string name="no_osm_account">Kein Konto bei OpenStreetMap?</string>
    <string name="register_at_openstreetmap">Bei OpenStreetMap registrieren</string>
-    <string name="login">Bei OpenStreetMap anmelden</string>
+    <string name="login">Anmelden</string>
    <!-- Status message indicating that user did not login to OSM profile yet. -->
    <string name="not_signed_in">Nicht angemeldet</string>
    <string name="login_osm">Bei OpenStreetMap anmelden</string>
    <string name="logout">Abmelden</string>
    <string name="edit_place">Eintrag bearbeiten</string>
    <string name="add_language">Eine Sprache hinzufügen</string>
-    <string name="street">Straße</string>
+    <string name="street">Innerortsstraße</string>
    <!-- Editable House Number text field (in address block). -->
    <string name="house_number">Hausnummer</string>
    <string name="details">Einzelheiten</string>
@@ -505,7 +505,7 @@
    <string name="editor_reset_edits_button">Änderungen verwerfen</string>
    <string name="editor_remove_place_message">Hinzugefügtes Objekt löschen?</string>
    <string name="editor_remove_place_button">Löschen</string>
-    <string name="editor_place_doesnt_exist">Dieser Ort existiert nicht</string>
+    <string name="editor_place_doesnt_exist">Ort existiert nicht</string>
    <!-- Error message for "Place doesn't exist" dialog when comment is empty -->
    <string name="delete_place_empty_comment_error">Gebe bitte den Grund für die Löschung an</string>
    <!-- Phone number error message -->
@@ -844,7 +844,7 @@
    <string name="pref_backup_summary">Backup automatisch in einem Ordner auf deinem Gerät erstellen</string>
    <string name="pref_backup_now_summary">Backup sofort erstellen</string>
    <string name="pref_backup_now_summary_ok">Backup erfolgreich abgeschlossen</string>
-    <string name="pref_backup_now_summary_empty_lists">Keine Orte und Tracks zum Sichern</string>
+    <string name="pref_backup_now_summary_empty_lists">Keine Orte und Tracks für ein Backup vorhanden</string>
    <string name="pref_backup_now_summary_failed">Backup fehlgeschlagen</string>
    <string name="pref_backup_now_summary_folder_unavailable">Der Backup-Ordner ist nicht verfügbar</string>
    <string name="pref_backup_location_summary_initial">Bitte wähle zuerst einen Ordner und erteile die Berechtigung</string>
--- a/android/app/src/main/res/values-el/strings.xml
+++ b/android/app/src/main/res/values-el/strings.xml
@@ -68,9 +68,9 @@
    <!-- Add Bookmark list dialog - hint when the list name is empty -->
    <string name="bookmark_set_name">Όνομα λίστας αγαπημένων</string>
    <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Αγαπημένα</string>
+    <string name="bookmarks">Μέρη</string>
    <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Αγαπημένα και διαδρομές</string>
+    <string name="bookmarks_and_tracks">Αγαπημένα</string>
    <!-- Add bookmark dialog - bookmark name -->
    <string name="name">Όνομα</string>
    <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -146,10 +146,10 @@
    <!-- Notes field in Bookmarks view -->
    <string name="description">Σημειώσεις</string>
    <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Κοινοποιήθηκαν τα αγαπημένα από το CoMaps σε εσάς</string>
-    <string name="share_bookmarks_email_body">Γειa! \n \nΣου επισυνάπτω τα αγαπημένα μου. Παρακαλώ άνοιξέ τα με το CoMaps. Αν δεν το έχεις εγκαταστήσει, μπορείς να το κατεβάσεις από εδώ: https://www.comaps.app/download/ \n \nΚαλή διασκέδαση ταξιδεύοντας με το CoMaps!</string>
+    <string name="share_bookmarks_email_subject">Τα Αγαπημένα μου στο CoMaps</string>
+    <string name="share_bookmarks_email_body">Γειά σου! \n \nΣου επισυνάπτω τα αγαπημένα μου. Παρακαλώ άνοιξε τα με το CoMaps. Αν δεν το έχεις εγκατεστημένο, μπορείς να το κατεβάσεις από εδώ: https://www.comaps.app/download/ \n \nΚαλή διασκέδαση ταξιδεύοντας με το CoMaps!</string>
    <!-- message title of loading file -->
-    <string name="load_kmz_title">Φορτώνονται τα αγαπημένα</string>
+    <string name="load_kmz_title">Φορτώνονται τα Αγαπημένα</string>
    <!-- Kmz file successful loading -->
    <string name="load_kmz_successful">Τα αγαπημένα φορτώθηκαν με επιτυχία! Μπορείτε να τα βρείτε στο χάρτη ή στην οθόνη Διαχείρισης αγαπημένων.</string>
    <!-- Kml file loading failed -->
@@ -163,9 +163,9 @@
    <!-- Warning message when doing search around current position -->
    <string name="unknown_current_position">Η τοποθεσία σας δεν έχει προσδιοριστεί ακόμη</string>
    <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Λυπούμαστε, οι ρυθμίσεις αποθήκευσης χαρτών είναι προς το παρόν απενεργοποιημένες.</string>
+    <string name="cant_change_this_setting">Λυπούμαστε, οι ρυθμίσεις αποθήκευσης χαρτών είναι προς το παρόν απενεργοποιημένες</string>
    <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">Λήψη χάρτη βρίσκεται σε εξέλιξη.</string>
+    <string name="downloading_is_active">Η λήψη χάρτη βρίσκεται σε εξέλιξη</string>
    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
    <string name="my_position_share_sms">Δες την τρέχουσα τοποθεσία μου στο CoMaps! %1$s ή %2$s Αν δεν έχεις τους χάρτες εκτός σύνδεσης, μπορείς να τους κατεβάσεις εδώ: https://www.comaps.app/download/</string>
    <!-- Subject for emailed bookmark -->
@@ -185,7 +185,7 @@
    <!-- Data version in «About» screen, %@ is replaced by a local, human readable date. -->
    <string name="data_version">Δεδομένα OpenStreetMap: %s</string>
    <!-- Title for tracks category in bookmarks manager -->
-    <string name="tracks_title">Διαδρομές</string>
+    <string name="tracks_title">Ίχνη</string>
    <!-- Length of track in cell that describes route -->
    <string name="length">Μήκος</string>
    <string name="share_my_location">Κοινοποίηση της τοποθεσίας μου</string>
@@ -269,7 +269,7 @@
    <string name="downloader_download_all_button">Λήψη όλων</string>
    <string name="downloader_downloading">Γίνεται λήψη:</string>
    <!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
-    <string name="downloader_delete_map_while_routing_dialog">Για να διαγράψετε το χάρτη, σταματήστε την πλοήγηση.</string>
+    <string name="downloader_delete_map_while_routing_dialog">Για να διαγράψετε το χάρτη, σταματήστε την πλοήγηση</string>
    <!-- PointsInDifferentMWM -->
    <string name="routing_failed_cross_mwm_building">Μπορούν να δημιουργηθούν μόνο διαδρομές που περιέχονται πλήρως μέσα σε ένα χάρτη σε μια ενιαία περιοχή.</string>
    <!-- Context menu item for downloader. -->
@@ -295,7 +295,7 @@
    <!-- location service disabled -->
    <string name="enable_location_services">Ενεργοποιήστε τις υπηρεσίες εντοπισμού τοποθεσίας</string>
    <string name="save">Αποθήκευση</string>
-    <string name="create">δημιουργήστε</string>
+    <string name="create">Δημιουργία</string>
    <!-- red color -->
    <string name="red">Κόκκινο</string>
    <!-- yellow color -->
@@ -341,18 +341,18 @@
    <string name="dialog_routing_location_turn_on">Ενεργοποιήστε τις υπηρεσίες εντοπισμού τοποθεσίας</string>
    <string name="dialog_routing_location_unknown_turn_on">Δεν είναι δυνατός ο εντοπισμός των τρεχουσών συντεταγμένων GPS. Ενεργοποιήστε τις υπηρεσίες εντοπισμού τοποθεσίας για τον υπολογισμό της διαδρομής.</string>
    <string name="dialog_routing_unable_locate_route">Δε μπορεί να εντοπιστεί η διαδρομή</string>
-    <string name="dialog_routing_cant_build_route">Δε μπορεί να δημιουργηθεί η διαδρομή.</string>
+    <string name="dialog_routing_cant_build_route">Δε μπορεί να δημιουργηθεί η διαδρομή</string>
    <string name="dialog_routing_change_start_or_end">Ρυθμίστε το σημείο εκκίνησης ή τον προορισμό σας.</string>
    <string name="dialog_routing_change_start">Ρυθμίστε το σημείο εκκίνησης</string>
    <string name="dialog_routing_start_not_determined">Η διαδρομή δεν δημιουργήθηκε. Δεν είναι δυνατός ο εντοπισμός του σημείου εκκίνησης.</string>
    <string name="dialog_routing_select_closer_start">Επιλέξτε σημείο εκκίνησης πιο κοντά σε κάποιο δρόμο.</string>
    <string name="dialog_routing_change_end">Ρύθμιση προορισμού</string>
    <string name="dialog_routing_end_not_determined">Η διαδρομή δεν δημιουργήθηκε. Δεν είναι δυνατός ο εντοπισμός του προορισμού.</string>
-    <string name="dialog_routing_select_closer_end">Επιλέξτε ένα σημείο προορισμού πιο κοντά σε κάποιο δρόμο.</string>
-    <string name="dialog_routing_change_intermediate">Δεν είναι δυνατός ο εντοπισμός ενδιάμεσου σημείου.</string>
-    <string name="dialog_routing_intermediate_not_determined">Ρυθμίστε το ενδιάμεσο σημείο.</string>
+    <string name="dialog_routing_select_closer_end">Επιλέξτε ένα σημείο προορισμού πιο κοντά σε κάποιο δρόμο</string>
+    <string name="dialog_routing_change_intermediate">Δεν είναι δυνατός ο εντοπισμός ενδιάμεσου σημείου</string>
+    <string name="dialog_routing_intermediate_not_determined">Προσαρμόστε το ενδιάμεσο σημείο</string>
    <string name="dialog_routing_system_error">Σφάλμα συστήματος</string>
-    <string name="dialog_routing_application_error">Δεν είναι δυνατή η δημιουργία διαδρομής λόγω σφάλματος της εφαρμογής.</string>
+    <string name="dialog_routing_application_error">Δεν είναι δυνατή η δημιουργία διαδρομής λόγω σφάλματος της εφαρμογής</string>
    <string name="dialog_routing_try_again">Προσπαθήστε ξανά</string>
    <string name="not_now">Όχι τώρα</string>
    <string name="dialog_routing_download_and_build_cross_route">Θέλετε να κατεβάσετε το χάρτη και να δημιουργήσετε μια πιο βέλτιστη διαδρομή που εκτείνεται σε περισσότερους από έναν χάρτες;</string>
@@ -366,11 +366,11 @@
    <string name="hide">Απόκρυψη</string>
    <string name="categories">Κατηγορίες</string>
    <string name="history">Ιστορικό</string>
-    <string name="search_not_found">Ωχ, δε βρέθηκαν αποτελέσματα.</string>
+    <string name="search_not_found">Ωχ, δε βρέθηκαν αποτελέσματα</string>
    <!-- The message when user did not find anything in the search. -->
    <string name="search_not_found_query">Κατεβάστε την περιοχή στην οποία ψάχνετε ή δοκιμάστε να προσθέσετε το όνομα μιας κοντινής πόλης/χωριού.</string>
    <string name="search_history_title">Ιστορικό αναζητήσεων</string>
-    <string name="search_history_text">Προβολή πρόσφατων αναζητήσεων.</string>
+    <string name="search_history_text">Προβολή πρόσφατων αναζητήσεων</string>
    <string name="clear_search">Εκκαθάριση ιστορικού αναζητήσεων</string>
    <!-- Place Page link to Wikipedia article (if map object has it). -->
    <string name="read_in_wikipedia">Βικιπέδια</string>
@@ -378,7 +378,7 @@
    <string name="p2p_start">Έναρξη</string>
    <string name="p2p_from_here">Διαδρομή από</string>
    <string name="p2p_to_here">Διαδρομή προς</string>
-    <string name="p2p_only_from_current">Η πλοήγηση είναι διαθέσιμη μόνο από την τρέχουσα τοποθεσία σας.</string>
+    <string name="p2p_only_from_current">Η πλοήγηση είναι διαθέσιμη μόνο από την τρέχουσα τοποθεσία σας</string>
    <string name="p2p_reroute_from_current">Θέλετε να σχεδιαστεί μια διαδρομή από την τρέχουσα τοποθεσία σας;</string>
    <!-- Edit open hours/set time and minutes dialog -->
    <string name="next_button">Επόμενο</string>
@@ -443,11 +443,11 @@
    <!-- login text field -->
    <string name="editor_add_phone">Προσθήκη Τηλεφώνου</string>
    <string name="level">Όροφος</string>
-    <string name="downloader_delete_map_dialog">Όλες οι αλλαγές που έχετε κάνει στο χάρτη θα διαγραφούν μαζί με το χάρτη.</string>
+    <string name="downloader_delete_map_dialog">Όλες οι αλλαγές που έχετε κάνει στο χάρτη θα διαγραφούν μαζί με το χάρτη</string>
    <string name="downloader_update_maps">Ενημέρωση χαρτών</string>
    <string name="downloader_mwm_migration_dialog">Για να δημιουργήσετε μια διαδρομή, πρέπει να ενημερώσετε όλους τους χάρτες και στη συνέχεια να σχεδιάσετε τη διαδρομή ξανά.</string>
    <string name="downloader_search_field_hint">Εύρεση χάρτη</string>
-    <string name="common_check_internet_connection_dialog">Βεβαιωθείτε ότι η συσκευή σας είναι συνδεδεμένη στο Internet.</string>
+    <string name="common_check_internet_connection_dialog">Βεβαιωθείτε ότι η συσκευή σας είναι συνδεδεμένη στο Διαδίκτυο</string>
    <string name="downloader_no_space_title">Δεν υπάρχει αρκετός χώρος</string>
    <string name="downloader_no_space_message">Διαγράψτε μη απαραίτητα δεδομένα</string>
    <string name="editor_login_error_dialog">Σφάλμα σύνδεσης</string>
@@ -492,11 +492,11 @@
    <string name="editor_category_unsuitable_text">Οι CoMaps επιτρέπουν την προσθήκη απλών κατηγοριών σημείων μόνο, δηλαδή όχι πόλεων, δρόμων, λιμνών, περιγραμμάτων κτιρίων κ.λπ. Παρακαλούμε προσθέστε τέτοιες κατηγορίες απευθείας στο <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Ελέγξτε τον <a href="https://www.comaps.app/support/advanced-map-editing/">οδηγό μας</a> για λεπτομερείς οδηγίες βήμα προς βήμα.</string>
    <string name="downloader_no_downloaded_maps_title">Δεν έχετε κατεβάσει χάρτες</string>
    <string name="downloader_no_downloaded_maps_message">Κατεβάστε χάρτες για να κάνετε αναζήτηση και να πλοηγηθείτε χωρίς σύνδεση</string>
-    <string name="current_location_unknown_error_title">Η τρέχουσα τοποθεσία είναι άγνωστη.</string>
+    <string name="current_location_unknown_error_title">Η τρέχουσα τοποθεσία είναι άγνωστη</string>
    <!-- abbreviation for kilometers per hour -->
    <string name="kilometers_per_hour">χμ/ω</string>
    <string name="placepage_more_button">Περισσότερα</string>
-    <string name="placepage_edit_bookmark_button">Επεξεργασία αγαπημένου</string>
+    <string name="placepage_edit_bookmark_button">Επεξεργασία αγαπημένων μερών</string>
    <string name="placepage_personal_notes_hint">Προσωπικές σημειώσεις (κείμενο ή html)</string>
    <string name="editor_reset_edits_message">Απόρριψη όλων των τοπικών αλλαγών;</string>
    <string name="editor_reset_edits_button">Απόρριψη αλλαγών</string>
@@ -520,9 +520,9 @@
    <!-- Dialog before publishing the modifications to the public map. -->
    <string name="editor_share_to_all_dialog_message_1">Βεβαιωθείτε ότι δεν έχετε εισάγει προσωπικά δεδομένα.</string>
    <string name="editor_share_to_all_dialog_message_2">Οι συντάκτες του OpenStreetMap θα ελέγξουν τις αλλαγές και θα επικοινωνήσουν μαζί σας εάν έχουν απορίες.</string>
-    <string name="navigation_stop_button">τέλος</string>
+    <string name="navigation_stop_button">Τέλος</string>
    <!-- Shown as toast when starting the recent track recording -->
-    <string name="track_recording">Καταγραφή της διαδρομής</string>
+    <string name="track_recording">Καταγραφή του ίχνους</string>
    <!-- For the first routing -->
    <string name="accept">Συμφωνώ</string>
    <!-- For the first routing -->
@@ -530,13 +530,13 @@
    <string name="mobile_data_dialog">Θέλετε να χρησιμοποιήσετε το δίκτυο κινητής τηλεφωνίας για να εμφανίσετε αναλυτικές πληροφορίες;</string>
    <string name="mobile_data_option_always">Να χρησιμοποιείται πάντα</string>
    <string name="mobile_data_option_today">Μόνο σήμερα</string>
-    <string name="mobile_data_option_not_today">Να Μην χρησιμοποιηθεί σήμερα</string>
+    <string name="mobile_data_option_not_today">Να μην χρησιμοποιηθεί σήμερα</string>
    <string name="mobile_data">Ίντερνετ μέσω δικτύου κινητής</string>
    <!-- NOTE to translators: please synchronize your translation with the English one. -->
    <string name="mobile_data_description">Απαιτείται πρόσβαση στο ίντερνετ μέσω δικτύου κινητής για την εμφάνιση αναλυτικών πληροφοριών για τις τοποθεσίες, όπως φωτογραφίες, τιμές και κριτικές.</string>
    <string name="mobile_data_option_never">Να μην χρησιμοποιείται ποτέ</string>
    <string name="mobile_data_option_ask">Να γίνεται πάντα ερώτηση</string>
-    <string name="traffic_update_maps_text">Για να εμφανιστούν πληροφορίες για την κίνηση, πρέπει να ενημερωθούν οι χάρτες.</string>
+    <string name="traffic_update_maps_text">Για να εμφανιστούν πληροφορίες για την κίνηση, πρέπει να ενημερωθούν οι χάρτες</string>
    <string name="big_font">Αύξηση μεγέθους γραμματοσειράς στο χάρτη</string>
    <string name="traffic_update_app">Κάντε ενημέρωση του CoMaps</string>
    <!-- "traffic" as in "road congestion" -->
@@ -546,7 +546,7 @@
    <string name="feedback_general">Αποστολή γνώμης</string>
    <string name="prefs_languages_information">Χρησιμοποιούμε το σύστημα TTS για τις φωνητικές οδηγίες. Αρκετές συσκευές Android χρησιμοποιούν το Google TTS, μπορείτε να το κατεβάσετε ή να το ενημερώσετε από το Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
    <string name="prefs_languages_information_off">Για μερικές γλώσσες θα χρειαστεί να εγκαταστήσετε συνθεσάιζερ ομιλίας ή κάποιο συμπληρωματικό πακέτο γλώσσας από το app store (Google Play, Galaxy Store, App Gallery, FDroid). \nΑνοίξτε τις Ρυθμίσεις της συσκευής σας → Γλώσσα και εισαγωγή → Ομιλία → Μετατροπή κειμένου σε ομιλία. \nΕδώ μπορείτε να διαχειριστείτε τις ρυθμίσεις της σύνθεσης ομιλίας (για παράδειγμα, μπορείτε να κατεβάσετε πακέτο γλώσσας για χρήση εκτός σύνδεσης) και να επιλέξετε άλλη μηχανή μετατροπής κειμένου σε ομιλία.</string>
-    <string name="prefs_languages_information_off_link">Για περισσότερες πληροφορίες δείτε αυτό τον οδηγό.</string>
+    <string name="prefs_languages_information_off_link">Για περισσότερες πληροφορίες δείτε αυτό τον οδηγό</string>
    <string name="transliteration_title">Μεταγραφή στο λατινικό αλφάβητο</string>
    <string name="learn_more">Μάθετε περισσότερα</string>
    <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
@@ -561,17 +561,17 @@
    <string name="dialog_error_storage_message">Ο εξωτερικός απθηκευτικός χώρος δεν είναι διαθέσιμος, πιθανότατα έχει αφαιρεθεί η κάρτα SD, είναι κατεστραμμένη ή το σύστημα αρχείων είναι μόνο για ανάγνωση. Ελέγξτε το και επικοινωνήστε μαζί μας στη διεύθυνση support@comaps.app</string>
    <string name="setting_emulate_bad_storage">Εξομείωση κακού αποθηκευτικού χώρου</string>
    <string name="error_enter_correct_name">Εισάγετε ένα σωστό όνομα</string>
-    <string name="bookmark_lists">Λίστες</string>
+    <string name="bookmark_lists">Λίστες αγαπημένων</string>
    <!-- Do not display all bookmark lists on the map -->
    <string name="bookmark_lists_hide_all">Απόκρυψη όλων</string>
    <string name="bookmark_lists_show_all">Εμφάνιση όλων</string>
    <plurals name="bookmarks_places">
-        <item quantity="one">%d αγαπημένο</item>
-        <item quantity="other">%d αγαπημένα</item>
+        <item quantity="one">%d αγαπημένο μέρος</item>
+        <item quantity="other">%d αγαπημένα μέρη</item>
    </plurals>
    <string name="bookmarks_create_new_group">Δημιουργία νέας λίστας</string>
    <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Εισαγωγή σελιδοδεικτών και διαδρομών</string>
+    <string name="bookmarks_import">Εισαγωγή Αγαπημένων</string>
    <string name="bookmarks_error_message_share_general">Αδυναμία κοινοποίησης λόγω σφάλματος εφαρμογής</string>
    <string name="bookmarks_error_title_share_empty">Σφάλμα κατά την κοινοποίηση</string>
    <string name="bookmarks_error_message_share_empty">Δεν είναι δυνατή η κοινή χρήση μιας κενής λίστας</string>
@@ -589,8 +589,8 @@
    </plurals>
    <string name="restore">Επαναφορά</string>
    <plurals name="tracks">
-        <item quantity="one">%d διαδρομή</item>
-        <item quantity="other">%d διαδρομές</item>
+        <item quantity="one">%d ίχνος</item>
+        <item quantity="other">%d ίχνη</item>
    </plurals>
    <!-- Settings privacy group in settings screen -->
    <string name="privacy">Απόρρητο</string>
@@ -600,12 +600,12 @@
    <string name="subway">Μετρό</string>
    <string name="layers_title">Στυλ χάρτη και επίπεδα</string>
    <string name="bookmarks_empty_list_title">Η λίστα είναι άδεια</string>
-    <string name="bookmarks_empty_list_message">Για να προσθέσετε σελιδοδείκτη, πατήστε ένα μέρος στο χάρτη και μετά πατήστε το αστεράκι</string>
+    <string name="bookmarks_empty_list_message">Για να αποθηκεύσετε ένα μέρος, πατήστε μια τοποθεσία στο χάρτη και μετά πατήστε το αστεράκι</string>
    <string name="category_desc_more">…περισσότερα</string>
    <string name="export_file">Εξαγωγή KMZ</string>
    <string name="export_file_gpx">Εξαγωγή GPX</string>
    <string name="delete_list">Διαγραφή λίστας</string>
-    <string name="speedcams_alert_title">Κάμερες Ταχύτητας</string>
+    <string name="speedcams_alert_title">Κάμερες ταχύτητας</string>
    <string name="place_description_title">Περιγραφή μέρους</string>
    <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
    <string name="notification_channel_downloader">Κατέβασμα χαρτών</string>
@@ -616,9 +616,9 @@
    <!-- Speed camera settings menu option - Never warn (about speedcams) -->
    <string name="pref_tts_speedcams_never">Να μην ειδοποιούμαι ποτέ</string>
    <string name="power_managment_title">Λειτουργία εξοικονόμησης ενέργειας</string>
-    <string name="power_managment_description">Θα γίνεται προσπάθεια εξοικονόμησης ενέργειας εις βάρος κάποιον λειτουργιών.</string>
+    <string name="power_managment_description">Θα γίνεται προσπάθεια εξοικονόμησης ενέργειας εις βάρος κάποιων λειτουργιών</string>
    <string name="power_managment_setting_never">Ποτέ</string>
-    <string name="power_managment_setting_auto">Αυτόματα</string>
+    <string name="power_managment_setting_auto">Όταν η μπαταρία είναι χαμηλή</string>
    <string name="power_managment_setting_manual_max">Πάντα</string>
    <string name="enable_logging_warning_message">Αυτή η λειτουργία είναι ενεργοποιημένη για την καταγραφή ενεργειών για διαγνωστικούς σκοπούς. Αυτό βοηθά την ομάδα να εντοπίζει προβλήματα με την εφαρμογή. Να ενεργοποιείτε τη λειτουργία μόνο κατόπιν αιτήματος της υποστήριξης του CoMaps.</string>
    <string name="driving_options_title">Ρυθμίσεις δρομολόγησης</string>
@@ -641,9 +641,9 @@
    <!-- A generic "No" button in dialogs -->
    <string name="no">Όχι</string>
    <!-- E.g. "WiFi:Yes" -->
-    <string name="yes_available">Ενεργ.</string>
+    <string name="yes_available">Ναι</string>
    <!-- E.g. "WiFi:No" -->
-    <string name="no_available">Απενεργ.</string>
+    <string name="no_available">Όχι</string>
    <!-- To indicate the capacity of car parkings, bicycle parkings, electric vehicle charging stations... -->
    <string name="capacity">Χωρητικότητα: %s</string>
    <!-- To indicate the network of ATMs, bicycle rentals, electric vehicle charging stations... -->
@@ -653,7 +653,7 @@
    <!-- max. 10 symbols, both iOS and Android -->
    <string name="sort">Ταξινόμηση…</string>
    <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Ταξινόμηση σελιδ/κτών</string>
+    <string name="sort_bookmarks">Ταξινόμηση αγαπημένων</string>
    <!-- Android -->
    <string name="by_default">Προεπιλογή</string>
    <!-- Android -->
@@ -769,7 +769,7 @@
    <string name="browser_not_available">Δεν είναι διαθέσιμος ο περιηγητής</string>
    <string name="volume">Ένταση ήχου</string>
    <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Εξαγωγή όλων των σελιδοδεικτών και των διαδρομών</string>
+    <string name="bookmarks_export">Εξαγωγή όλων των Μερών και Ιχνών</string>
    <!-- button in (app) TTS settings, to open the system TTS settings. -->
    <string name="pref_tts_open_system_settings">Ρυθμίσεις συστήματος σύνθεσης ομιλίας</string>
    <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -793,21 +793,21 @@
    <!-- Disclaimer summary shown when Power Saving Mode is enabled -->
    <string name="power_save_dialog_summary">Για την πιο ακριβή πλοήγηση, συνιστούμε να απενεργοποιήσετε τη λειτουργία εξοικονόμησης ενέργειας στις ρυθμίσεις μπαταρίας του τηλεφώνου.</string>
    <!-- Prompt to start recording a track. -->
-    <string name="start_track_recording">Εγγραφή διαδρομής</string>
+    <string name="start_track_recording">Εγγραφή ίχνους</string>
    <!-- Prompt for stopping a track recording. -->
-    <string name="stop_track_recording">Σταματήστε την εγγραφή διαδρομής</string>
+    <string name="stop_track_recording">Σταματήστε την εγγραφή ίχνους</string>
    <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
    <string name="stop_without_saving">Σταματήστε χωρίς αποθήκευση</string>
    <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
    <string name="continue_recording">Συνέχεια εγγραφής</string>
    <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Αποθήκευση στα Αγαπημένα και Διαδρομές;</string>
+    <string name="track_recording_alert_title">Αποθήκευση στα Αγαπημένα;</string>
    <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
-    <string name="track_recording_toast_nothing_to_save">Η διαδρομή είναι άδεια - δεν υπάρχει τίποτα να αποθηκεύσετε</string>
+    <string name="track_recording_toast_nothing_to_save">Το ίχνος είναι άδειο - δεν υπάρχει τίποτα να αποθηκεύσετε</string>
    <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
    <string name="error_no_file_manager_app">Δεν είναι δυνατή η εμφάνιση του διαλόγου επιλογής φακέλου επειδή δεν είναι εγκατεστημένη η κατάλληλη εφαρμογή στη συσκευή σας. Εγκαταστήστε μια εφαρμογή διαχείρισης αρχείων και δοκιμάστε ξανά.</string>
    <string name="choose_color">Επιλέξτε χρώμα</string>
-    <string name="edit_track">Επεξεργασία διαδρομής</string>
+    <string name="edit_track">Επεξεργασία ίχνους</string>
    <string name="uri_open_location_failed">Δεν υπάρχει εγκατεστημένη εφαρμογή που να μπορεί να ανοίξει την τοποθεσία</string>
    <!-- preference string for using auto theme only in navigation mode -->
    <string name="nav_auto">Αυτόματη πλοήγηση</string>
@@ -816,10 +816,10 @@
    <string name="translated_om_site_url">https://comaps.app/</string>
    <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
    <string name="level_value_generic">Όροφος: %s</string>
-    <string name="miles_per_hour">mph</string>
-    <string name="minute">λπτ</string>
-    <string name="day">Μέρα</string>
-    <string name="hour">Ωρα</string>
+    <string name="miles_per_hour">μλ/ώ</string>
+    <string name="minute">λεπ</string>
+    <string name="day">μέρ</string>
+    <string name="hour">ώ</string>
    <string name="telegram_url">https://t.me/CoMapsApp/</string>
    <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
    <string name="panoramax">εικόνα Panoramax</string>
@@ -836,4 +836,38 @@
    <string name="hours_confirmed_time_ago">Επιβεβαιώθηκε %s</string>
    <string name="existence_confirmed_time_ago">Ύπαρξη επιβεβαιώθηκε %s</string>
    <string name="editor_building_levels">Όροφοι (με το ισόγειο, χωρίς την ταράτσα)</string>
+    <string name="about_headline">Ανοιχτό έργο με την υποστήριξη της κοινότητας</string>
+    <string name="offline_explanation_text">Χρειάζεται να ληφθεί ένας χάρτης για να δείτε και να πλοηγηθείτε την περιοχή.\nΚατεβάστε χάρτες για τις περιοχές που θέλετε να ταξιδέψετε.</string>
+    <string name="pref_left_button_disable">Απενεργοποίηση</string>
+    <string name="avoid_steps">Αποφυγή σκαλοπατιών</string>
+    <string name="avoid_paved">Αποφυγή στρωμένων δρόμων</string>
+    <string name="unknown_power_output">άγνωστο</string>
+    <string name="unknown_count">άγνωστο</string>
+    <string name="advanced">Προχωρημένο</string>
+    <string name="charge_socket_count">Πλήθος</string>
+    <string name="ruler">Χάρακας</string>
+    <string name="clear">Εκκαθάριση</string>
+    <string name="route_type">Είδος διαδρομής</string>
+    <string name="vehicle">Όχημα</string>
+    <string name="pedestrian">Πεζός</string>
+    <string name="bicycle">Ποδήλατο</string>
+    <string name="bookmark_color">Χρώμα για Αγαπημένο</string>
+    <string name="about_help">Σχετικά &amp; Βοήθεια</string>
+    <string name="open_now">Ανοιχτό τώρα</string>
+    <string name="closed_now">Κλειστό τώρα</string>
+    <string name="at">στις %s</string>
+    <string name="share_track">Κοινοποίηση Ίχνους</string>
+    <string name="delete_track_dialog_title">Διαγραφή %s;</string>
+    <string name="place_page_app_too_old_description">Τα τρέχοντα δεδομένα χάρτη σας είναι πολύ παλιά, παρακαλούμε ενημερώστε την εφαρμογή CoMaps.</string>
+    <string name="editor_level">Όροφος (το 0 είναι το ισόγειο)</string>
+    <string name="error_enter_correct_level">Εισάγετε έναν έγκυρο αριθμό ορόφου</string>
+    <string name="editor_business_vacant_button">Η επιχείρηση είναι κενή</string>
+    <string name="editor_mark_business_vacant_title">Σήμανση επιχείρησης ως κενή</string>
+    <string name="place_page_update_too_old_map">Ενημέρωση χάρτη περιοχής</string>
+    <string name="place_page_too_old_to_edit">Η επεξεργασία του OpenStreetMap είναι απενεργοποιημένη επειδή τα δεδομένα χάρτη είναι πολύ παλιά.</string>
+    <string name="osm_note_hint">Ή, εναλλακτικά, αφήστε μια σημείωση στην κοινότητα του OpenStreetMap ώστε κάποιος άλλος να προσθέσει ή να διορθώσει την τοποθεσία εδώ.</string>
+    <string name="osm_note_toast">Η σημείωση θα αποσταλεί στο OpenStreetMap</string>
+    <string name="error_enter_correct_fediverse_page">Εισάγετε ένα έγκυρο όνομα χρήστη ή διεύθυνση Mastodon</string>
+    <string name="error_enter_correct_bluesky_page">Εισάγετε ένα έγκυρο όνομα χρήστη ή διεύθυνση Bluesky</string>
+    <string name="power_management">Διαχείριση ενέργειας</string>
 </resources>
--- a/android/app/src/main/res/values-en-rCA/strings.xml
+++ b/android/app/src/main/res/values-en-rCA/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="search">Search</string>
+    <string name="bookmarks_and_tracks">Favourites</string>
+</resources>
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -68,9 +68,9 @@
    <!-- "Add new bookmark list" dialog title -->
    <string name="add_new_set">Agregar una lista nueva</string>
    <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Nombre de la lista de marcadores</string>
+    <string name="bookmark_set_name">Nombre de la lista</string>
    <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Marcadores</string>
+    <string name="bookmarks">Lugares</string>
    <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
    <string name="bookmarks_and_tracks">Favoritos</string>
    <!-- Add bookmark dialog - bookmark name -->
@@ -103,11 +103,11 @@
    <!-- Search category for cafes, bars, restaurants; any changes should be duplicated in categories.txt @category_eat! -->
    <string name="category_eat">Dónde comer</string>
    <!-- Search category for grocery stores; any changes should be duplicated in categories.txt @category_food! -->
-    <string name="category_food">Tienda de comestibles</string>
+    <string name="category_food">Provisiones</string>
    <!-- Search category for public transport; any changes should be duplicated in categories.txt @category_transport! -->
    <string name="category_transport">Transporte</string>
    <!-- Search category for fuel stations; any changes should be duplicated in categories.txt @category_fuel! -->
-    <string name="category_fuel">Estación de Servicio</string>
+    <string name="category_fuel">Estación de servicio</string>
    <!-- Search category for parking lots; any changes should be duplicated in categories.txt @category_parking! -->
    <string name="category_parking">Aparcamiento</string>
    <!-- Search category for malls/clothes/shoes/gifts/jewellery/sport shops; any changes should be duplicated in categories.txt @category_shopping! -->
@@ -524,7 +524,7 @@
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">¿Quieres enviarlo a todos los usuarios?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Asegúrate de que no has introducido ningún dato privado o personal</string>
+    <string name="editor_share_to_all_dialog_message_1">Asegúrate de que no has introducido ningún dato privado o personal.</string>
    <string name="editor_share_to_all_dialog_message_2">Los editores de OpenStreetMap comprobarán los cambios y se pondrán en contacto contigo si tienen alguna pregunta.</string>
    <string name="navigation_stop_button">Detener</string>
    <!-- Shown as toast when starting the recent track recording -->
@@ -578,7 +578,7 @@
    </plurals>
    <string name="bookmarks_create_new_group">Crear nueva lista</string>
    <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Importar marcadores y trazas</string>
+    <string name="bookmarks_import">Importar favoritos</string>
    <string name="bookmarks_error_message_share_general">No se puede compartir debido a un error de la aplicación</string>
    <string name="bookmarks_error_title_share_empty">Error al compartir</string>
    <string name="bookmarks_error_message_share_empty">No se puede compartir una lista vacía</string>
@@ -662,7 +662,7 @@
    <!-- max. 10 symbols, both iOS and Android -->
    <string name="sort">Ordenar…</string>
    <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Ordenar marcadores</string>
+    <string name="sort_bookmarks">Exportar favoritos</string>
    <!-- Android -->
    <string name="by_default">Por defecto</string>
    <!-- Android -->
@@ -814,7 +814,7 @@
    <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
    <string name="continue_recording">Continuar grabación</string>
    <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">¿Guardar en Marcadores y trayectos?</string>
+    <string name="track_recording_alert_title">¿Guardar en Favoritos?</string>
    <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
    <string name="track_recording_toast_nothing_to_save">El trayecto está vacío; no hay nada que guardar</string>
    <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -845,14 +845,14 @@
    <string name="about_help">Acerca de y Ayuda</string>
    <string name="clear">Limpiar</string>
    <string name="ruler">Regla</string>
-    <string name="bookmark_color">Color del marcador</string>
-    <string name="pref_backup_title">Copia de seguridad de marcadores y trayectos</string>
+    <string name="bookmark_color">Color del favorito</string>
+    <string name="pref_backup_title">Respaldar favoritos</string>
    <string name="pref_backup_summary">Copia de seguridad automática a una carpeta de tu dispositivo</string>
-    <string name="pref_backup_now_title">Realizar copia de seguridad ahora</string>
+    <string name="pref_backup_now_title">Crear respaldo ahora</string>
    <string name="pref_backup_now_summary">Crear copia de seguridad inmediatamente</string>
    <string name="pref_backup_now_summary_progress">Copia de seguridad en progreso…</string>
    <string name="pref_backup_now_summary_ok">Copia de seguridad completada con éxito</string>
-    <string name="pref_backup_now_summary_empty_lists">No hay marcadores ni trayectos para hacer una copia de seguridad</string>
+    <string name="pref_backup_now_summary_empty_lists">No hay marcadores ni trayectos para hacer un respaldo</string>
    <string name="pref_backup_now_summary_failed">Copia de seguridad fallida</string>
    <string name="pref_backup_now_summary_folder_unavailable">La carpeta de copia de seguridad no está disponible</string>
    <string name="pref_backup_location_summary_initial">Selecciona por favor primero una carpeta y concede permiso</string>
@@ -927,4 +927,5 @@
    <string name="download_resources_custom_url_message">Sobreescribe el servidor de mapas por defecto. Déjalo en blanco para usar el servidor de CoMaps por defecto.</string>
    <string name="download_resources_custom_url_summary_none">No establecido</string>
    <string name="download_resources_custom_url_error_scheme">Por favor introduce un URL empezando con http:// o https://</string>
+    <string name="pref_maplanguage_local">Idioma local</string>
 </resources>
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -68,11 +68,11 @@
    <!-- "Add new bookmark list" dialog title -->
    <string name="add_new_set">Créer une nouvelle liste</string>
    <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Nom du groupe de signets</string>
+    <string name="bookmark_set_name">Nom de la liste</string>
    <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Signets</string>
+    <string name="bookmarks">Lieux</string>
    <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Signets et traces</string>
+    <string name="bookmarks_and_tracks">Favoris</string>
    <!-- Add bookmark dialog - bookmark name -->
    <string name="name">Nom</string>
    <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -148,14 +148,14 @@
    <!-- Notes field in Bookmarks view -->
    <string name="description">Notes</string>
    <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Signets CoMaps partagés avec vous</string>
-    <string name="share_bookmarks_email_body">Bonjour !\n \nVous trouverez ci-joint mes signets de l’appli CoMaps, à ouvrir dans l’application CoMaps. Si vous ne l’avez pas, téléchargez-la en suivant ce lien : https://www.comaps.app/download/ \n \nBon voyage avec CoMaps !</string>
+    <string name="share_bookmarks_email_subject">Mes favoris CoMaps.</string>
+    <string name="share_bookmarks_email_body">Bonjour,\n \nVous trouverez ci-joint mes favoris, veuillez les ouvrir dans l’application CoMaps. Si vous ne l’avez pas encore installée, téléchargez l\'application depuis : https://www.comaps.app/download/ \n \nBon voyage avec CoMaps !</string>
    <!-- message title of loading file -->
-    <string name="load_kmz_title">Chargement des signets</string>
+    <string name="load_kmz_title">Chargement des Favoris</string>
    <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Les signets ont été chargés avec succès ! Vous pouvez les trouver sur la carte ou sur l’écran du Gestionnaire de signets.</string>
+    <string name="load_kmz_successful">Les favoris ont été chargés avec succès ! Vous pouvez les trouver sur la carte ou sur l’écran du Gestionnaire des Favoris.</string>
    <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Échec lors du chargement des signets. Le fichier pourrait être corrompu ou défectueux.</string>
+    <string name="load_kmz_failed">Erreur lors du chargement des Favoris. Le fichier pourrait être corrompu ou défectueux.</string>
    <!-- Failed to recognize the format of a bookmarks or tracks file. -->
    <string name="unknown_file_type">Le type de fichier n’est pas reconnu par l’appli :\n%1$s</string>
    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -503,7 +503,7 @@
    <string name="minute">min</string>
    <string name="day">j</string>
    <string name="placepage_more_button">Plus</string>
-    <string name="placepage_edit_bookmark_button">Modifier le signet</string>
+    <string name="placepage_edit_bookmark_button">Modifier l\'emplacement enregistré</string>
    <string name="placepage_personal_notes_hint">Notes personnelles (texte ou html)</string>
    <string name="editor_reset_edits_message">Abandonner toutes les modifications locales ?</string>
    <string name="editor_reset_edits_button">Annuler les modifications</string>
@@ -567,18 +567,18 @@
    <string name="dialog_error_storage_message">Le stockage externe n’est pas disponible. La carte SD a probablement été enlevée, endommagée ou le système est en lecture seule. Veuillez vérifier votre carte SD ou nous contacter via support@comaps.app</string>
    <string name="setting_emulate_bad_storage">Émuler le mauvais stockage</string>
    <string name="error_enter_correct_name">Veuillez saisir un nom correct</string>
-    <string name="bookmark_lists">Listes</string>
+    <string name="bookmark_lists">Listes de favoris</string>
    <!-- Do not display all bookmark lists on the map -->
    <string name="bookmark_lists_hide_all">Tout masquer</string>
    <string name="bookmark_lists_show_all">Tout afficher</string>
    <plurals name="bookmarks_places">
-        <item quantity="one">%d signet</item>
-        <item quantity="many">%d signets</item>
-        <item quantity="other">%d signets</item>
+        <item quantity="one">%d emplacement enregistré</item>
+        <item quantity="many">%d emplacements enregistrés</item>
+        <item quantity="other">%d emplacements enregistrés</item>
    </plurals>
    <string name="bookmarks_create_new_group">Créer une nouvelle liste</string>
    <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Importer des signets et des parcours</string>
+    <string name="bookmarks_import">Importer des favoris</string>
    <string name="bookmarks_error_message_share_general">Impossible de partager en raison d’une erreur d’application</string>
    <string name="bookmarks_error_title_share_empty">Erreur de partage</string>
    <string name="bookmarks_error_message_share_empty">Impossible de partager une liste vide</string>
@@ -609,7 +609,7 @@
    <string name="subway">Métro</string>
    <string name="layers_title">Styles et couches de cartes</string>
    <string name="bookmarks_empty_list_title">Cette liste est vide</string>
-    <string name="bookmarks_empty_list_message">Pour ajouter un signet, appuyez sur un lieu sur la carte, puis appuyez sur l’icône étoile</string>
+    <string name="bookmarks_empty_list_message">Pour enregistrer un lieu, appuyez sur un lieu sur la carte, puis sur l\'icône en forme d\'étoile</string>
    <string name="category_desc_more">…plus</string>
    <string name="export_file">Exporter en KMZ</string>
    <string name="export_file_gpx">Exporter en GPX</string>
@@ -662,7 +662,7 @@
    <!-- max. 10 symbols, both iOS and Android -->
    <string name="sort">Trier…</string>
    <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Trier les signets</string>
+    <string name="sort_bookmarks">Trier les favoris</string>
    <!-- Android -->
    <string name="by_default">Par défaut</string>
    <!-- Android -->
@@ -780,7 +780,7 @@
    <string name="browser_not_available">Le navigateur Web n’est pas disponible</string>
    <string name="volume">Volume</string>
    <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Exporter tous les signets et toutes les traces</string>
+    <string name="bookmarks_export">Exporter tous les lieux et toutes les traces</string>
    <!-- button in (app) TTS settings, to open the system TTS settings. -->
    <string name="pref_tts_open_system_settings">Paramètres du système de synthèse vocale</string>
    <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -812,7 +812,7 @@
    <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
    <string name="continue_recording">Continuer l’enregistrement</string>
    <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Enregistrer dans les signets et traces ?</string>
+    <string name="track_recording_alert_title">Enregistrer dans les favoris ?</string>
    <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
    <string name="track_recording_toast_nothing_to_save">L’itinéraire est vide - il n’y a rien à enregistrer</string>
    <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -843,7 +843,7 @@
    <string name="pedestrian">À pied</string>
    <string name="bicycle">À vélo</string>
    <string name="ruler">Règle</string>
-    <string name="bookmark_color">Couleur du marque-page</string>
+    <string name="bookmark_color">Couleur des Favoris</string>
    <string name="panoramax">Image Panoramax</string>
    <string name="pref_backup_now_title">Enregistrer maintenant</string>
    <string name="backup_interval_every_day">Quotidien</string>
@@ -854,13 +854,13 @@
    <string name="backup_interval_every_week">Hebdomadaire</string>
    <string name="pref_backup_location_title">Emplacement des enregistrements</string>
    <string name="pref_backup_location_summary_initial">Veuillez d’abord sélectionner un dossier puis accorder l’autorisation</string>
-    <string name="pref_backup_now_summary_empty_lists">Ni signet ni trace à enregistrer</string>
+    <string name="pref_backup_now_summary_empty_lists">Aucun lieu ni piste à sauvegarder</string>
    <string name="pref_backup_interval_title">Enregistrement automatique</string>
    <string name="pref_backup_status_summary_success">Dernier enregistrement réussi</string>
    <string name="pref_backup_now_summary_ok">L’enregistrement s’est déroulé avec succès</string>
    <string name="pref_backup_history_title">Nombre d’enregistrements à conserver</string>
    <string name="pref_backup_now_summary_folder_unavailable">L’emplacement pour enregistrer n’est pas disponible</string>
-    <string name="pref_backup_title">Enregistrement des signets et des traces</string>
+    <string name="pref_backup_title">Sauvegarder les favoris</string>
    <string name="backup_interval_manual_only">Désactivé (manuel uniquement)</string>
    <string name="pref_backup_summary">Enregistrement automatique dans un dossier de votre appareil</string>
    <string name="about_help">À propos &amp; aide</string>
@@ -926,4 +926,5 @@
    <string name="download_resources_custom_url_title">Serveur de cartes personnalisé</string>
    <string name="download_resources_custom_url_error_scheme">Veuillez saisir une URL complète commençant par http:// ou https://</string>
    <string name="download_resources_custom_url_message">Serveur pour télécharger les cartes. Laissez vide pour utiliser le serveur par défaut CoMaps.</string>
+    <string name="pref_maplanguage_local">Langue locale</string>
 </resources>
--- a/android/app/src/main/res/values-ga/strings.xml
+++ b/android/app/src/main/res/values-ga/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/android/app/src/main/res/values-hr/strings.xml
+++ b/android/app/src/main/res/values-hr/strings.xml
@@ -15,7 +15,7 @@
    <string name="zoom_to_country">Prikaži na karti</string>
    <string name="country_status_download_failed">Preuzimanje neuspješno</string>
    <string name="try_again">Pokušaj ponovo</string>
-    <string name="about_proposition_2">• Fokusiran na privatnost i bez reklama</string>
+    <string name="about_proposition_2">• Usmjereno na privatnost i bez oglasa</string>
    <string name="close">Zatvori</string>
    <string name="download">Preuzmi</string>
    <string name="download_resources_continue">Prikaži kartu</string>
@@ -65,7 +65,7 @@
    <string name="downloader_retry">Pokušaj ponovno</string>
    <string name="red">Crvena</string>
    <string name="name">Naziv</string>
-    <string name="category_post">Pošta</string>
+    <string name="category_post">Poštanski ured</string>
    <string name="email">E-mail</string>
    <string name="done">Gotovo</string>
    <string name="rate_the_app">Ocijeni aplikaciju</string>
@@ -73,7 +73,7 @@
    <string name="search_history_title">Povijest pretraživanja</string>
    <string name="not_now">Ne sada</string>
    <string name="pref_map_style_title">Noćni način</string>
-    <string name="create">Napravi</string>
+    <string name="create">Kreiraj</string>
    <string name="editor_time_close">Zatvoreno</string>
    <string name="p2p_start">Početak</string>
    <string name="editor_time_to">Do</string>
@@ -115,9 +115,9 @@
    <string name="sort">Sortiraj…</string>
    <string name="money">Novac</string>
    <string name="app_site_url">https://comaps.app/hr/</string>
-    <string name="location_is_disabled_long_text">Trenutno su vam onemogućene sve usluge lokacije za ovaj uređaj ili aplikaciju. Molim omogućite ih u Postavkama.</string>
-    <string name="precise_location_is_disabled_long_text">Za točnu navigaciju omogućite Preciznu lokaciju u postavkama</string>
-    <string name="about_menu_title">O CoMaps aplikaciji</string>
+    <string name="location_is_disabled_long_text">Trenutno su vam sve lokacijske usluge onemogućene za ovaj uređaj ili aplikaciju. Omogućite ih u Postavkama.</string>
+    <string name="precise_location_is_disabled_long_text">Kako biste osigurali točnu navigaciju, uključite Preciznu lokaciju u postavkama</string>
+    <string name="about_menu_title">O CoMapsu</string>
    <string name="about_headline">Otvoreni projekt kojeg pokreće zajednica</string>
    <string name="about_proposition_1">• Jednostavan za korištenje i dotjeran</string>
    <string name="about_proposition_3">• Izvanmrežno, brz i kompaktan</string>
@@ -160,7 +160,7 @@
    <string name="category_eat">Gdje jesti</string>
    <string name="category_food">Namirnice</string>
    <string name="category_transport">Prijevoz</string>
-    <string name="category_fuel">Benzinske stanice</string>
+    <string name="category_fuel">Benzin</string>
    <string name="category_shopping">Kupovina</string>
    <string name="category_secondhand">Rabljena roba</string>
    <string name="category_tourism">Znamenitosti</string>
@@ -199,21 +199,21 @@
        <item quantity="few">%d rute</item>
        <item quantity="other">%d ruta</item>
    </plurals>
-    <string name="bookmarks_export">Izvoz svih Oznaka i Ruta</string>
+    <string name="bookmarks_export">Izvoz svih Mjesta i Ruta</string>
    <string name="start_track_recording">Snimi Rutu</string>
    <string name="stop_track_recording">Zaustavi snimanje Rute</string>
-    <string name="track_recording_alert_title">Spremi u Oznake i Rute?</string>
+    <string name="track_recording_alert_title">Spremi u favorite?</string>
    <string name="track_recording_toast_nothing_to_save">Ruta je prazna - nema ništa za spremiti</string>
    <string name="edit_track">Izmijeni Rutu</string>
-    <string name="pref_backup_title">Sigurnosna kopija Oznaka i Ruta</string>
-    <string name="pref_backup_now_summary_empty_lists">Nema Oznaka i Ruta za izradu sigurnosne kopije</string>
+    <string name="pref_backup_title">Sigurnosna kopija favorita</string>
+    <string name="pref_backup_now_summary_empty_lists">Nema Mjesta i Ruta za izradu sigurnosne kopije</string>
    <string name="share_track">Podijeli Rutu</string>
    <string name="placepage_edit_bookmark_button">Uredi spremljeno mjesto</string>
    <string name="bookmark_lists_hide_all">Sakrij sve</string>
    <plurals name="bookmarks_places">
-        <item quantity="one">%d Oznaka</item>
-        <item quantity="few">%d Oznake</item>
-        <item quantity="other">%d Oznaka</item>
+        <item quantity="one">%d spremljeno mjesto</item>
+        <item quantity="few">%d spremljena mjesta</item>
+        <item quantity="other">%d spremljenih mjesta</item>
    </plurals>
    <string name="bookmarks_create_new_group">Kreiraj novu Listu</string>
    <string name="bookmarks_error_message_share_general">Nije moguće podijeliti zbog greške u aplikaciji</string>
@@ -225,8 +225,8 @@
    <string name="bookmarks_error_message_list_name_already_taken">Molimo odaberite drugi naziv</string>
    <string name="bookmarks_empty_list_title">Ova Lista je prazna</string>
    <string name="bookmarks_empty_list_message">Za spremanje mjesta dodirnite mjesto na karti, a zatim dodirnite ikonu zvjezdice</string>
-    <string name="sort_bookmarks">Sortiraj Oznake</string>
-    <string name="bookmark_color">Boja Oznake</string>
+    <string name="sort_bookmarks">Sortiraj favorite</string>
+    <string name="bookmark_color">Boja Favorita</string>
    <string name="share_my_location">Podijeli moju lokaciju</string>
    <string name="pref_zoom_title">Gumbi za zumiranje</string>
    <string name="pref_map_3d_title">Pogled iz perspektive</string>
@@ -361,7 +361,7 @@
    <string name="editor_business_vacant_button">Objekt više ne posluje</string>
    <string name="editor_mark_business_vacant_title">Označi da nema aktivnog poslovanja</string>
    <string name="editor_mark_business_vacant_description">Koristite ovo ako se tvrtka iselila, a prostor je prazan i spreman za novog najmoprimca.</string>
-    <string name="editor_submit">Pošalji</string>
+    <string name="editor_submit">Predaj</string>
    <string name="error_enter_correct_phone">Unesite važeći telefonski broj</string>
    <string name="error_enter_correct_web">Unesite valjanu web-adresu</string>
    <string name="error_enter_correct_email">Unesite važeću e-adresu</string>
@@ -401,7 +401,7 @@
    <string name="enable_logging">Omogući zapisivanje</string>
    <string name="feedback_general">Opće povratne informacije</string>
    <string name="prefs_languages_information">Za glasovne upute koristimo sistemski TTS. Mnogi Android uređaji koriste Google TTS, možete ga preuzeti ili ažurirati s Google Playa (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
-    <string name="prefs_languages_information_off">Za neke jezike morat ćete instalirati sintetizator govora ili dodatni jezični paket iz trgovine aplikacija (Google Play, Galaxy Store, App Gallery, FDroid). \nOtvorite postavke uređaja → Jezik i unos → Govor → Izlaz teksta u govor. Ovdje možete upravljati postavkama za sintezu govora (na primjer, preuzeti jezični paket za izvanmrežnu upotrebu) i odabrati drugi program za pretvaranje teksta u govor.</string>
+    <string name="prefs_languages_information_off">Za neke jezike morat ćete instalirati sintetizator govora ili dodatni jezični paket iz trgovine aplikacija (Google Play, Galaxy Store, App Gallery, FDroid). . \nOtvorite postavke uređaja → Jezik i unos → Govor → Izlaz teksta u govor. \nOvdje možete upravljati postavkama za sintezu govora (na primjer, preuzeti jezični paket za izvanmrežnu upotrebu) i odabrati drugi program za pretvaranje teksta u govor.</string>
    <string name="prefs_languages_information_off_link">Za više informacija molimo provjerite ovaj vodič</string>
    <string name="prefs_speed_cameras_information">Upozorenja na kamere za nadzor brzine onemogućena su u državama u kojima su takva upozorenja zabranjena lokalnim zakonima.</string>
    <string name="transliteration_title">Prikaži u latinici</string>
@@ -552,4 +552,111 @@
    <string name="aa_grant_permissions">Dodijeli dopuštenja</string>
    <string name="button_layer_outdoor">Na otvorenom</string>
    <string name="browser_not_available">Web preglednik nije dostupan</string>
+    <string name="hours_confirmed_time_ago">Potvrđeno %s</string>
+    <string name="existence_confirmed_time_ago">Postojanje potvrđeno %s</string>
+    <string name="edit_opening_hours">Uredi radno vrijeme</string>
+    <string name="no_osm_account">Nemate OpenStreetMap račun?</string>
+    <string name="register_at_openstreetmap">Registrirajte se na OpenStreetMap-u</string>
+    <string name="not_signed_in">Niste prijavljeni</string>
+    <string name="login_osm">Prijava na OpenStreetMap</string>
+    <string name="edit_place">Uredi mjesto</string>
+    <string name="add_language">Dodaj jezik</string>
+    <string name="street">Ulica</string>
+    <string name="house_number">Broj zgrade</string>
+    <string name="building">Zgrada</string>
+    <string name="add_street">Dodaj ulicu</string>
+    <string name="empty_street_name_error">Unesite naziv ulice</string>
+    <string name="choose_language">Odaberite jezik</string>
+    <string name="choose_street">Odaberite ulicu</string>
+    <string name="cuisine">Kuhinja</string>
+    <string name="select_cuisine">Odaberite kuhinju</string>
+    <string name="editor_add_phone">Dodaj telefon</string>
+    <string name="level">Kat</string>
+    <string name="level_value_generic">Razina: %s</string>
+    <string name="volume">Volumen</string>
+    <string name="pref_tts_open_system_settings">Postavke sustava za sintezu govora</string>
+    <string name="pref_tts_no_system_tts">Postavke sinteze govora nisu pronađene, jeste li sigurni da vaš uređaj to podržava?</string>
+    <string name="drive_through">Prolaz za automobile</string>
+    <string name="clear_the_search">Obriši pretragu</string>
+    <string name="website_menu">Poveznica na Jelovnik</string>
+    <string name="view_menu">Pogledaj Jelovnik</string>
+    <string name="open_in_app">Otvori u drugoj aplikaciji</string>
+    <string name="select_option">Odaberite opciju</string>
+    <string name="outdoor_seating">Vanjski prostor za sjedenje</string>
+    <string name="power_save_dialog_summary">Za najtočniju navigaciju preporučujemo isključivanje načina uštede energije u postavkama baterije telefona.</string>
+    <string name="stop_without_saving">Zaustavi bez spremanja</string>
+    <string name="continue_recording">Nastavi snimanje</string>
+    <string name="error_no_file_manager_app">Dijalog za odabir mape nije moguće prikazati jer na vašem uređaju nije instalirana odgovarajuća aplikacija. Instalirajte aplikaciju za upravljanje datotekama i pokušajte ponovno.</string>
+    <string name="choose_color">Odaberi boju</string>
+    <string name="uri_open_location_failed">Nije instalirana aplikacija koja može otvoriti lokaciju</string>
+    <string name="nav_auto">Automatska tema u navigaciji</string>
+    <string name="pref_left_button_title">Postavke lijevog gumba</string>
+    <string name="pref_left_button_disable">Onemogući</string>
+    <string name="pref_backup_summary">Automatsko sigurnosno kopiranje u mapu na vašem uređaju</string>
+    <string name="pref_backup_now_title">Sigurnosno kopiraj sada</string>
+    <string name="pref_backup_now_summary">Odmah stvorite sigurnosnu kopiju</string>
+    <string name="pref_backup_now_summary_progress">Sigurnosno kopiranje u tijeku…</string>
+    <string name="pref_backup_now_summary_ok">Sigurnosna kopija uspješno dovršena</string>
+    <string name="pref_backup_now_summary_failed">Sigurnosna kopija nije uspjela</string>
+    <string name="pref_backup_now_summary_folder_unavailable">Mapa za sigurnosnu kopiju nije dostupna</string>
+    <string name="pref_backup_status_summary_success">Posljednja uspješna sigurnosna kopija</string>
+    <string name="pref_backup_location_title">Lokacija sigurnosne kopije</string>
+    <string name="pref_backup_location_summary_initial">Najprije odaberite mapu i dodijelite dopuštenje</string>
+    <string name="pref_backup_history_title">Broj sigurnosnih kopija koje treba čuvati</string>
+    <string name="pref_backup_interval_title">Automatsko sigurnosno kopiranje</string>
+    <string name="backup_interval_every_day">Dnevno</string>
+    <string name="backup_interval_every_week">Tjedno</string>
+    <string name="backup_interval_manual_only">Isključeno (samo ručno)</string>
+    <string name="dialog_report_error_missing_folder">Odabrana lokacija za sigurnosnu kopiju nije dostupna ili na nju nije moguće zapisivati. Odaberite drugu lokaciju.</string>
+    <string name="dialog_report_error_with_logs">Molimo vas da nam pošaljete izvješće o pogrešci:\n- \"Omogući zapisivanje\" u postavkama\n- reproducirajte problem\n- na zaslonu \"O nama i pomoć\" pritisnite gumb \"Prijavi grešku\" i pošaljite putem e-pošte ili chata\n- onemogućite zapisivanje</string>
+    <string name="clear">Očisti</string>
+    <string name="route_type">Vrsta rute</string>
+    <string name="vehicle">Vozilo</string>
+    <string name="pedestrian">Pješak</string>
+    <string name="bicycle">Bicikla</string>
+    <string name="ruler">Ravnalo</string>
+    <string name="about_help">O nama &amp; Pomoć</string>
+    <string name="open_now">Otvoreno sada</string>
+    <string name="closed_now">Zatvoreno sada</string>
+    <string name="at">u %s</string>
+    <string name="delete_track_dialog_title">Izbrisati %s?</string>
+    <string name="pref_tts_no_system_tts_short">Nije pronađen program za pretvaranje teksta u govor, provjerite postavke aplikacije</string>
+    <string name="navigation_start_tts_message">"Pokretanje navigacije, jezik glasovnih uputa: "</string>
+    <string name="navigation_start_tts_disabled_message">Glasovne upute onemogućene: TTS mehanizam nije dostupan</string>
+    <string name="unknown_power_output">nepoznato</string>
+    <string name="charge_socket_type2">Tip 2 (bez kabela)</string>
+    <string name="charge_socket_type2_cable">Tip 2 (s kabelom)</string>
+    <string name="charge_socket_type2_combo">Tip 2 kombinacija</string>
+    <string name="charge_socket_type1">Tip 1</string>
+    <string name="charge_socket_nacs">NACS</string>
+    <string name="charge_socket_chademo">CHAdeMO priključak</string>
+    <string name="charge_socket_schuko">Domaći EU</string>
+    <string name="unknown_socket_type">nepoznata utičnica</string>
+    <string name="edit_socket_info_tooltip">Izradite nove utičnice ili uredite postojeće.</string>
+    <string name="charging_station_available_sockets">Dostupne utičnice</string>
+    <string name="charge_socket_unknown_other">Drugo ili nepoznato</string>
+    <string name="charge_socket_count">Broj</string>
+    <string name="charge_socket_power">Snaga (kW)</string>
+    <string name="editor_socket">Uredi utičnicu</string>
+    <string name="unknown_count">nepoznato</string>
+    <string name="error_value_must_be_positive">Vrijednost mora biti pozitivna</string>
+    <string name="error_invalid_number">Nevažeći broj</string>
+    <string name="offline_explanation_title">Izvanmrežne karte</string>
+    <string name="offline_explanation_text">Za prikaz i navigaciju područjem potrebno je preuzeti kartu.\nPreuzmite karte za područja u koja želite putovati.</string>
+    <string name="list_description_empty">Uredite popis kako biste dodali opis</string>
+    <string name="advanced">Napredno</string>
+    <string name="download_resources_custom_url_title">Prilagođeni poslužitelj karata</string>
+    <string name="download_resources_custom_url_message">Zamijenite zadani poslužitelj za preuzimanje karata. Ostavite prazno za korištenje CoMaps zadanog poslužitelja.</string>
+    <string name="download_resources_custom_url_summary_none">Nije postavljeno</string>
+    <string name="download_resources_custom_url_error_scheme">Molimo unesite URL koji počinje s http:// ili https://</string>
+    <plurals name="minutes_short">
+        <item quantity="one">%d minuta</item>
+        <item quantity="few">%d minute</item>
+        <item quantity="other">%d minuta</item>
+    </plurals>
+    <plurals name="bookmarks_detect_message">
+        <item quantity="one">Pronađena je %d datoteka. Možete je vidjeti nakon pretvorbe.</item>
+        <item quantity="few">Pronađeno je %d datoteka. Možete ih vidjeti nakon pretvorbe.</item>
+        <item quantity="other">Pronađeno je %d datoteka. Možete ih vidjeti nakon pretvorbe.</item>
+    </plurals>
 </resources>
--- a/android/app/src/main/res/values-in/strings.xml
+++ b/android/app/src/main/res/values-in/strings.xml
@@ -144,7 +144,7 @@
    <!-- Email Subject when sharing bookmark list -->
    <string name="share_bookmarks_email_subject">Bagikan penanda CoMaps</string>
    <!-- message title of loading file -->
-    <string name="load_kmz_title">Memuat Penanda</string>
+    <string name="load_kmz_title">Memuat Tempat Favorit</string>
    <!-- Kmz file successful loading -->
    <string name="load_kmz_successful">Penanda berhasil dimuat! Anda dapat menemukannya pada peta atau pada layar Pengelola Penanda Lokasi.</string>
    <!-- Kml file loading failed -->
@@ -525,7 +525,7 @@
    <string name="feedback_general">Umpan Balik Umum</string>
    <string name="prefs_languages_information">Kami menggunakan TTS sistem untuk petunjuk suara. Banyak perangkat Android menggunakan Google TTS, Anda dapat mengunduhnya dari Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
    <string name="prefs_languages_information_off">Untuk beberapa bahasa, Anda perlu menginstal synthesizer suara atau paket bahasa tambahan dari toko aplikasi (Google Play, Galaxy Store, App Gallery, FDroid). \nBuka pengaturan perangkat Anda → Language and input (Bahasa dan input) → Speech (Suara) → Text to speech (Teks ke suara). \nDi sini, Anda dapat mengelola pengaturan untuk sintesis suara (contohnya, mengunduh paket bahasa untuk penggunaan tanpa internet) dan memilih mesin tekske suara lain.</string>
-    <string name="prefs_languages_information_off_link">Untuk informasi selengkapnya, bacalah panduan ini.</string>
+    <string name="prefs_languages_information_off_link">Untuk informasi selengkapnya, bacalah panduan ini</string>
    <string name="transliteration_title">Transliterasi ke dalam bahasa Latin</string>
    <string name="learn_more">Pelajari selengkapnya</string>
    <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -72,7 +72,7 @@
    <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
    <string name="bookmarks">Luoghi preferiti</string>
    <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Luoghi preferiti e tracce</string>
+    <string name="bookmarks_and_tracks">Preferiti</string>
    <!-- Add bookmark dialog - bookmark name -->
    <string name="name">Nome</string>
    <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -144,7 +144,7 @@
    <!-- Notes field in Bookmarks view -->
    <string name="description">Informazioni</string>
    <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Questi sono i miei luoghi preferiti su CoMaps</string>
+    <string name="share_bookmarks_email_subject">I miei luoghi preferiti su CoMaps</string>
    <string name="share_bookmarks_email_body">Ciao!\n\nIn allegato ci sono i miei luoghi preferiti. Aprili se hai installato CoMaps. Oppure, se non ce l\'hai, scarica l\'app per iOS o Android seguendo questo link: https://www.comaps.app/\n\nDivertiti a viaggiare con CoMaps!</string>
    <!-- message title of loading file -->
    <string name="load_kmz_title">Caricamento luoghi preferiti</string>
@@ -803,7 +803,7 @@
    <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
    <string name="continue_recording">Continua a registrare</string>
    <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Salvare in Luoghi preferiti e tracce?</string>
+    <string name="track_recording_alert_title">Salvare in Preferiti?</string>
    <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
    <string name="track_recording_toast_nothing_to_save">La traccia è vuota - non c\'è nulla da salvare</string>
    <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
--- a/android/app/src/main/res/values-kw/strings.xml
+++ b/android/app/src/main/res/values-kw/strings.xml
@@ -332,7 +332,7 @@
    <string name="zoom_in">Moghhe</string>
    <string name="zoom_out">Lehe</string>
    <string name="website_menu">Kevren Rol Voos</string>
-    <string name="view_menu">Vu Rol Voos</string>
+    <string name="view_menu">Gweles Rol Voos</string>
    <string name="open_in_app">Ygeri yn Aral App</string>
    <string name="select_option">Dewis dewis</string>
    <string name="outdoor_seating">Esedhow yn-mes</string>
--- a/android/app/src/main/res/values-lt/strings.xml
+++ b/android/app/src/main/res/values-lt/strings.xml
@@ -140,14 +140,14 @@
    <!-- Notes field in Bookmarks view -->
    <string name="description">Pastabos</string>
    <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Su jumis bendrinamas „CoMaps“ žymių sąrašas</string>
-    <string name="share_bookmarks_email_body">Labas! \n \nČia prisegtas mano žymių sąrašas iš „CoMaps“ programėlės. Jei jos neturi, gali ją parsisiųsti iš https://www.comaps.app/download/ \n \nSmagių kelionių su „CoMaps“!</string>
+    <string name="share_bookmarks_email_subject">Mano „CoMaps“ žymės</string>
+    <string name="share_bookmarks_email_body">Labas! \n \nČia prisegtas mano „CoMaps“ programėlės žymių failas. Jei jos neturi, gali ją parsisiųsti iš https://www.comaps.app/download/ \n \nSmagių kelionių su „CoMaps“!</string>
    <!-- message title of loading file -->
-    <string name="load_kmz_title">Žymių sąrašas įkeliamas</string>
+    <string name="load_kmz_title">Žymės įkeliamos</string>
    <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Žymių sąrašas įkeltas! Galite rasti jį žemėlapyje arba žymių tvarkytuvės ekrane.</string>
+    <string name="load_kmz_successful">Žymės įkeltos! Galite jas rasti žemėlapyje arba žymių tvarkytuvės ekrane.</string>
    <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Žymių sąrašo nepavyko įkelti. Gali būti, kad failas sugadintas.</string>
+    <string name="load_kmz_failed">Žymių įkelti nepavyko. Gali būti, kad failas sugadintas.</string>
    <!-- Failed to recognize the format of a bookmarks or tracks file. -->
    <string name="unknown_file_type">Programėlė neatpažįsta failo tipo: \n%1$s</string>
    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -553,13 +553,13 @@
    <string name="dialog_error_storage_message">Išorinė saugykla yra nepasiekiama. SD kortelė galimai yra pašalinta, pažeista, arba failų sistema joje yra nustatyta tik skaitymui. Patikrinkite SD kortelę arba susisiekite su mumis adresu support@comaps.app</string>
    <string name="setting_emulate_bad_storage">Emuliuoti blogą saugyklą</string>
    <string name="error_enter_correct_name">Įveskite teisingą pavadinimą</string>
-    <string name="bookmark_lists">Sąrašai</string>
+    <string name="bookmark_lists">Žymių sąrašai</string>
    <!-- Do not display all bookmark lists on the map -->
    <string name="bookmark_lists_hide_all">Nerodyti visų</string>
    <string name="bookmark_lists_show_all">Rodyti visus</string>
    <string name="bookmarks_create_new_group">Kurti naują sąrašą</string>
    <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Importuoti žymes ir trasas</string>
+    <string name="bookmarks_import">Importuoti žymes</string>
    <string name="bookmarks_error_message_share_general">Nepavyko bendrinti dėl programinės klaidos</string>
    <string name="bookmarks_error_title_share_empty">Klaida bendrinant</string>
    <string name="bookmarks_error_message_share_empty">Negalima bendrinti tuščio sąrašo</string>
@@ -580,7 +580,7 @@
    <string name="subway">Metro</string>
    <string name="layers_title">Žemėlapio stiliai ir sluoksniai</string>
    <string name="bookmarks_empty_list_title">Sąrašas tuščias</string>
-    <string name="bookmarks_empty_list_message">Jeigu norite pridėti žymę, bakstelėkite vietą žemėlapyje, o tada – žvaigždutės piktogramą</string>
+    <string name="bookmarks_empty_list_message">Jeigu norite pasižymėti, bakstelėkite ją žemėlapyje, o tada – bakstelėkite žvaigždutės piktogramą</string>
    <string name="category_desc_more">…daugiau</string>
    <string name="export_file">Eksportuoti KMZ</string>
    <string name="export_file_gpx">Eksportuoti GPX</string>
@@ -711,7 +711,7 @@
    <string name="browser_not_available">Saityno naršyklė nepasiekiama</string>
    <string name="volume">Garsumas</string>
    <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Eksportuoti visas žymes ir trasas</string>
+    <string name="bookmarks_export">Eksportuoti pasižymėtas žymes ir trasas</string>
    <!-- button in (app) TTS settings, to open the system TTS settings. -->
    <string name="pref_tts_open_system_settings">Šnekos sintezės sistemos nustatymai</string>
    <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -743,7 +743,7 @@
    <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
    <string name="continue_recording">Tęsti įrašymą</string>
    <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Įrašyti į žymių ir trasų sąrašą?</string>
+    <string name="track_recording_alert_title">Pridėti žymę?</string>
    <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
    <string name="track_recording_toast_nothing_to_save">Trasa tuščia – nėra ką įrašyti</string>
    <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -753,7 +753,7 @@
    <string name="uri_open_location_failed">Neįdiegta programėlė, galinti atverti vietą</string>
    <!-- preference string for using auto theme only in navigation mode -->
    <string name="nav_auto">Automatinė naviguojant</string>
-    <string name="bookmarks_and_tracks">Žymės ir trasos</string>
+    <string name="bookmarks_and_tracks">Žymės</string>
    <string name="location_settings">Vietos nustatymai</string>
    <string name="maps_storage_summary">Pasirinkite aplanką atsiųstiems žemėlapiams įrašyti</string>
    <string name="category_secondhand">Naudotos prekės</string>
@@ -780,9 +780,10 @@
    <string name="car_used_on_the_phone_screen">Dabar naudojatės „CoMaps“ telefono ekrane</string>
    <string name="car_used_on_the_car_screen">Dabar naudojatės „CoMaps“ automobilio ekrane</string>
    <plurals name="bookmarks_places">
-        <item quantity="one">%d žymė</item>
-        <item quantity="few">%d žymės</item>
-        <item quantity="other">%d žymių</item>
+        <item quantity="one">%d pasižymėta vieta</item>
+        <item quantity="few">%d pasižymėtos vietos</item>
+        <item quantity="many">%d pasižymėtų vietų</item>
+        <item quantity="other">%d pasižymėtų vietų</item>
    </plurals>
    <string name="app_tip_01">Su jūsų parama ir palaikymu mes galime sukurti geriausius žemėlapius pasaulyje!</string>
    <string name="enable_keep_screen_on_description">Įgalinus šią parinktį, ekranas visada liks įjungtas, kol rodomas žemėlapis.</string>
@@ -807,12 +808,12 @@
    <string name="saved">Įrašyta</string>
    <string name="ruler">Liniuotė</string>
    <string name="pref_left_button_title">Kairiojo mygtuko funkcija</string>
-    <string name="pref_backup_now_summary_empty_lists">Neturite jokių žymių ar trasų atsarginei kopijai sudaryti</string>
+    <string name="pref_backup_now_summary_empty_lists">Nėra pasižymėtų vietų ar trasų atsarginei kopijai sudaryti</string>
    <string name="pref_backup_interval_title">Automatinis atsarginis kopijavimas</string>
    <string name="dialog_report_error_missing_folder">Pasirinktas atsarginių kopijų aplankas nepasiekiamas, bent jau rašymui. Pasirinkite kitą aplanką.</string>
    <string name="dialog_report_error_with_logs">Būsime dėkingi, jei atsiųsti klaidos pranešimą:\n - programos nustatymuose pažymėkite „Įgalinti derinimo žurnalą“\n - atkartokite problemą\n - „Žinyno ir pagalbos“ ekrane bakstelėkite mygtuką „Pranešti apie klaidą“ ir išsiųskite pranešimą el. paštu ar per pokalbių programėlę\n - išjunkite derinimo žurnalą</string>
    <string name="bicycle">Dviračiu</string>
-    <string name="pref_backup_title">Žymių ir trasų atsarginis kopijavimas</string>
+    <string name="pref_backup_title">Žymių atsarginis kopijavimas</string>
    <string name="editor_building_levels">Aukštų skaičius (skaičiuojant pirmą aukštą, neskaičiuojant stogo)</string>
    <string name="editor_level">Aukštas (0 reiškia pirmą aukštą)</string>
    <string name="error_enter_correct_level">Įveskite leistiną aukšto numerį</string>
@@ -901,4 +902,5 @@
    <string name="download_resources_custom_url_message">Žemėlapiams parsisiųsti galite nurodyti kitą, nei numatytasis, serverį. Palikite lauką tuščią, jei norite naudoti numatytąjį „CoMaps“ serverį.</string>
    <string name="download_resources_custom_url_summary_none">Nenurodytas</string>
    <string name="download_resources_custom_url_error_scheme">Įveskite URL adresą, prasidedantį „http://“ arba „https://“</string>
+    <string name="pref_maplanguage_local">Vietos kalba</string>
 </resources>
--- a/android/app/src/main/res/values-lv/strings.xml
+++ b/android/app/src/main/res/values-lv/strings.xml
@@ -516,10 +516,10 @@
    <string name="error_enter_correct_line_page">Ierakstiet LINE vietnes adresi vai LINE ID</string>
    <string name="placepage_add_place_button">Pievienot vietu „OpenStreetMap“</string>
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
-    <string name="editor_share_to_all_dialog_title">Vai vēlaties to nosūtīt visiem lietotājiem?</string>
+    <string name="editor_share_to_all_dialog_title">Vai nosūtīt to visiem lietotājiem?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Jāpārliecinās, ka neievadīji nekādus privātus vai personīgus datus.</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap redaktori pārbaudīs veiktās izmaiņas, un sazināsies ar Tevi, ja viņiem būs kādi jautājumi.</string>
+    <string name="editor_share_to_all_dialog_message_1">Jāpārliecinās, ka nav ievadīti nekādi privāti vai personīgi dati.</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap redaktori pārbaudīs veiktās izmaiņas un sazināsies ar Tevi, ja viņiem būs kādi jautājumi.</string>
    <string name="navigation_stop_button">Apturēt</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">Maršruta reģistrēšana</string>
@@ -862,4 +862,25 @@
        <item quantity="other">%d min.</item>
    </plurals>
    <string name="pref_maplanguage_local">Vietējā valoda</string>
+    <string name="opens_day_at">Atver %1$s plkst. %2$s</string>
+    <string name="closes_at">Slēdz %s</string>
+    <string name="opens_at">Atver %s</string>
+    <string name="closes_day_at">Slēdz %1$s plkst. %2$s</string>
+    <string name="osm_note_toast">Piezīme tiks nosūtīta “OpenStreetMap”</string>
+    <string name="pref_backup_now_summary_ok">Rezerves kopēšana sekmīgi pabeigta</string>
+    <string name="pref_backup_now_summary_empty_lists">Nav vietu un ceļu, kam veikt rezerves kopēšanu</string>
+    <string name="pref_backup_now_summary_failed">Rezerves kopēšana neizdevās</string>
+    <string name="pref_backup_now_summary_folder_unavailable">Rezerves kopiju mape nav pieejama</string>
+    <string name="pref_backup_status_summary_success">Pēdējā sekmīgā rezerves kopēšana</string>
+    <string name="pref_backup_location_title">Rezerves kopiju atrašanās vieta</string>
+    <string name="pref_backup_location_summary_initial">Lūgums vispirms atlasīt mapi un nodrošināt atļauju</string>
+    <string name="pref_backup_history_title">Paturamo rezerves kopiju daudzums</string>
+    <string name="pref_backup_interval_title">Automātiskā rezerves kopēšana</string>
+    <string name="pref_backup_title">Izveidot izlases rezerves kopiju</string>
+    <string name="pref_backup_summary">Automātiski veikt rezerves kopēšanu ierīces mapē</string>
+    <string name="pref_backup_now_title">Veikt rezerves kopēšanu tagad</string>
+    <string name="pref_backup_now_summary">Nekavējoties izveidot rezerves kopiju</string>
+    <string name="pref_backup_now_summary_progress">Notiek rezerves kopēšana…</string>
+    <string name="pedestrian">Kājāmgājēju</string>
+    <string name="bicycle">Divriteņu</string>
 </resources>
--- a/android/app/src/main/res/values-night/colors.xml
+++ b/android/app/src/main/res/values-night/colors.xml
@@ -16,6 +16,8 @@
  <color name="bg_panel">@color/bg_window</color>
  <color name="bg_primary_dark">#FF588157</color>
  <color name="bg_app">#10140F</color>
+  <color name="bg_editor">#161b14</color>
+  <color name="fg_editor">#282e25</color>

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

@@ -42,4 +44,20 @@
  <!-- Downloader -->
  <color name="dl_done">#54575b</color>
  <color name="dl_download">#ffe68c</color>
+
+  <!-- Categories -->
+  <color name="foreground_color">#000</color>
+
+  <color name="amenity">#51585E</color>
+  <color name="entertainment">#802D19</color>
+  <color name="food">#8C491C</color>
+  <color name="shop">#6B425C</color>
+  <color name="cm_services">#574469</color>
+  <color name="medical">#983E44</color>
+  <color name="hotel">#614A43</color>
+  <color name="luggagehero">#851F03</color>
+  <color name="parking">#20607C</color>
+  <color name="tourism">#6E4426</color>
+  <color name="transport">#2F6499</color>
+  <color name="water">#0A6074</color>
 </resources>
--- a/android/app/src/main/res/values-night/themes.xml
+++ b/android/app/src/main/res/values-night/themes.xml
@@ -151,7 +151,7 @@
    <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
    <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>

-    <item name="appBackground">?android:attr/colorBackground</item>
+    <item name="appBackground">@color/bg_app</item>
  </style>

  <style name="MwmTheme" parent="MwmTheme.Base"/>
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -21,30 +21,30 @@
    <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
    <string name="search">Zoeken</string>
    <!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
-    <string name="search_map">Zoeken op de kaart</string>
+    <string name="search_map">Zoeken op kaart</string>
    <!-- Location services are disabled by user alert - message -->
-    <string name="location_is_disabled_long_text">U heeft momenteel alle locatieservices voor dit apparaat of deze app uitgeschakeld. Schakel ze in bij Instellingen.</string>
+    <string name="location_is_disabled_long_text">U heeft momenteel alle locatiediensten voor dit apparaat of deze app uitgeschakeld. Schakel ze in bij Instellingen.</string>
    <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
    <string name="limited_accuracy">Beperkte nauwkeurigheid</string>
    <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">Voor nauwkeurige navigatie moet Nauwkeurige Locatie worden ingesteld bij Instellingen</string>
+    <string name="precise_location_is_disabled_long_text">Voor nauwkeurige navigatie moet Nauwkeurige Locatie worden ingesteld in de instellingen</string>
    <!-- View and button titles for accessibility -->
-    <string name="zoom_to_country">Weergeven op de kaart</string>
+    <string name="zoom_to_country">Weergeven op kaart</string>
    <!-- Message to display at the center of the screen when the country download has failed -->
    <string name="country_status_download_failed">Downloaden is mislukt</string>
    <!-- Button text for the button under the country_status_download_failed message -->
    <string name="try_again">Opnieuw proberen</string>
    <string name="about_menu_title">Over CoMaps</string>
    <!-- Text in About screen -->
-    <string name="about_headline">Open project, gemaakt door de community</string>
+    <string name="about_headline">Open project gedreven door de community</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_1">• Gebruiksvriendelijk en gestroomlijnd</string>
+    <string name="about_proposition_1">• Gebruiksvriendelijk en afgewerkt</string>
    <!-- Text in About screen -->
    <string name="about_proposition_2">• Privacygericht en vrij van advertenties</string>
    <!-- Text in About screen -->
    <string name="about_proposition_3">• Offline, snel en compact</string>
    <!-- Text in About screen -->
-    <string name="about_developed_by_enthusiasts">Volledig open source, non-profit, transparante besluitvorming en financiering.</string>
+    <string name="about_developed_by_enthusiasts">Volledige open source, non-profit, transparante besluitvorming en financiering.</string>
    <!-- The button that opens system location settings -->
    <string name="location_settings">Locatie-instellingen</string>
    <string name="close">Sluiten</string>
@@ -55,7 +55,7 @@
    <!-- Used in DownloadResources startup screen -->
    <string name="not_enough_free_space_on_sdcard">Maak eerst ruimte vrij op de SD-kaart/USB-opslag om de app te gebruiken</string>
    <string name="download_resources">Laten we, voor de eerste start, de algemene wereldkaart downloaden. \nDeze gebruikt %s aan opslag.</string>
-    <string name="download_resources_continue">Ga naar de kaart</string>
+    <string name="download_resources_continue">Ga naar kaart</string>
    <string name="downloading_country_can_proceed">%1$s (%2$s) downloaden. U kunt nu \ndoorgaan naar de kaart.</string>
    <string name="download_country_ask">%1$s downloaden? (%2$s)</string>
    <string name="update_country_ask">%1$s bijwerken? (%2$s)</string>
@@ -66,7 +66,7 @@
    <!-- Show popup notification on top of the map when country download has failed. -->
    <string name="download_country_failed">%s download is mislukt</string>
    <!-- "Add new bookmark list" dialog title -->
-    <string name="add_new_set">Nieuwe groep toevoegen</string>
+    <string name="add_new_set">Nieuwe lijst toevoegen</string>
    <!-- Add Bookmark list dialog - hint when the list name is empty -->
    <string name="bookmark_set_name">Naam van lijst</string>
    <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
@@ -96,7 +96,7 @@
    <!-- Ask user to wait several minutes (some long process in modal dialog). -->
    <string name="wait_several_minutes">Dit kan enkele minuten duren. \nEven geduld…</string>
    <!-- Measurement units title in settings activity -->
-    <string name="measurement_units">Afstandseenheid</string>
+    <string name="measurement_units">Eenheid van afstand</string>
    <!-- Detailed description of Measurement Units settings button -->
    <string name="measurement_units_summary">Kies tussen mijlen en kilometers</string>
    <!-- SECTION: Search categories -->
@@ -143,7 +143,7 @@
    <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
    <string name="category_water">Water</string>
    <!-- Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! -->
-    <string name="category_rv">Caravanfaciliteiten</string>
+    <string name="category_rv">Camperfaciliteiten</string>
    <!-- SECTION: Other translations -->
    <!-- Notes field in Bookmarks view -->
    <string name="description">Notities</string>
@@ -159,7 +159,7 @@
    <!-- Failed to recognize the format of a bookmarks or tracks file. -->
    <string name="unknown_file_type">Het bestandstype wordt niet herkend door de app: \n%1$s</string>
    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
-    <string name="failed_to_open_file">Bestand openen mislukt %1$s \n \n%2$s</string>
+    <string name="failed_to_open_file">Bestand openen is mislukt %1$s \n \n%2$s</string>
    <!-- resource for context menu -->
    <string name="edit">Bewerken</string>
    <!-- Warning message when doing search around current position -->
@@ -841,21 +841,21 @@
    <string name="bookmark_color">Kleur voor favoriet</string>
    <string name="backup_interval_every_day">Dagelijks</string>
    <string name="backup_interval_manual_only">Uit (alleen handmatig)</string>
-    <string name="pref_backup_title">Back-up van favorieten</string>
+    <string name="pref_backup_title">Back-up maken van favorieten</string>
    <string name="pref_backup_summary">Automatisch back-up maken naar een map op je apparaat</string>
-    <string name="pref_backup_now_title">Nu back-uppen</string>
-    <string name="pref_backup_now_summary">Maak onmiddellijk een back-up</string>
-    <string name="pref_backup_now_summary_progress">Bezig met het maken van back-up…</string>
-    <string name="pref_backup_now_summary_ok">Back-up succesvol voltooid</string>
+    <string name="pref_backup_now_title">Nu back-up maken</string>
+    <string name="pref_backup_now_summary">Onmiddellijk een back-up maken</string>
+    <string name="pref_backup_now_summary_progress">Bezig met back-up maken…</string>
+    <string name="pref_backup_now_summary_ok">Back-up met succes voltooid</string>
    <string name="pref_backup_now_summary_empty_lists">Geen plaatsen en sporen voor een back-up</string>
    <string name="pref_backup_status_summary_success">Laatste succesvolle back-up</string>
    <string name="pref_backup_interval_title">Automatische back-up</string>
-    <string name="pref_backup_location_title">Back-up locatie</string>
-    <string name="pref_backup_now_summary_failed">Backup mislukt</string>
+    <string name="pref_backup_location_title">Back-uplocatie</string>
+    <string name="pref_backup_now_summary_failed">Backup is mislukt</string>
    <string name="pref_backup_history_title">Aantal back-ups om te bewaren</string>
    <string name="dialog_report_error_missing_folder">De geselecteerde back-uplocatie is niet beschikbaar of niet beschrijfbaar. Kies een andere locatie.</string>
    <string name="backup_interval_every_week">Wekelijks</string>
-    <string name="pref_backup_now_summary_folder_unavailable">De back-up map is niet beschikbaar</string>
+    <string name="pref_backup_now_summary_folder_unavailable">De back-upmap is niet beschikbaar</string>
    <string name="panoramax">Panoramax-afbeelding</string>
    <string name="pref_backup_location_summary_initial">Selecteer eerst een map en geef toestemming</string>
    <string name="pref_left_button_title">Linkerknop configuratie</string>
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -68,11 +68,11 @@
    <!-- "Add new bookmark list" dialog title -->
    <string name="add_new_set">Adicionar conjunto novo</string>
    <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Nome do conjunto de favoritos</string>
+    <string name="bookmark_set_name">Nome da Lista</string>
    <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Favoritos</string>
+    <string name="bookmarks">Lugares</string>
    <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Favoritos e trajetos</string>
+    <string name="bookmarks_and_tracks">Favoritos</string>
    <!-- Add bookmark dialog - bookmark name -->
    <string name="name">Nome</string>
    <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -144,10 +144,10 @@
    <!-- Notes field in Bookmarks view -->
    <string name="description">Notas</string>
    <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Os favoritos do CoMaps foram partilhados consigo</string>
-    <string name="share_bookmarks_email_body">Olá! \n \nSegue em anexo os meus favoritos da aplicação CoMaps. Por favor abra-os se tiver o CoMaps instalado. Caso não tenha, descarregue a aplicação para o seu dispositivo iOS ou Android com a hiperligação https://www.comaps.app/download/ \n \nDivirta-se a viajar com o CoMaps!</string>
+    <string name="share_bookmarks_email_subject">Os meus Favoritos do CoMaps</string>
+    <string name="share_bookmarks_email_body">Olá! \n \nSegue em anexo os meus favoritos; por favor abra-os com o CoMaps. Caso não tenha, descarregue a aplicação aqui: https://www.comaps.app/download/ \n \nDivirta-se a viajar com o CoMaps!</string>
    <!-- message title of loading file -->
-    <string name="load_kmz_title">A carregar favoritos</string>
+    <string name="load_kmz_title">Carregando Favoritos</string>
    <!-- Kmz file successful loading -->
    <string name="load_kmz_successful">Os favoritos foram carregados com sucesso! Pode encontrá-los no mapa ou no ecrã de gestão dos favoritos.</string>
    <!-- Kml file loading failed -->
--- a/android/app/src/main/res/values-sl/strings.xml
+++ b/android/app/src/main/res/values-sl/strings.xml
@@ -54,12 +54,12 @@
    <string name="maps_storage_free_size">%1$s prosto od %2$s</string>
    <string name="move_maps">Premaknem zemljevide?</string>
    <string name="move_maps_error">Napaka med premikanjem datotek zemljevidov</string>
-    <string name="wait_several_minutes">To lahko traja nekaj minut. \nProsimo, počakajte …</string>
+    <string name="wait_several_minutes">To lahko traja nekaj minut. \nPočakajte …</string>
    <string name="measurement_units">Merske enote</string>
    <string name="measurement_units_summary">Izberite med miljami in kilometri</string>
    <string name="category_eat">Kje jesti</string>
    <string name="category_food">Špecerija</string>
-    <string name="category_transport">Javni prevoz</string>
+    <string name="category_transport">Prevoz</string>
    <string name="category_fuel">Gorivo</string>
    <string name="category_parking">Parkiranje</string>
    <string name="category_shopping">Nakupovanje</string>
@@ -80,7 +80,7 @@
    <string name="category_water">Voda</string>
    <string name="category_rv">Prostori za avtodome</string>
    <string name="description">Pripis</string>
-    <string name="share_bookmarks_email_subject">Nekdo je z vami delil zaznamke CoMaps</string>
+    <string name="share_bookmarks_email_subject">Moji zaznamki na CoMaps</string>
    <string name="share_bookmarks_email_body">Živjo! \n \nV priponki so moji zaznamki. Prosim, odpri jih v orodju CoMaps. Če ga še nisi namestil, ga lahko preneseš tukaj: https://www.comaps.app/download/ \n \nUživaj v potovanju s CoMaps!</string>
    <string name="load_kmz_title">Nalagam zaznamke</string>
    <string name="load_kmz_successful">Zaznamki so uspešno naloženi! Najdete jih lahko na zemljevidu ali v upravitelju zaznamkov.</string>
@@ -239,7 +239,7 @@
    <string name="editor_example_values">Primeri vrednosti</string>
    <string name="editor_correct_mistake">Popravi napako</string>
    <string name="editor_add_select_location">Izberi lokacijo</string>
-    <string name="editor_report_problem_desription_1">Prosimo, podrobno opišite težavo, da jo lahko skupnost OpenStreetMap odpravi.</string>
+    <string name="editor_report_problem_desription_1">Podrobno opišite težavo, da jo lahko skupnost OpenStreetMap odpravi.</string>
    <string name="editor_report_problem_desription_2">Ali pa jo popravite sami na https://www.openstreetmap.org/</string>
    <string name="editor_report_problem_send_button">Pošlji</string>
    <string name="editor_report_problem_title">Težava</string>
@@ -271,7 +271,7 @@
    <string name="social_media">Družbena omrežja</string>
    <string name="building">Stavba</string>
    <string name="add_street">Dodaj ulico</string>
-    <string name="empty_street_name_error">Prosimo, vnesite ime ulice</string>
+    <string name="empty_street_name_error">Vnesite ime ulice</string>
    <string name="choose_language">Izberite jezik</string>
    <string name="choose_street">Izberite ulico</string>
    <string name="cuisine">Kuhinja</string>
@@ -285,7 +285,7 @@
    <string name="downloader_search_field_hint">Najdi zemljevid</string>
    <string name="common_check_internet_connection_dialog">Preverite, da je vaša naprava povezana na internet</string>
    <string name="downloader_no_space_title">Ni dovolj prostora</string>
-    <string name="downloader_no_space_message">Prosimo, izbrišite vse nepotrebne podatke</string>
+    <string name="downloader_no_space_message">Izbrišite vse nepotrebne podatke</string>
    <string name="editor_login_error_dialog">Napaka pri prijavi</string>
    <string name="editor_profile_changes">Potrjene spremembe</string>
    <string name="editor_focus_map_on_location">Povlecite zemljevid tako, da bo križ na lokaciji kraja ali podjetja.</string>
@@ -308,7 +308,7 @@
    <string name="error_enter_correct_zip_code">Vnesite veljavno poštno številko</string>
    <string name="editor_other_info">Komentar za prostovoljce na OpenStreetMap (neobvezno)</string>
    <string name="editor_note_hint">Opišite napake na zemljevidu ali stvari, ki jih ni mogoče urediti prek CoMaps</string>
-    <string name="editor_about_osm">Vaša urejanja se naložijo v javno podatkovno bazo <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a>. Prosimo, da ne dodajate osebnih ali avtorsko zaščitenih podatkov.</string>
+    <string name="editor_about_osm">Vaša urejanja se naložijo v javno podatkovno bazo <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a>. Ne dodajajte osebnih ali avtorsko zaščitenih podatkov.</string>
    <string name="editor_more_about_osm">Več o OpenStreetMap</string>
    <string name="editor_osm_history">Vaša zgodovina urejanja</string>
    <string name="editor_osm_notes">Vaši komentarji za zemljevid</string>
@@ -365,7 +365,7 @@
    <string name="mobile_data_option_ask">Vedno vprašaj</string>
    <string name="traffic_update_maps_text">Za prikazovanje podatkov o prometu je treba posodobiti zemljevide</string>
    <string name="big_font">Povečajte velikost oznak na zemljevidu</string>
-    <string name="traffic_update_app">Prosimo, posodobite CoMaps</string>
+    <string name="traffic_update_app">Posodobite CoMaps</string>
    <string name="traffic_data_unavailable">Prometni podatki niso na voljo</string>
    <string name="enable_logging">Omogoči dnevniške zapise</string>
    <string name="feedback_general">Splošne povratne informacije</string>
@@ -384,7 +384,7 @@
    <string name="dialog_error_storage_message">Zunanja shramba ni dostopna. SD kartica je bila morda odstranjena, je poškodovana ali pa datotečni sistem ne podpira zapisovanja. Preverite svojo SD kartico ali stopite v stik z nami prek support@comaps.app</string>
    <string name="setting_emulate_bad_storage">Emuliraj pokvarjeno shrambo</string>
    <string name="error_enter_correct_name">Vnesite pravilno ime</string>
-    <string name="bookmark_lists">Seznami</string>
+    <string name="bookmark_lists">Seznam priljubljenih</string>
    <string name="bookmark_lists_hide_all">Skrij vse</string>
    <string name="bookmark_lists_show_all">Pokaži vse</string>
    <plurals name="bookmarks_places">
@@ -394,7 +394,7 @@
        <item quantity="other">%d zaznamkov</item>
    </plurals>
    <string name="bookmarks_create_new_group">Ustvarite nov seznam</string>
-    <string name="bookmarks_import">Uvozi zaznamke in poti</string>
+    <string name="bookmarks_import">Uvozi zaznamke</string>
    <string name="bookmarks_error_message_share_general">Ni bilo mogoče deliti zaradi aplikacijske napake</string>
    <string name="bookmarks_error_title_share_empty">Napaka pri deljenju</string>
    <string name="bookmarks_error_message_share_empty">Ni mogoče deliti praznega seznama</string>
@@ -448,7 +448,7 @@
    <string name="avoid_ferry">Brez trajektov</string>
    <string name="avoid_motorways">Brez avtocest</string>
    <string name="unable_to_calc_alert_title">Ne morem izračunati poti</string>
-    <string name="unable_to_calc_alert_subtitle">Ni bilo mogoče najti relacije. Mogoče so krive vaše zahteve za pot ali pa nepopolni podatki OpenStreetMap. Prosimo, spremenite možnosti relacije in poskusite ponovno.</string>
+    <string name="unable_to_calc_alert_subtitle">Ni bilo mogoče najti povezave. Mogoče so krive vaše zahteve za pot ali pa nepopolni podatki OpenStreetMapa. Spremenite možnosti iskanja povezave in poskusite ponovno.</string>
    <string name="define_to_avoid_btn">Definirajte, katerim cestam naj se izognemo</string>
    <string name="change_driving_options_btn">Možnosti relacije so omogočene</string>
    <string name="toll_road">Cesta s cestnino</string>
@@ -524,7 +524,7 @@
    <string name="comma_separated_pair">%1$s, %2$s</string>
    <string name="app_tip_00">Hvala, ker uporabljate naše javno narejene zemljevide!</string>
    <string name="app_tip_01">Z vašo podporo lahko ustvarimo najboljše zemljevide na svetu!</string>
-    <string name="app_tip_02">Ali vam je naša aplikacija všeč? Vabimo vas, da finančno podprete njen razvoj! Ali niste zadovoljni z njo? Prosimo, da nam sporočite, zakaj, in jo bomo popravili!</string>
+    <string name="app_tip_02">Ali vam je naša aplikacija všeč? Vabimo vas, da finančno podprete njen razvoj! Ali niste zadovoljni z njo? Prosimo, da nam sporočite zakaj, in jo bomo popravili!</string>
    <string name="app_tip_03">Če poznate kakega_o razvijalca_ko programske opreme, ga_jo lahko prosite, da implementira funkcionalnost, ki jo potrebujete.</string>
    <string name="app_tip_04">S kratkim pritiskom na zemljevid lahko izberete kateri koli element. Z dolgim pritiskom lahko skrijete ali pokažete vmesnik.</string>
    <string name="app_tip_05">Ali ste vedeli, da lahko na zemljevidu izberete svojo trenutno lokacijo?</string>
@@ -571,7 +571,7 @@
    <string name="stop_track_recording">Ustavi snemanje sledi</string>
    <string name="stop_without_saving">Ustavi brez shranjevanja</string>
    <string name="continue_recording">Nadaljuj snemanje</string>
-    <string name="track_recording_alert_title">Shrani med Zaznamke in sledi?</string>
+    <string name="track_recording_alert_title">Shrani med zaznamke?</string>
    <string name="track_recording_toast_nothing_to_save">Sled je prazna – ničesar ni za shraniti</string>
    <string name="error_no_file_manager_app">Pogovornega okna za izbiro mape ni mogoče prikazati, ker na vaši napravi ni nameščenega ustreznega orodja. Namestite upravitelja datotek in poskusite znova.</string>
    <string name="choose_color">Izberi barvo</string>
@@ -581,7 +581,7 @@
    <string name="zoom_in">Približaj</string>
    <string name="zoom_out">Oddalji</string>
    <string name="pref_left_button_title">Nastavitev levega gumba</string>
-    <string name="pref_backup_title">Varnostno kopiranje zaznamkov in sledi</string>
+    <string name="pref_backup_title">Varnostno kopiranje priljubljenih</string>
    <string name="pref_backup_summary">Samodejno varnostno kopiraj v mapo na vaši napravi</string>
    <string name="pref_backup_now_title">Ustvari varnostno kopijo zdaj</string>
    <string name="pref_left_button_disable">Onemogoči</string>
@@ -593,14 +593,14 @@
    <string name="pref_backup_now_summary_folder_unavailable">Mapa za varnostno kopijo ni na voljo</string>
    <string name="pref_backup_status_summary_success">Zadnje uspešno kopiranje</string>
    <string name="pref_backup_location_title">Mesto varnostne kopije</string>
-    <string name="pref_backup_location_summary_initial">Prosimo, najprej izberite mapo in podelite dovoljenja</string>
+    <string name="pref_backup_location_summary_initial">Najprej izberite mapo in dodelite dovoljenja</string>
    <string name="pref_backup_history_title">Število varnostnih kopij, ki jih je treba hraniti</string>
    <string name="pref_backup_interval_title">Samodejno varnostno kopiranje</string>
    <string name="backup_interval_manual_only">Izklopljeno (samo ročno)</string>
    <string name="dialog_report_error_missing_folder">Izbrano mesto za varnostno kopijo ni na voljo ali vanjo ni mogoče pisati. Izberite drugo mesto.</string>
    <string name="backup_interval_every_day">Dnevno</string>
    <string name="backup_interval_every_week">Tedensko</string>
-    <string name="dialog_report_error_with_logs">Prosimo, pošljite nam poročilo o napaki:\n - \"Omogoči beleženje\" v nastavitvah\n - poustvarite težavo\n - na zaslonu »O programu in Pomoč« pritisnite gumb »Prijavi napako« in jo pošljite po e-pošti ali klepetu\n - onemogoči beleženje</string>
+    <string name="dialog_report_error_with_logs">Pošljite nam poročilo o napaki:\n - \"Omogoči beleženje\" v nastavitvah\n - poustvarite težavo\n - na zaslonu »O programu in Pomoč« pritisnite gumb »Prijavi napako« in jo pošljite po e-pošti ali klepetu\n - onemogočite beleženje</string>
    <string name="route_type">Vrsta poti</string>
    <string name="vehicle">Vozilo</string>
    <string name="pedestrian">Za pešce</string>
@@ -646,8 +646,8 @@
    <string name="editor_mark_business_vacant_description">To uporabite, če se je podjetje izselilo in so prostori prazni in pripravljeni za novega zakupnika.</string>
    <string name="editor_submit">Potrdi</string>
    <string name="place_page_map_too_old_title">Podatki zemljevida so zastareli</string>
-    <string name="place_page_map_too_old_description">Vaši trenutni podatki zemljevida so zelo stari; prosimo, posodobite zemljevid.</string>
-    <string name="place_page_app_too_old_description">Vaši trenutni podatki zemljevida so zelo stari; prosimo, posodobite orodje CoMaps.</string>
+    <string name="place_page_map_too_old_description">Vaši trenutni podatki zemljevida so zelo stari, posodobite zemljevid.</string>
+    <string name="place_page_app_too_old_description">Vaši trenutni podatki zemljevida so zelo stari, posodobite orodje CoMaps.</string>
    <string name="place_page_update_too_old_map">Posodobi področje zemljevida</string>
    <string name="place_page_too_old_to_edit">Urejanje OpenStreetMap je onemogočeno, ker so podatki zemljevida prestari.</string>
    <string name="prefs_speed_cameras_information">Opozorila o merilnikih hitrosti so onemogočena v državah, kjer so prepovedana s tamkajšnjimi zakoni.</string>
@@ -661,5 +661,6 @@
    <string name="download_resources_custom_url_title">Strežnik zemljevida po meri</string>
    <string name="download_resources_custom_url_message">Prepiši privzeti strežnik za prenos zemljevidov, ki se uporablja za prenos zemljevidov. Pustite prazno, če želite uporabiti privzeti strežnik CoMaps.</string>
    <string name="download_resources_custom_url_summary_none">Ni nastavljeno</string>
-    <string name="download_resources_custom_url_error_scheme">Prosimo, vnesite polni URL, ki se začne z https:// in konča z /</string>
+    <string name="download_resources_custom_url_error_scheme">Vnesite polni URL, ki se začne z http:// ali https://</string>
+    <string name="pref_maplanguage_local">Krajevni jezik</string>
 </resources>
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@@ -66,11 +66,11 @@
    <!-- "Add new bookmark list" dialog title -->
    <string name="add_new_set">Lägg till ny samling</string>
    <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Bokmärkessamlingens namn</string>
+    <string name="bookmark_set_name">Listans namn</string>
    <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Bokmärken</string>
+    <string name="bookmarks">Platser</string>
    <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Bokmärken och rutter</string>
+    <string name="bookmarks_and_tracks">Favoriter</string>
    <!-- Add bookmark dialog - bookmark name -->
    <string name="name">Namn</string>
    <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -142,13 +142,13 @@
    <!-- Notes field in Bookmarks view -->
    <string name="description">Anteckningar</string>
    <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">CoMaps bokmärken har delats med dig</string>
+    <string name="share_bookmarks_email_subject">Mina CoMaps-favoriter</string>
    <!-- message title of loading file -->
-    <string name="load_kmz_title">Läser in bokmärken</string>
+    <string name="load_kmz_title">Läser in favoriter</string>
    <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Bokmärkena lästes in! Du kan hitta dem på kartan eller i Bokmärkeshanteraren.</string>
+    <string name="load_kmz_successful">Favoriterna lästes in! Du kan hitta dem på kartan eller i favorithanteraren.</string>
    <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Inläsningen av bokmärkena misslyckades. Filen kan vara skadad eller defekt.</string>
+    <string name="load_kmz_failed">Inläsningen av favoriterna misslyckades. Filen kan vara skadad eller defekt.</string>
    <!-- Failed to recognize the format of a bookmarks or tracks file. -->
    <string name="unknown_file_type">Filtypen känns inte igen av appen: \n%1$s</string>
    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -210,7 +210,7 @@
    <!-- Settings «Route» category: «Tts language» title -->
    <string name="pref_tts_language_title">Röstspråk</string>
    <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Testa röstinstruktioner (TTS, Text-To-Speech)</string>
+    <string name="pref_tts_test_voice_title">Testa röstinstruktioner</string>
    <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
    <string name="pref_tts_playing_test_voice">Kontrollera volymen eller systemets text-till-tal-inställningar om du inte hör rösten nu</string>
    <!-- Settings «Route» category: «Tts unavailable» subtitle -->
@@ -793,7 +793,7 @@
    <string name="connection_failure">Anslutningen bröts</string>
    <string name="disk_error_title">Diskfel</string>
    <string name="enable_show_on_lock_screen">Visa på låsskärmen</string>
-    <string name="share_bookmarks_email_body">Hej! \n \nJag bifogar mina bokmärken, öppna gärna dem med CoMaps. Om du inte redan har appen installerad, kan du ladda ner den här: https://www.comaps.app/download/ \n \nTrevlig resa med CoMaps!</string>
+    <string name="share_bookmarks_email_body">Hej! \n \nJag bifogar mina favoriter, öppna gärna dem med CoMaps. Om du inte redan har appen installerad, kan du ladda ner den här: https://www.comaps.app/download/ \n \nTrevlig resa med CoMaps!</string>
    <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
    <string name="telegram_url">https://t.me/CoMapsApp/</string>
    <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Sv:Om_OpenStreetMap</string>
@@ -850,4 +850,5 @@
    <string name="bicycle">Cykel</string>
    <string name="pedestrian">Gående</string>
    <string name="error_enter_correct_line_page">Ange en giltig webbadress</string>
+    <string name="move_maps_error">Kunde inte flytta kartfiler</string>
 </resources>
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -65,6 +65,8 @@
  <color name="bg_panel">@color/bg_window</color>
  <color name="bg_primary_dark">#37653F</color> <!-- secondary dark -->
  <color name="bg_app">@android:color/white</color>
+  <color name="bg_editor">#ebefe4</color>
+  <color name="fg_editor">#f9faf2</color>

  <color name="bg_dialog_translucent">#BB000000</color>
  <color name="bg_text_translucent">#99FFFFFF</color>
@@ -133,5 +135,21 @@
  <color name="dl_done">#ebebeb</color>
  <color name="dl_download">#FF37653F</color>
  <color name="dl_update">#ffc30a</color>
+
+  <!-- Categories -->
+  <color name="foreground_color">#FFF</color>
+
+  <color name="amenity">#747E86</color>
+  <color name="entertainment">#EB785D</color>
+  <color name="food">#EC955E</color>
+  <color name="shop">#BE75A3</color>
+  <color name="cm_services">#AA96BC</color>
+  <color name="medical">#D85961</color>
+  <color name="hotel">#664E42</color>
+  <color name="luggagehero">#FB3207</color>
+  <color name="parking">#427BB8</color>
+  <color name="tourism">#9C6136</color>
+  <color name="transport">#2F6499</color>
+  <color name="water">#54A3B6</color>
 </resources>

--- a/android/app/src/main/res/values/styles-editor.xml
+++ b/android/app/src/main/res/values/styles-editor.xml
@@ -89,8 +89,16 @@
    <item name="android:layout_width">match_parent</item>
    <item name="android:layout_height">wrap_content</item>
    <item name="android:layout_marginBottom">@dimen/margin_half</item>
-    <item name="cardBackgroundColor">?cardBackground</item>
+    <item name="cardBackgroundColor">@color/fg_editor</item>
    <item name="android:padding">@dimen/margin_base</item>
    <item name="cardPreventCornerOverlap">false</item>
  </style>
+    <style name="MwmWidget.M3.CardView" parent="Widget.Material3.CardView.Elevated">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginBottom">@dimen/margin_half</item>
+        <item name="cardBackgroundColor">?appBackground</item>
+        <item name="android:padding">@dimen/margin_base</item>
+        <item name="cardPreventCornerOverlap">false</item>
+    </style>
 </resources>
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -239,10 +239,6 @@
    <item name="android:foreground">@drawable/shadow_top</item>
  </style>

-  <style name="MwmWidget.FrameLayout.BookmarkCategories">
-    <item name="android:background">?windowBackgroundForced</item>
-  </style>
-
  <style name="MwmWidget.Counter">
    <item name="android:layout_width">wrap_content</item>
    <item name="android:layout_height">wrap_content</item>
@@ -287,13 +283,13 @@
  </style>

  <style name="MwmWidget.BottomSheetDialog" parent="Widget.Material3.BottomSheet.Modal">
-    <item name="backgroundTint">?colorSurfaceContainerLow</item>
+    <item name="backgroundTint">?appBackground</item>
    <item name="elevationOverlayEnabled">false</item>
    <item name="shapeAppearance">@style/ShapeAppearance.Material3.LargeComponent</item>
  </style>

  <style name="MwmWidget.BottomSheet" parent="MwmWidget.BottomSheetDialog">
-    <item name="android:background">?colorSurfaceContainerLow</item>
+    <item name="android:background">?appBackground</item>
    <item name="behavior_hideable">false</item>
  </style>

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jean-Baptiste	72024b0d9c	[doc] Update files about Android CI Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-18 09:40:35 +01:00
Yannik Bloscheck	913b19bbaa	[docs] Explanation of emergency access addresses Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-17 17:20:27 +01:00
Yannik Bloscheck	6c8964e059	[styles] Fix uneven tram icon Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-17 16:07:50 +01:00
mvglasow	5ca03f7aa3	[docs] Add instructions for Eclipse Signed-off-by: mvglasow <michael -at- vonglasow.com> Co-authored-by: mvglasow <mvglasow@noreply.codeberg.org> Co-committed-by: mvglasow <mvglasow@noreply.codeberg.org>	2026-01-17 14:24:40 +01:00
Yannik Bloscheck	0825800376	[docs] Include subtypes details Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-17 13:57:22 +01:00
Yannik Bloscheck	e58b779282	[types] Switching recycling to new subtypes structure Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com> Co-authored-by: Yannik Bloscheck <git@yannikbloscheck.com> Co-committed-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-17 13:26:46 +01:00
Yannik Bloscheck	73648fa28c	[generator] Move special cases for charging stations with implicit car tagging to generator Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com> Co-authored-by: Yannik Bloscheck <git@yannikbloscheck.com> Co-committed-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-17 13:24:57 +01:00
Yannik Bloscheck	95b543a232	[types] Switching buoys and beacons to new subtypes structure Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com> Co-authored-by: Yannik Bloscheck <git@yannikbloscheck.com> Co-committed-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-17 12:47:17 +01:00
Yannik Bloscheck	942575af60	[search] Fix missing comma Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-16 23:45:01 +01:00
Jean-Baptiste	f832203c86	[android] Add new intent to be able to open app settings from Android settings Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-16 20:04:43 +01:00
Codeberg Translate	03c90aeff1	[strings] Update from Codeberg Translate Co-authored-by: Anonymous <anonymous@noreply.codeberg.org> Co-authored-by: Arktorus <arktorus@noreply.codeberg.org> Co-authored-by: Codeberg Translate <translate@codeberg.org> Co-authored-by: ERYpTION <eryption@noreply.codeberg.org> Co-authored-by: Edgarsons <edgarsons@noreply.codeberg.org> Co-authored-by: Fjuro <fjuro@alius.cz> Co-authored-by: JanezPavelZebovec <janezpavelzebovec@noreply.codeberg.org> Co-authored-by: Luftika <luftika@noreply.codeberg.org> Co-authored-by: Mickael81 <mickael81@noreply.codeberg.org> Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org> Co-authored-by: Priit Jõerüüt <jrtcdbrg@noreply.codeberg.org> Co-authored-by: Stephan-P <stephan-p@noreply.codeberg.org> Co-authored-by: Weblate <noreply-mt-weblate@weblate.org> Co-authored-by: Weblate Translation Memory <noreply-mt-weblate-translation-memory@weblate.org> Co-authored-by: ZeljkoBG <zeljkobg@noreply.codeberg.org> Co-authored-by: astro-ray <astro-ray@noreply.codeberg.org> Co-authored-by: cirilla <cirilla@noreply.codeberg.org> Co-authored-by: codebergian42 <codebergian42@noreply.codeberg.org> Co-authored-by: deesbabygirl <deesbabygirl@noreply.codeberg.org> Co-authored-by: eatham <eatham@noreply.codeberg.org> Co-authored-by: jimkats <jimkats@noreply.codeberg.org> Co-authored-by: marko <marko@noreply.codeberg.org> Co-authored-by: ovl-005 <ovl-005@noreply.codeberg.org> Co-authored-by: patepelo <patepelo@noreply.codeberg.org> Co-authored-by: thesupertechie <thesupertechie@noreply.codeberg.org> Co-authored-by: wirabdillah <wirabdillah@noreply.codeberg.org> Co-authored-by: x7z4w <x7z4w@noreply.codeberg.org> Translate-URL: https://translate.codeberg.org/projects/comaps/android-typestrings/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-typestrings/ Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/Android UI Strings Translation: CoMaps/Android UI Strings (SDK) Translation: CoMaps/Apple AppStore description Translation: CoMaps/Countries and regions names Translation: CoMaps/Search synonyms / aliases Translation: CoMaps/Voice announcements for navigation (TTS) Translation: CoMaps/iOS - Map Feature Types Translation: CoMaps/iOS Plist Translation: CoMaps/iOS Plurals Translation: CoMaps/iOS UI Strings	2026-01-16 17:20:35 +00:00
Yannik Bloscheck	d1eb98d641	[types] Use new subtypes structure for benches (without a backrest) Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com> Co-authored-by: Yannik Bloscheck <git@yannikbloscheck.com> Co-committed-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-16 16:20:07 +01:00
x7z4w	1a07fe4bcb	[generator] Fix warning Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2026-01-16 14:01:06 +01:00
x7z4w	439d8627c5	[search] Add Lithuanian synonyms Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2026-01-16 13:55:30 +01:00
zyphlar	59bfa64c0f	Add poly/bin border editing instructions Signed-off-by: zyphlar <zyphlar@gmail.com>	2026-01-16 13:10:37 +01:00
Jean-Baptiste	cbc6e23522	[search] Improve french synonyms Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-16 11:44:40 +01:00
x7z4w	d2384ebd8a	[indexer] Fix build errors Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2026-01-16 11:37:27 +01:00
x7z4w	7ad09956fb	[search] Add Spanish synonyms Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2026-01-15 21:11:11 +01:00
Jean-Baptiste	1238ae3ef5	[android] Use dark background in the editor Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-15 19:56:35 +01:00
Yannik Bloscheck	41919f61a4	[types] Switched to using a constant for the filename Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-15 19:27:42 +01:00
Yannik Bloscheck	6b0c505bdb	[types] Fix opening of subtypes file for Android Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-15 19:27:42 +01:00
Yannik Bloscheck	fd11533a60	[types] Adding subtypes file to Qt Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-15 19:27:42 +01:00
x7z4w	66582ba249	[search] Add German synonym Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2026-01-15 19:19:56 +01:00
Jean-Baptiste	62a55abeec	[android] Use default background color on bottomsheet Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-15 14:39:18 +01:00
Radek Olsak	393a26e82b	[cmake] Fixed issue when lto enabled Changed the original LTO setup hack using add_compile_options into cmake way of adding LTO. This issue made it impossible to compile flatpaks. Signed-off-by: Radek Olsak <radek@olsak.net>	2026-01-15 12:30:03 +01:00
Yannik Bloscheck	1d10e25761	Adding general support for subtypes (and switching charging stations to using it) Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-14 23:47:33 +01:00
x7z4w	64e13fde0f	[search] nits Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2026-01-14 17:14:23 +00:00
Yannik Bloscheck	6fe4b6e5d0	[types] Add emergency access address for some special use mainly in a Spanish region Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-14 11:09:59 +01:00
Chris H. Meyer	723ee5b2b6	[desktop] show scale in designer Signed-off-by: Chris H. Meyer <christian.h.meyer@t-online.de>	2026-01-13 22:14:12 +01:00
ldcuof	2f462456e2	[routing] Fix track is unpaved when in OSM Data it is paved Signed-off-by: ldcuof <ldcuof@noreply.codeberg.org>	2026-01-13 19:37:38 +01:00
Yannik Bloscheck	d67803fc61	[styles] Show emergency assembly points one zoom level later Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-13 17:57:31 +01:00
Yannik Bloscheck	ad0f7176d0	[styles] Simplifying defibrillator icon Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-13 17:55:29 +01:00
Yannik Bloscheck	b28690701c	[types] Add emergency disaster help points Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-13 17:55:15 +01:00
Chris H. Meyer	d6c93f5206	[desktop] Fix designer Signed-off-by: Chris H. Meyer <christian.h.meyer@t-online.de> Co-authored-by: Yannik Bloscheck <git@yannikbloscheck.com> Co-authored-by: Chris H. Meyer <christian.h.meyer@t-online.de> Co-committed-by: Chris H. Meyer <christian.h.meyer@t-online.de>	2026-01-13 17:51:45 +01:00
x7z4w	239282ec48	[search] Add synonyms Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2026-01-13 17:50:49 +01:00
Yannik Bloscheck	2d2e6eeb69	[styles] Blue public transport label color for subways etc. without custom icon Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-13 17:39:44 +01:00
Jean-Baptiste	3880c3ec29	[android] Improve color of text in how to edit oph Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-13 17:38:39 +01:00
map-per	0d758c51b0	[editor] Add alt and old name to language selection Signed-off-by: map-per <map-per@gmx.de>	2026-01-13 10:47:18 +01:00
map-per	5d0e919bdc	[edior] Reliably hide existingLanguages Signed-off-by: map-per <map-per@gmx.de>	2026-01-13 10:47:18 +01:00
Codeberg Translate	ca1d3fdb20	[strings] Update from Codeberg Translate Co-authored-by: Codeberg Translate <translate@codeberg.org> Co-authored-by: Edgarsons <edgarsons@noreply.codeberg.org> Co-authored-by: Fjuro <fjuro@alius.cz> Co-authored-by: JanezPavelZebovec <janezpavelzebovec@noreply.codeberg.org> Co-authored-by: N4ta <codeberg@n4ta.anonaddy.me> Co-authored-by: NikoM <nikom@noreply.codeberg.org> Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org> Co-authored-by: Stephan-P <stephan-p@noreply.codeberg.org> Co-authored-by: Weblate <noreply-mt-weblate@weblate.org> Co-authored-by: Weblate Translation Memory <noreply-mt-weblate-translation-memory@weblate.org> Co-authored-by: ZeljkoBG <zeljkobg@noreply.codeberg.org> Co-authored-by: arnyminerz <arnyminerz@noreply.codeberg.org> Co-authored-by: cirilla <cirilla@noreply.codeberg.org> Co-authored-by: codebergian42 <codebergian42@noreply.codeberg.org> Co-authored-by: lazlo <lazlo@noreply.codeberg.org> Co-authored-by: ldmpub <ldmpub@noreply.codeberg.org> Co-authored-by: loscati <loscati@noreply.codeberg.org> Co-authored-by: mcliquid <mcliquid@noreply.codeberg.org> Co-authored-by: ovl-005 <ovl-005@noreply.codeberg.org> Co-authored-by: patepelo <patepelo@noreply.codeberg.org> Co-authored-by: rimas <rimas@noreply.codeberg.org> Co-authored-by: sunsand <sunsand@noreply.codeberg.org> Co-authored-by: wirabdillah <wirabdillah@noreply.codeberg.org> Co-authored-by: x7z4w <x7z4w@noreply.codeberg.org> Translate-URL: https://translate.codeberg.org/projects/comaps/android-typestrings/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-typestrings/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/ Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/Android UI Strings Translation: CoMaps/Android UI Strings (SDK) Translation: CoMaps/Countries and regions names Translation: CoMaps/F-Droid app description Translation: CoMaps/Google Play and Huawei AppGallery descriptions Translation: CoMaps/Search synonyms / aliases Translation: CoMaps/Voice announcements for navigation (TTS) Translation: CoMaps/iOS - Map Feature Types Translation: CoMaps/iOS Plist Translation: CoMaps/iOS UI Strings	2026-01-12 21:15:55 +00:00
Jean-Baptiste	537776a883	[android] Reduce top margin on layer bottomsheet on tablet Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-11 19:51:41 +01:00
Jean-Baptiste	13fbe72b55	[android] Fix missing elevation on custom dialogs Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-11 19:30:01 +01:00
Jean-Baptiste	b4abd476db	[android] Add support of dark mode for how to edit oh html file Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-11 17:37:03 +01:00
Jean-Baptiste	649d947eac	[android] Improve colors of buttons in alert dialogs Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-11 14:41:42 +01:00
vikiawv	6af3e80f24	[styles] Fix Vienna U-Bahn Icon, using colors by PTA Wrong colors were used for Vienna subway icons. Now light mode does use official color submitted by the PTA, dark mode was surveyed and confirmed with photos. This PR also adjusts the Icon in the middle a bit, so the shape looks closer to the one submitted by the PTA. Co-authored-by: vikiawv <vikiawv@noreply.codeberg.org> Co-committed-by: vikiawv <vikiawv@noreply.codeberg.org>	2026-01-11 04:34:41 +01:00
Jean-Baptiste	002477c0bb	[android] Rework categories drawables Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-10 21:53:13 +01:00