diff --git a/data/styles/clear/style-night/6plus/bookmark-animals-m.png b/data/styles/default/dark/6plus/bookmark-animals-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-animals-m.png
rename to data/styles/default/dark/6plus/bookmark-animals-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-bar-m.png b/data/styles/default/dark/6plus/bookmark-bar-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-bar-m.png
rename to data/styles/default/dark/6plus/bookmark-bar-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-bg-m.png b/data/styles/default/dark/6plus/bookmark-bg-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-bg-m.png
rename to data/styles/default/dark/6plus/bookmark-bg-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-bg-s.png b/data/styles/default/dark/6plus/bookmark-bg-s.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-bg-s.png
rename to data/styles/default/dark/6plus/bookmark-bg-s.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-bg-xs.png b/data/styles/default/dark/6plus/bookmark-bg-xs.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-bg-xs.png
rename to data/styles/default/dark/6plus/bookmark-bg-xs.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-buddhism-m.png b/data/styles/default/dark/6plus/bookmark-buddhism-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-buddhism-m.png
rename to data/styles/default/dark/6plus/bookmark-buddhism-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-building-m.png b/data/styles/default/dark/6plus/bookmark-building-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-building-m.png
rename to data/styles/default/dark/6plus/bookmark-building-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-christianity-m.png b/data/styles/default/dark/6plus/bookmark-christianity-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-christianity-m.png
rename to data/styles/default/dark/6plus/bookmark-christianity-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-default-m.png b/data/styles/default/dark/6plus/bookmark-default-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-default-m.png
rename to data/styles/default/dark/6plus/bookmark-default-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-default-s.png b/data/styles/default/dark/6plus/bookmark-default-s.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-default-s.png
rename to data/styles/default/dark/6plus/bookmark-default-s.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-default-xs.png b/data/styles/default/dark/6plus/bookmark-default-xs.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-default-xs.png
rename to data/styles/default/dark/6plus/bookmark-default-xs.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-entertainment-m.png b/data/styles/default/dark/6plus/bookmark-entertainment-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-entertainment-m.png
rename to data/styles/default/dark/6plus/bookmark-entertainment-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-exchange-m.png b/data/styles/default/dark/6plus/bookmark-exchange-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-exchange-m.png
rename to data/styles/default/dark/6plus/bookmark-exchange-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-finish-m.png b/data/styles/default/dark/6plus/bookmark-finish-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-finish-m.png
rename to data/styles/default/dark/6plus/bookmark-finish-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-food-m.png b/data/styles/default/dark/6plus/bookmark-food-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-food-m.png
rename to data/styles/default/dark/6plus/bookmark-food-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-gas-m.png b/data/styles/default/dark/6plus/bookmark-gas-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-gas-m.png
rename to data/styles/default/dark/6plus/bookmark-gas-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-hotel-m.png b/data/styles/default/dark/6plus/bookmark-hotel-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-hotel-m.png
rename to data/styles/default/dark/6plus/bookmark-hotel-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-islam-m.png b/data/styles/default/dark/6plus/bookmark-islam-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-islam-m.png
rename to data/styles/default/dark/6plus/bookmark-islam-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-judaism-m.png b/data/styles/default/dark/6plus/bookmark-judaism-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-judaism-m.png
rename to data/styles/default/dark/6plus/bookmark-judaism-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-medicine-m.png b/data/styles/default/dark/6plus/bookmark-medicine-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-medicine-m.png
rename to data/styles/default/dark/6plus/bookmark-medicine-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-mountain-m.png b/data/styles/default/dark/6plus/bookmark-mountain-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-mountain-m.png
rename to data/styles/default/dark/6plus/bookmark-mountain-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-museum-m.png b/data/styles/default/dark/6plus/bookmark-museum-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-museum-m.png
rename to data/styles/default/dark/6plus/bookmark-museum-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-park-m.png b/data/styles/default/dark/6plus/bookmark-park-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-park-m.png
rename to data/styles/default/dark/6plus/bookmark-park-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-parking-m.png b/data/styles/default/dark/6plus/bookmark-parking-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-parking-m.png
rename to data/styles/default/dark/6plus/bookmark-parking-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-shop-m.png b/data/styles/default/dark/6plus/bookmark-shop-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-shop-m.png
rename to data/styles/default/dark/6plus/bookmark-shop-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-sights-m.png b/data/styles/default/dark/6plus/bookmark-sights-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-sights-m.png
rename to data/styles/default/dark/6plus/bookmark-sights-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-sport-m.png b/data/styles/default/dark/6plus/bookmark-sport-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-sport-m.png
rename to data/styles/default/dark/6plus/bookmark-sport-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-start-m.png b/data/styles/default/dark/6plus/bookmark-start-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-start-m.png
rename to data/styles/default/dark/6plus/bookmark-start-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-swim-m.png b/data/styles/default/dark/6plus/bookmark-swim-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-swim-m.png
rename to data/styles/default/dark/6plus/bookmark-swim-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-transport-m.png b/data/styles/default/dark/6plus/bookmark-transport-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-transport-m.png
rename to data/styles/default/dark/6plus/bookmark-transport-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-viewpoint-m.png b/data/styles/default/dark/6plus/bookmark-viewpoint-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-viewpoint-m.png
rename to data/styles/default/dark/6plus/bookmark-viewpoint-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-water-m.png b/data/styles/default/dark/6plus/bookmark-water-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-water-m.png
rename to data/styles/default/dark/6plus/bookmark-water-m.png
diff --git a/data/styles/clear/style-clear/6plus/coloredmark-bg-l.png b/data/styles/default/dark/6plus/coloredmark-bg-l.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/coloredmark-bg-l.png
rename to data/styles/default/dark/6plus/coloredmark-bg-l.png
diff --git a/data/styles/clear/style-clear/6plus/coloredmark-bg-s.png b/data/styles/default/dark/6plus/coloredmark-bg-s.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/coloredmark-bg-s.png
rename to data/styles/default/dark/6plus/coloredmark-bg-s.png
diff --git a/data/styles/clear/style-night/6plus/coloredmark-default-l.png b/data/styles/default/dark/6plus/coloredmark-default-l.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/coloredmark-default-l.png
rename to data/styles/default/dark/6plus/coloredmark-default-l.png
diff --git a/data/styles/clear/style-clear/6plus/coloredmark-default-s.png b/data/styles/default/dark/6plus/coloredmark-default-s.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/coloredmark-default-s.png
rename to data/styles/default/dark/6plus/coloredmark-default-s.png
diff --git a/data/styles/clear/style-night/6plus/compass-image.png b/data/styles/default/dark/6plus/compass-image.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/compass-image.png
rename to data/styles/default/dark/6plus/compass-image.png
diff --git a/data/styles/clear/style-night/6plus/cross_geoposition.png b/data/styles/default/dark/6plus/cross_geoposition.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/cross_geoposition.png
rename to data/styles/default/dark/6plus/cross_geoposition.png
diff --git a/data/styles/clear/style-night/6plus/current-position.png b/data/styles/default/dark/6plus/current-position.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/current-position.png
rename to data/styles/default/dark/6plus/current-position.png
diff --git a/data/styles/clear/style-night/6plus/ferry.png b/data/styles/default/dark/6plus/ferry.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/ferry.png
rename to data/styles/default/dark/6plus/ferry.png
diff --git a/data/styles/clear/style-night/6plus/infosign.png b/data/styles/default/dark/6plus/infosign.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/infosign.png
rename to data/styles/default/dark/6plus/infosign.png
diff --git a/data/styles/clear/style-clear/6plus/non-found-search-result.png b/data/styles/default/dark/6plus/non-found-search-result.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/non-found-search-result.png
rename to data/styles/default/dark/6plus/non-found-search-result.png
diff --git a/data/styles/clear/style-clear/6plus/norating-bg-l.png b/data/styles/default/dark/6plus/norating-bg-l.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/norating-bg-l.png
rename to data/styles/default/dark/6plus/norating-bg-l.png
diff --git a/data/styles/clear/style-clear/6plus/norating-default-l.png b/data/styles/default/dark/6plus/norating-default-l.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/norating-default-l.png
rename to data/styles/default/dark/6plus/norating-default-l.png
diff --git a/data/styles/clear/style-night/6plus/paid_road.png b/data/styles/default/dark/6plus/paid_road.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/paid_road.png
rename to data/styles/default/dark/6plus/paid_road.png
diff --git a/data/styles/clear/style-clear/6plus/route-arrow.png b/data/styles/default/dark/6plus/route-arrow.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/route-arrow.png
rename to data/styles/default/dark/6plus/route-arrow.png
diff --git a/data/styles/clear/style-clear/6plus/route-point-1.png b/data/styles/default/dark/6plus/route-point-1.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/route-point-1.png
rename to data/styles/default/dark/6plus/route-point-1.png
diff --git a/data/styles/clear/style-clear/6plus/route-point-10.png b/data/styles/default/dark/6plus/route-point-10.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/route-point-10.png
rename to data/styles/default/dark/6plus/route-point-10.png
diff --git a/data/styles/clear/style-clear/6plus/route-point-11.png b/data/styles/default/dark/6plus/route-point-11.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/route-point-11.png
rename to data/styles/default/dark/6plus/route-point-11.png
diff --git a/data/styles/clear/style-clear/6plus/route-point-12.png b/data/styles/default/dark/6plus/route-point-12.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/route-point-12.png
rename to data/styles/default/dark/6plus/route-point-12.png
diff --git a/data/styles/clear/style-clear/6plus/route-point-13.png b/data/styles/default/dark/6plus/route-point-13.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/route-point-13.png
rename to data/styles/default/dark/6plus/route-point-13.png
diff --git a/data/styles/clear/style-clear/6plus/route-point-14.png b/data/styles/default/dark/6plus/route-point-14.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/route-point-14.png
rename to data/styles/default/dark/6plus/route-point-14.png
diff --git a/data/styles/clear/style-clear/6plus/route-point-15.png b/data/styles/default/dark/6plus/route-point-15.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/route-point-15.png
rename to data/styles/default/dark/6plus/route-point-15.png
diff --git a/data/styles/clear/style-clear/6plus/route-point-16.png b/data/styles/default/dark/6plus/route-point-16.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/route-point-16.png
rename to data/styles/default/dark/6plus/route-point-16.png
diff --git a/data/styles/clear/style-clear/6plus/route-point-17.png b/data/styles/default/dark/6plus/route-point-17.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/route-point-17.png
rename to data/styles/default/dark/6plus/route-point-17.png
diff --git a/data/styles/clear/style-clear/6plus/route-point-18.png b/data/styles/default/dark/6plus/route-point-18.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/route-point-18.png
rename to data/styles/default/dark/6plus/route-point-18.png
diff --git a/data/styles/clear/style-clear/6plus/route-point-19.png b/data/styles/default/dark/6plus/route-point-19.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/route-point-19.png
rename to data/styles/default/dark/6plus/route-point-19.png
diff --git a/data/styles/clear/style-clear/6plus/route-point-2.png b/data/styles/default/dark/6plus/route-point-2.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/route-point-2.png
rename to data/styles/default/dark/6plus/route-point-2.png
diff --git a/data/styles/clear/style-clear/6plus/route-point-20.png b/data/styles/default/dark/6plus/route-point-20.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/route-point-20.png
rename to data/styles/default/dark/6plus/route-point-20.png
diff --git a/data/styles/clear/style-clear/6plus/route-point-3.png b/data/styles/default/dark/6plus/route-point-3.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/route-point-3.png
rename to data/styles/default/dark/6plus/route-point-3.png
diff --git a/data/styles/clear/style-clear/6plus/route-point-4.png b/data/styles/default/dark/6plus/route-point-4.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/route-point-4.png
rename to data/styles/default/dark/6plus/route-point-4.png
diff --git a/data/styles/clear/style-clear/6plus/route-point-5.png b/data/styles/default/dark/6plus/route-point-5.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/route-point-5.png
rename to data/styles/default/dark/6plus/route-point-5.png
diff --git a/data/styles/clear/style-clear/6plus/route-point-6.png b/data/styles/default/dark/6plus/route-point-6.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/route-point-6.png
rename to data/styles/default/dark/6plus/route-point-6.png
diff --git a/data/styles/clear/style-clear/6plus/route-point-7.png b/data/styles/default/dark/6plus/route-point-7.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/route-point-7.png
rename to data/styles/default/dark/6plus/route-point-7.png
diff --git a/data/styles/clear/style-clear/6plus/route-point-8.png b/data/styles/default/dark/6plus/route-point-8.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/route-point-8.png
rename to data/styles/default/dark/6plus/route-point-8.png
diff --git a/data/styles/clear/style-clear/6plus/route-point-9.png b/data/styles/default/dark/6plus/route-point-9.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/route-point-9.png
rename to data/styles/default/dark/6plus/route-point-9.png
diff --git a/data/styles/clear/style-clear/6plus/route-point-finish.png b/data/styles/default/dark/6plus/route-point-finish.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/route-point-finish.png
rename to data/styles/default/dark/6plus/route-point-finish.png
diff --git a/data/styles/clear/style-clear/6plus/route-point-start.png b/data/styles/default/dark/6plus/route-point-start.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/route-point-start.png
rename to data/styles/default/dark/6plus/route-point-start.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-bakery.png b/data/styles/default/dark/6plus/search-result-bakery.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-bakery.png
rename to data/styles/default/dark/6plus/search-result-bakery.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-bar.png b/data/styles/default/dark/6plus/search-result-bar.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-bar.png
rename to data/styles/default/dark/6plus/search-result-bar.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-cafe.png b/data/styles/default/dark/6plus/search-result-cafe.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-cafe.png
rename to data/styles/default/dark/6plus/search-result-cafe.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-casino.png b/data/styles/default/dark/6plus/search-result-casino.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-casino.png
rename to data/styles/default/dark/6plus/search-result-casino.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-cinema.png b/data/styles/default/dark/6plus/search-result-cinema.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-cinema.png
rename to data/styles/default/dark/6plus/search-result-cinema.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-fastfood.png b/data/styles/default/dark/6plus/search-result-fastfood.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-fastfood.png
rename to data/styles/default/dark/6plus/search-result-fastfood.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-marketplace.png b/data/styles/default/dark/6plus/search-result-marketplace.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-marketplace.png
rename to data/styles/default/dark/6plus/search-result-marketplace.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-nightclub.png b/data/styles/default/dark/6plus/search-result-nightclub.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-nightclub.png
rename to data/styles/default/dark/6plus/search-result-nightclub.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-playground.png b/data/styles/default/dark/6plus/search-result-playground.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-playground.png
rename to data/styles/default/dark/6plus/search-result-playground.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-pub.png b/data/styles/default/dark/6plus/search-result-pub.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-pub.png
rename to data/styles/default/dark/6plus/search-result-pub.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-restaurant.png b/data/styles/default/dark/6plus/search-result-restaurant.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-restaurant.png
rename to data/styles/default/dark/6plus/search-result-restaurant.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-shop-alcohol.png b/data/styles/default/dark/6plus/search-result-shop-alcohol.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-shop-alcohol.png
rename to data/styles/default/dark/6plus/search-result-shop-alcohol.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-shop-butcher.png b/data/styles/default/dark/6plus/search-result-shop-butcher.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-shop-butcher.png
rename to data/styles/default/dark/6plus/search-result-shop-butcher.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-shop-clothes.png b/data/styles/default/dark/6plus/search-result-shop-clothes.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-shop-clothes.png
rename to data/styles/default/dark/6plus/search-result-shop-clothes.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-shop-confectionery.png b/data/styles/default/dark/6plus/search-result-shop-confectionery.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-shop-confectionery.png
rename to data/styles/default/dark/6plus/search-result-shop-confectionery.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-shop-convenience.png b/data/styles/default/dark/6plus/search-result-shop-convenience.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-shop-convenience.png
rename to data/styles/default/dark/6plus/search-result-shop-convenience.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-shop-cosmetics.png b/data/styles/default/dark/6plus/search-result-shop-cosmetics.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-shop-cosmetics.png
rename to data/styles/default/dark/6plus/search-result-shop-cosmetics.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-shop-department_store.png b/data/styles/default/dark/6plus/search-result-shop-department_store.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-shop-department_store.png
rename to data/styles/default/dark/6plus/search-result-shop-department_store.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-shop-gift.png b/data/styles/default/dark/6plus/search-result-shop-gift.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-shop-gift.png
rename to data/styles/default/dark/6plus/search-result-shop-gift.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-shop-greengrocer.png b/data/styles/default/dark/6plus/search-result-shop-greengrocer.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-shop-greengrocer.png
rename to data/styles/default/dark/6plus/search-result-shop-greengrocer.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-shop-jewelry.png b/data/styles/default/dark/6plus/search-result-shop-jewelry.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-shop-jewelry.png
rename to data/styles/default/dark/6plus/search-result-shop-jewelry.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-shop-mall.png b/data/styles/default/dark/6plus/search-result-shop-mall.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-shop-mall.png
rename to data/styles/default/dark/6plus/search-result-shop-mall.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-shop-seafood.png b/data/styles/default/dark/6plus/search-result-shop-seafood.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-shop-seafood.png
rename to data/styles/default/dark/6plus/search-result-shop-seafood.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-shop-shoes.png b/data/styles/default/dark/6plus/search-result-shop-shoes.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-shop-shoes.png
rename to data/styles/default/dark/6plus/search-result-shop-shoes.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-shop-sports.png b/data/styles/default/dark/6plus/search-result-shop-sports.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-shop-sports.png
rename to data/styles/default/dark/6plus/search-result-shop-sports.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-shop-supermarket.png b/data/styles/default/dark/6plus/search-result-shop-supermarket.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-shop-supermarket.png
rename to data/styles/default/dark/6plus/search-result-shop-supermarket.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-shop-toys.png b/data/styles/default/dark/6plus/search-result-shop-toys.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-shop-toys.png
rename to data/styles/default/dark/6plus/search-result-shop-toys.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-theme-park.png b/data/styles/default/dark/6plus/search-result-theme-park.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-theme-park.png
rename to data/styles/default/dark/6plus/search-result-theme-park.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-water-park.png b/data/styles/default/dark/6plus/search-result-water-park.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-water-park.png
rename to data/styles/default/dark/6plus/search-result-water-park.png
diff --git a/data/styles/clear/style-clear/6plus/search-result-zoo.png b/data/styles/default/dark/6plus/search-result-zoo.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result-zoo.png
rename to data/styles/default/dark/6plus/search-result-zoo.png
diff --git a/data/styles/clear/style-night/6plus/search-result.png b/data/styles/default/dark/6plus/search-result.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result.png
rename to data/styles/default/dark/6plus/search-result.png
diff --git a/data/styles/clear/style-night/6plus/shield-us-hw-thin-scaled.png b/data/styles/default/dark/6plus/shield-us-hw-thin-scaled.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/shield-us-hw-thin-scaled.png
rename to data/styles/default/dark/6plus/shield-us-hw-thin-scaled.png
diff --git a/data/styles/clear/style-night/6plus/shield-us-hw-thin.png b/data/styles/default/dark/6plus/shield-us-hw-thin.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/shield-us-hw-thin.png
rename to data/styles/default/dark/6plus/shield-us-hw-thin.png
diff --git a/data/styles/clear/style-night/6plus/shield-us-hw-wide-scaled.png b/data/styles/default/dark/6plus/shield-us-hw-wide-scaled.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/shield-us-hw-wide-scaled.png
rename to data/styles/default/dark/6plus/shield-us-hw-wide-scaled.png
diff --git a/data/styles/clear/style-night/6plus/shield-us-hw-wide.png b/data/styles/default/dark/6plus/shield-us-hw-wide.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/shield-us-hw-wide.png
rename to data/styles/default/dark/6plus/shield-us-hw-wide.png
diff --git a/data/styles/clear/style-clear/6plus/shield-us-i-thin-scaled.png b/data/styles/default/dark/6plus/shield-us-i-thin-scaled.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/shield-us-i-thin-scaled.png
rename to data/styles/default/dark/6plus/shield-us-i-thin-scaled.png
diff --git a/data/styles/clear/style-clear/6plus/shield-us-i-thin.png b/data/styles/default/dark/6plus/shield-us-i-thin.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/shield-us-i-thin.png
rename to data/styles/default/dark/6plus/shield-us-i-thin.png
diff --git a/data/styles/clear/style-clear/6plus/shield-us-i-wide-scaled.png b/data/styles/default/dark/6plus/shield-us-i-wide-scaled.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/shield-us-i-wide-scaled.png
rename to data/styles/default/dark/6plus/shield-us-i-wide-scaled.png
diff --git a/data/styles/clear/style-clear/6plus/shield-us-i-wide.png b/data/styles/default/dark/6plus/shield-us-i-wide.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/shield-us-i-wide.png
rename to data/styles/default/dark/6plus/shield-us-i-wide.png
diff --git a/data/styles/clear/style-night/6plus/track_marker_deselected.png b/data/styles/default/dark/6plus/track_marker_deselected.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/track_marker_deselected.png
rename to data/styles/default/dark/6plus/track_marker_deselected.png
diff --git a/data/styles/clear/style-night/6plus/track_marker_selected.png b/data/styles/default/dark/6plus/track_marker_selected.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/track_marker_selected.png
rename to data/styles/default/dark/6plus/track_marker_selected.png
diff --git a/data/styles/clear/style-night/6plus/unpaved_road.png b/data/styles/default/dark/6plus/unpaved_road.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/unpaved_road.png
rename to data/styles/default/dark/6plus/unpaved_road.png
diff --git a/data/styles/clear/style-night/colors.mapcss b/data/styles/default/dark/colors.mapcss
similarity index 100%
rename from data/styles/clear/style-night/colors.mapcss
rename to data/styles/default/dark/colors.mapcss
diff --git a/data/styles/clear/style-clear/hdpi-ad/keep.png b/data/styles/default/dark/hdpi-ad/keep.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi-ad/keep.png
rename to data/styles/default/dark/hdpi-ad/keep.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-animals-m.png b/data/styles/default/dark/hdpi/bookmark-animals-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-animals-m.png
rename to data/styles/default/dark/hdpi/bookmark-animals-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-bar-m.png b/data/styles/default/dark/hdpi/bookmark-bar-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-bar-m.png
rename to data/styles/default/dark/hdpi/bookmark-bar-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-bg-m.png b/data/styles/default/dark/hdpi/bookmark-bg-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-bg-m.png
rename to data/styles/default/dark/hdpi/bookmark-bg-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-bg-s.png b/data/styles/default/dark/hdpi/bookmark-bg-s.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-bg-s.png
rename to data/styles/default/dark/hdpi/bookmark-bg-s.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-bg-xs.png b/data/styles/default/dark/hdpi/bookmark-bg-xs.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-bg-xs.png
rename to data/styles/default/dark/hdpi/bookmark-bg-xs.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-buddhism-m.png b/data/styles/default/dark/hdpi/bookmark-buddhism-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-buddhism-m.png
rename to data/styles/default/dark/hdpi/bookmark-buddhism-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-building-m.png b/data/styles/default/dark/hdpi/bookmark-building-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-building-m.png
rename to data/styles/default/dark/hdpi/bookmark-building-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-christianity-m.png b/data/styles/default/dark/hdpi/bookmark-christianity-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-christianity-m.png
rename to data/styles/default/dark/hdpi/bookmark-christianity-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-default-m.png b/data/styles/default/dark/hdpi/bookmark-default-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-default-m.png
rename to data/styles/default/dark/hdpi/bookmark-default-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-default-s.png b/data/styles/default/dark/hdpi/bookmark-default-s.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-default-s.png
rename to data/styles/default/dark/hdpi/bookmark-default-s.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-default-xs.png b/data/styles/default/dark/hdpi/bookmark-default-xs.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-default-xs.png
rename to data/styles/default/dark/hdpi/bookmark-default-xs.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-entertainment-m.png b/data/styles/default/dark/hdpi/bookmark-entertainment-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-entertainment-m.png
rename to data/styles/default/dark/hdpi/bookmark-entertainment-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-exchange-m.png b/data/styles/default/dark/hdpi/bookmark-exchange-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-exchange-m.png
rename to data/styles/default/dark/hdpi/bookmark-exchange-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-finish-m.png b/data/styles/default/dark/hdpi/bookmark-finish-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-finish-m.png
rename to data/styles/default/dark/hdpi/bookmark-finish-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-food-m.png b/data/styles/default/dark/hdpi/bookmark-food-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-food-m.png
rename to data/styles/default/dark/hdpi/bookmark-food-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-gas-m.png b/data/styles/default/dark/hdpi/bookmark-gas-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-gas-m.png
rename to data/styles/default/dark/hdpi/bookmark-gas-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-hotel-m.png b/data/styles/default/dark/hdpi/bookmark-hotel-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-hotel-m.png
rename to data/styles/default/dark/hdpi/bookmark-hotel-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-islam-m.png b/data/styles/default/dark/hdpi/bookmark-islam-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-islam-m.png
rename to data/styles/default/dark/hdpi/bookmark-islam-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-judaism-m.png b/data/styles/default/dark/hdpi/bookmark-judaism-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-judaism-m.png
rename to data/styles/default/dark/hdpi/bookmark-judaism-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-medicine-m.png b/data/styles/default/dark/hdpi/bookmark-medicine-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-medicine-m.png
rename to data/styles/default/dark/hdpi/bookmark-medicine-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-mountain-m.png b/data/styles/default/dark/hdpi/bookmark-mountain-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-mountain-m.png
rename to data/styles/default/dark/hdpi/bookmark-mountain-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-museum-m.png b/data/styles/default/dark/hdpi/bookmark-museum-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-museum-m.png
rename to data/styles/default/dark/hdpi/bookmark-museum-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-park-m.png b/data/styles/default/dark/hdpi/bookmark-park-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-park-m.png
rename to data/styles/default/dark/hdpi/bookmark-park-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-parking-m.png b/data/styles/default/dark/hdpi/bookmark-parking-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-parking-m.png
rename to data/styles/default/dark/hdpi/bookmark-parking-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-shop-m.png b/data/styles/default/dark/hdpi/bookmark-shop-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-shop-m.png
rename to data/styles/default/dark/hdpi/bookmark-shop-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-sights-m.png b/data/styles/default/dark/hdpi/bookmark-sights-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-sights-m.png
rename to data/styles/default/dark/hdpi/bookmark-sights-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-sport-m.png b/data/styles/default/dark/hdpi/bookmark-sport-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-sport-m.png
rename to data/styles/default/dark/hdpi/bookmark-sport-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-start-m.png b/data/styles/default/dark/hdpi/bookmark-start-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-start-m.png
rename to data/styles/default/dark/hdpi/bookmark-start-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-swim-m.png b/data/styles/default/dark/hdpi/bookmark-swim-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-swim-m.png
rename to data/styles/default/dark/hdpi/bookmark-swim-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-transport-m.png b/data/styles/default/dark/hdpi/bookmark-transport-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-transport-m.png
rename to data/styles/default/dark/hdpi/bookmark-transport-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-viewpoint-m.png b/data/styles/default/dark/hdpi/bookmark-viewpoint-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-viewpoint-m.png
rename to data/styles/default/dark/hdpi/bookmark-viewpoint-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-water-m.png b/data/styles/default/dark/hdpi/bookmark-water-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-water-m.png
rename to data/styles/default/dark/hdpi/bookmark-water-m.png
diff --git a/data/styles/clear/style-clear/hdpi/coloredmark-bg-l.png b/data/styles/default/dark/hdpi/coloredmark-bg-l.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/coloredmark-bg-l.png
rename to data/styles/default/dark/hdpi/coloredmark-bg-l.png
diff --git a/data/styles/clear/style-clear/hdpi/coloredmark-bg-s.png b/data/styles/default/dark/hdpi/coloredmark-bg-s.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/coloredmark-bg-s.png
rename to data/styles/default/dark/hdpi/coloredmark-bg-s.png
diff --git a/data/styles/clear/style-night/hdpi/coloredmark-default-l.png b/data/styles/default/dark/hdpi/coloredmark-default-l.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/coloredmark-default-l.png
rename to data/styles/default/dark/hdpi/coloredmark-default-l.png
diff --git a/data/styles/clear/style-clear/hdpi/coloredmark-default-s.png b/data/styles/default/dark/hdpi/coloredmark-default-s.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/coloredmark-default-s.png
rename to data/styles/default/dark/hdpi/coloredmark-default-s.png
diff --git a/data/styles/clear/style-night/hdpi/compass-image.png b/data/styles/default/dark/hdpi/compass-image.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/compass-image.png
rename to data/styles/default/dark/hdpi/compass-image.png
diff --git a/data/styles/clear/style-night/hdpi/cross_geoposition.png b/data/styles/default/dark/hdpi/cross_geoposition.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/cross_geoposition.png
rename to data/styles/default/dark/hdpi/cross_geoposition.png
diff --git a/data/styles/clear/style-night/hdpi/current-position.png b/data/styles/default/dark/hdpi/current-position.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/current-position.png
rename to data/styles/default/dark/hdpi/current-position.png
diff --git a/data/styles/clear/style-night/hdpi/ferry.png b/data/styles/default/dark/hdpi/ferry.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/ferry.png
rename to data/styles/default/dark/hdpi/ferry.png
diff --git a/data/styles/clear/style-night/hdpi/infosign.png b/data/styles/default/dark/hdpi/infosign.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/infosign.png
rename to data/styles/default/dark/hdpi/infosign.png
diff --git a/data/styles/clear/style-clear/hdpi/non-found-search-result.png b/data/styles/default/dark/hdpi/non-found-search-result.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/non-found-search-result.png
rename to data/styles/default/dark/hdpi/non-found-search-result.png
diff --git a/data/styles/clear/style-clear/hdpi/norating-bg-l.png b/data/styles/default/dark/hdpi/norating-bg-l.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/norating-bg-l.png
rename to data/styles/default/dark/hdpi/norating-bg-l.png
diff --git a/data/styles/clear/style-clear/hdpi/norating-default-l.png b/data/styles/default/dark/hdpi/norating-default-l.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/norating-default-l.png
rename to data/styles/default/dark/hdpi/norating-default-l.png
diff --git a/data/styles/clear/style-night/hdpi/paid_road.png b/data/styles/default/dark/hdpi/paid_road.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/paid_road.png
rename to data/styles/default/dark/hdpi/paid_road.png
diff --git a/data/styles/clear/style-clear/hdpi/route-arrow.png b/data/styles/default/dark/hdpi/route-arrow.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/route-arrow.png
rename to data/styles/default/dark/hdpi/route-arrow.png
diff --git a/data/styles/clear/style-clear/hdpi/route-point-1.png b/data/styles/default/dark/hdpi/route-point-1.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/route-point-1.png
rename to data/styles/default/dark/hdpi/route-point-1.png
diff --git a/data/styles/clear/style-clear/hdpi/route-point-10.png b/data/styles/default/dark/hdpi/route-point-10.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/route-point-10.png
rename to data/styles/default/dark/hdpi/route-point-10.png
diff --git a/data/styles/clear/style-clear/hdpi/route-point-11.png b/data/styles/default/dark/hdpi/route-point-11.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/route-point-11.png
rename to data/styles/default/dark/hdpi/route-point-11.png
diff --git a/data/styles/clear/style-clear/hdpi/route-point-12.png b/data/styles/default/dark/hdpi/route-point-12.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/route-point-12.png
rename to data/styles/default/dark/hdpi/route-point-12.png
diff --git a/data/styles/clear/style-clear/hdpi/route-point-13.png b/data/styles/default/dark/hdpi/route-point-13.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/route-point-13.png
rename to data/styles/default/dark/hdpi/route-point-13.png
diff --git a/data/styles/clear/style-clear/hdpi/route-point-14.png b/data/styles/default/dark/hdpi/route-point-14.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/route-point-14.png
rename to data/styles/default/dark/hdpi/route-point-14.png
diff --git a/data/styles/clear/style-clear/hdpi/route-point-15.png b/data/styles/default/dark/hdpi/route-point-15.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/route-point-15.png
rename to data/styles/default/dark/hdpi/route-point-15.png
diff --git a/data/styles/clear/style-clear/hdpi/route-point-16.png b/data/styles/default/dark/hdpi/route-point-16.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/route-point-16.png
rename to data/styles/default/dark/hdpi/route-point-16.png
diff --git a/data/styles/clear/style-clear/hdpi/route-point-17.png b/data/styles/default/dark/hdpi/route-point-17.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/route-point-17.png
rename to data/styles/default/dark/hdpi/route-point-17.png
diff --git a/data/styles/clear/style-clear/hdpi/route-point-18.png b/data/styles/default/dark/hdpi/route-point-18.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/route-point-18.png
rename to data/styles/default/dark/hdpi/route-point-18.png
diff --git a/data/styles/clear/style-clear/hdpi/route-point-19.png b/data/styles/default/dark/hdpi/route-point-19.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/route-point-19.png
rename to data/styles/default/dark/hdpi/route-point-19.png
diff --git a/data/styles/clear/style-clear/hdpi/route-point-2.png b/data/styles/default/dark/hdpi/route-point-2.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/route-point-2.png
rename to data/styles/default/dark/hdpi/route-point-2.png
diff --git a/data/styles/clear/style-clear/hdpi/route-point-20.png b/data/styles/default/dark/hdpi/route-point-20.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/route-point-20.png
rename to data/styles/default/dark/hdpi/route-point-20.png
diff --git a/data/styles/clear/style-clear/hdpi/route-point-3.png b/data/styles/default/dark/hdpi/route-point-3.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/route-point-3.png
rename to data/styles/default/dark/hdpi/route-point-3.png
diff --git a/data/styles/clear/style-clear/hdpi/route-point-4.png b/data/styles/default/dark/hdpi/route-point-4.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/route-point-4.png
rename to data/styles/default/dark/hdpi/route-point-4.png
diff --git a/data/styles/clear/style-clear/hdpi/route-point-5.png b/data/styles/default/dark/hdpi/route-point-5.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/route-point-5.png
rename to data/styles/default/dark/hdpi/route-point-5.png
diff --git a/data/styles/clear/style-clear/hdpi/route-point-6.png b/data/styles/default/dark/hdpi/route-point-6.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/route-point-6.png
rename to data/styles/default/dark/hdpi/route-point-6.png
diff --git a/data/styles/clear/style-clear/hdpi/route-point-7.png b/data/styles/default/dark/hdpi/route-point-7.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/route-point-7.png
rename to data/styles/default/dark/hdpi/route-point-7.png
diff --git a/data/styles/clear/style-clear/hdpi/route-point-8.png b/data/styles/default/dark/hdpi/route-point-8.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/route-point-8.png
rename to data/styles/default/dark/hdpi/route-point-8.png
diff --git a/data/styles/clear/style-clear/hdpi/route-point-9.png b/data/styles/default/dark/hdpi/route-point-9.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/route-point-9.png
rename to data/styles/default/dark/hdpi/route-point-9.png
diff --git a/data/styles/clear/style-clear/hdpi/route-point-finish.png b/data/styles/default/dark/hdpi/route-point-finish.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/route-point-finish.png
rename to data/styles/default/dark/hdpi/route-point-finish.png
diff --git a/data/styles/clear/style-clear/hdpi/route-point-start.png b/data/styles/default/dark/hdpi/route-point-start.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/route-point-start.png
rename to data/styles/default/dark/hdpi/route-point-start.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-bakery.png b/data/styles/default/dark/hdpi/search-result-bakery.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-bakery.png
rename to data/styles/default/dark/hdpi/search-result-bakery.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-bar.png b/data/styles/default/dark/hdpi/search-result-bar.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-bar.png
rename to data/styles/default/dark/hdpi/search-result-bar.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-cafe.png b/data/styles/default/dark/hdpi/search-result-cafe.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-cafe.png
rename to data/styles/default/dark/hdpi/search-result-cafe.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-casino.png b/data/styles/default/dark/hdpi/search-result-casino.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-casino.png
rename to data/styles/default/dark/hdpi/search-result-casino.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-cinema.png b/data/styles/default/dark/hdpi/search-result-cinema.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-cinema.png
rename to data/styles/default/dark/hdpi/search-result-cinema.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-fastfood.png b/data/styles/default/dark/hdpi/search-result-fastfood.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-fastfood.png
rename to data/styles/default/dark/hdpi/search-result-fastfood.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-marketplace.png b/data/styles/default/dark/hdpi/search-result-marketplace.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-marketplace.png
rename to data/styles/default/dark/hdpi/search-result-marketplace.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-nightclub.png b/data/styles/default/dark/hdpi/search-result-nightclub.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-nightclub.png
rename to data/styles/default/dark/hdpi/search-result-nightclub.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-playground.png b/data/styles/default/dark/hdpi/search-result-playground.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-playground.png
rename to data/styles/default/dark/hdpi/search-result-playground.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-pub.png b/data/styles/default/dark/hdpi/search-result-pub.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-pub.png
rename to data/styles/default/dark/hdpi/search-result-pub.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-restaurant.png b/data/styles/default/dark/hdpi/search-result-restaurant.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-restaurant.png
rename to data/styles/default/dark/hdpi/search-result-restaurant.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-shop-alcohol.png b/data/styles/default/dark/hdpi/search-result-shop-alcohol.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-shop-alcohol.png
rename to data/styles/default/dark/hdpi/search-result-shop-alcohol.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-shop-butcher.png b/data/styles/default/dark/hdpi/search-result-shop-butcher.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-shop-butcher.png
rename to data/styles/default/dark/hdpi/search-result-shop-butcher.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-shop-clothes.png b/data/styles/default/dark/hdpi/search-result-shop-clothes.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-shop-clothes.png
rename to data/styles/default/dark/hdpi/search-result-shop-clothes.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-shop-confectionery.png b/data/styles/default/dark/hdpi/search-result-shop-confectionery.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-shop-confectionery.png
rename to data/styles/default/dark/hdpi/search-result-shop-confectionery.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-shop-convenience.png b/data/styles/default/dark/hdpi/search-result-shop-convenience.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-shop-convenience.png
rename to data/styles/default/dark/hdpi/search-result-shop-convenience.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-shop-cosmetics.png b/data/styles/default/dark/hdpi/search-result-shop-cosmetics.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-shop-cosmetics.png
rename to data/styles/default/dark/hdpi/search-result-shop-cosmetics.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-shop-department_store.png b/data/styles/default/dark/hdpi/search-result-shop-department_store.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-shop-department_store.png
rename to data/styles/default/dark/hdpi/search-result-shop-department_store.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-shop-gift.png b/data/styles/default/dark/hdpi/search-result-shop-gift.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-shop-gift.png
rename to data/styles/default/dark/hdpi/search-result-shop-gift.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-shop-greengrocer.png b/data/styles/default/dark/hdpi/search-result-shop-greengrocer.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-shop-greengrocer.png
rename to data/styles/default/dark/hdpi/search-result-shop-greengrocer.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-shop-jewelry.png b/data/styles/default/dark/hdpi/search-result-shop-jewelry.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-shop-jewelry.png
rename to data/styles/default/dark/hdpi/search-result-shop-jewelry.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-shop-mall.png b/data/styles/default/dark/hdpi/search-result-shop-mall.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-shop-mall.png
rename to data/styles/default/dark/hdpi/search-result-shop-mall.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-shop-seafood.png b/data/styles/default/dark/hdpi/search-result-shop-seafood.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-shop-seafood.png
rename to data/styles/default/dark/hdpi/search-result-shop-seafood.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-shop-shoes.png b/data/styles/default/dark/hdpi/search-result-shop-shoes.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-shop-shoes.png
rename to data/styles/default/dark/hdpi/search-result-shop-shoes.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-shop-sports.png b/data/styles/default/dark/hdpi/search-result-shop-sports.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-shop-sports.png
rename to data/styles/default/dark/hdpi/search-result-shop-sports.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-shop-supermarket.png b/data/styles/default/dark/hdpi/search-result-shop-supermarket.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-shop-supermarket.png
rename to data/styles/default/dark/hdpi/search-result-shop-supermarket.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-shop-toys.png b/data/styles/default/dark/hdpi/search-result-shop-toys.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-shop-toys.png
rename to data/styles/default/dark/hdpi/search-result-shop-toys.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-theme-park.png b/data/styles/default/dark/hdpi/search-result-theme-park.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-theme-park.png
rename to data/styles/default/dark/hdpi/search-result-theme-park.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-water-park.png b/data/styles/default/dark/hdpi/search-result-water-park.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-water-park.png
rename to data/styles/default/dark/hdpi/search-result-water-park.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result-zoo.png b/data/styles/default/dark/hdpi/search-result-zoo.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result-zoo.png
rename to data/styles/default/dark/hdpi/search-result-zoo.png
diff --git a/data/styles/clear/style-night/hdpi/search-result.png b/data/styles/default/dark/hdpi/search-result.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result.png
rename to data/styles/default/dark/hdpi/search-result.png
diff --git a/data/styles/clear/style-clear/hdpi/shield-us-hw-thin-scaled.png b/data/styles/default/dark/hdpi/shield-us-hw-thin-scaled.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/shield-us-hw-thin-scaled.png
rename to data/styles/default/dark/hdpi/shield-us-hw-thin-scaled.png
diff --git a/data/styles/clear/style-clear/hdpi/shield-us-hw-thin.png b/data/styles/default/dark/hdpi/shield-us-hw-thin.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/shield-us-hw-thin.png
rename to data/styles/default/dark/hdpi/shield-us-hw-thin.png
diff --git a/data/styles/clear/style-clear/hdpi/shield-us-hw-wide-scaled.png b/data/styles/default/dark/hdpi/shield-us-hw-wide-scaled.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/shield-us-hw-wide-scaled.png
rename to data/styles/default/dark/hdpi/shield-us-hw-wide-scaled.png
diff --git a/data/styles/clear/style-clear/hdpi/shield-us-hw-wide.png b/data/styles/default/dark/hdpi/shield-us-hw-wide.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/shield-us-hw-wide.png
rename to data/styles/default/dark/hdpi/shield-us-hw-wide.png
diff --git a/data/styles/clear/style-clear/hdpi/shield-us-i-thin-scaled.png b/data/styles/default/dark/hdpi/shield-us-i-thin-scaled.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/shield-us-i-thin-scaled.png
rename to data/styles/default/dark/hdpi/shield-us-i-thin-scaled.png
diff --git a/data/styles/clear/style-clear/hdpi/shield-us-i-thin.png b/data/styles/default/dark/hdpi/shield-us-i-thin.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/shield-us-i-thin.png
rename to data/styles/default/dark/hdpi/shield-us-i-thin.png
diff --git a/data/styles/clear/style-clear/hdpi/shield-us-i-wide-scaled.png b/data/styles/default/dark/hdpi/shield-us-i-wide-scaled.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/shield-us-i-wide-scaled.png
rename to data/styles/default/dark/hdpi/shield-us-i-wide-scaled.png
diff --git a/data/styles/clear/style-clear/hdpi/shield-us-i-wide.png b/data/styles/default/dark/hdpi/shield-us-i-wide.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/shield-us-i-wide.png
rename to data/styles/default/dark/hdpi/shield-us-i-wide.png
diff --git a/data/styles/clear/style-night/hdpi/track_marker_deselected.png b/data/styles/default/dark/hdpi/track_marker_deselected.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/track_marker_deselected.png
rename to data/styles/default/dark/hdpi/track_marker_deselected.png
diff --git a/data/styles/clear/style-night/hdpi/track_marker_selected.png b/data/styles/default/dark/hdpi/track_marker_selected.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/track_marker_selected.png
rename to data/styles/default/dark/hdpi/track_marker_selected.png
diff --git a/data/styles/clear/style-night/hdpi/unpaved_road.png b/data/styles/default/dark/hdpi/unpaved_road.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/unpaved_road.png
rename to data/styles/default/dark/hdpi/unpaved_road.png
diff --git a/data/styles/clear/style-clear/mdpi-ad/keep.png b/data/styles/default/dark/mdpi-ad/keep.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi-ad/keep.png
rename to data/styles/default/dark/mdpi-ad/keep.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-animals-m.png b/data/styles/default/dark/mdpi/bookmark-animals-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-animals-m.png
rename to data/styles/default/dark/mdpi/bookmark-animals-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-bar-m.png b/data/styles/default/dark/mdpi/bookmark-bar-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-bar-m.png
rename to data/styles/default/dark/mdpi/bookmark-bar-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-bg-m.png b/data/styles/default/dark/mdpi/bookmark-bg-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-bg-m.png
rename to data/styles/default/dark/mdpi/bookmark-bg-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-bg-s.png b/data/styles/default/dark/mdpi/bookmark-bg-s.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-bg-s.png
rename to data/styles/default/dark/mdpi/bookmark-bg-s.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-bg-xs.png b/data/styles/default/dark/mdpi/bookmark-bg-xs.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-bg-xs.png
rename to data/styles/default/dark/mdpi/bookmark-bg-xs.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-buddhism-m.png b/data/styles/default/dark/mdpi/bookmark-buddhism-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-buddhism-m.png
rename to data/styles/default/dark/mdpi/bookmark-buddhism-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-building-m.png b/data/styles/default/dark/mdpi/bookmark-building-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-building-m.png
rename to data/styles/default/dark/mdpi/bookmark-building-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-christianity-m.png b/data/styles/default/dark/mdpi/bookmark-christianity-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-christianity-m.png
rename to data/styles/default/dark/mdpi/bookmark-christianity-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-default-m.png b/data/styles/default/dark/mdpi/bookmark-default-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-default-m.png
rename to data/styles/default/dark/mdpi/bookmark-default-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-default-s.png b/data/styles/default/dark/mdpi/bookmark-default-s.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-default-s.png
rename to data/styles/default/dark/mdpi/bookmark-default-s.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-default-xs.png b/data/styles/default/dark/mdpi/bookmark-default-xs.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-default-xs.png
rename to data/styles/default/dark/mdpi/bookmark-default-xs.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-entertainment-m.png b/data/styles/default/dark/mdpi/bookmark-entertainment-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-entertainment-m.png
rename to data/styles/default/dark/mdpi/bookmark-entertainment-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-exchange-m.png b/data/styles/default/dark/mdpi/bookmark-exchange-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-exchange-m.png
rename to data/styles/default/dark/mdpi/bookmark-exchange-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-finish-m.png b/data/styles/default/dark/mdpi/bookmark-finish-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-finish-m.png
rename to data/styles/default/dark/mdpi/bookmark-finish-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-food-m.png b/data/styles/default/dark/mdpi/bookmark-food-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-food-m.png
rename to data/styles/default/dark/mdpi/bookmark-food-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-gas-m.png b/data/styles/default/dark/mdpi/bookmark-gas-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-gas-m.png
rename to data/styles/default/dark/mdpi/bookmark-gas-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-hotel-m.png b/data/styles/default/dark/mdpi/bookmark-hotel-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-hotel-m.png
rename to data/styles/default/dark/mdpi/bookmark-hotel-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-islam-m.png b/data/styles/default/dark/mdpi/bookmark-islam-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-islam-m.png
rename to data/styles/default/dark/mdpi/bookmark-islam-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-judaism-m.png b/data/styles/default/dark/mdpi/bookmark-judaism-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-judaism-m.png
rename to data/styles/default/dark/mdpi/bookmark-judaism-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-medicine-m.png b/data/styles/default/dark/mdpi/bookmark-medicine-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-medicine-m.png
rename to data/styles/default/dark/mdpi/bookmark-medicine-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-mountain-m.png b/data/styles/default/dark/mdpi/bookmark-mountain-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-mountain-m.png
rename to data/styles/default/dark/mdpi/bookmark-mountain-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-museum-m.png b/data/styles/default/dark/mdpi/bookmark-museum-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-museum-m.png
rename to data/styles/default/dark/mdpi/bookmark-museum-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-park-m.png b/data/styles/default/dark/mdpi/bookmark-park-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-park-m.png
rename to data/styles/default/dark/mdpi/bookmark-park-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-parking-m.png b/data/styles/default/dark/mdpi/bookmark-parking-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-parking-m.png
rename to data/styles/default/dark/mdpi/bookmark-parking-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-shop-m.png b/data/styles/default/dark/mdpi/bookmark-shop-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-shop-m.png
rename to data/styles/default/dark/mdpi/bookmark-shop-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-sights-m.png b/data/styles/default/dark/mdpi/bookmark-sights-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-sights-m.png
rename to data/styles/default/dark/mdpi/bookmark-sights-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-sport-m.png b/data/styles/default/dark/mdpi/bookmark-sport-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-sport-m.png
rename to data/styles/default/dark/mdpi/bookmark-sport-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-start-m.png b/data/styles/default/dark/mdpi/bookmark-start-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-start-m.png
rename to data/styles/default/dark/mdpi/bookmark-start-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-swim-m.png b/data/styles/default/dark/mdpi/bookmark-swim-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-swim-m.png
rename to data/styles/default/dark/mdpi/bookmark-swim-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-transport-m.png b/data/styles/default/dark/mdpi/bookmark-transport-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-transport-m.png
rename to data/styles/default/dark/mdpi/bookmark-transport-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-viewpoint-m.png b/data/styles/default/dark/mdpi/bookmark-viewpoint-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-viewpoint-m.png
rename to data/styles/default/dark/mdpi/bookmark-viewpoint-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-water-m.png b/data/styles/default/dark/mdpi/bookmark-water-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-water-m.png
rename to data/styles/default/dark/mdpi/bookmark-water-m.png
diff --git a/data/styles/clear/style-clear/mdpi/coloredmark-bg-l.png b/data/styles/default/dark/mdpi/coloredmark-bg-l.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/coloredmark-bg-l.png
rename to data/styles/default/dark/mdpi/coloredmark-bg-l.png
diff --git a/data/styles/clear/style-clear/mdpi/coloredmark-bg-s.png b/data/styles/default/dark/mdpi/coloredmark-bg-s.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/coloredmark-bg-s.png
rename to data/styles/default/dark/mdpi/coloredmark-bg-s.png
diff --git a/data/styles/clear/style-night/mdpi/coloredmark-default-l.png b/data/styles/default/dark/mdpi/coloredmark-default-l.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/coloredmark-default-l.png
rename to data/styles/default/dark/mdpi/coloredmark-default-l.png
diff --git a/data/styles/clear/style-clear/mdpi/coloredmark-default-s.png b/data/styles/default/dark/mdpi/coloredmark-default-s.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/coloredmark-default-s.png
rename to data/styles/default/dark/mdpi/coloredmark-default-s.png
diff --git a/data/styles/clear/style-night/mdpi/compass-image.png b/data/styles/default/dark/mdpi/compass-image.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/compass-image.png
rename to data/styles/default/dark/mdpi/compass-image.png
diff --git a/data/styles/clear/style-night/mdpi/cross_geoposition.png b/data/styles/default/dark/mdpi/cross_geoposition.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/cross_geoposition.png
rename to data/styles/default/dark/mdpi/cross_geoposition.png
diff --git a/data/styles/clear/style-night/mdpi/current-position.png b/data/styles/default/dark/mdpi/current-position.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/current-position.png
rename to data/styles/default/dark/mdpi/current-position.png
diff --git a/data/styles/clear/style-night/mdpi/ferry.png b/data/styles/default/dark/mdpi/ferry.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/ferry.png
rename to data/styles/default/dark/mdpi/ferry.png
diff --git a/data/styles/clear/style-night/mdpi/infosign.png b/data/styles/default/dark/mdpi/infosign.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/infosign.png
rename to data/styles/default/dark/mdpi/infosign.png
diff --git a/data/styles/clear/style-clear/mdpi/non-found-search-result.png b/data/styles/default/dark/mdpi/non-found-search-result.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/non-found-search-result.png
rename to data/styles/default/dark/mdpi/non-found-search-result.png
diff --git a/data/styles/clear/style-clear/mdpi/norating-bg-l.png b/data/styles/default/dark/mdpi/norating-bg-l.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/norating-bg-l.png
rename to data/styles/default/dark/mdpi/norating-bg-l.png
diff --git a/data/styles/clear/style-clear/mdpi/norating-default-l.png b/data/styles/default/dark/mdpi/norating-default-l.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/norating-default-l.png
rename to data/styles/default/dark/mdpi/norating-default-l.png
diff --git a/data/styles/clear/style-night/mdpi/paid_road.png b/data/styles/default/dark/mdpi/paid_road.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/paid_road.png
rename to data/styles/default/dark/mdpi/paid_road.png
diff --git a/data/styles/clear/style-clear/mdpi/route-arrow.png b/data/styles/default/dark/mdpi/route-arrow.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/route-arrow.png
rename to data/styles/default/dark/mdpi/route-arrow.png
diff --git a/data/styles/clear/style-clear/mdpi/route-point-1.png b/data/styles/default/dark/mdpi/route-point-1.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/route-point-1.png
rename to data/styles/default/dark/mdpi/route-point-1.png
diff --git a/data/styles/clear/style-clear/mdpi/route-point-10.png b/data/styles/default/dark/mdpi/route-point-10.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/route-point-10.png
rename to data/styles/default/dark/mdpi/route-point-10.png
diff --git a/data/styles/clear/style-clear/mdpi/route-point-11.png b/data/styles/default/dark/mdpi/route-point-11.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/route-point-11.png
rename to data/styles/default/dark/mdpi/route-point-11.png
diff --git a/data/styles/clear/style-clear/mdpi/route-point-12.png b/data/styles/default/dark/mdpi/route-point-12.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/route-point-12.png
rename to data/styles/default/dark/mdpi/route-point-12.png
diff --git a/data/styles/clear/style-clear/mdpi/route-point-13.png b/data/styles/default/dark/mdpi/route-point-13.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/route-point-13.png
rename to data/styles/default/dark/mdpi/route-point-13.png
diff --git a/data/styles/clear/style-clear/mdpi/route-point-14.png b/data/styles/default/dark/mdpi/route-point-14.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/route-point-14.png
rename to data/styles/default/dark/mdpi/route-point-14.png
diff --git a/data/styles/clear/style-clear/mdpi/route-point-15.png b/data/styles/default/dark/mdpi/route-point-15.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/route-point-15.png
rename to data/styles/default/dark/mdpi/route-point-15.png
diff --git a/data/styles/clear/style-clear/mdpi/route-point-16.png b/data/styles/default/dark/mdpi/route-point-16.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/route-point-16.png
rename to data/styles/default/dark/mdpi/route-point-16.png
diff --git a/data/styles/clear/style-clear/mdpi/route-point-17.png b/data/styles/default/dark/mdpi/route-point-17.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/route-point-17.png
rename to data/styles/default/dark/mdpi/route-point-17.png
diff --git a/data/styles/clear/style-clear/mdpi/route-point-18.png b/data/styles/default/dark/mdpi/route-point-18.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/route-point-18.png
rename to data/styles/default/dark/mdpi/route-point-18.png
diff --git a/data/styles/clear/style-clear/mdpi/route-point-19.png b/data/styles/default/dark/mdpi/route-point-19.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/route-point-19.png
rename to data/styles/default/dark/mdpi/route-point-19.png
diff --git a/data/styles/clear/style-clear/mdpi/route-point-2.png b/data/styles/default/dark/mdpi/route-point-2.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/route-point-2.png
rename to data/styles/default/dark/mdpi/route-point-2.png
diff --git a/data/styles/clear/style-clear/mdpi/route-point-20.png b/data/styles/default/dark/mdpi/route-point-20.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/route-point-20.png
rename to data/styles/default/dark/mdpi/route-point-20.png
diff --git a/data/styles/clear/style-clear/mdpi/route-point-3.png b/data/styles/default/dark/mdpi/route-point-3.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/route-point-3.png
rename to data/styles/default/dark/mdpi/route-point-3.png
diff --git a/data/styles/clear/style-clear/mdpi/route-point-4.png b/data/styles/default/dark/mdpi/route-point-4.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/route-point-4.png
rename to data/styles/default/dark/mdpi/route-point-4.png
diff --git a/data/styles/clear/style-clear/mdpi/route-point-5.png b/data/styles/default/dark/mdpi/route-point-5.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/route-point-5.png
rename to data/styles/default/dark/mdpi/route-point-5.png
diff --git a/data/styles/clear/style-clear/mdpi/route-point-6.png b/data/styles/default/dark/mdpi/route-point-6.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/route-point-6.png
rename to data/styles/default/dark/mdpi/route-point-6.png
diff --git a/data/styles/clear/style-clear/mdpi/route-point-7.png b/data/styles/default/dark/mdpi/route-point-7.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/route-point-7.png
rename to data/styles/default/dark/mdpi/route-point-7.png
diff --git a/data/styles/clear/style-clear/mdpi/route-point-8.png b/data/styles/default/dark/mdpi/route-point-8.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/route-point-8.png
rename to data/styles/default/dark/mdpi/route-point-8.png
diff --git a/data/styles/clear/style-clear/mdpi/route-point-9.png b/data/styles/default/dark/mdpi/route-point-9.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/route-point-9.png
rename to data/styles/default/dark/mdpi/route-point-9.png
diff --git a/data/styles/clear/style-clear/mdpi/route-point-finish.png b/data/styles/default/dark/mdpi/route-point-finish.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/route-point-finish.png
rename to data/styles/default/dark/mdpi/route-point-finish.png
diff --git a/data/styles/clear/style-clear/mdpi/route-point-start.png b/data/styles/default/dark/mdpi/route-point-start.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/route-point-start.png
rename to data/styles/default/dark/mdpi/route-point-start.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-bakery.png b/data/styles/default/dark/mdpi/search-result-bakery.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-bakery.png
rename to data/styles/default/dark/mdpi/search-result-bakery.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-bar.png b/data/styles/default/dark/mdpi/search-result-bar.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-bar.png
rename to data/styles/default/dark/mdpi/search-result-bar.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-cafe.png b/data/styles/default/dark/mdpi/search-result-cafe.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-cafe.png
rename to data/styles/default/dark/mdpi/search-result-cafe.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-casino.png b/data/styles/default/dark/mdpi/search-result-casino.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-casino.png
rename to data/styles/default/dark/mdpi/search-result-casino.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-cinema.png b/data/styles/default/dark/mdpi/search-result-cinema.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-cinema.png
rename to data/styles/default/dark/mdpi/search-result-cinema.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-fastfood.png b/data/styles/default/dark/mdpi/search-result-fastfood.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-fastfood.png
rename to data/styles/default/dark/mdpi/search-result-fastfood.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-marketplace.png b/data/styles/default/dark/mdpi/search-result-marketplace.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-marketplace.png
rename to data/styles/default/dark/mdpi/search-result-marketplace.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-nightclub.png b/data/styles/default/dark/mdpi/search-result-nightclub.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-nightclub.png
rename to data/styles/default/dark/mdpi/search-result-nightclub.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-playground.png b/data/styles/default/dark/mdpi/search-result-playground.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-playground.png
rename to data/styles/default/dark/mdpi/search-result-playground.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-pub.png b/data/styles/default/dark/mdpi/search-result-pub.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-pub.png
rename to data/styles/default/dark/mdpi/search-result-pub.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-restaurant.png b/data/styles/default/dark/mdpi/search-result-restaurant.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-restaurant.png
rename to data/styles/default/dark/mdpi/search-result-restaurant.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-shop-alcohol.png b/data/styles/default/dark/mdpi/search-result-shop-alcohol.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-shop-alcohol.png
rename to data/styles/default/dark/mdpi/search-result-shop-alcohol.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-shop-butcher.png b/data/styles/default/dark/mdpi/search-result-shop-butcher.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-shop-butcher.png
rename to data/styles/default/dark/mdpi/search-result-shop-butcher.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-shop-clothes.png b/data/styles/default/dark/mdpi/search-result-shop-clothes.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-shop-clothes.png
rename to data/styles/default/dark/mdpi/search-result-shop-clothes.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-shop-confectionery.png b/data/styles/default/dark/mdpi/search-result-shop-confectionery.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-shop-confectionery.png
rename to data/styles/default/dark/mdpi/search-result-shop-confectionery.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-shop-convenience.png b/data/styles/default/dark/mdpi/search-result-shop-convenience.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-shop-convenience.png
rename to data/styles/default/dark/mdpi/search-result-shop-convenience.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-shop-cosmetics.png b/data/styles/default/dark/mdpi/search-result-shop-cosmetics.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-shop-cosmetics.png
rename to data/styles/default/dark/mdpi/search-result-shop-cosmetics.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-shop-department_store.png b/data/styles/default/dark/mdpi/search-result-shop-department_store.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-shop-department_store.png
rename to data/styles/default/dark/mdpi/search-result-shop-department_store.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-shop-gift.png b/data/styles/default/dark/mdpi/search-result-shop-gift.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-shop-gift.png
rename to data/styles/default/dark/mdpi/search-result-shop-gift.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-shop-greengrocer.png b/data/styles/default/dark/mdpi/search-result-shop-greengrocer.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-shop-greengrocer.png
rename to data/styles/default/dark/mdpi/search-result-shop-greengrocer.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-shop-jewelry.png b/data/styles/default/dark/mdpi/search-result-shop-jewelry.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-shop-jewelry.png
rename to data/styles/default/dark/mdpi/search-result-shop-jewelry.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-shop-mall.png b/data/styles/default/dark/mdpi/search-result-shop-mall.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-shop-mall.png
rename to data/styles/default/dark/mdpi/search-result-shop-mall.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-shop-seafood.png b/data/styles/default/dark/mdpi/search-result-shop-seafood.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-shop-seafood.png
rename to data/styles/default/dark/mdpi/search-result-shop-seafood.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-shop-shoes.png b/data/styles/default/dark/mdpi/search-result-shop-shoes.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-shop-shoes.png
rename to data/styles/default/dark/mdpi/search-result-shop-shoes.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-shop-sports.png b/data/styles/default/dark/mdpi/search-result-shop-sports.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-shop-sports.png
rename to data/styles/default/dark/mdpi/search-result-shop-sports.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-shop-supermarket.png b/data/styles/default/dark/mdpi/search-result-shop-supermarket.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-shop-supermarket.png
rename to data/styles/default/dark/mdpi/search-result-shop-supermarket.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-shop-toys.png b/data/styles/default/dark/mdpi/search-result-shop-toys.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-shop-toys.png
rename to data/styles/default/dark/mdpi/search-result-shop-toys.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-theme-park.png b/data/styles/default/dark/mdpi/search-result-theme-park.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-theme-park.png
rename to data/styles/default/dark/mdpi/search-result-theme-park.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-water-park.png b/data/styles/default/dark/mdpi/search-result-water-park.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-water-park.png
rename to data/styles/default/dark/mdpi/search-result-water-park.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result-zoo.png b/data/styles/default/dark/mdpi/search-result-zoo.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result-zoo.png
rename to data/styles/default/dark/mdpi/search-result-zoo.png
diff --git a/data/styles/clear/style-night/mdpi/search-result.png b/data/styles/default/dark/mdpi/search-result.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result.png
rename to data/styles/default/dark/mdpi/search-result.png
diff --git a/data/styles/clear/style-clear/mdpi/shield-us-hw-thin-scaled.png b/data/styles/default/dark/mdpi/shield-us-hw-thin-scaled.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/shield-us-hw-thin-scaled.png
rename to data/styles/default/dark/mdpi/shield-us-hw-thin-scaled.png
diff --git a/data/styles/clear/style-clear/mdpi/shield-us-hw-thin.png b/data/styles/default/dark/mdpi/shield-us-hw-thin.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/shield-us-hw-thin.png
rename to data/styles/default/dark/mdpi/shield-us-hw-thin.png
diff --git a/data/styles/clear/style-clear/mdpi/shield-us-hw-wide-scaled.png b/data/styles/default/dark/mdpi/shield-us-hw-wide-scaled.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/shield-us-hw-wide-scaled.png
rename to data/styles/default/dark/mdpi/shield-us-hw-wide-scaled.png
diff --git a/data/styles/clear/style-clear/mdpi/shield-us-hw-wide.png b/data/styles/default/dark/mdpi/shield-us-hw-wide.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/shield-us-hw-wide.png
rename to data/styles/default/dark/mdpi/shield-us-hw-wide.png
diff --git a/data/styles/clear/style-clear/mdpi/shield-us-i-thin-scaled.png b/data/styles/default/dark/mdpi/shield-us-i-thin-scaled.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/shield-us-i-thin-scaled.png
rename to data/styles/default/dark/mdpi/shield-us-i-thin-scaled.png
diff --git a/data/styles/clear/style-clear/mdpi/shield-us-i-thin.png b/data/styles/default/dark/mdpi/shield-us-i-thin.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/shield-us-i-thin.png
rename to data/styles/default/dark/mdpi/shield-us-i-thin.png
diff --git a/data/styles/clear/style-clear/mdpi/shield-us-i-wide-scaled.png b/data/styles/default/dark/mdpi/shield-us-i-wide-scaled.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/shield-us-i-wide-scaled.png
rename to data/styles/default/dark/mdpi/shield-us-i-wide-scaled.png
diff --git a/data/styles/clear/style-clear/mdpi/shield-us-i-wide.png b/data/styles/default/dark/mdpi/shield-us-i-wide.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/shield-us-i-wide.png
rename to data/styles/default/dark/mdpi/shield-us-i-wide.png
diff --git a/data/styles/clear/style-night/mdpi/track_marker_deselected.png b/data/styles/default/dark/mdpi/track_marker_deselected.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/track_marker_deselected.png
rename to data/styles/default/dark/mdpi/track_marker_deselected.png
diff --git a/data/styles/clear/style-night/mdpi/track_marker_selected.png b/data/styles/default/dark/mdpi/track_marker_selected.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/track_marker_selected.png
rename to data/styles/default/dark/mdpi/track_marker_selected.png
diff --git a/data/styles/clear/style-night/mdpi/unpaved_road.png b/data/styles/default/dark/mdpi/unpaved_road.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/unpaved_road.png
rename to data/styles/default/dark/mdpi/unpaved_road.png
diff --git a/data/styles/clear/style-night/style.mapcss b/data/styles/default/dark/style.mapcss
similarity index 100%
rename from data/styles/clear/style-night/style.mapcss
rename to data/styles/default/dark/style.mapcss
diff --git a/data/styles/clear/style-clear/symbols-ad/00000_keep.svg b/data/styles/default/dark/symbols-ad/00000_keep.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols-ad/00000_keep.svg
rename to data/styles/default/dark/symbols-ad/00000_keep.svg
diff --git a/data/styles/clear/style-night/symbols/aircraft-m.svg b/data/styles/default/dark/symbols/aircraft-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/aircraft-m.svg
rename to data/styles/default/dark/symbols/aircraft-m.svg
diff --git a/data/styles/clear/style-night/symbols/airport-m.svg b/data/styles/default/dark/symbols/airport-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/airport-m.svg
rename to data/styles/default/dark/symbols/airport-m.svg
diff --git a/data/styles/clear/style-night/symbols/airport-s.svg b/data/styles/default/dark/symbols/airport-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/airport-s.svg
rename to data/styles/default/dark/symbols/airport-s.svg
diff --git a/data/styles/clear/style-night/symbols/airport_gate-m.svg b/data/styles/default/dark/symbols/airport_gate-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/airport_gate-m.svg
rename to data/styles/default/dark/symbols/airport_gate-m.svg
diff --git a/data/styles/clear/style-night/symbols/alcohol-m.svg b/data/styles/default/dark/symbols/alcohol-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/alcohol-m.svg
rename to data/styles/default/dark/symbols/alcohol-m.svg
diff --git a/data/styles/clear/style-night/symbols/alpine_hut-m.svg b/data/styles/default/dark/symbols/alpine_hut-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/alpine_hut-m.svg
rename to data/styles/default/dark/symbols/alpine_hut-m.svg
diff --git a/data/styles/clear/style-night/symbols/alpine_hut-s.svg b/data/styles/default/dark/symbols/alpine_hut-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/alpine_hut-s.svg
rename to data/styles/default/dark/symbols/alpine_hut-s.svg
diff --git a/data/styles/clear/style-night/symbols/alternative-m.svg b/data/styles/default/dark/symbols/alternative-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/alternative-m.svg
rename to data/styles/default/dark/symbols/alternative-m.svg
diff --git a/data/styles/clear/style-night/symbols/america-football-m.svg b/data/styles/default/dark/symbols/america-football-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/america-football-m.svg
rename to data/styles/default/dark/symbols/america-football-m.svg
diff --git a/data/styles/clear/style-night/symbols/anchor-m.svg b/data/styles/default/dark/symbols/anchor-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/anchor-m.svg
rename to data/styles/default/dark/symbols/anchor-m.svg
diff --git a/data/styles/clear/style-night/symbols/animal-m.svg b/data/styles/default/dark/symbols/animal-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/animal-m.svg
rename to data/styles/default/dark/symbols/animal-m.svg
diff --git a/data/styles/clear/style-night/symbols/antiques-m.svg b/data/styles/default/dark/symbols/antiques-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/antiques-m.svg
rename to data/styles/default/dark/symbols/antiques-m.svg
diff --git a/data/styles/clear/style-night/symbols/apartment-m.svg b/data/styles/default/dark/symbols/apartment-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/apartment-m.svg
rename to data/styles/default/dark/symbols/apartment-m.svg
diff --git a/data/styles/clear/style-night/symbols/aquarium-m.svg b/data/styles/default/dark/symbols/aquarium-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/aquarium-m.svg
rename to data/styles/default/dark/symbols/aquarium-m.svg
diff --git a/data/styles/clear/style-night/symbols/arcade-m.svg b/data/styles/default/dark/symbols/arcade-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/arcade-m.svg
rename to data/styles/default/dark/symbols/arcade-m.svg
diff --git a/data/styles/clear/style-night/symbols/archaeological-site-m.svg b/data/styles/default/dark/symbols/archaeological-site-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/archaeological-site-m.svg
rename to data/styles/default/dark/symbols/archaeological-site-m.svg
diff --git a/data/styles/clear/style-night/symbols/archery-m.svg b/data/styles/default/dark/symbols/archery-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/archery-m.svg
rename to data/styles/default/dark/symbols/archery-m.svg
diff --git a/data/styles/clear/style-night/symbols/arrow-m.svg b/data/styles/default/dark/symbols/arrow-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/arrow-m.svg
rename to data/styles/default/dark/symbols/arrow-m.svg
diff --git a/data/styles/clear/style-night/symbols/arrow-s.svg b/data/styles/default/dark/symbols/arrow-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/arrow-s.svg
rename to data/styles/default/dark/symbols/arrow-s.svg
diff --git a/data/styles/clear/style-night/symbols/arrow-xs.svg b/data/styles/default/dark/symbols/arrow-xs.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/arrow-xs.svg
rename to data/styles/default/dark/symbols/arrow-xs.svg
diff --git a/data/styles/clear/style-night/symbols/art-m.svg b/data/styles/default/dark/symbols/art-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/art-m.svg
rename to data/styles/default/dark/symbols/art-m.svg
diff --git a/data/styles/clear/style-night/symbols/artwork-m.svg b/data/styles/default/dark/symbols/artwork-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/artwork-m.svg
rename to data/styles/default/dark/symbols/artwork-m.svg
diff --git a/data/styles/clear/style-night/symbols/assembly_point-m.svg b/data/styles/default/dark/symbols/assembly_point-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/assembly_point-m.svg
rename to data/styles/default/dark/symbols/assembly_point-m.svg
diff --git a/data/styles/clear/style-night/symbols/atm-m.svg b/data/styles/default/dark/symbols/atm-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/atm-m.svg
rename to data/styles/default/dark/symbols/atm-m.svg
diff --git a/data/styles/clear/style-night/symbols/auction-m.svg b/data/styles/default/dark/symbols/auction-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/auction-m.svg
rename to data/styles/default/dark/symbols/auction-m.svg
diff --git a/data/styles/clear/style-night/symbols/audiologist-m.svg b/data/styles/default/dark/symbols/audiologist-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/audiologist-m.svg
rename to data/styles/default/dark/symbols/audiologist-m.svg
diff --git a/data/styles/clear/style-night/symbols/australian-football-m.svg b/data/styles/default/dark/symbols/australian-football-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/australian-football-m.svg
rename to data/styles/default/dark/symbols/australian-football-m.svg
diff --git a/data/styles/clear/style-night/symbols/badminton-m.svg b/data/styles/default/dark/symbols/badminton-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/badminton-m.svg
rename to data/styles/default/dark/symbols/badminton-m.svg
diff --git a/data/styles/clear/style-night/symbols/bakery-m.svg b/data/styles/default/dark/symbols/bakery-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/bakery-m.svg
rename to data/styles/default/dark/symbols/bakery-m.svg
diff --git a/data/styles/clear/style-night/symbols/bank-m.svg b/data/styles/default/dark/symbols/bank-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/bank-m.svg
rename to data/styles/default/dark/symbols/bank-m.svg
diff --git a/data/styles/clear/style-night/symbols/banknote-m.svg b/data/styles/default/dark/symbols/banknote-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/banknote-m.svg
rename to data/styles/default/dark/symbols/banknote-m.svg
diff --git a/data/styles/clear/style-night/symbols/bar-m.svg b/data/styles/default/dark/symbols/bar-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/bar-m.svg
rename to data/styles/default/dark/symbols/bar-m.svg
diff --git a/data/styles/clear/style-night/symbols/barrier-entrance-s.svg b/data/styles/default/dark/symbols/barrier-entrance-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/barrier-entrance-s.svg
rename to data/styles/default/dark/symbols/barrier-entrance-s.svg
diff --git a/data/styles/clear/style-night/symbols/baseball-m.svg b/data/styles/default/dark/symbols/baseball-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/baseball-m.svg
rename to data/styles/default/dark/symbols/baseball-m.svg
diff --git a/data/styles/clear/style-night/symbols/basketball-m.svg b/data/styles/default/dark/symbols/basketball-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/basketball-m.svg
rename to data/styles/default/dark/symbols/basketball-m.svg
diff --git a/data/styles/clear/style-night/symbols/bbq-m.svg b/data/styles/default/dark/symbols/bbq-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/bbq-m.svg
rename to data/styles/default/dark/symbols/bbq-m.svg
diff --git a/data/styles/clear/style-night/symbols/bcontrol-m.svg b/data/styles/default/dark/symbols/bcontrol-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/bcontrol-m.svg
rename to data/styles/default/dark/symbols/bcontrol-m.svg
diff --git a/data/styles/clear/style-night/symbols/bcontrol-s.svg b/data/styles/default/dark/symbols/bcontrol-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/bcontrol-s.svg
rename to data/styles/default/dark/symbols/bcontrol-s.svg
diff --git a/data/styles/clear/style-night/symbols/beach-m.svg b/data/styles/default/dark/symbols/beach-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/beach-m.svg
rename to data/styles/default/dark/symbols/beach-m.svg
diff --git a/data/styles/clear/style-night/symbols/beauty-m.svg b/data/styles/default/dark/symbols/beauty-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/beauty-m.svg
rename to data/styles/default/dark/symbols/beauty-m.svg
diff --git a/data/styles/clear/style-night/symbols/beekeeper-m.svg b/data/styles/default/dark/symbols/beekeeper-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/beekeeper-m.svg
rename to data/styles/default/dark/symbols/beekeeper-m.svg
diff --git a/data/styles/clear/style-night/symbols/beer-m.svg b/data/styles/default/dark/symbols/beer-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/beer-m.svg
rename to data/styles/default/dark/symbols/beer-m.svg
diff --git a/data/styles/clear/style-night/symbols/bench.svg b/data/styles/default/dark/symbols/bench.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/bench.svg
rename to data/styles/default/dark/symbols/bench.svg
diff --git a/data/styles/clear/style-night/symbols/bicycle-parking-m.svg b/data/styles/default/dark/symbols/bicycle-parking-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/bicycle-parking-m.svg
rename to data/styles/default/dark/symbols/bicycle-parking-m.svg
diff --git a/data/styles/clear/style-night/symbols/bicycle-rental.svg b/data/styles/default/dark/symbols/bicycle-rental.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/bicycle-rental.svg
rename to data/styles/default/dark/symbols/bicycle-rental.svg
diff --git a/data/styles/clear/style-night/symbols/bicycle-repair-station.svg b/data/styles/default/dark/symbols/bicycle-repair-station.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/bicycle-repair-station.svg
rename to data/styles/default/dark/symbols/bicycle-repair-station.svg
diff --git a/data/styles/clear/style-night/symbols/blacksmith-m.svg b/data/styles/default/dark/symbols/blacksmith-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/blacksmith-m.svg
rename to data/styles/default/dark/symbols/blacksmith-m.svg
diff --git a/data/styles/clear/style-night/symbols/blood_donation-m.svg b/data/styles/default/dark/symbols/blood_donation-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/blood_donation-m.svg
rename to data/styles/default/dark/symbols/blood_donation-m.svg
diff --git a/data/styles/clear/style-night/symbols/board.svg b/data/styles/default/dark/symbols/board.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/board.svg
rename to data/styles/default/dark/symbols/board.svg
diff --git a/data/styles/clear/style-night/symbols/book-shop-m.svg b/data/styles/default/dark/symbols/book-shop-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/book-shop-m.svg
rename to data/styles/default/dark/symbols/book-shop-m.svg
diff --git a/data/styles/clear/style-night/symbols/bookcase-m.svg b/data/styles/default/dark/symbols/bookcase-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/bookcase-m.svg
rename to data/styles/default/dark/symbols/bookcase-m.svg
diff --git a/data/styles/clear/style-night/symbols/bookmaker-m.svg b/data/styles/default/dark/symbols/bookmaker-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/bookmaker-m.svg
rename to data/styles/default/dark/symbols/bookmaker-m.svg
diff --git a/data/styles/clear/style-night/symbols/bowling-m.svg b/data/styles/default/dark/symbols/bowling-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/bowling-m.svg
rename to data/styles/default/dark/symbols/bowling-m.svg
diff --git a/data/styles/clear/style-night/symbols/bowling_alley-m.svg b/data/styles/default/dark/symbols/bowling_alley-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/bowling_alley-m.svg
rename to data/styles/default/dark/symbols/bowling_alley-m.svg
diff --git a/data/styles/clear/style-night/symbols/brewery-m.svg b/data/styles/default/dark/symbols/brewery-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/brewery-m.svg
rename to data/styles/default/dark/symbols/brewery-m.svg
diff --git a/data/styles/clear/style-night/symbols/buddhist-m.svg b/data/styles/default/dark/symbols/buddhist-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/buddhist-m.svg
rename to data/styles/default/dark/symbols/buddhist-m.svg
diff --git a/data/styles/clear/style-night/symbols/buddhist-s.svg b/data/styles/default/dark/symbols/buddhist-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/buddhist-s.svg
rename to data/styles/default/dark/symbols/buddhist-s.svg
diff --git a/data/styles/clear/style-night/symbols/bus-m.svg b/data/styles/default/dark/symbols/bus-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/bus-m.svg
rename to data/styles/default/dark/symbols/bus-m.svg
diff --git a/data/styles/clear/style-night/symbols/bus-s.svg b/data/styles/default/dark/symbols/bus-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/bus-s.svg
rename to data/styles/default/dark/symbols/bus-s.svg
diff --git a/data/styles/clear/style-night/symbols/butcher-m.svg b/data/styles/default/dark/symbols/butcher-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/butcher-m.svg
rename to data/styles/default/dark/symbols/butcher-m.svg
diff --git a/data/styles/clear/style-night/symbols/cable-car-m.svg b/data/styles/default/dark/symbols/cable-car-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/cable-car-m.svg
rename to data/styles/default/dark/symbols/cable-car-m.svg
diff --git a/data/styles/clear/style-night/symbols/cable-car-s.svg b/data/styles/default/dark/symbols/cable-car-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/cable-car-s.svg
rename to data/styles/default/dark/symbols/cable-car-s.svg
diff --git a/data/styles/clear/style-night/symbols/cafe-m.svg b/data/styles/default/dark/symbols/cafe-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/cafe-m.svg
rename to data/styles/default/dark/symbols/cafe-m.svg
diff --git a/data/styles/clear/style-night/symbols/cairn-m.svg b/data/styles/default/dark/symbols/cairn-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/cairn-m.svg
rename to data/styles/default/dark/symbols/cairn-m.svg
diff --git a/data/styles/clear/style-night/symbols/campsite-m.svg b/data/styles/default/dark/symbols/campsite-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/campsite-m.svg
rename to data/styles/default/dark/symbols/campsite-m.svg
diff --git a/data/styles/clear/style-night/symbols/campsite-s.svg b/data/styles/default/dark/symbols/campsite-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/campsite-s.svg
rename to data/styles/default/dark/symbols/campsite-s.svg
diff --git a/data/styles/clear/style-night/symbols/cannon-m.svg b/data/styles/default/dark/symbols/cannon-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/cannon-m.svg
rename to data/styles/default/dark/symbols/cannon-m.svg
diff --git a/data/styles/clear/style-night/symbols/car-part-m.svg b/data/styles/default/dark/symbols/car-part-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/car-part-m.svg
rename to data/styles/default/dark/symbols/car-part-m.svg
diff --git a/data/styles/clear/style-night/symbols/car-repair-m.svg b/data/styles/default/dark/symbols/car-repair-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/car-repair-m.svg
rename to data/styles/default/dark/symbols/car-repair-m.svg
diff --git a/data/styles/clear/style-night/symbols/car-repair-s.svg b/data/styles/default/dark/symbols/car-repair-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/car-repair-s.svg
rename to data/styles/default/dark/symbols/car-repair-s.svg
diff --git a/data/styles/clear/style-night/symbols/car-wash-m.svg b/data/styles/default/dark/symbols/car-wash-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/car-wash-m.svg
rename to data/styles/default/dark/symbols/car-wash-m.svg
diff --git a/data/styles/clear/style-night/symbols/car_sharing-m.svg b/data/styles/default/dark/symbols/car_sharing-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/car_sharing-m.svg
rename to data/styles/default/dark/symbols/car_sharing-m.svg
diff --git a/data/styles/clear/style-night/symbols/car_shop-m.svg b/data/styles/default/dark/symbols/car_shop-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/car_shop-m.svg
rename to data/styles/default/dark/symbols/car_shop-m.svg
diff --git a/data/styles/clear/style-night/symbols/caravan-shop-m.svg b/data/styles/default/dark/symbols/caravan-shop-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/caravan-shop-m.svg
rename to data/styles/default/dark/symbols/caravan-shop-m.svg
diff --git a/data/styles/clear/style-night/symbols/caravan_site-m.svg b/data/styles/default/dark/symbols/caravan_site-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/caravan_site-m.svg
rename to data/styles/default/dark/symbols/caravan_site-m.svg
diff --git a/data/styles/clear/style-night/symbols/caravan_site-s.svg b/data/styles/default/dark/symbols/caravan_site-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/caravan_site-s.svg
rename to data/styles/default/dark/symbols/caravan_site-s.svg
diff --git a/data/styles/clear/style-night/symbols/carpenter-m.svg b/data/styles/default/dark/symbols/carpenter-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/carpenter-m.svg
rename to data/styles/default/dark/symbols/carpenter-m.svg
diff --git a/data/styles/clear/style-night/symbols/casino-m.svg b/data/styles/default/dark/symbols/casino-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/casino-m.svg
rename to data/styles/default/dark/symbols/casino-m.svg
diff --git a/data/styles/clear/style-night/symbols/caterer-m.svg b/data/styles/default/dark/symbols/caterer-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/caterer-m.svg
rename to data/styles/default/dark/symbols/caterer-m.svg
diff --git a/data/styles/clear/style-night/symbols/cave-m.svg b/data/styles/default/dark/symbols/cave-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/cave-m.svg
rename to data/styles/default/dark/symbols/cave-m.svg
diff --git a/data/styles/clear/style-night/symbols/cave-s.svg b/data/styles/default/dark/symbols/cave-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/cave-s.svg
rename to data/styles/default/dark/symbols/cave-s.svg
diff --git a/data/styles/clear/style-night/symbols/cemetery-m.svg b/data/styles/default/dark/symbols/cemetery-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/cemetery-m.svg
rename to data/styles/default/dark/symbols/cemetery-m.svg
diff --git a/data/styles/clear/style-night/symbols/charging-station-m.svg b/data/styles/default/dark/symbols/charging-station-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/charging-station-m.svg
rename to data/styles/default/dark/symbols/charging-station-m.svg
diff --git a/data/styles/clear/style-night/symbols/charging-station-s.svg b/data/styles/default/dark/symbols/charging-station-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/charging-station-s.svg
rename to data/styles/default/dark/symbols/charging-station-s.svg
diff --git a/data/styles/clear/style-night/symbols/charity_shop-m.svg b/data/styles/default/dark/symbols/charity_shop-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/charity_shop-m.svg
rename to data/styles/default/dark/symbols/charity_shop-m.svg
diff --git a/data/styles/clear/style-night/symbols/cheese-m.svg b/data/styles/default/dark/symbols/cheese-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/cheese-m.svg
rename to data/styles/default/dark/symbols/cheese-m.svg
diff --git a/data/styles/clear/style-night/symbols/chemist-m.svg b/data/styles/default/dark/symbols/chemist-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/chemist-m.svg
rename to data/styles/default/dark/symbols/chemist-m.svg
diff --git a/data/styles/clear/style-night/symbols/chess-m.svg b/data/styles/default/dark/symbols/chess-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/chess-m.svg
rename to data/styles/default/dark/symbols/chess-m.svg
diff --git a/data/styles/clear/style-night/symbols/chimney-m.svg b/data/styles/default/dark/symbols/chimney-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/chimney-m.svg
rename to data/styles/default/dark/symbols/chimney-m.svg
diff --git a/data/styles/clear/style-night/symbols/christian-m.svg b/data/styles/default/dark/symbols/christian-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/christian-m.svg
rename to data/styles/default/dark/symbols/christian-m.svg
diff --git a/data/styles/clear/style-night/symbols/christian-s.svg b/data/styles/default/dark/symbols/christian-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/christian-s.svg
rename to data/styles/default/dark/symbols/christian-s.svg
diff --git a/data/styles/clear/style-night/symbols/cinema-m.svg b/data/styles/default/dark/symbols/cinema-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/cinema-m.svg
rename to data/styles/default/dark/symbols/cinema-m.svg
diff --git a/data/styles/clear/style-night/symbols/climbing-m.svg b/data/styles/default/dark/symbols/climbing-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/climbing-m.svg
rename to data/styles/default/dark/symbols/climbing-m.svg
diff --git a/data/styles/clear/style-night/symbols/clinic-m.svg b/data/styles/default/dark/symbols/clinic-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/clinic-m.svg
rename to data/styles/default/dark/symbols/clinic-m.svg
diff --git a/data/styles/clear/style-night/symbols/clothes-m.svg b/data/styles/default/dark/symbols/clothes-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/clothes-m.svg
rename to data/styles/default/dark/symbols/clothes-m.svg
diff --git a/data/styles/clear/style-night/symbols/college-m.svg b/data/styles/default/dark/symbols/college-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/college-m.svg
rename to data/styles/default/dark/symbols/college-m.svg
diff --git a/data/styles/clear/style-night/symbols/college-s.svg b/data/styles/default/dark/symbols/college-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/college-s.svg
rename to data/styles/default/dark/symbols/college-s.svg
diff --git a/data/styles/clear/style-night/symbols/community-m.svg b/data/styles/default/dark/symbols/community-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/community-m.svg
rename to data/styles/default/dark/symbols/community-m.svg
diff --git a/data/styles/clear/style-night/symbols/compressed_air-m.svg b/data/styles/default/dark/symbols/compressed_air-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/compressed_air-m.svg
rename to data/styles/default/dark/symbols/compressed_air-m.svg
diff --git a/data/styles/clear/style-night/symbols/computer-m.svg b/data/styles/default/dark/symbols/computer-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/computer-m.svg
rename to data/styles/default/dark/symbols/computer-m.svg
diff --git a/data/styles/clear/style-night/symbols/convenience-m.svg b/data/styles/default/dark/symbols/convenience-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/convenience-m.svg
rename to data/styles/default/dark/symbols/convenience-m.svg
diff --git a/data/styles/clear/style-night/symbols/copyshop-m.svg b/data/styles/default/dark/symbols/copyshop-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/copyshop-m.svg
rename to data/styles/default/dark/symbols/copyshop-m.svg
diff --git a/data/styles/clear/style-night/symbols/cricket-m.svg b/data/styles/default/dark/symbols/cricket-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/cricket-m.svg
rename to data/styles/default/dark/symbols/cricket-m.svg
diff --git a/data/styles/clear/style-night/symbols/cross-m.svg b/data/styles/default/dark/symbols/cross-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/cross-m.svg
rename to data/styles/default/dark/symbols/cross-m.svg
diff --git a/data/styles/clear/style-night/symbols/curling-m.svg b/data/styles/default/dark/symbols/curling-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/curling-m.svg
rename to data/styles/default/dark/symbols/curling-m.svg
diff --git a/data/styles/clear/style-night/symbols/cycle_barrier-s.svg b/data/styles/default/dark/symbols/cycle_barrier-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/cycle_barrier-s.svg
rename to data/styles/default/dark/symbols/cycle_barrier-s.svg
diff --git a/data/styles/clear/style-night/symbols/defibrillator-m.svg b/data/styles/default/dark/symbols/defibrillator-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/defibrillator-m.svg
rename to data/styles/default/dark/symbols/defibrillator-m.svg
diff --git a/data/styles/clear/style-night/symbols/dentist-m.svg b/data/styles/default/dark/symbols/dentist-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/dentist-m.svg
rename to data/styles/default/dark/symbols/dentist-m.svg
diff --git a/data/styles/clear/style-night/symbols/department_store-m.svg b/data/styles/default/dark/symbols/department_store-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/department_store-m.svg
rename to data/styles/default/dark/symbols/department_store-m.svg
diff --git a/data/styles/clear/style-night/symbols/diving-m.svg b/data/styles/default/dark/symbols/diving-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/diving-m.svg
rename to data/styles/default/dark/symbols/diving-m.svg
diff --git a/data/styles/clear/style-night/symbols/dog_park-m.svg b/data/styles/default/dark/symbols/dog_park-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/dog_park-m.svg
rename to data/styles/default/dark/symbols/dog_park-m.svg
diff --git a/data/styles/clear/style-night/symbols/doityourself-m.svg b/data/styles/default/dark/symbols/doityourself-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/doityourself-m.svg
rename to data/styles/default/dark/symbols/doityourself-m.svg
diff --git a/data/styles/clear/style-night/symbols/dot-m.svg b/data/styles/default/dark/symbols/dot-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/dot-m.svg
rename to data/styles/default/dark/symbols/dot-m.svg
diff --git a/data/styles/clear/style-night/symbols/drinking-water-m.svg b/data/styles/default/dark/symbols/drinking-water-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/drinking-water-m.svg
rename to data/styles/default/dark/symbols/drinking-water-m.svg
diff --git a/data/styles/clear/style-night/symbols/drinking-water-s.svg b/data/styles/default/dark/symbols/drinking-water-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/drinking-water-s.svg
rename to data/styles/default/dark/symbols/drinking-water-s.svg
diff --git a/data/styles/clear/style-night/symbols/driving_school-m.svg b/data/styles/default/dark/symbols/driving_school-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/driving_school-m.svg
rename to data/styles/default/dark/symbols/driving_school-m.svg
diff --git a/data/styles/clear/style-night/symbols/dry_cleaning-m.svg b/data/styles/default/dark/symbols/dry_cleaning-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/dry_cleaning-m.svg
rename to data/styles/default/dark/symbols/dry_cleaning-m.svg
diff --git a/data/styles/clear/style-night/symbols/dump-station-m.svg b/data/styles/default/dark/symbols/dump-station-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/dump-station-m.svg
rename to data/styles/default/dark/symbols/dump-station-m.svg
diff --git a/data/styles/clear/style-night/symbols/electrician-m.svg b/data/styles/default/dark/symbols/electrician-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/electrician-m.svg
rename to data/styles/default/dark/symbols/electrician-m.svg
diff --git a/data/styles/clear/style-night/symbols/electronics-m.svg b/data/styles/default/dark/symbols/electronics-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/electronics-m.svg
rename to data/styles/default/dark/symbols/electronics-m.svg
diff --git a/data/styles/clear/style-night/symbols/elevator-s.svg b/data/styles/default/dark/symbols/elevator-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/elevator-s.svg
rename to data/styles/default/dark/symbols/elevator-s.svg
diff --git a/data/styles/clear/style-night/symbols/embassy-m.svg b/data/styles/default/dark/symbols/embassy-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/embassy-m.svg
rename to data/styles/default/dark/symbols/embassy-m.svg
diff --git a/data/styles/clear/style-night/symbols/emergency-phone-m.svg b/data/styles/default/dark/symbols/emergency-phone-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/emergency-phone-m.svg
rename to data/styles/default/dark/symbols/emergency-phone-m.svg
diff --git a/data/styles/clear/style-night/symbols/entrance-s.svg b/data/styles/default/dark/symbols/entrance-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/entrance-s.svg
rename to data/styles/default/dark/symbols/entrance-s.svg
diff --git a/data/styles/clear/style-night/symbols/equestrian-m.svg b/data/styles/default/dark/symbols/equestrian-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/equestrian-m.svg
rename to data/styles/default/dark/symbols/equestrian-m.svg
diff --git a/data/styles/clear/style-night/symbols/erotic-m.svg b/data/styles/default/dark/symbols/erotic-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/erotic-m.svg
rename to data/styles/default/dark/symbols/erotic-m.svg
diff --git a/data/styles/clear/style-night/symbols/excrement_bags-m.svg b/data/styles/default/dark/symbols/excrement_bags-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/excrement_bags-m.svg
rename to data/styles/default/dark/symbols/excrement_bags-m.svg
diff --git a/data/styles/clear/style-night/symbols/exit-s.svg b/data/styles/default/dark/symbols/exit-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/exit-s.svg
rename to data/styles/default/dark/symbols/exit-s.svg
diff --git a/data/styles/clear/style-night/symbols/factory-m.svg b/data/styles/default/dark/symbols/factory-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/factory-m.svg
rename to data/styles/default/dark/symbols/factory-m.svg
diff --git a/data/styles/clear/style-night/symbols/fastfood-m.svg b/data/styles/default/dark/symbols/fastfood-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/fastfood-m.svg
rename to data/styles/default/dark/symbols/fastfood-m.svg
diff --git a/data/styles/clear/style-night/symbols/fire_station-m.svg b/data/styles/default/dark/symbols/fire_station-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/fire_station-m.svg
rename to data/styles/default/dark/symbols/fire_station-m.svg
diff --git a/data/styles/clear/style-night/symbols/firehydrant-m.svg b/data/styles/default/dark/symbols/firehydrant-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/firehydrant-m.svg
rename to data/styles/default/dark/symbols/firehydrant-m.svg
diff --git a/data/styles/clear/style-night/symbols/fitness_centre-m.svg b/data/styles/default/dark/symbols/fitness_centre-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/fitness_centre-m.svg
rename to data/styles/default/dark/symbols/fitness_centre-m.svg
diff --git a/data/styles/clear/style-night/symbols/fitness_station-m.svg b/data/styles/default/dark/symbols/fitness_station-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/fitness_station-m.svg
rename to data/styles/default/dark/symbols/fitness_station-m.svg
diff --git a/data/styles/clear/style-night/symbols/florist-m.svg b/data/styles/default/dark/symbols/florist-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/florist-m.svg
rename to data/styles/default/dark/symbols/florist-m.svg
diff --git a/data/styles/clear/style-night/symbols/ford-m.svg b/data/styles/default/dark/symbols/ford-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/ford-m.svg
rename to data/styles/default/dark/symbols/ford-m.svg
diff --git a/data/styles/clear/style-night/symbols/fountain-m.svg b/data/styles/default/dark/symbols/fountain-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/fountain-m.svg
rename to data/styles/default/dark/symbols/fountain-m.svg
diff --git a/data/styles/clear/style-night/symbols/fountain-s.svg b/data/styles/default/dark/symbols/fountain-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/fountain-s.svg
rename to data/styles/default/dark/symbols/fountain-s.svg
diff --git a/data/styles/clear/style-night/symbols/fuel-dispenser-m.svg b/data/styles/default/dark/symbols/fuel-dispenser-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/fuel-dispenser-m.svg
rename to data/styles/default/dark/symbols/fuel-dispenser-m.svg
diff --git a/data/styles/clear/style-night/symbols/fuel-m.svg b/data/styles/default/dark/symbols/fuel-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/fuel-m.svg
rename to data/styles/default/dark/symbols/fuel-m.svg
diff --git a/data/styles/clear/style-night/symbols/fuel-s.svg b/data/styles/default/dark/symbols/fuel-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/fuel-s.svg
rename to data/styles/default/dark/symbols/fuel-s.svg
diff --git a/data/styles/clear/style-night/symbols/funeral_directors-m.svg b/data/styles/default/dark/symbols/funeral_directors-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/funeral_directors-m.svg
rename to data/styles/default/dark/symbols/funeral_directors-m.svg
diff --git a/data/styles/clear/style-night/symbols/funicular-m.svg b/data/styles/default/dark/symbols/funicular-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/funicular-m.svg
rename to data/styles/default/dark/symbols/funicular-m.svg
diff --git a/data/styles/clear/style-night/symbols/furniture-m.svg b/data/styles/default/dark/symbols/furniture-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/furniture-m.svg
rename to data/styles/default/dark/symbols/furniture-m.svg
diff --git a/data/styles/clear/style-night/symbols/gallery-m.svg b/data/styles/default/dark/symbols/gallery-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/gallery-m.svg
rename to data/styles/default/dark/symbols/gallery-m.svg
diff --git a/data/styles/clear/style-night/symbols/gambling-m.svg b/data/styles/default/dark/symbols/gambling-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/gambling-m.svg
rename to data/styles/default/dark/symbols/gambling-m.svg
diff --git a/data/styles/clear/style-night/symbols/garden-m.svg b/data/styles/default/dark/symbols/garden-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/garden-m.svg
rename to data/styles/default/dark/symbols/garden-m.svg
diff --git a/data/styles/clear/style-night/symbols/garden-outline-m.svg b/data/styles/default/dark/symbols/garden-outline-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/garden-outline-m.svg
rename to data/styles/default/dark/symbols/garden-outline-m.svg
diff --git a/data/styles/clear/style-night/symbols/garden_center-m.svg b/data/styles/default/dark/symbols/garden_center-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/garden_center-m.svg
rename to data/styles/default/dark/symbols/garden_center-m.svg
diff --git a/data/styles/clear/style-night/symbols/gate-s.svg b/data/styles/default/dark/symbols/gate-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/gate-s.svg
rename to data/styles/default/dark/symbols/gate-s.svg
diff --git a/data/styles/clear/style-night/symbols/geyser-m.svg b/data/styles/default/dark/symbols/geyser-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/geyser-m.svg
rename to data/styles/default/dark/symbols/geyser-m.svg
diff --git a/data/styles/clear/style-night/symbols/geyser-s.svg b/data/styles/default/dark/symbols/geyser-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/geyser-s.svg
rename to data/styles/default/dark/symbols/geyser-s.svg
diff --git a/data/styles/clear/style-night/symbols/gift-m.svg b/data/styles/default/dark/symbols/gift-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/gift-m.svg
rename to data/styles/default/dark/symbols/gift-m.svg
diff --git a/data/styles/clear/style-night/symbols/golf-m.svg b/data/styles/default/dark/symbols/golf-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/golf-m.svg
rename to data/styles/default/dark/symbols/golf-m.svg
diff --git a/data/styles/clear/style-night/symbols/greengrocer-m.svg b/data/styles/default/dark/symbols/greengrocer-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/greengrocer-m.svg
rename to data/styles/default/dark/symbols/greengrocer-m.svg
diff --git a/data/styles/clear/style-night/symbols/grinding_mill-m.svg b/data/styles/default/dark/symbols/grinding_mill-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/grinding_mill-m.svg
rename to data/styles/default/dark/symbols/grinding_mill-m.svg
diff --git a/data/styles/clear/style-night/symbols/grocery-m.svg b/data/styles/default/dark/symbols/grocery-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/grocery-m.svg
rename to data/styles/default/dark/symbols/grocery-m.svg
diff --git a/data/styles/clear/style-night/symbols/guidepost.svg b/data/styles/default/dark/symbols/guidepost.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/guidepost.svg
rename to data/styles/default/dark/symbols/guidepost.svg
diff --git a/data/styles/clear/style-night/symbols/hackerspace-m.svg b/data/styles/default/dark/symbols/hackerspace-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/hackerspace-m.svg
rename to data/styles/default/dark/symbols/hackerspace-m.svg
diff --git a/data/styles/clear/style-night/symbols/hairdresser-m.svg b/data/styles/default/dark/symbols/hairdresser-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/hairdresser-m.svg
rename to data/styles/default/dark/symbols/hairdresser-m.svg
diff --git a/data/styles/clear/style-night/symbols/hand-m.svg b/data/styles/default/dark/symbols/hand-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/hand-m.svg
rename to data/styles/default/dark/symbols/hand-m.svg
diff --git a/data/styles/clear/style-night/symbols/handball-m.svg b/data/styles/default/dark/symbols/handball-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/handball-m.svg
rename to data/styles/default/dark/symbols/handball-m.svg
diff --git a/data/styles/clear/style-night/symbols/handicraft-m.svg b/data/styles/default/dark/symbols/handicraft-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/handicraft-m.svg
rename to data/styles/default/dark/symbols/handicraft-m.svg
diff --git a/data/styles/clear/style-night/symbols/helipad-m.svg b/data/styles/default/dark/symbols/helipad-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/helipad-m.svg
rename to data/styles/default/dark/symbols/helipad-m.svg
diff --git a/data/styles/clear/style-night/symbols/hindu-m.svg b/data/styles/default/dark/symbols/hindu-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/hindu-m.svg
rename to data/styles/default/dark/symbols/hindu-m.svg
diff --git a/data/styles/clear/style-night/symbols/hindu-s.svg b/data/styles/default/dark/symbols/hindu-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/hindu-s.svg
rename to data/styles/default/dark/symbols/hindu-s.svg
diff --git a/data/styles/clear/style-night/symbols/historic-ship-m.svg b/data/styles/default/dark/symbols/historic-ship-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/historic-ship-m.svg
rename to data/styles/default/dark/symbols/historic-ship-m.svg
diff --git a/data/styles/clear/style-night/symbols/hockey-m.svg b/data/styles/default/dark/symbols/hockey-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/hockey-m.svg
rename to data/styles/default/dark/symbols/hockey-m.svg
diff --git a/data/styles/clear/style-night/symbols/home-m.svg b/data/styles/default/dark/symbols/home-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/home-m.svg
rename to data/styles/default/dark/symbols/home-m.svg
diff --git a/data/styles/clear/style-night/symbols/hospital-m.svg b/data/styles/default/dark/symbols/hospital-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/hospital-m.svg
rename to data/styles/default/dark/symbols/hospital-m.svg
diff --git a/data/styles/clear/style-night/symbols/hospital-s.svg b/data/styles/default/dark/symbols/hospital-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/hospital-s.svg
rename to data/styles/default/dark/symbols/hospital-s.svg
diff --git a/data/styles/clear/style-night/symbols/hostel-m.svg b/data/styles/default/dark/symbols/hostel-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/hostel-m.svg
rename to data/styles/default/dark/symbols/hostel-m.svg
diff --git a/data/styles/clear/style-night/symbols/hotel-m.svg b/data/styles/default/dark/symbols/hotel-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/hotel-m.svg
rename to data/styles/default/dark/symbols/hotel-m.svg
diff --git a/data/styles/clear/style-night/symbols/hotel-s.svg b/data/styles/default/dark/symbols/hotel-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/hotel-s.svg
rename to data/styles/default/dark/symbols/hotel-s.svg
diff --git a/data/styles/clear/style-night/symbols/hunting-tower-m.svg b/data/styles/default/dark/symbols/hunting-tower-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/hunting-tower-m.svg
rename to data/styles/default/dark/symbols/hunting-tower-m.svg
diff --git a/data/styles/clear/style-night/symbols/ice_cream-m.svg b/data/styles/default/dark/symbols/ice_cream-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/ice_cream-m.svg
rename to data/styles/default/dark/symbols/ice_cream-m.svg
diff --git a/data/styles/clear/style-night/symbols/information-m.svg b/data/styles/default/dark/symbols/information-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/information-m.svg
rename to data/styles/default/dark/symbols/information-m.svg
diff --git a/data/styles/clear/style-night/symbols/information-office-m.svg b/data/styles/default/dark/symbols/information-office-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/information-office-m.svg
rename to data/styles/default/dark/symbols/information-office-m.svg
diff --git a/data/styles/clear/style-night/symbols/interior_decoration-m.svg b/data/styles/default/dark/symbols/interior_decoration-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/interior_decoration-m.svg
rename to data/styles/default/dark/symbols/interior_decoration-m.svg
diff --git a/data/styles/clear/style-night/symbols/internet_cafe-m.svg b/data/styles/default/dark/symbols/internet_cafe-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/internet_cafe-m.svg
rename to data/styles/default/dark/symbols/internet_cafe-m.svg
diff --git a/data/styles/clear/style-night/symbols/jewelry-m.svg b/data/styles/default/dark/symbols/jewelry-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/jewelry-m.svg
rename to data/styles/default/dark/symbols/jewelry-m.svg
diff --git a/data/styles/clear/style-night/symbols/jewish-m.svg b/data/styles/default/dark/symbols/jewish-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/jewish-m.svg
rename to data/styles/default/dark/symbols/jewish-m.svg
diff --git a/data/styles/clear/style-night/symbols/jewish-s.svg b/data/styles/default/dark/symbols/jewish-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/jewish-s.svg
rename to data/styles/default/dark/symbols/jewish-s.svg
diff --git a/data/styles/clear/style-night/symbols/key_cutter-m.svg b/data/styles/default/dark/symbols/key_cutter-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/key_cutter-m.svg
rename to data/styles/default/dark/symbols/key_cutter-m.svg
diff --git a/data/styles/clear/style-night/symbols/kindergarten-m.svg b/data/styles/default/dark/symbols/kindergarten-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/kindergarten-m.svg
rename to data/styles/default/dark/symbols/kindergarten-m.svg
diff --git a/data/styles/clear/style-night/symbols/kiosk-m.svg b/data/styles/default/dark/symbols/kiosk-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/kiosk-m.svg
rename to data/styles/default/dark/symbols/kiosk-m.svg
diff --git a/data/styles/clear/style-night/symbols/language_school-m.svg b/data/styles/default/dark/symbols/language_school-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/language_school-m.svg
rename to data/styles/default/dark/symbols/language_school-m.svg
diff --git a/data/styles/clear/style-night/symbols/laundry-m.svg b/data/styles/default/dark/symbols/laundry-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/laundry-m.svg
rename to data/styles/default/dark/symbols/laundry-m.svg
diff --git a/data/styles/clear/style-night/symbols/lawyer-m.svg b/data/styles/default/dark/symbols/lawyer-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/lawyer-m.svg
rename to data/styles/default/dark/symbols/lawyer-m.svg
diff --git a/data/styles/clear/style-night/symbols/library-m.svg b/data/styles/default/dark/symbols/library-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/library-m.svg
rename to data/styles/default/dark/symbols/library-m.svg
diff --git a/data/styles/clear/style-night/symbols/lift_gate-m.svg b/data/styles/default/dark/symbols/lift_gate-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/lift_gate-m.svg
rename to data/styles/default/dark/symbols/lift_gate-m.svg
diff --git a/data/styles/clear/style-night/symbols/light_rail-dlr-london-m.svg b/data/styles/default/dark/symbols/light_rail-dlr-london-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/light_rail-dlr-london-m.svg
rename to data/styles/default/dark/symbols/light_rail-dlr-london-m.svg
diff --git a/data/styles/clear/style-night/symbols/light_rail-dlr-london-s.svg b/data/styles/default/dark/symbols/light_rail-dlr-london-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/light_rail-dlr-london-s.svg
rename to data/styles/default/dark/symbols/light_rail-dlr-london-s.svg
diff --git a/data/styles/clear/style-night/symbols/light_rail-porto-m.svg b/data/styles/default/dark/symbols/light_rail-porto-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/light_rail-porto-m.svg
rename to data/styles/default/dark/symbols/light_rail-porto-m.svg
diff --git a/data/styles/clear/style-night/symbols/light_rail-porto-s.svg b/data/styles/default/dark/symbols/light_rail-porto-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/light_rail-porto-s.svg
rename to data/styles/default/dark/symbols/light_rail-porto-s.svg
diff --git a/data/styles/clear/style-night/symbols/lighthouse-m.svg b/data/styles/default/dark/symbols/lighthouse-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/lighthouse-m.svg
rename to data/styles/default/dark/symbols/lighthouse-m.svg
diff --git a/data/styles/clear/style-night/symbols/lighthouse-s.svg b/data/styles/default/dark/symbols/lighthouse-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/lighthouse-s.svg
rename to data/styles/default/dark/symbols/lighthouse-s.svg
diff --git a/data/styles/clear/style-night/symbols/lightrail-berlin-m.svg b/data/styles/default/dark/symbols/lightrail-berlin-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/lightrail-berlin-m.svg
rename to data/styles/default/dark/symbols/lightrail-berlin-m.svg
diff --git a/data/styles/clear/style-night/symbols/lightrail-berlin-s.svg b/data/styles/default/dark/symbols/lightrail-berlin-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/lightrail-berlin-s.svg
rename to data/styles/default/dark/symbols/lightrail-berlin-s.svg
diff --git a/data/styles/clear/style-night/symbols/locomotive-m.svg b/data/styles/default/dark/symbols/locomotive-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/locomotive-m.svg
rename to data/styles/default/dark/symbols/locomotive-m.svg
diff --git a/data/styles/clear/style-night/symbols/lottery-m.svg b/data/styles/default/dark/symbols/lottery-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/lottery-m.svg
rename to data/styles/default/dark/symbols/lottery-m.svg
diff --git a/data/styles/clear/style-night/symbols/mail-m.svg b/data/styles/default/dark/symbols/mail-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/mail-m.svg
rename to data/styles/default/dark/symbols/mail-m.svg
diff --git a/data/styles/clear/style-night/symbols/main_entrance-s.svg b/data/styles/default/dark/symbols/main_entrance-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/main_entrance-s.svg
rename to data/styles/default/dark/symbols/main_entrance-s.svg
diff --git a/data/styles/clear/style-night/symbols/map.svg b/data/styles/default/dark/symbols/map.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/map.svg
rename to data/styles/default/dark/symbols/map.svg
diff --git a/data/styles/clear/style-night/symbols/marina-m.svg b/data/styles/default/dark/symbols/marina-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/marina-m.svg
rename to data/styles/default/dark/symbols/marina-m.svg
diff --git a/data/styles/clear/style-night/symbols/marketplace-m.svg b/data/styles/default/dark/symbols/marketplace-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/marketplace-m.svg
rename to data/styles/default/dark/symbols/marketplace-m.svg
diff --git a/data/styles/clear/style-night/symbols/mast-m.svg b/data/styles/default/dark/symbols/mast-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/mast-m.svg
rename to data/styles/default/dark/symbols/mast-m.svg
diff --git a/data/styles/clear/style-night/symbols/media-m.svg b/data/styles/default/dark/symbols/media-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/media-m.svg
rename to data/styles/default/dark/symbols/media-m.svg
diff --git a/data/styles/clear/style-night/symbols/metal_construction-m.svg b/data/styles/default/dark/symbols/metal_construction-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/metal_construction-m.svg
rename to data/styles/default/dark/symbols/metal_construction-m.svg
diff --git a/data/styles/clear/style-night/symbols/military-m.svg b/data/styles/default/dark/symbols/military-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/military-m.svg
rename to data/styles/default/dark/symbols/military-m.svg
diff --git a/data/styles/clear/style-night/symbols/mine-m.svg b/data/styles/default/dark/symbols/mine-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/mine-m.svg
rename to data/styles/default/dark/symbols/mine-m.svg
diff --git a/data/styles/clear/style-night/symbols/mobile_phone-m.svg b/data/styles/default/dark/symbols/mobile_phone-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/mobile_phone-m.svg
rename to data/styles/default/dark/symbols/mobile_phone-m.svg
diff --git a/data/styles/clear/style-night/symbols/monument-m.svg b/data/styles/default/dark/symbols/monument-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/monument-m.svg
rename to data/styles/default/dark/symbols/monument-m.svg
diff --git a/data/styles/clear/style-night/symbols/monument-s.svg b/data/styles/default/dark/symbols/monument-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/monument-s.svg
rename to data/styles/default/dark/symbols/monument-s.svg
diff --git a/data/styles/clear/style-night/symbols/mormon-m.svg b/data/styles/default/dark/symbols/mormon-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/mormon-m.svg
rename to data/styles/default/dark/symbols/mormon-m.svg
diff --git a/data/styles/clear/style-night/symbols/mormon-s.svg b/data/styles/default/dark/symbols/mormon-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/mormon-s.svg
rename to data/styles/default/dark/symbols/mormon-s.svg
diff --git a/data/styles/clear/style-night/symbols/motorcycle-parking-m.svg b/data/styles/default/dark/symbols/motorcycle-parking-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/motorcycle-parking-m.svg
rename to data/styles/default/dark/symbols/motorcycle-parking-m.svg
diff --git a/data/styles/clear/style-night/symbols/motorcycle_repair-m.svg b/data/styles/default/dark/symbols/motorcycle_repair-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/motorcycle_repair-m.svg
rename to data/styles/default/dark/symbols/motorcycle_repair-m.svg
diff --git a/data/styles/clear/style-night/symbols/motorcycle_shop-m.svg b/data/styles/default/dark/symbols/motorcycle_shop-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/motorcycle_shop-m.svg
rename to data/styles/default/dark/symbols/motorcycle_shop-m.svg
diff --git a/data/styles/clear/style-night/symbols/mountain-pass-m.svg b/data/styles/default/dark/symbols/mountain-pass-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/mountain-pass-m.svg
rename to data/styles/default/dark/symbols/mountain-pass-m.svg
diff --git a/data/styles/clear/style-night/symbols/mountain-pass-s.svg b/data/styles/default/dark/symbols/mountain-pass-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/mountain-pass-s.svg
rename to data/styles/default/dark/symbols/mountain-pass-s.svg
diff --git a/data/styles/clear/style-night/symbols/museum-m.svg b/data/styles/default/dark/symbols/museum-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/museum-m.svg
rename to data/styles/default/dark/symbols/museum-m.svg
diff --git a/data/styles/clear/style-night/symbols/museum-s.svg b/data/styles/default/dark/symbols/museum-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/museum-s.svg
rename to data/styles/default/dark/symbols/museum-s.svg
diff --git a/data/styles/clear/style-night/symbols/music-m.svg b/data/styles/default/dark/symbols/music-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/music-m.svg
rename to data/styles/default/dark/symbols/music-m.svg
diff --git a/data/styles/clear/style-night/symbols/music_school-m.svg b/data/styles/default/dark/symbols/music_school-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/music_school-m.svg
rename to data/styles/default/dark/symbols/music_school-m.svg
diff --git a/data/styles/clear/style-night/symbols/musical-instrument-m.svg b/data/styles/default/dark/symbols/musical-instrument-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/musical-instrument-m.svg
rename to data/styles/default/dark/symbols/musical-instrument-m.svg
diff --git a/data/styles/clear/style-night/symbols/muslim-m.svg b/data/styles/default/dark/symbols/muslim-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/muslim-m.svg
rename to data/styles/default/dark/symbols/muslim-m.svg
diff --git a/data/styles/clear/style-night/symbols/muslim-s.svg b/data/styles/default/dark/symbols/muslim-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/muslim-s.svg
rename to data/styles/default/dark/symbols/muslim-s.svg
diff --git a/data/styles/clear/style-night/symbols/needle_and_thread-m.svg b/data/styles/default/dark/symbols/needle_and_thread-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/needle_and_thread-m.svg
rename to data/styles/default/dark/symbols/needle_and_thread-m.svg
diff --git a/data/styles/clear/style-night/symbols/newsagent_shop-m.svg b/data/styles/default/dark/symbols/newsagent_shop-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/newsagent_shop-m.svg
rename to data/styles/default/dark/symbols/newsagent_shop-m.svg
diff --git a/data/styles/clear/style-night/symbols/nightclub-m.svg b/data/styles/default/dark/symbols/nightclub-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/nightclub-m.svg
rename to data/styles/default/dark/symbols/nightclub-m.svg
diff --git a/data/styles/clear/style-night/symbols/npark-m.svg b/data/styles/default/dark/symbols/npark-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/npark-m.svg
rename to data/styles/default/dark/symbols/npark-m.svg
diff --git a/data/styles/clear/style-night/symbols/nparkf-m.svg b/data/styles/default/dark/symbols/nparkf-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/nparkf-m.svg
rename to data/styles/default/dark/symbols/nparkf-m.svg
diff --git a/data/styles/clear/style-night/symbols/nparkf-outline-m.svg b/data/styles/default/dark/symbols/nparkf-outline-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/nparkf-outline-m.svg
rename to data/styles/default/dark/symbols/nparkf-outline-m.svg
diff --git a/data/styles/clear/style-night/symbols/nparkf-outline-s.svg b/data/styles/default/dark/symbols/nparkf-outline-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/nparkf-outline-s.svg
rename to data/styles/default/dark/symbols/nparkf-outline-s.svg
diff --git a/data/styles/clear/style-night/symbols/nparkf-s.svg b/data/styles/default/dark/symbols/nparkf-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/nparkf-s.svg
rename to data/styles/default/dark/symbols/nparkf-s.svg
diff --git a/data/styles/clear/style-night/symbols/office-m.svg b/data/styles/default/dark/symbols/office-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/office-m.svg
rename to data/styles/default/dark/symbols/office-m.svg
diff --git a/data/styles/clear/style-night/symbols/optician-m.svg b/data/styles/default/dark/symbols/optician-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/optician-m.svg
rename to data/styles/default/dark/symbols/optician-m.svg
diff --git a/data/styles/clear/style-night/symbols/optometrist-m.svg b/data/styles/default/dark/symbols/optometrist-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/optometrist-m.svg
rename to data/styles/default/dark/symbols/optometrist-m.svg
diff --git a/data/styles/clear/style-night/symbols/outdoor-shop-m.svg b/data/styles/default/dark/symbols/outdoor-shop-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/outdoor-shop-m.svg
rename to data/styles/default/dark/symbols/outdoor-shop-m.svg
diff --git a/data/styles/clear/style-night/symbols/outdoor_seating-m.svg b/data/styles/default/dark/symbols/outdoor_seating-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/outdoor_seating-m.svg
rename to data/styles/default/dark/symbols/outdoor_seating-m.svg
diff --git a/data/styles/clear/style-night/symbols/padel-m.svg b/data/styles/default/dark/symbols/padel-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/padel-m.svg
rename to data/styles/default/dark/symbols/padel-m.svg
diff --git a/data/styles/clear/style-night/symbols/painter-m.svg b/data/styles/default/dark/symbols/painter-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/painter-m.svg
rename to data/styles/default/dark/symbols/painter-m.svg
diff --git a/data/styles/clear/style-night/symbols/parcel_locker-m.svg b/data/styles/default/dark/symbols/parcel_locker-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/parcel_locker-m.svg
rename to data/styles/default/dark/symbols/parcel_locker-m.svg
diff --git a/data/styles/clear/style-night/symbols/park-m.svg b/data/styles/default/dark/symbols/park-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/park-m.svg
rename to data/styles/default/dark/symbols/park-m.svg
diff --git a/data/styles/clear/style-night/symbols/park-outline-m.svg b/data/styles/default/dark/symbols/park-outline-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/park-outline-m.svg
rename to data/styles/default/dark/symbols/park-outline-m.svg
diff --git a/data/styles/clear/style-night/symbols/park-outline-s.svg b/data/styles/default/dark/symbols/park-outline-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/park-outline-s.svg
rename to data/styles/default/dark/symbols/park-outline-s.svg
diff --git a/data/styles/clear/style-night/symbols/park-s.svg b/data/styles/default/dark/symbols/park-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/park-s.svg
rename to data/styles/default/dark/symbols/park-s.svg
diff --git a/data/styles/clear/style-night/symbols/parking-disabled-m.svg b/data/styles/default/dark/symbols/parking-disabled-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/parking-disabled-m.svg
rename to data/styles/default/dark/symbols/parking-disabled-m.svg
diff --git a/data/styles/clear/style-night/symbols/parking-m.svg b/data/styles/default/dark/symbols/parking-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/parking-m.svg
rename to data/styles/default/dark/symbols/parking-m.svg
diff --git a/data/styles/clear/style-night/symbols/parking-meter-m.svg b/data/styles/default/dark/symbols/parking-meter-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/parking-meter-m.svg
rename to data/styles/default/dark/symbols/parking-meter-m.svg
diff --git a/data/styles/clear/style-night/symbols/parking-s.svg b/data/styles/default/dark/symbols/parking-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/parking-s.svg
rename to data/styles/default/dark/symbols/parking-s.svg
diff --git a/data/styles/clear/style-night/symbols/parking_entrance-m.svg b/data/styles/default/dark/symbols/parking_entrance-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/parking_entrance-m.svg
rename to data/styles/default/dark/symbols/parking_entrance-m.svg
diff --git a/data/styles/clear/style-night/symbols/parking_entrance_private-m.svg b/data/styles/default/dark/symbols/parking_entrance_private-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/parking_entrance_private-m.svg
rename to data/styles/default/dark/symbols/parking_entrance_private-m.svg
diff --git a/data/styles/clear/style-night/symbols/parking_pay-m.svg b/data/styles/default/dark/symbols/parking_pay-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/parking_pay-m.svg
rename to data/styles/default/dark/symbols/parking_pay-m.svg
diff --git a/data/styles/clear/style-night/symbols/parking_pay-s.svg b/data/styles/default/dark/symbols/parking_pay-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/parking_pay-s.svg
rename to data/styles/default/dark/symbols/parking_pay-s.svg
diff --git a/data/styles/clear/style-night/symbols/parking_private-m.svg b/data/styles/default/dark/symbols/parking_private-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/parking_private-m.svg
rename to data/styles/default/dark/symbols/parking_private-m.svg
diff --git a/data/styles/clear/style-night/symbols/parking_private-s.svg b/data/styles/default/dark/symbols/parking_private-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/parking_private-s.svg
rename to data/styles/default/dark/symbols/parking_private-s.svg
diff --git a/data/styles/clear/style-night/symbols/parking_underground-m.svg b/data/styles/default/dark/symbols/parking_underground-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/parking_underground-m.svg
rename to data/styles/default/dark/symbols/parking_underground-m.svg
diff --git a/data/styles/clear/style-night/symbols/parking_underground_pay-m.svg b/data/styles/default/dark/symbols/parking_underground_pay-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/parking_underground_pay-m.svg
rename to data/styles/default/dark/symbols/parking_underground_pay-m.svg
diff --git a/data/styles/clear/style-night/symbols/parking_underground_private-m.svg b/data/styles/default/dark/symbols/parking_underground_private-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/parking_underground_private-m.svg
rename to data/styles/default/dark/symbols/parking_underground_private-m.svg
diff --git a/data/styles/clear/style-night/symbols/peakt-m.svg b/data/styles/default/dark/symbols/peakt-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/peakt-m.svg
rename to data/styles/default/dark/symbols/peakt-m.svg
diff --git a/data/styles/clear/style-night/symbols/peakt-s.svg b/data/styles/default/dark/symbols/peakt-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/peakt-s.svg
rename to data/styles/default/dark/symbols/peakt-s.svg
diff --git a/data/styles/clear/style-night/symbols/pelota-m.svg b/data/styles/default/dark/symbols/pelota-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/pelota-m.svg
rename to data/styles/default/dark/symbols/pelota-m.svg
diff --git a/data/styles/clear/style-night/symbols/petshop-m.svg b/data/styles/default/dark/symbols/petshop-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/petshop-m.svg
rename to data/styles/default/dark/symbols/petshop-m.svg
diff --git a/data/styles/clear/style-night/symbols/petting_zoo-m.svg b/data/styles/default/dark/symbols/petting_zoo-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/petting_zoo-m.svg
rename to data/styles/default/dark/symbols/petting_zoo-m.svg
diff --git a/data/styles/clear/style-night/symbols/pharmacy-m.svg b/data/styles/default/dark/symbols/pharmacy-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/pharmacy-m.svg
rename to data/styles/default/dark/symbols/pharmacy-m.svg
diff --git a/data/styles/clear/style-night/symbols/phone-m.svg b/data/styles/default/dark/symbols/phone-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/phone-m.svg
rename to data/styles/default/dark/symbols/phone-m.svg
diff --git a/data/styles/clear/style-night/symbols/photo-shop-m.svg b/data/styles/default/dark/symbols/photo-shop-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/photo-shop-m.svg
rename to data/styles/default/dark/symbols/photo-shop-m.svg
diff --git a/data/styles/clear/style-night/symbols/physiotherapist-m.svg b/data/styles/default/dark/symbols/physiotherapist-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/physiotherapist-m.svg
rename to data/styles/default/dark/symbols/physiotherapist-m.svg
diff --git a/data/styles/clear/style-night/symbols/picnic-m.svg b/data/styles/default/dark/symbols/picnic-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/picnic-m.svg
rename to data/styles/default/dark/symbols/picnic-m.svg
diff --git a/data/styles/clear/style-night/symbols/picnic-s.svg b/data/styles/default/dark/symbols/picnic-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/picnic-s.svg
rename to data/styles/default/dark/symbols/picnic-s.svg
diff --git a/data/styles/clear/style-night/symbols/picnic_table-m.svg b/data/styles/default/dark/symbols/picnic_table-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/picnic_table-m.svg
rename to data/styles/default/dark/symbols/picnic_table-m.svg
diff --git a/data/styles/clear/style-night/symbols/pitch-m.svg b/data/styles/default/dark/symbols/pitch-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/pitch-m.svg
rename to data/styles/default/dark/symbols/pitch-m.svg
diff --git a/data/styles/clear/style-night/symbols/place-of-worship-m.svg b/data/styles/default/dark/symbols/place-of-worship-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/place-of-worship-m.svg
rename to data/styles/default/dark/symbols/place-of-worship-m.svg
diff --git a/data/styles/clear/style-night/symbols/place-of-worship-s.svg b/data/styles/default/dark/symbols/place-of-worship-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/place-of-worship-s.svg
rename to data/styles/default/dark/symbols/place-of-worship-s.svg
diff --git a/data/styles/clear/style-night/symbols/plaque.svg b/data/styles/default/dark/symbols/plaque.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/plaque.svg
rename to data/styles/default/dark/symbols/plaque.svg
diff --git a/data/styles/clear/style-night/symbols/playground-m.svg b/data/styles/default/dark/symbols/playground-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/playground-m.svg
rename to data/styles/default/dark/symbols/playground-m.svg
diff --git a/data/styles/clear/style-night/symbols/plumber-m.svg b/data/styles/default/dark/symbols/plumber-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/plumber-m.svg
rename to data/styles/default/dark/symbols/plumber-m.svg
diff --git a/data/styles/clear/style-night/symbols/podiatrist-m.svg b/data/styles/default/dark/symbols/podiatrist-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/podiatrist-m.svg
rename to data/styles/default/dark/symbols/podiatrist-m.svg
diff --git a/data/styles/clear/style-night/symbols/police-m.svg b/data/styles/default/dark/symbols/police-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/police-m.svg
rename to data/styles/default/dark/symbols/police-m.svg
diff --git a/data/styles/clear/style-night/symbols/postbox-m.svg b/data/styles/default/dark/symbols/postbox-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/postbox-m.svg
rename to data/styles/default/dark/symbols/postbox-m.svg
diff --git a/data/styles/clear/style-night/symbols/power-m.svg b/data/styles/default/dark/symbols/power-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/power-m.svg
rename to data/styles/default/dark/symbols/power-m.svg
diff --git a/data/styles/clear/style-night/symbols/power-tower-m.svg b/data/styles/default/dark/symbols/power-tower-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/power-tower-m.svg
rename to data/styles/default/dark/symbols/power-tower-m.svg
diff --git a/data/styles/clear/style-night/symbols/power_plant_wind-m.svg b/data/styles/default/dark/symbols/power_plant_wind-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/power_plant_wind-m.svg
rename to data/styles/default/dark/symbols/power_plant_wind-m.svg
diff --git a/data/styles/clear/style-night/symbols/prison-m.svg b/data/styles/default/dark/symbols/prison-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/prison-m.svg
rename to data/styles/default/dark/symbols/prison-m.svg
diff --git a/data/styles/clear/style-night/symbols/psychotherapist-m.svg b/data/styles/default/dark/symbols/psychotherapist-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/psychotherapist-m.svg
rename to data/styles/default/dark/symbols/psychotherapist-m.svg
diff --git a/data/styles/clear/style-night/symbols/public-building-m.svg b/data/styles/default/dark/symbols/public-building-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/public-building-m.svg
rename to data/styles/default/dark/symbols/public-building-m.svg
diff --git a/data/styles/clear/style-night/symbols/public_bath-m.svg b/data/styles/default/dark/symbols/public_bath-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/public_bath-m.svg
rename to data/styles/default/dark/symbols/public_bath-m.svg
diff --git a/data/styles/clear/style-night/symbols/railway-crossing-l.svg b/data/styles/default/dark/symbols/railway-crossing-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/railway-crossing-l.svg
rename to data/styles/default/dark/symbols/railway-crossing-l.svg
diff --git a/data/styles/clear/style-night/symbols/railway-crossing-m.svg b/data/styles/default/dark/symbols/railway-crossing-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/railway-crossing-m.svg
rename to data/styles/default/dark/symbols/railway-crossing-m.svg
diff --git a/data/styles/clear/style-night/symbols/recycling-m.svg b/data/styles/default/dark/symbols/recycling-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/recycling-m.svg
rename to data/styles/default/dark/symbols/recycling-m.svg
diff --git a/data/styles/clear/style-night/symbols/remains-m.svg b/data/styles/default/dark/symbols/remains-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/remains-m.svg
rename to data/styles/default/dark/symbols/remains-m.svg
diff --git a/data/styles/clear/style-night/symbols/remains-s.svg b/data/styles/default/dark/symbols/remains-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/remains-s.svg
rename to data/styles/default/dark/symbols/remains-s.svg
diff --git a/data/styles/clear/style-night/symbols/rental-m.svg b/data/styles/default/dark/symbols/rental-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/rental-m.svg
rename to data/styles/default/dark/symbols/rental-m.svg
diff --git a/data/styles/clear/style-night/symbols/restaurant-m.svg b/data/styles/default/dark/symbols/restaurant-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/restaurant-m.svg
rename to data/styles/default/dark/symbols/restaurant-m.svg
diff --git a/data/styles/clear/style-night/symbols/sample_collection-m.svg b/data/styles/default/dark/symbols/sample_collection-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/sample_collection-m.svg
rename to data/styles/default/dark/symbols/sample_collection-m.svg
diff --git a/data/styles/clear/style-night/symbols/sawmill-m.svg b/data/styles/default/dark/symbols/sawmill-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/sawmill-m.svg
rename to data/styles/default/dark/symbols/sawmill-m.svg
diff --git a/data/styles/clear/style-night/symbols/school-m.svg b/data/styles/default/dark/symbols/school-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/school-m.svg
rename to data/styles/default/dark/symbols/school-m.svg
diff --git a/data/styles/clear/style-night/symbols/seafood-shop-m.svg b/data/styles/default/dark/symbols/seafood-shop-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/seafood-shop-m.svg
rename to data/styles/default/dark/symbols/seafood-shop-m.svg
diff --git a/data/styles/clear/style-night/symbols/second_hand_shop-m.svg b/data/styles/default/dark/symbols/second_hand_shop-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/second_hand_shop-m.svg
rename to data/styles/default/dark/symbols/second_hand_shop-m.svg
diff --git a/data/styles/clear/style-night/symbols/shelter-m.svg b/data/styles/default/dark/symbols/shelter-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/shelter-m.svg
rename to data/styles/default/dark/symbols/shelter-m.svg
diff --git a/data/styles/clear/style-night/symbols/shelter-public_transport-m.svg b/data/styles/default/dark/symbols/shelter-public_transport-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/shelter-public_transport-m.svg
rename to data/styles/default/dark/symbols/shelter-public_transport-m.svg
diff --git a/data/styles/clear/style-night/symbols/shelter-s.svg b/data/styles/default/dark/symbols/shelter-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/shelter-s.svg
rename to data/styles/default/dark/symbols/shelter-s.svg
diff --git a/data/styles/clear/style-night/symbols/shinto-m.svg b/data/styles/default/dark/symbols/shinto-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/shinto-m.svg
rename to data/styles/default/dark/symbols/shinto-m.svg
diff --git a/data/styles/clear/style-night/symbols/shinto-s.svg b/data/styles/default/dark/symbols/shinto-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/shinto-s.svg
rename to data/styles/default/dark/symbols/shinto-s.svg
diff --git a/data/styles/clear/style-night/symbols/ship-m.svg b/data/styles/default/dark/symbols/ship-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/ship-m.svg
rename to data/styles/default/dark/symbols/ship-m.svg
diff --git a/data/styles/clear/style-night/symbols/ship-s.svg b/data/styles/default/dark/symbols/ship-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/ship-s.svg
rename to data/styles/default/dark/symbols/ship-s.svg
diff --git a/data/styles/clear/style-night/symbols/shoes-m.svg b/data/styles/default/dark/symbols/shoes-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/shoes-m.svg
rename to data/styles/default/dark/symbols/shoes-m.svg
diff --git a/data/styles/clear/style-night/symbols/shop-bicycle-m.svg b/data/styles/default/dark/symbols/shop-bicycle-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/shop-bicycle-m.svg
rename to data/styles/default/dark/symbols/shop-bicycle-m.svg
diff --git a/data/styles/clear/style-night/symbols/shop-m.svg b/data/styles/default/dark/symbols/shop-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/shop-m.svg
rename to data/styles/default/dark/symbols/shop-m.svg
diff --git a/data/styles/clear/style-night/symbols/shop-rental-bicycle-m.svg b/data/styles/default/dark/symbols/shop-rental-bicycle-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/shop-rental-bicycle-m.svg
rename to data/styles/default/dark/symbols/shop-rental-bicycle-m.svg
diff --git a/data/styles/clear/style-night/symbols/shop-s.svg b/data/styles/default/dark/symbols/shop-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/shop-s.svg
rename to data/styles/default/dark/symbols/shop-s.svg
diff --git a/data/styles/clear/style-night/symbols/shower-m.svg b/data/styles/default/dark/symbols/shower-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/shower-m.svg
rename to data/styles/default/dark/symbols/shower-m.svg
diff --git a/data/styles/clear/style-night/symbols/skateboard-m.svg b/data/styles/default/dark/symbols/skateboard-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/skateboard-m.svg
rename to data/styles/default/dark/symbols/skateboard-m.svg
diff --git a/data/styles/clear/style-night/symbols/skiing-m.svg b/data/styles/default/dark/symbols/skiing-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/skiing-m.svg
rename to data/styles/default/dark/symbols/skiing-m.svg
diff --git a/data/styles/clear/style-night/symbols/slots-m.svg b/data/styles/default/dark/symbols/slots-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/slots-m.svg
rename to data/styles/default/dark/symbols/slots-m.svg
diff --git a/data/styles/clear/style-night/symbols/soccer-m.svg b/data/styles/default/dark/symbols/soccer-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/soccer-m.svg
rename to data/styles/default/dark/symbols/soccer-m.svg
diff --git a/data/styles/clear/style-night/symbols/speech_therapist-m.svg b/data/styles/default/dark/symbols/speech_therapist-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/speech_therapist-m.svg
rename to data/styles/default/dark/symbols/speech_therapist-m.svg
diff --git a/data/styles/clear/style-night/symbols/speedcam-alert-l.svg b/data/styles/default/dark/symbols/speedcam-alert-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/speedcam-alert-l.svg
rename to data/styles/default/dark/symbols/speedcam-alert-l.svg
diff --git a/data/styles/clear/style-night/symbols/speedcam-m.svg b/data/styles/default/dark/symbols/speedcam-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/speedcam-m.svg
rename to data/styles/default/dark/symbols/speedcam-m.svg
diff --git a/data/styles/clear/style-night/symbols/speedcam-s.svg b/data/styles/default/dark/symbols/speedcam-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/speedcam-s.svg
rename to data/styles/default/dark/symbols/speedcam-s.svg
diff --git a/data/styles/clear/style-night/symbols/sports-m.svg b/data/styles/default/dark/symbols/sports-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/sports-m.svg
rename to data/styles/default/dark/symbols/sports-m.svg
diff --git a/data/styles/clear/style-night/symbols/stadium-m.svg b/data/styles/default/dark/symbols/stadium-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/stadium-m.svg
rename to data/styles/default/dark/symbols/stadium-m.svg
diff --git a/data/styles/clear/style-night/symbols/stadium-s.svg b/data/styles/default/dark/symbols/stadium-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/stadium-s.svg
rename to data/styles/default/dark/symbols/stadium-s.svg
diff --git a/data/styles/clear/style-clear/symbols/star-l.svg b/data/styles/default/dark/symbols/star-l.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/star-l.svg
rename to data/styles/default/dark/symbols/star-l.svg
diff --git a/data/styles/clear/style-clear/symbols/star-m.svg b/data/styles/default/dark/symbols/star-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/star-m.svg
rename to data/styles/default/dark/symbols/star-m.svg
diff --git a/data/styles/clear/style-clear/symbols/star-s.svg b/data/styles/default/dark/symbols/star-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/star-s.svg
rename to data/styles/default/dark/symbols/star-s.svg
diff --git a/data/styles/clear/style-night/symbols/stationery_shop-m.svg b/data/styles/default/dark/symbols/stationery_shop-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/stationery_shop-m.svg
rename to data/styles/default/dark/symbols/stationery_shop-m.svg
diff --git a/data/styles/clear/style-night/symbols/statue-m.svg b/data/styles/default/dark/symbols/statue-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/statue-m.svg
rename to data/styles/default/dark/symbols/statue-m.svg
diff --git a/data/styles/clear/style-night/symbols/stone-m.svg b/data/styles/default/dark/symbols/stone-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/stone-m.svg
rename to data/styles/default/dark/symbols/stone-m.svg
diff --git a/data/styles/clear/style-night/symbols/storage-tank.svg b/data/styles/default/dark/symbols/storage-tank.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/storage-tank.svg
rename to data/styles/default/dark/symbols/storage-tank.svg
diff --git a/data/styles/clear/style-night/symbols/stripclub-m.svg b/data/styles/default/dark/symbols/stripclub-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/stripclub-m.svg
rename to data/styles/default/dark/symbols/stripclub-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-adana-m.svg b/data/styles/default/dark/symbols/subway-adana-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-adana-m.svg
rename to data/styles/default/dark/symbols/subway-adana-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-adana-s.svg b/data/styles/default/dark/symbols/subway-adana-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-adana-s.svg
rename to data/styles/default/dark/symbols/subway-adana-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-algeria-m.svg b/data/styles/default/dark/symbols/subway-algeria-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-algeria-m.svg
rename to data/styles/default/dark/symbols/subway-algeria-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-algeria-s.svg b/data/styles/default/dark/symbols/subway-algeria-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-algeria-s.svg
rename to data/styles/default/dark/symbols/subway-algeria-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-alicante-m.svg b/data/styles/default/dark/symbols/subway-alicante-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-alicante-m.svg
rename to data/styles/default/dark/symbols/subway-alicante-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-alicante-s.svg b/data/styles/default/dark/symbols/subway-alicante-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-alicante-s.svg
rename to data/styles/default/dark/symbols/subway-alicante-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-almaty-m.svg b/data/styles/default/dark/symbols/subway-almaty-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-almaty-m.svg
rename to data/styles/default/dark/symbols/subway-almaty-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-almaty-s.svg b/data/styles/default/dark/symbols/subway-almaty-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-almaty-s.svg
rename to data/styles/default/dark/symbols/subway-almaty-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-amsterdam-m.svg b/data/styles/default/dark/symbols/subway-amsterdam-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-amsterdam-m.svg
rename to data/styles/default/dark/symbols/subway-amsterdam-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-amsterdam-s.svg b/data/styles/default/dark/symbols/subway-amsterdam-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-amsterdam-s.svg
rename to data/styles/default/dark/symbols/subway-amsterdam-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-ankara-m.svg b/data/styles/default/dark/symbols/subway-ankara-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-ankara-m.svg
rename to data/styles/default/dark/symbols/subway-ankara-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-ankara-s.svg b/data/styles/default/dark/symbols/subway-ankara-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-ankara-s.svg
rename to data/styles/default/dark/symbols/subway-ankara-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-athens-m.svg b/data/styles/default/dark/symbols/subway-athens-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-athens-m.svg
rename to data/styles/default/dark/symbols/subway-athens-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-athens-s.svg b/data/styles/default/dark/symbols/subway-athens-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-athens-s.svg
rename to data/styles/default/dark/symbols/subway-athens-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-baku-m.svg b/data/styles/default/dark/symbols/subway-baku-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-baku-m.svg
rename to data/styles/default/dark/symbols/subway-baku-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-baku-s.svg b/data/styles/default/dark/symbols/subway-baku-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-baku-s.svg
rename to data/styles/default/dark/symbols/subway-baku-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-bangkok-m.svg b/data/styles/default/dark/symbols/subway-bangkok-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-bangkok-m.svg
rename to data/styles/default/dark/symbols/subway-bangkok-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-bangkok-s.svg b/data/styles/default/dark/symbols/subway-bangkok-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-bangkok-s.svg
rename to data/styles/default/dark/symbols/subway-bangkok-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-barcelona-m.svg b/data/styles/default/dark/symbols/subway-barcelona-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-barcelona-m.svg
rename to data/styles/default/dark/symbols/subway-barcelona-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-barcelona-s.svg b/data/styles/default/dark/symbols/subway-barcelona-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-barcelona-s.svg
rename to data/styles/default/dark/symbols/subway-barcelona-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-beijing-m.svg b/data/styles/default/dark/symbols/subway-beijing-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-beijing-m.svg
rename to data/styles/default/dark/symbols/subway-beijing-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-beijing-s.svg b/data/styles/default/dark/symbols/subway-beijing-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-beijing-s.svg
rename to data/styles/default/dark/symbols/subway-beijing-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-bengaluru-m.svg b/data/styles/default/dark/symbols/subway-bengaluru-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-bengaluru-m.svg
rename to data/styles/default/dark/symbols/subway-bengaluru-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-bengaluru-s.svg b/data/styles/default/dark/symbols/subway-bengaluru-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-bengaluru-s.svg
rename to data/styles/default/dark/symbols/subway-bengaluru-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-bilbao-m.svg b/data/styles/default/dark/symbols/subway-bilbao-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-bilbao-m.svg
rename to data/styles/default/dark/symbols/subway-bilbao-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-bilbao-s.svg b/data/styles/default/dark/symbols/subway-bilbao-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-bilbao-s.svg
rename to data/styles/default/dark/symbols/subway-bilbao-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-brasilia-m.svg b/data/styles/default/dark/symbols/subway-brasilia-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-brasilia-m.svg
rename to data/styles/default/dark/symbols/subway-brasilia-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-brasilia-s.svg b/data/styles/default/dark/symbols/subway-brasilia-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-brasilia-s.svg
rename to data/styles/default/dark/symbols/subway-brasilia-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-brescia-m.svg b/data/styles/default/dark/symbols/subway-brescia-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-brescia-m.svg
rename to data/styles/default/dark/symbols/subway-brescia-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-brescia-s.svg b/data/styles/default/dark/symbols/subway-brescia-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-brescia-s.svg
rename to data/styles/default/dark/symbols/subway-brescia-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-brussel-m.svg b/data/styles/default/dark/symbols/subway-brussel-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-brussel-m.svg
rename to data/styles/default/dark/symbols/subway-brussel-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-brussel-s.svg b/data/styles/default/dark/symbols/subway-brussel-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-brussel-s.svg
rename to data/styles/default/dark/symbols/subway-brussel-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-bucharest-m.svg b/data/styles/default/dark/symbols/subway-bucharest-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-bucharest-m.svg
rename to data/styles/default/dark/symbols/subway-bucharest-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-bucharest-s.svg b/data/styles/default/dark/symbols/subway-bucharest-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-bucharest-s.svg
rename to data/styles/default/dark/symbols/subway-bucharest-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-budapest-m.svg b/data/styles/default/dark/symbols/subway-budapest-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-budapest-m.svg
rename to data/styles/default/dark/symbols/subway-budapest-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-budapest-s.svg b/data/styles/default/dark/symbols/subway-budapest-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-budapest-s.svg
rename to data/styles/default/dark/symbols/subway-budapest-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-buenosaires-m.svg b/data/styles/default/dark/symbols/subway-buenosaires-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-buenosaires-m.svg
rename to data/styles/default/dark/symbols/subway-buenosaires-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-buenosaires-s.svg b/data/styles/default/dark/symbols/subway-buenosaires-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-buenosaires-s.svg
rename to data/styles/default/dark/symbols/subway-buenosaires-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-bursaray-m.svg b/data/styles/default/dark/symbols/subway-bursaray-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-bursaray-m.svg
rename to data/styles/default/dark/symbols/subway-bursaray-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-bursaray-s.svg b/data/styles/default/dark/symbols/subway-bursaray-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-bursaray-s.svg
rename to data/styles/default/dark/symbols/subway-bursaray-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-cairo-m.svg b/data/styles/default/dark/symbols/subway-cairo-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-cairo-m.svg
rename to data/styles/default/dark/symbols/subway-cairo-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-cairo-s.svg b/data/styles/default/dark/symbols/subway-cairo-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-cairo-s.svg
rename to data/styles/default/dark/symbols/subway-cairo-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-caracas-m.svg b/data/styles/default/dark/symbols/subway-caracas-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-caracas-m.svg
rename to data/styles/default/dark/symbols/subway-caracas-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-caracas-s.svg b/data/styles/default/dark/symbols/subway-caracas-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-caracas-s.svg
rename to data/styles/default/dark/symbols/subway-caracas-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-catania-m.svg b/data/styles/default/dark/symbols/subway-catania-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-catania-m.svg
rename to data/styles/default/dark/symbols/subway-catania-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-catania-s.svg b/data/styles/default/dark/symbols/subway-catania-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-catania-s.svg
rename to data/styles/default/dark/symbols/subway-catania-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-changchun-m.svg b/data/styles/default/dark/symbols/subway-changchun-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-changchun-m.svg
rename to data/styles/default/dark/symbols/subway-changchun-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-changchun-s.svg b/data/styles/default/dark/symbols/subway-changchun-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-changchun-s.svg
rename to data/styles/default/dark/symbols/subway-changchun-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-chengdu-m.svg b/data/styles/default/dark/symbols/subway-chengdu-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-chengdu-m.svg
rename to data/styles/default/dark/symbols/subway-chengdu-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-chengdu-s.svg b/data/styles/default/dark/symbols/subway-chengdu-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-chengdu-s.svg
rename to data/styles/default/dark/symbols/subway-chengdu-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-chicago-m.svg b/data/styles/default/dark/symbols/subway-chicago-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-chicago-m.svg
rename to data/styles/default/dark/symbols/subway-chicago-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-chicago-s.svg b/data/styles/default/dark/symbols/subway-chicago-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-chicago-s.svg
rename to data/styles/default/dark/symbols/subway-chicago-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-chongqing-m.svg b/data/styles/default/dark/symbols/subway-chongqing-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-chongqing-m.svg
rename to data/styles/default/dark/symbols/subway-chongqing-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-chongqing-s.svg b/data/styles/default/dark/symbols/subway-chongqing-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-chongqing-s.svg
rename to data/styles/default/dark/symbols/subway-chongqing-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-dalian-m.svg b/data/styles/default/dark/symbols/subway-dalian-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-dalian-m.svg
rename to data/styles/default/dark/symbols/subway-dalian-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-dalian-s.svg b/data/styles/default/dark/symbols/subway-dalian-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-dalian-s.svg
rename to data/styles/default/dark/symbols/subway-dalian-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-delhi-m.svg b/data/styles/default/dark/symbols/subway-delhi-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-delhi-m.svg
rename to data/styles/default/dark/symbols/subway-delhi-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-delhi-s.svg b/data/styles/default/dark/symbols/subway-delhi-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-delhi-s.svg
rename to data/styles/default/dark/symbols/subway-delhi-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-dnepro-m.svg b/data/styles/default/dark/symbols/subway-dnepro-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-dnepro-m.svg
rename to data/styles/default/dark/symbols/subway-dnepro-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-dnepro-s.svg b/data/styles/default/dark/symbols/subway-dnepro-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-dnepro-s.svg
rename to data/styles/default/dark/symbols/subway-dnepro-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-dubai-m.svg b/data/styles/default/dark/symbols/subway-dubai-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-dubai-m.svg
rename to data/styles/default/dark/symbols/subway-dubai-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-dubai-s.svg b/data/styles/default/dark/symbols/subway-dubai-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-dubai-s.svg
rename to data/styles/default/dark/symbols/subway-dubai-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-edmonton-m.svg b/data/styles/default/dark/symbols/subway-edmonton-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-edmonton-m.svg
rename to data/styles/default/dark/symbols/subway-edmonton-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-edmonton-s.svg b/data/styles/default/dark/symbols/subway-edmonton-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-edmonton-s.svg
rename to data/styles/default/dark/symbols/subway-edmonton-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-ekb-m.svg b/data/styles/default/dark/symbols/subway-ekb-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-ekb-m.svg
rename to data/styles/default/dark/symbols/subway-ekb-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-ekb-s.svg b/data/styles/default/dark/symbols/subway-ekb-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-ekb-s.svg
rename to data/styles/default/dark/symbols/subway-ekb-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-entrance-m.svg b/data/styles/default/dark/symbols/subway-entrance-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-entrance-m.svg
rename to data/styles/default/dark/symbols/subway-entrance-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-entrance-s.svg b/data/styles/default/dark/symbols/subway-entrance-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-entrance-s.svg
rename to data/styles/default/dark/symbols/subway-entrance-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-foshan-m.svg b/data/styles/default/dark/symbols/subway-foshan-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-foshan-m.svg
rename to data/styles/default/dark/symbols/subway-foshan-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-foshan-s.svg b/data/styles/default/dark/symbols/subway-foshan-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-foshan-s.svg
rename to data/styles/default/dark/symbols/subway-foshan-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-fukuoka-m.svg b/data/styles/default/dark/symbols/subway-fukuoka-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-fukuoka-m.svg
rename to data/styles/default/dark/symbols/subway-fukuoka-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-fukuoka-s.svg b/data/styles/default/dark/symbols/subway-fukuoka-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-fukuoka-s.svg
rename to data/styles/default/dark/symbols/subway-fukuoka-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-glasgow-m.svg b/data/styles/default/dark/symbols/subway-glasgow-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-glasgow-m.svg
rename to data/styles/default/dark/symbols/subway-glasgow-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-glasgow-s.svg b/data/styles/default/dark/symbols/subway-glasgow-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-glasgow-s.svg
rename to data/styles/default/dark/symbols/subway-glasgow-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-guadalajara-m.svg b/data/styles/default/dark/symbols/subway-guadalajara-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-guadalajara-m.svg
rename to data/styles/default/dark/symbols/subway-guadalajara-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-guadalajara-s.svg b/data/styles/default/dark/symbols/subway-guadalajara-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-guadalajara-s.svg
rename to data/styles/default/dark/symbols/subway-guadalajara-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-guangzhou-m.svg b/data/styles/default/dark/symbols/subway-guangzhou-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-guangzhou-m.svg
rename to data/styles/default/dark/symbols/subway-guangzhou-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-guangzhou-s.svg b/data/styles/default/dark/symbols/subway-guangzhou-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-guangzhou-s.svg
rename to data/styles/default/dark/symbols/subway-guangzhou-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-haagse-m.svg b/data/styles/default/dark/symbols/subway-haagse-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-haagse-m.svg
rename to data/styles/default/dark/symbols/subway-haagse-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-haagse-s.svg b/data/styles/default/dark/symbols/subway-haagse-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-haagse-s.svg
rename to data/styles/default/dark/symbols/subway-haagse-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-helsinki-m.svg b/data/styles/default/dark/symbols/subway-helsinki-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-helsinki-m.svg
rename to data/styles/default/dark/symbols/subway-helsinki-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-helsinki-s.svg b/data/styles/default/dark/symbols/subway-helsinki-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-helsinki-s.svg
rename to data/styles/default/dark/symbols/subway-helsinki-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-hirosima-m.svg b/data/styles/default/dark/symbols/subway-hirosima-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-hirosima-m.svg
rename to data/styles/default/dark/symbols/subway-hirosima-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-hirosima-s.svg b/data/styles/default/dark/symbols/subway-hirosima-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-hirosima-s.svg
rename to data/styles/default/dark/symbols/subway-hirosima-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-isfahan-m.svg b/data/styles/default/dark/symbols/subway-isfahan-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-isfahan-m.svg
rename to data/styles/default/dark/symbols/subway-isfahan-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-isfahan-s.svg b/data/styles/default/dark/symbols/subway-isfahan-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-isfahan-s.svg
rename to data/styles/default/dark/symbols/subway-isfahan-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-istanbul-m.svg b/data/styles/default/dark/symbols/subway-istanbul-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-istanbul-m.svg
rename to data/styles/default/dark/symbols/subway-istanbul-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-istanbul-s.svg b/data/styles/default/dark/symbols/subway-istanbul-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-istanbul-s.svg
rename to data/styles/default/dark/symbols/subway-istanbul-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-izmir-m.svg b/data/styles/default/dark/symbols/subway-izmir-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-izmir-m.svg
rename to data/styles/default/dark/symbols/subway-izmir-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-izmir-s.svg b/data/styles/default/dark/symbols/subway-izmir-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-izmir-s.svg
rename to data/styles/default/dark/symbols/subway-izmir-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kazan-m.svg b/data/styles/default/dark/symbols/subway-kazan-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kazan-m.svg
rename to data/styles/default/dark/symbols/subway-kazan-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kazan-s.svg b/data/styles/default/dark/symbols/subway-kazan-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kazan-s.svg
rename to data/styles/default/dark/symbols/subway-kazan-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kharkiv-m.svg b/data/styles/default/dark/symbols/subway-kharkiv-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kharkiv-m.svg
rename to data/styles/default/dark/symbols/subway-kharkiv-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kharkiv-s.svg b/data/styles/default/dark/symbols/subway-kharkiv-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kharkiv-s.svg
rename to data/styles/default/dark/symbols/subway-kharkiv-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kiev-m.svg b/data/styles/default/dark/symbols/subway-kiev-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kiev-m.svg
rename to data/styles/default/dark/symbols/subway-kiev-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kiev-s.svg b/data/styles/default/dark/symbols/subway-kiev-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kiev-s.svg
rename to data/styles/default/dark/symbols/subway-kiev-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kobe-m.svg b/data/styles/default/dark/symbols/subway-kobe-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kobe-m.svg
rename to data/styles/default/dark/symbols/subway-kobe-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kobe-s.svg b/data/styles/default/dark/symbols/subway-kobe-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kobe-s.svg
rename to data/styles/default/dark/symbols/subway-kobe-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kolkata-m.svg b/data/styles/default/dark/symbols/subway-kolkata-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kolkata-m.svg
rename to data/styles/default/dark/symbols/subway-kolkata-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kolkata-s.svg b/data/styles/default/dark/symbols/subway-kolkata-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kolkata-s.svg
rename to data/styles/default/dark/symbols/subway-kolkata-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kryvyirih-m.svg b/data/styles/default/dark/symbols/subway-kryvyirih-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kryvyirih-m.svg
rename to data/styles/default/dark/symbols/subway-kryvyirih-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kryvyirih-s.svg b/data/styles/default/dark/symbols/subway-kryvyirih-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kryvyirih-s.svg
rename to data/styles/default/dark/symbols/subway-kryvyirih-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kunming-m.svg b/data/styles/default/dark/symbols/subway-kunming-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kunming-m.svg
rename to data/styles/default/dark/symbols/subway-kunming-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kunming-s.svg b/data/styles/default/dark/symbols/subway-kunming-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kunming-s.svg
rename to data/styles/default/dark/symbols/subway-kunming-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kyoto-m.svg b/data/styles/default/dark/symbols/subway-kyoto-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kyoto-m.svg
rename to data/styles/default/dark/symbols/subway-kyoto-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kyoto-s.svg b/data/styles/default/dark/symbols/subway-kyoto-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kyoto-s.svg
rename to data/styles/default/dark/symbols/subway-kyoto-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lausanne-m.svg b/data/styles/default/dark/symbols/subway-lausanne-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lausanne-m.svg
rename to data/styles/default/dark/symbols/subway-lausanne-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lausanne-s.svg b/data/styles/default/dark/symbols/subway-lausanne-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lausanne-s.svg
rename to data/styles/default/dark/symbols/subway-lausanne-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lille-m.svg b/data/styles/default/dark/symbols/subway-lille-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lille-m.svg
rename to data/styles/default/dark/symbols/subway-lille-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lille-s.svg b/data/styles/default/dark/symbols/subway-lille-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lille-s.svg
rename to data/styles/default/dark/symbols/subway-lille-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lima-m.svg b/data/styles/default/dark/symbols/subway-lima-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lima-m.svg
rename to data/styles/default/dark/symbols/subway-lima-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lima-s.svg b/data/styles/default/dark/symbols/subway-lima-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lima-s.svg
rename to data/styles/default/dark/symbols/subway-lima-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lisboa-m.svg b/data/styles/default/dark/symbols/subway-lisboa-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lisboa-m.svg
rename to data/styles/default/dark/symbols/subway-lisboa-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lisboa-s.svg b/data/styles/default/dark/symbols/subway-lisboa-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lisboa-s.svg
rename to data/styles/default/dark/symbols/subway-lisboa-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-london-m.svg b/data/styles/default/dark/symbols/subway-london-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-london-m.svg
rename to data/styles/default/dark/symbols/subway-london-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-london-s.svg b/data/styles/default/dark/symbols/subway-london-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-london-s.svg
rename to data/styles/default/dark/symbols/subway-london-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-losangeles-m.svg b/data/styles/default/dark/symbols/subway-losangeles-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-losangeles-m.svg
rename to data/styles/default/dark/symbols/subway-losangeles-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-losangeles-s.svg b/data/styles/default/dark/symbols/subway-losangeles-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-losangeles-s.svg
rename to data/styles/default/dark/symbols/subway-losangeles-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lucknow-m.svg b/data/styles/default/dark/symbols/subway-lucknow-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lucknow-m.svg
rename to data/styles/default/dark/symbols/subway-lucknow-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lucknow-s.svg b/data/styles/default/dark/symbols/subway-lucknow-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lucknow-s.svg
rename to data/styles/default/dark/symbols/subway-lucknow-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lyon-m.svg b/data/styles/default/dark/symbols/subway-lyon-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lyon-m.svg
rename to data/styles/default/dark/symbols/subway-lyon-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lyon-s.svg b/data/styles/default/dark/symbols/subway-lyon-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lyon-s.svg
rename to data/styles/default/dark/symbols/subway-lyon-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-m.svg b/data/styles/default/dark/symbols/subway-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-m.svg
rename to data/styles/default/dark/symbols/subway-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-madrid-m.svg b/data/styles/default/dark/symbols/subway-madrid-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-madrid-m.svg
rename to data/styles/default/dark/symbols/subway-madrid-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-madrid-s.svg b/data/styles/default/dark/symbols/subway-madrid-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-madrid-s.svg
rename to data/styles/default/dark/symbols/subway-madrid-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-malaga-m.svg b/data/styles/default/dark/symbols/subway-malaga-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-malaga-m.svg
rename to data/styles/default/dark/symbols/subway-malaga-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-malaga-s.svg b/data/styles/default/dark/symbols/subway-malaga-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-malaga-s.svg
rename to data/styles/default/dark/symbols/subway-malaga-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-manila-m.svg b/data/styles/default/dark/symbols/subway-manila-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-manila-m.svg
rename to data/styles/default/dark/symbols/subway-manila-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-manila-s.svg b/data/styles/default/dark/symbols/subway-manila-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-manila-s.svg
rename to data/styles/default/dark/symbols/subway-manila-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-maracaibo-m.svg b/data/styles/default/dark/symbols/subway-maracaibo-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-maracaibo-m.svg
rename to data/styles/default/dark/symbols/subway-maracaibo-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-maracaibo-s.svg b/data/styles/default/dark/symbols/subway-maracaibo-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-maracaibo-s.svg
rename to data/styles/default/dark/symbols/subway-maracaibo-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-marseille-m.svg b/data/styles/default/dark/symbols/subway-marseille-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-marseille-m.svg
rename to data/styles/default/dark/symbols/subway-marseille-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-marseille-s.svg b/data/styles/default/dark/symbols/subway-marseille-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-marseille-s.svg
rename to data/styles/default/dark/symbols/subway-marseille-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-mashhad-m.svg b/data/styles/default/dark/symbols/subway-mashhad-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-mashhad-m.svg
rename to data/styles/default/dark/symbols/subway-mashhad-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-mashhad-s.svg b/data/styles/default/dark/symbols/subway-mashhad-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-mashhad-s.svg
rename to data/styles/default/dark/symbols/subway-mashhad-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-massachusetts-m.svg b/data/styles/default/dark/symbols/subway-massachusetts-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-massachusetts-m.svg
rename to data/styles/default/dark/symbols/subway-massachusetts-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-massachusetts-s.svg b/data/styles/default/dark/symbols/subway-massachusetts-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-massachusetts-s.svg
rename to data/styles/default/dark/symbols/subway-massachusetts-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-mecca-m.svg b/data/styles/default/dark/symbols/subway-mecca-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-mecca-m.svg
rename to data/styles/default/dark/symbols/subway-mecca-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-mecca-s.svg b/data/styles/default/dark/symbols/subway-mecca-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-mecca-s.svg
rename to data/styles/default/dark/symbols/subway-mecca-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-medellin-m.svg b/data/styles/default/dark/symbols/subway-medellin-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-medellin-m.svg
rename to data/styles/default/dark/symbols/subway-medellin-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-medellin-s.svg b/data/styles/default/dark/symbols/subway-medellin-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-medellin-s.svg
rename to data/styles/default/dark/symbols/subway-medellin-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-mexico-m.svg b/data/styles/default/dark/symbols/subway-mexico-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-mexico-m.svg
rename to data/styles/default/dark/symbols/subway-mexico-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-mexico-s.svg b/data/styles/default/dark/symbols/subway-mexico-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-mexico-s.svg
rename to data/styles/default/dark/symbols/subway-mexico-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-milan-m.svg b/data/styles/default/dark/symbols/subway-milan-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-milan-m.svg
rename to data/styles/default/dark/symbols/subway-milan-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-milan-s.svg b/data/styles/default/dark/symbols/subway-milan-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-milan-s.svg
rename to data/styles/default/dark/symbols/subway-milan-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-minatomirai-m.svg b/data/styles/default/dark/symbols/subway-minatomirai-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-minatomirai-m.svg
rename to data/styles/default/dark/symbols/subway-minatomirai-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-minatomirai-s.svg b/data/styles/default/dark/symbols/subway-minatomirai-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-minatomirai-s.svg
rename to data/styles/default/dark/symbols/subway-minatomirai-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-minsk-m.svg b/data/styles/default/dark/symbols/subway-minsk-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-minsk-m.svg
rename to data/styles/default/dark/symbols/subway-minsk-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-minsk-s.svg b/data/styles/default/dark/symbols/subway-minsk-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-minsk-s.svg
rename to data/styles/default/dark/symbols/subway-minsk-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-montreal-m.svg b/data/styles/default/dark/symbols/subway-montreal-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-montreal-m.svg
rename to data/styles/default/dark/symbols/subway-montreal-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-montreal-s.svg b/data/styles/default/dark/symbols/subway-montreal-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-montreal-s.svg
rename to data/styles/default/dark/symbols/subway-montreal-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-moscow-m.svg b/data/styles/default/dark/symbols/subway-moscow-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-moscow-m.svg
rename to data/styles/default/dark/symbols/subway-moscow-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-moscow-s.svg b/data/styles/default/dark/symbols/subway-moscow-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-moscow-s.svg
rename to data/styles/default/dark/symbols/subway-moscow-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-nagoya-m.svg b/data/styles/default/dark/symbols/subway-nagoya-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-nagoya-m.svg
rename to data/styles/default/dark/symbols/subway-nagoya-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-nagoya-s.svg b/data/styles/default/dark/symbols/subway-nagoya-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-nagoya-s.svg
rename to data/styles/default/dark/symbols/subway-nagoya-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-newyork-m.svg b/data/styles/default/dark/symbols/subway-newyork-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-newyork-m.svg
rename to data/styles/default/dark/symbols/subway-newyork-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-newyork-s.svg b/data/styles/default/dark/symbols/subway-newyork-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-newyork-s.svg
rename to data/styles/default/dark/symbols/subway-newyork-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-newyork-xs.svg b/data/styles/default/dark/symbols/subway-newyork-xs.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-newyork-xs.svg
rename to data/styles/default/dark/symbols/subway-newyork-xs.svg
diff --git a/data/styles/clear/style-night/symbols/subway-nnov-m.svg b/data/styles/default/dark/symbols/subway-nnov-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-nnov-m.svg
rename to data/styles/default/dark/symbols/subway-nnov-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-nnov-s.svg b/data/styles/default/dark/symbols/subway-nnov-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-nnov-s.svg
rename to data/styles/default/dark/symbols/subway-nnov-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-novosibirsk-m.svg b/data/styles/default/dark/symbols/subway-novosibirsk-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-novosibirsk-m.svg
rename to data/styles/default/dark/symbols/subway-novosibirsk-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-novosibirsk-s.svg b/data/styles/default/dark/symbols/subway-novosibirsk-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-novosibirsk-s.svg
rename to data/styles/default/dark/symbols/subway-novosibirsk-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-omsk-m.svg b/data/styles/default/dark/symbols/subway-omsk-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-omsk-m.svg
rename to data/styles/default/dark/symbols/subway-omsk-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-omsk-s.svg b/data/styles/default/dark/symbols/subway-omsk-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-omsk-s.svg
rename to data/styles/default/dark/symbols/subway-omsk-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-osaka-m.svg b/data/styles/default/dark/symbols/subway-osaka-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-osaka-m.svg
rename to data/styles/default/dark/symbols/subway-osaka-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-osaka-s.svg b/data/styles/default/dark/symbols/subway-osaka-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-osaka-s.svg
rename to data/styles/default/dark/symbols/subway-osaka-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-oslo-m.svg b/data/styles/default/dark/symbols/subway-oslo-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-oslo-m.svg
rename to data/styles/default/dark/symbols/subway-oslo-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-oslo-s.svg b/data/styles/default/dark/symbols/subway-oslo-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-oslo-s.svg
rename to data/styles/default/dark/symbols/subway-oslo-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-palma-m.svg b/data/styles/default/dark/symbols/subway-palma-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-palma-m.svg
rename to data/styles/default/dark/symbols/subway-palma-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-palma-s.svg b/data/styles/default/dark/symbols/subway-palma-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-palma-s.svg
rename to data/styles/default/dark/symbols/subway-palma-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-panama-m.svg b/data/styles/default/dark/symbols/subway-panama-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-panama-m.svg
rename to data/styles/default/dark/symbols/subway-panama-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-panama-s.svg b/data/styles/default/dark/symbols/subway-panama-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-panama-s.svg
rename to data/styles/default/dark/symbols/subway-panama-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-paris-m.svg b/data/styles/default/dark/symbols/subway-paris-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-paris-m.svg
rename to data/styles/default/dark/symbols/subway-paris-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-paris-s.svg b/data/styles/default/dark/symbols/subway-paris-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-paris-s.svg
rename to data/styles/default/dark/symbols/subway-paris-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-perugia-m.svg b/data/styles/default/dark/symbols/subway-perugia-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-perugia-m.svg
rename to data/styles/default/dark/symbols/subway-perugia-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-perugia-s.svg b/data/styles/default/dark/symbols/subway-perugia-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-perugia-s.svg
rename to data/styles/default/dark/symbols/subway-perugia-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-philadelphia-m.svg b/data/styles/default/dark/symbols/subway-philadelphia-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-philadelphia-m.svg
rename to data/styles/default/dark/symbols/subway-philadelphia-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-philadelphia-s.svg b/data/styles/default/dark/symbols/subway-philadelphia-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-philadelphia-s.svg
rename to data/styles/default/dark/symbols/subway-philadelphia-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-pittsburgh-m.svg b/data/styles/default/dark/symbols/subway-pittsburgh-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-pittsburgh-m.svg
rename to data/styles/default/dark/symbols/subway-pittsburgh-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-pittsburgh-s.svg b/data/styles/default/dark/symbols/subway-pittsburgh-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-pittsburgh-s.svg
rename to data/styles/default/dark/symbols/subway-pittsburgh-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-pyongyang-m.svg b/data/styles/default/dark/symbols/subway-pyongyang-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-pyongyang-m.svg
rename to data/styles/default/dark/symbols/subway-pyongyang-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-pyongyang-s.svg b/data/styles/default/dark/symbols/subway-pyongyang-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-pyongyang-s.svg
rename to data/styles/default/dark/symbols/subway-pyongyang-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-rennes-m.svg b/data/styles/default/dark/symbols/subway-rennes-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-rennes-m.svg
rename to data/styles/default/dark/symbols/subway-rennes-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-rennes-s.svg b/data/styles/default/dark/symbols/subway-rennes-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-rennes-s.svg
rename to data/styles/default/dark/symbols/subway-rennes-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-reseau-paris-m.svg b/data/styles/default/dark/symbols/subway-reseau-paris-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-reseau-paris-m.svg
rename to data/styles/default/dark/symbols/subway-reseau-paris-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-reseau-paris-s.svg b/data/styles/default/dark/symbols/subway-reseau-paris-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-reseau-paris-s.svg
rename to data/styles/default/dark/symbols/subway-reseau-paris-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-riodejaneiro-m.svg b/data/styles/default/dark/symbols/subway-riodejaneiro-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-riodejaneiro-m.svg
rename to data/styles/default/dark/symbols/subway-riodejaneiro-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-riodejaneiro-s.svg b/data/styles/default/dark/symbols/subway-riodejaneiro-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-riodejaneiro-s.svg
rename to data/styles/default/dark/symbols/subway-riodejaneiro-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-rome-m.svg b/data/styles/default/dark/symbols/subway-rome-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-rome-m.svg
rename to data/styles/default/dark/symbols/subway-rome-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-rome-s.svg b/data/styles/default/dark/symbols/subway-rome-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-rome-s.svg
rename to data/styles/default/dark/symbols/subway-rome-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-rotterdam-m.svg b/data/styles/default/dark/symbols/subway-rotterdam-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-rotterdam-m.svg
rename to data/styles/default/dark/symbols/subway-rotterdam-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-rotterdam-s.svg b/data/styles/default/dark/symbols/subway-rotterdam-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-rotterdam-s.svg
rename to data/styles/default/dark/symbols/subway-rotterdam-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-s.svg b/data/styles/default/dark/symbols/subway-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-s.svg
rename to data/styles/default/dark/symbols/subway-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-samara-m.svg b/data/styles/default/dark/symbols/subway-samara-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-samara-m.svg
rename to data/styles/default/dark/symbols/subway-samara-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-samara-s.svg b/data/styles/default/dark/symbols/subway-samara-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-samara-s.svg
rename to data/styles/default/dark/symbols/subway-samara-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-sanfrancisco-m.svg b/data/styles/default/dark/symbols/subway-sanfrancisco-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-sanfrancisco-m.svg
rename to data/styles/default/dark/symbols/subway-sanfrancisco-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-sanfrancisco-s.svg b/data/styles/default/dark/symbols/subway-sanfrancisco-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-sanfrancisco-s.svg
rename to data/styles/default/dark/symbols/subway-sanfrancisco-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-santiago-m.svg b/data/styles/default/dark/symbols/subway-santiago-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-santiago-m.svg
rename to data/styles/default/dark/symbols/subway-santiago-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-santiago-s.svg b/data/styles/default/dark/symbols/subway-santiago-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-santiago-s.svg
rename to data/styles/default/dark/symbols/subway-santiago-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-santodomingo-m.svg b/data/styles/default/dark/symbols/subway-santodomingo-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-santodomingo-m.svg
rename to data/styles/default/dark/symbols/subway-santodomingo-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-santodomingo-s.svg b/data/styles/default/dark/symbols/subway-santodomingo-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-santodomingo-s.svg
rename to data/styles/default/dark/symbols/subway-santodomingo-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-saopaulo-m.svg b/data/styles/default/dark/symbols/subway-saopaulo-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-saopaulo-m.svg
rename to data/styles/default/dark/symbols/subway-saopaulo-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-saopaulo-s.svg b/data/styles/default/dark/symbols/subway-saopaulo-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-saopaulo-s.svg
rename to data/styles/default/dark/symbols/subway-saopaulo-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-sapporo-m.svg b/data/styles/default/dark/symbols/subway-sapporo-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-sapporo-m.svg
rename to data/styles/default/dark/symbols/subway-sapporo-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-sapporo-s.svg b/data/styles/default/dark/symbols/subway-sapporo-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-sapporo-s.svg
rename to data/styles/default/dark/symbols/subway-sapporo-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-seattle-m.svg b/data/styles/default/dark/symbols/subway-seattle-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-seattle-m.svg
rename to data/styles/default/dark/symbols/subway-seattle-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-seattle-s.svg b/data/styles/default/dark/symbols/subway-seattle-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-seattle-s.svg
rename to data/styles/default/dark/symbols/subway-seattle-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-sendai-m.svg b/data/styles/default/dark/symbols/subway-sendai-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-sendai-m.svg
rename to data/styles/default/dark/symbols/subway-sendai-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-sendai-s.svg b/data/styles/default/dark/symbols/subway-sendai-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-sendai-s.svg
rename to data/styles/default/dark/symbols/subway-sendai-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-shanghai-m.svg b/data/styles/default/dark/symbols/subway-shanghai-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-shanghai-m.svg
rename to data/styles/default/dark/symbols/subway-shanghai-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-shanghai-s.svg b/data/styles/default/dark/symbols/subway-shanghai-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-shanghai-s.svg
rename to data/styles/default/dark/symbols/subway-shanghai-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-shiraz-m.svg b/data/styles/default/dark/symbols/subway-shiraz-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-shiraz-m.svg
rename to data/styles/default/dark/symbols/subway-shiraz-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-shiraz-s.svg b/data/styles/default/dark/symbols/subway-shiraz-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-shiraz-s.svg
rename to data/styles/default/dark/symbols/subway-shiraz-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-singapore-m.svg b/data/styles/default/dark/symbols/subway-singapore-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-singapore-m.svg
rename to data/styles/default/dark/symbols/subway-singapore-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-singapore-s.svg b/data/styles/default/dark/symbols/subway-singapore-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-singapore-s.svg
rename to data/styles/default/dark/symbols/subway-singapore-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-sofia-m.svg b/data/styles/default/dark/symbols/subway-sofia-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-sofia-m.svg
rename to data/styles/default/dark/symbols/subway-sofia-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-sofia-s.svg b/data/styles/default/dark/symbols/subway-sofia-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-sofia-s.svg
rename to data/styles/default/dark/symbols/subway-sofia-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-southkorea-m.svg b/data/styles/default/dark/symbols/subway-southkorea-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-southkorea-m.svg
rename to data/styles/default/dark/symbols/subway-southkorea-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-southkorea-s.svg b/data/styles/default/dark/symbols/subway-southkorea-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-southkorea-s.svg
rename to data/styles/default/dark/symbols/subway-southkorea-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-spb-m.svg b/data/styles/default/dark/symbols/subway-spb-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-spb-m.svg
rename to data/styles/default/dark/symbols/subway-spb-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-spb-s.svg b/data/styles/default/dark/symbols/subway-spb-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-spb-s.svg
rename to data/styles/default/dark/symbols/subway-spb-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-stlouis-m.svg b/data/styles/default/dark/symbols/subway-stlouis-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-stlouis-m.svg
rename to data/styles/default/dark/symbols/subway-stlouis-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-stlouis-s.svg b/data/styles/default/dark/symbols/subway-stlouis-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-stlouis-s.svg
rename to data/styles/default/dark/symbols/subway-stlouis-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-stockholm-m.svg b/data/styles/default/dark/symbols/subway-stockholm-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-stockholm-m.svg
rename to data/styles/default/dark/symbols/subway-stockholm-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-stockholm-s.svg b/data/styles/default/dark/symbols/subway-stockholm-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-stockholm-s.svg
rename to data/styles/default/dark/symbols/subway-stockholm-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tabriz-m.svg b/data/styles/default/dark/symbols/subway-tabriz-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tabriz-m.svg
rename to data/styles/default/dark/symbols/subway-tabriz-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tabriz-s.svg b/data/styles/default/dark/symbols/subway-tabriz-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tabriz-s.svg
rename to data/styles/default/dark/symbols/subway-tabriz-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-taipei-m.svg b/data/styles/default/dark/symbols/subway-taipei-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-taipei-m.svg
rename to data/styles/default/dark/symbols/subway-taipei-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-taipei-s.svg b/data/styles/default/dark/symbols/subway-taipei-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-taipei-s.svg
rename to data/styles/default/dark/symbols/subway-taipei-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-taoyuan-m.svg b/data/styles/default/dark/symbols/subway-taoyuan-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-taoyuan-m.svg
rename to data/styles/default/dark/symbols/subway-taoyuan-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-taoyuan-s.svg b/data/styles/default/dark/symbols/subway-taoyuan-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-taoyuan-s.svg
rename to data/styles/default/dark/symbols/subway-taoyuan-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tashkent-m.svg b/data/styles/default/dark/symbols/subway-tashkent-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tashkent-m.svg
rename to data/styles/default/dark/symbols/subway-tashkent-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tashkent-s.svg b/data/styles/default/dark/symbols/subway-tashkent-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tashkent-s.svg
rename to data/styles/default/dark/symbols/subway-tashkent-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tbilisi-m.svg b/data/styles/default/dark/symbols/subway-tbilisi-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tbilisi-m.svg
rename to data/styles/default/dark/symbols/subway-tbilisi-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tbilisi-s.svg b/data/styles/default/dark/symbols/subway-tbilisi-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tbilisi-s.svg
rename to data/styles/default/dark/symbols/subway-tbilisi-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-tehran-m.svg b/data/styles/default/dark/symbols/subway-tehran-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-tehran-m.svg
rename to data/styles/default/dark/symbols/subway-tehran-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-tehran-s.svg b/data/styles/default/dark/symbols/subway-tehran-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-tehran-s.svg
rename to data/styles/default/dark/symbols/subway-tehran-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tianjin-m.svg b/data/styles/default/dark/symbols/subway-tianjin-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tianjin-m.svg
rename to data/styles/default/dark/symbols/subway-tianjin-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tianjin-s.svg b/data/styles/default/dark/symbols/subway-tianjin-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tianjin-s.svg
rename to data/styles/default/dark/symbols/subway-tianjin-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tokyo-m.svg b/data/styles/default/dark/symbols/subway-tokyo-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tokyo-m.svg
rename to data/styles/default/dark/symbols/subway-tokyo-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tokyo-s.svg b/data/styles/default/dark/symbols/subway-tokyo-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tokyo-s.svg
rename to data/styles/default/dark/symbols/subway-tokyo-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tyneandwear-m.svg b/data/styles/default/dark/symbols/subway-tyneandwear-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tyneandwear-m.svg
rename to data/styles/default/dark/symbols/subway-tyneandwear-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tyneandwear-s.svg b/data/styles/default/dark/symbols/subway-tyneandwear-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tyneandwear-s.svg
rename to data/styles/default/dark/symbols/subway-tyneandwear-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-ubahn-m.svg b/data/styles/default/dark/symbols/subway-ubahn-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-ubahn-m.svg
rename to data/styles/default/dark/symbols/subway-ubahn-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-ubahn-s.svg b/data/styles/default/dark/symbols/subway-ubahn-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-ubahn-s.svg
rename to data/styles/default/dark/symbols/subway-ubahn-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-valencia-m.svg b/data/styles/default/dark/symbols/subway-valencia-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-valencia-m.svg
rename to data/styles/default/dark/symbols/subway-valencia-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-valencia-s.svg b/data/styles/default/dark/symbols/subway-valencia-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-valencia-s.svg
rename to data/styles/default/dark/symbols/subway-valencia-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-vienna-m.svg b/data/styles/default/dark/symbols/subway-vienna-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-vienna-m.svg
rename to data/styles/default/dark/symbols/subway-vienna-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-vienna-s.svg b/data/styles/default/dark/symbols/subway-vienna-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-vienna-s.svg
rename to data/styles/default/dark/symbols/subway-vienna-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-volgograd-m.svg b/data/styles/default/dark/symbols/subway-volgograd-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-volgograd-m.svg
rename to data/styles/default/dark/symbols/subway-volgograd-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-volgograd-s.svg b/data/styles/default/dark/symbols/subway-volgograd-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-volgograd-s.svg
rename to data/styles/default/dark/symbols/subway-volgograd-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-warsaw-m.svg b/data/styles/default/dark/symbols/subway-warsaw-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-warsaw-m.svg
rename to data/styles/default/dark/symbols/subway-warsaw-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-warsaw-s.svg b/data/styles/default/dark/symbols/subway-warsaw-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-warsaw-s.svg
rename to data/styles/default/dark/symbols/subway-warsaw-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-warszawa-m.svg b/data/styles/default/dark/symbols/subway-warszawa-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-warszawa-m.svg
rename to data/styles/default/dark/symbols/subway-warszawa-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-warszawa-s.svg b/data/styles/default/dark/symbols/subway-warszawa-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-warszawa-s.svg
rename to data/styles/default/dark/symbols/subway-warszawa-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-washington-m.svg b/data/styles/default/dark/symbols/subway-washington-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-washington-m.svg
rename to data/styles/default/dark/symbols/subway-washington-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-washington-s.svg b/data/styles/default/dark/symbols/subway-washington-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-washington-s.svg
rename to data/styles/default/dark/symbols/subway-washington-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-wuhan-m.svg b/data/styles/default/dark/symbols/subway-wuhan-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-wuhan-m.svg
rename to data/styles/default/dark/symbols/subway-wuhan-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-wuhan-s.svg b/data/styles/default/dark/symbols/subway-wuhan-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-wuhan-s.svg
rename to data/styles/default/dark/symbols/subway-wuhan-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-xs.svg b/data/styles/default/dark/symbols/subway-xs.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-xs.svg
rename to data/styles/default/dark/symbols/subway-xs.svg
diff --git a/data/styles/clear/style-night/symbols/subway-yerevan-m.svg b/data/styles/default/dark/symbols/subway-yerevan-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-yerevan-m.svg
rename to data/styles/default/dark/symbols/subway-yerevan-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-yerevan-s.svg b/data/styles/default/dark/symbols/subway-yerevan-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-yerevan-s.svg
rename to data/styles/default/dark/symbols/subway-yerevan-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-yokohama-m.svg b/data/styles/default/dark/symbols/subway-yokohama-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-yokohama-m.svg
rename to data/styles/default/dark/symbols/subway-yokohama-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-yokohama-s.svg b/data/styles/default/dark/symbols/subway-yokohama-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-yokohama-s.svg
rename to data/styles/default/dark/symbols/subway-yokohama-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway_entrance-london-m.svg b/data/styles/default/dark/symbols/subway_entrance-london-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway_entrance-london-m.svg
rename to data/styles/default/dark/symbols/subway_entrance-london-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway_entrance-london-s.svg b/data/styles/default/dark/symbols/subway_entrance-london-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway_entrance-london-s.svg
rename to data/styles/default/dark/symbols/subway_entrance-london-s.svg
diff --git a/data/styles/clear/style-night/symbols/survey_point-m.svg b/data/styles/default/dark/symbols/survey_point-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/survey_point-m.svg
rename to data/styles/default/dark/symbols/survey_point-m.svg
diff --git a/data/styles/clear/style-night/symbols/sweets-m.svg b/data/styles/default/dark/symbols/sweets-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/sweets-m.svg
rename to data/styles/default/dark/symbols/sweets-m.svg
diff --git a/data/styles/clear/style-night/symbols/swimming-m.svg b/data/styles/default/dark/symbols/swimming-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/swimming-m.svg
rename to data/styles/default/dark/symbols/swimming-m.svg
diff --git a/data/styles/clear/style-night/symbols/table-tennis-m.svg b/data/styles/default/dark/symbols/table-tennis-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/table-tennis-m.svg
rename to data/styles/default/dark/symbols/table-tennis-m.svg
diff --git a/data/styles/clear/style-night/symbols/tank-m.svg b/data/styles/default/dark/symbols/tank-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/tank-m.svg
rename to data/styles/default/dark/symbols/tank-m.svg
diff --git a/data/styles/clear/style-night/symbols/taoist-m.svg b/data/styles/default/dark/symbols/taoist-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/taoist-m.svg
rename to data/styles/default/dark/symbols/taoist-m.svg
diff --git a/data/styles/clear/style-night/symbols/taoist-s.svg b/data/styles/default/dark/symbols/taoist-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/taoist-s.svg
rename to data/styles/default/dark/symbols/taoist-s.svg
diff --git a/data/styles/clear/style-night/symbols/taxi-m.svg b/data/styles/default/dark/symbols/taxi-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/taxi-m.svg
rename to data/styles/default/dark/symbols/taxi-m.svg
diff --git a/data/styles/clear/style-night/symbols/tennis-m.svg b/data/styles/default/dark/symbols/tennis-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/tennis-m.svg
rename to data/styles/default/dark/symbols/tennis-m.svg
diff --git a/data/styles/clear/style-night/symbols/theatre-m.svg b/data/styles/default/dark/symbols/theatre-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/theatre-m.svg
rename to data/styles/default/dark/symbols/theatre-m.svg
diff --git a/data/styles/clear/style-night/symbols/theatre-s.svg b/data/styles/default/dark/symbols/theatre-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/theatre-s.svg
rename to data/styles/default/dark/symbols/theatre-s.svg
diff --git a/data/styles/clear/style-night/symbols/theme_park-m.svg b/data/styles/default/dark/symbols/theme_park-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/theme_park-m.svg
rename to data/styles/default/dark/symbols/theme_park-m.svg
diff --git a/data/styles/clear/style-night/symbols/theme_park-s.svg b/data/styles/default/dark/symbols/theme_park-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/theme_park-s.svg
rename to data/styles/default/dark/symbols/theme_park-s.svg
diff --git a/data/styles/clear/style-night/symbols/ticket-shop-m.svg b/data/styles/default/dark/symbols/ticket-shop-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/ticket-shop-m.svg
rename to data/styles/default/dark/symbols/ticket-shop-m.svg
diff --git a/data/styles/clear/style-night/symbols/tire-repair-m.svg b/data/styles/default/dark/symbols/tire-repair-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/tire-repair-m.svg
rename to data/styles/default/dark/symbols/tire-repair-m.svg
diff --git a/data/styles/clear/style-night/symbols/tobacco-m.svg b/data/styles/default/dark/symbols/tobacco-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/tobacco-m.svg
rename to data/styles/default/dark/symbols/tobacco-m.svg
diff --git a/data/styles/clear/style-night/symbols/toilets-m.svg b/data/styles/default/dark/symbols/toilets-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/toilets-m.svg
rename to data/styles/default/dark/symbols/toilets-m.svg
diff --git a/data/styles/clear/style-night/symbols/toll_booth-m.svg b/data/styles/default/dark/symbols/toll_booth-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/toll_booth-m.svg
rename to data/styles/default/dark/symbols/toll_booth-m.svg
diff --git a/data/styles/clear/style-night/symbols/toll_booth-s.svg b/data/styles/default/dark/symbols/toll_booth-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/toll_booth-s.svg
rename to data/styles/default/dark/symbols/toll_booth-s.svg
diff --git a/data/styles/clear/style-night/symbols/tomb-m.svg b/data/styles/default/dark/symbols/tomb-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/tomb-m.svg
rename to data/styles/default/dark/symbols/tomb-m.svg
diff --git a/data/styles/clear/style-night/symbols/tourism-m.svg b/data/styles/default/dark/symbols/tourism-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/tourism-m.svg
rename to data/styles/default/dark/symbols/tourism-m.svg
diff --git a/data/styles/clear/style-night/symbols/tourism-s.svg b/data/styles/default/dark/symbols/tourism-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/tourism-s.svg
rename to data/styles/default/dark/symbols/tourism-s.svg
diff --git a/data/styles/clear/style-night/symbols/toys-m.svg b/data/styles/default/dark/symbols/toys-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/toys-m.svg
rename to data/styles/default/dark/symbols/toys-m.svg
diff --git a/data/styles/clear/style-night/symbols/train-m.svg b/data/styles/default/dark/symbols/train-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/train-m.svg
rename to data/styles/default/dark/symbols/train-m.svg
diff --git a/data/styles/clear/style-night/symbols/train-s.svg b/data/styles/default/dark/symbols/train-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/train-s.svg
rename to data/styles/default/dark/symbols/train-s.svg
diff --git a/data/styles/clear/style-night/symbols/tram-m.svg b/data/styles/default/dark/symbols/tram-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/tram-m.svg
rename to data/styles/default/dark/symbols/tram-m.svg
diff --git a/data/styles/clear/style-night/symbols/tram-s.svg b/data/styles/default/dark/symbols/tram-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/tram-s.svg
rename to data/styles/default/dark/symbols/tram-s.svg
diff --git a/data/styles/clear/style-night/symbols/transfer_arrow.svg b/data/styles/default/dark/symbols/transfer_arrow.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/transfer_arrow.svg
rename to data/styles/default/dark/symbols/transfer_arrow.svg
diff --git a/data/styles/clear/style-night/symbols/transit_light_rail-m.svg b/data/styles/default/dark/symbols/transit_light_rail-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/transit_light_rail-m.svg
rename to data/styles/default/dark/symbols/transit_light_rail-m.svg
diff --git a/data/styles/clear/style-night/symbols/transit_light_rail-s.svg b/data/styles/default/dark/symbols/transit_light_rail-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/transit_light_rail-s.svg
rename to data/styles/default/dark/symbols/transit_light_rail-s.svg
diff --git a/data/styles/clear/style-night/symbols/transit_monorail-m.svg b/data/styles/default/dark/symbols/transit_monorail-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/transit_monorail-m.svg
rename to data/styles/default/dark/symbols/transit_monorail-m.svg
diff --git a/data/styles/clear/style-night/symbols/transit_monorail-s.svg b/data/styles/default/dark/symbols/transit_monorail-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/transit_monorail-s.svg
rename to data/styles/default/dark/symbols/transit_monorail-s.svg
diff --git a/data/styles/clear/style-night/symbols/transit_subway-m.svg b/data/styles/default/dark/symbols/transit_subway-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/transit_subway-m.svg
rename to data/styles/default/dark/symbols/transit_subway-m.svg
diff --git a/data/styles/clear/style-night/symbols/transit_subway-s.svg b/data/styles/default/dark/symbols/transit_subway-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/transit_subway-s.svg
rename to data/styles/default/dark/symbols/transit_subway-s.svg
diff --git a/data/styles/clear/style-night/symbols/transit_train-m.svg b/data/styles/default/dark/symbols/transit_train-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/transit_train-m.svg
rename to data/styles/default/dark/symbols/transit_train-m.svg
diff --git a/data/styles/clear/style-night/symbols/transit_train-s.svg b/data/styles/default/dark/symbols/transit_train-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/transit_train-s.svg
rename to data/styles/default/dark/symbols/transit_train-s.svg
diff --git a/data/styles/clear/style-night/symbols/travel_agency_shop-m.svg b/data/styles/default/dark/symbols/travel_agency_shop-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/travel_agency_shop-m.svg
rename to data/styles/default/dark/symbols/travel_agency_shop-m.svg
diff --git a/data/styles/clear/style-night/symbols/vehicle_inspection-m.svg b/data/styles/default/dark/symbols/vehicle_inspection-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/vehicle_inspection-m.svg
rename to data/styles/default/dark/symbols/vehicle_inspection-m.svg
diff --git a/data/styles/clear/style-night/symbols/vending-m.svg b/data/styles/default/dark/symbols/vending-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/vending-m.svg
rename to data/styles/default/dark/symbols/vending-m.svg
diff --git a/data/styles/clear/style-night/symbols/veterinary-m.svg b/data/styles/default/dark/symbols/veterinary-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/veterinary-m.svg
rename to data/styles/default/dark/symbols/veterinary-m.svg
diff --git a/data/styles/clear/style-night/symbols/video-games-m.svg b/data/styles/default/dark/symbols/video-games-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/video-games-m.svg
rename to data/styles/default/dark/symbols/video-games-m.svg
diff --git a/data/styles/clear/style-night/symbols/viewpoint-m.svg b/data/styles/default/dark/symbols/viewpoint-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/viewpoint-m.svg
rename to data/styles/default/dark/symbols/viewpoint-m.svg
diff --git a/data/styles/clear/style-night/symbols/viewpoint-s.svg b/data/styles/default/dark/symbols/viewpoint-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/viewpoint-s.svg
rename to data/styles/default/dark/symbols/viewpoint-s.svg
diff --git a/data/styles/clear/style-night/symbols/volcano-m.svg b/data/styles/default/dark/symbols/volcano-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/volcano-m.svg
rename to data/styles/default/dark/symbols/volcano-m.svg
diff --git a/data/styles/clear/style-night/symbols/volcano-s.svg b/data/styles/default/dark/symbols/volcano-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/volcano-s.svg
rename to data/styles/default/dark/symbols/volcano-s.svg
diff --git a/data/styles/clear/style-night/symbols/volleyball-m.svg b/data/styles/default/dark/symbols/volleyball-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/volleyball-m.svg
rename to data/styles/default/dark/symbols/volleyball-m.svg
diff --git a/data/styles/clear/style-night/symbols/waste-basket-m.svg b/data/styles/default/dark/symbols/waste-basket-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/waste-basket-m.svg
rename to data/styles/default/dark/symbols/waste-basket-m.svg
diff --git a/data/styles/clear/style-night/symbols/waste-basket-s.svg b/data/styles/default/dark/symbols/waste-basket-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/waste-basket-s.svg
rename to data/styles/default/dark/symbols/waste-basket-s.svg
diff --git a/data/styles/clear/style-night/symbols/waterfall-m.svg b/data/styles/default/dark/symbols/waterfall-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/waterfall-m.svg
rename to data/styles/default/dark/symbols/waterfall-m.svg
diff --git a/data/styles/clear/style-night/symbols/waterfall-s.svg b/data/styles/default/dark/symbols/waterfall-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/waterfall-s.svg
rename to data/styles/default/dark/symbols/waterfall-s.svg
diff --git a/data/styles/clear/style-night/symbols/wayside_shrine-m.svg b/data/styles/default/dark/symbols/wayside_shrine-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/wayside_shrine-m.svg
rename to data/styles/default/dark/symbols/wayside_shrine-m.svg
diff --git a/data/styles/clear/style-night/symbols/wholesale-m.svg b/data/styles/default/dark/symbols/wholesale-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/wholesale-m.svg
rename to data/styles/default/dark/symbols/wholesale-m.svg
diff --git a/data/styles/clear/style-night/symbols/wind_turbine-m.svg b/data/styles/default/dark/symbols/wind_turbine-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/wind_turbine-m.svg
rename to data/styles/default/dark/symbols/wind_turbine-m.svg
diff --git a/data/styles/clear/style-night/symbols/windmill-m.svg b/data/styles/default/dark/symbols/windmill-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/windmill-m.svg
rename to data/styles/default/dark/symbols/windmill-m.svg
diff --git a/data/styles/clear/style-night/symbols/winery-m.svg b/data/styles/default/dark/symbols/winery-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/winery-m.svg
rename to data/styles/default/dark/symbols/winery-m.svg
diff --git a/data/styles/clear/style-night/symbols/wreck-m.svg b/data/styles/default/dark/symbols/wreck-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/wreck-m.svg
rename to data/styles/default/dark/symbols/wreck-m.svg
diff --git a/data/styles/clear/style-night/symbols/yoga-m.svg b/data/styles/default/dark/symbols/yoga-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/yoga-m.svg
rename to data/styles/default/dark/symbols/yoga-m.svg
diff --git a/data/styles/clear/style-clear/symbols/zero-icon.svg b/data/styles/default/dark/symbols/zero-icon.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/zero-icon.svg
rename to data/styles/default/dark/symbols/zero-icon.svg
diff --git a/data/styles/clear/style-night/symbols/zoo-m.svg b/data/styles/default/dark/symbols/zoo-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/zoo-m.svg
rename to data/styles/default/dark/symbols/zoo-m.svg
diff --git a/data/styles/clear/style-night/symbols/zoo-s.svg b/data/styles/default/dark/symbols/zoo-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/zoo-s.svg
rename to data/styles/default/dark/symbols/zoo-s.svg
diff --git a/data/styles/clear/style-night/vector-icons/compass-image.svg b/data/styles/default/dark/vector-icons/compass-image.svg
similarity index 100%
rename from data/styles/clear/style-night/vector-icons/compass-image.svg
rename to data/styles/default/dark/vector-icons/compass-image.svg
diff --git a/data/styles/clear/style-clear/vector-icons/readme.md b/data/styles/default/dark/vector-icons/readme.md
similarity index 100%
rename from data/styles/clear/style-clear/vector-icons/readme.md
rename to data/styles/default/dark/vector-icons/readme.md
diff --git a/data/styles/clear/style-clear/xhdpi-ad/keep.png b/data/styles/default/dark/xhdpi-ad/keep.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi-ad/keep.png
rename to data/styles/default/dark/xhdpi-ad/keep.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-animals-m.png b/data/styles/default/dark/xhdpi/bookmark-animals-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-animals-m.png
rename to data/styles/default/dark/xhdpi/bookmark-animals-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-bar-m.png b/data/styles/default/dark/xhdpi/bookmark-bar-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-bar-m.png
rename to data/styles/default/dark/xhdpi/bookmark-bar-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-bg-m.png b/data/styles/default/dark/xhdpi/bookmark-bg-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-bg-m.png
rename to data/styles/default/dark/xhdpi/bookmark-bg-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-bg-s.png b/data/styles/default/dark/xhdpi/bookmark-bg-s.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-bg-s.png
rename to data/styles/default/dark/xhdpi/bookmark-bg-s.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-bg-xs.png b/data/styles/default/dark/xhdpi/bookmark-bg-xs.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-bg-xs.png
rename to data/styles/default/dark/xhdpi/bookmark-bg-xs.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-buddhism-m.png b/data/styles/default/dark/xhdpi/bookmark-buddhism-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-buddhism-m.png
rename to data/styles/default/dark/xhdpi/bookmark-buddhism-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-building-m.png b/data/styles/default/dark/xhdpi/bookmark-building-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-building-m.png
rename to data/styles/default/dark/xhdpi/bookmark-building-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-christianity-m.png b/data/styles/default/dark/xhdpi/bookmark-christianity-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-christianity-m.png
rename to data/styles/default/dark/xhdpi/bookmark-christianity-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-default-m.png b/data/styles/default/dark/xhdpi/bookmark-default-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-default-m.png
rename to data/styles/default/dark/xhdpi/bookmark-default-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-default-s.png b/data/styles/default/dark/xhdpi/bookmark-default-s.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-default-s.png
rename to data/styles/default/dark/xhdpi/bookmark-default-s.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-default-xs.png b/data/styles/default/dark/xhdpi/bookmark-default-xs.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-default-xs.png
rename to data/styles/default/dark/xhdpi/bookmark-default-xs.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-entertainment-m.png b/data/styles/default/dark/xhdpi/bookmark-entertainment-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-entertainment-m.png
rename to data/styles/default/dark/xhdpi/bookmark-entertainment-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-exchange-m.png b/data/styles/default/dark/xhdpi/bookmark-exchange-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-exchange-m.png
rename to data/styles/default/dark/xhdpi/bookmark-exchange-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-finish-m.png b/data/styles/default/dark/xhdpi/bookmark-finish-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-finish-m.png
rename to data/styles/default/dark/xhdpi/bookmark-finish-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-food-m.png b/data/styles/default/dark/xhdpi/bookmark-food-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-food-m.png
rename to data/styles/default/dark/xhdpi/bookmark-food-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-gas-m.png b/data/styles/default/dark/xhdpi/bookmark-gas-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-gas-m.png
rename to data/styles/default/dark/xhdpi/bookmark-gas-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-hotel-m.png b/data/styles/default/dark/xhdpi/bookmark-hotel-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-hotel-m.png
rename to data/styles/default/dark/xhdpi/bookmark-hotel-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-islam-m.png b/data/styles/default/dark/xhdpi/bookmark-islam-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-islam-m.png
rename to data/styles/default/dark/xhdpi/bookmark-islam-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-judaism-m.png b/data/styles/default/dark/xhdpi/bookmark-judaism-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-judaism-m.png
rename to data/styles/default/dark/xhdpi/bookmark-judaism-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-medicine-m.png b/data/styles/default/dark/xhdpi/bookmark-medicine-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-medicine-m.png
rename to data/styles/default/dark/xhdpi/bookmark-medicine-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-mountain-m.png b/data/styles/default/dark/xhdpi/bookmark-mountain-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-mountain-m.png
rename to data/styles/default/dark/xhdpi/bookmark-mountain-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-museum-m.png b/data/styles/default/dark/xhdpi/bookmark-museum-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-museum-m.png
rename to data/styles/default/dark/xhdpi/bookmark-museum-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-park-m.png b/data/styles/default/dark/xhdpi/bookmark-park-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-park-m.png
rename to data/styles/default/dark/xhdpi/bookmark-park-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-parking-m.png b/data/styles/default/dark/xhdpi/bookmark-parking-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-parking-m.png
rename to data/styles/default/dark/xhdpi/bookmark-parking-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-shop-m.png b/data/styles/default/dark/xhdpi/bookmark-shop-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-shop-m.png
rename to data/styles/default/dark/xhdpi/bookmark-shop-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-sights-m.png b/data/styles/default/dark/xhdpi/bookmark-sights-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-sights-m.png
rename to data/styles/default/dark/xhdpi/bookmark-sights-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-sport-m.png b/data/styles/default/dark/xhdpi/bookmark-sport-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-sport-m.png
rename to data/styles/default/dark/xhdpi/bookmark-sport-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-start-m.png b/data/styles/default/dark/xhdpi/bookmark-start-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-start-m.png
rename to data/styles/default/dark/xhdpi/bookmark-start-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-swim-m.png b/data/styles/default/dark/xhdpi/bookmark-swim-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-swim-m.png
rename to data/styles/default/dark/xhdpi/bookmark-swim-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-transport-m.png b/data/styles/default/dark/xhdpi/bookmark-transport-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-transport-m.png
rename to data/styles/default/dark/xhdpi/bookmark-transport-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-viewpoint-m.png b/data/styles/default/dark/xhdpi/bookmark-viewpoint-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-viewpoint-m.png
rename to data/styles/default/dark/xhdpi/bookmark-viewpoint-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-water-m.png b/data/styles/default/dark/xhdpi/bookmark-water-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-water-m.png
rename to data/styles/default/dark/xhdpi/bookmark-water-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/coloredmark-bg-l.png b/data/styles/default/dark/xhdpi/coloredmark-bg-l.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/coloredmark-bg-l.png
rename to data/styles/default/dark/xhdpi/coloredmark-bg-l.png
diff --git a/data/styles/clear/style-clear/xhdpi/coloredmark-bg-s.png b/data/styles/default/dark/xhdpi/coloredmark-bg-s.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/coloredmark-bg-s.png
rename to data/styles/default/dark/xhdpi/coloredmark-bg-s.png
diff --git a/data/styles/clear/style-night/xhdpi/coloredmark-default-l.png b/data/styles/default/dark/xhdpi/coloredmark-default-l.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/coloredmark-default-l.png
rename to data/styles/default/dark/xhdpi/coloredmark-default-l.png
diff --git a/data/styles/clear/style-clear/xhdpi/coloredmark-default-s.png b/data/styles/default/dark/xhdpi/coloredmark-default-s.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/coloredmark-default-s.png
rename to data/styles/default/dark/xhdpi/coloredmark-default-s.png
diff --git a/data/styles/clear/style-night/xhdpi/compass-image.png b/data/styles/default/dark/xhdpi/compass-image.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/compass-image.png
rename to data/styles/default/dark/xhdpi/compass-image.png
diff --git a/data/styles/clear/style-night/xhdpi/cross_geoposition.png b/data/styles/default/dark/xhdpi/cross_geoposition.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/cross_geoposition.png
rename to data/styles/default/dark/xhdpi/cross_geoposition.png
diff --git a/data/styles/clear/style-night/xhdpi/current-position.png b/data/styles/default/dark/xhdpi/current-position.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/current-position.png
rename to data/styles/default/dark/xhdpi/current-position.png
diff --git a/data/styles/clear/style-night/xhdpi/ferry.png b/data/styles/default/dark/xhdpi/ferry.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/ferry.png
rename to data/styles/default/dark/xhdpi/ferry.png
diff --git a/data/styles/clear/style-night/xhdpi/infosign.png b/data/styles/default/dark/xhdpi/infosign.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/infosign.png
rename to data/styles/default/dark/xhdpi/infosign.png
diff --git a/data/styles/clear/style-clear/xhdpi/non-found-search-result.png b/data/styles/default/dark/xhdpi/non-found-search-result.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/non-found-search-result.png
rename to data/styles/default/dark/xhdpi/non-found-search-result.png
diff --git a/data/styles/clear/style-clear/xhdpi/norating-bg-l.png b/data/styles/default/dark/xhdpi/norating-bg-l.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/norating-bg-l.png
rename to data/styles/default/dark/xhdpi/norating-bg-l.png
diff --git a/data/styles/clear/style-clear/xhdpi/norating-default-l.png b/data/styles/default/dark/xhdpi/norating-default-l.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/norating-default-l.png
rename to data/styles/default/dark/xhdpi/norating-default-l.png
diff --git a/data/styles/clear/style-night/xhdpi/paid_road.png b/data/styles/default/dark/xhdpi/paid_road.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/paid_road.png
rename to data/styles/default/dark/xhdpi/paid_road.png
diff --git a/data/styles/clear/style-clear/xhdpi/route-arrow.png b/data/styles/default/dark/xhdpi/route-arrow.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/route-arrow.png
rename to data/styles/default/dark/xhdpi/route-arrow.png
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-1.png b/data/styles/default/dark/xhdpi/route-point-1.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/route-point-1.png
rename to data/styles/default/dark/xhdpi/route-point-1.png
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-10.png b/data/styles/default/dark/xhdpi/route-point-10.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/route-point-10.png
rename to data/styles/default/dark/xhdpi/route-point-10.png
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-11.png b/data/styles/default/dark/xhdpi/route-point-11.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/route-point-11.png
rename to data/styles/default/dark/xhdpi/route-point-11.png
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-12.png b/data/styles/default/dark/xhdpi/route-point-12.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/route-point-12.png
rename to data/styles/default/dark/xhdpi/route-point-12.png
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-13.png b/data/styles/default/dark/xhdpi/route-point-13.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/route-point-13.png
rename to data/styles/default/dark/xhdpi/route-point-13.png
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-14.png b/data/styles/default/dark/xhdpi/route-point-14.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/route-point-14.png
rename to data/styles/default/dark/xhdpi/route-point-14.png
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-15.png b/data/styles/default/dark/xhdpi/route-point-15.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/route-point-15.png
rename to data/styles/default/dark/xhdpi/route-point-15.png
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-16.png b/data/styles/default/dark/xhdpi/route-point-16.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/route-point-16.png
rename to data/styles/default/dark/xhdpi/route-point-16.png
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-17.png b/data/styles/default/dark/xhdpi/route-point-17.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/route-point-17.png
rename to data/styles/default/dark/xhdpi/route-point-17.png
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-18.png b/data/styles/default/dark/xhdpi/route-point-18.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/route-point-18.png
rename to data/styles/default/dark/xhdpi/route-point-18.png
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-19.png b/data/styles/default/dark/xhdpi/route-point-19.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/route-point-19.png
rename to data/styles/default/dark/xhdpi/route-point-19.png
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-2.png b/data/styles/default/dark/xhdpi/route-point-2.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/route-point-2.png
rename to data/styles/default/dark/xhdpi/route-point-2.png
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-20.png b/data/styles/default/dark/xhdpi/route-point-20.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/route-point-20.png
rename to data/styles/default/dark/xhdpi/route-point-20.png
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-3.png b/data/styles/default/dark/xhdpi/route-point-3.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/route-point-3.png
rename to data/styles/default/dark/xhdpi/route-point-3.png
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-4.png b/data/styles/default/dark/xhdpi/route-point-4.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/route-point-4.png
rename to data/styles/default/dark/xhdpi/route-point-4.png
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-5.png b/data/styles/default/dark/xhdpi/route-point-5.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/route-point-5.png
rename to data/styles/default/dark/xhdpi/route-point-5.png
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-6.png b/data/styles/default/dark/xhdpi/route-point-6.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/route-point-6.png
rename to data/styles/default/dark/xhdpi/route-point-6.png
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-7.png b/data/styles/default/dark/xhdpi/route-point-7.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/route-point-7.png
rename to data/styles/default/dark/xhdpi/route-point-7.png
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-8.png b/data/styles/default/dark/xhdpi/route-point-8.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/route-point-8.png
rename to data/styles/default/dark/xhdpi/route-point-8.png
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-9.png b/data/styles/default/dark/xhdpi/route-point-9.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/route-point-9.png
rename to data/styles/default/dark/xhdpi/route-point-9.png
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-finish.png b/data/styles/default/dark/xhdpi/route-point-finish.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/route-point-finish.png
rename to data/styles/default/dark/xhdpi/route-point-finish.png
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-start.png b/data/styles/default/dark/xhdpi/route-point-start.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/route-point-start.png
rename to data/styles/default/dark/xhdpi/route-point-start.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-bakery.png b/data/styles/default/dark/xhdpi/search-result-bakery.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-bakery.png
rename to data/styles/default/dark/xhdpi/search-result-bakery.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-bar.png b/data/styles/default/dark/xhdpi/search-result-bar.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-bar.png
rename to data/styles/default/dark/xhdpi/search-result-bar.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-cafe.png b/data/styles/default/dark/xhdpi/search-result-cafe.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-cafe.png
rename to data/styles/default/dark/xhdpi/search-result-cafe.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-casino.png b/data/styles/default/dark/xhdpi/search-result-casino.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-casino.png
rename to data/styles/default/dark/xhdpi/search-result-casino.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-cinema.png b/data/styles/default/dark/xhdpi/search-result-cinema.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-cinema.png
rename to data/styles/default/dark/xhdpi/search-result-cinema.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-fastfood.png b/data/styles/default/dark/xhdpi/search-result-fastfood.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-fastfood.png
rename to data/styles/default/dark/xhdpi/search-result-fastfood.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-marketplace.png b/data/styles/default/dark/xhdpi/search-result-marketplace.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-marketplace.png
rename to data/styles/default/dark/xhdpi/search-result-marketplace.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-nightclub.png b/data/styles/default/dark/xhdpi/search-result-nightclub.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-nightclub.png
rename to data/styles/default/dark/xhdpi/search-result-nightclub.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-playground.png b/data/styles/default/dark/xhdpi/search-result-playground.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-playground.png
rename to data/styles/default/dark/xhdpi/search-result-playground.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-pub.png b/data/styles/default/dark/xhdpi/search-result-pub.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-pub.png
rename to data/styles/default/dark/xhdpi/search-result-pub.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-restaurant.png b/data/styles/default/dark/xhdpi/search-result-restaurant.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-restaurant.png
rename to data/styles/default/dark/xhdpi/search-result-restaurant.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-shop-alcohol.png b/data/styles/default/dark/xhdpi/search-result-shop-alcohol.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-shop-alcohol.png
rename to data/styles/default/dark/xhdpi/search-result-shop-alcohol.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-shop-butcher.png b/data/styles/default/dark/xhdpi/search-result-shop-butcher.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-shop-butcher.png
rename to data/styles/default/dark/xhdpi/search-result-shop-butcher.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-shop-clothes.png b/data/styles/default/dark/xhdpi/search-result-shop-clothes.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-shop-clothes.png
rename to data/styles/default/dark/xhdpi/search-result-shop-clothes.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-shop-confectionery.png b/data/styles/default/dark/xhdpi/search-result-shop-confectionery.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-shop-confectionery.png
rename to data/styles/default/dark/xhdpi/search-result-shop-confectionery.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-shop-convenience.png b/data/styles/default/dark/xhdpi/search-result-shop-convenience.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-shop-convenience.png
rename to data/styles/default/dark/xhdpi/search-result-shop-convenience.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-shop-cosmetics.png b/data/styles/default/dark/xhdpi/search-result-shop-cosmetics.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-shop-cosmetics.png
rename to data/styles/default/dark/xhdpi/search-result-shop-cosmetics.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-shop-department_store.png b/data/styles/default/dark/xhdpi/search-result-shop-department_store.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-shop-department_store.png
rename to data/styles/default/dark/xhdpi/search-result-shop-department_store.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-shop-gift.png b/data/styles/default/dark/xhdpi/search-result-shop-gift.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-shop-gift.png
rename to data/styles/default/dark/xhdpi/search-result-shop-gift.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-shop-greengrocer.png b/data/styles/default/dark/xhdpi/search-result-shop-greengrocer.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-shop-greengrocer.png
rename to data/styles/default/dark/xhdpi/search-result-shop-greengrocer.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-shop-jewelry.png b/data/styles/default/dark/xhdpi/search-result-shop-jewelry.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-shop-jewelry.png
rename to data/styles/default/dark/xhdpi/search-result-shop-jewelry.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-shop-mall.png b/data/styles/default/dark/xhdpi/search-result-shop-mall.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-shop-mall.png
rename to data/styles/default/dark/xhdpi/search-result-shop-mall.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-shop-seafood.png b/data/styles/default/dark/xhdpi/search-result-shop-seafood.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-shop-seafood.png
rename to data/styles/default/dark/xhdpi/search-result-shop-seafood.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-shop-shoes.png b/data/styles/default/dark/xhdpi/search-result-shop-shoes.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-shop-shoes.png
rename to data/styles/default/dark/xhdpi/search-result-shop-shoes.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-shop-sports.png b/data/styles/default/dark/xhdpi/search-result-shop-sports.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-shop-sports.png
rename to data/styles/default/dark/xhdpi/search-result-shop-sports.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-shop-supermarket.png b/data/styles/default/dark/xhdpi/search-result-shop-supermarket.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-shop-supermarket.png
rename to data/styles/default/dark/xhdpi/search-result-shop-supermarket.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-shop-toys.png b/data/styles/default/dark/xhdpi/search-result-shop-toys.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-shop-toys.png
rename to data/styles/default/dark/xhdpi/search-result-shop-toys.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-theme-park.png b/data/styles/default/dark/xhdpi/search-result-theme-park.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-theme-park.png
rename to data/styles/default/dark/xhdpi/search-result-theme-park.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-water-park.png b/data/styles/default/dark/xhdpi/search-result-water-park.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-water-park.png
rename to data/styles/default/dark/xhdpi/search-result-water-park.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result-zoo.png b/data/styles/default/dark/xhdpi/search-result-zoo.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result-zoo.png
rename to data/styles/default/dark/xhdpi/search-result-zoo.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result.png b/data/styles/default/dark/xhdpi/search-result.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result.png
rename to data/styles/default/dark/xhdpi/search-result.png
diff --git a/data/styles/clear/style-clear/xhdpi/shield-us-hw-thin-scaled.png b/data/styles/default/dark/xhdpi/shield-us-hw-thin-scaled.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/shield-us-hw-thin-scaled.png
rename to data/styles/default/dark/xhdpi/shield-us-hw-thin-scaled.png
diff --git a/data/styles/clear/style-clear/xhdpi/shield-us-hw-thin.png b/data/styles/default/dark/xhdpi/shield-us-hw-thin.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/shield-us-hw-thin.png
rename to data/styles/default/dark/xhdpi/shield-us-hw-thin.png
diff --git a/data/styles/clear/style-clear/xhdpi/shield-us-hw-wide-scaled.png b/data/styles/default/dark/xhdpi/shield-us-hw-wide-scaled.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/shield-us-hw-wide-scaled.png
rename to data/styles/default/dark/xhdpi/shield-us-hw-wide-scaled.png
diff --git a/data/styles/clear/style-clear/xhdpi/shield-us-hw-wide.png b/data/styles/default/dark/xhdpi/shield-us-hw-wide.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/shield-us-hw-wide.png
rename to data/styles/default/dark/xhdpi/shield-us-hw-wide.png
diff --git a/data/styles/clear/style-clear/xhdpi/shield-us-i-thin-scaled.png b/data/styles/default/dark/xhdpi/shield-us-i-thin-scaled.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/shield-us-i-thin-scaled.png
rename to data/styles/default/dark/xhdpi/shield-us-i-thin-scaled.png
diff --git a/data/styles/clear/style-clear/xhdpi/shield-us-i-thin.png b/data/styles/default/dark/xhdpi/shield-us-i-thin.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/shield-us-i-thin.png
rename to data/styles/default/dark/xhdpi/shield-us-i-thin.png
diff --git a/data/styles/clear/style-clear/xhdpi/shield-us-i-wide-scaled.png b/data/styles/default/dark/xhdpi/shield-us-i-wide-scaled.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/shield-us-i-wide-scaled.png
rename to data/styles/default/dark/xhdpi/shield-us-i-wide-scaled.png
diff --git a/data/styles/clear/style-clear/xhdpi/shield-us-i-wide.png b/data/styles/default/dark/xhdpi/shield-us-i-wide.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/shield-us-i-wide.png
rename to data/styles/default/dark/xhdpi/shield-us-i-wide.png
diff --git a/data/styles/clear/style-night/xhdpi/track_marker_deselected.png b/data/styles/default/dark/xhdpi/track_marker_deselected.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/track_marker_deselected.png
rename to data/styles/default/dark/xhdpi/track_marker_deselected.png
diff --git a/data/styles/clear/style-night/xhdpi/track_marker_selected.png b/data/styles/default/dark/xhdpi/track_marker_selected.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/track_marker_selected.png
rename to data/styles/default/dark/xhdpi/track_marker_selected.png
diff --git a/data/styles/clear/style-night/xhdpi/unpaved_road.png b/data/styles/default/dark/xhdpi/unpaved_road.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/unpaved_road.png
rename to data/styles/default/dark/xhdpi/unpaved_road.png
diff --git a/data/styles/clear/style-clear/xxhdpi-ad/keep.png b/data/styles/default/dark/xxhdpi-ad/keep.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi-ad/keep.png
rename to data/styles/default/dark/xxhdpi-ad/keep.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-animals-m.png b/data/styles/default/dark/xxhdpi/bookmark-animals-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-animals-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-animals-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-bar-m.png b/data/styles/default/dark/xxhdpi/bookmark-bar-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-bar-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-bar-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-bg-m.png b/data/styles/default/dark/xxhdpi/bookmark-bg-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-bg-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-bg-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-bg-s.png b/data/styles/default/dark/xxhdpi/bookmark-bg-s.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-bg-s.png
rename to data/styles/default/dark/xxhdpi/bookmark-bg-s.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-bg-xs.png b/data/styles/default/dark/xxhdpi/bookmark-bg-xs.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-bg-xs.png
rename to data/styles/default/dark/xxhdpi/bookmark-bg-xs.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-buddhism-m.png b/data/styles/default/dark/xxhdpi/bookmark-buddhism-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-buddhism-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-buddhism-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-building-m.png b/data/styles/default/dark/xxhdpi/bookmark-building-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-building-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-building-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-christianity-m.png b/data/styles/default/dark/xxhdpi/bookmark-christianity-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-christianity-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-christianity-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-default-m.png b/data/styles/default/dark/xxhdpi/bookmark-default-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-default-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-default-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-default-s.png b/data/styles/default/dark/xxhdpi/bookmark-default-s.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-default-s.png
rename to data/styles/default/dark/xxhdpi/bookmark-default-s.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-default-xs.png b/data/styles/default/dark/xxhdpi/bookmark-default-xs.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-default-xs.png
rename to data/styles/default/dark/xxhdpi/bookmark-default-xs.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-entertainment-m.png b/data/styles/default/dark/xxhdpi/bookmark-entertainment-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-entertainment-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-entertainment-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-exchange-m.png b/data/styles/default/dark/xxhdpi/bookmark-exchange-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-exchange-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-exchange-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-finish-m.png b/data/styles/default/dark/xxhdpi/bookmark-finish-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-finish-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-finish-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-food-m.png b/data/styles/default/dark/xxhdpi/bookmark-food-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-food-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-food-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-gas-m.png b/data/styles/default/dark/xxhdpi/bookmark-gas-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-gas-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-gas-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-hotel-m.png b/data/styles/default/dark/xxhdpi/bookmark-hotel-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-hotel-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-hotel-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-islam-m.png b/data/styles/default/dark/xxhdpi/bookmark-islam-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-islam-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-islam-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-judaism-m.png b/data/styles/default/dark/xxhdpi/bookmark-judaism-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-judaism-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-judaism-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-medicine-m.png b/data/styles/default/dark/xxhdpi/bookmark-medicine-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-medicine-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-medicine-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-mountain-m.png b/data/styles/default/dark/xxhdpi/bookmark-mountain-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-mountain-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-mountain-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-museum-m.png b/data/styles/default/dark/xxhdpi/bookmark-museum-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-museum-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-museum-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-park-m.png b/data/styles/default/dark/xxhdpi/bookmark-park-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-park-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-park-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-parking-m.png b/data/styles/default/dark/xxhdpi/bookmark-parking-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-parking-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-parking-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-shop-m.png b/data/styles/default/dark/xxhdpi/bookmark-shop-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-shop-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-shop-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-sights-m.png b/data/styles/default/dark/xxhdpi/bookmark-sights-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-sights-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-sights-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-sport-m.png b/data/styles/default/dark/xxhdpi/bookmark-sport-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-sport-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-sport-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-start-m.png b/data/styles/default/dark/xxhdpi/bookmark-start-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-start-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-start-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-swim-m.png b/data/styles/default/dark/xxhdpi/bookmark-swim-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-swim-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-swim-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-transport-m.png b/data/styles/default/dark/xxhdpi/bookmark-transport-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-transport-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-transport-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-viewpoint-m.png b/data/styles/default/dark/xxhdpi/bookmark-viewpoint-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-viewpoint-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-viewpoint-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-water-m.png b/data/styles/default/dark/xxhdpi/bookmark-water-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-water-m.png
rename to data/styles/default/dark/xxhdpi/bookmark-water-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/coloredmark-bg-l.png b/data/styles/default/dark/xxhdpi/coloredmark-bg-l.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/coloredmark-bg-l.png
rename to data/styles/default/dark/xxhdpi/coloredmark-bg-l.png
diff --git a/data/styles/clear/style-clear/xxhdpi/coloredmark-bg-s.png b/data/styles/default/dark/xxhdpi/coloredmark-bg-s.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/coloredmark-bg-s.png
rename to data/styles/default/dark/xxhdpi/coloredmark-bg-s.png
diff --git a/data/styles/clear/style-night/xxhdpi/coloredmark-default-l.png b/data/styles/default/dark/xxhdpi/coloredmark-default-l.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/coloredmark-default-l.png
rename to data/styles/default/dark/xxhdpi/coloredmark-default-l.png
diff --git a/data/styles/clear/style-clear/xxhdpi/coloredmark-default-s.png b/data/styles/default/dark/xxhdpi/coloredmark-default-s.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/coloredmark-default-s.png
rename to data/styles/default/dark/xxhdpi/coloredmark-default-s.png
diff --git a/data/styles/clear/style-night/xxhdpi/compass-image.png b/data/styles/default/dark/xxhdpi/compass-image.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/compass-image.png
rename to data/styles/default/dark/xxhdpi/compass-image.png
diff --git a/data/styles/clear/style-night/xxhdpi/cross_geoposition.png b/data/styles/default/dark/xxhdpi/cross_geoposition.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/cross_geoposition.png
rename to data/styles/default/dark/xxhdpi/cross_geoposition.png
diff --git a/data/styles/clear/style-night/xxhdpi/current-position.png b/data/styles/default/dark/xxhdpi/current-position.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/current-position.png
rename to data/styles/default/dark/xxhdpi/current-position.png
diff --git a/data/styles/clear/style-night/xxhdpi/ferry.png b/data/styles/default/dark/xxhdpi/ferry.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/ferry.png
rename to data/styles/default/dark/xxhdpi/ferry.png
diff --git a/data/styles/clear/style-night/xxhdpi/infosign.png b/data/styles/default/dark/xxhdpi/infosign.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/infosign.png
rename to data/styles/default/dark/xxhdpi/infosign.png
diff --git a/data/styles/clear/style-clear/xxhdpi/non-found-search-result.png b/data/styles/default/dark/xxhdpi/non-found-search-result.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/non-found-search-result.png
rename to data/styles/default/dark/xxhdpi/non-found-search-result.png
diff --git a/data/styles/clear/style-clear/xxhdpi/norating-bg-l.png b/data/styles/default/dark/xxhdpi/norating-bg-l.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/norating-bg-l.png
rename to data/styles/default/dark/xxhdpi/norating-bg-l.png
diff --git a/data/styles/clear/style-clear/xxhdpi/norating-default-l.png b/data/styles/default/dark/xxhdpi/norating-default-l.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/norating-default-l.png
rename to data/styles/default/dark/xxhdpi/norating-default-l.png
diff --git a/data/styles/clear/style-night/xxhdpi/paid_road.png b/data/styles/default/dark/xxhdpi/paid_road.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/paid_road.png
rename to data/styles/default/dark/xxhdpi/paid_road.png
diff --git a/data/styles/clear/style-clear/xxhdpi/route-arrow.png b/data/styles/default/dark/xxhdpi/route-arrow.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/route-arrow.png
rename to data/styles/default/dark/xxhdpi/route-arrow.png
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-1.png b/data/styles/default/dark/xxhdpi/route-point-1.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/route-point-1.png
rename to data/styles/default/dark/xxhdpi/route-point-1.png
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-10.png b/data/styles/default/dark/xxhdpi/route-point-10.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/route-point-10.png
rename to data/styles/default/dark/xxhdpi/route-point-10.png
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-11.png b/data/styles/default/dark/xxhdpi/route-point-11.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/route-point-11.png
rename to data/styles/default/dark/xxhdpi/route-point-11.png
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-12.png b/data/styles/default/dark/xxhdpi/route-point-12.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/route-point-12.png
rename to data/styles/default/dark/xxhdpi/route-point-12.png
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-13.png b/data/styles/default/dark/xxhdpi/route-point-13.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/route-point-13.png
rename to data/styles/default/dark/xxhdpi/route-point-13.png
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-14.png b/data/styles/default/dark/xxhdpi/route-point-14.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/route-point-14.png
rename to data/styles/default/dark/xxhdpi/route-point-14.png
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-15.png b/data/styles/default/dark/xxhdpi/route-point-15.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/route-point-15.png
rename to data/styles/default/dark/xxhdpi/route-point-15.png
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-16.png b/data/styles/default/dark/xxhdpi/route-point-16.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/route-point-16.png
rename to data/styles/default/dark/xxhdpi/route-point-16.png
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-17.png b/data/styles/default/dark/xxhdpi/route-point-17.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/route-point-17.png
rename to data/styles/default/dark/xxhdpi/route-point-17.png
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-18.png b/data/styles/default/dark/xxhdpi/route-point-18.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/route-point-18.png
rename to data/styles/default/dark/xxhdpi/route-point-18.png
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-19.png b/data/styles/default/dark/xxhdpi/route-point-19.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/route-point-19.png
rename to data/styles/default/dark/xxhdpi/route-point-19.png
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-2.png b/data/styles/default/dark/xxhdpi/route-point-2.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/route-point-2.png
rename to data/styles/default/dark/xxhdpi/route-point-2.png
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-20.png b/data/styles/default/dark/xxhdpi/route-point-20.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/route-point-20.png
rename to data/styles/default/dark/xxhdpi/route-point-20.png
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-3.png b/data/styles/default/dark/xxhdpi/route-point-3.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/route-point-3.png
rename to data/styles/default/dark/xxhdpi/route-point-3.png
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-4.png b/data/styles/default/dark/xxhdpi/route-point-4.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/route-point-4.png
rename to data/styles/default/dark/xxhdpi/route-point-4.png
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-5.png b/data/styles/default/dark/xxhdpi/route-point-5.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/route-point-5.png
rename to data/styles/default/dark/xxhdpi/route-point-5.png
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-6.png b/data/styles/default/dark/xxhdpi/route-point-6.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/route-point-6.png
rename to data/styles/default/dark/xxhdpi/route-point-6.png
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-7.png b/data/styles/default/dark/xxhdpi/route-point-7.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/route-point-7.png
rename to data/styles/default/dark/xxhdpi/route-point-7.png
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-8.png b/data/styles/default/dark/xxhdpi/route-point-8.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/route-point-8.png
rename to data/styles/default/dark/xxhdpi/route-point-8.png
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-9.png b/data/styles/default/dark/xxhdpi/route-point-9.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/route-point-9.png
rename to data/styles/default/dark/xxhdpi/route-point-9.png
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-finish.png b/data/styles/default/dark/xxhdpi/route-point-finish.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/route-point-finish.png
rename to data/styles/default/dark/xxhdpi/route-point-finish.png
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-start.png b/data/styles/default/dark/xxhdpi/route-point-start.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/route-point-start.png
rename to data/styles/default/dark/xxhdpi/route-point-start.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-bakery.png b/data/styles/default/dark/xxhdpi/search-result-bakery.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-bakery.png
rename to data/styles/default/dark/xxhdpi/search-result-bakery.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-bar.png b/data/styles/default/dark/xxhdpi/search-result-bar.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-bar.png
rename to data/styles/default/dark/xxhdpi/search-result-bar.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-cafe.png b/data/styles/default/dark/xxhdpi/search-result-cafe.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-cafe.png
rename to data/styles/default/dark/xxhdpi/search-result-cafe.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-casino.png b/data/styles/default/dark/xxhdpi/search-result-casino.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-casino.png
rename to data/styles/default/dark/xxhdpi/search-result-casino.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-cinema.png b/data/styles/default/dark/xxhdpi/search-result-cinema.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-cinema.png
rename to data/styles/default/dark/xxhdpi/search-result-cinema.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-fastfood.png b/data/styles/default/dark/xxhdpi/search-result-fastfood.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-fastfood.png
rename to data/styles/default/dark/xxhdpi/search-result-fastfood.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-marketplace.png b/data/styles/default/dark/xxhdpi/search-result-marketplace.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-marketplace.png
rename to data/styles/default/dark/xxhdpi/search-result-marketplace.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-nightclub.png b/data/styles/default/dark/xxhdpi/search-result-nightclub.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-nightclub.png
rename to data/styles/default/dark/xxhdpi/search-result-nightclub.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-playground.png b/data/styles/default/dark/xxhdpi/search-result-playground.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-playground.png
rename to data/styles/default/dark/xxhdpi/search-result-playground.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-pub.png b/data/styles/default/dark/xxhdpi/search-result-pub.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-pub.png
rename to data/styles/default/dark/xxhdpi/search-result-pub.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-restaurant.png b/data/styles/default/dark/xxhdpi/search-result-restaurant.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-restaurant.png
rename to data/styles/default/dark/xxhdpi/search-result-restaurant.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-shop-alcohol.png b/data/styles/default/dark/xxhdpi/search-result-shop-alcohol.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-shop-alcohol.png
rename to data/styles/default/dark/xxhdpi/search-result-shop-alcohol.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-shop-butcher.png b/data/styles/default/dark/xxhdpi/search-result-shop-butcher.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-shop-butcher.png
rename to data/styles/default/dark/xxhdpi/search-result-shop-butcher.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-shop-clothes.png b/data/styles/default/dark/xxhdpi/search-result-shop-clothes.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-shop-clothes.png
rename to data/styles/default/dark/xxhdpi/search-result-shop-clothes.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-shop-confectionery.png b/data/styles/default/dark/xxhdpi/search-result-shop-confectionery.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-shop-confectionery.png
rename to data/styles/default/dark/xxhdpi/search-result-shop-confectionery.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-shop-convenience.png b/data/styles/default/dark/xxhdpi/search-result-shop-convenience.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-shop-convenience.png
rename to data/styles/default/dark/xxhdpi/search-result-shop-convenience.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-shop-cosmetics.png b/data/styles/default/dark/xxhdpi/search-result-shop-cosmetics.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-shop-cosmetics.png
rename to data/styles/default/dark/xxhdpi/search-result-shop-cosmetics.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-shop-department_store.png b/data/styles/default/dark/xxhdpi/search-result-shop-department_store.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-shop-department_store.png
rename to data/styles/default/dark/xxhdpi/search-result-shop-department_store.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-shop-gift.png b/data/styles/default/dark/xxhdpi/search-result-shop-gift.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-shop-gift.png
rename to data/styles/default/dark/xxhdpi/search-result-shop-gift.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-shop-greengrocer.png b/data/styles/default/dark/xxhdpi/search-result-shop-greengrocer.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-shop-greengrocer.png
rename to data/styles/default/dark/xxhdpi/search-result-shop-greengrocer.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-shop-jewelry.png b/data/styles/default/dark/xxhdpi/search-result-shop-jewelry.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-shop-jewelry.png
rename to data/styles/default/dark/xxhdpi/search-result-shop-jewelry.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-shop-mall.png b/data/styles/default/dark/xxhdpi/search-result-shop-mall.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-shop-mall.png
rename to data/styles/default/dark/xxhdpi/search-result-shop-mall.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-shop-seafood.png b/data/styles/default/dark/xxhdpi/search-result-shop-seafood.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-shop-seafood.png
rename to data/styles/default/dark/xxhdpi/search-result-shop-seafood.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-shop-shoes.png b/data/styles/default/dark/xxhdpi/search-result-shop-shoes.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-shop-shoes.png
rename to data/styles/default/dark/xxhdpi/search-result-shop-shoes.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-shop-sports.png b/data/styles/default/dark/xxhdpi/search-result-shop-sports.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-shop-sports.png
rename to data/styles/default/dark/xxhdpi/search-result-shop-sports.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-shop-supermarket.png b/data/styles/default/dark/xxhdpi/search-result-shop-supermarket.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-shop-supermarket.png
rename to data/styles/default/dark/xxhdpi/search-result-shop-supermarket.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-shop-toys.png b/data/styles/default/dark/xxhdpi/search-result-shop-toys.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-shop-toys.png
rename to data/styles/default/dark/xxhdpi/search-result-shop-toys.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-theme-park.png b/data/styles/default/dark/xxhdpi/search-result-theme-park.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-theme-park.png
rename to data/styles/default/dark/xxhdpi/search-result-theme-park.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-water-park.png b/data/styles/default/dark/xxhdpi/search-result-water-park.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-water-park.png
rename to data/styles/default/dark/xxhdpi/search-result-water-park.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-zoo.png b/data/styles/default/dark/xxhdpi/search-result-zoo.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result-zoo.png
rename to data/styles/default/dark/xxhdpi/search-result-zoo.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result.png b/data/styles/default/dark/xxhdpi/search-result.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result.png
rename to data/styles/default/dark/xxhdpi/search-result.png
diff --git a/data/styles/clear/style-clear/xxhdpi/shield-us-hw-thin-scaled.png b/data/styles/default/dark/xxhdpi/shield-us-hw-thin-scaled.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/shield-us-hw-thin-scaled.png
rename to data/styles/default/dark/xxhdpi/shield-us-hw-thin-scaled.png
diff --git a/data/styles/clear/style-clear/xxhdpi/shield-us-hw-thin.png b/data/styles/default/dark/xxhdpi/shield-us-hw-thin.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/shield-us-hw-thin.png
rename to data/styles/default/dark/xxhdpi/shield-us-hw-thin.png
diff --git a/data/styles/clear/style-clear/xxhdpi/shield-us-hw-wide-scaled.png b/data/styles/default/dark/xxhdpi/shield-us-hw-wide-scaled.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/shield-us-hw-wide-scaled.png
rename to data/styles/default/dark/xxhdpi/shield-us-hw-wide-scaled.png
diff --git a/data/styles/clear/style-clear/xxhdpi/shield-us-hw-wide.png b/data/styles/default/dark/xxhdpi/shield-us-hw-wide.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/shield-us-hw-wide.png
rename to data/styles/default/dark/xxhdpi/shield-us-hw-wide.png
diff --git a/data/styles/clear/style-clear/xxhdpi/shield-us-i-thin-scaled.png b/data/styles/default/dark/xxhdpi/shield-us-i-thin-scaled.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/shield-us-i-thin-scaled.png
rename to data/styles/default/dark/xxhdpi/shield-us-i-thin-scaled.png
diff --git a/data/styles/clear/style-clear/xxhdpi/shield-us-i-thin.png b/data/styles/default/dark/xxhdpi/shield-us-i-thin.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/shield-us-i-thin.png
rename to data/styles/default/dark/xxhdpi/shield-us-i-thin.png
diff --git a/data/styles/clear/style-clear/xxhdpi/shield-us-i-wide-scaled.png b/data/styles/default/dark/xxhdpi/shield-us-i-wide-scaled.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/shield-us-i-wide-scaled.png
rename to data/styles/default/dark/xxhdpi/shield-us-i-wide-scaled.png
diff --git a/data/styles/clear/style-clear/xxhdpi/shield-us-i-wide.png b/data/styles/default/dark/xxhdpi/shield-us-i-wide.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/shield-us-i-wide.png
rename to data/styles/default/dark/xxhdpi/shield-us-i-wide.png
diff --git a/data/styles/clear/style-night/xxhdpi/track_marker_deselected.png b/data/styles/default/dark/xxhdpi/track_marker_deselected.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/track_marker_deselected.png
rename to data/styles/default/dark/xxhdpi/track_marker_deselected.png
diff --git a/data/styles/clear/style-night/xxhdpi/track_marker_selected.png b/data/styles/default/dark/xxhdpi/track_marker_selected.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/track_marker_selected.png
rename to data/styles/default/dark/xxhdpi/track_marker_selected.png
diff --git a/data/styles/clear/style-night/xxhdpi/unpaved_road.png b/data/styles/default/dark/xxhdpi/unpaved_road.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/unpaved_road.png
rename to data/styles/default/dark/xxhdpi/unpaved_road.png
diff --git a/data/styles/clear/style-clear/xxxhdpi-ad/keep.png b/data/styles/default/dark/xxxhdpi-ad/keep.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi-ad/keep.png
rename to data/styles/default/dark/xxxhdpi-ad/keep.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-animals-m.png b/data/styles/default/dark/xxxhdpi/bookmark-animals-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-animals-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-animals-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-bar-m.png b/data/styles/default/dark/xxxhdpi/bookmark-bar-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-bar-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-bar-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-bg-m.png b/data/styles/default/dark/xxxhdpi/bookmark-bg-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-bg-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-bg-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-bg-s.png b/data/styles/default/dark/xxxhdpi/bookmark-bg-s.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-bg-s.png
rename to data/styles/default/dark/xxxhdpi/bookmark-bg-s.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-bg-xs.png b/data/styles/default/dark/xxxhdpi/bookmark-bg-xs.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-bg-xs.png
rename to data/styles/default/dark/xxxhdpi/bookmark-bg-xs.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-buddhism-m.png b/data/styles/default/dark/xxxhdpi/bookmark-buddhism-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-buddhism-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-buddhism-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-building-m.png b/data/styles/default/dark/xxxhdpi/bookmark-building-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-building-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-building-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-christianity-m.png b/data/styles/default/dark/xxxhdpi/bookmark-christianity-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-christianity-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-christianity-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-default-m.png b/data/styles/default/dark/xxxhdpi/bookmark-default-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-default-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-default-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-default-s.png b/data/styles/default/dark/xxxhdpi/bookmark-default-s.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-default-s.png
rename to data/styles/default/dark/xxxhdpi/bookmark-default-s.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-default-xs.png b/data/styles/default/dark/xxxhdpi/bookmark-default-xs.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-default-xs.png
rename to data/styles/default/dark/xxxhdpi/bookmark-default-xs.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-entertainment-m.png b/data/styles/default/dark/xxxhdpi/bookmark-entertainment-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-entertainment-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-entertainment-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-exchange-m.png b/data/styles/default/dark/xxxhdpi/bookmark-exchange-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-exchange-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-exchange-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-finish-m.png b/data/styles/default/dark/xxxhdpi/bookmark-finish-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-finish-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-finish-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-food-m.png b/data/styles/default/dark/xxxhdpi/bookmark-food-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-food-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-food-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-gas-m.png b/data/styles/default/dark/xxxhdpi/bookmark-gas-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-gas-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-gas-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-hotel-m.png b/data/styles/default/dark/xxxhdpi/bookmark-hotel-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-hotel-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-hotel-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-islam-m.png b/data/styles/default/dark/xxxhdpi/bookmark-islam-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-islam-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-islam-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-judaism-m.png b/data/styles/default/dark/xxxhdpi/bookmark-judaism-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-judaism-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-judaism-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-medicine-m.png b/data/styles/default/dark/xxxhdpi/bookmark-medicine-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-medicine-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-medicine-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-mountain-m.png b/data/styles/default/dark/xxxhdpi/bookmark-mountain-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-mountain-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-mountain-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-museum-m.png b/data/styles/default/dark/xxxhdpi/bookmark-museum-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-museum-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-museum-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-park-m.png b/data/styles/default/dark/xxxhdpi/bookmark-park-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-park-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-park-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-parking-m.png b/data/styles/default/dark/xxxhdpi/bookmark-parking-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-parking-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-parking-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-shop-m.png b/data/styles/default/dark/xxxhdpi/bookmark-shop-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-shop-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-shop-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-sights-m.png b/data/styles/default/dark/xxxhdpi/bookmark-sights-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-sights-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-sights-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-sport-m.png b/data/styles/default/dark/xxxhdpi/bookmark-sport-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-sport-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-sport-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-start-m.png b/data/styles/default/dark/xxxhdpi/bookmark-start-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-start-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-start-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-swim-m.png b/data/styles/default/dark/xxxhdpi/bookmark-swim-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-swim-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-swim-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-transport-m.png b/data/styles/default/dark/xxxhdpi/bookmark-transport-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-transport-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-transport-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-viewpoint-m.png b/data/styles/default/dark/xxxhdpi/bookmark-viewpoint-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-viewpoint-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-viewpoint-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-water-m.png b/data/styles/default/dark/xxxhdpi/bookmark-water-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-water-m.png
rename to data/styles/default/dark/xxxhdpi/bookmark-water-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/coloredmark-bg-l.png b/data/styles/default/dark/xxxhdpi/coloredmark-bg-l.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/coloredmark-bg-l.png
rename to data/styles/default/dark/xxxhdpi/coloredmark-bg-l.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/coloredmark-bg-s.png b/data/styles/default/dark/xxxhdpi/coloredmark-bg-s.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/coloredmark-bg-s.png
rename to data/styles/default/dark/xxxhdpi/coloredmark-bg-s.png
diff --git a/data/styles/clear/style-night/xxxhdpi/coloredmark-default-l.png b/data/styles/default/dark/xxxhdpi/coloredmark-default-l.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/coloredmark-default-l.png
rename to data/styles/default/dark/xxxhdpi/coloredmark-default-l.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/coloredmark-default-s.png b/data/styles/default/dark/xxxhdpi/coloredmark-default-s.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/coloredmark-default-s.png
rename to data/styles/default/dark/xxxhdpi/coloredmark-default-s.png
diff --git a/data/styles/clear/style-night/xxxhdpi/compass-image.png b/data/styles/default/dark/xxxhdpi/compass-image.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/compass-image.png
rename to data/styles/default/dark/xxxhdpi/compass-image.png
diff --git a/data/styles/clear/style-night/xxxhdpi/cross_geoposition.png b/data/styles/default/dark/xxxhdpi/cross_geoposition.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/cross_geoposition.png
rename to data/styles/default/dark/xxxhdpi/cross_geoposition.png
diff --git a/data/styles/clear/style-night/xxxhdpi/current-position.png b/data/styles/default/dark/xxxhdpi/current-position.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/current-position.png
rename to data/styles/default/dark/xxxhdpi/current-position.png
diff --git a/data/styles/clear/style-night/xxxhdpi/ferry.png b/data/styles/default/dark/xxxhdpi/ferry.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/ferry.png
rename to data/styles/default/dark/xxxhdpi/ferry.png
diff --git a/data/styles/clear/style-night/xxxhdpi/infosign.png b/data/styles/default/dark/xxxhdpi/infosign.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/infosign.png
rename to data/styles/default/dark/xxxhdpi/infosign.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/non-found-search-result.png b/data/styles/default/dark/xxxhdpi/non-found-search-result.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/non-found-search-result.png
rename to data/styles/default/dark/xxxhdpi/non-found-search-result.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/norating-bg-l.png b/data/styles/default/dark/xxxhdpi/norating-bg-l.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/norating-bg-l.png
rename to data/styles/default/dark/xxxhdpi/norating-bg-l.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/norating-default-l.png b/data/styles/default/dark/xxxhdpi/norating-default-l.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/norating-default-l.png
rename to data/styles/default/dark/xxxhdpi/norating-default-l.png
diff --git a/data/styles/clear/style-night/xxxhdpi/paid_road.png b/data/styles/default/dark/xxxhdpi/paid_road.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/paid_road.png
rename to data/styles/default/dark/xxxhdpi/paid_road.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-arrow.png b/data/styles/default/dark/xxxhdpi/route-arrow.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/route-arrow.png
rename to data/styles/default/dark/xxxhdpi/route-arrow.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-1.png b/data/styles/default/dark/xxxhdpi/route-point-1.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/route-point-1.png
rename to data/styles/default/dark/xxxhdpi/route-point-1.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-10.png b/data/styles/default/dark/xxxhdpi/route-point-10.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/route-point-10.png
rename to data/styles/default/dark/xxxhdpi/route-point-10.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-11.png b/data/styles/default/dark/xxxhdpi/route-point-11.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/route-point-11.png
rename to data/styles/default/dark/xxxhdpi/route-point-11.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-12.png b/data/styles/default/dark/xxxhdpi/route-point-12.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/route-point-12.png
rename to data/styles/default/dark/xxxhdpi/route-point-12.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-13.png b/data/styles/default/dark/xxxhdpi/route-point-13.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/route-point-13.png
rename to data/styles/default/dark/xxxhdpi/route-point-13.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-14.png b/data/styles/default/dark/xxxhdpi/route-point-14.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/route-point-14.png
rename to data/styles/default/dark/xxxhdpi/route-point-14.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-15.png b/data/styles/default/dark/xxxhdpi/route-point-15.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/route-point-15.png
rename to data/styles/default/dark/xxxhdpi/route-point-15.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-16.png b/data/styles/default/dark/xxxhdpi/route-point-16.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/route-point-16.png
rename to data/styles/default/dark/xxxhdpi/route-point-16.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-17.png b/data/styles/default/dark/xxxhdpi/route-point-17.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/route-point-17.png
rename to data/styles/default/dark/xxxhdpi/route-point-17.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-18.png b/data/styles/default/dark/xxxhdpi/route-point-18.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/route-point-18.png
rename to data/styles/default/dark/xxxhdpi/route-point-18.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-19.png b/data/styles/default/dark/xxxhdpi/route-point-19.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/route-point-19.png
rename to data/styles/default/dark/xxxhdpi/route-point-19.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-2.png b/data/styles/default/dark/xxxhdpi/route-point-2.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/route-point-2.png
rename to data/styles/default/dark/xxxhdpi/route-point-2.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-20.png b/data/styles/default/dark/xxxhdpi/route-point-20.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/route-point-20.png
rename to data/styles/default/dark/xxxhdpi/route-point-20.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-3.png b/data/styles/default/dark/xxxhdpi/route-point-3.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/route-point-3.png
rename to data/styles/default/dark/xxxhdpi/route-point-3.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-4.png b/data/styles/default/dark/xxxhdpi/route-point-4.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/route-point-4.png
rename to data/styles/default/dark/xxxhdpi/route-point-4.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-5.png b/data/styles/default/dark/xxxhdpi/route-point-5.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/route-point-5.png
rename to data/styles/default/dark/xxxhdpi/route-point-5.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-6.png b/data/styles/default/dark/xxxhdpi/route-point-6.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/route-point-6.png
rename to data/styles/default/dark/xxxhdpi/route-point-6.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-7.png b/data/styles/default/dark/xxxhdpi/route-point-7.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/route-point-7.png
rename to data/styles/default/dark/xxxhdpi/route-point-7.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-8.png b/data/styles/default/dark/xxxhdpi/route-point-8.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/route-point-8.png
rename to data/styles/default/dark/xxxhdpi/route-point-8.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-9.png b/data/styles/default/dark/xxxhdpi/route-point-9.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/route-point-9.png
rename to data/styles/default/dark/xxxhdpi/route-point-9.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-finish.png b/data/styles/default/dark/xxxhdpi/route-point-finish.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/route-point-finish.png
rename to data/styles/default/dark/xxxhdpi/route-point-finish.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-start.png b/data/styles/default/dark/xxxhdpi/route-point-start.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/route-point-start.png
rename to data/styles/default/dark/xxxhdpi/route-point-start.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-bakery.png b/data/styles/default/dark/xxxhdpi/search-result-bakery.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-bakery.png
rename to data/styles/default/dark/xxxhdpi/search-result-bakery.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-bar.png b/data/styles/default/dark/xxxhdpi/search-result-bar.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-bar.png
rename to data/styles/default/dark/xxxhdpi/search-result-bar.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-cafe.png b/data/styles/default/dark/xxxhdpi/search-result-cafe.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-cafe.png
rename to data/styles/default/dark/xxxhdpi/search-result-cafe.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-casino.png b/data/styles/default/dark/xxxhdpi/search-result-casino.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-casino.png
rename to data/styles/default/dark/xxxhdpi/search-result-casino.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-cinema.png b/data/styles/default/dark/xxxhdpi/search-result-cinema.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-cinema.png
rename to data/styles/default/dark/xxxhdpi/search-result-cinema.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-fastfood.png b/data/styles/default/dark/xxxhdpi/search-result-fastfood.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-fastfood.png
rename to data/styles/default/dark/xxxhdpi/search-result-fastfood.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-marketplace.png b/data/styles/default/dark/xxxhdpi/search-result-marketplace.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-marketplace.png
rename to data/styles/default/dark/xxxhdpi/search-result-marketplace.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-nightclub.png b/data/styles/default/dark/xxxhdpi/search-result-nightclub.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-nightclub.png
rename to data/styles/default/dark/xxxhdpi/search-result-nightclub.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-playground.png b/data/styles/default/dark/xxxhdpi/search-result-playground.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-playground.png
rename to data/styles/default/dark/xxxhdpi/search-result-playground.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-pub.png b/data/styles/default/dark/xxxhdpi/search-result-pub.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-pub.png
rename to data/styles/default/dark/xxxhdpi/search-result-pub.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-restaurant.png b/data/styles/default/dark/xxxhdpi/search-result-restaurant.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-restaurant.png
rename to data/styles/default/dark/xxxhdpi/search-result-restaurant.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-shop-alcohol.png b/data/styles/default/dark/xxxhdpi/search-result-shop-alcohol.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-shop-alcohol.png
rename to data/styles/default/dark/xxxhdpi/search-result-shop-alcohol.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-shop-butcher.png b/data/styles/default/dark/xxxhdpi/search-result-shop-butcher.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-shop-butcher.png
rename to data/styles/default/dark/xxxhdpi/search-result-shop-butcher.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-shop-clothes.png b/data/styles/default/dark/xxxhdpi/search-result-shop-clothes.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-shop-clothes.png
rename to data/styles/default/dark/xxxhdpi/search-result-shop-clothes.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-shop-confectionery.png b/data/styles/default/dark/xxxhdpi/search-result-shop-confectionery.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-shop-confectionery.png
rename to data/styles/default/dark/xxxhdpi/search-result-shop-confectionery.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-shop-convenience.png b/data/styles/default/dark/xxxhdpi/search-result-shop-convenience.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-shop-convenience.png
rename to data/styles/default/dark/xxxhdpi/search-result-shop-convenience.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-shop-cosmetics.png b/data/styles/default/dark/xxxhdpi/search-result-shop-cosmetics.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-shop-cosmetics.png
rename to data/styles/default/dark/xxxhdpi/search-result-shop-cosmetics.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-shop-department_store.png b/data/styles/default/dark/xxxhdpi/search-result-shop-department_store.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-shop-department_store.png
rename to data/styles/default/dark/xxxhdpi/search-result-shop-department_store.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-shop-gift.png b/data/styles/default/dark/xxxhdpi/search-result-shop-gift.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-shop-gift.png
rename to data/styles/default/dark/xxxhdpi/search-result-shop-gift.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-shop-greengrocer.png b/data/styles/default/dark/xxxhdpi/search-result-shop-greengrocer.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-shop-greengrocer.png
rename to data/styles/default/dark/xxxhdpi/search-result-shop-greengrocer.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-shop-jewelry.png b/data/styles/default/dark/xxxhdpi/search-result-shop-jewelry.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-shop-jewelry.png
rename to data/styles/default/dark/xxxhdpi/search-result-shop-jewelry.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-shop-mall.png b/data/styles/default/dark/xxxhdpi/search-result-shop-mall.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-shop-mall.png
rename to data/styles/default/dark/xxxhdpi/search-result-shop-mall.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-shop-seafood.png b/data/styles/default/dark/xxxhdpi/search-result-shop-seafood.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-shop-seafood.png
rename to data/styles/default/dark/xxxhdpi/search-result-shop-seafood.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-shop-shoes.png b/data/styles/default/dark/xxxhdpi/search-result-shop-shoes.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-shop-shoes.png
rename to data/styles/default/dark/xxxhdpi/search-result-shop-shoes.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-shop-sports.png b/data/styles/default/dark/xxxhdpi/search-result-shop-sports.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-shop-sports.png
rename to data/styles/default/dark/xxxhdpi/search-result-shop-sports.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-shop-supermarket.png b/data/styles/default/dark/xxxhdpi/search-result-shop-supermarket.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-shop-supermarket.png
rename to data/styles/default/dark/xxxhdpi/search-result-shop-supermarket.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-shop-toys.png b/data/styles/default/dark/xxxhdpi/search-result-shop-toys.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-shop-toys.png
rename to data/styles/default/dark/xxxhdpi/search-result-shop-toys.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-theme-park.png b/data/styles/default/dark/xxxhdpi/search-result-theme-park.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-theme-park.png
rename to data/styles/default/dark/xxxhdpi/search-result-theme-park.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-water-park.png b/data/styles/default/dark/xxxhdpi/search-result-water-park.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-water-park.png
rename to data/styles/default/dark/xxxhdpi/search-result-water-park.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result-zoo.png b/data/styles/default/dark/xxxhdpi/search-result-zoo.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result-zoo.png
rename to data/styles/default/dark/xxxhdpi/search-result-zoo.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result.png b/data/styles/default/dark/xxxhdpi/search-result.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result.png
rename to data/styles/default/dark/xxxhdpi/search-result.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/shield-us-hw-thin-scaled.png b/data/styles/default/dark/xxxhdpi/shield-us-hw-thin-scaled.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/shield-us-hw-thin-scaled.png
rename to data/styles/default/dark/xxxhdpi/shield-us-hw-thin-scaled.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/shield-us-hw-thin.png b/data/styles/default/dark/xxxhdpi/shield-us-hw-thin.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/shield-us-hw-thin.png
rename to data/styles/default/dark/xxxhdpi/shield-us-hw-thin.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/shield-us-hw-wide-scaled.png b/data/styles/default/dark/xxxhdpi/shield-us-hw-wide-scaled.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/shield-us-hw-wide-scaled.png
rename to data/styles/default/dark/xxxhdpi/shield-us-hw-wide-scaled.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/shield-us-hw-wide.png b/data/styles/default/dark/xxxhdpi/shield-us-hw-wide.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/shield-us-hw-wide.png
rename to data/styles/default/dark/xxxhdpi/shield-us-hw-wide.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/shield-us-i-thin-scaled.png b/data/styles/default/dark/xxxhdpi/shield-us-i-thin-scaled.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/shield-us-i-thin-scaled.png
rename to data/styles/default/dark/xxxhdpi/shield-us-i-thin-scaled.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/shield-us-i-thin.png b/data/styles/default/dark/xxxhdpi/shield-us-i-thin.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/shield-us-i-thin.png
rename to data/styles/default/dark/xxxhdpi/shield-us-i-thin.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/shield-us-i-wide-scaled.png b/data/styles/default/dark/xxxhdpi/shield-us-i-wide-scaled.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/shield-us-i-wide-scaled.png
rename to data/styles/default/dark/xxxhdpi/shield-us-i-wide-scaled.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/shield-us-i-wide.png b/data/styles/default/dark/xxxhdpi/shield-us-i-wide.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/shield-us-i-wide.png
rename to data/styles/default/dark/xxxhdpi/shield-us-i-wide.png
diff --git a/data/styles/clear/style-night/xxxhdpi/track_marker_deselected.png b/data/styles/default/dark/xxxhdpi/track_marker_deselected.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/track_marker_deselected.png
rename to data/styles/default/dark/xxxhdpi/track_marker_deselected.png
diff --git a/data/styles/clear/style-night/xxxhdpi/track_marker_selected.png b/data/styles/default/dark/xxxhdpi/track_marker_selected.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/track_marker_selected.png
rename to data/styles/default/dark/xxxhdpi/track_marker_selected.png
diff --git a/data/styles/clear/style-night/xxxhdpi/unpaved_road.png b/data/styles/default/dark/xxxhdpi/unpaved_road.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/unpaved_road.png
rename to data/styles/default/dark/xxxhdpi/unpaved_road.png
diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss
similarity index 100%
rename from data/styles/clear/include/Basemap.mapcss
rename to data/styles/default/include/Basemap.mapcss
diff --git a/data/styles/clear/include/Basemap_label.mapcss b/data/styles/default/include/Basemap_label.mapcss
similarity index 100%
rename from data/styles/clear/include/Basemap_label.mapcss
rename to data/styles/default/include/Basemap_label.mapcss
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
similarity index 100%
rename from data/styles/clear/include/Icons.mapcss
rename to data/styles/default/include/Icons.mapcss
diff --git a/data/styles/clear/include/Roads.mapcss b/data/styles/default/include/Roads.mapcss
similarity index 100%
rename from data/styles/clear/include/Roads.mapcss
rename to data/styles/default/include/Roads.mapcss
diff --git a/data/styles/clear/include/Roads_label.mapcss b/data/styles/default/include/Roads_label.mapcss
similarity index 100%
rename from data/styles/clear/include/Roads_label.mapcss
rename to data/styles/default/include/Roads_label.mapcss
diff --git a/data/styles/clear/include/Subways.mapcss b/data/styles/default/include/Subways.mapcss
similarity index 100%
rename from data/styles/clear/include/Subways.mapcss
rename to data/styles/default/include/Subways.mapcss
diff --git a/data/styles/clear/include/defaults_new.mapcss b/data/styles/default/include/defaults_new.mapcss
similarity index 100%
rename from data/styles/clear/include/defaults_new.mapcss
rename to data/styles/default/include/defaults_new.mapcss
diff --git a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
similarity index 100%
rename from data/styles/clear/include/priorities_1_BG-by-size.prio.txt
rename to data/styles/default/include/priorities_1_BG-by-size.prio.txt
diff --git a/data/styles/clear/include/priorities_2_BG-top.prio.txt b/data/styles/default/include/priorities_2_BG-top.prio.txt
similarity index 100%
rename from data/styles/clear/include/priorities_2_BG-top.prio.txt
rename to data/styles/default/include/priorities_2_BG-top.prio.txt
diff --git a/data/styles/clear/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt
similarity index 100%
rename from data/styles/clear/include/priorities_3_FG.prio.txt
rename to data/styles/default/include/priorities_3_FG.prio.txt
diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
similarity index 100%
rename from data/styles/clear/include/priorities_4_overlays.prio.txt
rename to data/styles/default/include/priorities_4_overlays.prio.txt
diff --git a/data/styles/clear/style-clear/6plus/bookmark-animals-m.png b/data/styles/default/light/6plus/bookmark-animals-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-animals-m.png
rename to data/styles/default/light/6plus/bookmark-animals-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-bar-m.png b/data/styles/default/light/6plus/bookmark-bar-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-bar-m.png
rename to data/styles/default/light/6plus/bookmark-bar-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-bg-m.png b/data/styles/default/light/6plus/bookmark-bg-m.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-bg-m.png
rename to data/styles/default/light/6plus/bookmark-bg-m.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-bg-s.png b/data/styles/default/light/6plus/bookmark-bg-s.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-bg-s.png
rename to data/styles/default/light/6plus/bookmark-bg-s.png
diff --git a/data/styles/clear/style-night/6plus/bookmark-bg-xs.png b/data/styles/default/light/6plus/bookmark-bg-xs.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/bookmark-bg-xs.png
rename to data/styles/default/light/6plus/bookmark-bg-xs.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-buddhism-m.png b/data/styles/default/light/6plus/bookmark-buddhism-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-buddhism-m.png
rename to data/styles/default/light/6plus/bookmark-buddhism-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-building-m.png b/data/styles/default/light/6plus/bookmark-building-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-building-m.png
rename to data/styles/default/light/6plus/bookmark-building-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-christianity-m.png b/data/styles/default/light/6plus/bookmark-christianity-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-christianity-m.png
rename to data/styles/default/light/6plus/bookmark-christianity-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-default-m.png b/data/styles/default/light/6plus/bookmark-default-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-default-m.png
rename to data/styles/default/light/6plus/bookmark-default-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-default-s.png b/data/styles/default/light/6plus/bookmark-default-s.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-default-s.png
rename to data/styles/default/light/6plus/bookmark-default-s.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-default-xs.png b/data/styles/default/light/6plus/bookmark-default-xs.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-default-xs.png
rename to data/styles/default/light/6plus/bookmark-default-xs.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-entertainment-m.png b/data/styles/default/light/6plus/bookmark-entertainment-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-entertainment-m.png
rename to data/styles/default/light/6plus/bookmark-entertainment-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-exchange-m.png b/data/styles/default/light/6plus/bookmark-exchange-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-exchange-m.png
rename to data/styles/default/light/6plus/bookmark-exchange-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-finish-m.png b/data/styles/default/light/6plus/bookmark-finish-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-finish-m.png
rename to data/styles/default/light/6plus/bookmark-finish-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-food-m.png b/data/styles/default/light/6plus/bookmark-food-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-food-m.png
rename to data/styles/default/light/6plus/bookmark-food-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-gas-m.png b/data/styles/default/light/6plus/bookmark-gas-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-gas-m.png
rename to data/styles/default/light/6plus/bookmark-gas-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-hotel-m.png b/data/styles/default/light/6plus/bookmark-hotel-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-hotel-m.png
rename to data/styles/default/light/6plus/bookmark-hotel-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-islam-m.png b/data/styles/default/light/6plus/bookmark-islam-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-islam-m.png
rename to data/styles/default/light/6plus/bookmark-islam-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-judaism-m.png b/data/styles/default/light/6plus/bookmark-judaism-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-judaism-m.png
rename to data/styles/default/light/6plus/bookmark-judaism-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-medicine-m.png b/data/styles/default/light/6plus/bookmark-medicine-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-medicine-m.png
rename to data/styles/default/light/6plus/bookmark-medicine-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-mountain-m.png b/data/styles/default/light/6plus/bookmark-mountain-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-mountain-m.png
rename to data/styles/default/light/6plus/bookmark-mountain-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-museum-m.png b/data/styles/default/light/6plus/bookmark-museum-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-museum-m.png
rename to data/styles/default/light/6plus/bookmark-museum-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-park-m.png b/data/styles/default/light/6plus/bookmark-park-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-park-m.png
rename to data/styles/default/light/6plus/bookmark-park-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-parking-m.png b/data/styles/default/light/6plus/bookmark-parking-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-parking-m.png
rename to data/styles/default/light/6plus/bookmark-parking-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-shop-m.png b/data/styles/default/light/6plus/bookmark-shop-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-shop-m.png
rename to data/styles/default/light/6plus/bookmark-shop-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-sights-m.png b/data/styles/default/light/6plus/bookmark-sights-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-sights-m.png
rename to data/styles/default/light/6plus/bookmark-sights-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-sport-m.png b/data/styles/default/light/6plus/bookmark-sport-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-sport-m.png
rename to data/styles/default/light/6plus/bookmark-sport-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-start-m.png b/data/styles/default/light/6plus/bookmark-start-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-start-m.png
rename to data/styles/default/light/6plus/bookmark-start-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-swim-m.png b/data/styles/default/light/6plus/bookmark-swim-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-swim-m.png
rename to data/styles/default/light/6plus/bookmark-swim-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-transport-m.png b/data/styles/default/light/6plus/bookmark-transport-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-transport-m.png
rename to data/styles/default/light/6plus/bookmark-transport-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-viewpoint-m.png b/data/styles/default/light/6plus/bookmark-viewpoint-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-viewpoint-m.png
rename to data/styles/default/light/6plus/bookmark-viewpoint-m.png
diff --git a/data/styles/clear/style-clear/6plus/bookmark-water-m.png b/data/styles/default/light/6plus/bookmark-water-m.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/bookmark-water-m.png
rename to data/styles/default/light/6plus/bookmark-water-m.png
diff --git a/data/styles/clear/style-night/6plus/coloredmark-bg-l.png b/data/styles/default/light/6plus/coloredmark-bg-l.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/coloredmark-bg-l.png
rename to data/styles/default/light/6plus/coloredmark-bg-l.png
diff --git a/data/styles/clear/style-night/6plus/coloredmark-bg-s.png b/data/styles/default/light/6plus/coloredmark-bg-s.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/coloredmark-bg-s.png
rename to data/styles/default/light/6plus/coloredmark-bg-s.png
diff --git a/data/styles/clear/style-clear/6plus/coloredmark-default-l.png b/data/styles/default/light/6plus/coloredmark-default-l.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/coloredmark-default-l.png
rename to data/styles/default/light/6plus/coloredmark-default-l.png
diff --git a/data/styles/clear/style-night/6plus/coloredmark-default-s.png b/data/styles/default/light/6plus/coloredmark-default-s.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/coloredmark-default-s.png
rename to data/styles/default/light/6plus/coloredmark-default-s.png
diff --git a/data/styles/clear/style-clear/6plus/compass-image.png b/data/styles/default/light/6plus/compass-image.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/compass-image.png
rename to data/styles/default/light/6plus/compass-image.png
diff --git a/data/styles/clear/style-clear/6plus/cross_geoposition.png b/data/styles/default/light/6plus/cross_geoposition.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/cross_geoposition.png
rename to data/styles/default/light/6plus/cross_geoposition.png
diff --git a/data/styles/clear/style-clear/6plus/current-position.png b/data/styles/default/light/6plus/current-position.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/current-position.png
rename to data/styles/default/light/6plus/current-position.png
diff --git a/data/styles/clear/style-clear/6plus/ferry.png b/data/styles/default/light/6plus/ferry.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/ferry.png
rename to data/styles/default/light/6plus/ferry.png
diff --git a/data/styles/clear/style-clear/6plus/infosign.png b/data/styles/default/light/6plus/infosign.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/infosign.png
rename to data/styles/default/light/6plus/infosign.png
diff --git a/data/styles/clear/style-night/6plus/non-found-search-result.png b/data/styles/default/light/6plus/non-found-search-result.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/non-found-search-result.png
rename to data/styles/default/light/6plus/non-found-search-result.png
diff --git a/data/styles/clear/style-night/6plus/norating-bg-l.png b/data/styles/default/light/6plus/norating-bg-l.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/norating-bg-l.png
rename to data/styles/default/light/6plus/norating-bg-l.png
diff --git a/data/styles/clear/style-night/6plus/norating-default-l.png b/data/styles/default/light/6plus/norating-default-l.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/norating-default-l.png
rename to data/styles/default/light/6plus/norating-default-l.png
diff --git a/data/styles/clear/style-clear/6plus/paid_road.png b/data/styles/default/light/6plus/paid_road.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/paid_road.png
rename to data/styles/default/light/6plus/paid_road.png
diff --git a/data/styles/clear/style-night/6plus/route-arrow.png b/data/styles/default/light/6plus/route-arrow.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/route-arrow.png
rename to data/styles/default/light/6plus/route-arrow.png
diff --git a/data/styles/clear/style-night/6plus/route-point-1.png b/data/styles/default/light/6plus/route-point-1.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/route-point-1.png
rename to data/styles/default/light/6plus/route-point-1.png
diff --git a/data/styles/clear/style-night/6plus/route-point-10.png b/data/styles/default/light/6plus/route-point-10.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/route-point-10.png
rename to data/styles/default/light/6plus/route-point-10.png
diff --git a/data/styles/clear/style-night/6plus/route-point-11.png b/data/styles/default/light/6plus/route-point-11.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/route-point-11.png
rename to data/styles/default/light/6plus/route-point-11.png
diff --git a/data/styles/clear/style-night/6plus/route-point-12.png b/data/styles/default/light/6plus/route-point-12.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/route-point-12.png
rename to data/styles/default/light/6plus/route-point-12.png
diff --git a/data/styles/clear/style-night/6plus/route-point-13.png b/data/styles/default/light/6plus/route-point-13.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/route-point-13.png
rename to data/styles/default/light/6plus/route-point-13.png
diff --git a/data/styles/clear/style-night/6plus/route-point-14.png b/data/styles/default/light/6plus/route-point-14.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/route-point-14.png
rename to data/styles/default/light/6plus/route-point-14.png
diff --git a/data/styles/clear/style-night/6plus/route-point-15.png b/data/styles/default/light/6plus/route-point-15.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/route-point-15.png
rename to data/styles/default/light/6plus/route-point-15.png
diff --git a/data/styles/clear/style-night/6plus/route-point-16.png b/data/styles/default/light/6plus/route-point-16.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/route-point-16.png
rename to data/styles/default/light/6plus/route-point-16.png
diff --git a/data/styles/clear/style-night/6plus/route-point-17.png b/data/styles/default/light/6plus/route-point-17.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/route-point-17.png
rename to data/styles/default/light/6plus/route-point-17.png
diff --git a/data/styles/clear/style-night/6plus/route-point-18.png b/data/styles/default/light/6plus/route-point-18.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/route-point-18.png
rename to data/styles/default/light/6plus/route-point-18.png
diff --git a/data/styles/clear/style-night/6plus/route-point-19.png b/data/styles/default/light/6plus/route-point-19.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/route-point-19.png
rename to data/styles/default/light/6plus/route-point-19.png
diff --git a/data/styles/clear/style-night/6plus/route-point-2.png b/data/styles/default/light/6plus/route-point-2.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/route-point-2.png
rename to data/styles/default/light/6plus/route-point-2.png
diff --git a/data/styles/clear/style-night/6plus/route-point-20.png b/data/styles/default/light/6plus/route-point-20.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/route-point-20.png
rename to data/styles/default/light/6plus/route-point-20.png
diff --git a/data/styles/clear/style-night/6plus/route-point-3.png b/data/styles/default/light/6plus/route-point-3.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/route-point-3.png
rename to data/styles/default/light/6plus/route-point-3.png
diff --git a/data/styles/clear/style-night/6plus/route-point-4.png b/data/styles/default/light/6plus/route-point-4.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/route-point-4.png
rename to data/styles/default/light/6plus/route-point-4.png
diff --git a/data/styles/clear/style-night/6plus/route-point-5.png b/data/styles/default/light/6plus/route-point-5.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/route-point-5.png
rename to data/styles/default/light/6plus/route-point-5.png
diff --git a/data/styles/clear/style-night/6plus/route-point-6.png b/data/styles/default/light/6plus/route-point-6.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/route-point-6.png
rename to data/styles/default/light/6plus/route-point-6.png
diff --git a/data/styles/clear/style-night/6plus/route-point-7.png b/data/styles/default/light/6plus/route-point-7.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/route-point-7.png
rename to data/styles/default/light/6plus/route-point-7.png
diff --git a/data/styles/clear/style-night/6plus/route-point-8.png b/data/styles/default/light/6plus/route-point-8.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/route-point-8.png
rename to data/styles/default/light/6plus/route-point-8.png
diff --git a/data/styles/clear/style-night/6plus/route-point-9.png b/data/styles/default/light/6plus/route-point-9.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/route-point-9.png
rename to data/styles/default/light/6plus/route-point-9.png
diff --git a/data/styles/clear/style-night/6plus/route-point-finish.png b/data/styles/default/light/6plus/route-point-finish.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/route-point-finish.png
rename to data/styles/default/light/6plus/route-point-finish.png
diff --git a/data/styles/clear/style-night/6plus/route-point-start.png b/data/styles/default/light/6plus/route-point-start.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/route-point-start.png
rename to data/styles/default/light/6plus/route-point-start.png
diff --git a/data/styles/clear/style-night/6plus/search-result-bakery.png b/data/styles/default/light/6plus/search-result-bakery.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-bakery.png
rename to data/styles/default/light/6plus/search-result-bakery.png
diff --git a/data/styles/clear/style-night/6plus/search-result-bar.png b/data/styles/default/light/6plus/search-result-bar.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-bar.png
rename to data/styles/default/light/6plus/search-result-bar.png
diff --git a/data/styles/clear/style-night/6plus/search-result-cafe.png b/data/styles/default/light/6plus/search-result-cafe.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-cafe.png
rename to data/styles/default/light/6plus/search-result-cafe.png
diff --git a/data/styles/clear/style-night/6plus/search-result-casino.png b/data/styles/default/light/6plus/search-result-casino.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-casino.png
rename to data/styles/default/light/6plus/search-result-casino.png
diff --git a/data/styles/clear/style-night/6plus/search-result-cinema.png b/data/styles/default/light/6plus/search-result-cinema.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-cinema.png
rename to data/styles/default/light/6plus/search-result-cinema.png
diff --git a/data/styles/clear/style-night/6plus/search-result-fastfood.png b/data/styles/default/light/6plus/search-result-fastfood.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-fastfood.png
rename to data/styles/default/light/6plus/search-result-fastfood.png
diff --git a/data/styles/clear/style-night/6plus/search-result-marketplace.png b/data/styles/default/light/6plus/search-result-marketplace.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-marketplace.png
rename to data/styles/default/light/6plus/search-result-marketplace.png
diff --git a/data/styles/clear/style-night/6plus/search-result-nightclub.png b/data/styles/default/light/6plus/search-result-nightclub.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-nightclub.png
rename to data/styles/default/light/6plus/search-result-nightclub.png
diff --git a/data/styles/clear/style-night/6plus/search-result-playground.png b/data/styles/default/light/6plus/search-result-playground.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-playground.png
rename to data/styles/default/light/6plus/search-result-playground.png
diff --git a/data/styles/clear/style-night/6plus/search-result-pub.png b/data/styles/default/light/6plus/search-result-pub.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-pub.png
rename to data/styles/default/light/6plus/search-result-pub.png
diff --git a/data/styles/clear/style-night/6plus/search-result-restaurant.png b/data/styles/default/light/6plus/search-result-restaurant.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-restaurant.png
rename to data/styles/default/light/6plus/search-result-restaurant.png
diff --git a/data/styles/clear/style-night/6plus/search-result-shop-alcohol.png b/data/styles/default/light/6plus/search-result-shop-alcohol.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-shop-alcohol.png
rename to data/styles/default/light/6plus/search-result-shop-alcohol.png
diff --git a/data/styles/clear/style-night/6plus/search-result-shop-butcher.png b/data/styles/default/light/6plus/search-result-shop-butcher.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-shop-butcher.png
rename to data/styles/default/light/6plus/search-result-shop-butcher.png
diff --git a/data/styles/clear/style-night/6plus/search-result-shop-clothes.png b/data/styles/default/light/6plus/search-result-shop-clothes.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-shop-clothes.png
rename to data/styles/default/light/6plus/search-result-shop-clothes.png
diff --git a/data/styles/clear/style-night/6plus/search-result-shop-confectionery.png b/data/styles/default/light/6plus/search-result-shop-confectionery.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-shop-confectionery.png
rename to data/styles/default/light/6plus/search-result-shop-confectionery.png
diff --git a/data/styles/clear/style-night/6plus/search-result-shop-convenience.png b/data/styles/default/light/6plus/search-result-shop-convenience.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-shop-convenience.png
rename to data/styles/default/light/6plus/search-result-shop-convenience.png
diff --git a/data/styles/clear/style-night/6plus/search-result-shop-cosmetics.png b/data/styles/default/light/6plus/search-result-shop-cosmetics.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-shop-cosmetics.png
rename to data/styles/default/light/6plus/search-result-shop-cosmetics.png
diff --git a/data/styles/clear/style-night/6plus/search-result-shop-department_store.png b/data/styles/default/light/6plus/search-result-shop-department_store.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-shop-department_store.png
rename to data/styles/default/light/6plus/search-result-shop-department_store.png
diff --git a/data/styles/clear/style-night/6plus/search-result-shop-gift.png b/data/styles/default/light/6plus/search-result-shop-gift.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-shop-gift.png
rename to data/styles/default/light/6plus/search-result-shop-gift.png
diff --git a/data/styles/clear/style-night/6plus/search-result-shop-greengrocer.png b/data/styles/default/light/6plus/search-result-shop-greengrocer.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-shop-greengrocer.png
rename to data/styles/default/light/6plus/search-result-shop-greengrocer.png
diff --git a/data/styles/clear/style-night/6plus/search-result-shop-jewelry.png b/data/styles/default/light/6plus/search-result-shop-jewelry.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-shop-jewelry.png
rename to data/styles/default/light/6plus/search-result-shop-jewelry.png
diff --git a/data/styles/clear/style-night/6plus/search-result-shop-mall.png b/data/styles/default/light/6plus/search-result-shop-mall.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-shop-mall.png
rename to data/styles/default/light/6plus/search-result-shop-mall.png
diff --git a/data/styles/clear/style-night/6plus/search-result-shop-seafood.png b/data/styles/default/light/6plus/search-result-shop-seafood.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-shop-seafood.png
rename to data/styles/default/light/6plus/search-result-shop-seafood.png
diff --git a/data/styles/clear/style-night/6plus/search-result-shop-shoes.png b/data/styles/default/light/6plus/search-result-shop-shoes.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-shop-shoes.png
rename to data/styles/default/light/6plus/search-result-shop-shoes.png
diff --git a/data/styles/clear/style-night/6plus/search-result-shop-sports.png b/data/styles/default/light/6plus/search-result-shop-sports.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-shop-sports.png
rename to data/styles/default/light/6plus/search-result-shop-sports.png
diff --git a/data/styles/clear/style-night/6plus/search-result-shop-supermarket.png b/data/styles/default/light/6plus/search-result-shop-supermarket.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-shop-supermarket.png
rename to data/styles/default/light/6plus/search-result-shop-supermarket.png
diff --git a/data/styles/clear/style-night/6plus/search-result-shop-toys.png b/data/styles/default/light/6plus/search-result-shop-toys.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-shop-toys.png
rename to data/styles/default/light/6plus/search-result-shop-toys.png
diff --git a/data/styles/clear/style-night/6plus/search-result-theme-park.png b/data/styles/default/light/6plus/search-result-theme-park.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-theme-park.png
rename to data/styles/default/light/6plus/search-result-theme-park.png
diff --git a/data/styles/clear/style-night/6plus/search-result-water-park.png b/data/styles/default/light/6plus/search-result-water-park.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-water-park.png
rename to data/styles/default/light/6plus/search-result-water-park.png
diff --git a/data/styles/clear/style-night/6plus/search-result-zoo.png b/data/styles/default/light/6plus/search-result-zoo.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/search-result-zoo.png
rename to data/styles/default/light/6plus/search-result-zoo.png
diff --git a/data/styles/clear/style-clear/6plus/search-result.png b/data/styles/default/light/6plus/search-result.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/search-result.png
rename to data/styles/default/light/6plus/search-result.png
diff --git a/data/styles/clear/style-clear/6plus/shield-us-hw-thin-scaled.png b/data/styles/default/light/6plus/shield-us-hw-thin-scaled.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/shield-us-hw-thin-scaled.png
rename to data/styles/default/light/6plus/shield-us-hw-thin-scaled.png
diff --git a/data/styles/clear/style-clear/6plus/shield-us-hw-thin.png b/data/styles/default/light/6plus/shield-us-hw-thin.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/shield-us-hw-thin.png
rename to data/styles/default/light/6plus/shield-us-hw-thin.png
diff --git a/data/styles/clear/style-clear/6plus/shield-us-hw-wide-scaled.png b/data/styles/default/light/6plus/shield-us-hw-wide-scaled.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/shield-us-hw-wide-scaled.png
rename to data/styles/default/light/6plus/shield-us-hw-wide-scaled.png
diff --git a/data/styles/clear/style-clear/6plus/shield-us-hw-wide.png b/data/styles/default/light/6plus/shield-us-hw-wide.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/shield-us-hw-wide.png
rename to data/styles/default/light/6plus/shield-us-hw-wide.png
diff --git a/data/styles/clear/style-night/6plus/shield-us-i-thin-scaled.png b/data/styles/default/light/6plus/shield-us-i-thin-scaled.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/shield-us-i-thin-scaled.png
rename to data/styles/default/light/6plus/shield-us-i-thin-scaled.png
diff --git a/data/styles/clear/style-night/6plus/shield-us-i-thin.png b/data/styles/default/light/6plus/shield-us-i-thin.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/shield-us-i-thin.png
rename to data/styles/default/light/6plus/shield-us-i-thin.png
diff --git a/data/styles/clear/style-night/6plus/shield-us-i-wide-scaled.png b/data/styles/default/light/6plus/shield-us-i-wide-scaled.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/shield-us-i-wide-scaled.png
rename to data/styles/default/light/6plus/shield-us-i-wide-scaled.png
diff --git a/data/styles/clear/style-night/6plus/shield-us-i-wide.png b/data/styles/default/light/6plus/shield-us-i-wide.png
similarity index 100%
rename from data/styles/clear/style-night/6plus/shield-us-i-wide.png
rename to data/styles/default/light/6plus/shield-us-i-wide.png
diff --git a/data/styles/clear/style-clear/6plus/track_marker_deselected.png b/data/styles/default/light/6plus/track_marker_deselected.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/track_marker_deselected.png
rename to data/styles/default/light/6plus/track_marker_deselected.png
diff --git a/data/styles/clear/style-clear/6plus/track_marker_selected.png b/data/styles/default/light/6plus/track_marker_selected.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/track_marker_selected.png
rename to data/styles/default/light/6plus/track_marker_selected.png
diff --git a/data/styles/clear/style-clear/6plus/unpaved_road.png b/data/styles/default/light/6plus/unpaved_road.png
similarity index 100%
rename from data/styles/clear/style-clear/6plus/unpaved_road.png
rename to data/styles/default/light/6plus/unpaved_road.png
diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/default/light/colors.mapcss
similarity index 100%
rename from data/styles/clear/style-clear/colors.mapcss
rename to data/styles/default/light/colors.mapcss
diff --git a/data/styles/clear/style-night/hdpi-ad/keep.png b/data/styles/default/light/hdpi-ad/keep.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi-ad/keep.png
rename to data/styles/default/light/hdpi-ad/keep.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-animals-m.png b/data/styles/default/light/hdpi/bookmark-animals-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-animals-m.png
rename to data/styles/default/light/hdpi/bookmark-animals-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-bar-m.png b/data/styles/default/light/hdpi/bookmark-bar-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-bar-m.png
rename to data/styles/default/light/hdpi/bookmark-bar-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-bg-m.png b/data/styles/default/light/hdpi/bookmark-bg-m.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-bg-m.png
rename to data/styles/default/light/hdpi/bookmark-bg-m.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-bg-s.png b/data/styles/default/light/hdpi/bookmark-bg-s.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-bg-s.png
rename to data/styles/default/light/hdpi/bookmark-bg-s.png
diff --git a/data/styles/clear/style-night/hdpi/bookmark-bg-xs.png b/data/styles/default/light/hdpi/bookmark-bg-xs.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/bookmark-bg-xs.png
rename to data/styles/default/light/hdpi/bookmark-bg-xs.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-buddhism-m.png b/data/styles/default/light/hdpi/bookmark-buddhism-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-buddhism-m.png
rename to data/styles/default/light/hdpi/bookmark-buddhism-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-building-m.png b/data/styles/default/light/hdpi/bookmark-building-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-building-m.png
rename to data/styles/default/light/hdpi/bookmark-building-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-christianity-m.png b/data/styles/default/light/hdpi/bookmark-christianity-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-christianity-m.png
rename to data/styles/default/light/hdpi/bookmark-christianity-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-default-m.png b/data/styles/default/light/hdpi/bookmark-default-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-default-m.png
rename to data/styles/default/light/hdpi/bookmark-default-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-default-s.png b/data/styles/default/light/hdpi/bookmark-default-s.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-default-s.png
rename to data/styles/default/light/hdpi/bookmark-default-s.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-default-xs.png b/data/styles/default/light/hdpi/bookmark-default-xs.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-default-xs.png
rename to data/styles/default/light/hdpi/bookmark-default-xs.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-entertainment-m.png b/data/styles/default/light/hdpi/bookmark-entertainment-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-entertainment-m.png
rename to data/styles/default/light/hdpi/bookmark-entertainment-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-exchange-m.png b/data/styles/default/light/hdpi/bookmark-exchange-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-exchange-m.png
rename to data/styles/default/light/hdpi/bookmark-exchange-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-finish-m.png b/data/styles/default/light/hdpi/bookmark-finish-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-finish-m.png
rename to data/styles/default/light/hdpi/bookmark-finish-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-food-m.png b/data/styles/default/light/hdpi/bookmark-food-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-food-m.png
rename to data/styles/default/light/hdpi/bookmark-food-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-gas-m.png b/data/styles/default/light/hdpi/bookmark-gas-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-gas-m.png
rename to data/styles/default/light/hdpi/bookmark-gas-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-hotel-m.png b/data/styles/default/light/hdpi/bookmark-hotel-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-hotel-m.png
rename to data/styles/default/light/hdpi/bookmark-hotel-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-islam-m.png b/data/styles/default/light/hdpi/bookmark-islam-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-islam-m.png
rename to data/styles/default/light/hdpi/bookmark-islam-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-judaism-m.png b/data/styles/default/light/hdpi/bookmark-judaism-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-judaism-m.png
rename to data/styles/default/light/hdpi/bookmark-judaism-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-medicine-m.png b/data/styles/default/light/hdpi/bookmark-medicine-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-medicine-m.png
rename to data/styles/default/light/hdpi/bookmark-medicine-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-mountain-m.png b/data/styles/default/light/hdpi/bookmark-mountain-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-mountain-m.png
rename to data/styles/default/light/hdpi/bookmark-mountain-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-museum-m.png b/data/styles/default/light/hdpi/bookmark-museum-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-museum-m.png
rename to data/styles/default/light/hdpi/bookmark-museum-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-park-m.png b/data/styles/default/light/hdpi/bookmark-park-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-park-m.png
rename to data/styles/default/light/hdpi/bookmark-park-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-parking-m.png b/data/styles/default/light/hdpi/bookmark-parking-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-parking-m.png
rename to data/styles/default/light/hdpi/bookmark-parking-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-shop-m.png b/data/styles/default/light/hdpi/bookmark-shop-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-shop-m.png
rename to data/styles/default/light/hdpi/bookmark-shop-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-sights-m.png b/data/styles/default/light/hdpi/bookmark-sights-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-sights-m.png
rename to data/styles/default/light/hdpi/bookmark-sights-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-sport-m.png b/data/styles/default/light/hdpi/bookmark-sport-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-sport-m.png
rename to data/styles/default/light/hdpi/bookmark-sport-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-start-m.png b/data/styles/default/light/hdpi/bookmark-start-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-start-m.png
rename to data/styles/default/light/hdpi/bookmark-start-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-swim-m.png b/data/styles/default/light/hdpi/bookmark-swim-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-swim-m.png
rename to data/styles/default/light/hdpi/bookmark-swim-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-transport-m.png b/data/styles/default/light/hdpi/bookmark-transport-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-transport-m.png
rename to data/styles/default/light/hdpi/bookmark-transport-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-viewpoint-m.png b/data/styles/default/light/hdpi/bookmark-viewpoint-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-viewpoint-m.png
rename to data/styles/default/light/hdpi/bookmark-viewpoint-m.png
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-water-m.png b/data/styles/default/light/hdpi/bookmark-water-m.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/bookmark-water-m.png
rename to data/styles/default/light/hdpi/bookmark-water-m.png
diff --git a/data/styles/clear/style-night/hdpi/coloredmark-bg-l.png b/data/styles/default/light/hdpi/coloredmark-bg-l.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/coloredmark-bg-l.png
rename to data/styles/default/light/hdpi/coloredmark-bg-l.png
diff --git a/data/styles/clear/style-night/hdpi/coloredmark-bg-s.png b/data/styles/default/light/hdpi/coloredmark-bg-s.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/coloredmark-bg-s.png
rename to data/styles/default/light/hdpi/coloredmark-bg-s.png
diff --git a/data/styles/clear/style-clear/hdpi/coloredmark-default-l.png b/data/styles/default/light/hdpi/coloredmark-default-l.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/coloredmark-default-l.png
rename to data/styles/default/light/hdpi/coloredmark-default-l.png
diff --git a/data/styles/clear/style-night/hdpi/coloredmark-default-s.png b/data/styles/default/light/hdpi/coloredmark-default-s.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/coloredmark-default-s.png
rename to data/styles/default/light/hdpi/coloredmark-default-s.png
diff --git a/data/styles/clear/style-clear/hdpi/compass-image.png b/data/styles/default/light/hdpi/compass-image.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/compass-image.png
rename to data/styles/default/light/hdpi/compass-image.png
diff --git a/data/styles/clear/style-clear/hdpi/cross_geoposition.png b/data/styles/default/light/hdpi/cross_geoposition.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/cross_geoposition.png
rename to data/styles/default/light/hdpi/cross_geoposition.png
diff --git a/data/styles/clear/style-clear/hdpi/current-position.png b/data/styles/default/light/hdpi/current-position.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/current-position.png
rename to data/styles/default/light/hdpi/current-position.png
diff --git a/data/styles/clear/style-clear/hdpi/ferry.png b/data/styles/default/light/hdpi/ferry.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/ferry.png
rename to data/styles/default/light/hdpi/ferry.png
diff --git a/data/styles/clear/style-clear/hdpi/infosign.png b/data/styles/default/light/hdpi/infosign.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/infosign.png
rename to data/styles/default/light/hdpi/infosign.png
diff --git a/data/styles/clear/style-night/hdpi/non-found-search-result.png b/data/styles/default/light/hdpi/non-found-search-result.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/non-found-search-result.png
rename to data/styles/default/light/hdpi/non-found-search-result.png
diff --git a/data/styles/clear/style-night/hdpi/norating-bg-l.png b/data/styles/default/light/hdpi/norating-bg-l.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/norating-bg-l.png
rename to data/styles/default/light/hdpi/norating-bg-l.png
diff --git a/data/styles/clear/style-night/hdpi/norating-default-l.png b/data/styles/default/light/hdpi/norating-default-l.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/norating-default-l.png
rename to data/styles/default/light/hdpi/norating-default-l.png
diff --git a/data/styles/clear/style-clear/hdpi/paid_road.png b/data/styles/default/light/hdpi/paid_road.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/paid_road.png
rename to data/styles/default/light/hdpi/paid_road.png
diff --git a/data/styles/clear/style-night/hdpi/route-arrow.png b/data/styles/default/light/hdpi/route-arrow.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/route-arrow.png
rename to data/styles/default/light/hdpi/route-arrow.png
diff --git a/data/styles/clear/style-night/hdpi/route-point-1.png b/data/styles/default/light/hdpi/route-point-1.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/route-point-1.png
rename to data/styles/default/light/hdpi/route-point-1.png
diff --git a/data/styles/clear/style-night/hdpi/route-point-10.png b/data/styles/default/light/hdpi/route-point-10.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/route-point-10.png
rename to data/styles/default/light/hdpi/route-point-10.png
diff --git a/data/styles/clear/style-night/hdpi/route-point-11.png b/data/styles/default/light/hdpi/route-point-11.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/route-point-11.png
rename to data/styles/default/light/hdpi/route-point-11.png
diff --git a/data/styles/clear/style-night/hdpi/route-point-12.png b/data/styles/default/light/hdpi/route-point-12.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/route-point-12.png
rename to data/styles/default/light/hdpi/route-point-12.png
diff --git a/data/styles/clear/style-night/hdpi/route-point-13.png b/data/styles/default/light/hdpi/route-point-13.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/route-point-13.png
rename to data/styles/default/light/hdpi/route-point-13.png
diff --git a/data/styles/clear/style-night/hdpi/route-point-14.png b/data/styles/default/light/hdpi/route-point-14.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/route-point-14.png
rename to data/styles/default/light/hdpi/route-point-14.png
diff --git a/data/styles/clear/style-night/hdpi/route-point-15.png b/data/styles/default/light/hdpi/route-point-15.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/route-point-15.png
rename to data/styles/default/light/hdpi/route-point-15.png
diff --git a/data/styles/clear/style-night/hdpi/route-point-16.png b/data/styles/default/light/hdpi/route-point-16.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/route-point-16.png
rename to data/styles/default/light/hdpi/route-point-16.png
diff --git a/data/styles/clear/style-night/hdpi/route-point-17.png b/data/styles/default/light/hdpi/route-point-17.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/route-point-17.png
rename to data/styles/default/light/hdpi/route-point-17.png
diff --git a/data/styles/clear/style-night/hdpi/route-point-18.png b/data/styles/default/light/hdpi/route-point-18.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/route-point-18.png
rename to data/styles/default/light/hdpi/route-point-18.png
diff --git a/data/styles/clear/style-night/hdpi/route-point-19.png b/data/styles/default/light/hdpi/route-point-19.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/route-point-19.png
rename to data/styles/default/light/hdpi/route-point-19.png
diff --git a/data/styles/clear/style-night/hdpi/route-point-2.png b/data/styles/default/light/hdpi/route-point-2.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/route-point-2.png
rename to data/styles/default/light/hdpi/route-point-2.png
diff --git a/data/styles/clear/style-night/hdpi/route-point-20.png b/data/styles/default/light/hdpi/route-point-20.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/route-point-20.png
rename to data/styles/default/light/hdpi/route-point-20.png
diff --git a/data/styles/clear/style-night/hdpi/route-point-3.png b/data/styles/default/light/hdpi/route-point-3.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/route-point-3.png
rename to data/styles/default/light/hdpi/route-point-3.png
diff --git a/data/styles/clear/style-night/hdpi/route-point-4.png b/data/styles/default/light/hdpi/route-point-4.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/route-point-4.png
rename to data/styles/default/light/hdpi/route-point-4.png
diff --git a/data/styles/clear/style-night/hdpi/route-point-5.png b/data/styles/default/light/hdpi/route-point-5.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/route-point-5.png
rename to data/styles/default/light/hdpi/route-point-5.png
diff --git a/data/styles/clear/style-night/hdpi/route-point-6.png b/data/styles/default/light/hdpi/route-point-6.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/route-point-6.png
rename to data/styles/default/light/hdpi/route-point-6.png
diff --git a/data/styles/clear/style-night/hdpi/route-point-7.png b/data/styles/default/light/hdpi/route-point-7.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/route-point-7.png
rename to data/styles/default/light/hdpi/route-point-7.png
diff --git a/data/styles/clear/style-night/hdpi/route-point-8.png b/data/styles/default/light/hdpi/route-point-8.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/route-point-8.png
rename to data/styles/default/light/hdpi/route-point-8.png
diff --git a/data/styles/clear/style-night/hdpi/route-point-9.png b/data/styles/default/light/hdpi/route-point-9.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/route-point-9.png
rename to data/styles/default/light/hdpi/route-point-9.png
diff --git a/data/styles/clear/style-night/hdpi/route-point-finish.png b/data/styles/default/light/hdpi/route-point-finish.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/route-point-finish.png
rename to data/styles/default/light/hdpi/route-point-finish.png
diff --git a/data/styles/clear/style-night/hdpi/route-point-start.png b/data/styles/default/light/hdpi/route-point-start.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/route-point-start.png
rename to data/styles/default/light/hdpi/route-point-start.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-bakery.png b/data/styles/default/light/hdpi/search-result-bakery.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-bakery.png
rename to data/styles/default/light/hdpi/search-result-bakery.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-bar.png b/data/styles/default/light/hdpi/search-result-bar.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-bar.png
rename to data/styles/default/light/hdpi/search-result-bar.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-cafe.png b/data/styles/default/light/hdpi/search-result-cafe.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-cafe.png
rename to data/styles/default/light/hdpi/search-result-cafe.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-casino.png b/data/styles/default/light/hdpi/search-result-casino.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-casino.png
rename to data/styles/default/light/hdpi/search-result-casino.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-cinema.png b/data/styles/default/light/hdpi/search-result-cinema.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-cinema.png
rename to data/styles/default/light/hdpi/search-result-cinema.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-fastfood.png b/data/styles/default/light/hdpi/search-result-fastfood.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-fastfood.png
rename to data/styles/default/light/hdpi/search-result-fastfood.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-marketplace.png b/data/styles/default/light/hdpi/search-result-marketplace.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-marketplace.png
rename to data/styles/default/light/hdpi/search-result-marketplace.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-nightclub.png b/data/styles/default/light/hdpi/search-result-nightclub.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-nightclub.png
rename to data/styles/default/light/hdpi/search-result-nightclub.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-playground.png b/data/styles/default/light/hdpi/search-result-playground.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-playground.png
rename to data/styles/default/light/hdpi/search-result-playground.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-pub.png b/data/styles/default/light/hdpi/search-result-pub.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-pub.png
rename to data/styles/default/light/hdpi/search-result-pub.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-restaurant.png b/data/styles/default/light/hdpi/search-result-restaurant.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-restaurant.png
rename to data/styles/default/light/hdpi/search-result-restaurant.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-shop-alcohol.png b/data/styles/default/light/hdpi/search-result-shop-alcohol.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-shop-alcohol.png
rename to data/styles/default/light/hdpi/search-result-shop-alcohol.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-shop-butcher.png b/data/styles/default/light/hdpi/search-result-shop-butcher.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-shop-butcher.png
rename to data/styles/default/light/hdpi/search-result-shop-butcher.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-shop-clothes.png b/data/styles/default/light/hdpi/search-result-shop-clothes.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-shop-clothes.png
rename to data/styles/default/light/hdpi/search-result-shop-clothes.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-shop-confectionery.png b/data/styles/default/light/hdpi/search-result-shop-confectionery.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-shop-confectionery.png
rename to data/styles/default/light/hdpi/search-result-shop-confectionery.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-shop-convenience.png b/data/styles/default/light/hdpi/search-result-shop-convenience.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-shop-convenience.png
rename to data/styles/default/light/hdpi/search-result-shop-convenience.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-shop-cosmetics.png b/data/styles/default/light/hdpi/search-result-shop-cosmetics.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-shop-cosmetics.png
rename to data/styles/default/light/hdpi/search-result-shop-cosmetics.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-shop-department_store.png b/data/styles/default/light/hdpi/search-result-shop-department_store.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-shop-department_store.png
rename to data/styles/default/light/hdpi/search-result-shop-department_store.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-shop-gift.png b/data/styles/default/light/hdpi/search-result-shop-gift.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-shop-gift.png
rename to data/styles/default/light/hdpi/search-result-shop-gift.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-shop-greengrocer.png b/data/styles/default/light/hdpi/search-result-shop-greengrocer.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-shop-greengrocer.png
rename to data/styles/default/light/hdpi/search-result-shop-greengrocer.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-shop-jewelry.png b/data/styles/default/light/hdpi/search-result-shop-jewelry.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-shop-jewelry.png
rename to data/styles/default/light/hdpi/search-result-shop-jewelry.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-shop-mall.png b/data/styles/default/light/hdpi/search-result-shop-mall.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-shop-mall.png
rename to data/styles/default/light/hdpi/search-result-shop-mall.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-shop-seafood.png b/data/styles/default/light/hdpi/search-result-shop-seafood.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-shop-seafood.png
rename to data/styles/default/light/hdpi/search-result-shop-seafood.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-shop-shoes.png b/data/styles/default/light/hdpi/search-result-shop-shoes.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-shop-shoes.png
rename to data/styles/default/light/hdpi/search-result-shop-shoes.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-shop-sports.png b/data/styles/default/light/hdpi/search-result-shop-sports.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-shop-sports.png
rename to data/styles/default/light/hdpi/search-result-shop-sports.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-shop-supermarket.png b/data/styles/default/light/hdpi/search-result-shop-supermarket.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-shop-supermarket.png
rename to data/styles/default/light/hdpi/search-result-shop-supermarket.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-shop-toys.png b/data/styles/default/light/hdpi/search-result-shop-toys.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-shop-toys.png
rename to data/styles/default/light/hdpi/search-result-shop-toys.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-theme-park.png b/data/styles/default/light/hdpi/search-result-theme-park.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-theme-park.png
rename to data/styles/default/light/hdpi/search-result-theme-park.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-water-park.png b/data/styles/default/light/hdpi/search-result-water-park.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-water-park.png
rename to data/styles/default/light/hdpi/search-result-water-park.png
diff --git a/data/styles/clear/style-night/hdpi/search-result-zoo.png b/data/styles/default/light/hdpi/search-result-zoo.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/search-result-zoo.png
rename to data/styles/default/light/hdpi/search-result-zoo.png
diff --git a/data/styles/clear/style-clear/hdpi/search-result.png b/data/styles/default/light/hdpi/search-result.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/search-result.png
rename to data/styles/default/light/hdpi/search-result.png
diff --git a/data/styles/clear/style-night/hdpi/shield-us-hw-thin-scaled.png b/data/styles/default/light/hdpi/shield-us-hw-thin-scaled.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/shield-us-hw-thin-scaled.png
rename to data/styles/default/light/hdpi/shield-us-hw-thin-scaled.png
diff --git a/data/styles/clear/style-night/hdpi/shield-us-hw-thin.png b/data/styles/default/light/hdpi/shield-us-hw-thin.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/shield-us-hw-thin.png
rename to data/styles/default/light/hdpi/shield-us-hw-thin.png
diff --git a/data/styles/clear/style-night/hdpi/shield-us-hw-wide-scaled.png b/data/styles/default/light/hdpi/shield-us-hw-wide-scaled.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/shield-us-hw-wide-scaled.png
rename to data/styles/default/light/hdpi/shield-us-hw-wide-scaled.png
diff --git a/data/styles/clear/style-night/hdpi/shield-us-hw-wide.png b/data/styles/default/light/hdpi/shield-us-hw-wide.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/shield-us-hw-wide.png
rename to data/styles/default/light/hdpi/shield-us-hw-wide.png
diff --git a/data/styles/clear/style-night/hdpi/shield-us-i-thin-scaled.png b/data/styles/default/light/hdpi/shield-us-i-thin-scaled.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/shield-us-i-thin-scaled.png
rename to data/styles/default/light/hdpi/shield-us-i-thin-scaled.png
diff --git a/data/styles/clear/style-night/hdpi/shield-us-i-thin.png b/data/styles/default/light/hdpi/shield-us-i-thin.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/shield-us-i-thin.png
rename to data/styles/default/light/hdpi/shield-us-i-thin.png
diff --git a/data/styles/clear/style-night/hdpi/shield-us-i-wide-scaled.png b/data/styles/default/light/hdpi/shield-us-i-wide-scaled.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/shield-us-i-wide-scaled.png
rename to data/styles/default/light/hdpi/shield-us-i-wide-scaled.png
diff --git a/data/styles/clear/style-night/hdpi/shield-us-i-wide.png b/data/styles/default/light/hdpi/shield-us-i-wide.png
similarity index 100%
rename from data/styles/clear/style-night/hdpi/shield-us-i-wide.png
rename to data/styles/default/light/hdpi/shield-us-i-wide.png
diff --git a/data/styles/clear/style-clear/hdpi/track_marker_deselected.png b/data/styles/default/light/hdpi/track_marker_deselected.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/track_marker_deselected.png
rename to data/styles/default/light/hdpi/track_marker_deselected.png
diff --git a/data/styles/clear/style-clear/hdpi/track_marker_selected.png b/data/styles/default/light/hdpi/track_marker_selected.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/track_marker_selected.png
rename to data/styles/default/light/hdpi/track_marker_selected.png
diff --git a/data/styles/clear/style-clear/hdpi/unpaved_road.png b/data/styles/default/light/hdpi/unpaved_road.png
similarity index 100%
rename from data/styles/clear/style-clear/hdpi/unpaved_road.png
rename to data/styles/default/light/hdpi/unpaved_road.png
diff --git a/data/styles/clear/style-night/mdpi-ad/keep.png b/data/styles/default/light/mdpi-ad/keep.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi-ad/keep.png
rename to data/styles/default/light/mdpi-ad/keep.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-animals-m.png b/data/styles/default/light/mdpi/bookmark-animals-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-animals-m.png
rename to data/styles/default/light/mdpi/bookmark-animals-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-bar-m.png b/data/styles/default/light/mdpi/bookmark-bar-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-bar-m.png
rename to data/styles/default/light/mdpi/bookmark-bar-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-bg-m.png b/data/styles/default/light/mdpi/bookmark-bg-m.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-bg-m.png
rename to data/styles/default/light/mdpi/bookmark-bg-m.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-bg-s.png b/data/styles/default/light/mdpi/bookmark-bg-s.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-bg-s.png
rename to data/styles/default/light/mdpi/bookmark-bg-s.png
diff --git a/data/styles/clear/style-night/mdpi/bookmark-bg-xs.png b/data/styles/default/light/mdpi/bookmark-bg-xs.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/bookmark-bg-xs.png
rename to data/styles/default/light/mdpi/bookmark-bg-xs.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-buddhism-m.png b/data/styles/default/light/mdpi/bookmark-buddhism-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-buddhism-m.png
rename to data/styles/default/light/mdpi/bookmark-buddhism-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-building-m.png b/data/styles/default/light/mdpi/bookmark-building-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-building-m.png
rename to data/styles/default/light/mdpi/bookmark-building-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-christianity-m.png b/data/styles/default/light/mdpi/bookmark-christianity-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-christianity-m.png
rename to data/styles/default/light/mdpi/bookmark-christianity-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-default-m.png b/data/styles/default/light/mdpi/bookmark-default-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-default-m.png
rename to data/styles/default/light/mdpi/bookmark-default-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-default-s.png b/data/styles/default/light/mdpi/bookmark-default-s.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-default-s.png
rename to data/styles/default/light/mdpi/bookmark-default-s.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-default-xs.png b/data/styles/default/light/mdpi/bookmark-default-xs.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-default-xs.png
rename to data/styles/default/light/mdpi/bookmark-default-xs.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-entertainment-m.png b/data/styles/default/light/mdpi/bookmark-entertainment-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-entertainment-m.png
rename to data/styles/default/light/mdpi/bookmark-entertainment-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-exchange-m.png b/data/styles/default/light/mdpi/bookmark-exchange-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-exchange-m.png
rename to data/styles/default/light/mdpi/bookmark-exchange-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-finish-m.png b/data/styles/default/light/mdpi/bookmark-finish-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-finish-m.png
rename to data/styles/default/light/mdpi/bookmark-finish-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-food-m.png b/data/styles/default/light/mdpi/bookmark-food-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-food-m.png
rename to data/styles/default/light/mdpi/bookmark-food-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-gas-m.png b/data/styles/default/light/mdpi/bookmark-gas-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-gas-m.png
rename to data/styles/default/light/mdpi/bookmark-gas-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-hotel-m.png b/data/styles/default/light/mdpi/bookmark-hotel-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-hotel-m.png
rename to data/styles/default/light/mdpi/bookmark-hotel-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-islam-m.png b/data/styles/default/light/mdpi/bookmark-islam-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-islam-m.png
rename to data/styles/default/light/mdpi/bookmark-islam-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-judaism-m.png b/data/styles/default/light/mdpi/bookmark-judaism-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-judaism-m.png
rename to data/styles/default/light/mdpi/bookmark-judaism-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-medicine-m.png b/data/styles/default/light/mdpi/bookmark-medicine-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-medicine-m.png
rename to data/styles/default/light/mdpi/bookmark-medicine-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-mountain-m.png b/data/styles/default/light/mdpi/bookmark-mountain-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-mountain-m.png
rename to data/styles/default/light/mdpi/bookmark-mountain-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-museum-m.png b/data/styles/default/light/mdpi/bookmark-museum-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-museum-m.png
rename to data/styles/default/light/mdpi/bookmark-museum-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-park-m.png b/data/styles/default/light/mdpi/bookmark-park-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-park-m.png
rename to data/styles/default/light/mdpi/bookmark-park-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-parking-m.png b/data/styles/default/light/mdpi/bookmark-parking-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-parking-m.png
rename to data/styles/default/light/mdpi/bookmark-parking-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-shop-m.png b/data/styles/default/light/mdpi/bookmark-shop-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-shop-m.png
rename to data/styles/default/light/mdpi/bookmark-shop-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-sights-m.png b/data/styles/default/light/mdpi/bookmark-sights-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-sights-m.png
rename to data/styles/default/light/mdpi/bookmark-sights-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-sport-m.png b/data/styles/default/light/mdpi/bookmark-sport-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-sport-m.png
rename to data/styles/default/light/mdpi/bookmark-sport-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-start-m.png b/data/styles/default/light/mdpi/bookmark-start-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-start-m.png
rename to data/styles/default/light/mdpi/bookmark-start-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-swim-m.png b/data/styles/default/light/mdpi/bookmark-swim-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-swim-m.png
rename to data/styles/default/light/mdpi/bookmark-swim-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-transport-m.png b/data/styles/default/light/mdpi/bookmark-transport-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-transport-m.png
rename to data/styles/default/light/mdpi/bookmark-transport-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-viewpoint-m.png b/data/styles/default/light/mdpi/bookmark-viewpoint-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-viewpoint-m.png
rename to data/styles/default/light/mdpi/bookmark-viewpoint-m.png
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-water-m.png b/data/styles/default/light/mdpi/bookmark-water-m.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/bookmark-water-m.png
rename to data/styles/default/light/mdpi/bookmark-water-m.png
diff --git a/data/styles/clear/style-night/mdpi/coloredmark-bg-l.png b/data/styles/default/light/mdpi/coloredmark-bg-l.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/coloredmark-bg-l.png
rename to data/styles/default/light/mdpi/coloredmark-bg-l.png
diff --git a/data/styles/clear/style-night/mdpi/coloredmark-bg-s.png b/data/styles/default/light/mdpi/coloredmark-bg-s.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/coloredmark-bg-s.png
rename to data/styles/default/light/mdpi/coloredmark-bg-s.png
diff --git a/data/styles/clear/style-clear/mdpi/coloredmark-default-l.png b/data/styles/default/light/mdpi/coloredmark-default-l.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/coloredmark-default-l.png
rename to data/styles/default/light/mdpi/coloredmark-default-l.png
diff --git a/data/styles/clear/style-night/mdpi/coloredmark-default-s.png b/data/styles/default/light/mdpi/coloredmark-default-s.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/coloredmark-default-s.png
rename to data/styles/default/light/mdpi/coloredmark-default-s.png
diff --git a/data/styles/clear/style-clear/mdpi/compass-image.png b/data/styles/default/light/mdpi/compass-image.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/compass-image.png
rename to data/styles/default/light/mdpi/compass-image.png
diff --git a/data/styles/clear/style-clear/mdpi/cross_geoposition.png b/data/styles/default/light/mdpi/cross_geoposition.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/cross_geoposition.png
rename to data/styles/default/light/mdpi/cross_geoposition.png
diff --git a/data/styles/clear/style-clear/mdpi/current-position.png b/data/styles/default/light/mdpi/current-position.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/current-position.png
rename to data/styles/default/light/mdpi/current-position.png
diff --git a/data/styles/clear/style-clear/mdpi/ferry.png b/data/styles/default/light/mdpi/ferry.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/ferry.png
rename to data/styles/default/light/mdpi/ferry.png
diff --git a/data/styles/clear/style-clear/mdpi/infosign.png b/data/styles/default/light/mdpi/infosign.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/infosign.png
rename to data/styles/default/light/mdpi/infosign.png
diff --git a/data/styles/clear/style-night/mdpi/non-found-search-result.png b/data/styles/default/light/mdpi/non-found-search-result.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/non-found-search-result.png
rename to data/styles/default/light/mdpi/non-found-search-result.png
diff --git a/data/styles/clear/style-night/mdpi/norating-bg-l.png b/data/styles/default/light/mdpi/norating-bg-l.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/norating-bg-l.png
rename to data/styles/default/light/mdpi/norating-bg-l.png
diff --git a/data/styles/clear/style-night/mdpi/norating-default-l.png b/data/styles/default/light/mdpi/norating-default-l.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/norating-default-l.png
rename to data/styles/default/light/mdpi/norating-default-l.png
diff --git a/data/styles/clear/style-clear/mdpi/paid_road.png b/data/styles/default/light/mdpi/paid_road.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/paid_road.png
rename to data/styles/default/light/mdpi/paid_road.png
diff --git a/data/styles/clear/style-night/mdpi/route-arrow.png b/data/styles/default/light/mdpi/route-arrow.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/route-arrow.png
rename to data/styles/default/light/mdpi/route-arrow.png
diff --git a/data/styles/clear/style-night/mdpi/route-point-1.png b/data/styles/default/light/mdpi/route-point-1.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/route-point-1.png
rename to data/styles/default/light/mdpi/route-point-1.png
diff --git a/data/styles/clear/style-night/mdpi/route-point-10.png b/data/styles/default/light/mdpi/route-point-10.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/route-point-10.png
rename to data/styles/default/light/mdpi/route-point-10.png
diff --git a/data/styles/clear/style-night/mdpi/route-point-11.png b/data/styles/default/light/mdpi/route-point-11.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/route-point-11.png
rename to data/styles/default/light/mdpi/route-point-11.png
diff --git a/data/styles/clear/style-night/mdpi/route-point-12.png b/data/styles/default/light/mdpi/route-point-12.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/route-point-12.png
rename to data/styles/default/light/mdpi/route-point-12.png
diff --git a/data/styles/clear/style-night/mdpi/route-point-13.png b/data/styles/default/light/mdpi/route-point-13.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/route-point-13.png
rename to data/styles/default/light/mdpi/route-point-13.png
diff --git a/data/styles/clear/style-night/mdpi/route-point-14.png b/data/styles/default/light/mdpi/route-point-14.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/route-point-14.png
rename to data/styles/default/light/mdpi/route-point-14.png
diff --git a/data/styles/clear/style-night/mdpi/route-point-15.png b/data/styles/default/light/mdpi/route-point-15.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/route-point-15.png
rename to data/styles/default/light/mdpi/route-point-15.png
diff --git a/data/styles/clear/style-night/mdpi/route-point-16.png b/data/styles/default/light/mdpi/route-point-16.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/route-point-16.png
rename to data/styles/default/light/mdpi/route-point-16.png
diff --git a/data/styles/clear/style-night/mdpi/route-point-17.png b/data/styles/default/light/mdpi/route-point-17.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/route-point-17.png
rename to data/styles/default/light/mdpi/route-point-17.png
diff --git a/data/styles/clear/style-night/mdpi/route-point-18.png b/data/styles/default/light/mdpi/route-point-18.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/route-point-18.png
rename to data/styles/default/light/mdpi/route-point-18.png
diff --git a/data/styles/clear/style-night/mdpi/route-point-19.png b/data/styles/default/light/mdpi/route-point-19.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/route-point-19.png
rename to data/styles/default/light/mdpi/route-point-19.png
diff --git a/data/styles/clear/style-night/mdpi/route-point-2.png b/data/styles/default/light/mdpi/route-point-2.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/route-point-2.png
rename to data/styles/default/light/mdpi/route-point-2.png
diff --git a/data/styles/clear/style-night/mdpi/route-point-20.png b/data/styles/default/light/mdpi/route-point-20.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/route-point-20.png
rename to data/styles/default/light/mdpi/route-point-20.png
diff --git a/data/styles/clear/style-night/mdpi/route-point-3.png b/data/styles/default/light/mdpi/route-point-3.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/route-point-3.png
rename to data/styles/default/light/mdpi/route-point-3.png
diff --git a/data/styles/clear/style-night/mdpi/route-point-4.png b/data/styles/default/light/mdpi/route-point-4.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/route-point-4.png
rename to data/styles/default/light/mdpi/route-point-4.png
diff --git a/data/styles/clear/style-night/mdpi/route-point-5.png b/data/styles/default/light/mdpi/route-point-5.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/route-point-5.png
rename to data/styles/default/light/mdpi/route-point-5.png
diff --git a/data/styles/clear/style-night/mdpi/route-point-6.png b/data/styles/default/light/mdpi/route-point-6.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/route-point-6.png
rename to data/styles/default/light/mdpi/route-point-6.png
diff --git a/data/styles/clear/style-night/mdpi/route-point-7.png b/data/styles/default/light/mdpi/route-point-7.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/route-point-7.png
rename to data/styles/default/light/mdpi/route-point-7.png
diff --git a/data/styles/clear/style-night/mdpi/route-point-8.png b/data/styles/default/light/mdpi/route-point-8.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/route-point-8.png
rename to data/styles/default/light/mdpi/route-point-8.png
diff --git a/data/styles/clear/style-night/mdpi/route-point-9.png b/data/styles/default/light/mdpi/route-point-9.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/route-point-9.png
rename to data/styles/default/light/mdpi/route-point-9.png
diff --git a/data/styles/clear/style-night/mdpi/route-point-finish.png b/data/styles/default/light/mdpi/route-point-finish.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/route-point-finish.png
rename to data/styles/default/light/mdpi/route-point-finish.png
diff --git a/data/styles/clear/style-night/mdpi/route-point-start.png b/data/styles/default/light/mdpi/route-point-start.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/route-point-start.png
rename to data/styles/default/light/mdpi/route-point-start.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-bakery.png b/data/styles/default/light/mdpi/search-result-bakery.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-bakery.png
rename to data/styles/default/light/mdpi/search-result-bakery.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-bar.png b/data/styles/default/light/mdpi/search-result-bar.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-bar.png
rename to data/styles/default/light/mdpi/search-result-bar.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-cafe.png b/data/styles/default/light/mdpi/search-result-cafe.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-cafe.png
rename to data/styles/default/light/mdpi/search-result-cafe.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-casino.png b/data/styles/default/light/mdpi/search-result-casino.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-casino.png
rename to data/styles/default/light/mdpi/search-result-casino.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-cinema.png b/data/styles/default/light/mdpi/search-result-cinema.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-cinema.png
rename to data/styles/default/light/mdpi/search-result-cinema.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-fastfood.png b/data/styles/default/light/mdpi/search-result-fastfood.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-fastfood.png
rename to data/styles/default/light/mdpi/search-result-fastfood.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-marketplace.png b/data/styles/default/light/mdpi/search-result-marketplace.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-marketplace.png
rename to data/styles/default/light/mdpi/search-result-marketplace.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-nightclub.png b/data/styles/default/light/mdpi/search-result-nightclub.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-nightclub.png
rename to data/styles/default/light/mdpi/search-result-nightclub.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-playground.png b/data/styles/default/light/mdpi/search-result-playground.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-playground.png
rename to data/styles/default/light/mdpi/search-result-playground.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-pub.png b/data/styles/default/light/mdpi/search-result-pub.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-pub.png
rename to data/styles/default/light/mdpi/search-result-pub.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-restaurant.png b/data/styles/default/light/mdpi/search-result-restaurant.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-restaurant.png
rename to data/styles/default/light/mdpi/search-result-restaurant.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-shop-alcohol.png b/data/styles/default/light/mdpi/search-result-shop-alcohol.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-shop-alcohol.png
rename to data/styles/default/light/mdpi/search-result-shop-alcohol.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-shop-butcher.png b/data/styles/default/light/mdpi/search-result-shop-butcher.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-shop-butcher.png
rename to data/styles/default/light/mdpi/search-result-shop-butcher.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-shop-clothes.png b/data/styles/default/light/mdpi/search-result-shop-clothes.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-shop-clothes.png
rename to data/styles/default/light/mdpi/search-result-shop-clothes.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-shop-confectionery.png b/data/styles/default/light/mdpi/search-result-shop-confectionery.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-shop-confectionery.png
rename to data/styles/default/light/mdpi/search-result-shop-confectionery.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-shop-convenience.png b/data/styles/default/light/mdpi/search-result-shop-convenience.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-shop-convenience.png
rename to data/styles/default/light/mdpi/search-result-shop-convenience.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-shop-cosmetics.png b/data/styles/default/light/mdpi/search-result-shop-cosmetics.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-shop-cosmetics.png
rename to data/styles/default/light/mdpi/search-result-shop-cosmetics.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-shop-department_store.png b/data/styles/default/light/mdpi/search-result-shop-department_store.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-shop-department_store.png
rename to data/styles/default/light/mdpi/search-result-shop-department_store.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-shop-gift.png b/data/styles/default/light/mdpi/search-result-shop-gift.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-shop-gift.png
rename to data/styles/default/light/mdpi/search-result-shop-gift.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-shop-greengrocer.png b/data/styles/default/light/mdpi/search-result-shop-greengrocer.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-shop-greengrocer.png
rename to data/styles/default/light/mdpi/search-result-shop-greengrocer.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-shop-jewelry.png b/data/styles/default/light/mdpi/search-result-shop-jewelry.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-shop-jewelry.png
rename to data/styles/default/light/mdpi/search-result-shop-jewelry.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-shop-mall.png b/data/styles/default/light/mdpi/search-result-shop-mall.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-shop-mall.png
rename to data/styles/default/light/mdpi/search-result-shop-mall.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-shop-seafood.png b/data/styles/default/light/mdpi/search-result-shop-seafood.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-shop-seafood.png
rename to data/styles/default/light/mdpi/search-result-shop-seafood.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-shop-shoes.png b/data/styles/default/light/mdpi/search-result-shop-shoes.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-shop-shoes.png
rename to data/styles/default/light/mdpi/search-result-shop-shoes.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-shop-sports.png b/data/styles/default/light/mdpi/search-result-shop-sports.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-shop-sports.png
rename to data/styles/default/light/mdpi/search-result-shop-sports.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-shop-supermarket.png b/data/styles/default/light/mdpi/search-result-shop-supermarket.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-shop-supermarket.png
rename to data/styles/default/light/mdpi/search-result-shop-supermarket.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-shop-toys.png b/data/styles/default/light/mdpi/search-result-shop-toys.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-shop-toys.png
rename to data/styles/default/light/mdpi/search-result-shop-toys.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-theme-park.png b/data/styles/default/light/mdpi/search-result-theme-park.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-theme-park.png
rename to data/styles/default/light/mdpi/search-result-theme-park.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-water-park.png b/data/styles/default/light/mdpi/search-result-water-park.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-water-park.png
rename to data/styles/default/light/mdpi/search-result-water-park.png
diff --git a/data/styles/clear/style-night/mdpi/search-result-zoo.png b/data/styles/default/light/mdpi/search-result-zoo.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/search-result-zoo.png
rename to data/styles/default/light/mdpi/search-result-zoo.png
diff --git a/data/styles/clear/style-clear/mdpi/search-result.png b/data/styles/default/light/mdpi/search-result.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/search-result.png
rename to data/styles/default/light/mdpi/search-result.png
diff --git a/data/styles/clear/style-night/mdpi/shield-us-hw-thin-scaled.png b/data/styles/default/light/mdpi/shield-us-hw-thin-scaled.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/shield-us-hw-thin-scaled.png
rename to data/styles/default/light/mdpi/shield-us-hw-thin-scaled.png
diff --git a/data/styles/clear/style-night/mdpi/shield-us-hw-thin.png b/data/styles/default/light/mdpi/shield-us-hw-thin.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/shield-us-hw-thin.png
rename to data/styles/default/light/mdpi/shield-us-hw-thin.png
diff --git a/data/styles/clear/style-night/mdpi/shield-us-hw-wide-scaled.png b/data/styles/default/light/mdpi/shield-us-hw-wide-scaled.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/shield-us-hw-wide-scaled.png
rename to data/styles/default/light/mdpi/shield-us-hw-wide-scaled.png
diff --git a/data/styles/clear/style-night/mdpi/shield-us-hw-wide.png b/data/styles/default/light/mdpi/shield-us-hw-wide.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/shield-us-hw-wide.png
rename to data/styles/default/light/mdpi/shield-us-hw-wide.png
diff --git a/data/styles/clear/style-night/mdpi/shield-us-i-thin-scaled.png b/data/styles/default/light/mdpi/shield-us-i-thin-scaled.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/shield-us-i-thin-scaled.png
rename to data/styles/default/light/mdpi/shield-us-i-thin-scaled.png
diff --git a/data/styles/clear/style-night/mdpi/shield-us-i-thin.png b/data/styles/default/light/mdpi/shield-us-i-thin.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/shield-us-i-thin.png
rename to data/styles/default/light/mdpi/shield-us-i-thin.png
diff --git a/data/styles/clear/style-night/mdpi/shield-us-i-wide-scaled.png b/data/styles/default/light/mdpi/shield-us-i-wide-scaled.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/shield-us-i-wide-scaled.png
rename to data/styles/default/light/mdpi/shield-us-i-wide-scaled.png
diff --git a/data/styles/clear/style-night/mdpi/shield-us-i-wide.png b/data/styles/default/light/mdpi/shield-us-i-wide.png
similarity index 100%
rename from data/styles/clear/style-night/mdpi/shield-us-i-wide.png
rename to data/styles/default/light/mdpi/shield-us-i-wide.png
diff --git a/data/styles/clear/style-clear/mdpi/track_marker_deselected.png b/data/styles/default/light/mdpi/track_marker_deselected.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/track_marker_deselected.png
rename to data/styles/default/light/mdpi/track_marker_deselected.png
diff --git a/data/styles/clear/style-clear/mdpi/track_marker_selected.png b/data/styles/default/light/mdpi/track_marker_selected.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/track_marker_selected.png
rename to data/styles/default/light/mdpi/track_marker_selected.png
diff --git a/data/styles/clear/style-clear/mdpi/unpaved_road.png b/data/styles/default/light/mdpi/unpaved_road.png
similarity index 100%
rename from data/styles/clear/style-clear/mdpi/unpaved_road.png
rename to data/styles/default/light/mdpi/unpaved_road.png
diff --git a/data/styles/clear/style-clear/style.mapcss b/data/styles/default/light/style.mapcss
similarity index 100%
rename from data/styles/clear/style-clear/style.mapcss
rename to data/styles/default/light/style.mapcss
diff --git a/data/styles/clear/style-night/symbols-ad/00000_keep.svg b/data/styles/default/light/symbols-ad/00000_keep.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols-ad/00000_keep.svg
rename to data/styles/default/light/symbols-ad/00000_keep.svg
diff --git a/data/styles/clear/style-clear/symbols/aircraft-m.svg b/data/styles/default/light/symbols/aircraft-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/aircraft-m.svg
rename to data/styles/default/light/symbols/aircraft-m.svg
diff --git a/data/styles/clear/style-clear/symbols/airport-m.svg b/data/styles/default/light/symbols/airport-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/airport-m.svg
rename to data/styles/default/light/symbols/airport-m.svg
diff --git a/data/styles/clear/style-clear/symbols/airport-s.svg b/data/styles/default/light/symbols/airport-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/airport-s.svg
rename to data/styles/default/light/symbols/airport-s.svg
diff --git a/data/styles/clear/style-clear/symbols/airport_gate-m.svg b/data/styles/default/light/symbols/airport_gate-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/airport_gate-m.svg
rename to data/styles/default/light/symbols/airport_gate-m.svg
diff --git a/data/styles/clear/style-clear/symbols/alcohol-m.svg b/data/styles/default/light/symbols/alcohol-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/alcohol-m.svg
rename to data/styles/default/light/symbols/alcohol-m.svg
diff --git a/data/styles/clear/style-clear/symbols/alpine_hut-m.svg b/data/styles/default/light/symbols/alpine_hut-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/alpine_hut-m.svg
rename to data/styles/default/light/symbols/alpine_hut-m.svg
diff --git a/data/styles/clear/style-clear/symbols/alpine_hut-s.svg b/data/styles/default/light/symbols/alpine_hut-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/alpine_hut-s.svg
rename to data/styles/default/light/symbols/alpine_hut-s.svg
diff --git a/data/styles/clear/style-clear/symbols/alternative-m.svg b/data/styles/default/light/symbols/alternative-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/alternative-m.svg
rename to data/styles/default/light/symbols/alternative-m.svg
diff --git a/data/styles/clear/style-clear/symbols/america-football-m.svg b/data/styles/default/light/symbols/america-football-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/america-football-m.svg
rename to data/styles/default/light/symbols/america-football-m.svg
diff --git a/data/styles/clear/style-clear/symbols/anchor-m.svg b/data/styles/default/light/symbols/anchor-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/anchor-m.svg
rename to data/styles/default/light/symbols/anchor-m.svg
diff --git a/data/styles/clear/style-clear/symbols/animal-m.svg b/data/styles/default/light/symbols/animal-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/animal-m.svg
rename to data/styles/default/light/symbols/animal-m.svg
diff --git a/data/styles/clear/style-clear/symbols/antiques-m.svg b/data/styles/default/light/symbols/antiques-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/antiques-m.svg
rename to data/styles/default/light/symbols/antiques-m.svg
diff --git a/data/styles/clear/style-clear/symbols/apartment-m.svg b/data/styles/default/light/symbols/apartment-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/apartment-m.svg
rename to data/styles/default/light/symbols/apartment-m.svg
diff --git a/data/styles/clear/style-clear/symbols/aquarium-m.svg b/data/styles/default/light/symbols/aquarium-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/aquarium-m.svg
rename to data/styles/default/light/symbols/aquarium-m.svg
diff --git a/data/styles/clear/style-clear/symbols/arcade-m.svg b/data/styles/default/light/symbols/arcade-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/arcade-m.svg
rename to data/styles/default/light/symbols/arcade-m.svg
diff --git a/data/styles/clear/style-clear/symbols/archaeological-site-m.svg b/data/styles/default/light/symbols/archaeological-site-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/archaeological-site-m.svg
rename to data/styles/default/light/symbols/archaeological-site-m.svg
diff --git a/data/styles/clear/style-clear/symbols/archery-m.svg b/data/styles/default/light/symbols/archery-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/archery-m.svg
rename to data/styles/default/light/symbols/archery-m.svg
diff --git a/data/styles/clear/style-clear/symbols/arrow-m.svg b/data/styles/default/light/symbols/arrow-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/arrow-m.svg
rename to data/styles/default/light/symbols/arrow-m.svg
diff --git a/data/styles/clear/style-clear/symbols/arrow-s.svg b/data/styles/default/light/symbols/arrow-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/arrow-s.svg
rename to data/styles/default/light/symbols/arrow-s.svg
diff --git a/data/styles/clear/style-clear/symbols/arrow-xs.svg b/data/styles/default/light/symbols/arrow-xs.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/arrow-xs.svg
rename to data/styles/default/light/symbols/arrow-xs.svg
diff --git a/data/styles/clear/style-clear/symbols/art-m.svg b/data/styles/default/light/symbols/art-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/art-m.svg
rename to data/styles/default/light/symbols/art-m.svg
diff --git a/data/styles/clear/style-clear/symbols/artwork-m.svg b/data/styles/default/light/symbols/artwork-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/artwork-m.svg
rename to data/styles/default/light/symbols/artwork-m.svg
diff --git a/data/styles/clear/style-clear/symbols/assembly_point-m.svg b/data/styles/default/light/symbols/assembly_point-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/assembly_point-m.svg
rename to data/styles/default/light/symbols/assembly_point-m.svg
diff --git a/data/styles/clear/style-clear/symbols/atm-m.svg b/data/styles/default/light/symbols/atm-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/atm-m.svg
rename to data/styles/default/light/symbols/atm-m.svg
diff --git a/data/styles/clear/style-clear/symbols/auction-m.svg b/data/styles/default/light/symbols/auction-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/auction-m.svg
rename to data/styles/default/light/symbols/auction-m.svg
diff --git a/data/styles/clear/style-clear/symbols/audiologist-m.svg b/data/styles/default/light/symbols/audiologist-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/audiologist-m.svg
rename to data/styles/default/light/symbols/audiologist-m.svg
diff --git a/data/styles/clear/style-clear/symbols/australian-football-m.svg b/data/styles/default/light/symbols/australian-football-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/australian-football-m.svg
rename to data/styles/default/light/symbols/australian-football-m.svg
diff --git a/data/styles/clear/style-clear/symbols/badminton-m.svg b/data/styles/default/light/symbols/badminton-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/badminton-m.svg
rename to data/styles/default/light/symbols/badminton-m.svg
diff --git a/data/styles/clear/style-clear/symbols/bakery-m.svg b/data/styles/default/light/symbols/bakery-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/bakery-m.svg
rename to data/styles/default/light/symbols/bakery-m.svg
diff --git a/data/styles/clear/style-clear/symbols/bank-m.svg b/data/styles/default/light/symbols/bank-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/bank-m.svg
rename to data/styles/default/light/symbols/bank-m.svg
diff --git a/data/styles/clear/style-clear/symbols/banknote-m.svg b/data/styles/default/light/symbols/banknote-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/banknote-m.svg
rename to data/styles/default/light/symbols/banknote-m.svg
diff --git a/data/styles/clear/style-clear/symbols/bar-m.svg b/data/styles/default/light/symbols/bar-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/bar-m.svg
rename to data/styles/default/light/symbols/bar-m.svg
diff --git a/data/styles/clear/style-clear/symbols/barrier-entrance-s.svg b/data/styles/default/light/symbols/barrier-entrance-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/barrier-entrance-s.svg
rename to data/styles/default/light/symbols/barrier-entrance-s.svg
diff --git a/data/styles/clear/style-clear/symbols/baseball-m.svg b/data/styles/default/light/symbols/baseball-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/baseball-m.svg
rename to data/styles/default/light/symbols/baseball-m.svg
diff --git a/data/styles/clear/style-clear/symbols/basketball-m.svg b/data/styles/default/light/symbols/basketball-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/basketball-m.svg
rename to data/styles/default/light/symbols/basketball-m.svg
diff --git a/data/styles/clear/style-clear/symbols/bbq-m.svg b/data/styles/default/light/symbols/bbq-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/bbq-m.svg
rename to data/styles/default/light/symbols/bbq-m.svg
diff --git a/data/styles/clear/style-clear/symbols/bcontrol-m.svg b/data/styles/default/light/symbols/bcontrol-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/bcontrol-m.svg
rename to data/styles/default/light/symbols/bcontrol-m.svg
diff --git a/data/styles/clear/style-clear/symbols/bcontrol-s.svg b/data/styles/default/light/symbols/bcontrol-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/bcontrol-s.svg
rename to data/styles/default/light/symbols/bcontrol-s.svg
diff --git a/data/styles/clear/style-clear/symbols/beach-m.svg b/data/styles/default/light/symbols/beach-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/beach-m.svg
rename to data/styles/default/light/symbols/beach-m.svg
diff --git a/data/styles/clear/style-clear/symbols/beauty-m.svg b/data/styles/default/light/symbols/beauty-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/beauty-m.svg
rename to data/styles/default/light/symbols/beauty-m.svg
diff --git a/data/styles/clear/style-clear/symbols/beekeeper-m.svg b/data/styles/default/light/symbols/beekeeper-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/beekeeper-m.svg
rename to data/styles/default/light/symbols/beekeeper-m.svg
diff --git a/data/styles/clear/style-clear/symbols/beer-m.svg b/data/styles/default/light/symbols/beer-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/beer-m.svg
rename to data/styles/default/light/symbols/beer-m.svg
diff --git a/data/styles/clear/style-clear/symbols/bench.svg b/data/styles/default/light/symbols/bench.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/bench.svg
rename to data/styles/default/light/symbols/bench.svg
diff --git a/data/styles/clear/style-clear/symbols/bicycle-parking-m.svg b/data/styles/default/light/symbols/bicycle-parking-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/bicycle-parking-m.svg
rename to data/styles/default/light/symbols/bicycle-parking-m.svg
diff --git a/data/styles/clear/style-clear/symbols/bicycle-rental.svg b/data/styles/default/light/symbols/bicycle-rental.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/bicycle-rental.svg
rename to data/styles/default/light/symbols/bicycle-rental.svg
diff --git a/data/styles/clear/style-clear/symbols/bicycle-repair-station.svg b/data/styles/default/light/symbols/bicycle-repair-station.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/bicycle-repair-station.svg
rename to data/styles/default/light/symbols/bicycle-repair-station.svg
diff --git a/data/styles/clear/style-clear/symbols/blacksmith-m.svg b/data/styles/default/light/symbols/blacksmith-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/blacksmith-m.svg
rename to data/styles/default/light/symbols/blacksmith-m.svg
diff --git a/data/styles/clear/style-clear/symbols/blood_donation-m.svg b/data/styles/default/light/symbols/blood_donation-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/blood_donation-m.svg
rename to data/styles/default/light/symbols/blood_donation-m.svg
diff --git a/data/styles/clear/style-clear/symbols/board.svg b/data/styles/default/light/symbols/board.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/board.svg
rename to data/styles/default/light/symbols/board.svg
diff --git a/data/styles/clear/style-clear/symbols/book-shop-m.svg b/data/styles/default/light/symbols/book-shop-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/book-shop-m.svg
rename to data/styles/default/light/symbols/book-shop-m.svg
diff --git a/data/styles/clear/style-clear/symbols/bookcase-m.svg b/data/styles/default/light/symbols/bookcase-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/bookcase-m.svg
rename to data/styles/default/light/symbols/bookcase-m.svg
diff --git a/data/styles/clear/style-clear/symbols/bookmaker-m.svg b/data/styles/default/light/symbols/bookmaker-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/bookmaker-m.svg
rename to data/styles/default/light/symbols/bookmaker-m.svg
diff --git a/data/styles/clear/style-clear/symbols/bowling-m.svg b/data/styles/default/light/symbols/bowling-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/bowling-m.svg
rename to data/styles/default/light/symbols/bowling-m.svg
diff --git a/data/styles/clear/style-clear/symbols/bowling_alley-m.svg b/data/styles/default/light/symbols/bowling_alley-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/bowling_alley-m.svg
rename to data/styles/default/light/symbols/bowling_alley-m.svg
diff --git a/data/styles/clear/style-clear/symbols/brewery-m.svg b/data/styles/default/light/symbols/brewery-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/brewery-m.svg
rename to data/styles/default/light/symbols/brewery-m.svg
diff --git a/data/styles/clear/style-clear/symbols/buddhist-m.svg b/data/styles/default/light/symbols/buddhist-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/buddhist-m.svg
rename to data/styles/default/light/symbols/buddhist-m.svg
diff --git a/data/styles/clear/style-clear/symbols/buddhist-s.svg b/data/styles/default/light/symbols/buddhist-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/buddhist-s.svg
rename to data/styles/default/light/symbols/buddhist-s.svg
diff --git a/data/styles/clear/style-clear/symbols/bus-m.svg b/data/styles/default/light/symbols/bus-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/bus-m.svg
rename to data/styles/default/light/symbols/bus-m.svg
diff --git a/data/styles/clear/style-clear/symbols/bus-s.svg b/data/styles/default/light/symbols/bus-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/bus-s.svg
rename to data/styles/default/light/symbols/bus-s.svg
diff --git a/data/styles/clear/style-clear/symbols/butcher-m.svg b/data/styles/default/light/symbols/butcher-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/butcher-m.svg
rename to data/styles/default/light/symbols/butcher-m.svg
diff --git a/data/styles/clear/style-clear/symbols/cable-car-m.svg b/data/styles/default/light/symbols/cable-car-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/cable-car-m.svg
rename to data/styles/default/light/symbols/cable-car-m.svg
diff --git a/data/styles/clear/style-clear/symbols/cable-car-s.svg b/data/styles/default/light/symbols/cable-car-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/cable-car-s.svg
rename to data/styles/default/light/symbols/cable-car-s.svg
diff --git a/data/styles/clear/style-clear/symbols/cafe-m.svg b/data/styles/default/light/symbols/cafe-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/cafe-m.svg
rename to data/styles/default/light/symbols/cafe-m.svg
diff --git a/data/styles/clear/style-clear/symbols/cairn-m.svg b/data/styles/default/light/symbols/cairn-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/cairn-m.svg
rename to data/styles/default/light/symbols/cairn-m.svg
diff --git a/data/styles/clear/style-clear/symbols/campsite-m.svg b/data/styles/default/light/symbols/campsite-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/campsite-m.svg
rename to data/styles/default/light/symbols/campsite-m.svg
diff --git a/data/styles/clear/style-clear/symbols/campsite-s.svg b/data/styles/default/light/symbols/campsite-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/campsite-s.svg
rename to data/styles/default/light/symbols/campsite-s.svg
diff --git a/data/styles/clear/style-clear/symbols/cannon-m.svg b/data/styles/default/light/symbols/cannon-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/cannon-m.svg
rename to data/styles/default/light/symbols/cannon-m.svg
diff --git a/data/styles/clear/style-clear/symbols/car-part-m.svg b/data/styles/default/light/symbols/car-part-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/car-part-m.svg
rename to data/styles/default/light/symbols/car-part-m.svg
diff --git a/data/styles/clear/style-clear/symbols/car-repair-m.svg b/data/styles/default/light/symbols/car-repair-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/car-repair-m.svg
rename to data/styles/default/light/symbols/car-repair-m.svg
diff --git a/data/styles/clear/style-clear/symbols/car-repair-s.svg b/data/styles/default/light/symbols/car-repair-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/car-repair-s.svg
rename to data/styles/default/light/symbols/car-repair-s.svg
diff --git a/data/styles/clear/style-clear/symbols/car-wash-m.svg b/data/styles/default/light/symbols/car-wash-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/car-wash-m.svg
rename to data/styles/default/light/symbols/car-wash-m.svg
diff --git a/data/styles/clear/style-clear/symbols/car_sharing-m.svg b/data/styles/default/light/symbols/car_sharing-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/car_sharing-m.svg
rename to data/styles/default/light/symbols/car_sharing-m.svg
diff --git a/data/styles/clear/style-clear/symbols/car_shop-m.svg b/data/styles/default/light/symbols/car_shop-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/car_shop-m.svg
rename to data/styles/default/light/symbols/car_shop-m.svg
diff --git a/data/styles/clear/style-clear/symbols/caravan-shop-m.svg b/data/styles/default/light/symbols/caravan-shop-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/caravan-shop-m.svg
rename to data/styles/default/light/symbols/caravan-shop-m.svg
diff --git a/data/styles/clear/style-clear/symbols/caravan_site-m.svg b/data/styles/default/light/symbols/caravan_site-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/caravan_site-m.svg
rename to data/styles/default/light/symbols/caravan_site-m.svg
diff --git a/data/styles/clear/style-clear/symbols/caravan_site-s.svg b/data/styles/default/light/symbols/caravan_site-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/caravan_site-s.svg
rename to data/styles/default/light/symbols/caravan_site-s.svg
diff --git a/data/styles/clear/style-clear/symbols/carpenter-m.svg b/data/styles/default/light/symbols/carpenter-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/carpenter-m.svg
rename to data/styles/default/light/symbols/carpenter-m.svg
diff --git a/data/styles/clear/style-clear/symbols/casino-m.svg b/data/styles/default/light/symbols/casino-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/casino-m.svg
rename to data/styles/default/light/symbols/casino-m.svg
diff --git a/data/styles/clear/style-clear/symbols/caterer-m.svg b/data/styles/default/light/symbols/caterer-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/caterer-m.svg
rename to data/styles/default/light/symbols/caterer-m.svg
diff --git a/data/styles/clear/style-clear/symbols/cave-m.svg b/data/styles/default/light/symbols/cave-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/cave-m.svg
rename to data/styles/default/light/symbols/cave-m.svg
diff --git a/data/styles/clear/style-clear/symbols/cave-s.svg b/data/styles/default/light/symbols/cave-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/cave-s.svg
rename to data/styles/default/light/symbols/cave-s.svg
diff --git a/data/styles/clear/style-clear/symbols/cemetery-m.svg b/data/styles/default/light/symbols/cemetery-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/cemetery-m.svg
rename to data/styles/default/light/symbols/cemetery-m.svg
diff --git a/data/styles/clear/style-clear/symbols/charging-station-m.svg b/data/styles/default/light/symbols/charging-station-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/charging-station-m.svg
rename to data/styles/default/light/symbols/charging-station-m.svg
diff --git a/data/styles/clear/style-clear/symbols/charging-station-s.svg b/data/styles/default/light/symbols/charging-station-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/charging-station-s.svg
rename to data/styles/default/light/symbols/charging-station-s.svg
diff --git a/data/styles/clear/style-clear/symbols/charity_shop-m.svg b/data/styles/default/light/symbols/charity_shop-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/charity_shop-m.svg
rename to data/styles/default/light/symbols/charity_shop-m.svg
diff --git a/data/styles/clear/style-clear/symbols/cheese-m.svg b/data/styles/default/light/symbols/cheese-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/cheese-m.svg
rename to data/styles/default/light/symbols/cheese-m.svg
diff --git a/data/styles/clear/style-clear/symbols/chemist-m.svg b/data/styles/default/light/symbols/chemist-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/chemist-m.svg
rename to data/styles/default/light/symbols/chemist-m.svg
diff --git a/data/styles/clear/style-clear/symbols/chess-m.svg b/data/styles/default/light/symbols/chess-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/chess-m.svg
rename to data/styles/default/light/symbols/chess-m.svg
diff --git a/data/styles/clear/style-clear/symbols/chimney-m.svg b/data/styles/default/light/symbols/chimney-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/chimney-m.svg
rename to data/styles/default/light/symbols/chimney-m.svg
diff --git a/data/styles/clear/style-clear/symbols/christian-m.svg b/data/styles/default/light/symbols/christian-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/christian-m.svg
rename to data/styles/default/light/symbols/christian-m.svg
diff --git a/data/styles/clear/style-clear/symbols/christian-s.svg b/data/styles/default/light/symbols/christian-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/christian-s.svg
rename to data/styles/default/light/symbols/christian-s.svg
diff --git a/data/styles/clear/style-clear/symbols/cinema-m.svg b/data/styles/default/light/symbols/cinema-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/cinema-m.svg
rename to data/styles/default/light/symbols/cinema-m.svg
diff --git a/data/styles/clear/style-clear/symbols/climbing-m.svg b/data/styles/default/light/symbols/climbing-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/climbing-m.svg
rename to data/styles/default/light/symbols/climbing-m.svg
diff --git a/data/styles/clear/style-clear/symbols/clinic-m.svg b/data/styles/default/light/symbols/clinic-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/clinic-m.svg
rename to data/styles/default/light/symbols/clinic-m.svg
diff --git a/data/styles/clear/style-clear/symbols/clothes-m.svg b/data/styles/default/light/symbols/clothes-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/clothes-m.svg
rename to data/styles/default/light/symbols/clothes-m.svg
diff --git a/data/styles/clear/style-clear/symbols/college-m.svg b/data/styles/default/light/symbols/college-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/college-m.svg
rename to data/styles/default/light/symbols/college-m.svg
diff --git a/data/styles/clear/style-clear/symbols/college-s.svg b/data/styles/default/light/symbols/college-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/college-s.svg
rename to data/styles/default/light/symbols/college-s.svg
diff --git a/data/styles/clear/style-clear/symbols/community-m.svg b/data/styles/default/light/symbols/community-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/community-m.svg
rename to data/styles/default/light/symbols/community-m.svg
diff --git a/data/styles/clear/style-clear/symbols/compressed_air-m.svg b/data/styles/default/light/symbols/compressed_air-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/compressed_air-m.svg
rename to data/styles/default/light/symbols/compressed_air-m.svg
diff --git a/data/styles/clear/style-clear/symbols/computer-m.svg b/data/styles/default/light/symbols/computer-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/computer-m.svg
rename to data/styles/default/light/symbols/computer-m.svg
diff --git a/data/styles/clear/style-clear/symbols/convenience-m.svg b/data/styles/default/light/symbols/convenience-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/convenience-m.svg
rename to data/styles/default/light/symbols/convenience-m.svg
diff --git a/data/styles/clear/style-clear/symbols/copyshop-m.svg b/data/styles/default/light/symbols/copyshop-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/copyshop-m.svg
rename to data/styles/default/light/symbols/copyshop-m.svg
diff --git a/data/styles/clear/style-clear/symbols/cricket-m.svg b/data/styles/default/light/symbols/cricket-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/cricket-m.svg
rename to data/styles/default/light/symbols/cricket-m.svg
diff --git a/data/styles/clear/style-clear/symbols/cross-m.svg b/data/styles/default/light/symbols/cross-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/cross-m.svg
rename to data/styles/default/light/symbols/cross-m.svg
diff --git a/data/styles/clear/style-clear/symbols/curling-m.svg b/data/styles/default/light/symbols/curling-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/curling-m.svg
rename to data/styles/default/light/symbols/curling-m.svg
diff --git a/data/styles/clear/style-clear/symbols/cycle_barrier-s.svg b/data/styles/default/light/symbols/cycle_barrier-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/cycle_barrier-s.svg
rename to data/styles/default/light/symbols/cycle_barrier-s.svg
diff --git a/data/styles/clear/style-clear/symbols/defibrillator-m.svg b/data/styles/default/light/symbols/defibrillator-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/defibrillator-m.svg
rename to data/styles/default/light/symbols/defibrillator-m.svg
diff --git a/data/styles/clear/style-clear/symbols/dentist-m.svg b/data/styles/default/light/symbols/dentist-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/dentist-m.svg
rename to data/styles/default/light/symbols/dentist-m.svg
diff --git a/data/styles/clear/style-clear/symbols/department_store-m.svg b/data/styles/default/light/symbols/department_store-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/department_store-m.svg
rename to data/styles/default/light/symbols/department_store-m.svg
diff --git a/data/styles/clear/style-clear/symbols/diving-m.svg b/data/styles/default/light/symbols/diving-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/diving-m.svg
rename to data/styles/default/light/symbols/diving-m.svg
diff --git a/data/styles/clear/style-clear/symbols/dog_park-m.svg b/data/styles/default/light/symbols/dog_park-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/dog_park-m.svg
rename to data/styles/default/light/symbols/dog_park-m.svg
diff --git a/data/styles/clear/style-clear/symbols/doityourself-m.svg b/data/styles/default/light/symbols/doityourself-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/doityourself-m.svg
rename to data/styles/default/light/symbols/doityourself-m.svg
diff --git a/data/styles/clear/style-clear/symbols/dot-m.svg b/data/styles/default/light/symbols/dot-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/dot-m.svg
rename to data/styles/default/light/symbols/dot-m.svg
diff --git a/data/styles/clear/style-clear/symbols/drinking-water-m.svg b/data/styles/default/light/symbols/drinking-water-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/drinking-water-m.svg
rename to data/styles/default/light/symbols/drinking-water-m.svg
diff --git a/data/styles/clear/style-clear/symbols/drinking-water-s.svg b/data/styles/default/light/symbols/drinking-water-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/drinking-water-s.svg
rename to data/styles/default/light/symbols/drinking-water-s.svg
diff --git a/data/styles/clear/style-clear/symbols/driving_school-m.svg b/data/styles/default/light/symbols/driving_school-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/driving_school-m.svg
rename to data/styles/default/light/symbols/driving_school-m.svg
diff --git a/data/styles/clear/style-clear/symbols/dry_cleaning-m.svg b/data/styles/default/light/symbols/dry_cleaning-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/dry_cleaning-m.svg
rename to data/styles/default/light/symbols/dry_cleaning-m.svg
diff --git a/data/styles/clear/style-clear/symbols/dump-station-m.svg b/data/styles/default/light/symbols/dump-station-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/dump-station-m.svg
rename to data/styles/default/light/symbols/dump-station-m.svg
diff --git a/data/styles/clear/style-clear/symbols/electrician-m.svg b/data/styles/default/light/symbols/electrician-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/electrician-m.svg
rename to data/styles/default/light/symbols/electrician-m.svg
diff --git a/data/styles/clear/style-clear/symbols/electronics-m.svg b/data/styles/default/light/symbols/electronics-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/electronics-m.svg
rename to data/styles/default/light/symbols/electronics-m.svg
diff --git a/data/styles/clear/style-clear/symbols/elevator-s.svg b/data/styles/default/light/symbols/elevator-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/elevator-s.svg
rename to data/styles/default/light/symbols/elevator-s.svg
diff --git a/data/styles/clear/style-clear/symbols/embassy-m.svg b/data/styles/default/light/symbols/embassy-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/embassy-m.svg
rename to data/styles/default/light/symbols/embassy-m.svg
diff --git a/data/styles/clear/style-clear/symbols/emergency-phone-m.svg b/data/styles/default/light/symbols/emergency-phone-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/emergency-phone-m.svg
rename to data/styles/default/light/symbols/emergency-phone-m.svg
diff --git a/data/styles/clear/style-clear/symbols/entrance-s.svg b/data/styles/default/light/symbols/entrance-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/entrance-s.svg
rename to data/styles/default/light/symbols/entrance-s.svg
diff --git a/data/styles/clear/style-clear/symbols/equestrian-m.svg b/data/styles/default/light/symbols/equestrian-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/equestrian-m.svg
rename to data/styles/default/light/symbols/equestrian-m.svg
diff --git a/data/styles/clear/style-clear/symbols/erotic-m.svg b/data/styles/default/light/symbols/erotic-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/erotic-m.svg
rename to data/styles/default/light/symbols/erotic-m.svg
diff --git a/data/styles/clear/style-clear/symbols/excrement_bags-m.svg b/data/styles/default/light/symbols/excrement_bags-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/excrement_bags-m.svg
rename to data/styles/default/light/symbols/excrement_bags-m.svg
diff --git a/data/styles/clear/style-clear/symbols/exit-s.svg b/data/styles/default/light/symbols/exit-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/exit-s.svg
rename to data/styles/default/light/symbols/exit-s.svg
diff --git a/data/styles/clear/style-clear/symbols/factory-m.svg b/data/styles/default/light/symbols/factory-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/factory-m.svg
rename to data/styles/default/light/symbols/factory-m.svg
diff --git a/data/styles/clear/style-clear/symbols/fastfood-m.svg b/data/styles/default/light/symbols/fastfood-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/fastfood-m.svg
rename to data/styles/default/light/symbols/fastfood-m.svg
diff --git a/data/styles/clear/style-clear/symbols/fire_station-m.svg b/data/styles/default/light/symbols/fire_station-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/fire_station-m.svg
rename to data/styles/default/light/symbols/fire_station-m.svg
diff --git a/data/styles/clear/style-clear/symbols/firehydrant-m.svg b/data/styles/default/light/symbols/firehydrant-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/firehydrant-m.svg
rename to data/styles/default/light/symbols/firehydrant-m.svg
diff --git a/data/styles/clear/style-clear/symbols/fitness_centre-m.svg b/data/styles/default/light/symbols/fitness_centre-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/fitness_centre-m.svg
rename to data/styles/default/light/symbols/fitness_centre-m.svg
diff --git a/data/styles/clear/style-clear/symbols/fitness_station-m.svg b/data/styles/default/light/symbols/fitness_station-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/fitness_station-m.svg
rename to data/styles/default/light/symbols/fitness_station-m.svg
diff --git a/data/styles/clear/style-clear/symbols/florist-m.svg b/data/styles/default/light/symbols/florist-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/florist-m.svg
rename to data/styles/default/light/symbols/florist-m.svg
diff --git a/data/styles/clear/style-clear/symbols/ford-m.svg b/data/styles/default/light/symbols/ford-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/ford-m.svg
rename to data/styles/default/light/symbols/ford-m.svg
diff --git a/data/styles/clear/style-clear/symbols/fountain-m.svg b/data/styles/default/light/symbols/fountain-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/fountain-m.svg
rename to data/styles/default/light/symbols/fountain-m.svg
diff --git a/data/styles/clear/style-clear/symbols/fountain-s.svg b/data/styles/default/light/symbols/fountain-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/fountain-s.svg
rename to data/styles/default/light/symbols/fountain-s.svg
diff --git a/data/styles/clear/style-clear/symbols/fuel-dispenser-m.svg b/data/styles/default/light/symbols/fuel-dispenser-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/fuel-dispenser-m.svg
rename to data/styles/default/light/symbols/fuel-dispenser-m.svg
diff --git a/data/styles/clear/style-clear/symbols/fuel-m.svg b/data/styles/default/light/symbols/fuel-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/fuel-m.svg
rename to data/styles/default/light/symbols/fuel-m.svg
diff --git a/data/styles/clear/style-clear/symbols/fuel-s.svg b/data/styles/default/light/symbols/fuel-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/fuel-s.svg
rename to data/styles/default/light/symbols/fuel-s.svg
diff --git a/data/styles/clear/style-clear/symbols/funeral_directors-m.svg b/data/styles/default/light/symbols/funeral_directors-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/funeral_directors-m.svg
rename to data/styles/default/light/symbols/funeral_directors-m.svg
diff --git a/data/styles/clear/style-clear/symbols/funicular-m.svg b/data/styles/default/light/symbols/funicular-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/funicular-m.svg
rename to data/styles/default/light/symbols/funicular-m.svg
diff --git a/data/styles/clear/style-clear/symbols/furniture-m.svg b/data/styles/default/light/symbols/furniture-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/furniture-m.svg
rename to data/styles/default/light/symbols/furniture-m.svg
diff --git a/data/styles/clear/style-clear/symbols/gallery-m.svg b/data/styles/default/light/symbols/gallery-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/gallery-m.svg
rename to data/styles/default/light/symbols/gallery-m.svg
diff --git a/data/styles/clear/style-clear/symbols/gambling-m.svg b/data/styles/default/light/symbols/gambling-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/gambling-m.svg
rename to data/styles/default/light/symbols/gambling-m.svg
diff --git a/data/styles/clear/style-clear/symbols/garden-m.svg b/data/styles/default/light/symbols/garden-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/garden-m.svg
rename to data/styles/default/light/symbols/garden-m.svg
diff --git a/data/styles/clear/style-clear/symbols/garden-outline-m.svg b/data/styles/default/light/symbols/garden-outline-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/garden-outline-m.svg
rename to data/styles/default/light/symbols/garden-outline-m.svg
diff --git a/data/styles/clear/style-clear/symbols/garden_center-m.svg b/data/styles/default/light/symbols/garden_center-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/garden_center-m.svg
rename to data/styles/default/light/symbols/garden_center-m.svg
diff --git a/data/styles/clear/style-clear/symbols/gate-s.svg b/data/styles/default/light/symbols/gate-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/gate-s.svg
rename to data/styles/default/light/symbols/gate-s.svg
diff --git a/data/styles/clear/style-clear/symbols/geyser-m.svg b/data/styles/default/light/symbols/geyser-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/geyser-m.svg
rename to data/styles/default/light/symbols/geyser-m.svg
diff --git a/data/styles/clear/style-clear/symbols/geyser-s.svg b/data/styles/default/light/symbols/geyser-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/geyser-s.svg
rename to data/styles/default/light/symbols/geyser-s.svg
diff --git a/data/styles/clear/style-clear/symbols/gift-m.svg b/data/styles/default/light/symbols/gift-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/gift-m.svg
rename to data/styles/default/light/symbols/gift-m.svg
diff --git a/data/styles/clear/style-clear/symbols/golf-m.svg b/data/styles/default/light/symbols/golf-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/golf-m.svg
rename to data/styles/default/light/symbols/golf-m.svg
diff --git a/data/styles/clear/style-clear/symbols/greengrocer-m.svg b/data/styles/default/light/symbols/greengrocer-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/greengrocer-m.svg
rename to data/styles/default/light/symbols/greengrocer-m.svg
diff --git a/data/styles/clear/style-clear/symbols/grinding_mill-m.svg b/data/styles/default/light/symbols/grinding_mill-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/grinding_mill-m.svg
rename to data/styles/default/light/symbols/grinding_mill-m.svg
diff --git a/data/styles/clear/style-clear/symbols/grocery-m.svg b/data/styles/default/light/symbols/grocery-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/grocery-m.svg
rename to data/styles/default/light/symbols/grocery-m.svg
diff --git a/data/styles/clear/style-clear/symbols/guidepost.svg b/data/styles/default/light/symbols/guidepost.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/guidepost.svg
rename to data/styles/default/light/symbols/guidepost.svg
diff --git a/data/styles/clear/style-clear/symbols/hackerspace-m.svg b/data/styles/default/light/symbols/hackerspace-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/hackerspace-m.svg
rename to data/styles/default/light/symbols/hackerspace-m.svg
diff --git a/data/styles/clear/style-clear/symbols/hairdresser-m.svg b/data/styles/default/light/symbols/hairdresser-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/hairdresser-m.svg
rename to data/styles/default/light/symbols/hairdresser-m.svg
diff --git a/data/styles/clear/style-clear/symbols/hand-m.svg b/data/styles/default/light/symbols/hand-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/hand-m.svg
rename to data/styles/default/light/symbols/hand-m.svg
diff --git a/data/styles/clear/style-clear/symbols/handball-m.svg b/data/styles/default/light/symbols/handball-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/handball-m.svg
rename to data/styles/default/light/symbols/handball-m.svg
diff --git a/data/styles/clear/style-clear/symbols/handicraft-m.svg b/data/styles/default/light/symbols/handicraft-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/handicraft-m.svg
rename to data/styles/default/light/symbols/handicraft-m.svg
diff --git a/data/styles/clear/style-clear/symbols/helipad-m.svg b/data/styles/default/light/symbols/helipad-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/helipad-m.svg
rename to data/styles/default/light/symbols/helipad-m.svg
diff --git a/data/styles/clear/style-clear/symbols/hindu-m.svg b/data/styles/default/light/symbols/hindu-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/hindu-m.svg
rename to data/styles/default/light/symbols/hindu-m.svg
diff --git a/data/styles/clear/style-clear/symbols/hindu-s.svg b/data/styles/default/light/symbols/hindu-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/hindu-s.svg
rename to data/styles/default/light/symbols/hindu-s.svg
diff --git a/data/styles/clear/style-clear/symbols/historic-ship-m.svg b/data/styles/default/light/symbols/historic-ship-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/historic-ship-m.svg
rename to data/styles/default/light/symbols/historic-ship-m.svg
diff --git a/data/styles/clear/style-clear/symbols/hockey-m.svg b/data/styles/default/light/symbols/hockey-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/hockey-m.svg
rename to data/styles/default/light/symbols/hockey-m.svg
diff --git a/data/styles/clear/style-clear/symbols/home-m.svg b/data/styles/default/light/symbols/home-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/home-m.svg
rename to data/styles/default/light/symbols/home-m.svg
diff --git a/data/styles/clear/style-clear/symbols/hospital-m.svg b/data/styles/default/light/symbols/hospital-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/hospital-m.svg
rename to data/styles/default/light/symbols/hospital-m.svg
diff --git a/data/styles/clear/style-clear/symbols/hospital-s.svg b/data/styles/default/light/symbols/hospital-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/hospital-s.svg
rename to data/styles/default/light/symbols/hospital-s.svg
diff --git a/data/styles/clear/style-clear/symbols/hostel-m.svg b/data/styles/default/light/symbols/hostel-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/hostel-m.svg
rename to data/styles/default/light/symbols/hostel-m.svg
diff --git a/data/styles/clear/style-clear/symbols/hotel-m.svg b/data/styles/default/light/symbols/hotel-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/hotel-m.svg
rename to data/styles/default/light/symbols/hotel-m.svg
diff --git a/data/styles/clear/style-clear/symbols/hotel-s.svg b/data/styles/default/light/symbols/hotel-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/hotel-s.svg
rename to data/styles/default/light/symbols/hotel-s.svg
diff --git a/data/styles/clear/style-clear/symbols/hunting-tower-m.svg b/data/styles/default/light/symbols/hunting-tower-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/hunting-tower-m.svg
rename to data/styles/default/light/symbols/hunting-tower-m.svg
diff --git a/data/styles/clear/style-clear/symbols/ice_cream-m.svg b/data/styles/default/light/symbols/ice_cream-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/ice_cream-m.svg
rename to data/styles/default/light/symbols/ice_cream-m.svg
diff --git a/data/styles/clear/style-clear/symbols/information-m.svg b/data/styles/default/light/symbols/information-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/information-m.svg
rename to data/styles/default/light/symbols/information-m.svg
diff --git a/data/styles/clear/style-clear/symbols/information-office-m.svg b/data/styles/default/light/symbols/information-office-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/information-office-m.svg
rename to data/styles/default/light/symbols/information-office-m.svg
diff --git a/data/styles/clear/style-clear/symbols/interior_decoration-m.svg b/data/styles/default/light/symbols/interior_decoration-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/interior_decoration-m.svg
rename to data/styles/default/light/symbols/interior_decoration-m.svg
diff --git a/data/styles/clear/style-clear/symbols/internet_cafe-m.svg b/data/styles/default/light/symbols/internet_cafe-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/internet_cafe-m.svg
rename to data/styles/default/light/symbols/internet_cafe-m.svg
diff --git a/data/styles/clear/style-clear/symbols/jewelry-m.svg b/data/styles/default/light/symbols/jewelry-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/jewelry-m.svg
rename to data/styles/default/light/symbols/jewelry-m.svg
diff --git a/data/styles/clear/style-clear/symbols/jewish-m.svg b/data/styles/default/light/symbols/jewish-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/jewish-m.svg
rename to data/styles/default/light/symbols/jewish-m.svg
diff --git a/data/styles/clear/style-clear/symbols/jewish-s.svg b/data/styles/default/light/symbols/jewish-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/jewish-s.svg
rename to data/styles/default/light/symbols/jewish-s.svg
diff --git a/data/styles/clear/style-clear/symbols/key_cutter-m.svg b/data/styles/default/light/symbols/key_cutter-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/key_cutter-m.svg
rename to data/styles/default/light/symbols/key_cutter-m.svg
diff --git a/data/styles/clear/style-clear/symbols/kindergarten-m.svg b/data/styles/default/light/symbols/kindergarten-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/kindergarten-m.svg
rename to data/styles/default/light/symbols/kindergarten-m.svg
diff --git a/data/styles/clear/style-clear/symbols/kiosk-m.svg b/data/styles/default/light/symbols/kiosk-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/kiosk-m.svg
rename to data/styles/default/light/symbols/kiosk-m.svg
diff --git a/data/styles/clear/style-clear/symbols/language_school-m.svg b/data/styles/default/light/symbols/language_school-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/language_school-m.svg
rename to data/styles/default/light/symbols/language_school-m.svg
diff --git a/data/styles/clear/style-clear/symbols/laundry-m.svg b/data/styles/default/light/symbols/laundry-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/laundry-m.svg
rename to data/styles/default/light/symbols/laundry-m.svg
diff --git a/data/styles/clear/style-clear/symbols/lawyer-m.svg b/data/styles/default/light/symbols/lawyer-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/lawyer-m.svg
rename to data/styles/default/light/symbols/lawyer-m.svg
diff --git a/data/styles/clear/style-clear/symbols/library-m.svg b/data/styles/default/light/symbols/library-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/library-m.svg
rename to data/styles/default/light/symbols/library-m.svg
diff --git a/data/styles/clear/style-clear/symbols/lift_gate-m.svg b/data/styles/default/light/symbols/lift_gate-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/lift_gate-m.svg
rename to data/styles/default/light/symbols/lift_gate-m.svg
diff --git a/data/styles/clear/style-clear/symbols/light_rail-dlr-london-m.svg b/data/styles/default/light/symbols/light_rail-dlr-london-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/light_rail-dlr-london-m.svg
rename to data/styles/default/light/symbols/light_rail-dlr-london-m.svg
diff --git a/data/styles/clear/style-clear/symbols/light_rail-dlr-london-s.svg b/data/styles/default/light/symbols/light_rail-dlr-london-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/light_rail-dlr-london-s.svg
rename to data/styles/default/light/symbols/light_rail-dlr-london-s.svg
diff --git a/data/styles/clear/style-clear/symbols/light_rail-porto-m.svg b/data/styles/default/light/symbols/light_rail-porto-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/light_rail-porto-m.svg
rename to data/styles/default/light/symbols/light_rail-porto-m.svg
diff --git a/data/styles/clear/style-clear/symbols/light_rail-porto-s.svg b/data/styles/default/light/symbols/light_rail-porto-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/light_rail-porto-s.svg
rename to data/styles/default/light/symbols/light_rail-porto-s.svg
diff --git a/data/styles/clear/style-clear/symbols/lighthouse-m.svg b/data/styles/default/light/symbols/lighthouse-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/lighthouse-m.svg
rename to data/styles/default/light/symbols/lighthouse-m.svg
diff --git a/data/styles/clear/style-clear/symbols/lighthouse-s.svg b/data/styles/default/light/symbols/lighthouse-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/lighthouse-s.svg
rename to data/styles/default/light/symbols/lighthouse-s.svg
diff --git a/data/styles/clear/style-clear/symbols/lightrail-berlin-m.svg b/data/styles/default/light/symbols/lightrail-berlin-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/lightrail-berlin-m.svg
rename to data/styles/default/light/symbols/lightrail-berlin-m.svg
diff --git a/data/styles/clear/style-clear/symbols/lightrail-berlin-s.svg b/data/styles/default/light/symbols/lightrail-berlin-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/lightrail-berlin-s.svg
rename to data/styles/default/light/symbols/lightrail-berlin-s.svg
diff --git a/data/styles/clear/style-clear/symbols/locomotive-m.svg b/data/styles/default/light/symbols/locomotive-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/locomotive-m.svg
rename to data/styles/default/light/symbols/locomotive-m.svg
diff --git a/data/styles/clear/style-clear/symbols/lottery-m.svg b/data/styles/default/light/symbols/lottery-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/lottery-m.svg
rename to data/styles/default/light/symbols/lottery-m.svg
diff --git a/data/styles/clear/style-clear/symbols/mail-m.svg b/data/styles/default/light/symbols/mail-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/mail-m.svg
rename to data/styles/default/light/symbols/mail-m.svg
diff --git a/data/styles/clear/style-clear/symbols/main_entrance-s.svg b/data/styles/default/light/symbols/main_entrance-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/main_entrance-s.svg
rename to data/styles/default/light/symbols/main_entrance-s.svg
diff --git a/data/styles/clear/style-clear/symbols/map.svg b/data/styles/default/light/symbols/map.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/map.svg
rename to data/styles/default/light/symbols/map.svg
diff --git a/data/styles/clear/style-clear/symbols/marina-m.svg b/data/styles/default/light/symbols/marina-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/marina-m.svg
rename to data/styles/default/light/symbols/marina-m.svg
diff --git a/data/styles/clear/style-clear/symbols/marketplace-m.svg b/data/styles/default/light/symbols/marketplace-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/marketplace-m.svg
rename to data/styles/default/light/symbols/marketplace-m.svg
diff --git a/data/styles/clear/style-clear/symbols/mast-m.svg b/data/styles/default/light/symbols/mast-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/mast-m.svg
rename to data/styles/default/light/symbols/mast-m.svg
diff --git a/data/styles/clear/style-clear/symbols/media-m.svg b/data/styles/default/light/symbols/media-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/media-m.svg
rename to data/styles/default/light/symbols/media-m.svg
diff --git a/data/styles/clear/style-clear/symbols/metal_construction-m.svg b/data/styles/default/light/symbols/metal_construction-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/metal_construction-m.svg
rename to data/styles/default/light/symbols/metal_construction-m.svg
diff --git a/data/styles/clear/style-clear/symbols/military-m.svg b/data/styles/default/light/symbols/military-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/military-m.svg
rename to data/styles/default/light/symbols/military-m.svg
diff --git a/data/styles/clear/style-clear/symbols/mine-m.svg b/data/styles/default/light/symbols/mine-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/mine-m.svg
rename to data/styles/default/light/symbols/mine-m.svg
diff --git a/data/styles/clear/style-clear/symbols/mobile_phone-m.svg b/data/styles/default/light/symbols/mobile_phone-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/mobile_phone-m.svg
rename to data/styles/default/light/symbols/mobile_phone-m.svg
diff --git a/data/styles/clear/style-clear/symbols/monument-m.svg b/data/styles/default/light/symbols/monument-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/monument-m.svg
rename to data/styles/default/light/symbols/monument-m.svg
diff --git a/data/styles/clear/style-clear/symbols/monument-s.svg b/data/styles/default/light/symbols/monument-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/monument-s.svg
rename to data/styles/default/light/symbols/monument-s.svg
diff --git a/data/styles/clear/style-clear/symbols/mormon-m.svg b/data/styles/default/light/symbols/mormon-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/mormon-m.svg
rename to data/styles/default/light/symbols/mormon-m.svg
diff --git a/data/styles/clear/style-clear/symbols/mormon-s.svg b/data/styles/default/light/symbols/mormon-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/mormon-s.svg
rename to data/styles/default/light/symbols/mormon-s.svg
diff --git a/data/styles/clear/style-clear/symbols/motorcycle-parking-m.svg b/data/styles/default/light/symbols/motorcycle-parking-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/motorcycle-parking-m.svg
rename to data/styles/default/light/symbols/motorcycle-parking-m.svg
diff --git a/data/styles/clear/style-clear/symbols/motorcycle_repair-m.svg b/data/styles/default/light/symbols/motorcycle_repair-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/motorcycle_repair-m.svg
rename to data/styles/default/light/symbols/motorcycle_repair-m.svg
diff --git a/data/styles/clear/style-clear/symbols/motorcycle_shop-m.svg b/data/styles/default/light/symbols/motorcycle_shop-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/motorcycle_shop-m.svg
rename to data/styles/default/light/symbols/motorcycle_shop-m.svg
diff --git a/data/styles/clear/style-clear/symbols/mountain-pass-m.svg b/data/styles/default/light/symbols/mountain-pass-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/mountain-pass-m.svg
rename to data/styles/default/light/symbols/mountain-pass-m.svg
diff --git a/data/styles/clear/style-clear/symbols/mountain-pass-s.svg b/data/styles/default/light/symbols/mountain-pass-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/mountain-pass-s.svg
rename to data/styles/default/light/symbols/mountain-pass-s.svg
diff --git a/data/styles/clear/style-clear/symbols/museum-m.svg b/data/styles/default/light/symbols/museum-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/museum-m.svg
rename to data/styles/default/light/symbols/museum-m.svg
diff --git a/data/styles/clear/style-clear/symbols/museum-s.svg b/data/styles/default/light/symbols/museum-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/museum-s.svg
rename to data/styles/default/light/symbols/museum-s.svg
diff --git a/data/styles/clear/style-clear/symbols/music-m.svg b/data/styles/default/light/symbols/music-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/music-m.svg
rename to data/styles/default/light/symbols/music-m.svg
diff --git a/data/styles/clear/style-clear/symbols/music_school-m.svg b/data/styles/default/light/symbols/music_school-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/music_school-m.svg
rename to data/styles/default/light/symbols/music_school-m.svg
diff --git a/data/styles/clear/style-clear/symbols/musical-instrument-m.svg b/data/styles/default/light/symbols/musical-instrument-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/musical-instrument-m.svg
rename to data/styles/default/light/symbols/musical-instrument-m.svg
diff --git a/data/styles/clear/style-clear/symbols/muslim-m.svg b/data/styles/default/light/symbols/muslim-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/muslim-m.svg
rename to data/styles/default/light/symbols/muslim-m.svg
diff --git a/data/styles/clear/style-clear/symbols/muslim-s.svg b/data/styles/default/light/symbols/muslim-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/muslim-s.svg
rename to data/styles/default/light/symbols/muslim-s.svg
diff --git a/data/styles/clear/style-clear/symbols/needle_and_thread-m.svg b/data/styles/default/light/symbols/needle_and_thread-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/needle_and_thread-m.svg
rename to data/styles/default/light/symbols/needle_and_thread-m.svg
diff --git a/data/styles/clear/style-clear/symbols/newsagent_shop-m.svg b/data/styles/default/light/symbols/newsagent_shop-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/newsagent_shop-m.svg
rename to data/styles/default/light/symbols/newsagent_shop-m.svg
diff --git a/data/styles/clear/style-clear/symbols/nightclub-m.svg b/data/styles/default/light/symbols/nightclub-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/nightclub-m.svg
rename to data/styles/default/light/symbols/nightclub-m.svg
diff --git a/data/styles/clear/style-clear/symbols/npark-m.svg b/data/styles/default/light/symbols/npark-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/npark-m.svg
rename to data/styles/default/light/symbols/npark-m.svg
diff --git a/data/styles/clear/style-clear/symbols/nparkf-m.svg b/data/styles/default/light/symbols/nparkf-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/nparkf-m.svg
rename to data/styles/default/light/symbols/nparkf-m.svg
diff --git a/data/styles/clear/style-clear/symbols/nparkf-outline-m.svg b/data/styles/default/light/symbols/nparkf-outline-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/nparkf-outline-m.svg
rename to data/styles/default/light/symbols/nparkf-outline-m.svg
diff --git a/data/styles/clear/style-clear/symbols/nparkf-outline-s.svg b/data/styles/default/light/symbols/nparkf-outline-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/nparkf-outline-s.svg
rename to data/styles/default/light/symbols/nparkf-outline-s.svg
diff --git a/data/styles/clear/style-clear/symbols/nparkf-s.svg b/data/styles/default/light/symbols/nparkf-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/nparkf-s.svg
rename to data/styles/default/light/symbols/nparkf-s.svg
diff --git a/data/styles/clear/style-clear/symbols/office-m.svg b/data/styles/default/light/symbols/office-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/office-m.svg
rename to data/styles/default/light/symbols/office-m.svg
diff --git a/data/styles/clear/style-clear/symbols/optician-m.svg b/data/styles/default/light/symbols/optician-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/optician-m.svg
rename to data/styles/default/light/symbols/optician-m.svg
diff --git a/data/styles/clear/style-clear/symbols/optometrist-m.svg b/data/styles/default/light/symbols/optometrist-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/optometrist-m.svg
rename to data/styles/default/light/symbols/optometrist-m.svg
diff --git a/data/styles/clear/style-clear/symbols/outdoor-shop-m.svg b/data/styles/default/light/symbols/outdoor-shop-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/outdoor-shop-m.svg
rename to data/styles/default/light/symbols/outdoor-shop-m.svg
diff --git a/data/styles/clear/style-clear/symbols/outdoor_seating-m.svg b/data/styles/default/light/symbols/outdoor_seating-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/outdoor_seating-m.svg
rename to data/styles/default/light/symbols/outdoor_seating-m.svg
diff --git a/data/styles/clear/style-clear/symbols/padel-m.svg b/data/styles/default/light/symbols/padel-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/padel-m.svg
rename to data/styles/default/light/symbols/padel-m.svg
diff --git a/data/styles/clear/style-clear/symbols/painter-m.svg b/data/styles/default/light/symbols/painter-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/painter-m.svg
rename to data/styles/default/light/symbols/painter-m.svg
diff --git a/data/styles/clear/style-clear/symbols/parcel_locker-m.svg b/data/styles/default/light/symbols/parcel_locker-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/parcel_locker-m.svg
rename to data/styles/default/light/symbols/parcel_locker-m.svg
diff --git a/data/styles/clear/style-clear/symbols/park-m.svg b/data/styles/default/light/symbols/park-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/park-m.svg
rename to data/styles/default/light/symbols/park-m.svg
diff --git a/data/styles/clear/style-clear/symbols/park-outline-m.svg b/data/styles/default/light/symbols/park-outline-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/park-outline-m.svg
rename to data/styles/default/light/symbols/park-outline-m.svg
diff --git a/data/styles/clear/style-clear/symbols/park-outline-s.svg b/data/styles/default/light/symbols/park-outline-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/park-outline-s.svg
rename to data/styles/default/light/symbols/park-outline-s.svg
diff --git a/data/styles/clear/style-clear/symbols/park-s.svg b/data/styles/default/light/symbols/park-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/park-s.svg
rename to data/styles/default/light/symbols/park-s.svg
diff --git a/data/styles/clear/style-clear/symbols/parking-disabled-m.svg b/data/styles/default/light/symbols/parking-disabled-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/parking-disabled-m.svg
rename to data/styles/default/light/symbols/parking-disabled-m.svg
diff --git a/data/styles/clear/style-clear/symbols/parking-m.svg b/data/styles/default/light/symbols/parking-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/parking-m.svg
rename to data/styles/default/light/symbols/parking-m.svg
diff --git a/data/styles/clear/style-clear/symbols/parking-meter-m.svg b/data/styles/default/light/symbols/parking-meter-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/parking-meter-m.svg
rename to data/styles/default/light/symbols/parking-meter-m.svg
diff --git a/data/styles/clear/style-clear/symbols/parking-s.svg b/data/styles/default/light/symbols/parking-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/parking-s.svg
rename to data/styles/default/light/symbols/parking-s.svg
diff --git a/data/styles/clear/style-clear/symbols/parking_entrance-m.svg b/data/styles/default/light/symbols/parking_entrance-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/parking_entrance-m.svg
rename to data/styles/default/light/symbols/parking_entrance-m.svg
diff --git a/data/styles/clear/style-clear/symbols/parking_entrance_private-m.svg b/data/styles/default/light/symbols/parking_entrance_private-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/parking_entrance_private-m.svg
rename to data/styles/default/light/symbols/parking_entrance_private-m.svg
diff --git a/data/styles/clear/style-clear/symbols/parking_pay-m.svg b/data/styles/default/light/symbols/parking_pay-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/parking_pay-m.svg
rename to data/styles/default/light/symbols/parking_pay-m.svg
diff --git a/data/styles/clear/style-clear/symbols/parking_pay-s.svg b/data/styles/default/light/symbols/parking_pay-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/parking_pay-s.svg
rename to data/styles/default/light/symbols/parking_pay-s.svg
diff --git a/data/styles/clear/style-clear/symbols/parking_private-m.svg b/data/styles/default/light/symbols/parking_private-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/parking_private-m.svg
rename to data/styles/default/light/symbols/parking_private-m.svg
diff --git a/data/styles/clear/style-clear/symbols/parking_private-s.svg b/data/styles/default/light/symbols/parking_private-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/parking_private-s.svg
rename to data/styles/default/light/symbols/parking_private-s.svg
diff --git a/data/styles/clear/style-clear/symbols/parking_underground-m.svg b/data/styles/default/light/symbols/parking_underground-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/parking_underground-m.svg
rename to data/styles/default/light/symbols/parking_underground-m.svg
diff --git a/data/styles/clear/style-clear/symbols/parking_underground_pay-m.svg b/data/styles/default/light/symbols/parking_underground_pay-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/parking_underground_pay-m.svg
rename to data/styles/default/light/symbols/parking_underground_pay-m.svg
diff --git a/data/styles/clear/style-clear/symbols/parking_underground_private-m.svg b/data/styles/default/light/symbols/parking_underground_private-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/parking_underground_private-m.svg
rename to data/styles/default/light/symbols/parking_underground_private-m.svg
diff --git a/data/styles/clear/style-clear/symbols/peakt-m.svg b/data/styles/default/light/symbols/peakt-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/peakt-m.svg
rename to data/styles/default/light/symbols/peakt-m.svg
diff --git a/data/styles/clear/style-clear/symbols/peakt-s.svg b/data/styles/default/light/symbols/peakt-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/peakt-s.svg
rename to data/styles/default/light/symbols/peakt-s.svg
diff --git a/data/styles/clear/style-clear/symbols/pelota-m.svg b/data/styles/default/light/symbols/pelota-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/pelota-m.svg
rename to data/styles/default/light/symbols/pelota-m.svg
diff --git a/data/styles/clear/style-clear/symbols/petshop-m.svg b/data/styles/default/light/symbols/petshop-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/petshop-m.svg
rename to data/styles/default/light/symbols/petshop-m.svg
diff --git a/data/styles/clear/style-clear/symbols/petting_zoo-m.svg b/data/styles/default/light/symbols/petting_zoo-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/petting_zoo-m.svg
rename to data/styles/default/light/symbols/petting_zoo-m.svg
diff --git a/data/styles/clear/style-clear/symbols/pharmacy-m.svg b/data/styles/default/light/symbols/pharmacy-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/pharmacy-m.svg
rename to data/styles/default/light/symbols/pharmacy-m.svg
diff --git a/data/styles/clear/style-clear/symbols/phone-m.svg b/data/styles/default/light/symbols/phone-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/phone-m.svg
rename to data/styles/default/light/symbols/phone-m.svg
diff --git a/data/styles/clear/style-clear/symbols/photo-shop-m.svg b/data/styles/default/light/symbols/photo-shop-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/photo-shop-m.svg
rename to data/styles/default/light/symbols/photo-shop-m.svg
diff --git a/data/styles/clear/style-clear/symbols/physiotherapist-m.svg b/data/styles/default/light/symbols/physiotherapist-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/physiotherapist-m.svg
rename to data/styles/default/light/symbols/physiotherapist-m.svg
diff --git a/data/styles/clear/style-clear/symbols/picnic-m.svg b/data/styles/default/light/symbols/picnic-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/picnic-m.svg
rename to data/styles/default/light/symbols/picnic-m.svg
diff --git a/data/styles/clear/style-clear/symbols/picnic-s.svg b/data/styles/default/light/symbols/picnic-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/picnic-s.svg
rename to data/styles/default/light/symbols/picnic-s.svg
diff --git a/data/styles/clear/style-clear/symbols/picnic_table-m.svg b/data/styles/default/light/symbols/picnic_table-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/picnic_table-m.svg
rename to data/styles/default/light/symbols/picnic_table-m.svg
diff --git a/data/styles/clear/style-clear/symbols/pitch-m.svg b/data/styles/default/light/symbols/pitch-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/pitch-m.svg
rename to data/styles/default/light/symbols/pitch-m.svg
diff --git a/data/styles/clear/style-clear/symbols/place-of-worship-m.svg b/data/styles/default/light/symbols/place-of-worship-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/place-of-worship-m.svg
rename to data/styles/default/light/symbols/place-of-worship-m.svg
diff --git a/data/styles/clear/style-clear/symbols/place-of-worship-s.svg b/data/styles/default/light/symbols/place-of-worship-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/place-of-worship-s.svg
rename to data/styles/default/light/symbols/place-of-worship-s.svg
diff --git a/data/styles/clear/style-clear/symbols/plaque.svg b/data/styles/default/light/symbols/plaque.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/plaque.svg
rename to data/styles/default/light/symbols/plaque.svg
diff --git a/data/styles/clear/style-clear/symbols/playground-m.svg b/data/styles/default/light/symbols/playground-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/playground-m.svg
rename to data/styles/default/light/symbols/playground-m.svg
diff --git a/data/styles/clear/style-clear/symbols/plumber-m.svg b/data/styles/default/light/symbols/plumber-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/plumber-m.svg
rename to data/styles/default/light/symbols/plumber-m.svg
diff --git a/data/styles/clear/style-clear/symbols/podiatrist-m.svg b/data/styles/default/light/symbols/podiatrist-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/podiatrist-m.svg
rename to data/styles/default/light/symbols/podiatrist-m.svg
diff --git a/data/styles/clear/style-clear/symbols/police-m.svg b/data/styles/default/light/symbols/police-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/police-m.svg
rename to data/styles/default/light/symbols/police-m.svg
diff --git a/data/styles/clear/style-clear/symbols/postbox-m.svg b/data/styles/default/light/symbols/postbox-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/postbox-m.svg
rename to data/styles/default/light/symbols/postbox-m.svg
diff --git a/data/styles/clear/style-clear/symbols/power-m.svg b/data/styles/default/light/symbols/power-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/power-m.svg
rename to data/styles/default/light/symbols/power-m.svg
diff --git a/data/styles/clear/style-clear/symbols/power-tower-m.svg b/data/styles/default/light/symbols/power-tower-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/power-tower-m.svg
rename to data/styles/default/light/symbols/power-tower-m.svg
diff --git a/data/styles/clear/style-clear/symbols/power_plant_wind-m.svg b/data/styles/default/light/symbols/power_plant_wind-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/power_plant_wind-m.svg
rename to data/styles/default/light/symbols/power_plant_wind-m.svg
diff --git a/data/styles/clear/style-clear/symbols/prison-m.svg b/data/styles/default/light/symbols/prison-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/prison-m.svg
rename to data/styles/default/light/symbols/prison-m.svg
diff --git a/data/styles/clear/style-clear/symbols/psychotherapist-m.svg b/data/styles/default/light/symbols/psychotherapist-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/psychotherapist-m.svg
rename to data/styles/default/light/symbols/psychotherapist-m.svg
diff --git a/data/styles/clear/style-clear/symbols/public-building-m.svg b/data/styles/default/light/symbols/public-building-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/public-building-m.svg
rename to data/styles/default/light/symbols/public-building-m.svg
diff --git a/data/styles/clear/style-clear/symbols/public_bath-m.svg b/data/styles/default/light/symbols/public_bath-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/public_bath-m.svg
rename to data/styles/default/light/symbols/public_bath-m.svg
diff --git a/data/styles/clear/style-clear/symbols/railway-crossing-l.svg b/data/styles/default/light/symbols/railway-crossing-l.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/railway-crossing-l.svg
rename to data/styles/default/light/symbols/railway-crossing-l.svg
diff --git a/data/styles/clear/style-clear/symbols/railway-crossing-m.svg b/data/styles/default/light/symbols/railway-crossing-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/railway-crossing-m.svg
rename to data/styles/default/light/symbols/railway-crossing-m.svg
diff --git a/data/styles/clear/style-clear/symbols/recycling-m.svg b/data/styles/default/light/symbols/recycling-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/recycling-m.svg
rename to data/styles/default/light/symbols/recycling-m.svg
diff --git a/data/styles/clear/style-clear/symbols/remains-m.svg b/data/styles/default/light/symbols/remains-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/remains-m.svg
rename to data/styles/default/light/symbols/remains-m.svg
diff --git a/data/styles/clear/style-clear/symbols/remains-s.svg b/data/styles/default/light/symbols/remains-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/remains-s.svg
rename to data/styles/default/light/symbols/remains-s.svg
diff --git a/data/styles/clear/style-clear/symbols/rental-m.svg b/data/styles/default/light/symbols/rental-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/rental-m.svg
rename to data/styles/default/light/symbols/rental-m.svg
diff --git a/data/styles/clear/style-clear/symbols/restaurant-m.svg b/data/styles/default/light/symbols/restaurant-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/restaurant-m.svg
rename to data/styles/default/light/symbols/restaurant-m.svg
diff --git a/data/styles/clear/style-clear/symbols/sample_collection-m.svg b/data/styles/default/light/symbols/sample_collection-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/sample_collection-m.svg
rename to data/styles/default/light/symbols/sample_collection-m.svg
diff --git a/data/styles/clear/style-clear/symbols/sawmill-m.svg b/data/styles/default/light/symbols/sawmill-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/sawmill-m.svg
rename to data/styles/default/light/symbols/sawmill-m.svg
diff --git a/data/styles/clear/style-clear/symbols/school-m.svg b/data/styles/default/light/symbols/school-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/school-m.svg
rename to data/styles/default/light/symbols/school-m.svg
diff --git a/data/styles/clear/style-clear/symbols/seafood-shop-m.svg b/data/styles/default/light/symbols/seafood-shop-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/seafood-shop-m.svg
rename to data/styles/default/light/symbols/seafood-shop-m.svg
diff --git a/data/styles/clear/style-clear/symbols/second_hand_shop-m.svg b/data/styles/default/light/symbols/second_hand_shop-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/second_hand_shop-m.svg
rename to data/styles/default/light/symbols/second_hand_shop-m.svg
diff --git a/data/styles/clear/style-clear/symbols/shelter-m.svg b/data/styles/default/light/symbols/shelter-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/shelter-m.svg
rename to data/styles/default/light/symbols/shelter-m.svg
diff --git a/data/styles/clear/style-clear/symbols/shelter-public_transport-m.svg b/data/styles/default/light/symbols/shelter-public_transport-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/shelter-public_transport-m.svg
rename to data/styles/default/light/symbols/shelter-public_transport-m.svg
diff --git a/data/styles/clear/style-clear/symbols/shelter-s.svg b/data/styles/default/light/symbols/shelter-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/shelter-s.svg
rename to data/styles/default/light/symbols/shelter-s.svg
diff --git a/data/styles/clear/style-clear/symbols/shinto-m.svg b/data/styles/default/light/symbols/shinto-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/shinto-m.svg
rename to data/styles/default/light/symbols/shinto-m.svg
diff --git a/data/styles/clear/style-clear/symbols/shinto-s.svg b/data/styles/default/light/symbols/shinto-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/shinto-s.svg
rename to data/styles/default/light/symbols/shinto-s.svg
diff --git a/data/styles/clear/style-clear/symbols/ship-m.svg b/data/styles/default/light/symbols/ship-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/ship-m.svg
rename to data/styles/default/light/symbols/ship-m.svg
diff --git a/data/styles/clear/style-clear/symbols/ship-s.svg b/data/styles/default/light/symbols/ship-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/ship-s.svg
rename to data/styles/default/light/symbols/ship-s.svg
diff --git a/data/styles/clear/style-clear/symbols/shoes-m.svg b/data/styles/default/light/symbols/shoes-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/shoes-m.svg
rename to data/styles/default/light/symbols/shoes-m.svg
diff --git a/data/styles/clear/style-clear/symbols/shop-bicycle-m.svg b/data/styles/default/light/symbols/shop-bicycle-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/shop-bicycle-m.svg
rename to data/styles/default/light/symbols/shop-bicycle-m.svg
diff --git a/data/styles/clear/style-clear/symbols/shop-m.svg b/data/styles/default/light/symbols/shop-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/shop-m.svg
rename to data/styles/default/light/symbols/shop-m.svg
diff --git a/data/styles/clear/style-clear/symbols/shop-rental-bicycle-m.svg b/data/styles/default/light/symbols/shop-rental-bicycle-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/shop-rental-bicycle-m.svg
rename to data/styles/default/light/symbols/shop-rental-bicycle-m.svg
diff --git a/data/styles/clear/style-clear/symbols/shop-s.svg b/data/styles/default/light/symbols/shop-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/shop-s.svg
rename to data/styles/default/light/symbols/shop-s.svg
diff --git a/data/styles/clear/style-clear/symbols/shower-m.svg b/data/styles/default/light/symbols/shower-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/shower-m.svg
rename to data/styles/default/light/symbols/shower-m.svg
diff --git a/data/styles/clear/style-clear/symbols/skateboard-m.svg b/data/styles/default/light/symbols/skateboard-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/skateboard-m.svg
rename to data/styles/default/light/symbols/skateboard-m.svg
diff --git a/data/styles/clear/style-clear/symbols/skiing-m.svg b/data/styles/default/light/symbols/skiing-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/skiing-m.svg
rename to data/styles/default/light/symbols/skiing-m.svg
diff --git a/data/styles/clear/style-clear/symbols/slots-m.svg b/data/styles/default/light/symbols/slots-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/slots-m.svg
rename to data/styles/default/light/symbols/slots-m.svg
diff --git a/data/styles/clear/style-clear/symbols/soccer-m.svg b/data/styles/default/light/symbols/soccer-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/soccer-m.svg
rename to data/styles/default/light/symbols/soccer-m.svg
diff --git a/data/styles/clear/style-clear/symbols/speech_therapist-m.svg b/data/styles/default/light/symbols/speech_therapist-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/speech_therapist-m.svg
rename to data/styles/default/light/symbols/speech_therapist-m.svg
diff --git a/data/styles/clear/style-clear/symbols/speedcam-alert-l.svg b/data/styles/default/light/symbols/speedcam-alert-l.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/speedcam-alert-l.svg
rename to data/styles/default/light/symbols/speedcam-alert-l.svg
diff --git a/data/styles/clear/style-clear/symbols/speedcam-m.svg b/data/styles/default/light/symbols/speedcam-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/speedcam-m.svg
rename to data/styles/default/light/symbols/speedcam-m.svg
diff --git a/data/styles/clear/style-clear/symbols/speedcam-s.svg b/data/styles/default/light/symbols/speedcam-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/speedcam-s.svg
rename to data/styles/default/light/symbols/speedcam-s.svg
diff --git a/data/styles/clear/style-clear/symbols/sports-m.svg b/data/styles/default/light/symbols/sports-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/sports-m.svg
rename to data/styles/default/light/symbols/sports-m.svg
diff --git a/data/styles/clear/style-clear/symbols/stadium-m.svg b/data/styles/default/light/symbols/stadium-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/stadium-m.svg
rename to data/styles/default/light/symbols/stadium-m.svg
diff --git a/data/styles/clear/style-clear/symbols/stadium-s.svg b/data/styles/default/light/symbols/stadium-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/stadium-s.svg
rename to data/styles/default/light/symbols/stadium-s.svg
diff --git a/data/styles/clear/style-night/symbols/star-l.svg b/data/styles/default/light/symbols/star-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/star-l.svg
rename to data/styles/default/light/symbols/star-l.svg
diff --git a/data/styles/clear/style-night/symbols/star-m.svg b/data/styles/default/light/symbols/star-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/star-m.svg
rename to data/styles/default/light/symbols/star-m.svg
diff --git a/data/styles/clear/style-night/symbols/star-s.svg b/data/styles/default/light/symbols/star-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/star-s.svg
rename to data/styles/default/light/symbols/star-s.svg
diff --git a/data/styles/clear/style-clear/symbols/stationery_shop-m.svg b/data/styles/default/light/symbols/stationery_shop-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/stationery_shop-m.svg
rename to data/styles/default/light/symbols/stationery_shop-m.svg
diff --git a/data/styles/clear/style-clear/symbols/statue-m.svg b/data/styles/default/light/symbols/statue-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/statue-m.svg
rename to data/styles/default/light/symbols/statue-m.svg
diff --git a/data/styles/clear/style-clear/symbols/stone-m.svg b/data/styles/default/light/symbols/stone-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/stone-m.svg
rename to data/styles/default/light/symbols/stone-m.svg
diff --git a/data/styles/clear/style-clear/symbols/storage-tank.svg b/data/styles/default/light/symbols/storage-tank.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/storage-tank.svg
rename to data/styles/default/light/symbols/storage-tank.svg
diff --git a/data/styles/clear/style-clear/symbols/stripclub-m.svg b/data/styles/default/light/symbols/stripclub-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/stripclub-m.svg
rename to data/styles/default/light/symbols/stripclub-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-adana-m.svg b/data/styles/default/light/symbols/subway-adana-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-adana-m.svg
rename to data/styles/default/light/symbols/subway-adana-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-adana-s.svg b/data/styles/default/light/symbols/subway-adana-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-adana-s.svg
rename to data/styles/default/light/symbols/subway-adana-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-algeria-m.svg b/data/styles/default/light/symbols/subway-algeria-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-algeria-m.svg
rename to data/styles/default/light/symbols/subway-algeria-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-algeria-s.svg b/data/styles/default/light/symbols/subway-algeria-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-algeria-s.svg
rename to data/styles/default/light/symbols/subway-algeria-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-alicante-m.svg b/data/styles/default/light/symbols/subway-alicante-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-alicante-m.svg
rename to data/styles/default/light/symbols/subway-alicante-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-alicante-s.svg b/data/styles/default/light/symbols/subway-alicante-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-alicante-s.svg
rename to data/styles/default/light/symbols/subway-alicante-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-almaty-m.svg b/data/styles/default/light/symbols/subway-almaty-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-almaty-m.svg
rename to data/styles/default/light/symbols/subway-almaty-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-almaty-s.svg b/data/styles/default/light/symbols/subway-almaty-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-almaty-s.svg
rename to data/styles/default/light/symbols/subway-almaty-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-amsterdam-m.svg b/data/styles/default/light/symbols/subway-amsterdam-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-amsterdam-m.svg
rename to data/styles/default/light/symbols/subway-amsterdam-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-amsterdam-s.svg b/data/styles/default/light/symbols/subway-amsterdam-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-amsterdam-s.svg
rename to data/styles/default/light/symbols/subway-amsterdam-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-ankara-m.svg b/data/styles/default/light/symbols/subway-ankara-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-ankara-m.svg
rename to data/styles/default/light/symbols/subway-ankara-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-ankara-s.svg b/data/styles/default/light/symbols/subway-ankara-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-ankara-s.svg
rename to data/styles/default/light/symbols/subway-ankara-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-athens-m.svg b/data/styles/default/light/symbols/subway-athens-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-athens-m.svg
rename to data/styles/default/light/symbols/subway-athens-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-athens-s.svg b/data/styles/default/light/symbols/subway-athens-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-athens-s.svg
rename to data/styles/default/light/symbols/subway-athens-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-baku-m.svg b/data/styles/default/light/symbols/subway-baku-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-baku-m.svg
rename to data/styles/default/light/symbols/subway-baku-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-baku-s.svg b/data/styles/default/light/symbols/subway-baku-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-baku-s.svg
rename to data/styles/default/light/symbols/subway-baku-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-bangkok-m.svg b/data/styles/default/light/symbols/subway-bangkok-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-bangkok-m.svg
rename to data/styles/default/light/symbols/subway-bangkok-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-bangkok-s.svg b/data/styles/default/light/symbols/subway-bangkok-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-bangkok-s.svg
rename to data/styles/default/light/symbols/subway-bangkok-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-barcelona-m.svg b/data/styles/default/light/symbols/subway-barcelona-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-barcelona-m.svg
rename to data/styles/default/light/symbols/subway-barcelona-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-barcelona-s.svg b/data/styles/default/light/symbols/subway-barcelona-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-barcelona-s.svg
rename to data/styles/default/light/symbols/subway-barcelona-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-beijing-m.svg b/data/styles/default/light/symbols/subway-beijing-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-beijing-m.svg
rename to data/styles/default/light/symbols/subway-beijing-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-beijing-s.svg b/data/styles/default/light/symbols/subway-beijing-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-beijing-s.svg
rename to data/styles/default/light/symbols/subway-beijing-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-bengaluru-m.svg b/data/styles/default/light/symbols/subway-bengaluru-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-bengaluru-m.svg
rename to data/styles/default/light/symbols/subway-bengaluru-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-bengaluru-s.svg b/data/styles/default/light/symbols/subway-bengaluru-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-bengaluru-s.svg
rename to data/styles/default/light/symbols/subway-bengaluru-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-bilbao-m.svg b/data/styles/default/light/symbols/subway-bilbao-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-bilbao-m.svg
rename to data/styles/default/light/symbols/subway-bilbao-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-bilbao-s.svg b/data/styles/default/light/symbols/subway-bilbao-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-bilbao-s.svg
rename to data/styles/default/light/symbols/subway-bilbao-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-brasilia-m.svg b/data/styles/default/light/symbols/subway-brasilia-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-brasilia-m.svg
rename to data/styles/default/light/symbols/subway-brasilia-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-brasilia-s.svg b/data/styles/default/light/symbols/subway-brasilia-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-brasilia-s.svg
rename to data/styles/default/light/symbols/subway-brasilia-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-brescia-m.svg b/data/styles/default/light/symbols/subway-brescia-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-brescia-m.svg
rename to data/styles/default/light/symbols/subway-brescia-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-brescia-s.svg b/data/styles/default/light/symbols/subway-brescia-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-brescia-s.svg
rename to data/styles/default/light/symbols/subway-brescia-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-brussel-m.svg b/data/styles/default/light/symbols/subway-brussel-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-brussel-m.svg
rename to data/styles/default/light/symbols/subway-brussel-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-brussel-s.svg b/data/styles/default/light/symbols/subway-brussel-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-brussel-s.svg
rename to data/styles/default/light/symbols/subway-brussel-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-bucharest-m.svg b/data/styles/default/light/symbols/subway-bucharest-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-bucharest-m.svg
rename to data/styles/default/light/symbols/subway-bucharest-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-bucharest-s.svg b/data/styles/default/light/symbols/subway-bucharest-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-bucharest-s.svg
rename to data/styles/default/light/symbols/subway-bucharest-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-budapest-m.svg b/data/styles/default/light/symbols/subway-budapest-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-budapest-m.svg
rename to data/styles/default/light/symbols/subway-budapest-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-budapest-s.svg b/data/styles/default/light/symbols/subway-budapest-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-budapest-s.svg
rename to data/styles/default/light/symbols/subway-budapest-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-buenosaires-m.svg b/data/styles/default/light/symbols/subway-buenosaires-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-buenosaires-m.svg
rename to data/styles/default/light/symbols/subway-buenosaires-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-buenosaires-s.svg b/data/styles/default/light/symbols/subway-buenosaires-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-buenosaires-s.svg
rename to data/styles/default/light/symbols/subway-buenosaires-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-bursaray-m.svg b/data/styles/default/light/symbols/subway-bursaray-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-bursaray-m.svg
rename to data/styles/default/light/symbols/subway-bursaray-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-bursaray-s.svg b/data/styles/default/light/symbols/subway-bursaray-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-bursaray-s.svg
rename to data/styles/default/light/symbols/subway-bursaray-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-cairo-m.svg b/data/styles/default/light/symbols/subway-cairo-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-cairo-m.svg
rename to data/styles/default/light/symbols/subway-cairo-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-cairo-s.svg b/data/styles/default/light/symbols/subway-cairo-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-cairo-s.svg
rename to data/styles/default/light/symbols/subway-cairo-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-caracas-m.svg b/data/styles/default/light/symbols/subway-caracas-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-caracas-m.svg
rename to data/styles/default/light/symbols/subway-caracas-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-caracas-s.svg b/data/styles/default/light/symbols/subway-caracas-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-caracas-s.svg
rename to data/styles/default/light/symbols/subway-caracas-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-catania-m.svg b/data/styles/default/light/symbols/subway-catania-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-catania-m.svg
rename to data/styles/default/light/symbols/subway-catania-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-catania-s.svg b/data/styles/default/light/symbols/subway-catania-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-catania-s.svg
rename to data/styles/default/light/symbols/subway-catania-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-changchun-m.svg b/data/styles/default/light/symbols/subway-changchun-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-changchun-m.svg
rename to data/styles/default/light/symbols/subway-changchun-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-changchun-s.svg b/data/styles/default/light/symbols/subway-changchun-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-changchun-s.svg
rename to data/styles/default/light/symbols/subway-changchun-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-chengdu-m.svg b/data/styles/default/light/symbols/subway-chengdu-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-chengdu-m.svg
rename to data/styles/default/light/symbols/subway-chengdu-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-chengdu-s.svg b/data/styles/default/light/symbols/subway-chengdu-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-chengdu-s.svg
rename to data/styles/default/light/symbols/subway-chengdu-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-chicago-m.svg b/data/styles/default/light/symbols/subway-chicago-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-chicago-m.svg
rename to data/styles/default/light/symbols/subway-chicago-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-chicago-s.svg b/data/styles/default/light/symbols/subway-chicago-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-chicago-s.svg
rename to data/styles/default/light/symbols/subway-chicago-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-chongqing-m.svg b/data/styles/default/light/symbols/subway-chongqing-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-chongqing-m.svg
rename to data/styles/default/light/symbols/subway-chongqing-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-chongqing-s.svg b/data/styles/default/light/symbols/subway-chongqing-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-chongqing-s.svg
rename to data/styles/default/light/symbols/subway-chongqing-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-dalian-m.svg b/data/styles/default/light/symbols/subway-dalian-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-dalian-m.svg
rename to data/styles/default/light/symbols/subway-dalian-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-dalian-s.svg b/data/styles/default/light/symbols/subway-dalian-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-dalian-s.svg
rename to data/styles/default/light/symbols/subway-dalian-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-delhi-m.svg b/data/styles/default/light/symbols/subway-delhi-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-delhi-m.svg
rename to data/styles/default/light/symbols/subway-delhi-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-delhi-s.svg b/data/styles/default/light/symbols/subway-delhi-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-delhi-s.svg
rename to data/styles/default/light/symbols/subway-delhi-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-dnepro-m.svg b/data/styles/default/light/symbols/subway-dnepro-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-dnepro-m.svg
rename to data/styles/default/light/symbols/subway-dnepro-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-dnepro-s.svg b/data/styles/default/light/symbols/subway-dnepro-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-dnepro-s.svg
rename to data/styles/default/light/symbols/subway-dnepro-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-dubai-m.svg b/data/styles/default/light/symbols/subway-dubai-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-dubai-m.svg
rename to data/styles/default/light/symbols/subway-dubai-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-dubai-s.svg b/data/styles/default/light/symbols/subway-dubai-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-dubai-s.svg
rename to data/styles/default/light/symbols/subway-dubai-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-edmonton-m.svg b/data/styles/default/light/symbols/subway-edmonton-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-edmonton-m.svg
rename to data/styles/default/light/symbols/subway-edmonton-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-edmonton-s.svg b/data/styles/default/light/symbols/subway-edmonton-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-edmonton-s.svg
rename to data/styles/default/light/symbols/subway-edmonton-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-ekb-m.svg b/data/styles/default/light/symbols/subway-ekb-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-ekb-m.svg
rename to data/styles/default/light/symbols/subway-ekb-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-ekb-s.svg b/data/styles/default/light/symbols/subway-ekb-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-ekb-s.svg
rename to data/styles/default/light/symbols/subway-ekb-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-entrance-m.svg b/data/styles/default/light/symbols/subway-entrance-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-entrance-m.svg
rename to data/styles/default/light/symbols/subway-entrance-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-entrance-s.svg b/data/styles/default/light/symbols/subway-entrance-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-entrance-s.svg
rename to data/styles/default/light/symbols/subway-entrance-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-foshan-m.svg b/data/styles/default/light/symbols/subway-foshan-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-foshan-m.svg
rename to data/styles/default/light/symbols/subway-foshan-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-foshan-s.svg b/data/styles/default/light/symbols/subway-foshan-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-foshan-s.svg
rename to data/styles/default/light/symbols/subway-foshan-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-fukuoka-m.svg b/data/styles/default/light/symbols/subway-fukuoka-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-fukuoka-m.svg
rename to data/styles/default/light/symbols/subway-fukuoka-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-fukuoka-s.svg b/data/styles/default/light/symbols/subway-fukuoka-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-fukuoka-s.svg
rename to data/styles/default/light/symbols/subway-fukuoka-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-glasgow-m.svg b/data/styles/default/light/symbols/subway-glasgow-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-glasgow-m.svg
rename to data/styles/default/light/symbols/subway-glasgow-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-glasgow-s.svg b/data/styles/default/light/symbols/subway-glasgow-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-glasgow-s.svg
rename to data/styles/default/light/symbols/subway-glasgow-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-guadalajara-m.svg b/data/styles/default/light/symbols/subway-guadalajara-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-guadalajara-m.svg
rename to data/styles/default/light/symbols/subway-guadalajara-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-guadalajara-s.svg b/data/styles/default/light/symbols/subway-guadalajara-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-guadalajara-s.svg
rename to data/styles/default/light/symbols/subway-guadalajara-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-guangzhou-m.svg b/data/styles/default/light/symbols/subway-guangzhou-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-guangzhou-m.svg
rename to data/styles/default/light/symbols/subway-guangzhou-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-guangzhou-s.svg b/data/styles/default/light/symbols/subway-guangzhou-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-guangzhou-s.svg
rename to data/styles/default/light/symbols/subway-guangzhou-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-haagse-m.svg b/data/styles/default/light/symbols/subway-haagse-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-haagse-m.svg
rename to data/styles/default/light/symbols/subway-haagse-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-haagse-s.svg b/data/styles/default/light/symbols/subway-haagse-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-haagse-s.svg
rename to data/styles/default/light/symbols/subway-haagse-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-helsinki-m.svg b/data/styles/default/light/symbols/subway-helsinki-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-helsinki-m.svg
rename to data/styles/default/light/symbols/subway-helsinki-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-helsinki-s.svg b/data/styles/default/light/symbols/subway-helsinki-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-helsinki-s.svg
rename to data/styles/default/light/symbols/subway-helsinki-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-hirosima-m.svg b/data/styles/default/light/symbols/subway-hirosima-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-hirosima-m.svg
rename to data/styles/default/light/symbols/subway-hirosima-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-hirosima-s.svg b/data/styles/default/light/symbols/subway-hirosima-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-hirosima-s.svg
rename to data/styles/default/light/symbols/subway-hirosima-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-isfahan-m.svg b/data/styles/default/light/symbols/subway-isfahan-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-isfahan-m.svg
rename to data/styles/default/light/symbols/subway-isfahan-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-isfahan-s.svg b/data/styles/default/light/symbols/subway-isfahan-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-isfahan-s.svg
rename to data/styles/default/light/symbols/subway-isfahan-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-istanbul-m.svg b/data/styles/default/light/symbols/subway-istanbul-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-istanbul-m.svg
rename to data/styles/default/light/symbols/subway-istanbul-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-istanbul-s.svg b/data/styles/default/light/symbols/subway-istanbul-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-istanbul-s.svg
rename to data/styles/default/light/symbols/subway-istanbul-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-izmir-m.svg b/data/styles/default/light/symbols/subway-izmir-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-izmir-m.svg
rename to data/styles/default/light/symbols/subway-izmir-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-izmir-s.svg b/data/styles/default/light/symbols/subway-izmir-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-izmir-s.svg
rename to data/styles/default/light/symbols/subway-izmir-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-kazan-m.svg b/data/styles/default/light/symbols/subway-kazan-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-kazan-m.svg
rename to data/styles/default/light/symbols/subway-kazan-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-kazan-s.svg b/data/styles/default/light/symbols/subway-kazan-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-kazan-s.svg
rename to data/styles/default/light/symbols/subway-kazan-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-kharkiv-m.svg b/data/styles/default/light/symbols/subway-kharkiv-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-kharkiv-m.svg
rename to data/styles/default/light/symbols/subway-kharkiv-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-kharkiv-s.svg b/data/styles/default/light/symbols/subway-kharkiv-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-kharkiv-s.svg
rename to data/styles/default/light/symbols/subway-kharkiv-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-kiev-m.svg b/data/styles/default/light/symbols/subway-kiev-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-kiev-m.svg
rename to data/styles/default/light/symbols/subway-kiev-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-kiev-s.svg b/data/styles/default/light/symbols/subway-kiev-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-kiev-s.svg
rename to data/styles/default/light/symbols/subway-kiev-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-kobe-m.svg b/data/styles/default/light/symbols/subway-kobe-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-kobe-m.svg
rename to data/styles/default/light/symbols/subway-kobe-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-kobe-s.svg b/data/styles/default/light/symbols/subway-kobe-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-kobe-s.svg
rename to data/styles/default/light/symbols/subway-kobe-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-kolkata-m.svg b/data/styles/default/light/symbols/subway-kolkata-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-kolkata-m.svg
rename to data/styles/default/light/symbols/subway-kolkata-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-kolkata-s.svg b/data/styles/default/light/symbols/subway-kolkata-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-kolkata-s.svg
rename to data/styles/default/light/symbols/subway-kolkata-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-kryvyirih-m.svg b/data/styles/default/light/symbols/subway-kryvyirih-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-kryvyirih-m.svg
rename to data/styles/default/light/symbols/subway-kryvyirih-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-kryvyirih-s.svg b/data/styles/default/light/symbols/subway-kryvyirih-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-kryvyirih-s.svg
rename to data/styles/default/light/symbols/subway-kryvyirih-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-kunming-m.svg b/data/styles/default/light/symbols/subway-kunming-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-kunming-m.svg
rename to data/styles/default/light/symbols/subway-kunming-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-kunming-s.svg b/data/styles/default/light/symbols/subway-kunming-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-kunming-s.svg
rename to data/styles/default/light/symbols/subway-kunming-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-kyoto-m.svg b/data/styles/default/light/symbols/subway-kyoto-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-kyoto-m.svg
rename to data/styles/default/light/symbols/subway-kyoto-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-kyoto-s.svg b/data/styles/default/light/symbols/subway-kyoto-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-kyoto-s.svg
rename to data/styles/default/light/symbols/subway-kyoto-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-lausanne-m.svg b/data/styles/default/light/symbols/subway-lausanne-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-lausanne-m.svg
rename to data/styles/default/light/symbols/subway-lausanne-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-lausanne-s.svg b/data/styles/default/light/symbols/subway-lausanne-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-lausanne-s.svg
rename to data/styles/default/light/symbols/subway-lausanne-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-lille-m.svg b/data/styles/default/light/symbols/subway-lille-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-lille-m.svg
rename to data/styles/default/light/symbols/subway-lille-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-lille-s.svg b/data/styles/default/light/symbols/subway-lille-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-lille-s.svg
rename to data/styles/default/light/symbols/subway-lille-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-lima-m.svg b/data/styles/default/light/symbols/subway-lima-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-lima-m.svg
rename to data/styles/default/light/symbols/subway-lima-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-lima-s.svg b/data/styles/default/light/symbols/subway-lima-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-lima-s.svg
rename to data/styles/default/light/symbols/subway-lima-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-lisboa-m.svg b/data/styles/default/light/symbols/subway-lisboa-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-lisboa-m.svg
rename to data/styles/default/light/symbols/subway-lisboa-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-lisboa-s.svg b/data/styles/default/light/symbols/subway-lisboa-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-lisboa-s.svg
rename to data/styles/default/light/symbols/subway-lisboa-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-london-m.svg b/data/styles/default/light/symbols/subway-london-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-london-m.svg
rename to data/styles/default/light/symbols/subway-london-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-london-s.svg b/data/styles/default/light/symbols/subway-london-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-london-s.svg
rename to data/styles/default/light/symbols/subway-london-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-losangeles-m.svg b/data/styles/default/light/symbols/subway-losangeles-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-losangeles-m.svg
rename to data/styles/default/light/symbols/subway-losangeles-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-losangeles-s.svg b/data/styles/default/light/symbols/subway-losangeles-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-losangeles-s.svg
rename to data/styles/default/light/symbols/subway-losangeles-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-lucknow-m.svg b/data/styles/default/light/symbols/subway-lucknow-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-lucknow-m.svg
rename to data/styles/default/light/symbols/subway-lucknow-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-lucknow-s.svg b/data/styles/default/light/symbols/subway-lucknow-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-lucknow-s.svg
rename to data/styles/default/light/symbols/subway-lucknow-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-lyon-m.svg b/data/styles/default/light/symbols/subway-lyon-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-lyon-m.svg
rename to data/styles/default/light/symbols/subway-lyon-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-lyon-s.svg b/data/styles/default/light/symbols/subway-lyon-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-lyon-s.svg
rename to data/styles/default/light/symbols/subway-lyon-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-m.svg b/data/styles/default/light/symbols/subway-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-m.svg
rename to data/styles/default/light/symbols/subway-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-madrid-m.svg b/data/styles/default/light/symbols/subway-madrid-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-madrid-m.svg
rename to data/styles/default/light/symbols/subway-madrid-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-madrid-s.svg b/data/styles/default/light/symbols/subway-madrid-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-madrid-s.svg
rename to data/styles/default/light/symbols/subway-madrid-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-malaga-m.svg b/data/styles/default/light/symbols/subway-malaga-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-malaga-m.svg
rename to data/styles/default/light/symbols/subway-malaga-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-malaga-s.svg b/data/styles/default/light/symbols/subway-malaga-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-malaga-s.svg
rename to data/styles/default/light/symbols/subway-malaga-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-manila-m.svg b/data/styles/default/light/symbols/subway-manila-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-manila-m.svg
rename to data/styles/default/light/symbols/subway-manila-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-manila-s.svg b/data/styles/default/light/symbols/subway-manila-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-manila-s.svg
rename to data/styles/default/light/symbols/subway-manila-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-maracaibo-m.svg b/data/styles/default/light/symbols/subway-maracaibo-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-maracaibo-m.svg
rename to data/styles/default/light/symbols/subway-maracaibo-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-maracaibo-s.svg b/data/styles/default/light/symbols/subway-maracaibo-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-maracaibo-s.svg
rename to data/styles/default/light/symbols/subway-maracaibo-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-marseille-m.svg b/data/styles/default/light/symbols/subway-marseille-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-marseille-m.svg
rename to data/styles/default/light/symbols/subway-marseille-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-marseille-s.svg b/data/styles/default/light/symbols/subway-marseille-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-marseille-s.svg
rename to data/styles/default/light/symbols/subway-marseille-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-mashhad-m.svg b/data/styles/default/light/symbols/subway-mashhad-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-mashhad-m.svg
rename to data/styles/default/light/symbols/subway-mashhad-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-mashhad-s.svg b/data/styles/default/light/symbols/subway-mashhad-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-mashhad-s.svg
rename to data/styles/default/light/symbols/subway-mashhad-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-massachusetts-m.svg b/data/styles/default/light/symbols/subway-massachusetts-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-massachusetts-m.svg
rename to data/styles/default/light/symbols/subway-massachusetts-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-massachusetts-s.svg b/data/styles/default/light/symbols/subway-massachusetts-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-massachusetts-s.svg
rename to data/styles/default/light/symbols/subway-massachusetts-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-mecca-m.svg b/data/styles/default/light/symbols/subway-mecca-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-mecca-m.svg
rename to data/styles/default/light/symbols/subway-mecca-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-mecca-s.svg b/data/styles/default/light/symbols/subway-mecca-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-mecca-s.svg
rename to data/styles/default/light/symbols/subway-mecca-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-medellin-m.svg b/data/styles/default/light/symbols/subway-medellin-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-medellin-m.svg
rename to data/styles/default/light/symbols/subway-medellin-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-medellin-s.svg b/data/styles/default/light/symbols/subway-medellin-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-medellin-s.svg
rename to data/styles/default/light/symbols/subway-medellin-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-mexico-m.svg b/data/styles/default/light/symbols/subway-mexico-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-mexico-m.svg
rename to data/styles/default/light/symbols/subway-mexico-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-mexico-s.svg b/data/styles/default/light/symbols/subway-mexico-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-mexico-s.svg
rename to data/styles/default/light/symbols/subway-mexico-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-milan-m.svg b/data/styles/default/light/symbols/subway-milan-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-milan-m.svg
rename to data/styles/default/light/symbols/subway-milan-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-milan-s.svg b/data/styles/default/light/symbols/subway-milan-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-milan-s.svg
rename to data/styles/default/light/symbols/subway-milan-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-minatomirai-m.svg b/data/styles/default/light/symbols/subway-minatomirai-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-minatomirai-m.svg
rename to data/styles/default/light/symbols/subway-minatomirai-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-minatomirai-s.svg b/data/styles/default/light/symbols/subway-minatomirai-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-minatomirai-s.svg
rename to data/styles/default/light/symbols/subway-minatomirai-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-minsk-m.svg b/data/styles/default/light/symbols/subway-minsk-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-minsk-m.svg
rename to data/styles/default/light/symbols/subway-minsk-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-minsk-s.svg b/data/styles/default/light/symbols/subway-minsk-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-minsk-s.svg
rename to data/styles/default/light/symbols/subway-minsk-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-montreal-m.svg b/data/styles/default/light/symbols/subway-montreal-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-montreal-m.svg
rename to data/styles/default/light/symbols/subway-montreal-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-montreal-s.svg b/data/styles/default/light/symbols/subway-montreal-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-montreal-s.svg
rename to data/styles/default/light/symbols/subway-montreal-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-moscow-m.svg b/data/styles/default/light/symbols/subway-moscow-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-moscow-m.svg
rename to data/styles/default/light/symbols/subway-moscow-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-moscow-s.svg b/data/styles/default/light/symbols/subway-moscow-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-moscow-s.svg
rename to data/styles/default/light/symbols/subway-moscow-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-nagoya-m.svg b/data/styles/default/light/symbols/subway-nagoya-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-nagoya-m.svg
rename to data/styles/default/light/symbols/subway-nagoya-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-nagoya-s.svg b/data/styles/default/light/symbols/subway-nagoya-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-nagoya-s.svg
rename to data/styles/default/light/symbols/subway-nagoya-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-newyork-m.svg b/data/styles/default/light/symbols/subway-newyork-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-newyork-m.svg
rename to data/styles/default/light/symbols/subway-newyork-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-newyork-s.svg b/data/styles/default/light/symbols/subway-newyork-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-newyork-s.svg
rename to data/styles/default/light/symbols/subway-newyork-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-newyork-xs.svg b/data/styles/default/light/symbols/subway-newyork-xs.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-newyork-xs.svg
rename to data/styles/default/light/symbols/subway-newyork-xs.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-nnov-m.svg b/data/styles/default/light/symbols/subway-nnov-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-nnov-m.svg
rename to data/styles/default/light/symbols/subway-nnov-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-nnov-s.svg b/data/styles/default/light/symbols/subway-nnov-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-nnov-s.svg
rename to data/styles/default/light/symbols/subway-nnov-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-novosibirsk-m.svg b/data/styles/default/light/symbols/subway-novosibirsk-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-novosibirsk-m.svg
rename to data/styles/default/light/symbols/subway-novosibirsk-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-novosibirsk-s.svg b/data/styles/default/light/symbols/subway-novosibirsk-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-novosibirsk-s.svg
rename to data/styles/default/light/symbols/subway-novosibirsk-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-omsk-m.svg b/data/styles/default/light/symbols/subway-omsk-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-omsk-m.svg
rename to data/styles/default/light/symbols/subway-omsk-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-omsk-s.svg b/data/styles/default/light/symbols/subway-omsk-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-omsk-s.svg
rename to data/styles/default/light/symbols/subway-omsk-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-osaka-m.svg b/data/styles/default/light/symbols/subway-osaka-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-osaka-m.svg
rename to data/styles/default/light/symbols/subway-osaka-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-osaka-s.svg b/data/styles/default/light/symbols/subway-osaka-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-osaka-s.svg
rename to data/styles/default/light/symbols/subway-osaka-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-oslo-m.svg b/data/styles/default/light/symbols/subway-oslo-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-oslo-m.svg
rename to data/styles/default/light/symbols/subway-oslo-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-oslo-s.svg b/data/styles/default/light/symbols/subway-oslo-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-oslo-s.svg
rename to data/styles/default/light/symbols/subway-oslo-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-palma-m.svg b/data/styles/default/light/symbols/subway-palma-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-palma-m.svg
rename to data/styles/default/light/symbols/subway-palma-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-palma-s.svg b/data/styles/default/light/symbols/subway-palma-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-palma-s.svg
rename to data/styles/default/light/symbols/subway-palma-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-panama-m.svg b/data/styles/default/light/symbols/subway-panama-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-panama-m.svg
rename to data/styles/default/light/symbols/subway-panama-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-panama-s.svg b/data/styles/default/light/symbols/subway-panama-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-panama-s.svg
rename to data/styles/default/light/symbols/subway-panama-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-paris-m.svg b/data/styles/default/light/symbols/subway-paris-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-paris-m.svg
rename to data/styles/default/light/symbols/subway-paris-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-paris-s.svg b/data/styles/default/light/symbols/subway-paris-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-paris-s.svg
rename to data/styles/default/light/symbols/subway-paris-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-perugia-m.svg b/data/styles/default/light/symbols/subway-perugia-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-perugia-m.svg
rename to data/styles/default/light/symbols/subway-perugia-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-perugia-s.svg b/data/styles/default/light/symbols/subway-perugia-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-perugia-s.svg
rename to data/styles/default/light/symbols/subway-perugia-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-philadelphia-m.svg b/data/styles/default/light/symbols/subway-philadelphia-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-philadelphia-m.svg
rename to data/styles/default/light/symbols/subway-philadelphia-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-philadelphia-s.svg b/data/styles/default/light/symbols/subway-philadelphia-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-philadelphia-s.svg
rename to data/styles/default/light/symbols/subway-philadelphia-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-pittsburgh-m.svg b/data/styles/default/light/symbols/subway-pittsburgh-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-pittsburgh-m.svg
rename to data/styles/default/light/symbols/subway-pittsburgh-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-pittsburgh-s.svg b/data/styles/default/light/symbols/subway-pittsburgh-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-pittsburgh-s.svg
rename to data/styles/default/light/symbols/subway-pittsburgh-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-pyongyang-m.svg b/data/styles/default/light/symbols/subway-pyongyang-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-pyongyang-m.svg
rename to data/styles/default/light/symbols/subway-pyongyang-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-pyongyang-s.svg b/data/styles/default/light/symbols/subway-pyongyang-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-pyongyang-s.svg
rename to data/styles/default/light/symbols/subway-pyongyang-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-rennes-m.svg b/data/styles/default/light/symbols/subway-rennes-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-rennes-m.svg
rename to data/styles/default/light/symbols/subway-rennes-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-rennes-s.svg b/data/styles/default/light/symbols/subway-rennes-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-rennes-s.svg
rename to data/styles/default/light/symbols/subway-rennes-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-reseau-paris-m.svg b/data/styles/default/light/symbols/subway-reseau-paris-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-reseau-paris-m.svg
rename to data/styles/default/light/symbols/subway-reseau-paris-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-reseau-paris-s.svg b/data/styles/default/light/symbols/subway-reseau-paris-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-reseau-paris-s.svg
rename to data/styles/default/light/symbols/subway-reseau-paris-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-riodejaneiro-m.svg b/data/styles/default/light/symbols/subway-riodejaneiro-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-riodejaneiro-m.svg
rename to data/styles/default/light/symbols/subway-riodejaneiro-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-riodejaneiro-s.svg b/data/styles/default/light/symbols/subway-riodejaneiro-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-riodejaneiro-s.svg
rename to data/styles/default/light/symbols/subway-riodejaneiro-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-rome-m.svg b/data/styles/default/light/symbols/subway-rome-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-rome-m.svg
rename to data/styles/default/light/symbols/subway-rome-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-rome-s.svg b/data/styles/default/light/symbols/subway-rome-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-rome-s.svg
rename to data/styles/default/light/symbols/subway-rome-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-rotterdam-m.svg b/data/styles/default/light/symbols/subway-rotterdam-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-rotterdam-m.svg
rename to data/styles/default/light/symbols/subway-rotterdam-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-rotterdam-s.svg b/data/styles/default/light/symbols/subway-rotterdam-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-rotterdam-s.svg
rename to data/styles/default/light/symbols/subway-rotterdam-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-s.svg b/data/styles/default/light/symbols/subway-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-s.svg
rename to data/styles/default/light/symbols/subway-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-samara-m.svg b/data/styles/default/light/symbols/subway-samara-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-samara-m.svg
rename to data/styles/default/light/symbols/subway-samara-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-samara-s.svg b/data/styles/default/light/symbols/subway-samara-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-samara-s.svg
rename to data/styles/default/light/symbols/subway-samara-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-sanfrancisco-m.svg b/data/styles/default/light/symbols/subway-sanfrancisco-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-sanfrancisco-m.svg
rename to data/styles/default/light/symbols/subway-sanfrancisco-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-sanfrancisco-s.svg b/data/styles/default/light/symbols/subway-sanfrancisco-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-sanfrancisco-s.svg
rename to data/styles/default/light/symbols/subway-sanfrancisco-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-santiago-m.svg b/data/styles/default/light/symbols/subway-santiago-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-santiago-m.svg
rename to data/styles/default/light/symbols/subway-santiago-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-santiago-s.svg b/data/styles/default/light/symbols/subway-santiago-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-santiago-s.svg
rename to data/styles/default/light/symbols/subway-santiago-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-santodomingo-m.svg b/data/styles/default/light/symbols/subway-santodomingo-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-santodomingo-m.svg
rename to data/styles/default/light/symbols/subway-santodomingo-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-santodomingo-s.svg b/data/styles/default/light/symbols/subway-santodomingo-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-santodomingo-s.svg
rename to data/styles/default/light/symbols/subway-santodomingo-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-saopaulo-m.svg b/data/styles/default/light/symbols/subway-saopaulo-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-saopaulo-m.svg
rename to data/styles/default/light/symbols/subway-saopaulo-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-saopaulo-s.svg b/data/styles/default/light/symbols/subway-saopaulo-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-saopaulo-s.svg
rename to data/styles/default/light/symbols/subway-saopaulo-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-sapporo-m.svg b/data/styles/default/light/symbols/subway-sapporo-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-sapporo-m.svg
rename to data/styles/default/light/symbols/subway-sapporo-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-sapporo-s.svg b/data/styles/default/light/symbols/subway-sapporo-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-sapporo-s.svg
rename to data/styles/default/light/symbols/subway-sapporo-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-seattle-m.svg b/data/styles/default/light/symbols/subway-seattle-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-seattle-m.svg
rename to data/styles/default/light/symbols/subway-seattle-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-seattle-s.svg b/data/styles/default/light/symbols/subway-seattle-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-seattle-s.svg
rename to data/styles/default/light/symbols/subway-seattle-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-sendai-m.svg b/data/styles/default/light/symbols/subway-sendai-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-sendai-m.svg
rename to data/styles/default/light/symbols/subway-sendai-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-sendai-s.svg b/data/styles/default/light/symbols/subway-sendai-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-sendai-s.svg
rename to data/styles/default/light/symbols/subway-sendai-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-shanghai-m.svg b/data/styles/default/light/symbols/subway-shanghai-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-shanghai-m.svg
rename to data/styles/default/light/symbols/subway-shanghai-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-shanghai-s.svg b/data/styles/default/light/symbols/subway-shanghai-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-shanghai-s.svg
rename to data/styles/default/light/symbols/subway-shanghai-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-shiraz-m.svg b/data/styles/default/light/symbols/subway-shiraz-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-shiraz-m.svg
rename to data/styles/default/light/symbols/subway-shiraz-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-shiraz-s.svg b/data/styles/default/light/symbols/subway-shiraz-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-shiraz-s.svg
rename to data/styles/default/light/symbols/subway-shiraz-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-singapore-m.svg b/data/styles/default/light/symbols/subway-singapore-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-singapore-m.svg
rename to data/styles/default/light/symbols/subway-singapore-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-singapore-s.svg b/data/styles/default/light/symbols/subway-singapore-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-singapore-s.svg
rename to data/styles/default/light/symbols/subway-singapore-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-sofia-m.svg b/data/styles/default/light/symbols/subway-sofia-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-sofia-m.svg
rename to data/styles/default/light/symbols/subway-sofia-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-sofia-s.svg b/data/styles/default/light/symbols/subway-sofia-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-sofia-s.svg
rename to data/styles/default/light/symbols/subway-sofia-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-southkorea-m.svg b/data/styles/default/light/symbols/subway-southkorea-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-southkorea-m.svg
rename to data/styles/default/light/symbols/subway-southkorea-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-southkorea-s.svg b/data/styles/default/light/symbols/subway-southkorea-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-southkorea-s.svg
rename to data/styles/default/light/symbols/subway-southkorea-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-spb-m.svg b/data/styles/default/light/symbols/subway-spb-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-spb-m.svg
rename to data/styles/default/light/symbols/subway-spb-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-spb-s.svg b/data/styles/default/light/symbols/subway-spb-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-spb-s.svg
rename to data/styles/default/light/symbols/subway-spb-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-stlouis-m.svg b/data/styles/default/light/symbols/subway-stlouis-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-stlouis-m.svg
rename to data/styles/default/light/symbols/subway-stlouis-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-stlouis-s.svg b/data/styles/default/light/symbols/subway-stlouis-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-stlouis-s.svg
rename to data/styles/default/light/symbols/subway-stlouis-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-stockholm-m.svg b/data/styles/default/light/symbols/subway-stockholm-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-stockholm-m.svg
rename to data/styles/default/light/symbols/subway-stockholm-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-stockholm-s.svg b/data/styles/default/light/symbols/subway-stockholm-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-stockholm-s.svg
rename to data/styles/default/light/symbols/subway-stockholm-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-tabriz-m.svg b/data/styles/default/light/symbols/subway-tabriz-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-tabriz-m.svg
rename to data/styles/default/light/symbols/subway-tabriz-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-tabriz-s.svg b/data/styles/default/light/symbols/subway-tabriz-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-tabriz-s.svg
rename to data/styles/default/light/symbols/subway-tabriz-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-taipei-m.svg b/data/styles/default/light/symbols/subway-taipei-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-taipei-m.svg
rename to data/styles/default/light/symbols/subway-taipei-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-taipei-s.svg b/data/styles/default/light/symbols/subway-taipei-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-taipei-s.svg
rename to data/styles/default/light/symbols/subway-taipei-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-taoyuan-m.svg b/data/styles/default/light/symbols/subway-taoyuan-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-taoyuan-m.svg
rename to data/styles/default/light/symbols/subway-taoyuan-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-taoyuan-s.svg b/data/styles/default/light/symbols/subway-taoyuan-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-taoyuan-s.svg
rename to data/styles/default/light/symbols/subway-taoyuan-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-tashkent-m.svg b/data/styles/default/light/symbols/subway-tashkent-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-tashkent-m.svg
rename to data/styles/default/light/symbols/subway-tashkent-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-tashkent-s.svg b/data/styles/default/light/symbols/subway-tashkent-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-tashkent-s.svg
rename to data/styles/default/light/symbols/subway-tashkent-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-tbilisi-m.svg b/data/styles/default/light/symbols/subway-tbilisi-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-tbilisi-m.svg
rename to data/styles/default/light/symbols/subway-tbilisi-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-tbilisi-s.svg b/data/styles/default/light/symbols/subway-tbilisi-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-tbilisi-s.svg
rename to data/styles/default/light/symbols/subway-tbilisi-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tehran-m.svg b/data/styles/default/light/symbols/subway-tehran-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tehran-m.svg
rename to data/styles/default/light/symbols/subway-tehran-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tehran-s.svg b/data/styles/default/light/symbols/subway-tehran-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tehran-s.svg
rename to data/styles/default/light/symbols/subway-tehran-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-tianjin-m.svg b/data/styles/default/light/symbols/subway-tianjin-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-tianjin-m.svg
rename to data/styles/default/light/symbols/subway-tianjin-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-tianjin-s.svg b/data/styles/default/light/symbols/subway-tianjin-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-tianjin-s.svg
rename to data/styles/default/light/symbols/subway-tianjin-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-tokyo-m.svg b/data/styles/default/light/symbols/subway-tokyo-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-tokyo-m.svg
rename to data/styles/default/light/symbols/subway-tokyo-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-tokyo-s.svg b/data/styles/default/light/symbols/subway-tokyo-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-tokyo-s.svg
rename to data/styles/default/light/symbols/subway-tokyo-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-tyneandwear-m.svg b/data/styles/default/light/symbols/subway-tyneandwear-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-tyneandwear-m.svg
rename to data/styles/default/light/symbols/subway-tyneandwear-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-tyneandwear-s.svg b/data/styles/default/light/symbols/subway-tyneandwear-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-tyneandwear-s.svg
rename to data/styles/default/light/symbols/subway-tyneandwear-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-ubahn-m.svg b/data/styles/default/light/symbols/subway-ubahn-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-ubahn-m.svg
rename to data/styles/default/light/symbols/subway-ubahn-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-ubahn-s.svg b/data/styles/default/light/symbols/subway-ubahn-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-ubahn-s.svg
rename to data/styles/default/light/symbols/subway-ubahn-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-valencia-m.svg b/data/styles/default/light/symbols/subway-valencia-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-valencia-m.svg
rename to data/styles/default/light/symbols/subway-valencia-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-valencia-s.svg b/data/styles/default/light/symbols/subway-valencia-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-valencia-s.svg
rename to data/styles/default/light/symbols/subway-valencia-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-vienna-m.svg b/data/styles/default/light/symbols/subway-vienna-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-vienna-m.svg
rename to data/styles/default/light/symbols/subway-vienna-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-vienna-s.svg b/data/styles/default/light/symbols/subway-vienna-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-vienna-s.svg
rename to data/styles/default/light/symbols/subway-vienna-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-volgograd-m.svg b/data/styles/default/light/symbols/subway-volgograd-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-volgograd-m.svg
rename to data/styles/default/light/symbols/subway-volgograd-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-volgograd-s.svg b/data/styles/default/light/symbols/subway-volgograd-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-volgograd-s.svg
rename to data/styles/default/light/symbols/subway-volgograd-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-warsaw-m.svg b/data/styles/default/light/symbols/subway-warsaw-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-warsaw-m.svg
rename to data/styles/default/light/symbols/subway-warsaw-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-warsaw-s.svg b/data/styles/default/light/symbols/subway-warsaw-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-warsaw-s.svg
rename to data/styles/default/light/symbols/subway-warsaw-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-warszawa-m.svg b/data/styles/default/light/symbols/subway-warszawa-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-warszawa-m.svg
rename to data/styles/default/light/symbols/subway-warszawa-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-warszawa-s.svg b/data/styles/default/light/symbols/subway-warszawa-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-warszawa-s.svg
rename to data/styles/default/light/symbols/subway-warszawa-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-washington-m.svg b/data/styles/default/light/symbols/subway-washington-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-washington-m.svg
rename to data/styles/default/light/symbols/subway-washington-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-washington-s.svg b/data/styles/default/light/symbols/subway-washington-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-washington-s.svg
rename to data/styles/default/light/symbols/subway-washington-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-wuhan-m.svg b/data/styles/default/light/symbols/subway-wuhan-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-wuhan-m.svg
rename to data/styles/default/light/symbols/subway-wuhan-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-wuhan-s.svg b/data/styles/default/light/symbols/subway-wuhan-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-wuhan-s.svg
rename to data/styles/default/light/symbols/subway-wuhan-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-xs.svg b/data/styles/default/light/symbols/subway-xs.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-xs.svg
rename to data/styles/default/light/symbols/subway-xs.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-yerevan-m.svg b/data/styles/default/light/symbols/subway-yerevan-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-yerevan-m.svg
rename to data/styles/default/light/symbols/subway-yerevan-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-yerevan-s.svg b/data/styles/default/light/symbols/subway-yerevan-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-yerevan-s.svg
rename to data/styles/default/light/symbols/subway-yerevan-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-yokohama-m.svg b/data/styles/default/light/symbols/subway-yokohama-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-yokohama-m.svg
rename to data/styles/default/light/symbols/subway-yokohama-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-yokohama-s.svg b/data/styles/default/light/symbols/subway-yokohama-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-yokohama-s.svg
rename to data/styles/default/light/symbols/subway-yokohama-s.svg
diff --git a/data/styles/clear/style-clear/symbols/subway_entrance-london-m.svg b/data/styles/default/light/symbols/subway_entrance-london-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway_entrance-london-m.svg
rename to data/styles/default/light/symbols/subway_entrance-london-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway_entrance-london-s.svg b/data/styles/default/light/symbols/subway_entrance-london-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway_entrance-london-s.svg
rename to data/styles/default/light/symbols/subway_entrance-london-s.svg
diff --git a/data/styles/clear/style-clear/symbols/survey_point-m.svg b/data/styles/default/light/symbols/survey_point-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/survey_point-m.svg
rename to data/styles/default/light/symbols/survey_point-m.svg
diff --git a/data/styles/clear/style-clear/symbols/sweets-m.svg b/data/styles/default/light/symbols/sweets-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/sweets-m.svg
rename to data/styles/default/light/symbols/sweets-m.svg
diff --git a/data/styles/clear/style-clear/symbols/swimming-m.svg b/data/styles/default/light/symbols/swimming-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/swimming-m.svg
rename to data/styles/default/light/symbols/swimming-m.svg
diff --git a/data/styles/clear/style-clear/symbols/table-tennis-m.svg b/data/styles/default/light/symbols/table-tennis-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/table-tennis-m.svg
rename to data/styles/default/light/symbols/table-tennis-m.svg
diff --git a/data/styles/clear/style-clear/symbols/tank-m.svg b/data/styles/default/light/symbols/tank-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/tank-m.svg
rename to data/styles/default/light/symbols/tank-m.svg
diff --git a/data/styles/clear/style-clear/symbols/taoist-m.svg b/data/styles/default/light/symbols/taoist-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/taoist-m.svg
rename to data/styles/default/light/symbols/taoist-m.svg
diff --git a/data/styles/clear/style-clear/symbols/taoist-s.svg b/data/styles/default/light/symbols/taoist-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/taoist-s.svg
rename to data/styles/default/light/symbols/taoist-s.svg
diff --git a/data/styles/clear/style-clear/symbols/taxi-m.svg b/data/styles/default/light/symbols/taxi-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/taxi-m.svg
rename to data/styles/default/light/symbols/taxi-m.svg
diff --git a/data/styles/clear/style-clear/symbols/tennis-m.svg b/data/styles/default/light/symbols/tennis-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/tennis-m.svg
rename to data/styles/default/light/symbols/tennis-m.svg
diff --git a/data/styles/clear/style-clear/symbols/theatre-m.svg b/data/styles/default/light/symbols/theatre-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/theatre-m.svg
rename to data/styles/default/light/symbols/theatre-m.svg
diff --git a/data/styles/clear/style-clear/symbols/theatre-s.svg b/data/styles/default/light/symbols/theatre-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/theatre-s.svg
rename to data/styles/default/light/symbols/theatre-s.svg
diff --git a/data/styles/clear/style-clear/symbols/theme_park-m.svg b/data/styles/default/light/symbols/theme_park-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/theme_park-m.svg
rename to data/styles/default/light/symbols/theme_park-m.svg
diff --git a/data/styles/clear/style-clear/symbols/theme_park-s.svg b/data/styles/default/light/symbols/theme_park-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/theme_park-s.svg
rename to data/styles/default/light/symbols/theme_park-s.svg
diff --git a/data/styles/clear/style-clear/symbols/ticket-shop-m.svg b/data/styles/default/light/symbols/ticket-shop-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/ticket-shop-m.svg
rename to data/styles/default/light/symbols/ticket-shop-m.svg
diff --git a/data/styles/clear/style-clear/symbols/tire-repair-m.svg b/data/styles/default/light/symbols/tire-repair-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/tire-repair-m.svg
rename to data/styles/default/light/symbols/tire-repair-m.svg
diff --git a/data/styles/clear/style-clear/symbols/tobacco-m.svg b/data/styles/default/light/symbols/tobacco-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/tobacco-m.svg
rename to data/styles/default/light/symbols/tobacco-m.svg
diff --git a/data/styles/clear/style-clear/symbols/toilets-m.svg b/data/styles/default/light/symbols/toilets-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/toilets-m.svg
rename to data/styles/default/light/symbols/toilets-m.svg
diff --git a/data/styles/clear/style-clear/symbols/toll_booth-m.svg b/data/styles/default/light/symbols/toll_booth-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/toll_booth-m.svg
rename to data/styles/default/light/symbols/toll_booth-m.svg
diff --git a/data/styles/clear/style-clear/symbols/toll_booth-s.svg b/data/styles/default/light/symbols/toll_booth-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/toll_booth-s.svg
rename to data/styles/default/light/symbols/toll_booth-s.svg
diff --git a/data/styles/clear/style-clear/symbols/tomb-m.svg b/data/styles/default/light/symbols/tomb-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/tomb-m.svg
rename to data/styles/default/light/symbols/tomb-m.svg
diff --git a/data/styles/clear/style-clear/symbols/tourism-m.svg b/data/styles/default/light/symbols/tourism-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/tourism-m.svg
rename to data/styles/default/light/symbols/tourism-m.svg
diff --git a/data/styles/clear/style-clear/symbols/tourism-s.svg b/data/styles/default/light/symbols/tourism-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/tourism-s.svg
rename to data/styles/default/light/symbols/tourism-s.svg
diff --git a/data/styles/clear/style-clear/symbols/toys-m.svg b/data/styles/default/light/symbols/toys-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/toys-m.svg
rename to data/styles/default/light/symbols/toys-m.svg
diff --git a/data/styles/clear/style-clear/symbols/train-m.svg b/data/styles/default/light/symbols/train-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/train-m.svg
rename to data/styles/default/light/symbols/train-m.svg
diff --git a/data/styles/clear/style-clear/symbols/train-s.svg b/data/styles/default/light/symbols/train-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/train-s.svg
rename to data/styles/default/light/symbols/train-s.svg
diff --git a/data/styles/clear/style-clear/symbols/tram-m.svg b/data/styles/default/light/symbols/tram-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/tram-m.svg
rename to data/styles/default/light/symbols/tram-m.svg
diff --git a/data/styles/clear/style-clear/symbols/tram-s.svg b/data/styles/default/light/symbols/tram-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/tram-s.svg
rename to data/styles/default/light/symbols/tram-s.svg
diff --git a/data/styles/clear/style-clear/symbols/transfer_arrow.svg b/data/styles/default/light/symbols/transfer_arrow.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/transfer_arrow.svg
rename to data/styles/default/light/symbols/transfer_arrow.svg
diff --git a/data/styles/clear/style-clear/symbols/transit_light_rail-m.svg b/data/styles/default/light/symbols/transit_light_rail-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/transit_light_rail-m.svg
rename to data/styles/default/light/symbols/transit_light_rail-m.svg
diff --git a/data/styles/clear/style-clear/symbols/transit_light_rail-s.svg b/data/styles/default/light/symbols/transit_light_rail-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/transit_light_rail-s.svg
rename to data/styles/default/light/symbols/transit_light_rail-s.svg
diff --git a/data/styles/clear/style-clear/symbols/transit_monorail-m.svg b/data/styles/default/light/symbols/transit_monorail-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/transit_monorail-m.svg
rename to data/styles/default/light/symbols/transit_monorail-m.svg
diff --git a/data/styles/clear/style-clear/symbols/transit_monorail-s.svg b/data/styles/default/light/symbols/transit_monorail-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/transit_monorail-s.svg
rename to data/styles/default/light/symbols/transit_monorail-s.svg
diff --git a/data/styles/clear/style-clear/symbols/transit_subway-m.svg b/data/styles/default/light/symbols/transit_subway-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/transit_subway-m.svg
rename to data/styles/default/light/symbols/transit_subway-m.svg
diff --git a/data/styles/clear/style-clear/symbols/transit_subway-s.svg b/data/styles/default/light/symbols/transit_subway-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/transit_subway-s.svg
rename to data/styles/default/light/symbols/transit_subway-s.svg
diff --git a/data/styles/clear/style-clear/symbols/transit_train-m.svg b/data/styles/default/light/symbols/transit_train-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/transit_train-m.svg
rename to data/styles/default/light/symbols/transit_train-m.svg
diff --git a/data/styles/clear/style-clear/symbols/transit_train-s.svg b/data/styles/default/light/symbols/transit_train-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/transit_train-s.svg
rename to data/styles/default/light/symbols/transit_train-s.svg
diff --git a/data/styles/clear/style-clear/symbols/travel_agency_shop-m.svg b/data/styles/default/light/symbols/travel_agency_shop-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/travel_agency_shop-m.svg
rename to data/styles/default/light/symbols/travel_agency_shop-m.svg
diff --git a/data/styles/clear/style-clear/symbols/vehicle_inspection-m.svg b/data/styles/default/light/symbols/vehicle_inspection-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/vehicle_inspection-m.svg
rename to data/styles/default/light/symbols/vehicle_inspection-m.svg
diff --git a/data/styles/clear/style-clear/symbols/vending-m.svg b/data/styles/default/light/symbols/vending-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/vending-m.svg
rename to data/styles/default/light/symbols/vending-m.svg
diff --git a/data/styles/clear/style-clear/symbols/veterinary-m.svg b/data/styles/default/light/symbols/veterinary-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/veterinary-m.svg
rename to data/styles/default/light/symbols/veterinary-m.svg
diff --git a/data/styles/clear/style-clear/symbols/video-games-m.svg b/data/styles/default/light/symbols/video-games-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/video-games-m.svg
rename to data/styles/default/light/symbols/video-games-m.svg
diff --git a/data/styles/clear/style-clear/symbols/viewpoint-m.svg b/data/styles/default/light/symbols/viewpoint-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/viewpoint-m.svg
rename to data/styles/default/light/symbols/viewpoint-m.svg
diff --git a/data/styles/clear/style-clear/symbols/viewpoint-s.svg b/data/styles/default/light/symbols/viewpoint-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/viewpoint-s.svg
rename to data/styles/default/light/symbols/viewpoint-s.svg
diff --git a/data/styles/clear/style-clear/symbols/volcano-m.svg b/data/styles/default/light/symbols/volcano-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/volcano-m.svg
rename to data/styles/default/light/symbols/volcano-m.svg
diff --git a/data/styles/clear/style-clear/symbols/volcano-s.svg b/data/styles/default/light/symbols/volcano-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/volcano-s.svg
rename to data/styles/default/light/symbols/volcano-s.svg
diff --git a/data/styles/clear/style-clear/symbols/volleyball-m.svg b/data/styles/default/light/symbols/volleyball-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/volleyball-m.svg
rename to data/styles/default/light/symbols/volleyball-m.svg
diff --git a/data/styles/clear/style-clear/symbols/waste-basket-m.svg b/data/styles/default/light/symbols/waste-basket-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/waste-basket-m.svg
rename to data/styles/default/light/symbols/waste-basket-m.svg
diff --git a/data/styles/clear/style-clear/symbols/waste-basket-s.svg b/data/styles/default/light/symbols/waste-basket-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/waste-basket-s.svg
rename to data/styles/default/light/symbols/waste-basket-s.svg
diff --git a/data/styles/clear/style-clear/symbols/waterfall-m.svg b/data/styles/default/light/symbols/waterfall-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/waterfall-m.svg
rename to data/styles/default/light/symbols/waterfall-m.svg
diff --git a/data/styles/clear/style-clear/symbols/waterfall-s.svg b/data/styles/default/light/symbols/waterfall-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/waterfall-s.svg
rename to data/styles/default/light/symbols/waterfall-s.svg
diff --git a/data/styles/clear/style-clear/symbols/wayside_shrine-m.svg b/data/styles/default/light/symbols/wayside_shrine-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/wayside_shrine-m.svg
rename to data/styles/default/light/symbols/wayside_shrine-m.svg
diff --git a/data/styles/clear/style-clear/symbols/wholesale-m.svg b/data/styles/default/light/symbols/wholesale-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/wholesale-m.svg
rename to data/styles/default/light/symbols/wholesale-m.svg
diff --git a/data/styles/clear/style-clear/symbols/wind_turbine-m.svg b/data/styles/default/light/symbols/wind_turbine-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/wind_turbine-m.svg
rename to data/styles/default/light/symbols/wind_turbine-m.svg
diff --git a/data/styles/clear/style-clear/symbols/windmill-m.svg b/data/styles/default/light/symbols/windmill-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/windmill-m.svg
rename to data/styles/default/light/symbols/windmill-m.svg
diff --git a/data/styles/clear/style-clear/symbols/winery-m.svg b/data/styles/default/light/symbols/winery-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/winery-m.svg
rename to data/styles/default/light/symbols/winery-m.svg
diff --git a/data/styles/clear/style-clear/symbols/wreck-m.svg b/data/styles/default/light/symbols/wreck-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/wreck-m.svg
rename to data/styles/default/light/symbols/wreck-m.svg
diff --git a/data/styles/clear/style-clear/symbols/yoga-m.svg b/data/styles/default/light/symbols/yoga-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/yoga-m.svg
rename to data/styles/default/light/symbols/yoga-m.svg
diff --git a/data/styles/clear/style-night/symbols/zero-icon.svg b/data/styles/default/light/symbols/zero-icon.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/zero-icon.svg
rename to data/styles/default/light/symbols/zero-icon.svg
diff --git a/data/styles/clear/style-clear/symbols/zoo-m.svg b/data/styles/default/light/symbols/zoo-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/zoo-m.svg
rename to data/styles/default/light/symbols/zoo-m.svg
diff --git a/data/styles/clear/style-clear/symbols/zoo-s.svg b/data/styles/default/light/symbols/zoo-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/zoo-s.svg
rename to data/styles/default/light/symbols/zoo-s.svg
diff --git a/data/styles/clear/style-clear/vector-icons/compass-image.svg b/data/styles/default/light/vector-icons/compass-image.svg
similarity index 100%
rename from data/styles/clear/style-clear/vector-icons/compass-image.svg
rename to data/styles/default/light/vector-icons/compass-image.svg
diff --git a/data/styles/clear/style-night/vector-icons/readme.md b/data/styles/default/light/vector-icons/readme.md
similarity index 100%
rename from data/styles/clear/style-night/vector-icons/readme.md
rename to data/styles/default/light/vector-icons/readme.md
diff --git a/data/styles/clear/style-night/xhdpi-ad/keep.png b/data/styles/default/light/xhdpi-ad/keep.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi-ad/keep.png
rename to data/styles/default/light/xhdpi-ad/keep.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-animals-m.png b/data/styles/default/light/xhdpi/bookmark-animals-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-animals-m.png
rename to data/styles/default/light/xhdpi/bookmark-animals-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-bar-m.png b/data/styles/default/light/xhdpi/bookmark-bar-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-bar-m.png
rename to data/styles/default/light/xhdpi/bookmark-bar-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-bg-m.png b/data/styles/default/light/xhdpi/bookmark-bg-m.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-bg-m.png
rename to data/styles/default/light/xhdpi/bookmark-bg-m.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-bg-s.png b/data/styles/default/light/xhdpi/bookmark-bg-s.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-bg-s.png
rename to data/styles/default/light/xhdpi/bookmark-bg-s.png
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-bg-xs.png b/data/styles/default/light/xhdpi/bookmark-bg-xs.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/bookmark-bg-xs.png
rename to data/styles/default/light/xhdpi/bookmark-bg-xs.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-buddhism-m.png b/data/styles/default/light/xhdpi/bookmark-buddhism-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-buddhism-m.png
rename to data/styles/default/light/xhdpi/bookmark-buddhism-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-building-m.png b/data/styles/default/light/xhdpi/bookmark-building-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-building-m.png
rename to data/styles/default/light/xhdpi/bookmark-building-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-christianity-m.png b/data/styles/default/light/xhdpi/bookmark-christianity-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-christianity-m.png
rename to data/styles/default/light/xhdpi/bookmark-christianity-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-default-m.png b/data/styles/default/light/xhdpi/bookmark-default-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-default-m.png
rename to data/styles/default/light/xhdpi/bookmark-default-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-default-s.png b/data/styles/default/light/xhdpi/bookmark-default-s.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-default-s.png
rename to data/styles/default/light/xhdpi/bookmark-default-s.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-default-xs.png b/data/styles/default/light/xhdpi/bookmark-default-xs.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-default-xs.png
rename to data/styles/default/light/xhdpi/bookmark-default-xs.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-entertainment-m.png b/data/styles/default/light/xhdpi/bookmark-entertainment-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-entertainment-m.png
rename to data/styles/default/light/xhdpi/bookmark-entertainment-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-exchange-m.png b/data/styles/default/light/xhdpi/bookmark-exchange-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-exchange-m.png
rename to data/styles/default/light/xhdpi/bookmark-exchange-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-finish-m.png b/data/styles/default/light/xhdpi/bookmark-finish-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-finish-m.png
rename to data/styles/default/light/xhdpi/bookmark-finish-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-food-m.png b/data/styles/default/light/xhdpi/bookmark-food-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-food-m.png
rename to data/styles/default/light/xhdpi/bookmark-food-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-gas-m.png b/data/styles/default/light/xhdpi/bookmark-gas-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-gas-m.png
rename to data/styles/default/light/xhdpi/bookmark-gas-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-hotel-m.png b/data/styles/default/light/xhdpi/bookmark-hotel-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-hotel-m.png
rename to data/styles/default/light/xhdpi/bookmark-hotel-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-islam-m.png b/data/styles/default/light/xhdpi/bookmark-islam-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-islam-m.png
rename to data/styles/default/light/xhdpi/bookmark-islam-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-judaism-m.png b/data/styles/default/light/xhdpi/bookmark-judaism-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-judaism-m.png
rename to data/styles/default/light/xhdpi/bookmark-judaism-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-medicine-m.png b/data/styles/default/light/xhdpi/bookmark-medicine-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-medicine-m.png
rename to data/styles/default/light/xhdpi/bookmark-medicine-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-mountain-m.png b/data/styles/default/light/xhdpi/bookmark-mountain-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-mountain-m.png
rename to data/styles/default/light/xhdpi/bookmark-mountain-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-museum-m.png b/data/styles/default/light/xhdpi/bookmark-museum-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-museum-m.png
rename to data/styles/default/light/xhdpi/bookmark-museum-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-park-m.png b/data/styles/default/light/xhdpi/bookmark-park-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-park-m.png
rename to data/styles/default/light/xhdpi/bookmark-park-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-parking-m.png b/data/styles/default/light/xhdpi/bookmark-parking-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-parking-m.png
rename to data/styles/default/light/xhdpi/bookmark-parking-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-shop-m.png b/data/styles/default/light/xhdpi/bookmark-shop-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-shop-m.png
rename to data/styles/default/light/xhdpi/bookmark-shop-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-sights-m.png b/data/styles/default/light/xhdpi/bookmark-sights-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-sights-m.png
rename to data/styles/default/light/xhdpi/bookmark-sights-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-sport-m.png b/data/styles/default/light/xhdpi/bookmark-sport-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-sport-m.png
rename to data/styles/default/light/xhdpi/bookmark-sport-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-start-m.png b/data/styles/default/light/xhdpi/bookmark-start-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-start-m.png
rename to data/styles/default/light/xhdpi/bookmark-start-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-swim-m.png b/data/styles/default/light/xhdpi/bookmark-swim-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-swim-m.png
rename to data/styles/default/light/xhdpi/bookmark-swim-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-transport-m.png b/data/styles/default/light/xhdpi/bookmark-transport-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-transport-m.png
rename to data/styles/default/light/xhdpi/bookmark-transport-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-viewpoint-m.png b/data/styles/default/light/xhdpi/bookmark-viewpoint-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-viewpoint-m.png
rename to data/styles/default/light/xhdpi/bookmark-viewpoint-m.png
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-water-m.png b/data/styles/default/light/xhdpi/bookmark-water-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/bookmark-water-m.png
rename to data/styles/default/light/xhdpi/bookmark-water-m.png
diff --git a/data/styles/clear/style-night/xhdpi/coloredmark-bg-l.png b/data/styles/default/light/xhdpi/coloredmark-bg-l.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/coloredmark-bg-l.png
rename to data/styles/default/light/xhdpi/coloredmark-bg-l.png
diff --git a/data/styles/clear/style-night/xhdpi/coloredmark-bg-s.png b/data/styles/default/light/xhdpi/coloredmark-bg-s.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/coloredmark-bg-s.png
rename to data/styles/default/light/xhdpi/coloredmark-bg-s.png
diff --git a/data/styles/clear/style-clear/xhdpi/coloredmark-default-l.png b/data/styles/default/light/xhdpi/coloredmark-default-l.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/coloredmark-default-l.png
rename to data/styles/default/light/xhdpi/coloredmark-default-l.png
diff --git a/data/styles/clear/style-night/xhdpi/coloredmark-default-s.png b/data/styles/default/light/xhdpi/coloredmark-default-s.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/coloredmark-default-s.png
rename to data/styles/default/light/xhdpi/coloredmark-default-s.png
diff --git a/data/styles/clear/style-clear/xhdpi/compass-image.png b/data/styles/default/light/xhdpi/compass-image.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/compass-image.png
rename to data/styles/default/light/xhdpi/compass-image.png
diff --git a/data/styles/clear/style-clear/xhdpi/cross_geoposition.png b/data/styles/default/light/xhdpi/cross_geoposition.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/cross_geoposition.png
rename to data/styles/default/light/xhdpi/cross_geoposition.png
diff --git a/data/styles/clear/style-clear/xhdpi/current-position.png b/data/styles/default/light/xhdpi/current-position.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/current-position.png
rename to data/styles/default/light/xhdpi/current-position.png
diff --git a/data/styles/clear/style-clear/xhdpi/ferry.png b/data/styles/default/light/xhdpi/ferry.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/ferry.png
rename to data/styles/default/light/xhdpi/ferry.png
diff --git a/data/styles/clear/style-clear/xhdpi/infosign.png b/data/styles/default/light/xhdpi/infosign.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/infosign.png
rename to data/styles/default/light/xhdpi/infosign.png
diff --git a/data/styles/clear/style-night/xhdpi/non-found-search-result.png b/data/styles/default/light/xhdpi/non-found-search-result.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/non-found-search-result.png
rename to data/styles/default/light/xhdpi/non-found-search-result.png
diff --git a/data/styles/clear/style-night/xhdpi/norating-bg-l.png b/data/styles/default/light/xhdpi/norating-bg-l.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/norating-bg-l.png
rename to data/styles/default/light/xhdpi/norating-bg-l.png
diff --git a/data/styles/clear/style-night/xhdpi/norating-default-l.png b/data/styles/default/light/xhdpi/norating-default-l.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/norating-default-l.png
rename to data/styles/default/light/xhdpi/norating-default-l.png
diff --git a/data/styles/clear/style-clear/xhdpi/paid_road.png b/data/styles/default/light/xhdpi/paid_road.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/paid_road.png
rename to data/styles/default/light/xhdpi/paid_road.png
diff --git a/data/styles/clear/style-night/xhdpi/route-arrow.png b/data/styles/default/light/xhdpi/route-arrow.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/route-arrow.png
rename to data/styles/default/light/xhdpi/route-arrow.png
diff --git a/data/styles/clear/style-night/xhdpi/route-point-1.png b/data/styles/default/light/xhdpi/route-point-1.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/route-point-1.png
rename to data/styles/default/light/xhdpi/route-point-1.png
diff --git a/data/styles/clear/style-night/xhdpi/route-point-10.png b/data/styles/default/light/xhdpi/route-point-10.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/route-point-10.png
rename to data/styles/default/light/xhdpi/route-point-10.png
diff --git a/data/styles/clear/style-night/xhdpi/route-point-11.png b/data/styles/default/light/xhdpi/route-point-11.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/route-point-11.png
rename to data/styles/default/light/xhdpi/route-point-11.png
diff --git a/data/styles/clear/style-night/xhdpi/route-point-12.png b/data/styles/default/light/xhdpi/route-point-12.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/route-point-12.png
rename to data/styles/default/light/xhdpi/route-point-12.png
diff --git a/data/styles/clear/style-night/xhdpi/route-point-13.png b/data/styles/default/light/xhdpi/route-point-13.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/route-point-13.png
rename to data/styles/default/light/xhdpi/route-point-13.png
diff --git a/data/styles/clear/style-night/xhdpi/route-point-14.png b/data/styles/default/light/xhdpi/route-point-14.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/route-point-14.png
rename to data/styles/default/light/xhdpi/route-point-14.png
diff --git a/data/styles/clear/style-night/xhdpi/route-point-15.png b/data/styles/default/light/xhdpi/route-point-15.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/route-point-15.png
rename to data/styles/default/light/xhdpi/route-point-15.png
diff --git a/data/styles/clear/style-night/xhdpi/route-point-16.png b/data/styles/default/light/xhdpi/route-point-16.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/route-point-16.png
rename to data/styles/default/light/xhdpi/route-point-16.png
diff --git a/data/styles/clear/style-night/xhdpi/route-point-17.png b/data/styles/default/light/xhdpi/route-point-17.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/route-point-17.png
rename to data/styles/default/light/xhdpi/route-point-17.png
diff --git a/data/styles/clear/style-night/xhdpi/route-point-18.png b/data/styles/default/light/xhdpi/route-point-18.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/route-point-18.png
rename to data/styles/default/light/xhdpi/route-point-18.png
diff --git a/data/styles/clear/style-night/xhdpi/route-point-19.png b/data/styles/default/light/xhdpi/route-point-19.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/route-point-19.png
rename to data/styles/default/light/xhdpi/route-point-19.png
diff --git a/data/styles/clear/style-night/xhdpi/route-point-2.png b/data/styles/default/light/xhdpi/route-point-2.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/route-point-2.png
rename to data/styles/default/light/xhdpi/route-point-2.png
diff --git a/data/styles/clear/style-night/xhdpi/route-point-20.png b/data/styles/default/light/xhdpi/route-point-20.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/route-point-20.png
rename to data/styles/default/light/xhdpi/route-point-20.png
diff --git a/data/styles/clear/style-night/xhdpi/route-point-3.png b/data/styles/default/light/xhdpi/route-point-3.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/route-point-3.png
rename to data/styles/default/light/xhdpi/route-point-3.png
diff --git a/data/styles/clear/style-night/xhdpi/route-point-4.png b/data/styles/default/light/xhdpi/route-point-4.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/route-point-4.png
rename to data/styles/default/light/xhdpi/route-point-4.png
diff --git a/data/styles/clear/style-night/xhdpi/route-point-5.png b/data/styles/default/light/xhdpi/route-point-5.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/route-point-5.png
rename to data/styles/default/light/xhdpi/route-point-5.png
diff --git a/data/styles/clear/style-night/xhdpi/route-point-6.png b/data/styles/default/light/xhdpi/route-point-6.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/route-point-6.png
rename to data/styles/default/light/xhdpi/route-point-6.png
diff --git a/data/styles/clear/style-night/xhdpi/route-point-7.png b/data/styles/default/light/xhdpi/route-point-7.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/route-point-7.png
rename to data/styles/default/light/xhdpi/route-point-7.png
diff --git a/data/styles/clear/style-night/xhdpi/route-point-8.png b/data/styles/default/light/xhdpi/route-point-8.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/route-point-8.png
rename to data/styles/default/light/xhdpi/route-point-8.png
diff --git a/data/styles/clear/style-night/xhdpi/route-point-9.png b/data/styles/default/light/xhdpi/route-point-9.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/route-point-9.png
rename to data/styles/default/light/xhdpi/route-point-9.png
diff --git a/data/styles/clear/style-night/xhdpi/route-point-finish.png b/data/styles/default/light/xhdpi/route-point-finish.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/route-point-finish.png
rename to data/styles/default/light/xhdpi/route-point-finish.png
diff --git a/data/styles/clear/style-night/xhdpi/route-point-start.png b/data/styles/default/light/xhdpi/route-point-start.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/route-point-start.png
rename to data/styles/default/light/xhdpi/route-point-start.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-bakery.png b/data/styles/default/light/xhdpi/search-result-bakery.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-bakery.png
rename to data/styles/default/light/xhdpi/search-result-bakery.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-bar.png b/data/styles/default/light/xhdpi/search-result-bar.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-bar.png
rename to data/styles/default/light/xhdpi/search-result-bar.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-cafe.png b/data/styles/default/light/xhdpi/search-result-cafe.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-cafe.png
rename to data/styles/default/light/xhdpi/search-result-cafe.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-casino.png b/data/styles/default/light/xhdpi/search-result-casino.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-casino.png
rename to data/styles/default/light/xhdpi/search-result-casino.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-cinema.png b/data/styles/default/light/xhdpi/search-result-cinema.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-cinema.png
rename to data/styles/default/light/xhdpi/search-result-cinema.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-fastfood.png b/data/styles/default/light/xhdpi/search-result-fastfood.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-fastfood.png
rename to data/styles/default/light/xhdpi/search-result-fastfood.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-marketplace.png b/data/styles/default/light/xhdpi/search-result-marketplace.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-marketplace.png
rename to data/styles/default/light/xhdpi/search-result-marketplace.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-nightclub.png b/data/styles/default/light/xhdpi/search-result-nightclub.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-nightclub.png
rename to data/styles/default/light/xhdpi/search-result-nightclub.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-playground.png b/data/styles/default/light/xhdpi/search-result-playground.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-playground.png
rename to data/styles/default/light/xhdpi/search-result-playground.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-pub.png b/data/styles/default/light/xhdpi/search-result-pub.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-pub.png
rename to data/styles/default/light/xhdpi/search-result-pub.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-restaurant.png b/data/styles/default/light/xhdpi/search-result-restaurant.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-restaurant.png
rename to data/styles/default/light/xhdpi/search-result-restaurant.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-shop-alcohol.png b/data/styles/default/light/xhdpi/search-result-shop-alcohol.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-shop-alcohol.png
rename to data/styles/default/light/xhdpi/search-result-shop-alcohol.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-shop-butcher.png b/data/styles/default/light/xhdpi/search-result-shop-butcher.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-shop-butcher.png
rename to data/styles/default/light/xhdpi/search-result-shop-butcher.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-shop-clothes.png b/data/styles/default/light/xhdpi/search-result-shop-clothes.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-shop-clothes.png
rename to data/styles/default/light/xhdpi/search-result-shop-clothes.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-shop-confectionery.png b/data/styles/default/light/xhdpi/search-result-shop-confectionery.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-shop-confectionery.png
rename to data/styles/default/light/xhdpi/search-result-shop-confectionery.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-shop-convenience.png b/data/styles/default/light/xhdpi/search-result-shop-convenience.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-shop-convenience.png
rename to data/styles/default/light/xhdpi/search-result-shop-convenience.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-shop-cosmetics.png b/data/styles/default/light/xhdpi/search-result-shop-cosmetics.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-shop-cosmetics.png
rename to data/styles/default/light/xhdpi/search-result-shop-cosmetics.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-shop-department_store.png b/data/styles/default/light/xhdpi/search-result-shop-department_store.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-shop-department_store.png
rename to data/styles/default/light/xhdpi/search-result-shop-department_store.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-shop-gift.png b/data/styles/default/light/xhdpi/search-result-shop-gift.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-shop-gift.png
rename to data/styles/default/light/xhdpi/search-result-shop-gift.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-shop-greengrocer.png b/data/styles/default/light/xhdpi/search-result-shop-greengrocer.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-shop-greengrocer.png
rename to data/styles/default/light/xhdpi/search-result-shop-greengrocer.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-shop-jewelry.png b/data/styles/default/light/xhdpi/search-result-shop-jewelry.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-shop-jewelry.png
rename to data/styles/default/light/xhdpi/search-result-shop-jewelry.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-shop-mall.png b/data/styles/default/light/xhdpi/search-result-shop-mall.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-shop-mall.png
rename to data/styles/default/light/xhdpi/search-result-shop-mall.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-shop-seafood.png b/data/styles/default/light/xhdpi/search-result-shop-seafood.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-shop-seafood.png
rename to data/styles/default/light/xhdpi/search-result-shop-seafood.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-shop-shoes.png b/data/styles/default/light/xhdpi/search-result-shop-shoes.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-shop-shoes.png
rename to data/styles/default/light/xhdpi/search-result-shop-shoes.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-shop-sports.png b/data/styles/default/light/xhdpi/search-result-shop-sports.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-shop-sports.png
rename to data/styles/default/light/xhdpi/search-result-shop-sports.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-shop-supermarket.png b/data/styles/default/light/xhdpi/search-result-shop-supermarket.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-shop-supermarket.png
rename to data/styles/default/light/xhdpi/search-result-shop-supermarket.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-shop-toys.png b/data/styles/default/light/xhdpi/search-result-shop-toys.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-shop-toys.png
rename to data/styles/default/light/xhdpi/search-result-shop-toys.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-theme-park.png b/data/styles/default/light/xhdpi/search-result-theme-park.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-theme-park.png
rename to data/styles/default/light/xhdpi/search-result-theme-park.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-water-park.png b/data/styles/default/light/xhdpi/search-result-water-park.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-water-park.png
rename to data/styles/default/light/xhdpi/search-result-water-park.png
diff --git a/data/styles/clear/style-night/xhdpi/search-result-zoo.png b/data/styles/default/light/xhdpi/search-result-zoo.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/search-result-zoo.png
rename to data/styles/default/light/xhdpi/search-result-zoo.png
diff --git a/data/styles/clear/style-clear/xhdpi/search-result.png b/data/styles/default/light/xhdpi/search-result.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/search-result.png
rename to data/styles/default/light/xhdpi/search-result.png
diff --git a/data/styles/clear/style-night/xhdpi/shield-us-hw-thin-scaled.png b/data/styles/default/light/xhdpi/shield-us-hw-thin-scaled.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/shield-us-hw-thin-scaled.png
rename to data/styles/default/light/xhdpi/shield-us-hw-thin-scaled.png
diff --git a/data/styles/clear/style-night/xhdpi/shield-us-hw-thin.png b/data/styles/default/light/xhdpi/shield-us-hw-thin.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/shield-us-hw-thin.png
rename to data/styles/default/light/xhdpi/shield-us-hw-thin.png
diff --git a/data/styles/clear/style-night/xhdpi/shield-us-hw-wide-scaled.png b/data/styles/default/light/xhdpi/shield-us-hw-wide-scaled.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/shield-us-hw-wide-scaled.png
rename to data/styles/default/light/xhdpi/shield-us-hw-wide-scaled.png
diff --git a/data/styles/clear/style-night/xhdpi/shield-us-hw-wide.png b/data/styles/default/light/xhdpi/shield-us-hw-wide.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/shield-us-hw-wide.png
rename to data/styles/default/light/xhdpi/shield-us-hw-wide.png
diff --git a/data/styles/clear/style-night/xhdpi/shield-us-i-thin-scaled.png b/data/styles/default/light/xhdpi/shield-us-i-thin-scaled.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/shield-us-i-thin-scaled.png
rename to data/styles/default/light/xhdpi/shield-us-i-thin-scaled.png
diff --git a/data/styles/clear/style-night/xhdpi/shield-us-i-thin.png b/data/styles/default/light/xhdpi/shield-us-i-thin.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/shield-us-i-thin.png
rename to data/styles/default/light/xhdpi/shield-us-i-thin.png
diff --git a/data/styles/clear/style-night/xhdpi/shield-us-i-wide-scaled.png b/data/styles/default/light/xhdpi/shield-us-i-wide-scaled.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/shield-us-i-wide-scaled.png
rename to data/styles/default/light/xhdpi/shield-us-i-wide-scaled.png
diff --git a/data/styles/clear/style-night/xhdpi/shield-us-i-wide.png b/data/styles/default/light/xhdpi/shield-us-i-wide.png
similarity index 100%
rename from data/styles/clear/style-night/xhdpi/shield-us-i-wide.png
rename to data/styles/default/light/xhdpi/shield-us-i-wide.png
diff --git a/data/styles/clear/style-clear/xhdpi/track_marker_deselected.png b/data/styles/default/light/xhdpi/track_marker_deselected.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/track_marker_deselected.png
rename to data/styles/default/light/xhdpi/track_marker_deselected.png
diff --git a/data/styles/clear/style-clear/xhdpi/track_marker_selected.png b/data/styles/default/light/xhdpi/track_marker_selected.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/track_marker_selected.png
rename to data/styles/default/light/xhdpi/track_marker_selected.png
diff --git a/data/styles/clear/style-clear/xhdpi/unpaved_road.png b/data/styles/default/light/xhdpi/unpaved_road.png
similarity index 100%
rename from data/styles/clear/style-clear/xhdpi/unpaved_road.png
rename to data/styles/default/light/xhdpi/unpaved_road.png
diff --git a/data/styles/clear/style-night/xxhdpi-ad/keep.png b/data/styles/default/light/xxhdpi-ad/keep.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi-ad/keep.png
rename to data/styles/default/light/xxhdpi-ad/keep.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-animals-m.png b/data/styles/default/light/xxhdpi/bookmark-animals-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-animals-m.png
rename to data/styles/default/light/xxhdpi/bookmark-animals-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-bar-m.png b/data/styles/default/light/xxhdpi/bookmark-bar-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-bar-m.png
rename to data/styles/default/light/xxhdpi/bookmark-bar-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-bg-m.png b/data/styles/default/light/xxhdpi/bookmark-bg-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-bg-m.png
rename to data/styles/default/light/xxhdpi/bookmark-bg-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-bg-s.png b/data/styles/default/light/xxhdpi/bookmark-bg-s.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-bg-s.png
rename to data/styles/default/light/xxhdpi/bookmark-bg-s.png
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-bg-xs.png b/data/styles/default/light/xxhdpi/bookmark-bg-xs.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/bookmark-bg-xs.png
rename to data/styles/default/light/xxhdpi/bookmark-bg-xs.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-buddhism-m.png b/data/styles/default/light/xxhdpi/bookmark-buddhism-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-buddhism-m.png
rename to data/styles/default/light/xxhdpi/bookmark-buddhism-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-building-m.png b/data/styles/default/light/xxhdpi/bookmark-building-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-building-m.png
rename to data/styles/default/light/xxhdpi/bookmark-building-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-christianity-m.png b/data/styles/default/light/xxhdpi/bookmark-christianity-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-christianity-m.png
rename to data/styles/default/light/xxhdpi/bookmark-christianity-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-default-m.png b/data/styles/default/light/xxhdpi/bookmark-default-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-default-m.png
rename to data/styles/default/light/xxhdpi/bookmark-default-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-default-s.png b/data/styles/default/light/xxhdpi/bookmark-default-s.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-default-s.png
rename to data/styles/default/light/xxhdpi/bookmark-default-s.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-default-xs.png b/data/styles/default/light/xxhdpi/bookmark-default-xs.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-default-xs.png
rename to data/styles/default/light/xxhdpi/bookmark-default-xs.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-entertainment-m.png b/data/styles/default/light/xxhdpi/bookmark-entertainment-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-entertainment-m.png
rename to data/styles/default/light/xxhdpi/bookmark-entertainment-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-exchange-m.png b/data/styles/default/light/xxhdpi/bookmark-exchange-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-exchange-m.png
rename to data/styles/default/light/xxhdpi/bookmark-exchange-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-finish-m.png b/data/styles/default/light/xxhdpi/bookmark-finish-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-finish-m.png
rename to data/styles/default/light/xxhdpi/bookmark-finish-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-food-m.png b/data/styles/default/light/xxhdpi/bookmark-food-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-food-m.png
rename to data/styles/default/light/xxhdpi/bookmark-food-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-gas-m.png b/data/styles/default/light/xxhdpi/bookmark-gas-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-gas-m.png
rename to data/styles/default/light/xxhdpi/bookmark-gas-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-hotel-m.png b/data/styles/default/light/xxhdpi/bookmark-hotel-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-hotel-m.png
rename to data/styles/default/light/xxhdpi/bookmark-hotel-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-islam-m.png b/data/styles/default/light/xxhdpi/bookmark-islam-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-islam-m.png
rename to data/styles/default/light/xxhdpi/bookmark-islam-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-judaism-m.png b/data/styles/default/light/xxhdpi/bookmark-judaism-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-judaism-m.png
rename to data/styles/default/light/xxhdpi/bookmark-judaism-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-medicine-m.png b/data/styles/default/light/xxhdpi/bookmark-medicine-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-medicine-m.png
rename to data/styles/default/light/xxhdpi/bookmark-medicine-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-mountain-m.png b/data/styles/default/light/xxhdpi/bookmark-mountain-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-mountain-m.png
rename to data/styles/default/light/xxhdpi/bookmark-mountain-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-museum-m.png b/data/styles/default/light/xxhdpi/bookmark-museum-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-museum-m.png
rename to data/styles/default/light/xxhdpi/bookmark-museum-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-park-m.png b/data/styles/default/light/xxhdpi/bookmark-park-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-park-m.png
rename to data/styles/default/light/xxhdpi/bookmark-park-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-parking-m.png b/data/styles/default/light/xxhdpi/bookmark-parking-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-parking-m.png
rename to data/styles/default/light/xxhdpi/bookmark-parking-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-shop-m.png b/data/styles/default/light/xxhdpi/bookmark-shop-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-shop-m.png
rename to data/styles/default/light/xxhdpi/bookmark-shop-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-sights-m.png b/data/styles/default/light/xxhdpi/bookmark-sights-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-sights-m.png
rename to data/styles/default/light/xxhdpi/bookmark-sights-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-sport-m.png b/data/styles/default/light/xxhdpi/bookmark-sport-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-sport-m.png
rename to data/styles/default/light/xxhdpi/bookmark-sport-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-start-m.png b/data/styles/default/light/xxhdpi/bookmark-start-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-start-m.png
rename to data/styles/default/light/xxhdpi/bookmark-start-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-swim-m.png b/data/styles/default/light/xxhdpi/bookmark-swim-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-swim-m.png
rename to data/styles/default/light/xxhdpi/bookmark-swim-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-transport-m.png b/data/styles/default/light/xxhdpi/bookmark-transport-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-transport-m.png
rename to data/styles/default/light/xxhdpi/bookmark-transport-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-viewpoint-m.png b/data/styles/default/light/xxhdpi/bookmark-viewpoint-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-viewpoint-m.png
rename to data/styles/default/light/xxhdpi/bookmark-viewpoint-m.png
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-water-m.png b/data/styles/default/light/xxhdpi/bookmark-water-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/bookmark-water-m.png
rename to data/styles/default/light/xxhdpi/bookmark-water-m.png
diff --git a/data/styles/clear/style-night/xxhdpi/coloredmark-bg-l.png b/data/styles/default/light/xxhdpi/coloredmark-bg-l.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/coloredmark-bg-l.png
rename to data/styles/default/light/xxhdpi/coloredmark-bg-l.png
diff --git a/data/styles/clear/style-night/xxhdpi/coloredmark-bg-s.png b/data/styles/default/light/xxhdpi/coloredmark-bg-s.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/coloredmark-bg-s.png
rename to data/styles/default/light/xxhdpi/coloredmark-bg-s.png
diff --git a/data/styles/clear/style-clear/xxhdpi/coloredmark-default-l.png b/data/styles/default/light/xxhdpi/coloredmark-default-l.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/coloredmark-default-l.png
rename to data/styles/default/light/xxhdpi/coloredmark-default-l.png
diff --git a/data/styles/clear/style-night/xxhdpi/coloredmark-default-s.png b/data/styles/default/light/xxhdpi/coloredmark-default-s.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/coloredmark-default-s.png
rename to data/styles/default/light/xxhdpi/coloredmark-default-s.png
diff --git a/data/styles/clear/style-clear/xxhdpi/compass-image.png b/data/styles/default/light/xxhdpi/compass-image.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/compass-image.png
rename to data/styles/default/light/xxhdpi/compass-image.png
diff --git a/data/styles/clear/style-clear/xxhdpi/cross_geoposition.png b/data/styles/default/light/xxhdpi/cross_geoposition.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/cross_geoposition.png
rename to data/styles/default/light/xxhdpi/cross_geoposition.png
diff --git a/data/styles/clear/style-clear/xxhdpi/current-position.png b/data/styles/default/light/xxhdpi/current-position.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/current-position.png
rename to data/styles/default/light/xxhdpi/current-position.png
diff --git a/data/styles/clear/style-clear/xxhdpi/ferry.png b/data/styles/default/light/xxhdpi/ferry.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/ferry.png
rename to data/styles/default/light/xxhdpi/ferry.png
diff --git a/data/styles/clear/style-clear/xxhdpi/infosign.png b/data/styles/default/light/xxhdpi/infosign.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/infosign.png
rename to data/styles/default/light/xxhdpi/infosign.png
diff --git a/data/styles/clear/style-night/xxhdpi/non-found-search-result.png b/data/styles/default/light/xxhdpi/non-found-search-result.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/non-found-search-result.png
rename to data/styles/default/light/xxhdpi/non-found-search-result.png
diff --git a/data/styles/clear/style-night/xxhdpi/norating-bg-l.png b/data/styles/default/light/xxhdpi/norating-bg-l.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/norating-bg-l.png
rename to data/styles/default/light/xxhdpi/norating-bg-l.png
diff --git a/data/styles/clear/style-night/xxhdpi/norating-default-l.png b/data/styles/default/light/xxhdpi/norating-default-l.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/norating-default-l.png
rename to data/styles/default/light/xxhdpi/norating-default-l.png
diff --git a/data/styles/clear/style-clear/xxhdpi/paid_road.png b/data/styles/default/light/xxhdpi/paid_road.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/paid_road.png
rename to data/styles/default/light/xxhdpi/paid_road.png
diff --git a/data/styles/clear/style-night/xxhdpi/route-arrow.png b/data/styles/default/light/xxhdpi/route-arrow.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/route-arrow.png
rename to data/styles/default/light/xxhdpi/route-arrow.png
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-1.png b/data/styles/default/light/xxhdpi/route-point-1.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/route-point-1.png
rename to data/styles/default/light/xxhdpi/route-point-1.png
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-10.png b/data/styles/default/light/xxhdpi/route-point-10.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/route-point-10.png
rename to data/styles/default/light/xxhdpi/route-point-10.png
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-11.png b/data/styles/default/light/xxhdpi/route-point-11.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/route-point-11.png
rename to data/styles/default/light/xxhdpi/route-point-11.png
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-12.png b/data/styles/default/light/xxhdpi/route-point-12.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/route-point-12.png
rename to data/styles/default/light/xxhdpi/route-point-12.png
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-13.png b/data/styles/default/light/xxhdpi/route-point-13.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/route-point-13.png
rename to data/styles/default/light/xxhdpi/route-point-13.png
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-14.png b/data/styles/default/light/xxhdpi/route-point-14.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/route-point-14.png
rename to data/styles/default/light/xxhdpi/route-point-14.png
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-15.png b/data/styles/default/light/xxhdpi/route-point-15.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/route-point-15.png
rename to data/styles/default/light/xxhdpi/route-point-15.png
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-16.png b/data/styles/default/light/xxhdpi/route-point-16.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/route-point-16.png
rename to data/styles/default/light/xxhdpi/route-point-16.png
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-17.png b/data/styles/default/light/xxhdpi/route-point-17.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/route-point-17.png
rename to data/styles/default/light/xxhdpi/route-point-17.png
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-18.png b/data/styles/default/light/xxhdpi/route-point-18.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/route-point-18.png
rename to data/styles/default/light/xxhdpi/route-point-18.png
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-19.png b/data/styles/default/light/xxhdpi/route-point-19.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/route-point-19.png
rename to data/styles/default/light/xxhdpi/route-point-19.png
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-2.png b/data/styles/default/light/xxhdpi/route-point-2.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/route-point-2.png
rename to data/styles/default/light/xxhdpi/route-point-2.png
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-20.png b/data/styles/default/light/xxhdpi/route-point-20.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/route-point-20.png
rename to data/styles/default/light/xxhdpi/route-point-20.png
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-3.png b/data/styles/default/light/xxhdpi/route-point-3.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/route-point-3.png
rename to data/styles/default/light/xxhdpi/route-point-3.png
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-4.png b/data/styles/default/light/xxhdpi/route-point-4.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/route-point-4.png
rename to data/styles/default/light/xxhdpi/route-point-4.png
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-5.png b/data/styles/default/light/xxhdpi/route-point-5.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/route-point-5.png
rename to data/styles/default/light/xxhdpi/route-point-5.png
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-6.png b/data/styles/default/light/xxhdpi/route-point-6.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/route-point-6.png
rename to data/styles/default/light/xxhdpi/route-point-6.png
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-7.png b/data/styles/default/light/xxhdpi/route-point-7.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/route-point-7.png
rename to data/styles/default/light/xxhdpi/route-point-7.png
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-8.png b/data/styles/default/light/xxhdpi/route-point-8.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/route-point-8.png
rename to data/styles/default/light/xxhdpi/route-point-8.png
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-9.png b/data/styles/default/light/xxhdpi/route-point-9.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/route-point-9.png
rename to data/styles/default/light/xxhdpi/route-point-9.png
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-finish.png b/data/styles/default/light/xxhdpi/route-point-finish.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/route-point-finish.png
rename to data/styles/default/light/xxhdpi/route-point-finish.png
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-start.png b/data/styles/default/light/xxhdpi/route-point-start.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/route-point-start.png
rename to data/styles/default/light/xxhdpi/route-point-start.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-bakery.png b/data/styles/default/light/xxhdpi/search-result-bakery.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-bakery.png
rename to data/styles/default/light/xxhdpi/search-result-bakery.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-bar.png b/data/styles/default/light/xxhdpi/search-result-bar.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-bar.png
rename to data/styles/default/light/xxhdpi/search-result-bar.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-cafe.png b/data/styles/default/light/xxhdpi/search-result-cafe.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-cafe.png
rename to data/styles/default/light/xxhdpi/search-result-cafe.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-casino.png b/data/styles/default/light/xxhdpi/search-result-casino.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-casino.png
rename to data/styles/default/light/xxhdpi/search-result-casino.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-cinema.png b/data/styles/default/light/xxhdpi/search-result-cinema.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-cinema.png
rename to data/styles/default/light/xxhdpi/search-result-cinema.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-fastfood.png b/data/styles/default/light/xxhdpi/search-result-fastfood.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-fastfood.png
rename to data/styles/default/light/xxhdpi/search-result-fastfood.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-marketplace.png b/data/styles/default/light/xxhdpi/search-result-marketplace.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-marketplace.png
rename to data/styles/default/light/xxhdpi/search-result-marketplace.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-nightclub.png b/data/styles/default/light/xxhdpi/search-result-nightclub.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-nightclub.png
rename to data/styles/default/light/xxhdpi/search-result-nightclub.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-playground.png b/data/styles/default/light/xxhdpi/search-result-playground.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-playground.png
rename to data/styles/default/light/xxhdpi/search-result-playground.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-pub.png b/data/styles/default/light/xxhdpi/search-result-pub.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-pub.png
rename to data/styles/default/light/xxhdpi/search-result-pub.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-restaurant.png b/data/styles/default/light/xxhdpi/search-result-restaurant.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-restaurant.png
rename to data/styles/default/light/xxhdpi/search-result-restaurant.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-shop-alcohol.png b/data/styles/default/light/xxhdpi/search-result-shop-alcohol.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-shop-alcohol.png
rename to data/styles/default/light/xxhdpi/search-result-shop-alcohol.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-shop-butcher.png b/data/styles/default/light/xxhdpi/search-result-shop-butcher.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-shop-butcher.png
rename to data/styles/default/light/xxhdpi/search-result-shop-butcher.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-shop-clothes.png b/data/styles/default/light/xxhdpi/search-result-shop-clothes.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-shop-clothes.png
rename to data/styles/default/light/xxhdpi/search-result-shop-clothes.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-shop-confectionery.png b/data/styles/default/light/xxhdpi/search-result-shop-confectionery.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-shop-confectionery.png
rename to data/styles/default/light/xxhdpi/search-result-shop-confectionery.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-shop-convenience.png b/data/styles/default/light/xxhdpi/search-result-shop-convenience.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-shop-convenience.png
rename to data/styles/default/light/xxhdpi/search-result-shop-convenience.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-shop-cosmetics.png b/data/styles/default/light/xxhdpi/search-result-shop-cosmetics.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-shop-cosmetics.png
rename to data/styles/default/light/xxhdpi/search-result-shop-cosmetics.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-shop-department_store.png b/data/styles/default/light/xxhdpi/search-result-shop-department_store.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-shop-department_store.png
rename to data/styles/default/light/xxhdpi/search-result-shop-department_store.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-shop-gift.png b/data/styles/default/light/xxhdpi/search-result-shop-gift.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-shop-gift.png
rename to data/styles/default/light/xxhdpi/search-result-shop-gift.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-shop-greengrocer.png b/data/styles/default/light/xxhdpi/search-result-shop-greengrocer.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-shop-greengrocer.png
rename to data/styles/default/light/xxhdpi/search-result-shop-greengrocer.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-shop-jewelry.png b/data/styles/default/light/xxhdpi/search-result-shop-jewelry.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-shop-jewelry.png
rename to data/styles/default/light/xxhdpi/search-result-shop-jewelry.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-shop-mall.png b/data/styles/default/light/xxhdpi/search-result-shop-mall.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-shop-mall.png
rename to data/styles/default/light/xxhdpi/search-result-shop-mall.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-shop-seafood.png b/data/styles/default/light/xxhdpi/search-result-shop-seafood.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-shop-seafood.png
rename to data/styles/default/light/xxhdpi/search-result-shop-seafood.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-shop-shoes.png b/data/styles/default/light/xxhdpi/search-result-shop-shoes.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-shop-shoes.png
rename to data/styles/default/light/xxhdpi/search-result-shop-shoes.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-shop-sports.png b/data/styles/default/light/xxhdpi/search-result-shop-sports.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-shop-sports.png
rename to data/styles/default/light/xxhdpi/search-result-shop-sports.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-shop-supermarket.png b/data/styles/default/light/xxhdpi/search-result-shop-supermarket.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-shop-supermarket.png
rename to data/styles/default/light/xxhdpi/search-result-shop-supermarket.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-shop-toys.png b/data/styles/default/light/xxhdpi/search-result-shop-toys.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-shop-toys.png
rename to data/styles/default/light/xxhdpi/search-result-shop-toys.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-theme-park.png b/data/styles/default/light/xxhdpi/search-result-theme-park.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-theme-park.png
rename to data/styles/default/light/xxhdpi/search-result-theme-park.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-water-park.png b/data/styles/default/light/xxhdpi/search-result-water-park.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-water-park.png
rename to data/styles/default/light/xxhdpi/search-result-water-park.png
diff --git a/data/styles/clear/style-night/xxhdpi/search-result-zoo.png b/data/styles/default/light/xxhdpi/search-result-zoo.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/search-result-zoo.png
rename to data/styles/default/light/xxhdpi/search-result-zoo.png
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result.png b/data/styles/default/light/xxhdpi/search-result.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/search-result.png
rename to data/styles/default/light/xxhdpi/search-result.png
diff --git a/data/styles/clear/style-night/xxhdpi/shield-us-hw-thin-scaled.png b/data/styles/default/light/xxhdpi/shield-us-hw-thin-scaled.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/shield-us-hw-thin-scaled.png
rename to data/styles/default/light/xxhdpi/shield-us-hw-thin-scaled.png
diff --git a/data/styles/clear/style-night/xxhdpi/shield-us-hw-thin.png b/data/styles/default/light/xxhdpi/shield-us-hw-thin.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/shield-us-hw-thin.png
rename to data/styles/default/light/xxhdpi/shield-us-hw-thin.png
diff --git a/data/styles/clear/style-night/xxhdpi/shield-us-hw-wide-scaled.png b/data/styles/default/light/xxhdpi/shield-us-hw-wide-scaled.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/shield-us-hw-wide-scaled.png
rename to data/styles/default/light/xxhdpi/shield-us-hw-wide-scaled.png
diff --git a/data/styles/clear/style-night/xxhdpi/shield-us-hw-wide.png b/data/styles/default/light/xxhdpi/shield-us-hw-wide.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/shield-us-hw-wide.png
rename to data/styles/default/light/xxhdpi/shield-us-hw-wide.png
diff --git a/data/styles/clear/style-night/xxhdpi/shield-us-i-thin-scaled.png b/data/styles/default/light/xxhdpi/shield-us-i-thin-scaled.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/shield-us-i-thin-scaled.png
rename to data/styles/default/light/xxhdpi/shield-us-i-thin-scaled.png
diff --git a/data/styles/clear/style-night/xxhdpi/shield-us-i-thin.png b/data/styles/default/light/xxhdpi/shield-us-i-thin.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/shield-us-i-thin.png
rename to data/styles/default/light/xxhdpi/shield-us-i-thin.png
diff --git a/data/styles/clear/style-night/xxhdpi/shield-us-i-wide-scaled.png b/data/styles/default/light/xxhdpi/shield-us-i-wide-scaled.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/shield-us-i-wide-scaled.png
rename to data/styles/default/light/xxhdpi/shield-us-i-wide-scaled.png
diff --git a/data/styles/clear/style-night/xxhdpi/shield-us-i-wide.png b/data/styles/default/light/xxhdpi/shield-us-i-wide.png
similarity index 100%
rename from data/styles/clear/style-night/xxhdpi/shield-us-i-wide.png
rename to data/styles/default/light/xxhdpi/shield-us-i-wide.png
diff --git a/data/styles/clear/style-clear/xxhdpi/track_marker_deselected.png b/data/styles/default/light/xxhdpi/track_marker_deselected.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/track_marker_deselected.png
rename to data/styles/default/light/xxhdpi/track_marker_deselected.png
diff --git a/data/styles/clear/style-clear/xxhdpi/track_marker_selected.png b/data/styles/default/light/xxhdpi/track_marker_selected.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/track_marker_selected.png
rename to data/styles/default/light/xxhdpi/track_marker_selected.png
diff --git a/data/styles/clear/style-clear/xxhdpi/unpaved_road.png b/data/styles/default/light/xxhdpi/unpaved_road.png
similarity index 100%
rename from data/styles/clear/style-clear/xxhdpi/unpaved_road.png
rename to data/styles/default/light/xxhdpi/unpaved_road.png
diff --git a/data/styles/clear/style-night/xxxhdpi-ad/keep.png b/data/styles/default/light/xxxhdpi-ad/keep.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi-ad/keep.png
rename to data/styles/default/light/xxxhdpi-ad/keep.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-animals-m.png b/data/styles/default/light/xxxhdpi/bookmark-animals-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-animals-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-animals-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-bar-m.png b/data/styles/default/light/xxxhdpi/bookmark-bar-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-bar-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-bar-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-bg-m.png b/data/styles/default/light/xxxhdpi/bookmark-bg-m.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-bg-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-bg-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-bg-s.png b/data/styles/default/light/xxxhdpi/bookmark-bg-s.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-bg-s.png
rename to data/styles/default/light/xxxhdpi/bookmark-bg-s.png
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-bg-xs.png b/data/styles/default/light/xxxhdpi/bookmark-bg-xs.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/bookmark-bg-xs.png
rename to data/styles/default/light/xxxhdpi/bookmark-bg-xs.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-buddhism-m.png b/data/styles/default/light/xxxhdpi/bookmark-buddhism-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-buddhism-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-buddhism-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-building-m.png b/data/styles/default/light/xxxhdpi/bookmark-building-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-building-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-building-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-christianity-m.png b/data/styles/default/light/xxxhdpi/bookmark-christianity-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-christianity-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-christianity-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-default-m.png b/data/styles/default/light/xxxhdpi/bookmark-default-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-default-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-default-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-default-s.png b/data/styles/default/light/xxxhdpi/bookmark-default-s.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-default-s.png
rename to data/styles/default/light/xxxhdpi/bookmark-default-s.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-default-xs.png b/data/styles/default/light/xxxhdpi/bookmark-default-xs.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-default-xs.png
rename to data/styles/default/light/xxxhdpi/bookmark-default-xs.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-entertainment-m.png b/data/styles/default/light/xxxhdpi/bookmark-entertainment-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-entertainment-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-entertainment-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-exchange-m.png b/data/styles/default/light/xxxhdpi/bookmark-exchange-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-exchange-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-exchange-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-finish-m.png b/data/styles/default/light/xxxhdpi/bookmark-finish-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-finish-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-finish-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-food-m.png b/data/styles/default/light/xxxhdpi/bookmark-food-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-food-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-food-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-gas-m.png b/data/styles/default/light/xxxhdpi/bookmark-gas-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-gas-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-gas-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-hotel-m.png b/data/styles/default/light/xxxhdpi/bookmark-hotel-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-hotel-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-hotel-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-islam-m.png b/data/styles/default/light/xxxhdpi/bookmark-islam-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-islam-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-islam-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-judaism-m.png b/data/styles/default/light/xxxhdpi/bookmark-judaism-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-judaism-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-judaism-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-medicine-m.png b/data/styles/default/light/xxxhdpi/bookmark-medicine-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-medicine-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-medicine-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-mountain-m.png b/data/styles/default/light/xxxhdpi/bookmark-mountain-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-mountain-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-mountain-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-museum-m.png b/data/styles/default/light/xxxhdpi/bookmark-museum-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-museum-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-museum-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-park-m.png b/data/styles/default/light/xxxhdpi/bookmark-park-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-park-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-park-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-parking-m.png b/data/styles/default/light/xxxhdpi/bookmark-parking-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-parking-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-parking-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-shop-m.png b/data/styles/default/light/xxxhdpi/bookmark-shop-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-shop-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-shop-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-sights-m.png b/data/styles/default/light/xxxhdpi/bookmark-sights-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-sights-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-sights-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-sport-m.png b/data/styles/default/light/xxxhdpi/bookmark-sport-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-sport-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-sport-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-start-m.png b/data/styles/default/light/xxxhdpi/bookmark-start-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-start-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-start-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-swim-m.png b/data/styles/default/light/xxxhdpi/bookmark-swim-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-swim-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-swim-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-transport-m.png b/data/styles/default/light/xxxhdpi/bookmark-transport-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-transport-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-transport-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-viewpoint-m.png b/data/styles/default/light/xxxhdpi/bookmark-viewpoint-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-viewpoint-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-viewpoint-m.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-water-m.png b/data/styles/default/light/xxxhdpi/bookmark-water-m.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/bookmark-water-m.png
rename to data/styles/default/light/xxxhdpi/bookmark-water-m.png
diff --git a/data/styles/clear/style-night/xxxhdpi/coloredmark-bg-l.png b/data/styles/default/light/xxxhdpi/coloredmark-bg-l.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/coloredmark-bg-l.png
rename to data/styles/default/light/xxxhdpi/coloredmark-bg-l.png
diff --git a/data/styles/clear/style-night/xxxhdpi/coloredmark-bg-s.png b/data/styles/default/light/xxxhdpi/coloredmark-bg-s.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/coloredmark-bg-s.png
rename to data/styles/default/light/xxxhdpi/coloredmark-bg-s.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/coloredmark-default-l.png b/data/styles/default/light/xxxhdpi/coloredmark-default-l.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/coloredmark-default-l.png
rename to data/styles/default/light/xxxhdpi/coloredmark-default-l.png
diff --git a/data/styles/clear/style-night/xxxhdpi/coloredmark-default-s.png b/data/styles/default/light/xxxhdpi/coloredmark-default-s.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/coloredmark-default-s.png
rename to data/styles/default/light/xxxhdpi/coloredmark-default-s.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/compass-image.png b/data/styles/default/light/xxxhdpi/compass-image.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/compass-image.png
rename to data/styles/default/light/xxxhdpi/compass-image.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/cross_geoposition.png b/data/styles/default/light/xxxhdpi/cross_geoposition.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/cross_geoposition.png
rename to data/styles/default/light/xxxhdpi/cross_geoposition.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/current-position.png b/data/styles/default/light/xxxhdpi/current-position.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/current-position.png
rename to data/styles/default/light/xxxhdpi/current-position.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/ferry.png b/data/styles/default/light/xxxhdpi/ferry.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/ferry.png
rename to data/styles/default/light/xxxhdpi/ferry.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/infosign.png b/data/styles/default/light/xxxhdpi/infosign.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/infosign.png
rename to data/styles/default/light/xxxhdpi/infosign.png
diff --git a/data/styles/clear/style-night/xxxhdpi/non-found-search-result.png b/data/styles/default/light/xxxhdpi/non-found-search-result.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/non-found-search-result.png
rename to data/styles/default/light/xxxhdpi/non-found-search-result.png
diff --git a/data/styles/clear/style-night/xxxhdpi/norating-bg-l.png b/data/styles/default/light/xxxhdpi/norating-bg-l.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/norating-bg-l.png
rename to data/styles/default/light/xxxhdpi/norating-bg-l.png
diff --git a/data/styles/clear/style-night/xxxhdpi/norating-default-l.png b/data/styles/default/light/xxxhdpi/norating-default-l.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/norating-default-l.png
rename to data/styles/default/light/xxxhdpi/norating-default-l.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/paid_road.png b/data/styles/default/light/xxxhdpi/paid_road.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/paid_road.png
rename to data/styles/default/light/xxxhdpi/paid_road.png
diff --git a/data/styles/clear/style-night/xxxhdpi/route-arrow.png b/data/styles/default/light/xxxhdpi/route-arrow.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/route-arrow.png
rename to data/styles/default/light/xxxhdpi/route-arrow.png
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-1.png b/data/styles/default/light/xxxhdpi/route-point-1.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/route-point-1.png
rename to data/styles/default/light/xxxhdpi/route-point-1.png
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-10.png b/data/styles/default/light/xxxhdpi/route-point-10.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/route-point-10.png
rename to data/styles/default/light/xxxhdpi/route-point-10.png
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-11.png b/data/styles/default/light/xxxhdpi/route-point-11.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/route-point-11.png
rename to data/styles/default/light/xxxhdpi/route-point-11.png
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-12.png b/data/styles/default/light/xxxhdpi/route-point-12.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/route-point-12.png
rename to data/styles/default/light/xxxhdpi/route-point-12.png
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-13.png b/data/styles/default/light/xxxhdpi/route-point-13.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/route-point-13.png
rename to data/styles/default/light/xxxhdpi/route-point-13.png
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-14.png b/data/styles/default/light/xxxhdpi/route-point-14.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/route-point-14.png
rename to data/styles/default/light/xxxhdpi/route-point-14.png
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-15.png b/data/styles/default/light/xxxhdpi/route-point-15.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/route-point-15.png
rename to data/styles/default/light/xxxhdpi/route-point-15.png
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-16.png b/data/styles/default/light/xxxhdpi/route-point-16.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/route-point-16.png
rename to data/styles/default/light/xxxhdpi/route-point-16.png
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-17.png b/data/styles/default/light/xxxhdpi/route-point-17.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/route-point-17.png
rename to data/styles/default/light/xxxhdpi/route-point-17.png
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-18.png b/data/styles/default/light/xxxhdpi/route-point-18.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/route-point-18.png
rename to data/styles/default/light/xxxhdpi/route-point-18.png
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-19.png b/data/styles/default/light/xxxhdpi/route-point-19.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/route-point-19.png
rename to data/styles/default/light/xxxhdpi/route-point-19.png
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-2.png b/data/styles/default/light/xxxhdpi/route-point-2.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/route-point-2.png
rename to data/styles/default/light/xxxhdpi/route-point-2.png
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-20.png b/data/styles/default/light/xxxhdpi/route-point-20.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/route-point-20.png
rename to data/styles/default/light/xxxhdpi/route-point-20.png
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-3.png b/data/styles/default/light/xxxhdpi/route-point-3.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/route-point-3.png
rename to data/styles/default/light/xxxhdpi/route-point-3.png
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-4.png b/data/styles/default/light/xxxhdpi/route-point-4.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/route-point-4.png
rename to data/styles/default/light/xxxhdpi/route-point-4.png
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-5.png b/data/styles/default/light/xxxhdpi/route-point-5.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/route-point-5.png
rename to data/styles/default/light/xxxhdpi/route-point-5.png
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-6.png b/data/styles/default/light/xxxhdpi/route-point-6.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/route-point-6.png
rename to data/styles/default/light/xxxhdpi/route-point-6.png
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-7.png b/data/styles/default/light/xxxhdpi/route-point-7.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/route-point-7.png
rename to data/styles/default/light/xxxhdpi/route-point-7.png
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-8.png b/data/styles/default/light/xxxhdpi/route-point-8.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/route-point-8.png
rename to data/styles/default/light/xxxhdpi/route-point-8.png
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-9.png b/data/styles/default/light/xxxhdpi/route-point-9.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/route-point-9.png
rename to data/styles/default/light/xxxhdpi/route-point-9.png
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-finish.png b/data/styles/default/light/xxxhdpi/route-point-finish.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/route-point-finish.png
rename to data/styles/default/light/xxxhdpi/route-point-finish.png
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-start.png b/data/styles/default/light/xxxhdpi/route-point-start.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/route-point-start.png
rename to data/styles/default/light/xxxhdpi/route-point-start.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-bakery.png b/data/styles/default/light/xxxhdpi/search-result-bakery.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-bakery.png
rename to data/styles/default/light/xxxhdpi/search-result-bakery.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-bar.png b/data/styles/default/light/xxxhdpi/search-result-bar.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-bar.png
rename to data/styles/default/light/xxxhdpi/search-result-bar.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-cafe.png b/data/styles/default/light/xxxhdpi/search-result-cafe.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-cafe.png
rename to data/styles/default/light/xxxhdpi/search-result-cafe.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-casino.png b/data/styles/default/light/xxxhdpi/search-result-casino.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-casino.png
rename to data/styles/default/light/xxxhdpi/search-result-casino.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-cinema.png b/data/styles/default/light/xxxhdpi/search-result-cinema.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-cinema.png
rename to data/styles/default/light/xxxhdpi/search-result-cinema.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-fastfood.png b/data/styles/default/light/xxxhdpi/search-result-fastfood.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-fastfood.png
rename to data/styles/default/light/xxxhdpi/search-result-fastfood.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-marketplace.png b/data/styles/default/light/xxxhdpi/search-result-marketplace.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-marketplace.png
rename to data/styles/default/light/xxxhdpi/search-result-marketplace.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-nightclub.png b/data/styles/default/light/xxxhdpi/search-result-nightclub.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-nightclub.png
rename to data/styles/default/light/xxxhdpi/search-result-nightclub.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-playground.png b/data/styles/default/light/xxxhdpi/search-result-playground.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-playground.png
rename to data/styles/default/light/xxxhdpi/search-result-playground.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-pub.png b/data/styles/default/light/xxxhdpi/search-result-pub.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-pub.png
rename to data/styles/default/light/xxxhdpi/search-result-pub.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-restaurant.png b/data/styles/default/light/xxxhdpi/search-result-restaurant.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-restaurant.png
rename to data/styles/default/light/xxxhdpi/search-result-restaurant.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-shop-alcohol.png b/data/styles/default/light/xxxhdpi/search-result-shop-alcohol.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-shop-alcohol.png
rename to data/styles/default/light/xxxhdpi/search-result-shop-alcohol.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-shop-butcher.png b/data/styles/default/light/xxxhdpi/search-result-shop-butcher.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-shop-butcher.png
rename to data/styles/default/light/xxxhdpi/search-result-shop-butcher.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-shop-clothes.png b/data/styles/default/light/xxxhdpi/search-result-shop-clothes.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-shop-clothes.png
rename to data/styles/default/light/xxxhdpi/search-result-shop-clothes.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-shop-confectionery.png b/data/styles/default/light/xxxhdpi/search-result-shop-confectionery.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-shop-confectionery.png
rename to data/styles/default/light/xxxhdpi/search-result-shop-confectionery.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-shop-convenience.png b/data/styles/default/light/xxxhdpi/search-result-shop-convenience.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-shop-convenience.png
rename to data/styles/default/light/xxxhdpi/search-result-shop-convenience.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-shop-cosmetics.png b/data/styles/default/light/xxxhdpi/search-result-shop-cosmetics.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-shop-cosmetics.png
rename to data/styles/default/light/xxxhdpi/search-result-shop-cosmetics.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-shop-department_store.png b/data/styles/default/light/xxxhdpi/search-result-shop-department_store.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-shop-department_store.png
rename to data/styles/default/light/xxxhdpi/search-result-shop-department_store.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-shop-gift.png b/data/styles/default/light/xxxhdpi/search-result-shop-gift.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-shop-gift.png
rename to data/styles/default/light/xxxhdpi/search-result-shop-gift.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-shop-greengrocer.png b/data/styles/default/light/xxxhdpi/search-result-shop-greengrocer.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-shop-greengrocer.png
rename to data/styles/default/light/xxxhdpi/search-result-shop-greengrocer.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-shop-jewelry.png b/data/styles/default/light/xxxhdpi/search-result-shop-jewelry.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-shop-jewelry.png
rename to data/styles/default/light/xxxhdpi/search-result-shop-jewelry.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-shop-mall.png b/data/styles/default/light/xxxhdpi/search-result-shop-mall.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-shop-mall.png
rename to data/styles/default/light/xxxhdpi/search-result-shop-mall.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-shop-seafood.png b/data/styles/default/light/xxxhdpi/search-result-shop-seafood.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-shop-seafood.png
rename to data/styles/default/light/xxxhdpi/search-result-shop-seafood.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-shop-shoes.png b/data/styles/default/light/xxxhdpi/search-result-shop-shoes.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-shop-shoes.png
rename to data/styles/default/light/xxxhdpi/search-result-shop-shoes.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-shop-sports.png b/data/styles/default/light/xxxhdpi/search-result-shop-sports.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-shop-sports.png
rename to data/styles/default/light/xxxhdpi/search-result-shop-sports.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-shop-supermarket.png b/data/styles/default/light/xxxhdpi/search-result-shop-supermarket.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-shop-supermarket.png
rename to data/styles/default/light/xxxhdpi/search-result-shop-supermarket.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-shop-toys.png b/data/styles/default/light/xxxhdpi/search-result-shop-toys.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-shop-toys.png
rename to data/styles/default/light/xxxhdpi/search-result-shop-toys.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-theme-park.png b/data/styles/default/light/xxxhdpi/search-result-theme-park.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-theme-park.png
rename to data/styles/default/light/xxxhdpi/search-result-theme-park.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-water-park.png b/data/styles/default/light/xxxhdpi/search-result-water-park.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-water-park.png
rename to data/styles/default/light/xxxhdpi/search-result-water-park.png
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result-zoo.png b/data/styles/default/light/xxxhdpi/search-result-zoo.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/search-result-zoo.png
rename to data/styles/default/light/xxxhdpi/search-result-zoo.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result.png b/data/styles/default/light/xxxhdpi/search-result.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/search-result.png
rename to data/styles/default/light/xxxhdpi/search-result.png
diff --git a/data/styles/clear/style-night/xxxhdpi/shield-us-hw-thin-scaled.png b/data/styles/default/light/xxxhdpi/shield-us-hw-thin-scaled.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/shield-us-hw-thin-scaled.png
rename to data/styles/default/light/xxxhdpi/shield-us-hw-thin-scaled.png
diff --git a/data/styles/clear/style-night/xxxhdpi/shield-us-hw-thin.png b/data/styles/default/light/xxxhdpi/shield-us-hw-thin.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/shield-us-hw-thin.png
rename to data/styles/default/light/xxxhdpi/shield-us-hw-thin.png
diff --git a/data/styles/clear/style-night/xxxhdpi/shield-us-hw-wide-scaled.png b/data/styles/default/light/xxxhdpi/shield-us-hw-wide-scaled.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/shield-us-hw-wide-scaled.png
rename to data/styles/default/light/xxxhdpi/shield-us-hw-wide-scaled.png
diff --git a/data/styles/clear/style-night/xxxhdpi/shield-us-hw-wide.png b/data/styles/default/light/xxxhdpi/shield-us-hw-wide.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/shield-us-hw-wide.png
rename to data/styles/default/light/xxxhdpi/shield-us-hw-wide.png
diff --git a/data/styles/clear/style-night/xxxhdpi/shield-us-i-thin-scaled.png b/data/styles/default/light/xxxhdpi/shield-us-i-thin-scaled.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/shield-us-i-thin-scaled.png
rename to data/styles/default/light/xxxhdpi/shield-us-i-thin-scaled.png
diff --git a/data/styles/clear/style-night/xxxhdpi/shield-us-i-thin.png b/data/styles/default/light/xxxhdpi/shield-us-i-thin.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/shield-us-i-thin.png
rename to data/styles/default/light/xxxhdpi/shield-us-i-thin.png
diff --git a/data/styles/clear/style-night/xxxhdpi/shield-us-i-wide-scaled.png b/data/styles/default/light/xxxhdpi/shield-us-i-wide-scaled.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/shield-us-i-wide-scaled.png
rename to data/styles/default/light/xxxhdpi/shield-us-i-wide-scaled.png
diff --git a/data/styles/clear/style-night/xxxhdpi/shield-us-i-wide.png b/data/styles/default/light/xxxhdpi/shield-us-i-wide.png
similarity index 100%
rename from data/styles/clear/style-night/xxxhdpi/shield-us-i-wide.png
rename to data/styles/default/light/xxxhdpi/shield-us-i-wide.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/track_marker_deselected.png b/data/styles/default/light/xxxhdpi/track_marker_deselected.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/track_marker_deselected.png
rename to data/styles/default/light/xxxhdpi/track_marker_deselected.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/track_marker_selected.png b/data/styles/default/light/xxxhdpi/track_marker_selected.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/track_marker_selected.png
rename to data/styles/default/light/xxxhdpi/track_marker_selected.png
diff --git a/data/styles/clear/style-clear/xxxhdpi/unpaved_road.png b/data/styles/default/light/xxxhdpi/unpaved_road.png
similarity index 100%
rename from data/styles/clear/style-clear/xxxhdpi/unpaved_road.png
rename to data/styles/default/light/xxxhdpi/unpaved_road.png
diff --git a/data/styles/outdoors/style-night/colors.mapcss b/data/styles/outdoors/dark/colors.mapcss
similarity index 100%
rename from data/styles/outdoors/style-night/colors.mapcss
rename to data/styles/outdoors/dark/colors.mapcss
diff --git a/data/styles/outdoors/style-night/style.mapcss b/data/styles/outdoors/dark/style.mapcss
similarity index 100%
rename from data/styles/outdoors/style-night/style.mapcss
rename to data/styles/outdoors/dark/style.mapcss
diff --git a/data/styles/outdoors/style-clear/colors.mapcss b/data/styles/outdoors/light/colors.mapcss
similarity index 100%
rename from data/styles/outdoors/style-clear/colors.mapcss
rename to data/styles/outdoors/light/colors.mapcss
diff --git a/data/styles/outdoors/style-clear/style.mapcss b/data/styles/outdoors/light/style.mapcss
similarity index 100%
rename from data/styles/outdoors/style-clear/style.mapcss
rename to data/styles/outdoors/light/style.mapcss
diff --git a/data/styles/vehicle/style-night/colors.mapcss b/data/styles/vehicle/dark/colors.mapcss
similarity index 100%
rename from data/styles/vehicle/style-night/colors.mapcss
rename to data/styles/vehicle/dark/colors.mapcss
diff --git a/data/styles/vehicle/style-night/style.mapcss b/data/styles/vehicle/dark/style.mapcss
similarity index 100%
rename from data/styles/vehicle/style-night/style.mapcss
rename to data/styles/vehicle/dark/style.mapcss
diff --git a/data/styles/vehicle/style-clear/colors.mapcss b/data/styles/vehicle/light/colors.mapcss
similarity index 100%
rename from data/styles/vehicle/style-clear/colors.mapcss
rename to data/styles/vehicle/light/colors.mapcss
diff --git a/data/styles/vehicle/style-clear/style.mapcss b/data/styles/vehicle/light/style.mapcss
similarity index 100%
rename from data/styles/vehicle/style-clear/style.mapcss
rename to data/styles/vehicle/light/style.mapcss