diff --git a/data/styles/new_style/include/POI.mapcss b/data/styles/clear/include/POI.mapcss
similarity index 100%
rename from data/styles/new_style/include/POI.mapcss
rename to data/styles/clear/include/POI.mapcss
diff --git a/data/styles/new_style/include/boundaries.mapcss b/data/styles/clear/include/boundaries.mapcss
similarity index 100%
rename from data/styles/new_style/include/boundaries.mapcss
rename to data/styles/clear/include/boundaries.mapcss
diff --git a/data/styles/new_style/include/buildings.mapcss b/data/styles/clear/include/buildings.mapcss
similarity index 100%
rename from data/styles/new_style/include/buildings.mapcss
rename to data/styles/clear/include/buildings.mapcss
diff --git a/data/styles/new_style/include/defaults.mapcss b/data/styles/clear/include/defaults.mapcss
similarity index 100%
rename from data/styles/new_style/include/defaults.mapcss
rename to data/styles/clear/include/defaults.mapcss
diff --git a/data/styles/new_style/include/labels.mapcss b/data/styles/clear/include/labels.mapcss
similarity index 100%
rename from data/styles/new_style/include/labels.mapcss
rename to data/styles/clear/include/labels.mapcss
diff --git a/data/styles/new_style/include/landuse.mapcss b/data/styles/clear/include/landuse.mapcss
similarity index 100%
rename from data/styles/new_style/include/landuse.mapcss
rename to data/styles/clear/include/landuse.mapcss
diff --git a/data/styles/new_style/include/natural.mapcss b/data/styles/clear/include/natural.mapcss
similarity index 100%
rename from data/styles/new_style/include/natural.mapcss
rename to data/styles/clear/include/natural.mapcss
diff --git a/data/styles/new_style/include/other.mapcss b/data/styles/clear/include/other.mapcss
similarity index 100%
rename from data/styles/new_style/include/other.mapcss
rename to data/styles/clear/include/other.mapcss
diff --git a/data/styles/new_style/include/roads.mapcss b/data/styles/clear/include/roads.mapcss
similarity index 100%
rename from data/styles/new_style/include/roads.mapcss
rename to data/styles/clear/include/roads.mapcss
diff --git a/data/styles/new_style/include/transport.mapcss b/data/styles/clear/include/transport.mapcss
similarity index 100%
rename from data/styles/new_style/include/transport.mapcss
rename to data/styles/clear/include/transport.mapcss
diff --git a/data/styles/new_style/style-clear/6plus/api-result.png b/data/styles/clear/style-clear/6plus/api-result.png
similarity index 100%
rename from data/styles/new_style/style-clear/6plus/api-result.png
rename to data/styles/clear/style-clear/6plus/api-result.png
diff --git a/data/styles/new_style/style-clear/6plus/compass-image.png b/data/styles/clear/style-clear/6plus/compass-image.png
similarity index 100%
rename from data/styles/new_style/style-clear/6plus/compass-image.png
rename to data/styles/clear/style-clear/6plus/compass-image.png
diff --git a/data/styles/new_style/style-clear/6plus/current-position-compas.png b/data/styles/clear/style-clear/6plus/current-position-compas.png
similarity index 100%
rename from data/styles/new_style/style-clear/6plus/current-position-compas.png
rename to data/styles/clear/style-clear/6plus/current-position-compas.png
diff --git a/data/styles/new_style/style-clear/6plus/current-position.png b/data/styles/clear/style-clear/6plus/current-position.png
similarity index 100%
rename from data/styles/new_style/style-clear/6plus/current-position.png
rename to data/styles/clear/style-clear/6plus/current-position.png
diff --git a/data/styles/new_style/style-clear/6plus/current-routing-compas.png b/data/styles/clear/style-clear/6plus/current-routing-compas.png
similarity index 100%
rename from data/styles/new_style/style-clear/6plus/current-routing-compas.png
rename to data/styles/clear/style-clear/6plus/current-routing-compas.png
diff --git a/data/styles/new_style/style-clear/6plus/placemark-blue.png b/data/styles/clear/style-clear/6plus/placemark-blue.png
similarity index 100%
rename from data/styles/new_style/style-clear/6plus/placemark-blue.png
rename to data/styles/clear/style-clear/6plus/placemark-blue.png
diff --git a/data/styles/new_style/style-clear/6plus/placemark-brown.png b/data/styles/clear/style-clear/6plus/placemark-brown.png
similarity index 100%
rename from data/styles/new_style/style-clear/6plus/placemark-brown.png
rename to data/styles/clear/style-clear/6plus/placemark-brown.png
diff --git a/data/styles/new_style/style-clear/6plus/placemark-green.png b/data/styles/clear/style-clear/6plus/placemark-green.png
similarity index 100%
rename from data/styles/new_style/style-clear/6plus/placemark-green.png
rename to data/styles/clear/style-clear/6plus/placemark-green.png
diff --git a/data/styles/new_style/style-clear/6plus/placemark-orange.png b/data/styles/clear/style-clear/6plus/placemark-orange.png
similarity index 100%
rename from data/styles/new_style/style-clear/6plus/placemark-orange.png
rename to data/styles/clear/style-clear/6plus/placemark-orange.png
diff --git a/data/styles/new_style/style-clear/6plus/placemark-pink.png b/data/styles/clear/style-clear/6plus/placemark-pink.png
similarity index 100%
rename from data/styles/new_style/style-clear/6plus/placemark-pink.png
rename to data/styles/clear/style-clear/6plus/placemark-pink.png
diff --git a/data/styles/new_style/style-clear/6plus/placemark-purple.png b/data/styles/clear/style-clear/6plus/placemark-purple.png
similarity index 100%
rename from data/styles/new_style/style-clear/6plus/placemark-purple.png
rename to data/styles/clear/style-clear/6plus/placemark-purple.png
diff --git a/data/styles/new_style/style-clear/6plus/placemark-red.png b/data/styles/clear/style-clear/6plus/placemark-red.png
similarity index 100%
rename from data/styles/new_style/style-clear/6plus/placemark-red.png
rename to data/styles/clear/style-clear/6plus/placemark-red.png
diff --git a/data/styles/new_style/style-clear/6plus/placemark-yellow.png b/data/styles/clear/style-clear/6plus/placemark-yellow.png
similarity index 100%
rename from data/styles/new_style/style-clear/6plus/placemark-yellow.png
rename to data/styles/clear/style-clear/6plus/placemark-yellow.png
diff --git a/data/styles/style-dark/6plus/route-arrow.png b/data/styles/clear/style-clear/6plus/route-arrow.png
similarity index 100%
rename from data/styles/style-dark/6plus/route-arrow.png
rename to data/styles/clear/style-clear/6plus/route-arrow.png
diff --git a/data/styles/new_style/style-clear/6plus/route_from.png b/data/styles/clear/style-clear/6plus/route_from.png
similarity index 100%
rename from data/styles/new_style/style-clear/6plus/route_from.png
rename to data/styles/clear/style-clear/6plus/route_from.png
diff --git a/data/styles/new_style/style-clear/6plus/route_to.png b/data/styles/clear/style-clear/6plus/route_to.png
similarity index 100%
rename from data/styles/new_style/style-clear/6plus/route_to.png
rename to data/styles/clear/style-clear/6plus/route_to.png
diff --git a/data/styles/new_style/style-clear/6plus/search-result-active.png b/data/styles/clear/style-clear/6plus/search-result-active.png
similarity index 100%
rename from data/styles/new_style/style-clear/6plus/search-result-active.png
rename to data/styles/clear/style-clear/6plus/search-result-active.png
diff --git a/data/styles/new_style/style-clear/6plus/search-result.png b/data/styles/clear/style-clear/6plus/search-result.png
similarity index 100%
rename from data/styles/new_style/style-clear/6plus/search-result.png
rename to data/styles/clear/style-clear/6plus/search-result.png
diff --git a/data/styles/new_style/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss
similarity index 100%
rename from data/styles/new_style/style-clear/colors.mapcss
rename to data/styles/clear/style-clear/colors.mapcss
diff --git a/data/styles/new_style/style-clear/hdpi/api-result.png b/data/styles/clear/style-clear/hdpi/api-result.png
similarity index 100%
rename from data/styles/new_style/style-clear/hdpi/api-result.png
rename to data/styles/clear/style-clear/hdpi/api-result.png
diff --git a/data/styles/new_style/style-clear/hdpi/compass-image.png b/data/styles/clear/style-clear/hdpi/compass-image.png
similarity index 100%
rename from data/styles/new_style/style-clear/hdpi/compass-image.png
rename to data/styles/clear/style-clear/hdpi/compass-image.png
diff --git a/data/styles/new_style/style-clear/hdpi/current-position-compas.png b/data/styles/clear/style-clear/hdpi/current-position-compas.png
similarity index 100%
rename from data/styles/new_style/style-clear/hdpi/current-position-compas.png
rename to data/styles/clear/style-clear/hdpi/current-position-compas.png
diff --git a/data/styles/new_style/style-clear/hdpi/current-position.png b/data/styles/clear/style-clear/hdpi/current-position.png
similarity index 100%
rename from data/styles/new_style/style-clear/hdpi/current-position.png
rename to data/styles/clear/style-clear/hdpi/current-position.png
diff --git a/data/styles/new_style/style-clear/hdpi/current-routing-compas.png b/data/styles/clear/style-clear/hdpi/current-routing-compas.png
similarity index 100%
rename from data/styles/new_style/style-clear/hdpi/current-routing-compas.png
rename to data/styles/clear/style-clear/hdpi/current-routing-compas.png
diff --git a/data/styles/new_style/style-clear/hdpi/placemark-blue.png b/data/styles/clear/style-clear/hdpi/placemark-blue.png
similarity index 100%
rename from data/styles/new_style/style-clear/hdpi/placemark-blue.png
rename to data/styles/clear/style-clear/hdpi/placemark-blue.png
diff --git a/data/styles/new_style/style-clear/hdpi/placemark-brown.png b/data/styles/clear/style-clear/hdpi/placemark-brown.png
similarity index 100%
rename from data/styles/new_style/style-clear/hdpi/placemark-brown.png
rename to data/styles/clear/style-clear/hdpi/placemark-brown.png
diff --git a/data/styles/new_style/style-clear/hdpi/placemark-green.png b/data/styles/clear/style-clear/hdpi/placemark-green.png
similarity index 100%
rename from data/styles/new_style/style-clear/hdpi/placemark-green.png
rename to data/styles/clear/style-clear/hdpi/placemark-green.png
diff --git a/data/styles/new_style/style-clear/hdpi/placemark-orange.png b/data/styles/clear/style-clear/hdpi/placemark-orange.png
similarity index 100%
rename from data/styles/new_style/style-clear/hdpi/placemark-orange.png
rename to data/styles/clear/style-clear/hdpi/placemark-orange.png
diff --git a/data/styles/new_style/style-clear/hdpi/placemark-pink.png b/data/styles/clear/style-clear/hdpi/placemark-pink.png
similarity index 100%
rename from data/styles/new_style/style-clear/hdpi/placemark-pink.png
rename to data/styles/clear/style-clear/hdpi/placemark-pink.png
diff --git a/data/styles/new_style/style-clear/hdpi/placemark-purple.png b/data/styles/clear/style-clear/hdpi/placemark-purple.png
similarity index 100%
rename from data/styles/new_style/style-clear/hdpi/placemark-purple.png
rename to data/styles/clear/style-clear/hdpi/placemark-purple.png
diff --git a/data/styles/new_style/style-clear/hdpi/placemark-red.png b/data/styles/clear/style-clear/hdpi/placemark-red.png
similarity index 100%
rename from data/styles/new_style/style-clear/hdpi/placemark-red.png
rename to data/styles/clear/style-clear/hdpi/placemark-red.png
diff --git a/data/styles/new_style/style-clear/hdpi/placemark-yellow.png b/data/styles/clear/style-clear/hdpi/placemark-yellow.png
similarity index 100%
rename from data/styles/new_style/style-clear/hdpi/placemark-yellow.png
rename to data/styles/clear/style-clear/hdpi/placemark-yellow.png
diff --git a/data/styles/style-dark/hdpi/route-arrow.png b/data/styles/clear/style-clear/hdpi/route-arrow.png
similarity index 100%
rename from data/styles/style-dark/hdpi/route-arrow.png
rename to data/styles/clear/style-clear/hdpi/route-arrow.png
diff --git a/data/styles/new_style/style-clear/hdpi/route_from.png b/data/styles/clear/style-clear/hdpi/route_from.png
similarity index 100%
rename from data/styles/new_style/style-clear/hdpi/route_from.png
rename to data/styles/clear/style-clear/hdpi/route_from.png
diff --git a/data/styles/new_style/style-clear/hdpi/route_to.png b/data/styles/clear/style-clear/hdpi/route_to.png
similarity index 100%
rename from data/styles/new_style/style-clear/hdpi/route_to.png
rename to data/styles/clear/style-clear/hdpi/route_to.png
diff --git a/data/styles/new_style/style-clear/hdpi/search-result-active.png b/data/styles/clear/style-clear/hdpi/search-result-active.png
similarity index 100%
rename from data/styles/new_style/style-clear/hdpi/search-result-active.png
rename to data/styles/clear/style-clear/hdpi/search-result-active.png
diff --git a/data/styles/new_style/style-clear/hdpi/search-result.png b/data/styles/clear/style-clear/hdpi/search-result.png
similarity index 100%
rename from data/styles/new_style/style-clear/hdpi/search-result.png
rename to data/styles/clear/style-clear/hdpi/search-result.png
diff --git a/data/styles/new_style/style-clear/ldpi/api-result.png b/data/styles/clear/style-clear/ldpi/api-result.png
similarity index 100%
rename from data/styles/new_style/style-clear/ldpi/api-result.png
rename to data/styles/clear/style-clear/ldpi/api-result.png
diff --git a/data/styles/new_style/style-clear/ldpi/compass-image.png b/data/styles/clear/style-clear/ldpi/compass-image.png
similarity index 100%
rename from data/styles/new_style/style-clear/ldpi/compass-image.png
rename to data/styles/clear/style-clear/ldpi/compass-image.png
diff --git a/data/styles/new_style/style-clear/ldpi/current-position-compas.png b/data/styles/clear/style-clear/ldpi/current-position-compas.png
similarity index 100%
rename from data/styles/new_style/style-clear/ldpi/current-position-compas.png
rename to data/styles/clear/style-clear/ldpi/current-position-compas.png
diff --git a/data/styles/new_style/style-clear/ldpi/current-position.png b/data/styles/clear/style-clear/ldpi/current-position.png
similarity index 100%
rename from data/styles/new_style/style-clear/ldpi/current-position.png
rename to data/styles/clear/style-clear/ldpi/current-position.png
diff --git a/data/styles/new_style/style-clear/ldpi/current-routing-compas.png b/data/styles/clear/style-clear/ldpi/current-routing-compas.png
similarity index 100%
rename from data/styles/new_style/style-clear/ldpi/current-routing-compas.png
rename to data/styles/clear/style-clear/ldpi/current-routing-compas.png
diff --git a/data/styles/new_style/style-clear/ldpi/placemark-blue.png b/data/styles/clear/style-clear/ldpi/placemark-blue.png
similarity index 100%
rename from data/styles/new_style/style-clear/ldpi/placemark-blue.png
rename to data/styles/clear/style-clear/ldpi/placemark-blue.png
diff --git a/data/styles/new_style/style-clear/ldpi/placemark-brown.png b/data/styles/clear/style-clear/ldpi/placemark-brown.png
similarity index 100%
rename from data/styles/new_style/style-clear/ldpi/placemark-brown.png
rename to data/styles/clear/style-clear/ldpi/placemark-brown.png
diff --git a/data/styles/new_style/style-clear/ldpi/placemark-green.png b/data/styles/clear/style-clear/ldpi/placemark-green.png
similarity index 100%
rename from data/styles/new_style/style-clear/ldpi/placemark-green.png
rename to data/styles/clear/style-clear/ldpi/placemark-green.png
diff --git a/data/styles/new_style/style-clear/ldpi/placemark-orange.png b/data/styles/clear/style-clear/ldpi/placemark-orange.png
similarity index 100%
rename from data/styles/new_style/style-clear/ldpi/placemark-orange.png
rename to data/styles/clear/style-clear/ldpi/placemark-orange.png
diff --git a/data/styles/new_style/style-clear/ldpi/placemark-pink.png b/data/styles/clear/style-clear/ldpi/placemark-pink.png
similarity index 100%
rename from data/styles/new_style/style-clear/ldpi/placemark-pink.png
rename to data/styles/clear/style-clear/ldpi/placemark-pink.png
diff --git a/data/styles/new_style/style-clear/ldpi/placemark-purple.png b/data/styles/clear/style-clear/ldpi/placemark-purple.png
similarity index 100%
rename from data/styles/new_style/style-clear/ldpi/placemark-purple.png
rename to data/styles/clear/style-clear/ldpi/placemark-purple.png
diff --git a/data/styles/new_style/style-clear/ldpi/placemark-red.png b/data/styles/clear/style-clear/ldpi/placemark-red.png
similarity index 100%
rename from data/styles/new_style/style-clear/ldpi/placemark-red.png
rename to data/styles/clear/style-clear/ldpi/placemark-red.png
diff --git a/data/styles/new_style/style-clear/ldpi/placemark-yellow.png b/data/styles/clear/style-clear/ldpi/placemark-yellow.png
similarity index 100%
rename from data/styles/new_style/style-clear/ldpi/placemark-yellow.png
rename to data/styles/clear/style-clear/ldpi/placemark-yellow.png
diff --git a/data/styles/style-dark/ldpi/route-arrow.png b/data/styles/clear/style-clear/ldpi/route-arrow.png
similarity index 100%
rename from data/styles/style-dark/ldpi/route-arrow.png
rename to data/styles/clear/style-clear/ldpi/route-arrow.png
diff --git a/data/styles/new_style/style-clear/ldpi/route_from.png b/data/styles/clear/style-clear/ldpi/route_from.png
similarity index 100%
rename from data/styles/new_style/style-clear/ldpi/route_from.png
rename to data/styles/clear/style-clear/ldpi/route_from.png
diff --git a/data/styles/new_style/style-clear/ldpi/route_to.png b/data/styles/clear/style-clear/ldpi/route_to.png
similarity index 100%
rename from data/styles/new_style/style-clear/ldpi/route_to.png
rename to data/styles/clear/style-clear/ldpi/route_to.png
diff --git a/data/styles/new_style/style-clear/ldpi/search-result-active.png b/data/styles/clear/style-clear/ldpi/search-result-active.png
similarity index 100%
rename from data/styles/new_style/style-clear/ldpi/search-result-active.png
rename to data/styles/clear/style-clear/ldpi/search-result-active.png
diff --git a/data/styles/new_style/style-clear/ldpi/search-result.png b/data/styles/clear/style-clear/ldpi/search-result.png
similarity index 100%
rename from data/styles/new_style/style-clear/ldpi/search-result.png
rename to data/styles/clear/style-clear/ldpi/search-result.png
diff --git a/data/styles/new_style/style-clear/mdpi/api-result.png b/data/styles/clear/style-clear/mdpi/api-result.png
similarity index 100%
rename from data/styles/new_style/style-clear/mdpi/api-result.png
rename to data/styles/clear/style-clear/mdpi/api-result.png
diff --git a/data/styles/new_style/style-clear/mdpi/compass-image.png b/data/styles/clear/style-clear/mdpi/compass-image.png
similarity index 100%
rename from data/styles/new_style/style-clear/mdpi/compass-image.png
rename to data/styles/clear/style-clear/mdpi/compass-image.png
diff --git a/data/styles/new_style/style-clear/mdpi/current-position-compas.png b/data/styles/clear/style-clear/mdpi/current-position-compas.png
similarity index 100%
rename from data/styles/new_style/style-clear/mdpi/current-position-compas.png
rename to data/styles/clear/style-clear/mdpi/current-position-compas.png
diff --git a/data/styles/new_style/style-clear/mdpi/current-position.png b/data/styles/clear/style-clear/mdpi/current-position.png
similarity index 100%
rename from data/styles/new_style/style-clear/mdpi/current-position.png
rename to data/styles/clear/style-clear/mdpi/current-position.png
diff --git a/data/styles/new_style/style-clear/mdpi/current-routing-compas.png b/data/styles/clear/style-clear/mdpi/current-routing-compas.png
similarity index 100%
rename from data/styles/new_style/style-clear/mdpi/current-routing-compas.png
rename to data/styles/clear/style-clear/mdpi/current-routing-compas.png
diff --git a/data/styles/new_style/style-clear/mdpi/placemark-blue.png b/data/styles/clear/style-clear/mdpi/placemark-blue.png
similarity index 100%
rename from data/styles/new_style/style-clear/mdpi/placemark-blue.png
rename to data/styles/clear/style-clear/mdpi/placemark-blue.png
diff --git a/data/styles/new_style/style-clear/mdpi/placemark-brown.png b/data/styles/clear/style-clear/mdpi/placemark-brown.png
similarity index 100%
rename from data/styles/new_style/style-clear/mdpi/placemark-brown.png
rename to data/styles/clear/style-clear/mdpi/placemark-brown.png
diff --git a/data/styles/new_style/style-clear/mdpi/placemark-green.png b/data/styles/clear/style-clear/mdpi/placemark-green.png
similarity index 100%
rename from data/styles/new_style/style-clear/mdpi/placemark-green.png
rename to data/styles/clear/style-clear/mdpi/placemark-green.png
diff --git a/data/styles/new_style/style-clear/mdpi/placemark-orange.png b/data/styles/clear/style-clear/mdpi/placemark-orange.png
similarity index 100%
rename from data/styles/new_style/style-clear/mdpi/placemark-orange.png
rename to data/styles/clear/style-clear/mdpi/placemark-orange.png
diff --git a/data/styles/new_style/style-clear/mdpi/placemark-pink.png b/data/styles/clear/style-clear/mdpi/placemark-pink.png
similarity index 100%
rename from data/styles/new_style/style-clear/mdpi/placemark-pink.png
rename to data/styles/clear/style-clear/mdpi/placemark-pink.png
diff --git a/data/styles/new_style/style-clear/mdpi/placemark-purple.png b/data/styles/clear/style-clear/mdpi/placemark-purple.png
similarity index 100%
rename from data/styles/new_style/style-clear/mdpi/placemark-purple.png
rename to data/styles/clear/style-clear/mdpi/placemark-purple.png
diff --git a/data/styles/new_style/style-clear/mdpi/placemark-red.png b/data/styles/clear/style-clear/mdpi/placemark-red.png
similarity index 100%
rename from data/styles/new_style/style-clear/mdpi/placemark-red.png
rename to data/styles/clear/style-clear/mdpi/placemark-red.png
diff --git a/data/styles/new_style/style-clear/mdpi/placemark-yellow.png b/data/styles/clear/style-clear/mdpi/placemark-yellow.png
similarity index 100%
rename from data/styles/new_style/style-clear/mdpi/placemark-yellow.png
rename to data/styles/clear/style-clear/mdpi/placemark-yellow.png
diff --git a/data/styles/style-dark/mdpi/route-arrow.png b/data/styles/clear/style-clear/mdpi/route-arrow.png
similarity index 100%
rename from data/styles/style-dark/mdpi/route-arrow.png
rename to data/styles/clear/style-clear/mdpi/route-arrow.png
diff --git a/data/styles/new_style/style-clear/mdpi/route_from.png b/data/styles/clear/style-clear/mdpi/route_from.png
similarity index 100%
rename from data/styles/new_style/style-clear/mdpi/route_from.png
rename to data/styles/clear/style-clear/mdpi/route_from.png
diff --git a/data/styles/new_style/style-clear/mdpi/route_to.png b/data/styles/clear/style-clear/mdpi/route_to.png
similarity index 100%
rename from data/styles/new_style/style-clear/mdpi/route_to.png
rename to data/styles/clear/style-clear/mdpi/route_to.png
diff --git a/data/styles/new_style/style-clear/mdpi/search-result-active.png b/data/styles/clear/style-clear/mdpi/search-result-active.png
similarity index 100%
rename from data/styles/new_style/style-clear/mdpi/search-result-active.png
rename to data/styles/clear/style-clear/mdpi/search-result-active.png
diff --git a/data/styles/new_style/style-clear/mdpi/search-result.png b/data/styles/clear/style-clear/mdpi/search-result.png
similarity index 100%
rename from data/styles/new_style/style-clear/mdpi/search-result.png
rename to data/styles/clear/style-clear/mdpi/search-result.png
diff --git a/data/styles/new_style/style-clear/mdpi/watch-my-direction.png b/data/styles/clear/style-clear/mdpi/watch-my-direction.png
similarity index 100%
rename from data/styles/new_style/style-clear/mdpi/watch-my-direction.png
rename to data/styles/clear/style-clear/mdpi/watch-my-direction.png
diff --git a/data/styles/new_style/style-clear/mdpi/watch-my-position.png b/data/styles/clear/style-clear/mdpi/watch-my-position.png
similarity index 100%
rename from data/styles/new_style/style-clear/mdpi/watch-my-position.png
rename to data/styles/clear/style-clear/mdpi/watch-my-position.png
diff --git a/data/styles/new_style/style-clear/mdpi/watch-search-result.png b/data/styles/clear/style-clear/mdpi/watch-search-result.png
similarity index 100%
rename from data/styles/new_style/style-clear/mdpi/watch-search-result.png
rename to data/styles/clear/style-clear/mdpi/watch-search-result.png
diff --git a/data/styles/new_style/style-clear/style.mapcss b/data/styles/clear/style-clear/style.mapcss
similarity index 100%
rename from data/styles/new_style/style-clear/style.mapcss
rename to data/styles/clear/style-clear/style.mapcss
diff --git a/data/styles/new_style/style-clear/symbols/airport-l.svg b/data/styles/clear/style-clear/symbols/airport-l.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/airport-l.svg
rename to data/styles/clear/style-clear/symbols/airport-l.svg
diff --git a/data/styles/new_style/style-clear/symbols/airport-m.svg b/data/styles/clear/style-clear/symbols/airport-m.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/airport-m.svg
rename to data/styles/clear/style-clear/symbols/airport-m.svg
diff --git a/data/styles/new_style/style-clear/symbols/airport-s.svg b/data/styles/clear/style-clear/symbols/airport-s.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/airport-s.svg
rename to data/styles/clear/style-clear/symbols/airport-s.svg
diff --git a/data/styles/new_style/style-clear/symbols/arrow-m.svg b/data/styles/clear/style-clear/symbols/arrow-m.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/arrow-m.svg
rename to data/styles/clear/style-clear/symbols/arrow-m.svg
diff --git a/data/styles/new_style/style-clear/symbols/arrow-s.svg b/data/styles/clear/style-clear/symbols/arrow-s.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/arrow-s.svg
rename to data/styles/clear/style-clear/symbols/arrow-s.svg
diff --git a/data/styles/new_style/style-clear/symbols/arrow.svg b/data/styles/clear/style-clear/symbols/arrow.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/arrow.svg
rename to data/styles/clear/style-clear/symbols/arrow.svg
diff --git a/data/styles/new_style/style-clear/symbols/bank-l.svg b/data/styles/clear/style-clear/symbols/bank-l.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/bank-l.svg
rename to data/styles/clear/style-clear/symbols/bank-l.svg
diff --git a/data/styles/new_style/style-clear/symbols/bank-m.svg b/data/styles/clear/style-clear/symbols/bank-m.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/bank-m.svg
rename to data/styles/clear/style-clear/symbols/bank-m.svg
diff --git a/data/styles/new_style/style-clear/symbols/bank-s.svg b/data/styles/clear/style-clear/symbols/bank-s.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/bank-s.svg
rename to data/styles/clear/style-clear/symbols/bank-s.svg
diff --git a/data/styles/new_style/style-clear/symbols/bar-l.svg b/data/styles/clear/style-clear/symbols/bar-l.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/bar-l.svg
rename to data/styles/clear/style-clear/symbols/bar-l.svg
diff --git a/data/styles/new_style/style-clear/symbols/bar-m.svg b/data/styles/clear/style-clear/symbols/bar-m.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/bar-m.svg
rename to data/styles/clear/style-clear/symbols/bar-m.svg
diff --git a/data/styles/new_style/style-clear/symbols/bar-s.svg b/data/styles/clear/style-clear/symbols/bar-s.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/bar-s.svg
rename to data/styles/clear/style-clear/symbols/bar-s.svg
diff --git a/data/styles/new_style/style-clear/symbols/bus-l.svg b/data/styles/clear/style-clear/symbols/bus-l.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/bus-l.svg
rename to data/styles/clear/style-clear/symbols/bus-l.svg
diff --git a/data/styles/new_style/style-clear/symbols/bus-m.svg b/data/styles/clear/style-clear/symbols/bus-m.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/bus-m.svg
rename to data/styles/clear/style-clear/symbols/bus-m.svg
diff --git a/data/styles/new_style/style-clear/symbols/bus-s.svg b/data/styles/clear/style-clear/symbols/bus-s.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/bus-s.svg
rename to data/styles/clear/style-clear/symbols/bus-s.svg
diff --git a/data/styles/new_style/style-clear/symbols/cafe-l.svg b/data/styles/clear/style-clear/symbols/cafe-l.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/cafe-l.svg
rename to data/styles/clear/style-clear/symbols/cafe-l.svg
diff --git a/data/styles/new_style/style-clear/symbols/cafe-m.svg b/data/styles/clear/style-clear/symbols/cafe-m.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/cafe-m.svg
rename to data/styles/clear/style-clear/symbols/cafe-m.svg
diff --git a/data/styles/new_style/style-clear/symbols/cafe-s.svg b/data/styles/clear/style-clear/symbols/cafe-s.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/cafe-s.svg
rename to data/styles/clear/style-clear/symbols/cafe-s.svg
diff --git a/data/styles/new_style/style-clear/symbols/cinema-l.svg b/data/styles/clear/style-clear/symbols/cinema-l.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/cinema-l.svg
rename to data/styles/clear/style-clear/symbols/cinema-l.svg
diff --git a/data/styles/new_style/style-clear/symbols/cinema-m.svg b/data/styles/clear/style-clear/symbols/cinema-m.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/cinema-m.svg
rename to data/styles/clear/style-clear/symbols/cinema-m.svg
diff --git a/data/styles/new_style/style-clear/symbols/cinema-s.svg b/data/styles/clear/style-clear/symbols/cinema-s.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/cinema-s.svg
rename to data/styles/clear/style-clear/symbols/cinema-s.svg
diff --git a/data/styles/new_style/style-clear/symbols/dot-m.svg b/data/styles/clear/style-clear/symbols/dot-m.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/dot-m.svg
rename to data/styles/clear/style-clear/symbols/dot-m.svg
diff --git a/data/styles/new_style/style-clear/symbols/dot-s-light.svg b/data/styles/clear/style-clear/symbols/dot-s-light.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/dot-s-light.svg
rename to data/styles/clear/style-clear/symbols/dot-s-light.svg
diff --git a/data/styles/new_style/style-clear/symbols/dot-s.svg b/data/styles/clear/style-clear/symbols/dot-s.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/dot-s.svg
rename to data/styles/clear/style-clear/symbols/dot-s.svg
diff --git a/data/styles/new_style/style-clear/symbols/fastfood-l.svg b/data/styles/clear/style-clear/symbols/fastfood-l.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/fastfood-l.svg
rename to data/styles/clear/style-clear/symbols/fastfood-l.svg
diff --git a/data/styles/new_style/style-clear/symbols/fastfood-m.svg b/data/styles/clear/style-clear/symbols/fastfood-m.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/fastfood-m.svg
rename to data/styles/clear/style-clear/symbols/fastfood-m.svg
diff --git a/data/styles/new_style/style-clear/symbols/fastfood-s.svg b/data/styles/clear/style-clear/symbols/fastfood-s.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/fastfood-s.svg
rename to data/styles/clear/style-clear/symbols/fastfood-s.svg
diff --git a/data/styles/new_style/style-clear/symbols/gallery-l.svg b/data/styles/clear/style-clear/symbols/gallery-l.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/gallery-l.svg
rename to data/styles/clear/style-clear/symbols/gallery-l.svg
diff --git a/data/styles/new_style/style-clear/symbols/gallery-m.svg b/data/styles/clear/style-clear/symbols/gallery-m.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/gallery-m.svg
rename to data/styles/clear/style-clear/symbols/gallery-m.svg
diff --git a/data/styles/new_style/style-clear/symbols/gallery-s.svg b/data/styles/clear/style-clear/symbols/gallery-s.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/gallery-s.svg
rename to data/styles/clear/style-clear/symbols/gallery-s.svg
diff --git a/data/styles/new_style/style-clear/symbols/grocery-l.svg b/data/styles/clear/style-clear/symbols/grocery-l.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/grocery-l.svg
rename to data/styles/clear/style-clear/symbols/grocery-l.svg
diff --git a/data/styles/new_style/style-clear/symbols/grocery-m.svg b/data/styles/clear/style-clear/symbols/grocery-m.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/grocery-m.svg
rename to data/styles/clear/style-clear/symbols/grocery-m.svg
diff --git a/data/styles/new_style/style-clear/symbols/grocery-s.svg b/data/styles/clear/style-clear/symbols/grocery-s.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/grocery-s.svg
rename to data/styles/clear/style-clear/symbols/grocery-s.svg
diff --git a/data/styles/new_style/style-clear/symbols/hotel-l.svg b/data/styles/clear/style-clear/symbols/hotel-l.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/hotel-l.svg
rename to data/styles/clear/style-clear/symbols/hotel-l.svg
diff --git a/data/styles/new_style/style-clear/symbols/hotel-m.svg b/data/styles/clear/style-clear/symbols/hotel-m.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/hotel-m.svg
rename to data/styles/clear/style-clear/symbols/hotel-m.svg
diff --git a/data/styles/new_style/style-clear/symbols/hotel-s.svg b/data/styles/clear/style-clear/symbols/hotel-s.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/hotel-s.svg
rename to data/styles/clear/style-clear/symbols/hotel-s.svg
diff --git a/data/styles/new_style/style-clear/symbols/monument-l.svg b/data/styles/clear/style-clear/symbols/monument-l.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/monument-l.svg
rename to data/styles/clear/style-clear/symbols/monument-l.svg
diff --git a/data/styles/new_style/style-clear/symbols/monument-m.svg b/data/styles/clear/style-clear/symbols/monument-m.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/monument-m.svg
rename to data/styles/clear/style-clear/symbols/monument-m.svg
diff --git a/data/styles/new_style/style-clear/symbols/monument-s.svg b/data/styles/clear/style-clear/symbols/monument-s.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/monument-s.svg
rename to data/styles/clear/style-clear/symbols/monument-s.svg
diff --git a/data/styles/new_style/style-clear/symbols/museum-l.svg b/data/styles/clear/style-clear/symbols/museum-l.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/museum-l.svg
rename to data/styles/clear/style-clear/symbols/museum-l.svg
diff --git a/data/styles/new_style/style-clear/symbols/museum-m.svg b/data/styles/clear/style-clear/symbols/museum-m.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/museum-m.svg
rename to data/styles/clear/style-clear/symbols/museum-m.svg
diff --git a/data/styles/new_style/style-clear/symbols/museum-s.svg b/data/styles/clear/style-clear/symbols/museum-s.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/museum-s.svg
rename to data/styles/clear/style-clear/symbols/museum-s.svg
diff --git a/data/styles/new_style/style-clear/symbols/park-l.svg b/data/styles/clear/style-clear/symbols/park-l.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/park-l.svg
rename to data/styles/clear/style-clear/symbols/park-l.svg
diff --git a/data/styles/new_style/style-clear/symbols/park-m.svg b/data/styles/clear/style-clear/symbols/park-m.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/park-m.svg
rename to data/styles/clear/style-clear/symbols/park-m.svg
diff --git a/data/styles/new_style/style-clear/symbols/park-s.svg b/data/styles/clear/style-clear/symbols/park-s.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/park-s.svg
rename to data/styles/clear/style-clear/symbols/park-s.svg
diff --git a/data/styles/new_style/style-clear/symbols/restaurant-l.svg b/data/styles/clear/style-clear/symbols/restaurant-l.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/restaurant-l.svg
rename to data/styles/clear/style-clear/symbols/restaurant-l.svg
diff --git a/data/styles/new_style/style-clear/symbols/restaurant-m.svg b/data/styles/clear/style-clear/symbols/restaurant-m.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/restaurant-m.svg
rename to data/styles/clear/style-clear/symbols/restaurant-m.svg
diff --git a/data/styles/new_style/style-clear/symbols/restaurant-s.svg b/data/styles/clear/style-clear/symbols/restaurant-s.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/restaurant-s.svg
rename to data/styles/clear/style-clear/symbols/restaurant-s.svg
diff --git a/data/styles/new_style/style-clear/symbols/ship-l.svg b/data/styles/clear/style-clear/symbols/ship-l.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/ship-l.svg
rename to data/styles/clear/style-clear/symbols/ship-l.svg
diff --git a/data/styles/new_style/style-clear/symbols/ship-m.svg b/data/styles/clear/style-clear/symbols/ship-m.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/ship-m.svg
rename to data/styles/clear/style-clear/symbols/ship-m.svg
diff --git a/data/styles/new_style/style-clear/symbols/ship-s.svg b/data/styles/clear/style-clear/symbols/ship-s.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/ship-s.svg
rename to data/styles/clear/style-clear/symbols/ship-s.svg
diff --git a/data/styles/new_style/style-clear/symbols/star-l.svg b/data/styles/clear/style-clear/symbols/star-l.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/star-l.svg
rename to data/styles/clear/style-clear/symbols/star-l.svg
diff --git a/data/styles/new_style/style-clear/symbols/star-m.svg b/data/styles/clear/style-clear/symbols/star-m.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/star-m.svg
rename to data/styles/clear/style-clear/symbols/star-m.svg
diff --git a/data/styles/new_style/style-clear/symbols/star-s.svg b/data/styles/clear/style-clear/symbols/star-s.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/star-s.svg
rename to data/styles/clear/style-clear/symbols/star-s.svg
diff --git a/data/styles/new_style/style-clear/symbols/subway-l.svg b/data/styles/clear/style-clear/symbols/subway-l.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/subway-l.svg
rename to data/styles/clear/style-clear/symbols/subway-l.svg
diff --git a/data/styles/new_style/style-clear/symbols/subway-m.svg b/data/styles/clear/style-clear/symbols/subway-m.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/subway-m.svg
rename to data/styles/clear/style-clear/symbols/subway-m.svg
diff --git a/data/styles/new_style/style-clear/symbols/subway-s.svg b/data/styles/clear/style-clear/symbols/subway-s.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/subway-s.svg
rename to data/styles/clear/style-clear/symbols/subway-s.svg
diff --git a/data/styles/new_style/style-clear/symbols/subway-xs.svg b/data/styles/clear/style-clear/symbols/subway-xs.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/subway-xs.svg
rename to data/styles/clear/style-clear/symbols/subway-xs.svg
diff --git a/data/styles/new_style/style-clear/symbols/theatre-l.svg b/data/styles/clear/style-clear/symbols/theatre-l.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/theatre-l.svg
rename to data/styles/clear/style-clear/symbols/theatre-l.svg
diff --git a/data/styles/new_style/style-clear/symbols/theatre-m.svg b/data/styles/clear/style-clear/symbols/theatre-m.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/theatre-m.svg
rename to data/styles/clear/style-clear/symbols/theatre-m.svg
diff --git a/data/styles/new_style/style-clear/symbols/theatre-s.svg b/data/styles/clear/style-clear/symbols/theatre-s.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/theatre-s.svg
rename to data/styles/clear/style-clear/symbols/theatre-s.svg
diff --git a/data/styles/new_style/style-clear/symbols/train-l.svg b/data/styles/clear/style-clear/symbols/train-l.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/train-l.svg
rename to data/styles/clear/style-clear/symbols/train-l.svg
diff --git a/data/styles/new_style/style-clear/symbols/train-m.svg b/data/styles/clear/style-clear/symbols/train-m.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/train-m.svg
rename to data/styles/clear/style-clear/symbols/train-m.svg
diff --git a/data/styles/new_style/style-clear/symbols/train-s.svg b/data/styles/clear/style-clear/symbols/train-s.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/train-s.svg
rename to data/styles/clear/style-clear/symbols/train-s.svg
diff --git a/data/styles/new_style/style-clear/symbols/tram-l.svg b/data/styles/clear/style-clear/symbols/tram-l.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/tram-l.svg
rename to data/styles/clear/style-clear/symbols/tram-l.svg
diff --git a/data/styles/new_style/style-clear/symbols/tram-m.svg b/data/styles/clear/style-clear/symbols/tram-m.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/tram-m.svg
rename to data/styles/clear/style-clear/symbols/tram-m.svg
diff --git a/data/styles/new_style/style-clear/symbols/tram-s.svg b/data/styles/clear/style-clear/symbols/tram-s.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/tram-s.svg
rename to data/styles/clear/style-clear/symbols/tram-s.svg
diff --git a/data/styles/new_style/style-clear/symbols/zoo-l.svg b/data/styles/clear/style-clear/symbols/zoo-l.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/zoo-l.svg
rename to data/styles/clear/style-clear/symbols/zoo-l.svg
diff --git a/data/styles/new_style/style-clear/symbols/zoo-m.svg b/data/styles/clear/style-clear/symbols/zoo-m.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/zoo-m.svg
rename to data/styles/clear/style-clear/symbols/zoo-m.svg
diff --git a/data/styles/new_style/style-clear/symbols/zoo-s.svg b/data/styles/clear/style-clear/symbols/zoo-s.svg
similarity index 100%
rename from data/styles/new_style/style-clear/symbols/zoo-s.svg
rename to data/styles/clear/style-clear/symbols/zoo-s.svg
diff --git a/data/styles/new_style/style-clear/watch/api-result.png b/data/styles/clear/style-clear/watch/api-result.png
similarity index 100%
rename from data/styles/new_style/style-clear/watch/api-result.png
rename to data/styles/clear/style-clear/watch/api-result.png
diff --git a/data/styles/new_style/style-clear/watch/arrow-direction.png b/data/styles/clear/style-clear/watch/arrow-direction.png
similarity index 100%
rename from data/styles/new_style/style-clear/watch/arrow-direction.png
rename to data/styles/clear/style-clear/watch/arrow-direction.png
diff --git a/data/styles/new_style/style-clear/watch/compass-image.png b/data/styles/clear/style-clear/watch/compass-image.png
similarity index 100%
rename from data/styles/new_style/style-clear/watch/compass-image.png
rename to data/styles/clear/style-clear/watch/compass-image.png
diff --git a/data/styles/new_style/style-clear/watch/current-position-compas.png b/data/styles/clear/style-clear/watch/current-position-compas.png
similarity index 100%
rename from data/styles/new_style/style-clear/watch/current-position-compas.png
rename to data/styles/clear/style-clear/watch/current-position-compas.png
diff --git a/data/styles/new_style/style-clear/watch/current-position.png b/data/styles/clear/style-clear/watch/current-position.png
similarity index 100%
rename from data/styles/new_style/style-clear/watch/current-position.png
rename to data/styles/clear/style-clear/watch/current-position.png
diff --git a/data/styles/new_style/style-clear/watch/current-routing-compas.png b/data/styles/clear/style-clear/watch/current-routing-compas.png
similarity index 100%
rename from data/styles/new_style/style-clear/watch/current-routing-compas.png
rename to data/styles/clear/style-clear/watch/current-routing-compas.png
diff --git a/data/styles/new_style/style-clear/watch/placemark-blue.png b/data/styles/clear/style-clear/watch/placemark-blue.png
similarity index 100%
rename from data/styles/new_style/style-clear/watch/placemark-blue.png
rename to data/styles/clear/style-clear/watch/placemark-blue.png
diff --git a/data/styles/new_style/style-clear/watch/placemark-brown.png b/data/styles/clear/style-clear/watch/placemark-brown.png
similarity index 100%
rename from data/styles/new_style/style-clear/watch/placemark-brown.png
rename to data/styles/clear/style-clear/watch/placemark-brown.png
diff --git a/data/styles/new_style/style-clear/watch/placemark-green.png b/data/styles/clear/style-clear/watch/placemark-green.png
similarity index 100%
rename from data/styles/new_style/style-clear/watch/placemark-green.png
rename to data/styles/clear/style-clear/watch/placemark-green.png
diff --git a/data/styles/new_style/style-clear/watch/placemark-orange.png b/data/styles/clear/style-clear/watch/placemark-orange.png
similarity index 100%
rename from data/styles/new_style/style-clear/watch/placemark-orange.png
rename to data/styles/clear/style-clear/watch/placemark-orange.png
diff --git a/data/styles/new_style/style-clear/watch/placemark-pink.png b/data/styles/clear/style-clear/watch/placemark-pink.png
similarity index 100%
rename from data/styles/new_style/style-clear/watch/placemark-pink.png
rename to data/styles/clear/style-clear/watch/placemark-pink.png
diff --git a/data/styles/new_style/style-clear/watch/placemark-purple.png b/data/styles/clear/style-clear/watch/placemark-purple.png
similarity index 100%
rename from data/styles/new_style/style-clear/watch/placemark-purple.png
rename to data/styles/clear/style-clear/watch/placemark-purple.png
diff --git a/data/styles/new_style/style-clear/watch/placemark-red.png b/data/styles/clear/style-clear/watch/placemark-red.png
similarity index 100%
rename from data/styles/new_style/style-clear/watch/placemark-red.png
rename to data/styles/clear/style-clear/watch/placemark-red.png
diff --git a/data/styles/new_style/style-clear/watch/placemark-yellow.png b/data/styles/clear/style-clear/watch/placemark-yellow.png
similarity index 100%
rename from data/styles/new_style/style-clear/watch/placemark-yellow.png
rename to data/styles/clear/style-clear/watch/placemark-yellow.png
diff --git a/data/styles/new_style/style-clear/watch/route_from.png b/data/styles/clear/style-clear/watch/route_from.png
similarity index 100%
rename from data/styles/new_style/style-clear/watch/route_from.png
rename to data/styles/clear/style-clear/watch/route_from.png
diff --git a/data/styles/new_style/style-clear/watch/route_to.png b/data/styles/clear/style-clear/watch/route_to.png
similarity index 100%
rename from data/styles/new_style/style-clear/watch/route_to.png
rename to data/styles/clear/style-clear/watch/route_to.png
diff --git a/data/styles/new_style/style-clear/watch/search-result-active.png b/data/styles/clear/style-clear/watch/search-result-active.png
similarity index 100%
rename from data/styles/new_style/style-clear/watch/search-result-active.png
rename to data/styles/clear/style-clear/watch/search-result-active.png
diff --git a/data/styles/new_style/style-clear/watch/search-result.png b/data/styles/clear/style-clear/watch/search-result.png
similarity index 100%
rename from data/styles/new_style/style-clear/watch/search-result.png
rename to data/styles/clear/style-clear/watch/search-result.png
diff --git a/data/styles/new_style/style-clear/xhdpi/api-result.png b/data/styles/clear/style-clear/xhdpi/api-result.png
similarity index 100%
rename from data/styles/new_style/style-clear/xhdpi/api-result.png
rename to data/styles/clear/style-clear/xhdpi/api-result.png
diff --git a/data/styles/new_style/style-clear/xhdpi/compass-image.png b/data/styles/clear/style-clear/xhdpi/compass-image.png
similarity index 100%
rename from data/styles/new_style/style-clear/xhdpi/compass-image.png
rename to data/styles/clear/style-clear/xhdpi/compass-image.png
diff --git a/data/styles/new_style/style-clear/xhdpi/current-position-compas.png b/data/styles/clear/style-clear/xhdpi/current-position-compas.png
similarity index 100%
rename from data/styles/new_style/style-clear/xhdpi/current-position-compas.png
rename to data/styles/clear/style-clear/xhdpi/current-position-compas.png
diff --git a/data/styles/new_style/style-clear/xhdpi/current-position.png b/data/styles/clear/style-clear/xhdpi/current-position.png
similarity index 100%
rename from data/styles/new_style/style-clear/xhdpi/current-position.png
rename to data/styles/clear/style-clear/xhdpi/current-position.png
diff --git a/data/styles/new_style/style-clear/xhdpi/current-routing-compas.png b/data/styles/clear/style-clear/xhdpi/current-routing-compas.png
similarity index 100%
rename from data/styles/new_style/style-clear/xhdpi/current-routing-compas.png
rename to data/styles/clear/style-clear/xhdpi/current-routing-compas.png
diff --git a/data/styles/new_style/style-clear/xhdpi/placemark-blue.png b/data/styles/clear/style-clear/xhdpi/placemark-blue.png
similarity index 100%
rename from data/styles/new_style/style-clear/xhdpi/placemark-blue.png
rename to data/styles/clear/style-clear/xhdpi/placemark-blue.png
diff --git a/data/styles/new_style/style-clear/xhdpi/placemark-brown.png b/data/styles/clear/style-clear/xhdpi/placemark-brown.png
similarity index 100%
rename from data/styles/new_style/style-clear/xhdpi/placemark-brown.png
rename to data/styles/clear/style-clear/xhdpi/placemark-brown.png
diff --git a/data/styles/new_style/style-clear/xhdpi/placemark-green.png b/data/styles/clear/style-clear/xhdpi/placemark-green.png
similarity index 100%
rename from data/styles/new_style/style-clear/xhdpi/placemark-green.png
rename to data/styles/clear/style-clear/xhdpi/placemark-green.png
diff --git a/data/styles/new_style/style-clear/xhdpi/placemark-orange.png b/data/styles/clear/style-clear/xhdpi/placemark-orange.png
similarity index 100%
rename from data/styles/new_style/style-clear/xhdpi/placemark-orange.png
rename to data/styles/clear/style-clear/xhdpi/placemark-orange.png
diff --git a/data/styles/new_style/style-clear/xhdpi/placemark-pink.png b/data/styles/clear/style-clear/xhdpi/placemark-pink.png
similarity index 100%
rename from data/styles/new_style/style-clear/xhdpi/placemark-pink.png
rename to data/styles/clear/style-clear/xhdpi/placemark-pink.png
diff --git a/data/styles/new_style/style-clear/xhdpi/placemark-purple.png b/data/styles/clear/style-clear/xhdpi/placemark-purple.png
similarity index 100%
rename from data/styles/new_style/style-clear/xhdpi/placemark-purple.png
rename to data/styles/clear/style-clear/xhdpi/placemark-purple.png
diff --git a/data/styles/new_style/style-clear/xhdpi/placemark-red.png b/data/styles/clear/style-clear/xhdpi/placemark-red.png
similarity index 100%
rename from data/styles/new_style/style-clear/xhdpi/placemark-red.png
rename to data/styles/clear/style-clear/xhdpi/placemark-red.png
diff --git a/data/styles/new_style/style-clear/xhdpi/placemark-yellow.png b/data/styles/clear/style-clear/xhdpi/placemark-yellow.png
similarity index 100%
rename from data/styles/new_style/style-clear/xhdpi/placemark-yellow.png
rename to data/styles/clear/style-clear/xhdpi/placemark-yellow.png
diff --git a/data/styles/style-dark/xhdpi/route-arrow.png b/data/styles/clear/style-clear/xhdpi/route-arrow.png
similarity index 100%
rename from data/styles/style-dark/xhdpi/route-arrow.png
rename to data/styles/clear/style-clear/xhdpi/route-arrow.png
diff --git a/data/styles/new_style/style-clear/xhdpi/route_from.png b/data/styles/clear/style-clear/xhdpi/route_from.png
similarity index 100%
rename from data/styles/new_style/style-clear/xhdpi/route_from.png
rename to data/styles/clear/style-clear/xhdpi/route_from.png
diff --git a/data/styles/new_style/style-clear/xhdpi/route_to.png b/data/styles/clear/style-clear/xhdpi/route_to.png
similarity index 100%
rename from data/styles/new_style/style-clear/xhdpi/route_to.png
rename to data/styles/clear/style-clear/xhdpi/route_to.png
diff --git a/data/styles/new_style/style-clear/xhdpi/search-result-active.png b/data/styles/clear/style-clear/xhdpi/search-result-active.png
similarity index 100%
rename from data/styles/new_style/style-clear/xhdpi/search-result-active.png
rename to data/styles/clear/style-clear/xhdpi/search-result-active.png
diff --git a/data/styles/new_style/style-clear/xhdpi/search-result.png b/data/styles/clear/style-clear/xhdpi/search-result.png
similarity index 100%
rename from data/styles/new_style/style-clear/xhdpi/search-result.png
rename to data/styles/clear/style-clear/xhdpi/search-result.png
diff --git a/data/styles/new_style/style-clear/xhdpi/watch-my-direction.png b/data/styles/clear/style-clear/xhdpi/watch-my-direction.png
similarity index 100%
rename from data/styles/new_style/style-clear/xhdpi/watch-my-direction.png
rename to data/styles/clear/style-clear/xhdpi/watch-my-direction.png
diff --git a/data/styles/new_style/style-clear/xhdpi/watch-my-position.png b/data/styles/clear/style-clear/xhdpi/watch-my-position.png
similarity index 100%
rename from data/styles/new_style/style-clear/xhdpi/watch-my-position.png
rename to data/styles/clear/style-clear/xhdpi/watch-my-position.png
diff --git a/data/styles/new_style/style-clear/xhdpi/watch-search-result.png b/data/styles/clear/style-clear/xhdpi/watch-search-result.png
similarity index 100%
rename from data/styles/new_style/style-clear/xhdpi/watch-search-result.png
rename to data/styles/clear/style-clear/xhdpi/watch-search-result.png
diff --git a/data/styles/new_style/style-clear/xxhdpi/api-result.png b/data/styles/clear/style-clear/xxhdpi/api-result.png
similarity index 100%
rename from data/styles/new_style/style-clear/xxhdpi/api-result.png
rename to data/styles/clear/style-clear/xxhdpi/api-result.png
diff --git a/data/styles/new_style/style-clear/xxhdpi/compass-image (1).png b/data/styles/clear/style-clear/xxhdpi/compass-image (1).png
similarity index 100%
rename from data/styles/new_style/style-clear/xxhdpi/compass-image (1).png
rename to data/styles/clear/style-clear/xxhdpi/compass-image (1).png
diff --git a/data/styles/new_style/style-clear/xxhdpi/compass-image.png b/data/styles/clear/style-clear/xxhdpi/compass-image.png
similarity index 100%
rename from data/styles/new_style/style-clear/xxhdpi/compass-image.png
rename to data/styles/clear/style-clear/xxhdpi/compass-image.png
diff --git a/data/styles/new_style/style-clear/xxhdpi/current-position-compas (1).png b/data/styles/clear/style-clear/xxhdpi/current-position-compas (1).png
similarity index 100%
rename from data/styles/new_style/style-clear/xxhdpi/current-position-compas (1).png
rename to data/styles/clear/style-clear/xxhdpi/current-position-compas (1).png
diff --git a/data/styles/new_style/style-clear/xxhdpi/current-position-compas.png b/data/styles/clear/style-clear/xxhdpi/current-position-compas.png
similarity index 100%
rename from data/styles/new_style/style-clear/xxhdpi/current-position-compas.png
rename to data/styles/clear/style-clear/xxhdpi/current-position-compas.png
diff --git a/data/styles/new_style/style-clear/xxhdpi/current-position.png b/data/styles/clear/style-clear/xxhdpi/current-position.png
similarity index 100%
rename from data/styles/new_style/style-clear/xxhdpi/current-position.png
rename to data/styles/clear/style-clear/xxhdpi/current-position.png
diff --git a/data/styles/new_style/style-clear/xxhdpi/current-routing-compas.png b/data/styles/clear/style-clear/xxhdpi/current-routing-compas.png
similarity index 100%
rename from data/styles/new_style/style-clear/xxhdpi/current-routing-compas.png
rename to data/styles/clear/style-clear/xxhdpi/current-routing-compas.png
diff --git a/data/styles/new_style/style-clear/xxhdpi/placemark-blue.png b/data/styles/clear/style-clear/xxhdpi/placemark-blue.png
similarity index 100%
rename from data/styles/new_style/style-clear/xxhdpi/placemark-blue.png
rename to data/styles/clear/style-clear/xxhdpi/placemark-blue.png
diff --git a/data/styles/new_style/style-clear/xxhdpi/placemark-brown (1).png b/data/styles/clear/style-clear/xxhdpi/placemark-brown (1).png
similarity index 100%
rename from data/styles/new_style/style-clear/xxhdpi/placemark-brown (1).png
rename to data/styles/clear/style-clear/xxhdpi/placemark-brown (1).png
diff --git a/data/styles/new_style/style-clear/xxhdpi/placemark-brown.png b/data/styles/clear/style-clear/xxhdpi/placemark-brown.png
similarity index 100%
rename from data/styles/new_style/style-clear/xxhdpi/placemark-brown.png
rename to data/styles/clear/style-clear/xxhdpi/placemark-brown.png
diff --git a/data/styles/new_style/style-clear/xxhdpi/placemark-green.png b/data/styles/clear/style-clear/xxhdpi/placemark-green.png
similarity index 100%
rename from data/styles/new_style/style-clear/xxhdpi/placemark-green.png
rename to data/styles/clear/style-clear/xxhdpi/placemark-green.png
diff --git a/data/styles/new_style/style-clear/xxhdpi/placemark-orange (1).png b/data/styles/clear/style-clear/xxhdpi/placemark-orange (1).png
similarity index 100%
rename from data/styles/new_style/style-clear/xxhdpi/placemark-orange (1).png
rename to data/styles/clear/style-clear/xxhdpi/placemark-orange (1).png
diff --git a/data/styles/new_style/style-clear/xxhdpi/placemark-orange.png b/data/styles/clear/style-clear/xxhdpi/placemark-orange.png
similarity index 100%
rename from data/styles/new_style/style-clear/xxhdpi/placemark-orange.png
rename to data/styles/clear/style-clear/xxhdpi/placemark-orange.png
diff --git a/data/styles/new_style/style-clear/xxhdpi/placemark-pink.png b/data/styles/clear/style-clear/xxhdpi/placemark-pink.png
similarity index 100%
rename from data/styles/new_style/style-clear/xxhdpi/placemark-pink.png
rename to data/styles/clear/style-clear/xxhdpi/placemark-pink.png
diff --git a/data/styles/new_style/style-clear/xxhdpi/placemark-purple.png b/data/styles/clear/style-clear/xxhdpi/placemark-purple.png
similarity index 100%
rename from data/styles/new_style/style-clear/xxhdpi/placemark-purple.png
rename to data/styles/clear/style-clear/xxhdpi/placemark-purple.png
diff --git a/data/styles/new_style/style-clear/xxhdpi/placemark-red (1).png b/data/styles/clear/style-clear/xxhdpi/placemark-red (1).png
similarity index 100%
rename from data/styles/new_style/style-clear/xxhdpi/placemark-red (1).png
rename to data/styles/clear/style-clear/xxhdpi/placemark-red (1).png
diff --git a/data/styles/new_style/style-clear/xxhdpi/placemark-red.png b/data/styles/clear/style-clear/xxhdpi/placemark-red.png
similarity index 100%
rename from data/styles/new_style/style-clear/xxhdpi/placemark-red.png
rename to data/styles/clear/style-clear/xxhdpi/placemark-red.png
diff --git a/data/styles/new_style/style-clear/xxhdpi/placemark-yellow.png b/data/styles/clear/style-clear/xxhdpi/placemark-yellow.png
similarity index 100%
rename from data/styles/new_style/style-clear/xxhdpi/placemark-yellow.png
rename to data/styles/clear/style-clear/xxhdpi/placemark-yellow.png
diff --git a/data/styles/style-dark/xxhdpi/route-arrow.png b/data/styles/clear/style-clear/xxhdpi/route-arrow.png
similarity index 100%
rename from data/styles/style-dark/xxhdpi/route-arrow.png
rename to data/styles/clear/style-clear/xxhdpi/route-arrow.png
diff --git a/data/styles/new_style/style-clear/xxhdpi/route_from.png b/data/styles/clear/style-clear/xxhdpi/route_from.png
similarity index 100%
rename from data/styles/new_style/style-clear/xxhdpi/route_from.png
rename to data/styles/clear/style-clear/xxhdpi/route_from.png
diff --git a/data/styles/new_style/style-clear/xxhdpi/route_to.png b/data/styles/clear/style-clear/xxhdpi/route_to.png
similarity index 100%
rename from data/styles/new_style/style-clear/xxhdpi/route_to.png
rename to data/styles/clear/style-clear/xxhdpi/route_to.png
diff --git a/data/styles/new_style/style-clear/xxhdpi/search-result-active.png b/data/styles/clear/style-clear/xxhdpi/search-result-active.png
similarity index 100%
rename from data/styles/new_style/style-clear/xxhdpi/search-result-active.png
rename to data/styles/clear/style-clear/xxhdpi/search-result-active.png
diff --git a/data/styles/new_style/style-clear/xxhdpi/search-result.png b/data/styles/clear/style-clear/xxhdpi/search-result.png
similarity index 100%
rename from data/styles/new_style/style-clear/xxhdpi/search-result.png
rename to data/styles/clear/style-clear/xxhdpi/search-result.png
diff --git a/data/styles/new_style/style-clear/xxhdpi/watch-my-direction.png b/data/styles/clear/style-clear/xxhdpi/watch-my-direction.png
similarity index 100%
rename from data/styles/new_style/style-clear/xxhdpi/watch-my-direction.png
rename to data/styles/clear/style-clear/xxhdpi/watch-my-direction.png
diff --git a/data/styles/new_style/style-clear/xxhdpi/watch-my-position.png b/data/styles/clear/style-clear/xxhdpi/watch-my-position.png
similarity index 100%
rename from data/styles/new_style/style-clear/xxhdpi/watch-my-position.png
rename to data/styles/clear/style-clear/xxhdpi/watch-my-position.png
diff --git a/data/styles/new_style/style-clear/xxhdpi/watch-search-result.png b/data/styles/clear/style-clear/xxhdpi/watch-search-result.png
similarity index 100%
rename from data/styles/new_style/style-clear/xxhdpi/watch-search-result.png
rename to data/styles/clear/style-clear/xxhdpi/watch-search-result.png
diff --git a/data/styles/include/base_boundaries.mapcss b/data/styles/legacy/include/base_boundaries.mapcss
similarity index 100%
rename from data/styles/include/base_boundaries.mapcss
rename to data/styles/legacy/include/base_boundaries.mapcss
diff --git a/data/styles/include/base_defaults.mapcss b/data/styles/legacy/include/base_defaults.mapcss
similarity index 100%
rename from data/styles/include/base_defaults.mapcss
rename to data/styles/legacy/include/base_defaults.mapcss
diff --git a/data/styles/include/base_landuse.mapcss b/data/styles/legacy/include/base_landuse.mapcss
similarity index 100%
rename from data/styles/include/base_landuse.mapcss
rename to data/styles/legacy/include/base_landuse.mapcss
diff --git a/data/styles/include/base_other.mapcss b/data/styles/legacy/include/base_other.mapcss
similarity index 100%
rename from data/styles/include/base_other.mapcss
rename to data/styles/legacy/include/base_other.mapcss
diff --git a/data/styles/include/base_piste.mapcss b/data/styles/legacy/include/base_piste.mapcss
similarity index 100%
rename from data/styles/include/base_piste.mapcss
rename to data/styles/legacy/include/base_piste.mapcss
diff --git a/data/styles/include/base_place.mapcss b/data/styles/legacy/include/base_place.mapcss
similarity index 100%
rename from data/styles/include/base_place.mapcss
rename to data/styles/legacy/include/base_place.mapcss
diff --git a/data/styles/include/base_publictransport.mapcss b/data/styles/legacy/include/base_publictransport.mapcss
similarity index 100%
rename from data/styles/include/base_publictransport.mapcss
rename to data/styles/legacy/include/base_publictransport.mapcss
diff --git a/data/styles/include/base_railways.mapcss b/data/styles/legacy/include/base_railways.mapcss
similarity index 100%
rename from data/styles/include/base_railways.mapcss
rename to data/styles/legacy/include/base_railways.mapcss
diff --git a/data/styles/include/base_roads.mapcss b/data/styles/legacy/include/base_roads.mapcss
similarity index 100%
rename from data/styles/include/base_roads.mapcss
rename to data/styles/legacy/include/base_roads.mapcss
diff --git a/data/styles/include/base_roads_UK.mapcss b/data/styles/legacy/include/base_roads_UK.mapcss
similarity index 100%
rename from data/styles/include/base_roads_UK.mapcss
rename to data/styles/legacy/include/base_roads_UK.mapcss
diff --git a/data/styles/include/base_shop.mapcss b/data/styles/legacy/include/base_shop.mapcss
similarity index 100%
rename from data/styles/include/base_shop.mapcss
rename to data/styles/legacy/include/base_shop.mapcss
diff --git a/data/styles/include/base_sport.mapcss b/data/styles/legacy/include/base_sport.mapcss
similarity index 100%
rename from data/styles/include/base_sport.mapcss
rename to data/styles/legacy/include/base_sport.mapcss
diff --git a/data/styles/include/base_water.mapcss b/data/styles/legacy/include/base_water.mapcss
similarity index 100%
rename from data/styles/include/base_water.mapcss
rename to data/styles/legacy/include/base_water.mapcss
diff --git a/data/styles/style-dark/6plus/api-result.png b/data/styles/legacy/style-dark/6plus/api-result.png
similarity index 100%
rename from data/styles/style-dark/6plus/api-result.png
rename to data/styles/legacy/style-dark/6plus/api-result.png
diff --git a/data/styles/style-dark/6plus/compass-image.png b/data/styles/legacy/style-dark/6plus/compass-image.png
similarity index 100%
rename from data/styles/style-dark/6plus/compass-image.png
rename to data/styles/legacy/style-dark/6plus/compass-image.png
diff --git a/data/styles/style-dark/6plus/current-position-compas.png b/data/styles/legacy/style-dark/6plus/current-position-compas.png
similarity index 100%
rename from data/styles/style-dark/6plus/current-position-compas.png
rename to data/styles/legacy/style-dark/6plus/current-position-compas.png
diff --git a/data/styles/style-dark/6plus/current-position.png b/data/styles/legacy/style-dark/6plus/current-position.png
similarity index 100%
rename from data/styles/style-dark/6plus/current-position.png
rename to data/styles/legacy/style-dark/6plus/current-position.png
diff --git a/data/styles/style-dark/6plus/current-routing-compas.png b/data/styles/legacy/style-dark/6plus/current-routing-compas.png
similarity index 100%
rename from data/styles/style-dark/6plus/current-routing-compas.png
rename to data/styles/legacy/style-dark/6plus/current-routing-compas.png
diff --git a/data/styles/style-dark/6plus/placemark-blue.png b/data/styles/legacy/style-dark/6plus/placemark-blue.png
similarity index 100%
rename from data/styles/style-dark/6plus/placemark-blue.png
rename to data/styles/legacy/style-dark/6plus/placemark-blue.png
diff --git a/data/styles/style-dark/6plus/placemark-brown.png b/data/styles/legacy/style-dark/6plus/placemark-brown.png
similarity index 100%
rename from data/styles/style-dark/6plus/placemark-brown.png
rename to data/styles/legacy/style-dark/6plus/placemark-brown.png
diff --git a/data/styles/style-dark/6plus/placemark-green.png b/data/styles/legacy/style-dark/6plus/placemark-green.png
similarity index 100%
rename from data/styles/style-dark/6plus/placemark-green.png
rename to data/styles/legacy/style-dark/6plus/placemark-green.png
diff --git a/data/styles/style-dark/6plus/placemark-orange.png b/data/styles/legacy/style-dark/6plus/placemark-orange.png
similarity index 100%
rename from data/styles/style-dark/6plus/placemark-orange.png
rename to data/styles/legacy/style-dark/6plus/placemark-orange.png
diff --git a/data/styles/style-dark/6plus/placemark-pink.png b/data/styles/legacy/style-dark/6plus/placemark-pink.png
similarity index 100%
rename from data/styles/style-dark/6plus/placemark-pink.png
rename to data/styles/legacy/style-dark/6plus/placemark-pink.png
diff --git a/data/styles/style-dark/6plus/placemark-purple.png b/data/styles/legacy/style-dark/6plus/placemark-purple.png
similarity index 100%
rename from data/styles/style-dark/6plus/placemark-purple.png
rename to data/styles/legacy/style-dark/6plus/placemark-purple.png
diff --git a/data/styles/style-dark/6plus/placemark-red.png b/data/styles/legacy/style-dark/6plus/placemark-red.png
similarity index 100%
rename from data/styles/style-dark/6plus/placemark-red.png
rename to data/styles/legacy/style-dark/6plus/placemark-red.png
diff --git a/data/styles/style-dark/6plus/placemark-yellow.png b/data/styles/legacy/style-dark/6plus/placemark-yellow.png
similarity index 100%
rename from data/styles/style-dark/6plus/placemark-yellow.png
rename to data/styles/legacy/style-dark/6plus/placemark-yellow.png
diff --git a/data/styles/style-light/6plus/route-arrow.png b/data/styles/legacy/style-dark/6plus/route-arrow.png
similarity index 100%
rename from data/styles/style-light/6plus/route-arrow.png
rename to data/styles/legacy/style-dark/6plus/route-arrow.png
diff --git a/data/styles/style-dark/6plus/route_from.png b/data/styles/legacy/style-dark/6plus/route_from.png
similarity index 100%
rename from data/styles/style-dark/6plus/route_from.png
rename to data/styles/legacy/style-dark/6plus/route_from.png
diff --git a/data/styles/style-dark/6plus/route_to.png b/data/styles/legacy/style-dark/6plus/route_to.png
similarity index 100%
rename from data/styles/style-dark/6plus/route_to.png
rename to data/styles/legacy/style-dark/6plus/route_to.png
diff --git a/data/styles/style-dark/6plus/search-result-active.png b/data/styles/legacy/style-dark/6plus/search-result-active.png
similarity index 100%
rename from data/styles/style-dark/6plus/search-result-active.png
rename to data/styles/legacy/style-dark/6plus/search-result-active.png
diff --git a/data/styles/style-dark/6plus/search-result.png b/data/styles/legacy/style-dark/6plus/search-result.png
similarity index 100%
rename from data/styles/style-dark/6plus/search-result.png
rename to data/styles/legacy/style-dark/6plus/search-result.png
diff --git a/data/styles/style-dark/colors_dark.mapcss b/data/styles/legacy/style-dark/colors_dark.mapcss
similarity index 100%
rename from data/styles/style-dark/colors_dark.mapcss
rename to data/styles/legacy/style-dark/colors_dark.mapcss
diff --git a/data/styles/style-dark/hdpi/api-result.png b/data/styles/legacy/style-dark/hdpi/api-result.png
similarity index 100%
rename from data/styles/style-dark/hdpi/api-result.png
rename to data/styles/legacy/style-dark/hdpi/api-result.png
diff --git a/data/styles/style-dark/hdpi/compass-image.png b/data/styles/legacy/style-dark/hdpi/compass-image.png
similarity index 100%
rename from data/styles/style-dark/hdpi/compass-image.png
rename to data/styles/legacy/style-dark/hdpi/compass-image.png
diff --git a/data/styles/style-dark/hdpi/current-position-compas.png b/data/styles/legacy/style-dark/hdpi/current-position-compas.png
similarity index 100%
rename from data/styles/style-dark/hdpi/current-position-compas.png
rename to data/styles/legacy/style-dark/hdpi/current-position-compas.png
diff --git a/data/styles/style-dark/hdpi/current-position.png b/data/styles/legacy/style-dark/hdpi/current-position.png
similarity index 100%
rename from data/styles/style-dark/hdpi/current-position.png
rename to data/styles/legacy/style-dark/hdpi/current-position.png
diff --git a/data/styles/style-dark/hdpi/current-routing-compas.png b/data/styles/legacy/style-dark/hdpi/current-routing-compas.png
similarity index 100%
rename from data/styles/style-dark/hdpi/current-routing-compas.png
rename to data/styles/legacy/style-dark/hdpi/current-routing-compas.png
diff --git a/data/styles/style-dark/hdpi/placemark-blue.png b/data/styles/legacy/style-dark/hdpi/placemark-blue.png
similarity index 100%
rename from data/styles/style-dark/hdpi/placemark-blue.png
rename to data/styles/legacy/style-dark/hdpi/placemark-blue.png
diff --git a/data/styles/style-dark/hdpi/placemark-brown.png b/data/styles/legacy/style-dark/hdpi/placemark-brown.png
similarity index 100%
rename from data/styles/style-dark/hdpi/placemark-brown.png
rename to data/styles/legacy/style-dark/hdpi/placemark-brown.png
diff --git a/data/styles/style-dark/hdpi/placemark-green.png b/data/styles/legacy/style-dark/hdpi/placemark-green.png
similarity index 100%
rename from data/styles/style-dark/hdpi/placemark-green.png
rename to data/styles/legacy/style-dark/hdpi/placemark-green.png
diff --git a/data/styles/style-dark/hdpi/placemark-orange.png b/data/styles/legacy/style-dark/hdpi/placemark-orange.png
similarity index 100%
rename from data/styles/style-dark/hdpi/placemark-orange.png
rename to data/styles/legacy/style-dark/hdpi/placemark-orange.png
diff --git a/data/styles/style-dark/hdpi/placemark-pink.png b/data/styles/legacy/style-dark/hdpi/placemark-pink.png
similarity index 100%
rename from data/styles/style-dark/hdpi/placemark-pink.png
rename to data/styles/legacy/style-dark/hdpi/placemark-pink.png
diff --git a/data/styles/style-dark/hdpi/placemark-purple.png b/data/styles/legacy/style-dark/hdpi/placemark-purple.png
similarity index 100%
rename from data/styles/style-dark/hdpi/placemark-purple.png
rename to data/styles/legacy/style-dark/hdpi/placemark-purple.png
diff --git a/data/styles/style-dark/hdpi/placemark-red.png b/data/styles/legacy/style-dark/hdpi/placemark-red.png
similarity index 100%
rename from data/styles/style-dark/hdpi/placemark-red.png
rename to data/styles/legacy/style-dark/hdpi/placemark-red.png
diff --git a/data/styles/style-dark/hdpi/placemark-yellow.png b/data/styles/legacy/style-dark/hdpi/placemark-yellow.png
similarity index 100%
rename from data/styles/style-dark/hdpi/placemark-yellow.png
rename to data/styles/legacy/style-dark/hdpi/placemark-yellow.png
diff --git a/data/styles/style-light/hdpi/route-arrow.png b/data/styles/legacy/style-dark/hdpi/route-arrow.png
similarity index 100%
rename from data/styles/style-light/hdpi/route-arrow.png
rename to data/styles/legacy/style-dark/hdpi/route-arrow.png
diff --git a/data/styles/style-dark/hdpi/route_from.png b/data/styles/legacy/style-dark/hdpi/route_from.png
similarity index 100%
rename from data/styles/style-dark/hdpi/route_from.png
rename to data/styles/legacy/style-dark/hdpi/route_from.png
diff --git a/data/styles/style-dark/hdpi/route_to.png b/data/styles/legacy/style-dark/hdpi/route_to.png
similarity index 100%
rename from data/styles/style-dark/hdpi/route_to.png
rename to data/styles/legacy/style-dark/hdpi/route_to.png
diff --git a/data/styles/style-dark/hdpi/search-result-active.png b/data/styles/legacy/style-dark/hdpi/search-result-active.png
similarity index 100%
rename from data/styles/style-dark/hdpi/search-result-active.png
rename to data/styles/legacy/style-dark/hdpi/search-result-active.png
diff --git a/data/styles/style-dark/hdpi/search-result.png b/data/styles/legacy/style-dark/hdpi/search-result.png
similarity index 100%
rename from data/styles/style-dark/hdpi/search-result.png
rename to data/styles/legacy/style-dark/hdpi/search-result.png
diff --git a/data/styles/style-dark/ldpi/api-result.png b/data/styles/legacy/style-dark/ldpi/api-result.png
similarity index 100%
rename from data/styles/style-dark/ldpi/api-result.png
rename to data/styles/legacy/style-dark/ldpi/api-result.png
diff --git a/data/styles/style-dark/ldpi/compass-image.png b/data/styles/legacy/style-dark/ldpi/compass-image.png
similarity index 100%
rename from data/styles/style-dark/ldpi/compass-image.png
rename to data/styles/legacy/style-dark/ldpi/compass-image.png
diff --git a/data/styles/style-dark/ldpi/current-position-compas.png b/data/styles/legacy/style-dark/ldpi/current-position-compas.png
similarity index 100%
rename from data/styles/style-dark/ldpi/current-position-compas.png
rename to data/styles/legacy/style-dark/ldpi/current-position-compas.png
diff --git a/data/styles/style-dark/ldpi/current-position.png b/data/styles/legacy/style-dark/ldpi/current-position.png
similarity index 100%
rename from data/styles/style-dark/ldpi/current-position.png
rename to data/styles/legacy/style-dark/ldpi/current-position.png
diff --git a/data/styles/style-dark/ldpi/current-routing-compas.png b/data/styles/legacy/style-dark/ldpi/current-routing-compas.png
similarity index 100%
rename from data/styles/style-dark/ldpi/current-routing-compas.png
rename to data/styles/legacy/style-dark/ldpi/current-routing-compas.png
diff --git a/data/styles/style-dark/ldpi/placemark-blue.png b/data/styles/legacy/style-dark/ldpi/placemark-blue.png
similarity index 100%
rename from data/styles/style-dark/ldpi/placemark-blue.png
rename to data/styles/legacy/style-dark/ldpi/placemark-blue.png
diff --git a/data/styles/style-dark/ldpi/placemark-brown.png b/data/styles/legacy/style-dark/ldpi/placemark-brown.png
similarity index 100%
rename from data/styles/style-dark/ldpi/placemark-brown.png
rename to data/styles/legacy/style-dark/ldpi/placemark-brown.png
diff --git a/data/styles/style-dark/ldpi/placemark-green.png b/data/styles/legacy/style-dark/ldpi/placemark-green.png
similarity index 100%
rename from data/styles/style-dark/ldpi/placemark-green.png
rename to data/styles/legacy/style-dark/ldpi/placemark-green.png
diff --git a/data/styles/style-dark/ldpi/placemark-orange.png b/data/styles/legacy/style-dark/ldpi/placemark-orange.png
similarity index 100%
rename from data/styles/style-dark/ldpi/placemark-orange.png
rename to data/styles/legacy/style-dark/ldpi/placemark-orange.png
diff --git a/data/styles/style-dark/ldpi/placemark-pink.png b/data/styles/legacy/style-dark/ldpi/placemark-pink.png
similarity index 100%
rename from data/styles/style-dark/ldpi/placemark-pink.png
rename to data/styles/legacy/style-dark/ldpi/placemark-pink.png
diff --git a/data/styles/style-dark/ldpi/placemark-purple.png b/data/styles/legacy/style-dark/ldpi/placemark-purple.png
similarity index 100%
rename from data/styles/style-dark/ldpi/placemark-purple.png
rename to data/styles/legacy/style-dark/ldpi/placemark-purple.png
diff --git a/data/styles/style-dark/ldpi/placemark-red.png b/data/styles/legacy/style-dark/ldpi/placemark-red.png
similarity index 100%
rename from data/styles/style-dark/ldpi/placemark-red.png
rename to data/styles/legacy/style-dark/ldpi/placemark-red.png
diff --git a/data/styles/style-dark/ldpi/placemark-yellow.png b/data/styles/legacy/style-dark/ldpi/placemark-yellow.png
similarity index 100%
rename from data/styles/style-dark/ldpi/placemark-yellow.png
rename to data/styles/legacy/style-dark/ldpi/placemark-yellow.png
diff --git a/data/styles/style-light/ldpi/route-arrow.png b/data/styles/legacy/style-dark/ldpi/route-arrow.png
similarity index 100%
rename from data/styles/style-light/ldpi/route-arrow.png
rename to data/styles/legacy/style-dark/ldpi/route-arrow.png
diff --git a/data/styles/style-dark/ldpi/route_from.png b/data/styles/legacy/style-dark/ldpi/route_from.png
similarity index 100%
rename from data/styles/style-dark/ldpi/route_from.png
rename to data/styles/legacy/style-dark/ldpi/route_from.png
diff --git a/data/styles/style-dark/ldpi/route_to.png b/data/styles/legacy/style-dark/ldpi/route_to.png
similarity index 100%
rename from data/styles/style-dark/ldpi/route_to.png
rename to data/styles/legacy/style-dark/ldpi/route_to.png
diff --git a/data/styles/style-dark/ldpi/search-result-active.png b/data/styles/legacy/style-dark/ldpi/search-result-active.png
similarity index 100%
rename from data/styles/style-dark/ldpi/search-result-active.png
rename to data/styles/legacy/style-dark/ldpi/search-result-active.png
diff --git a/data/styles/style-dark/ldpi/search-result.png b/data/styles/legacy/style-dark/ldpi/search-result.png
similarity index 100%
rename from data/styles/style-dark/ldpi/search-result.png
rename to data/styles/legacy/style-dark/ldpi/search-result.png
diff --git a/data/styles/style-dark/mdpi/api-result.png b/data/styles/legacy/style-dark/mdpi/api-result.png
similarity index 100%
rename from data/styles/style-dark/mdpi/api-result.png
rename to data/styles/legacy/style-dark/mdpi/api-result.png
diff --git a/data/styles/style-dark/mdpi/compass-image.png b/data/styles/legacy/style-dark/mdpi/compass-image.png
similarity index 100%
rename from data/styles/style-dark/mdpi/compass-image.png
rename to data/styles/legacy/style-dark/mdpi/compass-image.png
diff --git a/data/styles/style-dark/mdpi/current-position-compas.png b/data/styles/legacy/style-dark/mdpi/current-position-compas.png
similarity index 100%
rename from data/styles/style-dark/mdpi/current-position-compas.png
rename to data/styles/legacy/style-dark/mdpi/current-position-compas.png
diff --git a/data/styles/style-dark/mdpi/current-position.png b/data/styles/legacy/style-dark/mdpi/current-position.png
similarity index 100%
rename from data/styles/style-dark/mdpi/current-position.png
rename to data/styles/legacy/style-dark/mdpi/current-position.png
diff --git a/data/styles/style-dark/mdpi/current-routing-compas.png b/data/styles/legacy/style-dark/mdpi/current-routing-compas.png
similarity index 100%
rename from data/styles/style-dark/mdpi/current-routing-compas.png
rename to data/styles/legacy/style-dark/mdpi/current-routing-compas.png
diff --git a/data/styles/style-dark/mdpi/placemark-blue.png b/data/styles/legacy/style-dark/mdpi/placemark-blue.png
similarity index 100%
rename from data/styles/style-dark/mdpi/placemark-blue.png
rename to data/styles/legacy/style-dark/mdpi/placemark-blue.png
diff --git a/data/styles/style-dark/mdpi/placemark-brown.png b/data/styles/legacy/style-dark/mdpi/placemark-brown.png
similarity index 100%
rename from data/styles/style-dark/mdpi/placemark-brown.png
rename to data/styles/legacy/style-dark/mdpi/placemark-brown.png
diff --git a/data/styles/style-dark/mdpi/placemark-green.png b/data/styles/legacy/style-dark/mdpi/placemark-green.png
similarity index 100%
rename from data/styles/style-dark/mdpi/placemark-green.png
rename to data/styles/legacy/style-dark/mdpi/placemark-green.png
diff --git a/data/styles/style-dark/mdpi/placemark-orange.png b/data/styles/legacy/style-dark/mdpi/placemark-orange.png
similarity index 100%
rename from data/styles/style-dark/mdpi/placemark-orange.png
rename to data/styles/legacy/style-dark/mdpi/placemark-orange.png
diff --git a/data/styles/style-dark/mdpi/placemark-pink.png b/data/styles/legacy/style-dark/mdpi/placemark-pink.png
similarity index 100%
rename from data/styles/style-dark/mdpi/placemark-pink.png
rename to data/styles/legacy/style-dark/mdpi/placemark-pink.png
diff --git a/data/styles/style-dark/mdpi/placemark-purple.png b/data/styles/legacy/style-dark/mdpi/placemark-purple.png
similarity index 100%
rename from data/styles/style-dark/mdpi/placemark-purple.png
rename to data/styles/legacy/style-dark/mdpi/placemark-purple.png
diff --git a/data/styles/style-dark/mdpi/placemark-red.png b/data/styles/legacy/style-dark/mdpi/placemark-red.png
similarity index 100%
rename from data/styles/style-dark/mdpi/placemark-red.png
rename to data/styles/legacy/style-dark/mdpi/placemark-red.png
diff --git a/data/styles/style-dark/mdpi/placemark-yellow.png b/data/styles/legacy/style-dark/mdpi/placemark-yellow.png
similarity index 100%
rename from data/styles/style-dark/mdpi/placemark-yellow.png
rename to data/styles/legacy/style-dark/mdpi/placemark-yellow.png
diff --git a/data/styles/style-light/mdpi/route-arrow.png b/data/styles/legacy/style-dark/mdpi/route-arrow.png
similarity index 100%
rename from data/styles/style-light/mdpi/route-arrow.png
rename to data/styles/legacy/style-dark/mdpi/route-arrow.png
diff --git a/data/styles/style-dark/mdpi/route_from.png b/data/styles/legacy/style-dark/mdpi/route_from.png
similarity index 100%
rename from data/styles/style-dark/mdpi/route_from.png
rename to data/styles/legacy/style-dark/mdpi/route_from.png
diff --git a/data/styles/style-dark/mdpi/route_to.png b/data/styles/legacy/style-dark/mdpi/route_to.png
similarity index 100%
rename from data/styles/style-dark/mdpi/route_to.png
rename to data/styles/legacy/style-dark/mdpi/route_to.png
diff --git a/data/styles/style-dark/mdpi/search-result-active.png b/data/styles/legacy/style-dark/mdpi/search-result-active.png
similarity index 100%
rename from data/styles/style-dark/mdpi/search-result-active.png
rename to data/styles/legacy/style-dark/mdpi/search-result-active.png
diff --git a/data/styles/style-dark/mdpi/search-result.png b/data/styles/legacy/style-dark/mdpi/search-result.png
similarity index 100%
rename from data/styles/style-dark/mdpi/search-result.png
rename to data/styles/legacy/style-dark/mdpi/search-result.png
diff --git a/data/styles/style-dark/mdpi/watch-my-direction.png b/data/styles/legacy/style-dark/mdpi/watch-my-direction.png
similarity index 100%
rename from data/styles/style-dark/mdpi/watch-my-direction.png
rename to data/styles/legacy/style-dark/mdpi/watch-my-direction.png
diff --git a/data/styles/style-dark/mdpi/watch-my-position.png b/data/styles/legacy/style-dark/mdpi/watch-my-position.png
similarity index 100%
rename from data/styles/style-dark/mdpi/watch-my-position.png
rename to data/styles/legacy/style-dark/mdpi/watch-my-position.png
diff --git a/data/styles/style-dark/mdpi/watch-search-result.png b/data/styles/legacy/style-dark/mdpi/watch-search-result.png
similarity index 100%
rename from data/styles/style-dark/mdpi/watch-search-result.png
rename to data/styles/legacy/style-dark/mdpi/watch-search-result.png
diff --git a/data/styles/style-dark/style.mapcss b/data/styles/legacy/style-dark/style.mapcss
similarity index 100%
rename from data/styles/style-dark/style.mapcss
rename to data/styles/legacy/style-dark/style.mapcss
diff --git a/data/styles/style-dark/symbols/airport.svg b/data/styles/legacy/style-dark/symbols/airport.svg
similarity index 100%
rename from data/styles/style-dark/symbols/airport.svg
rename to data/styles/legacy/style-dark/symbols/airport.svg
diff --git a/data/styles/style-dark/symbols/alpine_hut.svg b/data/styles/legacy/style-dark/symbols/alpine_hut.svg
similarity index 100%
rename from data/styles/style-dark/symbols/alpine_hut.svg
rename to data/styles/legacy/style-dark/symbols/alpine_hut.svg
diff --git a/data/styles/style-dark/symbols/archery-borderless.svg b/data/styles/legacy/style-dark/symbols/archery-borderless.svg
similarity index 100%
rename from data/styles/style-dark/symbols/archery-borderless.svg
rename to data/styles/legacy/style-dark/symbols/archery-borderless.svg
diff --git a/data/styles/style-dark/symbols/archery.svg b/data/styles/legacy/style-dark/symbols/archery.svg
similarity index 100%
rename from data/styles/style-dark/symbols/archery.svg
rename to data/styles/legacy/style-dark/symbols/archery.svg
diff --git a/data/styles/style-dark/symbols/arrow.svg b/data/styles/legacy/style-dark/symbols/arrow.svg
similarity index 100%
rename from data/styles/style-dark/symbols/arrow.svg
rename to data/styles/legacy/style-dark/symbols/arrow.svg
diff --git a/data/styles/style-dark/symbols/athletics-borderless.svg b/data/styles/legacy/style-dark/symbols/athletics-borderless.svg
similarity index 100%
rename from data/styles/style-dark/symbols/athletics-borderless.svg
rename to data/styles/legacy/style-dark/symbols/athletics-borderless.svg
diff --git a/data/styles/style-dark/symbols/athletics.svg b/data/styles/legacy/style-dark/symbols/athletics.svg
similarity index 100%
rename from data/styles/style-dark/symbols/athletics.svg
rename to data/styles/legacy/style-dark/symbols/athletics.svg
diff --git a/data/styles/style-dark/symbols/atm.svg b/data/styles/legacy/style-dark/symbols/atm.svg
similarity index 100%
rename from data/styles/style-dark/symbols/atm.svg
rename to data/styles/legacy/style-dark/symbols/atm.svg
diff --git a/data/styles/style-dark/symbols/bakery.svg b/data/styles/legacy/style-dark/symbols/bakery.svg
similarity index 100%
rename from data/styles/style-dark/symbols/bakery.svg
rename to data/styles/legacy/style-dark/symbols/bakery.svg
diff --git a/data/styles/style-dark/symbols/bank.svg b/data/styles/legacy/style-dark/symbols/bank.svg
similarity index 100%
rename from data/styles/style-dark/symbols/bank.svg
rename to data/styles/legacy/style-dark/symbols/bank.svg
diff --git a/data/styles/style-dark/symbols/bar.svg b/data/styles/legacy/style-dark/symbols/bar.svg
similarity index 100%
rename from data/styles/style-dark/symbols/bar.svg
rename to data/styles/legacy/style-dark/symbols/bar.svg
diff --git a/data/styles/style-dark/symbols/barrier.svg b/data/styles/legacy/style-dark/symbols/barrier.svg
similarity index 100%
rename from data/styles/style-dark/symbols/barrier.svg
rename to data/styles/legacy/style-dark/symbols/barrier.svg
diff --git a/data/styles/style-dark/symbols/baseball-borderless.svg b/data/styles/legacy/style-dark/symbols/baseball-borderless.svg
similarity index 100%
rename from data/styles/style-dark/symbols/baseball-borderless.svg
rename to data/styles/legacy/style-dark/symbols/baseball-borderless.svg
diff --git a/data/styles/style-dark/symbols/baseball.svg b/data/styles/legacy/style-dark/symbols/baseball.svg
similarity index 100%
rename from data/styles/style-dark/symbols/baseball.svg
rename to data/styles/legacy/style-dark/symbols/baseball.svg
diff --git a/data/styles/style-dark/symbols/basketball-borderless.svg b/data/styles/legacy/style-dark/symbols/basketball-borderless.svg
similarity index 100%
rename from data/styles/style-dark/symbols/basketball-borderless.svg
rename to data/styles/legacy/style-dark/symbols/basketball-borderless.svg
diff --git a/data/styles/style-dark/symbols/basketball.svg b/data/styles/legacy/style-dark/symbols/basketball.svg
similarity index 100%
rename from data/styles/style-dark/symbols/basketball.svg
rename to data/styles/legacy/style-dark/symbols/basketball.svg
diff --git a/data/styles/style-dark/symbols/bench.svg b/data/styles/legacy/style-dark/symbols/bench.svg
similarity index 100%
rename from data/styles/style-dark/symbols/bench.svg
rename to data/styles/legacy/style-dark/symbols/bench.svg
diff --git a/data/styles/style-dark/symbols/bicycle_rental.svg b/data/styles/legacy/style-dark/symbols/bicycle_rental.svg
similarity index 100%
rename from data/styles/style-dark/symbols/bicycle_rental.svg
rename to data/styles/legacy/style-dark/symbols/bicycle_rental.svg
diff --git a/data/styles/style-dark/symbols/bird.svg b/data/styles/legacy/style-dark/symbols/bird.svg
similarity index 100%
rename from data/styles/style-dark/symbols/bird.svg
rename to data/styles/legacy/style-dark/symbols/bird.svg
diff --git a/data/styles/style-dark/symbols/bowls.svg b/data/styles/legacy/style-dark/symbols/bowls.svg
similarity index 100%
rename from data/styles/style-dark/symbols/bowls.svg
rename to data/styles/legacy/style-dark/symbols/bowls.svg
diff --git a/data/styles/style-dark/symbols/building.svg b/data/styles/legacy/style-dark/symbols/building.svg
similarity index 100%
rename from data/styles/style-dark/symbols/building.svg
rename to data/styles/legacy/style-dark/symbols/building.svg
diff --git a/data/styles/style-dark/symbols/bureau_de_change.svg b/data/styles/legacy/style-dark/symbols/bureau_de_change.svg
similarity index 100%
rename from data/styles/style-dark/symbols/bureau_de_change.svg
rename to data/styles/legacy/style-dark/symbols/bureau_de_change.svg
diff --git a/data/styles/style-dark/symbols/bus-mini.svg b/data/styles/legacy/style-dark/symbols/bus-mini.svg
similarity index 100%
rename from data/styles/style-dark/symbols/bus-mini.svg
rename to data/styles/legacy/style-dark/symbols/bus-mini.svg
diff --git a/data/styles/style-dark/symbols/bus.svg b/data/styles/legacy/style-dark/symbols/bus.svg
similarity index 100%
rename from data/styles/style-dark/symbols/bus.svg
rename to data/styles/legacy/style-dark/symbols/bus.svg
diff --git a/data/styles/style-dark/symbols/bus_sta.svg b/data/styles/legacy/style-dark/symbols/bus_sta.svg
similarity index 100%
rename from data/styles/style-dark/symbols/bus_sta.svg
rename to data/styles/legacy/style-dark/symbols/bus_sta.svg
diff --git a/data/styles/style-dark/symbols/cafe.svg b/data/styles/legacy/style-dark/symbols/cafe.svg
similarity index 100%
rename from data/styles/style-dark/symbols/cafe.svg
rename to data/styles/legacy/style-dark/symbols/cafe.svg
diff --git a/data/styles/style-dark/symbols/campSite.svg b/data/styles/legacy/style-dark/symbols/campSite.svg
similarity index 100%
rename from data/styles/style-dark/symbols/campSite.svg
rename to data/styles/legacy/style-dark/symbols/campSite.svg
diff --git a/data/styles/style-dark/symbols/cannon.svg b/data/styles/legacy/style-dark/symbols/cannon.svg
similarity index 100%
rename from data/styles/style-dark/symbols/cannon.svg
rename to data/styles/legacy/style-dark/symbols/cannon.svg
diff --git a/data/styles/style-dark/symbols/car_rental.svg b/data/styles/legacy/style-dark/symbols/car_rental.svg
similarity index 100%
rename from data/styles/style-dark/symbols/car_rental.svg
rename to data/styles/legacy/style-dark/symbols/car_rental.svg
diff --git a/data/styles/style-dark/symbols/car_repair.svg b/data/styles/legacy/style-dark/symbols/car_repair.svg
similarity index 100%
rename from data/styles/style-dark/symbols/car_repair.svg
rename to data/styles/legacy/style-dark/symbols/car_repair.svg
diff --git a/data/styles/style-dark/symbols/car_sharing.svg b/data/styles/legacy/style-dark/symbols/car_sharing.svg
similarity index 100%
rename from data/styles/style-dark/symbols/car_sharing.svg
rename to data/styles/legacy/style-dark/symbols/car_sharing.svg
diff --git a/data/styles/style-dark/symbols/castle.svg b/data/styles/legacy/style-dark/symbols/castle.svg
similarity index 100%
rename from data/styles/style-dark/symbols/castle.svg
rename to data/styles/legacy/style-dark/symbols/castle.svg
diff --git a/data/styles/style-dark/symbols/cave_entrance.svg b/data/styles/legacy/style-dark/symbols/cave_entrance.svg
similarity index 100%
rename from data/styles/style-dark/symbols/cave_entrance.svg
rename to data/styles/legacy/style-dark/symbols/cave_entrance.svg
diff --git a/data/styles/style-dark/symbols/church.svg b/data/styles/legacy/style-dark/symbols/church.svg
similarity index 100%
rename from data/styles/style-dark/symbols/church.svg
rename to data/styles/legacy/style-dark/symbols/church.svg
diff --git a/data/styles/style-dark/symbols/cinema.svg b/data/styles/legacy/style-dark/symbols/cinema.svg
similarity index 100%
rename from data/styles/style-dark/symbols/cinema.svg
rename to data/styles/legacy/style-dark/symbols/cinema.svg
diff --git a/data/styles/style-dark/symbols/clothes.svg b/data/styles/legacy/style-dark/symbols/clothes.svg
similarity index 100%
rename from data/styles/style-dark/symbols/clothes.svg
rename to data/styles/legacy/style-dark/symbols/clothes.svg
diff --git a/data/styles/style-dark/symbols/cricket-borderless.svg b/data/styles/legacy/style-dark/symbols/cricket-borderless.svg
similarity index 100%
rename from data/styles/style-dark/symbols/cricket-borderless.svg
rename to data/styles/legacy/style-dark/symbols/cricket-borderless.svg
diff --git a/data/styles/style-dark/symbols/cricket.svg b/data/styles/legacy/style-dark/symbols/cricket.svg
similarity index 100%
rename from data/styles/style-dark/symbols/cricket.svg
rename to data/styles/legacy/style-dark/symbols/cricket.svg
diff --git a/data/styles/style-dark/symbols/curling-borderless.svg b/data/styles/legacy/style-dark/symbols/curling-borderless.svg
similarity index 100%
rename from data/styles/style-dark/symbols/curling-borderless.svg
rename to data/styles/legacy/style-dark/symbols/curling-borderless.svg
diff --git a/data/styles/style-dark/symbols/curling.svg b/data/styles/legacy/style-dark/symbols/curling.svg
similarity index 100%
rename from data/styles/style-dark/symbols/curling.svg
rename to data/styles/legacy/style-dark/symbols/curling.svg
diff --git a/data/styles/style-dark/symbols/disused.svg b/data/styles/legacy/style-dark/symbols/disused.svg
similarity index 100%
rename from data/styles/style-dark/symbols/disused.svg
rename to data/styles/legacy/style-dark/symbols/disused.svg
diff --git a/data/styles/style-dark/symbols/diving-borderless.svg b/data/styles/legacy/style-dark/symbols/diving-borderless.svg
similarity index 100%
rename from data/styles/style-dark/symbols/diving-borderless.svg
rename to data/styles/legacy/style-dark/symbols/diving-borderless.svg
diff --git a/data/styles/style-dark/symbols/diving.svg b/data/styles/legacy/style-dark/symbols/diving.svg
similarity index 100%
rename from data/styles/style-dark/symbols/diving.svg
rename to data/styles/legacy/style-dark/symbols/diving.svg
diff --git a/data/styles/style-dark/symbols/doctor.svg b/data/styles/legacy/style-dark/symbols/doctor.svg
similarity index 100%
rename from data/styles/style-dark/symbols/doctor.svg
rename to data/styles/legacy/style-dark/symbols/doctor.svg
diff --git a/data/styles/style-dark/symbols/dog_park.svg b/data/styles/legacy/style-dark/symbols/dog_park.svg
similarity index 100%
rename from data/styles/style-dark/symbols/dog_park.svg
rename to data/styles/legacy/style-dark/symbols/dog_park.svg
diff --git a/data/styles/style-dark/symbols/drinking_water.svg b/data/styles/legacy/style-dark/symbols/drinking_water.svg
similarity index 100%
rename from data/styles/style-dark/symbols/drinking_water.svg
rename to data/styles/legacy/style-dark/symbols/drinking_water.svg
diff --git a/data/styles/style-dark/symbols/earthquake-camp.svg b/data/styles/legacy/style-dark/symbols/earthquake-camp.svg
similarity index 100%
rename from data/styles/style-dark/symbols/earthquake-camp.svg
rename to data/styles/legacy/style-dark/symbols/earthquake-camp.svg
diff --git a/data/styles/style-dark/symbols/embassy.svg b/data/styles/legacy/style-dark/symbols/embassy.svg
similarity index 100%
rename from data/styles/style-dark/symbols/embassy.svg
rename to data/styles/legacy/style-dark/symbols/embassy.svg
diff --git a/data/styles/style-dark/symbols/equestrian-borderless.svg b/data/styles/legacy/style-dark/symbols/equestrian-borderless.svg
similarity index 100%
rename from data/styles/style-dark/symbols/equestrian-borderless.svg
rename to data/styles/legacy/style-dark/symbols/equestrian-borderless.svg
diff --git a/data/styles/style-dark/symbols/equestrian.svg b/data/styles/legacy/style-dark/symbols/equestrian.svg
similarity index 100%
rename from data/styles/style-dark/symbols/equestrian.svg
rename to data/styles/legacy/style-dark/symbols/equestrian.svg
diff --git a/data/styles/style-dark/symbols/fastfood.svg b/data/styles/legacy/style-dark/symbols/fastfood.svg
similarity index 100%
rename from data/styles/style-dark/symbols/fastfood.svg
rename to data/styles/legacy/style-dark/symbols/fastfood.svg
diff --git a/data/styles/style-dark/symbols/firebrigade.svg b/data/styles/legacy/style-dark/symbols/firebrigade.svg
similarity index 100%
rename from data/styles/style-dark/symbols/firebrigade.svg
rename to data/styles/legacy/style-dark/symbols/firebrigade.svg
diff --git a/data/styles/style-dark/symbols/football-borderless.svg b/data/styles/legacy/style-dark/symbols/football-borderless.svg
similarity index 100%
rename from data/styles/style-dark/symbols/football-borderless.svg
rename to data/styles/legacy/style-dark/symbols/football-borderless.svg
diff --git a/data/styles/style-dark/symbols/football.svg b/data/styles/legacy/style-dark/symbols/football.svg
similarity index 100%
rename from data/styles/style-dark/symbols/football.svg
rename to data/styles/legacy/style-dark/symbols/football.svg
diff --git a/data/styles/style-dark/symbols/fountain.svg b/data/styles/legacy/style-dark/symbols/fountain.svg
similarity index 100%
rename from data/styles/style-dark/symbols/fountain.svg
rename to data/styles/legacy/style-dark/symbols/fountain.svg
diff --git a/data/styles/style-dark/symbols/gate.svg b/data/styles/legacy/style-dark/symbols/gate.svg
similarity index 100%
rename from data/styles/style-dark/symbols/gate.svg
rename to data/styles/legacy/style-dark/symbols/gate.svg
diff --git a/data/styles/style-dark/symbols/golf-course.svg b/data/styles/legacy/style-dark/symbols/golf-course.svg
similarity index 100%
rename from data/styles/style-dark/symbols/golf-course.svg
rename to data/styles/legacy/style-dark/symbols/golf-course.svg
diff --git a/data/styles/style-dark/symbols/gymnastics-borderless.svg b/data/styles/legacy/style-dark/symbols/gymnastics-borderless.svg
similarity index 100%
rename from data/styles/style-dark/symbols/gymnastics-borderless.svg
rename to data/styles/legacy/style-dark/symbols/gymnastics-borderless.svg
diff --git a/data/styles/style-dark/symbols/gymnastics.svg b/data/styles/legacy/style-dark/symbols/gymnastics.svg
similarity index 100%
rename from data/styles/style-dark/symbols/gymnastics.svg
rename to data/styles/legacy/style-dark/symbols/gymnastics.svg
diff --git a/data/styles/style-dark/symbols/hairdresser.svg b/data/styles/legacy/style-dark/symbols/hairdresser.svg
similarity index 100%
rename from data/styles/style-dark/symbols/hairdresser.svg
rename to data/styles/legacy/style-dark/symbols/hairdresser.svg
diff --git a/data/styles/style-dark/symbols/handball-borderless.svg b/data/styles/legacy/style-dark/symbols/handball-borderless.svg
similarity index 100%
rename from data/styles/style-dark/symbols/handball-borderless.svg
rename to data/styles/legacy/style-dark/symbols/handball-borderless.svg
diff --git a/data/styles/style-dark/symbols/handball.svg b/data/styles/legacy/style-dark/symbols/handball.svg
similarity index 100%
rename from data/styles/style-dark/symbols/handball.svg
rename to data/styles/legacy/style-dark/symbols/handball.svg
diff --git a/data/styles/style-dark/symbols/helipad.svg b/data/styles/legacy/style-dark/symbols/helipad.svg
similarity index 100%
rename from data/styles/style-dark/symbols/helipad.svg
rename to data/styles/legacy/style-dark/symbols/helipad.svg
diff --git a/data/styles/style-dark/symbols/hospital.svg b/data/styles/legacy/style-dark/symbols/hospital.svg
similarity index 100%
rename from data/styles/style-dark/symbols/hospital.svg
rename to data/styles/legacy/style-dark/symbols/hospital.svg
diff --git a/data/styles/style-dark/symbols/hostel.svg b/data/styles/legacy/style-dark/symbols/hostel.svg
similarity index 100%
rename from data/styles/style-dark/symbols/hostel.svg
rename to data/styles/legacy/style-dark/symbols/hostel.svg
diff --git a/data/styles/style-dark/symbols/hotel.svg b/data/styles/legacy/style-dark/symbols/hotel.svg
similarity index 100%
rename from data/styles/style-dark/symbols/hotel.svg
rename to data/styles/legacy/style-dark/symbols/hotel.svg
diff --git a/data/styles/style-dark/symbols/housenumber.svg b/data/styles/legacy/style-dark/symbols/housenumber.svg
similarity index 100%
rename from data/styles/style-dark/symbols/housenumber.svg
rename to data/styles/legacy/style-dark/symbols/housenumber.svg
diff --git a/data/styles/style-dark/symbols/hunting_closed_high.svg b/data/styles/legacy/style-dark/symbols/hunting_closed_high.svg
similarity index 100%
rename from data/styles/style-dark/symbols/hunting_closed_high.svg
rename to data/styles/legacy/style-dark/symbols/hunting_closed_high.svg
diff --git a/data/styles/style-dark/symbols/information-guidepost.svg b/data/styles/legacy/style-dark/symbols/information-guidepost.svg
similarity index 100%
rename from data/styles/style-dark/symbols/information-guidepost.svg
rename to data/styles/legacy/style-dark/symbols/information-guidepost.svg
diff --git a/data/styles/style-dark/symbols/information-office.svg b/data/styles/legacy/style-dark/symbols/information-office.svg
similarity index 100%
rename from data/styles/style-dark/symbols/information-office.svg
rename to data/styles/legacy/style-dark/symbols/information-office.svg
diff --git a/data/styles/style-dark/symbols/information.svg b/data/styles/legacy/style-dark/symbols/information.svg
similarity index 100%
rename from data/styles/style-dark/symbols/information.svg
rename to data/styles/legacy/style-dark/symbols/information.svg
diff --git a/data/styles/style-dark/symbols/khanda.svg b/data/styles/legacy/style-dark/symbols/khanda.svg
similarity index 100%
rename from data/styles/style-dark/symbols/khanda.svg
rename to data/styles/legacy/style-dark/symbols/khanda.svg
diff --git a/data/styles/style-dark/symbols/kindergarten.svg b/data/styles/legacy/style-dark/symbols/kindergarten.svg
similarity index 100%
rename from data/styles/style-dark/symbols/kindergarten.svg
rename to data/styles/legacy/style-dark/symbols/kindergarten.svg
diff --git a/data/styles/style-dark/symbols/kindergarten2.svg b/data/styles/legacy/style-dark/symbols/kindergarten2.svg
similarity index 100%
rename from data/styles/style-dark/symbols/kindergarten2.svg
rename to data/styles/legacy/style-dark/symbols/kindergarten2.svg
diff --git a/data/styles/style-dark/symbols/kiosk.svg b/data/styles/legacy/style-dark/symbols/kiosk.svg
similarity index 100%
rename from data/styles/style-dark/symbols/kiosk.svg
rename to data/styles/legacy/style-dark/symbols/kiosk.svg
diff --git a/data/styles/style-dark/symbols/library.svg b/data/styles/legacy/style-dark/symbols/library.svg
similarity index 100%
rename from data/styles/style-dark/symbols/library.svg
rename to data/styles/legacy/style-dark/symbols/library.svg
diff --git a/data/styles/style-dark/symbols/lighthouse.svg b/data/styles/legacy/style-dark/symbols/lighthouse.svg
similarity index 100%
rename from data/styles/style-dark/symbols/lighthouse.svg
rename to data/styles/legacy/style-dark/symbols/lighthouse.svg
diff --git a/data/styles/style-dark/symbols/man-made-halfpipe.svg b/data/styles/legacy/style-dark/symbols/man-made-halfpipe.svg
similarity index 100%
rename from data/styles/style-dark/symbols/man-made-halfpipe.svg
rename to data/styles/legacy/style-dark/symbols/man-made-halfpipe.svg
diff --git a/data/styles/style-dark/symbols/memorial.svg b/data/styles/legacy/style-dark/symbols/memorial.svg
similarity index 100%
rename from data/styles/style-dark/symbols/memorial.svg
rename to data/styles/legacy/style-dark/symbols/memorial.svg
diff --git a/data/styles/style-dark/symbols/mosque.svg b/data/styles/legacy/style-dark/symbols/mosque.svg
similarity index 100%
rename from data/styles/style-dark/symbols/mosque.svg
rename to data/styles/legacy/style-dark/symbols/mosque.svg
diff --git a/data/styles/style-dark/symbols/mountain_pass.svg b/data/styles/legacy/style-dark/symbols/mountain_pass.svg
similarity index 100%
rename from data/styles/style-dark/symbols/mountain_pass.svg
rename to data/styles/legacy/style-dark/symbols/mountain_pass.svg
diff --git a/data/styles/style-dark/symbols/museum.svg b/data/styles/legacy/style-dark/symbols/museum.svg
similarity index 100%
rename from data/styles/style-dark/symbols/museum.svg
rename to data/styles/legacy/style-dark/symbols/museum.svg
diff --git a/data/styles/style-dark/symbols/park_and_ride-permissive.svg b/data/styles/legacy/style-dark/symbols/park_and_ride-permissive.svg
similarity index 100%
rename from data/styles/style-dark/symbols/park_and_ride-permissive.svg
rename to data/styles/legacy/style-dark/symbols/park_and_ride-permissive.svg
diff --git a/data/styles/style-dark/symbols/park_and_ride.svg b/data/styles/legacy/style-dark/symbols/park_and_ride.svg
similarity index 100%
rename from data/styles/style-dark/symbols/park_and_ride.svg
rename to data/styles/legacy/style-dark/symbols/park_and_ride.svg
diff --git a/data/styles/style-dark/symbols/parking-mini.svg b/data/styles/legacy/style-dark/symbols/parking-mini.svg
similarity index 100%
rename from data/styles/style-dark/symbols/parking-mini.svg
rename to data/styles/legacy/style-dark/symbols/parking-mini.svg
diff --git a/data/styles/style-dark/symbols/parking-permissive.svg b/data/styles/legacy/style-dark/symbols/parking-permissive.svg
similarity index 100%
rename from data/styles/style-dark/symbols/parking-permissive.svg
rename to data/styles/legacy/style-dark/symbols/parking-permissive.svg
diff --git a/data/styles/style-dark/symbols/parking-private.svg b/data/styles/legacy/style-dark/symbols/parking-private.svg
similarity index 100%
rename from data/styles/style-dark/symbols/parking-private.svg
rename to data/styles/legacy/style-dark/symbols/parking-private.svg
diff --git a/data/styles/style-dark/symbols/parking.svg b/data/styles/legacy/style-dark/symbols/parking.svg
similarity index 100%
rename from data/styles/style-dark/symbols/parking.svg
rename to data/styles/legacy/style-dark/symbols/parking.svg
diff --git a/data/styles/style-dark/symbols/parking_fee-permissive copy.svg b/data/styles/legacy/style-dark/symbols/parking_fee-permissive copy.svg
similarity index 100%
rename from data/styles/style-dark/symbols/parking_fee-permissive copy.svg
rename to data/styles/legacy/style-dark/symbols/parking_fee-permissive copy.svg
diff --git a/data/styles/style-dark/symbols/parking_fee-permissive.svg b/data/styles/legacy/style-dark/symbols/parking_fee-permissive.svg
similarity index 100%
rename from data/styles/style-dark/symbols/parking_fee-permissive.svg
rename to data/styles/legacy/style-dark/symbols/parking_fee-permissive.svg
diff --git a/data/styles/style-dark/symbols/parking_roof-permissive.svg b/data/styles/legacy/style-dark/symbols/parking_roof-permissive.svg
similarity index 100%
rename from data/styles/style-dark/symbols/parking_roof-permissive.svg
rename to data/styles/legacy/style-dark/symbols/parking_roof-permissive.svg
diff --git a/data/styles/style-dark/symbols/parking_roof.svg b/data/styles/legacy/style-dark/symbols/parking_roof.svg
similarity index 100%
rename from data/styles/style-dark/symbols/parking_roof.svg
rename to data/styles/legacy/style-dark/symbols/parking_roof.svg
diff --git a/data/styles/style-dark/symbols/parking_roof_fee-permissive.svg b/data/styles/legacy/style-dark/symbols/parking_roof_fee-permissive.svg
similarity index 100%
rename from data/styles/style-dark/symbols/parking_roof_fee-permissive.svg
rename to data/styles/legacy/style-dark/symbols/parking_roof_fee-permissive.svg
diff --git a/data/styles/style-dark/symbols/parking_roof_fee.svg b/data/styles/legacy/style-dark/symbols/parking_roof_fee.svg
similarity index 100%
rename from data/styles/style-dark/symbols/parking_roof_fee.svg
rename to data/styles/legacy/style-dark/symbols/parking_roof_fee.svg
diff --git a/data/styles/style-dark/symbols/peak-mini.svg b/data/styles/legacy/style-dark/symbols/peak-mini.svg
similarity index 100%
rename from data/styles/style-dark/symbols/peak-mini.svg
rename to data/styles/legacy/style-dark/symbols/peak-mini.svg
diff --git a/data/styles/style-dark/symbols/peak.svg b/data/styles/legacy/style-dark/symbols/peak.svg
similarity index 100%
rename from data/styles/style-dark/symbols/peak.svg
rename to data/styles/legacy/style-dark/symbols/peak.svg
diff --git a/data/styles/style-dark/symbols/petrolStation.svg b/data/styles/legacy/style-dark/symbols/petrolStation.svg
similarity index 100%
rename from data/styles/style-dark/symbols/petrolStation.svg
rename to data/styles/legacy/style-dark/symbols/petrolStation.svg
diff --git a/data/styles/style-dark/symbols/pharmacy.svg b/data/styles/legacy/style-dark/symbols/pharmacy.svg
similarity index 100%
rename from data/styles/style-dark/symbols/pharmacy.svg
rename to data/styles/legacy/style-dark/symbols/pharmacy.svg
diff --git a/data/styles/style-dark/symbols/picnic.svg b/data/styles/legacy/style-dark/symbols/picnic.svg
similarity index 100%
rename from data/styles/style-dark/symbols/picnic.svg
rename to data/styles/legacy/style-dark/symbols/picnic.svg
diff --git a/data/styles/style-dark/symbols/playground.svg b/data/styles/legacy/style-dark/symbols/playground.svg
similarity index 100%
rename from data/styles/style-dark/symbols/playground.svg
rename to data/styles/legacy/style-dark/symbols/playground.svg
diff --git a/data/styles/style-dark/symbols/police.svg b/data/styles/legacy/style-dark/symbols/police.svg
similarity index 100%
rename from data/styles/style-dark/symbols/police.svg
rename to data/styles/legacy/style-dark/symbols/police.svg
diff --git a/data/styles/style-dark/symbols/postbox.svg b/data/styles/legacy/style-dark/symbols/postbox.svg
similarity index 100%
rename from data/styles/style-dark/symbols/postbox.svg
rename to data/styles/legacy/style-dark/symbols/postbox.svg
diff --git a/data/styles/style-dark/symbols/postoffice.svg b/data/styles/legacy/style-dark/symbols/postoffice.svg
similarity index 100%
rename from data/styles/style-dark/symbols/postoffice.svg
rename to data/styles/legacy/style-dark/symbols/postoffice.svg
diff --git a/data/styles/style-dark/symbols/power-pole.svg b/data/styles/legacy/style-dark/symbols/power-pole.svg
similarity index 100%
rename from data/styles/style-dark/symbols/power-pole.svg
rename to data/styles/legacy/style-dark/symbols/power-pole.svg
diff --git a/data/styles/style-dark/symbols/power-tower.svg b/data/styles/legacy/style-dark/symbols/power-tower.svg
similarity index 100%
rename from data/styles/style-dark/symbols/power-tower.svg
rename to data/styles/legacy/style-dark/symbols/power-tower.svg
diff --git a/data/styles/style-dark/symbols/power_generic.svg b/data/styles/legacy/style-dark/symbols/power_generic.svg
similarity index 100%
rename from data/styles/style-dark/symbols/power_generic.svg
rename to data/styles/legacy/style-dark/symbols/power_generic.svg
diff --git a/data/styles/style-dark/symbols/power_hydro.svg b/data/styles/legacy/style-dark/symbols/power_hydro.svg
similarity index 100%
rename from data/styles/style-dark/symbols/power_hydro.svg
rename to data/styles/legacy/style-dark/symbols/power_hydro.svg
diff --git a/data/styles/style-dark/symbols/power_photovoltaic.svg b/data/styles/legacy/style-dark/symbols/power_photovoltaic.svg
similarity index 100%
rename from data/styles/style-dark/symbols/power_photovoltaic.svg
rename to data/styles/legacy/style-dark/symbols/power_photovoltaic.svg
diff --git a/data/styles/style-dark/symbols/power_wind.svg b/data/styles/legacy/style-dark/symbols/power_wind.svg
similarity index 100%
rename from data/styles/style-dark/symbols/power_wind.svg
rename to data/styles/legacy/style-dark/symbols/power_wind.svg
diff --git a/data/styles/style-dark/symbols/pub.svg b/data/styles/legacy/style-dark/symbols/pub.svg
similarity index 100%
rename from data/styles/style-dark/symbols/pub.svg
rename to data/styles/legacy/style-dark/symbols/pub.svg
diff --git a/data/styles/style-dark/symbols/pubx.svg b/data/styles/legacy/style-dark/symbols/pubx.svg
similarity index 100%
rename from data/styles/style-dark/symbols/pubx.svg
rename to data/styles/legacy/style-dark/symbols/pubx.svg
diff --git a/data/styles/style-dark/symbols/railway-crossing-small.svg b/data/styles/legacy/style-dark/symbols/railway-crossing-small.svg
similarity index 100%
rename from data/styles/style-dark/symbols/railway-crossing-small.svg
rename to data/styles/legacy/style-dark/symbols/railway-crossing-small.svg
diff --git a/data/styles/style-dark/symbols/railway-crossing.svg b/data/styles/legacy/style-dark/symbols/railway-crossing.svg
similarity index 100%
rename from data/styles/style-dark/symbols/railway-crossing.svg
rename to data/styles/legacy/style-dark/symbols/railway-crossing.svg
diff --git a/data/styles/style-dark/symbols/railway-station-mini.svg b/data/styles/legacy/style-dark/symbols/railway-station-mini.svg
similarity index 100%
rename from data/styles/style-dark/symbols/railway-station-mini.svg
rename to data/styles/legacy/style-dark/symbols/railway-station-mini.svg
diff --git a/data/styles/style-dark/symbols/railway-station.svg b/data/styles/legacy/style-dark/symbols/railway-station.svg
similarity index 100%
rename from data/styles/style-dark/symbols/railway-station.svg
rename to data/styles/legacy/style-dark/symbols/railway-station.svg
diff --git a/data/styles/style-dark/symbols/recycling.svg b/data/styles/legacy/style-dark/symbols/recycling.svg
similarity index 100%
rename from data/styles/style-dark/symbols/recycling.svg
rename to data/styles/legacy/style-dark/symbols/recycling.svg
diff --git a/data/styles/style-dark/symbols/religion.svg b/data/styles/legacy/style-dark/symbols/religion.svg
similarity index 100%
rename from data/styles/style-dark/symbols/religion.svg
rename to data/styles/legacy/style-dark/symbols/religion.svg
diff --git a/data/styles/style-dark/symbols/restaurant.svg b/data/styles/legacy/style-dark/symbols/restaurant.svg
similarity index 100%
rename from data/styles/style-dark/symbols/restaurant.svg
rename to data/styles/legacy/style-dark/symbols/restaurant.svg
diff --git a/data/styles/style-dark/symbols/roundabout_left.svg b/data/styles/legacy/style-dark/symbols/roundabout_left.svg
similarity index 100%
rename from data/styles/style-dark/symbols/roundabout_left.svg
rename to data/styles/legacy/style-dark/symbols/roundabout_left.svg
diff --git a/data/styles/style-dark/symbols/roundabout_right.svg b/data/styles/legacy/style-dark/symbols/roundabout_right.svg
similarity index 100%
rename from data/styles/style-dark/symbols/roundabout_right.svg
rename to data/styles/legacy/style-dark/symbols/roundabout_right.svg
diff --git a/data/styles/style-dark/symbols/ruins.svg b/data/styles/legacy/style-dark/symbols/ruins.svg
similarity index 100%
rename from data/styles/style-dark/symbols/ruins.svg
rename to data/styles/legacy/style-dark/symbols/ruins.svg
diff --git a/data/styles/style-dark/symbols/school.svg b/data/styles/legacy/style-dark/symbols/school.svg
similarity index 100%
rename from data/styles/style-dark/symbols/school.svg
rename to data/styles/legacy/style-dark/symbols/school.svg
diff --git a/data/styles/style-dark/symbols/shelter-fireplace.svg b/data/styles/legacy/style-dark/symbols/shelter-fireplace.svg
similarity index 100%
rename from data/styles/style-dark/symbols/shelter-fireplace.svg
rename to data/styles/legacy/style-dark/symbols/shelter-fireplace.svg
diff --git a/data/styles/style-dark/symbols/shelter.svg b/data/styles/legacy/style-dark/symbols/shelter.svg
similarity index 100%
rename from data/styles/style-dark/symbols/shelter.svg
rename to data/styles/legacy/style-dark/symbols/shelter.svg
diff --git a/data/styles/style-dark/symbols/shooting-borderless.svg b/data/styles/legacy/style-dark/symbols/shooting-borderless.svg
similarity index 100%
rename from data/styles/style-dark/symbols/shooting-borderless.svg
rename to data/styles/legacy/style-dark/symbols/shooting-borderless.svg
diff --git a/data/styles/style-dark/symbols/shooting.svg b/data/styles/legacy/style-dark/symbols/shooting.svg
similarity index 100%
rename from data/styles/style-dark/symbols/shooting.svg
rename to data/styles/legacy/style-dark/symbols/shooting.svg
diff --git a/data/styles/style-dark/symbols/slipway.svg b/data/styles/legacy/style-dark/symbols/slipway.svg
similarity index 100%
rename from data/styles/style-dark/symbols/slipway.svg
rename to data/styles/legacy/style-dark/symbols/slipway.svg
diff --git a/data/styles/style-dark/symbols/soccer-borderless.svg b/data/styles/legacy/style-dark/symbols/soccer-borderless.svg
similarity index 100%
rename from data/styles/style-dark/symbols/soccer-borderless.svg
rename to data/styles/legacy/style-dark/symbols/soccer-borderless.svg
diff --git a/data/styles/style-dark/symbols/soccer.svg b/data/styles/legacy/style-dark/symbols/soccer.svg
similarity index 100%
rename from data/styles/style-dark/symbols/soccer.svg
rename to data/styles/legacy/style-dark/symbols/soccer.svg
diff --git a/data/styles/style-dark/symbols/speed_trap.svg b/data/styles/legacy/style-dark/symbols/speed_trap.svg
similarity index 100%
rename from data/styles/style-dark/symbols/speed_trap.svg
rename to data/styles/legacy/style-dark/symbols/speed_trap.svg
diff --git a/data/styles/style-dark/symbols/subway-station-l.svg b/data/styles/legacy/style-dark/symbols/subway-station-l.svg
similarity index 100%
rename from data/styles/style-dark/symbols/subway-station-l.svg
rename to data/styles/legacy/style-dark/symbols/subway-station-l.svg
diff --git a/data/styles/style-dark/symbols/subway-station-m.svg b/data/styles/legacy/style-dark/symbols/subway-station-m.svg
similarity index 100%
rename from data/styles/style-dark/symbols/subway-station-m.svg
rename to data/styles/legacy/style-dark/symbols/subway-station-m.svg
diff --git a/data/styles/style-dark/symbols/subway-station-s.svg b/data/styles/legacy/style-dark/symbols/subway-station-s.svg
similarity index 100%
rename from data/styles/style-dark/symbols/subway-station-s.svg
rename to data/styles/legacy/style-dark/symbols/subway-station-s.svg
diff --git a/data/styles/style-dark/symbols/subway.svg b/data/styles/legacy/style-dark/symbols/subway.svg
similarity index 100%
rename from data/styles/style-dark/symbols/subway.svg
rename to data/styles/legacy/style-dark/symbols/subway.svg
diff --git a/data/styles/style-dark/symbols/supermarket.svg b/data/styles/legacy/style-dark/symbols/supermarket.svg
similarity index 100%
rename from data/styles/style-dark/symbols/supermarket.svg
rename to data/styles/legacy/style-dark/symbols/supermarket.svg
diff --git a/data/styles/style-dark/symbols/survey_point.svg b/data/styles/legacy/style-dark/symbols/survey_point.svg
similarity index 100%
rename from data/styles/style-dark/symbols/survey_point.svg
rename to data/styles/legacy/style-dark/symbols/survey_point.svg
diff --git a/data/styles/style-dark/symbols/swimming-borderless.svg b/data/styles/legacy/style-dark/symbols/swimming-borderless.svg
similarity index 100%
rename from data/styles/style-dark/symbols/swimming-borderless.svg
rename to data/styles/legacy/style-dark/symbols/swimming-borderless.svg
diff --git a/data/styles/style-dark/symbols/swimming.svg b/data/styles/legacy/style-dark/symbols/swimming.svg
similarity index 100%
rename from data/styles/style-dark/symbols/swimming.svg
rename to data/styles/legacy/style-dark/symbols/swimming.svg
diff --git a/data/styles/style-dark/symbols/synagogue.svg b/data/styles/legacy/style-dark/symbols/synagogue.svg
similarity index 100%
rename from data/styles/style-dark/symbols/synagogue.svg
rename to data/styles/legacy/style-dark/symbols/synagogue.svg
diff --git a/data/styles/style-dark/symbols/taxi.svg b/data/styles/legacy/style-dark/symbols/taxi.svg
similarity index 100%
rename from data/styles/style-dark/symbols/taxi.svg
rename to data/styles/legacy/style-dark/symbols/taxi.svg
diff --git a/data/styles/style-dark/symbols/telephone.svg b/data/styles/legacy/style-dark/symbols/telephone.svg
similarity index 100%
rename from data/styles/style-dark/symbols/telephone.svg
rename to data/styles/legacy/style-dark/symbols/telephone.svg
diff --git a/data/styles/style-dark/symbols/tennis-borderless.svg b/data/styles/legacy/style-dark/symbols/tennis-borderless.svg
similarity index 100%
rename from data/styles/style-dark/symbols/tennis-borderless.svg
rename to data/styles/legacy/style-dark/symbols/tennis-borderless.svg
diff --git a/data/styles/style-dark/symbols/tennis.svg b/data/styles/legacy/style-dark/symbols/tennis.svg
similarity index 100%
rename from data/styles/style-dark/symbols/tennis.svg
rename to data/styles/legacy/style-dark/symbols/tennis.svg
diff --git a/data/styles/style-dark/symbols/theatre.svg b/data/styles/legacy/style-dark/symbols/theatre.svg
similarity index 100%
rename from data/styles/style-dark/symbols/theatre.svg
rename to data/styles/legacy/style-dark/symbols/theatre.svg
diff --git a/data/styles/style-dark/symbols/toilets.svg b/data/styles/legacy/style-dark/symbols/toilets.svg
similarity index 100%
rename from data/styles/style-dark/symbols/toilets.svg
rename to data/styles/legacy/style-dark/symbols/toilets.svg
diff --git a/data/styles/style-dark/symbols/traffic_signal.svg b/data/styles/legacy/style-dark/symbols/traffic_signal.svg
similarity index 100%
rename from data/styles/style-dark/symbols/traffic_signal.svg
rename to data/styles/legacy/style-dark/symbols/traffic_signal.svg
diff --git a/data/styles/style-dark/symbols/tramway-mini.svg b/data/styles/legacy/style-dark/symbols/tramway-mini.svg
similarity index 100%
rename from data/styles/style-dark/symbols/tramway-mini.svg
rename to data/styles/legacy/style-dark/symbols/tramway-mini.svg
diff --git a/data/styles/style-dark/symbols/tramway.svg b/data/styles/legacy/style-dark/symbols/tramway.svg
similarity index 100%
rename from data/styles/style-dark/symbols/tramway.svg
rename to data/styles/legacy/style-dark/symbols/tramway.svg
diff --git a/data/styles/style-dark/symbols/tree.svg b/data/styles/legacy/style-dark/symbols/tree.svg
similarity index 100%
rename from data/styles/style-dark/symbols/tree.svg
rename to data/styles/legacy/style-dark/symbols/tree.svg
diff --git a/data/styles/style-dark/symbols/university.svg b/data/styles/legacy/style-dark/symbols/university.svg
similarity index 100%
rename from data/styles/style-dark/symbols/university.svg
rename to data/styles/legacy/style-dark/symbols/university.svg
diff --git a/data/styles/style-dark/symbols/viewpoint.svg b/data/styles/legacy/style-dark/symbols/viewpoint.svg
similarity index 100%
rename from data/styles/style-dark/symbols/viewpoint.svg
rename to data/styles/legacy/style-dark/symbols/viewpoint.svg
diff --git a/data/styles/style-dark/symbols/vulcan.svg b/data/styles/legacy/style-dark/symbols/vulcan.svg
similarity index 100%
rename from data/styles/style-dark/symbols/vulcan.svg
rename to data/styles/legacy/style-dark/symbols/vulcan.svg
diff --git a/data/styles/style-dark/symbols/wastewater.svg b/data/styles/legacy/style-dark/symbols/wastewater.svg
similarity index 100%
rename from data/styles/style-dark/symbols/wastewater.svg
rename to data/styles/legacy/style-dark/symbols/wastewater.svg
diff --git a/data/styles/style-dark/symbols/waterfall.svg b/data/styles/legacy/style-dark/symbols/waterfall.svg
similarity index 100%
rename from data/styles/style-dark/symbols/waterfall.svg
rename to data/styles/legacy/style-dark/symbols/waterfall.svg
diff --git a/data/styles/style-dark/symbols/windmill.svg b/data/styles/legacy/style-dark/symbols/windmill.svg
similarity index 100%
rename from data/styles/style-dark/symbols/windmill.svg
rename to data/styles/legacy/style-dark/symbols/windmill.svg
diff --git a/data/styles/style-dark/watch/api-result.png b/data/styles/legacy/style-dark/watch/api-result.png
similarity index 100%
rename from data/styles/style-dark/watch/api-result.png
rename to data/styles/legacy/style-dark/watch/api-result.png
diff --git a/data/styles/style-dark/watch/arrow-direction.png b/data/styles/legacy/style-dark/watch/arrow-direction.png
similarity index 100%
rename from data/styles/style-dark/watch/arrow-direction.png
rename to data/styles/legacy/style-dark/watch/arrow-direction.png
diff --git a/data/styles/style-dark/watch/compass-image.png b/data/styles/legacy/style-dark/watch/compass-image.png
similarity index 100%
rename from data/styles/style-dark/watch/compass-image.png
rename to data/styles/legacy/style-dark/watch/compass-image.png
diff --git a/data/styles/style-dark/watch/current-position-compas.png b/data/styles/legacy/style-dark/watch/current-position-compas.png
similarity index 100%
rename from data/styles/style-dark/watch/current-position-compas.png
rename to data/styles/legacy/style-dark/watch/current-position-compas.png
diff --git a/data/styles/style-dark/watch/current-position.png b/data/styles/legacy/style-dark/watch/current-position.png
similarity index 100%
rename from data/styles/style-dark/watch/current-position.png
rename to data/styles/legacy/style-dark/watch/current-position.png
diff --git a/data/styles/style-dark/watch/current-routing-compas.png b/data/styles/legacy/style-dark/watch/current-routing-compas.png
similarity index 100%
rename from data/styles/style-dark/watch/current-routing-compas.png
rename to data/styles/legacy/style-dark/watch/current-routing-compas.png
diff --git a/data/styles/style-dark/watch/placemark-blue.png b/data/styles/legacy/style-dark/watch/placemark-blue.png
similarity index 100%
rename from data/styles/style-dark/watch/placemark-blue.png
rename to data/styles/legacy/style-dark/watch/placemark-blue.png
diff --git a/data/styles/style-dark/watch/placemark-brown.png b/data/styles/legacy/style-dark/watch/placemark-brown.png
similarity index 100%
rename from data/styles/style-dark/watch/placemark-brown.png
rename to data/styles/legacy/style-dark/watch/placemark-brown.png
diff --git a/data/styles/style-dark/watch/placemark-green.png b/data/styles/legacy/style-dark/watch/placemark-green.png
similarity index 100%
rename from data/styles/style-dark/watch/placemark-green.png
rename to data/styles/legacy/style-dark/watch/placemark-green.png
diff --git a/data/styles/style-dark/watch/placemark-orange.png b/data/styles/legacy/style-dark/watch/placemark-orange.png
similarity index 100%
rename from data/styles/style-dark/watch/placemark-orange.png
rename to data/styles/legacy/style-dark/watch/placemark-orange.png
diff --git a/data/styles/style-dark/watch/placemark-pink.png b/data/styles/legacy/style-dark/watch/placemark-pink.png
similarity index 100%
rename from data/styles/style-dark/watch/placemark-pink.png
rename to data/styles/legacy/style-dark/watch/placemark-pink.png
diff --git a/data/styles/style-dark/watch/placemark-purple.png b/data/styles/legacy/style-dark/watch/placemark-purple.png
similarity index 100%
rename from data/styles/style-dark/watch/placemark-purple.png
rename to data/styles/legacy/style-dark/watch/placemark-purple.png
diff --git a/data/styles/style-dark/watch/placemark-red.png b/data/styles/legacy/style-dark/watch/placemark-red.png
similarity index 100%
rename from data/styles/style-dark/watch/placemark-red.png
rename to data/styles/legacy/style-dark/watch/placemark-red.png
diff --git a/data/styles/style-dark/watch/placemark-yellow.png b/data/styles/legacy/style-dark/watch/placemark-yellow.png
similarity index 100%
rename from data/styles/style-dark/watch/placemark-yellow.png
rename to data/styles/legacy/style-dark/watch/placemark-yellow.png
diff --git a/data/styles/style-dark/watch/route_from.png b/data/styles/legacy/style-dark/watch/route_from.png
similarity index 100%
rename from data/styles/style-dark/watch/route_from.png
rename to data/styles/legacy/style-dark/watch/route_from.png
diff --git a/data/styles/style-dark/watch/route_to.png b/data/styles/legacy/style-dark/watch/route_to.png
similarity index 100%
rename from data/styles/style-dark/watch/route_to.png
rename to data/styles/legacy/style-dark/watch/route_to.png
diff --git a/data/styles/style-dark/watch/search-result-active.png b/data/styles/legacy/style-dark/watch/search-result-active.png
similarity index 100%
rename from data/styles/style-dark/watch/search-result-active.png
rename to data/styles/legacy/style-dark/watch/search-result-active.png
diff --git a/data/styles/style-dark/watch/search-result.png b/data/styles/legacy/style-dark/watch/search-result.png
similarity index 100%
rename from data/styles/style-dark/watch/search-result.png
rename to data/styles/legacy/style-dark/watch/search-result.png
diff --git a/data/styles/style-dark/xhdpi/api-result.png b/data/styles/legacy/style-dark/xhdpi/api-result.png
similarity index 100%
rename from data/styles/style-dark/xhdpi/api-result.png
rename to data/styles/legacy/style-dark/xhdpi/api-result.png
diff --git a/data/styles/style-dark/xhdpi/compass-image.png b/data/styles/legacy/style-dark/xhdpi/compass-image.png
similarity index 100%
rename from data/styles/style-dark/xhdpi/compass-image.png
rename to data/styles/legacy/style-dark/xhdpi/compass-image.png
diff --git a/data/styles/style-dark/xhdpi/current-position-compas.png b/data/styles/legacy/style-dark/xhdpi/current-position-compas.png
similarity index 100%
rename from data/styles/style-dark/xhdpi/current-position-compas.png
rename to data/styles/legacy/style-dark/xhdpi/current-position-compas.png
diff --git a/data/styles/style-dark/xhdpi/current-position.png b/data/styles/legacy/style-dark/xhdpi/current-position.png
similarity index 100%
rename from data/styles/style-dark/xhdpi/current-position.png
rename to data/styles/legacy/style-dark/xhdpi/current-position.png
diff --git a/data/styles/style-dark/xhdpi/current-routing-compas.png b/data/styles/legacy/style-dark/xhdpi/current-routing-compas.png
similarity index 100%
rename from data/styles/style-dark/xhdpi/current-routing-compas.png
rename to data/styles/legacy/style-dark/xhdpi/current-routing-compas.png
diff --git a/data/styles/style-dark/xhdpi/placemark-blue.png b/data/styles/legacy/style-dark/xhdpi/placemark-blue.png
similarity index 100%
rename from data/styles/style-dark/xhdpi/placemark-blue.png
rename to data/styles/legacy/style-dark/xhdpi/placemark-blue.png
diff --git a/data/styles/style-dark/xhdpi/placemark-brown.png b/data/styles/legacy/style-dark/xhdpi/placemark-brown.png
similarity index 100%
rename from data/styles/style-dark/xhdpi/placemark-brown.png
rename to data/styles/legacy/style-dark/xhdpi/placemark-brown.png
diff --git a/data/styles/style-dark/xhdpi/placemark-green.png b/data/styles/legacy/style-dark/xhdpi/placemark-green.png
similarity index 100%
rename from data/styles/style-dark/xhdpi/placemark-green.png
rename to data/styles/legacy/style-dark/xhdpi/placemark-green.png
diff --git a/data/styles/style-dark/xhdpi/placemark-orange.png b/data/styles/legacy/style-dark/xhdpi/placemark-orange.png
similarity index 100%
rename from data/styles/style-dark/xhdpi/placemark-orange.png
rename to data/styles/legacy/style-dark/xhdpi/placemark-orange.png
diff --git a/data/styles/style-dark/xhdpi/placemark-pink.png b/data/styles/legacy/style-dark/xhdpi/placemark-pink.png
similarity index 100%
rename from data/styles/style-dark/xhdpi/placemark-pink.png
rename to data/styles/legacy/style-dark/xhdpi/placemark-pink.png
diff --git a/data/styles/style-dark/xhdpi/placemark-purple.png b/data/styles/legacy/style-dark/xhdpi/placemark-purple.png
similarity index 100%
rename from data/styles/style-dark/xhdpi/placemark-purple.png
rename to data/styles/legacy/style-dark/xhdpi/placemark-purple.png
diff --git a/data/styles/style-dark/xhdpi/placemark-red.png b/data/styles/legacy/style-dark/xhdpi/placemark-red.png
similarity index 100%
rename from data/styles/style-dark/xhdpi/placemark-red.png
rename to data/styles/legacy/style-dark/xhdpi/placemark-red.png
diff --git a/data/styles/style-dark/xhdpi/placemark-yellow.png b/data/styles/legacy/style-dark/xhdpi/placemark-yellow.png
similarity index 100%
rename from data/styles/style-dark/xhdpi/placemark-yellow.png
rename to data/styles/legacy/style-dark/xhdpi/placemark-yellow.png
diff --git a/data/styles/style-light/xhdpi/route-arrow.png b/data/styles/legacy/style-dark/xhdpi/route-arrow.png
similarity index 100%
rename from data/styles/style-light/xhdpi/route-arrow.png
rename to data/styles/legacy/style-dark/xhdpi/route-arrow.png
diff --git a/data/styles/style-dark/xhdpi/route_from.png b/data/styles/legacy/style-dark/xhdpi/route_from.png
similarity index 100%
rename from data/styles/style-dark/xhdpi/route_from.png
rename to data/styles/legacy/style-dark/xhdpi/route_from.png
diff --git a/data/styles/style-dark/xhdpi/route_to.png b/data/styles/legacy/style-dark/xhdpi/route_to.png
similarity index 100%
rename from data/styles/style-dark/xhdpi/route_to.png
rename to data/styles/legacy/style-dark/xhdpi/route_to.png
diff --git a/data/styles/style-dark/xhdpi/search-result-active.png b/data/styles/legacy/style-dark/xhdpi/search-result-active.png
similarity index 100%
rename from data/styles/style-dark/xhdpi/search-result-active.png
rename to data/styles/legacy/style-dark/xhdpi/search-result-active.png
diff --git a/data/styles/style-dark/xhdpi/search-result.png b/data/styles/legacy/style-dark/xhdpi/search-result.png
similarity index 100%
rename from data/styles/style-dark/xhdpi/search-result.png
rename to data/styles/legacy/style-dark/xhdpi/search-result.png
diff --git a/data/styles/style-dark/xhdpi/watch-my-direction.png b/data/styles/legacy/style-dark/xhdpi/watch-my-direction.png
similarity index 100%
rename from data/styles/style-dark/xhdpi/watch-my-direction.png
rename to data/styles/legacy/style-dark/xhdpi/watch-my-direction.png
diff --git a/data/styles/style-dark/xhdpi/watch-my-position.png b/data/styles/legacy/style-dark/xhdpi/watch-my-position.png
similarity index 100%
rename from data/styles/style-dark/xhdpi/watch-my-position.png
rename to data/styles/legacy/style-dark/xhdpi/watch-my-position.png
diff --git a/data/styles/style-dark/xhdpi/watch-search-result.png b/data/styles/legacy/style-dark/xhdpi/watch-search-result.png
similarity index 100%
rename from data/styles/style-dark/xhdpi/watch-search-result.png
rename to data/styles/legacy/style-dark/xhdpi/watch-search-result.png
diff --git a/data/styles/style-dark/xxhdpi/api-result.png b/data/styles/legacy/style-dark/xxhdpi/api-result.png
similarity index 100%
rename from data/styles/style-dark/xxhdpi/api-result.png
rename to data/styles/legacy/style-dark/xxhdpi/api-result.png
diff --git a/data/styles/style-dark/xxhdpi/compass-image.png b/data/styles/legacy/style-dark/xxhdpi/compass-image.png
similarity index 100%
rename from data/styles/style-dark/xxhdpi/compass-image.png
rename to data/styles/legacy/style-dark/xxhdpi/compass-image.png
diff --git a/data/styles/style-dark/xxhdpi/current-position-compas.png b/data/styles/legacy/style-dark/xxhdpi/current-position-compas.png
similarity index 100%
rename from data/styles/style-dark/xxhdpi/current-position-compas.png
rename to data/styles/legacy/style-dark/xxhdpi/current-position-compas.png
diff --git a/data/styles/style-dark/xxhdpi/current-position.png b/data/styles/legacy/style-dark/xxhdpi/current-position.png
similarity index 100%
rename from data/styles/style-dark/xxhdpi/current-position.png
rename to data/styles/legacy/style-dark/xxhdpi/current-position.png
diff --git a/data/styles/style-dark/xxhdpi/current-routing-compas.png b/data/styles/legacy/style-dark/xxhdpi/current-routing-compas.png
similarity index 100%
rename from data/styles/style-dark/xxhdpi/current-routing-compas.png
rename to data/styles/legacy/style-dark/xxhdpi/current-routing-compas.png
diff --git a/data/styles/style-dark/xxhdpi/placemark-blue.png b/data/styles/legacy/style-dark/xxhdpi/placemark-blue.png
similarity index 100%
rename from data/styles/style-dark/xxhdpi/placemark-blue.png
rename to data/styles/legacy/style-dark/xxhdpi/placemark-blue.png
diff --git a/data/styles/style-dark/xxhdpi/placemark-brown.png b/data/styles/legacy/style-dark/xxhdpi/placemark-brown.png
similarity index 100%
rename from data/styles/style-dark/xxhdpi/placemark-brown.png
rename to data/styles/legacy/style-dark/xxhdpi/placemark-brown.png
diff --git a/data/styles/style-dark/xxhdpi/placemark-green.png b/data/styles/legacy/style-dark/xxhdpi/placemark-green.png
similarity index 100%
rename from data/styles/style-dark/xxhdpi/placemark-green.png
rename to data/styles/legacy/style-dark/xxhdpi/placemark-green.png
diff --git a/data/styles/style-dark/xxhdpi/placemark-orange.png b/data/styles/legacy/style-dark/xxhdpi/placemark-orange.png
similarity index 100%
rename from data/styles/style-dark/xxhdpi/placemark-orange.png
rename to data/styles/legacy/style-dark/xxhdpi/placemark-orange.png
diff --git a/data/styles/style-dark/xxhdpi/placemark-pink.png b/data/styles/legacy/style-dark/xxhdpi/placemark-pink.png
similarity index 100%
rename from data/styles/style-dark/xxhdpi/placemark-pink.png
rename to data/styles/legacy/style-dark/xxhdpi/placemark-pink.png
diff --git a/data/styles/style-dark/xxhdpi/placemark-purple.png b/data/styles/legacy/style-dark/xxhdpi/placemark-purple.png
similarity index 100%
rename from data/styles/style-dark/xxhdpi/placemark-purple.png
rename to data/styles/legacy/style-dark/xxhdpi/placemark-purple.png
diff --git a/data/styles/style-dark/xxhdpi/placemark-red.png b/data/styles/legacy/style-dark/xxhdpi/placemark-red.png
similarity index 100%
rename from data/styles/style-dark/xxhdpi/placemark-red.png
rename to data/styles/legacy/style-dark/xxhdpi/placemark-red.png
diff --git a/data/styles/style-dark/xxhdpi/placemark-yellow.png b/data/styles/legacy/style-dark/xxhdpi/placemark-yellow.png
similarity index 100%
rename from data/styles/style-dark/xxhdpi/placemark-yellow.png
rename to data/styles/legacy/style-dark/xxhdpi/placemark-yellow.png
diff --git a/data/styles/style-light/xxhdpi/route-arrow.png b/data/styles/legacy/style-dark/xxhdpi/route-arrow.png
similarity index 100%
rename from data/styles/style-light/xxhdpi/route-arrow.png
rename to data/styles/legacy/style-dark/xxhdpi/route-arrow.png
diff --git a/data/styles/style-dark/xxhdpi/route_from.png b/data/styles/legacy/style-dark/xxhdpi/route_from.png
similarity index 100%
rename from data/styles/style-dark/xxhdpi/route_from.png
rename to data/styles/legacy/style-dark/xxhdpi/route_from.png
diff --git a/data/styles/style-dark/xxhdpi/route_to.png b/data/styles/legacy/style-dark/xxhdpi/route_to.png
similarity index 100%
rename from data/styles/style-dark/xxhdpi/route_to.png
rename to data/styles/legacy/style-dark/xxhdpi/route_to.png
diff --git a/data/styles/style-dark/xxhdpi/search-result-active.png b/data/styles/legacy/style-dark/xxhdpi/search-result-active.png
similarity index 100%
rename from data/styles/style-dark/xxhdpi/search-result-active.png
rename to data/styles/legacy/style-dark/xxhdpi/search-result-active.png
diff --git a/data/styles/style-dark/xxhdpi/search-result.png b/data/styles/legacy/style-dark/xxhdpi/search-result.png
similarity index 100%
rename from data/styles/style-dark/xxhdpi/search-result.png
rename to data/styles/legacy/style-dark/xxhdpi/search-result.png
diff --git a/data/styles/style-dark/xxhdpi/watch-my-direction.png b/data/styles/legacy/style-dark/xxhdpi/watch-my-direction.png
similarity index 100%
rename from data/styles/style-dark/xxhdpi/watch-my-direction.png
rename to data/styles/legacy/style-dark/xxhdpi/watch-my-direction.png
diff --git a/data/styles/style-dark/xxhdpi/watch-my-position.png b/data/styles/legacy/style-dark/xxhdpi/watch-my-position.png
similarity index 100%
rename from data/styles/style-dark/xxhdpi/watch-my-position.png
rename to data/styles/legacy/style-dark/xxhdpi/watch-my-position.png
diff --git a/data/styles/style-dark/xxhdpi/watch-search-result.png b/data/styles/legacy/style-dark/xxhdpi/watch-search-result.png
similarity index 100%
rename from data/styles/style-dark/xxhdpi/watch-search-result.png
rename to data/styles/legacy/style-dark/xxhdpi/watch-search-result.png
diff --git a/data/styles/style-light/6plus/api-result.png b/data/styles/legacy/style-light/6plus/api-result.png
similarity index 100%
rename from data/styles/style-light/6plus/api-result.png
rename to data/styles/legacy/style-light/6plus/api-result.png
diff --git a/data/styles/style-light/6plus/compass-image.png b/data/styles/legacy/style-light/6plus/compass-image.png
similarity index 100%
rename from data/styles/style-light/6plus/compass-image.png
rename to data/styles/legacy/style-light/6plus/compass-image.png
diff --git a/data/styles/style-light/6plus/current-position-compas.png b/data/styles/legacy/style-light/6plus/current-position-compas.png
similarity index 100%
rename from data/styles/style-light/6plus/current-position-compas.png
rename to data/styles/legacy/style-light/6plus/current-position-compas.png
diff --git a/data/styles/style-light/6plus/current-position.png b/data/styles/legacy/style-light/6plus/current-position.png
similarity index 100%
rename from data/styles/style-light/6plus/current-position.png
rename to data/styles/legacy/style-light/6plus/current-position.png
diff --git a/data/styles/style-light/6plus/current-routing-compas.png b/data/styles/legacy/style-light/6plus/current-routing-compas.png
similarity index 100%
rename from data/styles/style-light/6plus/current-routing-compas.png
rename to data/styles/legacy/style-light/6plus/current-routing-compas.png
diff --git a/data/styles/style-light/6plus/placemark-blue.png b/data/styles/legacy/style-light/6plus/placemark-blue.png
similarity index 100%
rename from data/styles/style-light/6plus/placemark-blue.png
rename to data/styles/legacy/style-light/6plus/placemark-blue.png
diff --git a/data/styles/style-light/6plus/placemark-brown.png b/data/styles/legacy/style-light/6plus/placemark-brown.png
similarity index 100%
rename from data/styles/style-light/6plus/placemark-brown.png
rename to data/styles/legacy/style-light/6plus/placemark-brown.png
diff --git a/data/styles/style-light/6plus/placemark-green.png b/data/styles/legacy/style-light/6plus/placemark-green.png
similarity index 100%
rename from data/styles/style-light/6plus/placemark-green.png
rename to data/styles/legacy/style-light/6plus/placemark-green.png
diff --git a/data/styles/style-light/6plus/placemark-orange.png b/data/styles/legacy/style-light/6plus/placemark-orange.png
similarity index 100%
rename from data/styles/style-light/6plus/placemark-orange.png
rename to data/styles/legacy/style-light/6plus/placemark-orange.png
diff --git a/data/styles/style-light/6plus/placemark-pink.png b/data/styles/legacy/style-light/6plus/placemark-pink.png
similarity index 100%
rename from data/styles/style-light/6plus/placemark-pink.png
rename to data/styles/legacy/style-light/6plus/placemark-pink.png
diff --git a/data/styles/style-light/6plus/placemark-purple.png b/data/styles/legacy/style-light/6plus/placemark-purple.png
similarity index 100%
rename from data/styles/style-light/6plus/placemark-purple.png
rename to data/styles/legacy/style-light/6plus/placemark-purple.png
diff --git a/data/styles/style-light/6plus/placemark-red.png b/data/styles/legacy/style-light/6plus/placemark-red.png
similarity index 100%
rename from data/styles/style-light/6plus/placemark-red.png
rename to data/styles/legacy/style-light/6plus/placemark-red.png
diff --git a/data/styles/style-light/6plus/placemark-yellow.png b/data/styles/legacy/style-light/6plus/placemark-yellow.png
similarity index 100%
rename from data/styles/style-light/6plus/placemark-yellow.png
rename to data/styles/legacy/style-light/6plus/placemark-yellow.png
diff --git a/data/styles/legacy/style-light/6plus/route-arrow.png b/data/styles/legacy/style-light/6plus/route-arrow.png
new file mode 100644
index 0000000000..59e4a8e7bd
Binary files /dev/null and b/data/styles/legacy/style-light/6plus/route-arrow.png differ
diff --git a/data/styles/style-light/6plus/route_from.png b/data/styles/legacy/style-light/6plus/route_from.png
similarity index 100%
rename from data/styles/style-light/6plus/route_from.png
rename to data/styles/legacy/style-light/6plus/route_from.png
diff --git a/data/styles/style-light/6plus/route_to.png b/data/styles/legacy/style-light/6plus/route_to.png
similarity index 100%
rename from data/styles/style-light/6plus/route_to.png
rename to data/styles/legacy/style-light/6plus/route_to.png
diff --git a/data/styles/style-light/6plus/search-result-active.png b/data/styles/legacy/style-light/6plus/search-result-active.png
similarity index 100%
rename from data/styles/style-light/6plus/search-result-active.png
rename to data/styles/legacy/style-light/6plus/search-result-active.png
diff --git a/data/styles/style-light/6plus/search-result.png b/data/styles/legacy/style-light/6plus/search-result.png
similarity index 100%
rename from data/styles/style-light/6plus/search-result.png
rename to data/styles/legacy/style-light/6plus/search-result.png
diff --git a/data/styles/style-light/colors_light.mapcss b/data/styles/legacy/style-light/colors_light.mapcss
similarity index 100%
rename from data/styles/style-light/colors_light.mapcss
rename to data/styles/legacy/style-light/colors_light.mapcss
diff --git a/data/styles/style-light/hdpi/api-result.png b/data/styles/legacy/style-light/hdpi/api-result.png
similarity index 100%
rename from data/styles/style-light/hdpi/api-result.png
rename to data/styles/legacy/style-light/hdpi/api-result.png
diff --git a/data/styles/style-light/hdpi/compass-image.png b/data/styles/legacy/style-light/hdpi/compass-image.png
similarity index 100%
rename from data/styles/style-light/hdpi/compass-image.png
rename to data/styles/legacy/style-light/hdpi/compass-image.png
diff --git a/data/styles/style-light/hdpi/current-position-compas.png b/data/styles/legacy/style-light/hdpi/current-position-compas.png
similarity index 100%
rename from data/styles/style-light/hdpi/current-position-compas.png
rename to data/styles/legacy/style-light/hdpi/current-position-compas.png
diff --git a/data/styles/style-light/hdpi/current-position.png b/data/styles/legacy/style-light/hdpi/current-position.png
similarity index 100%
rename from data/styles/style-light/hdpi/current-position.png
rename to data/styles/legacy/style-light/hdpi/current-position.png
diff --git a/data/styles/style-light/hdpi/current-routing-compas.png b/data/styles/legacy/style-light/hdpi/current-routing-compas.png
similarity index 100%
rename from data/styles/style-light/hdpi/current-routing-compas.png
rename to data/styles/legacy/style-light/hdpi/current-routing-compas.png
diff --git a/data/styles/style-light/hdpi/placemark-blue.png b/data/styles/legacy/style-light/hdpi/placemark-blue.png
similarity index 100%
rename from data/styles/style-light/hdpi/placemark-blue.png
rename to data/styles/legacy/style-light/hdpi/placemark-blue.png
diff --git a/data/styles/style-light/hdpi/placemark-brown.png b/data/styles/legacy/style-light/hdpi/placemark-brown.png
similarity index 100%
rename from data/styles/style-light/hdpi/placemark-brown.png
rename to data/styles/legacy/style-light/hdpi/placemark-brown.png
diff --git a/data/styles/style-light/hdpi/placemark-green.png b/data/styles/legacy/style-light/hdpi/placemark-green.png
similarity index 100%
rename from data/styles/style-light/hdpi/placemark-green.png
rename to data/styles/legacy/style-light/hdpi/placemark-green.png
diff --git a/data/styles/style-light/hdpi/placemark-orange.png b/data/styles/legacy/style-light/hdpi/placemark-orange.png
similarity index 100%
rename from data/styles/style-light/hdpi/placemark-orange.png
rename to data/styles/legacy/style-light/hdpi/placemark-orange.png
diff --git a/data/styles/style-light/hdpi/placemark-pink.png b/data/styles/legacy/style-light/hdpi/placemark-pink.png
similarity index 100%
rename from data/styles/style-light/hdpi/placemark-pink.png
rename to data/styles/legacy/style-light/hdpi/placemark-pink.png
diff --git a/data/styles/style-light/hdpi/placemark-purple.png b/data/styles/legacy/style-light/hdpi/placemark-purple.png
similarity index 100%
rename from data/styles/style-light/hdpi/placemark-purple.png
rename to data/styles/legacy/style-light/hdpi/placemark-purple.png
diff --git a/data/styles/style-light/hdpi/placemark-red.png b/data/styles/legacy/style-light/hdpi/placemark-red.png
similarity index 100%
rename from data/styles/style-light/hdpi/placemark-red.png
rename to data/styles/legacy/style-light/hdpi/placemark-red.png
diff --git a/data/styles/style-light/hdpi/placemark-yellow.png b/data/styles/legacy/style-light/hdpi/placemark-yellow.png
similarity index 100%
rename from data/styles/style-light/hdpi/placemark-yellow.png
rename to data/styles/legacy/style-light/hdpi/placemark-yellow.png
diff --git a/data/styles/legacy/style-light/hdpi/route-arrow.png b/data/styles/legacy/style-light/hdpi/route-arrow.png
new file mode 100644
index 0000000000..1961f84d94
Binary files /dev/null and b/data/styles/legacy/style-light/hdpi/route-arrow.png differ
diff --git a/data/styles/style-light/hdpi/route_from.png b/data/styles/legacy/style-light/hdpi/route_from.png
similarity index 100%
rename from data/styles/style-light/hdpi/route_from.png
rename to data/styles/legacy/style-light/hdpi/route_from.png
diff --git a/data/styles/style-light/hdpi/route_to.png b/data/styles/legacy/style-light/hdpi/route_to.png
similarity index 100%
rename from data/styles/style-light/hdpi/route_to.png
rename to data/styles/legacy/style-light/hdpi/route_to.png
diff --git a/data/styles/style-light/hdpi/search-result-active.png b/data/styles/legacy/style-light/hdpi/search-result-active.png
similarity index 100%
rename from data/styles/style-light/hdpi/search-result-active.png
rename to data/styles/legacy/style-light/hdpi/search-result-active.png
diff --git a/data/styles/style-light/hdpi/search-result.png b/data/styles/legacy/style-light/hdpi/search-result.png
similarity index 100%
rename from data/styles/style-light/hdpi/search-result.png
rename to data/styles/legacy/style-light/hdpi/search-result.png
diff --git a/data/styles/style-light/ldpi/api-result.png b/data/styles/legacy/style-light/ldpi/api-result.png
similarity index 100%
rename from data/styles/style-light/ldpi/api-result.png
rename to data/styles/legacy/style-light/ldpi/api-result.png
diff --git a/data/styles/style-light/ldpi/compass-image.png b/data/styles/legacy/style-light/ldpi/compass-image.png
similarity index 100%
rename from data/styles/style-light/ldpi/compass-image.png
rename to data/styles/legacy/style-light/ldpi/compass-image.png
diff --git a/data/styles/style-light/ldpi/current-position-compas.png b/data/styles/legacy/style-light/ldpi/current-position-compas.png
similarity index 100%
rename from data/styles/style-light/ldpi/current-position-compas.png
rename to data/styles/legacy/style-light/ldpi/current-position-compas.png
diff --git a/data/styles/style-light/ldpi/current-position.png b/data/styles/legacy/style-light/ldpi/current-position.png
similarity index 100%
rename from data/styles/style-light/ldpi/current-position.png
rename to data/styles/legacy/style-light/ldpi/current-position.png
diff --git a/data/styles/style-light/ldpi/current-routing-compas.png b/data/styles/legacy/style-light/ldpi/current-routing-compas.png
similarity index 100%
rename from data/styles/style-light/ldpi/current-routing-compas.png
rename to data/styles/legacy/style-light/ldpi/current-routing-compas.png
diff --git a/data/styles/style-light/ldpi/placemark-blue.png b/data/styles/legacy/style-light/ldpi/placemark-blue.png
similarity index 100%
rename from data/styles/style-light/ldpi/placemark-blue.png
rename to data/styles/legacy/style-light/ldpi/placemark-blue.png
diff --git a/data/styles/style-light/ldpi/placemark-brown.png b/data/styles/legacy/style-light/ldpi/placemark-brown.png
similarity index 100%
rename from data/styles/style-light/ldpi/placemark-brown.png
rename to data/styles/legacy/style-light/ldpi/placemark-brown.png
diff --git a/data/styles/style-light/ldpi/placemark-green.png b/data/styles/legacy/style-light/ldpi/placemark-green.png
similarity index 100%
rename from data/styles/style-light/ldpi/placemark-green.png
rename to data/styles/legacy/style-light/ldpi/placemark-green.png
diff --git a/data/styles/style-light/ldpi/placemark-orange.png b/data/styles/legacy/style-light/ldpi/placemark-orange.png
similarity index 100%
rename from data/styles/style-light/ldpi/placemark-orange.png
rename to data/styles/legacy/style-light/ldpi/placemark-orange.png
diff --git a/data/styles/style-light/ldpi/placemark-pink.png b/data/styles/legacy/style-light/ldpi/placemark-pink.png
similarity index 100%
rename from data/styles/style-light/ldpi/placemark-pink.png
rename to data/styles/legacy/style-light/ldpi/placemark-pink.png
diff --git a/data/styles/style-light/ldpi/placemark-purple.png b/data/styles/legacy/style-light/ldpi/placemark-purple.png
similarity index 100%
rename from data/styles/style-light/ldpi/placemark-purple.png
rename to data/styles/legacy/style-light/ldpi/placemark-purple.png
diff --git a/data/styles/style-light/ldpi/placemark-red.png b/data/styles/legacy/style-light/ldpi/placemark-red.png
similarity index 100%
rename from data/styles/style-light/ldpi/placemark-red.png
rename to data/styles/legacy/style-light/ldpi/placemark-red.png
diff --git a/data/styles/style-light/ldpi/placemark-yellow.png b/data/styles/legacy/style-light/ldpi/placemark-yellow.png
similarity index 100%
rename from data/styles/style-light/ldpi/placemark-yellow.png
rename to data/styles/legacy/style-light/ldpi/placemark-yellow.png
diff --git a/data/styles/legacy/style-light/ldpi/route-arrow.png b/data/styles/legacy/style-light/ldpi/route-arrow.png
new file mode 100644
index 0000000000..0bd2f6990a
Binary files /dev/null and b/data/styles/legacy/style-light/ldpi/route-arrow.png differ
diff --git a/data/styles/style-light/ldpi/route_from.png b/data/styles/legacy/style-light/ldpi/route_from.png
similarity index 100%
rename from data/styles/style-light/ldpi/route_from.png
rename to data/styles/legacy/style-light/ldpi/route_from.png
diff --git a/data/styles/style-light/ldpi/route_to.png b/data/styles/legacy/style-light/ldpi/route_to.png
similarity index 100%
rename from data/styles/style-light/ldpi/route_to.png
rename to data/styles/legacy/style-light/ldpi/route_to.png
diff --git a/data/styles/style-light/ldpi/search-result-active.png b/data/styles/legacy/style-light/ldpi/search-result-active.png
similarity index 100%
rename from data/styles/style-light/ldpi/search-result-active.png
rename to data/styles/legacy/style-light/ldpi/search-result-active.png
diff --git a/data/styles/style-light/ldpi/search-result.png b/data/styles/legacy/style-light/ldpi/search-result.png
similarity index 100%
rename from data/styles/style-light/ldpi/search-result.png
rename to data/styles/legacy/style-light/ldpi/search-result.png
diff --git a/data/styles/style-light/mdpi/api-result.png b/data/styles/legacy/style-light/mdpi/api-result.png
similarity index 100%
rename from data/styles/style-light/mdpi/api-result.png
rename to data/styles/legacy/style-light/mdpi/api-result.png
diff --git a/data/styles/style-light/mdpi/compass-image.png b/data/styles/legacy/style-light/mdpi/compass-image.png
similarity index 100%
rename from data/styles/style-light/mdpi/compass-image.png
rename to data/styles/legacy/style-light/mdpi/compass-image.png
diff --git a/data/styles/style-light/mdpi/current-position-compas.png b/data/styles/legacy/style-light/mdpi/current-position-compas.png
similarity index 100%
rename from data/styles/style-light/mdpi/current-position-compas.png
rename to data/styles/legacy/style-light/mdpi/current-position-compas.png
diff --git a/data/styles/style-light/mdpi/current-position.png b/data/styles/legacy/style-light/mdpi/current-position.png
similarity index 100%
rename from data/styles/style-light/mdpi/current-position.png
rename to data/styles/legacy/style-light/mdpi/current-position.png
diff --git a/data/styles/style-light/mdpi/current-routing-compas.png b/data/styles/legacy/style-light/mdpi/current-routing-compas.png
similarity index 100%
rename from data/styles/style-light/mdpi/current-routing-compas.png
rename to data/styles/legacy/style-light/mdpi/current-routing-compas.png
diff --git a/data/styles/style-light/mdpi/placemark-blue.png b/data/styles/legacy/style-light/mdpi/placemark-blue.png
similarity index 100%
rename from data/styles/style-light/mdpi/placemark-blue.png
rename to data/styles/legacy/style-light/mdpi/placemark-blue.png
diff --git a/data/styles/style-light/mdpi/placemark-brown.png b/data/styles/legacy/style-light/mdpi/placemark-brown.png
similarity index 100%
rename from data/styles/style-light/mdpi/placemark-brown.png
rename to data/styles/legacy/style-light/mdpi/placemark-brown.png
diff --git a/data/styles/style-light/mdpi/placemark-green.png b/data/styles/legacy/style-light/mdpi/placemark-green.png
similarity index 100%
rename from data/styles/style-light/mdpi/placemark-green.png
rename to data/styles/legacy/style-light/mdpi/placemark-green.png
diff --git a/data/styles/style-light/mdpi/placemark-orange.png b/data/styles/legacy/style-light/mdpi/placemark-orange.png
similarity index 100%
rename from data/styles/style-light/mdpi/placemark-orange.png
rename to data/styles/legacy/style-light/mdpi/placemark-orange.png
diff --git a/data/styles/style-light/mdpi/placemark-pink.png b/data/styles/legacy/style-light/mdpi/placemark-pink.png
similarity index 100%
rename from data/styles/style-light/mdpi/placemark-pink.png
rename to data/styles/legacy/style-light/mdpi/placemark-pink.png
diff --git a/data/styles/style-light/mdpi/placemark-purple.png b/data/styles/legacy/style-light/mdpi/placemark-purple.png
similarity index 100%
rename from data/styles/style-light/mdpi/placemark-purple.png
rename to data/styles/legacy/style-light/mdpi/placemark-purple.png
diff --git a/data/styles/style-light/mdpi/placemark-red.png b/data/styles/legacy/style-light/mdpi/placemark-red.png
similarity index 100%
rename from data/styles/style-light/mdpi/placemark-red.png
rename to data/styles/legacy/style-light/mdpi/placemark-red.png
diff --git a/data/styles/style-light/mdpi/placemark-yellow.png b/data/styles/legacy/style-light/mdpi/placemark-yellow.png
similarity index 100%
rename from data/styles/style-light/mdpi/placemark-yellow.png
rename to data/styles/legacy/style-light/mdpi/placemark-yellow.png
diff --git a/data/styles/legacy/style-light/mdpi/route-arrow.png b/data/styles/legacy/style-light/mdpi/route-arrow.png
new file mode 100644
index 0000000000..3e0e083ba4
Binary files /dev/null and b/data/styles/legacy/style-light/mdpi/route-arrow.png differ
diff --git a/data/styles/style-light/mdpi/route_from.png b/data/styles/legacy/style-light/mdpi/route_from.png
similarity index 100%
rename from data/styles/style-light/mdpi/route_from.png
rename to data/styles/legacy/style-light/mdpi/route_from.png
diff --git a/data/styles/style-light/mdpi/route_to.png b/data/styles/legacy/style-light/mdpi/route_to.png
similarity index 100%
rename from data/styles/style-light/mdpi/route_to.png
rename to data/styles/legacy/style-light/mdpi/route_to.png
diff --git a/data/styles/style-light/mdpi/search-result-active.png b/data/styles/legacy/style-light/mdpi/search-result-active.png
similarity index 100%
rename from data/styles/style-light/mdpi/search-result-active.png
rename to data/styles/legacy/style-light/mdpi/search-result-active.png
diff --git a/data/styles/style-light/mdpi/search-result.png b/data/styles/legacy/style-light/mdpi/search-result.png
similarity index 100%
rename from data/styles/style-light/mdpi/search-result.png
rename to data/styles/legacy/style-light/mdpi/search-result.png
diff --git a/data/styles/style-light/mdpi/watch-my-direction.png b/data/styles/legacy/style-light/mdpi/watch-my-direction.png
similarity index 100%
rename from data/styles/style-light/mdpi/watch-my-direction.png
rename to data/styles/legacy/style-light/mdpi/watch-my-direction.png
diff --git a/data/styles/style-light/mdpi/watch-my-position.png b/data/styles/legacy/style-light/mdpi/watch-my-position.png
similarity index 100%
rename from data/styles/style-light/mdpi/watch-my-position.png
rename to data/styles/legacy/style-light/mdpi/watch-my-position.png
diff --git a/data/styles/style-light/mdpi/watch-search-result.png b/data/styles/legacy/style-light/mdpi/watch-search-result.png
similarity index 100%
rename from data/styles/style-light/mdpi/watch-search-result.png
rename to data/styles/legacy/style-light/mdpi/watch-search-result.png
diff --git a/data/styles/style-light/style.mapcss b/data/styles/legacy/style-light/style.mapcss
similarity index 100%
rename from data/styles/style-light/style.mapcss
rename to data/styles/legacy/style-light/style.mapcss
diff --git a/data/styles/style-light/symbols/airport.svg b/data/styles/legacy/style-light/symbols/airport.svg
similarity index 100%
rename from data/styles/style-light/symbols/airport.svg
rename to data/styles/legacy/style-light/symbols/airport.svg
diff --git a/data/styles/style-light/symbols/alpine_hut.svg b/data/styles/legacy/style-light/symbols/alpine_hut.svg
similarity index 100%
rename from data/styles/style-light/symbols/alpine_hut.svg
rename to data/styles/legacy/style-light/symbols/alpine_hut.svg
diff --git a/data/styles/style-light/symbols/archery-borderless.svg b/data/styles/legacy/style-light/symbols/archery-borderless.svg
similarity index 100%
rename from data/styles/style-light/symbols/archery-borderless.svg
rename to data/styles/legacy/style-light/symbols/archery-borderless.svg
diff --git a/data/styles/style-light/symbols/archery.svg b/data/styles/legacy/style-light/symbols/archery.svg
similarity index 100%
rename from data/styles/style-light/symbols/archery.svg
rename to data/styles/legacy/style-light/symbols/archery.svg
diff --git a/data/styles/style-light/symbols/arrow.svg b/data/styles/legacy/style-light/symbols/arrow.svg
similarity index 100%
rename from data/styles/style-light/symbols/arrow.svg
rename to data/styles/legacy/style-light/symbols/arrow.svg
diff --git a/data/styles/style-light/symbols/athletics-borderless.svg b/data/styles/legacy/style-light/symbols/athletics-borderless.svg
similarity index 100%
rename from data/styles/style-light/symbols/athletics-borderless.svg
rename to data/styles/legacy/style-light/symbols/athletics-borderless.svg
diff --git a/data/styles/style-light/symbols/athletics.svg b/data/styles/legacy/style-light/symbols/athletics.svg
similarity index 100%
rename from data/styles/style-light/symbols/athletics.svg
rename to data/styles/legacy/style-light/symbols/athletics.svg
diff --git a/data/styles/style-light/symbols/atm.svg b/data/styles/legacy/style-light/symbols/atm.svg
similarity index 100%
rename from data/styles/style-light/symbols/atm.svg
rename to data/styles/legacy/style-light/symbols/atm.svg
diff --git a/data/styles/style-light/symbols/bakery.svg b/data/styles/legacy/style-light/symbols/bakery.svg
similarity index 100%
rename from data/styles/style-light/symbols/bakery.svg
rename to data/styles/legacy/style-light/symbols/bakery.svg
diff --git a/data/styles/style-light/symbols/bank.svg b/data/styles/legacy/style-light/symbols/bank.svg
similarity index 100%
rename from data/styles/style-light/symbols/bank.svg
rename to data/styles/legacy/style-light/symbols/bank.svg
diff --git a/data/styles/style-light/symbols/bar.svg b/data/styles/legacy/style-light/symbols/bar.svg
similarity index 100%
rename from data/styles/style-light/symbols/bar.svg
rename to data/styles/legacy/style-light/symbols/bar.svg
diff --git a/data/styles/style-light/symbols/barrier.svg b/data/styles/legacy/style-light/symbols/barrier.svg
similarity index 100%
rename from data/styles/style-light/symbols/barrier.svg
rename to data/styles/legacy/style-light/symbols/barrier.svg
diff --git a/data/styles/style-light/symbols/baseball-borderless.svg b/data/styles/legacy/style-light/symbols/baseball-borderless.svg
similarity index 100%
rename from data/styles/style-light/symbols/baseball-borderless.svg
rename to data/styles/legacy/style-light/symbols/baseball-borderless.svg
diff --git a/data/styles/style-light/symbols/baseball.svg b/data/styles/legacy/style-light/symbols/baseball.svg
similarity index 100%
rename from data/styles/style-light/symbols/baseball.svg
rename to data/styles/legacy/style-light/symbols/baseball.svg
diff --git a/data/styles/style-light/symbols/basketball-borderless.svg b/data/styles/legacy/style-light/symbols/basketball-borderless.svg
similarity index 100%
rename from data/styles/style-light/symbols/basketball-borderless.svg
rename to data/styles/legacy/style-light/symbols/basketball-borderless.svg
diff --git a/data/styles/style-light/symbols/basketball.svg b/data/styles/legacy/style-light/symbols/basketball.svg
similarity index 100%
rename from data/styles/style-light/symbols/basketball.svg
rename to data/styles/legacy/style-light/symbols/basketball.svg
diff --git a/data/styles/style-light/symbols/bench.svg b/data/styles/legacy/style-light/symbols/bench.svg
similarity index 100%
rename from data/styles/style-light/symbols/bench.svg
rename to data/styles/legacy/style-light/symbols/bench.svg
diff --git a/data/styles/style-light/symbols/bicycle_rental.svg b/data/styles/legacy/style-light/symbols/bicycle_rental.svg
similarity index 100%
rename from data/styles/style-light/symbols/bicycle_rental.svg
rename to data/styles/legacy/style-light/symbols/bicycle_rental.svg
diff --git a/data/styles/style-light/symbols/bird.svg b/data/styles/legacy/style-light/symbols/bird.svg
similarity index 100%
rename from data/styles/style-light/symbols/bird.svg
rename to data/styles/legacy/style-light/symbols/bird.svg
diff --git a/data/styles/style-light/symbols/bowls-borderless.svg b/data/styles/legacy/style-light/symbols/bowls-borderless.svg
similarity index 100%
rename from data/styles/style-light/symbols/bowls-borderless.svg
rename to data/styles/legacy/style-light/symbols/bowls-borderless.svg
diff --git a/data/styles/style-light/symbols/bowls.svg b/data/styles/legacy/style-light/symbols/bowls.svg
similarity index 100%
rename from data/styles/style-light/symbols/bowls.svg
rename to data/styles/legacy/style-light/symbols/bowls.svg
diff --git a/data/styles/style-light/symbols/building.svg b/data/styles/legacy/style-light/symbols/building.svg
similarity index 100%
rename from data/styles/style-light/symbols/building.svg
rename to data/styles/legacy/style-light/symbols/building.svg
diff --git a/data/styles/style-light/symbols/bureau_de_change.svg b/data/styles/legacy/style-light/symbols/bureau_de_change.svg
similarity index 100%
rename from data/styles/style-light/symbols/bureau_de_change.svg
rename to data/styles/legacy/style-light/symbols/bureau_de_change.svg
diff --git a/data/styles/style-light/symbols/bus-mini.svg b/data/styles/legacy/style-light/symbols/bus-mini.svg
similarity index 100%
rename from data/styles/style-light/symbols/bus-mini.svg
rename to data/styles/legacy/style-light/symbols/bus-mini.svg
diff --git a/data/styles/style-light/symbols/bus.svg b/data/styles/legacy/style-light/symbols/bus.svg
similarity index 100%
rename from data/styles/style-light/symbols/bus.svg
rename to data/styles/legacy/style-light/symbols/bus.svg
diff --git a/data/styles/style-light/symbols/bus_sta.svg b/data/styles/legacy/style-light/symbols/bus_sta.svg
similarity index 100%
rename from data/styles/style-light/symbols/bus_sta.svg
rename to data/styles/legacy/style-light/symbols/bus_sta.svg
diff --git a/data/styles/style-light/symbols/cafe.svg b/data/styles/legacy/style-light/symbols/cafe.svg
similarity index 100%
rename from data/styles/style-light/symbols/cafe.svg
rename to data/styles/legacy/style-light/symbols/cafe.svg
diff --git a/data/styles/style-light/symbols/campSite.svg b/data/styles/legacy/style-light/symbols/campSite.svg
similarity index 100%
rename from data/styles/style-light/symbols/campSite.svg
rename to data/styles/legacy/style-light/symbols/campSite.svg
diff --git a/data/styles/style-light/symbols/cannon.svg b/data/styles/legacy/style-light/symbols/cannon.svg
similarity index 100%
rename from data/styles/style-light/symbols/cannon.svg
rename to data/styles/legacy/style-light/symbols/cannon.svg
diff --git a/data/styles/style-light/symbols/car_rental.svg b/data/styles/legacy/style-light/symbols/car_rental.svg
similarity index 100%
rename from data/styles/style-light/symbols/car_rental.svg
rename to data/styles/legacy/style-light/symbols/car_rental.svg
diff --git a/data/styles/style-light/symbols/car_repair.svg b/data/styles/legacy/style-light/symbols/car_repair.svg
similarity index 100%
rename from data/styles/style-light/symbols/car_repair.svg
rename to data/styles/legacy/style-light/symbols/car_repair.svg
diff --git a/data/styles/style-light/symbols/car_sharing.svg b/data/styles/legacy/style-light/symbols/car_sharing.svg
similarity index 100%
rename from data/styles/style-light/symbols/car_sharing.svg
rename to data/styles/legacy/style-light/symbols/car_sharing.svg
diff --git a/data/styles/style-light/symbols/castle.svg b/data/styles/legacy/style-light/symbols/castle.svg
similarity index 100%
rename from data/styles/style-light/symbols/castle.svg
rename to data/styles/legacy/style-light/symbols/castle.svg
diff --git a/data/styles/style-light/symbols/cave_entrance.svg b/data/styles/legacy/style-light/symbols/cave_entrance.svg
similarity index 100%
rename from data/styles/style-light/symbols/cave_entrance.svg
rename to data/styles/legacy/style-light/symbols/cave_entrance.svg
diff --git a/data/styles/style-light/symbols/church.svg b/data/styles/legacy/style-light/symbols/church.svg
similarity index 100%
rename from data/styles/style-light/symbols/church.svg
rename to data/styles/legacy/style-light/symbols/church.svg
diff --git a/data/styles/style-light/symbols/cinema.svg b/data/styles/legacy/style-light/symbols/cinema.svg
similarity index 100%
rename from data/styles/style-light/symbols/cinema.svg
rename to data/styles/legacy/style-light/symbols/cinema.svg
diff --git a/data/styles/style-light/symbols/clothes.svg b/data/styles/legacy/style-light/symbols/clothes.svg
similarity index 100%
rename from data/styles/style-light/symbols/clothes.svg
rename to data/styles/legacy/style-light/symbols/clothes.svg
diff --git a/data/styles/style-light/symbols/cricket-borderless.svg b/data/styles/legacy/style-light/symbols/cricket-borderless.svg
similarity index 100%
rename from data/styles/style-light/symbols/cricket-borderless.svg
rename to data/styles/legacy/style-light/symbols/cricket-borderless.svg
diff --git a/data/styles/style-light/symbols/cricket.svg b/data/styles/legacy/style-light/symbols/cricket.svg
similarity index 100%
rename from data/styles/style-light/symbols/cricket.svg
rename to data/styles/legacy/style-light/symbols/cricket.svg
diff --git a/data/styles/style-light/symbols/curling-borderless.svg b/data/styles/legacy/style-light/symbols/curling-borderless.svg
similarity index 100%
rename from data/styles/style-light/symbols/curling-borderless.svg
rename to data/styles/legacy/style-light/symbols/curling-borderless.svg
diff --git a/data/styles/style-light/symbols/curling.svg b/data/styles/legacy/style-light/symbols/curling.svg
similarity index 100%
rename from data/styles/style-light/symbols/curling.svg
rename to data/styles/legacy/style-light/symbols/curling.svg
diff --git a/data/styles/style-light/symbols/disused.svg b/data/styles/legacy/style-light/symbols/disused.svg
similarity index 100%
rename from data/styles/style-light/symbols/disused.svg
rename to data/styles/legacy/style-light/symbols/disused.svg
diff --git a/data/styles/style-light/symbols/diving-borderless.svg b/data/styles/legacy/style-light/symbols/diving-borderless.svg
similarity index 100%
rename from data/styles/style-light/symbols/diving-borderless.svg
rename to data/styles/legacy/style-light/symbols/diving-borderless.svg
diff --git a/data/styles/style-light/symbols/diving.svg b/data/styles/legacy/style-light/symbols/diving.svg
similarity index 100%
rename from data/styles/style-light/symbols/diving.svg
rename to data/styles/legacy/style-light/symbols/diving.svg
diff --git a/data/styles/style-light/symbols/doctor.svg b/data/styles/legacy/style-light/symbols/doctor.svg
similarity index 100%
rename from data/styles/style-light/symbols/doctor.svg
rename to data/styles/legacy/style-light/symbols/doctor.svg
diff --git a/data/styles/style-light/symbols/dog_park.svg b/data/styles/legacy/style-light/symbols/dog_park.svg
similarity index 100%
rename from data/styles/style-light/symbols/dog_park.svg
rename to data/styles/legacy/style-light/symbols/dog_park.svg
diff --git a/data/styles/style-light/symbols/drinking_water.svg b/data/styles/legacy/style-light/symbols/drinking_water.svg
similarity index 100%
rename from data/styles/style-light/symbols/drinking_water.svg
rename to data/styles/legacy/style-light/symbols/drinking_water.svg
diff --git a/data/styles/style-light/symbols/earthquake-camp.svg b/data/styles/legacy/style-light/symbols/earthquake-camp.svg
similarity index 100%
rename from data/styles/style-light/symbols/earthquake-camp.svg
rename to data/styles/legacy/style-light/symbols/earthquake-camp.svg
diff --git a/data/styles/style-light/symbols/embassy.svg b/data/styles/legacy/style-light/symbols/embassy.svg
similarity index 100%
rename from data/styles/style-light/symbols/embassy.svg
rename to data/styles/legacy/style-light/symbols/embassy.svg
diff --git a/data/styles/style-light/symbols/equestrian-borderless.svg b/data/styles/legacy/style-light/symbols/equestrian-borderless.svg
similarity index 100%
rename from data/styles/style-light/symbols/equestrian-borderless.svg
rename to data/styles/legacy/style-light/symbols/equestrian-borderless.svg
diff --git a/data/styles/style-light/symbols/equestrian.svg b/data/styles/legacy/style-light/symbols/equestrian.svg
similarity index 100%
rename from data/styles/style-light/symbols/equestrian.svg
rename to data/styles/legacy/style-light/symbols/equestrian.svg
diff --git a/data/styles/style-light/symbols/fastfood.svg b/data/styles/legacy/style-light/symbols/fastfood.svg
similarity index 100%
rename from data/styles/style-light/symbols/fastfood.svg
rename to data/styles/legacy/style-light/symbols/fastfood.svg
diff --git a/data/styles/style-light/symbols/firebrigade.svg b/data/styles/legacy/style-light/symbols/firebrigade.svg
similarity index 100%
rename from data/styles/style-light/symbols/firebrigade.svg
rename to data/styles/legacy/style-light/symbols/firebrigade.svg
diff --git a/data/styles/style-light/symbols/football-borderless.svg b/data/styles/legacy/style-light/symbols/football-borderless.svg
similarity index 100%
rename from data/styles/style-light/symbols/football-borderless.svg
rename to data/styles/legacy/style-light/symbols/football-borderless.svg
diff --git a/data/styles/style-light/symbols/football.svg b/data/styles/legacy/style-light/symbols/football.svg
similarity index 100%
rename from data/styles/style-light/symbols/football.svg
rename to data/styles/legacy/style-light/symbols/football.svg
diff --git a/data/styles/style-light/symbols/fountain.svg b/data/styles/legacy/style-light/symbols/fountain.svg
similarity index 100%
rename from data/styles/style-light/symbols/fountain.svg
rename to data/styles/legacy/style-light/symbols/fountain.svg
diff --git a/data/styles/style-light/symbols/gate.svg b/data/styles/legacy/style-light/symbols/gate.svg
similarity index 100%
rename from data/styles/style-light/symbols/gate.svg
rename to data/styles/legacy/style-light/symbols/gate.svg
diff --git a/data/styles/style-light/symbols/golf-course.svg b/data/styles/legacy/style-light/symbols/golf-course.svg
similarity index 100%
rename from data/styles/style-light/symbols/golf-course.svg
rename to data/styles/legacy/style-light/symbols/golf-course.svg
diff --git a/data/styles/style-light/symbols/gymnastics-borderless.svg b/data/styles/legacy/style-light/symbols/gymnastics-borderless.svg
similarity index 100%
rename from data/styles/style-light/symbols/gymnastics-borderless.svg
rename to data/styles/legacy/style-light/symbols/gymnastics-borderless.svg
diff --git a/data/styles/style-light/symbols/gymnastics.svg b/data/styles/legacy/style-light/symbols/gymnastics.svg
similarity index 100%
rename from data/styles/style-light/symbols/gymnastics.svg
rename to data/styles/legacy/style-light/symbols/gymnastics.svg
diff --git a/data/styles/style-light/symbols/hairdresser.svg b/data/styles/legacy/style-light/symbols/hairdresser.svg
similarity index 100%
rename from data/styles/style-light/symbols/hairdresser.svg
rename to data/styles/legacy/style-light/symbols/hairdresser.svg
diff --git a/data/styles/style-light/symbols/handball-borderless.svg b/data/styles/legacy/style-light/symbols/handball-borderless.svg
similarity index 100%
rename from data/styles/style-light/symbols/handball-borderless.svg
rename to data/styles/legacy/style-light/symbols/handball-borderless.svg
diff --git a/data/styles/style-light/symbols/handball.svg b/data/styles/legacy/style-light/symbols/handball.svg
similarity index 100%
rename from data/styles/style-light/symbols/handball.svg
rename to data/styles/legacy/style-light/symbols/handball.svg
diff --git a/data/styles/style-light/symbols/helipad.svg b/data/styles/legacy/style-light/symbols/helipad.svg
similarity index 100%
rename from data/styles/style-light/symbols/helipad.svg
rename to data/styles/legacy/style-light/symbols/helipad.svg
diff --git a/data/styles/style-light/symbols/hospital.svg b/data/styles/legacy/style-light/symbols/hospital.svg
similarity index 100%
rename from data/styles/style-light/symbols/hospital.svg
rename to data/styles/legacy/style-light/symbols/hospital.svg
diff --git a/data/styles/style-light/symbols/hostel.svg b/data/styles/legacy/style-light/symbols/hostel.svg
similarity index 100%
rename from data/styles/style-light/symbols/hostel.svg
rename to data/styles/legacy/style-light/symbols/hostel.svg
diff --git a/data/styles/style-light/symbols/hotel.svg b/data/styles/legacy/style-light/symbols/hotel.svg
similarity index 100%
rename from data/styles/style-light/symbols/hotel.svg
rename to data/styles/legacy/style-light/symbols/hotel.svg
diff --git a/data/styles/style-light/symbols/housenumber.svg b/data/styles/legacy/style-light/symbols/housenumber.svg
similarity index 100%
rename from data/styles/style-light/symbols/housenumber.svg
rename to data/styles/legacy/style-light/symbols/housenumber.svg
diff --git a/data/styles/style-light/symbols/hunting_closed_high.svg b/data/styles/legacy/style-light/symbols/hunting_closed_high.svg
similarity index 100%
rename from data/styles/style-light/symbols/hunting_closed_high.svg
rename to data/styles/legacy/style-light/symbols/hunting_closed_high.svg
diff --git a/data/styles/style-light/symbols/information-guidepost.svg b/data/styles/legacy/style-light/symbols/information-guidepost.svg
similarity index 100%
rename from data/styles/style-light/symbols/information-guidepost.svg
rename to data/styles/legacy/style-light/symbols/information-guidepost.svg
diff --git a/data/styles/style-light/symbols/information-office.svg b/data/styles/legacy/style-light/symbols/information-office.svg
similarity index 100%
rename from data/styles/style-light/symbols/information-office.svg
rename to data/styles/legacy/style-light/symbols/information-office.svg
diff --git a/data/styles/style-light/symbols/information.svg b/data/styles/legacy/style-light/symbols/information.svg
similarity index 100%
rename from data/styles/style-light/symbols/information.svg
rename to data/styles/legacy/style-light/symbols/information.svg
diff --git a/data/styles/style-light/symbols/khanda.svg b/data/styles/legacy/style-light/symbols/khanda.svg
similarity index 100%
rename from data/styles/style-light/symbols/khanda.svg
rename to data/styles/legacy/style-light/symbols/khanda.svg
diff --git a/data/styles/style-light/symbols/kindergarten.svg b/data/styles/legacy/style-light/symbols/kindergarten.svg
similarity index 100%
rename from data/styles/style-light/symbols/kindergarten.svg
rename to data/styles/legacy/style-light/symbols/kindergarten.svg
diff --git a/data/styles/style-light/symbols/kindergarten2.svg b/data/styles/legacy/style-light/symbols/kindergarten2.svg
similarity index 100%
rename from data/styles/style-light/symbols/kindergarten2.svg
rename to data/styles/legacy/style-light/symbols/kindergarten2.svg
diff --git a/data/styles/style-light/symbols/kiosk.svg b/data/styles/legacy/style-light/symbols/kiosk.svg
similarity index 100%
rename from data/styles/style-light/symbols/kiosk.svg
rename to data/styles/legacy/style-light/symbols/kiosk.svg
diff --git a/data/styles/style-light/symbols/library.svg b/data/styles/legacy/style-light/symbols/library.svg
similarity index 100%
rename from data/styles/style-light/symbols/library.svg
rename to data/styles/legacy/style-light/symbols/library.svg
diff --git a/data/styles/style-light/symbols/lighthouse.svg b/data/styles/legacy/style-light/symbols/lighthouse.svg
similarity index 100%
rename from data/styles/style-light/symbols/lighthouse.svg
rename to data/styles/legacy/style-light/symbols/lighthouse.svg
diff --git a/data/styles/style-light/symbols/man-made-halfpipe.svg b/data/styles/legacy/style-light/symbols/man-made-halfpipe.svg
similarity index 100%
rename from data/styles/style-light/symbols/man-made-halfpipe.svg
rename to data/styles/legacy/style-light/symbols/man-made-halfpipe.svg
diff --git a/data/styles/style-light/symbols/memorial.svg b/data/styles/legacy/style-light/symbols/memorial.svg
similarity index 100%
rename from data/styles/style-light/symbols/memorial.svg
rename to data/styles/legacy/style-light/symbols/memorial.svg
diff --git a/data/styles/style-light/symbols/mosque.svg b/data/styles/legacy/style-light/symbols/mosque.svg
similarity index 100%
rename from data/styles/style-light/symbols/mosque.svg
rename to data/styles/legacy/style-light/symbols/mosque.svg
diff --git a/data/styles/style-light/symbols/mountain_pass.svg b/data/styles/legacy/style-light/symbols/mountain_pass.svg
similarity index 100%
rename from data/styles/style-light/symbols/mountain_pass.svg
rename to data/styles/legacy/style-light/symbols/mountain_pass.svg
diff --git a/data/styles/style-light/symbols/museum.svg b/data/styles/legacy/style-light/symbols/museum.svg
similarity index 100%
rename from data/styles/style-light/symbols/museum.svg
rename to data/styles/legacy/style-light/symbols/museum.svg
diff --git a/data/styles/style-light/symbols/park_and_ride-permissive.svg b/data/styles/legacy/style-light/symbols/park_and_ride-permissive.svg
similarity index 100%
rename from data/styles/style-light/symbols/park_and_ride-permissive.svg
rename to data/styles/legacy/style-light/symbols/park_and_ride-permissive.svg
diff --git a/data/styles/style-light/symbols/park_and_ride.svg b/data/styles/legacy/style-light/symbols/park_and_ride.svg
similarity index 100%
rename from data/styles/style-light/symbols/park_and_ride.svg
rename to data/styles/legacy/style-light/symbols/park_and_ride.svg
diff --git a/data/styles/style-light/symbols/parking-mini.svg b/data/styles/legacy/style-light/symbols/parking-mini.svg
similarity index 100%
rename from data/styles/style-light/symbols/parking-mini.svg
rename to data/styles/legacy/style-light/symbols/parking-mini.svg
diff --git a/data/styles/style-light/symbols/parking-permissive.svg b/data/styles/legacy/style-light/symbols/parking-permissive.svg
similarity index 100%
rename from data/styles/style-light/symbols/parking-permissive.svg
rename to data/styles/legacy/style-light/symbols/parking-permissive.svg
diff --git a/data/styles/style-light/symbols/parking-private.svg b/data/styles/legacy/style-light/symbols/parking-private.svg
similarity index 100%
rename from data/styles/style-light/symbols/parking-private.svg
rename to data/styles/legacy/style-light/symbols/parking-private.svg
diff --git a/data/styles/style-light/symbols/parking.svg b/data/styles/legacy/style-light/symbols/parking.svg
similarity index 100%
rename from data/styles/style-light/symbols/parking.svg
rename to data/styles/legacy/style-light/symbols/parking.svg
diff --git a/data/styles/style-light/symbols/parking_fee-permissive.svg b/data/styles/legacy/style-light/symbols/parking_fee-permissive.svg
similarity index 100%
rename from data/styles/style-light/symbols/parking_fee-permissive.svg
rename to data/styles/legacy/style-light/symbols/parking_fee-permissive.svg
diff --git a/data/styles/style-light/symbols/parking_fee.svg b/data/styles/legacy/style-light/symbols/parking_fee.svg
similarity index 100%
rename from data/styles/style-light/symbols/parking_fee.svg
rename to data/styles/legacy/style-light/symbols/parking_fee.svg
diff --git a/data/styles/style-light/symbols/parking_roof-permissive.svg b/data/styles/legacy/style-light/symbols/parking_roof-permissive.svg
similarity index 100%
rename from data/styles/style-light/symbols/parking_roof-permissive.svg
rename to data/styles/legacy/style-light/symbols/parking_roof-permissive.svg
diff --git a/data/styles/style-light/symbols/parking_roof.svg b/data/styles/legacy/style-light/symbols/parking_roof.svg
similarity index 100%
rename from data/styles/style-light/symbols/parking_roof.svg
rename to data/styles/legacy/style-light/symbols/parking_roof.svg
diff --git a/data/styles/style-light/symbols/parking_roof_fee-permissive.svg b/data/styles/legacy/style-light/symbols/parking_roof_fee-permissive.svg
similarity index 100%
rename from data/styles/style-light/symbols/parking_roof_fee-permissive.svg
rename to data/styles/legacy/style-light/symbols/parking_roof_fee-permissive.svg
diff --git a/data/styles/style-light/symbols/parking_roof_fee.svg b/data/styles/legacy/style-light/symbols/parking_roof_fee.svg
similarity index 100%
rename from data/styles/style-light/symbols/parking_roof_fee.svg
rename to data/styles/legacy/style-light/symbols/parking_roof_fee.svg
diff --git a/data/styles/style-light/symbols/peak-mini.svg b/data/styles/legacy/style-light/symbols/peak-mini.svg
similarity index 100%
rename from data/styles/style-light/symbols/peak-mini.svg
rename to data/styles/legacy/style-light/symbols/peak-mini.svg
diff --git a/data/styles/style-light/symbols/peak.svg b/data/styles/legacy/style-light/symbols/peak.svg
similarity index 100%
rename from data/styles/style-light/symbols/peak.svg
rename to data/styles/legacy/style-light/symbols/peak.svg
diff --git a/data/styles/style-light/symbols/petrolStation.svg b/data/styles/legacy/style-light/symbols/petrolStation.svg
similarity index 100%
rename from data/styles/style-light/symbols/petrolStation.svg
rename to data/styles/legacy/style-light/symbols/petrolStation.svg
diff --git a/data/styles/style-light/symbols/pharmacy.svg b/data/styles/legacy/style-light/symbols/pharmacy.svg
similarity index 100%
rename from data/styles/style-light/symbols/pharmacy.svg
rename to data/styles/legacy/style-light/symbols/pharmacy.svg
diff --git a/data/styles/style-light/symbols/picnic.svg b/data/styles/legacy/style-light/symbols/picnic.svg
similarity index 100%
rename from data/styles/style-light/symbols/picnic.svg
rename to data/styles/legacy/style-light/symbols/picnic.svg
diff --git a/data/styles/style-light/symbols/playground.svg b/data/styles/legacy/style-light/symbols/playground.svg
similarity index 100%
rename from data/styles/style-light/symbols/playground.svg
rename to data/styles/legacy/style-light/symbols/playground.svg
diff --git a/data/styles/style-light/symbols/police.svg b/data/styles/legacy/style-light/symbols/police.svg
similarity index 100%
rename from data/styles/style-light/symbols/police.svg
rename to data/styles/legacy/style-light/symbols/police.svg
diff --git a/data/styles/style-light/symbols/postbox.svg b/data/styles/legacy/style-light/symbols/postbox.svg
similarity index 100%
rename from data/styles/style-light/symbols/postbox.svg
rename to data/styles/legacy/style-light/symbols/postbox.svg
diff --git a/data/styles/style-light/symbols/postoffice.svg b/data/styles/legacy/style-light/symbols/postoffice.svg
similarity index 100%
rename from data/styles/style-light/symbols/postoffice.svg
rename to data/styles/legacy/style-light/symbols/postoffice.svg
diff --git a/data/styles/style-light/symbols/power-pole.svg b/data/styles/legacy/style-light/symbols/power-pole.svg
similarity index 100%
rename from data/styles/style-light/symbols/power-pole.svg
rename to data/styles/legacy/style-light/symbols/power-pole.svg
diff --git a/data/styles/style-light/symbols/power-tower.svg b/data/styles/legacy/style-light/symbols/power-tower.svg
similarity index 100%
rename from data/styles/style-light/symbols/power-tower.svg
rename to data/styles/legacy/style-light/symbols/power-tower.svg
diff --git a/data/styles/style-light/symbols/power_generic.svg b/data/styles/legacy/style-light/symbols/power_generic.svg
similarity index 100%
rename from data/styles/style-light/symbols/power_generic.svg
rename to data/styles/legacy/style-light/symbols/power_generic.svg
diff --git a/data/styles/style-light/symbols/power_hydro.svg b/data/styles/legacy/style-light/symbols/power_hydro.svg
similarity index 100%
rename from data/styles/style-light/symbols/power_hydro.svg
rename to data/styles/legacy/style-light/symbols/power_hydro.svg
diff --git a/data/styles/style-light/symbols/power_photovoltaic.svg b/data/styles/legacy/style-light/symbols/power_photovoltaic.svg
similarity index 100%
rename from data/styles/style-light/symbols/power_photovoltaic.svg
rename to data/styles/legacy/style-light/symbols/power_photovoltaic.svg
diff --git a/data/styles/style-light/symbols/power_wind.svg b/data/styles/legacy/style-light/symbols/power_wind.svg
similarity index 100%
rename from data/styles/style-light/symbols/power_wind.svg
rename to data/styles/legacy/style-light/symbols/power_wind.svg
diff --git a/data/styles/style-light/symbols/pub.svg b/data/styles/legacy/style-light/symbols/pub.svg
similarity index 100%
rename from data/styles/style-light/symbols/pub.svg
rename to data/styles/legacy/style-light/symbols/pub.svg
diff --git a/data/styles/style-light/symbols/pubx.svg b/data/styles/legacy/style-light/symbols/pubx.svg
similarity index 100%
rename from data/styles/style-light/symbols/pubx.svg
rename to data/styles/legacy/style-light/symbols/pubx.svg
diff --git a/data/styles/style-light/symbols/railway-crossing-small.svg b/data/styles/legacy/style-light/symbols/railway-crossing-small.svg
similarity index 100%
rename from data/styles/style-light/symbols/railway-crossing-small.svg
rename to data/styles/legacy/style-light/symbols/railway-crossing-small.svg
diff --git a/data/styles/style-light/symbols/railway-crossing.svg b/data/styles/legacy/style-light/symbols/railway-crossing.svg
similarity index 100%
rename from data/styles/style-light/symbols/railway-crossing.svg
rename to data/styles/legacy/style-light/symbols/railway-crossing.svg
diff --git a/data/styles/style-light/symbols/railway-station-mini.svg b/data/styles/legacy/style-light/symbols/railway-station-mini.svg
similarity index 100%
rename from data/styles/style-light/symbols/railway-station-mini.svg
rename to data/styles/legacy/style-light/symbols/railway-station-mini.svg
diff --git a/data/styles/style-light/symbols/railway-station.svg b/data/styles/legacy/style-light/symbols/railway-station.svg
similarity index 100%
rename from data/styles/style-light/symbols/railway-station.svg
rename to data/styles/legacy/style-light/symbols/railway-station.svg
diff --git a/data/styles/style-light/symbols/recycling.svg b/data/styles/legacy/style-light/symbols/recycling.svg
similarity index 100%
rename from data/styles/style-light/symbols/recycling.svg
rename to data/styles/legacy/style-light/symbols/recycling.svg
diff --git a/data/styles/style-light/symbols/religion.svg b/data/styles/legacy/style-light/symbols/religion.svg
similarity index 100%
rename from data/styles/style-light/symbols/religion.svg
rename to data/styles/legacy/style-light/symbols/religion.svg
diff --git a/data/styles/style-light/symbols/restaurant.svg b/data/styles/legacy/style-light/symbols/restaurant.svg
similarity index 100%
rename from data/styles/style-light/symbols/restaurant.svg
rename to data/styles/legacy/style-light/symbols/restaurant.svg
diff --git a/data/styles/style-light/symbols/roundabout_left.svg b/data/styles/legacy/style-light/symbols/roundabout_left.svg
similarity index 100%
rename from data/styles/style-light/symbols/roundabout_left.svg
rename to data/styles/legacy/style-light/symbols/roundabout_left.svg
diff --git a/data/styles/style-light/symbols/roundabout_right.svg b/data/styles/legacy/style-light/symbols/roundabout_right.svg
similarity index 100%
rename from data/styles/style-light/symbols/roundabout_right.svg
rename to data/styles/legacy/style-light/symbols/roundabout_right.svg
diff --git a/data/styles/style-light/symbols/ruins.svg b/data/styles/legacy/style-light/symbols/ruins.svg
similarity index 100%
rename from data/styles/style-light/symbols/ruins.svg
rename to data/styles/legacy/style-light/symbols/ruins.svg
diff --git a/data/styles/style-light/symbols/school.svg b/data/styles/legacy/style-light/symbols/school.svg
similarity index 100%
rename from data/styles/style-light/symbols/school.svg
rename to data/styles/legacy/style-light/symbols/school.svg
diff --git a/data/styles/style-light/symbols/shelter-fireplace.svg b/data/styles/legacy/style-light/symbols/shelter-fireplace.svg
similarity index 100%
rename from data/styles/style-light/symbols/shelter-fireplace.svg
rename to data/styles/legacy/style-light/symbols/shelter-fireplace.svg
diff --git a/data/styles/style-light/symbols/shelter.svg b/data/styles/legacy/style-light/symbols/shelter.svg
similarity index 100%
rename from data/styles/style-light/symbols/shelter.svg
rename to data/styles/legacy/style-light/symbols/shelter.svg
diff --git a/data/styles/style-light/symbols/shooting-borderless.svg b/data/styles/legacy/style-light/symbols/shooting-borderless.svg
similarity index 100%
rename from data/styles/style-light/symbols/shooting-borderless.svg
rename to data/styles/legacy/style-light/symbols/shooting-borderless.svg
diff --git a/data/styles/style-light/symbols/shooting.svg b/data/styles/legacy/style-light/symbols/shooting.svg
similarity index 100%
rename from data/styles/style-light/symbols/shooting.svg
rename to data/styles/legacy/style-light/symbols/shooting.svg
diff --git a/data/styles/style-light/symbols/slipway.svg b/data/styles/legacy/style-light/symbols/slipway.svg
similarity index 100%
rename from data/styles/style-light/symbols/slipway.svg
rename to data/styles/legacy/style-light/symbols/slipway.svg
diff --git a/data/styles/style-light/symbols/soccer-borderless.svg b/data/styles/legacy/style-light/symbols/soccer-borderless.svg
similarity index 100%
rename from data/styles/style-light/symbols/soccer-borderless.svg
rename to data/styles/legacy/style-light/symbols/soccer-borderless.svg
diff --git a/data/styles/style-light/symbols/soccer.svg b/data/styles/legacy/style-light/symbols/soccer.svg
similarity index 100%
rename from data/styles/style-light/symbols/soccer.svg
rename to data/styles/legacy/style-light/symbols/soccer.svg
diff --git a/data/styles/style-light/symbols/speed_trap.svg b/data/styles/legacy/style-light/symbols/speed_trap.svg
similarity index 100%
rename from data/styles/style-light/symbols/speed_trap.svg
rename to data/styles/legacy/style-light/symbols/speed_trap.svg
diff --git a/data/styles/style-light/symbols/subway-station-l.svg b/data/styles/legacy/style-light/symbols/subway-station-l.svg
similarity index 100%
rename from data/styles/style-light/symbols/subway-station-l.svg
rename to data/styles/legacy/style-light/symbols/subway-station-l.svg
diff --git a/data/styles/style-light/symbols/subway-station-m.svg b/data/styles/legacy/style-light/symbols/subway-station-m.svg
similarity index 100%
rename from data/styles/style-light/symbols/subway-station-m.svg
rename to data/styles/legacy/style-light/symbols/subway-station-m.svg
diff --git a/data/styles/style-light/symbols/subway-station-s.svg b/data/styles/legacy/style-light/symbols/subway-station-s.svg
similarity index 100%
rename from data/styles/style-light/symbols/subway-station-s.svg
rename to data/styles/legacy/style-light/symbols/subway-station-s.svg
diff --git a/data/styles/style-light/symbols/subway.svg b/data/styles/legacy/style-light/symbols/subway.svg
similarity index 100%
rename from data/styles/style-light/symbols/subway.svg
rename to data/styles/legacy/style-light/symbols/subway.svg
diff --git a/data/styles/style-light/symbols/supermarket.svg b/data/styles/legacy/style-light/symbols/supermarket.svg
similarity index 100%
rename from data/styles/style-light/symbols/supermarket.svg
rename to data/styles/legacy/style-light/symbols/supermarket.svg
diff --git a/data/styles/style-light/symbols/survey_point.svg b/data/styles/legacy/style-light/symbols/survey_point.svg
similarity index 100%
rename from data/styles/style-light/symbols/survey_point.svg
rename to data/styles/legacy/style-light/symbols/survey_point.svg
diff --git a/data/styles/style-light/symbols/swimming-borderless.svg b/data/styles/legacy/style-light/symbols/swimming-borderless.svg
similarity index 100%
rename from data/styles/style-light/symbols/swimming-borderless.svg
rename to data/styles/legacy/style-light/symbols/swimming-borderless.svg
diff --git a/data/styles/style-light/symbols/swimming.svg b/data/styles/legacy/style-light/symbols/swimming.svg
similarity index 100%
rename from data/styles/style-light/symbols/swimming.svg
rename to data/styles/legacy/style-light/symbols/swimming.svg
diff --git a/data/styles/style-light/symbols/synagogue.svg b/data/styles/legacy/style-light/symbols/synagogue.svg
similarity index 100%
rename from data/styles/style-light/symbols/synagogue.svg
rename to data/styles/legacy/style-light/symbols/synagogue.svg
diff --git a/data/styles/style-light/symbols/taxi.svg b/data/styles/legacy/style-light/symbols/taxi.svg
similarity index 100%
rename from data/styles/style-light/symbols/taxi.svg
rename to data/styles/legacy/style-light/symbols/taxi.svg
diff --git a/data/styles/style-light/symbols/telephone.svg b/data/styles/legacy/style-light/symbols/telephone.svg
similarity index 100%
rename from data/styles/style-light/symbols/telephone.svg
rename to data/styles/legacy/style-light/symbols/telephone.svg
diff --git a/data/styles/style-light/symbols/tennis-borderless.svg b/data/styles/legacy/style-light/symbols/tennis-borderless.svg
similarity index 100%
rename from data/styles/style-light/symbols/tennis-borderless.svg
rename to data/styles/legacy/style-light/symbols/tennis-borderless.svg
diff --git a/data/styles/style-light/symbols/tennis.svg b/data/styles/legacy/style-light/symbols/tennis.svg
similarity index 100%
rename from data/styles/style-light/symbols/tennis.svg
rename to data/styles/legacy/style-light/symbols/tennis.svg
diff --git a/data/styles/style-light/symbols/theatre.svg b/data/styles/legacy/style-light/symbols/theatre.svg
similarity index 100%
rename from data/styles/style-light/symbols/theatre.svg
rename to data/styles/legacy/style-light/symbols/theatre.svg
diff --git a/data/styles/style-light/symbols/toilets.svg b/data/styles/legacy/style-light/symbols/toilets.svg
similarity index 100%
rename from data/styles/style-light/symbols/toilets.svg
rename to data/styles/legacy/style-light/symbols/toilets.svg
diff --git a/data/styles/style-light/symbols/traffic_signal.svg b/data/styles/legacy/style-light/symbols/traffic_signal.svg
similarity index 100%
rename from data/styles/style-light/symbols/traffic_signal.svg
rename to data/styles/legacy/style-light/symbols/traffic_signal.svg
diff --git a/data/styles/style-light/symbols/tramway-mini.svg b/data/styles/legacy/style-light/symbols/tramway-mini.svg
similarity index 100%
rename from data/styles/style-light/symbols/tramway-mini.svg
rename to data/styles/legacy/style-light/symbols/tramway-mini.svg
diff --git a/data/styles/style-light/symbols/tramway.svg b/data/styles/legacy/style-light/symbols/tramway.svg
similarity index 100%
rename from data/styles/style-light/symbols/tramway.svg
rename to data/styles/legacy/style-light/symbols/tramway.svg
diff --git a/data/styles/style-light/symbols/tree.svg b/data/styles/legacy/style-light/symbols/tree.svg
similarity index 100%
rename from data/styles/style-light/symbols/tree.svg
rename to data/styles/legacy/style-light/symbols/tree.svg
diff --git a/data/styles/style-light/symbols/university.svg b/data/styles/legacy/style-light/symbols/university.svg
similarity index 100%
rename from data/styles/style-light/symbols/university.svg
rename to data/styles/legacy/style-light/symbols/university.svg
diff --git a/data/styles/style-light/symbols/viewpoint.svg b/data/styles/legacy/style-light/symbols/viewpoint.svg
similarity index 100%
rename from data/styles/style-light/symbols/viewpoint.svg
rename to data/styles/legacy/style-light/symbols/viewpoint.svg
diff --git a/data/styles/style-light/symbols/vulcan.svg b/data/styles/legacy/style-light/symbols/vulcan.svg
similarity index 100%
rename from data/styles/style-light/symbols/vulcan.svg
rename to data/styles/legacy/style-light/symbols/vulcan.svg
diff --git a/data/styles/style-light/symbols/wastewater.svg b/data/styles/legacy/style-light/symbols/wastewater.svg
similarity index 100%
rename from data/styles/style-light/symbols/wastewater.svg
rename to data/styles/legacy/style-light/symbols/wastewater.svg
diff --git a/data/styles/style-light/symbols/waterfall.svg b/data/styles/legacy/style-light/symbols/waterfall.svg
similarity index 100%
rename from data/styles/style-light/symbols/waterfall.svg
rename to data/styles/legacy/style-light/symbols/waterfall.svg
diff --git a/data/styles/style-light/symbols/windmill.svg b/data/styles/legacy/style-light/symbols/windmill.svg
similarity index 100%
rename from data/styles/style-light/symbols/windmill.svg
rename to data/styles/legacy/style-light/symbols/windmill.svg
diff --git a/data/styles/style-light/watch/api-result.png b/data/styles/legacy/style-light/watch/api-result.png
similarity index 100%
rename from data/styles/style-light/watch/api-result.png
rename to data/styles/legacy/style-light/watch/api-result.png
diff --git a/data/styles/style-light/watch/arrow-direction.png b/data/styles/legacy/style-light/watch/arrow-direction.png
similarity index 100%
rename from data/styles/style-light/watch/arrow-direction.png
rename to data/styles/legacy/style-light/watch/arrow-direction.png
diff --git a/data/styles/style-light/watch/compass-image.png b/data/styles/legacy/style-light/watch/compass-image.png
similarity index 100%
rename from data/styles/style-light/watch/compass-image.png
rename to data/styles/legacy/style-light/watch/compass-image.png
diff --git a/data/styles/style-light/watch/current-position-compas.png b/data/styles/legacy/style-light/watch/current-position-compas.png
similarity index 100%
rename from data/styles/style-light/watch/current-position-compas.png
rename to data/styles/legacy/style-light/watch/current-position-compas.png
diff --git a/data/styles/style-light/watch/current-position.png b/data/styles/legacy/style-light/watch/current-position.png
similarity index 100%
rename from data/styles/style-light/watch/current-position.png
rename to data/styles/legacy/style-light/watch/current-position.png
diff --git a/data/styles/style-light/watch/current-routing-compas.png b/data/styles/legacy/style-light/watch/current-routing-compas.png
similarity index 100%
rename from data/styles/style-light/watch/current-routing-compas.png
rename to data/styles/legacy/style-light/watch/current-routing-compas.png
diff --git a/data/styles/style-light/watch/placemark-blue.png b/data/styles/legacy/style-light/watch/placemark-blue.png
similarity index 100%
rename from data/styles/style-light/watch/placemark-blue.png
rename to data/styles/legacy/style-light/watch/placemark-blue.png
diff --git a/data/styles/style-light/watch/placemark-brown.png b/data/styles/legacy/style-light/watch/placemark-brown.png
similarity index 100%
rename from data/styles/style-light/watch/placemark-brown.png
rename to data/styles/legacy/style-light/watch/placemark-brown.png
diff --git a/data/styles/style-light/watch/placemark-green.png b/data/styles/legacy/style-light/watch/placemark-green.png
similarity index 100%
rename from data/styles/style-light/watch/placemark-green.png
rename to data/styles/legacy/style-light/watch/placemark-green.png
diff --git a/data/styles/style-light/watch/placemark-orange.png b/data/styles/legacy/style-light/watch/placemark-orange.png
similarity index 100%
rename from data/styles/style-light/watch/placemark-orange.png
rename to data/styles/legacy/style-light/watch/placemark-orange.png
diff --git a/data/styles/style-light/watch/placemark-pink.png b/data/styles/legacy/style-light/watch/placemark-pink.png
similarity index 100%
rename from data/styles/style-light/watch/placemark-pink.png
rename to data/styles/legacy/style-light/watch/placemark-pink.png
diff --git a/data/styles/style-light/watch/placemark-purple.png b/data/styles/legacy/style-light/watch/placemark-purple.png
similarity index 100%
rename from data/styles/style-light/watch/placemark-purple.png
rename to data/styles/legacy/style-light/watch/placemark-purple.png
diff --git a/data/styles/style-light/watch/placemark-red.png b/data/styles/legacy/style-light/watch/placemark-red.png
similarity index 100%
rename from data/styles/style-light/watch/placemark-red.png
rename to data/styles/legacy/style-light/watch/placemark-red.png
diff --git a/data/styles/style-light/watch/placemark-yellow.png b/data/styles/legacy/style-light/watch/placemark-yellow.png
similarity index 100%
rename from data/styles/style-light/watch/placemark-yellow.png
rename to data/styles/legacy/style-light/watch/placemark-yellow.png
diff --git a/data/styles/style-light/watch/route_from.png b/data/styles/legacy/style-light/watch/route_from.png
similarity index 100%
rename from data/styles/style-light/watch/route_from.png
rename to data/styles/legacy/style-light/watch/route_from.png
diff --git a/data/styles/style-light/watch/route_to.png b/data/styles/legacy/style-light/watch/route_to.png
similarity index 100%
rename from data/styles/style-light/watch/route_to.png
rename to data/styles/legacy/style-light/watch/route_to.png
diff --git a/data/styles/style-light/watch/search-result-active.png b/data/styles/legacy/style-light/watch/search-result-active.png
similarity index 100%
rename from data/styles/style-light/watch/search-result-active.png
rename to data/styles/legacy/style-light/watch/search-result-active.png
diff --git a/data/styles/style-light/watch/search-result.png b/data/styles/legacy/style-light/watch/search-result.png
similarity index 100%
rename from data/styles/style-light/watch/search-result.png
rename to data/styles/legacy/style-light/watch/search-result.png
diff --git a/data/styles/style-light/xhdpi/api-result.png b/data/styles/legacy/style-light/xhdpi/api-result.png
similarity index 100%
rename from data/styles/style-light/xhdpi/api-result.png
rename to data/styles/legacy/style-light/xhdpi/api-result.png
diff --git a/data/styles/style-light/xhdpi/compass-image.png b/data/styles/legacy/style-light/xhdpi/compass-image.png
similarity index 100%
rename from data/styles/style-light/xhdpi/compass-image.png
rename to data/styles/legacy/style-light/xhdpi/compass-image.png
diff --git a/data/styles/style-light/xhdpi/current-position-compas.png b/data/styles/legacy/style-light/xhdpi/current-position-compas.png
similarity index 100%
rename from data/styles/style-light/xhdpi/current-position-compas.png
rename to data/styles/legacy/style-light/xhdpi/current-position-compas.png
diff --git a/data/styles/style-light/xhdpi/current-position.png b/data/styles/legacy/style-light/xhdpi/current-position.png
similarity index 100%
rename from data/styles/style-light/xhdpi/current-position.png
rename to data/styles/legacy/style-light/xhdpi/current-position.png
diff --git a/data/styles/style-light/xhdpi/current-routing-compas.png b/data/styles/legacy/style-light/xhdpi/current-routing-compas.png
similarity index 100%
rename from data/styles/style-light/xhdpi/current-routing-compas.png
rename to data/styles/legacy/style-light/xhdpi/current-routing-compas.png
diff --git a/data/styles/style-light/xhdpi/placemark-blue.png b/data/styles/legacy/style-light/xhdpi/placemark-blue.png
similarity index 100%
rename from data/styles/style-light/xhdpi/placemark-blue.png
rename to data/styles/legacy/style-light/xhdpi/placemark-blue.png
diff --git a/data/styles/style-light/xhdpi/placemark-brown.png b/data/styles/legacy/style-light/xhdpi/placemark-brown.png
similarity index 100%
rename from data/styles/style-light/xhdpi/placemark-brown.png
rename to data/styles/legacy/style-light/xhdpi/placemark-brown.png
diff --git a/data/styles/style-light/xhdpi/placemark-green.png b/data/styles/legacy/style-light/xhdpi/placemark-green.png
similarity index 100%
rename from data/styles/style-light/xhdpi/placemark-green.png
rename to data/styles/legacy/style-light/xhdpi/placemark-green.png
diff --git a/data/styles/style-light/xhdpi/placemark-orange.png b/data/styles/legacy/style-light/xhdpi/placemark-orange.png
similarity index 100%
rename from data/styles/style-light/xhdpi/placemark-orange.png
rename to data/styles/legacy/style-light/xhdpi/placemark-orange.png
diff --git a/data/styles/style-light/xhdpi/placemark-pink.png b/data/styles/legacy/style-light/xhdpi/placemark-pink.png
similarity index 100%
rename from data/styles/style-light/xhdpi/placemark-pink.png
rename to data/styles/legacy/style-light/xhdpi/placemark-pink.png
diff --git a/data/styles/style-light/xhdpi/placemark-purple.png b/data/styles/legacy/style-light/xhdpi/placemark-purple.png
similarity index 100%
rename from data/styles/style-light/xhdpi/placemark-purple.png
rename to data/styles/legacy/style-light/xhdpi/placemark-purple.png
diff --git a/data/styles/style-light/xhdpi/placemark-red.png b/data/styles/legacy/style-light/xhdpi/placemark-red.png
similarity index 100%
rename from data/styles/style-light/xhdpi/placemark-red.png
rename to data/styles/legacy/style-light/xhdpi/placemark-red.png
diff --git a/data/styles/style-light/xhdpi/placemark-yellow.png b/data/styles/legacy/style-light/xhdpi/placemark-yellow.png
similarity index 100%
rename from data/styles/style-light/xhdpi/placemark-yellow.png
rename to data/styles/legacy/style-light/xhdpi/placemark-yellow.png
diff --git a/data/styles/legacy/style-light/xhdpi/route-arrow.png b/data/styles/legacy/style-light/xhdpi/route-arrow.png
new file mode 100644
index 0000000000..c6a62c47f9
Binary files /dev/null and b/data/styles/legacy/style-light/xhdpi/route-arrow.png differ
diff --git a/data/styles/style-light/xhdpi/route_from.png b/data/styles/legacy/style-light/xhdpi/route_from.png
similarity index 100%
rename from data/styles/style-light/xhdpi/route_from.png
rename to data/styles/legacy/style-light/xhdpi/route_from.png
diff --git a/data/styles/style-light/xhdpi/route_to.png b/data/styles/legacy/style-light/xhdpi/route_to.png
similarity index 100%
rename from data/styles/style-light/xhdpi/route_to.png
rename to data/styles/legacy/style-light/xhdpi/route_to.png
diff --git a/data/styles/style-light/xhdpi/search-result-active.png b/data/styles/legacy/style-light/xhdpi/search-result-active.png
similarity index 100%
rename from data/styles/style-light/xhdpi/search-result-active.png
rename to data/styles/legacy/style-light/xhdpi/search-result-active.png
diff --git a/data/styles/style-light/xhdpi/search-result.png b/data/styles/legacy/style-light/xhdpi/search-result.png
similarity index 100%
rename from data/styles/style-light/xhdpi/search-result.png
rename to data/styles/legacy/style-light/xhdpi/search-result.png
diff --git a/data/styles/style-light/xhdpi/watch-my-direction.png b/data/styles/legacy/style-light/xhdpi/watch-my-direction.png
similarity index 100%
rename from data/styles/style-light/xhdpi/watch-my-direction.png
rename to data/styles/legacy/style-light/xhdpi/watch-my-direction.png
diff --git a/data/styles/style-light/xhdpi/watch-my-position.png b/data/styles/legacy/style-light/xhdpi/watch-my-position.png
similarity index 100%
rename from data/styles/style-light/xhdpi/watch-my-position.png
rename to data/styles/legacy/style-light/xhdpi/watch-my-position.png
diff --git a/data/styles/style-light/xhdpi/watch-search-result.png b/data/styles/legacy/style-light/xhdpi/watch-search-result.png
similarity index 100%
rename from data/styles/style-light/xhdpi/watch-search-result.png
rename to data/styles/legacy/style-light/xhdpi/watch-search-result.png
diff --git a/data/styles/style-light/xxhdpi/api-result.png b/data/styles/legacy/style-light/xxhdpi/api-result.png
similarity index 100%
rename from data/styles/style-light/xxhdpi/api-result.png
rename to data/styles/legacy/style-light/xxhdpi/api-result.png
diff --git a/data/styles/style-light/xxhdpi/compass-image.png b/data/styles/legacy/style-light/xxhdpi/compass-image.png
similarity index 100%
rename from data/styles/style-light/xxhdpi/compass-image.png
rename to data/styles/legacy/style-light/xxhdpi/compass-image.png
diff --git a/data/styles/style-light/xxhdpi/current-position-compas.png b/data/styles/legacy/style-light/xxhdpi/current-position-compas.png
similarity index 100%
rename from data/styles/style-light/xxhdpi/current-position-compas.png
rename to data/styles/legacy/style-light/xxhdpi/current-position-compas.png
diff --git a/data/styles/style-light/xxhdpi/current-position.png b/data/styles/legacy/style-light/xxhdpi/current-position.png
similarity index 100%
rename from data/styles/style-light/xxhdpi/current-position.png
rename to data/styles/legacy/style-light/xxhdpi/current-position.png
diff --git a/data/styles/style-light/xxhdpi/current-routing-compas.png b/data/styles/legacy/style-light/xxhdpi/current-routing-compas.png
similarity index 100%
rename from data/styles/style-light/xxhdpi/current-routing-compas.png
rename to data/styles/legacy/style-light/xxhdpi/current-routing-compas.png
diff --git a/data/styles/style-light/xxhdpi/placemark-blue.png b/data/styles/legacy/style-light/xxhdpi/placemark-blue.png
similarity index 100%
rename from data/styles/style-light/xxhdpi/placemark-blue.png
rename to data/styles/legacy/style-light/xxhdpi/placemark-blue.png
diff --git a/data/styles/style-light/xxhdpi/placemark-brown.png b/data/styles/legacy/style-light/xxhdpi/placemark-brown.png
similarity index 100%
rename from data/styles/style-light/xxhdpi/placemark-brown.png
rename to data/styles/legacy/style-light/xxhdpi/placemark-brown.png
diff --git a/data/styles/style-light/xxhdpi/placemark-green.png b/data/styles/legacy/style-light/xxhdpi/placemark-green.png
similarity index 100%
rename from data/styles/style-light/xxhdpi/placemark-green.png
rename to data/styles/legacy/style-light/xxhdpi/placemark-green.png
diff --git a/data/styles/style-light/xxhdpi/placemark-orange.png b/data/styles/legacy/style-light/xxhdpi/placemark-orange.png
similarity index 100%
rename from data/styles/style-light/xxhdpi/placemark-orange.png
rename to data/styles/legacy/style-light/xxhdpi/placemark-orange.png
diff --git a/data/styles/style-light/xxhdpi/placemark-pink.png b/data/styles/legacy/style-light/xxhdpi/placemark-pink.png
similarity index 100%
rename from data/styles/style-light/xxhdpi/placemark-pink.png
rename to data/styles/legacy/style-light/xxhdpi/placemark-pink.png
diff --git a/data/styles/style-light/xxhdpi/placemark-purple.png b/data/styles/legacy/style-light/xxhdpi/placemark-purple.png
similarity index 100%
rename from data/styles/style-light/xxhdpi/placemark-purple.png
rename to data/styles/legacy/style-light/xxhdpi/placemark-purple.png
diff --git a/data/styles/style-light/xxhdpi/placemark-red.png b/data/styles/legacy/style-light/xxhdpi/placemark-red.png
similarity index 100%
rename from data/styles/style-light/xxhdpi/placemark-red.png
rename to data/styles/legacy/style-light/xxhdpi/placemark-red.png
diff --git a/data/styles/style-light/xxhdpi/placemark-yellow.png b/data/styles/legacy/style-light/xxhdpi/placemark-yellow.png
similarity index 100%
rename from data/styles/style-light/xxhdpi/placemark-yellow.png
rename to data/styles/legacy/style-light/xxhdpi/placemark-yellow.png
diff --git a/data/styles/legacy/style-light/xxhdpi/route-arrow.png b/data/styles/legacy/style-light/xxhdpi/route-arrow.png
new file mode 100644
index 0000000000..59201f3ceb
Binary files /dev/null and b/data/styles/legacy/style-light/xxhdpi/route-arrow.png differ
diff --git a/data/styles/style-light/xxhdpi/route_from.png b/data/styles/legacy/style-light/xxhdpi/route_from.png
similarity index 100%
rename from data/styles/style-light/xxhdpi/route_from.png
rename to data/styles/legacy/style-light/xxhdpi/route_from.png
diff --git a/data/styles/style-light/xxhdpi/route_to.png b/data/styles/legacy/style-light/xxhdpi/route_to.png
similarity index 100%
rename from data/styles/style-light/xxhdpi/route_to.png
rename to data/styles/legacy/style-light/xxhdpi/route_to.png
diff --git a/data/styles/style-light/xxhdpi/search-result-active.png b/data/styles/legacy/style-light/xxhdpi/search-result-active.png
similarity index 100%
rename from data/styles/style-light/xxhdpi/search-result-active.png
rename to data/styles/legacy/style-light/xxhdpi/search-result-active.png
diff --git a/data/styles/style-light/xxhdpi/search-result.png b/data/styles/legacy/style-light/xxhdpi/search-result.png
similarity index 100%
rename from data/styles/style-light/xxhdpi/search-result.png
rename to data/styles/legacy/style-light/xxhdpi/search-result.png
diff --git a/data/styles/style-light/xxhdpi/watch-my-direction.png b/data/styles/legacy/style-light/xxhdpi/watch-my-direction.png
similarity index 100%
rename from data/styles/style-light/xxhdpi/watch-my-direction.png
rename to data/styles/legacy/style-light/xxhdpi/watch-my-direction.png
diff --git a/data/styles/style-light/xxhdpi/watch-my-position.png b/data/styles/legacy/style-light/xxhdpi/watch-my-position.png
similarity index 100%
rename from data/styles/style-light/xxhdpi/watch-my-position.png
rename to data/styles/legacy/style-light/xxhdpi/watch-my-position.png
diff --git a/data/styles/style-light/xxhdpi/watch-search-result.png b/data/styles/legacy/style-light/xxhdpi/watch-search-result.png
similarity index 100%
rename from data/styles/style-light/xxhdpi/watch-search-result.png
rename to data/styles/legacy/style-light/xxhdpi/watch-search-result.png
diff --git a/data/styles/style-yota/style.mapcss b/data/styles/legacy/style-yota/style.mapcss
similarity index 100%
rename from data/styles/style-yota/style.mapcss
rename to data/styles/legacy/style-yota/style.mapcss
diff --git a/data/styles/style-yota/symbols/airport.svg b/data/styles/legacy/style-yota/symbols/airport.svg
similarity index 100%
rename from data/styles/style-yota/symbols/airport.svg
rename to data/styles/legacy/style-yota/symbols/airport.svg
diff --git a/data/styles/style-yota/symbols/alpine_hut.svg b/data/styles/legacy/style-yota/symbols/alpine_hut.svg
similarity index 100%
rename from data/styles/style-yota/symbols/alpine_hut.svg
rename to data/styles/legacy/style-yota/symbols/alpine_hut.svg
diff --git a/data/styles/style-yota/symbols/archery-borderless.svg b/data/styles/legacy/style-yota/symbols/archery-borderless.svg
similarity index 100%
rename from data/styles/style-yota/symbols/archery-borderless.svg
rename to data/styles/legacy/style-yota/symbols/archery-borderless.svg
diff --git a/data/styles/style-yota/symbols/archery.svg b/data/styles/legacy/style-yota/symbols/archery.svg
similarity index 100%
rename from data/styles/style-yota/symbols/archery.svg
rename to data/styles/legacy/style-yota/symbols/archery.svg
diff --git a/data/styles/style-yota/symbols/arrow.svg b/data/styles/legacy/style-yota/symbols/arrow.svg
similarity index 100%
rename from data/styles/style-yota/symbols/arrow.svg
rename to data/styles/legacy/style-yota/symbols/arrow.svg
diff --git a/data/styles/style-yota/symbols/athletics-borderless.svg b/data/styles/legacy/style-yota/symbols/athletics-borderless.svg
similarity index 100%
rename from data/styles/style-yota/symbols/athletics-borderless.svg
rename to data/styles/legacy/style-yota/symbols/athletics-borderless.svg
diff --git a/data/styles/style-yota/symbols/athletics.svg b/data/styles/legacy/style-yota/symbols/athletics.svg
similarity index 100%
rename from data/styles/style-yota/symbols/athletics.svg
rename to data/styles/legacy/style-yota/symbols/athletics.svg
diff --git a/data/styles/style-yota/symbols/atm.svg b/data/styles/legacy/style-yota/symbols/atm.svg
similarity index 100%
rename from data/styles/style-yota/symbols/atm.svg
rename to data/styles/legacy/style-yota/symbols/atm.svg
diff --git a/data/styles/style-yota/symbols/bakery.svg b/data/styles/legacy/style-yota/symbols/bakery.svg
similarity index 100%
rename from data/styles/style-yota/symbols/bakery.svg
rename to data/styles/legacy/style-yota/symbols/bakery.svg
diff --git a/data/styles/style-yota/symbols/bank.svg b/data/styles/legacy/style-yota/symbols/bank.svg
similarity index 100%
rename from data/styles/style-yota/symbols/bank.svg
rename to data/styles/legacy/style-yota/symbols/bank.svg
diff --git a/data/styles/style-yota/symbols/bar.svg b/data/styles/legacy/style-yota/symbols/bar.svg
similarity index 100%
rename from data/styles/style-yota/symbols/bar.svg
rename to data/styles/legacy/style-yota/symbols/bar.svg
diff --git a/data/styles/style-yota/symbols/barrier.svg b/data/styles/legacy/style-yota/symbols/barrier.svg
similarity index 100%
rename from data/styles/style-yota/symbols/barrier.svg
rename to data/styles/legacy/style-yota/symbols/barrier.svg
diff --git a/data/styles/style-yota/symbols/baseball-borderless.svg b/data/styles/legacy/style-yota/symbols/baseball-borderless.svg
similarity index 100%
rename from data/styles/style-yota/symbols/baseball-borderless.svg
rename to data/styles/legacy/style-yota/symbols/baseball-borderless.svg
diff --git a/data/styles/style-yota/symbols/baseball.svg b/data/styles/legacy/style-yota/symbols/baseball.svg
similarity index 100%
rename from data/styles/style-yota/symbols/baseball.svg
rename to data/styles/legacy/style-yota/symbols/baseball.svg
diff --git a/data/styles/style-yota/symbols/basketball-borderless.svg b/data/styles/legacy/style-yota/symbols/basketball-borderless.svg
similarity index 100%
rename from data/styles/style-yota/symbols/basketball-borderless.svg
rename to data/styles/legacy/style-yota/symbols/basketball-borderless.svg
diff --git a/data/styles/style-yota/symbols/basketball.svg b/data/styles/legacy/style-yota/symbols/basketball.svg
similarity index 100%
rename from data/styles/style-yota/symbols/basketball.svg
rename to data/styles/legacy/style-yota/symbols/basketball.svg
diff --git a/data/styles/style-yota/symbols/bench.svg b/data/styles/legacy/style-yota/symbols/bench.svg
similarity index 100%
rename from data/styles/style-yota/symbols/bench.svg
rename to data/styles/legacy/style-yota/symbols/bench.svg
diff --git a/data/styles/style-yota/symbols/bicycle_rental.svg b/data/styles/legacy/style-yota/symbols/bicycle_rental.svg
similarity index 100%
rename from data/styles/style-yota/symbols/bicycle_rental.svg
rename to data/styles/legacy/style-yota/symbols/bicycle_rental.svg
diff --git a/data/styles/style-yota/symbols/bird.svg b/data/styles/legacy/style-yota/symbols/bird.svg
similarity index 100%
rename from data/styles/style-yota/symbols/bird.svg
rename to data/styles/legacy/style-yota/symbols/bird.svg
diff --git a/data/styles/style-yota/symbols/bowls-borderless.svg b/data/styles/legacy/style-yota/symbols/bowls-borderless.svg
similarity index 100%
rename from data/styles/style-yota/symbols/bowls-borderless.svg
rename to data/styles/legacy/style-yota/symbols/bowls-borderless.svg
diff --git a/data/styles/style-yota/symbols/bowls.svg b/data/styles/legacy/style-yota/symbols/bowls.svg
similarity index 100%
rename from data/styles/style-yota/symbols/bowls.svg
rename to data/styles/legacy/style-yota/symbols/bowls.svg
diff --git a/data/styles/style-yota/symbols/building.svg b/data/styles/legacy/style-yota/symbols/building.svg
similarity index 100%
rename from data/styles/style-yota/symbols/building.svg
rename to data/styles/legacy/style-yota/symbols/building.svg
diff --git a/data/styles/style-yota/symbols/bureau_de_change.svg b/data/styles/legacy/style-yota/symbols/bureau_de_change.svg
similarity index 100%
rename from data/styles/style-yota/symbols/bureau_de_change.svg
rename to data/styles/legacy/style-yota/symbols/bureau_de_change.svg
diff --git a/data/styles/style-yota/symbols/bus-mini.svg b/data/styles/legacy/style-yota/symbols/bus-mini.svg
similarity index 100%
rename from data/styles/style-yota/symbols/bus-mini.svg
rename to data/styles/legacy/style-yota/symbols/bus-mini.svg
diff --git a/data/styles/style-yota/symbols/bus.svg b/data/styles/legacy/style-yota/symbols/bus.svg
similarity index 100%
rename from data/styles/style-yota/symbols/bus.svg
rename to data/styles/legacy/style-yota/symbols/bus.svg
diff --git a/data/styles/style-yota/symbols/bus_sta.svg b/data/styles/legacy/style-yota/symbols/bus_sta.svg
similarity index 100%
rename from data/styles/style-yota/symbols/bus_sta.svg
rename to data/styles/legacy/style-yota/symbols/bus_sta.svg
diff --git a/data/styles/style-yota/symbols/cafe.svg b/data/styles/legacy/style-yota/symbols/cafe.svg
similarity index 100%
rename from data/styles/style-yota/symbols/cafe.svg
rename to data/styles/legacy/style-yota/symbols/cafe.svg
diff --git a/data/styles/style-yota/symbols/campSite.svg b/data/styles/legacy/style-yota/symbols/campSite.svg
similarity index 100%
rename from data/styles/style-yota/symbols/campSite.svg
rename to data/styles/legacy/style-yota/symbols/campSite.svg
diff --git a/data/styles/style-yota/symbols/cannon.svg b/data/styles/legacy/style-yota/symbols/cannon.svg
similarity index 100%
rename from data/styles/style-yota/symbols/cannon.svg
rename to data/styles/legacy/style-yota/symbols/cannon.svg
diff --git a/data/styles/style-yota/symbols/car_rental.svg b/data/styles/legacy/style-yota/symbols/car_rental.svg
similarity index 100%
rename from data/styles/style-yota/symbols/car_rental.svg
rename to data/styles/legacy/style-yota/symbols/car_rental.svg
diff --git a/data/styles/style-yota/symbols/car_repair.svg b/data/styles/legacy/style-yota/symbols/car_repair.svg
similarity index 100%
rename from data/styles/style-yota/symbols/car_repair.svg
rename to data/styles/legacy/style-yota/symbols/car_repair.svg
diff --git a/data/styles/style-yota/symbols/car_sharing.svg b/data/styles/legacy/style-yota/symbols/car_sharing.svg
similarity index 100%
rename from data/styles/style-yota/symbols/car_sharing.svg
rename to data/styles/legacy/style-yota/symbols/car_sharing.svg
diff --git a/data/styles/style-yota/symbols/castle.svg b/data/styles/legacy/style-yota/symbols/castle.svg
similarity index 100%
rename from data/styles/style-yota/symbols/castle.svg
rename to data/styles/legacy/style-yota/symbols/castle.svg
diff --git a/data/styles/style-yota/symbols/cave_entrance.svg b/data/styles/legacy/style-yota/symbols/cave_entrance.svg
similarity index 100%
rename from data/styles/style-yota/symbols/cave_entrance.svg
rename to data/styles/legacy/style-yota/symbols/cave_entrance.svg
diff --git a/data/styles/style-yota/symbols/church.svg b/data/styles/legacy/style-yota/symbols/church.svg
similarity index 100%
rename from data/styles/style-yota/symbols/church.svg
rename to data/styles/legacy/style-yota/symbols/church.svg
diff --git a/data/styles/style-yota/symbols/cinema.svg b/data/styles/legacy/style-yota/symbols/cinema.svg
similarity index 100%
rename from data/styles/style-yota/symbols/cinema.svg
rename to data/styles/legacy/style-yota/symbols/cinema.svg
diff --git a/data/styles/style-yota/symbols/clothes.svg b/data/styles/legacy/style-yota/symbols/clothes.svg
similarity index 100%
rename from data/styles/style-yota/symbols/clothes.svg
rename to data/styles/legacy/style-yota/symbols/clothes.svg
diff --git a/data/styles/style-yota/symbols/cricket-borderless.svg b/data/styles/legacy/style-yota/symbols/cricket-borderless.svg
similarity index 100%
rename from data/styles/style-yota/symbols/cricket-borderless.svg
rename to data/styles/legacy/style-yota/symbols/cricket-borderless.svg
diff --git a/data/styles/style-yota/symbols/cricket.svg b/data/styles/legacy/style-yota/symbols/cricket.svg
similarity index 100%
rename from data/styles/style-yota/symbols/cricket.svg
rename to data/styles/legacy/style-yota/symbols/cricket.svg
diff --git a/data/styles/style-yota/symbols/curling-borderless.svg b/data/styles/legacy/style-yota/symbols/curling-borderless.svg
similarity index 100%
rename from data/styles/style-yota/symbols/curling-borderless.svg
rename to data/styles/legacy/style-yota/symbols/curling-borderless.svg
diff --git a/data/styles/style-yota/symbols/curling.svg b/data/styles/legacy/style-yota/symbols/curling.svg
similarity index 100%
rename from data/styles/style-yota/symbols/curling.svg
rename to data/styles/legacy/style-yota/symbols/curling.svg
diff --git a/data/styles/style-yota/symbols/disused.svg b/data/styles/legacy/style-yota/symbols/disused.svg
similarity index 100%
rename from data/styles/style-yota/symbols/disused.svg
rename to data/styles/legacy/style-yota/symbols/disused.svg
diff --git a/data/styles/style-yota/symbols/diving-borderless.svg b/data/styles/legacy/style-yota/symbols/diving-borderless.svg
similarity index 100%
rename from data/styles/style-yota/symbols/diving-borderless.svg
rename to data/styles/legacy/style-yota/symbols/diving-borderless.svg
diff --git a/data/styles/style-yota/symbols/diving.svg b/data/styles/legacy/style-yota/symbols/diving.svg
similarity index 100%
rename from data/styles/style-yota/symbols/diving.svg
rename to data/styles/legacy/style-yota/symbols/diving.svg
diff --git a/data/styles/style-yota/symbols/doctor.svg b/data/styles/legacy/style-yota/symbols/doctor.svg
similarity index 100%
rename from data/styles/style-yota/symbols/doctor.svg
rename to data/styles/legacy/style-yota/symbols/doctor.svg
diff --git a/data/styles/style-yota/symbols/dog_park.svg b/data/styles/legacy/style-yota/symbols/dog_park.svg
similarity index 100%
rename from data/styles/style-yota/symbols/dog_park.svg
rename to data/styles/legacy/style-yota/symbols/dog_park.svg
diff --git a/data/styles/style-yota/symbols/drinking_water.svg b/data/styles/legacy/style-yota/symbols/drinking_water.svg
similarity index 100%
rename from data/styles/style-yota/symbols/drinking_water.svg
rename to data/styles/legacy/style-yota/symbols/drinking_water.svg
diff --git a/data/styles/style-yota/symbols/earthquake-camp.svg b/data/styles/legacy/style-yota/symbols/earthquake-camp.svg
similarity index 100%
rename from data/styles/style-yota/symbols/earthquake-camp.svg
rename to data/styles/legacy/style-yota/symbols/earthquake-camp.svg
diff --git a/data/styles/style-yota/symbols/embassy.svg b/data/styles/legacy/style-yota/symbols/embassy.svg
similarity index 100%
rename from data/styles/style-yota/symbols/embassy.svg
rename to data/styles/legacy/style-yota/symbols/embassy.svg
diff --git a/data/styles/style-yota/symbols/equestrian-borderless.svg b/data/styles/legacy/style-yota/symbols/equestrian-borderless.svg
similarity index 100%
rename from data/styles/style-yota/symbols/equestrian-borderless.svg
rename to data/styles/legacy/style-yota/symbols/equestrian-borderless.svg
diff --git a/data/styles/style-yota/symbols/equestrian.svg b/data/styles/legacy/style-yota/symbols/equestrian.svg
similarity index 100%
rename from data/styles/style-yota/symbols/equestrian.svg
rename to data/styles/legacy/style-yota/symbols/equestrian.svg
diff --git a/data/styles/style-yota/symbols/fastfood.svg b/data/styles/legacy/style-yota/symbols/fastfood.svg
similarity index 100%
rename from data/styles/style-yota/symbols/fastfood.svg
rename to data/styles/legacy/style-yota/symbols/fastfood.svg
diff --git a/data/styles/style-yota/symbols/firebrigade.svg b/data/styles/legacy/style-yota/symbols/firebrigade.svg
similarity index 100%
rename from data/styles/style-yota/symbols/firebrigade.svg
rename to data/styles/legacy/style-yota/symbols/firebrigade.svg
diff --git a/data/styles/style-yota/symbols/football-borderless.svg b/data/styles/legacy/style-yota/symbols/football-borderless.svg
similarity index 100%
rename from data/styles/style-yota/symbols/football-borderless.svg
rename to data/styles/legacy/style-yota/symbols/football-borderless.svg
diff --git a/data/styles/style-yota/symbols/football.svg b/data/styles/legacy/style-yota/symbols/football.svg
similarity index 100%
rename from data/styles/style-yota/symbols/football.svg
rename to data/styles/legacy/style-yota/symbols/football.svg
diff --git a/data/styles/style-yota/symbols/fountain.svg b/data/styles/legacy/style-yota/symbols/fountain.svg
similarity index 100%
rename from data/styles/style-yota/symbols/fountain.svg
rename to data/styles/legacy/style-yota/symbols/fountain.svg
diff --git a/data/styles/style-yota/symbols/gate.svg b/data/styles/legacy/style-yota/symbols/gate.svg
similarity index 100%
rename from data/styles/style-yota/symbols/gate.svg
rename to data/styles/legacy/style-yota/symbols/gate.svg
diff --git a/data/styles/style-yota/symbols/golf-course.svg b/data/styles/legacy/style-yota/symbols/golf-course.svg
similarity index 100%
rename from data/styles/style-yota/symbols/golf-course.svg
rename to data/styles/legacy/style-yota/symbols/golf-course.svg
diff --git a/data/styles/style-yota/symbols/gymnastics-borderless.svg b/data/styles/legacy/style-yota/symbols/gymnastics-borderless.svg
similarity index 100%
rename from data/styles/style-yota/symbols/gymnastics-borderless.svg
rename to data/styles/legacy/style-yota/symbols/gymnastics-borderless.svg
diff --git a/data/styles/style-yota/symbols/gymnastics.svg b/data/styles/legacy/style-yota/symbols/gymnastics.svg
similarity index 100%
rename from data/styles/style-yota/symbols/gymnastics.svg
rename to data/styles/legacy/style-yota/symbols/gymnastics.svg
diff --git a/data/styles/style-yota/symbols/hairdresser.svg b/data/styles/legacy/style-yota/symbols/hairdresser.svg
similarity index 100%
rename from data/styles/style-yota/symbols/hairdresser.svg
rename to data/styles/legacy/style-yota/symbols/hairdresser.svg
diff --git a/data/styles/style-yota/symbols/handball-borderless.svg b/data/styles/legacy/style-yota/symbols/handball-borderless.svg
similarity index 100%
rename from data/styles/style-yota/symbols/handball-borderless.svg
rename to data/styles/legacy/style-yota/symbols/handball-borderless.svg
diff --git a/data/styles/style-yota/symbols/handball.svg b/data/styles/legacy/style-yota/symbols/handball.svg
similarity index 100%
rename from data/styles/style-yota/symbols/handball.svg
rename to data/styles/legacy/style-yota/symbols/handball.svg
diff --git a/data/styles/style-yota/symbols/helipad.svg b/data/styles/legacy/style-yota/symbols/helipad.svg
similarity index 100%
rename from data/styles/style-yota/symbols/helipad.svg
rename to data/styles/legacy/style-yota/symbols/helipad.svg
diff --git a/data/styles/style-yota/symbols/hospital.svg b/data/styles/legacy/style-yota/symbols/hospital.svg
similarity index 100%
rename from data/styles/style-yota/symbols/hospital.svg
rename to data/styles/legacy/style-yota/symbols/hospital.svg
diff --git a/data/styles/style-yota/symbols/hostel.svg b/data/styles/legacy/style-yota/symbols/hostel.svg
similarity index 100%
rename from data/styles/style-yota/symbols/hostel.svg
rename to data/styles/legacy/style-yota/symbols/hostel.svg
diff --git a/data/styles/style-yota/symbols/hotel.svg b/data/styles/legacy/style-yota/symbols/hotel.svg
similarity index 100%
rename from data/styles/style-yota/symbols/hotel.svg
rename to data/styles/legacy/style-yota/symbols/hotel.svg
diff --git a/data/styles/style-yota/symbols/housenumber.svg b/data/styles/legacy/style-yota/symbols/housenumber.svg
similarity index 100%
rename from data/styles/style-yota/symbols/housenumber.svg
rename to data/styles/legacy/style-yota/symbols/housenumber.svg
diff --git a/data/styles/style-yota/symbols/hunting_closed_high.svg b/data/styles/legacy/style-yota/symbols/hunting_closed_high.svg
similarity index 100%
rename from data/styles/style-yota/symbols/hunting_closed_high.svg
rename to data/styles/legacy/style-yota/symbols/hunting_closed_high.svg
diff --git a/data/styles/style-yota/symbols/information-guidepost.svg b/data/styles/legacy/style-yota/symbols/information-guidepost.svg
similarity index 100%
rename from data/styles/style-yota/symbols/information-guidepost.svg
rename to data/styles/legacy/style-yota/symbols/information-guidepost.svg
diff --git a/data/styles/style-yota/symbols/information-office.svg b/data/styles/legacy/style-yota/symbols/information-office.svg
similarity index 100%
rename from data/styles/style-yota/symbols/information-office.svg
rename to data/styles/legacy/style-yota/symbols/information-office.svg
diff --git a/data/styles/style-yota/symbols/information.svg b/data/styles/legacy/style-yota/symbols/information.svg
similarity index 100%
rename from data/styles/style-yota/symbols/information.svg
rename to data/styles/legacy/style-yota/symbols/information.svg
diff --git a/data/styles/style-yota/symbols/khanda.svg b/data/styles/legacy/style-yota/symbols/khanda.svg
similarity index 100%
rename from data/styles/style-yota/symbols/khanda.svg
rename to data/styles/legacy/style-yota/symbols/khanda.svg
diff --git a/data/styles/style-yota/symbols/kindergarten.svg b/data/styles/legacy/style-yota/symbols/kindergarten.svg
similarity index 100%
rename from data/styles/style-yota/symbols/kindergarten.svg
rename to data/styles/legacy/style-yota/symbols/kindergarten.svg
diff --git a/data/styles/style-yota/symbols/kindergarten2.svg b/data/styles/legacy/style-yota/symbols/kindergarten2.svg
similarity index 100%
rename from data/styles/style-yota/symbols/kindergarten2.svg
rename to data/styles/legacy/style-yota/symbols/kindergarten2.svg
diff --git a/data/styles/style-yota/symbols/kiosk.svg b/data/styles/legacy/style-yota/symbols/kiosk.svg
similarity index 100%
rename from data/styles/style-yota/symbols/kiosk.svg
rename to data/styles/legacy/style-yota/symbols/kiosk.svg
diff --git a/data/styles/style-yota/symbols/library.svg b/data/styles/legacy/style-yota/symbols/library.svg
similarity index 100%
rename from data/styles/style-yota/symbols/library.svg
rename to data/styles/legacy/style-yota/symbols/library.svg
diff --git a/data/styles/style-yota/symbols/lighthouse.svg b/data/styles/legacy/style-yota/symbols/lighthouse.svg
similarity index 100%
rename from data/styles/style-yota/symbols/lighthouse.svg
rename to data/styles/legacy/style-yota/symbols/lighthouse.svg
diff --git a/data/styles/style-yota/symbols/man-made-halfpipe.svg b/data/styles/legacy/style-yota/symbols/man-made-halfpipe.svg
similarity index 100%
rename from data/styles/style-yota/symbols/man-made-halfpipe.svg
rename to data/styles/legacy/style-yota/symbols/man-made-halfpipe.svg
diff --git a/data/styles/style-yota/symbols/memorial.svg b/data/styles/legacy/style-yota/symbols/memorial.svg
similarity index 100%
rename from data/styles/style-yota/symbols/memorial.svg
rename to data/styles/legacy/style-yota/symbols/memorial.svg
diff --git a/data/styles/style-yota/symbols/mosque.svg b/data/styles/legacy/style-yota/symbols/mosque.svg
similarity index 100%
rename from data/styles/style-yota/symbols/mosque.svg
rename to data/styles/legacy/style-yota/symbols/mosque.svg
diff --git a/data/styles/style-yota/symbols/mountain_pass.svg b/data/styles/legacy/style-yota/symbols/mountain_pass.svg
similarity index 100%
rename from data/styles/style-yota/symbols/mountain_pass.svg
rename to data/styles/legacy/style-yota/symbols/mountain_pass.svg
diff --git a/data/styles/style-yota/symbols/museum.svg b/data/styles/legacy/style-yota/symbols/museum.svg
similarity index 100%
rename from data/styles/style-yota/symbols/museum.svg
rename to data/styles/legacy/style-yota/symbols/museum.svg
diff --git a/data/styles/style-yota/symbols/park_and_ride-permissive.svg b/data/styles/legacy/style-yota/symbols/park_and_ride-permissive.svg
similarity index 100%
rename from data/styles/style-yota/symbols/park_and_ride-permissive.svg
rename to data/styles/legacy/style-yota/symbols/park_and_ride-permissive.svg
diff --git a/data/styles/style-yota/symbols/park_and_ride.svg b/data/styles/legacy/style-yota/symbols/park_and_ride.svg
similarity index 100%
rename from data/styles/style-yota/symbols/park_and_ride.svg
rename to data/styles/legacy/style-yota/symbols/park_and_ride.svg
diff --git a/data/styles/style-yota/symbols/parking-mini.svg b/data/styles/legacy/style-yota/symbols/parking-mini.svg
similarity index 100%
rename from data/styles/style-yota/symbols/parking-mini.svg
rename to data/styles/legacy/style-yota/symbols/parking-mini.svg
diff --git a/data/styles/style-yota/symbols/parking-permissive.svg b/data/styles/legacy/style-yota/symbols/parking-permissive.svg
similarity index 100%
rename from data/styles/style-yota/symbols/parking-permissive.svg
rename to data/styles/legacy/style-yota/symbols/parking-permissive.svg
diff --git a/data/styles/style-yota/symbols/parking-private.svg b/data/styles/legacy/style-yota/symbols/parking-private.svg
similarity index 100%
rename from data/styles/style-yota/symbols/parking-private.svg
rename to data/styles/legacy/style-yota/symbols/parking-private.svg
diff --git a/data/styles/style-yota/symbols/parking.svg b/data/styles/legacy/style-yota/symbols/parking.svg
similarity index 100%
rename from data/styles/style-yota/symbols/parking.svg
rename to data/styles/legacy/style-yota/symbols/parking.svg
diff --git a/data/styles/style-yota/symbols/parking_fee-permissive.svg b/data/styles/legacy/style-yota/symbols/parking_fee-permissive.svg
similarity index 100%
rename from data/styles/style-yota/symbols/parking_fee-permissive.svg
rename to data/styles/legacy/style-yota/symbols/parking_fee-permissive.svg
diff --git a/data/styles/style-yota/symbols/parking_fee.svg b/data/styles/legacy/style-yota/symbols/parking_fee.svg
similarity index 100%
rename from data/styles/style-yota/symbols/parking_fee.svg
rename to data/styles/legacy/style-yota/symbols/parking_fee.svg
diff --git a/data/styles/style-yota/symbols/parking_roof-permissive.svg b/data/styles/legacy/style-yota/symbols/parking_roof-permissive.svg
similarity index 100%
rename from data/styles/style-yota/symbols/parking_roof-permissive.svg
rename to data/styles/legacy/style-yota/symbols/parking_roof-permissive.svg
diff --git a/data/styles/style-yota/symbols/parking_roof.svg b/data/styles/legacy/style-yota/symbols/parking_roof.svg
similarity index 100%
rename from data/styles/style-yota/symbols/parking_roof.svg
rename to data/styles/legacy/style-yota/symbols/parking_roof.svg
diff --git a/data/styles/style-yota/symbols/parking_roof_fee-permissive.svg b/data/styles/legacy/style-yota/symbols/parking_roof_fee-permissive.svg
similarity index 100%
rename from data/styles/style-yota/symbols/parking_roof_fee-permissive.svg
rename to data/styles/legacy/style-yota/symbols/parking_roof_fee-permissive.svg
diff --git a/data/styles/style-yota/symbols/parking_roof_fee.svg b/data/styles/legacy/style-yota/symbols/parking_roof_fee.svg
similarity index 100%
rename from data/styles/style-yota/symbols/parking_roof_fee.svg
rename to data/styles/legacy/style-yota/symbols/parking_roof_fee.svg
diff --git a/data/styles/style-yota/symbols/peak-mini.svg b/data/styles/legacy/style-yota/symbols/peak-mini.svg
similarity index 100%
rename from data/styles/style-yota/symbols/peak-mini.svg
rename to data/styles/legacy/style-yota/symbols/peak-mini.svg
diff --git a/data/styles/style-yota/symbols/peak.svg b/data/styles/legacy/style-yota/symbols/peak.svg
similarity index 100%
rename from data/styles/style-yota/symbols/peak.svg
rename to data/styles/legacy/style-yota/symbols/peak.svg
diff --git a/data/styles/style-yota/symbols/petrolStation.svg b/data/styles/legacy/style-yota/symbols/petrolStation.svg
similarity index 100%
rename from data/styles/style-yota/symbols/petrolStation.svg
rename to data/styles/legacy/style-yota/symbols/petrolStation.svg
diff --git a/data/styles/style-yota/symbols/pharmacy.svg b/data/styles/legacy/style-yota/symbols/pharmacy.svg
similarity index 100%
rename from data/styles/style-yota/symbols/pharmacy.svg
rename to data/styles/legacy/style-yota/symbols/pharmacy.svg
diff --git a/data/styles/style-yota/symbols/picnic.svg b/data/styles/legacy/style-yota/symbols/picnic.svg
similarity index 100%
rename from data/styles/style-yota/symbols/picnic.svg
rename to data/styles/legacy/style-yota/symbols/picnic.svg
diff --git a/data/styles/style-yota/symbols/playground.svg b/data/styles/legacy/style-yota/symbols/playground.svg
similarity index 100%
rename from data/styles/style-yota/symbols/playground.svg
rename to data/styles/legacy/style-yota/symbols/playground.svg
diff --git a/data/styles/style-yota/symbols/police.svg b/data/styles/legacy/style-yota/symbols/police.svg
similarity index 100%
rename from data/styles/style-yota/symbols/police.svg
rename to data/styles/legacy/style-yota/symbols/police.svg
diff --git a/data/styles/style-yota/symbols/postbox.svg b/data/styles/legacy/style-yota/symbols/postbox.svg
similarity index 100%
rename from data/styles/style-yota/symbols/postbox.svg
rename to data/styles/legacy/style-yota/symbols/postbox.svg
diff --git a/data/styles/style-yota/symbols/postoffice.svg b/data/styles/legacy/style-yota/symbols/postoffice.svg
similarity index 100%
rename from data/styles/style-yota/symbols/postoffice.svg
rename to data/styles/legacy/style-yota/symbols/postoffice.svg
diff --git a/data/styles/style-yota/symbols/power-pole.svg b/data/styles/legacy/style-yota/symbols/power-pole.svg
similarity index 100%
rename from data/styles/style-yota/symbols/power-pole.svg
rename to data/styles/legacy/style-yota/symbols/power-pole.svg
diff --git a/data/styles/style-yota/symbols/power-tower.svg b/data/styles/legacy/style-yota/symbols/power-tower.svg
similarity index 100%
rename from data/styles/style-yota/symbols/power-tower.svg
rename to data/styles/legacy/style-yota/symbols/power-tower.svg
diff --git a/data/styles/style-yota/symbols/power_generic.svg b/data/styles/legacy/style-yota/symbols/power_generic.svg
similarity index 100%
rename from data/styles/style-yota/symbols/power_generic.svg
rename to data/styles/legacy/style-yota/symbols/power_generic.svg
diff --git a/data/styles/style-yota/symbols/power_hydro.svg b/data/styles/legacy/style-yota/symbols/power_hydro.svg
similarity index 100%
rename from data/styles/style-yota/symbols/power_hydro.svg
rename to data/styles/legacy/style-yota/symbols/power_hydro.svg
diff --git a/data/styles/style-yota/symbols/power_photovoltaic.svg b/data/styles/legacy/style-yota/symbols/power_photovoltaic.svg
similarity index 100%
rename from data/styles/style-yota/symbols/power_photovoltaic.svg
rename to data/styles/legacy/style-yota/symbols/power_photovoltaic.svg
diff --git a/data/styles/style-yota/symbols/power_wind.svg b/data/styles/legacy/style-yota/symbols/power_wind.svg
similarity index 100%
rename from data/styles/style-yota/symbols/power_wind.svg
rename to data/styles/legacy/style-yota/symbols/power_wind.svg
diff --git a/data/styles/style-yota/symbols/pub.svg b/data/styles/legacy/style-yota/symbols/pub.svg
similarity index 100%
rename from data/styles/style-yota/symbols/pub.svg
rename to data/styles/legacy/style-yota/symbols/pub.svg
diff --git a/data/styles/style-yota/symbols/pubx.svg b/data/styles/legacy/style-yota/symbols/pubx.svg
similarity index 100%
rename from data/styles/style-yota/symbols/pubx.svg
rename to data/styles/legacy/style-yota/symbols/pubx.svg
diff --git a/data/styles/style-yota/symbols/railway-crossing-small.svg b/data/styles/legacy/style-yota/symbols/railway-crossing-small.svg
similarity index 100%
rename from data/styles/style-yota/symbols/railway-crossing-small.svg
rename to data/styles/legacy/style-yota/symbols/railway-crossing-small.svg
diff --git a/data/styles/style-yota/symbols/railway-crossing.svg b/data/styles/legacy/style-yota/symbols/railway-crossing.svg
similarity index 100%
rename from data/styles/style-yota/symbols/railway-crossing.svg
rename to data/styles/legacy/style-yota/symbols/railway-crossing.svg
diff --git a/data/styles/style-yota/symbols/railway-station-mini.svg b/data/styles/legacy/style-yota/symbols/railway-station-mini.svg
similarity index 100%
rename from data/styles/style-yota/symbols/railway-station-mini.svg
rename to data/styles/legacy/style-yota/symbols/railway-station-mini.svg
diff --git a/data/styles/style-yota/symbols/railway-station.svg b/data/styles/legacy/style-yota/symbols/railway-station.svg
similarity index 100%
rename from data/styles/style-yota/symbols/railway-station.svg
rename to data/styles/legacy/style-yota/symbols/railway-station.svg
diff --git a/data/styles/style-yota/symbols/recycling.svg b/data/styles/legacy/style-yota/symbols/recycling.svg
similarity index 100%
rename from data/styles/style-yota/symbols/recycling.svg
rename to data/styles/legacy/style-yota/symbols/recycling.svg
diff --git a/data/styles/style-yota/symbols/religion.svg b/data/styles/legacy/style-yota/symbols/religion.svg
similarity index 100%
rename from data/styles/style-yota/symbols/religion.svg
rename to data/styles/legacy/style-yota/symbols/religion.svg
diff --git a/data/styles/style-yota/symbols/restaurant.svg b/data/styles/legacy/style-yota/symbols/restaurant.svg
similarity index 100%
rename from data/styles/style-yota/symbols/restaurant.svg
rename to data/styles/legacy/style-yota/symbols/restaurant.svg
diff --git a/data/styles/style-yota/symbols/roundabout_left.svg b/data/styles/legacy/style-yota/symbols/roundabout_left.svg
similarity index 100%
rename from data/styles/style-yota/symbols/roundabout_left.svg
rename to data/styles/legacy/style-yota/symbols/roundabout_left.svg
diff --git a/data/styles/style-yota/symbols/roundabout_right.svg b/data/styles/legacy/style-yota/symbols/roundabout_right.svg
similarity index 100%
rename from data/styles/style-yota/symbols/roundabout_right.svg
rename to data/styles/legacy/style-yota/symbols/roundabout_right.svg
diff --git a/data/styles/style-yota/symbols/ruins.svg b/data/styles/legacy/style-yota/symbols/ruins.svg
similarity index 100%
rename from data/styles/style-yota/symbols/ruins.svg
rename to data/styles/legacy/style-yota/symbols/ruins.svg
diff --git a/data/styles/style-yota/symbols/school.svg b/data/styles/legacy/style-yota/symbols/school.svg
similarity index 100%
rename from data/styles/style-yota/symbols/school.svg
rename to data/styles/legacy/style-yota/symbols/school.svg
diff --git a/data/styles/style-yota/symbols/shelter-fireplace.svg b/data/styles/legacy/style-yota/symbols/shelter-fireplace.svg
similarity index 100%
rename from data/styles/style-yota/symbols/shelter-fireplace.svg
rename to data/styles/legacy/style-yota/symbols/shelter-fireplace.svg
diff --git a/data/styles/style-yota/symbols/shelter.svg b/data/styles/legacy/style-yota/symbols/shelter.svg
similarity index 100%
rename from data/styles/style-yota/symbols/shelter.svg
rename to data/styles/legacy/style-yota/symbols/shelter.svg
diff --git a/data/styles/style-yota/symbols/shooting-borderless.svg b/data/styles/legacy/style-yota/symbols/shooting-borderless.svg
similarity index 100%
rename from data/styles/style-yota/symbols/shooting-borderless.svg
rename to data/styles/legacy/style-yota/symbols/shooting-borderless.svg
diff --git a/data/styles/style-yota/symbols/shooting.svg b/data/styles/legacy/style-yota/symbols/shooting.svg
similarity index 100%
rename from data/styles/style-yota/symbols/shooting.svg
rename to data/styles/legacy/style-yota/symbols/shooting.svg
diff --git a/data/styles/style-yota/symbols/slipway.svg b/data/styles/legacy/style-yota/symbols/slipway.svg
similarity index 100%
rename from data/styles/style-yota/symbols/slipway.svg
rename to data/styles/legacy/style-yota/symbols/slipway.svg
diff --git a/data/styles/style-yota/symbols/soccer-borderless.svg b/data/styles/legacy/style-yota/symbols/soccer-borderless.svg
similarity index 100%
rename from data/styles/style-yota/symbols/soccer-borderless.svg
rename to data/styles/legacy/style-yota/symbols/soccer-borderless.svg
diff --git a/data/styles/style-yota/symbols/soccer.svg b/data/styles/legacy/style-yota/symbols/soccer.svg
similarity index 100%
rename from data/styles/style-yota/symbols/soccer.svg
rename to data/styles/legacy/style-yota/symbols/soccer.svg
diff --git a/data/styles/style-yota/symbols/speed_trap.svg b/data/styles/legacy/style-yota/symbols/speed_trap.svg
similarity index 100%
rename from data/styles/style-yota/symbols/speed_trap.svg
rename to data/styles/legacy/style-yota/symbols/speed_trap.svg
diff --git a/data/styles/style-yota/symbols/subway-station-l.svg b/data/styles/legacy/style-yota/symbols/subway-station-l.svg
similarity index 100%
rename from data/styles/style-yota/symbols/subway-station-l.svg
rename to data/styles/legacy/style-yota/symbols/subway-station-l.svg
diff --git a/data/styles/style-yota/symbols/subway-station-m.svg b/data/styles/legacy/style-yota/symbols/subway-station-m.svg
similarity index 100%
rename from data/styles/style-yota/symbols/subway-station-m.svg
rename to data/styles/legacy/style-yota/symbols/subway-station-m.svg
diff --git a/data/styles/style-yota/symbols/subway-station-s.svg b/data/styles/legacy/style-yota/symbols/subway-station-s.svg
similarity index 100%
rename from data/styles/style-yota/symbols/subway-station-s.svg
rename to data/styles/legacy/style-yota/symbols/subway-station-s.svg
diff --git a/data/styles/style-yota/symbols/subway.svg b/data/styles/legacy/style-yota/symbols/subway.svg
similarity index 100%
rename from data/styles/style-yota/symbols/subway.svg
rename to data/styles/legacy/style-yota/symbols/subway.svg
diff --git a/data/styles/style-yota/symbols/supermarket.svg b/data/styles/legacy/style-yota/symbols/supermarket.svg
similarity index 100%
rename from data/styles/style-yota/symbols/supermarket.svg
rename to data/styles/legacy/style-yota/symbols/supermarket.svg
diff --git a/data/styles/style-yota/symbols/survey_point.svg b/data/styles/legacy/style-yota/symbols/survey_point.svg
similarity index 100%
rename from data/styles/style-yota/symbols/survey_point.svg
rename to data/styles/legacy/style-yota/symbols/survey_point.svg
diff --git a/data/styles/style-yota/symbols/swimming-borderless.svg b/data/styles/legacy/style-yota/symbols/swimming-borderless.svg
similarity index 100%
rename from data/styles/style-yota/symbols/swimming-borderless.svg
rename to data/styles/legacy/style-yota/symbols/swimming-borderless.svg
diff --git a/data/styles/style-yota/symbols/swimming.svg b/data/styles/legacy/style-yota/symbols/swimming.svg
similarity index 100%
rename from data/styles/style-yota/symbols/swimming.svg
rename to data/styles/legacy/style-yota/symbols/swimming.svg
diff --git a/data/styles/style-yota/symbols/synagogue.svg b/data/styles/legacy/style-yota/symbols/synagogue.svg
similarity index 100%
rename from data/styles/style-yota/symbols/synagogue.svg
rename to data/styles/legacy/style-yota/symbols/synagogue.svg
diff --git a/data/styles/style-yota/symbols/taxi.svg b/data/styles/legacy/style-yota/symbols/taxi.svg
similarity index 100%
rename from data/styles/style-yota/symbols/taxi.svg
rename to data/styles/legacy/style-yota/symbols/taxi.svg
diff --git a/data/styles/style-yota/symbols/telephone.svg b/data/styles/legacy/style-yota/symbols/telephone.svg
similarity index 100%
rename from data/styles/style-yota/symbols/telephone.svg
rename to data/styles/legacy/style-yota/symbols/telephone.svg
diff --git a/data/styles/style-yota/symbols/tennis-borderless.svg b/data/styles/legacy/style-yota/symbols/tennis-borderless.svg
similarity index 100%
rename from data/styles/style-yota/symbols/tennis-borderless.svg
rename to data/styles/legacy/style-yota/symbols/tennis-borderless.svg
diff --git a/data/styles/style-yota/symbols/tennis.svg b/data/styles/legacy/style-yota/symbols/tennis.svg
similarity index 100%
rename from data/styles/style-yota/symbols/tennis.svg
rename to data/styles/legacy/style-yota/symbols/tennis.svg
diff --git a/data/styles/style-yota/symbols/theatre.svg b/data/styles/legacy/style-yota/symbols/theatre.svg
similarity index 100%
rename from data/styles/style-yota/symbols/theatre.svg
rename to data/styles/legacy/style-yota/symbols/theatre.svg
diff --git a/data/styles/style-yota/symbols/toilets.svg b/data/styles/legacy/style-yota/symbols/toilets.svg
similarity index 100%
rename from data/styles/style-yota/symbols/toilets.svg
rename to data/styles/legacy/style-yota/symbols/toilets.svg
diff --git a/data/styles/style-yota/symbols/traffic_signal.svg b/data/styles/legacy/style-yota/symbols/traffic_signal.svg
similarity index 100%
rename from data/styles/style-yota/symbols/traffic_signal.svg
rename to data/styles/legacy/style-yota/symbols/traffic_signal.svg
diff --git a/data/styles/style-yota/symbols/tramway-mini.svg b/data/styles/legacy/style-yota/symbols/tramway-mini.svg
similarity index 100%
rename from data/styles/style-yota/symbols/tramway-mini.svg
rename to data/styles/legacy/style-yota/symbols/tramway-mini.svg
diff --git a/data/styles/style-yota/symbols/tramway.svg b/data/styles/legacy/style-yota/symbols/tramway.svg
similarity index 100%
rename from data/styles/style-yota/symbols/tramway.svg
rename to data/styles/legacy/style-yota/symbols/tramway.svg
diff --git a/data/styles/style-yota/symbols/tree.svg b/data/styles/legacy/style-yota/symbols/tree.svg
similarity index 100%
rename from data/styles/style-yota/symbols/tree.svg
rename to data/styles/legacy/style-yota/symbols/tree.svg
diff --git a/data/styles/style-yota/symbols/university.svg b/data/styles/legacy/style-yota/symbols/university.svg
similarity index 100%
rename from data/styles/style-yota/symbols/university.svg
rename to data/styles/legacy/style-yota/symbols/university.svg
diff --git a/data/styles/style-yota/symbols/viewpoint.svg b/data/styles/legacy/style-yota/symbols/viewpoint.svg
similarity index 100%
rename from data/styles/style-yota/symbols/viewpoint.svg
rename to data/styles/legacy/style-yota/symbols/viewpoint.svg
diff --git a/data/styles/style-yota/symbols/vulcan.svg b/data/styles/legacy/style-yota/symbols/vulcan.svg
similarity index 100%
rename from data/styles/style-yota/symbols/vulcan.svg
rename to data/styles/legacy/style-yota/symbols/vulcan.svg
diff --git a/data/styles/style-yota/symbols/wastewater.svg b/data/styles/legacy/style-yota/symbols/wastewater.svg
similarity index 100%
rename from data/styles/style-yota/symbols/wastewater.svg
rename to data/styles/legacy/style-yota/symbols/wastewater.svg
diff --git a/data/styles/style-yota/symbols/waterfall.svg b/data/styles/legacy/style-yota/symbols/waterfall.svg
similarity index 100%
rename from data/styles/style-yota/symbols/waterfall.svg
rename to data/styles/legacy/style-yota/symbols/waterfall.svg
diff --git a/data/styles/style-yota/symbols/windmill.svg b/data/styles/legacy/style-yota/symbols/windmill.svg
similarity index 100%
rename from data/styles/style-yota/symbols/windmill.svg
rename to data/styles/legacy/style-yota/symbols/windmill.svg
diff --git a/data/styles/style-yota/yota/api-result.png b/data/styles/legacy/style-yota/yota/api-result.png
similarity index 100%
rename from data/styles/style-yota/yota/api-result.png
rename to data/styles/legacy/style-yota/yota/api-result.png
diff --git a/data/styles/style-yota/yota/compass-image.png b/data/styles/legacy/style-yota/yota/compass-image.png
similarity index 100%
rename from data/styles/style-yota/yota/compass-image.png
rename to data/styles/legacy/style-yota/yota/compass-image.png
diff --git a/data/styles/style-yota/yota/current-position-compas.png b/data/styles/legacy/style-yota/yota/current-position-compas.png
similarity index 100%
rename from data/styles/style-yota/yota/current-position-compas.png
rename to data/styles/legacy/style-yota/yota/current-position-compas.png
diff --git a/data/styles/style-yota/yota/current-position.png b/data/styles/legacy/style-yota/yota/current-position.png
similarity index 100%
rename from data/styles/style-yota/yota/current-position.png
rename to data/styles/legacy/style-yota/yota/current-position.png
diff --git a/data/styles/style-yota/yota/current-routing-compas.png b/data/styles/legacy/style-yota/yota/current-routing-compas.png
similarity index 100%
rename from data/styles/style-yota/yota/current-routing-compas.png
rename to data/styles/legacy/style-yota/yota/current-routing-compas.png
diff --git a/data/styles/style-yota/yota/placemark-blue.png b/data/styles/legacy/style-yota/yota/placemark-blue.png
similarity index 100%
rename from data/styles/style-yota/yota/placemark-blue.png
rename to data/styles/legacy/style-yota/yota/placemark-blue.png
diff --git a/data/styles/style-yota/yota/placemark-brown.png b/data/styles/legacy/style-yota/yota/placemark-brown.png
similarity index 100%
rename from data/styles/style-yota/yota/placemark-brown.png
rename to data/styles/legacy/style-yota/yota/placemark-brown.png
diff --git a/data/styles/style-yota/yota/placemark-green.png b/data/styles/legacy/style-yota/yota/placemark-green.png
similarity index 100%
rename from data/styles/style-yota/yota/placemark-green.png
rename to data/styles/legacy/style-yota/yota/placemark-green.png
diff --git a/data/styles/style-yota/yota/placemark-orange.png b/data/styles/legacy/style-yota/yota/placemark-orange.png
similarity index 100%
rename from data/styles/style-yota/yota/placemark-orange.png
rename to data/styles/legacy/style-yota/yota/placemark-orange.png
diff --git a/data/styles/style-yota/yota/placemark-pink.png b/data/styles/legacy/style-yota/yota/placemark-pink.png
similarity index 100%
rename from data/styles/style-yota/yota/placemark-pink.png
rename to data/styles/legacy/style-yota/yota/placemark-pink.png
diff --git a/data/styles/style-yota/yota/placemark-purple.png b/data/styles/legacy/style-yota/yota/placemark-purple.png
similarity index 100%
rename from data/styles/style-yota/yota/placemark-purple.png
rename to data/styles/legacy/style-yota/yota/placemark-purple.png
diff --git a/data/styles/style-yota/yota/placemark-red.png b/data/styles/legacy/style-yota/yota/placemark-red.png
similarity index 100%
rename from data/styles/style-yota/yota/placemark-red.png
rename to data/styles/legacy/style-yota/yota/placemark-red.png
diff --git a/data/styles/style-yota/yota/placemark-yellow.png b/data/styles/legacy/style-yota/yota/placemark-yellow.png
similarity index 100%
rename from data/styles/style-yota/yota/placemark-yellow.png
rename to data/styles/legacy/style-yota/yota/placemark-yellow.png
diff --git a/data/styles/style-yota/yota/route_from.png b/data/styles/legacy/style-yota/yota/route_from.png
similarity index 100%
rename from data/styles/style-yota/yota/route_from.png
rename to data/styles/legacy/style-yota/yota/route_from.png
diff --git a/data/styles/style-yota/yota/route_to.png b/data/styles/legacy/style-yota/yota/route_to.png
similarity index 100%
rename from data/styles/style-yota/yota/route_to.png
rename to data/styles/legacy/style-yota/yota/route_to.png
diff --git a/data/styles/style-yota/yota/search-result-active.png b/data/styles/legacy/style-yota/yota/search-result-active.png
similarity index 100%
rename from data/styles/style-yota/yota/search-result-active.png
rename to data/styles/legacy/style-yota/yota/search-result-active.png
diff --git a/data/styles/style-yota/yota/search-result.png b/data/styles/legacy/style-yota/yota/search-result.png
similarity index 100%
rename from data/styles/style-yota/yota/search-result.png
rename to data/styles/legacy/style-yota/yota/search-result.png