From 65a9c8c1fecdc96912a6d3f2f76c1d97b4cda384 Mon Sep 17 00:00:00 2001
From: Christoph <47949835+Sir-Photch@users.noreply.github.com>
Date: Fri, 14 Jun 2024 11:57:03 +0200
Subject: [PATCH] Add support for location plugins (#772)

* Cherry pick location refactor

* Refactor :data:openstreetmaps to :data:locations

* contract, plugin sdk

* Implement serialization, module tweaks

* Include check for out-of-date departures in SearchableItemVM.requestUpdatedSearchable()

* settings for location plugins

* Try not to be too lazy

* more fiddling with the plugin SDK

* add departures in MapView with mock data for debug builds

* change icons

* add boats

* animate departure lazycolumn

* Add MarqueeText for text overflow handling

* Define height for Departures in case there is no map to display

* Don't inclure railway / highway tags for OSM since there will be location plugins for that

* sort by time

* - Apply pre-merge changes to LocationSettings
- Add banner warning about slowed down location search for large search radii

* ditch `showLocationOnMap`

* LocationItem: make `showOpeningSchedule` toggleable

* LocationItem: make Navigation AssistChip work for people that don't have google maps installed

* LocationItem: resolve TODOs

* MapTiles: ditch unused code, animate userIndicator

* Reintroduce departure list

* Add LineColor

* Add osm tag `stars` as `userRating` https://taginfo.openstreetmap.org/keys/stars#overview

* typealias -> import

* Don't add Navigation Chip when there is no way to resolve navigation intents

* Add settings migration

* Set plugin SDK version to 1.2.0-SNAPSHOT

* Deduplicate shared plugin classes, use kotlinx.serialization

* Fix imports

* Use ZonedDateTime for depature times

* Add more line types

* Rewrite location serialization

* Replace street/houseNumber with address

* Add attribution field

* Add plugin config

* Reject location search requests without lat lon parameters

* Add default values to plugin location class

* Don't crash if column value is null

* Add docs comments to LocationCategory values

* Refactor OpeningSchedule as polymorphic

* remove dead corpse *ahem* code

* Split LocationCategory into category and icon

(Also update to Kotlin 2.0, please don't do this at home)

* Add more location icons

* Fix (?) location deserializer

* Add more location icons

* More icons

* Meh

* Add Pub

* Disable Github Maven repo if credentials are missing

* Add location search specific settings to plugin details screen

* Add language parameter

* Unbreak the build

* Refactor plugin SDK (with breaking changes)

* Set plugin SDK version to 2.0.0-SNAPSHOT

* Document SDK breaking changes

* Implement LocationProvider.getQuery

* Add a typesafe cursor API

* Oops I did it again

next time maybe check if the code is actually compiling before pushing

* Add missing return statement

* Fix list serialization

* Departure time UI adjustment

* Use typesafe cursor for weather plugins

* Add userRatingCount and emailAddress fields

* grrr

* Rename and extend LineTypes

* Add default lineType to Departure to fix serialization errors

* Fix refreshing stored plugin locations

* Adapt line name column width to available departures

* Fix plugin settings screen category overlap

* add LocationItem.GenericTransit

* Fix crash during deserialization of locations

* Update SDK docs

* Replace plugin "official" mark with "verified developer" mark

before anyone gets sued

* show 'now' when departure is in less than one minute

* Add typesafe Bundle API

* Implement plugin API changes

* Plugin SDK: Fix refresh result not being returned

* Update docs

* apply alpha to departures that have departured

* better (maybe): reduce saturation instead of alpha

* Add default values for Attribution

* Display attribution

* Rearrange location result layout

* Reduce searchable update interval to 1 minute

* Pass last update time to refresh function

* Change refresh path and ensure that timestamp is only update when the item was updated

* categorize osm location

* Update docs

* Optimize location search

- run providers in parallel
- flatten code

* add experimental address parsing for OSM

* add poi_category_townhall

* Fix popup closing when favorites items are updated

* Revert "Fix popup closing when favorites items are updated"

This reverts commit fc517fd066c7f8109b6d6df2d4f536af66398207.

* Fork AndroidAddressFormatter to `:libs:address-formatter`

* migrate `:libs:address-formatter` dependencies to version catalog and update them

* also consider addr:{suburb,hamlet} for `Address.city` if city tag is missing

* Move poi strings back to strings.xml

* Update Jetpack Compose

* Move address-formatter back to its original package, add license and readme

* Move address-formatter back to its original package

---------

Co-authored-by: MM20 <15646950+MM2-0@users.noreply.github.com>
---
 .gitignore                                    |   4 +-
 .idea/inspectionProfiles/Project_Default.xml  |  28 +
 .idea/kotlinc.xml                             |   2 +-
 app/app/build.gradle.kts                      |   4 +-
 .../de/mm20/launcher2/LauncherApplication.kt  |   4 +-
 app/ui/build.gradle.kts                       |   7 +-
 .../launcher2/ui/component/MarqueeText.kt     | 101 +++
 .../mm20/launcher2/ui/component/RatingBar.kt  |  17 +-
 .../ui/component/ShapedLauncherIcon.kt        | 125 +---
 .../component/preferences/TextPreference.kt   |   2 +
 .../component/weather/AnimatedWeatherIcon.kt  |   8 +-
 .../ui/component/weather/WeatherIcon.kt       |  14 +-
 .../mm20/launcher2/ui/ktx/ContentDrawState.kt |  24 +
 .../de/mm20/launcher2/ui/ktx/MutableState.kt  |   2 +-
 .../launcher2/ui/launcher/search/SearchVM.kt  |  12 +-
 .../search/common/SearchableItemVM.kt         |  18 +-
 .../launcher/search/common/grid/GridItem.kt   |   3 -
 .../launcher/search/common/list/ListItem.kt   |   2 -
 .../launcher/search/contacts/ContactItem.kt   |   9 +-
 .../search/filters/KeyboardFilterBar.kt       |  14 -
 .../search/filters/KeyboardFilterBarItem.kt   |   2 +-
 .../launcher/search/filters/SearchFilters.kt  |   2 +-
 .../launcher/search/location/LocationItem.kt  | 657 +++++++++++++-----
 .../ui/launcher/search/location/MapTiles.kt   |  65 +-
 .../clock/parts/BatteryPartProvider.kt        |  15 +-
 .../launcher/widgets/weather/WeatherWidget.kt |   8 +-
 .../ui/settings/about/AboutSettingsScreen.kt  |   6 +-
 .../filesearch/FileSearchSettingsScreen.kt    |   4 +-
 .../locations/LocationsSettingsScreen.kt      |  87 ++-
 .../locations/LocationsSettingsScreenVM.kt    |  40 +-
 .../settings/plugins/PluginSettingsScreen.kt  | 275 +++++---
 .../plugins/PluginSettingsScreenVM.kt         |  12 +
 .../settings/plugins/PluginsSettingsScreen.kt |   9 -
 .../settings/search/SearchSettingsScreen.kt   |  11 +-
 .../settings/search/SearchSettingsScreenVM.kt |   8 -
 core/base/build.gradle.kts                    |   3 +
 .../de/mm20/launcher2}/icons/BatteryIcons.kt  |   2 +-
 .../java/de/mm20/launcher2}/icons/Icons.kt    | 332 ++++++++-
 .../mm20/launcher2/icons/LauncherIconLayer.kt |   6 +
 .../de/mm20/launcher2/plugin/PluginApi.kt     |  26 +-
 .../de/mm20/launcher2/plugin/PluginPackage.kt |   2 +-
 .../mm20/launcher2/plugin/QueryPluginApi.kt   | 190 +++++
 .../plugin/config/SearchPluginConfig.kt       |   4 +-
 .../java/de/mm20/launcher2/search/Location.kt | 507 ++++++++------
 .../launcher2/search/UpdatableSearchable.kt   |  15 +-
 .../launcher2/search/OpeningScheduleTest.kt   |   2 +
 .../devicepose/DevicePoseProvider.kt          |   2 +
 core/i18n/src/main/res/values-pl/strings.xml  |   2 +-
 core/i18n/src/main/res/values/strings.xml     |  49 ++
 .../main/java/de/mm20/launcher2/ktx/Json.kt   |   3 +-
 .../de/mm20/launcher2/ktx/PendingIntent.kt    |  10 +-
 .../preferences/LauncherDataStore.kt          |   2 +
 .../preferences/LauncherSettingsData.kt       |   2 +
 .../preferences/migrations/Migration3.kt      |  24 +
 .../search/LocationSearchSettings.kt          |  43 +-
 core/shared/build.gradle.kts                  |  22 +-
 .../de/mm20/launcher2/plugin/PluginType.kt    |   1 +
 ...chPluginConfig.kt => QueryPluginConfig.kt} |   5 +-
 .../plugin/config/StorageStrategy.kt          |  14 +-
 .../launcher2/plugin/contracts/Columns.kt     | 271 ++++++++
 .../plugin/contracts/FilePluginContract.kt    |  41 +-
 .../contracts/LocationPluginContract.kt       | 143 ++++
 .../plugin/contracts/SearchPluginContract.kt  |  18 +-
 .../plugin/contracts/WeatherPluginContract.kt |  50 +-
 .../de/mm20/launcher2/plugin/data/Bundle.kt   |  17 +
 .../de/mm20/launcher2/plugin/data/Cursor.kt   |  77 ++
 .../mm20/launcher2/search/location/Address.kt |  35 +
 .../launcher2/search/location/Attribution.kt  |  13 +
 .../launcher2/search/location/Departure.kt    |  47 ++
 .../launcher2/search/location/LocationIcon.kt | 139 ++++
 .../search/location/OpeningSchedule.kt        |  30 +
 .../serialization/ColorSerializer.kt          |  21 +
 .../serialization/DayOfWeekSerializer.kt      |  22 +
 .../serialization/DurationSerializer.kt       |  20 +
 .../de/mm20/launcher2/serialization/Json.kt   |  17 +
 .../serialization/LocalTimeSerializer.kt      |  21 +
 .../OpeningScheduleSerializer.kt              |  55 ++
 .../launcher2/serialization/UriSerializer.kt  |  21 +
 .../serialization/ZonedDateTimeSerializer.kt  |  27 +
 .../de/mm20/launcher2/weather/WeatherIcon.kt  |  25 +
 .../mm20/launcher2/files/FileSerialization.kt | 111 +--
 .../launcher2/files/providers/DeferredFile.kt |   3 +-
 .../launcher2/files/providers/PluginFile.kt   |   6 +-
 .../files/providers/PluginFileProvider.kt     | 285 +++-----
 data/{openstreetmaps => locations}/.gitignore |   0
 .../build.gradle.kts                          |   1 +
 data/locations/consumer-rules.pro             |   2 +
 .../proguard-rules.pro                        |   0
 .../src/main/AndroidManifest.xml              |   0
 .../locations/LocationSerialization.kt        | 198 ++++++
 .../locations/LocationsRepository.kt          |  86 +++
 .../de/mm20/launcher2/locations/Module.kt     |  19 +
 .../locations/providers/LocationProvider.kt   |  16 +
 .../locations/providers/PluginLocation.kt     |  66 ++
 .../providers/PluginLocationProvider.kt       | 121 ++++
 .../providers/openstreetmaps/OsmLocation.kt   | 495 +++++++++++++
 .../openstreetmaps/OsmLocationProvider.kt     | 171 +++++
 .../providers}/openstreetmaps/OverpassApi.kt  |   2 +-
 data/openstreetmaps/consumer-rules.pro        |   2 -
 .../mm20/launcher2/openstreetmaps/Module.kt   |  13 -
 .../launcher2/openstreetmaps/OsmLocation.kt   | 302 --------
 .../launcher2/openstreetmaps/OsmRepository.kt | 195 ------
 .../openstreetmaps/OsmSerialization.kt        | 107 ---
 .../weather/plugin/PluginWeatherProvider.kt   | 151 +---
 .../developer-guide/plugins/get-started.md    |   1 +
 .../developer-guide/plugins/migrations/v2.md  |  39 ++
 .../plugin-types/common/_get_params.md        |   4 +
 .../common/_query_plugin_config.md            |  18 +
 .../plugin-types/common/_refresh_params.md    |   7 +
 .../plugin-types/common/_search_params.md     |  11 +
 .../common/_search_plugin_config.md           |  20 -
 .../plugins/plugin-types/file-search.md       |  52 +-
 .../plugins/plugin-types/places-search.md     | 124 ++++
 .../plugins/plugin-types/weather.md           |   1 +
 docs/docs/developer-guide/sidebar.ts          |  14 +
 gradle/libs.versions.toml                     |  21 +-
 libs/address-formatter/LICENSE                |  21 +
 libs/address-formatter/Readme.md              |   2 +
 libs/address-formatter/build.gradle           |  30 +
 libs/address-formatter/proguard-rules.pro     |  17 +
 .../OsmAddressFormatter.java                  | 478 +++++++++++++
 .../RegexPatternCache.java                    |  29 +
 .../AndroidAddressFormatter/Templates.java    |  45 ++
 .../src/main/resources/abbreviations.json     |   1 +
 .../src/main/resources/aliases.json           |   1 +
 .../src/main/resources/country2lang.json      |   1 +
 .../src/main/resources/countrynames.json      |   1 +
 .../src/main/resources/countycodes.json       |   1 +
 .../src/main/resources/statecodes.json        |   1 +
 .../src/main/resources/worldwide.json         |   1 +
 plugins/sdk/build.gradle.kts                  |  16 +-
 .../launcher2/sdk/base/QueryPluginProvider.kt | 195 ++++++
 .../sdk/base/SearchPluginProvider.kt          | 123 ----
 .../sdk/base/StringPluginProvider.kt          |  14 +
 .../sdk/config/SearchPluginConfig.kt          |   4 +-
 .../mm20/launcher2/sdk/files/FileProvider.kt  |  87 +--
 .../mm20/launcher2/sdk/locations/Location.kt  |  37 +
 .../sdk/locations/LocationProvider.kt         |  80 +++
 .../launcher2/sdk/locations/LocationQuery.kt  |   8 +
 .../de/mm20/launcher2/sdk/weather/Forecast.kt |  27 +-
 .../launcher2/sdk/weather/WeatherProvider.kt  | 120 +---
 .../ThemedPlaceholderIconProvider.kt          |   1 +
 .../mm20/launcher2/plugins/PluginScanner.kt   |   2 +
 .../mm20/launcher2/plugins/PluginService.kt   |  14 +-
 settings.gradle.kts                           |   3 +-
 145 files changed, 5804 insertions(+), 2199 deletions(-)
 create mode 100644 app/ui/src/main/java/de/mm20/launcher2/ui/component/MarqueeText.kt
 create mode 100644 app/ui/src/main/java/de/mm20/launcher2/ui/ktx/ContentDrawState.kt
 rename {app/ui/src/main/java/de/mm20/launcher2/ui => core/base/src/main/java/de/mm20/launcher2}/icons/BatteryIcons.kt (99%)
 rename {app/ui/src/main/java/de/mm20/launcher2/ui => core/base/src/main/java/de/mm20/launcher2}/icons/Icons.kt (83%)
 create mode 100644 core/base/src/main/java/de/mm20/launcher2/plugin/QueryPluginApi.kt
 create mode 100644 core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration3.kt
 rename core/shared/src/main/java/de/mm20/launcher2/plugin/config/{SearchPluginConfig.kt => QueryPluginConfig.kt} (67%)
 create mode 100644 core/shared/src/main/java/de/mm20/launcher2/plugin/contracts/Columns.kt
 create mode 100644 core/shared/src/main/java/de/mm20/launcher2/plugin/contracts/LocationPluginContract.kt
 create mode 100644 core/shared/src/main/java/de/mm20/launcher2/plugin/data/Bundle.kt
 create mode 100644 core/shared/src/main/java/de/mm20/launcher2/plugin/data/Cursor.kt
 create mode 100644 core/shared/src/main/java/de/mm20/launcher2/search/location/Address.kt
 create mode 100644 core/shared/src/main/java/de/mm20/launcher2/search/location/Attribution.kt
 create mode 100644 core/shared/src/main/java/de/mm20/launcher2/search/location/Departure.kt
 create mode 100644 core/shared/src/main/java/de/mm20/launcher2/search/location/LocationIcon.kt
 create mode 100644 core/shared/src/main/java/de/mm20/launcher2/search/location/OpeningSchedule.kt
 create mode 100644 core/shared/src/main/java/de/mm20/launcher2/serialization/ColorSerializer.kt
 create mode 100644 core/shared/src/main/java/de/mm20/launcher2/serialization/DayOfWeekSerializer.kt
 create mode 100644 core/shared/src/main/java/de/mm20/launcher2/serialization/DurationSerializer.kt
 create mode 100644 core/shared/src/main/java/de/mm20/launcher2/serialization/Json.kt
 create mode 100644 core/shared/src/main/java/de/mm20/launcher2/serialization/LocalTimeSerializer.kt
 create mode 100644 core/shared/src/main/java/de/mm20/launcher2/serialization/OpeningScheduleSerializer.kt
 create mode 100644 core/shared/src/main/java/de/mm20/launcher2/serialization/UriSerializer.kt
 create mode 100644 core/shared/src/main/java/de/mm20/launcher2/serialization/ZonedDateTimeSerializer.kt
 create mode 100644 core/shared/src/main/java/de/mm20/launcher2/weather/WeatherIcon.kt
 rename data/{openstreetmaps => locations}/.gitignore (100%)
 rename data/{openstreetmaps => locations}/build.gradle.kts (96%)
 create mode 100644 data/locations/consumer-rules.pro
 rename data/{openstreetmaps => locations}/proguard-rules.pro (100%)
 rename data/{openstreetmaps => locations}/src/main/AndroidManifest.xml (100%)
 create mode 100644 data/locations/src/main/java/de/mm20/launcher2/locations/LocationSerialization.kt
 create mode 100644 data/locations/src/main/java/de/mm20/launcher2/locations/LocationsRepository.kt
 create mode 100644 data/locations/src/main/java/de/mm20/launcher2/locations/Module.kt
 create mode 100644 data/locations/src/main/java/de/mm20/launcher2/locations/providers/LocationProvider.kt
 create mode 100644 data/locations/src/main/java/de/mm20/launcher2/locations/providers/PluginLocation.kt
 create mode 100644 data/locations/src/main/java/de/mm20/launcher2/locations/providers/PluginLocationProvider.kt
 create mode 100644 data/locations/src/main/java/de/mm20/launcher2/locations/providers/openstreetmaps/OsmLocation.kt
 create mode 100644 data/locations/src/main/java/de/mm20/launcher2/locations/providers/openstreetmaps/OsmLocationProvider.kt
 rename data/{openstreetmaps/src/main/java/de/mm20/launcher2 => locations/src/main/java/de/mm20/launcher2/locations/providers}/openstreetmaps/OverpassApi.kt (97%)
 delete mode 100644 data/openstreetmaps/consumer-rules.pro
 delete mode 100644 data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/Module.kt
 delete mode 100644 data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OsmLocation.kt
 delete mode 100644 data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OsmRepository.kt
 delete mode 100644 data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OsmSerialization.kt
 create mode 100644 docs/docs/developer-guide/plugins/migrations/v2.md
 create mode 100644 docs/docs/developer-guide/plugins/plugin-types/common/_get_params.md
 create mode 100644 docs/docs/developer-guide/plugins/plugin-types/common/_query_plugin_config.md
 create mode 100644 docs/docs/developer-guide/plugins/plugin-types/common/_refresh_params.md
 create mode 100644 docs/docs/developer-guide/plugins/plugin-types/common/_search_params.md
 delete mode 100644 docs/docs/developer-guide/plugins/plugin-types/common/_search_plugin_config.md
 create mode 100644 docs/docs/developer-guide/plugins/plugin-types/places-search.md
 create mode 100644 libs/address-formatter/LICENSE
 create mode 100644 libs/address-formatter/Readme.md
 create mode 100644 libs/address-formatter/build.gradle
 create mode 100644 libs/address-formatter/proguard-rules.pro
 create mode 100644 libs/address-formatter/src/main/java/org/woheller69/AndroidAddressFormatter/OsmAddressFormatter.java
 create mode 100644 libs/address-formatter/src/main/java/org/woheller69/AndroidAddressFormatter/RegexPatternCache.java
 create mode 100644 libs/address-formatter/src/main/java/org/woheller69/AndroidAddressFormatter/Templates.java
 create mode 100644 libs/address-formatter/src/main/resources/abbreviations.json
 create mode 100644 libs/address-formatter/src/main/resources/aliases.json
 create mode 100644 libs/address-formatter/src/main/resources/country2lang.json
 create mode 100644 libs/address-formatter/src/main/resources/countrynames.json
 create mode 100644 libs/address-formatter/src/main/resources/countycodes.json
 create mode 100644 libs/address-formatter/src/main/resources/statecodes.json
 create mode 100644 libs/address-formatter/src/main/resources/worldwide.json
 create mode 100644 plugins/sdk/src/main/java/de/mm20/launcher2/sdk/base/QueryPluginProvider.kt
 delete mode 100644 plugins/sdk/src/main/java/de/mm20/launcher2/sdk/base/SearchPluginProvider.kt
 create mode 100644 plugins/sdk/src/main/java/de/mm20/launcher2/sdk/base/StringPluginProvider.kt
 create mode 100644 plugins/sdk/src/main/java/de/mm20/launcher2/sdk/locations/Location.kt
 create mode 100644 plugins/sdk/src/main/java/de/mm20/launcher2/sdk/locations/LocationProvider.kt
 create mode 100644 plugins/sdk/src/main/java/de/mm20/launcher2/sdk/locations/LocationQuery.kt

diff --git a/.gitignore b/.gitignore
index 7c99b000..90ec7398 100644
--- a/.gitignore
+++ b/.gitignore
@@ -305,4 +305,6 @@ fabric.properties
 .idea/deploymentTargetDropDown.xml
 .idea/deploymentTargetSelector.xml
 .idea/copilot
-.idea/other.xml
\ No newline at end of file
+.idea/other.xml
+
+.kotlin
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 7f097246..3e11d4a5 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -2,6 +2,34 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="AndroidLintNewerVersionAvailable" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 148fdd24..6d0ee1c2 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.24" />
+    <option name="version" value="2.0.0" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/app/build.gradle.kts b/app/app/build.gradle.kts
index ffd40504..e894d861 100644
--- a/app/app/build.gradle.kts
+++ b/app/app/build.gradle.kts
@@ -57,7 +57,7 @@ android {
         }
         debug {
             applicationIdSuffix = ".debug"
-            isDebuggable = false
+            isDebuggable = true
         }
         create("nightly") {
             initWith(getByName("release"))
@@ -166,7 +166,7 @@ dependencies {
     implementation(project(":services:global-actions"))
     implementation(project(":services:widgets"))
     implementation(project(":services:favorites"))
-    implementation(project(":data:openstreetmaps"))
+    implementation(project(":data:locations"))
     implementation(project(":services:plugins"))
     implementation(project(":core:devicepose"))
 
diff --git a/app/app/src/main/java/de/mm20/launcher2/LauncherApplication.kt b/app/app/src/main/java/de/mm20/launcher2/LauncherApplication.kt
index 47f33b95..17362fce 100644
--- a/app/app/src/main/java/de/mm20/launcher2/LauncherApplication.kt
+++ b/app/app/src/main/java/de/mm20/launcher2/LauncherApplication.kt
@@ -26,7 +26,7 @@ import de.mm20.launcher2.database.databaseModule
 import de.mm20.launcher2.debug.initDebugMode
 import de.mm20.launcher2.globalactions.globalActionsModule
 import de.mm20.launcher2.notifications.notificationsModule
-import de.mm20.launcher2.openstreetmaps.openStreetMapsModule
+import de.mm20.launcher2.locations.locationsModule
 import de.mm20.launcher2.permissions.permissionsModule
 import de.mm20.launcher2.data.plugins.dataPluginsModule
 import de.mm20.launcher2.devicepose.devicePoseModule
@@ -87,7 +87,7 @@ class LauncherApplication : Application(), CoroutineScope, ImageLoaderFactory {
                     websitesModule,
                     widgetsModule,
                     wikipediaModule,
-                    openStreetMapsModule,
+                    locationsModule,
                     servicesTagsModule,
                     widgetsServiceModule,
                     dataPluginsModule,
diff --git a/app/ui/build.gradle.kts b/app/ui/build.gradle.kts
index 4aed0e48..dc39c6bf 100644
--- a/app/ui/build.gradle.kts
+++ b/app/ui/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.plugin.compose)
 }
 
 android {
@@ -58,10 +59,6 @@ android {
         viewBinding = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
-
     lint {
         abortOnError = false
     }
@@ -141,7 +138,7 @@ dependencies {
     implementation(project(":core:crashreporter"))
     implementation(project(":data:notifications"))
     implementation(project(":data:contacts"))
-    implementation(project(":data:openstreetmaps"))
+    implementation(project(":data:locations"))
     implementation(project(":core:permissions"))
     implementation(project(":data:websites"))
     implementation(project(":data:unitconverter"))
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/component/MarqueeText.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/MarqueeText.kt
new file mode 100644
index 00000000..8726d1ac
--- /dev/null
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/component/MarqueeText.kt
@@ -0,0 +1,101 @@
+package de.mm20.launcher2.ui.component
+
+import androidx.compose.foundation.MarqueeAnimationMode
+import androidx.compose.foundation.MarqueeAnimationMode.Companion.Immediately
+import androidx.compose.foundation.MarqueeDefaults
+import androidx.compose.foundation.MarqueeSpacing
+import androidx.compose.foundation.basicMarquee
+import androidx.compose.material3.LocalTextStyle
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.CompositingStrategy
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.TextUnit
+import de.mm20.launcher2.ui.ktx.conditional
+import de.mm20.launcher2.ui.ktx.drawFadedEdge
+
+@Composable
+fun MarqueeText(
+    text: String,
+    modifier: Modifier = Modifier,
+    color: Color = Color.Unspecified,
+    fontSize: TextUnit = TextUnit.Unspecified,
+    fontStyle: FontStyle? = null,
+    fontWeight: FontWeight? = null,
+    fontFamily: FontFamily? = null,
+    letterSpacing: TextUnit = TextUnit.Unspecified,
+    textDecoration: TextDecoration? = null,
+    textAlign: TextAlign? = null,
+    lineHeight: TextUnit = TextUnit.Unspecified,
+    style: TextStyle = LocalTextStyle.current,
+    iterations: Int = MarqueeDefaults.Iterations,
+    animationMode: MarqueeAnimationMode = Immediately,
+    repeatDelayMillis: Int = MarqueeDefaults.RepeatDelayMillis,
+    initialDelayMillis: Int = if (animationMode == Immediately) repeatDelayMillis else 0,
+    spacing: MarqueeSpacing = MarqueeDefaults.Spacing,
+    velocity: Dp = MarqueeDefaults.Velocity,
+    fadeLeft: Dp? = null,
+    fadeRight: Dp? = null,
+) {
+    var textSize by remember { mutableIntStateOf(0) }
+    var textLayout by remember { mutableStateOf<TextLayoutResult?>(null) }
+
+    Text(
+        text = text,
+        style = style,
+        color = color,
+        fontSize = fontSize,
+        fontStyle = fontStyle,
+        fontWeight = fontWeight,
+        fontFamily = fontFamily,
+        letterSpacing = letterSpacing,
+        textDecoration = textDecoration,
+        textAlign = textAlign,
+        lineHeight = lineHeight,
+        softWrap = false,
+        maxLines = 1,
+        onTextLayout = { textLayout = it },
+        modifier = modifier
+            .onGloballyPositioned { textSize = it.size.width }
+            .graphicsLayer {
+                compositingStrategy = CompositingStrategy.Offscreen
+            }
+            .conditional(
+                textLayout != null && textLayout!!.size.width > textSize,
+                Modifier
+                    .drawWithContent {
+                        drawContent()
+                        if (fadeLeft != null) {
+                            drawFadedEdge(leftEdge = true, fadeLeft)
+                        }
+                        if (fadeRight != null) {
+                            drawFadedEdge(leftEdge = false, fadeRight)
+                        }
+                    }
+            )
+            .basicMarquee(
+                iterations = iterations,
+                initialDelayMillis = initialDelayMillis,
+                spacing = spacing,
+                repeatDelayMillis = repeatDelayMillis,
+                velocity = velocity
+            )
+    )
+}
\ No newline at end of file
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/component/RatingBar.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/RatingBar.kt
index b423ddfa..05cded49 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/component/RatingBar.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/component/RatingBar.kt
@@ -1,6 +1,8 @@
 package de.mm20.launcher2.ui.component
 
+import android.icu.text.DecimalFormat
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.rounded.StarHalf
@@ -8,7 +10,9 @@ import androidx.compose.material.icons.rounded.Star
 import androidx.compose.material.icons.rounded.StarOutline
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
@@ -25,7 +29,8 @@ fun RatingBar(
     rating: Float,
     modifier: Modifier = Modifier,
     tint: Color = MaterialTheme.colorScheme.primary,
-    starSize: Dp = 16.dp
+    starSize: Dp = 16.dp,
+    ratingCount: Int? = null,
 ) {
     val starRating = round(rating * 10f).toInt()
     val fullStars = starRating / 2
@@ -34,6 +39,7 @@ fun RatingBar(
     val iconModifier = Modifier.size(starSize)
     Row(
         modifier = modifier,
+        verticalAlignment = Alignment.CenterVertically
     ) {
         for (i in 0 until fullStars) {
             Icon(
@@ -59,11 +65,18 @@ fun RatingBar(
                 modifier = iconModifier
             )
         }
+        Text(
+            modifier = Modifier.padding(start = 4.dp),
+            text = DecimalFormat("#.0").format(starRating / 2) +
+                    if (ratingCount == null) "" else " ($ratingCount)",
+            style = MaterialTheme.typography.bodySmall,
+            color = MaterialTheme.colorScheme.onSurfaceVariant
+        )
     }
 }
 
 @Preview
 @Composable
 fun RatingBarPreview() {
-    RatingBar(0.67f)
+    RatingBar(0.68f, ratingCount = 263)
 }
\ No newline at end of file
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/component/ShapedLauncherIcon.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/ShapedLauncherIcon.kt
index 77890aa5..a232d6f9 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/component/ShapedLauncherIcon.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/component/ShapedLauncherIcon.kt
@@ -8,14 +8,9 @@ import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
 import android.graphics.RectF
 import android.graphics.drawable.AdaptiveIconDrawable
-import android.util.Log
-import androidx.compose.animation.core.Animatable
-import androidx.compose.animation.core.LinearEasing
 import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.animation.core.tween
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
@@ -25,6 +20,7 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.GenericShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
@@ -67,17 +63,14 @@ import de.mm20.launcher2.badges.Badge
 import de.mm20.launcher2.icons.ClockLayer
 import de.mm20.launcher2.icons.ClockSublayer
 import de.mm20.launcher2.icons.ClockSublayerRole
-import de.mm20.launcher2.icons.ColorLayer
 import de.mm20.launcher2.icons.DynamicLauncherIcon
 import de.mm20.launcher2.icons.LauncherIcon
-import de.mm20.launcher2.icons.LauncherIconLayer
 import de.mm20.launcher2.icons.LauncherIconRenderSettings
-import de.mm20.launcher2.icons.StaticIconLayer
 import de.mm20.launcher2.icons.StaticLauncherIcon
 import de.mm20.launcher2.icons.TextLayer
 import de.mm20.launcher2.icons.TintedClockLayer
-import de.mm20.launcher2.icons.TintedIconLayer
 import de.mm20.launcher2.icons.TransparentLayer
+import de.mm20.launcher2.icons.VectorLayer
 import de.mm20.launcher2.ktx.drawWithColorFilter
 import de.mm20.launcher2.preferences.IconShape
 import de.mm20.launcher2.ui.base.LocalTime
@@ -85,10 +78,8 @@ import de.mm20.launcher2.ui.ktx.toPixels
 import de.mm20.launcher2.ui.locals.LocalDarkTheme
 import de.mm20.launcher2.ui.locals.LocalGridSettings
 import de.mm20.launcher2.ui.modifier.scale
-import kotlinx.coroutines.launch
 import palettes.TonalPalette
 import java.time.Instant
-import java.time.LocalDate
 import java.time.ZoneId
 import kotlin.math.abs
 import kotlin.math.pow
@@ -220,6 +211,17 @@ fun ShapedLauncherIcon(
                         )
                     }
 
+                    is VectorLayer -> {
+                        Icon(
+                            imageVector = fg.vector, contentDescription = null,
+                            tint = if (fg.color == 0) {
+                                Color(renderSettings.fgThemeColor)
+                            } else {
+                                Color(getTone(fg.color, renderSettings.fgTone))
+                            },
+                        )
+                    }
+
                     else -> {}
                 }
             } else {
@@ -303,98 +305,6 @@ fun ShapedLauncherIcon(
     }
 }
 
-@Composable
-private fun IconLayer(
-    layer: LauncherIconLayer,
-    size: Dp,
-    colorTone: Int,
-    defaultTintColor: Color
-) {
-    when (layer) {
-        is ClockLayer -> {
-            ClockLayer(
-                layer.sublayers,
-                scale = layer.scale,
-                defaultSecond = layer.defaultSecond,
-                defaultMinute = layer.defaultMinute,
-                defaultHour = layer.defaultHour,
-                tintColor = null
-            )
-        }
-
-        is TintedClockLayer -> {
-            ClockLayer(
-                layer.sublayers,
-                scale = layer.scale,
-                defaultSecond = layer.defaultSecond,
-                defaultMinute = layer.defaultMinute,
-                defaultHour = layer.defaultHour,
-                tintColor = if (layer.color == 0) defaultTintColor
-                else Color(getTone(layer.color, colorTone))
-            )
-
-        }
-
-        is ColorLayer -> {
-            Box(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .background(
-                        if (layer.color == 0) {
-                            defaultTintColor
-                        } else {
-                            Color(getTone(layer.color, colorTone))
-                        }
-                    )
-            )
-        }
-
-        is StaticIconLayer -> {
-            Canvas(modifier = Modifier.fillMaxSize()) {
-                withTransform({
-                    this.scale(layer.scale)
-                }) {
-                    drawIntoCanvas {
-                        layer.icon.bounds = this.size.toRect().toAndroidRect()
-                        layer.icon.draw(it.nativeCanvas)
-                    }
-                }
-            }
-        }
-
-        is TextLayer -> {
-            Text(
-                text = layer.text,
-                style = MaterialTheme.typography.headlineSmall.copy(
-                    fontSize = 20.sp * (size / 48.dp)
-                ),
-                color = if (layer.color == 0) {
-                    defaultTintColor
-                } else {
-                    Color(getTone(layer.color, colorTone))
-                },
-            )
-        }
-
-        is TintedIconLayer -> {
-            val color =
-                if (layer.color == 0) defaultTintColor.toArgb()
-                else getTone(layer.color, colorTone)
-            Canvas(modifier = Modifier.fillMaxSize()) {
-                drawIntoCanvas {
-                    layer.icon.bounds = this.size.toRect().toAndroidRect()
-                    layer.icon.drawWithColorFilter(
-                        it.nativeCanvas,
-                        PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN)
-                    )
-                }
-            }
-        }
-
-        is TransparentLayer -> {}
-    }
-}
-
 private fun getTone(argb: Int, tone: Int): Int {
     return TonalPalette
         .fromInt(argb)
@@ -430,8 +340,13 @@ private fun ClockLayer(
                         sublayer.drawable.level = (((hour - defaultHour + 12) % 12) * 60
                                 + ((minute) % 60))
                     }
-                    ClockSublayerRole.Minute -> sublayer.drawable.level = ((minute - defaultMinute + 60) % 60)
-                    ClockSublayerRole.Second -> sublayer.drawable.level = (((second - defaultSecond + 60) % 60) * 10)
+
+                    ClockSublayerRole.Minute -> sublayer.drawable.level =
+                        ((minute - defaultMinute + 60) % 60)
+
+                    ClockSublayerRole.Second -> sublayer.drawable.level =
+                        (((second - defaultSecond + 60) % 60) * 10)
+
                     else -> {}
                 }
                 drawIntoCanvas {
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/TextPreference.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/TextPreference.kt
index 91e88d2c..6cee47a6 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/TextPreference.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/TextPreference.kt
@@ -9,6 +9,7 @@ fun TextPreference(
     title: String,
     value: String,
     summary: String? = value,
+    enabled: Boolean = true,
     onValueChanged: (String) -> Unit,
     placeholder: String? = null
 ) {
@@ -16,6 +17,7 @@ fun TextPreference(
     Preference(
         title = title,
         summary = summary,
+        enabled = enabled,
         onClick = { showDialog = true }
     )
 
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/component/weather/AnimatedWeatherIcon.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/weather/AnimatedWeatherIcon.kt
index 155dd3c9..9278e3b2 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/component/weather/AnimatedWeatherIcon.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/component/weather/AnimatedWeatherIcon.kt
@@ -23,8 +23,14 @@ import androidx.compose.ui.draw.scale
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import de.mm20.launcher2.icons.WeatherCloud
+import de.mm20.launcher2.icons.WeatherFog
+import de.mm20.launcher2.icons.WeatherHailAnimatable
+import de.mm20.launcher2.icons.WeatherLightRainAnimatable
+import de.mm20.launcher2.icons.WeatherRainAnimatable
+import de.mm20.launcher2.icons.WeatherSleetRainAnimatable
+import de.mm20.launcher2.icons.WeatherSleetSnowAnimatable
 import de.mm20.launcher2.ui.R
-import de.mm20.launcher2.ui.icons.*
 import kotlin.math.PI
 import kotlin.math.sin
 
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/component/weather/WeatherIcon.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/weather/WeatherIcon.kt
index 8185ae42..d7c05ac5 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/component/weather/WeatherIcon.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/component/weather/WeatherIcon.kt
@@ -18,13 +18,13 @@ import androidx.compose.ui.draw.scale
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
-import de.mm20.launcher2.ui.icons.WeatherCloud
-import de.mm20.launcher2.ui.icons.WeatherFog
-import de.mm20.launcher2.ui.icons.WeatherHail
-import de.mm20.launcher2.ui.icons.WeatherLightRain
-import de.mm20.launcher2.ui.icons.WeatherRain
-import de.mm20.launcher2.ui.icons.WeatherSleetRain
-import de.mm20.launcher2.ui.icons.WeatherSleetSnow
+import de.mm20.launcher2.icons.WeatherCloud
+import de.mm20.launcher2.icons.WeatherFog
+import de.mm20.launcher2.icons.WeatherHail
+import de.mm20.launcher2.icons.WeatherLightRain
+import de.mm20.launcher2.icons.WeatherRain
+import de.mm20.launcher2.icons.WeatherSleetRain
+import de.mm20.launcher2.icons.WeatherSleetSnow
 
 @Composable
 fun WeatherIcon(
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/ktx/ContentDrawState.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/ktx/ContentDrawState.kt
new file mode 100644
index 00000000..30113a28
--- /dev/null
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/ktx/ContentDrawState.kt
@@ -0,0 +1,24 @@
+package de.mm20.launcher2.ui.ktx
+
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.BlendMode
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.drawscope.ContentDrawScope
+import androidx.compose.ui.unit.Dp
+
+fun ContentDrawScope.drawFadedEdge(leftEdge: Boolean, edgeWidth: Dp) {
+    // https://stackoverflow.com/a/75112743
+    val edgeWidthPx = edgeWidth.toPx()
+    drawRect(
+        topLeft = Offset(if (leftEdge) 0f else size.width - edgeWidthPx, 0f),
+        size = Size(edgeWidthPx, size.height),
+        brush = Brush.horizontalGradient(
+            colors = listOf(Color.Transparent, Color.Black),
+            startX = if (leftEdge) 0f else size.width,
+            endX = if (leftEdge) edgeWidthPx else size.width - edgeWidthPx
+        ),
+        blendMode = BlendMode.DstIn
+    )
+}
\ No newline at end of file
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/ktx/MutableState.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/ktx/MutableState.kt
index 6bf2af18..851bbd43 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/ktx/MutableState.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/ktx/MutableState.kt
@@ -17,7 +17,7 @@ suspend fun MutableState<Float>.animateTo(targetValue: Float) {
 
 suspend inline fun <T, V: AnimationVector> MutableState<T>.animateTo(targetValue: T, converter: TwoWayConverter<T, V>) {
     val animatable = Animatable(this.value, converter)
-    animatable.animateTo(targetValue) {
+    animatable.animateTo(targetValue) animatable@ {
         this@animateTo.value = this.value
     }
 }
\ No newline at end of file
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt
index 2791cac4..963fdfa5 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt
@@ -225,10 +225,11 @@ class SearchVM : ViewModel(), KoinComponent {
                         }
 
                     resultsList = resultsList.sortedWith { a, b ->
+                        val lastLocation = devicePoseProvider.lastLocation
                         when {
-                            a is Location && b is Location && devicePoseProvider.lastLocation != null -> {
-                                a.distanceTo(devicePoseProvider.lastLocation!!)
-                                    .compareTo(b.distanceTo(devicePoseProvider.lastLocation!!))
+                            a is Location && b is Location && lastLocation != null -> {
+                                a.distanceTo(lastLocation)
+                                    .compareTo(b.distanceTo(lastLocation))
                             }
 
                             a is SavableSearchable && b !is SavableSearchable -> -1
@@ -250,7 +251,6 @@ class SearchVM : ViewModel(), KoinComponent {
                         }
                     }
 
-
                     hiddenItemKeys.collectLatest { hiddenKeys ->
                         val hidden = mutableListOf<SavableSearchable>()
                         val apps = mutableListOf<Application>()
@@ -349,7 +349,7 @@ class SearchVM : ViewModel(), KoinComponent {
 
     val missingLocationPermission = combine(
         permissionsManager.hasPermission(PermissionGroup.Location),
-        locationSearchSettings.enabled.distinctUntilChanged()
+        locationSearchSettings.osmLocations.distinctUntilChanged()
     ) { perm, enabled -> !perm && enabled }
 
     fun requestLocationPermission(context: AppCompatActivity) {
@@ -357,7 +357,7 @@ class SearchVM : ViewModel(), KoinComponent {
     }
 
     fun disableLocationSearch() {
-        locationSearchSettings.setEnabled(false)
+        locationSearchSettings.setOsmLocations(false)
     }
 
     val missingFilesPermission = combine(
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/SearchableItemVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/SearchableItemVM.kt
index 54c31176..52c9ab39 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/SearchableItemVM.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/SearchableItemVM.kt
@@ -6,6 +6,7 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.ui.geometry.Rect
 import androidx.core.app.ActivityOptionsCompat
+import androidx.customview.view.AbsSavedState
 import de.mm20.launcher2.appshortcuts.AppShortcutRepository
 import de.mm20.launcher2.badges.BadgeService
 import de.mm20.launcher2.devicepose.DevicePoseProvider
@@ -19,6 +20,7 @@ import de.mm20.launcher2.preferences.search.LocationSearchSettings
 import de.mm20.launcher2.search.AppShortcut
 import de.mm20.launcher2.search.Application
 import de.mm20.launcher2.search.File
+import de.mm20.launcher2.search.Location
 import de.mm20.launcher2.search.SavableSearchable
 import de.mm20.launcher2.search.UpdatableSearchable
 import de.mm20.launcher2.search.UpdateResult
@@ -40,6 +42,7 @@ import kotlinx.coroutines.launch
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import kotlin.time.Duration.Companion.hours
+import kotlin.time.Duration.Companion.minutes
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class SearchableItemVM : ListItemViewModel(), KoinComponent {
@@ -184,21 +187,24 @@ class SearchableItemVM : ListItemViewModel(), KoinComponent {
         val searchable = searchable.value ?: return
         if (searchable is UpdatableSearchable<*>) {
             val updatedSelf = searchable.updatedSelf ?: return
-            if (!shouldRetryUpdate && System.currentTimeMillis() < searchable.timestamp + 1.hours.inWholeMilliseconds) return
+            val sinceTimestamp = System.currentTimeMillis() - searchable.timestamp
+
+            val isOutOfDate = 1.minutes.inWholeMilliseconds < sinceTimestamp
+
+            if (!shouldRetryUpdate && !isOutOfDate) return
+
             viewModelScope.launch {
-                this@SearchableItemVM.searchable.value = with(updatedSelf()) {
+                with(updatedSelf(searchable)) {
                     when (this) {
                         is UpdateResult.Success -> {
                             isUpToDate.value = true
                             shouldRetryUpdate = false
                             favoritesService.upsert(this.result)
-                            this.result
                         }
 
                         is UpdateResult.TemporarilyUnavailable -> {
                             isUpToDate.value = false
                             shouldRetryUpdate = true
-                            return@launch
                         }
 
                         is UpdateResult.PermanentlyUnavailable -> {
@@ -211,7 +217,6 @@ class SearchableItemVM : ListItemViewModel(), KoinComponent {
                                 Toast.LENGTH_LONG
                             ).show()
                             Log.d("requestUpdatedSearchable", "PermanentlyUnavailable", this.cause)
-                            null
                         }
                     }
                 }
@@ -232,9 +237,6 @@ class SearchableItemVM : ListItemViewModel(), KoinComponent {
     val applyMapTheming = locationSearchSettings.themeMap
         .stateIn(viewModelScope, SharingStarted.Lazily, false)
 
-    val showPositionOnMap = locationSearchSettings.showPositionOnMap
-        .stateIn(viewModelScope, SharingStarted.Lazily, false)
-
     val mapTileServerUrl = locationSearchSettings.tileServer
         .stateIn(viewModelScope, SharingStarted.Lazily, "")
 }
\ No newline at end of file
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItem.kt
index 52e8e5a2..8d62562e 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItem.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItem.kt
@@ -23,7 +23,6 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -90,8 +89,6 @@ fun GridItem(
         viewModel.init(item, iconSize.toInt())
     }
 
-    val item = viewModel.searchable.collectAsState().value ?: item
-
     val context = LocalContext.current
 
     var showPopup by remember(item.key) { mutableStateOf(false) }
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListItem.kt
index 7ecb3878..6d47f654 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListItem.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListItem.kt
@@ -69,8 +69,6 @@ fun ListItem(
         )
     )
 
-    val item = viewModel.searchable.collectAsState().value ?: item
-
     var bounds by remember { mutableStateOf(Rect.Zero) }
     Box(
         modifier = modifier
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactItem.kt
index 158cb60d..8d5aa867 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactItem.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactItem.kt
@@ -1,10 +1,7 @@
 package de.mm20.launcher2.ui.launcher.search.contacts
 
-import android.content.Intent
-import android.net.Uri
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.MutableTransitionState
-import androidx.compose.animation.core.animateDp
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.core.updateTransition
 import androidx.compose.animation.expandIn
@@ -25,7 +22,6 @@ import androidx.compose.material.icons.rounded.Email
 import androidx.compose.material.icons.rounded.Home
 import androidx.compose.material.icons.rounded.MoreHoriz
 import androidx.compose.material.icons.rounded.OpenInNew
-import androidx.compose.material.icons.rounded.Place
 import androidx.compose.material.icons.rounded.Star
 import androidx.compose.material.icons.rounded.StarOutline
 import androidx.compose.material.icons.rounded.Visibility
@@ -63,9 +59,8 @@ import de.mm20.launcher2.ui.component.DefaultToolbarAction
 import de.mm20.launcher2.ui.component.ShapedLauncherIcon
 import de.mm20.launcher2.ui.component.Toolbar
 import de.mm20.launcher2.ui.component.ToolbarAction
-import de.mm20.launcher2.ui.icons.Signal
-import de.mm20.launcher2.ui.icons.Telegram
-import de.mm20.launcher2.ui.icons.WhatsApp
+import de.mm20.launcher2.icons.Signal
+import de.mm20.launcher2.icons.Telegram
 import de.mm20.launcher2.ui.ktx.toPixels
 import de.mm20.launcher2.ui.launcher.search.common.SearchableItemVM
 import de.mm20.launcher2.ui.launcher.search.listItemViewModel
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/filters/KeyboardFilterBar.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/filters/KeyboardFilterBar.kt
index de28c0d5..6b483d4e 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/filters/KeyboardFilterBar.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/filters/KeyboardFilterBar.kt
@@ -10,17 +10,6 @@ import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.AppShortcut
-import androidx.compose.material.icons.rounded.Apps
-import androidx.compose.material.icons.rounded.Description
-import androidx.compose.material.icons.rounded.Handyman
-import androidx.compose.material.icons.rounded.Language
-import androidx.compose.material.icons.rounded.Person
-import androidx.compose.material.icons.rounded.Place
-import androidx.compose.material.icons.rounded.Public
-import androidx.compose.material.icons.rounded.Today
-import androidx.compose.material.icons.rounded.VisibilityOff
 import androidx.compose.material3.FilterChip
 import androidx.compose.material3.FilterChipDefaults
 import androidx.compose.material3.HorizontalDivider
@@ -32,12 +21,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import de.mm20.launcher2.preferences.KeyboardFilterBarItem
 import de.mm20.launcher2.search.SearchFilters
-import de.mm20.launcher2.ui.R
-import de.mm20.launcher2.ui.icons.Wikipedia
 
 @Composable
 fun KeyboardFilterBar(
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/filters/KeyboardFilterBarItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/filters/KeyboardFilterBarItem.kt
index 93349853..a0e76ef7 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/filters/KeyboardFilterBarItem.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/filters/KeyboardFilterBarItem.kt
@@ -15,7 +15,7 @@ import androidx.compose.material.icons.rounded.VisibilityOff
 import de.mm20.launcher2.preferences.KeyboardFilterBarItem
 import de.mm20.launcher2.search.SearchFilters
 import de.mm20.launcher2.ui.R
-import de.mm20.launcher2.ui.icons.Wikipedia
+import de.mm20.launcher2.icons.Wikipedia
 
 val KeyboardFilterBarItem.icon
     get() = when (this) {
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/filters/SearchFilters.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/filters/SearchFilters.kt
index c6b7142b..a373519a 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/filters/SearchFilters.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/filters/SearchFilters.kt
@@ -28,7 +28,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import de.mm20.launcher2.search.SearchFilters
 import de.mm20.launcher2.ui.R
-import de.mm20.launcher2.ui.icons.Wikipedia
+import de.mm20.launcher2.icons.Wikipedia
 
 @Composable
 fun SearchFilters(
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/location/LocationItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/location/LocationItem.kt
index ce6aee71..b3eb7276 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/location/LocationItem.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/location/LocationItem.kt
@@ -14,29 +14,49 @@ import androidx.compose.animation.fadeOut
 import androidx.compose.animation.shrinkOut
 import androidx.compose.animation.slideIn
 import androidx.compose.animation.slideOut
+import androidx.compose.foundation.MarqueeSpacing
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.gestures.detectDragGestures
 import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.requiredHeight
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.foundation.layout.wrapContentWidth
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.rounded.ArrowBack
 import androidx.compose.material.icons.automirrored.rounded.NavigateNext
 import androidx.compose.material.icons.automirrored.rounded.OpenInNew
+import androidx.compose.material.icons.rounded.AirplanemodeActive
 import androidx.compose.material.icons.rounded.BugReport
+import androidx.compose.material.icons.rounded.Commute
+import androidx.compose.material.icons.rounded.DirectionsBoat
+import androidx.compose.material.icons.rounded.DirectionsBus
+import androidx.compose.material.icons.rounded.DirectionsRailway
+import androidx.compose.material.icons.rounded.DirectionsTransit
 import androidx.compose.material.icons.rounded.Edit
 import androidx.compose.material.icons.rounded.Language
 import androidx.compose.material.icons.rounded.Navigation
 import androidx.compose.material.icons.rounded.Phone
 import androidx.compose.material.icons.rounded.Star
 import androidx.compose.material.icons.rounded.StarOutline
+import androidx.compose.material.icons.rounded.Subway
+import androidx.compose.material.icons.rounded.Train
+import androidx.compose.material.icons.rounded.Tram
 import androidx.compose.material.icons.rounded.Visibility
 import androidx.compose.material.icons.rounded.VisibilityOff
 import androidx.compose.material3.AssistChip
@@ -58,31 +78,48 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.geometry.Rect
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.TransformOrigin
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.graphics.luminance
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.TextUnitType
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.max
 import androidx.compose.ui.unit.roundToIntRect
 import androidx.compose.ui.unit.times
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.lifecycleScope
+import blend.Blend.harmonize
+import coil.compose.AsyncImage
 import de.mm20.launcher2.i18n.R
+import de.mm20.launcher2.icons.CableCar
 import de.mm20.launcher2.ktx.tryStartActivity
 import de.mm20.launcher2.search.Location
-import de.mm20.launcher2.search.LocationCategory
-import de.mm20.launcher2.search.OpeningHours
-import de.mm20.launcher2.search.OpeningSchedule
+import de.mm20.launcher2.search.isOpen
+import de.mm20.launcher2.search.location.Attribution
+import de.mm20.launcher2.search.location.Departure
+import de.mm20.launcher2.search.location.LineType
+import de.mm20.launcher2.search.location.OpeningHours
+import de.mm20.launcher2.search.location.OpeningSchedule
+import de.mm20.launcher2.ui.base.LocalTime
 import de.mm20.launcher2.ui.component.DefaultToolbarAction
+import de.mm20.launcher2.ui.component.MarqueeText
 import de.mm20.launcher2.ui.component.RatingBar
 import de.mm20.launcher2.ui.component.ShapedLauncherIcon
 import de.mm20.launcher2.ui.component.Toolbar
 import de.mm20.launcher2.ui.component.ToolbarAction
+import de.mm20.launcher2.ui.ktx.blendIntoViewScale
 import de.mm20.launcher2.ui.ktx.metersToLocalizedString
-import de.mm20.launcher2.ui.ktx.toPixels
 import de.mm20.launcher2.ui.launcher.search.common.SearchableItemVM
 import de.mm20.launcher2.ui.launcher.search.listItemViewModel
 import de.mm20.launcher2.ui.launcher.sheets.LocalBottomSheetManager
@@ -92,7 +129,9 @@ import de.mm20.launcher2.ui.locals.LocalSnackbarHostState
 import de.mm20.launcher2.ui.modifier.scale
 import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.launch
+import java.time.Duration
 import java.time.LocalDateTime
+import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
 import java.time.format.TextStyle
@@ -108,7 +147,6 @@ fun LocationItem(
 ) {
     val context = LocalContext.current
     val viewModel: SearchableItemVM = listItemViewModel(key = "search-${location.key}")
-    val iconSize = LocalGridSettings.current.iconSize.dp.toPixels()
 
     val userLocation by remember {
         viewModel.devicePoseProvider.getLocation()
@@ -181,7 +219,8 @@ fun LocationItem(
                         if (category != null || formattedDistance != null) {
                             Text(
                                 when {
-                                    category != null && formattedDistance != null -> "${stringResource(category.labelRes)} • ${formattedDistance}"
+                                    category != null && formattedDistance != null -> "$category • $formattedDistance"
+
                                     category != null -> category.toString()
                                     formattedDistance != null -> formattedDistance
                                     else -> ""
@@ -258,7 +297,7 @@ fun LocationItem(
                             end = 12.dp,
                             bottom = 4.dp
                         ),
-                        verticalAlignment = Alignment.CenterVertically,
+                        verticalAlignment = Alignment.Top,
                     ) {
                         Column(
                             modifier = Modifier.weight(1f),
@@ -279,7 +318,8 @@ fun LocationItem(
                             if (category != null || formattedDistance != null) {
                                 Text(
                                     when {
-                                        category != null && formattedDistance != null -> "${stringResource(category.labelRes)} • ${formattedDistance}"
+                                        category != null && formattedDistance != null -> "$category • $formattedDistance"
+
                                         category != null -> category.toString()
                                         formattedDistance != null -> formattedDistance
                                         else -> ""
@@ -294,31 +334,176 @@ fun LocationItem(
                                         )
                                 )
                             }
-                            // TODO: add rating to location
-                            if (!showMap && false) {
-                                RatingBar(0.66f, modifier = Modifier.padding(top = 4.dp))
+                            if (location.userRating != null) {
+                                RatingBar(
+                                    location.userRating!!,
+                                    modifier = Modifier
+                                        .padding(top = 6.dp)
+                                        .offset(-2.dp)
+                                )
+                            }
+
+                            if (!showMap) {
+                                val attribution = location.attribution
+                                if (attribution != null) {
+                                    Attribution(
+                                        attribution,
+                                        reverse = true,
+                                        modifier = Modifier
+                                            .padding(
+                                                top = 16.dp,
+                                                bottom = 0.dp,
+                                            )
+                                            .clickable(
+                                                enabled = attribution.url != null
+                                            ) {
+                                                context.tryStartActivity(
+                                                    Intent(
+                                                        Intent.ACTION_VIEW,
+                                                        Uri.parse(attribution.url)
+                                                    )
+                                                )
+                                            }
+                                    )
+                                }
                             }
                         }
-                        //TODO: add rating to location
-                        if (showMap && false) {
-                            RatingBar(0.66f)
-                        }
+
                         if (!showMap) {
                             Compass(
                                 targetHeading = targetHeading,
                                 modifier = Modifier
-                                    .align(Alignment.Top)
                                     .sharedBounds(
                                         rememberSharedContentState("compass"),
                                         this@AnimatedContent
                                     ),
                                 size = 56.dp,
                             )
+                        } else {
+                            val attribution = location.attribution
+                            if (attribution != null) {
+                                Attribution(
+                                    attribution,
+                                    modifier = Modifier
+                                        .padding(
+                                            top = 4.dp,
+                                            bottom = 4.dp,
+                                            start = 12.dp)
+                                        .clickable(
+                                            enabled = attribution.url != null
+                                        ) {
+                                            context.tryStartActivity(
+                                                Intent(
+                                                    Intent.ACTION_VIEW,
+                                                    Uri.parse(attribution.url)
+                                                )
+                                            )
+                                        }
+                                )
+                            }
                         }
                     }
 
                     val openingSchedule = location.openingSchedule
-                    if (openingSchedule != null && (openingSchedule.isTwentyFourSeven || openingSchedule.openingHours.isNotEmpty())) {
+                    val departures = remember(location.departures) {
+                        location.departures
+                            ?.sortedBy { it.time }
+                    }
+                    if (departures != null) {
+                        val time = LocalTime.current
+                        val nextDeparture = remember(time) {
+                            departures.firstOrNull {
+                                it.time.plus(it.delay ?: Duration.ZERO).isAfter(ZonedDateTime.now())
+                            }
+                        }
+                        if (nextDeparture != null) {
+                            var showDepartureList by remember(departures) {
+                                mutableStateOf(false)
+                            }
+                            OutlinedCard(
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .padding(start = 12.dp, end = 12.dp, top = 12.dp),
+                                shape = MaterialTheme.shapes.small,
+                                onClick = { showDepartureList = !showDepartureList }
+                            ) {
+                                val listState = rememberLazyListState()
+
+                                AnimatedContent(showDepartureList) { showList ->
+                                    if (!showList) {
+                                        Row(
+                                            Modifier
+                                                .padding(12.dp)
+                                                .fillMaxWidth(),
+                                            horizontalArrangement = Arrangement.SpaceBetween,
+                                            verticalAlignment = Alignment.CenterVertically
+                                        ) {
+                                            nextDeparture.LineIcon(Modifier.padding(end = 8.dp))
+                                            val lastStop = nextDeparture.lastStop
+                                            if (lastStop != null) {
+                                                MarqueeText(
+                                                    modifier = Modifier.weight(1f),
+                                                    text = lastStop,
+                                                    style = MaterialTheme.typography.labelMedium,
+                                                    iterations = Int.MAX_VALUE,
+                                                    repeatDelayMillis = 0,
+                                                    velocity = 20.dp,
+                                                    fadeLeft = 5.dp,
+                                                    fadeRight = 5.dp,
+                                                )
+                                            }
+
+                                            val formattedTime = remember(time) {
+                                                val timeLeft = Duration.between(
+                                                    java.time.LocalTime.now(),
+                                                    nextDeparture.time + (nextDeparture.delay
+                                                        ?: Duration.ZERO)
+                                                ).toMinutes()
+                                                if (timeLeft < 1) "now" else "in $timeLeft min"
+                                            }
+
+                                            Text(
+                                                text = formattedTime,
+                                                style = MaterialTheme.typography.labelSmall,
+                                                modifier = Modifier.padding(end = 12.dp)
+                                            )
+                                            Icon(Icons.AutoMirrored.Rounded.NavigateNext, null)
+                                        }
+                                    } else {
+                                        val longestLine = remember(departures) {
+                                            departures.maxOfOrNull { it.line.length }
+                                        }
+                                        LazyColumn(
+                                            state = listState,
+                                            modifier = modifier
+                                                .heightIn(max = 192.dp)
+                                                .padding(12.dp)
+                                                .fillMaxWidth()
+                                                .pointerInput(Unit) { detectDragGestures { _, _ -> } },
+                                            verticalArrangement = Arrangement.spacedBy(8.dp),
+                                        ) {
+                                            itemsIndexed(
+                                                departures,
+                                                key = { idx, _ -> idx }) { idx, it ->
+                                                it.LazyColumnPart(
+                                                    lineWidth = longestLine,
+                                                    Modifier
+                                                        .fillMaxWidth()
+                                                        .graphicsLayer {
+                                                            alpha =
+                                                                listState.layoutInfo.blendIntoViewScale(
+                                                                    idx
+                                                                )
+                                                        }
+                                                )
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    if (openingSchedule is OpeningSchedule.TwentyFourSeven || (openingSchedule is OpeningSchedule.Hours && openingSchedule.openingHours.isNotEmpty())) {
                         var showOpeningSchedule by remember(openingSchedule) {
                             mutableStateOf(false)
                         }
@@ -328,8 +513,8 @@ fun LocationItem(
                                 .padding(start = 12.dp, end = 12.dp, top = 12.dp),
                             shape = MaterialTheme.shapes.small,
                             onClick = {
-                                if (!openingSchedule.isTwentyFourSeven) {
-                                    showOpeningSchedule = true
+                                if (openingSchedule !is OpeningSchedule.TwentyFourSeven) {
+                                    showOpeningSchedule = !showOpeningSchedule
                                 }
                             }
                         ) {
@@ -341,78 +526,84 @@ fun LocationItem(
                                             .padding(12.dp),
                                         verticalAlignment = Alignment.CenterVertically
                                     ) {
-                                        if (openingSchedule.isTwentyFourSeven) {
-                                            Text(
-                                                text = stringResource(R.string.location_open_24_7),
-                                                style = MaterialTheme.typography.labelMedium,
-                                            )
-                                        } else {
-                                            val text = remember(openingSchedule) {
-                                                val currentOpeningTime =
-                                                    openingSchedule.getCurrentOpeningHours()
-                                                val timeFormat =
-                                                    DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
-                                                return@remember if (currentOpeningTime != null) {
-                                                    val isSameDay =
-                                                        currentOpeningTime.dayOfWeek == LocalDateTime.now().dayOfWeek
-                                                    val formattedTime =
-                                                        timeFormat.format(currentOpeningTime.startTime + currentOpeningTime.duration)
-                                                    val closingTime = if (isSameDay) {
-                                                        context.getString(
-                                                            R.string.location_closes,
-                                                            formattedTime
-                                                        )
-                                                    } else {
-                                                        val dow =
-                                                            currentOpeningTime.dayOfWeek.getDisplayName(
-                                                                TextStyle.SHORT,
-                                                                Locale.getDefault()
-                                                            )
-                                                        context.getString(
-                                                            R.string.location_closes_other_day,
-                                                            dow,
-                                                            formattedTime
-                                                        )
-                                                    }
-                                                    "${context.getString(R.string.location_open)} • $closingTime"
-                                                } else {
-                                                    val nextOpeningTime =
-                                                        openingSchedule.getNextOpeningHours()
-                                                    val isSameDay =
-                                                        nextOpeningTime.dayOfWeek == LocalDateTime.now().dayOfWeek
-                                                    val formattedTime =
-                                                        timeFormat.format(nextOpeningTime.startTime)
-                                                    val openingTime = if (isSameDay) {
-                                                        context.getString(
-                                                            R.string.location_opens,
-                                                            formattedTime
-                                                        )
-                                                    } else {
-                                                        val dow =
-                                                            nextOpeningTime.dayOfWeek.getDisplayName(
-                                                                TextStyle.SHORT,
-                                                                Locale.getDefault()
-                                                            )
-                                                        context.getString(
-                                                            R.string.location_opens_other_day,
-                                                            dow,
-                                                            formattedTime
-                                                        )
-                                                    }
-                                                    "${context.getString(R.string.location_closed)} • $openingTime"
-                                                }
+                                        when (openingSchedule) {
+                                            is OpeningSchedule.TwentyFourSeven -> {
+                                                Text(
+                                                    text = stringResource(R.string.location_open_24_7),
+                                                    style = MaterialTheme.typography.labelMedium,
+                                                )
                                             }
 
-                                            Text(
-                                                text = text,
-                                                style = MaterialTheme.typography.labelMedium,
-                                                modifier = Modifier.weight(1f)
-                                            )
+                                            is OpeningSchedule.Hours -> {
+                                                val text = remember(openingSchedule) {
+                                                    val currentOpeningTime =
+                                                        openingSchedule.getCurrentOpeningHours()
+                                                    val timeFormat =
+                                                        DateTimeFormatter.ofLocalizedTime(
+                                                            FormatStyle.SHORT
+                                                        )
+                                                    return@remember if (currentOpeningTime != null) {
+                                                        val isSameDay =
+                                                            currentOpeningTime.dayOfWeek == LocalDateTime.now().dayOfWeek
+                                                        val formattedTime =
+                                                            timeFormat.format(currentOpeningTime.startTime + currentOpeningTime.duration)
+                                                        val closingTime = if (isSameDay) {
+                                                            context.getString(
+                                                                R.string.location_closes,
+                                                                formattedTime
+                                                            )
+                                                        } else {
+                                                            val dow =
+                                                                currentOpeningTime.dayOfWeek.getDisplayName(
+                                                                    TextStyle.SHORT,
+                                                                    Locale.getDefault()
+                                                                )
+                                                            context.getString(
+                                                                R.string.location_closes_other_day,
+                                                                dow,
+                                                                formattedTime
+                                                            )
+                                                        }
+                                                        "${context.getString(R.string.location_open)} • $closingTime"
+                                                    } else {
+                                                        val nextOpeningTime =
+                                                            openingSchedule.getNextOpeningHours()
+                                                        val isSameDay =
+                                                            nextOpeningTime.dayOfWeek == LocalDateTime.now().dayOfWeek
+                                                        val formattedTime =
+                                                            timeFormat.format(nextOpeningTime.startTime)
+                                                        val openingTime = if (isSameDay) {
+                                                            context.getString(
+                                                                R.string.location_opens,
+                                                                formattedTime
+                                                            )
+                                                        } else {
+                                                            val dow =
+                                                                nextOpeningTime.dayOfWeek.getDisplayName(
+                                                                    TextStyle.SHORT,
+                                                                    Locale.getDefault()
+                                                                )
+                                                            context.getString(
+                                                                R.string.location_opens_other_day,
+                                                                dow,
+                                                                formattedTime
+                                                            )
+                                                        }
+                                                        "${context.getString(R.string.location_closed)} • $openingTime"
+                                                    }
+                                                }
 
-                                            Icon(Icons.AutoMirrored.Rounded.NavigateNext, null)
+                                                Text(
+                                                    text = text,
+                                                    style = MaterialTheme.typography.labelMedium,
+                                                    modifier = Modifier.weight(1f)
+                                                )
+
+                                                Icon(Icons.AutoMirrored.Rounded.NavigateNext, null)
+                                            }
                                         }
                                     }
-                                } else {
+                                } else if (openingSchedule is OpeningSchedule.Hours) {
                                     Column(
                                         modifier = Modifier.padding(vertical = 6.dp)
                                     ) {
@@ -469,24 +660,26 @@ fun LocationItem(
                             .horizontalScroll(rememberScrollState())
                             .padding(start = 12.dp, top = 8.dp)
                     ) {
-                        AssistChip(
-                            modifier = Modifier.padding(end = 12.dp),
-                            onClick = {
-                                context.tryStartActivity(
-                                    Intent(
-                                        Intent.ACTION_VIEW,
-                                        Uri.parse("google.navigation:q=${location.latitude},${location.longitude}")
-                                    ),
-                                )
-                            },
-                            label = { Text(stringResource(R.string.menu_navigation)) },
-                            leadingIcon = {
-                                Icon(
-                                    Icons.Rounded.Navigation, null,
-                                    modifier = Modifier.size(AssistChipDefaults.IconSize)
-                                )
-                            }
+                        val navigationIntent = Intent(
+                            Intent.ACTION_VIEW,
+                            Uri.parse("google.navigation:q=${location.latitude},${location.longitude}")
                         )
+                        val canResolveNavigationIntent = remember {
+                            null != context.packageManager.resolveActivity(navigationIntent, 0)
+                        }
+                        if (canResolveNavigationIntent) {
+                            AssistChip(
+                                modifier = Modifier.padding(end = 12.dp),
+                                onClick = { context.tryStartActivity(navigationIntent) },
+                                label = { Text(stringResource(R.string.menu_navigation)) },
+                                leadingIcon = {
+                                    Icon(
+                                        Icons.Rounded.Navigation, null,
+                                        modifier = Modifier.size(AssistChipDefaults.IconSize)
+                                    )
+                                }
+                            )
+                        }
                         location.phoneNumber?.let {
                             AssistChip(
                                 modifier = Modifier.padding(end = 12.dp),
@@ -569,8 +762,6 @@ fun LocationItem(
                         action = { sheetManager.showCustomizeSearchableModal(location) }
                     ))
 
-
-
                     location.fixMeUrl?.let {
                         toolbarActions += DefaultToolbarAction(
                             label = stringResource(id = R.string.menu_bugreport),
@@ -715,11 +906,11 @@ private fun buildAddress(
     return if (summary.isEmpty()) null else summary.toString()
 }
 
-private fun OpeningSchedule.getCurrentOpeningHours(): OpeningHours? {
+private fun OpeningSchedule.Hours.getCurrentOpeningHours(): OpeningHours? {
     return openingHours.find { it.isOpen() }
 }
 
-private fun OpeningSchedule.getNextOpeningHours(): OpeningHours {
+private fun OpeningSchedule.Hours.getNextOpeningHours(): OpeningHours {
     val now = LocalDateTime.now()
     val sortedSchedule = this
         .openingHours
@@ -737,80 +928,178 @@ private fun OpeningSchedule.getNextOpeningHours(): OpeningHours {
         } ?: sortedSchedule.first()
 }
 
-private val LocationCategory.labelRes
-    get() = when(this) {
-        LocationCategory.ART -> R.string.poi_category_art
-        LocationCategory.BANK -> R.string.poi_category_bank
-        LocationCategory.BAR -> R.string.poi_category_bar
-        LocationCategory.BEAUTY -> R.string.poi_category_beauty
-        LocationCategory.BICYCLE -> R.string.poi_category_bicycle
-        LocationCategory.RESTAURANT -> R.string.poi_category_restaurant
-        LocationCategory.FAST_FOOD -> R.string.poi_category_fast_food
-        LocationCategory.CAFE -> R.string.poi_category_coffee_shop
-        LocationCategory.HOTEL -> R.string.poi_category_hotel
-        LocationCategory.SUPERMARKET -> R.string.poi_category_supermarket
-        LocationCategory.OTHER -> R.string.poi_category_other
-        LocationCategory.SCHOOL -> R.string.poi_category_school
-        LocationCategory.PARKING -> R.string.poi_category_parking
-        LocationCategory.FUEL -> R.string.poi_category_fuel
-        LocationCategory.TOILETS -> R.string.poi_category_toilets
-        LocationCategory.PHARMACY -> R.string.poi_category_pharmacy
-        LocationCategory.HOSPITAL -> R.string.poi_category_hospital
-        LocationCategory.POST_OFFICE -> R.string.poi_category_post_office
-        LocationCategory.PUB -> R.string.poi_category_pub
-        LocationCategory.GRAVE_YARD -> R.string.poi_category_grave_yard
-        LocationCategory.DOCTORS -> R.string.poi_category_doctors
-        LocationCategory.POLICE -> R.string.poi_category_police
-        LocationCategory.DENTIST -> R.string.poi_category_dentist
-        LocationCategory.LIBRARY -> R.string.poi_category_library
-        LocationCategory.COLLEGE -> R.string.poi_category_college
-        LocationCategory.ICE_CREAM -> R.string.poi_category_ice_cream
-        LocationCategory.THEATRE -> R.string.poi_category_theater
-        LocationCategory.PUBLIC_BUILDING -> R.string.poi_category_public_building
-        LocationCategory.CINEMA -> R.string.poi_category_cinema
-        LocationCategory.NIGHTCLUB -> R.string.poi_category_nightclub
-        LocationCategory.BIERGARTEN -> R.string.poi_category_biergarten
-        LocationCategory.CLINIC -> R.string.poi_category_clinic
-        LocationCategory.UNIVERSITY -> R.string.poi_category_university
-        LocationCategory.DEPARTMENT_STORE -> R.string.poi_category_department_store
-        LocationCategory.CLOTHES -> R.string.poi_category_clothes
-        LocationCategory.CONVENIENCE -> R.string.poi_category_convenience
-        LocationCategory.HAIRDRESSER -> R.string.poi_category_hairdresser
-        LocationCategory.CAR_REPAIR -> R.string.poi_category_car_repair
-        LocationCategory.BOOKS -> R.string.poi_category_books
-        LocationCategory.BAKERY -> R.string.poi_category_bakery
-        LocationCategory.CAR -> R.string.poi_category_car
-        LocationCategory.MOBILE_PHONE -> R.string.poi_category_mobile_phone
-        LocationCategory.FURNITURE -> R.string.poi_category_furniture
-        LocationCategory.ALCOHOL -> R.string.poi_category_alcohol
-        LocationCategory.FLORIST -> R.string.poi_category_florist
-        LocationCategory.HARDWARE -> R.string.poi_category_hardware
-        LocationCategory.ELECTRONICS -> R.string.poi_category_electronics
-        LocationCategory.SHOES -> R.string.poi_category_shoes
-        LocationCategory.MALL -> R.string.poi_category_mall
-        LocationCategory.OPTICIAN -> R.string.poi_category_optician
-        LocationCategory.JEWELRY -> R.string.poi_category_jewelry
-        LocationCategory.GIFT -> R.string.poi_category_gift
-        LocationCategory.LAUNDRY -> R.string.poi_category_laundry
-        LocationCategory.COMPUTER -> R.string.poi_category_computer
-        LocationCategory.TOBACCO -> R.string.poi_category_tobacco
-        LocationCategory.WINE -> R.string.poi_category_wine
-        LocationCategory.PHOTO -> R.string.poi_category_photo
-        LocationCategory.COFFEE_SHOP -> R.string.poi_category_coffee_shop
-        LocationCategory.SOCCER -> R.string.poi_category_soccer
-        LocationCategory.BASKETBALL -> R.string.poi_category_basketball
-        LocationCategory.TENNIS -> R.string.poi_category_tennis
-        LocationCategory.FITNESS -> R.string.poi_category_fitness
-        LocationCategory.TRAM_STOP -> R.string.poi_category_tram_stop
-        LocationCategory.RAILWAY_STATION -> R.string.poi_category_railway_station
-        LocationCategory.RAILWAY_STOP -> R.string.poi_category_railway_stop
-        LocationCategory.BUS_STATION -> R.string.poi_category_bus_station
-        LocationCategory.ATM -> R.string.poi_category_atm
-        LocationCategory.KIOSK -> R.string.poi_category_kiosk
-        LocationCategory.BUS_STOP -> R.string.poi_category_bus_stop
-        LocationCategory.MUSEUM -> R.string.poi_category_museum
-        LocationCategory.PARCEL_LOCKER -> R.string.poi_category_parcel_locker
-        LocationCategory.CHEMIST -> R.string.poi_category_chemist
-        LocationCategory.TRAVEL_AGENCY -> R.string.poi_category_travel_agency
-        LocationCategory.FITNESS_CENTRE -> R.string.poi_category_fitness_center
-    }
\ No newline at end of file
+@Composable
+fun Departure.LineIcon(
+    modifier: Modifier
+) {
+    val harmonizeArgb = MaterialTheme.colorScheme.primary.toArgb()
+    var (lineBg, lineFg) = if (lineColor != null) {
+        val bg = Color(
+            harmonize(lineColor!!.toArgb(), harmonizeArgb)
+        )
+        val fg = Color(
+            harmonize(
+                if (0.5f < bg.luminance()) Color.Black.toArgb() else Color.White.toArgb(),
+                harmonizeArgb
+            )
+        )
+        bg to fg
+    } else {
+        MaterialTheme.colorScheme.primaryContainer to MaterialTheme.colorScheme.onPrimaryContainer
+    }
+
+    val hasDeparted = ZonedDateTime.now().isAfter(time + (delay ?: Duration.ZERO))
+
+    if (hasDeparted) {
+        val hsv = FloatArray(3)
+        android.graphics.Color.colorToHSV(lineBg.toArgb(), hsv)
+        val (h, s, v) = hsv
+        lineBg = Color.hsv(h, s / 2f, v, lineBg.alpha)
+    }
+
+    Row(
+        modifier = modifier
+            .wrapContentWidth(Alignment.Start)
+            .background(
+                lineBg,
+                MaterialTheme.shapes.small
+            )
+            .padding(top = 4.dp, bottom = 4.dp, start = 4.dp, end = 8.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Icon(
+            imageVector = when (type) {
+                LineType.Bus -> Icons.Rounded.DirectionsBus
+                LineType.Tram -> Icons.Rounded.Tram
+                LineType.Subway -> Icons.Rounded.Subway
+                LineType.Monorail -> Icons.Rounded.DirectionsTransit
+                LineType.CommuterTrain -> Icons.Rounded.DirectionsRailway
+                LineType.Train, LineType.RegionalTrain, LineType.HighSpeedTrain -> Icons.Rounded.Train
+                LineType.Boat -> Icons.Rounded.DirectionsBoat
+                LineType.CableCar -> Icons.Rounded.CableCar
+                LineType.Airplane -> Icons.Rounded.AirplanemodeActive
+                null -> Icons.Rounded.Commute
+            },
+            contentDescription = type?.name, // TODO localize (maybe) with ?.let{ stringResource("departure_line_type_$it") }
+            tint = lineFg,
+            modifier = Modifier
+                .padding(end = 2.dp)
+                .size(16.dp),
+        )
+        MarqueeText(
+            text = line,
+            style = MaterialTheme.typography.labelSmall,
+            color = lineFg,
+            textAlign = TextAlign.Center,
+            fadeLeft = 2.5.dp,
+            fadeRight = 2.5.dp,
+            iterations = Int.MAX_VALUE,
+            repeatDelayMillis = 0,
+            spacing = MarqueeSpacing(10.dp),
+            velocity = 20.dp,
+            modifier = Modifier
+                .wrapContentSize()
+                .widthIn(max = 34.dp)
+        )
+    }
+}
+
+@Composable
+fun Departure.LazyColumnPart(
+    lineWidth: Int?,
+    modifier: Modifier
+) {
+    Row(
+        modifier = modifier,
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Row(
+            horizontalArrangement = Arrangement.Start,
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier.fillMaxWidth(0.8f)
+        ) {
+            LineIcon(
+                Modifier
+                    .padding(end = 8.dp)
+                    .widthIn(
+                        min = if (lineWidth == null) 0.dp
+                        else max(64.dp, lineWidth * 8.dp)
+                    )
+            )
+            if (lastStop != null) {
+                MarqueeText(
+                    text = lastStop!!,
+                    style = MaterialTheme.typography.labelMedium,
+                    iterations = Int.MAX_VALUE,
+                    repeatDelayMillis = 0,
+                    velocity = 20.dp,
+                    fadeLeft = 5.dp,
+                    fadeRight = 5.dp,
+                )
+            }
+        }
+        Row(
+            horizontalArrangement = Arrangement.End,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Text(
+                text = time.format(
+                    DateTimeFormatter.ofPattern(
+                        "HH:mm",
+                        Locale.getDefault()
+                    )
+                ),
+                style = MaterialTheme.typography.labelSmall,
+                modifier = Modifier.padding(end = 2.dp)
+            )
+            val delayMinutes = delay?.toMinutes()
+            if (null != delayMinutes && 0L < delayMinutes) {
+                Text(
+                    text = "+$delayMinutes",
+                    style = MaterialTheme.typography.labelSmall,
+                    color = MaterialTheme.colorScheme.error,
+                    fontSize = TextUnit(2f, TextUnitType.Em),
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun Attribution(
+    attribution: Attribution,
+    modifier: Modifier = Modifier,
+    reverse: Boolean = false,
+) {
+    Row(
+        modifier = modifier,
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        if (attribution.text != null && !reverse) {
+            Text(
+                text = attribution.text!!,
+                style = MaterialTheme.typography.labelSmall,
+            )
+        }
+
+        if (attribution.iconUrl != null) {
+            AsyncImage(
+                modifier = Modifier
+                    .padding(
+                        start = if (reverse) 0.dp else 8.dp,
+                        end = if (reverse) 8.dp else 0.dp
+                    )
+                    .requiredHeight(16.dp),
+                model = attribution.iconUrl!!,
+                contentDescription = null,
+            )
+        }
+        if (attribution.text != null && reverse) {
+            Text(
+                text = attribution.text!!,
+                style = MaterialTheme.typography.labelSmall,
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/location/MapTiles.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/location/MapTiles.kt
index a1a6d9d8..cc0ef750 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/location/MapTiles.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/location/MapTiles.kt
@@ -8,6 +8,7 @@ import androidx.compose.animation.core.EaseInOutCirc
 import androidx.compose.animation.core.EaseInOutSine
 import androidx.compose.animation.core.RepeatMode
 import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.animateOffsetAsState
 import androidx.compose.animation.core.animateValueAsState
 import androidx.compose.animation.core.infiniteRepeatable
 import androidx.compose.animation.core.rememberInfiniteTransition
@@ -47,7 +48,6 @@ import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.ColorMatrix
 import androidx.compose.ui.graphics.FilterQuality
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.rememberTextMeasurer
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.IntSize
@@ -62,23 +62,26 @@ import coil.request.ImageRequest
 import de.mm20.launcher2.ktx.PI
 import de.mm20.launcher2.ktx.tryStartActivity
 import de.mm20.launcher2.search.Location
-import de.mm20.launcher2.search.LocationCategory
-import de.mm20.launcher2.search.OpeningHours
-import de.mm20.launcher2.search.OpeningSchedule
 import de.mm20.launcher2.search.SavableSearchable
 import de.mm20.launcher2.search.SearchableSerializer
+import de.mm20.launcher2.search.location.Address
+import de.mm20.launcher2.search.location.Departure
+import de.mm20.launcher2.search.location.LineType
+import de.mm20.launcher2.search.location.LocationIcon
+import de.mm20.launcher2.search.location.OpeningSchedule
 import de.mm20.launcher2.ui.ktx.DegreesConverter
 import de.mm20.launcher2.ui.ktx.contrast
 import de.mm20.launcher2.ui.ktx.hue
 import de.mm20.launcher2.ui.ktx.hueRotate
 import de.mm20.launcher2.ui.ktx.invert
 import de.mm20.launcher2.ui.locals.LocalDarkTheme
-import kotlinx.collections.immutable.toImmutableList
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import org.koin.core.context.GlobalContext
 import org.koin.core.context.startKoin
+import java.time.Duration
+import java.time.ZonedDateTime
 import kotlin.math.PI
 import kotlin.math.ceil
 import kotlin.math.cos
@@ -216,7 +219,15 @@ fun MapTiles(
                 )
         )
         if (userLocation != null) {
-            val userTileCoordinates = getTileCoordinates(userLocation.lat, userLocation.lon, zoom)
+            val userIndicatorOffset by animateOffsetAsState(
+                targetValue = getTileCoordinates(userLocation.lat, userLocation.lon, zoom).let {
+                    Offset(
+                        (it.x - start.x) * tileSize.value - 8f,
+                        (it.y - start.y) * tileSize.value - 8f
+                    )
+                },
+                animationSpec = tween()
+            )
 
             if (userLocation.heading != null) {
                 val headingAnim by animateValueAsState(
@@ -232,8 +243,8 @@ fun MapTiles(
                         .align(Alignment.TopStart)
                         .size(16.dp)
                         .absoluteOffset(
-                            x = (userTileCoordinates.x - start.x) * tileSize - 8.dp,
-                            y = (userTileCoordinates.y - start.y) * tileSize - 8.dp,
+                            userIndicatorOffset.x.dp,
+                            userIndicatorOffset.y.dp
                         )
                         .rotate(headingAnim)
                         .absoluteOffset(y = -8.dp)
@@ -245,8 +256,8 @@ fun MapTiles(
                     .align(Alignment.TopStart)
                     .size(16.dp)
                     .absoluteOffset(
-                        x = (userTileCoordinates.x - start.x) * tileSize - 8.dp,
-                        y = (userTileCoordinates.y - start.y) * tileSize - 8.dp,
+                        userIndicatorOffset.x.dp,
+                        userIndicatorOffset.y.dp
                     )
                     .background(MaterialTheme.colorScheme.tertiary, CircleShape)
                     .border(2.dp, MaterialTheme.colorScheme.onTertiary, CircleShape)
@@ -438,7 +449,7 @@ private fun MapTilesPreview() {
     )
 }
 
-internal object MockLocation : Location {
+private object MockLocation : Location {
 
     override val domain: String = "MOCKLOCATION"
     override val key: String = "MOCKLOCATION"
@@ -448,19 +459,25 @@ internal object MockLocation : Location {
     override val latitude = 52.5162700
     override val longitude = 13.3777021
 
-    override var category: LocationCategory? = LocationCategory.OTHER
+    override val icon: LocationIcon? = null
+    override var category: String? = "Landmark"
 
-    override val street: String = "Pariser Platz"
-
-    override val houseNumber: String = "1"
+    override val address: Address = Address(
+        address = "Pariser Platz 1",
+        city = "Berlin",
+        postalCode = "10117",
+        country = "Germany"
+    )
 
     override val openingSchedule: OpeningSchedule =
-        OpeningSchedule(true, emptyList<OpeningHours>().toImmutableList())
+        OpeningSchedule.TwentyFourSeven
 
     override val websiteUrl: String = "https://en.wikipedia.org/wiki/Brandenburg_Gate"
 
     override val phoneNumber: String = "+49 1234567"
 
+    override val emailAddress: String = "abc@de.fg"
+
     override fun overrideLabel(label: String): SavableSearchable = TODO()
 
     override fun launch(context: Context, options: Bundle?): Boolean =
@@ -472,4 +489,20 @@ internal object MockLocation : Location {
         )
 
     override fun getSerializer(): SearchableSerializer = TODO()
+
+    override val departures: List<Departure> = listOf(
+        Departure(
+            ZonedDateTime.now() + Duration.ofMinutes(3),
+            Duration.ofMinutes(1),
+            "B2",
+            "heaven",
+            LineType.Bus,
+            android.graphics.Color.valueOf(0xFAFAFAFA)
+        )
+    )
+
+    override val userRating: Float
+        get() = 0.9f
+
+    override val userRatingCount: Int  = 553
 }
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/BatteryPartProvider.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/BatteryPartProvider.kt
index 9f9e5465..8dac372f 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/BatteryPartProvider.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/BatteryPartProvider.kt
@@ -26,8 +26,21 @@ import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.core.content.getSystemService
+import de.mm20.launcher2.icons.Battery0Bar
+import de.mm20.launcher2.icons.Battery1Bar
+import de.mm20.launcher2.icons.Battery2Bar
+import de.mm20.launcher2.icons.Battery3Bar
+import de.mm20.launcher2.icons.Battery4Bar
+import de.mm20.launcher2.icons.Battery5Bar
+import de.mm20.launcher2.icons.Battery6Bar
+import de.mm20.launcher2.icons.BatteryCharging0Bar
+import de.mm20.launcher2.icons.BatteryCharging1Bar
+import de.mm20.launcher2.icons.BatteryCharging2Bar
+import de.mm20.launcher2.icons.BatteryCharging3Bar
+import de.mm20.launcher2.icons.BatteryCharging4Bar
+import de.mm20.launcher2.icons.BatteryCharging5Bar
+import de.mm20.launcher2.icons.BatteryCharging6Bar
 import de.mm20.launcher2.ui.R
-import de.mm20.launcher2.ui.icons.*
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.channels.trySendBlocking
 import kotlinx.coroutines.flow.*
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt
index ffd2e3bf..91a27279 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt
@@ -40,14 +40,10 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.rotate
-import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
-import androidx.compose.ui.input.nestedscroll.NestedScrollSource
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.Velocity
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.Lifecycle
@@ -59,8 +55,8 @@ import de.mm20.launcher2.ui.common.WeatherLocationSearchDialog
 import de.mm20.launcher2.ui.component.MissingPermissionBanner
 import de.mm20.launcher2.ui.component.weather.AnimatedWeatherIcon
 import de.mm20.launcher2.ui.component.weather.WeatherIcon
-import de.mm20.launcher2.ui.icons.HumidityPercentage
-import de.mm20.launcher2.ui.icons.Rain
+import de.mm20.launcher2.icons.HumidityPercentage
+import de.mm20.launcher2.icons.Rain
 import de.mm20.launcher2.ui.ktx.blendIntoViewScale
 import de.mm20.launcher2.ui.locals.LocalCardStyle
 import de.mm20.launcher2.ui.modifier.consumeAllScrolling
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutSettingsScreen.kt
index 8e2ca99f..60824920 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutSettingsScreen.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutSettingsScreen.kt
@@ -14,9 +14,9 @@ import de.mm20.launcher2.ui.R
 import de.mm20.launcher2.ui.component.preferences.Preference
 import de.mm20.launcher2.ui.component.preferences.PreferenceCategory
 import de.mm20.launcher2.ui.component.preferences.PreferenceScreen
-import de.mm20.launcher2.ui.icons.Fdroid
-import de.mm20.launcher2.ui.icons.GitHub
-import de.mm20.launcher2.ui.icons.Telegram
+import de.mm20.launcher2.icons.Fdroid
+import de.mm20.launcher2.icons.GitHub
+import de.mm20.launcher2.icons.Telegram
 import de.mm20.launcher2.ui.locals.LocalNavController
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreen.kt
index 9eaa6b0e..235caab7 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreen.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreen.kt
@@ -191,7 +191,7 @@ fun FileSearchSettingsScreen() {
                     if (state is PluginState.SetupRequired) {
                         Banner(
                             modifier = Modifier.padding(16.dp),
-                            text = state.message ?: "You need to setup this plugin first",
+                            text = state.message ?: stringResource(id = R.string.plugin_state_setup_required),
                             icon = Icons.Rounded.ErrorOutline,
                             primaryAction = {
                                 TextButton(onClick = {
@@ -201,7 +201,7 @@ fun FileSearchSettingsScreen() {
                                         CrashReporter.logException(e)
                                     }
                                 }) {
-                                    Text("Set up")
+                                    Text(stringResource(id = R.string.plugin_action_setup))
                                 }
                             }
                         )
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/locations/LocationsSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/locations/LocationsSettingsScreen.kt
index 5a1f17a2..f01f5da2 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/locations/LocationsSettingsScreen.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/locations/LocationsSettingsScreen.kt
@@ -1,9 +1,14 @@
 package de.mm20.launcher2.ui.settings.locations
 
+import android.app.PendingIntent
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.ErrorOutline
+import androidx.compose.material.icons.rounded.WarningAmber
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -11,9 +16,14 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
+import de.mm20.launcher2.crashreporter.CrashReporter
+import de.mm20.launcher2.plugin.PluginState
 import de.mm20.launcher2.preferences.search.LocationSearchSettings
 import de.mm20.launcher2.ui.R
+import de.mm20.launcher2.ui.component.Banner
 import de.mm20.launcher2.ui.component.preferences.ListPreference
 import de.mm20.launcher2.ui.component.preferences.PreferenceCategory
 import de.mm20.launcher2.ui.component.preferences.PreferenceScreen
@@ -26,39 +36,86 @@ import de.mm20.launcher2.ui.ktx.metersToLocalizedString
 fun LocationsSettingsScreen() {
     val viewModel: LocationsSettingsScreenVM = viewModel()
 
-    val locations by viewModel.locations.collectAsState()
+    val osmLocations by viewModel.osmLocations.collectAsState()
     val imperialUnits by viewModel.imperialUnits.collectAsState()
     val hideUncategorized by viewModel.hideUncategorized.collectAsState()
     val radius by viewModel.radius.collectAsState()
     val customOverpassUrl by viewModel.customOverpassUrl.collectAsState()
     val showMap by viewModel.showMap.collectAsState()
     val themeMap by viewModel.themeMap.collectAsState()
-    val showPositionOnMap by viewModel.showPositionOnMap.collectAsState()
     val customTileServerUrl by viewModel.customTileServerUrl.collectAsState()
 
+    val plugins by viewModel.availablePlugins.collectAsStateWithLifecycle(
+        initialValue = emptyList(),
+        minActiveState = Lifecycle.State.RESUMED
+    )
+    val enabledPlugins by viewModel.enabledPlugins.collectAsStateWithLifecycle(initialValue = null)
+
+    val anyLocationProviderEnabled = osmLocations ?: false || enabledPlugins.isNullOrEmpty().not()
+
 
     PreferenceScreen(title = stringResource(R.string.preference_search_locations)) {
         item {
             PreferenceCategory {
                 SwitchPreference(
-                    title = stringResource(R.string.preference_search_locations),
-                    summary = stringResource(R.string.preference_search_locations_summary),
-                    value = locations == true,
+                    title = stringResource(R.string.preference_search_osm_locations),
+                    summary = stringResource(R.string.preference_search_osm_locations_summary),
+                    value = osmLocations == true,
                     onValueChanged = {
-                        viewModel.setLocations(it)
+                        viewModel.setOsmLocations(it)
                     }
                 )
+                for (plugin in plugins) {
+                    val state = plugin.state
+                    if (state is PluginState.SetupRequired) {
+                        Banner(
+                            modifier = Modifier.padding(16.dp),
+                            text = state.message
+                                ?: stringResource(id = R.string.plugin_state_setup_required),
+                            icon = Icons.Rounded.ErrorOutline,
+                            primaryAction = {
+                                TextButton(onClick = {
+                                    try {
+                                        state.setupActivity.send()
+                                    } catch (e: PendingIntent.CanceledException) {
+                                        CrashReporter.logException(e)
+                                    }
+                                }) {
+                                    Text(stringResource(id = R.string.plugin_action_setup))
+                                }
+                            }
+                        )
+                    }
+                    SwitchPreference(
+                        title = plugin.plugin.label,
+                        enabled = enabledPlugins != null && state is PluginState.Ready,
+                        summary = (state as? PluginState.Ready)?.text
+                            ?: (state as? PluginState.SetupRequired)?.message
+                            ?: plugin.plugin.description,
+                        value = enabledPlugins?.contains(plugin.plugin.authority) == true && state is PluginState.Ready,
+                        onValueChanged = {
+                            viewModel.setPluginEnabled(plugin.plugin.authority, it)
+                        },
+                    )
+                }
             }
         }
         item {
             PreferenceCategory {
+                if (5000 < radius) {
+                    Banner(
+                        modifier = Modifier.padding(16.dp),
+                        icon = Icons.Rounded.WarningAmber,
+                        text = stringResource(R.string.preference_search_locations_radius_large_radius_warning)
+                    )
+                }
                 ListPreference(
                     title = stringResource(R.string.length_unit),
                     items = listOf(
                         stringResource(R.string.imperial) to true,
                         stringResource(R.string.metric) to false
                     ),
-                    enabled = locations == true,
+                    enabled = anyLocationProviderEnabled,
                     value = imperialUnits,
                     onValueChanged = {
                         viewModel.setImperialUnits(it)
@@ -70,7 +127,7 @@ fun LocationsSettingsScreen() {
                     min = 500,
                     max = 10000,
                     step = 500,
-                    enabled = locations == true,
+                    enabled = anyLocationProviderEnabled,
                     onValueChanged = {
                         viewModel.setRadius(it)
                     },
@@ -91,7 +148,7 @@ fun LocationsSettingsScreen() {
                     title = stringResource(R.string.preference_search_locations_hide_uncategorized),
                     summary = stringResource(R.string.preference_search_locations_hide_uncategorized_summary),
                     value = hideUncategorized == true,
-                    enabled = locations == true,
+                    enabled = anyLocationProviderEnabled,
                     onValueChanged = {
                         viewModel.setHideUncategorized(it)
                     }
@@ -103,7 +160,7 @@ fun LocationsSettingsScreen() {
                 SwitchPreference(
                     title = stringResource(R.string.preference_search_locations_show_map),
                     summary = stringResource(R.string.preference_search_locations_show_map_summary),
-                    enabled = locations == true,
+                    enabled = anyLocationProviderEnabled,
                     value = showMap == true,
                     onValueChanged = {
                         viewModel.setShowMap(it)
@@ -113,7 +170,7 @@ fun LocationsSettingsScreen() {
                     title = stringResource(R.string.preference_search_locations_theme_map),
                     summary = stringResource(R.string.preference_search_locations_theme_map_summary),
                     value = themeMap == true,
-                    enabled = locations == true && showMap == true,
+                    enabled = anyLocationProviderEnabled && showMap == true,
                     onValueChanged = {
                         viewModel.setThemeMap(it)
                     }
@@ -127,11 +184,12 @@ fun LocationsSettingsScreen() {
                     title = stringResource(R.string.preference_search_location_custom_overpass_url),
                     value = customOverpassUrl,
                     placeholder = LocationSearchSettings.DefaultOverpassUrl,
-                    summary = customOverpassUrl.takeIf { !it.isNullOrBlank() }
+                    summary = customOverpassUrl.takeIf { it.isNotBlank() }
                         ?: LocationSearchSettings.DefaultOverpassUrl,
                     onValueChanged = {
                         viewModel.setCustomOverpassUrl(it)
-                    }
+                    },
+                    enabled = osmLocations == true,
                 )
                 TextPreference(
                     title = stringResource(R.string.preference_search_location_custom_tile_server_url),
@@ -141,7 +199,8 @@ fun LocationsSettingsScreen() {
                         ?: LocationSearchSettings.DefaultTileServerUrl,
                     onValueChanged = {
                         viewModel.setCustomTileServerUrl(it)
-                    }
+                    },
+                    enabled = anyLocationProviderEnabled
                 )
             }
         }
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/locations/LocationsSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/locations/LocationsSettingsScreenVM.kt
index 49720a44..825b1937 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/locations/LocationsSettingsScreenVM.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/locations/LocationsSettingsScreenVM.kt
@@ -2,40 +2,52 @@ package de.mm20.launcher2.ui.settings.locations
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import de.mm20.launcher2.plugin.PluginType
+import de.mm20.launcher2.plugins.PluginService
 import de.mm20.launcher2.preferences.search.LocationSearchSettings
 import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.launch
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
-class LocationsSettingsScreenVM: ViewModel(), KoinComponent {
+class LocationsSettingsScreenVM : ViewModel(), KoinComponent {
     private val settings: LocationSearchSettings by inject()
+    private val pluginService: PluginService by inject()
 
-    val locations = settings.enabled
+    val availablePlugins = pluginService.getPluginsWithState(
+        type = PluginType.LocationSearch,
+        enabled = true,
+    )
+    val enabledPlugins = settings.enabledPlugins
+
+    val osmLocations = settings.osmLocations
         .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null)
-    fun setLocations(openStreetMaps: Boolean) {
-        settings.setEnabled(openStreetMaps)
+
+    fun setOsmLocations(osmLocations: Boolean) {
+        settings.setOsmLocations(osmLocations)
     }
 
     val imperialUnits = settings.imperialUnits
         .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), false)
+
     fun setImperialUnits(imperialUnits: Boolean) {
         settings.setImperialUnits(imperialUnits)
     }
 
     val radius = settings.searchRadius
         .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), 1500)
+
     fun setRadius(radius: Int) {
         settings.setSearchRadius(radius)
     }
 
     val customOverpassUrl = settings.overpassUrl
         .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), "")
+
     fun setCustomOverpassUrl(customUrl: String) {
         var url = customUrl
-        if (url.endsWith('/')){
+        if (url.endsWith('/')) {
             url = url.substringBeforeLast('/')
         }
         if (url.endsWith("/api/interpreter")) {
@@ -47,31 +59,33 @@ class LocationsSettingsScreenVM: ViewModel(), KoinComponent {
 
     val showMap = settings.showMap
         .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null)
+
     fun setShowMap(showMap: Boolean) {
         settings.setShowMap(showMap)
     }
 
-    val showPositionOnMap = settings.showPositionOnMap
-        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null)
-    fun setShowPositionOnMap(showPositionOnMap: Boolean) {
-        settings.setShowPositionOnMap(showPositionOnMap)
-    }
-
     val customTileServerUrl = settings.tileServer
         .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null)
+
     fun setCustomTileServerUrl(customTileServerUrl: String) {
         settings.setTileServer(customTileServerUrl)
     }
 
     val hideUncategorized = settings.hideUncategorized
         .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null)
+
     fun setHideUncategorized(hideUncategorized: Boolean) {
         settings.setHideUncategorized(hideUncategorized)
     }
 
     val themeMap = settings.themeMap
         .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null)
+
     fun setThemeMap(themeMap: Boolean) {
         settings.setThemeMap(themeMap)
     }
+
+    fun setPluginEnabled(authority: String, enabled: Boolean) {
+        settings.setPluginEnabled(authority, enabled)
+    }
 }
\ No newline at end of file
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/plugins/PluginSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/plugins/PluginSettingsScreen.kt
index a1f54c03..4a699fbf 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/plugins/PluginSettingsScreen.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/plugins/PluginSettingsScreen.kt
@@ -25,6 +25,7 @@ import androidx.compose.material.icons.rounded.Delete
 import androidx.compose.material.icons.rounded.Error
 import androidx.compose.material.icons.rounded.Info
 import androidx.compose.material.icons.rounded.LightMode
+import androidx.compose.material.icons.rounded.Place
 import androidx.compose.material.icons.rounded.Settings
 import androidx.compose.material.icons.rounded.Verified
 import androidx.compose.material3.Icon
@@ -81,6 +82,11 @@ fun PluginSettingsScreen(pluginId: String) {
         minActiveState = Lifecycle.State.RESUMED
     )
 
+    val locationPlugins by viewModel.locationPlugins.collectAsStateWithLifecycle(
+        emptyList(),
+        minActiveState = Lifecycle.State.RESUMED
+    )
+
     val weatherPlugins by viewModel.weatherPlugins.collectAsStateWithLifecycle(
         emptyList(),
         minActiveState = Lifecycle.State.RESUMED
@@ -97,6 +103,10 @@ fun PluginSettingsScreen(pluginId: String) {
         null
     )
 
+    val enabledLocationSearchPlugins by viewModel.enabledLocationSearchPlugins.collectAsStateWithLifecycle(
+        null
+    )
+
     val weatherProviderId by viewModel.weatherProvider.collectAsStateWithLifecycle(
         null
     )
@@ -176,30 +186,7 @@ fun PluginSettingsScreen(pluginId: String) {
                                 pluginPackage?.label ?: "",
                                 style = MaterialTheme.typography.titleLarge
                             )
-                            if (pluginPackage?.isOfficial == true) {
-                                Row(
-                                    verticalAlignment = Alignment.CenterVertically,
-                                    modifier = Modifier
-                                        .padding(top = 4.dp)
-                                        .background(
-                                            MaterialTheme.colorScheme.secondary,
-                                            shape = MaterialTheme.shapes.medium,
-                                        )
-                                        .padding(4.dp)
-                                ) {
-                                    Text(
-                                        stringResource(R.string.plugin_badge_official),
-                                        modifier = Modifier.padding(horizontal = 4.dp),
-                                        style = MaterialTheme.typography.labelMedium,
-                                        color = MaterialTheme.colorScheme.onSecondary,
-                                    )
-                                    Icon(
-                                        Icons.Rounded.Verified, null,
-                                        modifier = Modifier.size(16.dp),
-                                        tint = MaterialTheme.colorScheme.onSecondary,
-                                    )
-                                }
-                            } else if (pluginPackage?.author != null) {
+                            if (pluginPackage?.author != null) {
                                 Row(
                                     verticalAlignment = Alignment.CenterVertically,
                                     modifier = Modifier
@@ -210,6 +197,15 @@ fun PluginSettingsScreen(pluginId: String) {
                                         style = MaterialTheme.typography.labelMedium,
                                         color = MaterialTheme.colorScheme.secondary,
                                     )
+                                    if (pluginPackage?.isVerified == true) {
+                                        Icon(
+                                            Icons.Rounded.Verified, null,
+                                            modifier = Modifier
+                                                .padding(start = 4.dp)
+                                                .size(16.dp),
+                                            tint = MaterialTheme.colorScheme.secondary,
+                                        )
+                                    }
                                 }
                             }
                         }
@@ -246,6 +242,7 @@ fun PluginSettingsScreen(pluginId: String) {
                                     when (type) {
                                         PluginType.FileSearch -> Icons.AutoMirrored.Rounded.InsertDriveFile
                                         PluginType.Weather -> Icons.Rounded.LightMode
+                                        PluginType.LocationSearch -> Icons.Rounded.Place
                                     },
                                     null,
                                     modifier = Modifier.size(16.dp),
@@ -255,6 +252,7 @@ fun PluginSettingsScreen(pluginId: String) {
                                     when (type) {
                                         PluginType.FileSearch -> stringResource(R.string.plugin_type_filesearch)
                                         PluginType.Weather -> stringResource(R.string.plugin_type_weather)
+                                        PluginType.LocationSearch -> stringResource(R.string.plugin_type_locationsearch)
                                     },
                                     modifier = Modifier.padding(horizontal = 4.dp),
                                     style = MaterialTheme.typography.labelMedium,
@@ -298,109 +296,164 @@ fun PluginSettingsScreen(pluginId: String) {
                 )
             }
             AnimatedVisibility(pluginPackage?.enabled == true && hasPermission == true) {
-                if (filePlugins.isNotEmpty()) {
-                    PreferenceCategory(
-                        stringResource(R.string.plugin_type_filesearch),
-                        iconPadding = false,
-                    ) {
-                        for (plugin in filePlugins) {
-                            val state = plugin.state
-                            if (state is PluginState.SetupRequired) {
-                                Banner(
-                                    modifier = Modifier.padding(16.dp),
-                                    text = state.message ?: stringResource(R.string.plugin_state_setup_required),
-                                    icon = Icons.Rounded.Info,
-                                    primaryAction = {
-                                        TextButton(onClick = {
-                                            try {
-                                                state.setupActivity.sendWithBackgroundPermission()
-                                            } catch (e: PendingIntent.CanceledException) {
-                                                CrashReporter.logException(e)
+                Column {
+                    if (filePlugins.isNotEmpty()) {
+                        PreferenceCategory(
+                            stringResource(R.string.plugin_type_filesearch),
+                            iconPadding = false,
+                        ) {
+                            for (plugin in filePlugins) {
+                                val state = plugin.state
+                                if (state is PluginState.SetupRequired) {
+                                    Banner(
+                                        modifier = Modifier.padding(16.dp),
+                                        text = state.message
+                                            ?: stringResource(R.string.plugin_state_setup_required),
+                                        icon = Icons.Rounded.Info,
+                                        primaryAction = {
+                                            TextButton(onClick = {
+                                                try {
+                                                    state.setupActivity.sendWithBackgroundPermission(context)
+                                                } catch (e: PendingIntent.CanceledException) {
+                                                    CrashReporter.logException(e)
+                                                }
+                                            }) {
+                                                Text(stringResource(R.string.plugin_action_setup))
                                             }
-                                        }) {
-                                            Text(stringResource(R.string.plugin_action_setup))
                                         }
-                                    }
-                                )
-                            } else if (state is PluginState.Error) {
-                                Banner(
-                                    modifier = Modifier.padding(16.dp),
-                                    text = stringResource(R.string.plugin_state_error),
-                                    icon = Icons.Rounded.Error,
-                                    color = MaterialTheme.colorScheme.errorContainer,
+                                    )
+                                } else if (state is PluginState.Error) {
+                                    Banner(
+                                        modifier = Modifier.padding(16.dp),
+                                        text = stringResource(R.string.plugin_state_error),
+                                        icon = Icons.Rounded.Error,
+                                        color = MaterialTheme.colorScheme.errorContainer,
+                                    )
+                                }
+                                SwitchPreference(
+                                    title = plugin.plugin.label,
+                                    enabled = enabledFileSearchPlugins != null && state is PluginState.Ready,
+                                    summary = (state as? PluginState.Ready)?.text
+                                        ?: (state as? PluginState.SetupRequired)?.message
+                                        ?: plugin.plugin.description,
+                                    value = enabledFileSearchPlugins?.contains(plugin.plugin.authority) == true && state is PluginState.Ready,
+                                    onValueChanged = {
+                                        viewModel.setFileSearchPluginEnabled(
+                                            plugin.plugin.authority,
+                                            it
+                                        )
+                                    },
+                                    iconPadding = false,
                                 )
                             }
-                            SwitchPreference(
-                                title = plugin.plugin.label,
-                                enabled = enabledFileSearchPlugins != null && state is PluginState.Ready,
-                                summary = (state as? PluginState.Ready)?.text
-                                    ?: (state as? PluginState.SetupRequired)?.message
-                                    ?: plugin.plugin.description,
-                                value = enabledFileSearchPlugins?.contains(plugin.plugin.authority) == true && state is PluginState.Ready,
-                                onValueChanged = {
-                                    viewModel.setFileSearchPluginEnabled(
-                                        plugin.plugin.authority,
-                                        it
-                                    )
-                                },
-                                iconPadding = false,
-                            )
                         }
                     }
-                }
-                if (weatherPlugins.isNotEmpty()) {
-                    PreferenceCategory(
-                        stringResource(R.string.plugin_type_weather),
-                        iconPadding = false,
-                    ) {
-                        for (plugin in weatherPlugins) {
-                            val state = plugin.state
-                            if (state is PluginState.SetupRequired) {
-                                Banner(
-                                    modifier = Modifier.padding(16.dp),
-                                    text = state.message ?: stringResource(R.string.plugin_state_setup_required),
-                                    icon = Icons.Rounded.Info,
-                                    primaryAction = {
-                                        TextButton(onClick = {
-                                            try {
-                                                state.setupActivity.sendWithBackgroundPermission()
-                                            } catch (e: PendingIntent.CanceledException) {
-                                                CrashReporter.logException(e)
+                    if (locationPlugins.isNotEmpty()) {
+                        PreferenceCategory(
+                            stringResource(R.string.plugin_type_locationsearch),
+                            iconPadding = false,
+                        ) {
+                            for (plugin in locationPlugins) {
+                                val state = plugin.state
+                                if (state is PluginState.SetupRequired) {
+                                    Banner(
+                                        modifier = Modifier.padding(16.dp),
+                                        text = state.message
+                                            ?: stringResource(R.string.plugin_state_setup_required),
+                                        icon = Icons.Rounded.Info,
+                                        primaryAction = {
+                                            TextButton(onClick = {
+                                                try {
+                                                    state.setupActivity.sendWithBackgroundPermission(context)
+                                                } catch (e: PendingIntent.CanceledException) {
+                                                    CrashReporter.logException(e)
+                                                }
+                                            }) {
+                                                Text(stringResource(R.string.plugin_action_setup))
                                             }
-                                        }) {
-                                            Text(stringResource(R.string.plugin_action_setup))
                                         }
-                                    }
+                                    )
+                                } else if (state is PluginState.Error) {
+                                    Banner(
+                                        modifier = Modifier.padding(16.dp),
+                                        text = stringResource(R.string.plugin_state_error),
+                                        icon = Icons.Rounded.Error,
+                                        color = MaterialTheme.colorScheme.errorContainer,
+                                    )
+                                }
+                                SwitchPreference(
+                                    title = plugin.plugin.label,
+                                    enabled = enabledLocationSearchPlugins != null && state is PluginState.Ready,
+                                    summary = (state as? PluginState.Ready)?.text
+                                        ?: (state as? PluginState.SetupRequired)?.message
+                                        ?: plugin.plugin.description,
+                                    value = enabledLocationSearchPlugins?.contains(plugin.plugin.authority) == true && state is PluginState.Ready,
+                                    onValueChanged = {
+                                        viewModel.setLocationSearchPluginEnabled(
+                                            plugin.plugin.authority,
+                                            it
+                                        )
+                                    },
+                                    iconPadding = false,
                                 )
-                            } else if (state is PluginState.Error) {
-                                Banner(
-                                    modifier = Modifier.padding(16.dp),
-                                    text = stringResource(R.string.plugin_state_error),
-                                    icon = Icons.Rounded.Error,
-                                    color = MaterialTheme.colorScheme.errorContainer,
+                            }
+                        }
+                    }
+                    if (weatherPlugins.isNotEmpty()) {
+                        PreferenceCategory(
+                            stringResource(R.string.plugin_type_weather),
+                            iconPadding = false,
+                        ) {
+                            for (plugin in weatherPlugins) {
+                                val state = plugin.state
+                                if (state is PluginState.SetupRequired) {
+                                    Banner(
+                                        modifier = Modifier.padding(16.dp),
+                                        text = state.message
+                                            ?: stringResource(R.string.plugin_state_setup_required),
+                                        icon = Icons.Rounded.Info,
+                                        primaryAction = {
+                                            TextButton(onClick = {
+                                                try {
+                                                    state.setupActivity.sendWithBackgroundPermission(context)
+                                                } catch (e: PendingIntent.CanceledException) {
+                                                    CrashReporter.logException(e)
+                                                }
+                                            }) {
+                                                Text(stringResource(R.string.plugin_action_setup))
+                                            }
+                                        }
+                                    )
+                                } else if (state is PluginState.Error) {
+                                    Banner(
+                                        modifier = Modifier.padding(16.dp),
+                                        text = stringResource(R.string.plugin_state_error),
+                                        icon = Icons.Rounded.Error,
+                                        color = MaterialTheme.colorScheme.errorContainer,
+                                    )
+                                }
+                                Preference(
+                                    title = plugin.plugin.label,
+                                    enabled = state is PluginState.Ready && weatherProviderId != plugin.plugin.authority,
+                                    iconPadding = false,
+                                    summary = if (weatherProviderId != plugin.plugin.authority) {
+                                        stringResource(R.string.plugin_weather_provider_enable)
+                                    } else {
+                                        stringResource(R.string.plugin_weather_provider_enabled)
+                                    },
+                                    onClick = {
+                                        viewModel.setWeatherProvider(plugin.plugin.authority)
+                                    }
                                 )
                             }
                             Preference(
-                                title = plugin.plugin.label,
-                                enabled = state is PluginState.Ready && weatherProviderId != plugin.plugin.authority,
-                                iconPadding = false,
-                                summary = if (weatherProviderId != plugin.plugin.authority) {
-                                    stringResource(R.string.plugin_weather_provider_enable)
-                                } else {
-                                    stringResource(R.string.plugin_weather_provider_enabled)
-                                },
+                                title = stringResource(R.string.widget_config_weather_integration_settings),
+                                icon = Icons.AutoMirrored.Rounded.OpenInNew,
                                 onClick = {
-                                    viewModel.setWeatherProvider(plugin.plugin.authority)
+                                    navController?.navigate("settings/integrations/weather")
                                 }
                             )
                         }
-                        Preference(
-                            title = stringResource(R.string.widget_config_weather_integration_settings),
-                            icon = Icons.AutoMirrored.Rounded.OpenInNew,
-                            onClick = {
-                                navController?.navigate("settings/integrations/weather")
-                            }
-                        )
                     }
                 }
             }
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/plugins/PluginSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/plugins/PluginSettingsScreenVM.kt
index 00b7cc87..bc7a2409 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/plugins/PluginSettingsScreenVM.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/plugins/PluginSettingsScreenVM.kt
@@ -14,6 +14,7 @@ import de.mm20.launcher2.plugin.PluginType
 import de.mm20.launcher2.plugins.PluginService
 import de.mm20.launcher2.plugins.PluginWithState
 import de.mm20.launcher2.preferences.search.FileSearchSettings
+import de.mm20.launcher2.preferences.search.LocationSearchSettings
 import de.mm20.launcher2.preferences.weather.WeatherSettings
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -31,6 +32,7 @@ import org.koin.core.component.inject
 class PluginSettingsScreenVM : ViewModel(), KoinComponent {
     private val pluginService by inject<PluginService>()
     private val fileSearchSettings: FileSearchSettings by inject()
+    private val locationSearchSettings: LocationSearchSettings by inject()
     private val weatherSettings: WeatherSettings by inject()
 
     private var pluginPackageName = MutableStateFlow<String?>(null)
@@ -72,6 +74,11 @@ class PluginSettingsScreenVM : ViewModel(), KoinComponent {
             it.filter { it.plugin.type == PluginType.FileSearch }
         }
 
+    val locationPlugins = states
+        .map {
+            it.filter { it.plugin.type == PluginType.LocationSearch }
+        }
+
     val weatherPlugins = states
         .map {
             it.filter { it.plugin.type == PluginType.Weather }
@@ -109,6 +116,11 @@ class PluginSettingsScreenVM : ViewModel(), KoinComponent {
         fileSearchSettings.setPluginEnabled(authority, enabled)
     }
 
+    val enabledLocationSearchPlugins = locationSearchSettings.enabledPlugins
+    fun setLocationSearchPluginEnabled(authority: String, enabled: Boolean) {
+        locationSearchSettings.setPluginEnabled(authority, enabled)
+    }
+
     val weatherProvider = weatherSettings.providerId
     fun setWeatherProvider(providerId: String) {
         weatherSettings.setProvider(providerId)
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/plugins/PluginsSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/plugins/PluginsSettingsScreen.kt
index 007a2770..cbeae8b3 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/plugins/PluginsSettingsScreen.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/plugins/PluginsSettingsScreen.kt
@@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.Extension
-import androidx.compose.material.icons.rounded.ExtensionOff
 import androidx.compose.material.icons.rounded.Verified
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -19,7 +18,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
@@ -98,13 +96,6 @@ private fun PluginPreference(viewModel: PluginsSettingsScreenVM, plugin: PluginP
                 verticalAlignment = Alignment.CenterVertically
             ) {
                 Text(plugin.label)
-                if (plugin.isOfficial) {
-                    Icon(
-                        Icons.Rounded.Verified, null,
-                        modifier = Modifier.padding(start = 4.dp).size(16.dp),
-                        tint = MaterialTheme.colorScheme.secondary,
-                    )
-                }
             }
         },
         summary = plugin.description?.let { { Text(it) } },
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreen.kt
index 97b5333a..919f315b 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreen.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreen.kt
@@ -22,8 +22,6 @@ import androidx.compose.material.icons.rounded.Today
 import androidx.compose.material.icons.rounded.VisibilityOff
 import androidx.compose.material.icons.rounded.Warning
 import androidx.compose.material.icons.rounded.Work
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -50,7 +48,7 @@ import de.mm20.launcher2.ui.component.preferences.PreferenceCategory
 import de.mm20.launcher2.ui.component.preferences.PreferenceScreen
 import de.mm20.launcher2.ui.component.preferences.PreferenceWithSwitch
 import de.mm20.launcher2.ui.component.preferences.SwitchPreference
-import de.mm20.launcher2.ui.icons.Wikipedia
+import de.mm20.launcher2.icons.Wikipedia
 import de.mm20.launcher2.ui.launcher.search.filters.SearchFilters
 import de.mm20.launcher2.ui.locals.LocalNavController
 
@@ -227,15 +225,10 @@ fun SearchSettingsScreen() {
                     }
                 )
 
-                val locations by viewModel.locations.collectAsStateWithLifecycle(null)
-                PreferenceWithSwitch(
+                Preference(
                     title = stringResource(R.string.preference_search_locations),
                     summary = stringResource(R.string.preference_search_locations_summary),
                     icon = Icons.Rounded.Place,
-                    switchValue = locations == true,
-                    onSwitchChanged = {
-                        viewModel.setLocations(it)
-                    },
                     onClick = {
                         navController?.navigate("settings/search/locations")
                     }
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreenVM.kt
index fbdd95d2..c35e0907 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreenVM.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreenVM.kt
@@ -22,7 +22,6 @@ import de.mm20.launcher2.preferences.search.WikipediaSearchSettings
 import de.mm20.launcher2.preferences.ui.SearchUiSettings
 import de.mm20.launcher2.search.SearchFilters
 import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.stateIn
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
@@ -109,13 +108,6 @@ class SearchSettingsScreenVM : ViewModel(), KoinComponent {
         websiteSearchSettings.setEnabled(websites)
     }
 
-    val locations = locationSearchSettings.enabled
-        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null)
-
-    fun setLocations(locations: Boolean) {
-        locationSearchSettings.setEnabled(locations)
-    }
-
     val autoFocus = searchUiSettings.openKeyboard
 
     fun setAutoFocus(autoFocus: Boolean) {
diff --git a/core/base/build.gradle.kts b/core/base/build.gradle.kts
index a55700f5..a20c62c0 100644
--- a/core/base/build.gradle.kts
+++ b/core/base/build.gradle.kts
@@ -48,6 +48,9 @@ dependencies {
 
     implementation(libs.koin.android)
     implementation(libs.androidx.palette)
+    runtimeOnly(libs.androidx.compose.ui)
+    runtimeOnly(libs.androidx.compose.runtime)
+    implementation(libs.androidx.compose.materialicons)
 
     implementation(project(":core:ktx"))
     implementation(project(":core:i18n"))
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/icons/BatteryIcons.kt b/core/base/src/main/java/de/mm20/launcher2/icons/BatteryIcons.kt
similarity index 99%
rename from app/ui/src/main/java/de/mm20/launcher2/ui/icons/BatteryIcons.kt
rename to core/base/src/main/java/de/mm20/launcher2/icons/BatteryIcons.kt
index 45d2b5b0..afdeae8b 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/icons/BatteryIcons.kt
+++ b/core/base/src/main/java/de/mm20/launcher2/icons/BatteryIcons.kt
@@ -1,4 +1,4 @@
-package de.mm20.launcher2.ui.icons
+package de.mm20.launcher2.icons
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.materialIcon
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/icons/Icons.kt b/core/base/src/main/java/de/mm20/launcher2/icons/Icons.kt
similarity index 83%
rename from app/ui/src/main/java/de/mm20/launcher2/ui/icons/Icons.kt
rename to core/base/src/main/java/de/mm20/launcher2/icons/Icons.kt
index 5f35cf52..59c11516 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/icons/Icons.kt
+++ b/core/base/src/main/java/de/mm20/launcher2/icons/Icons.kt
@@ -1,9 +1,10 @@
-package de.mm20.launcher2.ui.icons
+package de.mm20.launcher2.icons
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.materialIcon
 import androidx.compose.material.icons.materialPath
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.unit.dp
 
 val Icons.Rounded.Pdf: ImageVector
     get() = materialIcon("Icons.Rounded.Pdf") {
@@ -1099,4 +1100,331 @@ val Icons.Rounded.HumidityPercentage
             moveToRelative(0f, -6.2f)
             close()
         }
-    }
\ No newline at end of file
+    }
+
+private val _CableCar = materialIcon("Icons.Rounded.CableCar") {
+    materialPath {
+        moveTo(21f, 4.5f)
+        lineTo(3f, 7.5f)
+        verticalLineTo(9f)
+        lineTo(10.999512f, 7.6669922f)
+        verticalLineTo(10.000488f)
+        horizontalLineTo(6f)
+        curveToRelative(-1.1079945f, 0f, -1.9995117f, 0.891517f, -1.9995117f, 1.999512f)
+        verticalLineToRelative(6f)
+        curveToRelative(0f, 1.107995f, 0.8915172f, 1.999512f, 1.9995117f, 1.999512f)
+        horizontalLineToRelative(12f)
+        curveToRelative(1.107995f, 0f, 1.999512f, -0.891517f, 1.999512f, -1.999512f)
+        verticalLineToRelative(-6f)
+        curveToRelative(0f, -1.107995f, -0.891517f, -1.999512f, -1.999512f, -1.999512f)
+        horizontalLineTo(13.000488f)
+        verticalLineTo(7.3330078f)
+        lineTo(21f, 6f)
+        close()
+        moveTo(6f, 12f)
+        horizontalLineToRelative(4.999512f)
+        verticalLineToRelative(3f)
+        horizontalLineTo(6f)
+        close()
+        moveToRelative(7.000488f, 0f)
+        horizontalLineTo(18f)
+        verticalLineToRelative(3f)
+        horizontalLineToRelative(-4.999512f)
+        close()
+    }
+}
+val Icons.Rounded.CableCar
+    get() = _CableCar
+
+
+private val _Stethoscope = materialIcon("Icons.Rounded.Stethoscope") {
+    materialPath {
+        moveTo(13.5f, 22f)
+        quadTo(10.8f, 22f, 8.9f, 20.1f)
+        quadTo(7f, 18.2f, 7f, 15.5f)
+        verticalLineTo(14.925f)
+        quadTo(4.85f, 14.575f, 3.425f, 12.9125f)
+        quadTo(2f, 11.25f, 2f, 9f)
+        verticalLineTo(4f)
+        quadTo(2f, 3.575f, 2.2875f, 3.2875f)
+        quadTo(2.575f, 3f, 3f, 3f)
+        horizontalLineTo(5f)
+        quadTo(5f, 2.575f, 5.2875f, 2.2875f)
+        quadTo(5.575f, 2f, 6f, 2f)
+        quadTo(6.425f, 2f, 6.7125f, 2.2875f)
+        quadTo(7f, 2.575f, 7f, 3f)
+        verticalLineTo(5f)
+        quadTo(7f, 5.425f, 6.7125f, 5.7125f)
+        quadTo(6.425f, 6f, 6f, 6f)
+        quadTo(5.575f, 6f, 5.2875f, 5.7125f)
+        quadTo(5f, 5.425f, 5f, 5f)
+        horizontalLineTo(4f)
+        verticalLineTo(9f)
+        quadTo(4f, 10.65f, 5.175f, 11.825f)
+        quadTo(6.35f, 13f, 8f, 13f)
+        quadTo(9.65f, 13f, 10.825f, 11.825f)
+        quadTo(12f, 10.65f, 12f, 9f)
+        verticalLineTo(5f)
+        horizontalLineTo(11f)
+        quadTo(11f, 5.425f, 10.7125f, 5.7125f)
+        quadTo(10.425f, 6f, 10f, 6f)
+        quadTo(9.575f, 6f, 9.2875f, 5.7125f)
+        quadTo(9f, 5.425f, 9f, 5f)
+        verticalLineTo(3f)
+        quadTo(9f, 2.575f, 9.2875f, 2.2875f)
+        quadTo(9.575f, 2f, 10f, 2f)
+        quadTo(10.425f, 2f, 10.7125f, 2.2875f)
+        quadTo(11f, 2.575f, 11f, 3f)
+        horizontalLineToRelative(2f)
+        quadTo(13.425f, 3f, 13.7125f, 3.2875f)
+        quadTo(14f, 3.575f, 14f, 4f)
+        verticalLineToRelative(5f)
+        quadToRelative(0f, 2.25f, -1.425f, 3.9125f)
+        quadTo(11.15f, 14.575f, 9f, 14.925f)
+        verticalLineTo(15.5f)
+        quadToRelative(0f, 1.875f, 1.3125f, 3.1875f)
+        quadTo(11.625f, 20f, 13.5f, 20f)
+        quadTo(15.375f, 20f, 16.6875f, 18.6875f)
+        quadTo(18f, 17.375f, 18f, 15.5f)
+        verticalLineTo(13.825f)
+        quadTo(17.125f, 13.5f, 16.5625f, 12.7375f)
+        quadTo(16f, 11.975f, 16f, 11f)
+        quadTo(16f, 9.75f, 16.875f, 8.875f)
+        quadTo(17.75f, 8f, 19f, 8f)
+        quadTo(20.25f, 8f, 21.125f, 8.875f)
+        quadTo(22f, 9.75f, 22f, 11f)
+        quadTo(22f, 11.975f, 21.4375f, 12.7375f)
+        quadTo(20.875f, 13.5f, 20f, 13.825f)
+        verticalLineTo(15.5f)
+        quadToRelative(0f, 2.7f, -1.9f, 4.6f)
+        quadToRelative(-1.9f, 1.9f, -4.6f, 1.9f)
+        close()
+    }
+}
+
+val Icons.Rounded.Stethoscope
+    get() = _Stethoscope
+
+private val _Dentistry = materialIcon("Icons.Rounded.Dentistry") {
+    materialPath {
+        moveTo(17f, 2.9875f)
+        quadToRelative(1.65f, 0f, 2.825f, 1.175f)
+        quadTo(21f, 5.3375f, 21f, 6.9875f)
+        quadTo(21f, 7.2625f, 20.9625f, 7.725f)
+        quadTo(20.925f, 8.1875f, 20.85f, 8.7875f)
+        lineToRelative(-1.375f, 10.075f)
+        quadToRelative(-0.125f, 0.95f, -0.8625f, 1.55f)
+        quadToRelative(-0.7375f, 0.6f, -1.6875f, 0.6f)
+        quadToRelative(-0.575f, 0f, -1.0625f, -0.25f)
+        quadToRelative(-0.4875f, -0.25f, -0.8125f, -0.7f)
+        lineToRelative(-2.675f, -3.9f)
+        quadToRelative(-0.05f, -0.1f, -0.1625f, -0.1375f)
+        quadToRelative(-0.1125f, -0.0375f, -0.2375f, -0.0375f)
+        quadToRelative(-0.1f, 0f, -0.4f, 0.225f)
+        lineToRelative(-2.6f, 3.775f)
+        quadTo(8.625f, 20.4875f, 8.1125f, 20.75f)
+        quadTo(7.6f, 21.0125f, 7.025f, 21.0125f)
+        quadTo(6.075f, 21.0125f, 5.35f, 20.4f)
+        quadTo(4.625f, 19.7875f, 4.5f, 18.8375f)
+        lineTo(3.15f, 8.7875f)
+        quadTo(3.075f, 8.1875f, 3.0375f, 7.725f)
+        quadTo(3f, 7.2625f, 3f, 6.9875f)
+        quadTo(3f, 5.3375f, 4.175f, 4.1625f)
+        quadTo(5.35f, 2.9875f, 7f, 2.9875f)
+        quadTo(7.9f, 2.9875f, 8.4375f, 3.225f)
+        quadTo(8.975f, 3.4625f, 9.475f, 3.7375f)
+        quadTo(9.975f, 4.0125f, 10.5375f, 4.25f)
+        quadTo(11.1f, 4.4875f, 12f, 4.4875f)
+        quadToRelative(0.9f, 0f, 1.4625f, -0.2375f)
+        quadToRelative(0.5625f, -0.2375f, 1.0625f, -0.5125f)
+        quadToRelative(0.5f, -0.275f, 1.05f, -0.5125f)
+        quadTo(16.125f, 2.9875f, 17f, 2.9875f)
+        close()
+    }
+}
+
+val Icons.Rounded.Dentistry
+    get() = _Dentistry
+
+private val _Eyeglasses = materialIcon("Icons.Rounded.Eyeglasses") {
+    materialPath {
+        moveTo(6.85f, 15f)
+        quadTo(7.625f, 15f, 8.2375f, 14.55f)
+        quadTo(8.85f, 14.1f, 9.1f, 13.375f)
+        lineToRelative(0.375f, -1.15f)
+        quadToRelative(0.4f, -1.2f, -0.2f, -2.2125f)
+        quadTo(8.675f, 9f, 7.55f, 9f)
+        horizontalLineTo(4.025f)
+        lineTo(4.5f, 12.925f)
+        quadTo(4.625f, 13.8f, 5.2875f, 14.4f)
+        quadTo(5.95f, 15f, 6.85f, 15f)
+        close()
+        moveToRelative(10.3f, 0f)
+        quadToRelative(0.9f, 0f, 1.5625f, -0.6f)
+        quadTo(19.375f, 13.8f, 19.5f, 12.925f)
+        lineTo(19.975f, 9f)
+        horizontalLineToRelative(-3.5f)
+        quadToRelative(-1.125f, 0f, -1.725f, 1.025f)
+        quadToRelative(-0.6f, 1.025f, -0.2f, 2.225f)
+        lineToRelative(0.35f, 1.125f)
+        quadTo(15.15f, 14.1f, 15.7625f, 14.55f)
+        quadTo(16.375f, 15f, 17.15f, 15f)
+        close()
+        moveTo(6.85f, 17f)
+        quadTo(5.2f, 17f, 3.9625f, 15.9125f)
+        quadTo(2.725f, 14.825f, 2.525f, 13.175f)
+        lineTo(2f, 9f)
+        quadTo(1.575f, 9f, 1.2875f, 8.7125f)
+        quadTo(1f, 8.425f, 1f, 8f)
+        quadTo(1f, 7.575f, 1.2875f, 7.2875f)
+        quadTo(1.575f, 7f, 2f, 7f)
+        horizontalLineTo(7.55f)
+        quadTo(8.65f, 7f, 9.5625f, 7.5375f)
+        quadTo(10.475f, 8.075f, 11f, 9f)
+        horizontalLineToRelative(2.025f)
+        quadTo(13.55f, 8.075f, 14.4625f, 7.5375f)
+        quadTo(15.375f, 7f, 16.475f, 7f)
+        horizontalLineTo(22f)
+        quadTo(22.425f, 7f, 22.7125f, 7.2875f)
+        quadTo(23f, 7.575f, 23f, 8f)
+        quadTo(23f, 8.425f, 22.7125f, 8.7125f)
+        quadTo(22.425f, 9f, 22f, 9f)
+        lineToRelative(-0.525f, 4.175f)
+        quadToRelative(-0.2f, 1.65f, -1.4375f, 2.7375f)
+        quadTo(18.8f, 17f, 17.15f, 17f)
+        quadTo(15.725f, 17f, 14.5875f, 16.1875f)
+        quadTo(13.45f, 15.375f, 13f, 14.025f)
+        lineTo(12.625f, 12.9f)
+        quadToRelative(-0.05f, -0.175f, -0.1f, -0.3625f)
+        quadTo(12.475f, 12.35f, 12.425f, 12f)
+        horizontalLineToRelative(-0.85f)
+        quadToRelative(-0.05f, 0.3f, -0.1f, 0.4875f)
+        quadToRelative(-0.05f, 0.1875f, -0.1f, 0.3625f)
+        lineTo(11f, 14f)
+        quadTo(10.55f, 15.35f, 9.4125f, 16.175f)
+        quadTo(8.275f, 17f, 6.85f, 17f)
+        close()
+    }
+}
+
+val Icons.Rounded.Eyeglasses
+    get() = _Eyeglasses
+
+private val _Monument = materialIcon("Icons.Rounded.Monument") {
+    materialPath {
+        moveTo(12f, 1.9995117f)
+        lineTo(10.000488f, 4.0004883f)
+        lineTo(10.000488f, 16.000488f)
+        lineTo(9f, 16.000488f)
+        curveTo(8.4460012f, 16.000488f, 7.9995117f, 16.445512f, 7.9995117f, 16.999512f)
+        lineTo(7.9995117f, 19.999512f)
+        lineTo(7.0004883f, 19.999512f)
+        curveTo(6.4464888f, 19.999512f, 6f, 20.446001f, 6f, 21f)
+        curveTo(6f, 21.553999f, 6.4464888f, 22.000488f, 7.0004883f, 22.000488f)
+        lineTo(16.999512f, 22.000488f)
+        curveTo(17.553511f, 22.000488f, 18f, 21.553999f, 18f, 21f)
+        curveTo(18f, 20.446001f, 17.553511f, 19.999512f, 16.999512f, 19.999512f)
+        lineTo(16.000488f, 19.999512f)
+        lineTo(16.000488f, 16.999512f)
+        curveTo(16.000488f, 16.445512f, 15.553998f, 16.000488f, 15f, 16.000488f)
+        lineTo(13.999512f, 16.000488f)
+        lineTo(13.999512f, 4.0004883f)
+        lineTo(12f, 1.9995117f)
+        close()
+    }
+
+}
+val Icons.Rounded.Monument
+    get() = _Monument
+
+private val _Candle = materialIcon("Icons.Rounded.Candle") {
+    materialPath {
+        moveTo(240f, -160f)
+        horizontalLineToRelative(480f)
+        quadToRelative(17f, 0f, 28.5f, -11.5f)
+        reflectiveQuadTo(760f, -200f)
+        horizontalLineTo(200f)
+        quadToRelative(0f, 17f, 11.5f, 28.5f)
+        reflectiveQuadTo(240f, -160f)
+        close()
+        moveToRelative(240f, -480f)
+        quadToRelative(-48f, 0f, -80f, -33.5f)
+        reflectiveQuadTo(370f, -755f)
+        quadToRelative(2f, -44f, 27f, -78.5f)
+        reflectiveQuadToRelative(56f, -62.5f)
+        quadToRelative(6f, -5f, 12.5f, -7.5f)
+        reflectiveQuadTo(480f, -906f)
+        quadToRelative(8f, 0f, 14.5f, 2.5f)
+        reflectiveQuadTo(507f, -896f)
+        quadToRelative(31f, 28f, 56f, 62.5f)
+        reflectiveQuadToRelative(27f, 78.5f)
+        quadToRelative(2f, 48f, -30f, 81.5f)
+        reflectiveQuadTo(480f, -640f)
+        close()
+        moveToRelative(-40f, 360f)
+        horizontalLineToRelative(80f)
+        verticalLineToRelative(-240f)
+        horizontalLineToRelative(-80f)
+        verticalLineToRelative(240f)
+        close()
+        moveToRelative(40f, -440f)
+        quadToRelative(13f, 0f, 21.5f, -9f)
+        reflectiveQuadToRelative(8.5f, -22f)
+        quadToRelative(0f, -17f, -9.5f, -31f)
+        reflectiveQuadTo(480f, -809f)
+        quadToRelative(-11f, 13f, -20.5f, 27f)
+        reflectiveQuadToRelative(-9.5f, 31f)
+        quadToRelative(0f, 13f, 8.5f, 22f)
+        reflectiveQuadToRelative(21.5f, 9f)
+        close()
+        moveToRelative(330f, 440f)
+        quadToRelative(13f, 0f, 21.5f, -8.5f)
+        reflectiveQuadTo(840f, -310f)
+        quadToRelative(0f, -13f, -8.5f, -21.5f)
+        reflectiveQuadTo(810f, -340f)
+        quadToRelative(-13f, 0f, -21.5f, 8.5f)
+        reflectiveQuadTo(780f, -310f)
+        quadToRelative(0f, 13f, 8.5f, 21.5f)
+        reflectiveQuadTo(810f, -280f)
+        close()
+        moveTo(720f, -80f)
+        horizontalLineTo(240f)
+        quadToRelative(-50f, 0f, -85f, -35f)
+        reflectiveQuadToRelative(-35f, -85f)
+        verticalLineToRelative(-40f)
+        quadToRelative(0f, -17f, 11.5f, -28.5f)
+        reflectiveQuadTo(160f, -280f)
+        horizontalLineToRelative(200f)
+        verticalLineToRelative(-240f)
+        quadToRelative(0f, -33f, 23.5f, -56.5f)
+        reflectiveQuadTo(440f, -600f)
+        horizontalLineToRelative(80f)
+        quadToRelative(33f, 0f, 56.5f, 23.5f)
+        reflectiveQuadTo(600f, -520f)
+        verticalLineToRelative(240f)
+        horizontalLineToRelative(104f)
+        quadToRelative(-2f, -8f, -3f, -15f)
+        reflectiveQuadToRelative(-1f, -15f)
+        quadToRelative(0f, -46f, 32f, -78f)
+        reflectiveQuadToRelative(78f, -32f)
+        quadToRelative(46f, 0f, 78f, 32f)
+        reflectiveQuadToRelative(32f, 78f)
+        quadToRelative(0f, 38f, -22.5f, 67f)
+        reflectiveQuadTo(840f, -204f)
+        verticalLineToRelative(4f)
+        quadToRelative(0f, 50f, -35f, 85f)
+        reflectiveQuadToRelative(-85f, 35f)
+        close()
+        moveToRelative(-240f, -80f)
+        close()
+        moveToRelative(-40f, -120f)
+        horizontalLineToRelative(80f)
+        horizontalLineToRelative(-80f)
+        close()
+        moveToRelative(40f, -484f)
+        close()
+    }
+}
+
+val Icons.Rounded.Candle
+    get() = _Candle
diff --git a/core/base/src/main/java/de/mm20/launcher2/icons/LauncherIconLayer.kt b/core/base/src/main/java/de/mm20/launcher2/icons/LauncherIconLayer.kt
index 47a04465..8ab1d68d 100644
--- a/core/base/src/main/java/de/mm20/launcher2/icons/LauncherIconLayer.kt
+++ b/core/base/src/main/java/de/mm20/launcher2/icons/LauncherIconLayer.kt
@@ -1,6 +1,7 @@
 package de.mm20.launcher2.icons
 
 import android.graphics.drawable.Drawable
+import androidx.compose.ui.graphics.vector.ImageVector
 
 sealed interface LauncherIconLayer
 
@@ -53,4 +54,9 @@ data class TextLayer(
     val color: Int = 0,
 ) : LauncherIconLayer
 
+data class VectorLayer(
+    val vector: ImageVector,
+    val color: Int = 0,
+) : LauncherIconLayer
+
 object TransparentLayer: LauncherIconLayer
\ No newline at end of file
diff --git a/core/base/src/main/java/de/mm20/launcher2/plugin/PluginApi.kt b/core/base/src/main/java/de/mm20/launcher2/plugin/PluginApi.kt
index 98d85471..08fb76f6 100644
--- a/core/base/src/main/java/de/mm20/launcher2/plugin/PluginApi.kt
+++ b/core/base/src/main/java/de/mm20/launcher2/plugin/PluginApi.kt
@@ -1,9 +1,11 @@
 package de.mm20.launcher2.plugin
 
 import android.content.ContentResolver
+import android.database.Cursor
 import android.net.Uri
+import android.os.Bundle
 import android.util.Log
-import de.mm20.launcher2.plugin.config.SearchPluginConfig
+import de.mm20.launcher2.plugin.config.QueryPluginConfig
 import de.mm20.launcher2.plugin.config.WeatherPluginConfig
 import de.mm20.launcher2.plugin.contracts.PluginContract
 
@@ -11,7 +13,25 @@ class PluginApi(
     private val pluginAuthority: String,
     private val contentResolver: ContentResolver,
 ) {
-    fun getSearchPluginConfig(): SearchPluginConfig? {
+    fun getConfig(): Bundle? {
+        val configBundle = try {
+            contentResolver.call(
+                Uri.Builder()
+                    .scheme("content")
+                    .authority(pluginAuthority)
+                    .build(),
+                PluginContract.Methods.GetConfig,
+                null,
+                null
+            ) ?: return null
+        } catch (e: Exception) {
+            Log.e("MM20", "Plugin $pluginAuthority threw exception", e)
+            return null
+        }
+        return configBundle
+    }
+
+    fun getSearchPluginConfig(): QueryPluginConfig? {
         val configBundle = try {
             contentResolver.call(
                 Uri.Builder()
@@ -27,7 +47,7 @@ class PluginApi(
             return null
         }
 
-        return SearchPluginConfig(configBundle)
+        return QueryPluginConfig(configBundle)
     }
 
     fun getWeatherPluginConfig(): WeatherPluginConfig? {
diff --git a/core/base/src/main/java/de/mm20/launcher2/plugin/PluginPackage.kt b/core/base/src/main/java/de/mm20/launcher2/plugin/PluginPackage.kt
index 0d6a66f3..147a1984 100644
--- a/core/base/src/main/java/de/mm20/launcher2/plugin/PluginPackage.kt
+++ b/core/base/src/main/java/de/mm20/launcher2/plugin/PluginPackage.kt
@@ -10,7 +10,7 @@ data class PluginPackage(
     val author: String? = null,
     val settings: Intent? = null,
     val plugins: List<Plugin>,
-    val isOfficial: Boolean = false,
+    val isVerified: Boolean = false,
 ) {
     val enabled: Boolean = plugins.all { it.enabled }
 }
\ No newline at end of file
diff --git a/core/base/src/main/java/de/mm20/launcher2/plugin/QueryPluginApi.kt b/core/base/src/main/java/de/mm20/launcher2/plugin/QueryPluginApi.kt
new file mode 100644
index 00000000..413973f4
--- /dev/null
+++ b/core/base/src/main/java/de/mm20/launcher2/plugin/QueryPluginApi.kt
@@ -0,0 +1,190 @@
+package de.mm20.launcher2.plugin
+
+import android.content.Context
+import android.database.Cursor
+import android.net.Uri
+import android.os.Bundle
+import android.os.CancellationSignal
+import android.util.Log
+import de.mm20.launcher2.plugin.config.QueryPluginConfig
+import de.mm20.launcher2.plugin.contracts.LocationPluginContract
+import de.mm20.launcher2.plugin.contracts.PluginContract
+import de.mm20.launcher2.plugin.contracts.SearchPluginContract
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.withContext
+import kotlin.coroutines.resume
+
+private class NotUpdated : Exception("Not updated")
+
+abstract class QueryPluginApi<TQuery, TResult>(
+    private val context: Context,
+    private val pluginAuthority: String,
+) {
+    private fun getLanguage() = context.resources.configuration.locales[0].language
+
+    fun getConfig(): QueryPluginConfig? {
+        val configBundle = try {
+            context.contentResolver.call(
+                Uri.Builder()
+                    .scheme("content")
+                    .authority(pluginAuthority)
+                    .build(),
+                PluginContract.Methods.GetConfig,
+                null,
+                null
+            ) ?: return null
+        } catch (e: Exception) {
+            Log.e("MM20", "Plugin $pluginAuthority threw exception", e)
+            return null
+        }
+        return QueryPluginConfig(configBundle)
+    }
+
+    suspend fun search(query: TQuery, allowNetwork: Boolean): List<TResult> = withContext(Dispatchers.IO) {
+            val lang = getLanguage()
+            val uri = Uri.Builder()
+                .scheme("content")
+                .authority(pluginAuthority)
+                .path(LocationPluginContract.Paths.Search)
+                .appendQueryParameters(query)
+                .appendQueryParameter(
+                    SearchPluginContract.Params.AllowNetwork,
+                    allowNetwork.toString()
+                )
+                .appendQueryParameter(
+                    SearchPluginContract.Params.Lang,
+                    lang
+                )
+                .build()
+            val cancellationSignal = CancellationSignal()
+
+            return@withContext suspendCancellableCoroutine {
+                it.invokeOnCancellation {
+                    cancellationSignal.cancel()
+                }
+                val cursor = try {
+                    context.contentResolver.query(
+                        uri,
+                        null,
+                        null,
+                        cancellationSignal
+                    )
+                } catch (e: Exception) {
+                    Log.e("MM20", "Plugin $pluginAuthority threw exception", e)
+                    it.resume(emptyList())
+                    return@suspendCancellableCoroutine
+                }
+
+                if (cursor == null) {
+                    Log.e("MM20", "Plugin $pluginAuthority returned null cursor")
+                    it.resume(emptyList())
+                    return@suspendCancellableCoroutine
+                }
+
+                val results = cursor.getData() ?: emptyList()
+                it.resume(results)
+            }
+        }
+
+    suspend fun get(id: String): Result<TResult?> = withContext(Dispatchers.IO) {
+        val uri = Uri.Builder()
+            .scheme("content")
+            .authority(pluginAuthority)
+            .path(SearchPluginContract.Paths.Root)
+            .appendPath(id)
+            .appendQueryParameter(SearchPluginContract.Params.Lang, getLanguage())
+            .build()
+
+        val cancellationSignal = CancellationSignal()
+
+        return@withContext suspendCancellableCoroutine {
+            it.invokeOnCancellation {
+                cancellationSignal.cancel()
+            }
+            val cursor = try {
+                context.contentResolver.query(
+                    uri,
+                    null,
+                    null,
+                    cancellationSignal
+                )
+            } catch (e: Exception) {
+                Log.e("MM20", "Plugin $pluginAuthority threw exception", e)
+                it.resume(Result.failure(e))
+                return@suspendCancellableCoroutine
+            }
+
+            if (cursor == null) {
+                Log.e("MM20", "Plugin $pluginAuthority returned null cursor")
+                it.resume(Result.success(null))
+                return@suspendCancellableCoroutine
+            }
+
+            val result = cursor.getData()?.firstOrNull()
+
+            if (result == null) {
+                it.resume(Result.success(null))
+                return@suspendCancellableCoroutine
+            }
+
+            it.resume(Result.success(result))
+        }
+    }
+
+    suspend fun refresh(item: TResult, lastUpdate: Long): Result<TResult?> = withContext(Dispatchers.IO) {
+        val uri = Uri.Builder()
+            .scheme("content")
+            .authority(pluginAuthority)
+            .path(SearchPluginContract.Paths.Refresh)
+            .appendQueryParameter(SearchPluginContract.Params.Lang, getLanguage())
+            .appendQueryParameter(SearchPluginContract.Params.UpdatedAt, lastUpdate.toString())
+            .build()
+
+        val cancellationSignal = CancellationSignal()
+
+        return@withContext suspendCancellableCoroutine {
+            it.invokeOnCancellation {
+                cancellationSignal.cancel()
+            }
+            val cursor = try {
+                context.contentResolver.query(
+                    uri,
+                    null,
+                    item.toBundle(),
+                    cancellationSignal
+                )
+            } catch (e: Exception) {
+                Log.e("MM20", "Plugin $pluginAuthority threw exception", e)
+                it.resume(Result.failure(e))
+                return@suspendCancellableCoroutine
+            }
+
+            if (cursor == null) {
+                Log.e("MM20", "Plugin $pluginAuthority returned null cursor")
+                it.resume(Result.failure(IllegalArgumentException()))
+                return@suspendCancellableCoroutine
+            }
+
+            if (cursor.extras?.getBoolean(SearchPluginContract.Extras.NotUpdated) == true) {
+                it.resume(Result.failure(NotUpdated()))
+                return@suspendCancellableCoroutine
+            }
+
+            val result = cursor.getData()?.firstOrNull()
+
+            if (result == null) {
+                it.resume(Result.success(null))
+                return@suspendCancellableCoroutine
+            }
+
+            it.resume(Result.success(result))
+        }
+    }
+
+    protected abstract fun Uri.Builder.appendQueryParameters(query: TQuery): Uri.Builder
+
+    protected abstract fun Cursor.getData(): List<TResult>?
+
+    protected abstract fun TResult.toBundle(): Bundle
+}
\ No newline at end of file
diff --git a/core/base/src/main/java/de/mm20/launcher2/plugin/config/SearchPluginConfig.kt b/core/base/src/main/java/de/mm20/launcher2/plugin/config/SearchPluginConfig.kt
index a3777bd5..9bd5e8c8 100644
--- a/core/base/src/main/java/de/mm20/launcher2/plugin/config/SearchPluginConfig.kt
+++ b/core/base/src/main/java/de/mm20/launcher2/plugin/config/SearchPluginConfig.kt
@@ -2,8 +2,8 @@ package de.mm20.launcher2.plugin.config
 
 import android.os.Bundle
 
-fun SearchPluginConfig(bundle: Bundle): SearchPluginConfig? {
-    return SearchPluginConfig(
+fun QueryPluginConfig(bundle: Bundle): QueryPluginConfig {
+    return QueryPluginConfig(
         storageStrategy = valueOfOrElse(
             bundle.getString(
                 "storageStrategy",
diff --git a/core/base/src/main/java/de/mm20/launcher2/search/Location.kt b/core/base/src/main/java/de/mm20/launcher2/search/Location.kt
index 21fbdf05..44578530 100644
--- a/core/base/src/main/java/de/mm20/launcher2/search/Location.kt
+++ b/core/base/src/main/java/de/mm20/launcher2/search/Location.kt
@@ -1,16 +1,135 @@
 package de.mm20.launcher2.search
 
 import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.rounded.DirectionsBike
+import androidx.compose.material.icons.rounded.AccountBalance
+import androidx.compose.material.icons.rounded.AttachMoney
+import androidx.compose.material.icons.rounded.Attractions
+import androidx.compose.material.icons.rounded.BakeryDining
+import androidx.compose.material.icons.rounded.Bed
+import androidx.compose.material.icons.rounded.Bento
+import androidx.compose.material.icons.rounded.Book
+import androidx.compose.material.icons.rounded.BreakfastDining
+import androidx.compose.material.icons.rounded.BrunchDining
+import androidx.compose.material.icons.rounded.CarRental
+import androidx.compose.material.icons.rounded.CarRepair
+import androidx.compose.material.icons.rounded.Casino
+import androidx.compose.material.icons.rounded.Checkroom
+import androidx.compose.material.icons.rounded.Church
+import androidx.compose.material.icons.rounded.ContentCut
+import androidx.compose.material.icons.rounded.Diamond
+import androidx.compose.material.icons.rounded.DirectionsBoat
+import androidx.compose.material.icons.rounded.DirectionsBus
+import androidx.compose.material.icons.rounded.DirectionsCar
+import androidx.compose.material.icons.rounded.DirectionsTransit
+import androidx.compose.material.icons.rounded.Discount
+import androidx.compose.material.icons.rounded.DownhillSkiing
+import androidx.compose.material.icons.rounded.ElectricScooter
+import androidx.compose.material.icons.rounded.EvStation
+import androidx.compose.material.icons.rounded.Fastfood
+import androidx.compose.material.icons.rounded.Festival
+import androidx.compose.material.icons.rounded.FitnessCenter
+import androidx.compose.material.icons.rounded.Flight
+import androidx.compose.material.icons.rounded.Forest
+import androidx.compose.material.icons.rounded.Gavel
+import androidx.compose.material.icons.rounded.Hiking
+import androidx.compose.material.icons.rounded.Hotel
+import androidx.compose.material.icons.rounded.Icecream
+import androidx.compose.material.icons.rounded.Kayaking
+import androidx.compose.material.icons.rounded.KebabDining
+import androidx.compose.material.icons.rounded.Liquor
+import androidx.compose.material.icons.rounded.LocalAtm
+import androidx.compose.material.icons.rounded.LocalBar
+import androidx.compose.material.icons.rounded.LocalCafe
+import androidx.compose.material.icons.rounded.LocalCarWash
+import androidx.compose.material.icons.rounded.LocalConvenienceStore
+import androidx.compose.material.icons.rounded.LocalFireDepartment
+import androidx.compose.material.icons.rounded.LocalFlorist
+import androidx.compose.material.icons.rounded.LocalGasStation
+import androidx.compose.material.icons.rounded.LocalGroceryStore
+import androidx.compose.material.icons.rounded.LocalHospital
+import androidx.compose.material.icons.rounded.LocalLaundryService
+import androidx.compose.material.icons.rounded.LocalMall
+import androidx.compose.material.icons.rounded.LocalParking
+import androidx.compose.material.icons.rounded.LocalPharmacy
+import androidx.compose.material.icons.rounded.LocalPizza
+import androidx.compose.material.icons.rounded.LocalPolice
+import androidx.compose.material.icons.rounded.LocalPostOffice
+import androidx.compose.material.icons.rounded.LocalTaxi
+import androidx.compose.material.icons.rounded.LunchDining
+import androidx.compose.material.icons.rounded.Moped
+import androidx.compose.material.icons.rounded.Mosque
+import androidx.compose.material.icons.rounded.Motorcycle
+import androidx.compose.material.icons.rounded.Museum
+import androidx.compose.material.icons.rounded.MusicNote
+import androidx.compose.material.icons.rounded.Newspaper
+import androidx.compose.material.icons.rounded.Nightlife
+import androidx.compose.material.icons.rounded.NordicWalking
+import androidx.compose.material.icons.rounded.Palette
+import androidx.compose.material.icons.rounded.Paragliding
+import androidx.compose.material.icons.rounded.Park
+import androidx.compose.material.icons.rounded.Pets
+import androidx.compose.material.icons.rounded.Phone
+import androidx.compose.material.icons.rounded.Place
+import androidx.compose.material.icons.rounded.Pool
+import androidx.compose.material.icons.rounded.RamenDining
+import androidx.compose.material.icons.rounded.Restaurant
+import androidx.compose.material.icons.rounded.School
+import androidx.compose.material.icons.rounded.ShoppingBag
+import androidx.compose.material.icons.rounded.Skateboarding
+import androidx.compose.material.icons.rounded.Snowboarding
+import androidx.compose.material.icons.rounded.SoupKitchen
+import androidx.compose.material.icons.rounded.Sports
+import androidx.compose.material.icons.rounded.SportsBar
+import androidx.compose.material.icons.rounded.SportsBaseball
+import androidx.compose.material.icons.rounded.SportsBasketball
+import androidx.compose.material.icons.rounded.SportsCricket
+import androidx.compose.material.icons.rounded.SportsFootball
+import androidx.compose.material.icons.rounded.SportsGolf
+import androidx.compose.material.icons.rounded.SportsGymnastics
+import androidx.compose.material.icons.rounded.SportsHandball
+import androidx.compose.material.icons.rounded.SportsHockey
+import androidx.compose.material.icons.rounded.SportsMartialArts
+import androidx.compose.material.icons.rounded.SportsMotorsports
+import androidx.compose.material.icons.rounded.SportsRugby
+import androidx.compose.material.icons.rounded.SportsSoccer
+import androidx.compose.material.icons.rounded.SportsTennis
+import androidx.compose.material.icons.rounded.SportsVolleyball
+import androidx.compose.material.icons.rounded.Stadium
+import androidx.compose.material.icons.rounded.Subway
+import androidx.compose.material.icons.rounded.Surfing
+import androidx.compose.material.icons.rounded.Synagogue
+import androidx.compose.material.icons.rounded.TakeoutDining
+import androidx.compose.material.icons.rounded.TempleBuddhist
+import androidx.compose.material.icons.rounded.TempleHindu
+import androidx.compose.material.icons.rounded.TheaterComedy
+import androidx.compose.material.icons.rounded.Theaters
+import androidx.compose.material.icons.rounded.Train
+import androidx.compose.material.icons.rounded.Tram
+import androidx.compose.material.icons.rounded.Wc
 import androidx.core.content.ContextCompat
 import de.mm20.launcher2.base.R
+import de.mm20.launcher2.icons.CableCar
+import de.mm20.launcher2.icons.Candle
 import de.mm20.launcher2.icons.ColorLayer
+import de.mm20.launcher2.icons.Dentistry
+import de.mm20.launcher2.icons.Eyeglasses
+import de.mm20.launcher2.icons.Monument
 import de.mm20.launcher2.icons.StaticLauncherIcon
-import de.mm20.launcher2.icons.TintedIconLayer
-import kotlinx.collections.immutable.ImmutableList
-import java.time.DayOfWeek
-import java.time.Duration
+import de.mm20.launcher2.icons.Stethoscope
+import de.mm20.launcher2.icons.VectorLayer
+import de.mm20.launcher2.ktx.tryStartActivity
+import de.mm20.launcher2.search.location.Address
+import de.mm20.launcher2.search.location.Attribution
+import de.mm20.launcher2.search.location.Departure
+import de.mm20.launcher2.search.location.LocationIcon
+import de.mm20.launcher2.search.location.OpeningHours
+import de.mm20.launcher2.search.location.OpeningSchedule
 import java.time.LocalDateTime
-import java.time.LocalTime
 import java.time.temporal.TemporalAdjusters
 import android.location.Location as AndroidLocation
 
@@ -20,128 +139,182 @@ interface Location : SavableSearchable {
     val longitude: Double
     val fixMeUrl: String?
 
-    val category: LocationCategory?
+    val icon: LocationIcon?
+    val category: String?
+
+    val address: Address?
 
-    val street: String?
-    val houseNumber: String?
-    val openingSchedule: OpeningSchedule?
     val websiteUrl: String?
     val phoneNumber: String?
+    val emailAddress: String?
+
+    val userRating: Float?
+    val userRatingCount: Int?
+
+    val openingSchedule: OpeningSchedule?
+    val departures: List<Departure>?
+
+    val attribution: Attribution?
+        get() = null
 
     override val preferDetailsOverLaunch: Boolean
         get() = true
 
+    override fun launch(context: Context, options: Bundle?): Boolean {
+        return context.tryStartActivity(
+            Intent(
+                Intent.ACTION_VIEW,
+                Uri.parse("geo:$latitude,$longitude?q=${Uri.encode(label)}")
+            ),
+            options
+        )
+    }
+
     override fun getPlaceholderIcon(context: Context): StaticLauncherIcon {
-        val (resId, bgColor) = when (category) {
-            LocationCategory.FAST_FOOD, LocationCategory.RESTAURANT -> with(
-                labelOverride ?: label
-            ) {
-                when {
-                    contains(
-                        "pizza",
-                        ignoreCase = true
-                    ) -> R.drawable.ic_location_pizza to R.color.red
+        val (vector, bgColor) = when (icon) {
+            // blue: transportation
+            LocationIcon.Car -> Icons.Rounded.DirectionsCar to R.color.blue
+            LocationIcon.CarRental -> Icons.Rounded.CarRental to R.color.blue
+            LocationIcon.CarRepair -> Icons.Rounded.CarRepair to R.color.blue
+            LocationIcon.CarWash -> Icons.Rounded.LocalCarWash to R.color.blue
+            LocationIcon.ChargingStation -> Icons.Rounded.EvStation to R.color.blue
+            LocationIcon.GasStation -> Icons.Rounded.LocalGasStation to R.color.blue
+            LocationIcon.Parking -> Icons.Rounded.LocalParking to R.color.blue
+            LocationIcon.Bus -> Icons.Rounded.DirectionsBus to R.color.blue
+            LocationIcon.Tram -> Icons.Rounded.Tram to R.color.blue
+            LocationIcon.Subway -> Icons.Rounded.Subway to R.color.blue
+            LocationIcon.Train -> Icons.Rounded.Train to R.color.blue
+            LocationIcon.CableCar -> Icons.Rounded.CableCar to R.color.blue
+            LocationIcon.Airport -> Icons.Rounded.Flight to R.color.blue
+            LocationIcon.Boat -> Icons.Rounded.DirectionsBoat to R.color.blue
+            LocationIcon.Moped -> Icons.Rounded.Moped to R.color.blue
+            LocationIcon.Bike -> Icons.AutoMirrored.Rounded.DirectionsBike to R.color.blue
+            LocationIcon.Motorcycle -> Icons.Rounded.Motorcycle to R.color.blue
+            LocationIcon.ElectricScooter -> Icons.Rounded.ElectricScooter to R.color.blue
+            LocationIcon.Taxi -> Icons.Rounded.LocalTaxi to R.color.blue
+            LocationIcon.GenericTransit -> Icons.Rounded.DirectionsTransit to R.color.blue
 
-                    contains(
-                        "ramen",
-                        ignoreCase = true
-                    ) -> R.drawable.ic_location_ramen to R.color.orange
+            // cyan: art, culture, entertainment
+            LocationIcon.ArtGallery -> Icons.Rounded.Palette to R.color.cyan
+            LocationIcon.Museum -> Icons.Rounded.Museum to R.color.cyan
+            LocationIcon.Theater -> Icons.Rounded.TheaterComedy to R.color.cyan
+            LocationIcon.MovieTheater -> Icons.Rounded.Theaters to R.color.cyan
+            LocationIcon.AmusementPark -> Icons.Rounded.Attractions to R.color.cyan
+            LocationIcon.NightClub -> Icons.Rounded.Nightlife to R.color.cyan
+            LocationIcon.ConcertHall -> Icons.Rounded.MusicNote to R.color.cyan
+            LocationIcon.Stadium -> Icons.Rounded.Stadium to R.color.cyan
+            LocationIcon.Casino -> Icons.Rounded.Casino to R.color.cyan
+            LocationIcon.Circus -> Icons.Rounded.Festival to R.color.cyan
+            // pink: hotels
+            LocationIcon.Hotel -> Icons.Rounded.Hotel to R.color.pink
+            // orange: food and drink
+            LocationIcon.Restaurant -> Icons.Rounded.Restaurant to R.color.orange
+            LocationIcon.Cafe -> Icons.Rounded.LocalCafe to R.color.orange
+            LocationIcon.FastFood -> Icons.Rounded.Fastfood to R.color.orange
+            LocationIcon.Pizza -> Icons.Rounded.LocalPizza to R.color.orange
+            LocationIcon.Burger -> Icons.Rounded.LunchDining to R.color.orange
+            LocationIcon.Kebab -> Icons.Rounded.KebabDining to R.color.orange
+            LocationIcon.IceCream -> Icons.Rounded.Icecream to R.color.orange
+            LocationIcon.Ramen -> Icons.Rounded.RamenDining to R.color.orange
+            LocationIcon.Soup -> Icons.Rounded.SoupKitchen to R.color.orange
+            LocationIcon.Bar -> Icons.Rounded.LocalBar to R.color.orange
+            LocationIcon.Brunch -> Icons.Rounded.BrunchDining to R.color.orange
+            LocationIcon.Breakfast -> Icons.Rounded.BreakfastDining to R.color.orange
+            LocationIcon.Pub -> Icons.Rounded.SportsBar to R.color.orange
+            LocationIcon.JapaneseCuisine -> Icons.Rounded.Bento to R.color.orange
+            LocationIcon.AsianCuisine -> Icons.Rounded.TakeoutDining to R.color.orange
+            // indigo: business and shopping
+            LocationIcon.Shopping -> Icons.Rounded.ShoppingBag to R.color.indigo
+            LocationIcon.Supermarket -> Icons.Rounded.LocalGroceryStore to R.color.indigo
+            LocationIcon.Florist -> Icons.Rounded.LocalFlorist to R.color.indigo
+            LocationIcon.Kiosk -> Icons.Rounded.Newspaper to R.color.indigo
+            LocationIcon.FurnitureStore -> Icons.Rounded.Bed to R.color.indigo
+            LocationIcon.CellPhoneStore -> Icons.Rounded.Phone to R.color.indigo
+            LocationIcon.BookStore -> Icons.Rounded.Book to R.color.indigo
+            LocationIcon.ClothingStore -> Icons.Rounded.Checkroom to R.color.indigo
+            LocationIcon.ConvenienceStore -> Icons.Rounded.LocalConvenienceStore to R.color.indigo
+            LocationIcon.DiscountStore -> Icons.Rounded.Discount to R.color.indigo
+            LocationIcon.JewelryStore -> Icons.Rounded.Diamond to R.color.indigo
+            LocationIcon.ShoppingMall -> Icons.Rounded.LocalMall to R.color.indigo
+            LocationIcon.LiquorStore -> Icons.Rounded.Liquor to R.color.indigo
+            LocationIcon.PetStore -> Icons.Rounded.Pets to R.color.indigo
+            LocationIcon.Bakery -> Icons.Rounded.BakeryDining to R.color.indigo
+            LocationIcon.Optician -> Icons.Rounded.Eyeglasses to R.color.indigo
+            LocationIcon.Pharmacy -> Icons.Rounded.LocalPharmacy to R.color.indigo
+            LocationIcon.HairSalon -> Icons.Rounded.ContentCut to R.color.indigo
+            LocationIcon.Laundromat -> Icons.Rounded.LocalLaundryService to R.color.indigo
+            // purple: sports and recreation
+            LocationIcon.Sports -> Icons.Rounded.Sports to R.color.purple
+            LocationIcon.FitnessCenter -> Icons.Rounded.FitnessCenter to R.color.purple
+            LocationIcon.Soccer -> Icons.Rounded.SportsSoccer to R.color.purple
+            LocationIcon.Basketball -> Icons.Rounded.SportsBasketball to R.color.purple
+            LocationIcon.Golf -> Icons.Rounded.SportsGolf to R.color.purple
+            LocationIcon.Tennis -> Icons.Rounded.SportsTennis to R.color.purple
+            LocationIcon.Baseball -> Icons.Rounded.SportsBaseball to R.color.purple
+            LocationIcon.Rugby -> Icons.Rounded.SportsRugby to R.color.purple
+            LocationIcon.AmericanFootball -> Icons.Rounded.SportsFootball to R.color.purple
+            LocationIcon.Hiking -> Icons.Rounded.Hiking to R.color.purple
+            LocationIcon.Swimming -> Icons.Rounded.Pool to R.color.purple
+            LocationIcon.Surfing -> Icons.Rounded.Surfing to R.color.purple
+            LocationIcon.Motorsports -> Icons.Rounded.SportsMotorsports to R.color.purple
+            LocationIcon.Handball -> Icons.Rounded.SportsHandball to R.color.purple
+            LocationIcon.Volleyball -> Icons.Rounded.SportsVolleyball to R.color.purple
+            LocationIcon.Skiing -> Icons.Rounded.DownhillSkiing to R.color.purple
+            LocationIcon.Kayaking -> Icons.Rounded.Kayaking to R.color.purple
+            LocationIcon.Skateboarding -> Icons.Rounded.Skateboarding to R.color.purple
+            LocationIcon.Cricket -> Icons.Rounded.SportsCricket to R.color.purple
+            LocationIcon.MartialArts -> Icons.Rounded.SportsMartialArts to R.color.purple
+            LocationIcon.NordicWalking -> Icons.Rounded.NordicWalking to R.color.purple
+            LocationIcon.Paragliding -> Icons.Rounded.Paragliding to R.color.purple
+            LocationIcon.Gymnastics -> Icons.Rounded.SportsGymnastics to R.color.purple
+            LocationIcon.Snowboarding -> Icons.Rounded.Snowboarding to R.color.purple
+            LocationIcon.Hockey -> Icons.Rounded.SportsHockey to R.color.purple
+            // green: finances
+            LocationIcon.Bank -> Icons.Rounded.AttachMoney to R.color.green
+            LocationIcon.Atm -> Icons.Rounded.LocalAtm to R.color.green
+            // red: health
+            LocationIcon.Hospital -> Icons.Rounded.LocalHospital to R.color.red
+            LocationIcon.Clinic -> Icons.Rounded.LocalHospital to R.color.red
+            LocationIcon.Dentist -> Icons.Rounded.Dentistry to R.color.red
+            LocationIcon.Physician -> Icons.Rounded.Stethoscope to R.color.red
+            // light green: nature
+            LocationIcon.Park -> Icons.Rounded.Park to R.color.lightgreen
+            LocationIcon.Forest -> Icons.Rounded.Forest to R.color.lightgreen
+            // brown: places of worship and remembrance
+            LocationIcon.Monument -> Icons.Rounded.Monument to R.color.brown
+            LocationIcon.Church -> Icons.Rounded.Church to R.color.brown
+            LocationIcon.Mosque -> Icons.Rounded.Mosque to R.color.brown
+            LocationIcon.Synagogue -> Icons.Rounded.Synagogue to R.color.brown
+            LocationIcon.HinduTemple -> Icons.Rounded.TempleHindu to R.color.brown
+            LocationIcon.BuddhistTemple -> Icons.Rounded.TempleBuddhist to R.color.brown
+            LocationIcon.Candle -> Icons.Rounded.Candle to R.color.brown
+            // bluegrey: public services
+            LocationIcon.GovernmentBuilding -> Icons.Rounded.AccountBalance to R.color.bluegrey
+            LocationIcon.Police -> Icons.Rounded.LocalPolice to R.color.bluegrey
+            LocationIcon.FireDepartment -> Icons.Rounded.LocalFireDepartment to R.color.bluegrey
+            LocationIcon.Courthouse -> Icons.Rounded.Gavel to R.color.bluegrey
+            LocationIcon.PostOffice -> Icons.Rounded.LocalPostOffice to R.color.bluegrey
+            LocationIcon.Library -> Icons.Rounded.Book to R.color.bluegrey
+            LocationIcon.School -> Icons.Rounded.School to R.color.bluegrey
+            LocationIcon.University -> Icons.Rounded.School to R.color.bluegrey
+            LocationIcon.PublicBathroom -> Icons.Rounded.Wc to R.color.bluegrey
 
-                    contains(
-                        "tapas",
-                        ignoreCase = true
-                    ) -> R.drawable.ic_location_tapas to R.color.orange
-
-                    contains(
-                        "keba" /* b or p, depending on locale */,
-                        ignoreCase = true
-                    ) -> R.drawable.ic_location_kebab to R.color.orange
-
-                    category == LocationCategory.FAST_FOOD -> R.drawable.ic_location_fastfood to R.color.orange
-                    else -> R.drawable.ic_location_restaurant to R.color.red
-                }
-            }
-
-            LocationCategory.BAR -> R.drawable.ic_location_bar to R.color.amber
-            LocationCategory.CAFE, LocationCategory.COFFEE_SHOP -> R.drawable.ic_location_cafe to R.color.brown
-            LocationCategory.HOTEL -> R.drawable.ic_location_hotel to R.color.green
-            LocationCategory.SUPERMARKET -> R.drawable.ic_location_supermarket to R.color.lightblue
-            LocationCategory.SCHOOL -> R.drawable.ic_location_school to R.color.purple
-            LocationCategory.PARKING -> R.drawable.ic_location_parking to R.color.blue
-            LocationCategory.FUEL -> R.drawable.ic_location_fuel to R.color.teal
-            LocationCategory.TOILETS -> R.drawable.ic_location_toilets to R.color.blue
-            LocationCategory.PHARMACY -> R.drawable.ic_location_pharmacy to R.color.pink
-            LocationCategory.HOSPITAL, LocationCategory.CLINIC -> R.drawable.ic_location_hospital to R.color.red
-            LocationCategory.POST_OFFICE -> R.drawable.ic_location_post_office to R.color.yellow
-            LocationCategory.PUB, LocationCategory.BIERGARTEN -> R.drawable.ic_location_pub to R.color.amber
-            LocationCategory.GRAVE_YARD -> R.drawable.ic_location_grave_yard to R.color.grey
-            LocationCategory.DOCTORS -> R.drawable.ic_location_doctors to R.color.red
-            LocationCategory.POLICE -> R.drawable.ic_location_police to R.color.blue
-            LocationCategory.DENTIST -> R.drawable.ic_location_dentist to R.color.lightblue
-            LocationCategory.LIBRARY, LocationCategory.BOOKS -> R.drawable.ic_location_library to R.color.brown
-            LocationCategory.COLLEGE, LocationCategory.UNIVERSITY -> R.drawable.ic_location_college to R.color.purple
-            LocationCategory.ICE_CREAM -> R.drawable.ic_location_ice_cream to R.color.pink
-            LocationCategory.THEATRE -> R.drawable.ic_location_theatre to R.color.purple
-            LocationCategory.PUBLIC_BUILDING -> R.drawable.ic_location_public_building to R.color.bluegrey
-            LocationCategory.CINEMA -> R.drawable.ic_location_cinema to R.color.purple
-            LocationCategory.NIGHTCLUB -> R.drawable.ic_location_nightclub to R.color.purple
-            LocationCategory.CONVENIENCE -> R.drawable.ic_location_convenience to R.color.lightblue
-            LocationCategory.CLOTHES -> R.drawable.ic_location_clothes to R.color.pink
-            LocationCategory.HAIRDRESSER, LocationCategory.BEAUTY -> R.drawable.ic_location_hairdresser to R.color.pink
-            LocationCategory.CAR_REPAIR -> R.drawable.ic_location_car_repair to R.color.blue
-            LocationCategory.BAKERY -> R.drawable.ic_location_bakery to R.color.brown
-            LocationCategory.CAR -> R.drawable.ic_location_car to R.color.blue
-            LocationCategory.MOBILE_PHONE -> R.drawable.ic_location_mobile_phone to R.color.blue
-            LocationCategory.FURNITURE -> R.drawable.ic_location_furniture to R.color.brown
-            LocationCategory.ALCOHOL -> R.drawable.ic_location_alcohol to R.color.amber
-            LocationCategory.FLORIST -> R.drawable.ic_location_florist to R.color.green
-            LocationCategory.HARDWARE -> R.drawable.ic_location_hardware to R.color.brown
-            LocationCategory.ELECTRONICS -> R.drawable.ic_location_electronics to R.color.blue
-            LocationCategory.SHOES -> R.drawable.ic_location_shoes to R.color.pink
-            LocationCategory.MALL, LocationCategory.DEPARTMENT_STORE, LocationCategory.CHEMIST -> R.drawable.ic_location_mall to R.color.blue
-            LocationCategory.OPTICIAN -> R.drawable.ic_location_optician to R.color.blue
-            LocationCategory.JEWELRY -> R.drawable.ic_location_jewelry to R.color.pink
-            LocationCategory.GIFT -> R.drawable.ic_location_gift to R.color.pink
-            LocationCategory.BICYCLE -> R.drawable.ic_location_bicycle to R.color.blue
-            LocationCategory.LAUNDRY -> R.drawable.ic_location_laundry to R.color.blue
-            LocationCategory.COMPUTER -> R.drawable.ic_location_computer to R.color.blue
-            LocationCategory.TOBACCO -> R.drawable.ic_location_tobacco to R.color.amber
-            LocationCategory.WINE -> R.drawable.ic_location_wine to R.color.amber
-            LocationCategory.PHOTO -> R.drawable.ic_location_photo to R.color.blue
-            LocationCategory.BANK -> R.drawable.ic_location_bank to R.color.blue
-            LocationCategory.SOCCER -> R.drawable.ic_location_soccer to R.color.green
-            LocationCategory.BASKETBALL -> R.drawable.ic_location_basketball to R.color.orange
-            LocationCategory.TENNIS -> R.drawable.ic_location_tennis to R.color.orange
-            LocationCategory.FITNESS, LocationCategory.FITNESS_CENTRE -> R.drawable.ic_location_fitness to R.color.orange
-            LocationCategory.TRAM_STOP -> R.drawable.ic_location_tram_stop to R.color.blue
-            LocationCategory.RAILWAY_STATION -> R.drawable.ic_location_railway_stop to R.color.lightblue
-            LocationCategory.BUS_STATION, LocationCategory.BUS_STOP -> R.drawable.ic_location_bus_station to R.color.blue
-            LocationCategory.ATM -> R.drawable.ic_location_atm to R.color.green
-            LocationCategory.ART -> R.drawable.ic_location_art to R.color.deeporange
-            LocationCategory.KIOSK -> R.drawable.ic_location_kiosk to R.color.bluegrey
-            LocationCategory.MUSEUM -> R.drawable.ic_location_museum to R.color.deeporange
-            LocationCategory.PARCEL_LOCKER -> R.drawable.ic_location_parcel_locker to R.color.bluegrey
-            LocationCategory.TRAVEL_AGENCY -> R.drawable.ic_location_travel_agency to R.color.lightblue
-            else -> R.drawable.ic_location_place to R.color.bluegrey
+            null -> Icons.Rounded.Place to R.color.bluegrey
         }
         return StaticLauncherIcon(
-            foregroundLayer = TintedIconLayer(
-                icon = ContextCompat.getDrawable(context, resId)!!,
-                scale = 0.5f,
+            foregroundLayer = VectorLayer(
+                vector = vector,
                 color = ContextCompat.getColor(context, bgColor)
             ),
             backgroundLayer = ColorLayer(ContextCompat.getColor(context, bgColor))
         )
     }
 
-    fun toAndroidLocation(): AndroidLocation {
-        val location = AndroidLocation("KvaesitsoLocationProvider")
-
-        location.latitude = latitude
-        location.longitude = longitude
-
-        return location
-    }
+    fun toAndroidLocation(): AndroidLocation =
+        AndroidLocation("KvaesitsoLocationProvider").apply {
+            this.latitude = this@Location.latitude
+            this.longitude = this@Location.longitude
+        }
 
     fun distanceTo(androidLocation: AndroidLocation): Float {
         return androidLocation.distanceTo(this.toAndroidLocation())
@@ -149,107 +322,25 @@ interface Location : SavableSearchable {
 
     fun distanceTo(otherLocation: Location): Float =
         this.distanceTo(otherLocation.toAndroidLocation())
+
+    fun distanceTo(
+        latitude: Double,
+        longitude: Double,
+        locationProvider: String = "KvaesitsoLocationProvider"
+    ): Float =
+        this.distanceTo(AndroidLocation(locationProvider).apply {
+            this.latitude = latitude
+            this.longitude = longitude
+        })
 }
 
-// https://taginfo.openstreetmap.org/tags
-// 'amenity', 'shop', 'sport' of which the most important
-enum class LocationCategory {
-    RESTAURANT,
-    FAST_FOOD,
-    BAR,
-    CAFE,
-    HOTEL,
-    SUPERMARKET,
-    OTHER,
-    SCHOOL,
-    PARKING,
-    FUEL,
-    TOILETS,
-    PHARMACY,
-    HOSPITAL,
-    POST_OFFICE,
-    PUB,
-    GRAVE_YARD,
-    DOCTORS,
-    POLICE,
-    DENTIST,
-    LIBRARY,
-    COLLEGE,
-    ICE_CREAM,
-    THEATRE,
-    PUBLIC_BUILDING,
-    CINEMA,
-    NIGHTCLUB,
-    BIERGARTEN,
-    CLINIC,
-    UNIVERSITY,
-    DEPARTMENT_STORE,
-    CLOTHES,
-    CONVENIENCE,
-    HAIRDRESSER,
-    CAR_REPAIR,
-    BEAUTY,
-    BOOKS,
-    BAKERY,
-    CAR,
-    MOBILE_PHONE,
-    FURNITURE,
-    ALCOHOL,
-    FLORIST,
-    HARDWARE,
-    ELECTRONICS,
-    SHOES,
-    MALL,
-    OPTICIAN,
-    JEWELRY,
-    GIFT,
-    BICYCLE,
-    LAUNDRY,
-    COMPUTER,
-    TOBACCO,
-    WINE,
-    PHOTO,
-    COFFEE_SHOP,
-    BANK,
-    SOCCER,
-    BASKETBALL,
-    TENNIS,
-    FITNESS,
-    TRAM_STOP,
-    RAILWAY_STATION,
-    RAILWAY_STOP,
-    BUS_STATION,
-    ATM,
-    ART,
-    KIOSK,
-    BUS_STOP,
-    MUSEUM,
-    PARCEL_LOCKER,
-    CHEMIST,
-    TRAVEL_AGENCY,
-    FITNESS_CENTRE
+fun OpeningSchedule.isOpen(date: LocalDateTime = LocalDateTime.now()): Boolean = when (this) {
+    is OpeningSchedule.TwentyFourSeven -> true
+    is OpeningSchedule.Hours -> openingHours.any { it.isOpen(date) }
 }
 
-data class OpeningHours(
-    val dayOfWeek: DayOfWeek,
-    val startTime: LocalTime,
-    val duration: Duration
-) {
-
-    fun isOpen(date: LocalDateTime = LocalDateTime.now()): Boolean {
-        val startTime = date.with(TemporalAdjusters.previousOrSame(dayOfWeek)).with(startTime)
-        val endTime = startTime.plus(duration)
-        return date in startTime..<endTime
-    }
-
-    override fun toString(): String = "$dayOfWeek $startTime-${startTime.plus(duration)}"
-}
-
-data class OpeningSchedule(
-    val isTwentyFourSeven: Boolean,
-    val openingHours: ImmutableList<OpeningHours>
-) {
-    fun isOpen(date: LocalDateTime = LocalDateTime.now()): Boolean {
-        return isTwentyFourSeven || openingHours.any { it.isOpen(date) }
-    }
+fun OpeningHours.isOpen(date: LocalDateTime = LocalDateTime.now()): Boolean {
+    val startTime = date.with(TemporalAdjusters.previousOrSame(dayOfWeek)).with(startTime)
+    val endTime = startTime.plus(duration)
+    return date in startTime..<endTime
 }
\ No newline at end of file
diff --git a/core/base/src/main/java/de/mm20/launcher2/search/UpdatableSearchable.kt b/core/base/src/main/java/de/mm20/launcher2/search/UpdatableSearchable.kt
index fc6c4046..f3122fee 100644
--- a/core/base/src/main/java/de/mm20/launcher2/search/UpdatableSearchable.kt
+++ b/core/base/src/main/java/de/mm20/launcher2/search/UpdatableSearchable.kt
@@ -8,7 +8,7 @@ package de.mm20.launcher2.search
  */
 interface UpdatableSearchable<T : SavableSearchable> {
     val timestamp: Long
-    val updatedSelf: (suspend () -> UpdateResult<T>)?
+    val updatedSelf: (suspend (SavableSearchable) -> UpdateResult<T>)?
 }
 
 sealed class UpdateResult<out T> {
@@ -16,3 +16,16 @@ sealed class UpdateResult<out T> {
     data class TemporarilyUnavailable<T>(val cause: Throwable? = null) : UpdateResult<T>()
     data class PermanentlyUnavailable<T>(val cause: Throwable? = null) : UpdateResult<T>()
 }
+
+fun <T>Result<T?>.asUpdateResult(): UpdateResult<T> {
+    return if (isSuccess) {
+        val refreshed = getOrNull()
+        if (refreshed == null) {
+            UpdateResult.PermanentlyUnavailable()
+        } else {
+            UpdateResult.Success(refreshed)
+        }
+    } else {
+        UpdateResult.TemporarilyUnavailable(exceptionOrNull())
+    }
+}
\ No newline at end of file
diff --git a/core/base/src/test/java/de/mm20/launcher2/search/OpeningScheduleTest.kt b/core/base/src/test/java/de/mm20/launcher2/search/OpeningScheduleTest.kt
index d0263d7a..3ddf4da4 100644
--- a/core/base/src/test/java/de/mm20/launcher2/search/OpeningScheduleTest.kt
+++ b/core/base/src/test/java/de/mm20/launcher2/search/OpeningScheduleTest.kt
@@ -1,5 +1,7 @@
 package de.mm20.launcher2.search
 
+import de.mm20.launcher2.search.location.OpeningHours
+import de.mm20.launcher2.search.location.OpeningSchedule
 import kotlinx.collections.immutable.persistentListOf
 import org.junit.Assert
 import org.junit.Test
diff --git a/core/devicepose/src/main/java/de/mm20/launcher2/devicepose/DevicePoseProvider.kt b/core/devicepose/src/main/java/de/mm20/launcher2/devicepose/DevicePoseProvider.kt
index 5b7e45ba..b6079d64 100644
--- a/core/devicepose/src/main/java/de/mm20/launcher2/devicepose/DevicePoseProvider.kt
+++ b/core/devicepose/src/main/java/de/mm20/launcher2/devicepose/DevicePoseProvider.kt
@@ -10,7 +10,9 @@ import android.hardware.SensorManager
 import android.location.Location
 import android.location.LocationListener
 import android.location.LocationManager
+import android.os.Build
 import android.util.Log
+import androidx.annotation.RequiresApi
 import androidx.core.content.getSystemService
 import de.mm20.launcher2.ktx.PI
 import kotlinx.coroutines.channels.awaitClose
diff --git a/core/i18n/src/main/res/values-pl/strings.xml b/core/i18n/src/main/res/values-pl/strings.xml
index fb659cb4..324a072c 100644
--- a/core/i18n/src/main/res/values-pl/strings.xml
+++ b/core/i18n/src/main/res/values-pl/strings.xml
@@ -757,7 +757,7 @@
     <string name="preference_default_filter_summary">Dostosuj domyślny filtr wyszukiwania</string>
     <string name="preference_filter_bar">Pokaż pasek filtrów</string>
     <string name="preference_filter_bar_summary">Pokaż szybkie filtry nad klawiaturą</string>
-    <string name="location_closes">Zamyka się za</string>
+    <string name="location_closes">Zamyka się za %1$s</string>
     <string name="location_closes_other_day">Zamknięcie %1$s, %2$s</string>
     <string name="location_opens">Otwórz o %1$s</string>
     <string name="location_opens_other_day">Otwórz %1$s, %2$s</string>
diff --git a/core/i18n/src/main/res/values/strings.xml b/core/i18n/src/main/res/values/strings.xml
index f0ffd479..844c9d56 100644
--- a/core/i18n/src/main/res/values/strings.xml
+++ b/core/i18n/src/main/res/values/strings.xml
@@ -925,6 +925,7 @@
     <string name="search_filter_tools">Tools</string>
     <string name="search_filter_online">Online results</string>
     <string name="search_filter_apps">Apps</string>
+    <string name="plugin_type_locationsearch">Location search</string>
     <string name="preference_default_filter">Default filter</string>
     <string name="preference_default_filter_summary">Customize the default filter for searches</string>
     <string name="preference_filter_bar">Show filter bar</string>
@@ -932,6 +933,8 @@
     <string name="preference_customize_filter_bar">Customize filter bar</string>
     <string name="preference_customize_filter_bar_summary">Customize which items are included in the filter bar</string>
     <string name="filter_settings_network_warning">The current filter enables online results by default. Your search queries might unintentionally be sent to external web services. For privacy reasons, this is not recommended.</string>
+    <string name="preference_search_osm_locations">OpenStreetMap</string>
+    <string name="preference_search_osm_locations_summary">Search OpenStreetMap for shops and other places in the local area</string>
     <string name="poi_category_restaurant">Restaurant</string>
     <string name="poi_category_fast_food">Fast food</string>
     <string name="poi_category_bar">Bar</string>
@@ -1006,4 +1009,50 @@
     <string name="poi_category_chemist">Drug store</string>
     <string name="poi_category_travel_agency">Travel agency</string>
     <string name="poi_category_fitness_center">Fitness center</string>
+    <string name="poi_category_church">Church</string>
+    <string name="poi_category_mosque">Mosque</string>
+    <string name="poi_category_buddhist_temple">Buddhist temple</string>
+    <string name="poi_category_hindu_temple">Hindu temple</string>
+    <string name="poi_category_synagogue">Synagogue</string>
+    <string name="poi_category_pizza_restaurant">Pizza restaurant</string>
+    <string name="poi_category_burger_restaurant">Burger restaurant</string>
+    <string name="poi_category_place_of_worship">Place of worship</string>
+    <string name="poi_category_chinese_restaurant">Chinese restaurant</string>
+    <string name="poi_category_japanese_restaurant">Japanese restaurant</string>
+    <string name="poi_category_kebab_restaurant">Kebab restaurant</string>
+    <string name="poi_category_asian_restaurant">Asian restaurant</string>
+    <string name="poi_category_ramen_restaurant">Ramen restaurant</string>
+    <string name="poi_category_soup_restaurant">Soup restaurant</string>
+    <string name="poi_category_brunch_restaurant">Brunch restaurant</string>
+    <string name="poi_category_breakfast_restaurant">Breakfast restaurant</string>
+    <string name="poi_category_car_wash">Car wash</string>
+    <string name="poi_category_charging_station">Charging station</string>
+    <string name="poi_category_motorcycle_rental">Motorcycle rental</string>
+    <string name="poi_category_gallery">Gallery</string>
+    <string name="poi_category_amusement_park">Amusement park</string>
+    <string name="poi_category_concert_hall">Concert hall</string>
+    <string name="poi_category_stadium">Stadium</string>
+    <string name="poi_category_casino">Casino</string>
+    <string name="poi_category_shopping_center">Shopping center</string>
+    <string name="poi_category_discount_store">Discount store</string>
+    <string name="poi_category_pet">Pet store</string>
+    <string name="poi_category_shopping">Shopping</string>
+    <string name="poi_category_swimming">Swimming pool</string>
+    <string name="poi_category_martial_arts">Martial arts</string>
+    <string name="poi_category_golf">Golf</string>
+    <string name="poi_category_gymnastics">Gymnastics</string>
+    <string name="poi_category_ice_hockey">Ice hockey</string>
+    <string name="poi_category_baseball">Baseball</string>
+    <string name="poi_category_american_football">American football</string>
+    <string name="poi_category_handball">Handball</string>
+    <string name="poi_category_volleyball">Volleyball</string>
+    <string name="poi_category_skiing">Skiing</string>
+    <string name="poi_category_cricket">Cricket</string>
+    <string name="poi_category_park">Park</string>
+    <string name="poi_category_monument">Monument</string>
+    <string name="poi_category_government_building">Government building</string>
+    <string name="poi_category_fire_station">Fire station</string>
+    <string name="poi_category_courthouse">Courthouse</string>
+    <string name="poi_category_townhall">Townhall</string>
+    <string name="preference_search_locations_radius_large_radius_warning">Large search radii can significantly slow down location search.</string>
 </resources>
\ No newline at end of file
diff --git a/core/ktx/src/main/java/de/mm20/launcher2/ktx/Json.kt b/core/ktx/src/main/java/de/mm20/launcher2/ktx/Json.kt
index f28ed514..498f5207 100644
--- a/core/ktx/src/main/java/de/mm20/launcher2/ktx/Json.kt
+++ b/core/ktx/src/main/java/de/mm20/launcher2/ktx/Json.kt
@@ -2,9 +2,8 @@ package de.mm20.launcher2.ktx
 
 import kotlinx.serialization.SerializationException
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.decodeFromString
 
-inline fun <reified T>Json.decodeFromStringOrNull(json: String?): T? {
+inline fun <reified T> Json.decodeFromStringOrNull(json: String?): T? {
     if (json == null) return null
     return try {
         decodeFromString(json)
diff --git a/core/ktx/src/main/java/de/mm20/launcher2/ktx/PendingIntent.kt b/core/ktx/src/main/java/de/mm20/launcher2/ktx/PendingIntent.kt
index 92f0c3c8..48604380 100644
--- a/core/ktx/src/main/java/de/mm20/launcher2/ktx/PendingIntent.kt
+++ b/core/ktx/src/main/java/de/mm20/launcher2/ktx/PendingIntent.kt
@@ -2,19 +2,17 @@ package de.mm20.launcher2.ktx
 
 import android.app.ActivityOptions
 import android.app.PendingIntent
+import android.content.Context
 
-fun PendingIntent.sendWithBackgroundPermission() {
+fun PendingIntent.sendWithBackgroundPermission(context: Context) {
     if (isAtLeastApiLevel(34)) {
         val options = ActivityOptions.makeBasic()
-            .setPendingIntentCreatorBackgroundActivityStartMode(
-                ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED
-            )
             .setPendingIntentBackgroundActivityStartMode(
                 ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED
             )
             .toBundle()
-        send(options)
+        send(context, 0, null, null, null, null, options)
     } else {
-        send()
+        send(context, 0, null)
     }
 }
\ No newline at end of file
diff --git a/core/preferences/src/main/java/de/mm20/launcher2/preferences/LauncherDataStore.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/LauncherDataStore.kt
index 4cb927bd..c5ef736b 100644
--- a/core/preferences/src/main/java/de/mm20/launcher2/preferences/LauncherDataStore.kt
+++ b/core/preferences/src/main/java/de/mm20/launcher2/preferences/LauncherDataStore.kt
@@ -3,6 +3,7 @@ package de.mm20.launcher2.preferences
 import android.content.Context
 import de.mm20.launcher2.preferences.migrations.Migration1
 import de.mm20.launcher2.preferences.migrations.Migration2
+import de.mm20.launcher2.preferences.migrations.Migration3
 import de.mm20.launcher2.settings.BaseSettings
 
 internal class LauncherDataStore(
@@ -15,6 +16,7 @@ internal class LauncherDataStore(
     migrations = listOf(
         Migration1(legacyDataStore),
         Migration2(),
+        Migration3(),
     ),
 ) {
 
diff --git a/core/preferences/src/main/java/de/mm20/launcher2/preferences/LauncherSettingsData.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/LauncherSettingsData.kt
index 3a8cc8c7..2986ae75 100644
--- a/core/preferences/src/main/java/de/mm20/launcher2/preferences/LauncherSettingsData.kt
+++ b/core/preferences/src/main/java/de/mm20/launcher2/preferences/LauncherSettingsData.kt
@@ -135,7 +135,9 @@ data class LauncherSettingsData internal constructor(
     val weatherProviderSettings: Map<String, ProviderSettings> = emptyMap(),
     val weatherImperialUnits: Boolean = false,
 
+    @Deprecated("Use locationSearchProviders instead")
     val locationSearchEnabled: Boolean = false,
+    val locationSearchProviders: Set<String> = setOf("openstreetmaps"),
     val locationSearchImperialUnits: Boolean = false,
     val locationSearchRadius: Int = 1500,
     val locationSearchHideUncategorized: Boolean = true,
diff --git a/core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration3.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration3.kt
new file mode 100644
index 00000000..2e9ac53f
--- /dev/null
+++ b/core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration3.kt
@@ -0,0 +1,24 @@
+package de.mm20.launcher2.preferences.migrations
+
+import androidx.datastore.core.DataMigration
+import de.mm20.launcher2.preferences.LauncherSettingsData
+
+class Migration3: DataMigration<LauncherSettingsData> {
+    override suspend fun cleanUp() {
+    }
+
+    override suspend fun shouldMigrate(currentData: LauncherSettingsData): Boolean {
+        return currentData.schemaVersion < 3
+    }
+
+    override suspend fun migrate(currentData: LauncherSettingsData): LauncherSettingsData {
+        return currentData.copy(
+            schemaVersion = 3,
+            locationSearchProviders = buildSet {
+                if (currentData.locationSearchEnabled) {
+                    add("openstreetmaps")
+                }
+            }
+        )
+    }
+}
\ No newline at end of file
diff --git a/core/preferences/src/main/java/de/mm20/launcher2/preferences/search/LocationSearchSettings.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/search/LocationSearchSettings.kt
index 9c7f8eae..01e4b5b0 100644
--- a/core/preferences/src/main/java/de/mm20/launcher2/preferences/search/LocationSearchSettings.kt
+++ b/core/preferences/src/main/java/de/mm20/launcher2/preferences/search/LocationSearchSettings.kt
@@ -1,16 +1,16 @@
 package de.mm20.launcher2.preferences.search
 
 import de.mm20.launcher2.preferences.LauncherDataStore
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
 class LocationSearchSettings internal constructor(
     private val launcherDataStore: LauncherDataStore,
 ) {
-
     val data
         get() = launcherDataStore.data.map {
             LocationSearchSettingsData(
-                enabled = it.locationSearchEnabled,
+                providers = it.locationSearchProviders,
                 searchRadius = it.locationSearchRadius,
                 hideUncategorized = it.locationSearchHideUncategorized,
                 overpassUrl = it.locationSearchOverpassUrl,
@@ -22,12 +22,32 @@ class LocationSearchSettings internal constructor(
             )
         }
 
-    val enabled
-        get() = launcherDataStore.data.map { it.locationSearchEnabled }
+    val enabledProviders: Flow<Set<String>>
+        get() = launcherDataStore.data.map { it.locationSearchProviders }
 
-    fun setEnabled(enabled: Boolean) {
+    val osmLocations
+        get() = launcherDataStore.data.map { it.locationSearchProviders.contains("openstreetmaps") }
+
+    fun setOsmLocations(osmLocations: Boolean) {
         launcherDataStore.update {
-            it.copy(locationSearchEnabled = enabled)
+            if (osmLocations) {
+                it.copy(locationSearchProviders = it.locationSearchProviders + "openstreetmaps")
+            } else {
+                it.copy(locationSearchProviders = it.locationSearchProviders - "openstreetmaps")
+            }
+        }
+    }
+
+    val enabledPlugins: Flow<Set<String>>
+        get() = launcherDataStore.data.map { it.locationSearchProviders - "openstreetmaps" }
+
+    fun setPluginEnabled(authority: String, enabled: Boolean) {
+        launcherDataStore.update {
+            if (enabled) {
+                it.copy(locationSearchProviders = it.locationSearchProviders + authority)
+            } else {
+                it.copy(locationSearchProviders = it.locationSearchProviders - authority)
+            }
         }
     }
 
@@ -76,15 +96,6 @@ class LocationSearchSettings internal constructor(
         }
     }
 
-    val showPositionOnMap
-        get() = launcherDataStore.data.map { it.locationSearchShowPositionOnMap }
-
-    fun setShowPositionOnMap(showPositionOnMap: Boolean) {
-        launcherDataStore.update {
-            it.copy(locationSearchShowPositionOnMap = showPositionOnMap)
-        }
-    }
-
     val themeMap
         get() = launcherDataStore.data.map { it.locationSearchThemeMap }
 
@@ -111,7 +122,7 @@ class LocationSearchSettings internal constructor(
 }
 
 data class LocationSearchSettingsData(
-    val enabled: Boolean = false,
+    val providers: Set<String> = setOf("openstreetmaps"),
     val searchRadius: Int = 1500,
     val hideUncategorized: Boolean = true,
     val overpassUrl: String = LocationSearchSettings.DefaultOverpassUrl,
diff --git a/core/shared/build.gradle.kts b/core/shared/build.gradle.kts
index bd537e03..0428bfd0 100644
--- a/core/shared/build.gradle.kts
+++ b/core/shared/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.plugin.serialization)
     alias(libs.plugins.dokka)
     `maven-publish`
     signing
@@ -46,6 +47,11 @@ android {
     }
 }
 
+dependencies {
+    implementation(libs.kotlinx.serialization.json)
+    implementation(libs.bundles.kotlin)
+}
+
 tasks.dokkaHtml {
     outputDirectory.set(layout.buildDirectory.dir("dokka"))
 }
@@ -95,12 +101,16 @@ publishing {
     }
     repositories {
         mavenLocal()
-        maven {
-            name = "GitHubPackages"
-            url = uri("https://maven.pkg.github.com/MM2-0/Kvaesitso")
-            credentials {
-                username = project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME")
-                password = project.findProperty("gpr.key") as String? ?: System.getenv("TOKEN")
+        val ghUser = project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME")
+        if (ghUser == "MM2-0") {
+            maven {
+                name = "GitHubPackages"
+                url = uri("https://maven.pkg.github.com/MM2-0/Kvaesitso")
+                credentials {
+                    username =
+                        project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME")
+                    password = project.findProperty("gpr.key") as String? ?: System.getenv("TOKEN")
+                }
             }
         }
     }
diff --git a/core/shared/src/main/java/de/mm20/launcher2/plugin/PluginType.kt b/core/shared/src/main/java/de/mm20/launcher2/plugin/PluginType.kt
index ac8b2fcb..d530f5d4 100644
--- a/core/shared/src/main/java/de/mm20/launcher2/plugin/PluginType.kt
+++ b/core/shared/src/main/java/de/mm20/launcher2/plugin/PluginType.kt
@@ -3,4 +3,5 @@ package de.mm20.launcher2.plugin
 enum class PluginType {
     FileSearch,
     Weather,
+    LocationSearch,
 }
\ No newline at end of file
diff --git a/core/shared/src/main/java/de/mm20/launcher2/plugin/config/SearchPluginConfig.kt b/core/shared/src/main/java/de/mm20/launcher2/plugin/config/QueryPluginConfig.kt
similarity index 67%
rename from core/shared/src/main/java/de/mm20/launcher2/plugin/config/SearchPluginConfig.kt
rename to core/shared/src/main/java/de/mm20/launcher2/plugin/config/QueryPluginConfig.kt
index 5296a0b7..50b01f4c 100644
--- a/core/shared/src/main/java/de/mm20/launcher2/plugin/config/SearchPluginConfig.kt
+++ b/core/shared/src/main/java/de/mm20/launcher2/plugin/config/QueryPluginConfig.kt
@@ -1,9 +1,6 @@
 package de.mm20.launcher2.plugin.config
 
-import android.os.Bundle
-import de.mm20.launcher2.plugin.config.StorageStrategy
-
-data class SearchPluginConfig(
+data class QueryPluginConfig(
     /**
      * Strategy to store items from this provider in the launcher database
      * @see [StorageStrategy]
diff --git a/core/shared/src/main/java/de/mm20/launcher2/plugin/config/StorageStrategy.kt b/core/shared/src/main/java/de/mm20/launcher2/plugin/config/StorageStrategy.kt
index 677876c6..b4ae67a8 100644
--- a/core/shared/src/main/java/de/mm20/launcher2/plugin/config/StorageStrategy.kt
+++ b/core/shared/src/main/java/de/mm20/launcher2/plugin/config/StorageStrategy.kt
@@ -1,9 +1,13 @@
 package de.mm20.launcher2.plugin.config
 
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
 /**
  * Defines how the launcher should store search results from a plugin (i.e. when the search result is
  * added to favorites).
  */
+@Serializable
 enum class StorageStrategy {
     /**
      * The launcher only stores the ID and the plugin provider for the search result. To restore the
@@ -13,6 +17,7 @@ enum class StorageStrategy {
      * particular, the plugin provider must be able to restore a search result without any network
      * requests.
      */
+    @SerialName("ref")
     StoreReference,
 
     /**
@@ -21,13 +26,6 @@ enum class StorageStrategy {
      * Use this strategy if your plugin needs to perform network requests to retrieve search
      * results and if you don't want to implement a cache for search results.
      */
+    @SerialName("copy")
     StoreCopy,
-
-    /**
-     * The launcher stores all relevant information in its own internal database, like [StoreCopy].
-     * A fresh copy is fetched from the plugin provider when the user opens the search result's
-     * detail view. This allows the plugin provider to update the search result at a later point in
-     * time, without the time constraints of [StoreReference].
-     */
-    Deferred,
 }
\ No newline at end of file
diff --git a/core/shared/src/main/java/de/mm20/launcher2/plugin/contracts/Columns.kt b/core/shared/src/main/java/de/mm20/launcher2/plugin/contracts/Columns.kt
new file mode 100644
index 00000000..f0d20919
--- /dev/null
+++ b/core/shared/src/main/java/de/mm20/launcher2/plugin/contracts/Columns.kt
@@ -0,0 +1,271 @@
+package de.mm20.launcher2.plugin.contracts
+
+import android.database.Cursor
+import android.os.Bundle
+import android.util.Log
+import de.mm20.launcher2.plugin.data.RowBuilderScope
+import de.mm20.launcher2.serialization.Json
+import kotlinx.serialization.encodeToString
+
+abstract class Columns {
+    internal val columns = mutableSetOf<String>()
+}
+
+@Suppress("UNCHECKED_CAST")
+internal inline fun <reified T : Any> Columns.column(name: String): Column<T> {
+    val column = when (T::class) {
+        Int::class -> IntColumn(name)
+        Long::class -> LongColumn(name)
+        String::class -> StringColumn(name)
+        Short::class -> ShortColumn(name)
+        Boolean::class -> BooleanColumn(name)
+        Double::class -> DoubleColumn(name)
+        Float::class -> FloatColumn(name)
+        ByteArray::class -> BlobColumn(name)
+        else -> {
+            if (T::class.java.isEnum) {
+                SerializableColumn(
+                    name,
+                    { it.toString() },
+                    { v -> T::class.java.enumConstants?.find { it.toString() == v } }
+                )
+            } else {
+                SerializableColumn(
+                    name,
+                    { Json.Lenient.encodeToString(it) },
+                    { Json.Lenient.decodeFromString(it) }
+                )
+            }
+        }
+    } as Column<T>
+    columns.add(name)
+    return column
+}
+
+sealed interface Column<T> {
+    val name: String
+    fun Cursor.readAtIndex(index: Int): T?
+    fun RowBuilderScope.toCursorValue(value: T?): Any? {
+        return value
+    }
+
+    fun Bundle.put(value: T?)
+    fun Bundle.get(): T?
+}
+
+internal class IntColumn(
+    override val name: String
+) : Column<Int> {
+    override fun Cursor.readAtIndex(index: Int): Int {
+        return getInt(index)
+    }
+
+    override fun Bundle.put(value: Int?) {
+        if (value == null) {
+            remove(name)
+        } else {
+            putInt(name, value)
+        }
+    }
+
+    override fun Bundle.get(): Int {
+        return getInt(name)
+    }
+}
+
+
+internal class LongColumn(
+    override val name: String
+) : Column<Long> {
+    override fun Cursor.readAtIndex(index: Int): Long {
+        return getLong(index)
+    }
+
+    override fun Bundle.put(value: Long?) {
+        if (value == null) {
+            remove(name)
+        } else {
+            putLong(name, value)
+        }
+    }
+
+    override fun Bundle.get(): Long {
+        return getLong(name)
+    }
+}
+
+internal class DoubleColumn(
+    override val name: String
+) : Column<Double> {
+    override fun Cursor.readAtIndex(index: Int): Double {
+        return getDouble(index)
+    }
+
+    override fun Bundle.put(value: Double?) {
+        if (value == null) {
+            remove(name)
+        } else {
+            putDouble(name, value)
+        }
+    }
+
+    override fun Bundle.get(): Double {
+        return getDouble(name)
+    }
+}
+
+internal class FloatColumn(
+    override val name: String
+) : Column<Float> {
+    override fun Cursor.readAtIndex(index: Int): Float {
+        return getFloat(index)
+    }
+
+    override fun Bundle.put(value: Float?) {
+        if (value == null) {
+            remove(name)
+        } else {
+            putFloat(name, value)
+        }
+    }
+
+    override fun Bundle.get(): Float {
+        return getFloat(name)
+    }
+}
+
+internal class StringColumn(
+    override val name: String
+) : Column<String> {
+    override fun Cursor.readAtIndex(index: Int): String? {
+        return getString(index)
+    }
+
+    override fun Bundle.put(value: String?) {
+        if (value == null) {
+            remove(name)
+        } else {
+            putString(name, value)
+        }
+    }
+
+    override fun Bundle.get(): String? {
+        return getString(name)
+    }
+}
+
+internal class ShortColumn(
+    override val name: String
+) : Column<Short> {
+    override fun Cursor.readAtIndex(index: Int): Short {
+        return getShort(index)
+    }
+
+    override fun Bundle.put(value: Short?) {
+        if (value == null) {
+            remove(name)
+        } else {
+            putShort(name, value)
+        }
+    }
+
+    override fun Bundle.get(): Short {
+        return getShort(name)
+    }
+}
+
+internal class BooleanColumn(
+    override val name: String
+) : Column<Boolean> {
+    override fun Cursor.readAtIndex(index: Int): Boolean {
+        return getInt(index) != 0
+    }
+
+    override fun RowBuilderScope.toCursorValue(value: Boolean?): Any? {
+        value ?: return null
+        return if (value) 1 else 0
+    }
+
+    override fun Bundle.put(value: Boolean?) {
+        if (value == null) {
+            remove(name)
+        } else {
+            putBoolean(name, value)
+        }
+    }
+
+    override fun Bundle.get(): Boolean? {
+        return getBoolean(name)
+    }
+}
+
+
+internal class BlobColumn(
+    override val name: String
+) : Column<ByteArray> {
+
+    override fun Cursor.readAtIndex(index: Int): ByteArray? {
+        return getBlob(index)
+    }
+
+    override fun Bundle.put(value: ByteArray?) {
+        if (value == null) {
+            remove(name)
+        } else {
+            putByteArray(name, value)
+        }
+    }
+
+    override fun Bundle.get(): ByteArray? {
+        return getByteArray(name)
+    }
+}
+
+internal class SerializableColumn<T>(
+    override val name: String,
+    val serialize: (T) -> String,
+    val deserialize: (String) -> T
+) : Column<T> {
+    override fun Cursor.readAtIndex(index: Int): T? {
+        val string = getString(index)
+        try {
+            return deserialize(string)
+        } catch (e: Exception) {
+            Log.e("MM20", "Failed to read column value", e)
+            return null
+        }
+    }
+
+    override fun RowBuilderScope.toCursorValue(value: T?): Any? {
+        return try {
+            serialize(value ?: return null)
+        } catch (e: Exception) {
+            Log.e("MM20", "Failed to write column value", e)
+            null
+        }
+    }
+
+    override fun Bundle.put(value: T?) {
+        val serialized = try {
+            value?.let(serialize)
+        } catch (e: Exception) {
+            Log.e("MM20", "Failed to serialize column value", e)
+            null
+        }
+        if (serialized == null) {
+            remove(name)
+        } else {
+            putString(name, serialized)
+        }
+    }
+
+    override fun Bundle.get(): T? {
+        val string = getString(name) ?: return null
+        return try {
+            deserialize(string)
+        } catch (e: Exception) {
+            Log.e("MM20", "Failed to deserialize column value", e)
+            null
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/shared/src/main/java/de/mm20/launcher2/plugin/contracts/FilePluginContract.kt b/core/shared/src/main/java/de/mm20/launcher2/plugin/contracts/FilePluginContract.kt
index d890f63c..adf0b7c2 100644
--- a/core/shared/src/main/java/de/mm20/launcher2/plugin/contracts/FilePluginContract.kt
+++ b/core/shared/src/main/java/de/mm20/launcher2/plugin/contracts/FilePluginContract.kt
@@ -2,64 +2,63 @@ package de.mm20.launcher2.plugin.contracts
 
 abstract class FilePluginContract {
 
-    object FileColumns {
+    object FileColumns: Columns() {
         /**
          * The unique ID of the file.
          * Type: String
          */
-        const val Id = "id"
+        val Id = column<String>("id")
 
         /**
          * The display name of the file.
          * Type: String
          */
-        const val DisplayName = "display_name"
+        val DisplayName = column<String>("display_name")
 
         /**
          * The MIME type of the file. This is used to determine how to open the file. Make sure that
          * this is either a common MIME type or that your app can handle this MIME type.
          * Type: String?
          */
-        const val MimeType = "mime_type"
+        val MimeType = column<String>("mime_type")
 
         /**
          * The size of the file in bytes.
          * Type: Long?
          */
-        const val Size = "size"
+        val Size = column<Long>("size")
 
         /**
          * The display path of the file.
          * Type: String?
          */
-        const val Path = "path"
+        val Path = column<String>("path")
 
         /**
          * The URI to view the file.
          * Type: String?
          */
-        const val ContentUri = "uri"
+        val ContentUri = column<String>("uri")
 
-        const val ThumbnailUri = "thumbnail_uri"
+        val ThumbnailUri = column<String>("thumbnail_uri")
 
         /**
          * Whether the file is a directory.
          * Type: Int
          */
-        const val IsDirectory = "is_directory"
+        val IsDirectory = column<Boolean>("is_directory")
 
-        const val Owner = "owner"
+        val Owner = column<String>("owner")
 
-        const val MetaTitle = "meta_title"
-        const val MetaArtist = "meta_artist"
-        const val MetaAlbum = "meta_album"
-        const val MetaDuration = "meta_duration"
-        const val MetaYear = "meta_year"
-        const val MetaWidth = "meta_width"
-        const val MetaHeight = "meta_height"
-        const val MetaLocation = "meta_location"
-        const val MetaAppName = "meta_app_name"
-        const val MetaAppPackageName = "meta_app_package_name"
-        const val MetaAppMinSdkVersion = "meta_app_min_sdk_version"
+        val MetaTitle = column<String>("meta_title")
+        val MetaArtist = column<String>("meta_artist")
+        val MetaAlbum = column<String>("meta_album")
+        val MetaDuration = column<Long>("meta_duration")
+        val MetaYear = column<Int>("meta_year")
+        val MetaWidth = column<Int>("meta_width")
+        val MetaHeight = column<Int>("meta_height")
+        val MetaLocation = column<String>("meta_location")
+        val MetaAppName = column<String>("meta_app_name")
+        val MetaAppPackageName = column<String>("meta_app_package_name")
     }
 }
\ No newline at end of file
diff --git a/core/shared/src/main/java/de/mm20/launcher2/plugin/contracts/LocationPluginContract.kt b/core/shared/src/main/java/de/mm20/launcher2/plugin/contracts/LocationPluginContract.kt
new file mode 100644
index 00000000..d944180e
--- /dev/null
+++ b/core/shared/src/main/java/de/mm20/launcher2/plugin/contracts/LocationPluginContract.kt
@@ -0,0 +1,143 @@
+package de.mm20.launcher2.plugin.contracts
+
+import de.mm20.launcher2.search.location.Address
+import de.mm20.launcher2.search.location.Attribution
+import de.mm20.launcher2.search.location.Departure
+import de.mm20.launcher2.search.location.LocationIcon
+import de.mm20.launcher2.search.location.OpeningSchedule
+
+abstract class LocationPluginContract {
+    object Paths {
+        const val Search = "search"
+        const val Get = "get"
+    }
+
+    object Params {
+        /**
+         * Search query.
+         * Type: String
+         */
+        const val Query = "query"
+
+        /**
+         * Latitude of user's current location in degrees.
+         * Type: Double?
+         */
+        const val UserLatitude = "user_latitude"
+
+        /**
+         * Longitude of user's current location in degrees.
+         * Type: Double?
+         */
+        const val UserLongitude = "user_longitude"
+
+        /**
+         * Search radius in meters.
+         * Type: Long
+         */
+        const val SearchRadius = "search_radius"
+
+        /**
+         * Whether to allow network requests.
+         * Type: Boolean
+         */
+        const val AllowNetwork = "network"
+    }
+
+    object GetParams {
+        /**
+         * Unique identifier of location to look up.
+         * Type: String
+         */
+        const val Id = "id"
+    }
+
+    object LocationColumns : Columns() {
+        /**
+         * Unique identifier of location.
+         * Type: String
+         */
+        val Id = column<String>("id")
+
+        /**
+         * Display name of location.
+         * Type: String
+         */
+        val Label = column<String>("label")
+
+        /**
+         * Latitude of location in degrees.
+         * Type: Double
+         */
+        val Latitude = column<Double>("latitude")
+
+        /**
+         * Longitude of location in degrees.
+         * Type: Double
+         */
+        val Longitude = column<Double>("longitude")
+
+        /**
+         * Url for users to report / fix incorrect data.
+         * Type: String?
+         */
+        val FixMeUrl = column<String>("fix_me_url")
+
+        /**
+         * Icon of location.
+         * Type: String? (enum LocationIcon)
+         */
+        val Icon = column<LocationIcon>("icon")
+
+        /**
+         * Location category.
+         * Type: String?
+         */
+        val Category = column<String>("category")
+
+        /**
+         * Street name of location.
+         * Type: String? (JSON)
+         */
+        val Address = column<Address>("address")
+
+        /**
+         * Opening schedule of location, encoded as JSON.
+         * Type: String? (JSON)
+         */
+        val OpeningSchedule = column<OpeningSchedule>("opening_schedule")
+
+        /**
+         * Website URL of location.
+         * Type: String?
+         */
+        val WebsiteUrl = column<String>("website_url")
+
+        /**
+         * Phone number of location.
+         * Type: String?
+         */
+        val PhoneNumber = column<String>("phone_number")
+
+        val EmailAddress = column<String>("email_address")
+
+        /**
+         * User rating of location, from 0.0 (worst) to 1.0 (best)
+         * Type: Float?
+         */
+        val UserRating = column<Float>("user_rating")
+        val UserRatingCount = column<Int>("user_rating_count")
+
+        /**
+         * Public transport departures originating from this location, encoded as JSON.
+         * Type: String? (JSON)
+         */
+        val Departures = column<List<Departure>>("departures")
+
+        /**
+         * Attribution information for location data.
+         * Type: String? (JSON)
+         */
+        val Attribution = column<Attribution>("attribution")
+    }
+}
\ No newline at end of file
diff --git a/core/shared/src/main/java/de/mm20/launcher2/plugin/contracts/SearchPluginContract.kt b/core/shared/src/main/java/de/mm20/launcher2/plugin/contracts/SearchPluginContract.kt
index 23eaf05e..56a0a5f5 100644
--- a/core/shared/src/main/java/de/mm20/launcher2/plugin/contracts/SearchPluginContract.kt
+++ b/core/shared/src/main/java/de/mm20/launcher2/plugin/contracts/SearchPluginContract.kt
@@ -4,7 +4,21 @@ abstract class SearchPluginContract {
     object Paths {
         const val Search = "search"
         const val Root = "root"
-        const val QueryParam = "query"
-        const val AllowNetworkParam = "network"
+        const val Refresh = "refresh"
+        @Deprecated("Use Paths.Query instead")
+        const val QueryParam = Params.Query
+        @Deprecated("Use Params.AllowNetwork instead")
+        const val AllowNetworkParam = Params.AllowNetwork
+        @Deprecated("Use Params.Lang instead")
+        const val LangParam = Params.Lang
+    }
+    object Params {
+        const val AllowNetwork = "network"
+        const val Lang = "lang"
+        const val UpdatedAt = "updatedAt"
+        const val Query = "query"
+    }
+    object Extras {
+        const val NotUpdated = "notUpdated"
     }
 }
\ No newline at end of file
diff --git a/core/shared/src/main/java/de/mm20/launcher2/plugin/contracts/WeatherPluginContract.kt b/core/shared/src/main/java/de/mm20/launcher2/plugin/contracts/WeatherPluginContract.kt
index 069e9eab..9846c598 100644
--- a/core/shared/src/main/java/de/mm20/launcher2/plugin/contracts/WeatherPluginContract.kt
+++ b/core/shared/src/main/java/de/mm20/launcher2/plugin/contracts/WeatherPluginContract.kt
@@ -1,5 +1,7 @@
 package de.mm20.launcher2.plugin.contracts
 
+import de.mm20.launcher2.weather.WeatherIcon
+
 object WeatherPluginContract {
     object Paths {
         const val Forecasts = "forecasts"
@@ -14,25 +16,25 @@ object WeatherPluginContract {
         const val Language = "lang"
     }
 
-    object ForecastColumns {
-        const val Timestamp = "timestamp"
-        const val CreatedAt = "created_at"
-        const val Temperature = "temperature"
-        const val TemperatureMin = "temperature_min"
-        const val TemperatureMax = "temperature_max"
-        const val Pressure = "pressure"
-        const val Humidity = "humidity"
-        const val WindSpeed = "wind_speed"
-        const val WindDirection = "wind_direction"
-        const val Precipitation = "precipitation"
-        const val RainProbability = "rain_probability"
-        const val Clouds = "clouds"
-        const val Location = "location"
-        const val Provider = "provider"
-        const val ProviderUrl = "provider_url"
-        const val Night = "night"
-        const val Icon = "icon"
-        const val Condition = "condition"
+    object ForecastColumns : Columns() {
+        val Timestamp = column<Long>("timestamp")
+        val CreatedAt = column<Long>("created_at")
+        val Temperature = column<Double>("temperature")
+        val TemperatureMin = column<Double>("temperature_min")
+        val TemperatureMax = column<Double>("temperature_max")
+        val Pressure = column<Double>("pressure")
+        val Humidity = column<Int>("humidity")
+        val WindSpeed = column<Double>("wind_speed")
+        val WindDirection = column<Double>("wind_direction")
+        val Precipitation = column<Double>("precipitation")
+        val RainProbability = column<Int>("rain_probability")
+        val Clouds = column<Int>("clouds")
+        val Location = column<String>("location")
+        val Provider = column<String>("provider")
+        val ProviderUrl = column<String>("provider_url")
+        val Night = column<Boolean>("night")
+        val Icon = column<WeatherIcon>("icon")
+        val Condition = column<String>("condition")
     }
 
     object LocationParams {
@@ -40,10 +42,10 @@ object WeatherPluginContract {
         const val Language = "lang"
     }
 
-    object LocationColumns {
-        const val Id = "id"
-        const val Lat = "lat"
-        const val Lon = "lon"
-        const val Name = "name"
+    object LocationColumns : Columns() {
+        val Id = column<String>("id")
+        val Lat = column<Double>("lat")
+        val Lon = column<Double>("lon")
+        val Name = column<String>("name")
     }
 }
\ No newline at end of file
diff --git a/core/shared/src/main/java/de/mm20/launcher2/plugin/data/Bundle.kt b/core/shared/src/main/java/de/mm20/launcher2/plugin/data/Bundle.kt
new file mode 100644
index 00000000..24634331
--- /dev/null
+++ b/core/shared/src/main/java/de/mm20/launcher2/plugin/data/Bundle.kt
@@ -0,0 +1,17 @@
+package de.mm20.launcher2.plugin.data
+
+import android.os.Bundle
+import de.mm20.launcher2.plugin.contracts.Column
+
+operator fun <T> Bundle.get(column: Column<T>): T? {
+    return with(column) {
+        if (!containsKey(column.name)) return null
+        get()
+    }
+}
+
+operator fun <T> Bundle.set(column: Column<T>, value: T?) {
+    with(column) {
+        put(value)
+    }
+}
\ No newline at end of file
diff --git a/core/shared/src/main/java/de/mm20/launcher2/plugin/data/Cursor.kt b/core/shared/src/main/java/de/mm20/launcher2/plugin/data/Cursor.kt
new file mode 100644
index 00000000..772a7719
--- /dev/null
+++ b/core/shared/src/main/java/de/mm20/launcher2/plugin/data/Cursor.kt
@@ -0,0 +1,77 @@
+package de.mm20.launcher2.plugin.data
+
+import android.database.Cursor
+import android.database.MatrixCursor
+import android.util.Log
+import de.mm20.launcher2.plugin.contracts.Column
+import de.mm20.launcher2.plugin.contracts.Columns
+
+interface ColumnsScope {
+    operator fun <T : Any> Cursor.get(column: Column<T>): T?
+    operator fun Cursor.contains(column: Column<*>): Boolean
+}
+
+internal class ColumnsScopeImpl(
+    private val columnIndices: Map<String, Int>,
+    private val cursor: Cursor
+) : ColumnsScope {
+    override operator fun <T : Any> Cursor.get(column: Column<T>): T? {
+        val index = columnIndices[column.name] ?: return null
+        if (index == -1) return null
+        if (cursor.isNull(index)) return null
+        try {
+            return with(column) { cursor.readAtIndex(index) }
+        } catch (e: Exception) {
+            Log.e("MM20", "Failed to get column value", e)
+        }
+        return null
+    }
+
+    override fun Cursor.contains(column: Column<*>): Boolean {
+        return columnIndices.containsKey(column.name)
+    }
+}
+
+fun Cursor.withColumns(columns: Columns, block: ColumnsScope.() -> Unit) {
+    val scope = ColumnsScopeImpl(
+        columns.columns.associateWith { name -> getColumnIndex(name) },
+        this
+    )
+    scope.block()
+}
+
+
+
+fun <T> buildCursor(
+    columns: Columns,
+    data: List<T>,
+    rowBuilder: RowBuilderScope.(item: T) -> Unit
+): Cursor {
+    val cursor = MatrixCursor(columns.columns.toTypedArray(), data.size)
+    val values = Array<Any?>(columns.columns.size) { null }
+    val scope = RowBuilderScopeImpl(
+        columnIndices = columns.columns.withIndex().associate { (index, name) -> name to index },
+        values = values
+    )
+    repeat(data.size) {
+        values.fill(null)
+        scope.rowBuilder(data[it])
+        cursor.addRow(scope.values)
+    }
+    return cursor
+}
+
+interface RowBuilderScope {
+    fun <T : Any> put(column: Column<T>, value: T?)
+}
+
+internal class RowBuilderScopeImpl(
+    private val columnIndices: Map<String, Int>,
+    internal val values: Array<Any?>
+) : RowBuilderScope {
+    override fun <T : Any> put(column: Column<T>, value: T?) {
+        value ?: return
+        val index = columnIndices[column.name] ?: return
+        values[index] = with(column) { toCursorValue(value) }
+    }
+}
\ No newline at end of file
diff --git a/core/shared/src/main/java/de/mm20/launcher2/search/location/Address.kt b/core/shared/src/main/java/de/mm20/launcher2/search/location/Address.kt
new file mode 100644
index 00000000..6afacdd9
--- /dev/null
+++ b/core/shared/src/main/java/de/mm20/launcher2/search/location/Address.kt
@@ -0,0 +1,35 @@
+package de.mm20.launcher2.search.location
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Address(
+    /**
+     * Address line 1 (e.g. street name and number)
+     */
+    val address: String? = null,
+    /**
+     * Address line 2 (e.g. apartment number)
+     */
+    val address2: String? = null,
+    /**
+     * Address line 3 (e.g. additional information)
+     */
+    val address3: String? = null,
+    /**
+     * City
+     */
+    val city: String? = null,
+    /**
+     * State, province, or region
+     */
+    val state: String? = null,
+    /**
+     * Postal code
+     */
+    val postalCode: String? = null,
+    /**
+     * Country
+     */
+    val country: String? = null,
+)
\ No newline at end of file
diff --git a/core/shared/src/main/java/de/mm20/launcher2/search/location/Attribution.kt b/core/shared/src/main/java/de/mm20/launcher2/search/location/Attribution.kt
new file mode 100644
index 00000000..f2045ee8
--- /dev/null
+++ b/core/shared/src/main/java/de/mm20/launcher2/search/location/Attribution.kt
@@ -0,0 +1,13 @@
+package de.mm20.launcher2.search.location
+
+import android.net.Uri
+import de.mm20.launcher2.serialization.UriSerializer
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Attribution(
+    val text: String? = null,
+    @Serializable(with = UriSerializer::class)
+    val iconUrl: Uri? = null,
+    val url: String? = null,
+)
\ No newline at end of file
diff --git a/core/shared/src/main/java/de/mm20/launcher2/search/location/Departure.kt b/core/shared/src/main/java/de/mm20/launcher2/search/location/Departure.kt
new file mode 100644
index 00000000..93b9ae14
--- /dev/null
+++ b/core/shared/src/main/java/de/mm20/launcher2/search/location/Departure.kt
@@ -0,0 +1,47 @@
+package de.mm20.launcher2.search.location
+
+import android.graphics.Color
+import de.mm20.launcher2.serialization.ColorSerializer
+import de.mm20.launcher2.serialization.DurationSerializer
+import de.mm20.launcher2.serialization.ZonedDateTimeSerializer
+import kotlinx.serialization.Serializable
+import java.time.Duration
+import java.time.ZonedDateTime
+
+@Serializable
+data class Departure(
+    /**
+     * The scheduled time of the departure.
+     */
+    @Serializable(with = ZonedDateTimeSerializer::class)
+    val time: ZonedDateTime,
+    /**
+     * The delay of the departure.
+     * `Duration.ZERO` if the departure is on time,
+     * `null` if no real-time data is available.
+     */
+    @Serializable(with = DurationSerializer::class)
+    val delay: Duration?,
+    /**
+     * Name of the line (i.e. "11", "U2", "S1").
+     */
+    val line: String,
+    val lastStop: String?,
+    val type: LineType? = null,
+    @Serializable(with = ColorSerializer::class)
+    val lineColor: Color?,
+)
+
+enum class LineType {
+    Bus,
+    Tram,
+    Subway,
+    CommuterTrain,
+    RegionalTrain,
+    Train,
+    HighSpeedTrain,
+    Boat,
+    Monorail,
+    CableCar,
+    Airplane,
+}
\ No newline at end of file
diff --git a/core/shared/src/main/java/de/mm20/launcher2/search/location/LocationIcon.kt b/core/shared/src/main/java/de/mm20/launcher2/search/location/LocationIcon.kt
new file mode 100644
index 00000000..6ecffbef
--- /dev/null
+++ b/core/shared/src/main/java/de/mm20/launcher2/search/location/LocationIcon.kt
@@ -0,0 +1,139 @@
+package de.mm20.launcher2.search.location
+
+enum class LocationIcon {
+    Car,
+    CarRental,
+    CarRepair,
+    CarWash,
+    ChargingStation,
+    GasStation,
+    GenericTransit,
+    Parking,
+    Bus,
+    Tram,
+    Train,
+    Subway,
+    CableCar,
+    Airport,
+    Boat,
+    Taxi,
+    Moped,
+    Bike,
+    Motorcycle,
+    ElectricScooter,
+
+    ArtGallery,
+    Museum,
+    Theater,
+    MovieTheater,
+    AmusementPark,
+    NightClub,
+    ConcertHall,
+    Stadium,
+    Casino,
+    Circus,
+
+    Hotel,
+
+    Restaurant,
+    Cafe,
+    FastFood,
+    Pizza,
+    Burger,
+    Kebab,
+    IceCream,
+    Ramen,
+    Soup,
+    Bar,
+    Brunch,
+    Breakfast,
+    Pub,
+    JapaneseCuisine,
+    AsianCuisine,
+
+    Shopping,
+    Florist,
+    Kiosk,
+    FurnitureStore,
+    CellPhoneStore,
+    BookStore,
+    ClothingStore,
+    ConvenienceStore,
+    DiscountStore,
+    JewelryStore,
+    LiquorStore,
+    PetStore,
+    ShoppingMall,
+    Supermarket,
+    Bakery,
+    Optician,
+    Pharmacy,
+    HairSalon,
+    Laundromat,
+
+    Sports,
+    FitnessCenter,
+    Soccer,
+    Basketball,
+    Tennis,
+    Golf,
+    Baseball,
+    AmericanFootball,
+    Hiking,
+    Swimming,
+    Surfing,
+    Motorsports,
+    Handball,
+    Volleyball,
+    Skiing,
+    Kayaking,
+    Skateboarding,
+    Cricket,
+    MartialArts,
+    NordicWalking,
+    Paragliding,
+    Gymnastics,
+    Snowboarding,
+    Hockey,
+    Rugby,
+
+    Bank,
+    Atm,
+
+    Physician,
+    Dentist,
+    Hospital,
+    Clinic,
+
+    Park,
+    Forest,
+
+    Monument,
+    Church,
+    Mosque,
+    Synagogue,
+    BuddhistTemple,
+    HinduTemple,
+    Candle,
+
+    GovernmentBuilding,
+    Police,
+    FireDepartment,
+    Courthouse,
+    PostOffice,
+    Library,
+    School,
+    University,
+    PublicBathroom;
+
+    companion object {
+        fun valueOfOrNull(string: String): LocationIcon? {
+            return try {
+                valueOf(string)
+            } catch (e: IllegalArgumentException) {
+                null
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/core/shared/src/main/java/de/mm20/launcher2/search/location/OpeningSchedule.kt b/core/shared/src/main/java/de/mm20/launcher2/search/location/OpeningSchedule.kt
new file mode 100644
index 00000000..34f22835
--- /dev/null
+++ b/core/shared/src/main/java/de/mm20/launcher2/search/location/OpeningSchedule.kt
@@ -0,0 +1,30 @@
+package de.mm20.launcher2.search.location
+
+import de.mm20.launcher2.serialization.DurationSerializer
+import de.mm20.launcher2.serialization.LocalTimeSerializer
+import de.mm20.launcher2.serialization.OpeningScheduleSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonNames
+import java.time.DayOfWeek
+import java.time.Duration
+import java.time.LocalTime
+
+@Serializable
+data class OpeningHours(
+    @JsonNames("day")
+    val dayOfWeek: DayOfWeek,
+    @JsonNames("openingTime")
+    @Serializable(with = LocalTimeSerializer::class)
+    val startTime: LocalTime,
+    @Serializable(with = DurationSerializer::class)
+    val duration: Duration
+) {
+    override fun toString(): String = "$dayOfWeek $startTime-${startTime.plus(duration)}"
+}
+
+@Serializable(with = OpeningScheduleSerializer::class)
+sealed interface OpeningSchedule {
+    data object TwentyFourSeven : OpeningSchedule
+    @Serializable
+    data class Hours(@Serializable val openingHours: List<OpeningHours>) : OpeningSchedule
+}
\ No newline at end of file
diff --git a/core/shared/src/main/java/de/mm20/launcher2/serialization/ColorSerializer.kt b/core/shared/src/main/java/de/mm20/launcher2/serialization/ColorSerializer.kt
new file mode 100644
index 00000000..4907e800
--- /dev/null
+++ b/core/shared/src/main/java/de/mm20/launcher2/serialization/ColorSerializer.kt
@@ -0,0 +1,21 @@
+package de.mm20.launcher2.serialization
+
+import android.graphics.Color
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+object ColorSerializer: KSerializer<Color> {
+    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor(javaClass.canonicalName!!, PrimitiveKind.INT)
+
+    override fun deserialize(decoder: Decoder): Color {
+        return Color.valueOf(decoder.decodeInt())
+    }
+
+    override fun serialize(encoder: Encoder, value: Color) {
+        encoder.encodeInt(value.toArgb())
+    }
+}
\ No newline at end of file
diff --git a/core/shared/src/main/java/de/mm20/launcher2/serialization/DayOfWeekSerializer.kt b/core/shared/src/main/java/de/mm20/launcher2/serialization/DayOfWeekSerializer.kt
new file mode 100644
index 00000000..087ed1c0
--- /dev/null
+++ b/core/shared/src/main/java/de/mm20/launcher2/serialization/DayOfWeekSerializer.kt
@@ -0,0 +1,22 @@
+package de.mm20.launcher2.serialization
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import java.time.DayOfWeek
+
+object DayOfWeekSerializer : KSerializer<DayOfWeek> {
+    override val descriptor: SerialDescriptor =
+        PrimitiveSerialDescriptor(javaClass.canonicalName!!, PrimitiveKind.INT)
+
+    override fun deserialize(decoder: Decoder): DayOfWeek {
+        return DayOfWeek.of(decoder.decodeInt())
+    }
+
+    override fun serialize(encoder: Encoder, value: DayOfWeek) {
+        encoder.encodeInt(value.value)
+    }
+}
\ No newline at end of file
diff --git a/core/shared/src/main/java/de/mm20/launcher2/serialization/DurationSerializer.kt b/core/shared/src/main/java/de/mm20/launcher2/serialization/DurationSerializer.kt
new file mode 100644
index 00000000..ae5b9e98
--- /dev/null
+++ b/core/shared/src/main/java/de/mm20/launcher2/serialization/DurationSerializer.kt
@@ -0,0 +1,20 @@
+package de.mm20.launcher2.serialization
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import java.time.Duration
+
+object DurationSerializer: KSerializer<Duration> {
+    override val descriptor = PrimitiveSerialDescriptor(javaClass.canonicalName!!, PrimitiveKind.LONG)
+
+    override fun serialize(encoder: Encoder, value: Duration) {
+        encoder.encodeLong(value.toMillis())
+    }
+
+    override fun deserialize(decoder: Decoder): Duration {
+        return Duration.ofMillis(decoder.decodeLong())
+    }
+}
\ No newline at end of file
diff --git a/core/shared/src/main/java/de/mm20/launcher2/serialization/Json.kt b/core/shared/src/main/java/de/mm20/launcher2/serialization/Json.kt
new file mode 100644
index 00000000..3c82a626
--- /dev/null
+++ b/core/shared/src/main/java/de/mm20/launcher2/serialization/Json.kt
@@ -0,0 +1,17 @@
+package de.mm20.launcher2.serialization
+
+/**
+ * Default Json serializer configurations
+ */
+object Json {
+    /**
+     * A Json serializer configuration that aims to be as forgiving as possible.
+     * Suitable for external data sources, and legacy data that may not be fully compliant with the current schema.
+     */
+    val Lenient = kotlinx.serialization.json.Json {
+        ignoreUnknownKeys = true
+        explicitNulls = false
+        isLenient = true
+        coerceInputValues = true
+    }
+}
\ No newline at end of file
diff --git a/core/shared/src/main/java/de/mm20/launcher2/serialization/LocalTimeSerializer.kt b/core/shared/src/main/java/de/mm20/launcher2/serialization/LocalTimeSerializer.kt
new file mode 100644
index 00000000..15e11376
--- /dev/null
+++ b/core/shared/src/main/java/de/mm20/launcher2/serialization/LocalTimeSerializer.kt
@@ -0,0 +1,21 @@
+package de.mm20.launcher2.serialization
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import java.time.LocalTime
+
+object LocalTimeSerializer: KSerializer<LocalTime> {
+    override val descriptor = PrimitiveSerialDescriptor(javaClass.canonicalName!!, PrimitiveKind.LONG)
+
+    override fun serialize(encoder: Encoder, value: LocalTime) {
+        // We use millis here for backwards compatibility in LocationSerializer
+        encoder.encodeLong(value.toNanoOfDay() / 1000000L)
+    }
+
+    override fun deserialize(decoder: Decoder): LocalTime {
+        return LocalTime.ofNanoOfDay(decoder.decodeLong() * 1000000L)
+    }
+}
\ No newline at end of file
diff --git a/core/shared/src/main/java/de/mm20/launcher2/serialization/OpeningScheduleSerializer.kt b/core/shared/src/main/java/de/mm20/launcher2/serialization/OpeningScheduleSerializer.kt
new file mode 100644
index 00000000..cc7cbb01
--- /dev/null
+++ b/core/shared/src/main/java/de/mm20/launcher2/serialization/OpeningScheduleSerializer.kt
@@ -0,0 +1,55 @@
+package de.mm20.launcher2.serialization
+
+import android.util.Log
+import de.mm20.launcher2.search.location.OpeningSchedule
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.PolymorphicSerializer
+import kotlinx.serialization.SerializationException
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.JsonDecoder
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.decodeFromJsonElement
+import kotlinx.serialization.json.jsonArray
+import kotlinx.serialization.json.jsonObject
+
+object OpeningScheduleSerializer : KSerializer<OpeningSchedule> {
+    override val descriptor = PolymorphicSerializer(OpeningSchedule::class).descriptor
+
+    override fun serialize(encoder: Encoder, value: OpeningSchedule) {
+        when (value) {
+            is OpeningSchedule.TwentyFourSeven -> encoder.encodeString("twentyFourSeven")
+
+            is OpeningSchedule.Hours -> encoder.encodeSerializableValue(
+                OpeningSchedule.Hours.serializer(),
+                value
+            )
+        }
+    }
+
+    override fun deserialize(decoder: Decoder): OpeningSchedule {
+        decoder as JsonDecoder
+        val jsonElement = decoder.decodeJsonElement()
+
+        if ((jsonElement as? JsonPrimitive)?.content == "twentyFourSeven") {
+            return OpeningSchedule.TwentyFourSeven
+        }
+
+        if ("openingHours" in jsonElement.jsonObject.keys &&
+            /* backwards compatibility */ !jsonElement.jsonObject["openingHours"]!!.jsonArray.isEmpty()
+        ) {
+            return try {
+                decoder.json.decodeFromJsonElement<OpeningSchedule.Hours>(
+                    jsonElement
+                )
+            } catch (e: SerializationException) {
+                Log.e("MM20", "Failed to deserialize OpeningSchedule.Hours", e)
+                return OpeningSchedule.Hours(openingHours = emptyList())
+            }
+        }
+
+        // fallback in case we receive data which was serialized before introducing OpeningScheduleSerializer.
+        // here openingHours is empty, in which case it has to be 24/7, else it would indicate corrupted data.
+        return OpeningSchedule.TwentyFourSeven
+    }
+}
\ No newline at end of file
diff --git a/core/shared/src/main/java/de/mm20/launcher2/serialization/UriSerializer.kt b/core/shared/src/main/java/de/mm20/launcher2/serialization/UriSerializer.kt
new file mode 100644
index 00000000..23523976
--- /dev/null
+++ b/core/shared/src/main/java/de/mm20/launcher2/serialization/UriSerializer.kt
@@ -0,0 +1,21 @@
+package de.mm20.launcher2.serialization
+
+import android.net.Uri
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+object UriSerializer : KSerializer<Uri> {
+    override val descriptor = PrimitiveSerialDescriptor(javaClass.canonicalName!!, PrimitiveKind.STRING)
+
+    override fun serialize(encoder: Encoder, value: Uri) {
+        // We use millis here for backwards compatibility in LocationSerializer
+        encoder.encodeString(value.toString())
+    }
+
+    override fun deserialize(decoder: Decoder): Uri {
+        return Uri.parse(decoder.decodeString())
+    }
+}
\ No newline at end of file
diff --git a/core/shared/src/main/java/de/mm20/launcher2/serialization/ZonedDateTimeSerializer.kt b/core/shared/src/main/java/de/mm20/launcher2/serialization/ZonedDateTimeSerializer.kt
new file mode 100644
index 00000000..58c2962d
--- /dev/null
+++ b/core/shared/src/main/java/de/mm20/launcher2/serialization/ZonedDateTimeSerializer.kt
@@ -0,0 +1,27 @@
+package de.mm20.launcher2.serialization
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import java.time.Instant
+import java.time.ZoneId
+import java.time.ZonedDateTime
+
+object ZonedDateTimeSerializer : KSerializer<ZonedDateTime> {
+    override val descriptor = PrimitiveSerialDescriptor(javaClass.canonicalName!!, PrimitiveKind.LONG)
+
+    override fun serialize(encoder: Encoder, value: ZonedDateTime) {
+        encoder.encodeLong(
+            value.toEpochSecond()
+        )
+    }
+
+    override fun deserialize(decoder: Decoder): ZonedDateTime {
+        return ZonedDateTime.ofInstant(
+            Instant.ofEpochSecond(decoder.decodeLong()),
+            ZoneId.systemDefault()
+        )
+    }
+}
\ No newline at end of file
diff --git a/core/shared/src/main/java/de/mm20/launcher2/weather/WeatherIcon.kt b/core/shared/src/main/java/de/mm20/launcher2/weather/WeatherIcon.kt
new file mode 100644
index 00000000..2d365627
--- /dev/null
+++ b/core/shared/src/main/java/de/mm20/launcher2/weather/WeatherIcon.kt
@@ -0,0 +1,25 @@
+package de.mm20.launcher2.weather
+
+enum class WeatherIcon {
+    Unknown,
+    Clear,
+    Cloudy,
+    Cold,
+    Drizzle,
+    Haze,
+    Fog,
+    Hail,
+    HeavyThunderstorm,
+    HeavyThunderstormWithRain,
+    Hot,
+    MostlyCloudy,
+    PartlyCloudy,
+    Showers,
+    Sleet,
+    Snow,
+    Storm,
+    Thunderstorm,
+    ThunderstormWithRain,
+    Wind,
+    BrokenClouds,
+}
\ No newline at end of file
diff --git a/data/files/src/main/java/de/mm20/launcher2/files/FileSerialization.kt b/data/files/src/main/java/de/mm20/launcher2/files/FileSerialization.kt
index 3e864ae5..79a77886 100644
--- a/data/files/src/main/java/de/mm20/launcher2/files/FileSerialization.kt
+++ b/data/files/src/main/java/de/mm20/launcher2/files/FileSerialization.kt
@@ -24,6 +24,7 @@ import de.mm20.launcher2.search.SavableSearchable
 import de.mm20.launcher2.search.SearchableDeserializer
 import de.mm20.launcher2.search.SearchableSerializer
 import de.mm20.launcher2.search.UpdateResult
+import de.mm20.launcher2.search.asUpdateResult
 import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.coroutines.flow.firstOrNull
@@ -312,8 +313,7 @@ internal class OwncloudFileDeserializer : SearchableDeserializer {
     }
 }
 
-internal class PluginFileSerializer(
-) : SearchableSerializer {
+internal class PluginFileSerializer : SearchableSerializer {
     override fun serialize(searchable: SavableSearchable): String? {
         searchable as PluginFile
         if (searchable.storageStrategy == StorageStrategy.StoreReference) {
@@ -333,7 +333,8 @@ internal class PluginFileSerializer(
                 "thumbnailUri" to searchable.thumbnailUri?.toString(),
                 "isDirectory" to searchable.isDirectory,
                 "authority" to searchable.authority,
-                "strategy" to if (searchable.storageStrategy == StorageStrategy.StoreCopy) "copy" else "deferred",
+                "timestamp" to searchable.timestamp,
+                "strategy" to "copy",
             ).toString()
         }
     }
@@ -348,84 +349,46 @@ internal class PluginFileDeserializer(
     private val pluginRepository: PluginRepository,
 ) : SearchableDeserializer {
     override suspend fun deserialize(serialized: String): SavableSearchable? {
-        val jsonObject = JSONObject(serialized)
+        val obj = JSONObject(serialized)
 
-        return when (jsonObject.optString("strategy", "copy")) {
-            "ref" -> {
-                getByRef(jsonObject)
-            }
-
-            "deferred" -> {
-                getDeferred(jsonObject)
-            }
-
-            else -> {
-                getByCopy(jsonObject)
-            }
-        }
-    }
-
-    private suspend fun getByRef(obj: JSONObject): File? {
+        val authority = obj.getString("authority")
+        val id = obj.getString("id")
+        val plugin = pluginRepository.get(authority).firstOrNull() ?: return null
+        if (!plugin.enabled) return null
+        val provider = PluginFileProvider(context, authority)
         try {
-            val authority = obj.getString("authority")
-            val id = obj.getString("id")
-            val plugin = pluginRepository.get(authority).firstOrNull() ?: return null
-            if (!plugin.enabled) return null
-            val provider = PluginFileProvider(context, authority)
-            return provider.getFile(id)
-        } catch (e: Exception) {
-            CrashReporter.logException(e)
-            return null
-        }
-    }
+            return when (obj.optString("strategy", "copy")) {
+                "ref" -> {
+                    provider.get(id).getOrNull()
+                }
 
-    private fun getDeferred(obj: JSONObject): File? {
-        val cached = getByCopy(obj) ?: return null
-        val timestamp = obj.optLong("timestamp", 0L)
-        return DeferredFile(
-            cachedFile = cached as PluginFile,
-            timestamp = timestamp,
-            updatedSelf = {
-                val plugin = pluginRepository.get(cached.authority).firstOrNull()
-                    ?: return@DeferredFile UpdateResult.PermanentlyUnavailable()
-                if (!plugin.enabled) return@DeferredFile UpdateResult.PermanentlyUnavailable()
-                val provider = PluginFileProvider(context, cached.authority)
-                try {
-                    val file = provider.getFile(cached.id)
-                    if (file == null) {
-                        UpdateResult.PermanentlyUnavailable()
-                    } else {
-                        UpdateResult.Success(file)
-                    }
-                } catch (e: Exception) {
-                    CrashReporter.logException(e)
-                    UpdateResult.TemporarilyUnavailable(e)
+                else -> {
+                    val uri = obj.getString("uri")
+                    val thumbnailUri = obj.optString("thumbnailUri")
+                    val timestamp = obj.optLong("timestamp", 0L)
+                    val file =  PluginFile(
+                        id = obj.getString("id"),
+                        path = obj.getString("path"),
+                        mimeType = obj.getString("mimeType"),
+                        size = obj.optLong("size", 0L),
+                        metaData = persistentMapOf(),
+                        label = obj.getString("label"),
+                        uri = Uri.parse(uri),
+                        thumbnailUri = thumbnailUri.takeIf { it.isNotEmpty() }?.let { Uri.parse(it) },
+                        storageStrategy = StorageStrategy.StoreCopy,
+                        isDirectory = obj.optBoolean("isDirectory", false),
+                        authority = obj.getString("authority"),
+                        timestamp = timestamp,
+                        updatedSelf = {
+                            if (it !is PluginFile) UpdateResult.TemporarilyUnavailable()
+                            else provider.refresh(it, timestamp).asUpdateResult()
+                        }
+                    )
+                    return file
                 }
             }
-        )
-    }
-
-    private fun getByCopy(obj: JSONObject): File? {
-        try {
-            val uri = obj.getString("uri")
-            val thumbnailUri = obj.optString("thumbnailUri")
-            return PluginFile(
-                id = obj.getString("id"),
-                path = obj.getString("path"),
-                mimeType = obj.getString("mimeType"),
-                size = obj.optLong("size", 0L),
-                metaData = persistentMapOf(),
-                label = obj.getString("label"),
-                uri = Uri.parse(uri),
-                thumbnailUri = thumbnailUri.takeIf { it.isNotEmpty() }?.let { Uri.parse(it) },
-                storageStrategy = StorageStrategy.StoreCopy,
-                isDirectory = obj.optBoolean("isDirectory", false),
-                authority = obj.getString("authority"),
-            )
         } catch (e: JSONException) {
-            CrashReporter.logException(e)
             return null
         }
     }
-
 }
\ No newline at end of file
diff --git a/data/files/src/main/java/de/mm20/launcher2/files/providers/DeferredFile.kt b/data/files/src/main/java/de/mm20/launcher2/files/providers/DeferredFile.kt
index a0ab4597..598877ff 100644
--- a/data/files/src/main/java/de/mm20/launcher2/files/providers/DeferredFile.kt
+++ b/data/files/src/main/java/de/mm20/launcher2/files/providers/DeferredFile.kt
@@ -1,11 +1,12 @@
 package de.mm20.launcher2.files.providers
 
 import de.mm20.launcher2.search.File
+import de.mm20.launcher2.search.SavableSearchable
 import de.mm20.launcher2.search.UpdatableSearchable
 import de.mm20.launcher2.search.UpdateResult
 
 class DeferredFile(
     cachedFile: File,
     override val timestamp: Long,
-    override var updatedSelf: (suspend () -> UpdateResult<File>)? = null,
+    override var updatedSelf: (suspend (SavableSearchable) -> UpdateResult<File>)? = null,
 ) : File by cachedFile, UpdatableSearchable<File>
\ No newline at end of file
diff --git a/data/files/src/main/java/de/mm20/launcher2/files/providers/PluginFile.kt b/data/files/src/main/java/de/mm20/launcher2/files/providers/PluginFile.kt
index e2d4e33d..902302f6 100644
--- a/data/files/src/main/java/de/mm20/launcher2/files/providers/PluginFile.kt
+++ b/data/files/src/main/java/de/mm20/launcher2/files/providers/PluginFile.kt
@@ -18,6 +18,8 @@ import de.mm20.launcher2.search.File
 import de.mm20.launcher2.search.FileMetaType
 import de.mm20.launcher2.search.SavableSearchable
 import de.mm20.launcher2.search.SearchableSerializer
+import de.mm20.launcher2.search.UpdatableSearchable
+import de.mm20.launcher2.search.UpdateResult
 import kotlinx.collections.immutable.ImmutableMap
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -35,7 +37,9 @@ data class PluginFile(
     val authority: String,
     internal val storageStrategy: StorageStrategy,
     override val labelOverride: String? = null,
-) : File {
+    override val timestamp: Long,
+    override val updatedSelf: (suspend (SavableSearchable) -> UpdateResult<File>)?,
+) : File, UpdatableSearchable<File> {
     override val domain: String = Domain
 
     override val key: String
diff --git a/data/files/src/main/java/de/mm20/launcher2/files/providers/PluginFileProvider.kt b/data/files/src/main/java/de/mm20/launcher2/files/providers/PluginFileProvider.kt
index 4d3ffe58..2d55bf4b 100644
--- a/data/files/src/main/java/de/mm20/launcher2/files/providers/PluginFileProvider.kt
+++ b/data/files/src/main/java/de/mm20/launcher2/files/providers/PluginFileProvider.kt
@@ -3,100 +3,35 @@ package de.mm20.launcher2.files.providers
 import android.content.Context
 import android.database.Cursor
 import android.net.Uri
-import android.os.CancellationSignal
+import android.os.Bundle
 import android.text.format.DateUtils
 import android.util.Log
-import androidx.core.database.getIntOrNull
-import androidx.core.database.getLongOrNull
-import androidx.core.database.getStringOrNull
-import de.mm20.launcher2.crashreporter.CrashReporter
 import de.mm20.launcher2.plugin.PluginApi
-import de.mm20.launcher2.plugin.config.SearchPluginConfig
-import de.mm20.launcher2.plugin.contracts.FilePluginContract
-import de.mm20.launcher2.plugin.contracts.PluginContract
+import de.mm20.launcher2.plugin.QueryPluginApi
+import de.mm20.launcher2.plugin.config.QueryPluginConfig
+import de.mm20.launcher2.plugin.contracts.FilePluginContract.FileColumns
 import de.mm20.launcher2.plugin.contracts.SearchPluginContract
-import de.mm20.launcher2.search.File
+import de.mm20.launcher2.plugin.data.set
+import de.mm20.launcher2.plugin.data.withColumns
 import de.mm20.launcher2.search.FileMetaType
+import de.mm20.launcher2.search.UpdateResult
+import de.mm20.launcher2.search.asUpdateResult
 import kotlinx.collections.immutable.toPersistentMap
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.suspendCancellableCoroutine
-import kotlinx.coroutines.withContext
-import kotlin.coroutines.resume
 
 class PluginFileProvider(
     private val context: Context,
     private val pluginAuthority: String,
-) : FileProvider {
-    override suspend fun search(query: String, allowNetwork: Boolean): List<File> = withContext(Dispatchers.IO) {
-        val uri = Uri.Builder()
-            .scheme("content")
-            .authority(pluginAuthority)
-            .path(SearchPluginContract.Paths.Search)
-            .appendQueryParameter(SearchPluginContract.Paths.QueryParam, query)
-            .appendQueryParameter(SearchPluginContract.Paths.AllowNetworkParam, allowNetwork.toString())
-            .build()
-        val cancellationSignal = CancellationSignal()
+) : QueryPluginApi<String, PluginFile>(
+    context, pluginAuthority
+), FileProvider {
 
-        return@withContext suspendCancellableCoroutine {
-            it.invokeOnCancellation {
-                cancellationSignal.cancel()
-            }
-            val cursor = try {
-                context.contentResolver.query(
-                    uri,
-                    null,
-                    null,
-                    cancellationSignal
-                )
-            } catch (e: Exception) {
-                Log.e("MM20", "Plugin ${pluginAuthority} threw exception")
-                CrashReporter.logException(e)
-                it.resume(emptyList())
-                return@suspendCancellableCoroutine
-            }
-
-            if (cursor == null) {
-                Log.e("MM20", "Plugin ${pluginAuthority} returned null cursor")
-                it.resume(emptyList())
-                return@suspendCancellableCoroutine
-            }
-
-            val results = fromCursor(cursor) ?: emptyList()
-            it.resume(results)
-        }
-    }
-
-    private fun getPluginConfig(): SearchPluginConfig? {
+    private fun getPluginConfig(): QueryPluginConfig? {
         return PluginApi(pluginAuthority, context.contentResolver).getSearchPluginConfig()
     }
 
-    suspend fun getFile(id: String): File? {
-        val uri = Uri.Builder()
-            .scheme("content")
-            .authority(pluginAuthority)
-            .path(SearchPluginContract.Paths.Root)
-            .appendPath(id)
-            .build()
-        val cancellationSignal = CancellationSignal()
-
-        return suspendCancellableCoroutine {
-            it.invokeOnCancellation {
-                cancellationSignal.cancel()
-            }
-            val cursor = context.contentResolver.query(
-                uri,
-                null,
-                null,
-                cancellationSignal
-            ) ?: return@suspendCancellableCoroutine it.resume(null)
-
-            val results = fromCursor(cursor)
-            it.resume(results?.firstOrNull())
-        }
-    }
-
-    private fun fromCursor(cursor: Cursor): List<File>? {
+    override fun Cursor.getData(): List<PluginFile>? {
         val config = getPluginConfig()
+        val cursor = this
 
         if (config == null) {
             Log.e("MM20", "Plugin ${pluginAuthority} returned null config")
@@ -104,119 +39,99 @@ class PluginFileProvider(
             return null
         }
 
-        val idIndex = cursor
-            .getColumnIndex(FilePluginContract.FileColumns.Id)
-            .takeIf { it >= 0 }
-            ?: return null
-        val pathIndex =
-            cursor.getColumnIndex(FilePluginContract.FileColumns.Path).takeIf { it >= 0 }
-        val typeIndex =
-            cursor.getColumnIndex(FilePluginContract.FileColumns.MimeType).takeIf { it >= 0 }
-        val sizeIndex =
-            cursor.getColumnIndex(FilePluginContract.FileColumns.Size).takeIf { it >= 0 }
-        val nameIndex = cursor.getColumnIndex(FilePluginContract.FileColumns.DisplayName)
-            .takeIf { it >= 0 }
-            ?: return null
-        val contentUriIndex = cursor.getColumnIndex(FilePluginContract.FileColumns.ContentUri)
-            .takeIf { it >= 0 }
-            ?: return null
-        val thumbnailUriIndex =
-            cursor.getColumnIndex(FilePluginContract.FileColumns.ThumbnailUri)
-                .takeIf { it >= 0 }
-        val directoryIndex =
-            cursor.getColumnIndex(FilePluginContract.FileColumns.IsDirectory).takeIf { it >= 0 }
-
-        val ownerIndex =
-            cursor.getColumnIndex(FilePluginContract.FileColumns.Owner).takeIf { it >= 0 }
-
-        val metaTitleIndex =
-            cursor.getColumnIndex(FilePluginContract.FileColumns.MetaTitle).takeIf { it >= 0 }
-
-        val metaArtistIndex =
-            cursor.getColumnIndex(FilePluginContract.FileColumns.MetaArtist).takeIf { it >= 0 }
-
-        val metaAlbumIndex =
-            cursor.getColumnIndex(FilePluginContract.FileColumns.MetaAlbum).takeIf { it >= 0 }
-
-        val metaDurationIndex =
-            cursor.getColumnIndex(FilePluginContract.FileColumns.MetaDuration).takeIf { it >= 0 }
-
-        val metaYearIndex =
-            cursor.getColumnIndex(FilePluginContract.FileColumns.MetaYear).takeIf { it >= 0 }
-
-        val metaWidthIndex =
-            cursor.getColumnIndex(FilePluginContract.FileColumns.MetaWidth).takeIf { it >= 0 }
-
-        val metaHeightIndex =
-            cursor.getColumnIndex(FilePluginContract.FileColumns.MetaHeight).takeIf { it >= 0 }
-
-        val metaLocationIndex =
-            cursor.getColumnIndex(FilePluginContract.FileColumns.MetaLocation).takeIf { it >= 0 }
-
-        val metaAppNameIndex =
-            cursor.getColumnIndex(FilePluginContract.FileColumns.MetaAppName).takeIf { it >= 0 }
-
-        val metaAppPackageNameIndex =
-            cursor.getColumnIndex(FilePluginContract.FileColumns.MetaAppPackageName)
-                .takeIf { it >= 0 }
-
-        val results = mutableListOf<File>()
-        while (cursor.moveToNext()) {
-            results.add(
-                PluginFile(
-                    id = cursor.getString(idIndex),
-                    path = pathIndex?.let { cursor.getString(it) } ?: "",
-                    mimeType = typeIndex?.let { cursor.getString(it) }
-                        ?: "application/octet-stream",
-                    size = sizeIndex?.let { cursor.getLong(it) } ?: 0,
-                    metaData = buildMap {
-                        metaTitleIndex?.let { cursor.getStringOrNull(it) }?.let {
-                            put(FileMetaType.Title, it)
-                        }
-                        metaArtistIndex?.let { cursor.getStringOrNull(it) }?.let {
-                            put(FileMetaType.Artist, it)
-                        }
-                        metaAlbumIndex?.let { cursor.getStringOrNull(it) }?.let {
-                            put(FileMetaType.Album, it)
-                        }
-                        metaDurationIndex?.let { cursor.getLongOrNull(it) }?.let {
-                            put(FileMetaType.Duration, DateUtils.formatElapsedTime(it / 1000L))
-                        }
-                        metaYearIndex?.let { cursor.getIntOrNull(it) }?.let {
-                            put(FileMetaType.Year, it.toString())
-                        }
-                        if (metaWidthIndex != null && metaHeightIndex != null) {
-                            val width = cursor.getIntOrNull(metaWidthIndex)
-                            val height = cursor.getIntOrNull(metaHeightIndex)
+        val results = mutableListOf<PluginFile>()
+        val timestamp = System.currentTimeMillis()
+        cursor.withColumns(FileColumns) {
+            while (cursor.moveToNext()) {
+                results.add(
+                    PluginFile(
+                        id = cursor[FileColumns.Id] ?: continue,
+                        path = cursor[FileColumns.Path] ?: "",
+                        mimeType = cursor[FileColumns.MimeType] ?: "application/octet-stream",
+                        size = cursor[FileColumns.Size] ?: 0L,
+                        metaData = buildMap {
+                            cursor[FileColumns.MetaTitle]?.let {
+                                put(FileMetaType.Title, it)
+                            }
+                            cursor[FileColumns.MetaArtist]?.let {
+                                put(FileMetaType.Artist, it)
+                            }
+                            cursor[FileColumns.MetaAlbum]?.let {
+                                put(FileMetaType.Album, it)
+                            }
+                            cursor[FileColumns.MetaDuration]?.let {
+                                put(FileMetaType.Duration, DateUtils.formatElapsedTime(it / 1000L))
+                            }
+                            cursor[FileColumns.MetaYear]?.let {
+                                put(FileMetaType.Year, it.toString())
+                            }
+                            val width = cursor[FileColumns.MetaWidth]
+                            val height = cursor[FileColumns.MetaHeight]
                             if (width != null && height != null) {
                                 put(FileMetaType.Dimensions, "${width}x${height}")
                             }
+                            cursor[FileColumns.MetaLocation]?.let {
+                                put(FileMetaType.Location, it)
+                            }
+                            cursor[FileColumns.MetaAppName]?.let {
+                                put(FileMetaType.AppName, it)
+                            }
+                            cursor[FileColumns.MetaAppPackageName]?.let {
+                                put(FileMetaType.AppPackageName, it)
+                            }
+                            cursor[FileColumns.Owner]?.let {
+                                put(FileMetaType.Owner, it)
+                            }
+                        }.toPersistentMap(),
+                        label = cursor[FileColumns.DisplayName] ?: continue,
+                        uri = cursor[FileColumns.DisplayName]?.let { Uri.parse(it) } ?: continue,
+                        thumbnailUri = cursor[FileColumns.ThumbnailUri]?.let { Uri.parse(it) },
+                        storageStrategy = config.storageStrategy,
+                        isDirectory = cursor[FileColumns.IsDirectory] ?: false,
+                        authority = pluginAuthority,
+                        timestamp = timestamp,
+                        updatedSelf = {
+                            if (it !is PluginFile) UpdateResult.TemporarilyUnavailable()
+                            else refresh(it, timestamp).asUpdateResult()
                         }
-                        metaLocationIndex?.let { cursor.getStringOrNull(it) }?.let {
-                            put(FileMetaType.Location, it)
-                        }
-                        metaAppNameIndex?.let { cursor.getStringOrNull(it) }?.let {
-                            put(FileMetaType.AppName, it)
-                        }
-                        metaAppPackageNameIndex?.let { cursor.getStringOrNull(it) }?.let {
-                            put(FileMetaType.AppPackageName, it)
-                        }
-                        ownerIndex?.let { cursor.getStringOrNull(it) }?.let {
-                            put(FileMetaType.Owner, it)
-                        }
-                    }.toPersistentMap(),
-                    label = cursor.getString(nameIndex),
-                    uri = Uri.parse(cursor.getString(contentUriIndex)),
-                    thumbnailUri = thumbnailUriIndex?.let {
-                        cursor.getStringOrNull(it)
-                    }?.let { Uri.parse(it) },
-                    storageStrategy = config.storageStrategy,
-                    isDirectory = directoryIndex?.let { cursor.getInt(it) } == 1,
-                    authority = pluginAuthority,
+                    )
                 )
-            )
+            }
         }
         cursor.close()
         return results
     }
+
+    override fun PluginFile.toBundle(): Bundle {
+        return Bundle().apply {
+            set(FileColumns.Id, id)
+            set(FileColumns.Path, path)
+            set(FileColumns.MimeType, mimeType)
+            set(FileColumns.Size, size)
+            set(FileColumns.MetaTitle, metaData[FileMetaType.Title])
+            set(FileColumns.MetaArtist, metaData[FileMetaType.Artist])
+            set(FileColumns.MetaAlbum, metaData[FileMetaType.Album])
+            set(FileColumns.MetaDuration, metaData[FileMetaType.Duration]?.toLong())
+            set(FileColumns.MetaYear, metaData[FileMetaType.Year]?.toInt())
+            set(
+                FileColumns.MetaWidth,
+                metaData[FileMetaType.Dimensions]?.split("x")?.getOrNull(0)?.toInt()
+            )
+            set(
+                FileColumns.MetaHeight,
+                metaData[FileMetaType.Dimensions]?.split("x")?.getOrNull(1)?.toInt()
+            )
+            set(FileColumns.MetaLocation, metaData[FileMetaType.Location])
+            set(FileColumns.MetaAppName, metaData[FileMetaType.AppName])
+            set(FileColumns.MetaAppPackageName, metaData[FileMetaType.AppPackageName])
+            set(FileColumns.Owner, metaData[FileMetaType.Owner])
+            set(FileColumns.DisplayName, label)
+            set(FileColumns.ThumbnailUri, thumbnailUri?.toString())
+            set(FileColumns.IsDirectory, isDirectory)
+        }
+    }
+
+    override fun Uri.Builder.appendQueryParameters(query: String): Uri.Builder = apply {
+        appendQueryParameter(SearchPluginContract.Params.Query, query)
+    }
 }
\ No newline at end of file
diff --git a/data/openstreetmaps/.gitignore b/data/locations/.gitignore
similarity index 100%
rename from data/openstreetmaps/.gitignore
rename to data/locations/.gitignore
diff --git a/data/openstreetmaps/build.gradle.kts b/data/locations/build.gradle.kts
similarity index 96%
rename from data/openstreetmaps/build.gradle.kts
rename to data/locations/build.gradle.kts
index ed53c3cc..9f475ebc 100644
--- a/data/openstreetmaps/build.gradle.kts
+++ b/data/locations/build.gradle.kts
@@ -56,4 +56,5 @@ dependencies {
     implementation(project(":core:permissions"))
     implementation(project(":core:crashreporter"))
     implementation(project(":core:devicepose"))
+    implementation(project(":libs:address-formatter"))
 }
\ No newline at end of file
diff --git a/data/locations/consumer-rules.pro b/data/locations/consumer-rules.pro
new file mode 100644
index 00000000..666a0e6b
--- /dev/null
+++ b/data/locations/consumer-rules.pro
@@ -0,0 +1,2 @@
+-keep class de.mm20.launcher2.locations.** { *; }
+-keep class kotlin.coroutines.Continuation
\ No newline at end of file
diff --git a/data/openstreetmaps/proguard-rules.pro b/data/locations/proguard-rules.pro
similarity index 100%
rename from data/openstreetmaps/proguard-rules.pro
rename to data/locations/proguard-rules.pro
diff --git a/data/openstreetmaps/src/main/AndroidManifest.xml b/data/locations/src/main/AndroidManifest.xml
similarity index 100%
rename from data/openstreetmaps/src/main/AndroidManifest.xml
rename to data/locations/src/main/AndroidManifest.xml
diff --git a/data/locations/src/main/java/de/mm20/launcher2/locations/LocationSerialization.kt b/data/locations/src/main/java/de/mm20/launcher2/locations/LocationSerialization.kt
new file mode 100644
index 00000000..f48714f5
--- /dev/null
+++ b/data/locations/src/main/java/de/mm20/launcher2/locations/LocationSerialization.kt
@@ -0,0 +1,198 @@
+package de.mm20.launcher2.locations
+
+import android.content.Context
+import android.util.Log
+import de.mm20.launcher2.locations.providers.PluginLocation
+import de.mm20.launcher2.locations.providers.PluginLocationProvider
+import de.mm20.launcher2.locations.providers.openstreetmaps.OsmLocation
+import de.mm20.launcher2.locations.providers.openstreetmaps.OsmLocationProvider
+import de.mm20.launcher2.plugin.PluginRepository
+import de.mm20.launcher2.plugin.config.StorageStrategy
+import de.mm20.launcher2.search.SavableSearchable
+import de.mm20.launcher2.search.SearchableDeserializer
+import de.mm20.launcher2.search.SearchableSerializer
+import de.mm20.launcher2.search.UpdateResult
+import de.mm20.launcher2.search.asUpdateResult
+import de.mm20.launcher2.search.location.Address
+import de.mm20.launcher2.search.location.Attribution
+import de.mm20.launcher2.search.location.Departure
+import de.mm20.launcher2.search.location.LocationIcon
+import de.mm20.launcher2.search.location.OpeningSchedule
+import de.mm20.launcher2.serialization.Json
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.encodeToString
+
+@Serializable
+internal data class SerializedLocation(
+    val id: String? = null,
+    val lat: Double? = null,
+    val lon: Double? = null,
+    val icon: LocationIcon? = null,
+    val category: String? = null,
+    val label: String? = null,
+    val address: Address? = null,
+    val websiteUrl: String? = null,
+    val phoneNumber: String? = null,
+    val emailAddress: String? = null,
+    val userRating: Float? = null,
+    val userRatingCount: Int? = null,
+    val openingSchedule: OpeningSchedule? = null,
+    val timestamp: Long? = null,
+    val departures: List<Departure>? = null,
+    val fixMeUrl: String? = null,
+    val attribution: Attribution? = null,
+    val authority: String? = null,
+    val storageStrategy: StorageStrategy? = null,
+)
+
+internal class OsmLocationSerializer : SearchableSerializer {
+    override fun serialize(searchable: SavableSearchable): String {
+        searchable as OsmLocation
+        return Json.Lenient.encodeToString(
+            SerializedLocation(
+                id = searchable.id.toString(),
+                lat = searchable.latitude,
+                lon = searchable.longitude,
+                icon = searchable.icon,
+                category = searchable.category,
+                label = searchable.label,
+                address = searchable.address,
+                websiteUrl = searchable.websiteUrl,
+                phoneNumber = searchable.phoneNumber,
+                emailAddress = searchable.emailAddress,
+                userRating = searchable.userRating,
+                userRatingCount = searchable.userRatingCount,
+                openingSchedule = searchable.openingSchedule,
+                timestamp = searchable.timestamp,
+                departures = searchable.departures,
+                fixMeUrl = searchable.fixMeUrl,
+            )
+        )
+    }
+
+    override val typePrefix: String
+        get() = "osmlocation"
+}
+
+internal class OsmLocationDeserializer(
+    private val osmProvider: OsmLocationProvider,
+) : SearchableDeserializer {
+    override suspend fun deserialize(serialized: String): SavableSearchable? {
+        val json = Json.Lenient.decodeFromString<SerializedLocation>(serialized)
+        val id = json.id?.toLongOrNull() ?: return null
+
+        return OsmLocation(
+            id = id,
+            latitude = json.lat ?: return null,
+            longitude = json.lon ?: return null,
+            icon = json.icon,
+            category = json.category,
+            label = json.label ?: return null,
+            address = json.address,
+            websiteUrl = json.websiteUrl,
+            phoneNumber = json.phoneNumber,
+            emailAddress = json.emailAddress,
+            userRating = json.userRating,
+            openingSchedule = json.openingSchedule,
+            timestamp = json.timestamp ?: return null,
+            updatedSelf = {
+                osmProvider.update(id)
+            }
+        )
+    }
+}
+
+internal class PluginLocationSerializer : SearchableSerializer {
+    override fun serialize(searchable: SavableSearchable): String {
+        searchable as PluginLocation
+        return when (searchable.storageStrategy) {
+            StorageStrategy.StoreReference -> Json.Lenient.encodeToString(
+                SerializedLocation(
+                    id = searchable.id,
+                    authority = searchable.authority,
+                    storageStrategy = StorageStrategy.StoreReference,
+                )
+            )
+
+            else -> {
+                Json.Lenient.encodeToString(
+                    SerializedLocation(
+                        id = searchable.id,
+                        lat = searchable.latitude,
+                        lon = searchable.longitude,
+                        icon = searchable.icon,
+                        category = searchable.category,
+                        label = searchable.label,
+                        address = searchable.address,
+                        websiteUrl = searchable.websiteUrl,
+                        phoneNumber = searchable.phoneNumber,
+                        emailAddress = searchable.emailAddress,
+                        userRating = searchable.userRating,
+                        userRatingCount = searchable.userRatingCount,
+                        attribution = searchable.attribution,
+                        openingSchedule = searchable.openingSchedule,
+                        timestamp = searchable.timestamp,
+                        departures = searchable.departures,
+                        fixMeUrl = searchable.fixMeUrl,
+                        authority = searchable.authority,
+                        storageStrategy = searchable.storageStrategy,
+                    )
+                )
+            }
+        }
+    }
+
+    override val typePrefix: String
+        get() = PluginLocation.DOMAIN
+}
+
+internal class PluginLocationDeserializer(
+    private val context: Context,
+    private val pluginRepository: PluginRepository,
+) : SearchableDeserializer {
+    override suspend fun deserialize(serialized: String): SavableSearchable? {
+        val json = Json.Lenient.decodeFromString<SerializedLocation>(serialized)
+        val authority = json.authority ?: return null
+        val id = json.id ?: return null
+        val strategy = json.storageStrategy ?: StorageStrategy.StoreCopy
+
+        val plugin = pluginRepository.get(authority).firstOrNull() ?: return null
+        if (!plugin.enabled) return null
+
+        return when (strategy) {
+            StorageStrategy.StoreReference -> {
+                PluginLocationProvider(context, authority).get(id).getOrNull()
+            }
+
+            else -> {
+                val timestamp = json.timestamp ?: 0
+                PluginLocation(
+                    id = id,
+                    latitude = json.lat ?: return null,
+                    longitude = json.lon ?: return null,
+                    icon = json.icon,
+                    category = json.category,
+                    label = json.label ?: return null,
+                    address = json.address,
+                    websiteUrl = json.websiteUrl,
+                    phoneNumber = json.phoneNumber,
+                    emailAddress = json.emailAddress,
+                    userRating = json.userRating,
+                    userRatingCount = json.userRatingCount,
+                    openingSchedule = json.openingSchedule,
+                    timestamp = timestamp,
+                    departures = json.departures,
+                    fixMeUrl = json.fixMeUrl,
+                    attribution = json.attribution,
+                    authority = authority,
+                    storageStrategy = strategy,
+                    updatedSelf = {
+                        if (it !is PluginLocation) UpdateResult.TemporarilyUnavailable()
+                        else PluginLocationProvider(context, authority).refresh(it, timestamp).asUpdateResult()
+                    }
+                )
+            }
+        }
+    }
+}
diff --git a/data/locations/src/main/java/de/mm20/launcher2/locations/LocationsRepository.kt b/data/locations/src/main/java/de/mm20/launcher2/locations/LocationsRepository.kt
new file mode 100644
index 00000000..9838c96c
--- /dev/null
+++ b/data/locations/src/main/java/de/mm20/launcher2/locations/LocationsRepository.kt
@@ -0,0 +1,86 @@
+package de.mm20.launcher2.locations
+
+import android.content.Context
+import de.mm20.launcher2.devicepose.DevicePoseProvider
+import de.mm20.launcher2.locations.providers.PluginLocationProvider
+import de.mm20.launcher2.locations.providers.openstreetmaps.OsmLocationProvider
+import de.mm20.launcher2.permissions.PermissionGroup
+import de.mm20.launcher2.permissions.PermissionsManager
+import de.mm20.launcher2.preferences.search.LocationSearchSettings
+import de.mm20.launcher2.search.Location
+import de.mm20.launcher2.search.SearchableRepository
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.collections.immutable.toPersistentList
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.combineTransform
+import kotlinx.coroutines.flow.coroutineContext
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.newCoroutineContext
+import kotlinx.coroutines.supervisorScope
+
+internal class LocationsRepository(
+    private val context: Context,
+    private val settings: LocationSearchSettings,
+    private val poseProvider: DevicePoseProvider,
+    private val permissionsManager: PermissionsManager,
+) : SearchableRepository<Location> {
+
+    override fun search(
+        query: String,
+        allowNetwork: Boolean
+    ): Flow<ImmutableList<Location>> {
+        if (query.isBlank()) {
+            return flowOf(persistentListOf())
+        }
+
+        val hasPermission = permissionsManager.hasPermission(PermissionGroup.Location)
+
+        return combineTransform(settings.data, hasPermission) { settingsData, permission ->
+            emit(persistentListOf())
+            if (!permission || settingsData.providers.isEmpty()) {
+                return@combineTransform
+            }
+
+            val userLocation = poseProvider.getLocation().firstOrNull()
+                ?: poseProvider.lastLocation
+                ?: return@combineTransform
+
+            val providers = settingsData.providers.map {
+                when (it) {
+                    "openstreetmaps" -> OsmLocationProvider(context, settings)
+                    else -> PluginLocationProvider(context, it)
+                }
+            }
+
+            supervisorScope {
+                val result = MutableStateFlow(persistentListOf<Location>())
+
+                for (provider in providers) {
+                    launch {
+                        val r = provider.search(
+                            query,
+                            userLocation,
+                            allowNetwork,
+                            settingsData.searchRadius,
+                            settingsData.hideUncategorized
+                        )
+                        result.update {
+                            (it + r).toPersistentList()
+                        }
+                    }
+                }
+                emitAll(result)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/locations/src/main/java/de/mm20/launcher2/locations/Module.kt b/data/locations/src/main/java/de/mm20/launcher2/locations/Module.kt
new file mode 100644
index 00000000..2c67d857
--- /dev/null
+++ b/data/locations/src/main/java/de/mm20/launcher2/locations/Module.kt
@@ -0,0 +1,19 @@
+package de.mm20.launcher2.locations
+
+import de.mm20.launcher2.locations.providers.PluginLocation
+import de.mm20.launcher2.locations.providers.openstreetmaps.OsmLocation
+import de.mm20.launcher2.locations.providers.openstreetmaps.OsmLocationProvider
+import de.mm20.launcher2.search.Location
+import de.mm20.launcher2.search.SearchableDeserializer
+import de.mm20.launcher2.search.SearchableRepository
+import org.koin.android.ext.koin.androidContext
+import org.koin.core.qualifier.named
+import org.koin.dsl.module
+
+val locationsModule = module {
+    single<OsmLocationProvider> { OsmLocationProvider(androidContext(), get()) }
+    single<LocationsRepository> { LocationsRepository(androidContext(), get(), get(), get()) }
+    factory<SearchableRepository<Location>>(named<Location>()) { get<LocationsRepository>() }
+    factory<SearchableDeserializer>(named(OsmLocation.DOMAIN)) { OsmLocationDeserializer(get()) }
+    factory<SearchableDeserializer>(named(PluginLocation.DOMAIN)) { PluginLocationDeserializer(androidContext(), get()) }
+}
\ No newline at end of file
diff --git a/data/locations/src/main/java/de/mm20/launcher2/locations/providers/LocationProvider.kt b/data/locations/src/main/java/de/mm20/launcher2/locations/providers/LocationProvider.kt
new file mode 100644
index 00000000..99d17313
--- /dev/null
+++ b/data/locations/src/main/java/de/mm20/launcher2/locations/providers/LocationProvider.kt
@@ -0,0 +1,16 @@
+package de.mm20.launcher2.locations.providers
+
+import de.mm20.launcher2.search.Location
+import de.mm20.launcher2.search.UpdateResult
+
+internal typealias AndroidLocation = android.location.Location
+
+internal interface LocationProvider<TId> {
+    suspend fun search(
+        query: String,
+        userLocation: AndroidLocation,
+        allowNetwork: Boolean,
+        searchRadiusMeters: Int,
+        hideUncategorized: Boolean
+    ): List<Location>
+}
\ No newline at end of file
diff --git a/data/locations/src/main/java/de/mm20/launcher2/locations/providers/PluginLocation.kt b/data/locations/src/main/java/de/mm20/launcher2/locations/providers/PluginLocation.kt
new file mode 100644
index 00000000..fda09d4b
--- /dev/null
+++ b/data/locations/src/main/java/de/mm20/launcher2/locations/providers/PluginLocation.kt
@@ -0,0 +1,66 @@
+package de.mm20.launcher2.locations.providers
+
+import android.content.Context
+import android.graphics.drawable.Drawable
+import de.mm20.launcher2.locations.PluginLocationSerializer
+import de.mm20.launcher2.plugin.config.StorageStrategy
+import de.mm20.launcher2.search.Location
+import de.mm20.launcher2.search.SavableSearchable
+import de.mm20.launcher2.search.SearchableSerializer
+import de.mm20.launcher2.search.UpdatableSearchable
+import de.mm20.launcher2.search.UpdateResult
+import de.mm20.launcher2.search.location.Address
+import de.mm20.launcher2.search.location.Attribution
+import de.mm20.launcher2.search.location.Departure
+import de.mm20.launcher2.search.location.LocationIcon
+import de.mm20.launcher2.search.location.OpeningSchedule
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+data class PluginLocation(
+    override val latitude: Double,
+    override val longitude: Double,
+    override val fixMeUrl: String?,
+    override val icon: LocationIcon?,
+    override val category: String?,
+    override val address: Address?,
+    override val openingSchedule: OpeningSchedule?,
+    override val websiteUrl: String?,
+    override val phoneNumber: String?,
+    override val emailAddress: String?,
+    override val userRating: Float?,
+    override val userRatingCount: Int?,
+    override val departures: List<Departure>?,
+    override val label: String,
+    override val timestamp: Long,
+    override val attribution: Attribution?,
+    override val updatedSelf: (suspend (SavableSearchable) -> UpdateResult<Location>)?,
+    override val labelOverride: String? = null,
+    val authority: String,
+    val id: String,
+    val storageStrategy: StorageStrategy,
+) : Location, UpdatableSearchable<Location> {
+    override val key: String
+        get() = "$domain://$authority:$id"
+
+    override fun overrideLabel(label: String): PluginLocation {
+        return this.copy(labelOverride = label)
+    }
+
+    override val domain: String = DOMAIN
+
+    override fun getSerializer(): SearchableSerializer {
+        return PluginLocationSerializer()
+    }
+
+    override suspend fun getProviderIcon(context: Context): Drawable? {
+        return withContext(Dispatchers.IO) {
+            context.packageManager.resolveContentProvider(authority, 0)
+                ?.loadIcon(context.packageManager)
+        }
+    }
+
+    companion object {
+        const val DOMAIN = "plugin.location"
+    }
+}
\ No newline at end of file
diff --git a/data/locations/src/main/java/de/mm20/launcher2/locations/providers/PluginLocationProvider.kt b/data/locations/src/main/java/de/mm20/launcher2/locations/providers/PluginLocationProvider.kt
new file mode 100644
index 00000000..2c0734a9
--- /dev/null
+++ b/data/locations/src/main/java/de/mm20/launcher2/locations/providers/PluginLocationProvider.kt
@@ -0,0 +1,121 @@
+package de.mm20.launcher2.locations.providers
+
+import android.content.Context
+import android.database.Cursor
+import android.net.Uri
+import android.os.Bundle
+import android.util.Log
+import de.mm20.launcher2.plugin.QueryPluginApi
+import de.mm20.launcher2.plugin.contracts.LocationPluginContract
+import de.mm20.launcher2.plugin.contracts.LocationPluginContract.LocationColumns
+import de.mm20.launcher2.plugin.contracts.SearchPluginContract
+import de.mm20.launcher2.plugin.data.set
+import de.mm20.launcher2.plugin.data.withColumns
+import de.mm20.launcher2.search.Location
+import de.mm20.launcher2.search.UpdateResult
+import de.mm20.launcher2.search.asUpdateResult
+
+internal class PluginLocationProvider(
+    context: Context,
+    private val pluginAuthority: String
+) : QueryPluginApi<Triple<String, AndroidLocation, Int>, PluginLocation>(
+    context,
+    pluginAuthority
+), LocationProvider<String> {
+
+    override suspend fun search(
+        query: String,
+        userLocation: AndroidLocation,
+        allowNetwork: Boolean,
+        searchRadiusMeters: Int,
+        hideUncategorized: Boolean
+    ): List<Location> {
+        return search(
+            query = Triple(query, userLocation, searchRadiusMeters),
+            allowNetwork = allowNetwork,
+        )
+    }
+
+    override fun Uri.Builder.appendQueryParameters(query: Triple<String, AndroidLocation, Int>): Uri.Builder {
+        return apply {
+            appendQueryParameter(SearchPluginContract.Params.Query, query.first)
+            appendQueryParameter(
+                LocationPluginContract.Params.UserLatitude,
+                query.second.latitude.toString()
+            )
+            appendQueryParameter(
+                LocationPluginContract.Params.UserLongitude,
+                query.second.longitude.toString()
+            )
+            appendQueryParameter(LocationPluginContract.Params.SearchRadius, query.third.toString())
+        }
+    }
+
+    override fun Cursor.getData(): List<PluginLocation>? {
+        val config = getConfig()
+        val cursor = this
+
+        if (config == null) {
+            Log.e("MM20", "Plugin ${pluginAuthority} returned null config")
+            cursor.close()
+            return null
+        }
+
+        val results = mutableListOf<PluginLocation>()
+        val timestamp = System.currentTimeMillis()
+        cursor.withColumns(LocationColumns) {
+            while (cursor.moveToNext()) {
+                val id = cursor[LocationColumns.Id] ?: continue
+                results.add(
+                    PluginLocation(
+                        id = id,
+                        label = cursor[LocationColumns.Label] ?: continue,
+                        latitude = cursor[LocationColumns.Latitude] ?: continue,
+                        longitude = cursor[LocationColumns.Longitude] ?: continue,
+                        fixMeUrl = cursor[LocationColumns.FixMeUrl],
+                        icon = cursor[LocationColumns.Icon],
+                        category = cursor[LocationColumns.Category],
+                        address = cursor[LocationColumns.Address],
+                        openingSchedule = cursor[LocationColumns.OpeningSchedule],
+                        websiteUrl = cursor[LocationColumns.WebsiteUrl],
+                        phoneNumber = cursor[LocationColumns.PhoneNumber],
+                        emailAddress = cursor[LocationColumns.EmailAddress],
+                        userRating = cursor[LocationColumns.UserRating],
+                        userRatingCount = cursor[LocationColumns.UserRatingCount],
+                        departures = cursor[LocationColumns.Departures],
+                        attribution = cursor[LocationColumns.Attribution],
+                        authority = pluginAuthority,
+                        updatedSelf = {
+                            if (it !is PluginLocation) UpdateResult.TemporarilyUnavailable()
+                            else refresh(it, timestamp).asUpdateResult()
+                        },
+                        timestamp = timestamp,
+                        storageStrategy = config.storageStrategy,
+                    )
+                )
+            }
+        }
+        return results
+    }
+
+    override fun PluginLocation.toBundle(): Bundle {
+        return Bundle().apply {
+            set(LocationColumns.Id, id)
+            set(LocationColumns.Label, label)
+            set(LocationColumns.Latitude, latitude)
+            set(LocationColumns.Longitude, longitude)
+            set(LocationColumns.FixMeUrl, fixMeUrl)
+            set(LocationColumns.Icon, icon)
+            set(LocationColumns.Category, category)
+            set(LocationColumns.Address, address)
+            set(LocationColumns.OpeningSchedule, openingSchedule)
+            set(LocationColumns.WebsiteUrl, websiteUrl)
+            set(LocationColumns.PhoneNumber, phoneNumber)
+            set(LocationColumns.EmailAddress, emailAddress)
+            set(LocationColumns.UserRating, userRating)
+            set(LocationColumns.UserRatingCount, userRatingCount)
+            set(LocationColumns.Departures, departures)
+            set(LocationColumns.Attribution, attribution)
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/locations/src/main/java/de/mm20/launcher2/locations/providers/openstreetmaps/OsmLocation.kt b/data/locations/src/main/java/de/mm20/launcher2/locations/providers/openstreetmaps/OsmLocation.kt
new file mode 100644
index 00000000..63720092
--- /dev/null
+++ b/data/locations/src/main/java/de/mm20/launcher2/locations/providers/openstreetmaps/OsmLocation.kt
@@ -0,0 +1,495 @@
+package de.mm20.launcher2.locations.providers.openstreetmaps
+
+import android.content.Context
+import android.util.Log
+import de.mm20.launcher2.locations.OsmLocationSerializer
+import de.mm20.launcher2.openstreetmaps.R
+import de.mm20.launcher2.search.Location
+import de.mm20.launcher2.search.SavableSearchable
+import de.mm20.launcher2.search.SearchableSerializer
+import de.mm20.launcher2.search.UpdatableSearchable
+import de.mm20.launcher2.search.UpdateResult
+import de.mm20.launcher2.search.location.Address
+import de.mm20.launcher2.search.location.Departure
+import de.mm20.launcher2.search.location.LocationIcon
+import de.mm20.launcher2.search.location.OpeningHours
+import de.mm20.launcher2.search.location.OpeningSchedule
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.put
+import org.woheller69.AndroidAddressFormatter.OsmAddressFormatter
+import java.time.DayOfWeek
+import java.time.Duration
+import java.time.LocalTime
+import java.time.format.DateTimeFormatter
+import java.time.format.DateTimeParseException
+import java.time.format.ResolverStyle
+import java.util.Locale
+import kotlin.math.min
+
+internal data class OsmLocation(
+    internal val id: Long,
+    override val label: String,
+    override val icon: LocationIcon?,
+    override val category: String?,
+    override val latitude: Double,
+    override val longitude: Double,
+    override val address: Address?,
+    override val openingSchedule: OpeningSchedule?,
+    override val websiteUrl: String?,
+    override val phoneNumber: String?,
+    override val emailAddress: String? = null,
+    override val labelOverride: String? = null,
+    override val timestamp: Long,
+    override var updatedSelf: (suspend (SavableSearchable) -> UpdateResult<Location>)? = null,
+    override val userRating: Float?
+) : Location, UpdatableSearchable<Location> {
+
+    override val domain: String
+        get() = DOMAIN
+    override val key: String = "$domain://$id"
+    override val fixMeUrl: String
+        get() = FIXMEURL
+
+    override val userRatingCount: Int? = null
+    override val departures: List<Departure>? = null
+
+    override fun overrideLabel(label: String): OsmLocation {
+        return this.copy(labelOverride = label)
+    }
+
+    override fun getSerializer(): SearchableSerializer {
+        return OsmLocationSerializer()
+    }
+
+    companion object {
+
+        internal const val DOMAIN = "osm"
+        internal const val FIXMEURL = "https://www.openstreetmap.org/fixthemap"
+
+        internal val addressFormatter =
+            OsmAddressFormatter(
+                false,
+                false,
+                false
+            )
+
+        fun fromOverpassResponse(
+            result: OverpassResponse,
+            context: Context
+        ): List<OsmLocation> = result.elements.mapNotNull {
+            it.tags ?: return@mapNotNull null
+            val (category, icon) = it.tags.categorize(context)
+            icon ?: return@mapNotNull null
+            OsmLocation(
+                id = it.id,
+                label = it.tags["name"] ?: it.tags["brand"] ?: return@mapNotNull null,
+                icon = icon,
+                category = category,
+                latitude = it.lat ?: it.center?.lat ?: return@mapNotNull null,
+                longitude = it.lon ?: it.center?.lon ?: return@mapNotNull null,
+                address = it.tags.toAddress(),
+                openingSchedule = it.tags["opening_hours"]?.let { ot -> parseOpeningSchedule(ot) },
+                websiteUrl = it.tags["website"] ?: it.tags["contact:website"],
+                phoneNumber = it.tags["phone"] ?: it.tags["contact:phone"],
+                emailAddress = it.tags["email"] ?: it.tags["contact:email"],
+                timestamp = System.currentTimeMillis(),
+                userRating = it.tags["stars"]?.runCatching { this.toInt() }?.getOrNull()
+                    ?.let { min(it, 5) / 5.0f }
+            )
+        }
+    }
+}
+
+private fun Map<String, String>.firstOfAlso(vararg strs: String, also: (String) -> Unit): String? {
+    for (str in strs) {
+        if (str in this) {
+            also(str)
+            return this[str]
+        }
+    }
+    return null
+}
+
+private fun Map<String, String>.toAddress(): Address? {
+    val formatAddrKeys = this.keys.filter { it.contains("addr") }.toMutableSet()
+    if (formatAddrKeys.isEmpty()) return null
+
+    val addr = Address(
+        city = firstOfAlso("addr:city", "addr:suburb", "addr:hamlet") { formatAddrKeys.remove(it) },
+        state = firstOfAlso("addr:state", "addr:province") { formatAddrKeys.remove(it) },
+        postalCode = firstOfAlso("addr:postcode") { formatAddrKeys.remove(it) },
+        country = firstOfAlso("addr:country") { formatAddrKeys.remove(it) },
+    )
+
+    val formattedRest = buildJsonObject {
+        formatAddrKeys.mapNotNull {
+            val (_, subkey) = it.split(':', limit = 2).takeIf { it.size == 2 }
+                ?: return@mapNotNull null
+            put(subkey, this@toAddress[it])
+        }
+    }.takeIf { it.isNotEmpty() }?.toString()?.runCatching {
+        OsmLocation.addressFormatter.format(
+            this,
+            this@toAddress["addr:country"] ?: Locale.getDefault().country
+        )
+    }?.getOrNull() ?: return addr
+
+    val lines = formattedRest.lines().filter { it.isNotBlank() }
+    return addr.copy(
+        address = lines.getOrNull(0),
+        address2 = lines.getOrNull(1),
+        address3 = lines.getOrNull(2),
+    )
+}
+
+private class MatchAnyReceiverScope<T, A, B> {
+    private val pairs = mutableMapOf<T, Pair<A, B>>()
+    operator fun get(key: T): Pair<A, B>? = pairs[key]
+    infix fun T.with(pair: Pair<A, B>) = pairs.put(this, pair)
+}
+
+private fun <A, B> Map<String, String>.matchAnyTag(
+    key: String,
+    block: MatchAnyReceiverScope<String, A, B>.() -> Unit
+): Pair<A, B>? {
+    val scope = MatchAnyReceiverScope<String, A, B>()
+    scope.block()
+    return this[key]?.split(' ', ',', '.', ';')?.map { it.trim() }
+        ?.firstNotNullOfOrNull { scope[it] }
+}
+
+private fun Map<String, String>.categorize(context: Context): Pair<String, LocationIcon?> {
+    val category = this.firstNotNullOfOrNull { (tag, value) ->
+        val values = value.split(' ', ',', '.', ';').map { it.trim() }.toSet()
+        when (tag.lowercase()) {
+
+            "shop" -> values.firstNotNullOfOrNull {
+                when (it) {
+                    "florist" -> R.string.poi_category_florist to LocationIcon.Florist
+                    "kiosk" -> R.string.poi_category_kiosk to LocationIcon.Kiosk
+                    "furniture" -> R.string.poi_category_furniture to LocationIcon.FurnitureStore
+                    "cell_phones", "mobile_phone" -> R.string.poi_category_mobile_phone to LocationIcon.CellPhoneStore
+                    "books" -> R.string.poi_category_books to LocationIcon.BookStore
+                    "clothes" -> R.string.poi_category_clothes to LocationIcon.ClothingStore
+                    "convenience" -> R.string.poi_category_convenience to LocationIcon.ConvenienceStore
+                    "discount" -> R.string.poi_category_discount_store to LocationIcon.DiscountStore
+                    "jewelry" -> R.string.poi_category_jewelry to LocationIcon.JewelryStore
+                    "alcohol" -> R.string.poi_category_alcohol to LocationIcon.LiquorStore
+                    "pet", "pet_grooming" -> R.string.poi_category_pet to LocationIcon.PetStore
+                    "mall", "shopping_centre", "department_store" -> R.string.poi_category_mall to LocationIcon.ShoppingMall
+                    "supermarket" -> R.string.poi_category_supermarket to LocationIcon.Supermarket
+                    "bakery" -> R.string.poi_category_bakery to LocationIcon.Bakery
+                    "optician" -> R.string.poi_category_optician to LocationIcon.Optician
+                    "hairdresser" -> R.string.poi_category_hairdresser to LocationIcon.HairSalon
+                    "laundry" -> R.string.poi_category_laundry to LocationIcon.Laundromat
+
+                    else -> R.string.poi_category_shopping to LocationIcon.Shopping
+                }
+            }
+
+            "amenity" -> values.firstNotNullOfOrNull {
+                when (it) {
+                    "place_of_worship" -> matchAnyTag<Int, LocationIcon>("religion") {
+                        "christian" with (R.string.poi_category_church to LocationIcon.Church)
+                        "muslim" with (R.string.poi_category_mosque to LocationIcon.Mosque)
+                        "buddhist" with (R.string.poi_category_buddhist_temple to LocationIcon.BuddhistTemple)
+                        "hindu" with (R.string.poi_category_hindu_temple to LocationIcon.HinduTemple)
+                        "jewish" with (R.string.poi_category_synagogue to LocationIcon.Synagogue)
+                    } ?: (R.string.poi_category_place_of_worship to LocationIcon.Candle)
+
+                    "fast_food" -> R.string.poi_category_fast_food to LocationIcon.FastFood
+                    "cafe" -> R.string.poi_category_cafe to LocationIcon.Cafe
+                    "ice_cream" -> R.string.poi_category_ice_cream to LocationIcon.IceCream
+                    "bar" -> R.string.poi_category_bar to LocationIcon.Bar
+                    "pub" -> R.string.poi_category_pub to LocationIcon.Pub
+                    "restaurant" -> matchAnyTag<Int, LocationIcon>("cuisine") {
+                        "pizza" with (R.string.poi_category_pizza_restaurant to LocationIcon.Pizza)
+                        "burger" with (R.string.poi_category_burger_restaurant to LocationIcon.Burger)
+                        "chinese" with (R.string.poi_category_chinese_restaurant to LocationIcon.Ramen)
+                        "ramen" with (R.string.poi_category_ramen_restaurant to LocationIcon.Ramen)
+                        "japanese" with (R.string.poi_category_japanese_restaurant to LocationIcon.JapaneseCuisine)
+                        "kebab" with (R.string.poi_category_kebab_restaurant to LocationIcon.Kebab)
+                        "asian" with (R.string.poi_category_asian_restaurant to LocationIcon.AsianCuisine)
+                        "soup" with (R.string.poi_category_soup_restaurant to LocationIcon.Soup)
+                        "coffee_shop" with (R.string.poi_category_cafe to LocationIcon.Cafe)
+                        "brunch" with (R.string.poi_category_brunch_restaurant to LocationIcon.Brunch)
+                        "breakfast" with (R.string.poi_category_breakfast_restaurant to LocationIcon.Breakfast)
+                    } ?: (R.string.poi_category_restaurant to LocationIcon.Restaurant)
+
+                    "fuel" -> R.string.poi_category_fuel to LocationIcon.GasStation
+                    "car_rental", "car_sharing" -> R.string.poi_category_car to LocationIcon.CarRental
+                    "car_wash" -> R.string.poi_category_car_wash to LocationIcon.CarWash
+                    "charging_station" -> R.string.poi_category_charging_station to LocationIcon.ChargingStation
+                    "parking", "parking_space", "motorcycle_parking" -> R.string.poi_category_parking to LocationIcon.Parking
+                    "motorcycle_rental" -> R.string.poi_category_motorcycle_rental to LocationIcon.Motorcycle
+
+                    "theatre" -> R.string.poi_category_theater to LocationIcon.Theater
+                    "cinema" -> R.string.poi_category_cinema to LocationIcon.MovieTheater
+                    "nightclub" -> R.string.poi_category_nightclub to LocationIcon.NightClub
+                    "concert_hall" -> R.string.poi_category_concert_hall to LocationIcon.ConcertHall
+                    "casino" -> R.string.poi_category_casino to LocationIcon.Casino
+
+                    "pharmacy" -> R.string.poi_category_pharmacy to LocationIcon.Pharmacy
+                    "bank" -> R.string.poi_category_bank to LocationIcon.Bank
+                    "atm" -> R.string.poi_category_atm to LocationIcon.Atm
+                    "doctors" -> R.string.poi_category_doctors to LocationIcon.Physician
+                    "dentist" -> R.string.poi_category_dentist to LocationIcon.Dentist
+                    "hospital" -> R.string.poi_category_hospital to LocationIcon.Hospital
+                    "clinic" -> R.string.poi_category_clinic to LocationIcon.Clinic
+
+                    "police" -> R.string.poi_category_police to LocationIcon.Police
+                    "fire_station" -> R.string.poi_category_fire_station to LocationIcon.FireDepartment
+                    "courthouse" -> R.string.poi_category_courthouse to LocationIcon.Courthouse
+                    "post_office" -> R.string.poi_category_post_office to LocationIcon.PostOffice
+                    "library" -> R.string.poi_category_library to LocationIcon.Library
+                    "school" -> R.string.poi_category_school to LocationIcon.School
+                    "university" -> R.string.poi_category_university to LocationIcon.University
+                    "toilets" -> R.string.poi_category_toilets to LocationIcon.PublicBathroom
+                    "townhall" -> R.string.poi_category_townhall to LocationIcon.GovernmentBuilding
+
+                    else -> null
+                }
+            }
+
+            "tourism" -> values.firstNotNullOfOrNull {
+                when (it) {
+                    "gallery" -> R.string.poi_category_gallery to LocationIcon.ArtGallery
+                    "museum" -> R.string.poi_category_museum to LocationIcon.Museum
+                    "theme_park" -> R.string.poi_category_amusement_park to LocationIcon.AmusementPark
+                    "hotel" -> R.string.poi_category_hotel to LocationIcon.Hotel
+                    else -> null
+                }
+            }
+
+            "leisure" -> values.firstNotNullOfOrNull {
+                when (it) {
+                    "stadium" -> R.string.poi_category_stadium to LocationIcon.Stadium
+                    "fitness_centre" -> R.string.poi_category_fitness_center to LocationIcon.FitnessCenter
+                    "swimming_pool" -> R.string.poi_category_swimming to LocationIcon.Swimming
+                    "pitch", "sports_centre" -> matchAnyTag<Int, LocationIcon>("sport") {
+                        "soccer" with (R.string.poi_category_soccer to LocationIcon.Soccer)
+                        "tennis" with (R.string.poi_category_tennis to LocationIcon.Tennis)
+                        "basketball" with (R.string.poi_category_basketball to LocationIcon.Basketball)
+                        "gymnastics" with (R.string.poi_category_gymnastics to LocationIcon.Gymnastics)
+                        "martial_arts" with (R.string.poi_category_martial_arts to LocationIcon.MartialArts)
+                        "golf" with (R.string.poi_category_golf to LocationIcon.Golf)
+                        "ice_hockey" with (R.string.poi_category_ice_hockey to LocationIcon.Hockey)
+                        "baseball" with (R.string.poi_category_baseball to LocationIcon.Baseball)
+                        "american_football" with (R.string.poi_category_american_football to LocationIcon.AmericanFootball)
+                        "handball" with (R.string.poi_category_handball to LocationIcon.Handball)
+                        "volleyball" with (R.string.poi_category_volleyball to LocationIcon.Volleyball)
+                        "skiing" with (R.string.poi_category_skiing to LocationIcon.Skiing)
+                        "cricket" with (R.string.poi_category_cricket to LocationIcon.Cricket)
+                    }
+
+                    "park" -> R.string.poi_category_park to LocationIcon.Park
+                    else -> null
+                }
+            }
+
+            "historic" -> values.firstNotNullOfOrNull {
+                when (it) {
+                    "monument" -> R.string.poi_category_monument to LocationIcon.Monument
+                    else -> null
+                }
+            }
+
+            "building" -> values.firstNotNullOfOrNull {
+                when (it) {
+                    "government" -> R.string.poi_category_government_building to LocationIcon.GovernmentBuilding
+                    else -> null
+                }
+            }
+
+            else -> null
+        }
+    }
+    val (rid, icon) = category ?: (R.string.poi_category_other to null)
+    return context.resources.getString(rid) to icon
+}
+
+// allow for 24:00 to be part of the same day
+// https://stackoverflow.com/a/31113244
+private val DATE_TIME_FORMATTER =
+    DateTimeFormatter.ISO_LOCAL_TIME.withResolverStyle(ResolverStyle.SMART)
+
+private val timeRegex by lazy {
+    Regex(
+        """^(?:\d{2}:\d{2}-?){2}$""",
+        RegexOption.IGNORE_CASE
+    )
+}
+private val singleDayRegex by lazy {
+    Regex(
+        """^[mtwfsp][ouehra]$""",
+        RegexOption.IGNORE_CASE
+    )
+}
+private val dayRangeRegex by lazy {
+    Regex(
+        """^[mtwfsp][ouehra]-[mtwfsp][ouehra]$""",
+        RegexOption.IGNORE_CASE
+    )
+}
+
+private val daysOfWeek = enumValues<DayOfWeek>().toList().toImmutableList()
+
+private val twentyFourSeven = daysOfWeek.map {
+    OpeningHours(
+        dayOfWeek = it,
+        startTime = LocalTime.MIDNIGHT,
+        duration = Duration.ofDays(1)
+    )
+}.toImmutableList()
+
+// If this is not sufficient, resort to implementing https://wiki.openstreetmap.org/wiki/Key:opening_hours/specification
+// or port https://github.com/opening-hours/opening_hours.js
+internal fun parseOpeningSchedule(it: String?): OpeningSchedule? {
+    if (it.isNullOrBlank()) return null
+
+    val openingHours = mutableListOf<OpeningHours>()
+
+    // e.g.
+    // "Mo-Sa 11:00-14:00, 17:00-23:00; Su 11:00-23:00"
+    // "Mo-Sa 11:00-21:00; PH,Su off"
+    // "Mo-Th 10:00-24:00, Fr,Sa 10:00-05:00, PH,Su 12:00-22:00"
+    var blocks =
+        it.split(',', ';', ' ').mapNotNull { if (it.isBlank()) null else it.trim() }
+
+    if (blocks.first() == "24/7")
+        return OpeningSchedule.TwentyFourSeven
+
+    fun dayOfWeekFromString(it: String): DayOfWeek? = when (it.lowercase()) {
+        "mo" -> DayOfWeek.MONDAY
+        "tu" -> DayOfWeek.TUESDAY
+        "we" -> DayOfWeek.WEDNESDAY
+        "th" -> DayOfWeek.THURSDAY
+        "fr" -> DayOfWeek.FRIDAY
+        "sa" -> DayOfWeek.SATURDAY
+        "su" -> DayOfWeek.SUNDAY
+        else -> null
+    }
+
+    var allDay = false
+    var everyDay = false
+
+    fun parseGroup(group: List<String>) {
+        if (group.isEmpty())
+            return
+
+        var times = group
+            .filter { timeRegex.matches(it) }
+            .mapNotNull {
+                try {
+                    val startTime =
+                        LocalTime.parse(it.substringBefore('-'), DATE_TIME_FORMATTER)
+                    val endTime =
+                        LocalTime.parse(it.substringAfter('-'), DATE_TIME_FORMATTER)
+
+                    var duration = Duration.between(startTime, endTime)
+
+                    if (duration.isNegative || duration.isZero)
+                        duration += Duration.ofDays(1)
+
+                    startTime to duration
+                } catch (dtpe: DateTimeParseException) {
+                    Log.e(
+                        "OpeningTimeFromOverpassElement",
+                        "Failed to parse opening time $it",
+                        dtpe
+                    )
+                    null
+                }
+            }
+
+        var days = group
+            .filter { dayRangeRegex.matches(it) }
+            .flatMap {
+                val dowStart = dayOfWeekFromString(it.substringBefore('-'))
+                    ?: return@flatMap emptyList()
+                val dowEnd = dayOfWeekFromString(it.substringAfter('-'))
+                    ?: return@flatMap emptyList()
+
+                if (dowStart.ordinal <= dowEnd.ordinal)
+                    daysOfWeek.subList(dowStart.ordinal, dowEnd.ordinal + 1)
+                else // "We-Mo"
+                    daysOfWeek.subList(dowStart.ordinal, daysOfWeek.size)
+                        .union(daysOfWeek.subList(0, dowEnd.ordinal + 1))
+            }.union(
+                group.filter { singleDayRegex.matches(it) }
+                    .mapNotNull { dayOfWeekFromString(it) }
+            )
+
+        // if no time specified, treat as "all day"
+        if (times.isEmpty()) {
+            allDay = true
+            times = listOf(LocalTime.MIDNIGHT to Duration.ofDays(1))
+        }
+
+        // if no day specified, treat as "every day"
+        if (days.isEmpty()) {
+            if (group.any { it.equals("PH", ignoreCase = true) }) {
+                times = emptyList()
+            } else {
+                everyDay = true
+                days = daysOfWeek.toSet()
+            }
+        }
+
+        openingHours.addAll(days.flatMap { day ->
+            times.map { (start, duration) ->
+                OpeningHours(
+                    dayOfWeek = day,
+                    startTime = start,
+                    duration = duration
+                )
+            }
+        })
+    }
+
+    while (true) {
+        if (blocks.isEmpty())
+            break
+
+        // assuming that there are blocks that only contain time
+        // treating them as "every day of the week"
+        if (blocks.size < 2) {
+            parseGroup(blocks)
+            break
+        }
+
+        val nextTimeIndex =
+            blocks.indexOfFirst { timeRegex.matches(it) }
+
+        // no time left, so probably no sensible information
+        // willingly skips "off" and "closed" as they are not useful
+        if (nextTimeIndex == -1)
+            break
+
+        // assuming next block to start with the first date coming after a time block
+        var nextGroupIndex =
+            blocks.subList(nextTimeIndex, blocks.size)
+                .indexOfFirst { !timeRegex.matches(it) }
+
+        // no day left, so we are done
+        if (nextGroupIndex == -1) {
+            parseGroup(blocks)
+            break
+        }
+
+        // convert index from sublist context
+        nextGroupIndex += nextTimeIndex
+
+        parseGroup(blocks.subList(0, nextGroupIndex))
+        blocks = blocks.subList(nextGroupIndex, blocks.size)
+    }
+
+    return if (allDay && everyDay) {
+        OpeningSchedule.TwentyFourSeven
+    } else {
+        OpeningSchedule.Hours(openingHours)
+    }
+}
+
+
diff --git a/data/locations/src/main/java/de/mm20/launcher2/locations/providers/openstreetmaps/OsmLocationProvider.kt b/data/locations/src/main/java/de/mm20/launcher2/locations/providers/openstreetmaps/OsmLocationProvider.kt
new file mode 100644
index 00000000..993370b4
--- /dev/null
+++ b/data/locations/src/main/java/de/mm20/launcher2/locations/providers/openstreetmaps/OsmLocationProvider.kt
@@ -0,0 +1,171 @@
+package de.mm20.launcher2.locations.providers.openstreetmaps
+
+import android.content.Context
+import android.util.Log
+import de.mm20.launcher2.crashreporter.CrashReporter
+import de.mm20.launcher2.locations.providers.AndroidLocation
+import de.mm20.launcher2.locations.providers.LocationProvider
+import de.mm20.launcher2.preferences.search.LocationSearchSettings
+import de.mm20.launcher2.search.Location
+import de.mm20.launcher2.search.UpdateResult
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.withContext
+import okhttp3.OkHttpClient
+import retrofit2.HttpException
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import java.net.UnknownHostException
+
+private val Scope = CoroutineScope(Job() + Dispatchers.IO)
+private val HttpClient = OkHttpClient()
+
+internal class OsmLocationProvider(
+    private val context: Context,
+    settings: LocationSearchSettings
+) : LocationProvider<Long> {
+
+    private val overpassApi = settings.overpassUrl.map {
+        try {
+            Retrofit.Builder()
+                .client(HttpClient)
+                .baseUrl(it.takeIf { it.isNotBlank() }
+                    ?: LocationSearchSettings.DefaultOverpassUrl)
+                .addConverterFactory(OverpassQueryConverterFactory())
+                .addConverterFactory(GsonConverterFactory.create())
+                .build()
+                .create(OverpassApi::class.java)
+        } catch (e: Exception) {
+            CrashReporter.logException(e)
+            null
+        }
+    }.stateIn(Scope, SharingStarted.Eagerly, null)
+
+
+    suspend fun update(
+        id: Long
+    ): UpdateResult<Location> = overpassApi.first()?.runCatching {
+        this.search(
+            OverpassIdQuery(
+                id = id
+            )
+        ).let {
+            OsmLocation.fromOverpassResponse(it, context)
+        }.first().apply {
+            updatedSelf = { update(id) }
+        }
+    }?.fold(
+        onSuccess = { UpdateResult.Success(it) },
+        onFailure = {
+            when (it) {
+                is CancellationException, is UnknownHostException -> {
+                    // network
+                    UpdateResult.TemporarilyUnavailable(it)
+                }
+
+                is HttpException -> when (it.code()) {
+                    in 400..499 -> UpdateResult.PermanentlyUnavailable(it)
+                    else -> UpdateResult.TemporarilyUnavailable(it)
+                }
+
+                is NoSuchElementException -> {
+                    // empty response
+                    UpdateResult.PermanentlyUnavailable(it)
+                }
+
+                else -> {
+                    if (it is Exception) {
+                        CrashReporter.logException(it)
+                    }
+                    UpdateResult.TemporarilyUnavailable(it)
+                }
+            }
+        }
+    ) ?: let {
+        Log.e("OsmProvider", "overpassApi was not initialized")
+        UpdateResult.TemporarilyUnavailable()
+    }
+
+    override suspend fun search(
+        query: String,
+        userLocation: AndroidLocation,
+        allowNetwork: Boolean,
+        searchRadiusMeters: Int,
+        hideUncategorized: Boolean,
+    ): List<Location> {
+        if (!allowNetwork || query.length < 2) {
+            return emptyList()
+        }
+
+        withContext(Dispatchers.IO) {
+            HttpClient.dispatcher.cancelAll()
+        }
+
+        suspend fun searchByTag(tag: String): OverpassResponse? =
+            overpassApi.first()?.runCatching {
+                this.search(
+                    OverpassFuzzyRadiusQuery(
+                        tag = tag,
+                        query = query,
+                        radius = searchRadiusMeters,
+                        latitude = userLocation.latitude,
+                        longitude = userLocation.longitude,
+                    )
+                )
+            }?.onFailure {
+                if (it !is HttpException && it !is CancellationException) {
+                    Log.e("OsmLocationProvider", "Failed to search for $tag: $query", it)
+                }
+            }?.getOrNull()
+
+        val result = awaitAll(
+            // optionally query by "amenity" or "shop" here
+            // if we want to make searching for locations fuzzier
+            // however, this would not account for localized queries like "Bäcker" (shop:bakery)
+            Scope.async { searchByTag("name") },
+            Scope.async { searchByTag("brand") },
+        ).flatMap {
+            it?.let {
+                OsmLocation.fromOverpassResponse(it, context)
+            } ?: emptyList()
+        }
+
+        return result
+            .asSequence()
+            .filter {
+                !hideUncategorized || (it.category != null)
+            }
+            .groupBy {
+                it.label.lowercase()
+            }
+            .flatMap { (_, duplicates) ->
+                // deduplicate results with same labels, if
+                // - same category
+                // - distance is less than 100m
+                if (duplicates.size < 2) duplicates
+                else {
+                    val luckyFirst = duplicates.first()
+                    duplicates
+                        .drop(1)
+                        .filter {
+                            it.category != luckyFirst.category ||
+                                    it.distanceTo(luckyFirst) > 100.0
+                        } + luckyFirst
+                }
+            }
+            .sortedBy {
+                it.distanceTo(userLocation)
+            }
+            .take(7)
+            .toImmutableList()
+    }
+}
diff --git a/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OverpassApi.kt b/data/locations/src/main/java/de/mm20/launcher2/locations/providers/openstreetmaps/OverpassApi.kt
similarity index 97%
rename from data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OverpassApi.kt
rename to data/locations/src/main/java/de/mm20/launcher2/locations/providers/openstreetmaps/OverpassApi.kt
index 12497b8c..8415156f 100644
--- a/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OverpassApi.kt
+++ b/data/locations/src/main/java/de/mm20/launcher2/locations/providers/openstreetmaps/OverpassApi.kt
@@ -1,4 +1,4 @@
-package de.mm20.launcher2.openstreetmaps
+package de.mm20.launcher2.locations.providers.openstreetmaps
 
 import okhttp3.RequestBody
 import okhttp3.RequestBody.Companion.toRequestBody
diff --git a/data/openstreetmaps/consumer-rules.pro b/data/openstreetmaps/consumer-rules.pro
deleted file mode 100644
index b2638ebb..00000000
--- a/data/openstreetmaps/consumer-rules.pro
+++ /dev/null
@@ -1,2 +0,0 @@
--keep class de.mm20.launcher2.openstreetmaps.** { *; }
--keep class kotlin.coroutines.Continuation
\ No newline at end of file
diff --git a/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/Module.kt b/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/Module.kt
deleted file mode 100644
index 5e6456d9..00000000
--- a/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/Module.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package de.mm20.launcher2.openstreetmaps
-
-import de.mm20.launcher2.search.Location
-import de.mm20.launcher2.search.SearchableDeserializer
-import de.mm20.launcher2.search.SearchableRepository
-import org.koin.core.qualifier.named
-import org.koin.dsl.module
-
-val openStreetMapsModule = module {
-    single<OsmRepository> { OsmRepository(get(), get(), get()) }
-    factory<SearchableRepository<Location>>(named<Location>()) { get<OsmRepository>() }
-    factory<SearchableDeserializer>(named(OsmLocation.DOMAIN)) { OsmLocationDeserializer(get()) }
-}
\ No newline at end of file
diff --git a/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OsmLocation.kt b/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OsmLocation.kt
deleted file mode 100644
index ed6fbc15..00000000
--- a/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OsmLocation.kt
+++ /dev/null
@@ -1,302 +0,0 @@
-package de.mm20.launcher2.openstreetmaps
-
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import android.net.Uri
-import android.util.Log
-import de.mm20.launcher2.ktx.orRunCatching
-import de.mm20.launcher2.ktx.tryStartActivity
-import de.mm20.launcher2.search.Location
-import de.mm20.launcher2.search.LocationCategory
-import de.mm20.launcher2.search.OpeningHours
-import de.mm20.launcher2.search.OpeningSchedule
-import de.mm20.launcher2.search.SearchableSerializer
-import de.mm20.launcher2.search.UpdateResult
-import de.mm20.launcher2.search.UpdatableSearchable
-import kotlinx.collections.immutable.toImmutableList
-import java.time.DayOfWeek
-import java.time.Duration
-import java.time.LocalTime
-import java.time.format.DateTimeFormatter
-import java.time.format.DateTimeParseException
-import java.time.format.ResolverStyle
-import java.util.Locale
-
-internal data class OsmLocation(
-    internal val id: Long,
-    override val label: String,
-    override val category: LocationCategory?,
-    override val latitude: Double,
-    override val longitude: Double,
-    override val street: String?,
-    override val houseNumber: String?,
-    override val openingSchedule: OpeningSchedule?,
-    override val websiteUrl: String?,
-    override val phoneNumber: String?,
-    override val labelOverride: String? = null,
-    override val timestamp: Long,
-    override var updatedSelf: (suspend () -> UpdateResult<Location>)? = null,
-) : Location, UpdatableSearchable<Location> {
-
-    override val domain: String
-        get() = DOMAIN
-    override val key: String = "$domain://$id"
-    override val fixMeUrl: String
-        get() = FIXMEURL
-
-    override fun overrideLabel(label: String): OsmLocation {
-        return this.copy(labelOverride = label)
-    }
-
-    override fun launch(context: Context, options: Bundle?): Boolean {
-        return context.tryStartActivity(
-            Intent(
-                Intent.ACTION_VIEW,
-                Uri.parse("geo:$latitude,$longitude?q=${Uri.encode(label)}")
-            ),
-            options
-        )
-    }
-
-    override fun getSerializer(): SearchableSerializer {
-        return OsmLocationSerializer()
-    }
-
-    companion object {
-
-        internal const val DOMAIN = "osm"
-        internal const val FIXMEURL = "https://www.openstreetmap.org/fixthemap"
-
-        private val categoryTags = setOf(
-            "amenity",
-            "shop",
-            "sport",   // "sport:soccer"
-            "railway", // "railway:stop"
-            "highway", // "highway:bus_stop"
-            "tourism", // "tourism:museum"
-            "leisure", // "leisure:fitness_center"
-        )
-
-        fun fromOverpassResponse(
-            result: OverpassResponse
-        ): List<OsmLocation> = result.elements.mapNotNull {
-            it.tags ?: return@mapNotNull null
-            OsmLocation(
-                id = it.id,
-                label = it.tags["name"] ?: it.tags["brand"] ?: return@mapNotNull null,
-                category = it.tags.firstNotNullOfOrNull { (tag, value) ->
-                    if (tag.lowercase() in categoryTags) {
-                        value
-                            .split(' ', ',', '.', ';') // in case there are multiple
-                            .firstNotNullOfOrNull { value ->
-                                runCatching {
-                                    LocationCategory.valueOf(value.uppercase(Locale.ROOT))
-                                }.orRunCatching {
-                                    LocationCategory.valueOf(
-                                        // e.g. "railway:stop" -> "RAILWAY_STOP"
-                                        "${tag}_${value}".uppercase(
-                                            Locale.ROOT
-                                        )
-                                    )
-                                }.getOrNull()
-                            }
-                    } else null
-                } ?: LocationCategory.OTHER,
-                latitude = it.lat ?: it.center?.lat ?: return@mapNotNull null,
-                longitude = it.lon ?: it.center?.lon ?: return@mapNotNull null,
-                street = it.tags["addr:street"],
-                houseNumber = it.tags["addr:housenumber"],
-                openingSchedule = it.tags["opening_hours"]?.let { ot -> parseOpeningSchedule(ot) },
-                websiteUrl = it.tags["website"] ?: it.tags["contact:website"],
-                phoneNumber = it.tags["phone"] ?: it.tags["contact:phone"],
-                timestamp = System.currentTimeMillis(),
-            )
-        }
-    }
-}
-
-// allow for 24:00 to be part of the same day
-// https://stackoverflow.com/a/31113244
-private val DATE_TIME_FORMATTER =
-    DateTimeFormatter.ISO_LOCAL_TIME.withResolverStyle(ResolverStyle.SMART)
-
-private val timeRegex by lazy {
-    Regex(
-        """^(?:\d{2}:\d{2}-?){2}$""",
-        RegexOption.IGNORE_CASE
-    )
-}
-private val singleDayRegex by lazy {
-    Regex(
-        """^[mtwfsp][ouehra]$""",
-        RegexOption.IGNORE_CASE
-    )
-}
-private val dayRangeRegex by lazy {
-    Regex(
-        """^[mtwfsp][ouehra]-[mtwfsp][ouehra]$""",
-        RegexOption.IGNORE_CASE
-    )
-}
-
-private val daysOfWeek = enumValues<DayOfWeek>().toList().toImmutableList()
-
-private val twentyFourSeven = daysOfWeek.map {
-    OpeningHours(
-        dayOfWeek = it,
-        startTime = LocalTime.MIDNIGHT,
-        duration = Duration.ofDays(1)
-    )
-}.toImmutableList()
-
-// If this is not sufficient, resort to implementing https://wiki.openstreetmap.org/wiki/Key:opening_hours/specification
-// or port https://github.com/opening-hours/opening_hours.js
-internal fun parseOpeningSchedule(it: String?): OpeningSchedule? {
-    if (it.isNullOrBlank()) return null
-
-    val openingHours = mutableListOf<OpeningHours>()
-
-    // e.g.
-    // "Mo-Sa 11:00-14:00, 17:00-23:00; Su 11:00-23:00"
-    // "Mo-Sa 11:00-21:00; PH,Su off"
-    // "Mo-Th 10:00-24:00, Fr,Sa 10:00-05:00, PH,Su 12:00-22:00"
-    var blocks =
-        it.split(',', ';', ' ').mapNotNull { if (it.isBlank()) null else it.trim() }
-
-    if (blocks.first() == "24/7")
-        return OpeningSchedule(
-            isTwentyFourSeven = true,
-            openingHours = twentyFourSeven
-        )
-
-    fun dayOfWeekFromString(it: String): DayOfWeek? = when (it.lowercase()) {
-        "mo" -> DayOfWeek.MONDAY
-        "tu" -> DayOfWeek.TUESDAY
-        "we" -> DayOfWeek.WEDNESDAY
-        "th" -> DayOfWeek.THURSDAY
-        "fr" -> DayOfWeek.FRIDAY
-        "sa" -> DayOfWeek.SATURDAY
-        "su" -> DayOfWeek.SUNDAY
-        else -> null
-    }
-
-    var allDay = false
-    var everyDay = false
-
-    fun parseGroup(group: List<String>) {
-        if (group.isEmpty())
-            return
-
-        var times = group
-            .filter { timeRegex.matches(it) }
-            .mapNotNull {
-                try {
-                    val startTime =
-                        LocalTime.parse(it.substringBefore('-'), DATE_TIME_FORMATTER)
-                    val endTime =
-                        LocalTime.parse(it.substringAfter('-'), DATE_TIME_FORMATTER)
-
-                    var duration = Duration.between(startTime, endTime)
-
-                    if (duration.isNegative || duration.isZero)
-                        duration += Duration.ofDays(1)
-
-                    startTime to duration
-                } catch (dtpe: DateTimeParseException) {
-                    Log.e(
-                        "OpeningTimeFromOverpassElement",
-                        "Failed to parse opening time $it",
-                        dtpe
-                    )
-                    null
-                }
-            }
-
-        var days = group
-            .filter { dayRangeRegex.matches(it) }
-            .flatMap {
-                val dowStart = dayOfWeekFromString(it.substringBefore('-'))
-                    ?: return@flatMap emptyList()
-                val dowEnd = dayOfWeekFromString(it.substringAfter('-'))
-                    ?: return@flatMap emptyList()
-
-                if (dowStart.ordinal <= dowEnd.ordinal)
-                    daysOfWeek.subList(dowStart.ordinal, dowEnd.ordinal + 1)
-                else // "We-Mo"
-                    daysOfWeek.subList(dowStart.ordinal, daysOfWeek.size)
-                        .union(daysOfWeek.subList(0, dowEnd.ordinal + 1))
-            }.union(
-                group.filter { singleDayRegex.matches(it) }
-                    .mapNotNull { dayOfWeekFromString(it) }
-            )
-
-        // if no time specified, treat as "all day"
-        if (times.isEmpty()) {
-            allDay = true
-            times = listOf(LocalTime.MIDNIGHT to Duration.ofDays(1))
-        }
-
-        // if no day specified, treat as "every day"
-        if (days.isEmpty()) {
-            if (group.any { it.equals("PH", ignoreCase = true) }) {
-                times = emptyList()
-            } else {
-                everyDay = true
-                days = daysOfWeek.toSet()
-            }
-        }
-
-        openingHours.addAll(days.flatMap { day ->
-            times.map { (start, duration) ->
-                OpeningHours(
-                    dayOfWeek = day,
-                    startTime = start,
-                    duration = duration
-                )
-            }
-        })
-    }
-
-    while (true) {
-        if (blocks.isEmpty())
-            break
-
-        // assuming that there are blocks that only contain time
-        // treating them as "every day of the week"
-        if (blocks.size < 2) {
-            parseGroup(blocks)
-            break
-        }
-
-        val nextTimeIndex =
-            blocks.indexOfFirst { timeRegex.matches(it) }
-
-        // no time left, so probably no sensible information
-        // willingly skips "off" and "closed" as they are not useful
-        if (nextTimeIndex == -1)
-            break
-
-        // assuming next block to start with the first date coming after a time block
-        var nextGroupIndex =
-            blocks.subList(nextTimeIndex, blocks.size)
-                .indexOfFirst { !timeRegex.matches(it) }
-
-        // no day left, so we are done
-        if (nextGroupIndex == -1) {
-            parseGroup(blocks)
-            break
-        }
-
-        // convert index from sublist context
-        nextGroupIndex += nextTimeIndex
-
-        parseGroup(blocks.subList(0, nextGroupIndex))
-        blocks = blocks.subList(nextGroupIndex, blocks.size)
-    }
-
-    return OpeningSchedule(
-        isTwentyFourSeven = allDay && everyDay,
-        openingHours.toImmutableList()
-    )
-}
diff --git a/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OsmRepository.kt b/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OsmRepository.kt
deleted file mode 100644
index 367614c9..00000000
--- a/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OsmRepository.kt
+++ /dev/null
@@ -1,195 +0,0 @@
-package de.mm20.launcher2.openstreetmaps
-
-import android.util.Log
-import de.mm20.launcher2.crashreporter.CrashReporter
-import de.mm20.launcher2.devicepose.DevicePoseProvider
-import de.mm20.launcher2.permissions.PermissionGroup
-import de.mm20.launcher2.permissions.PermissionsManager
-import de.mm20.launcher2.preferences.search.LocationSearchSettings
-import de.mm20.launcher2.search.Location
-import de.mm20.launcher2.search.LocationCategory
-import de.mm20.launcher2.search.SearchableRepository
-import de.mm20.launcher2.search.UpdateResult
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toImmutableList
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.channelFlow
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.withContext
-import okhttp3.OkHttpClient
-import retrofit2.HttpException
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
-import java.net.UnknownHostException
-
-internal class OsmRepository(
-    private val settings: LocationSearchSettings,
-    private val poseProvider: DevicePoseProvider,
-    permissionsManager: PermissionsManager,
-) : SearchableRepository<Location> {
-
-
-    private val scope = CoroutineScope(Job() + Dispatchers.Default)
-
-    private val httpClient = OkHttpClient()
-    private val overpassService = settings.overpassUrl.map {
-        try {
-            Retrofit.Builder()
-                .client(httpClient)
-                .baseUrl(it.takeIf { it.isNotBlank() } ?: LocationSearchSettings.DefaultOverpassUrl)
-                .addConverterFactory(OverpassQueryConverterFactory())
-                .addConverterFactory(GsonConverterFactory.create())
-                .build()
-                .create(OverpassApi::class.java)
-        } catch (e: Exception) {
-            CrashReporter.logException(e)
-            null
-        }
-    }.stateIn(scope, SharingStarted.Eagerly, null)
-
-    private val hasLocationPermission = permissionsManager.hasPermission(PermissionGroup.Location)
-
-    internal suspend fun update(
-        id: Long
-    ): UpdateResult<Location> = overpassService.first()?.runCatching {
-        this.search(
-            OverpassIdQuery(
-                id = id
-            )
-        ).let {
-            OsmLocation.fromOverpassResponse(it)
-        }.first().apply {
-            updatedSelf = { update(id) }
-        }
-    }?.fold(
-        onSuccess = { UpdateResult.Success(it) },
-        onFailure = {
-            when (it) {
-                is CancellationException, is UnknownHostException -> {
-                    // network
-                    UpdateResult.TemporarilyUnavailable(it)
-                }
-
-                is HttpException -> when (it.code()) {
-                    in 400..499 -> UpdateResult.PermanentlyUnavailable(it)
-                    else -> UpdateResult.TemporarilyUnavailable(it)
-                }
-
-                is NoSuchElementException -> {
-                    // empty response
-                    UpdateResult.PermanentlyUnavailable(it)
-                }
-
-                else -> {
-                    if (it is Exception) {
-                        CrashReporter.logException(it)
-                    }
-                    UpdateResult.TemporarilyUnavailable(it)
-                }
-            }
-        }
-    ) ?: let {
-        Log.e("OsmLocationDeserializer", "overpassService was not initialized")
-        UpdateResult.TemporarilyUnavailable()
-    }
-
-    override fun search(query: String, allowNetwork: Boolean): Flow<ImmutableList<Location>> = channelFlow {
-        send(persistentListOf())
-
-        if (!allowNetwork) return@channelFlow
-
-        // values higher than 2 might block searches for "dm"
-        // (Drogerie Markt, a problem specific to germany, but probably also relevant for other countries)
-        if (query.length < 2) return@channelFlow
-
-        hasLocationPermission.collectLatest { locationPermission ->
-            if (!locationPermission) return@collectLatest
-
-            settings.data.collectLatest dataStore@{ settings ->
-                if (!settings.enabled) return@dataStore
-
-                val userLocation =
-                    poseProvider.getLocation().firstOrNull() ?: poseProvider.lastLocation
-                    ?: return@dataStore
-
-                withContext(Dispatchers.IO) {
-                    httpClient.dispatcher.cancelAll()
-                }
-
-                suspend fun searchByTag(tag: String): OverpassResponse? =
-                    overpassService.first()?.runCatching {
-                        this.search(
-                            OverpassFuzzyRadiusQuery(
-                                tag = tag,
-                                query = query,
-                                radius = settings.searchRadius,
-                                latitude = userLocation.latitude,
-                                longitude = userLocation.longitude,
-                            )
-                        )
-                    }?.onFailure {
-                        if (it !is HttpException && it !is CancellationException) {
-                            Log.e("OsmRepository", "Failed to search for $tag: $query", it)
-                        }
-                    }?.getOrNull()
-
-                val result = awaitAll(
-                    // optionally query by "amenity" or "shop" here
-                    // if we want to make searching for locations fuzzier
-                    // however, this would not account for localized queries like "Bäcker" (shop:bakery)
-                    async(this.coroutineContext) { searchByTag("name") },
-                    async(this.coroutineContext) { searchByTag("brand") },
-                ).flatMap {
-                    it?.let {
-                        OsmLocation.fromOverpassResponse(it)
-                    } ?: emptyList()
-                }
-
-                if (result.isNotEmpty()) {
-                    send(
-                        result
-                            .asSequence()
-                            .filter {
-                                !settings.hideUncategorized || (it.category != null && it.category != LocationCategory.OTHER)
-                            }
-                            .groupBy {
-                                it.label.lowercase()
-                            }
-                            .flatMap { (_, duplicates) ->
-                                // deduplicate results with same labels, if
-                                // - same category
-                                // - distance is less than 100m
-                                if (duplicates.size < 2) duplicates
-                                else {
-                                    val luckyFirst = duplicates.first()
-                                    duplicates
-                                        .drop(1)
-                                        .filter {
-                                            it.category != luckyFirst.category ||
-                                                    it.distanceTo(luckyFirst) > 100.0
-                                        } + luckyFirst
-                                }
-                            }
-                            .sortedBy {
-                                it.distanceTo(userLocation)
-                            }
-                            .take(7)
-                            .toImmutableList()
-                    )
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OsmSerialization.kt b/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OsmSerialization.kt
deleted file mode 100644
index d44fec33..00000000
--- a/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OsmSerialization.kt
+++ /dev/null
@@ -1,107 +0,0 @@
-package de.mm20.launcher2.openstreetmaps
-
-import de.mm20.launcher2.ktx.jsonObjectOf
-import de.mm20.launcher2.search.LocationCategory
-import de.mm20.launcher2.search.OpeningHours
-import de.mm20.launcher2.search.OpeningSchedule
-import de.mm20.launcher2.search.SavableSearchable
-import de.mm20.launcher2.search.SearchableDeserializer
-import de.mm20.launcher2.search.SearchableSerializer
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toPersistentList
-import org.json.JSONArray
-import org.json.JSONObject
-import java.time.DayOfWeek
-import java.time.Duration
-import java.time.LocalTime
-
-class OsmLocationSerializer : SearchableSerializer {
-    override fun serialize(searchable: SavableSearchable): String {
-        searchable as OsmLocation
-        return jsonObjectOf(
-            "id" to searchable.id,
-            "lat" to searchable.latitude,
-            "lon" to searchable.longitude,
-            "category" to searchable.category?.name,
-            "label" to searchable.label,
-            "street" to searchable.street,
-            "houseNumber" to searchable.houseNumber,
-            "websiteUrl" to searchable.websiteUrl,
-            "phoneNumber" to searchable.phoneNumber,
-            "openingSchedule" to searchable.openingSchedule?.let {
-                jsonObjectOf(
-                    "isTwentyFourSeven" to it.isTwentyFourSeven,
-                    "openingHours" to JSONArray(it.openingHours.map {
-                        jsonObjectOf(
-                            "day" to it.dayOfWeek.value,
-                            "openingTime" to it.startTime.toSecondOfDay() * 1000L,
-                            "duration" to it.duration.toMillis(),
-                        )
-                    })
-                )
-            },
-            "timestamp" to searchable.timestamp,
-        ).toString()
-    }
-
-    override val typePrefix: String
-        get() = "osmlocation"
-}
-
-internal class OsmLocationDeserializer(
-    private val osmRepository: OsmRepository,
-) : SearchableDeserializer {
-    override suspend fun deserialize(serialized: String): SavableSearchable {
-        val json = JSONObject(serialized)
-        val id = json.getLong("id")
-
-        return OsmLocation(
-            id = id,
-            latitude = json.getDouble("lat"),
-            longitude = json.getDouble("lon"),
-            category = json.getString("category").runCatching { LocationCategory.valueOf(this) }
-                .getOrNull(),
-            label = json.getString("label"),
-            street = json.optString("street").takeIf { it.isNotBlank() },
-            houseNumber = json.optString("houseNumber").takeIf { it.isNotBlank() },
-            openingSchedule = json.optJSONObject("openingSchedule")?.let { getOpeningSchedule(it) },
-            websiteUrl = json.optString("websiteUrl").takeIf { it.isNotBlank() },
-            phoneNumber = json.optString("phoneNumber").takeIf { it.isNotBlank() },
-            timestamp = json.optLong("timestamp"),
-            updatedSelf = { osmRepository.update(id) }
-        )
-    }
-
-    private fun getOpeningSchedule(json: JSONObject): OpeningSchedule {
-        return OpeningSchedule(
-            isTwentyFourSeven = json.optBoolean("isTwentyFourSeven"),
-            openingHours = json.optJSONArray("openingHours")?.let {
-                getOpeningHours(it)
-            } ?: persistentListOf()
-        )
-    }
-
-    private fun getOpeningHours(array: JSONArray): ImmutableList<OpeningHours> {
-        val hours = mutableListOf<OpeningHours>()
-
-        for (i in 0 until array.length()) {
-            val json = array.getJSONObject(i)
-            val dayOfWeek =
-                DayOfWeek.of(json.optInt("day").takeIf { it in 1..7 } ?: continue)
-            val openingTimeMillis =
-                json.optLong("openingTime", -1).takeIf { it >= 0 } ?: continue
-            val durationMillis = json.optLong("duration", -1).takeIf { it >= 0 } ?: continue
-
-            hours.add(
-                OpeningHours(
-                    dayOfWeek = dayOfWeek,
-                    startTime = LocalTime.ofSecondOfDay(openingTimeMillis / 1000L),
-                    duration = Duration.ofMillis(durationMillis)
-                )
-            )
-        }
-
-        return hours.toPersistentList()
-    }
-}
\ No newline at end of file
diff --git a/data/weather/src/main/java/de/mm20/launcher2/weather/plugin/PluginWeatherProvider.kt b/data/weather/src/main/java/de/mm20/launcher2/weather/plugin/PluginWeatherProvider.kt
index 5592ad24..3b0bc6ee 100644
--- a/data/weather/src/main/java/de/mm20/launcher2/weather/plugin/PluginWeatherProvider.kt
+++ b/data/weather/src/main/java/de/mm20/launcher2/weather/plugin/PluginWeatherProvider.kt
@@ -14,6 +14,9 @@ import de.mm20.launcher2.plugin.PluginApi
 import de.mm20.launcher2.plugin.config.WeatherPluginConfig
 import de.mm20.launcher2.plugin.contracts.PluginContract
 import de.mm20.launcher2.plugin.contracts.WeatherPluginContract
+import de.mm20.launcher2.plugin.contracts.WeatherPluginContract.ForecastColumns
+import de.mm20.launcher2.plugin.contracts.WeatherPluginContract.LocationColumns
+import de.mm20.launcher2.plugin.data.withColumns
 import de.mm20.launcher2.preferences.weather.WeatherLocation
 import de.mm20.launcher2.weather.Forecast
 import de.mm20.launcher2.weather.WeatherProvider
@@ -107,99 +110,30 @@ internal class PluginWeatherProvider(
         return cursor.use {
             val results = mutableListOf<Forecast>()
 
-            val timestampIndex =
-                cursor.getColumnIndex(WeatherPluginContract.ForecastColumns.Timestamp)
-                    .takeIf { it >= 0 } ?: return null
-            val createdAtIndex =
-                cursor.getColumnIndex(WeatherPluginContract.ForecastColumns.CreatedAt)
-                    .takeIf { it >= 0 } ?: return null
-            val temperatureIndex =
-                cursor.getColumnIndex(WeatherPluginContract.ForecastColumns.Temperature)
-                    .takeIf { it >= 0 } ?: return null
-            val conditionIndex =
-                cursor.getColumnIndex(WeatherPluginContract.ForecastColumns.Condition)
-                    .takeIf { it >= 0 } ?: return null
-            val iconIndex =
-                cursor.getColumnIndex(WeatherPluginContract.ForecastColumns.Icon).takeIf { it >= 0 }
-                    ?: return null
+            cursor.withColumns(ForecastColumns) {
 
-            val locationIndex =
-                cursor.getColumnIndex(WeatherPluginContract.ForecastColumns.Location)
-                    .takeIf { it >= 0 }
-                    ?: return null
-
-            val providerIndex =
-                cursor.getColumnIndex(WeatherPluginContract.ForecastColumns.Provider)
-                    .takeIf { it >= 0 }
-                    ?: return null
-
-            val providerUrlIndex =
-                cursor.getColumnIndex(WeatherPluginContract.ForecastColumns.ProviderUrl)
-                    .takeIf { it >= 0 }
-
-            val precipitationIndex =
-                cursor.getColumnIndex(WeatherPluginContract.ForecastColumns.Precipitation)
-                    .takeIf { it >= 0 }
-
-            val precipProbabilityIndex =
-                cursor.getColumnIndex(WeatherPluginContract.ForecastColumns.RainProbability)
-                    .takeIf { it >= 0 }
-
-            val cloudsIndex =
-                cursor.getColumnIndex(WeatherPluginContract.ForecastColumns.Clouds)
-                    .takeIf { it >= 0 }
-
-            val humidityIndex =
-                cursor.getColumnIndex(WeatherPluginContract.ForecastColumns.Humidity)
-                    .takeIf { it >= 0 }
-
-            val windSpeedIndex =
-                cursor.getColumnIndex(WeatherPluginContract.ForecastColumns.WindSpeed)
-                    .takeIf { it >= 0 }
-
-            val windDirectionIndex =
-                cursor.getColumnIndex(WeatherPluginContract.ForecastColumns.WindDirection)
-                    .takeIf { it >= 0 }
-
-            val pressureIndex =
-                cursor.getColumnIndex(WeatherPluginContract.ForecastColumns.Pressure)
-                    .takeIf { it >= 0 }
-
-            val nightIndex =
-                cursor.getColumnIndex(WeatherPluginContract.ForecastColumns.Night)
-                    .takeIf { it >= 0 }
-
-            val minTempIndex =
-                cursor.getColumnIndex(WeatherPluginContract.ForecastColumns.TemperatureMin)
-                    .takeIf { it >= 0 }
-
-            val maxTempIndex =
-                cursor.getColumnIndex(WeatherPluginContract.ForecastColumns.TemperatureMax)
-                    .takeIf { it >= 0 }
-
-
-
-            while (cursor.moveToNext()) {
-                results += Forecast(
-                    timestamp = cursor.getLongOrNull(timestampIndex) ?: continue,
-                    temperature = cursor.getDoubleOrNull(temperatureIndex) ?: continue,
-                    updateTime = cursor.getLongOrNull(createdAtIndex) ?: continue,
-                    condition = cursor.getStringOrNull(conditionIndex) ?: continue,
-                    icon = getIcon(cursor.getStringOrNull(iconIndex) ?: continue),
-                    location = cursor.getStringOrNull(locationIndex) ?: continue,
-                    provider = cursor.getStringOrNull(providerIndex) ?: continue,
-                    providerUrl = providerUrlIndex?.let { cursor.getStringOrNull(it) } ?: "",
-                    clouds = cloudsIndex?.let { cursor.getIntOrNull(it) },
-                    humidity = humidityIndex?.let { cursor.getDoubleOrNull(it) },
-                    precipitation = precipitationIndex?.let { cursor.getDoubleOrNull(it) },
-                    precipProbability = precipProbabilityIndex?.let { cursor.getIntOrNull(it) },
-                    windSpeed = windSpeedIndex?.let { cursor.getDoubleOrNull(it) },
-                    windDirection = windDirectionIndex?.let { cursor.getDoubleOrNull(it) },
-                    pressure = pressureIndex?.let { cursor.getDoubleOrNull(it) },
-                    night = nightIndex?.let { cursor.getIntOrNull(it) } == 1,
-                    minTemp = minTempIndex?.let { cursor.getDoubleOrNull(it) },
-                    maxTemp = maxTempIndex?.let { cursor.getDoubleOrNull(it) },
-                )
+                while (cursor.moveToNext()) {
+                    results += Forecast(
+                        timestamp = cursor[ForecastColumns.Timestamp] ?: continue,
+                        temperature = cursor[ForecastColumns.Temperature] ?: continue,
+                        updateTime = cursor[ForecastColumns.CreatedAt] ?: continue,
+                        condition = cursor[ForecastColumns.Condition] ?: continue,
+                        icon = getIcon(cursor[ForecastColumns.Icon]?.name ?: continue),
+                        location = cursor[ForecastColumns.Location] ?: continue,
+                        provider = cursor[ForecastColumns.Provider] ?: continue,
+                        providerUrl = cursor[ForecastColumns.ProviderUrl] ?: "",
+                        clouds = cursor[ForecastColumns.Clouds],
+                        humidity = cursor[ForecastColumns.Humidity]?.toDouble(),
+                        precipitation = cursor[ForecastColumns.Precipitation],
+                        precipProbability = cursor[ForecastColumns.RainProbability],
+                        windSpeed = cursor[ForecastColumns.WindSpeed],
+                        windDirection = cursor[ForecastColumns.WindDirection],
+                        pressure = cursor[ForecastColumns.Pressure],
+                        night = cursor[ForecastColumns.Night] ?: false,
+                        minTemp = cursor[ForecastColumns.TemperatureMin],
+                        maxTemp =  cursor[ForecastColumns.TemperatureMax],
+                    )
+                }
             }
             results
         }
@@ -278,29 +212,18 @@ internal class PluginWeatherProvider(
         return cursor.use {
             val results = mutableListOf<WeatherLocation>()
 
-            val nameIndex =
-                cursor.getColumnIndex(WeatherPluginContract.LocationColumns.Name)
-                    .takeIf { it >= 0 } ?: return emptyList()
-            val latIndex =
-                cursor.getColumnIndex(WeatherPluginContract.LocationColumns.Lat)
-                    .takeIf { it >= 0 }
-            val lonIndex =
-                cursor.getColumnIndex(WeatherPluginContract.LocationColumns.Lon)
-                    .takeIf { it >= 0 }
-            val locationIdIndex =
-                cursor.getColumnIndex(WeatherPluginContract.LocationColumns.Id)
-                    .takeIf { it >= 0 }
+            cursor.withColumns(LocationColumns) {
+                while (cursor.moveToNext()) {
+                    val lat = cursor[LocationColumns.Lat]
+                    val lon = cursor[LocationColumns.Lon]
+                    val locationId = cursor[LocationColumns.Id]
+                    val name = cursor[LocationColumns.Name] ?: continue
 
-            while (cursor.moveToNext()) {
-                val lat = latIndex?.let { cursor.getDoubleOrNull(it) }
-                val lon = lonIndex?.let { cursor.getDoubleOrNull(it) }
-                val locationId = locationIdIndex?.let { cursor.getStringOrNull(it) }
-                val name = cursor.getStringOrNull(nameIndex) ?: continue
-
-                if (lat != null && lon != null) {
-                    results += WeatherLocation.LatLon(lat = lat, lon = lon, name = name)
-                } else if (locationId != null) {
-                    results += WeatherLocation.Id(locationId = locationId, name = name)
+                    if (lat != null && lon != null) {
+                        results += WeatherLocation.LatLon(lat = lat, lon = lon, name = name)
+                    } else if (locationId != null) {
+                        results += WeatherLocation.Id(locationId = locationId, name = name)
+                    }
                 }
             }
             results
diff --git a/docs/docs/developer-guide/plugins/get-started.md b/docs/docs/developer-guide/plugins/get-started.md
index d0e1dc63..fc27ada7 100644
--- a/docs/docs/developer-guide/plugins/get-started.md
+++ b/docs/docs/developer-guide/plugins/get-started.md
@@ -49,3 +49,4 @@ Your next steps depend on the type of plugin that you want to develop:
 
 - Weather provider plugin: [Weather Provider](/docs/developer-guide/plugins/plugin-types/weather.html)
 - File search plugin: [File Search Provider](/docs/developer-guide/plugins/plugin-types/file-search.html)
+- Places search plugin: [Places Search Provider](/docs/developer-guide/plugins/plugin-types/places-search.html)
diff --git a/docs/docs/developer-guide/plugins/migrations/v2.md b/docs/docs/developer-guide/plugins/migrations/v2.md
new file mode 100644
index 00000000..8ef9c856
--- /dev/null
+++ b/docs/docs/developer-guide/plugins/migrations/v2.md
@@ -0,0 +1,39 @@
+# Migrate from v1.x to v2.x
+
+Version 2.0.0 of the plugin SDK introduces some breaking changes:
+
+## Name changes
+
+- The `SearchPluginConfig` class has been renamed to `QueryPluginConfig`
+
+## Signature changes
+
+### `FileProvider`
+
+### `search`
+
+```kt
+suspend fun search(query: String, allowNetwork: Boolean): List<File>
+```
+
+has been changed to
+
+```kt
+suspend fun search(query: String, params: SearchParams): List<File>
+```
+
+`params` provides additional properties to configure how the search is performed:
+ - `allowNetwork` - whether to allow network requests
+ - `lang` - the language to use for the search
+
+### `get`
+
+```kt
+suspend fun get(id: String): File?
+```
+
+has been changed to
+
+```kt
+suspend fun get(id: String, params: GetParams): File?
+```
diff --git a/docs/docs/developer-guide/plugins/plugin-types/common/_get_params.md b/docs/docs/developer-guide/plugins/plugin-types/common/_get_params.md
new file mode 100644
index 00000000..3d7587fb
--- /dev/null
+++ b/docs/docs/developer-guide/plugins/plugin-types/common/_get_params.md
@@ -0,0 +1,4 @@
+- `params` provides additional parameters:
+    - `lang` is the current language of the launcher. This can differ from the system language, as
+      the user can set a different language per app. This value should be used to localize the
+      result.
diff --git a/docs/docs/developer-guide/plugins/plugin-types/common/_query_plugin_config.md b/docs/docs/developer-guide/plugins/plugin-types/common/_query_plugin_config.md
new file mode 100644
index 00000000..76c21fba
--- /dev/null
+++ b/docs/docs/developer-guide/plugins/plugin-types/common/_query_plugin_config.md
@@ -0,0 +1,18 @@
+Search plugins have the following configuration properties:
+
+- `storageStrategy`: Describes how the launcher should store a search result in its internal
+  database. This is relevant when a user pins a search result to favorites, or when they assign a
+  tag or custom label. In these situations, the launcher needs to be able to restore the search
+  result from its database. There are two different strategies:
+    - **`StorageStrategy.StoreCopy`** (default): The launcher stores all relevant information about
+      this search result in its own internal database. The result can be restored without querying
+      the plugin again. The launcher will try refresh the search result at its own discretion (e.g.
+      when a user long-presses a restored search result to view its details). This strategy is the
+      default and should be used whenever the plugin can't restore a search result immediately. It
+      is best suited for online search plugins.
+    - **`StorageStrategy.StoreReference`**: The launcher only stores the ID of the search result,
+      and the plugin that created it. To restore a result, the plugin is queried again. This
+      allows the plugin to update key fields (i.e. the label) immediately. However, plugins that
+      use this strategy must guarantee, that they can restore a search result at any time, in a
+      timely manner. In particular, the plugin must be able to restore a search result without
+      any network requests. This strategy is best suited for on-device search plugins.
diff --git a/docs/docs/developer-guide/plugins/plugin-types/common/_refresh_params.md b/docs/docs/developer-guide/plugins/plugin-types/common/_refresh_params.md
new file mode 100644
index 00000000..a741cf15
--- /dev/null
+++ b/docs/docs/developer-guide/plugins/plugin-types/common/_refresh_params.md
@@ -0,0 +1,7 @@
+- `params` provides additional parameters:
+    - `lang` is the current language of the launcher. This can differ from the system language, as
+      the user can set a different language per app. This value should be used to localize the
+      result.
+    - `lastUpdated` the timestamp (in milliseconds) when `item` was last updated. This should be
+      used to determine if the item needs to be refreshed again. If you decide not to refresh the
+      item, you should return the original `item` parameter.
\ No newline at end of file
diff --git a/docs/docs/developer-guide/plugins/plugin-types/common/_search_params.md b/docs/docs/developer-guide/plugins/plugin-types/common/_search_params.md
new file mode 100644
index 00000000..89cfdd31
--- /dev/null
+++ b/docs/docs/developer-guide/plugins/plugin-types/common/_search_params.md
@@ -0,0 +1,11 @@
+- `params` provides additional parameters for the search:
+    - `allowNetwork` is a flag that indicates whether the user has enabled online search for this
+      query. Plugins are generally advised to respect this request. This flag exists mainly for
+      privacy reasons: the majority of searches target offline results (like apps, or contacts).
+      Sending every single search request to external servers is overkill and can be a privacy
+      issue. (Besides, it's not very nice to overload servers with unnecessary requests.) To reduce
+      the amount of data that is sent to external servers, users can control, whether a search
+      should include online results or not.
+    - `lang` is the current language of the launcher. This can differ from the system language, as
+      the user can set a different language per app. This value should be used for any localization
+      in the search results.
\ No newline at end of file
diff --git a/docs/docs/developer-guide/plugins/plugin-types/common/_search_plugin_config.md b/docs/docs/developer-guide/plugins/plugin-types/common/_search_plugin_config.md
deleted file mode 100644
index 35795b1a..00000000
--- a/docs/docs/developer-guide/plugins/plugin-types/common/_search_plugin_config.md
+++ /dev/null
@@ -1,20 +0,0 @@
-Search plugins have the following configuration properties:
-
-- `storageStrategy`: Describes how the launcher should store a search result in its internal
-  database. This is relevant when a user pins a search result to favorites, or when they assign a
-  tag or custom label. In these situations, the launcher needs to be able to restore the search
-  result from its database. There are two different strategies:
-    - **`StorageStrategy.StoreReference`**: The launcher only stores the ID of the search result,
-      and the plugin that created it. To restore a result, the plugin is queried again. This
-      strategy allows the plugin provider to update a search result at a later point in time.
-      However, plugins that use this strategy must guarantee that a search result can be restored in
-      a timely manner. In particular, the plugin provider must be able to restore a search result
-      without any network requests.
-    - **`StorageStrategy.StoreCopy`** (default): The launcher stores all relevant information about
-      this search result in its own internal database. The result can be restored without querying
-      the plugin again. This strategy is very easy to implement. The downside is, that results
-      cannot be updated at a later point in time.
-    - **`StorageStrategy.Deferred`** (default): The launcher stores all relevant information in its
-      own internal database, like [StoreCopy]. A fresh copy is fetched from the plugin provider when
-      the user opens the search result's detail view. This allows the plugin provider to update the
-      search result at a later point in time, without the time constraints of [StoreReference].
diff --git a/docs/docs/developer-guide/plugins/plugin-types/file-search.md b/docs/docs/developer-guide/plugins/plugin-types/file-search.md
index 02a4e558..26ad6ead 100644
--- a/docs/docs/developer-guide/plugins/plugin-types/file-search.md
+++ b/docs/docs/developer-guide/plugins/plugin-types/file-search.md
@@ -6,35 +6,30 @@ class:
 
 ```kt
 class MyFileSearchPlugin : FileProvider(
-    SearchPluginConfig()
+    QueryPluginConfig()
 )
 
 ```
 
 In the super constructor call, pass
-a <a href="/reference/core/shared/de.mm20.launcher2.plugin.config/-search-plugin-config/index.html" target="_blank">`SearchPluginConfig`</a>
+a <a href="/reference/core/shared/de.mm20.launcher2.plugin.config/-query-plugin-config/index.html" target="_blank">`QueryPluginConfig`</a>
 object.
 
 ## Plugin config
 
-<!--@include: ./common/_search_plugin_config.md-->
+<!--@include: ./common/_query_plugin_config.md-->
 
 ## Search files
 
 To implement file search, override
 
 ```kt
-suspend fun search(query: String, allowNetwork: Boolean): List<File>
+suspend fun search(query: String, params: SearchParams): List<File>
 ```
 
 - `query` is the search term
-- `allowNetwork` is a flag that indicates whether the user has enabled online search for this query.
-  Plugins are generally advised to respect this request. This flag exists mainly for privacy
-  reasons: the majority of searches target offline results (like apps, or contacts). Sending every
-  single search request to external servers is overkill and can be a privacy issue. (Besides, it's
-  not very nice to overload servers with unnecessary requests.) To reduce the amount of data that is
-  leaked to external servers, users can control, whether a search should include online results or
-  not.
+
+<!--@include: ./common/_search_params.md-->
 
 `search` returns a list of `File`s. The list can be empty if no results were found.
 
@@ -60,18 +55,41 @@ A `File` has the following properties:
   cloud drive and are not owned by the user themselves, but shared with them.
 - `metadata`: Additional file metadata.
 
-## Get a file
+## Refresh a file
 
-If you have set `config.storageStrategy` to `StorageStrategy.StoreReference`
-or `StorageStrategy.Deferred`, you must override
+If you have set `config.storageStrategy` to `StorageStrategy.StoreCopy`, the launcher will
+periodically
+try to refresh the stored copy. This happens for example when a user long-presses a file to view its
+details. To update the file, you can override
 
 ```kt
-suspend fun get(id: String): File?
+suspend fun refresh(item: File, params: RefreshParams): File?
+```
+
+The stored file will be replaced with the return value of this method. If the file is no longer
+available, it should return `null`. In this case, the launcher will remove it from its database. If
+the file is temporarily unavailable, an exception should be thrown.
+
+- `item` is the version that the launcher has currently stored
+
+<!--@include: ./common/_refresh_params.md-->
+
+The default implementation returns `item` without any changes.
+
+## Get a file
+
+If you have set `config.storageStrategy` to `StorageStrategy.StoreReference`, you must override
+
+```kt
+suspend fun get(id: String, params: GetParams): File?
 ```
 
 This method is used to lookup a file by its `id`. If the file is no longer available, it should
-return `null`. In this case, the launcher will remove it from its database. If the file is
-temporarily unavailable, an exception should be thrown.
+return `null`. In this case, the launcher will remove it from its database.
+
+- `id` is the ID of the file that is being requested
+
+<!--@include: ./common/_get_params.md-->
 
 ## Plugin state
 
diff --git a/docs/docs/developer-guide/plugins/plugin-types/places-search.md b/docs/docs/developer-guide/plugins/plugin-types/places-search.md
new file mode 100644
index 00000000..bce05053
--- /dev/null
+++ b/docs/docs/developer-guide/plugins/plugin-types/places-search.md
@@ -0,0 +1,124 @@
+# Places Search
+
+Places search provider plugins need to extend
+the <a href="/reference/plugins/sdk/de.mm20.launcher2.sdk.locations/-location-provider/index.html" target="_blank">`LocationProvider`</a>
+class:
+
+```kt
+class MyplaceSearchPlugin : LocationProvider(
+    QueryPluginConfig()
+)
+
+```
+
+In the super constructor call, pass
+a <a href="/reference/core/shared/de.mm20.launcher2.plugin.config/-query-plugin-config/index.html" target="_blank">`QueryPluginConfig`</a>
+object.
+
+## Plugin config
+
+<!--@include: ./common/_query_plugin_config.md-->
+
+## Search places
+
+To implement place search, override
+
+```kt
+suspend fun search(query: LocationQuery, params: SearchParams): List<Location>
+```
+
+- `query` includes the query parameters:
+    - `query`: The search term
+    - `userLatitude`: The latitude of the user's current location
+    - `userLongitude`: The longitude of the user's current location
+    - `radius`: The search radius in meters
+
+<!--@include: ./common/_search_params.md-->
+
+`search` returns a list of `Location`s. The list can be empty if no results were found.
+
+### The `Location` object
+
+A `Location` has the following properties:
+
+- `id`: A unique and stable identifier for this location. This is used to track usage stats so if
+  two
+  places are identical, they must have the same ID, and if they are different, they need to have
+  different IDs.
+- `label`: The name that is shown to the user
+- `latitude`: The latitude of the location
+- `longitude`: The longitude of the location
+- `icon`: An enum value of `LocationIcon` that determines the icon that is shown for this location
+- `category`: A human readable category of the location. For example, _"Restaurant"_, _"Hotel"_, or
+  _"Museum"_. This should be localized with the `params.lang` parameter.
+- `address`: The address of the location
+- `websiteUrl`: The URL of the location's website
+- `phoneNumber`: The phone number of the location
+- `emailAddress`: The email address of the location
+- `openingSchedule`: Either
+    - `OpeningSchedule.TwentyFourSeven` if the location is open at all times
+    - `OpeningSchedule.Hours(openingHours: List<OpeningHours>)` if the location has specific opening
+      hours, with each `OpeningHours` object containing:
+        - `dayOfWeek`: The day of the week, as `DayOfWeek` enum value. If a location is open past
+          midnight, `dayOfWeek` should refer to the day when the opening hours start.
+        - `startTime`: The time the location opens, as a `LocalTime` object
+        - `duration`: The duration the location is open, as a `Duration` object
+- `departures`: If the place is a public transport station, this field contains the next departures
+  from this station. This is a list of `Departure` objects, each containing:
+    - `time`: The scheduled departure time as `ZonedDateTime`
+    - `delay`: The delay as `Duration`. If the departure is on time, this must be `Duration.ZERO`.
+      If no real-time data is available, this should be `null`.
+    - `line`: The line name (e.g. _"S1"_, _"U2"_, or _"73"_)
+    - `lastStop`: The destination of the line
+    - `type`: The type of the line, as `LineType` enum value
+    - `lineColor`: The color of the line, as a `Color`
+    - `userRating`: A user rating of this location, on a scale from 0 to 1. This is multiplied by 5
+      and shown as a star rating bar in the launcher.
+    - `userRatingCount`: The number of user ratings that were used to calculate the `userRating`
+    - `fixMeUrl`: A URL where users can report incorrect data for this location.
+    - `attribution`: Attribution that should be shown alongside the search result (read the data
+      provider's terms of service to find out if this is required).
+
+## Refresh a place
+
+If you have set `config.storageStrategy` to `StorageStrategy.StoreCopy`, the launcher will
+periodically try to refresh the stored copy. This happens for example when a user long-presses a
+place to view its details. To update the place, you can override
+
+```kt
+suspend fun refresh(item: Location, params: RefreshParams): Location?
+```
+
+The stored place will be replaced with the return value of this method. If the place is no longer
+available, it should return `null`. In this case, the launcher will remove it from its database. If
+the place is temporarily unavailable, an exception should be thrown.
+
+- `item` is the version that the launcher has currently stored
+
+<!--@include: ./common/_refresh_params.md-->
+
+The default implementation returns `item` without any changes.
+
+## Get a place
+
+If you have set `config.storageStrategy` to `StorageStrategy.StoreReference`, you must override
+
+```kt
+suspend fun get(id: String, params: GetParams): Location?
+```
+
+This method is used to lookup a place by its `id`. If the place is no longer available, it should
+return `null`. In this case, the launcher will remove it from its database.
+
+- `id` is the ID of the place that is being requested
+
+<!--@include: ./common/_get_params.md-->
+
+## Plugin state
+
+<!--@include: ./common/_plugin_state.md-->
+
+## Examples
+
+- [Foursquare plugin](https://github.com/Kvaesitso/Plugin-Foursquare)
+- [HERE plugin](https://github.com/Kvaesitso/Plugin-HERE)
diff --git a/docs/docs/developer-guide/plugins/plugin-types/weather.md b/docs/docs/developer-guide/plugins/plugin-types/weather.md
index 25e21836..a0bf6929 100644
--- a/docs/docs/developer-guide/plugins/plugin-types/weather.md
+++ b/docs/docs/developer-guide/plugins/plugin-types/weather.md
@@ -117,3 +117,4 @@ a `condition`, an `icon`, a `location` name, and a `provider` name.
 ## Examples
 
 - [OpenWeatherMap plugin](https://github.com/Kvaesitso/Plugin-OpenWeatherMap)
+- [Breezy Weather plugin](https://github.com/Kvaesitso/Plugin-BreezyWeather)
diff --git a/docs/docs/developer-guide/sidebar.ts b/docs/docs/developer-guide/sidebar.ts
index 0e38d832..a58121de 100644
--- a/docs/docs/developer-guide/sidebar.ts
+++ b/docs/docs/developer-guide/sidebar.ts
@@ -71,6 +71,10 @@ export const DeveloperGuideSidebar: DefaultTheme.SidebarItem[] = [
             text: 'File Search Provider',
             link: '/docs/developer-guide/plugins/plugin-types/file-search',
           },
+          {
+            text: 'Places Search Provider',
+            link: '/docs/developer-guide/plugins/plugin-types/places-search',
+          },
         ],
       },
       {
@@ -90,6 +94,16 @@ export const DeveloperGuideSidebar: DefaultTheme.SidebarItem[] = [
         link: '/reference/index.html',
         target: '_blank',
       },
+      {
+        text: 'Migrations',
+        items: [
+          {
+            text: 'Migrate to plugin SDK v2.x',
+            link: '/docs/developer-guide/plugins/migrations/v2',
+          },
+          ,
+        ],
+      },
     ],
   },
 ]
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9d3b699a..e03cf2ee 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,24 +1,28 @@
 [versions]
+compiler = "0.9.7"
+guava = "33.1.0-android"
+jacksonCore = "2.12.7"
+jacksonDataformatYaml = "2.12.7"
 minSdk = "26"
 compileSdk = "34"
 targetSdk = "35"
 
-pluginSdk = "1.1.1"
+pluginSdk = "2.0.0-SNAPSHOT"
 
 gradle = "8.1.2"
 android-gradle-plugin = "8.2.2"
 protobuf-gradle-plugin = "0.9.4"
-ksp-gradle-plugin = "1.9.24-1.0.20"
+ksp-gradle-plugin = "2.0.0-1.0.21"
 
-kotlin = "1.9.24"
+kotlin = "2.0.0"
 kotlinx-coroutines = "1.8.0"
 kotlinx-immutable = "0.3.5"
 kotlinx-serialization = "1.6.3"
 
 jetbrains-markdown = "0.5.2"
 
-androidx-compose = "1.7.0-beta01"
-androidx-compose-material3 = "1.3.0-beta01"
+androidx-compose = "1.7.0-beta03"
+androidx-compose-material3 = "1.3.0-beta03"
 androidx-compose-compiler = "1.5.14"
 androidx-lifecycle = "2.7.0"
 androidx-core = "1.14.0-alpha01"
@@ -40,8 +44,12 @@ junitVersion = "1.1.5"
 espressoCore = "3.5.1"
 
 [libraries]
+compiler = { module = "com.github.spullara.mustache.java:compiler", version.ref = "compiler" }
 gradle = { group = "com.android.tools.build", name = "gradle", version.ref = "android-gradle-plugin" }
 
+guava = { module = "com.google.guava:guava", version.ref = "guava" }
+jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jacksonCore" }
+jackson-dataformat-yaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", version.ref = "jacksonDataformatYaml" }
 kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
 kotlin-gradle = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
@@ -132,8 +140,6 @@ junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
 androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
 
-
-
 [bundles]
 kotlin = ["kotlin-stdlib", "kotlinx-coroutines-core", "kotlinx-coroutines-android", "kotlinx-collections-immutable", "kotlinx-serialization-json"]
 androidx-lifecycle = ["androidx-lifecycle-viewmodel", "androidx-lifecycle-common", "androidx-lifecycle-runtime", "androidx-lifecycle-viewmodelcompose", "androidx-lifecycle-runtimecompose"]
@@ -147,4 +153,5 @@ protobuf = { id = "com.google.protobuf", version.ref = "protobuf-gradle-plugin"
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp-gradle-plugin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+kotlin-plugin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
diff --git a/libs/address-formatter/LICENSE b/libs/address-formatter/LICENSE
new file mode 100644
index 00000000..6fa8b927
--- /dev/null
+++ b/libs/address-formatter/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 woheller69
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/libs/address-formatter/Readme.md b/libs/address-formatter/Readme.md
new file mode 100644
index 00000000..06dfdf01
--- /dev/null
+++ b/libs/address-formatter/Readme.md
@@ -0,0 +1,2 @@
+Fork of https://github.com/woheller69/AndroidAddressFormatter by woheller69, licensed under the MIT
+License.
diff --git a/libs/address-formatter/build.gradle b/libs/address-formatter/build.gradle
new file mode 100644
index 00000000..bc116657
--- /dev/null
+++ b/libs/address-formatter/build.gradle
@@ -0,0 +1,30 @@
+apply plugin: 'com.android.library'
+
+android {
+
+    compileSdk libs.versions.compileSdk.get().toInteger()
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    defaultConfig {
+        minSdk libs.versions.minSdk.get().toInteger()
+        versionCode 10
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    namespace "de.mm20.launcher2.lib.addressformatter"
+}
+
+dependencies {
+    implementation libs.jackson.core
+    implementation libs.jackson.dataformat.yaml
+    implementation libs.guava
+    implementation libs.compiler
+}
diff --git a/libs/address-formatter/proguard-rules.pro b/libs/address-formatter/proguard-rules.pro
new file mode 100644
index 00000000..c2f30680
--- /dev/null
+++ b/libs/address-formatter/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /home/yonjuni/Android/Sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/libs/address-formatter/src/main/java/org/woheller69/AndroidAddressFormatter/OsmAddressFormatter.java b/libs/address-formatter/src/main/java/org/woheller69/AndroidAddressFormatter/OsmAddressFormatter.java
new file mode 100644
index 00000000..0a8df004
--- /dev/null
+++ b/libs/address-formatter/src/main/java/org/woheller69/AndroidAddressFormatter/OsmAddressFormatter.java
@@ -0,0 +1,478 @@
+package org.woheller69.AndroidAddressFormatter;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.type.TypeFactory;
+import com.fasterxml.jackson.databind.type.MapType;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.github.mustachejava.*;
+import com.google.common.primitives.Ints;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.StringReader;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.HashMap;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.function.Function;
+import com.google.common.base.CaseFormat;
+import java.util.Map.Entry;
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+import java.util.Optional;
+import java.util.ArrayList;
+
+public class OsmAddressFormatter {
+
+  private static final RegexPatternCache regexPatternCache = new RegexPatternCache();
+  private static final List<String> knownComponents = OsmAddressFormatter.getKnownComponents();
+  private static final Map<String, String> replacements = new HashMap<String, String>() {{
+    put("[\\},\\s]+$", "");
+    put("^[,\\s]+", "");
+    put("^- ", "");
+    put(",\\s*,", ", ");
+    put("[ \t]+,[ \t]+", ", ");
+    put("[ \t][ \t]+", " ");
+    put("[ \t]\n", "\n");
+    put("\n,", "\n");
+    put(",+", ",");
+    put(",\n", "\n");
+    put("\n[ \t]+", "\n");
+    put("\n+", "\n");
+  }};
+
+  private final ObjectMapper yamlReader = new ObjectMapper(new YAMLFactory());
+  private final boolean abbreviate;
+  private final boolean appendCountry;
+  private final boolean appendUnknown;
+
+  public OsmAddressFormatter(Boolean abbreviate, Boolean appendCountry, Boolean appendUnknown) {
+    this.abbreviate = abbreviate;
+    this.appendCountry = appendCountry;
+    this.appendUnknown = appendUnknown;
+  }
+
+  public String format(String json) throws IOException {
+    return format(json, null);
+  }
+
+  public String format(String json, String fallbackCountryCode) throws IOException {
+    TypeFactory factory = TypeFactory.defaultInstance();
+    MapType type = factory.constructMapType(HashMap.class, String.class, String.class);
+    Map<String, Object> components = null;
+
+    try {
+       components = yamlReader.readValue(json, type);
+    } catch (JsonProcessingException e) {
+      throw(new IOException("Json processing exception", e));
+    }
+    components = normalizeFields(components);
+
+    if (fallbackCountryCode != null) {
+      components.put("country_code", fallbackCountryCode);
+    }
+
+    components = determineCountryCode(components, fallbackCountryCode);
+    String countryCode = components.get("country_code").toString();
+
+    if (appendCountry) {
+      if (Templates.COUNTRY_NAMES.getData().has(countryCode) && components.get("country") == null) {
+        components.put("country", Templates.COUNTRY_NAMES.getData().get(countryCode).asText());
+      }
+    }else components.remove("country");       //if !appendCountry do not show it, even if it is there
+
+    components = applyAliases(components);
+    JsonNode template = findTemplate(components);
+    components = cleanupInput(components, template.get("replace"));
+    return renderTemplate(template, components);
+  }
+
+  Map<String, Object> normalizeFields(Map<String, Object> components) {
+    Map<String, Object> normalizedComponents = new HashMap<>();
+    for (Map.Entry<String, Object> entry : components.entrySet()) {
+      String field = entry.getKey();
+      Object value = entry.getValue();
+      String newField = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, field);
+      if (!normalizedComponents.containsKey(newField)) {
+        normalizedComponents.put(newField, value);
+      }
+    }
+    return normalizedComponents;
+  }
+
+  Map<String, Object> determineCountryCode(Map<String, Object> components,
+    String fallbackCountryCode) {
+    String countryCode;
+
+    if (components.get("country_code") != null) {
+      countryCode = (String) components.get("country_code");
+    } else if (fallbackCountryCode != null) {
+      countryCode = fallbackCountryCode;
+    } else {
+      throw new Error("No country code provided. Use fallbackCountryCode?");
+    }
+
+    countryCode = countryCode.toUpperCase();
+
+    if (!Templates.WORLDWIDE.getData().has(countryCode) || countryCode.length() != 2) {
+      throw new Error("Invalid country code");
+    }
+
+    if (countryCode.equals("UK")) {
+      countryCode = "GB";
+    }
+
+    JsonNode country = Templates.WORLDWIDE.getData().get(countryCode);
+    if (country != null && country.has("use_country")) {
+      String oldCountryCode = countryCode;
+      countryCode = country.get("use_country").asText().toUpperCase();
+
+      if (country.has("change_country")) {
+        String newCountry = country.get("change_country").asText();
+        Pattern p = regexPatternCache.get("\\$(\\w*)");
+        Matcher m = p.matcher(newCountry);
+        String match;
+        if (m.find()) {
+          match = m.group(1); // $state
+          Pattern p2 = regexPatternCache.get(String.format("\\$%s", match));
+          Matcher m2;
+          if (components.get(match) != null && components.containsKey(match)) {
+            m2 = p2.matcher(newCountry);
+            String toReplace = components.get(match).toString();
+            newCountry = m2.replaceAll(toReplace);
+          } else {
+            m2 = p2.matcher(newCountry);
+            newCountry = m2.replaceAll("");
+          }
+          components.put("country", newCountry);
+        }
+        components.put("country", newCountry);
+      }
+
+      JsonNode oldCountry = Templates.WORLDWIDE.getData().get(oldCountryCode);
+      JsonNode oldCountryAddComponent = oldCountry.get("add_component");
+      if (oldCountryAddComponent != null && oldCountryAddComponent.toString().contains("=")) {
+        String[] pairs = oldCountryAddComponent.textValue().split("=");
+        if (pairs[0].equals("state")) {
+          components.put("state", pairs[1]);
+        }
+      }
+    }
+
+    String state = (components.get("state") != null) ? components.get("state").toString() : null;
+
+    if (countryCode.equals("NL") && state != null) {
+      Pattern p1 = regexPatternCache.get("sint maarten", Pattern.CASE_INSENSITIVE);
+      Matcher m1 = p1.matcher(state);
+      Pattern p2 = regexPatternCache.get("aruba", Pattern.CASE_INSENSITIVE);
+      Matcher m2 = p2.matcher(state);
+      if (state.equals("Curaçao")) {
+        countryCode = "CW";
+        components.put("country", "Curaçao");
+      } else if (m1.find()) {
+        countryCode = "SX";
+        components.put("country", "Sint Maarten");
+      } else if (m2.find()) {
+        countryCode = "AW";
+        components.put("country", "Aruba");
+      }
+    }
+
+    components.put("country_code", countryCode);
+    return components;
+  }
+
+  Map<String, Object> cleanupInput(Map<String, Object> components, JsonNode replacements) {
+    Object country = components.get("country");
+    Object state = components.get("state");
+
+    if (country != null && state != null && Ints.tryParse((String) country) != null) {
+      components.put("country", state);
+      components.remove("state");
+    }
+    if (replacements != null && replacements.size() > 0) {
+      for (String component : components.keySet()) {
+        Iterator<JsonNode> rIterator = replacements.iterator();
+        String regex = String.format("^%s=", component);
+        Pattern p = regexPatternCache.get(regex);
+        while (rIterator.hasNext()) {
+          ArrayNode replacement = (ArrayNode) rIterator.next();
+          Matcher m = p.matcher(replacement.get(0).asText());
+          if (m.find()) {
+            m.reset();
+            String value = m.replaceAll("");
+            if (components.get(component).toString().equals(value)) {
+              components.put(component, replacement.get(1).asText());
+            }
+            m.reset();
+          } else {
+            Pattern p2 = regexPatternCache.get(replacement.get(0).asText());
+            Matcher m2 = p2.matcher(components.get(component).toString());
+            String value = m2.replaceAll(replacement.get(1).asText());
+            m.reset();
+            components.put(component, value);
+          }
+        }
+      }
+    }
+
+    if (!components.containsKey("state_code")  && components.containsKey("state")) {
+      String stateCode = getStateCode(components.get("state").toString(), components.get("country_code").toString());
+      components.put("state_code", stateCode);
+      Pattern p = regexPatternCache.get("^washington,? d\\.?c\\.?");
+      Matcher m = p.matcher(components.get("state").toString());
+      if (m.find()) {
+        components.put("state_code", "DC");
+        components.put("state", "District of Columbia");
+        components.put("city", "Washington");
+      }
+    }
+
+    if (!components.containsKey("county_code") && components.containsKey("county")) {
+      String countyCode = getCountyCode(components.get("county").toString(), components.get("country_code").toString());
+      components.put("county_code", countyCode);
+    }
+
+    List<String> unknownComponents = components.entrySet().stream().filter(component -> {
+      if (component.getKey() == null) {
+        return false;
+      }
+      return !knownComponents.contains(component.getKey());
+    }).map(component -> component.getValue().toString()).collect(Collectors.toList());
+
+    if (appendUnknown && unknownComponents.size() > 0) {
+      components.put("attention", String.join(", ", unknownComponents));
+    }
+
+
+    if (components.containsKey("postcode")) {
+      String postCode = components.get("postcode").toString();
+      components.put("postcode", postCode);
+      Pattern p1 = regexPatternCache.get("^(\\d{5}),\\d{5}");
+      Pattern p2 = regexPatternCache.get("\\d+;\\d+");
+      Matcher m1 = p1.matcher(postCode);
+      Matcher m2 = p2.matcher(postCode);
+      if (postCode.length() > 20) {
+        components.remove("postcode");
+      } else if (m2.matches()) {
+        components.remove("postcode");
+      } else if (m1.matches()) {
+        components.put("postcode", m1.group(1));
+      }
+    }
+
+    if (abbreviate && components.containsKey("country_code") && Templates.COUNTRY_2_LANG.getData().has(components.get("country_code").toString())) {
+      JsonNode languages = Templates.COUNTRY_2_LANG.getData().get(components.get("country_code").toString());
+      StreamSupport.stream(languages.spliterator(), false)
+          .filter(language -> Templates.ABBREVIATIONS.getData().has(language.textValue()))
+          .map(language -> Templates.ABBREVIATIONS.getData().get(language.textValue())).forEach(
+          languageAbbreviations -> StreamSupport.stream(languageAbbreviations.spliterator(), false)
+              .filter(abbreviation -> abbreviation.has("component"))
+              .forEach(abbreviation -> StreamSupport.stream(abbreviation.get("replacements").spliterator(), false)
+                  .forEach(replacement -> {
+                    String key = abbreviation.get("component").asText();
+                    if (key == null) {
+                      return;
+                    }
+                    if (components.get(key) == null) {
+                      return;
+                    }
+                    String oldComponent = components.get(key).toString();
+                    String regex = String.format("\\b%s\\b", replacement.get("src").asText());
+                    Pattern p = regexPatternCache.get(regex);
+                    Matcher m = p.matcher(oldComponent);
+                    String newComponent = m.replaceAll(replacement.get("dest").asText());
+                    components.put(key, newComponent);
+                  })));
+    }
+
+    Pattern p = regexPatternCache.get("^https?://");
+    return components.entrySet().stream().filter(component -> {
+      if (component.getValue() == null) {
+        return false;
+      }
+
+      Matcher m = p.matcher(component.getValue().toString());
+
+      if (m.matches()) {
+        m.reset();
+        return false;
+      }
+
+      m.reset();
+      return true;
+    }).collect(Collectors.toMap(Entry::getKey, Entry::getValue));
+  }
+
+  Map<String, Object> applyAliases(Map<String, Object> components) {
+    Map<String, Object> aliasedComponents = new HashMap<>();
+    components.forEach((key, value) -> {
+      String newKey = key;
+      Iterator<JsonNode> iterator = Templates.ALIASES.getData().elements();
+      while (iterator.hasNext()) {
+        JsonNode pair = iterator.next();
+        if (pair.get("alias").asText().equals(key)
+            && components.get(pair.get("name").asText()) == null) {
+          newKey = pair.get("name").asText();
+          break;
+        }
+      }
+      aliasedComponents.put(key, value);
+      aliasedComponents.put(newKey, value);
+    });
+
+    return aliasedComponents;
+  }
+
+  JsonNode findTemplate(Map<String, Object> components) {
+    JsonNode template;
+    if (Templates.WORLDWIDE.getData().has(components.get("country_code").toString())) {
+      template = Templates.WORLDWIDE.getData().get(components.get("country_code").toString());
+    } else {
+      template = Templates.WORLDWIDE.getData().get("default");
+    }
+
+    return template;
+  }
+
+  JsonNode chooseTemplateText(JsonNode template, Map<String, Object> components) {
+    JsonNode selected;
+    if (template.has("address_template")) {
+      if (Templates.WORLDWIDE.getData().has(template.get("address_template").asText())) {
+        selected = Templates.WORLDWIDE.getData().get(template.get("address_template").asText());
+      } else {
+        selected = template.get("address_template");
+      }
+    } else {
+      JsonNode defaults = Templates.WORLDWIDE.getData().get("default");
+      selected = Templates.WORLDWIDE.getData().get(defaults.get("address_template").textValue());
+    }
+
+    List<String> required = Arrays.asList("road", "postcode");
+    long count = required.stream().filter(req -> !components.containsKey(req)).count();
+    if (count == 2) {
+      if (template.has("fallback_template")) {
+        if (Templates.WORLDWIDE.getData().has(template.get("fallback_template").asText())) {
+          selected = Templates.WORLDWIDE.getData().get(template.get("fallback_template").asText());
+        } else {
+          selected = template.get("fallback_template");
+        }
+      } else {
+        JsonNode defaults = Templates.WORLDWIDE.getData().get("default");
+        selected = Templates.WORLDWIDE.getData().get(defaults.get("fallback_template").textValue());
+      }
+    }
+    return selected;
+  }
+
+  String getStateCode(String state, String countryCode) {
+    if (!Templates.STATE_CODES.getData().has(countryCode)) {
+      return null;
+    }
+
+    JsonNode countryCodes = Templates.STATE_CODES.getData().get(countryCode);
+    Iterator<String> iterator = countryCodes.fieldNames();
+    return StreamSupport
+        .stream(Spliterators.spliteratorUnknownSize(iterator,
+        Spliterator.ORDERED), false).filter(key-> {
+          JsonNode code = countryCodes.get(key);
+      if (code.isObject()) {
+        if (code.has("default")) {
+          return code.get("default").asText().toUpperCase().equals(state.toUpperCase());
+        }
+      } else {
+        return code.asText().toUpperCase().equals(state.toUpperCase());
+      }
+      return false;
+    }).findFirst().orElse(null);
+  }
+
+  String getCountyCode(String county, String countryCode) {
+    if (!Templates.COUNTY_CODES.getData().has(countryCode)) {
+      return null;
+    }
+    JsonNode country = Templates.COUNTY_CODES.getData().get(countryCode);
+    Optional<JsonNode> countyCode = StreamSupport.stream(country.spliterator(), true).filter(posCounty -> {
+      if (posCounty.isObject()) {
+        if (posCounty.has("default")) {
+          return posCounty.get("default").asText().toUpperCase().equals(county.toUpperCase());
+        }
+      } else {
+        return posCounty.asText().toUpperCase().equals(county.toUpperCase());
+      }
+      return false;
+    }).findFirst();
+
+    return countyCode.map(JsonNode::asText).orElse(null);
+  }
+
+  String renderTemplate(JsonNode template, Map<String, Object> components) {
+    Map<String, Object> callback = new HashMap<>();
+    callback.put("first", (Function<String, String>) s -> {
+      String[] splitted = s.split("\\s*\\|\\|\\s*");
+      Optional<String> chosen = Arrays.stream(splitted).filter(v -> v.length() > 0).findFirst();
+      return chosen.orElse("");
+    });
+
+    JsonNode templateText = chooseTemplateText(template, components);
+    MustacheFactory mf = new DefaultMustacheFactory();
+    Mustache m = mf.compile(new StringReader(templateText.asText()), "example");
+    StringWriter st = new StringWriter();
+    m.execute(st, new Object[]{ components, callback});
+    String rendered = cleanupRender(st.toString());
+
+    if (template.has("postformat_replace")) {
+      ArrayNode postformat = (ArrayNode) template.get("postformat_replace");
+      for (JsonNode regex : postformat) {
+        Pattern p = regexPatternCache.get(regex.get(0).asText());
+        Matcher m2 = p.matcher(rendered);
+        rendered = m2.replaceAll(regex.get(1).asText());
+      }
+    }
+    rendered = cleanupRender(rendered);
+    String trimmed = rendered.trim();
+
+    return trimmed + "\n";
+  }
+
+  String cleanupRender(String rendered) {
+    Set<Map.Entry<String, String>> entries = replacements.entrySet();
+    String deduped = rendered;
+
+    for(Map.Entry<String, String> replacement : entries) {
+      Pattern p = regexPatternCache.get(replacement.getKey());
+      Matcher m = p.matcher(deduped);
+      String predupe = m.replaceAll(replacement.getValue());
+      deduped = dedupe(predupe);
+    }
+
+    return deduped;
+  }
+
+  String dedupe(String rendered) {
+     return Arrays.stream(rendered.split("\n"))
+        .map(s -> Arrays.stream(s.trim().split(", "))
+            .map(String::trim).distinct().collect(Collectors.joining(", ")))
+        .distinct()
+        .collect(Collectors.joining("\n"));
+  }
+
+  static List<String> getKnownComponents() {
+    List<String> knownComponents = new ArrayList<>();
+    Iterator<JsonNode> fields = Templates.ALIASES.getData().elements();
+    while (fields.hasNext()) {
+      JsonNode field = fields.next();
+      knownComponents.add(field.get("alias").textValue());
+    }
+
+    return knownComponents;
+  }
+}
diff --git a/libs/address-formatter/src/main/java/org/woheller69/AndroidAddressFormatter/RegexPatternCache.java b/libs/address-formatter/src/main/java/org/woheller69/AndroidAddressFormatter/RegexPatternCache.java
new file mode 100644
index 00000000..bfab6518
--- /dev/null
+++ b/libs/address-formatter/src/main/java/org/woheller69/AndroidAddressFormatter/RegexPatternCache.java
@@ -0,0 +1,29 @@
+package org.woheller69.AndroidAddressFormatter;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.regex.Pattern;
+
+class RegexPatternCache {
+  private Map<String, Pattern> map = new HashMap<>();
+
+  public Pattern get(String key) {
+    if (map.containsKey(key)) {
+      return map.get(key);
+    } else {
+      Pattern newPattern = Pattern.compile(key);
+      map.put(key, newPattern);
+      return newPattern;
+    }
+  }
+
+  public Pattern get(String key, int flags) {
+    if (map.containsKey(key)) {
+      return map.get(key);
+    } else {
+      Pattern newPattern = Pattern.compile(key, flags);
+      map.put(key, newPattern);
+      return newPattern;
+    }
+  }
+}
diff --git a/libs/address-formatter/src/main/java/org/woheller69/AndroidAddressFormatter/Templates.java b/libs/address-formatter/src/main/java/org/woheller69/AndroidAddressFormatter/Templates.java
new file mode 100644
index 00000000..43cf3280
--- /dev/null
+++ b/libs/address-formatter/src/main/java/org/woheller69/AndroidAddressFormatter/Templates.java
@@ -0,0 +1,45 @@
+package org.woheller69.AndroidAddressFormatter;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
+import java.io.InputStream;
+
+enum Templates {
+  WORLDWIDE("worldwide.json"),
+  COUNTRY_NAMES("countrynames.json"),
+  ALIASES("aliases.json"),
+  ABBREVIATIONS("abbreviations.json"),
+  COUNTRY_2_LANG("country2lang.json"),
+  COUNTY_CODES("countycodes.json"),
+  STATE_CODES("statecodes.json")
+;
+
+  private interface Constants {
+    ObjectMapper jsonWriter = new ObjectMapper();
+  }
+
+  private final JsonNode data;
+
+  Templates(String fileName) {
+    this.data = setData(fileName);
+  }
+
+  synchronized public JsonNode getData() {
+    return this.data;
+  }
+
+  synchronized private static JsonNode setData(String fileName) {
+    JsonNode node = null;
+    try {
+      ClassLoader cl = Thread.currentThread().getContextClassLoader();
+
+      InputStream is = cl.getResourceAsStream(fileName);
+      node = Constants.jsonWriter.readTree(is);
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+
+    return node;
+  }
+}
diff --git a/libs/address-formatter/src/main/resources/abbreviations.json b/libs/address-formatter/src/main/resources/abbreviations.json
new file mode 100644
index 00000000..f6ccb7d8
--- /dev/null
+++ b/libs/address-formatter/src/main/resources/abbreviations.json
@@ -0,0 +1 @@
+{"NL":[{"component":"road","replacements":[{"src":"Burgemeester","dest":"Burg"},{"src":"Docter","dest":"Dr"},{"src":"Dokter","dest":"Dr"},{"src":"Gebroeders","dest":"Gebr"},{"src":"Generaal","dest":"Gen"},{"src":"Gracht","dest":"Gr"},{"src":"Kardinaal","dest":"Kard"},{"src":"Kolonel","dest":"Kol"},{"src":"Kort","dest":"K"},{"src":"Korte","dest":"Kte"},{"src":"Laan","dest":"ln"},{"src":"Lange","dest":"L"},{"src":"Markt","dest":"mkt"},{"src":"Minister","dest":"Min"},{"src":"Monseigneur","dest":"Mgr"},{"src":"Pastoor","dest":"Past"},{"src":"Prins","dest":"Pr"},{"src":"Prinses","dest":"Pr"},{"src":"Professor","dest":"Prof"},{"src":"Sint","dest":"St"},{"src":"Straat","dest":"str"},{"src":"Van","dest":"v"},{"src":"Vrouwe","dest":"Vr"},{"src":"Weg","dest":"wg"},{"src":"Zuster","dest":"Zr"}]}],"VN":[{"component":"road","replacements":[{"src":"Công trường","dest":"CT"},{"src":"Đại lộ","dest":"ĐL"},{"src":"Đường","dest":"D"},{"src":"Quảng trường","dest":"QT"}]}],"RU":[{"component":"country","replacements":[{"src":"Российская Федерация","dest":"РФ"}]},{"component":"state","replacements":[{"src":"автономный округ","dest":"АО"},{"src":"автономная область","dest":"Аобл"},{"src":"область","dest":"обл"},{"src":"Республика","dest":"Респ"}]},{"component":"county","replacements":[{"src":"городской округ","dest":"г.о."},{"src":"сельский округ","dest":"с.о."},{"src":"район","dest":"р-н"}]},{"component":"city","replacements":[{"src":"город","dest":"г"},{"src":"сельское поселение","dest":"с.п."},{"src":"сельский совет","dest":"с.с."}]},{"component":"village","replacements":[{"src":"поселок","dest":"пос"},{"src":"посёлок","dest":"пос"},{"src":"дачный поселок","dest":"дп"},{"src":"дачный посёлок","dest":"дп"},{"src":"деревня","dest":"д"},{"src":"курортный поселок","dest":"кп"},{"src":"курортный посёлок","dest":"кп"},{"src":"местечко","dest":"м"},{"src":"село","dest":"с"},{"src":"станица","dest":"ст-ца"},{"src":"поселок городского типа","dest":"пгт"},{"src":"посёлок городского типа","dest":"пгт"}]},{"component":"neighbourhood","replacements":[{"src":"квартал","dest":"кв-л"},{"src":"район","dest":"р-н"},{"src":"микрорайон","dest":"мкр"}]},{"component":"road","replacements":[{"src":"улица","dest":"ул"},{"src":"дорога","dest":"дор"},{"src":"переулок","dest":"пер"},{"src":"шоссе","dest":"ш"},{"src":"проспект","dest":"пр-кт"},{"src":"проезд","dest":"пр"},{"src":"площадь","dest":"пл"},{"src":"бульвар","dest":"б-р"},{"src":"набережная","dest":"наб"},{"src":"корпус","dest":"корп"},{"src":"строение","dest":"стр"},{"src":"тупик","dest":"туп"}]}],"FI":[{"component":"road","replacements":[{"src":"alue","dest":"al"},{"src":"asema","dest":"as"},{"src":"aukio","dest":"auk"},{"src":"kaari","dest":"kri"},{"src":"katu","dest":"k"},{"src":"kuja","dest":"kj"},{"src":"penger","dest":"pgr"},{"src":"polku","dest":"p"},{"src":"raitti","dest":"r"},{"src":"ranta","dest":"rt"},{"src":"rinne","dest":"rn"},{"src":"tie","dest":"t"},{"src":"tienhaara","dest":"th"},{"src":"tori","dest":"tr"},{"src":"väylä","dest":"vlä"}]}],"UK":[{"component":"road","replacements":[{"src":"бульвар","dest":"бул"},{"src":"дорога","dest":"дор"},{"src":"провулок","dest":"пров"},{"src":"площа","dest":"пл"},{"src":"проспект","dest":"просп"},{"src":"шосе","dest":"ш"},{"src":"вулиця","dest":"вул"}]}],"DE":[{"component":"road","replacements":[{"src":"Platz","dest":"Pl"},{"src":"Sankt","dest":"St"},{"src":"Straße","dest":"Str"},{"src":"Strasse","dest":"Str"}]}],"RO":[{"component":"road","replacements":[{"src":"Strada","dest":"Str"},{"src":"Intrarea","dest":"Intr"},{"src":"Bulevardul","dest":"Blvd"},{"src":"Soseaua","dest":"Sos"}]}],"DA":[{"component":"road","replacements":[{"src":"Gamle","dest":"Gl"},{"src":"Gammel","dest":"Gl"},{"src":"Lille","dest":"Ll"},{"src":"Nordre","dest":"Ndr"},{"src":"Nørre","dest":"Nr"},{"src":"Sankt","dest":"Skt"},{"src":"Store","dest":"St"},{"src":"Søndre","dest":"Sdr"},{"src":"Sønder","dest":"Sdr"},{"src":"Vester","dest":"V"},{"src":"Vestre","dest":"V"},{"src":"Øster","dest":"Ø"},{"src":"Østre","dest":"Ø"}]}],"CA":[{"component":"road","replacements":[{"src":"Carrer de","dest":"C"},{"src":"Rambla","dest":"Rbla"}]}],"EU":[{"component":"road","replacements":[{"src":"Kalea","dest":"K"},{"src":"Errepidea","dest":"Err"},{"src":"Etorbidea","dest":"Etorb"}]}],"PT":[{"component":"road","replacements":[{"src":"Alameda","dest":"Al"},{"src":"Avenida","dest":"Av"},{"src":"Azinhaga","dest":"Az"},{"src":"Bairro","dest":"Br"},{"src":"Beco","dest":"Bc"},{"src":"Calçada","dest":"Cc"},{"src":"Calçadinha","dest":"Ccnh"},{"src":"Caminho","dest":"Cam"},{"src":"Casal","dest":"Csl"},{"src":"Escadas","dest":"Esc"},{"src":"Escadinhas","dest":"Escnh"},{"src":"Estrada","dest":"Estr"},{"src":"Gaveto","dest":"Gav"},{"src":"Jardim","dest":"Jrd"},{"src":"Largo","dest":"Lg"},{"src":"Loteamento","dest":"Loteam"},{"src":"Parque","dest":"Pq"},{"src":"Pátio","dest":"Pto"},{"src":"Praça","dest":"Pc"},{"src":"Praceta","dest":"Pct"},{"src":"Prolongamento","dest":"Prolng"},{"src":"Quinta","dest":"Qta"},{"src":"Rotunda","dest":"Rot"},{"src":"Rua","dest":"R"},{"src":"Transversal","dest":"Transv"},{"src":"Travessa","dest":"Tv"},{"src":"Urbanização","dest":"Urb"},{"src":"Vila","dest":"Vl"},{"src":"Zona","dest":"Zn"}]}],"FR":[{"component":"road","replacements":[{"src":"Avenue","dest":"Av"},{"src":"Bâtiment","dest":"Bât"},{"src":"Boulevard","dest":"Boul"},{"src":"Cours","dest":"Crs"},{"src":"Place","dest":"Pl"},{"src":"Rue","dest":"r"},{"src":"Saint","dest":"St"},{"src":"Sainte","dest":"Ste"},{"src":"Zone industrielle","dest":"Z.I"}]}],"TR":[{"component":"road","replacements":[{"src":"Bulvar","dest":"Bl"},{"src":"Bulvarı","dest":"Bl"},{"src":"Cadde","dest":"Cd"},{"src":"Caddesi","dest":"Cd"},{"src":"Mahalle","dest":"Mh"},{"src":"Sokak","dest":"Sk"},{"src":"Sokağı","dest":"Sk"}]}],"CS":[{"component":"road","replacements":[{"src":"Ulice","dest":"Ul"},{"src":"Třída","dest":"Tř"},{"src":"Náměstí","dest":"Nám"}]}],"EN":[{"component":"country","replacements":[{"src":"United Kingdom","dest":"UK"},{"src":"United States of America","dest":"USA"},{"src":"United States Virgin Islands","dest":"USVI"}]},{"component":"road","replacements":[{"src":"Alley","dest":"Aly"},{"src":"Arcade","dest":"Arc"},{"src":"Avenue","dest":"Ave"},{"src":"Boulevard","dest":"Blvd"},{"src":"Circle","dest":"Cl"},{"src":"Court","dest":"Ct"},{"src":"Crescent","dest":"Cres"},{"src":"Crossroad","dest":"XRD"},{"src":"Drive","dest":"Dr"},{"src":"Esplanade","dest":"Esp"},{"src":"Expressway","dest":"EXPY"},{"src":"Extention","dest":"Ext"},{"src":"Freeway","dest":"Fwy"},{"src":"Grove","dest":"Gr"},{"src":"Highway","dest":"HWY"},{"src":"Mountain","dest":"Mtn"},{"src":"Northeast","dest":"NE"},{"src":"Northwest","dest":"NW"},{"src":"Place","dest":"Pl"},{"src":"Road","dest":"Rd"},{"src":"Southeast","dest":"SE"},{"src":"Southwest","dest":"SW"},{"src":"Square","dest":"Sq"},{"src":"Street","dest":"St"},{"src":"Terrace","dest":"Tce"},{"src":"Throughway","dest":"TRWY"}]}],"IT":[{"component":"road","replacements":[{"src":"Calle","dest":"C.le"},{"src":"Campo","dest":"C.po"},{"src":"Cascina","dest":"C.na"},{"src":"Corso","dest":"C.so"},{"src":"Corte","dest":"C.te"},{"src":"Fondamenta","dest":"F.te"},{"src":"Largo","dest":"L.go"},{"src":"Località","dest":"Loc."},{"src":"Lungomare","dest":"L.mare"},{"src":"Piazza","dest":"P.za"},{"src":"Piazzale","dest":"P.le"},{"src":"Piazzetta","dest":"P.ta"},{"src":"Ponte","dest":"P.te"},{"src":"Porta","dest":"P.ta"},{"src":"Salizada","dest":"S.da"},{"src":"San","dest":"S."},{"src":"Santa","dest":"S."},{"src":"Santo","dest":"S."},{"src":"Santissima","dest":"SS.ma"},{"src":"Santissime","dest":"SS.me"},{"src":"Santissimi","dest":"SS.mi"},{"src":"Santissimo","dest":"SS.mo"},{"src":"Stazione","dest":"Staz"},{"src":"Strada Comunale","dest":"SC"},{"src":"Strada Provinciale","dest":"SP"},{"src":"Strada Regionale","dest":"SR"},{"src":"Strada Statale","dest":"SS"},{"src":"Via","dest":"V"},{"src":"Viale","dest":"V.le"},{"src":"Vico","dest":"V.co"},{"src":"Vicolo","dest":"V.lo"}]}],"HU":[{"component":"road","replacements":[{"src":"utca","dest":"u"},{"src":"körút","dest":"krt"}]}],"SE":[{"component":"road","replacements":[{"src":"gata","dest":"g"},{"src":"gatan","dest":"g"},{"src":"gränd","dest":"gr"},{"src":"gränden","dest":"gr"},{"src":"lilla","dest":"l"},{"src":"norra","dest":"n"},{"src":"östra","dest":"ö"},{"src":"södra","dest":"s"},{"src":"stig","dest":"st"},{"src":"stora","dest":"st"},{"src":"västra","dest":"v"}]}],"PL":[{"component":"road","replacements":[{"src":"Aleja","dest":"al."},{"src":"Aleje","dest":"al."},{"src":"Alei","dest":"al."},{"src":"Alejach","dest":"al."},{"src":"Aleją","dest":"al."},{"src":"Biskupa","dest":"bpa."},{"src":"Biskup","dest":"bp."},{"src":"Doktora","dest":"dr."},{"src":"Księcia","dest":"ks."},{"src":"Księdza","dest":"ks."},{"src":"Kardynała","dest":"kard."},{"src":"Marszałka","dest":"marsz."},{"src":"Majora","dest":"mjr."},{"src":"Plac","dest":"pl."},{"src":"Placu","dest":"pl."},{"src":"Placem","dest":"pl."},{"src":"Profesora","dest":"prof."},{"src":"Pułkownika","dest":"płk."},{"src":"Rotmistrza","dest":"rotm."},{"src":"Ulica","dest":"ul."},{"src":"Ulice","dest":"ul."},{"src":"Ulicą","dest":"ul."},{"src":"Ulicy","dest":"ul."}]}],"ET":[{"component":"road","replacements":[{"src":"Maantee","dest":"mnt"},{"src":"Puiestee","dest":"pst"},{"src":"Raudtee","dest":"rdt"},{"src":"Raudteejaam","dest":"rdtj"},{"src":"Tänav","dest":"tn"}]}],"ES":[{"component":"road","replacements":[{"src":"Avenida","dest":"Avda"},{"src":"Calle de","dest":"C"},{"src":"Carrera","dest":"Cra"},{"src":"Carrero","dest":"Cro"},{"src":"Colonia","dest":"Col"},{"src":"Estación","dest":"Estcn"},{"src":"Gran Vía","dest":"GV"},{"src":"Mercado","dest":"Merc"},{"src":"Plaza","dest":"Pl"},{"src":"Parque","dest":"Pque"},{"src":"Pasaje","dest":"Psje"},{"src":"Paseo","dest":"Po"},{"src":"Pueblo","dest":"Pblo"},{"src":"Puente","dest":"Pnte"},{"src":"Puerta","dest":"Pta"},{"src":"Puerto","dest":"Pto"},{"src":"Rambla","dest":"Rbla"},{"src":"Ronda","dest":"Rda"},{"src":"Rotonda","dest":"Rtda"},{"src":"San","dest":"S"},{"src":"Sector","dest":"Sect"},{"src":"Santa","dest":"Sta"},{"src":"Viaducto","dest":"Vcto"}]}],"NO":[{"component":"road","replacements":[{"src":"gata","dest":"g"},{"src":"gate","dest":"g"},{"src":"gaten","dest":"g"},{"src":"plass","dest":"pl"},{"src":"plassen","dest":"pl"},{"src":"sving","dest":"sv"},{"src":"svingen","dest":"sv"},{"src":"veg","dest":"v"},{"src":"vegen","dest":"v"},{"src":"vei","dest":"v"},{"src":"veien","dest":"v"}]}],"SK":[{"component":"road","replacements":[{"src":"Armádneho generála","dest":"Arm. gen"},{"src":"Československej","dest":"Čsl"},{"src":"Doktora","dest":"Dr"},{"src":"Doktorky","dest":"Dr"},{"src":"Generála","dest":"Gen"},{"src":"Inžiniera","dest":"Ing"},{"src":"Inžinierky","dest":"Ing"},{"src":"Kapitána","dest":"Kpt"},{"src":"Majora","dest":"Mjr"},{"src":"Nábrežie","dest":"Nábr"},{"src":"Námestie","dest":"Nám"},{"src":"Plukovníka","dest":"Plk"},{"src":"Podplukovníka","dest":"Pplk"},{"src":"Podporučíka","dest":"Ppor"},{"src":"Poručíka","dest":"Por"},{"src":"Profesora","dest":"Prof"},{"src":"Profesorky","dest":"Prof"},{"src":"Sídlisko","dest":"Sídl"},{"src":"Svätého","dest":"Sv"},{"src":"Svätej","dest":"Sv"},{"src":"Ulica","dest":"Ul"}]}]}
diff --git a/libs/address-formatter/src/main/resources/aliases.json b/libs/address-formatter/src/main/resources/aliases.json
new file mode 100644
index 00000000..d7d7d8a4
--- /dev/null
+++ b/libs/address-formatter/src/main/resources/aliases.json
@@ -0,0 +1 @@
+[{"alias":"street_number","name":"house_number"},{"alias":"housenumber","name":"house_number"},{"alias":"house_number","name":"house_number"},{"alias":"building","name":"house"},{"alias":"public_building","name":"house"},{"alias":"isolated_dwelling","name":"house"},{"alias":"farmland","name":"house"},{"alias":"allotments","name":"house"},{"alias":"house","name":"house"},{"alias":"footway","name":"road"},{"alias":"street","name":"road"},{"alias":"street_name","name":"road"},{"alias":"residential","name":"road"},{"alias":"path","name":"road"},{"alias":"pedestrian","name":"road"},{"alias":"road_reference","name":"road"},{"alias":"road_reference_intl","name":"road"},{"alias":"square","name":"road"},{"alias":"place","name":"road"},{"alias":"road","name":"road"},{"alias":"locality","name":"hamlet"},{"alias":"croft","name":"hamlet"},{"alias":"hamlet","name":"hamlet"},{"alias":"village","name":"village"},{"alias":"suburb","name":"neighbourhood"},{"alias":"city_district","name":"neighbourhood"},{"alias":"district","name":"neighbourhood"},{"alias":"quarter","name":"neighbourhood"},{"alias":"borough","name":"neighbourhood"},{"alias":"city_block","name":"neighbourhood"},{"alias":"residential","name":"neighbourhood"},{"alias":"commercial","name":"neighbourhood"},{"alias":"industrial","name":"neighbourhood"},{"alias":"houses","name":"neighbourhood"},{"alias":"subdistrict","name":"neighbourhood"},{"alias":"subdivision","name":"neighbourhood"},{"alias":"ward","name":"neighbourhood"},{"alias":"neighbourhood","name":"neighbourhood"},{"alias":"postal_city","name":"postal_city"},{"alias":"town","name":"city"},{"alias":"township","name":"city"},{"alias":"city","name":"city"},{"alias":"local_administrative_area","name":"municipality"},{"alias":"subcounty","name":"municipality"},{"alias":"municipality","name":"municipality"},{"alias":"county_code","name":"county"},{"alias":"department","name":"county"},{"alias":"county","name":"county"},{"alias":"state_district","name":"state_district"},{"alias":"postal_code","name":"postcode"},{"alias":"partial_postcode","name":"postcode"},{"alias":"postcode","name":"postcode"},{"alias":"province","name":"state"},{"alias":"state_code","name":"state"},{"alias":"state","name":"state"},{"alias":"region","name":"region"},{"alias":"island","name":"island"},{"alias":"archipelago","name":"archipelago"},{"alias":"country_name","name":"country"},{"alias":"country","name":"country"},{"alias":"country_code","name":"country_code"},{"alias":"continent","name":"continent"}]
diff --git a/libs/address-formatter/src/main/resources/country2lang.json b/libs/address-formatter/src/main/resources/country2lang.json
new file mode 100644
index 00000000..e5b51472
--- /dev/null
+++ b/libs/address-formatter/src/main/resources/country2lang.json
@@ -0,0 +1 @@
+{"AD":["CA"],"AE":["AR","EN"],"AF":["FA","PS"],"AG":["EN"],"AI":["EN"],"AL":["SQ"],"AM":["HY"],"AO":["PT"],"AQ":["EN"],"AR":["ES"],"AS":["EN"],"AT":["DE"],"AU":["EN"],"AW":["NL"],"AX":["FI","SE"],"AZ":["AZ"],"BA":["BS","HR","SR"],"BB":["EN"],"BD":["BN"],"BE":["FR","NL","DE"],"BF":["FR"],"BG":["BG"],"BH":["AR","EN"],"BI":["EN"],"BJ":["FR"],"BL":["FR"],"BM":["EN"],"BN":["EN","MS"],"BO":["ES"],"BQ":["NL","EN"],"BR":["PT"],"BS":["EN"],"BT":["DZ"],"BV":["NO"],"BW":["EN"],"BY":["BY","RU"],"BZ":["EN","ES"],"CA":["EN","FR"],"CC":["EN"],"CD":["FR"],"CF":["FR"],"CG":["FR"],"CH":["DE","FR","IT"],"CI":["FR"],"CK":["EN"],"CL":["ES"],"CM":["EN"],"CN":["ZH"],"CO":["ES"],"CR":["ES"],"CU":["ES"],"CV":["PT"],"CW":["EN","NL"],"CX":["EN"],"CY":["HE"],"CZ":["CS"],"DE":["DE"],"DJ":["AR","FR"],"DK":["DA"],"DM":["EN"],"DO":["ES"],"DZ":["AR","FR"],"EC":["ES"],"EE":["ET"],"EG":["AR"],"EH":["AR"],"ER":["AR","IT","TI"],"ES":["CA","ES","EU","GL"],"ET":["AM","OM","SO","TI"],"FI":["FI","SE"],"FJ":["EN"],"FK":["EN"],"FM":["EN"],"FO":["DA"],"FR":["FR"],"GA":["FR"],"GB":["EN"],"GD":["EN"],"GE":["KA"],"GG":["EN"],"GF":["FR"],"GH":["EN"],"GI":["EN"],"GL":["DA","KL"],"GM":["EN"],"GN":["FR"],"GP":["FR"],"GQ":["ES","FR","PT"],"GR":["EL"],"GS":["EN"],"GT":["ES"],"GU":["EN"],"GW":["PT"],"GY":["EN"],"HK":["EN","ZH"],"HM":["EN"],"HN":["ES"],"HR":["HR"],"HT":["FR","HT"],"HU":["HU"],"ID":["ID"],"IE":["EN"],"IL":["AR","HE"],"IM":["EN"],"IN":["EN"],"IO":["EN"],"IQ":["AR"],"IR":["FA"],"IS":["IS"],"IT":["IT"],"JE":["EN"],"JM":["EN"],"JO":["AR"],"JP":["JP"],"KE":["EN"],"KG":["KY","RU"],"KH":["KM"],"KI":["EN"],"KM":["AR","FR"],"KN":["EN"],"KP":["KO"],"KR":["KO"],"KW":["AR"],"KY":["EN"],"KZ":["KK","RU"],"LA":["LO"],"LB":["AR"],"LC":["EN"],"LI":["DE"],"LK":["EN","SI","TA"],"LR":["EN"],"LS":["EN","ST"],"LT":["LT"],"LU":["DE","FR"],"LV":["LV"],"LY":["AR"],"MA":["AR","FR"],"MC":["FR"],"MD":["RO"],"ME":["SR"],"MF":["FR"],"MG":["FR","MG"],"MH":["EN"],"MK":["MK"],"ML":["FR"],"MM":["MY"],"MN":["MN"],"MO":["PT","ZH"],"MP":["EN"],"MQ":["FR"],"MR":["AR","FR"],"MS":["EN"],"MT":["EN","MT"],"MU":["EN","FR"],"MV":["DV"],"MW":["EN","NY"],"MX":["ES"],"MY":["MS"],"MZ":["PT"],"NA":["EN"],"NC":["FR"],"NE":["FR"],"NF":["EN"],"NG":["ES"],"NI":["ES"],"NL":["NL"],"NO":["NO"],"NP":["EN"],"NR":["EN"],"NU":["EN"],"NZ":["EN"],"OM":["AR","EN"],"PA":["ES"],"PE":["ES"],"PF":["FR"],"PG":["EN"],"PH":["EN","TL"],"PK":["EN"],"PL":["PL"],"PM":["FR"],"PN":["EN"],"PR":["EN","ES"],"PS":["AR"],"PT":["PT"],"PW":["EN"],"PY":["ES"],"QA":["AR","EN"],"RE":["FR"],"RO":["RO"],"RS":["SR"],"RU":["RU"],"RW":["EN","FR","RW"],"SA":["AR"],"SB":["EN"],"SC":["EN","FR"],"SD":["AR","EN"],"SE":["SE"],"SG":["EN"],"SH":["EN"],"SI":["SL"],"SJ":["NO"],"SK":["SK"],"SL":["EN"],"SM":["IT"],"SN":["FR"],"SO":["SO"],"SR":["NL"],"SS":["EN"],"ST":["PT"],"SV":["ES"],"SX":["EN","NL"],"SY":["AR"],"SZ":["EN","SS"],"TC":["EN"],"TD":["FR"],"TF":["FR"],"TG":["FR"],"TH":["TH"],"TJ":["RU","TG"],"TK":["EN"],"TL":["EN","ID","PT"],"TN":["AR","FR"],"TM":["RU","TK"],"TO":["EN","TO"],"TR":["TR"],"TT":["EN"],"TV":["EN"],"TW":["ZH"],"TZ":["EN","SW"],"UA":["UK"],"UG":["EN","SW"],"UM":["EN"],"US":["EN"],"UY":["ES"],"UZ":["UZ"],"VA":["IT"],"VC":["EN"],"VE":["ES"],"VG":["EN"],"VI":["EN"],"VN":["VN"],"VU":["EN"],"WF":["FR"],"WS":["EN"],"YE":["AR"],"YT":["FR"],"ZA":["EN"],"ZM":["EN"],"ZW":["EN"]}
diff --git a/libs/address-formatter/src/main/resources/countrynames.json b/libs/address-formatter/src/main/resources/countrynames.json
new file mode 100644
index 00000000..e5ff8b58
--- /dev/null
+++ b/libs/address-formatter/src/main/resources/countrynames.json
@@ -0,0 +1 @@
+{"AD":"Andorra","AE":"United Arab Emirates","AF":"Afghanistan","AG":"Antigua and Barbuda","AI":"Anguilla","AL":"Albania","AM":"Armenia","AO":"Angola","AQ":"Antarctica","AR":"Argentina","AS":"American Samoa","AT":"Austria","AU":"Australia","AW":"Aruba","AX":"Åland Islands","AZ":"Azerbaijan","BA":"Bosnia and Herzegovina","BB":"Barbados","BD":"Bangladesh","BE":"Belgium","BF":"Burkina Faso","BG":"Bulgaria","BH":"Bahrain","BI":"Burundi","BJ":"Benin","BL":"Saint Barthélemy","BM":"Bermuda","BN":"Brunei","BO":"Bolivia","BQ":"Caribbean Netherlands","BR":"Brazil","BS":"The Bahamas","BT":"Bhutan","BV":"Bouvet Island","BW":"Botswana","BY":"Belarus","BZ":"Belize","CA":"Canada","CC":"Cocos (Keeling) Islands","CD":"Democratic Republic of the Congo","CF":"Central African Republic","CG":"Republic of the Congo","CH":"Switzerland","CI":"Côte d'Ivoire","CK":"Cook Islands","CL":"Chile","CM":"Cameroon","CN":"China","CO":"Colombia","CR":"Costa Rica","CU":"Cuba","CV":"Cabo Verde","CW":"Curaçao","CX":"Christmas Island","CY":"Cyprus","CZ":"Czech Republic","DE":"Germany","DJ":"Djibouti","DK":"Denmark","DM":"Dominica","DO":"Dominican Republic","DZ":"Algeria","EC":"Ecuador","EE":"Estonia","EG":"Egypt","EH":"Western Sahara","ER":"Eritrea","ES":"Spain","ET":"Ethiopia","FI":"Finland","FJ":"Fiji","FK":"Falkland Islands","FM":"Federated States of Micronesia","FO":"Faroe Islands","FR":"France","GA":"Gabon","GB":"United Kingdom","GD":"Grenada","GE":"Georgia (country)","GF":"French Guiana","GG":"Guernsey","GH":"Ghana","GI":"Gibraltar","GL":"Greenland","GM":"The Gambia","GN":"Guinea","GP":"Guadeloupe","GQ":"Equatorial Guinea","GR":"Greece","GS":"South Georgia and the South Sandwich Islands","GT":"Guatemala","GU":"Guam","GW":"Guinea-Bissau","GY":"Guyana","HK":"Hong Kong","HM":"Heard Island and McDonald Islands","HN":"Honduras","HR":"Croatia","HT":"Haiti","HU":"Hungary","ID":"Indonesia","IE":"Republic of Ireland","IL":"Israel","IM":"Isle of Man","IN":"India","IO":"British Indian Ocean Territory","IQ":"Iraq","IR":"Iran","IS":"Iceland","IT":"Italy","JE":"Jersey","JM":"Jamaica","JO":"Jordan","JP":"Japan","KE":"Kenya","KG":"Kyrgyzstan","KH":"Cambodia","KI":"Kiribati","KM":"Comoros","KN":"Saint Kitts and Nevis","KP":"North Korea","KR":"South Korea","KW":"Kuwait","KY":"Cayman Islands","KZ":"Kazakhstan","LA":"Laos","LB":"Lebanon","LC":"Saint Lucia","LI":"Liechtenstein","LK":"Sri Lanka","LR":"Liberia","LS":"Lesotho","LT":"Lithuania","LU":"Luxembourg","LV":"Latvia","LY":"Libya","MA":"Morocco","MC":"Monaco","MD":"Moldova","ME":"Montenegro","MF":"Collectivity of Saint Martin","MG":"Madagascar","MH":"Marshall Islands","MK":"Republic of North Macedonia","ML":"Mali","MM":"Myanmar","MN":"Mongolia","MO":"Macau","MP":"Northern Mariana Islands","MQ":"Martinique","MR":"Mauritania","MS":"Montserrat","MT":"Malta","MU":"Mauritius","MV":"Maldives","MW":"Malawi","MX":"Mexico","MY":"Malaysia","MZ":"Mozambique","NA":"Namibia","NC":"New Caledonia","NE":"Niger","NF":"Norfolk Island","NG":"Nigeria","NI":"Nicaragua","NL":"Netherlands","NO":"Norway","NP":"Nepal","NR":"Nauru","NU":"Niue","NZ":"New Zealand","OM":"Oman","PA":"Panama","PE":"Peru","PF":"French Polynesia","PG":"Papua New Guinea","PH":"Philippines","PK":"Pakistan","PL":"Poland","PM":"Saint Pierre and Miquelon","PN":"Pitcairn Islands","PR":"Puerto Rico","PS":"State of Palestine","PT":"Portugal","PW":"Palau","PY":"Paraguay","QA":"Qatar","RE":"Réunion","RO":"Romania","RS":"Serbia","RU":"Russia","RW":"Rwanda","SA":"Saudi Arabia","SB":"Solomon Islands","SC":"Seychelles","SD":"Sudan","SE":"Sweden","SG":"Singapore","SH":"Saint Helena, Ascension and Tristan da Cunha","SI":"Slovenia","SJ":"Svalbard and Jan Mayen","SK":"Slovakia","SL":"Sierra Leone","SM":"San Marino","SN":"Senegal","SO":"Somalia","SR":"Suriname","SS":"South Sudan","ST":"São Tomé and Príncipe","SV":"El Salvador","SX":"Sint Maarten","SY":"Syria","SZ":"Swaziland","TC":"Turks and Caicos Islands","TD":"Chad","TF":"French Southern and Antarctic Lands","TG":"Togo","TH":"Thailand","TJ":"Tajikistan","TK":"Tokelau","TL":"East Timor","TM":"Turkmenistan","TN":"Tunisia","TO":"Tonga","TR":"Turkey","TT":"Trinidad and Tobago","TV":"Tuvalu","TW":"Taiwan","TZ":"Tanzania","UA":"Ukraine","UG":"Uganda","UM":"United States Minor Outlying Islands","US":"United States","UY":"Uruguay","UZ":"Uzbekistan","VA":"Vatican City","VC":"Saint Vincent and the Grenadines","VE":"Venezuela","VG":"British Virgin Islands","VI":"United States Virgin Islands","VN":"Vietnam","VU":"Vanuatu","WF":"Wallis and Futuna","WS":"Samoa","YE":"Yemen","YT":"Mayotte","ZA":"South Africa","ZM":"Zambia","ZW":"Zimbabwe"}
diff --git a/libs/address-formatter/src/main/resources/countycodes.json b/libs/address-formatter/src/main/resources/countycodes.json
new file mode 100644
index 00000000..cd3eb8db
--- /dev/null
+++ b/libs/address-formatter/src/main/resources/countycodes.json
@@ -0,0 +1 @@
+{"ES":{"A":"Alicante","AB":"Albacete","AL":"Almería","AV":"Ávila","B":{"default":"Barcelonés","alt_ca":"Barcelonès","alt_en":"Barcelona"},"BA":"Badajoz","BI":"Vizcaya","BU":"Burgos","C":"A Coruña","CA":"Cádiz","CC":"Cáceres","CO":"Córdoba","CR":"Ciudad Real","CS":"Castellón","CU":"Cuenca","GC":"Las Palmas","GI":{"default":"Gironés","alt_ca":"Gironès","alt_en":"Girona"},"GR":"Granada","GU":"Guadalajara","H":"Huelva","HU":"Huesca","J":"Jaén","L":{"default":"Lérida","alt_ca":"Lleida"},"LE":"León","LO":"La Rioja","LU":"Lugo","M":"Comunidad de Madrid","MA":"Málaga","MU":"Región de Murcia","NA":"Navarra","O":"Asturias","OR":"Ourense","P":"Palencia","PM":"Islas Baleares","PO":"Pontevedra","S":"Cantabria","SA":"Salamanca","SE":"Sevilla","SG":"Segovia","SO":"Soria","SS":"Guipúzcoa","T":"Tarragona","TE":"Teruel","TF":"Santa Cruz de Tenerife","TO":"Toledo","V":"Valencia","VA":"Valladolid","VI":"Álava","Z":"Zaragoza","ZA":"Zamora"},"GB":{"ABC":"County Armagh","ABD":"Aberdeenshire","ABE":"Aberdeen City","AGB":"Argyll and Bute","AGY":"Isle of Anglesey","AND":"Ards and North Down","ANN":"Antrim and Newtownabbey","ANS":"Angus","ARM":"Armagh","BAS":"Bath and North East Somerset","BBD":"Blackburn with Darwen","BDF":"Bedford","BDG":"London Borough of Barking and Dagenham","BEN":"London Borough of Brent","BEX":"London Borough of Bexley","BFS":"Belfast","BGE":"Bridgend","BGW":"Blaenau Gwent","BIR":"Birmingham","BKM":"Buckinghamshire","BMH":"Bournemouth","BNE":"London Borough of Barnet","BNH":"Brighton and Hove","BNS":"Barnsley","BOL":"Bolton","BPL":"Blackpool","BRC":"Bracknell Forest","BRD":"Bradford","BRY":"London Borough of Bromley","BST":"City of Bristol","BUR":"Bury","CAM":"Cambridgeshire","CAY":"Caerphilly","CBF":"Central Bedfordshire","CCG":"Causeway Coast and Glens","CGN":"Ceredigion","CHE":"Cheshire East","CHW":"Cheshire West and Chester","CLD":"Calderdale","CLK":"Clackmannanshire","CMA":"Cumbria","CMD":"London Borough of Camden","CMN":"Carmarthenshire","CON":"Cornwall","COV":"Coventry","CRF":"Cardiff","CRY":"London Borough of Croydon","CWY":"Conwy","DAL":"Darlington","DBY":"Derbyshire","DEN":"Denbighshire","DER":"Derby","DEV":"Devon","DGY":"Dumfries and Galloway","DNC":"Doncaster","DND":"Dundee City","DOR":"Dorset","DRS":"Derry and Strabane","DUD":"Dudley","DUR":"Durham","EAL":"London Borough of Ealing","EAY":"East Ayrshire","EDH":"City of Edinburgh","EDU":"East Dunbartonshire","ELN":"East Lothian","ELS":"Eilean Siar","ENF":"Enfield","ERW":"East Renfrewshire","ERY":"East Riding of Yorkshire","ESS":"Essex","ESX":"East Sussex","FAL":"Falkirk","FIF":"Fife","FLN":"Flintshire","FMO":"Fermanagh and Omagh","GAT":"Gateshead","GLG":"Glasgow City","GLS":"Gloucestershire","GRE":"Royal Borough of Greenwich","GWN":"Gwynedd","HAL":"Halton","HAM":"Hampshire","HAV":"London Borough of Havering","HCK":"London Borough of Hackney","HEF":"Herefordshire","HIL":"London Borough of Hillingdon","HLD":"Highland","HMF":"London Borough of Hammersmith and Fulham","HNS":"London Borough of Hounslow","HPL":"Hartlepool","HRT":"Hertfordshire","HRW":"London Borough of Harrow","HRY":"London Borough of Haringey","IOS":"Isles of Scilly","IOW":"Isle of Wight","ISL":"London Borough of Islington","IVC":"Inverclyde","KEC":"Royal Borough of Kensington and Chelsea","KEN":"Kent","KHL":"Kingston upon Hull","KIR":"Kirklees","KTT":"Royal Borough of Kingston upon Thames","KWL":"Knowsley","LAN":"Lancashire","LBC":"Lisburn and Castlereagh","LBH":"London Borough of Lambeth","LCE":"Leicester","LDS":"Leeds","LEC":"Leicestershire","LEW":"London Borough of Lewisham","LIN":"Lincolnshire","LIV":"Liverpool","LND":"City of London","LUT":"Luton","MAN":"Manchester","MDB":"Middlesbrough","MDW":"Medway","MEA":"Mid and East Antrim","MIK":"Milton Keynes","MLN":"Midlothian","MON":"Monmouthshire","MRT":"London Borough of Merton","MRY":"Moray","MTY":"Merthyr Tydfil","MUL":"Mid Ulster","NAY":"North Ayrshire","NBL":"Northumberland","NEL":"North East Lincolnshire","NET":"Newcastle upon Tyne","NFK":"Norfolk","NGM":"Nottingham","NLK":"North Lanarkshire","NLN":"North Lincolnshire","NMD":"County Down","NSM":"North Somerset","NTH":"Northamptonshire","NTL":"Neath Port Talbot","NTT":"Nottinghamshire","NTY":"North Tyneside","NWM":"London Borough of Newham","NWP":"Newport","NYK":"North Yorkshire","OLD":"Oldham","ORK":"Orkney Islands","OXF":"Oxfordshire","PEM":"Pembrokeshire","PKN":"Perth and Kinross","PLY":"Plymouth","POL":"Poole","POR":"Portsmouth","POW":"Powys","PTE":"Peterborough","RCC":"Redcar and Cleveland","RCH":"Rochdale","RCT":"Rhondda Cynon Taf","RDB":"London Borough of Redbridge","RDG":"Reading","RFW":"Renfrewshire","RIC":"London Borough of Richmond upon Thames","ROT":"Rotherham","RUT":"Rutland","SAW":"Sandwell","SAY":"South Ayrshire","SCB":"Scottish Borders","SFK":"Suffolk","SFT":"Sefton","SGC":"South Gloucestershire","SHF":"Sheffield","SHN":"St. Helens","SHR":"Shropshire","SKP":"Stockport","SLF":"Salford","SLG":"Slough","SLK":"South Lanarkshire","SND":"Sunderland","SOL":"Solihull","SOM":"Somerset","SOS":"Southend-on-Sea","SRY":"Surrey","STE":"Stoke-on-Trent","STG":"Stirling","STH":"Southampton","STN":"London Borough of Sutton","STS":"Staffordshire","STT":"Stockton-on-Tees","STY":"South Tyneside","SWA":"Swansea","SWD":"Swindon","SWK":"London Borough of Southwark","TAM":"Tameside","TFW":"Telford and Wrekin","THR":"Thurrock","TOB":"Torbay","TOF":"Torfaen","TRF":"Trafford","TWH":"London Borough of Tower Hamlets","VGL":"Vale of Glamorgan","WAR":"Warwickshire","WBK":"West Berkshire","WDU":"West Dunbartonshire","WFT":"London Borough of Waltham Forest","WGN":"Wigan","WIL":"Wiltshire","WKF":"Wakefield","WLL":"Walsall","WLN":"West Lothian","WLV":"Wolverhampton","WND":"London Borough of Wandsworth","WNM":"Windsor and Maidenhead","WOK":"Wokingham","WOR":"Worcestershire","WRL":"Wirral","WRT":"Warrington","WRX":"Wrexham","WSM":"Westminster","WSX":"West Sussex","YOR":"York","ZET":"Shetland Islands"},"IE":{"CE":"County Clare","CN":"County Cavan","CO":"County Cork","CW":"County Carlow","D":"County Dublin","DL":"County Donegal","G":"County Galway","KE":"County Kildare","KK":"County Kilkenny","KY":"County Kerry","LD":"County Longford","LH":"County Louth","LK":"County Limerick","LM":"County Leitrim","LS":"County Laois","MH":"County Meath","MN":"County Monaghan","MO":"County Mayo","OY":"County Offaly","RN":"County Roscommon","SO":"County Sligo","TA":"County Tipperary","WD":"County Waterford","WH":"County Westmeath","WW":"County Wicklow","WX":"County Wexford"},"IT":{"AG":"Agrigento","AL":"Alessandria","AN":"Ancona","AO":"Aosta","AP":"Ascoli Piceno","AQ":"L'Aquila","AR":"Arezzo","AT":"Asti","AV":"Avellino","BA":"Bari","BG":"Bergamo","BI":"Biella","BL":"Belluno","BN":"Benevento","BO":"Bologna","BR":"Brindisi","BS":"Brescia","BT":"Barletta-Andria-Trani","BZ":{"default":"Bolzano - Bozen","alt_de":"Südtirol","alt_en":"South Tyrol","alt_it":"Bolzano"},"CA":"Cagliari","CB":"Campobasso","CE":"Caserta","CH":"Chieti","CL":"Caltanissetta","CN":"Cuneo","CO":"Como","CR":"Cremona","CS":"Cosenza","CT":"Catania","CZ":"Catanzaro","EN":"Enna","FC":"Forlì-Cesena","FE":"Ferrara","FG":"Foggia","FI":{"default":"Firenze","alt_en":"Florence"},"FM":"Fermo","FR":"Frosinone","GE":"Genova","GR":"Grosseto","IM":"Imperia","IS":"Isernia","KR":"Crotone","LC":"Lecco","LE":"Lecce","LI":"Livorno","LO":"Lodi","LT":"Latina","LU":"Lucca","MB":{"default":"Monza e della Brianza","alt_en":"Monza and Brianza"},"MC":"Macerata","ME":"Messina","MI":{"default":"Milano","alt_en":"Milan"},"MN":"Mantova","MO":"Modena","MS":"Massa-Carrara","MT":"Matera","NA":"Napoli","NO":"Novara","NU":"Nuoro","OG":"Ogliastra","OR":"Oristano","OT":"Olbia-Tempio","PA":"Palermo","PC":"Piacenza","PD":"Padova","PE":"Pescara","PG":"Perugia","PI":"Pisa","PO":"Prato","PR":"Parma","PT":"Pistoia","PU":"Pesaro e Urbino","PV":"Pavia","PZ":"Potenza","RA":"Ravenna","RC":"Reggio Calabria","RE":"Reggio Emilia","RG":"Ragusa","RI":"Rieti","RM":{"default":"Roma Capitale","alt_en":"Rome"},"RN":"Rimini","RO":"Rovigo","SA":"Salerno","SI":"Siena","SO":"Sondrio","SP":"La Spezia","SR":"Siracusa","SS":"Sassari","SV":"Savona","TA":"Taranto","TE":"Teramo","TN":"Provincia di Trento","TO":"Provincia di Torino","TP":"Trapani","TR":"Terni","TV":"Treviso","VA":"Varese","VB":"Verbano-Cusio-Ossola","VC":"Vercelli","VE":"Venezia","VI":"Vicenza","VR":"Verona","VT":"Viterbo","VV":"Vibo Valentia"},"LU":{"CA":{"default":"Canton Capellen","alt_de":"Kanton Kapellen"},"CL":{"default":"Canton Clervaux","alt_de":"Kanton Clerf"},"DI":{"default":"Canton Diekirch","alt_de":"Kanton Diekirch"},"EC":{"default":"Canton Echternach","alt_de":"Kanton Echternach"},"ES":{"default":"Canton Esch-sur-Alzette","alt_de":"Kanton Esch an der Alzette"},"GR":{"default":"Canton Grevenmacher","alt_de":"Kanton Grevenmacher"},"LU":{"default":"Canton Luxembourg","alt_de":"Kanton Luxemburg"},"ME":{"default":"Canton Mersch","alt_de":"Kanton Mersch"},"RD":{"default":"Canton Redange","alt_de":"Kanton Redingen"},"RM":{"default":"Canton Remich","alt_de":"Kanton Remich"},"VD":{"default":"Canton Vianden","alt_de":"Kanton Vianden"},"WI":{"default":"Canton Wiltz","alt_de":"Kanton Wiltz"}},"PT":{"ABF":"Albufeira","ABL":"Albergaria-a-Velha","ABT":"Abrantes","ACB":"Alcobaça","ACH":"Alcochete","ACN":"Alcanena","ACT":"Alcoutim","ADL":"Alandroal","ADV":"Almodôvar","AFE":"Alfândega da Fé","AGB":"Aguiar da Beira","AGD":"Águeda","AGH":"Angra do Heroísmo","AGN":"Arganil","AJT":"Aljustrel","AJZ":"Aljezur","ALD":"Almeida","ALJ":"Alijó","ALM":"Almada","ALQ":"Alenquer","ALR":"Almeirim","ALT":"Alter do Chão","AMD":"Amadora","AMM":"Armamar","AMR":"Amares","AMT":"Amarante","AND":"Anadia","ANS":"Ansião","APC":"Alpiarça","ARC":"Arouca","ARL":"Arraiolos","ARR":"Arronches","ARV":"Arruda dos Vinhos","ASL":"Alcácer do Sal","AVR":"Aveiro","AVS":"Avis","AVT":"Alvito","AVV":"Arcos de Valdevez","AVZ":"Alvaiázere","AZB":"Azambuja","BAO":"Baião","BBR":"Bombarral","BCL":"Barcelos","BGC":"Bragança","BJA":"Beja","BMT":"Belmonte","BNV":"Benavente","BRB":"Borba","BRC":"Barrancos","BRG":"Braga","BRR":"Barreiro","BTC":"Boticas","BTL":"Batalha","CBC":"Cabeceiras de Basto","CBR":"Coimbra","CBT":"Celorico de Basto","CCH":"Coruche","CDN":"Condeixa-a-Nova","CDR":"Castro Daire","CDV":"Cadaval","CHM":"Chamusca","CHT":"Calheta","CHV":"Chaves","CLB":"Celorico da Beira","CLD":"Caldas da Rainha","CLT":"Calheta","CML":"Câmara de Lobos","CMN":"Caminha","CMR":"Campo Maior","CNF":"Cinfães","CNT":"Cantanhede","CPR":"Castanheira de Pera","CPV":"Castelo de Paiva","CRS":"Carregal do Sal","CRT":"Crato","CRV":"Corvo","CRZ":"Carrazeda de Ansiães","CSC":"Cascais","CTB":"Castelo Branco","CTC":"Constância","CTM":"Castro Marim","CTX":"Cartaxo","CUB":"Cuba","CVD":"Castelo de Vide","CVL":"Covilhã","CVR":"Castro Verde","ELV":"Elvas","ENT":"Entroncamento","EPS":"Esposende","ESP":"Espinho","ETR":"Estarreja","ETZ":"Estremoz","EVR":"Évora","FAF":"Fafe","FAG":"Fornos de Algodres","FAL":"Ferreira do Alentejo","FAR":"Faro","FCR":"Figueira de Castelo Rodrigo","FEC":"Freixo de Espada à Cinta","FIG":"Figueira da Foz","FLG":"Felgueiras","FND":"Fundão","FTR":"Fronteira","FUN":"Funchal","FVN":"Figueiró dos Vinhos","FZZ":"Ferreira do Zêzere","GAV":"Gavião","GDL":"Grândola","GDM":"Gondomar","GLG":"Golegã","GMR":"Guimarães","GOI":"Góis","GRD":"Guarda","GVA":"Gouveia","HRT":"Horta","IDN":"Idanha-a-Nova","ILH":"Ílhavo","LAG":"Lagoa","LGA":"Lagoa","LGF":"Lajes das Flores","LGP":"Lajes do Pico","LGS":"Lagos","LLE":"Loulé","LMG":"Lamego","LNH":"Lourinhã","LRA":"Leiria","LRS":"Loures","LSA":"Lousã","LSB":"Lisboa","LSD":"Lousada","MAC":"Mação","MAD":"Madalena","MAI":"Maia","MBR":"Moimenta da Beira","MCH":"Machico","MCN":"Marco de Canaveses","MCQ":"Monchique","MCV":"Miranda do Corvo","MDA":"Mêda","MDB":"Mondim de Basto","MDC":"Macedo de Cavaleiros","MDL":"Mirandela","MDR":"Miranda do Douro","MFR":"Mafra","MFT":"Monforte","MGD":"Mogadouro","MGL":"Mangualde","MGR":"Marinha Grande","MIR":"Mira","MLD":"Mealhada","MLG":"Melgaço","MMN":"Montemor-o-Novo","MMV":"Montemor-o-Velho","MNC":"Monção","MOR":"Mora","MOU":"Mourão","MRA":"Moura","MRS":"Murtosa","MRT":"Mortágua","MRV":"Marvão","MSF":"Mesão Frio","MTA":"Moita","MTG":"Manteigas","MTJ":"Montijo","MTL":"Mértola","MTR":"Montalegre","MTS":"Matosinhos","MUR":"Murça","NIS":"Nisa","NLS":"Nelas","NRD":"Nordeste","NZR":"Nazaré","OAZ":"Oliveira de Azeméis","OBD":"Óbidos","OBR":"Oliveira do Bairro","ODM":"Odemira","ODV":"Odivelas","OER":"Oeiras","OFR":"Oliveira de Frades","OHP":"Oliveira do Hospital","OLH":"Olhão","OLR":"Oleiros","ORQ":"Ourique","OVR":"Ovar","PBL":"Pombal","PCR":"Paredes de Coura","PCT":"Penalva do Castelo","PCV":"Penacova","PDL":"Ponta Delgada","PFR":"Paços de Ferreira","PGR":"Pedrógão Grande","PLM":"Palmela","PMS":"Porto de Mós","PMZ":"Porto Moniz","PNC":"Penamacor","PND":"Penedono","PNF":"Penafiel","PNH":"Pinhel","PNI":"Peniche","PNL":"Penela","PNV":"Proença-a-Nova","PPS":"Pampilhosa da Serra","PRD":"Paredes","PRG":"Peso da Régua","PRL":"Portel","PRS":"Vila Nova de Poiares","PRT":"Porto","PSR":"Ponte de Sor","PST":"Porto Santo","PTB":"Ponte da Barca","PTG":"Portalegre","PTL":"Ponte de Lima","PTM":"Portimão","PTS":"Ponta do Sol","PVC":"Povoação","PVL":"Póvoa de Lanhoso","PVZ":"Póvoa de Varzim","RBR":"Ribeira Brava","RDD":"Redondo","RGR":"Ribeira Grande","RMR":"Rio Maior","RMZ":"Reguengos de Monsaraz","RPN":"Ribeira de Pena","RSD":"Resende","SAT":"Sátão","SBA":"São Brás de Alportel","SBG":"Sabugal","SBR":"Sabrosa","SCD":"Santa Comba Dão","SCF":"Santa Cruz das Flores","SCG":"Santa Cruz da Graciosa","SCR":"Santa Cruz","SEI":"Seia","SJM":"São João da Madeira","SJP":"São João da Pesqueira","SLV":"Silves","SMA":"Sobral de Monte Agraço","SMG":"Salvaterra de Magos","SMP":"Santa Marta de Penaguião","SNS":"Sines","SNT":"Sintra","SPS":"São Pedro do Sul","SRD":"Sardoal","SRE":"Soure","SRN":"Sernancelhe","SRP":"São Roque do Pico","SRT":"Sertã","SSB":"Sesimbra","SSL":"Sousel","STB":"Setúbal","STC":"Santiago do Cacém","STN":"Santana","STR":"Santarém","STS":"Santo Tirso","SVC":"São Vicente","SVV":"Sever do Vouga","SXL":"Seixal","TBC":"Tabuaço","TBR":"Terras de Bouro","TBU":"Tábua","TCS":"Trancoso","TMC":"Torre de Moncorvo","TMR":"Tomar","TND":"Tondela","TNV":"Torres Novas","TRC":"Tarouca","TRF":"Trofa","TVD":"Torres Vedras","TVR":"Tavira","VBP":"Vila do Bispo","VCD":"Vila do Conde","VCT":"Viana do Castelo","VDG":"Vidigueira","VFC":"Vila Franca do Campo","VFL":"Vila Flor","VFR":"Santa Maria da Feira","VFX":"Vila Franca de Xira","VGS":"Vagos","VIS":"Viseu","VIZ":"Vizela","VLC":"Vale de Cambra","VLF":"Vila Nova de Foz Coa","VLG":"Valongo","VLN":"Valença","VLP":"Valpaços","VLR":"Vila de Rei","VLS":"Velas","VMS":"Vimioso","VNB":"Vila Nova da Barquinha","VNC":"Vila Nova de Cerveira","VND":"Vendas Novas","VNF":"Vila Nova de Famalicão","VNG":"Vila Nova de Gaia","VNH":"Vinhais","VNO":"Ourém","VNP":"Vila Nova de Paiva","VNT":"Viana do Alentejo","VPA":"Vila Pouca de Aguiar","VPT":"Vila do Porto","VPV":"Praia da Vitória","VRL":"Vila Real","VRM":"Vieira do Minho","VRS":"Vila Real de Santo António","VVC":"Vila Viçosa","VVD":"Vila Verde","VVR":"Vila Velha de Ródão","VZL":"Vouzela"}}
diff --git a/libs/address-formatter/src/main/resources/statecodes.json b/libs/address-formatter/src/main/resources/statecodes.json
new file mode 100644
index 00000000..feb1c49e
--- /dev/null
+++ b/libs/address-formatter/src/main/resources/statecodes.json
@@ -0,0 +1 @@
+{"AE":{"AJ":{"default":"عجمان","alt_en":"Ajman Emirate"},"AZ":{"default":"أبو ظبي","alt_en":"Abu Dhabi Emirate"},"DU":{"default":"دبي","alt_en":"Dubai"},"FU":{"default":"فجيرة","alt_en":"Fujairah Emirate"},"RK":{"default":"رأس الخيمة","alt_en":"Ras al-Khaimah"},"SH":{"default":"الشارقة","alt_en":"Sharjah Emirate"},"UQ":{"default":"أم القيوين","alt_en":"Umm al-Quwain"}},"AF":{"BAL":{"default":"ولایت بلخ","alt_en":"Balkh Province"},"BAM":{"default":"ولایت بامیان","alt_en":"Bamyan"},"BDG":{"default":"ولایت بادغیس","alt_en":"Badghis"},"BDS":{"default":"ولایت بدخشان","alt_en":"Badakhshan Province"},"BGL":{"default":"ولایت بغلان","alt_en":"Baghlan Province"},"DAY":{"default":"ولایت دایکندی","alt_en":"Daykundi"},"FRA":{"default":"ولایت فراه","alt_en":"Farah Province"},"FYB":{"default":"ولایت فاریاب","alt_en":"Faryab"},"GHA":{"default":"ولایت غزنی","alt_en":"Ghazni Province"},"GHO":{"default":"غور","alt_en":"Ghor"},"HEL":{"default":"هلمند ولايت","alt_en":"Helmand"},"HER":{"default":"ولایت هرات","alt_en":"Herat Province"},"JOW":{"default":"ولایت جوزجان","alt_en":"Jowzjan Province"},"KAB":{"default":"ولایت كابل","alt_en":"Kabul Province"},"KAN":{"default":"کندهار ولايت","alt_en":"Kandahar"},"KAP":{"default":"ولایت کاپیسا","alt_en":"Kapisa Province"},"KDZ":{"default":"ولایت کندز","alt_en":"Kunduz Province"},"KHO":{"default":"خوست ولايت","alt_en":"Khost Province"},"KNR":{"default":"کونړ ولايت","alt_en":"Kunar Province"},"LAG":{"default":"لغمان ولايت","alt_en":"Laghman Province"},"LOG":{"default":"لوگر ولايت","alt_en":"Logar Province"},"NAN":{"default":"ننگرهار ولايت","alt_en":"Nangarhar Province"},"NIM":{"default":"ولایت نیمروز","alt_en":"Nimruz Province"},"NUR":{"default":"نورستان ولایت","alt_en":"Nuristan Province"},"PAN":{"default":"ولایت پنجشیر","alt_en":"Panjshir Province"},"PAR":{"default":"ولایت پروان","alt_en":"Parwan Province"},"PIA":{"default":"پکتيا ولايت","alt_en":"Paktia Province"},"PKA":{"default":"پکتيکا ولايت","alt_en":"Paktika Province"},"SAM":{"default":"ولایت سمنگان","alt_en":"Samangan"},"SAR":{"default":"سرپل","alt_en":"Sar-e Pol Province"},"TAK":{"default":"ولایت تخار","alt_en":"Takhar"},"URU":{"default":"روزگان ولايت","alt_en":"Urōzgān"},"WAR":{"default":"ميدان وردگ ولايت","alt_en":"Maidan Wardak"},"ZAB":{"default":"زابل ولايت","alt_en":"Zabul Province"}},"AM":{"AG":"Aragac̣otn","AR":"Ararat","AV":"Armavir","ER":"Erevan","GR":"Geġark'unik'","KT":"Kotayk'","LO":"Loṙi","SH":"Širak","SU":"Syunik'","TV":"Tavuš","VD":"Vayoć Jor"},"AO":{"BGO":"Bengo","BGU":"Benguela","BIE":"Bié","CAB":"Cabinda","CCU":"Kuando Kubango","CNN":"Cunene","CNO":"Kwanza Norte","CUS":"Kwanza Sul","HUA":"Huambo","HUI":"Huíla","LNO":"Lunda Norte","LSU":"Lunda Sul","LUA":"Luanda","MAL":"Malange","MOX":"Moxico","NAM":"Namibe","UIG":"Uíge","ZAI":"Zaire"},"AR":{"A":"Salta","B":"Buenos Aires","C":{"default":"Ciudad Autónoma de Buenos Aires","alt_en":"Autonomous City of Buenos Aires"},"D":"San Luis","E":{"default":"Entre Ríos","alt_en":"Entre Ríos Province"},"F":"La Rioja","G":"Santiago del Estero","H":"Chaco","J":"San Juan","K":"Catamarca","L":"La Pampa","M":"Mendoza","N":"Misiones","P":"Formosa","Q":{"default":"Neuquén","alt_en":"Neuquén Province"},"R":{"default":"Río Negro","alt_en":"Río Negro Province"},"S":"Santa Fe","T":"Tucumán","U":"Chubut","V":{"default":"Tierra del Fuego","alt_en":"Tierra del Fuego Province"},"W":"Corrientes","X":"Córdoba","Y":"Jujuy","Z":{"default":"Santa Cruz","alt_en":"Santa Cruz Province"}},"AU":{"AAT":"Australian Antarctic Territory","ACT":"Australian Capital Territory","HIMI":"Heard Island and McDonald Islands","JBT":"Jervis Bay Territory","NSW":"New South Wales","NT":"Northern Territory","QLD":"Queensland","SA":"South Australia","TAS":"Tasmania","VIC":"Victoria","WA":"Western Australia"},"AZ":{"ABS":"Abşeron","AGA":"Ağstafa","AGC":"Ağcabədi","AGM":"Ağdam","AGS":"Ağdaş","AGU":"Ağsu","AST":"Astara","BA":"Bakı","BAB":"Babək","BAL":"Balakən","BAR":"Bərdə","BEY":"Beyləqan","BIL":"Biləsuvar","CAB":"Cəbrayıl","CAL":"Cəlilabad","CUL":"Culfa","DAS":"Daşkəsən","FUZ":"Füzuli","GA":"Gəncə","GAD":"Gədəbəy","GOR":"Goranboy","GOY":"Göyçay","GYG":"Göygöl","HAC":"Hacıqabul","IMI":"İmişli","ISM":"İsmayıllı","KAL":"Kəlbəcər","KAN":"Kǝngǝrli","KUR":"Kürdəmir","LA":"Lənkəran","LAC":"Laçın","LAN":"Lənkəran","LER":"Lerik","MAS":"Masallı","MI":"Mingəçevir","NA":"Naftalan","NEF":"Neftçala","NV":"Naxçıvan","NX":"Naxçıvan","OGU":"Oğuz","ORD":"Ordubad","QAB":"Qəbələ","QAX":"Qax","QAZ":"Qazax","QBA":"Quba","QBI":"Qubadlı","QOB":"Qobustan","QUS":"Qusar","SA":"Şəki","SAB":"Sabirabad","SAD":"Sədərək","SAH":"Şahbuz","SAK":"Şəki","SAL":"Salyan","SAR":"Şərur","SAT":"Saatlı","SBN":"Şabran","SIY":"Siyəzən","SKR":"Şəmkir","SM":"Sumqayıt","SMI":"Şamaxı","SMX":"Samux","SR":"Şirvan","SUS":"Şuşa","TAR":"Tərtər","TOV":"Tovuz","UCA":"Ucar","XA":"Xankəndi","XAC":"Xaçmaz","XCI":"Xocalı","XIZ":"Xızı","XVD":"Xocavənd","YAR":"Yardımlı","YE":"Yevlax","YEV":"Yevlax","ZAN":"Zəngilan","ZAQ":"Zaqatala","ZAR":"Zərdab"},"BA":{"BIH":"Federacija Bosne i Hercegovine","BRC":"Brčko distrikt","SRP":"Republika Srpska"},"BD":{"A":{"default":"বরিশাল বিভাগ","alt_en":"Barisal Division"},"B":{"default":"চট্টগ্রাম বিভাগ","alt_en":"Chittagong Division"},"C":{"default":"ঢাকা বিভাগ","alt_en":"Dhaka Division"},"D":{"default":"খুলনা বিভাগ","alt_en":"Khulna Division"},"E":{"default":"রাজশাহী বিভাগ","alt_en":"Rajshahi Division"},"F":{"default":"রংপুর বিভাগ","alt_en":"Rangpur Division"},"G":{"default":"সিলেট বিভাগ","alt_en":"Sylhet Division"}},"BE":{"BRU":{"default":"Bruxelles-Capitale","alt_de":"Brüssel-Hauptstadt","alt_en":"Brussels-Capital","alt_nl":"Brussel-Hoofdstad"},"VAN":{"default":"Antwerpen","alt_en":"Antwerp","alt_fr":"Anvers"},"VBR":{"default":"Vlaams Brabant","alt_de":"Flämisch-Brabant","alt_en":"Flemish Brabant","alt_fr":"Brabant flamand"},"VLI":{"default":"Limburg","alt_fr":"Limbourg"},"VOV":{"default":"Oost-Vlaanderen","alt_en":"East Flanders","alt_fr":"Flandre orientale"},"VWV":{"default":"West-Vlaanderen","alt_de":"Westflandern","alt_en":"West Flanders","alt_fr":"Flandre-Occidentale"},"WBR":{"default":"Brabant wallon","alt_de":"Wallonisch-Brabant","alt_en":"Walloon Brabant","alt_nl":"Waals-Brabant"},"WHT":{"default":"Hainaut","alt_de":"Hennegau","alt_nl":"Henegouwen"},"WLG":{"default":"Liège","alt_de":"Lüttich","alt_nl":"Luik"},"WLX":{"default":"Luxembourg","alt_de":"Luxemburg","alt_nl":"Luxemburg"},"WNA":{"default":"Namur","alt_nl":"Namen"}},"BF":{"BAL":"Balé","BAM":"Bam","BAN":"Banwa","BAZ":"Bazèga ga","BGR":"Bougouriba","BLG":"Boulgou","BLK":"Boulkiemdé","COM":"Comoé","GAN":"Ganzourgou","GNA":"Gnagna","GOU":"Gourma","HOU":"Houet","IOB":"Ioba","KAD":"Kadiogo","KEN":"Kénédougou","KMD":"Komondjari","KMP":"Kompienga","KOP":"Koulpélogo","KOS":"Kossi","KOT":"Kouritenga","KOW":"Kourwéogo","LER":"Léraba","LOR":"Loroum","MOU":"Mouhoun","NAM":"Namentenga","NAO":"Nahouri","NAY":"Nayala","NOU":"Noumbiel","OUB":"Oubritenga","OUD":"Oudalan","PAS":"Passoré","PON":"Poni","SEN":"Séno","SIS":"Sissili","SMT":"Sanmatenga","SNG":"Sanguié","SOM":"Soum","SOR":"Sourou","TAP":"Tapoa","TUI":"Tuy","YAG":"Yagha","YAT":"Yatenga","ZIR":"Ziro","ZON":"Zondoma","ZOU":"Zoundwéogo"},"BI":{"BB":"Bubanza","BL":"Bujumbura Rural","BM":"Bujumbura Mairie","BR":"Bururi","CA":"Cankuzo","CI":"Cibitoke","GI":"Gitega","KI":"Kirundo","KR":"Karuzi","KY":"Kayanza","MA":"Makamba","MU":"Muramvya","MW":"Mwaro","MY":"Muyinga","NG":"Ngozi","RM":"Rumonge","RT":"Rutana","RY":"Ruyigi"},"BJ":{"AK":"Atacora","AL":"Alibori","AQ":"Atlantique","BO":"Borgou","CO":"Collines","DO":"Donga","KO":"Couffo","LI":"Littoral","MO":"Mono","OU":"Ouémé","PL":"Plateau","ZO":"Zou"},"BN":{"BE":"Belait","BM":"Brunei-Muara","TE":"Temburong","TU":"Tutong"},"BO":{"B":"El Beni","C":"Cochabamba","H":"Chuquisaca","L":"La Paz","N":"Pando","O":"Oruro","P":"Potosí","S":"Santa Cruz","T":"Tarija"},"BR":{"AC":"Acre","AL":"Alagoas","AP":"Amapá","AM":"Amazonas","BA":"Bahia","CE":"Ceará","DF":"Distrito Federal","ES":"Espírito Santo","GO":"Goiás","MA":"Maranhão","MT":"Mato Grosso","MS":"Mato Grosso do Sul","MG":"Minas Gerais","PA":"Pará","PB":"Paraíba","PR":"Paraná","PE":"Pernambuco","PI":"Piauí","RJ":"Rio de Janeiro","RN":"Rio Grande do Norte","RS":"Rio Grande do Sul","RO":"Rondônia","RR":"Roraima","SC":"Santa Catarina","SP":"São Paulo","SE":"Sergipe","TO":"Tocantins"},"BW":{"CE":"Central","CH":"Chobe","FR":"Francistown","GA":"Gaborone","GH":"Ghanzi","JW":"Jwaneng","KG":"Kgalagadi","KL":"Kgatleng","KW":"Kweneng","LO":"Lobatse","NE":"North East","NW":"North West","SE":"South East","SO":"Southern","SP":"Selibe Phikwe","ST":"Sowa Town"},"BY":{"BR":{"default":"Брестская область","alt_en":"Brest Region"},"HM":{"default":"Минск","alt_en":"Minsk"},"HO":{"default":"Гомельская область","alt_en":"Homel Region"},"HR":{"default":"Гродненская область","alt_en":"Grodno Region"},"MA":{"default":"Могилёвская область","alt_en":"Mahilyow Region"},"MI":{"default":"Минская область","alt_en":"Minsk Region"},"VI":{"default":"Витебская область","alt_en":"Vitsebsk Region"}},"BZ":{"BZ":"Belize District","CY":"Cayo","CZL":"Corozal","OW":"Orange Walk","SC":"Stann Creek","TOL":"Toledo"},"CA":{"AB":"Alberta","BC":{"default":"British Columbia","alt_fr":"Colombie-Britannique"},"MB":"Manitoba","NB":{"default":"New Brunswick","alt_fr":"Nouveau-Brunswick"},"NL":{"default":"Newfoundland and Labrador","alt_fr":"Terre-Neuve-et-Labrador"},"NT":{"default":"Northwest Territories","alt_fr":"Territoires du Nord-Ouest"},"NS":{"default":"Nova Scotia","alt_fr":"Nouvelle-Écosse"},"NU":"Nunavut","ON":"Ontario","PE":{"default":"Prince Edward Island","alt_fr":"Île-du-Prince-Édouard"},"QC":{"default":"Quebec","alt_fr":"Québec"},"SK":"Saskatchewan","YT":"Yukon"},"CD":{"BC":"Kongo Central","BU":"Bas-Uélé","EQ":"Équateur","HK":"Haut-Katanga","HL":"Haut-Lomami","HU":"Haut-Uélé","IT":"Ituri","KC":"Kasaï Central","KE":"Kasaï Oriental","KG":"Kwango","KL":"Kwilu","KN":"Kinshasa","KS":"Kasaï","LO":"Lomami","LU":"Lualaba","MA":"Maniema","MN":"Mai-Ndombe","MO":"Mongala","NK":"Nord-Kivu","NU":"Nord-Ubangi","SA":"Sankuru","SK":"Sud-Kivu","SU":"Sud-Ubangi","TA":"Tanganyika","TO":"Tshopo","TU":"Tshuapa"},"CF":{"AC":"Ouham","BB":"Bamingui-Bangoran","BGF":"Bangui","BK":"Basse-Kotto","HK":"Haute-Kotto","HM":"Haut-Mbomou","HS":"Mambéré-Kadéï","KB":"Gribingui","KG":"Kémo‐Gribingui","LB":"Lobaye","MB":"Mbomou","MP":"Ombella-Mpoko","NM":"Nana-Mambéré","OP":"Ouham-Pendé","SE":"Sangha","UK":"Ouaka","VK":"Vakaga"},"CH":{"AG":{"default":"Aargau","alt_fr":"Argovie","alt_it":"Argovia"},"AI":{"default":"Appenzell Innerrhoden","alt_fr":"Appenzell Rhodes-Intérieures","alt_it":"Appenzello Interno"},"AR":{"default":"Appenzell Ausserrhoden","alt_fr":"Appenzell Rhodes-Extérieures","alt_it":"Appenzello Esterno"},"BE":{"default":"Bern","alt_fr":"Berne","alt_it":"Berna"},"BL":{"default":"Basel-Landschaft","alt_fr":"Bâle-Campagne","alt_it":"Basilea Campagna"},"BS":{"default":"Basel-Stadt","alt_en":"Basel-City","alt_fr":"Bâle-Ville","alt_it":"Basilea Città"},"FR":{"default":"Fribourg","alt_de":"Freiburg","alt_it":"Friburgo"},"GE":{"default":"Geneva","alt_de":"Genf","alt_fr":"Genève","alt_it":"Ginevra"},"GL":{"default":"Glarus","alt_fr":"Glaris","alt_it":"Glarona"},"GR":{"default":"Graubünden","alt_en":"Grisons","alt_fr":"Grisons","alt_it":"Grigioni"},"JU":{"default":"Jura","alt_it":"Giura"},"LU":{"default":"Luzern","alt_fr":"Lucerne","alt_it":"Lucerna"},"NE":{"default":"Neuchâtel","alt_de":"Neuenburg"},"NW":{"default":"Nidwalden","alt_fr":"Nidwald","alt_it":"Nidvaldo"},"OW":{"default":"Obwalden","alt_fr":"Obwald","alt_it":"Obvaldo"},"SG":{"default":"Sankt Gallen","alt_fr":"Saint-Gall","alt_it":"San Gallo"},"SH":{"default":"Schaffhausen","alt_fr":"Schaffhouse","alt_it":"Sciaffusa"},"SO":{"default":"Solothurn","alt_fr":"Soleure","alt_it":"Soletta"},"SZ":{"default":"Schwyz","alt_it":"Svitto"},"TG":{"default":"Thurgau","alt_fr":"Thurgovie","alt_it":"Turgovia"},"TI":{"default":"Ticino","alt_de":"Tessin","alt_fr":"Tessin"},"UR":"Uri","VD":{"default":"Vaud","alt_de":"Waadt"},"VS":{"default":"Valais/Wallis","alt_de":"Wallis","alt_fr":"Valais","alt_it":"Vallese"},"ZG":{"default":"Zug","alt_fr":"Zoug","alt_it":"Zugo"},"ZH":{"default":"Zürich","alt_en":"Zurich","alt_fr":"Zurich","alt_it":"Zurigo"}},"CI":{"AB":"Abidjan","BS":"Bas-Sassandra","CM":"Comoé","DN":"Denguélé","GD":"Gôh-Djiboua","LC":"Lacs","LG":"Lagunes","MG":"Montagnes","SM":"Sassandra-Marahoué","SV":"Savanes","VB":"Vallée du Bandama","WR":"Woroba","YM":"Yamoussoukro","ZZ":"Zanzan"},"CL":{"AI":"Aisén del General Carlos Ibañez del Campo","AN":"Antofagasta","AP":"Arica y Parinacota","AR":"La Araucanía","AT":"Atacama","BI":"Biobío","CO":"Coquimbo","LI":"Libertador General Bernardo O'Higgins","LL":"Los Lagos","LR":"Los Ríos","MA":"Magallanes","ML":"Maule","RM":"Región Metropolitana de Santiago","TA":"Tarapacá","VS":"Valparaíso"},"CM":{"AD":"Adamaoua","CE":"Centre","EN":"Far North","ES":"East","LT":"Littoral","NO":"North","NW":"North-West","OU":"West","SU":"South","SW":"South-West"},"CO":{"AMA":"Amazonas","ANT":"Antioquia","ARA":"Arauca","ATL":"Atlántico","BOL":"Bolívar","BOY":"Boyacá","CAL":"Caldas","CAQ":"Caquetá","CAS":"Casanare","CAU":"Cauca","CES":"Cesar","CHO":"Chocó","COR":"Córdoba","CUN":"Cundinamarca","DC":"Distrito Capital de Bogotá","GUA":"Guainía","GUV":"Guaviare","HUI":"Huila","LAG":"La Guajira","MAG":"Magdalena","MET":"Meta","NAR":"Nariño","NSA":"Norte de Santander","PUT":"Putumayo","QUI":"Quindío","RIS":"Risaralda","SAN":"Santander","SAP":"San Andrés","SUC":"Sucre","TOL":"Tolima","VAC":"Valle del Cauca","VAU":"Vaupés","VID":"Vichada"},"CR":{"A":"Alajuela","C":"Cartago","G":"Guanacaste","H":"Heredia","L":"Limón","P":"Puntarenas","SJ":"San José"},"CV":{"BR":"Brava","BV":"Boa Vista","CA":"Santa Catarina","CF":"Santa Catarina do Fogo","CR":"Santa Cruz","MA":"Maio","MO":"Mosteiros","PA":"Paul","PN":"Porto Novo","PR":"Praia","RB":"Ribeira Brava","RG":"Ribeira Grande","RS":"Ribeira Grande de Santiago","SD":"São Domingos","SF":"São Filipe","SL":"Sal","SM":"São Miguel","SO":"São Lourenço dos Órgãos","SS":"São Salvador do Mundo","SV":"São Vicente","TA":"Tarrafal","TS":"Tarrafal de São Nicolau"},"DE":{"BB":"Brandenburg","BE":"Berlin","BW":"Baden-Württemberg","BY":{"default":"Bayern","alt_en":"Bavaria"},"HB":"Bremen","HE":{"default":"Hessen","alt_en":"Hesse"},"HH":"Hamburg","MV":"Mecklenburg-Vorpommern","NI":{"default":"Niedersachsen","alt_en":"Lower Saxony"},"NW":{"default":"Nordrhein-Westfalen","alt_en":"North Rhine-Westphalia"},"RP":{"default":"Rheinland-Pfalz","alt_en":"Rhineland-Palatinate"},"SH":"Schleswig-Holstein","SL":"Saarland","SN":{"default":"Sachsen","alt_en":"Saxony"},"ST":{"default":"Sachsen-Anhalt","alt_en":"Saxony-Anhalt"},"TH":{"default":"Thüringen","alt_en":"Thuringia"}},"DJ":{"AR":"Arta","AS":"Ali Sabieh","DI":"Dikhil","DJ":"Djibouti","OB":"Obock","TA":"Tadjourah"},"EC":{"A":"Azuay","B":"Bolívar","C":"Carchi","D":"Orellana","E":"Esmeraldas","F":"Cañar","G":"Guayas","H":"Chimborazo","I":"Imbabura","L":"Loja","M":"Manabí","N":"Napo","O":"El Oro","P":"Pichincha","R":"Los Ríos","S":"Morona-Santiago","SD":"Santo Domingo de los Tsáchilas","SE":"Santa Elena","T":"Tungurahua","U":"Sucumbíos","W":"Galápagos","X":"Cotopaxi","Y":"Pastaza","Z":"Zamora Chinchipe"},"ER":{"AN":{"default":"ዞባ ዓንሰባ Anseba عنسبا","alt_ar":"عنسبا","alt_en":"Anseba","alt_ti":"ዞባ ዓንሰባ"},"DK":{"default":"ዞባ ደቡባዊ ቀይሕ ባሕሪ southern Red Sea Zone جنوب البحر الأحمر","alt_ar":"جنوب البحر الأحمر","alt_en":"Southern Red Sea Region","alt_ti":"ዞባ ደቡባዊ ቀይሕ ባሕሪ"},"DU":{"default":"ዞባ ደቡብ Debub منطقة الجنوب","alt_ar":"منطقة الجنوب","alt_en":"Debub Region","alt_ti":"ዞባ ደቡብ"},"GB":{"default":"ጋሽ-ባርካ Gash barka القاش وبركة","alt_ar":"القاش وبركة","alt_en":"Gash-Barka","alt_ti":"ጋሽ-ባርካ"},"MA":{"default":"ዞባ ማእከል Maekel zone المنطقة المركزية","alt_ar":"المنطقة المركزية","alt_en":"Maekel Region","alt_ti":"ዞባ ማእከል"},"SK":{"default":"ዞባ ሰሜናዊ ቀይሕ ባሕሪ Northern Red Sea zone شمال البحر الأحمر","alt_ar":"شمال البحر الأحمر","alt_en":"Northen Red Sea Region","alt_ti":"ዞባ ሰሜናዊ ቀይሕ ባሕሪ"}},"ES":{"AN":{"default":"Andalucía","alt_en":"Andalusia"},"AR":{"default":"Aragón","alt_en":"Aragon"},"AS":"Asturias","CB":"Cantabria","CE":"Ceuta","CL":{"default":"Castilla y León","alt_en":"Castile and León"},"CM":{"default":"Castilla-La Mancha","alt_en":"Castile-La Mancha"},"CN":{"default":"Canarias","alt_en":"Canary Islands"},"CT":{"default":"Cataluña","alt_ca":"Catalunya","alt_en":"Catalonia"},"EX":"Extremadura","GA":"Galicia","IB":{"default":"Islas Baleares","alt_en":"Balearic Islands"},"MC":{"default":"Región de Murcia","alt_en":"Region of Murcia"},"MD":{"default":"Comunidad de Madrid","alt_en":"Community of Madrid"},"ML":"Melilla","NC":"Navarra","PV":{"default":"País Vasco","alt_en":"Autonomous Community of the Basque Country","alt_eu":"Euskadi"},"RI":{"default":"La Rioja","alt_en":"Rioja"},"VC":{"default":"Comunidad Valenciana","alt_en":"Valencian Community"}},"FJ":{"C":"Central","E":"Eastern","N":"Northern","W":"Western"},"FM":{"KSA":"Kosrae","PNI":"Pohnpei","TRK":"Chuuk","YAP":"Yap"},"FR":{"ARA":"Auvergne-Rhône-Alpes","BFC":"Bourgogne-Franche-Comté","BRE":{"default":"Bretagne","alt_en":"Brittany"},"CVL":"Centre-Val de Loire","COR":{"default":"Corse","alt_en":"Corsica"},"GES":"Grand Est","GF":"Guyane","GP":"Guadeloupe","HDF":"Hauts-de-France","IDF":{"default":"Île-de-France","alt_en":"Ile-de-France"},"MQ":"Martinique","NOR":{"default":"Normandie","alt_en":"Normandy"},"NAQ":{"default":"Nouvelle-Aquitaine","alt_en":"New Aquitaine"},"OCC":{"default":"Occitanie","alt_en":"Occitania"},"PDL":"Pays de la Loire","PAC":"Provence-Alpes-Côte d'Azur","RE":"La Réunion","YT":"Mayotte"},"GB":{"ENG":"England","NIR":"Northern Ireland","SCT":"Scotland","WLS":"Wales"},"GE":{"AB":{"default":"აფხაზეთის ავტონომიური რესპუბლიკა - Аҧсны Автономтә Республика","alt_en":"Autonomous Republic of Abkhazia"},"AJ":{"default":"აჭარის ავტონომიური რესპუბლიკა","alt_en":"Autonomous Republic of Adjara"},"GU":{"default":"გურია","alt_en":"Guria"},"IM":{"default":"იმერეთი","alt_en":"Imereti"},"KA":{"default":"კახეთი","alt_en":"Kakheti"},"KK":{"default":"ქვემო ქართლი","alt_en":"Lower Kartli"},"MM":{"default":"მცხეთა-მთიანეთი","alt_en":"Mtskheta-Mtianeti"},"RL":{"default":"რაჭა-ლეჩხუმი და ქვემო სვანეთი","alt_en":"Racha-Lechkhumi and Lower Svaneti"},"SJ":{"default":"სამცხე-ჯავახეთი","alt_en":"Samtskhe-Javakheti"},"SK":{"default":"შიდა ქართლი","alt_en":"Inner Kartli"},"SZ":{"default":"სამეგრელო-ზემო სვანეთი","alt_en":"Samegrelo-Upper Svaneti"},"TB":{"default":"თბილისი","alt_en":"Tbilisi"}},"GH":{"AA":"Greater Accra","AH":"Ashanti","BA":"Brong-Ahafo","CP":"Central","EP":"Eastern","NP":"Northern","TV":"Volta","UE":"Upper East","UW":"Upper West","WP":"Western"},"GL":{"KU":"Kommune Kujalleq","QA":"Qaasuitsup Kommunia","QE":"Qeqqata Kommunia","SM":"Kommuneqarfik Sermersooq"},"GM":{"B":"Banjul","L":"Lower River","M":"Central River","N":"North Bank","U":"Upper River","W":"Western"},"GN":{"BE":"Beyla","BF":"Boffa","BK":"Boké","CO":"Coyah","DB":"Dabola","DI":"Dinguiraye","DL":"Dalaba","DU":"Dubréka","FA":"Faranah","FO":"Forécariah","FR":"Fria","GA":"Gaoual","GU":"Guékédou","KA":"Kankan","KB":"Koubia","KD":"Kindia","KE":"Kérouané","KN":"Koundara","KO":"Kouroussa","KS":"Kissidougou","LA":"Labé","LE":"Lélouma","LO":"Lola","MC":"Macenta","MD":"Mandiana","ML":"Mali","MM":"Mamou","NZ":"Nzérékoré","PI":"Pita","SI":"Siguiri","TE":"Télimélé","TO":"Tougué","YO":"Yomou"},"GQ":{"AN":"Annobón","BN":"Bioko Norte","BS":"Bioko Sur","CS":"Centro Sur","KN":"Kié‐Ntem","LI":"Litoral","WN":"Wele‐Nzas"},"GT":{"AV":"Alta Verapaz","BV":"Baja Verapaz","CM":"Chimaltenango","CQ":"Chiquimula","ES":"Escuintla","GU":"Guatemala","HU":"Huehuetenango","IZ":"Izabal","JA":"Jalapa","JU":"Jutiapa","PE":"Petén","PR":"El Progreso","QC":"Quiché","QZ":"Quetzaltenango","RE":"Retalhuleu","SA":"Sacatepéquez","SM":"San Marcos","SO":"Sololá","SR":"Santa Rosa","SU":"Suchitepéquez","TO":"Totonicapán","ZA":"Zacapa"},"GW":{"BA":"Bafatá","BL":"Bolama","BM":"Biombo","BS":"Bissau","CA":"Cacheu","GA":"Gabú","OI":"Oio","QU":"Quinara","TO":"Tombali"},"GY":{"BA":"Barima-Waini","CU":"Cuyuni-Mazaruni","DE":"Demerara-Mahaica","EB":"East Berbice-Corentyne","ES":"Essequibo Islands-West Demerara","MA":"Mahaica-Berbice","PM":"Pomeroon-Supenaam","PT":"Potaro-Siparuni","UD":"Upper Demerara-Berbice","UT":"Upper Takutu-Upper Essequibo"},"HN":{"AT":"Atlántida","CH":"Choluteca","CL":"Colón","CM":"Comayagua","CP":"Copán","CR":"Cortés","EP":"El Paraíso","FM":"Francisco Morazán","GD":"Gracias a Dios","IB":"Islas de la Bahía","IN":"Intibucá","LE":"Lempira","LP":"La Paz","OC":"Ocotepeque","OL":"Olancho","SB":"Santa Bárbara","VA":"Valle","YO":"Yoro"},"HT":{"AR":"Artibonite","CE":"Centre","GA":"Grande’Anse","ND":"Nord","NE":"Nord-Est","NI":"Nippes","NO":"Nord-Ouest","OU":"Ouest","SD":"Sud","SE":"Sud-Est"},"HU":{"BA":"Baranya","BC":"Békéscsaba","BE":"Békés","BK":"Bács-Kiskun","BU":"Budapest","BZ":"Borsod-Abaúj-Zemplén","CS":"Csongrád","DE":"Debrecen","DU":"Dunaújváros","EG":"Eger","ER":"Érd","FE":"Fejér","GS":"Győr‐Moson‐Sopron","GY":"Győr","HB":"Hajdú-Bihar","HE":"Heves","HV":"Hódmezővásárhely","JN":"Jász-Nagykun-Szolnok","KE":"Komárom-Esztergom","KM":"Kecskemét","KV":"Kaposvár","MI":"Miskolc","NK":"Nagykanizsa","NO":"Nógrád","NY":"Nyíregyháza","PE":"Pest","PS":"Pécs","SD":"Szeged","SF":"Székesfehérvár","SH":"Szombathely","SK":"Szolnok","SN":"Sopron","SO":"Somogy","SS":"Szekszárd","ST":"Salgótarján","SZ":"Szabolcs-Szatmár-Bereg","TB":"Tatabánya","TO":"Tolna","VA":"Vas","VE":"Veszprém","VM":"Veszprém","ZA":"Zala","ZE":"Zalaegerszeg"},"ID":{"AC":"Aceh","BA":"Bali","BB":{"default":"Kepulauan Bangka Belitung","alt_en":"Bangka-Belitung Islands"},"BE":"Bengkulu","BT":"Banten","GO":"Gorontalo","JA":"Jambi","JB":{"default":"Jawa Barat","alt_en":"West Java"},"JI":{"default":"Jawa Timur","alt_en":"East Java"},"JK":{"default":"Daerah Khusus Ibukota Jakarta","alt_en":"Jakarta Special Capital Region"},"JT":{"default":"Jawa Tengah","alt_en":"Central Java"},"KB":{"default":"Kalimantan Barat","alt_en":"West Kalimantan"},"KI":{"default":"Kalimantan Timur","alt_en":"East Kalimantan"},"KR":{"default":"Kepulauan Riau","alt_en":"Riau Islands"},"KS":{"default":"Kalimantan Selatan","alt_en":"South Kalimantan"},"KT":{"default":"Kalimantan Tengah","alt_en":"Central Kalimantan"},"KU":{"default":"Kalimantan Utara","alt_en":"North Kalimantan"},"LA":"Lampung","MA":"Maluku","MU":{"default":"Maluku Utara","alt_en":"North Maluku"},"NB":"Nusa Tenggara Barat","NT":"Nusa Tenggara Timur","PA":"Papua","PB":{"default":"Papua Barat","alt_en":"West Papua"},"RI":"Riau","SA":{"default":"Sulawesi Utara","alt_en":"North Sulawesi"},"SB":{"default":"Sumatera Barat","alt_en":"West Sumatra"},"SG":{"default":"Sulawesi Tenggara","alt_en":"Southeast Sulawesi"},"SN":{"default":"Sulawesi Selatan","alt_en":"South Sulawesi"},"SR":{"default":"Sulawesi Barat","alt_en":"West Sulawesi"},"SS":{"default":"Sumatera Selatan","alt_en":"South Sumatra"},"ST":{"default":"Sulawesi Tengah","alt_en":"Central Sulawesi"},"SU":{"default":"Sumatera Utara","alt_en":"North Sumatra"},"YO":{"default":"Daerah Istimewa Yogyakarta","alt_en":"Special Region of Yogyakarta"}},"IE":{"C":"Connacht","L":"Leinster","M":"Munster","U":"Ulster"},"IN":{"AN":"Andaman and Nicobar Islands","AP":"Andhra Pradesh","AR":"Arunachal Pradesh","AS":"Assam","BR":"Bihar","CH":"Chandigarh","CT":"Chhattisgarh","DD":"Daman and Diu","DL":"Delhi","DN":"Dadra and Nagar Haveli","GA":"Goa","GJ":"Gujarat","HP":"Himachal Pradesh","HR":"Haryana","JH":"Jharkhand","JK":"Jammu and Kashmir","KA":"Karnataka","KL":"Kerala","LD":"Lakshadweep","MH":"Maharashtra","ML":"Meghalaya","MN":"Manipur","MP":"Madhya Pradesh","MZ":"Mizoram","NL":"Nagaland","OR":"Odisha","PB":"Punjab","PY":"Puducherry","RJ":"Rajasthan","SK":"Sikkim","TG":"Telangana","TN":"Tamil Nadu","TR":"Tripura","UP":"Uttar Pradesh","UT":"Uttarakhand","WB":"West Bengal"},"IT":{"ABR":"Abruzzo","BAS":"Basilicata","CAL":"Calabria","CAM":"Campania","EMI":"Emilia-Romagna","FRI":"Friuli Venezia Giulia","LAZ":"Lazio","LIG":"Liguria","LOM":"Lombardia","MAR":"Marche","MOL":"Molise","PIE":"Piemonte","PUG":"Puglia","SAR":"Sardegna","SIC":"Sicilia","TOS":"Toscana","TRE":{"default":"Trentino-Alto Adige/Südtirol","alt_de":"Trentino-Südtirol","alt_it":"Trentino-Alto Adige"},"UMB":"Umbria","VAL":"Valle d'Aosta","VEN":"Veneto"},"JO":{"AJ":{"default":"عجلون","alt_en":"Ajlun"},"AM":{"default":"عمان","alt_en":"Amman"},"AQ":{"default":"العقبة","alt_en":"Aqaba"},"AT":{"default":"الطفيلة","alt_en":"Tafilah"},"AZ":{"default":"الزرقاء","alt_en":"Zarqa"},"BA":{"default":"البلقاء","alt_en":"Balqa"},"IR":{"default":"إربد","alt_en":"Irbid"},"JA":{"default":"جرش","alt_en":"Jarash"},"KA":{"default":"الكرك","alt_en":"Karak"},"MA":{"default":"المفرق","alt_en":"Mafraq"},"MD":{"default":"مادبا","alt_en":"Madaba"},"MN":{"default":"معان","alt_en":"Maan"}},"KG":{"B":{"default":"Баткенская область","alt_en":"Batken Region"},"C":{"default":"Чуйская область","alt_en":"Chuy Region"},"GB":{"default":"Бишкек","alt_en":"Bishkek"},"GO":{"default":"Ош","alt_en":"City of Osh"},"J":{"default":"Джалал-Абадская область","alt_en":"Jalal-Abad Region"},"N":{"default":"Нарынская область","alt_en":"Naryn Region"},"O":{"default":"Ошская область","alt_en":"Osh Region"},"T":{"default":"Таласская область","alt_en":"Talas Region"},"Y":{"default":"Иссык-Кульская область","alt_en":"Issyk-Kul Region"}},"KI":{"G":"Gilbert Islands","L":"Line Islands","P":"Phoenix Islands"},"KM":{"A":"Anjouan","G":"Grande Comore","M":"Mohéli"},"KN":{"K":"Saint Kitts","N":"Nevis"},"KW":{"AH":{"default":"الاحمدي","alt_en":"Ahmadi"},"FA":{"default":"الفروانية","alt_en":"Farwaniya"},"HA":{"default":"حولي","alt_en":"Hawalli"},"JA":{"default":"الجهراء","alt_en":"Jahra"},"KU":{"default":"العاصمة","alt_en":"Al Asimah"},"MU":{"default":"مبارك الكبير","alt_en":"Mubarak Al-Kabeer"}},"LA":{"AT":{"default":"ອັດຕະປື","alt_en":"Attapeu"},"BK":{"default":"ບໍ່ແກ້ວ","alt_en":"Bokeo Province"},"BL":{"default":"ບໍລິຄຳໄຊ","alt_en":"Bolikhamsai"},"CH":{"default":"ຈຳປາສັກ","alt_en":"Champasak Province"},"HO":{"default":"ຫົວພັນ","alt_en":"Houaphanh"},"KH":{"default":"ຄໍາມ່ວນ","alt_en":"Khammouane"},"LM":{"default":"ຫລວງນໍ້າທາ","alt_en":"Luang Namtha"},"LP":{"default":"ຫລວງພະບາງ","alt_en":"Luang Prabang"},"OU":{"default":"ອຸດົມໄຊ","alt_en":"Oudomxay"},"PH":{"default":"ຜົ້ງສາລີ","alt_en":"Phongsaly"},"SL":{"default":"ສາລະວັນ","alt_en":"Salavan Province"},"SV":{"default":"ສະຫວັນນະເຂດ","alt_en":"Savannakhet Province"},"VI":{"default":"ວຽງຈັນ","alt_en":"Vientiane Province"},"VT":{"default":"ນະຄອນຫຼວງວຽງຈັນ","alt_en":"Vientiane Prefecture"},"XA":{"default":"ໄຊຍະບູລີ","alt_en":"Sainyabuli Province"},"XE":{"default":"ເຊກອງ","alt_en":"Sekong Province"},"XI":{"default":"ຊຽງຂວາງ","alt_en":"Xiangkhouang Province"},"XS":{"default":"ໄຊສົມບູນ","alt_en":"Xaisomboun Province"}},"KZ":{"AKM":{"default":"Акмолинская область","alt_en":"Akmola Region"},"AKT":{"default":"Актюбинская область","alt_en":"Aktobe Region"},"ALA":{"default":"Алматы","alt_en":"Almaty"},"ALM":{"default":"Алматинская область","alt_en":"Almaty Region"},"AST":{"default":"Нур-Султан","alt_en":"Nur-Sultan"},"ATY":{"default":"Атырауская область","alt_en":"Atyrau Region"},"KAR":{"default":"Карагандинская область","alt_en":"Karaganda Region"},"KUS":{"default":"Костанайская область","alt_en":"Kostanay Region"},"KZY":{"default":"Кызылординская область","alt_en":"Kyzylorda Region"},"MAN":{"default":"Мангистауская область","alt_en":"Mangystau Region"},"PAV":{"default":"Павлодарская область","alt_en":"Pavlodar Region"},"SEV":{"default":"Северо-Казахстанская область","alt_en":"North Kazakhstan Region"},"SHY":{"default":"Шымкент","alt_en":"Shymkent Region"},"VOS":{"default":"Восточно-Казахстанская область","alt_en":"East Kazakhstan Region"},"YUZ":{"default":"Туркестанская область","alt_en":"Turkistan Region"},"ZAP":{"default":"Западно-Казахстанская область","alt_en":"West Kazakhstan Region"},"ZHA":{"default":"Жамбылская область","alt_en":"Jambyl Region"}},"LB":{"AK":{"default":"محافظة عكار","alt_en":"Akkar Governorate","alt_fr":"Gouvernorat de l'Akkar"},"AS":{"default":"محافظة الشمال","alt_en":"North Governorate","alt_fr":"Gouvernorat du Liban Nord"},"BA":{"default":"محافظة بيروت","alt_en":"Beirut Governorate","alt_fr":"Gouvernorat de Beyrouth"},"BH":{"default":"محافظة بعلبك الهرمل","alt_en":"Baalbek-Hermel Governorate","alt_fr":"Gouvernorat de Baalbek-Hermel"},"BI":{"default":"محافظة البقاع","alt_en":"Beqaa Governorate","alt_fr":"Gouvernorat de Beqaa"},"JA":{"default":"محافظة الجنوب","alt_en":"South Governorate","alt_fr":"Gouvernorat du Liban Sud"},"JL":{"default":"محافظة جبل لبنان","alt_en":"Mount Lebanon Governorate","alt_fr":"Gouvernorat du Mont Liban"},"NA":{"default":"محافظة النبطية","alt_en":"Nabatiya Governorate","alt_fr":"Gouvernorat de Nabatiyeh"}},"LR":{"BG":"Bong","BM":"Bomi","CM":"Grand Cape Mount","GB":"Grand Bassa","GG":"Grand Gedeh","GK":"Grand Kru","GP":"Gbarpolu","LO":"Lofa","MG":"Margibi","MO":"Montserrado","MY":"Maryland","NI":"Nimba","RG":"River Gee","RI":"River Cess","SI":"Sinoe"},"LS":{"A":"Maseru","B":"Butha-Buthe","C":"Leribe","D":"Berea","E":"Mafeteng","F":"Mohale's Hoek","G":"Quthing","H":"Qacha's Nek","J":"Mokhotlong","K":"Thaba-Tseka"},"LT":{"AL":{"default":"Alytaus apskritis","alt_en":"Alytus County"},"KL":{"default":"Klaipėdos apskritis","alt_en":"Klaipeda County"},"KU":{"default":"Kauno apskritis","alt_en":"Kaunas County"},"MR":{"default":"Marijampolės apskritis","alt_en":"Marijampole County"},"PN":{"default":"Panevėžio apskritis","alt_en":"Panevezys County"},"SA":{"default":"Šiaulių apskritis","alt_en":"Siauliai County"},"TA":{"default":"Tauragės apskritis","alt_en":"Taurage County"},"TE":{"default":"Telšių apskritis","alt_en":"Telsiai County"},"UT":{"default":"Utenos apskritis","alt_en":"Utena County"},"VL":{"default":"Vilniaus apskritis","alt_en":"Vilnius County"}},"LY":{"BA":{"default":"بنغازي","alt_en":"Benghazi"},"BU":{"default":"البطنان","alt_en":"Butnan"},"DR":{"default":"درنة","alt_en":"Derna"},"GT":{"default":"غات","alt_en":"Ghat"},"JA":{"default":"الجبل الأخضر","alt_en":"Jabal al Akhdar"},"JG":{"default":"الجبل الغربي","alt_en":"Jabal al Gharbi"},"JI":{"default":"الجفارة","alt_en":"Jafara"},"JU":{"default":"الجفرة","alt_en":"Jufra"},"KF":{"default":"الكفرة","alt_en":"Kufra"},"MB":{"default":"المرقب","alt_en":"Murqub"},"MI":{"default":"بني وليد","alt_en":"Bani Walid"},"MJ":{"default":"المرج","alt_en":"Marj"},"MQ":{"default":"مرزق","alt_en":"Murzuq"},"NL":{"default":"نالوت","alt_en":"Nalut"},"NQ":{"default":"النقاط الخمس","alt_en":"Nuqat al Khams"},"SB":{"default":"سبها","alt_en":"Sabha"},"SR":{"default":"سرت","alt_en":"Sirte"},"TB":{"default":"طرابلس","alt_en":"Tripoli"},"WA":{"default":"الواحات","alt_en":"Al Wahat"},"WD":{"default":"وادي الحياة","alt_en":"Wadi al Hayaa"},"WS":{"default":"وادي الشاطئ","alt_en":"Wadi al Shatii"},"ZA":{"default":"الزاوية","alt_en":"Zawiya"}},"MD":{"AN":"Anenii Noi","BA":"Bălţi","BD":"Bender [Tighina]","BR":"Briceni","BS":"Basarabeasca","CA":"Cahul","CL":"Călăraşi","CM":"Cimişlia","CR":"Criuleni","CS":"Căuşeni","CT":"Cantemir","CU":"Chişinău","DO":"Donduşeni","DR":"Drochia","DU":"Dubăsari","ED":"Edineţ","FA":"Făleşti","FL":"Floreşti","GA":"Găgăuzia","GL":"Glodeni","HI":"Hînceşti","IA":"Ialoveni","LE":"Leova","NI":"Nisporeni","OC":"Ocniþa","OR":"Orhei","RE":"Rezina","RI":"Rîşcani","SD":"Şoldăneşti","SI":"Sîngerei","SN":"Stînga Nistrului","SO":"Soroca","ST":"Străşeni","SV":"Ştefan Vodă","TA":"Taraclia","TE":"Teleneşti","UN":"Ungheni"},"MG":{"A":"Toamasina","D":"Antsiranana","F":"Fianarantsoa","M":"Mahajanga","T":"Antananarivo","U":"Toliara"},"MU":{"BL":"Black River","FL":"Flacq","GP":"Grand Port","MO":"Moka","PA":"Pamplemousses","PL":"Port Louis","PW":"Plaines Wilhems","RR":"Rivière du Rempart","SA":"Savanne"},"MW":{"BA":"Balaka","BL":"Blantyre","C":"Central","CK":"Chikwawa","CR":"Chiradzulu","CT":"Chitipa","DE":"Dedza","DO":"Dowa","KR":"Karonga","KS":"Kasungu","LI":"Lilongwe","LK":"Likoma","MC":"Mchinji","MG":"Mangochi","MH":"Machinga","MU":"Mulanje","MW":"Mwanza","MZ":"Mzimba","N":"Northern","NB":"Nkhata Bay","NE":"Neno","NI":"Ntchisi","NK":"Nkhotakota","NS":"Nsanje","NU":"Ntcheu","PH":"Phalombe","RU":"Rumphi","S":"Southern","SA":"Salima","TH":"Thyolo","ZO":"Zomba"},"MX":{"AGU":"Aguascalientes","BCN":"Baja California","BCS":{"default":"Baja California Sur","alt_en":"Lower California South"},"CAM":"Campeche","CHH":"Chihuahua","CHP":"Chiapas","CMX":{"default":"Ciudad de México","alt_en":"Mexico City"},"COA":"Coahuila de Zaragoza","COL":"Colima","DUR":"Durango","GRO":"Guerrero","GUA":"Guanajuato","HID":"Hidalgo","JAL":"Jalisco","MEX":{"default":"Estado de México","alt_en":"State of Mexico"},"MIC":{"default":"Michoacán de Ocampo","alt_en":"Michoacán"},"MOR":"Morelos","NAY":"Nayarit","NLE":"Nuevo León","OAX":"Oaxaca","PUE":"Puebla","QUE":"Querétaro","ROO":"Quintana Roo","SIN":"Sinaloa","SLP":"San Luis Potosí","SON":"Sonora","TAB":"Tabasco","TAM":"Tamaulipas","TLA":"Tlaxcala","VER":{"default":"Veracruz de Ignacio de la Llave","alt_en":"Veracruz"},"YUC":"Yucatán","ZAC":"Zacatecas"},"MZ":{"A":"Niaosa","B":"Manica","G":"Gaza","I":"Inhambane","L":"Maputo","MPM":"Maputo","N":"Nampula","P":"Cabo Delgado","Q":"Zambézia","S":"Sofala","T":"Tete"},"NA":{"CA":"Zambezi","ER":"Erongo","HA":"Hardap","KA":"Karas","KE":"Kavango East","KH":"Khomas","KU":"Kunene","KW":"Kavango West","OD":"Otjozondjupa","OH":"Omaheke","ON":"Oshana","OS":"Omusati","OT":"Oshikoto","OW":"Ohangwena"},"NG":{"AB":"Abia","AD":"Adamawa","AK":"Akwa Ibom","AN":"Anambra","BA":"Bauchi","BE":"Benue","BO":"Borno","BY":"Bayelsa","CR":"Cross River","DE":"Delta","EB":"Ebonyi","ED":"Edo","EK":"Ekiti","EN":"Enugu","FC":"Abuja Capital Territory","GO":"Gombe","IM":"Imo","JI":"Jigawa","KD":"Kaduna","KE":"Kebbi","KN":"Kano","KO":"Kogi","KT":"Katsina","KW":"Kwara","LA":"Lagos","NA":"Nasarawa","NI":"Niger","OG":"Ogun","ON":"Ondo","OS":"Osun","OY":"Oyo","PL":"Plateau","RI":"Rivers","SO":"Sokoto","TA":"Taraba","YO":"Yobe","ZA":"Zamfara"},"NI":{"AN":"Atlántico Norte","AS":"Atlántico Sur","BO":"Boaco","CA":"Carazo","CI":"Chinandega","CO":"Chontales","ES":"Estelí","GR":"Granada","JI":"Jinotega","LE":"León","MD":"Madriz","MN":"Managua","MS":"Masaya","MT":"Matagalpa","NS":"Nueva Segovia","RI":"Rivas","SJ":"Río San Juan"},"NL":{"DR":"Drenthe","FL":"Flevoland","FR":"Friesland","GE":"Gelderland","GR":"Groningen","LI":"Limburg","NB":{"default":"Noord-Brabant","alt_en":"North Brabant"},"NH":{"default":"Noord-Holland","alt_en":"North Holland"},"OV":"Overijssel","UT":"Utrecht","ZE":"Zeeland","ZH":{"default":"Zuid-Holland","alt_en":"South Holland"}},"NZ":{"AUK":"Auckland","BOP":"Bay of Plenty","CAN":"Canterbury","CIT":"Chatham Islands Territory","GIS":"Gisborne","HKB":"Hawkes's Bay","MBH":"Marlborough","MWT":"Manawatu-Wanganui","NSN":"Nelson","NTL":"Northland","OTA":"Otago","STL":"Southland","TAS":"Tasman","TKI":"Taranaki","WGN":"Wellington","WKO":"Waikato","WTC":"West Coast"},"OM":{"BJ":{"default":"محافظة جنوب الباطنة","alt_en":"Al Batinah South Governorate"},"BS":{"default":"محافظة شمال الباطنة","alt_en":"Al Batinah North Governorate"},"BU":{"default":"محافظة البريمي","alt_en":"Al Buraymi Governorate"},"DA":{"default":"محافظة الداخلية","alt_en":"Ad Dakhiliyah Governorate"},"MA":{"default":"مسقط","alt_en":"Muscat"},"MU":{"default":"محافظة مسندم","alt_en":"Musandam Governorate"},"SJ":{"default":"جنوب الشرقية","alt_en":"Ash Sharqiyah South"},"SS":{"default":"شمال الشرقية","alt_en":"Ash Sharqiyah North"},"WU":{"default":"محافظة الوسطى","alt_en":"Al Wusta Governorate"},"ZA":{"default":"محافظة الظاهرة","alt_en":"Ad Dhahirah Governorate"},"ZU":{"default":"محافظة ظفار","alt_en":"Dhofar"}},"PE":{"AMA":"Amazonas","ANC":"Ancash","APU":"Apurímac","ARE":"Arequipa","AYA":"Ayacucho","CAJ":"Cajamarca","CAL":"El Callao","CUS":"Cuzco","HUC":"Huánuco","HUV":"Huancavelica","ICA":"Ica","JUN":"Junín","LAL":"La Libertad","LAM":"Lambayeque","LIM":"Lima","LMA":"Lima hatun llaqta","LOR":"Loreto","MDD":"Madre de Dios","MOQ":"Moquegua","PAS":"Pasco","PIU":"Piura","PUN":"Puno","SAM":"San Martín","TAC":"Tacna","TUM":"Tumbes","UCA":"Ucayali"},"PG":{"CPK":"Chimbu","CPM":"Central","EBR":"East New Britain","EHG":"Eastern Highlands","EPW":"Enga","ESW":"East Sepik","GPK":"Gulf","HLA":"Hela","JWK":"Jiwaka","MBA":"Milne Bay","MPL":"Morobe","MPM":"Madang","MRL":"Manus","NCD":"National Capital District","NIK":"New Ireland","NPP":"Northern","NSB":"Bougainville","SAN":"West Sepik","SHM":"Southern Highlands","WBK":"West New Britain","WHM":"Western Highlands","WPD":"Western"},"PH":{"ABR":"Abra","AGN":"Agusan del Norte","AGS":"Agusan del Sur","AKL":"Aklan","ALB":"Albay","ANT":"Antique","APA":"Apayao","AUR":"Aurora","BAN":"Batasn","BAS":"Basilan","BEN":"Benguet","BIL":"Biliran","BOH":"Bohol","BTG":"Batangas","BTN":"Batanes","BUK":"Bukidnon","BUL":"Bulacan","CAG":"Cagayan","CAM":"Camiguin","CAN":"Camarines Norte","CAP":"Capiz","CAS":"Camarines Sur","CAT":"Catanduanes","CAV":"Cavite","CEB":"Cebu","COM":"Compostela Valley","DAO":"Davao Oriental","DAS":"Davao del Sur","DAV":"Davao del Norte","DIN":"Dinagat Islands","EAS":"Eastern Samar","GUI":"Guimaras","IFU":"Ifugao","ILI":"Iloilo","ILN":"Ilocos Norte","ILS":"Ilocos Sur","ISA":"Isabela","KAL":"Kalinga-Apayso","LAG":"Laguna","LAN":"Lanao del Norte","LAS":"Lanao del Sur","LEY":"Leyte","LUN":"La Union","MAD":"Marinduque","MAG":"Maguindanao","MAS":"Masbate","MDC":"Mindoro Occidental","MDR":"Mindoro Oriental","MOU":"Mountain Province","MSC":"Misamis Occidental","MSR":"Misamis Oriental","NCO":"North Cotabato","NEC":"Negros Occidental","NER":"Negros Oriental","NSA":"Northern Samar","NUE":"Nueva Ecija","NUV":"Nueva Vizcaya","PAM":"Pampanga","PAN":"Pangasinan","PLW":"Palawan","QUE":"Quezon","QUI":"Quirino","RIZ":"Rizal","ROM":"Romblon","SAR":"Sarangani","SCO":"South Cotabato","SIG":"Siquijor","SLE":"Southern Leyte","SLU":"Sulu","SOR":"Sorsogon","SUK":"Sultan Kudarat","SUN":"Surigao del Norte","SUR":"Surigao del Sur","TAR":"Tarlac","TAW":"Tawi-Tawi","WSA":"Western Samar","ZAN":"Zamboanga del Norte","ZAS":"Zamboanga del Sur","ZMB":"Zambales","ZSI":"Zamboanga Sibugay"},"PK":{"BA":"Balochistan","GB":"Gilgit-Baltistan","IS":"Islamabad","JK":"Azad Jammu and Kashmir","KP":"Khyber Pakhtunkhwa","PB":"Punjab","SD":"Sindh","TA":"Federally Administered Tribal Areas"},"PL":{"02":{"default":"województwo dolnośląskie","alt_en":"Lower Silesian Voivodeship"},"04":{"default":"województwo kujawsko-pomorskie","alt_en":"Kuyavian-Pomeranian Voivodeship"},"06":{"default":"województwo lubelskie","alt_en":"Lublin Voivodeship"},"08":{"default":"województwo lubuskie","alt_en":"Lubusz Voivodeship"},"10":{"default":"województwo łódzkie","alt_en":"Łódź Voivodeship"},"12":{"default":"województwo małopolskie","alt_en":"Lesser Poland Voivodeship"},"14":{"default":"województwo mazowieckie","alt_en":"Masovian Voivodeship"},"16":{"default":"województwo opolskie","alt_en":"Opole Voivodeship"},"18":{"default":"województwo podkarpackie","alt_en":"Subcarpathian Voivodeship"},"20":{"default":"województwo podlaskie","alt_en":"Podlaskie Voivodeship"},"22":{"default":"województwo pomorskie","alt_en":"Pomeranian Voivodeship"},"24":{"default":"województwo śląskie","alt_en":"Silesian Voivodeship"},"26":{"default":"województwo świętokrzyskie","alt_en":"Świętokrzyskie Voivodeship"},"28":{"default":"województwo warmińsko-mazurskie","alt_en":"Warmian-Masurian Voivodeship"},"30":{"default":"województwo wielkopolskie","alt_en":"Greater Poland Voivodeship"},"32":{"default":"województwo zachodniopomorskie","alt_en":"West Pomeranian Voivodeship"}},"QA":{"DA":{"default":"الدوحة","alt_en":"Doha"},"KH":{"default":"الخور والذخيرة","alt_en":"Al Khor and Al Thakhira"},"MS":{"default":"الشمال","alt_en":"Ash Shamal"},"RA":{"default":"الريان","alt_en":"Ar Rayyan"},"SH":{"default":"الشحانية","alt_en":"Al Shahaniya"},"US":{"default":"أم صلال","alt_en":"Umm Salal"},"WA":{"default":"الوكرة","alt_en":"Al Wakrah"},"ZA":{"default":"الضعاين","alt_en":"Al Daayen"}},"RO":{"AB":"Alba","AG":"Argeş","AR":"Arad","B":"Bucureşti","BC":"Bacău","BH":"Bihor","BN":"Bistriţa-Năsăud","BR":"Brāila","BT":"Botoşani","BV":"Braşov","BZ":"Buzău","CJ":"Cluj","CL":"Călărasi","CS":"Caraş-Severin","CT":"Constarţa","CV":"Covasna","DB":"Dâmboviţa","DJ":"Dolj","GJ":"Gorj","GL":"Galaţi","GR":"Giurgiu","HD":"Hunedoara","HR":"Harghita","IF":"Ilfov","IL":"Ialomiţa","IS":"Iaşi","MH":"Mehedinţi","MM":"Maramureş","MS":"Mureş","NT":"Neamţ","OT":"Olt","PH":"Prahova","SB":"Sibiu","SJ":"Sălaj","SM":"Satu Mare","SV":"Suceava","TL":"Tulcea","TM":"Timiş","TR":"Teleorman","VL":"Vâlcea","VN":"Vrancea","VS":"Vaslui"},"SB":{"CE":"Central Province","CH":"Choiseul Province","CT":"Capital Territory","GU":"Guadalcanal Province","IS":"Isabel Province","MK":"Makira Province","ML":"Malaita Province","RB":"Rennell and Bellona Province","TE":"Temotu Province","WE":"Western Province"},"SD":{"DC":{"default":"ولاية وسط دارفور","alt_en":"Central Darfur"},"DE":{"default":"ولاية شرق دارفور","alt_en":"East Darfur State"},"DN":{"default":"ولاية شمال دارفور","alt_en":"North Darfur State"},"DS":{"default":"جنوب دارفور","alt_en":"South Darfur State"},"DW":{"default":"ولاية غرب دارفور","alt_en":"West Darfur State"},"GD":{"default":"القضارف","alt_en":"Gedarif State"},"GK":{"default":"ولاية غرب كردفان","alt_en":"West Kurdufan"},"GZ":{"default":"ولاية الجزيرة","alt_en":"Gezira State"},"KA":{"default":"كسلا","alt_en":"Kassala"},"KH":{"default":"ولاية الخرطوم","alt_en":"Khartoum State"},"KN":{"default":"ولاية شمال كردفان","alt_en":"North Kordofan State"},"KS":{"default":"ولاية جنوب كردفان","alt_en":"South Kordofan State"},"NB":{"default":"ولاية النيل الأزرق","alt_en":"Blue Nile State"},"NO":{"default":"الولاية الشمالية","alt_en":"Northern State"},"NR":{"default":"نهر النيل","alt_en":"River Nile"},"NW":{"default":"ولاية النيل الأبيض","alt_en":"White Nile State"},"RS":{"default":"البحر الأحمر","alt_en":"Red Sea State"},"SI":{"default":"سنار","alt_en":"Sennar State"}},"SE":{"AB":"Stockholms län","AC":"Västerbottens län","BD":"Norrbottens län","C":"Uppsala län","D":"Södermanlands län","E":"Östergötlands län","F":"Jönköpings län","G":"Kronoborgs län","H":"Kalmar län","I":"Gotlands län","K":"Blekinge län","M":"Skåne län","N":"Hallands län","O":"Västra Götalands län","S":"Värmlands län","T":"Örebro län","U":"Västmanlands län","W":"Dalarnes län","X":"Gävleborgs län","Y":"Västernorrlands län","Z":"Jämtlands län"},"SH":{"AC":"Ascension","HL":"Saint Helena","TA":"Tristan da Cunha"},"SK":{"BC":{"default":"Banskobystrický kraj","alt_en":"Region of Banská Bystrica"},"BL":{"default":"Bratislavský kraj","alt_en":"Region of Bratislava"},"KI":{"default":"Košický kraj","alt_en":"Region of Košice"},"NI":{"default":"Nitrianský kraj","alt_en":"Region of Nitra"},"PV":{"default":"Prešovský kraj","alt_en":"Region of Prešov"},"TA":{"default":"Trnavský kraj","alt_en":"Region of Trnava"},"TC":{"default":"Trenčianský kraj","alt_en":"Region of Trenčín"},"ZI":{"default":"Žilinský kraj","alt_en":"Region of Žilina"}},"SL":{"E":"Eastern","N":"Northern","S":"Southern","W":"Western Area"},"SN":{"DB":"Diourbel","DK":"Dakar","FK":"Fatick","KA":"Kaffrine","KD":"Kolda","KE":"Kédougou","KL":"Kaolack","LG":"Louga","MT":"Matam","SE":"Sédhiou","SL":"Saint-Louis","TC":"Tambacounda","TH":"Thiès","ZG":"Ziguinchor"},"SO":{"AW":"Awdal","BK":"Bakool","BN":"Banaadir","BR":"Bari","BY":"Bay","GA":"Galguduud","GE":"Gedo","HI":"Hiiraan","JD":"Jubbada Dhexe","JH":"Jubbada Hoose","MU":"Mudug","NU":"Nugaal","SA":"Sanaag","SD":"Shabeellaha Dhexe","SH":"Shabeellaha Hoose","SO":"Sool","TO":"Togdheer","WO":"Woqooyi Galbeed"},"SR":{"BR":"Brokopondo","CM":"Commewijne","CR":"Coronie","MA":"Marowijne","NI":"Nickerie","PM":"Paramaribo","PR":"Para","SA":"Saramacca","SI":"Sipaliwini","WA":"Wanica"},"SS":{"BN":"Northern Bahr el Ghazal","BW":"Western Bahr el Ghazal","EC":"Central Equatoria","EE":"Eastern Equatoria","EW":"Western Equatoria","JG":"Jonglei","LK":"Lakes","NU":"Upper Nile","UY":"Unity","WR":"Warrap"},"ST":{"P":{"default":"Província de Príncipe","alt_en":"Príncipe Province"},"S":{"default":"Província de São Tomé","alt_en":"São Tomé Province"}},"SV":{"AH":"Departamento de Ahuachapán","CA":"Departamento de Cabañas","CH":"Departamento de Chalatenango","CU":"Departamento de Cuscatlán","LI":"La Libertad","MO":"Departamento de Morazán","PA":"Departamento de La Paz","SA":"Departamento de Santa Ana","SM":"Departamento de San Miguel","SO":"Departamento de Sonsonate","SS":"Departamento de San Salvador","SV":"San Vicente","UN":"Departamento de La Unión","US":"Departamento de Usulután"},"SY":{"DI":{"default":"محافظة دمشق","alt_en":"Damascus Governorate"},"DR":{"default":"محافظة درعا","alt_en":"Daraa Governorate"},"DY":{"default":"محافظة دير الزور","alt_en":"Deir Ezzor Governorate"},"HA":{"default":"محافظة الحسكة","alt_en":"Al-Hasaka Governorate"},"HI":{"default":"محافظة حمص","alt_en":"Homs Governorate"},"HL":{"default":"محافظة حلب","alt_en":"Aleppo Governorate"},"HM":{"default":"محافظة حماة","alt_en":"Hama Governorate"},"ID":{"default":"محافظة إدلب","alt_en":"Idlib Governorate"},"LA":{"default":"محافظة اللاذقية","alt_en":"Latakia Governorate"},"QU":{"default":"محافظة القنيطرة","alt_en":"Al-Qunaitra Governorate"},"RA":{"default":"محافظة الرقة","alt_en":"Ar-Raqqah Governorate"},"RD":{"default":"محافظة ريف دمشق","alt_en":"Rif Dimashq Governorate"},"SU":{"default":"محافظة السويداء","alt_en":"As-Suwayda Governorate"},"TA":{"default":"محافظة طرطوس","alt_en":"Tartus Governorate"}},"SZ":{"HH":"Hhohho","LU":"Lubombo","MA":"Manzini","SH":"Shiselweni"},"TD":{"BA":"Batha","BG":"Baḩr al Ghazāl","BO":"Būrkū","CB":"Chari-Baguirmi","EE":"Ennedi-Est","EO":"Ennedi-Ouest","GR":"Guéra","HL":"Hadjer Lamis","KA":"Kanem","LC":"Lac","LO":"Logone-Occidental","LR":"Logone-Oriental","MA":"Mandoul","MC":"Moyen-Chari","ME":"Mayo‐Kebbi‐Est","MO":"Mayo‐Kebbi‐Ouest","ND":"Ville de Ndjamena","OD":"Ouaddaï","SA":"Salamat","SI":"Sīlā","TA":"Tandjilé","TI":"Tibastī","WF":"Wadi Fira"},"TG":{"C":"Centrale","K":"Kara","M":"Maritime","P":"Plateaux","S":"Savanes"},"TJ":{"DU":{"default":"Душанбе","alt_en":"Dushanbe"},"GB":{"default":"Вилояти Мухтори Кӯҳистони Бадахшон","alt_en":"Gorno-Badakhshan Autonomous Region"},"KT":{"default":"Вилояти Хатлон","alt_en":"Khatlon Region"},"RA":{"default":"Ноҳияҳои тобеи ҷумҳурӣ","alt_en":"Districts of Republican Subordination"},"SU":{"default":"Вилояти Суғд","alt_en":"Sughd Region"}},"TL":{"AL":"Aileu","AN":"Ainaro","BA":"Baucau","BO":"Bobonaro","CO":"Cova Lima","DI":"Díli","ER":"Ermera","LA":"Lautem","LI":"Liquiça","MF":"Manufahi","MT":"Manatuto","OE":"Oecussi","VI":"Viqueque"},"TT":{"ARI":"Arima","CHA":"Chaguanas","CTT":"Couva-Tabaquite-Talparo","DMN":"Diego Martin","MRC":"Mayaro-Rio Claro","PED":"Penal-Debe","POS":"Port of Spain","PRT":"Princes Town","PTF":"Point Fortin","SFO":"San Fernando","SGE":"Sangre Grande","SIP":"Siparia","SJL":"San Juan-Laventille","TOB":"Tobago","TUP":"Tunapuna-Piarco"},"US":{"AL":"Alabama","AK":"Alaska","AS":"American Samoa","AZ":"Arizona","AR":"Arkansas","CA":"California","CO":"Colorado","CT":"Connecticut","DE":"Delaware","DC":"District of Columbia","FL":"Florida","FM":"Micronesia","GA":"Georgia","GU":"Guam","HI":"Hawaii","ID":"Idaho","IL":"Illinois","IN":"Indiana","IA":"Iowa","KS":"Kansas","KY":"Kentucky","LA":"Louisiana","ME":"Maine","MD":"Maryland","MA":"Massachusetts","MH":"Marshall Islands","MI":"Michigan","MN":"Minnesota","MS":"Mississippi","MO":"Missouri","MP":"Northern Mariana Islands","MT":"Montana","NE":"Nebraska","NV":"Nevada","NH":"New Hampshire","NJ":"New Jersey","NM":"New Mexico","NY":"New York","NC":"North Carolina","ND":"North Dakota","OH":"Ohio","OK":"Oklahoma","OR":"Oregon","PA":"Pennsylvania","PR":"Puerto Rico","PW":"Palau","RI":"Rhode Island","SC":"South Carolina","SD":"South Dakota","TN":"Tennessee","TX":"Texas","UM":"US Minor Outlying Islands","UT":"Utah","VT":"Vermont","VA":"Virginia","VI":"US Virgin Islands","WA":"Washington","WV":"West Virginia","WI":"Wisconsin","WY":"Wyoming"},"UY":{"AR":"Artigas","CA":"Canelones","CL":"Cerro Largo","CO":"Colonia","DU":"Durazno","FD":"Florida","FS":"Flores","LA":"Lavalleja","MA":"Maldonado","MO":"Montevideo","PA":"Paysandú","RN":"Río Negro","RO":"Rocha","RV":"Rivera","SA":"Salto","SJ":"San José","SO":"Soriano","TA":"Tacuarembó","TT":"Treinta y Tres"},"UZ":{"AN":"Andijon Region","BU":"Bukhara Region","FA":"Fergana Region","JI":"Jizzakh Region","NG":"Namangan Region","NW":"Navoiy Region","QA":"Qashqadaryo Region","QR":"Republic of Karakalpakstan","SA":"Samarqand Region","SI":"Sirdaryo Region","SU":"Surxondaryo Region","TK":"Tashkent","TO":"Tashkent Region","XO":"Xorazm Region"},"VE":{"A":"Distrito Capital","B":"Anzoátegui","C":"Apure","D":"Aragua","E":"Barinas","F":"Bolívar","G":"Carabobo","H":"Cojedes","I":"Falcón","J":"Guárico","K":"Lara","L":"Mérida","M":"Miranda","N":"Monagas","O":"Nueva Esparta","P":"Portuguesa","R":"Sucre","S":"Táchira","T":"Trujillo","U":"Yaracuy","V":"Zulia","W":"Dependencias Federales","X":"La Guaira","Y":"Delta Amacuro","Z":"Amazonas"},"VU":{"MAP":"Malampa","PAM":"Penama","SAM":"Sanma","SEE":"Shefa","TAE":"Tafea","TOB":"Torba"},"YE":{"AB":{"default":"محافظة أبين","alt_en":"Abyan Governorate"},"AD":{"default":"محافظة عدن","alt_en":"Aden Governorate"},"AM":{"default":"محافظة عمران","alt_en":"Amran Governorate"},"BA":{"default":"محافظة البيضاء","alt_en":"Al Bayda' Governorate"},"DA":{"default":"محافظة الضالع","alt_en":"Ad Dali' Governorate"},"DH":{"default":"محافظة ذمار","alt_en":"Dhamar Governorate"},"HD":{"default":"محافظة حضرموت","alt_en":"Hadramaut Governorate"},"HJ":{"default":"محافظة حجة","alt_en":"Hajjah Governorate"},"HU":{"default":"محافظة الحديدة","alt_en":"Al Hudaydah Governorate"},"IB":{"default":"محافظة إب","alt_en":"Ibb Governorate"},"JA":{"default":"محافظة الجوف","alt_en":"Al Jawf Governorate"},"LA":{"default":"محافظة لحج","alt_en":"Lahij Governorate"},"MA":{"default":"محافظة مأرب","alt_en":"Marib Governorate"},"MR":{"default":"محافظة المهرة","alt_en":"Al Mahrah Governorate"},"MW":{"default":"محافظة المحويت","alt_en":"Al Mahwit Governorate"},"RA":{"default":"محافظة ريمة","alt_en":"Raymah Governorate"},"SA":{"default":"أمانة العاصمة","alt_en":"Amanat Al Asimah"},"SD":{"default":"محافظة صعدة","alt_en":"Sa'dah Governorate"},"SH":{"default":"محافظة شبوة","alt_en":"Shabwah Governorate"},"SN":{"default":"محافظة صنعاء","alt_en":"Sana'a Governorate"},"SU":{"default":"محافظة أرخبيل سقطرى","alt_en":"Socotra Governorate"},"TA":{"default":"محافظة تعز","alt_en":"Ta'izz Governorate"}},"ZA":{"EC":"Eastern Cape","FS":"Free State","GT":"Gauteng","LP":"Limpopo","MP":"Mpumalanga","NC":"Northern Cape","NL":"Kwazulu-Natal","NW":"North-West","WC":"Western Cape"},"ZW":{"BU":"Bulawayo","HA":"Harare","MA":"Manicaland","MC":"Mashonaland Central","ME":"Mashonaland East","MI":"Midlands","MN":"Matabeleland North","MS":"Matabeleland South","MV":"Masvingo","MW":"Mashonaland West"}}
diff --git a/libs/address-formatter/src/main/resources/worldwide.json b/libs/address-formatter/src/main/resources/worldwide.json
new file mode 100644
index 00000000..840f337c
--- /dev/null
+++ b/libs/address-formatter/src/main/resources/worldwide.json
@@ -0,0 +1 @@
+{"generic1":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}\n{{{postcode}}} {{#first}} {{{postal_city}}} || {{{town}}} || {{{city}}} || {{{village}}} || {{{municipality}}} || {{{hamlet}}} || {{{county}}} || {{{state}}} {{/first}}\n{{{archipelago}}}\n{{{country}}}\n","generic2":"{{{attention}}}\n{{#first}} {{{house}}}, {{{quarter}}} || {{{house}}} {{/first}}\n{{{house_number}}} {{{road}}}\n{{#first}} {{{village}}} || {{{town}}} || {{{city}}} || {{{municipality}}} || {{{hamlet}}} || {{{county}}} {{/first}} {{{postcode}}}\n{{#first}} {{{country}}} || {{{state}}} {{/first}}\n","generic3":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}}\n{{{postcode}}} {{#first}} {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{city}}} || {{{municipality}}} || {{{state}}} {{/first}}        \n{{{country}}}\n","generic4":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}}\n{{#first}} {{{village}}} || {{{hamlet}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{state_district}}} || {{{suburb}}} || {{{municipality}}} || {{{county}}} {{/first}}, {{#first}} {{{state_code}}} || {{{state}}} {{/first}} {{{postcode}}}\n{{{country}}}\n","generic5":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}} \n{{#first}} {{{state_district}}} || {{{state}}} {{/first}}\n{{{country}}}\n","generic6":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{municipality}}} {{/first}} \n{{{county}}}\n{{{state}}}         \n{{{country}}}\n","generic7":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}} \n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{state}}}{{/first}}, {{{postcode}}} \n{{{country}}}\n","generic8":"{{{attention}}}\n{{{house}}}\n{{{road}}}, {{{house_number}}} \n{{{postcode}}} {{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{municipality}}} {{/first}} {{#first}} {{{county_code}}} || {{{county}}} {{/first}}\n{{{country}}}\n","generic9":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{state_district}}} {{/first}}\n{{{postcode}}} {{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{state}}} {{/first}}\n{{{country}}}\n","generic10":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}}\n{{{state}}}\n{{{country}}}\n{{{postcode}}}\n","generic11":"{{{country}}}\n{{{state}}}\n{{{postcode}}} {{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}}\n{{{suburb}}}\n{{{road}}}, {{{house_number}}}\n{{{house}}}\n{{{attention}}}\n","generic12":"{{{attention}}}\n{{{house}}}\n{{{house_number}}}, {{{road}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{state_district}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}} - {{{postcode}}}\n{{{state}}}\n{{{country}}}\n","generic13":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}}\n{{#first}} {{{suburb}}} || {{{city}}} || {{{town}}} || {{{state_district}}} || {{{village}}} || {{{hamlet}}} || {{{region}}} {{/first}} {{#first}} {{{state_code}}} || {{{state}}} {{/first}} {{{postcode}}}\n{{{country}}}\n","generic14":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}}\n{{{postcode}}} {{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{state_district}}} {{/first}}\n{{{state}}}\n{{{country}}}\n","generic15":"{{{attention}}}\n{{{house}}}\n{{{road}}}, {{{house_number}}}\n{{{postcode}}} {{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{municipality}}} || {{{state}}} || {{{county}}} {{/first}}\n{{{country}}}\n","generic16":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{municipality}}} || {{{county}}} || {{{state_district}}} || {{{state}}} {{/first}} \n{{{country}}}\n","generic17":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}} \n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{municipality}}} || {{{county}}} || {{{state_district}}} || {{{state}}} {{/first}} \n{{{country}}}\n","generic18":"{{{attention}}}\n{{{house}}}\n{{{house_number}}}, {{{road}}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} || {{{state}}} {{/first}} \n{{{country}}}\n","generic19":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}} {{{postcode}}} \n{{{country}}}\n","generic20":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}} \n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}} {{{postcode}}} \n{{{country}}}\n","generic21":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}} \n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{state}}} {{/first}} \n{{{country}}}\n","generic22":"{{{attention}}}\n{{{house}}}\n{{{house_number}}}, {{{road}}}\n{{{postcode}}} {{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{state}}} {{/first}}\n{{{country}}}\n","generic23":"{{{attention}}}\n{{house}}\n{{{house_number}}} {{{road}}}\n{{quarter}}\n{{#first}} {{{village}}} || {{{town}}} || {{{city}}} || {{{municipality}}} || {{{hamlet}}} || {{{county}}} {{/first}}\n{{{postcode}}}\n{{#first}} {{{country}}} || {{{state}}} {{/first}}\n","fallback1":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} || {{{island}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{municipality}}} {{/first}}\n{{#first}} {{{county}}} || {{{state_district}}} || {{{state}}} || {{{region}}} || {{{island}}}, {{{archipelago}}} {{/first}}\n{{{country}}}\n","fallback2":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}\n{{#first}} {{{suburb}}} || {{{village}}} || {{{hamlet}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{municipality}}} || {{{county}}} || {{{island}}} || {{{state_district}}} {{/first}}, {{#first}} {{{state}}} || {{{state_code}}} {{/first}}\n{{{country}}}\n","fallback3":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}\n{{#first}} {{{suburb}}} || {{{island}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{municipality}}} {{/first}}\n{{{county}}}\n{{#first}} {{{state}}} || {{{state_code}}} {{/first}}\n{{{country}}}\n","fallback4":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}\n{{{suburb}}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{municipality}}} || {{{county}}} {{/first}}\n{{#first}} {{{state}}} || {{{county}}} {{/first}}\n{{{country}}}\n","default":{"address_template":"generic1","fallback_template":"fallback1"},"AD":{"address_template":"generic3"},"AE":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}} \n{{#first}} {{{state_district}}} || {{{state}}} {{/first}}\n{{{country}}}\n"},"AF":{"address_template":"generic21"},"AG":{"address_template":"generic16"},"AI":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}} \n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}}\n{{{postcode}}} {{{country}}}\n"},"AL":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}} \n{{{postcode}}} {{#first}} {{{city}}} || {{{town}}} || {{{city_district}}} || {{{municipality}}} || {{{state_district}}} || {{{village}}} || {{{hamlet}}} {{/first}}\n{{{country}}}\n","postformat_replace":[["\n(\\d{4}) ([^,]*)\n","\n$1-$2\n"]]},"AM":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}} \n{{{postcode}}} \n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}}\n{{#first}} {{{state_district}}} || {{{state}}} {{/first}}\n{{{country}}}\n"},"AO":{"address_template":"generic7"},"AQ":{"address_template":"{{{attention}}}\n{{{house}}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}}\n{{#first}} {{{country}}} || {{{continent}}} {{/first}}\n"},"AR":{"address_template":"generic9","replace":[["^Autonomous City of ",""]],"postformat_replace":[["\n(\\w\\d{4})(\\w{3}) ","\n$1 $2 "]]},"AS":{"use_country":"US","change_country":"United States of America","add_component":"state=American Samoa"},"AT":{"address_template":"generic1"},"AU":{"address_template":"generic13"},"AW":{"address_template":"generic17"},"AX":{"use_country":"FI","change_country":"Åland, Finland"},"AZ":{"address_template":"generic3"},"BA":{"address_template":"generic1"},"BB":{"address_template":"generic16"},"BD":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{state_district}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}} - {{{postcode}}}\n{{{country}}}\n"},"BE":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}\n{{{postcode}}} {{#first}} {{{postal_city}}} || {{{town}}} || {{{city}}} || {{{village}}} || {{{municipality}}} || {{{hamlet}}} || {{{county}}} || {{{state}}} {{/first}}\n{{{archipelago}}}\n{{{country}}}\n"},"BF":{"address_template":"generic6"},"BG":{"address_template":"generic9"},"BH":{"address_template":"generic2"},"BI":{"address_template":"generic17"},"BJ":{"address_template":"generic18"},"BL":{"use_country":"FR","change_country":"Saint-Barthélemy, France"},"BM":{"address_template":"generic2"},"BN":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}}, {{{road}}} \n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{municipality}}} {{/first}} \n{{#first}} {{{county}}} || {{{state_district}}} || {{{state}}} {{/first}} {{{postcode}}} \n{{{country}}}\n"},"BO":{"address_template":"generic17","replace":[["^Municipio Nuestra Senora de ",""]]},"BQ":{"use_country":"NL","change_country":"Caribbean Netherlands"},"BR":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{state_district}}} || {{{village}}} || {{{hamlet}}} {{/first}} - {{#first}} {{{state_code}}} || {{{state}}} {{/first}}\n{{{postcode}}}\n{{{country}}}\n","postformat_replace":[["\\b(\\d{5})(\\d{3})\\b","$1-$2"]]},"BS":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}} \n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{municipality}}} {{/first}} \n{{{county}}} \n{{{country}}}\n"},"BT":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}, {{{house}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{state}}} {{/first}} {{{postcode}}} \n{{{country}}}\n"},"BV":{"use_country":"NO","change_country":"Bouvet Island, Norway"},"BW":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}} \n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}} \n{{{country}}}\n"},"BY":{"address_template":"generic11"},"BZ":{"address_template":"generic16"},"CA":{"address_template":"{{{attention}}}\n{{{house}}}\n{{#first}} {{{house_number}}} {{{road}}} || {{{suburb}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{county}}} || {{{state_district}}} {{/first}}, {{#first}} {{{state_code}}} || {{{state}}} {{/first}} {{{postcode}}}\n{{{country}}}\n","fallback_template":"{{{attention}}}\n{{{house}}}\n{{#first}} {{{house_number}}} {{{road}}} || {{{suburb}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{county}}} || {{{state_district}}} {{/first}}, {{#first}} {{{state_code}}} || {{{state}}} {{/first}} {{{postcode}}}\n{{{country}}}\n","postformat_replace":[[" (\\w{2}) (\\w{3})(\\w{3})\n"," $1 $2 $3\n"]]},"CC":{"use_country":"AU","change_country":"Australia"},"CD":{"address_template":"generic18"},"CF":{"address_template":"generic17"},"CG":{"address_template":"generic18"},"CH":{"address_template":"generic1","replace":[["Verwaltungskreis",""],[" administrative district",""],[" administrative region",""]]},"CI":{"address_template":"generic16"},"CK":{"address_template":"generic16"},"CL":{"address_template":"generic1","postformat_replace":[["\n(\\d{3})(\\d{4}) ","\n$1 $2 "]]},"CM":{"address_template":"generic17"},"CN":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}} \n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{{county}}}\n{{{postcode}}} {{#first}} {{{state_code}}} || {{{state}}} || {{{city}}} || {{{town}}} || {{{municipality}}} || {{{state_district}}} || {{{region}}} || {{{village}}}|| {{{hamlet}}} {{/first}}\n{{{country}}}\n"},"CN_en":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}} \n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{{county}}}\n{{{postcode}}} {{#first}} {{{state_code}}} || {{{state}}} || {{{city}}} || {{{town}}} || {{{municipality}}} || {{{state_district}}} || {{{region}}} || {{{village}}} || {{{hamlet}}} {{/first}}\n{{{country}}}\n"},"CN_zh":{"address_template":"{{{country}}}\n{{{postcode}}} \n{{#first}} {{{state_code}}} || {{{state}}} || {{{region}}} {{/first}}\n{{#first}} {{{state_district}}} || {{{county}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{municipality}}} {{/first}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{{road}}}\n{{{house_number}}} \n{{{house}}}\n{{{attention}}}\n"},"CO":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{{postcode}}} {{#first}} {{{city}}} || {{{town}}} || {{{state_district}}} || {{{village}}} || {{{hamlet}}} {{/first}}, {{#first}} {{{state_code}}} || {{{state}}} {{/first}}\n{{{country}}}\n","postformat_replace":[["Localidad "," "],["Bogota, Bogota","Bogota"],["Bogota, Bogotá Distrito Capital","Bogota"],["Bogotá, Bogotá Distrito Capital","Bogotá"]]},"CR":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}\n{{{state}}}, {{#first}} {{{city}}} || {{{town}}} || {{{state_district}}} || {{{village}}} || {{{hamlet}}} {{/first}}, {{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{{postcode}}} {{{country}}}\n"},"CU":{"address_template":"generic7"},"CV":{"address_template":"generic1","postformat_replace":[["\n(\\d{4}) ([^,]*)\n","\n$1-$2\n"]]},"CW":{"address_template":"generic17"},"CX":{"use_country":"AU","add_component":"state=Christmas Island","change_country":"Australia"},"CY":{"address_template":"generic1"},"CZ":{"address_template":"generic1","postformat_replace":[["\n(\\d{3})(\\d{2}) ","\n$1 $2 "]]},"DE":{"address_template":"generic1","fallback_template":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{#first}} {{{town}}} || {{{city}}} || {{{village}}} || {{{hamlet}}} || {{{municipality}}} || {{{county}}} {{/first}}\n{{#first}} {{{state}}} || {{{state_district}}} {{/first}}\n{{{country}}}\n","replace":[["^Stadtteil ",""],["^Stadtbezirk (\\d+)",""],["^Ortsbeirat (\\d+) :",""],["^Gemeinde ",""],["^Gemeindeverwaltungsverband ",""],["^Landkreis ",""],["^Kreis ",""],["^Grenze ",""],["^Free State of ",""],["^Freistaat ",""],["^Regierungsbezirk ",""],["^Gemeindefreies Gebiet ",""],["city=Alt-Berlin","Berlin"]],"postformat_replace":[["Berlin\nBerlin","Berlin"],["Bremen\nBremen","Bremen"],["Hamburg\nHamburg","Hamburg"]]},"DJ":{"address_template":"generic16","replace":[["city=Djibouti","Djibouti-Ville"]]},"DK":{"address_template":"generic1","replace":[["^Capital Region of ",""]]},"DM":{"address_template":"generic16"},"DO":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}} \n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}}, {{{state}}} \n{{{postcode}}} \n{{{country}}}\n","postformat_replace":[[", Distrito Nacional",", DN"]]},"DZ":{"address_template":"generic3"},"EC":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}\n{{{postcode}}}\n{{#first}} {{{city}}} || {{{town}}} || {{{state_district}}} || {{{village}}} || {{{hamlet}}} {{/first}}\n{{{country}}}\n"},"EG":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}} \n{{{postcode}}} \n{{{country}}}\n"},"EE":{"address_template":"generic1"},"EH":{"address_template":"generic17"},"ER":{"address_template":"generic17"},"ES":{"address_template":"generic15","fallback_template":"fallback4","replace":[["Autonomous Community of the",""],["Autonomous Community of",""],["^Community of ",""]]},"ET":{"address_template":"generic1"},"FI":{"address_template":"generic1"},"FJ":{"address_template":"generic16"},"FK":{"use_country":"GB","change_country":"Falkland Islands, United Kingdom"},"FM":{"use_country":"US","change_country":"United States of America","add_component":"state=Micronesia"},"FO":{"address_template":"generic1","postformat_replace":[["Territorial waters of Faroe Islands","Faroe Islands"]]},"FR":{"address_template":"generic3","replace":[["Polynésie française, Îles du Vent \\(eaux territoriales\\)","Polynésie française"],["France, Mayotte \\(eaux territoriales\\)","Mayotte, France"],["France, La Réunion \\(eaux territoriales\\)","La Réunion, France"],["Grande Terre et récifs d'Entrecasteaux",""],["France, Nouvelle-Calédonie","Nouvelle-Calédonie, France"],["\\(eaux territoriales\\)",""],["Paris (\\d+)(\\w+) Arrondissement$","Paris"]]},"GA":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}} \n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} || {{{village}}} || {{{hamlet}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{municipality}}} || {{{county}}} || {{{state_district}}} || {{{state}}} {{/first}}\n{{{country}}}\n"},"GB":{"address_template":"generic23","fallback_template":"fallback3","replace":[["^Borough of ",""],["^County( of)? ",""],["^Parish of ",""],["^Central ",""],["^Greater London","London"],["^London Borough of ",""],["Royal Borough of ",""],["County Borough of ",""]],"postformat_replace":[["London, London","London"],["London, Greater London","London"],["City of Westminster","London"],["City of Nottingham","Nottingham"],[", United Kingdom$","\nUnited Kingdom"],["London\nEngland\nUnited Kingdom","London\nUnited Kingdom"]]},"GD":{"address_template":"generic17"},"GE":{"address_template":"generic1"},"GF":{"use_country":"FR","change_country":"France"},"GG":{"use_country":"GB","change_country":"Guernsey, Channel Islands"},"GH":{"address_template":"generic16"},"GI":{"address_template":"generic16"},"GL":{"address_template":"generic1"},"GM":{"address_template":"generic16"},"GN":{"address_template":"generic14"},"GP":{"use_country":"FR","change_country":"Guadeloupe, France"},"GQ":{"address_template":"generic17"},"GR":{"address_template":"generic1","postformat_replace":[["\n(\\d{3})(\\d{2}) ","\n$1 $2 "]]},"GS":{"use_country":"GB","change_country":"United Kingdom","add_component":"county=South Georgia"},"GT":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}\n{{{postcode}}}-{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{municipality}}} || {{{state}}} {{/first}}\n{{{country}}}\n","postformat_replace":[["\n(\\d{5})- ","\n$1-"],["\n -","\n"]]},"GU":{"use_country":"US","change_country":"United States of America","add_component":"state=Guam"},"GW":{"address_template":"generic1"},"GY":{"address_template":"generic16"},"HK":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}} \n{{{state_district}}}\n{{#first}} {{{state}}} || {{{country}}} {{/first}}\n"},"HK_en":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}} \n{{{state_district}}}\n{{{state}}}\n{{{country}}}\n"},"HK_zh":{"address_template":"{{{country}}}\n{{{state}}}\n{{{state_district}}}\n{{{road}}}\n{{{house_number}}}\n{{{house}}}\n{{{attention}}}\n"},"HM":{"use_country":"AU","change_country":"Australia","add_component":"state=Heard Island and McDonald Islands"},"HN":{"address_template":"generic1"},"HR":{"address_template":"generic1"},"HT":{"address_template":"generic1","postformat_replace":[[" Commune de"," "]]},"HU":{"address_template":"{{{attention}}}\n{{{house}}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}} \n{{{road}}} {{{house_number}}} \n{{{postcode}}}\n{{{country}}}\n"},"ID":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}} {{{postcode}}}\n{{{state}}}\n{{{country}}}\n"},"IE":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{municipality}}} {{/first}}\n{{{county}}}\n{{{country}}}\n","replace":[[" City$",""],["The Municipal District of ",""],["The Metropolitan District of ",""],["Municipal District",""],["Electoral Division",""]],"postformat_replace":[["Dublin\nCounty Dublin","Dublin"],["Galway\nCounty Galway","Galway"],["Kilkenny\nCounty Kilkenny","Kilkenny"],["Limerick\nCounty Limerick","Limerick"],["Tipperary\nCounty Tipperary","Tipperary"]]},"IL":{"address_template":"generic1"},"IM":{"use_country":"GB"},"IN":{"address_template":"generic12"},"IO":{"use_country":"GB","change_country":"British Indian Ocean Territory, United Kingdom"},"IQ":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{#first}} {{{city_district}}} || {{{neighbourhood}}} || {{{suburb}}} {{/first}}\n{{{road}}}         \n{{#first}} {{{city}}} || {{{town}}} || {{{state}}} || {{{village}}} || {{{hamlet}}} {{/first}}\n{{{postcode}}}\n{{{country}}}\n"},"IR":{"address_template":"{{{attention}}}\n{{{house}}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{{road}}}\n{{{house_number}}}\n{{#first}}{{{province}}} || {{{state}}} || {{{state_district}}}{{/first}}\n{{{postcode}}}\n{{{country}}}\n"},"IR_en":{"address_template":"{{{attention}}}\n{{{house}}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{{road}}}\n{{{house_number}}}\n{{#first}}{{{state}}} || {{{state_district}}}{{/first}}\n{{{postcode}}}\n{{{country}}}\n"},"IR_fa":{"address_template":"{{{country}}}\n{{{state}}}\n{{{state_district}}}\n{{#first}} {{{state}}} || {{{province}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{{road}}}\n{{{house_number}}}\n{{{house}}}\n{{{attention}}}\n{{{postcode}}}\n"},"IS":{"address_template":"generic1"},"IT":{"address_template":"generic8","replace":[["Città metropolitana di ",""],["Metropolitan City of ",""]],"postformat_replace":[["Vatican City\nVatican City$","\nVatican City"],["Città del Vaticano\nCittà del Vaticano$","Città del Vaticano\n"]]},"JE":{"use_country":"GB","change_country":"Jersey, Channel Islands"},"JM":{"address_template":"generic20"},"JO":{"address_template":"generic1"},"JP":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}}, {{#first}} {{{state}}} || {{{state_district}}} {{/first}} {{{postcode}}}\n{{{country}}}\n","postformat_replace":[[" (\\d{3})(\\d{4})\n"," $1-$2\n"]]},"JP_en":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}}, {{#first}} {{{state}}} || {{{state_district}}} {{/first}} {{{postcode}}}\n{{{country}}}\n","postformat_replace":[[" (\\d{3})(\\d{4})\n"," $1-$2\n"]]},"JP_ja":{"address_template":"{{{country}}}\n{{{postcode}}}\n{{#first}} {{{state}}} || {{{state_district}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{{road}}}\n{{{house_number}}}\n{{{house}}}\n{{{attention}}}\n","postformat_replace":[[" (\\d{3})(\\d{4})\n"," $1-$2\n"]]},"KE":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}}\n{{#first}} {{{city}}} || {{{town}}} || {{{state}}} || {{{village}}} || {{{hamlet}}} {{/first}}\n{{{postcode}}}\n{{{country}}}\n"},"KG":{"address_template":"generic11"},"KH":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}} \n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}} {{{postcode}}}\n{{{country}}}\n"},"KI":{"address_template":"generic17"},"KM":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{{country}}}\n"},"KN":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}} \n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}}, {{#first}} {{{state}}} || {{{island}}} {{/first}}\n{{{country}}}\n"},"KP":{"address_template":"generic21"},"KR":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}} \n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}, {{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}}, {{#first}} {{{state}}} {{/first}} {{{postcode}}} \n{{{country}}}\n"},"KR_en":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}} \n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}, {{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}}, {{#first}} {{{state}}} {{/first}} {{{postcode}}} \n{{{country}}}\n"},"KR_ko":{"address_template":"{{{country}}}\n{{#first}} {{{state}}} {{/first}} \n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{{road}}}\n{{{house_number}}} \n{{{house}}}\n{{{attention}}}\n{{{postcode}}}\n"},"KW":{"address_template":"{{{attention}}}\n{{{house}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n\n{{{road}}} \n{{{house_number}}} {{{house}}}\n{{{postcode}}} {{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}}\n{{{country}}}\n"},"KY":{"address_template":"generic2"},"KZ":{"address_template":"generic11"},"LA":{"address_template":"generic22"},"LB":{"address_template":"generic2","postformat_replace":[[" (\\d{4}) (\\d{4})\n"," $1 $2\n"]]},"LC":{"address_template":"generic17"},"LI":{"use_country":"CH"},"LK":{"address_template":"generic20"},"LR":{"address_template":"generic1"},"LS":{"address_template":"generic2"},"LT":{"address_template":"generic1"},"LU":{"address_template":"generic3"},"LV":{"address_template":"generic7"},"LY":{"address_template":"generic17"},"MA":{"address_template":"generic3"},"MC":{"address_template":"generic3"},"MD":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}}, {{{house_number}}}\n{{{postcode}}} {{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{state}}} {{/first}}\n{{{country}}}\n"},"ME":{"address_template":"generic1"},"MF":{"use_country":"FR","change_country":"France"},"MH":{"use_country":"US","add_component":"state=Marshall Islands"},"MG":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}} \n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{{postcode}}} {{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}} \n{{{country}}}\n"},"MK":{"address_template":"generic1"},"ML":{"address_template":"generic17"},"MM":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}} \n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{state}}} {{/first}}, {{{postcode}}} \n{{{country}}}\n"},"MN":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{city_district}}} \n{{#first}} {{{suburb}}} || {{{neighbourhood}}} {{/first}}\n{{{road}}} \n{{{house_number}}} \n{{{postcode}}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}} \n{{{country}}}\n"},"MO":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}\n{{#first}} {{{suburb}}} || {{{village}}} || {{{hamlet}}} || {{{state_district}}} {{/first}}\n{{{country}}}\n"},"MO_pt":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}\n{{#first}} {{{suburb}}} || {{{village}}} || {{{hamlet}}} || {{{state_district}}} {{/first}}\n{{{country}}}\n"},"MO_zh":{"address_template":"{{{country}}}\n{{#first}} {{{suburb}}} || {{{village}}} || {{{hamlet}}} || {{{state_district}}} {{/first}}\n{{{road}}}\n{{{house_number}}}    \n{{{house}}}\n{{{attention}}}\n"},"MP":{"use_country":"US","change_country":"United States of America","add_component":"state=Northern Mariana Islands"},"MS":{"address_template":"generic16"},"MT":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}} \n{{#first}} {{{city}}} || {{{town}}} || {{{suburb}}} || {{{village}}} || {{{hamlet}}} {{/first}} \n{{{postcode}}}\n{{{country}}}\n"},"MQ":{"use_country":"FR","change_country":"Martinique, France"},"MR":{"address_template":"generic18"},"MU":{"address_template":"generic18"},"MV":{"address_template":"generic2"},"MW":{"address_template":"generic16"},"MX":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{{postcode}}} {{#first}} {{{city}}} || {{{town}}} || {{{state_district}}} || {{{village}}} || {{{hamlet}}} {{/first}}, {{#first}} {{{state_code}}} || {{{state}}} {{/first}}\n{{{country}}}\n"},"MY":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{{postcode}}} {{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}}\n{{{state}}}\n{{{country}}}\n"},"MZ":{"address_template":"generic15","fallback_template":"fallback4"},"NA":{"address_template":"generic2"},"NC":{"use_country":"FR","change_country":"Nouvelle-Calédonie, France"},"NE":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} \n{{{road}}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}}\n{{{country}}}\n"},"NF":{"use_country":"AU","add_component":"state=Norfolk Island","change_country":"Australia"},"NG":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}} {{{postcode}}}\n{{{state}}}\n{{{country}}}\n"},"NI":{"address_template":"generic21"},"NL":{"address_template":"generic1","postformat_replace":[["\n(\\d{4})(\\w{2}) ","\n$1 $2 "],["\nKoninkrijk der Nederlanden$","\nNederland"]]},"NO":{"address_template":"generic1"},"NP":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}} \n{{#first}} {{{suburb}}} || {{{neighbourhood}}} || {{{city}}} {{/first}}\n{{#first}} {{{municipality}}} || {{{county}}} || {{{state_district}}} || {{{state}}} {{/first}} {{{postcode}}} \n{{{country}}}\n"},"NR":{"address_template":"generic16"},"NU":{"address_template":"generic16"},"NZ":{"address_template":"generic20","postformat_replace":[["Wellington\nWellington City","Wellington"]]},"OM":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}} \n{{{postcode}}}\n{{#first}} {{{city}}} || {{{town}}} || {{{state_district}}} || {{{village}}} || {{{hamlet}}} {{/first}}\n{{{state}}}\n{{{country}}}\n"},"PA":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{{postcode}}}\n{{#first}} {{{city}}} || {{{town}}} || {{{state_district}}} || {{{village}}} || {{{hamlet}}} {{/first}}\n{{{state}}}\n{{{country}}}\n","replace":[["city=Panama","Panama City"],["city=Panamá","Ciudad de Panamá"]]},"PE":{"address_template":"generic19"},"PF":{"use_country":"FR","change_country":"Polynésie française, France","replace":[["Polynésie française, Îles du Vent \\(eaux territoriales\\)","Polynésie française"]]},"PG":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}} \n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}} {{{postcode}}} {{{state}}} \n{{{country}}}\n"},"PH":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{suburb}}} || {{{state_district}}} {{/first}}\n{{{postcode}}} {{{state}}}\n{{{country}}}\n"},"PK":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{state}}} {{/first}} {{{postcode}}} \n{{{country}}}\n"},"PL":{"address_template":"generic1","postformat_replace":[["\n(\\d{2})(\\w{3}) ","\n$1-$2 "]]},"PM":{"use_country":"FR","change_country":"Saint-Pierre-et-Miquelon, France"},"PN":{"address_template":"{{{attention}}}\n{{{house}}}\n{{#first}} {{{city}}} || {{{town}}} || {{{island}}} {{/first}} \n{{{country}}}\n"},"PR":{"use_country":"US","change_country":"United States of America","add_component":"state=Puerto Rico"},"PS":{"use_country":"IL"},"PT":{"address_template":"generic1","postformat_replace":[["\n(\\d{4})(\\d{3}) ","\n$1-$2 "]]},"PW":{"address_template":"generic1"},"PY":{"address_template":"generic1"},"QA":{"address_template":"generic17"},"RE":{"use_country":"FR","change_country":"La Réunion, France"},"RO":{"address_template":"generic1"},"RS":{"address_template":"generic1"},"RU":{"address_template":"generic10","fallback_template":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} || {{{island}}} || {{{village}}} || {{{hamlet}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{municipality}}} {{/first}}\n{{#first}} {{{county}}} || {{{state_district}}} || {{{state}}} {{/first}}\n{{{country}}}\n"},"RW":{"address_template":"generic16"},"SA":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}}, {{#first}} {{{village}}} || {{{hamlet}}} || {{{city_district}}} || {{{suburb}}} || {{{neighbourhood}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{state_district}}} {{/first}} {{{postcode}}}\n{{{country}}}\n"},"SB":{"address_template":"generic17"},"SC":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}} \n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{island}}} {{/first}} \n{{{island}}}\n{{{country}}}\n"},"SD":{"address_template":"generic1"},"SE":{"address_template":"generic1","postformat_replace":[["\n(\\d{3})(\\d{2}) ","\n$1 $2 "]]},"SG":{"address_template":"{{{attention}}}\n{{#first}} {{{house}}}, {{{quarter}}} || {{{house}}} {{/first}}\n{{{house_number}}} {{{road}}}, {{{residential}}}\n{{#first}} {{{country}}} || {{{town}}} || {{{city}}} || {{{municipality}}} || {{{hamlet}}} || {{{village}}} || {{{county}}} {{/first}} {{{postcode}}}\n{{#first}} {{{country}}} {{/first}}\n"},"SH":{"use_country":"GB","change_country":"$state, United Kingdom"},"SI":{"address_template":"generic1"},"SJ":{"use_country":"NO","change_country":"Norway"},"SK":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}\n{{{postcode}}} {{#first}} {{{postal_city}}} || {{{city}}} || {{{town}}} || {{{village}}} || {{{municipality}}} || {{{city_district}}} || {{{hamlet}}} || {{{county}}} || {{{state}}} {{/first}}\n{{{country}}}\n","replace":[["^District of ",""],["^Region of ",""]],"postformat_replace":[["\n(\\d{3})(\\d{2}) ","\n$1 $2 "]]},"SL":{"address_template":"generic16"},"SM":{"use_country":"IT"},"SN":{"address_template":"generic3"},"SO":{"address_template":"generic21"},"SR":{"address_template":"generic21"},"SS":{"address_template":"generic17"},"ST":{"address_template":"generic17"},"SV":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}} \n{{{postcode}}} - {{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}} \n{{{state}}} \n{{{country}}}\n","postformat_replace":[["\n- ","\n "]]},"SX":{"address_template":"generic17"},"SY":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}}, {{{house_number}}}\n{{#first}} {{{village}}} || {{{hamlet}}} || {{{city_district}}} || {{{neighbourhood}}} || {{{suburb}}} {{/first}}\n{{{postcode}}} {{#first}} {{{city}}} || {{{town}}} || {{{state_district}}} || {{{state}}} {{/first}}\n\n{{{country}}}\n"},"SZ":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{state}}} {{/first}}\n{{{postcode}}} \n{{{country}}}\n"},"TC":{"use_country":"GB"},"TD":{"address_template":"generic21"},"TF":{"use_country":"FR","change_country":"Terres australes et antarctiques françaises, France"},"TG":{"address_template":"generic18"},"TH":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{#first}} {{{village}}} || {{{hamlet}}} {{/first}}\n{{{road}}} \n{{#first}} {{{neighbourhood}}} || {{{city}}} || {{{town}}} {{/first}}, {{#first}} {{{suburb}}} || {{{city_district}}} || {{{state_district}}} {{/first}}\n{{{state}}} {{{postcode}}} \n{{{country}}}\n"},"TJ":{"address_template":"generic1"},"TK":{"use_country":"NZ","change_country":"Tokelau, New Zealand"},"TL":{"address_template":"generic17"},"TM":{"address_template":"generic22"},"TN":{"address_template":"generic3"},"TO":{"address_template":"generic16"},"TR":{"address_template":"generic1"},"TT":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{state_district}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{state_district}}} || {{{village}}} || {{{hamlet}}} {{/first}}, {{{postcode}}}\n{{{country}}}\n"},"TV":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{municipality}}} {{/first}}\n{{#first}} {{{county}}} || {{{state_district}}} || {{{state}}} || {{{island}}} {{/first}}\n{{{country}}}\n"},"TW":{"address_template":"generic20"},"TW_en":{"address_template":"generic20"},"TW_zh":{"address_template":"{{{country}}}\n{{{postcode}}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{municipality}}} {{/first}}\n{{{city_district}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}\n{{{road}}}\n{{{house_number}}}\n{{{house}}}\n{{{attention}}}\n"},"TZ":{"address_template":"generic14","fallback_template":"generic14","postformat_replace":[["Dar es Salaam\nDar es Salaam","Dar es Salaam"]]},"UA":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}}, {{{house_number}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{state_district}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{municipality}}} || {{{state}}} {{/first}}\n{{{postcode}}} \n{{{country}}}\n"},"UG":{"address_template":"generic16"},"UM":{"fallback_template":"fallback2","use_country":"US","change_country":"United States of America","add_component":"state=US Minor Outlying Islands"},"US":{"address_template":"generic4","fallback_template":"fallback2","replace":[["state=United States Virgin Islands","US Virgin Islands"],["state=USVI","US Virgin Islands"]],"postformat_replace":[["\nUS$","\nUnited States of America"],["\nUSA$","\nUnited States of America"],["\nUnited States$","\nUnited States of America"],["Town of ",""],["Township of ",""]]},"UZ":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}} \n{{#first}} {{{state}}} || {{{state_district}}} {{/first}} \n{{{country}}}\n{{{postcode}}}\n"},"UY":{"address_template":"generic1"},"VA":{"use_country":"IT"},"VC":{"address_template":"generic17"},"VE":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{road}}} {{{house_number}}}\n{{#first}} {{{city}}} || {{{town}}} || {{{state_district}}} || {{{village}}} || {{{hamlet}}} {{/first}} {{{postcode}}}, {{#first}} {{{state_code}}} || {{{state}}} {{/first}}\n{{{country}}}\n"},"VG":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}} \n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} {{/first}}, {{{island}}}\n{{{country}}}, {{{postcode}}}\n"},"VI":{"use_country":"US","change_country":"United States of America","add_component":"state=US Virgin Islands"},"VN":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}}, {{{road}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}, {{#first}} {{{city}}} || {{{town}}} || {{{state_district}}} || {{{village}}} || {{{hamlet}}} {{/first}}\n{{{state}}} {{{postcode}}}\n{{{country}}}\n"},"VU":{"address_template":"generic17"},"WF":{"use_country":"FR","change_country":"Wallis-et-Futuna, France"},"WS":{"address_template":"generic17"},"YE":{"address_template":"generic18"},"YT":{"use_country":"FR","change_country":"Mayotte, France"},"ZA":{"address_template":"{{{attention}}}\n{{{house}}}\n{{{house_number}}} {{{road}}}\n{{#first}} {{{suburb}}} || {{{city_district}}} || {{{state_district}}} {{/first}}\n{{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{state}}} {{/first}} \n{{{postcode}}}\n{{{country}}}\n"},"ZM":{"address_template":"generic3"},"ZW":{"address_template":"generic16"}}
diff --git a/plugins/sdk/build.gradle.kts b/plugins/sdk/build.gradle.kts
index a45d179f..e22a74fd 100644
--- a/plugins/sdk/build.gradle.kts
+++ b/plugins/sdk/build.gradle.kts
@@ -107,12 +107,16 @@ publishing {
     }
     repositories {
         mavenLocal()
-        maven {
-            name = "GitHubPackages"
-            url = uri("https://maven.pkg.github.com/MM2-0/Kvaesitso")
-            credentials {
-                username = project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME")
-                password = project.findProperty("gpr.key") as String? ?: System.getenv("TOKEN")
+        val ghUser = project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME")
+        if (ghUser == "MM2-0") {
+            maven {
+                name = "GitHubPackages"
+                url = uri("https://maven.pkg.github.com/MM2-0/Kvaesitso")
+                credentials {
+                    username =
+                        project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME")
+                    password = project.findProperty("gpr.key") as String? ?: System.getenv("TOKEN")
+                }
             }
         }
     }
diff --git a/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/base/QueryPluginProvider.kt b/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/base/QueryPluginProvider.kt
new file mode 100644
index 00000000..7efebd2c
--- /dev/null
+++ b/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/base/QueryPluginProvider.kt
@@ -0,0 +1,195 @@
+package de.mm20.launcher2.sdk.base
+
+import android.content.ContentValues
+import android.database.Cursor
+import android.net.Uri
+import android.os.Bundle
+import android.os.CancellationSignal
+import de.mm20.launcher2.plugin.config.QueryPluginConfig
+import de.mm20.launcher2.plugin.contracts.SearchPluginContract
+import de.mm20.launcher2.sdk.config.toBundle
+import de.mm20.launcher2.sdk.utils.launchWithCancellationSignal
+
+data class SearchParams(
+    val allowNetwork: Boolean,
+    val lang: String?,
+)
+
+data class GetParams(
+    val lang: String?,
+)
+
+/**
+ * Parameters that are passed to the [refresh] method.
+ */
+data class RefreshParams(
+    /**
+     * The current language of the launcher.
+     */
+    val lang: String?,
+    /**
+     * The time (in unixtime millis) when the item was last refreshed.
+     */
+    val lastUpdated: Long,
+)
+
+abstract class QueryPluginProvider<TQuery, TResult>(
+    private val config: QueryPluginConfig,
+) : BasePluginProvider() {
+
+    abstract suspend fun search(query: TQuery, params: SearchParams): List<TResult>
+
+    /**
+     * Get an item by its id.
+     * This only needs to be implemented if `config.storageStrategy` is set to `StoreReference`
+     */
+    open suspend fun get(id: String, params: GetParams): TResult? = null
+
+    /**
+     * Request an updated copy of the item.
+     * This is called when `config.storageStrategy` is set to `StoreCopy` and the launcher wants to refresh the item.
+     * By default, this method returns the same item.
+     * @param item the old item that should be refreshed
+     * @param params the parameters that should be used to refresh the item
+     */
+    open suspend fun refresh(item: TResult, params: RefreshParams): TResult? = item
+
+    internal abstract fun getQuery(uri: Uri): TQuery?
+
+    override fun onCreate(): Boolean = true
+
+    override fun query(
+        uri: Uri,
+        projection: Array<out String>?,
+        selection: String?,
+        selectionArgs: Array<out String>?,
+        sortOrder: String?
+    ): Cursor? = query(uri, projection, null, null)
+
+    override fun query(
+        uri: Uri,
+        projection: Array<out String>?,
+        queryArgs: Bundle?,
+        cancellationSignal: CancellationSignal?
+    ): Cursor? {
+        val context = context ?: return null
+        checkPermissionOrThrow(context)
+        when {
+            uri.pathSegments.size == 1 && uri.pathSegments.first() == SearchPluginContract.Paths.Search -> {
+                val query = getQuery(uri) ?: return null
+                val params = getSearchParams(uri)
+                val results = search(query, params, cancellationSignal)
+                return results.toCursor()
+            }
+
+            uri.pathSegments.size == 2 && uri.pathSegments.first() == SearchPluginContract.Paths.Root -> {
+                val id = uri.pathSegments[1]
+                val params = getGetParams(uri)
+                val result = get(id, params, cancellationSignal)
+                return if (result != null) {
+                    listOf(result).toCursor()
+                } else {
+                    emptyList<TResult>().toCursor()
+                }
+            }
+
+            uri.pathSegments.size == 1 && uri.pathSegments.first() == SearchPluginContract.Paths.Refresh -> {
+                val oldItem = queryArgs?.toResult() ?: return null
+                val params = getRefreshParams(uri)
+                val newItem = refresh(oldItem, params, cancellationSignal)
+                return if (newItem == null) {
+                    emptyList<TResult>().toCursor()
+                } else {
+                    listOf(newItem).toCursor().apply {
+                        extras = Bundle().apply {
+                            putBoolean(SearchPluginContract.Extras.NotUpdated, newItem === oldItem)
+                        }
+                    }
+                }
+            }
+        }
+        return null
+    }
+
+    override fun getType(uri: Uri): String? =
+        throw UnsupportedOperationException("This operation is not supported")
+
+    override fun insert(uri: Uri, values: ContentValues?): Uri? =
+        throw UnsupportedOperationException("This operation is not supported")
+
+    override fun delete(uri: Uri, selection: String?, selectionArgs: Array<out String>?): Int =
+        throw UnsupportedOperationException("This operation is not supported")
+
+    override fun update(
+        uri: Uri,
+        values: ContentValues?,
+        selection: String?,
+        selectionArgs: Array<out String>?
+    ): Int = throw UnsupportedOperationException("This operation is not supported")
+
+    private fun search(
+        query: TQuery,
+        params: SearchParams,
+        cancellationSignal: CancellationSignal?
+    ): List<TResult> {
+        return launchWithCancellationSignal(cancellationSignal) {
+            search(query, params)
+        }
+    }
+
+    private fun refresh(
+        item: TResult,
+        params: RefreshParams,
+        cancellationSignal: CancellationSignal?
+    ): TResult? {
+        return launchWithCancellationSignal(cancellationSignal) {
+            refresh(item, params)
+        }
+    }
+
+    private fun get(
+        id: String,
+        params: GetParams,
+        cancellationSignal: CancellationSignal?
+    ): TResult? {
+        return launchWithCancellationSignal(cancellationSignal) {
+            get(id, params)
+        }
+    }
+
+    private fun getGetParams(uri: Uri): GetParams {
+        val lang = uri.getQueryParameter(SearchPluginContract.Params.Lang)
+        return GetParams(
+            lang = lang,
+        )
+    }
+
+    private fun getSearchParams(uri: Uri): SearchParams {
+        val allowNetwork =
+            uri.getQueryParameter(SearchPluginContract.Params.AllowNetwork)?.toBoolean()
+                ?: false
+        val lang = uri.getQueryParameter(SearchPluginContract.Params.Lang)
+        return SearchParams(
+            allowNetwork = allowNetwork,
+            lang = lang,
+        )
+    }
+
+    private fun getRefreshParams(uri: Uri): RefreshParams {
+        val lang = uri.getQueryParameter(SearchPluginContract.Params.Lang)
+        val lastUpdated =
+            uri.getQueryParameter(SearchPluginContract.Params.UpdatedAt)?.toLongOrNull() ?: 0L
+        return RefreshParams(
+            lang = lang,
+            lastUpdated = lastUpdated,
+        )
+    }
+
+    internal abstract fun List<TResult>.toCursor(): Cursor
+
+    internal abstract fun Bundle.toResult(): TResult?
+
+    final override fun getPluginConfig(): Bundle {
+        return config.toBundle()
+    }
+}
\ No newline at end of file
diff --git a/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/base/SearchPluginProvider.kt b/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/base/SearchPluginProvider.kt
deleted file mode 100644
index 2f9bbaf4..00000000
--- a/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/base/SearchPluginProvider.kt
+++ /dev/null
@@ -1,123 +0,0 @@
-package de.mm20.launcher2.sdk.base
-
-import android.content.ContentValues
-import android.database.Cursor
-import android.database.MatrixCursor
-import android.net.Uri
-import android.os.Bundle
-import android.os.CancellationSignal
-import de.mm20.launcher2.plugin.config.SearchPluginConfig
-import de.mm20.launcher2.plugin.contracts.SearchPluginContract
-import de.mm20.launcher2.sdk.config.toBundle
-import de.mm20.launcher2.sdk.utils.launchWithCancellationSignal
-import kotlinx.coroutines.runBlocking
-
-abstract class SearchPluginProvider<T>(
-    private val config: SearchPluginConfig,
-) : BasePluginProvider() {
-
-    /**
-     * Search for items matching the given query
-     * @param query The query to search for
-     */
-    abstract suspend fun search(query: String, allowNetwork: Boolean): List<T>
-
-    /**
-     * Get an item by its id.
-     * This only needs to be implemented if `config.storageStrategy` is set to `StoreReference`
-     */
-    open suspend fun get(id: String): T? {
-        return null
-    }
-
-    override fun onCreate(): Boolean {
-        return true
-    }
-
-    override fun query(
-        uri: Uri,
-        projection: Array<out String>?,
-        selection: String?,
-        selectionArgs: Array<out String>?,
-        sortOrder: String?
-    ): Cursor? {
-        return query(uri, projection, null, null)
-    }
-
-    override fun query(
-        uri: Uri,
-        projection: Array<out String>?,
-        queryArgs: Bundle?,
-        cancellationSignal: CancellationSignal?
-    ): Cursor? {
-        val context = context ?: return null
-        checkPermissionOrThrow(context)
-        when {
-            uri.pathSegments.size == 1 && uri.pathSegments.first() == SearchPluginContract.Paths.Search -> {
-                val query =
-                    uri.getQueryParameter(SearchPluginContract.Paths.QueryParam) ?: return null
-                val allowNetwork =
-                    uri.getQueryParameter(SearchPluginContract.Paths.AllowNetworkParam)?.toBoolean()
-                        ?: false
-                val results = search(query, allowNetwork, cancellationSignal)
-                val cursor = createCursor(results.size)
-                for (result in results) {
-                    writeToCursor(cursor, result)
-                }
-                return cursor
-            }
-            uri.pathSegments.size == 2 && uri.pathSegments.first() == SearchPluginContract.Paths.Root -> {
-                val id = uri.pathSegments[1]
-                val result = runBlocking {
-                    get(id)
-                }
-                return if (result != null) {
-                    val cursor = createCursor(1)
-                    writeToCursor(cursor, result)
-                    cursor
-                } else {
-                    createCursor(0)
-                }
-            }
-        }
-        return null
-    }
-
-    override fun getType(uri: Uri): String? {
-        throw UnsupportedOperationException("This operation is not supported")
-    }
-
-    override fun insert(uri: Uri, values: ContentValues?): Uri? {
-        throw UnsupportedOperationException("This operation is not supported")
-    }
-
-    override fun delete(uri: Uri, selection: String?, selectionArgs: Array<out String>?): Int {
-        throw UnsupportedOperationException("This operation is not supported")
-    }
-
-    override fun update(
-        uri: Uri,
-        values: ContentValues?,
-        selection: String?,
-        selectionArgs: Array<out String>?
-    ): Int {
-        throw UnsupportedOperationException("This operation is not supported")
-    }
-
-    private fun search(
-        query: String,
-        allowNetwork: Boolean,
-        cancellationSignal: CancellationSignal?
-    ): List<T> {
-        return launchWithCancellationSignal(cancellationSignal) {
-            search(query, allowNetwork)
-        }
-    }
-
-    final override fun getPluginConfig(): Bundle {
-        return config.toBundle()
-    }
-
-    internal abstract fun createCursor(capacity: Int): MatrixCursor
-    internal abstract fun writeToCursor(cursor: MatrixCursor, item: T)
-}
\ No newline at end of file
diff --git a/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/base/StringPluginProvider.kt b/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/base/StringPluginProvider.kt
new file mode 100644
index 00000000..f41629af
--- /dev/null
+++ b/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/base/StringPluginProvider.kt
@@ -0,0 +1,14 @@
+package de.mm20.launcher2.sdk.base
+
+import android.net.Uri
+import de.mm20.launcher2.plugin.config.QueryPluginConfig
+import de.mm20.launcher2.plugin.contracts.SearchPluginContract
+
+abstract class StringPluginProvider<T>(
+    config: QueryPluginConfig,
+) : QueryPluginProvider<String, T>(config) {
+
+    override fun getQuery(uri: Uri): String? {
+        return uri.getQueryParameter(SearchPluginContract.Paths.QueryParam)
+    }
+}
\ No newline at end of file
diff --git a/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/config/SearchPluginConfig.kt b/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/config/SearchPluginConfig.kt
index 20bd0ac7..8b4f840e 100644
--- a/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/config/SearchPluginConfig.kt
+++ b/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/config/SearchPluginConfig.kt
@@ -1,9 +1,9 @@
 package de.mm20.launcher2.sdk.config
 
 import android.os.Bundle
-import de.mm20.launcher2.plugin.config.SearchPluginConfig
+import de.mm20.launcher2.plugin.config.QueryPluginConfig
 
-internal fun SearchPluginConfig.toBundle(): Bundle {
+internal fun QueryPluginConfig.toBundle(): Bundle {
     return Bundle().apply {
         putString("storageStrategy", storageStrategy.name)
     }
diff --git a/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/files/FileProvider.kt b/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/files/FileProvider.kt
index 489e5b79..d9c3568b 100644
--- a/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/files/FileProvider.kt
+++ b/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/files/FileProvider.kt
@@ -1,70 +1,41 @@
 package de.mm20.launcher2.sdk.files
 
-import android.database.MatrixCursor
+import android.database.Cursor
 import de.mm20.launcher2.plugin.PluginType
-import de.mm20.launcher2.plugin.config.SearchPluginConfig
-import de.mm20.launcher2.plugin.contracts.FilePluginContract
-import de.mm20.launcher2.sdk.base.SearchPluginProvider
+import de.mm20.launcher2.plugin.config.QueryPluginConfig
+import de.mm20.launcher2.plugin.contracts.FilePluginContract.FileColumns
+import de.mm20.launcher2.plugin.data.buildCursor
+import de.mm20.launcher2.sdk.base.StringPluginProvider
 
 abstract class FileProvider(
-    config: SearchPluginConfig,
-) : SearchPluginProvider<File>(config) {
-    abstract override suspend fun search(query: String, allowNetwork: Boolean): List<File>
+    config: QueryPluginConfig,
+) : StringPluginProvider<File>(config) {
 
     final override fun getPluginType(): PluginType {
         return PluginType.FileSearch
     }
 
-    override fun createCursor(capacity: Int): MatrixCursor {
-        return MatrixCursor(
-            arrayOf(
-                FilePluginContract.FileColumns.Id,
-                FilePluginContract.FileColumns.DisplayName,
-                FilePluginContract.FileColumns.MimeType,
-                FilePluginContract.FileColumns.Size,
-                FilePluginContract.FileColumns.Path,
-                FilePluginContract.FileColumns.ContentUri,
-                FilePluginContract.FileColumns.ThumbnailUri,
-                FilePluginContract.FileColumns.IsDirectory,
-                FilePluginContract.FileColumns.Owner,
-                FilePluginContract.FileColumns.MetaTitle,
-                FilePluginContract.FileColumns.MetaArtist,
-                FilePluginContract.FileColumns.MetaAlbum,
-                FilePluginContract.FileColumns.MetaDuration,
-                FilePluginContract.FileColumns.MetaYear,
-                FilePluginContract.FileColumns.MetaWidth,
-                FilePluginContract.FileColumns.MetaHeight,
-                FilePluginContract.FileColumns.MetaLocation,
-                FilePluginContract.FileColumns.MetaAppName,
-                FilePluginContract.FileColumns.MetaAppPackageName,
-            ),
-            capacity,
-        )
-    }
-
-    override fun writeToCursor(cursor: MatrixCursor, item: File) {
-        cursor.addRow(
-            arrayOf(
-                item.id,
-                item.displayName,
-                item.mimeType,
-                item.size,
-                item.path,
-                item.uri.toString(),
-                item.thumbnailUri?.toString(),
-                if (item.isDirectory) 1 else 0,
-                item.owner,
-                item.metadata.title,
-                item.metadata.artist,
-                item.metadata.album,
-                item.metadata.duration,
-                item.metadata.year,
-                item.metadata.dimensions?.width,
-                item.metadata.dimensions?.height,
-                item.metadata.location,
-                item.metadata.appName,
-                item.metadata.appPackageName,
-            )
-        )
+    override fun List<File>.toCursor(): Cursor {
+        return buildCursor(FileColumns, this) {
+            put(FileColumns.Id, it.id)
+            put(FileColumns.DisplayName, it.displayName)
+            put(FileColumns.MimeType, it.mimeType)
+            put(FileColumns.Size, it.size)
+            put(FileColumns.Path, it.path)
+            put(FileColumns.ContentUri, it.uri.toString())
+            put(FileColumns.ThumbnailUri, it.thumbnailUri?.toString())
+            put(FileColumns.IsDirectory, it.isDirectory)
+            put(FileColumns.Owner, it.owner)
+            put(FileColumns.MetaTitle, it.metadata.title)
+            put(FileColumns.MetaArtist, it.metadata.artist)
+            put(FileColumns.MetaAlbum, it.metadata.album)
+            put(FileColumns.MetaDuration, it.metadata.duration)
+            put(FileColumns.MetaYear, it.metadata.year)
+            put(FileColumns.MetaWidth, it.metadata.dimensions?.width)
+            put(FileColumns.MetaHeight, it.metadata.dimensions?.height)
+            put(FileColumns.MetaLocation, it.metadata.location)
+            put(FileColumns.MetaAppName, it.metadata.appName)
+            put(FileColumns.MetaAppPackageName, it.metadata.appPackageName)
+        }
     }
 }
\ No newline at end of file
diff --git a/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/locations/Location.kt b/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/locations/Location.kt
new file mode 100644
index 00000000..6e5aed6e
--- /dev/null
+++ b/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/locations/Location.kt
@@ -0,0 +1,37 @@
+package de.mm20.launcher2.sdk.locations
+
+import de.mm20.launcher2.search.location.Address
+import de.mm20.launcher2.search.location.Attribution
+import de.mm20.launcher2.search.location.Departure
+import de.mm20.launcher2.search.location.LocationIcon
+import de.mm20.launcher2.search.location.OpeningSchedule
+
+data class Location(
+    val id: String,
+    val label: String,
+    val latitude: Double,
+    val longitude: Double,
+    val icon: LocationIcon? = null,
+    /**
+     * Human-readable category of the location.
+     * Should be localized.
+     */
+    val category: String?,
+    val address: Address? = null,
+    val openingSchedule: OpeningSchedule? = null,
+    val websiteUrl: String? = null,
+    val phoneNumber: String? = null,
+    val emailAddress: String? = null,
+    /**
+     * User rating of a location, from 0 to 1.
+     * Will be multiplied by 5 to get a 5-star rating.
+     */
+    val userRating: Float? = null,
+    /**
+     * Number of reviews that were used to calculate the user rating.
+     */
+    val userRatingCount: Int? = null,
+    val departures: List<Departure>? = null,
+    val fixMeUrl: String? = null,
+    val attribution: Attribution? = null,
+)
\ No newline at end of file
diff --git a/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/locations/LocationProvider.kt b/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/locations/LocationProvider.kt
new file mode 100644
index 00000000..3a4aa5b1
--- /dev/null
+++ b/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/locations/LocationProvider.kt
@@ -0,0 +1,80 @@
+package de.mm20.launcher2.sdk.locations
+
+import android.database.Cursor
+import android.net.Uri
+import android.os.Bundle
+import de.mm20.launcher2.plugin.PluginType
+import de.mm20.launcher2.plugin.config.QueryPluginConfig
+import de.mm20.launcher2.plugin.contracts.LocationPluginContract
+import de.mm20.launcher2.plugin.contracts.LocationPluginContract.LocationColumns
+import de.mm20.launcher2.plugin.data.buildCursor
+import de.mm20.launcher2.plugin.data.get
+import de.mm20.launcher2.sdk.base.QueryPluginProvider
+import de.mm20.launcher2.serialization.Json
+
+abstract class LocationProvider(
+    config: QueryPluginConfig,
+) : QueryPluginProvider<LocationQuery, Location>(config) {
+
+    private val json = Json.Lenient
+
+    final override fun getPluginType(): PluginType {
+        return PluginType.LocationSearch
+    }
+
+    override fun List<Location>.toCursor(): Cursor {
+        return buildCursor(LocationColumns, this) {
+            put(LocationColumns.Id, it.id)
+            put(LocationColumns.Label, it.label)
+            put(LocationColumns.Latitude, it.latitude)
+            put(LocationColumns.Longitude, it.longitude)
+            put(LocationColumns.FixMeUrl, it.fixMeUrl)
+            put(LocationColumns.Icon, it.icon)
+            put(LocationColumns.Category, it.category)
+            put(LocationColumns.Address, it.address)
+            put(LocationColumns.OpeningSchedule, it.openingSchedule)
+            put(LocationColumns.WebsiteUrl, it.websiteUrl)
+            put(LocationColumns.PhoneNumber, it.phoneNumber)
+            put(LocationColumns.EmailAddress, it.emailAddress)
+            put(LocationColumns.UserRating, it.userRating)
+            put(LocationColumns.UserRatingCount, it.userRatingCount)
+            put(LocationColumns.Departures, it.departures)
+            put(LocationColumns.Attribution, it.attribution)
+        }
+    }
+
+    override fun getQuery(uri: Uri): LocationQuery? {
+        val query = uri.getQueryParameter(LocationPluginContract.Params.Query) ?: return null
+        val searchRadius = uri.getQueryParameter(LocationPluginContract.Params.SearchRadius)?.toLongOrNull() ?: return null
+        val lat = uri.getQueryParameter(LocationPluginContract.Params.UserLatitude)?.toDoubleOrNull() ?: return null
+        val lon = uri.getQueryParameter(LocationPluginContract.Params.UserLongitude)?.toDoubleOrNull() ?: return null
+        return LocationQuery(
+            query = query,
+            userLatitude = lat,
+            userLongitude = lon,
+            searchRadius = searchRadius,
+        )
+    }
+
+    final override fun Bundle.toResult(): Location? {
+        return Location(
+            id = get(LocationColumns.Id) ?: return null,
+            label = get(LocationColumns.Label) ?: return null,
+            latitude = get(LocationColumns.Latitude) ?: return null,
+            longitude = get(LocationColumns.Longitude) ?:return null,
+            fixMeUrl = get(LocationColumns.FixMeUrl),
+            icon = get(LocationColumns.Icon),
+            category = get(LocationColumns.Category),
+            address = get(LocationColumns.Address),
+            openingSchedule = get(LocationColumns.OpeningSchedule),
+            websiteUrl = get(LocationColumns.WebsiteUrl),
+            phoneNumber = get(LocationColumns.PhoneNumber),
+            emailAddress = get(LocationColumns.EmailAddress),
+            userRating = get(LocationColumns.UserRating),
+            userRatingCount = get(LocationColumns.UserRatingCount),
+            departures = get(LocationColumns.Departures),
+            attribution = get(LocationColumns.Attribution),
+
+        )
+    }
+}
\ No newline at end of file
diff --git a/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/locations/LocationQuery.kt b/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/locations/LocationQuery.kt
new file mode 100644
index 00000000..5290908f
--- /dev/null
+++ b/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/locations/LocationQuery.kt
@@ -0,0 +1,8 @@
+package de.mm20.launcher2.sdk.locations
+
+data class LocationQuery(
+    val query: String,
+    val userLatitude: Double,
+    val userLongitude: Double,
+    val searchRadius: Long,
+)
diff --git a/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/weather/Forecast.kt b/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/weather/Forecast.kt
index f1849d92..191e55a0 100644
--- a/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/weather/Forecast.kt
+++ b/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/weather/Forecast.kt
@@ -99,31 +99,8 @@ val Double.mm
 val Double.inch
     get() = Precipitation(this * 25.4)
 
-
-enum class WeatherIcon {
-    Unknown,
-    Clear,
-    Cloudy,
-    Cold,
-    Drizzle,
-    Haze,
-    Fog,
-    Hail,
-    HeavyThunderstorm,
-    HeavyThunderstormWithRain,
-    Hot,
-    MostlyCloudy,
-    PartlyCloudy,
-    Showers,
-    Sleet,
-    Snow,
-    Storm,
-    Thunderstorm,
-    ThunderstormWithRain,
-    Wind,
-    BrokenClouds,
-}
-
+@Deprecated("Use de.mm20.launcher2.weather.WeatherIcon")
+typealias WeatherIcon = de.mm20.launcher2.weather.WeatherIcon
 
 data class Forecast(
     /**
diff --git a/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/weather/WeatherProvider.kt b/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/weather/WeatherProvider.kt
index 65ab1307..b8c3f648 100644
--- a/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/weather/WeatherProvider.kt
+++ b/plugins/sdk/src/main/java/de/mm20/launcher2/sdk/weather/WeatherProvider.kt
@@ -2,7 +2,6 @@ package de.mm20.launcher2.sdk.weather
 
 import android.content.ContentValues
 import android.database.Cursor
-import android.database.MatrixCursor
 import android.location.Geocoder
 import android.net.Uri
 import android.os.Bundle
@@ -11,6 +10,9 @@ import android.util.Log
 import de.mm20.launcher2.plugin.PluginType
 import de.mm20.launcher2.plugin.config.WeatherPluginConfig
 import de.mm20.launcher2.plugin.contracts.WeatherPluginContract
+import de.mm20.launcher2.plugin.contracts.WeatherPluginContract.ForecastColumns
+import de.mm20.launcher2.plugin.contracts.WeatherPluginContract.LocationColumns
+import de.mm20.launcher2.plugin.data.buildCursor
 import de.mm20.launcher2.sdk.base.BasePluginProvider
 import de.mm20.launcher2.sdk.config.toBundle
 import de.mm20.launcher2.sdk.ktx.formatToString
@@ -71,7 +73,26 @@ abstract class WeatherProvider(
                 val forecasts = launchWithCancellationSignal(cancellationSignal) {
                     getWeatherData(lat, lon, id, name, lang)
                 } ?: return null
-                return createForecastCursor(forecasts)
+                return buildCursor(ForecastColumns, forecasts) {
+                    put(ForecastColumns.Timestamp, it.timestamp)
+                    put(ForecastColumns.CreatedAt, it.createdAt)
+                    put(ForecastColumns.Temperature, it.temperature.kelvin)
+                    put(ForecastColumns.TemperatureMin, it.minTemp?.kelvin)
+                    put(ForecastColumns.TemperatureMax, it.maxTemp?.kelvin)
+                    put(ForecastColumns.Pressure, it.pressure?.hPa)
+                    put(ForecastColumns.Humidity, it.humidity)
+                    put(ForecastColumns.WindSpeed, it.windSpeed?.metersPerSecond)
+                    put(ForecastColumns.WindDirection, it.windDirection)
+                    put(ForecastColumns.Precipitation, it.precipitation?.mm)
+                    put(ForecastColumns.RainProbability, it.rainProbability)
+                    put(ForecastColumns.Clouds, it.clouds)
+                    put(ForecastColumns.Location, it.location)
+                    put(ForecastColumns.Provider, it.provider)
+                    put(ForecastColumns.ProviderUrl, it.providerUrl)
+                    put(ForecastColumns.Night, it.night)
+                    put(ForecastColumns.Icon, it.icon)
+                    put(ForecastColumns.Condition, it.condition)
+                }
             }
 
             uri.pathSegments.size == 1 && uri.pathSegments.first() == WeatherPluginContract.Paths.Locations -> {
@@ -85,7 +106,16 @@ abstract class WeatherProvider(
                 ) {
                     findLocations(query, lang)
                 }
-                return createLocationsCursor(locations)
+                return buildCursor(LocationColumns, locations) {
+                    if (it is WeatherLocation.Id) {
+                        put(LocationColumns.Id, it.id)
+                        put(LocationColumns.Name, it.name)
+                    } else if (it is WeatherLocation.LatLon) {
+                        put(LocationColumns.Lat, it.lat)
+                        put(LocationColumns.Lon, it.lon)
+                        put(LocationColumns.Name, it.name)
+                    }
+                }
             }
         }
         return null
@@ -113,90 +143,6 @@ abstract class WeatherProvider(
         return null
     }
 
-    private fun createForecastCursor(forecasts: List<Forecast>): Cursor {
-        val cursor = MatrixCursor(
-            arrayOf(
-                WeatherPluginContract.ForecastColumns.Timestamp,
-                WeatherPluginContract.ForecastColumns.CreatedAt,
-                WeatherPluginContract.ForecastColumns.Temperature,
-                WeatherPluginContract.ForecastColumns.TemperatureMin,
-                WeatherPluginContract.ForecastColumns.TemperatureMax,
-                WeatherPluginContract.ForecastColumns.Pressure,
-                WeatherPluginContract.ForecastColumns.Humidity,
-                WeatherPluginContract.ForecastColumns.WindSpeed,
-                WeatherPluginContract.ForecastColumns.WindDirection,
-                WeatherPluginContract.ForecastColumns.Precipitation,
-                WeatherPluginContract.ForecastColumns.RainProbability,
-                WeatherPluginContract.ForecastColumns.Clouds,
-                WeatherPluginContract.ForecastColumns.Location,
-                WeatherPluginContract.ForecastColumns.Provider,
-                WeatherPluginContract.ForecastColumns.ProviderUrl,
-                WeatherPluginContract.ForecastColumns.Night,
-                WeatherPluginContract.ForecastColumns.Icon,
-                WeatherPluginContract.ForecastColumns.Condition,
-            ),
-            forecasts.size,
-        )
-        for (forecast in forecasts) {
-            cursor.addRow(
-                arrayOf(
-                    forecast.timestamp,
-                    forecast.createdAt,
-                    forecast.temperature.kelvin,
-                    forecast.minTemp?.kelvin,
-                    forecast.maxTemp?.kelvin,
-                    forecast.pressure?.hPa,
-                    forecast.humidity,
-                    forecast.windSpeed?.metersPerSecond,
-                    forecast.windDirection,
-                    forecast.precipitation?.mm,
-                    forecast.rainProbability,
-                    forecast.clouds,
-                    forecast.location,
-                    forecast.provider,
-                    forecast.providerUrl,
-                    if (forecast.night) 1 else 0,
-                    forecast.icon.name,
-                    forecast.condition,
-                )
-            )
-        }
-        return cursor
-    }
-
-    fun createLocationsCursor(locations: List<WeatherLocation>): Cursor {
-        val cursor = MatrixCursor(
-            arrayOf(
-                WeatherPluginContract.LocationColumns.Id,
-                WeatherPluginContract.LocationColumns.Lat,
-                WeatherPluginContract.LocationColumns.Lon,
-                WeatherPluginContract.LocationColumns.Name,
-            ),
-            locations.size,
-        )
-        for (location in locations) {
-            if (location is WeatherLocation.Id) {
-                cursor.addRow(
-                    arrayOf(
-                        location.id,
-                        null,
-                        null,
-                        location.name,
-                    )
-                )
-            } else if (location is WeatherLocation.LatLon) {
-                cursor.addRow(
-                    arrayOf(
-                        null,
-                        location.lat,
-                        location.lon,
-                        location.name,
-                    )
-                )
-            }
-        }
-        return cursor
-    }
 
     override fun insert(uri: Uri, values: ContentValues?): Uri? {
         throw UnsupportedOperationException("This operation is not supported")
diff --git a/services/icons/src/main/java/de/mm20/launcher2/icons/providers/ThemedPlaceholderIconProvider.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/providers/ThemedPlaceholderIconProvider.kt
index 14f394da..e18126bb 100644
--- a/services/icons/src/main/java/de/mm20/launcher2/icons/providers/ThemedPlaceholderIconProvider.kt
+++ b/services/icons/src/main/java/de/mm20/launcher2/icons/providers/ThemedPlaceholderIconProvider.kt
@@ -33,6 +33,7 @@ internal class ThemedPlaceholderIconProvider(
                 color = 0,
                 scale = layer.scale,
             )
+            is VectorLayer -> layer.copy(color = 0)
             is TextLayer -> layer.copy(color = 0)
             is TintedIconLayer -> layer.copy(color = 0)
             is TintedClockLayer -> return layer.copy(color = 0)
diff --git a/services/plugins/src/main/java/de/mm20/launcher2/plugins/PluginScanner.kt b/services/plugins/src/main/java/de/mm20/launcher2/plugins/PluginScanner.kt
index be1f6ed6..d27ed88c 100644
--- a/services/plugins/src/main/java/de/mm20/launcher2/plugins/PluginScanner.kt
+++ b/services/plugins/src/main/java/de/mm20/launcher2/plugins/PluginScanner.kt
@@ -2,6 +2,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.Uri
+import android.util.Log
 import de.mm20.launcher2.crashreporter.CrashReporter
 import de.mm20.launcher2.plugin.Plugin
 import de.mm20.launcher2.plugin.PluginType
@@ -34,6 +35,7 @@ class PluginScanner(
                         try {
                             PluginType.valueOf(it)
                         } catch (e: IllegalArgumentException) {
+                            Log.e("MM20", "Invalid plugin type: $it")
                             null
                         }
                     } ?: continue
diff --git a/services/plugins/src/main/java/de/mm20/launcher2/plugins/PluginService.kt b/services/plugins/src/main/java/de/mm20/launcher2/plugins/PluginService.kt
index 55acf1f7..2a735045 100644
--- a/services/plugins/src/main/java/de/mm20/launcher2/plugins/PluginService.kt
+++ b/services/plugins/src/main/java/de/mm20/launcher2/plugins/PluginService.kt
@@ -225,12 +225,13 @@ internal class PluginServiceImpl(
                     0
                 ).firstOrNull()
                 val signature = getSignature(packageName)
+                val author = appInfo.metaData?.getString("de.mm20.launcher2.plugin.author")
                 PluginPackage(
                     packageName = packageName,
                     label = appInfo.metaData?.getString("de.mm20.launcher2.plugin.label")
                         ?: appInfo.loadLabel(context.packageManager).toString(),
                     description = appInfo.metaData?.getString("de.mm20.launcher2.plugin.description"),
-                    author = appInfo.metaData?.getString("de.mm20.launcher2.plugin.author"),
+                    author = author,
                     plugins = plugins,
                     settings = settingsActivity?.let {
                         Intent().apply {
@@ -238,7 +239,7 @@ internal class PluginServiceImpl(
                                 ComponentName(it.activityInfo.packageName, it.activityInfo.name)
                         }
                     },
-                    isOfficial = OFFICIAL_PLUGIN_SIGNATURES.contains(signature),
+                    isVerified = VERIFIED_PLUGIN_SIGNATURES[author]?.contains(signature) == true,
                 )
             }
         }.flowOn(Dispatchers.Default)
@@ -258,6 +259,7 @@ internal class PluginServiceImpl(
             0
         ).firstOrNull()
         val signature = getSignature(packageName)
+        val author = appInfo.metaData?.getString("de.mm20.launcher2.plugin.author")
         return repository.findMany(packageName = packageName)
             .map {
                 PluginPackage(
@@ -265,7 +267,7 @@ internal class PluginServiceImpl(
                     label = appInfo.metaData?.getString("de.mm20.launcher2.plugin.label")
                         ?: appInfo.loadLabel(context.packageManager).toString(),
                     description = appInfo.metaData?.getString("de.mm20.launcher2.plugin.description"),
-                    author = appInfo.metaData?.getString("de.mm20.launcher2.plugin.author"),
+                    author = author,
                     plugins = it,
                     settings = settingsActivityInfo?.let {
                         Intent().apply {
@@ -273,7 +275,7 @@ internal class PluginServiceImpl(
                                 ComponentName(it.activityInfo.packageName, it.activityInfo.name)
                         }
                     },
-                    isOfficial = OFFICIAL_PLUGIN_SIGNATURES.contains(signature),
+                    isVerified = VERIFIED_PLUGIN_SIGNATURES[author]?.contains(signature) == true,
                 )
             }
             .flowOn(Dispatchers.Default)
@@ -313,6 +315,8 @@ internal class PluginServiceImpl(
     }
 
     companion object {
-        private val OFFICIAL_PLUGIN_SIGNATURES = listOf("rx1fSnL7r5/OMoFC0e1KPqTndXQ=")
+        private val VERIFIED_PLUGIN_SIGNATURES = mapOf(
+            "MM2-0" to setOf("rx1fSnL7r5/OMoFC0e1KPqTndXQ=")
+        )
     }
 }
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f9a180c0..5b67ba76 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -59,11 +59,12 @@ include(":libs:nextcloud")
 include(":libs:owncloud")
 include(":libs:webdav")
 include(":libs:g-services")
+include(":libs:address-formatter")
 include(":services:global-actions")
 include(":services:widgets")
 include(":services:favorites")
 
 include(":plugins:sdk")
-include(":data:openstreetmaps")
+include(":data:locations")
 include(":services:plugins")
 include(":core:devicepose")