diff --git a/data/styles/ink_dark.mapcss b/data/styles/ink_dark.mapcss
deleted file mode 100644
index 8e28e7d0fa..0000000000
--- a/data/styles/ink_dark.mapcss
+++ /dev/null
@@ -1,3987 +0,0 @@
-canvas
-{
- background-color: #0e1117;
- fill-color: #462b2b;
- default-lines: false;
- default-points: false;
-}
-
-way::*
-{
- linejoin: round;
- linecap: round;
- text-position: line;
-}
-
-*::*
-{
- text-halo-color: black;
- text-anchor-horizontal: center;
- text-anchor-vertical: center;
- icon-width: 16;
- icon-height: 16;
-}
-
-*::int_name
-{
- text-offset: 20;
-}
-
-node::* {
- text-anchor-vertical: top;
-}
-
-area::* {
- text-position: center;
- text-anchor-vertical: center;
-}
-
-
-*[amenity],
-*[office],
-*[historic],
-*[tourism],
-*[leisure],
-*[man_made],
-*[natural],
-*[power],
-*[landuse],
-*[craft],
-*[internet_access],
-{
- text-position: center
-}
-area[aeroway],
-area[tourism]
-{
- fill-position: background;
-}
-
-@import("include/base_roads_dark.mapcss");
-@import("include/base_shop_dark.mapcss");
-@import("include/base_sport_dark.mapcss");
-@import("include/base_place_dark.mapcss");
-@import("include/base_water_dark.mapcss");
-
-line[highway=motorway_junction]
-{
- casing-width: 0;
-}
-line|z4[boundary=administrative][admin_level=2]
-{
- color: #005f6f;
- width: 1;
- z-index: 400;
- dashes: 3.12,3.12;
- linecap: butt;
- -x-kot-layer: top;
-}
-line|z5[boundary=administrative][admin_level=2]
-{
- color: #0088a4;
- width: 1;
- z-index: 400;
- dashes: 3.12,3.12;
- linecap: butt;
- -x-kot-layer: top;
-}
-line|z6-8[boundary=administrative][admin_level=4]::d2p2,
-line|z6-8[boundary=administrative][admin_level=4][border_type=state]::d3p2
-{
- color: #111122;
- width: 1;
- z-index: 120;
- -x-kot-layer: top;
-}
-line|z4-[boundary=administrative][admin_level=3]
-{
- color: #5f5f5f;
- width: 1;
- z-index: 123;
- dashes: 1,1;
- linecap: butt;
- -x-kot-layer: top;
-}
-line|z6[boundary=administrative][admin_level=2]::d2p2
-{
- color: #111122;
- width: 1;
- z-index: 123;
- -x-kot-layer: top;
-}
-line|z6[boundary=administrative][border_type=state]
-{
- color: blue;
- width: 1;
- z-index: 55;
-}
-line|z6-[boundary=administrative][admin_level=3]::d2p2
-{
- color: #111122;
- width: 1;
- z-index: 122;
- -x-kot-layer: top;
-}
-line|z6[boundary=administrative][admin_level=2]
-{
- color: #2688a4;
- width: 1;
- z-index: 124;
- dashes: 3.12,3.12;
- linecap: butt;
- -x-kot-layer: top;
-}
-line|z6[boundary=administrative][admin_level=4]
-{
- color: #5f5f5f;
- width: 0.2;
- z-index: 121;
- dashes: 0.3,0.6;
- linecap: butt;
- -x-kot-layer: top;
-}
-line|z7[boundary=administrative][admin_level=2]
-{
- color: #111122;
- width: 2.73;
- z-index: 124;
- -x-kot-layer: top;
-}
-line|z7-8[boundary=administrative][admin_level=4]
-{
- color: #6f6f6f;
- width: 0.7;
- z-index: 121;
- dashes: 0.3,0.6;
- linecap: butt;
- -x-kot-layer: top;
-}
-line|z7[boundary=administrative][admin_level=2]::d2p2
-{
- color: #06a8b4;
- width: 2;
- z-index: 125;
- dashes: 5,5;
- linecap: butt;
- -x-kot-layer: top;
-}
-line|z7[boundary=administrative][border_type=state]
-{
- color: blue;
- width: 0.62;
- z-index: 56;
-}
-line|z7[boundary=administrative][border_type=state]::d2p2
-{
- color: #06a8b4;
- width: 0.12;
- z-index: 57;
- dashes: 0.62,0.12,0.12,0.12;
- linecap: butt;
-}
-line|z8[boundary=administrative][border_type=state]
-{
- color: blue;
- width: 1.25;
- z-index: 63;
-}
-line|z8-11[boundary=administrative][admin_level=2]::d2p2
-{
- color: #06a8b4;
- width: 2.34;
- z-index: 125;
- dashes: 3.12,3.12;
- linecap: butt;
- -x-kot-layer: top;
-}
-line|z8[boundary=administrative][border_type=state]::d2p2
-{
- color: #06a8b4;
- width: 0.25;
- z-index: 64;
- dashes: 1.25,0.25,0.25,0.25;
- linecap: butt;
- -x-kot-layer: top;
-}
-line|z8-11[boundary=administrative][admin_level=2]
-{
- color: #111122;
- width: 3.12;
- z-index: 124;
- -x-kot-layer: top;
-}
-line|z9[boundary=administrative][admin_level=4]::d2p2
-{
- color: #111122;
- width: 1.2;
- -x-kot-layer: top;
-}
-area|z12-[aeroway=aerodrome],
-area|z12-[aeroway=airport],
-area|z12-[aeroway=aerodrome],
-node|z12-[aeroway=aerodrome],
-node|z12-[aeroway=airport],
-node|z12-[aeroway=aerodrome]
-{
- icon-image: airport.svg;
-}
-line|z9[boundary=administrative][admin_level=4]
-{
- color: #6f6f6f;
- width: 1;
- z-index: 12;
- dashes: 0.3,0.6;
- linecap: butt;
- -x-kot-layer: top;
-}
-area|z11-[aeroway=aerodrome]
-{
- fill-color: #272331;
-}
-line|z9[boundary=administrative][border_type=state]
-{
- color: blue;
- width: 1;
- z-index: 63;
-}
-line|z9[boundary=administrative][border_type=state]::d2p2
-{
- color: #06a8b4;
- width: 0.5;
- z-index: 64;
- dashes: 2.5,0.5,0.5,0.5;
- linecap: butt;
-}
-line|z10[boundary=administrative][admin_level=4]::d2p2,
-{
- color: #111122;
- width: 2;
- z-index: 401;
- -x-kot-layer: top;
-}
-line|z10-11[railway=rail]
-{
- color: #333333;
- width: 1;
- z-index: 136;
-}
-line|z10[boundary=administrative][border_type=state]
-{
- color: blue;
- width: 5;
- z-index: 152;
-}
-line|z10[boundary=administrative][admin_level=4]
-{
- color: #6f6f6f;
- linecap: butt;
- -x-kot-layer: top;
- width: 1.5;
- z-index: 402;
- dashes: 0.3,0.6;
-}
-line|z10-11[route=ferry]
-{
- color: #674717;
- width: 1;
- z-index: 147;
- dashes: 3,2;
- linecap: butt;
-}
-line|z10[boundary=administrative][border_type=state]::d2p2
-{
- color: #06a8b4;
- width: 1;
- z-index: 153;
- dashes: 5,1,1,1;
- linecap: butt;
-}
-line|z10[boundary=national_park]
-{
- color: #b106b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- z-index: 154;
- dashes: 5,1,1,1;
-}
-line|z11[boundary=administrative][border_type=state]::d2p2
-{
- color: #06a8b4;
- width: 2;
- z-index: 153;
- dashes: 10,2,2,2;
- linecap: butt;
-}
-line|z11[boundary=national_park]
-{
- color: #b106b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 154;
- dashes: 10,2,2,2;
-}
-line|z12[boundary=administrative][type=nation]
-{
- color: blue;
- width: 6;
- z-index: 414;
- -x-kot-layer: top;
-}
-line|z12[railway=yard]
-{
- color: #bfbfbf;
- width: 0.5;
- z-index: 228;
-}
-line|z12[boundary=administrative][border_type=country]::d2p2
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 417;
- dashes: 12,12;
-}
-line|z12[railway=narrow_gauge]
-{
- color: #333333;
- width: 1;
- z-index: 222;
-}
-line|z12[railway=light_rail]
-{
- color: #6f2f6f;
- width: 1;
- z-index: 668;
-}
-line|z12[boundary=administrative][border_type=region]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- z-index: 412;
- dashes: 12,4,4,4;
-}
-line|z12[aeroway=runway]
-{
- casing-linecap: butt;
- color: #2b2342;
- linecap: butt;
- width: 2;
- z-index: 230;
- linejoin: bevel;
- casing-linejoin: bevel;
- casing-width: 0.5;
- casing-color: #dfdfdf;
-}
-line|z12[man_made=cutline]
-{
- color: #0e1117;
- width: 1;
- z-index: 184;
- linecap: butt;
-}
-line|z13[man_made=cutline]
-{
- color: #0e1117;
- width: 2;
- z-index: 184;
- linecap: butt;
-}
-
-line|z12[railway=preserved]
-{
- color: #333333;
- width: 1;
- z-index: 223;
-}
-
-line|z12[railway=abandoned]
-{
- color: #4d4d4d;
- width: 0.25;
- z-index: 219;
- opacity: 0.3;
-}
-line|z12[aeroway=taxiway]
-{
- casing-linecap: butt;
- color: #2b2342;
- linecap: butt;
- width: 0.5;
- z-index: 231;
- linejoin: bevel;
- casing-linejoin: bevel;
- casing-width: 0.12;
- casing-color: #dfdfdf;
-}
-line|z12[boundary=administrative][border_type=state]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 413;
- dashes: 12,4,4,4;
-}
-line|z12[railway=monorail]
-{
- color: #2f7f7f;
- width: 1;
- z-index: 226;
-}
-line|z12[railway=rail]
-{
- color: #333333;
- width: 1;
- z-index: 221;
-}
-line|z12[railway=funicular]
-{
- color: #5f5f5f;
- width: 1;
- z-index: 225;
-}
-line|z12[route=ferry]
-{
- color: #674717;
- width: 1;
- z-index: 389;
- dashes: 3,2;
- linecap: butt;
-}
-line|z12[boundary=administrative][border_type=country]
-{
- color: blue;
- width: 6;
- z-index: 415;
- -x-kot-layer: top;
-}
-area|z12-[natural=volcano],
-node|z12-[natural=volcano]
-{
- icon-image: vulcan.svg;
-}
-line|z12[boundary=administrative][admin_level=2]
-{
- color: #111122;
- width: 6;
- z-index: 409;
- -x-kot-layer: top;
-}
-area|z12-[aeroway=terminal]
-{
- fill-color: #2b376b;
-}
-line|z12[boundary=national_park]
-{
- color: #b106b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 418;
- dashes: 12,4,4,4;
-}
-line|z12[boundary=administrative][admin_level=2]::d2p2
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 410;
- dashes: 12,12;
-}
-line|z12[railway=disused]
-{
- color: #575757;
- width: 0.5;
- z-index: 218;
- opacity: 0.5;
-}
-area|z12-13[natural=peak],
-node|z12-13[natural=peak],
-area|z12-13[natural=rock],
-node|z12-13[natural=rock],
-area|z13-15[natural=bare_rock],
-node|z13-15[natural=bare_rock],
-{
- icon-image: peak-mini.svg;
-}
-line|z12[boundary=administrative][type=nation]::d2p2
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 416;
- dashes: 12,12;
-}
-line|z13[piste:type=sled]
-{
- color: #0f1f23;
- width: 1.25;
-}
-line|z13[boundary=national_park]
-{
- color: #b106b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 443;
- dashes: 12,4,4,4;
-}
-line|z13[boundary=administrative][border_type=country]
-{
- color: blue;
- width: 6;
- z-index: 440;
- -x-kot-layer: top;
-}
-area|z13[aeroway=aerodrome],
-node|z13[aeroway=aerodrome]
-{
- text-offset: 10;
- text: name;
- font-size: 12;
- text-color: #575757;
-}
-line|z13[railway=siding]
-{
- color: #4f4f4f;
- width: 1;
- z-index: 239;
-}
-line|z13[piste:type=nordic]
-{
- color: #3fffff;
- width: 0.5;
- dashes: 1.5,0.25;
- linecap: butt;
-}
-line|z13[piste:type=downhill]
-{
- color: #afafaf;
- width: 2.5;
-}
-line|z13[piste:type=downhill][piste:difficulty=freeride]
-{
- color: #0922f5;
- width: 2.5;
-}
-line|z13[boundary=administrative][border_type=region]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- z-index: 437;
- dashes: 12,4,4,4;
-}
-line|z13[route=ferry]
-{
- color: #674717;
- width: 1;
- z-index: 411;
- dashes: 3,2;
- linecap: butt;
-}
-line|z13[railway=funicular]
-{
- color: #5f5f5f;
- width: 1;
- z-index: 235;
-}
-line|z13[railway=preserved]
-{
- color: #4f4f4f;
- width: 1.35;
- z-index: 231;
-}
-line|z13[boundary=administrative][border_type=country]::d2p2
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 442;
- dashes: 12,12;
-}
-line|z13[railway=abandoned]
-{
- color: #4d4d4d;
- width: 0.55;
- z-index: 227;
- opacity: 0.3;
-}
-line|z13[railway=disused]
-{
- color: #575757;
- width: 0.85;
- z-index: 226;
- opacity: 0.5;
-}
-line|z13[aeroway=runway]
-{
- casing-linecap: butt;
- color: #2b2342;
- linecap: butt;
- width: 2.5;
- z-index: 240;
- linejoin: bevel;
- casing-linejoin: bevel;
- casing-width: 0.5;
- casing-color: #dfdfdf;
-}
-line|z13[boundary=administrative][admin_level=2]
-{
- color: #111122;
- width: 6;
- z-index: 433;
- -x-kot-layer: top;
-}
-line|z13[boundary=administrative][border_type=state]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 438;
- dashes: 12,4,4,4;
-}
-node|z13[aerialway=station]
-{
- symbol-shape: circle;
- symbol-fill-color: #dfdfdf;
- symbol-size: 2;
-}
-area|z13-15[natural=peak],
-node|z13-15[natural=peak],
-area|z13-15[natural=rock],
-node|z13-15[natural=rock],
-area|z13-15[natural=bare_rock],
-node|z13-15[natural=bare_rock],
-{
- text-offset: 10;
- text: name;
- font-size: 12;
- text-color: white;
-}
-line|z13[boundary=administrative][type=nation]::d2p2
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 441;
- dashes: 12,12;
-}
-line|z13[aeroway=taxiway]
-{
- casing-linecap: butt;
- color: #2b2342;
- linecap: butt;
- width: 1;
- z-index: 241;
- linejoin: bevel;
- casing-linejoin: bevel;
- casing-width: 0.25;
- casing-color: #dfdfdf;
-}
-area|z17-[amenity=shelter],
-area|z17-[amenity=school],
-node|z17-[amenity=shelter],
-node|z17-[amenity=school]
-{
- text-offset: 10;
- font-size: 12;
- text-halo-radius: 2;
- text: name;
- text-color: #bfbfbf;
- text-halo-color: black;
-}
-node|z13-[highway=motorway_junction]
-{
- text-position: center;
-}
-area|z17-[leisure=garden]::int_name,
-area|z17-[leisure=park]::int_name
-{
- font-size: 11;
- text-halo-radius: 2;
- text: int_name;
- text-color: #bfbfbf;
- text-halo-color: black;
-}
-line|z13[piste:type=downhill][piste:difficulty=intermediate]
-{
- color: #00bfbf;
- width: 2.5;
-}
-line|z13[piste:type=downhill][piste:difficulty=advanced]
-{
- color: #dfdfdf;
- width: 2.5;
-}
-line|z13[boundary=administrative][admin_level=2]::d2p2
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 434;
- dashes: 12,12;
-}
-line|z13[railway=monorail]
-{
- color: #2f7f7f;
- width: 1;
-}
-area|z13-14[leisure=park],
-node|z13-14[leisure=park]
-{
- text: name;
- font-size: 12;
- text-color: #a357ff;
-}
-area|z13-14[leisure=park]::int_name,
-node|z13-14[leisure=park]::int_name
-{
- text: int_name;
- font-size: 11;
- text-color: #a357ff;
-}
-line|z13[railway=narrow_gauge]
-{
- color: #5f5f5f;
- width: 1;
- z-index: 230;
-}
-line|z13[railway=light_rail]
-{
- color: #6f2f6f;
- width: 1;
- z-index: 687;
-}
-line|z13[boundary=administrative][type=nation]
-{
- color: blue;
- width: 6;
- z-index: 439;
- -x-kot-layer: top;
-}
-line|z13[railway=rail]
-{
- color: #4f4f4f;
- width: 1.85;
- z-index: 229;
-}
-line|z13[railway=yard]
-{
- color: #bfbfbf;
- width: 0.85;
- z-index: 238;
-}
-line|z13[piste:type=downhill][piste:difficulty=easy]
-{
- color: yellow;
- width: 2.5;
-}
-line|z13[piste:type=downhill][piste:difficulty=novice]
-{
- color: #bf00bf;
- width: 2.5;
-}
-line|z13[piste:type=downhill][piste:difficulty=expert]
-{
- color: #097ff5;
- width: 2.5;
-}
-line|z14[railway=spur]::d1p2
-{
- color: #6f6f6f;
- width: 1;
- z-index: 293;
-}
-line|z14[railway=yard]
-{
- color: #bfbfbf;
- width: 1.6;
- z-index: 208;
-}
-area|z14-15[natural=volcano],
-node|z14-15[natural=volcano],
-node|z14-15[natural=cave_entrance],
-area|z14-15[natural=cave_entrance],
-node|z14-15[natural=cape],
-area|z14-15[natural=cape],
-{
- text-offset: 10;
- text: name;
- font-size: 12;
- text-color: white;
-}
-line|z14[railway=abandoned]::d1p3
-{
- opacity: 0.4;
- color: #4d4d4d;
- linecap: butt;
- width: 1;
- z-index: 300;
- dashes: 4.5,4.5;
-}
-area|z14-[natural=peak],
-node|z14-[natural=peak],
-area|z14-[natural=rock],
-node|z14-[natural=rock],
-area|z14-[natural=bare_rock],
-node|z14-[natural=bare_rock],
-{
- icon-image: peak.svg;
-}
-area|z14-[man_made=pier]
-{
- fill-color: #0e1117;
- z-index: 488;
-}
-area|z16-[amenity=ferry_terminal],
-node|z16-[amenity=ferry_terminal]
-{
- icon-image: slipway.svg;
-}
-line|z14[man_made=pier]::d1p3
-{
- color: #1b1b1b;
- width: 0.6;
- z-index: 488;
-}
-line|z14[railway=narrow_gauge]::d1p3
-{
- color: #bfbfbf;
- width: 1.7;
- z-index: 303;
- dashes: 5.5,5.5;
- linecap: butt;
-}
-area|z14-[natural=cave_entrance],
-node|z14-[natural=cave_entrance]
-{
- icon-image: cave_entrance.svg;
-}
-line|z14[railway=monorail]::d1p2
-{
- color: #2f7f7f;
- width: 1.7;
- z-index: 556;
-}
-line|z14[railway=light_rail]
-{
- color: #f6a6f6;
- width: 2.4;
- z-index: 668;
-}
-line|z14[boundary=administrative][admin_level=6]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- z-index: 521;
- dashes: 4,20;
-}
-area|z14-[power=generator][generator:type=photovoltaic]::d2p2,
-node|z14-[power=generator][generator:type=photovoltaic]::d2p2
-{
- icon-image: power_photovoltaic.svg;
-}
-line|z14-[railway=rail],
-node|z16-[aerialway=station]
-{
- font-size: 12;
- text-halo-radius: 2;
- text: name;
- text-color: #cfaf27;
- text-halo-color: black;
-}
-line|z14[piste:lift=platter]::d1p2
-{
- color: #dfdfdf;
- width: 0.4;
-}
-line|z14[piste:lift=j-bar]::d2p2
-{
- color: #dfdfdf;
- width: 0.4;
-}
-area|z14-[earthquake:damage=spontaneous_camp],
-node|z14-[earthquake:damage=spontaneous_camp]
-{
- icon-image: earthquake-camp.svg;
-}
-line|z14[railway=spur]
-{
- color: #4f4f4f;
- width: 1.6;
- z-index: 207;
-}
-line|z14[railway=narrow_gauge]::d1p2
-{
- color: #191919;
- width: 1.7;
- z-index: 286;
-}
-line|z14-[piste:type=downhill]
-{
- color: #afafaf;
- width: 5;
-}
-line|z14-[piste:type=downhill][piste:difficulty=easy]
-{
- color: yellow;
- width: 5;
-}
-line|z14[boundary=administrative][type=nation]
-{
- color: blue;
- width: 6;
- z-index: 532;
- -x-kot-layer: top;
-}
-line|z14[aeroway=runway]
-{
- casing-linecap: butt;
- color: #2b2342;
- linecap: butt;
- width: 10;
- z-index: 314;
- linejoin: bevel;
- casing-linejoin: bevel;
- casing-width: 2;
- casing-color: #dfdfdf;
-}
-line|z14[route=ferry]
-{
- color: #674717;
- width: 1;
- z-index: 499;
- dashes: 3,2;
- linecap: butt;
-}
-line|z14[railway=rail],
-{
- color: #777777;
- z-index: 198;
- width: 3;
-}
-line|z14-[piste:type=downhill][piste:difficulty=advanced]
-{
- color: #dfdfdf;
- width: 5;
-}
-line|z14[piste:type=sled]
-{
- color: #0f1f23;
- width: 2.5;
-}
-line|z14-[piste:type=downhill][piste:difficulty=intermediate]
-{
- color: #00bfbf;
- width: 5;
-}
-line|z14[boundary=administrative][border_type=country]
-{
- color: blue;
- width: 6;
- z-index: 533;
- -x-kot-layer: top;
-}
-area|z14-[tourism=alpine_hut],
-node|z14-[tourism=alpine_hut],
-{
- icon-image: alpine_hut.svg;
- text-offset: 10;
- font-size: 12;
- text-halo-radius: 2;
- text: name;
- text-color: white;
- text-halo-color: black;
-}
-line|z14[boundary=national_park]
-{
- color: #b106b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 536;
- dashes: 12,4,4,4;
-}
-line|z14[railway=preserved]::d1p3
-{
- color: #afafaf;
- width: 1.7;
- z-index: 304;
- dashes: 4.5,4.5;
- linecap: butt;
-}
-line|z14[man_made=cutline]
-{
- color: #0e1117;
- width: 4;
- z-index: 247;
- linecap: butt;
-}
-area|z14-[amenity=shelter],
-node|z14-[amenity=shelter]
-{
- icon-image: shelter.svg;
-}
-line|z14[railway=siding]
-{
- color: #6f6f6f;
- width: 1.6;
- z-index: 209;
-}
-line|z14[boundary=administrative][admin_level=5]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- z-index: 522;
- dashes: 12,12;
-}
-line|z14-[piste:type=downhill][piste:difficulty=expert]
-{
- color: #097ff5;
- width: 5;
-}
-line|z14[railway=monorail]::raildash
-{
- color: #a6f6a6;
- width: 1.7;
- z-index: 557;
- dashes: 3.6,5.4;
- linecap: butt;
-}
-line|z14[railway=monorail]::railborder
-{
- color: #a6f6a6;
- width: 2;
- z-index: 555;
-}
-line|z14[piste:lift=platter]::d1p3
-{
- color: #dfdfdf;
- width: 4;
- dashes: 0.4,20;
- linecap: butt;
-}
-line|z14[boundary=administrative][type=nation]::d2p2
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 534;
- dashes: 12,12;
-}
-line|z14[piste:lift=j-bar]::d2p3
-{
- color: #dfdfdf;
- width: 4;
- dashes: 0.4,20;
- linecap: butt;
-}
-line|z14[railway=disused]
-{
- color: #575757;
- width: 1.6;
- z-index: 196;
- opacity: 0.7;
-}
-line|z14[railway=funicular]::d1p3
-{
- color: #a6f6f6;
- width: 0.4;
- z-index: 309;
-}
-line|z14[railway=yard]::d1p2
-{
- color: #191919;
- width: 1;
- z-index: 294;
-}
-line|z14-[piste:type=downhill][piste:difficulty=freeride]
-{
- color: #0922f5;
- width: 5;
-}
-line|z14[boundary=administrative][admin_level=2]
-{
- color: #111122;
- width: 6;
- z-index: 525;
- -x-kot-layer: top;
-}
-line|z14[railway=rail]::d1p5
-{
- color: #777777;
- width: 1.8;
- z-index: 302;
- dashes: 4.5,4.5;
- linecap: butt;
-}
-line|z14[railway=rail]::d1p4
-{
- color: #191919;
- width: 1.8;
- z-index: 285;
-}
-line|z14[railway=abandoned]::d1p2
-{
- color: black;
- width: 1;
- z-index: 283;
- opacity: 0.4;
-}
-line|z14[railway=siding]::d1p3
-{
- color: #bfbfbf;
- width: 1;
- z-index: 313;
- dashes: 3,6;
- linecap: butt;
-}
-line|z14[boundary=administrative][border_type=country]::d2p2
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 535;
- dashes: 12,12;
-}
-line|z14[boundary=administrative][border_type=region]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- z-index: 530;
- dashes: 12,4,4,4;
-}
-line|z14[railway=preserved]::d1p2
-{
- color: #191919;
- width: 1.7;
-}
-line|z14[railway=siding]::d1p2
-{
- color: #191919;
- width: 1;
- z-index: 295;
-}
-line|z14[boundary=administrative][border_type=county]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- z-index: 529;
- dashes: 4,20;
-}
-area|z14-[power=generator],
-node|z14-[power=generator]
-{
- icon-image: power_generic.svg;
-}
-line|z12-[mapswithme=grid]
-{
- color: #dfdfdf;
- width: 4;
- dashes: 1,1;
- linecap: butt;
-}
-line|z14[piste:lift=t-bar]::d2p2
-{
- color: #dfdfdf;
- width: 0.4;
-}
-line|z14[railway=disused]::d1p2
-{
- color: #0d0d0d;
- width: 1;
- z-index: 282;
- opacity: 0.7;
-}
-area|z14-[power=generator],
-area|z14-[power=station],
-area|z14-[power=sub_station],
-node|z14-[power=generator]
-{
- fill-color: #414141;
-}
-line|z14[man_made=pier]
-{
- color: #2f2f2f;
- width: 0.8;
-}
-area|z12-[aeroway=airport],
-area|z12-[aeroway=aerodrome],
-node|z12-[aeroway=airport],
-node|z12-[aeroway=aerodrome]
-{
- font-size: 10;
- text-halo-radius: 2;
- text: name;
- text-color: #ffa41d;
- text-halo-color: black;
- text-offset: 10;
- text-position: point;
-}
-area|z12-[aeroway=airport]::int_name,
-area|z12-[aeroway=aerodrome]::int_name,
-node|z12-[aeroway=airport]::int_name
-node|z12-[aeroway=aerodrome]::int_name,
-{
- font-size: 9;
- text-halo-radius: 2;
- text: int_name;
- text-color: #ffa41d;
- text-halo-color: black;
- text-offset: 10;
-}
-area|z13-14[aeroway=airport],
-area|z13-14[aeroway=aerodrome],
-node|z13-14[aeroway=airport],
-node|z13-14[aeroway=aerodrome]
-{
- font-size: 11;
-}
-area|z13-14[aeroway=airport]::int_name,
-area|z13-14[aeroway=aerodrome]::int_name,
-area|z13-14[aeroway=airport]::int_name,
-node|z13-14[aeroway=aerodrome]::int_name
-{
- font-size: 10;
-}
-area|z15-[aeroway=airport],
-area|z15-[aeroway=aerodrome],
-node|z15-[aeroway=airport],
-node|z15-[aeroway=aerodrome]
-{
- font-size: 12;
-}
-area|z15-[aeroway=airport]::int_name,
-area|z15-[aeroway=aerodrome]::int_name,
-area|z15-[aeroway=airport]::int_name,
-node|z15-[aeroway=aerodrome]::int_name
-{
- font-size: 11;
-}
-line|z14[railway=preserved]
-{
- color: #6f6f6f;
- width: 2.4;
- z-index: 200;
-}
-area|z14-[power=generator][power_source=hydro]::d2p2,
-node|z14-[power=generator][power_source=hydro]::d2p2
-{
- icon-image: power_hydro.svg;
-}
-line|z14[railway=light_rail]::d1p3
-{
- color: #f6a6f6;
- width: 1.7;
- z-index: 687;
- dashes: 3.8,5.4;
- linecap: butt;
-}
-line|z14[railway=yard]::d1p3
-{
- color: #bfbfbf;
- width: 1;
- z-index: 312;
- dashes: 3,6;
- linecap: butt;
-}
-line|z14[boundary=administrative][border_type=state]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 531;
- dashes: 12,4,4,4;
-}
-line|z14[railway=narrow_gauge]
-{
- color: #9f9f9f;
- width: 2.4;
- z-index: 199;
-}
-area|z16-[power=tower],
-node|z16-[power=tower]
-{
- icon-image: power-tower.svg;
-}
-
-line|z14-[piste:type=downhill][piste:difficulty=novice]
-{
- color: #bf00bf;
- width: 5;
-}
-line|z14[railway=disused]::d1p3
-{
- opacity: 0.7;
- color: #575757;
- linecap: butt;
- width: 1;
- z-index: 299;
- dashes: 4.5,4.5;
-}
-area|z14-[power=generator][power_source=wind]::d2p2,
-node|z14-[power=generator][power_source=wind]::d2p2
-{
- icon-image: power_wind.svg;
-}
-line|z14[piste:lift=t-bar]::d2p3
-{
- color: #dfdfdf;
- width: 4;
- dashes: 0.4,20;
- linecap: butt;
-}
-line|z14[railway=abandoned]
-{
- color: #4d4d4d;
- width: 1.6;
- z-index: 197;
- opacity: 0.4;
-}
-line|z14[aeroway=taxiway]
-{
- casing-linecap: butt;
- color: #2b2342;
- linecap: butt;
- width: 4;
- z-index: 315;
- linejoin: bevel;
- casing-linejoin: bevel;
- casing-width: 1;
- casing-color: #dfdfdf;
-}
-line|z14[railway=light_rail]::d1p2
-{
- color: #481919;
- width: 1.7;
- z-index: 677;
-}
-node|z14[aerialway=station]
-{
- symbol-shape: circle;
- symbol-fill-color: #cfaf27;
- symbol-size: 2;
-}
-line|z14[boundary=administrative][admin_level=2]::d2p2
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 526;
- dashes: 12,12;
-}
-line|z14[man_made=pier]
-{
- color: #2f2f2f;
- width: 0.1;
- z-index: 486;
-}
-line|z14[piste:type=nordic]
-{
- color: #3fffff;
- width: 1;
- dashes: 3,0.5;
- linecap: butt;
-}
-line|z14[railway=funicular]
-{
- color: #a6f6f6;
- width: 2.4;
- z-index: 205;
-}
-node|z16-[highway=motorway_junction]::d1p1
-{
- font-size: 12;
- text-halo-radius: 2;
- text: name;
- text-color: white;
- text-halo-color: black;
- text-position: center;
-}
-line|z14[railway=spur]::d1p3
-{
- color: #131313;
- width: 1;
- z-index: 311;
- dashes: 3,6;
- linecap: butt;
-}
-node|z15[aerialway=station]
-{
- symbol-shape: circle;
- symbol-fill-color: #cfaf27;
- symbol-size: 3;
-}
-line|z14[railway=funicular]::d1p2
-{
- color: #194848;
- width: 1.7;
- z-index: 291;
- dashes: 3.6,5.4;
- linecap: butt;
-}
-line|z15[railway=spur]::d1p3
-{
- color: #9f9f9f;
- width: 1.4;
- z-index: 411;
- dashes: 6,12;
- linecap: butt;
-}
-line|z15[boundary=administrative][border_type=county]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- z-index: 686;
- dashes: 4,20;
-}
-line|z15-16[man_made=cutline]
-{
- color: #0e1117;
- width: 5;
-}
-line|z15[boundary=administrative][admin_level=2]::d2p2
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 680;
- dashes: 12,12;
-}
-area|z16[building],
-node|z16[building],
-area|z16[addr:housenumber][addr:street],
-node|z16[addr:housenumber][addr:street]
-{
- text: "addr:housenumber";
- font-size: 10;
- text-color: white;
- text-position: center;
-}
-line|z15[railway=disused]
-{
- color: #575757;
- width: 3.2;
- z-index: 284;
- opacity: 0.7;
-}
-line|z15[railway=preserved]::d1p2
-{
- color: #191919;
- width: 2;
- z-index: 388;
-}
-line|z15[piste:lift=magic_carpet]
-{
- color: #efefef;
- width: 1.6;
-}
-line|z15[railway=abandoned]
-{
- color: #4d4d4d;
- width: 3.2;
- z-index: 285;
- opacity: 0.4;
-}
-line|z15[route=ferry]
-{
- color: #674717;
- width: 1;
- z-index: 643;
- dashes: 7,5;
- linecap: butt;
-}
-line|z15[railway=siding]::d1p3
-{
- color: silver;
- width: 1.4;
- z-index: 413;
- dashes: 6,12;
- linecap: butt;
-}
-line|z15-[piste:lift=j-bar]
-{
- color: #dfdfdf;
- width: 0.8;
-}
-area|z16[amenity=parking],
-node|z16[amenity=parking]
-{
- icon-image: parking-mini.svg;
-}
-area|z15-[tourism=viewpoint],
-node|z15-[tourism=viewpoint],
-area|z15-[tourism=artwork],
-node|z15-[tourism=artwork],
-{
- icon-image: viewpoint.svg;
-}
-line|z15[railway=siding]::d1p2
-{
- color: #191919;
- width: 1.4;
- z-index: 396;
-}
-
-line|z15[railway=preserved]
-{
- color: #6f6f6f;
- width: 3.2;
- z-index: 289;
-}
-line|z15-[aeroway=runway]
-{
- casing-linecap: butt;
- color: #2b2342;
- linecap: butt;
- width: 20;
- linejoin: bevel;
- casing-linejoin: bevel;
- casing-width: 4;
- casing-color: #dfdfdf;
-}
-line|z15-[piste:lift=t-bar]
-{
- color: #dfdfdf;
- width: 0.8;
-}
-line|z15[boundary=administrative][admin_level=5]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- z-index: 676;
- dashes: 12,12;
-}
-line|z15-[piste:lift=t-bar]::d2p2
-{
- color: #dfdfdf;
- width: 8;
- dashes: 0.8,40;
- linecap: butt;
-}
-node|z15-[tourism=attraction]
-{
- font-size: 12;
- text-halo-radius: 2;
- text: name;
- text-color: #cfcfcf;
- text-halo-color: black;
-}
-line|z15[railway=yard]
-{
- color: silver;
- width: 2.4;
-}
-line|z15[railway=spur]
-{
- color: #9f9f9f;
- width: 2.4;
- z-index: 295;
-}
-line|z15[boundary=administrative][border_type=region]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- z-index: 688;
- dashes: 12,4,4,4;
-}
-line|z15[railway=rail]
-{
- color: #999999;
- z-index: 287;
- width: 4;
-}
-line|z15[railway=rail]::d1p5
-{
- color: #999999;
- width: 2.4;
- dashes: 9,9;
- linecap: butt;
- z-index: 387;
-}
-line|z15[railway=rail]::d1p4
-{
- color: #191919;
- width: 2.4;
- z-index: 386;
-}
-area|z15-[aeroway=helipad],
-node|z15-[aeroway=helipad]
-{
- icon-image: helipad.svg;
-}
-line|z15[boundary=administrative][admin_level=8]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- dashes: 12,4,4,4;
-}
-line|z15[railway=narrow_gauge]::d1p2
-{
- color: #191919;
- width: 2;
- z-index: 387;
-}
-line|z15[boundary=administrative][admin_level=7]
-{
- color: #06a8b4;
- width: 1;
- z-index: 674;
- -x-kot-layer: top;
-}
-line|z15[boundary=administrative][border_type=city]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 0.8;
- z-index: 685;
- dashes: 12,4,4,4;
-}
-line|z15-[piste:lift=platter]
-{
- color: #dfdfdf;
- width: 0.8;
-}
-line|z15[railway=yard]::d1p2
-{
- color: #191919;
- width: 1.4;
- z-index: 395;
-}
-line|z15-16[railway=light_rail]::d1p2
-{
- color: #481919;
- width: 2;
- z-index: 677;
-}
-line|z15-16[railway=light_rail]
-{
- color: #f0b3f0;
- width: 3.2;
- z-index: 668;
-}
-line|z15[boundary=national_park]
-{
- color: #b106b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 694;
- dashes: 12,4,4,4;
-}
-line|z15[railway=preserved]::d1p3
-{
- color: silver;
- width: 2;
- z-index: 405;
- dashes: 9,9;
- linecap: butt;
-}
-line|z15-[piste:type=nordic]
-{
- color: #3fffff;
- width: 2;
- dashes: 6,1;
- linecap: butt;
-}
-line|z15[railway=light_rail]::d1p3
-{
- color: #f0b3f0;
- width: 2;
- z-index: 687;
- dashes: 7.6,10.8;
- linecap: butt;
-}
-area|z15-[leisure=park],
-node|z15-[leisure=park]
-{
- font-size: 12;
- text-halo-radius: 2;
- text: name;
- text-color: #a357ff;
- text-halo-color: black;
-}
-area|z15-[leisure=park]::int_name,
-node|z15-[leisure=park]::int_name
-{
- font-size: 11;
- text-halo-radius: 2;
- text: int_name;
- text-color: #a357ff;
- text-halo-color: black;
-}
-line|z15[railway=funicular]::d1p2
-{
- color: #194848;
- width: 2;
- z-index: 392;
- dashes: 7.2,10.8;
- linecap: butt;
-}
-line|z15-[aeroway=taxiway]
-{
- casing-linecap: butt;
- color: #2b2342;
- linecap: butt;
- width: 8;
- z-index: 415;
- linejoin: bevel;
- casing-linejoin: bevel;
- casing-width: 2;
- casing-color: #dfdfdf;
-}
-line|z15[boundary=administrative][border_type=state]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 689;
- dashes: 12,4,4,4;
-}
-line|z15[boundary=administrative][admin_level=2]
-{
- color: #111122;
- width: 6;
- z-index: 679;
- -x-kot-layer: top;
-}
-line|z15[boundary=administrative][admin_level=10]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 0.8;
- z-index: 671;
- dashes: 4,20;
-}
-line|z15-[piste:lift=j-bar]::d2p2
-{
- color: #dfdfdf;
- width: 8;
- z-index: 605;
- dashes: 0.8,40;
- linecap: butt;
-}
-line|z15[railway=spur]::d1p2
-{
- color: #191919;
- width: 1.4;
- z-index: 394;
-}
-line|z15[boundary=administrative][type=nation]
-{
- color: blue;
- width: 6;
- z-index: 690;
- -x-kot-layer: top;
-}
-line|z15[piste:lift=rope_tow]
-{
- color: #27273b;
- width: 1;
- z-index: 607;
- dashes: 2,2;
- linecap: butt;
-}
-line|z15[aerialway=chair_lift]
-{
- color: #dfdfdf;
- width: 0.8;
- z-index: 612;
-}
-line|z15[man_made=pier]
-{
- color: #2f2f2f;
- width: 0.2;
- z-index: 630;
-}
-line|z15[boundary=administrative][admin_level=6]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- z-index: 675;
- dashes: 4,20;
-}
-line|z15[railway=monorail]::d1p3
-{
- color: #b3f0b3;
- width: 2;
- z-index: 566;
- dashes: 7.2,10.8;
- linecap: butt;
-}
-line|z15[railway=abandoned]::d1p2
-{
- color: black;
- width: 2;
- z-index: 384;
- opacity: 0.4;
-}
-line|z15-[railway=monorail]
-{
- color: #b3f0b3;
- width: 3.2;
- z-index: 556;
-}
-line|z15[aerialway=gondola]
-{
- color: #dfdfdf;
- width: 0.8;
- z-index: 610;
-}
-line|z15[railway=narrow_gauge]::d1p3
-{
- color: silver;
- width: 2;
- z-index: 404;
- dashes: 11,11;
- linecap: butt;
-}
-line|z15[railway=funicular]
-{
- color: #b3f0f0;
- width: 3.2;
- z-index: 293;
-}
-line|z15[railway=yard]::d1p3
-{
- color: silver;
- width: 1.4;
- z-index: 412;
- dashes: 6,12;
- linecap: butt;
-}
-line|z15[boundary=administrative][border_type=country]::d2p2
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 693;
- dashes: 12,12;
-}
-line|z15[boundary=administrative][admin_level=9]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- z-index: 672;
- dashes: 12,12;
-}
-line|z15[man_made=pier]
-{
- color: #2f2f2f;
- width: 1.6;
- z-index: 631;
-}
-line|z15[aerialway=mixed_lift]
-{
- color: #dfdfdf;
- width: 0.8;
- z-index: 613;
-}
-line|z15[railway=disused]::d1p2
-{
- color: #0d0d0d;
- width: 2;
- z-index: 383;
- opacity: 0.7;
-}
-line|z15[aerialway=cable_car]
-{
- color: #dfdfdf;
- width: 0.8;
- z-index: 609;
-}
-line|z15[man_made=pier]::d1p3
-{
- color: #1b1b1b;
- width: 1.2;
- z-index: 632;
-}
-line|z15[boundary=administrative][border_type=suburb]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 0.8;
- z-index: 683;
- dashes: 4,20;
-}
-line|z15[railway=disused]::d1p3
-{
- opacity: 0.7;
- color: #575757;
- linecap: butt;
- width: 2;
- z-index: 400;
- dashes: 9,9;
-}
-line|z15[railway=abandoned]::d1p3
-{
- opacity: 0.4;
- color: #4d4d4d;
- linecap: butt;
- width: 2;
- z-index: 401;
- dashes: 9,9;
-}
-line|z15-[railway=monorail]::d1p2
-{
- color: #2f7f7f;
- width: 2;
- z-index: 561;
-}
-line|z15-[piste:lift=platter]::d1p2
-{
- color: #dfdfdf;
- width: 8;
- dashes: 1,40;
- linecap: butt;
-}
-line|z15[boundary=administrative][type=nation]::d2p2
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 692;
- dashes: 12,12;
-}
-line|z15[piste:type=sled]
-{
- color: #0f1f23;
- width: 5;
-}
-line|z15[boundary=administrative][border_type=country]
-{
- color: blue;
- width: 6;
- z-index: 691;
- -x-kot-layer: top;
-}
-
-area|z15-[amenity=fuel],
-node|z15-[amenity=fuel]
-{
- icon-image: petrolstation.svg;
-}
-area|z15-[leisure=nature_reserve],
-node|z15-[leisure=nature_reserve]
-{
- icon-image: bird.svg;
-}
-area|z15-[building],
-node|z15-[building]
-{
- fill-color: #444444;
-}
-line|z15[railway=narrow_gauge]
-{
- color: silver;
- width: 3.2;
- z-index: 288;
-}
-line|z15[boundary=administrative][border_type=municipality]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- z-index: 684;
- dashes: 12,4,4,4;
-}
-line|z15[railway=siding]
-{
- color: silver;
- width: 2.4;
- z-index: 297;
-}
-line|z15[railway=funicular]::d1p3
-{
- color: #b3f0f0;
- width: 0.5;
- z-index: 410;
-}
-line|z16[communication=line]
-{
- color: #0f7f0f;
- width: 0.4;
- z-index: 873;
- dashes: 8,4;
- linecap: butt;
-}
-area|z16-[amenity=bureau_de_change],
-node|z16-[amenity=bureau_de_change]
-{
- icon-image: bureau_de_change.svg;
-}
-line|z16[boundary=administrative][admin_level=5]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- z-index: 932;
- dashes: 12,12;
-}
-line|z16[railway=narrow_gauge]::d1p3
-{
- color: silver;
- width: 2;
- z-index: 647;
- dashes: 14,14;
- linecap: butt;
-}
-line|z16[aerialway=chair_lift]
-{
- color: #dfdfdf;
- width: 1.6;
- z-index: 852;
-}
-line|z16[piste:type=sled]
-{
- color: #0f1f23;
- width: 10;
- z-index: 840;
-}
-line|z16[man_made=pipeline][location=overground]
-{
- color: #5f5f5f;
- width: 0.8;
- z-index: 875;
- dashes: 8,4;
- linecap: butt;
-}
-line|z16[railway=spur]
-{
- color: #9f9f9f;
- width: 2.4;
- z-index: 547;
-}
-area|z16-[amenity=restaurant],
-node|z16-[amenity=restaurant]
-{
- icon-image: restaurant.svg;
-}
-line|z16[railway=funicular]
-{
- color: #b3f0f0;
- width: 3.2;
- z-index: 546;
-}
-line|z16[man_made=pier]::d1p3
-{
- color: #1b1b1b;
- width: 2.4;
- z-index: 857;
-}
-line|z16[boundary=administrative][admin_level=2],
-line|z16[boundary=administrative][border_type=country]
-{
- color: #111122;
- width: 6;
- z-index: 933;
- -x-kot-layer: top;
-}
-area|z17-[amenity],
-area|z17-[historic],
-area|z17-[office][office!=no],
-area|z17-[tourism],
-area|z17-[craft],
-area|z17-[internet_access],
-node|z17-[amenity],
-node|z17-[historic],
-node|z17-[office][office!=no],
-node|z17-[tourism],
-node|z17-[craft],
-node|z17-[internet_access],
-{
- font-size: 11;
- text-halo-radius: 2;
- text: name;
- text-color: #bfbfbf;
- text-offset: 10;
- text-halo-color: black;
- z-index: 1;
-}
-
-line|z16[railway=disused]
-{
- color: #575757;
- width: 3.2;
- z-index: 540;
- opacity: 0.7;
-}
-line|z16[boundary=administrative][admin_level=10]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 0.8;
- z-index: 927;
- dashes: 4,20;
-}
-area|z17-[amenity=atm],
-node|z17-[amenity=atm]
-{
- icon-image: atm.svg;
-}
-line|z16[railway=light_rail]::d1p3
-{
- color: #f0b3f0;
- width: 2;
- z-index: 687;
- dashes: 9.6,14.4;
- linecap: butt;
-}
-area|z17-[military=bunker],
-area|z16-[historic=battlefield],
-node|z17-[military=bunker],
-node|z16-[historic=battlefield]
-{
- icon-image: cannon.svg;
-}
-area|z16-[amenity=hunting_stand],
-node|z16-[amenity=hunting_stand]
-{
- icon-image: hunting_closed_high.svg;
-}
-line|z16[railway=spur]::d1p2
-{
- color: #191919;
- width: 1.2;
- z-index: 638;
-}
-line|z16[railway=spur]::d1p3
-{
- color: silver;
- width: 1.2;
- z-index: 652;
- dashes: 8,16;
- linecap: butt;
-}
-area|z16[building]::int_name,
-node|z16[building]::int_name
-{
- text: int_name;
- font-size: 11;
- text-color: #7f7f8f;
-}
-area|z16-[amenity=fast_food],
-node|z16-[amenity=fast_food]
-{
- icon-image: fastfood.svg;
-}
-
-line|z16[boundary=administrative][border_type=country]::d2p2
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 945;
- dashes: 12,12;
-}
-area|z16-[amenity=bench],
-node|z16-[amenity=bench]
-{
- icon-image: bench.svg;
-}
-area|z16-[power=pole],
-node|z16-[power=pole]
-{
- icon-image: power-pole.svg;
-}
-area|z16-[natural=peak],
-node|z16-[natural=peak],
-area|z16-[natural=rock],
-node|z16-[natural=rock],
-area|z16-[natural=bare_rock],
-node|z16-[natural=bare_rock],
-{
- text-offset: 10;
- text: name;
- font-size: 16;
- text-color: #bfbfbf;
-}
-line|z16[route=ferry]
-{
- color: #573727;
- width: 2;
- z-index: 877;
- dashes: 12,8;
- linecap: butt;
-}
-line|z16[railway=razed]
-{
- opacity: 0.3;
- color: #3d3d3d;
- linecap: butt;
- width: 3.2;
- z-index: 541;
- dashes: 2.4,2.4;
-}
-line|z16[railway=abandoned]
-{
- color: #4d4d4d;
- width: 3.2;
- z-index: 542;
- opacity: 0.4;
-}
-area|z16[aerialway=station],
-node|z16[aerialway=station]
-{
- symbol-shape: circle;
- symbol-fill-color: #cfaf27;
- symbol-size: 4;
-}
-area|z16-[amenity=bicycle_rental],
-node|z16-[amenity=bicycle_rental]
-{
- icon-image: bicycle_rental.svg;
-}
-line|z16[power=minor_line]
-{
- color: black;
- width: 1.6;
- z-index: 862;
- opacity: 0.5;
-}
-area|z16-[amenity=theatre],
-node|z16-[amenity=theatre]
-{
- icon-image: theatre.svg;
-}
-area|z16-[amenity=embassy],
-node|z16-[amenity=embassy]
-{
- icon-image: embassy.svg;
-}
-line|z16[railway=rail]::d1p3
-{
- color: #999999;
- z-index: 543;
- width: 4;
-}
-area|z16-[tourism=guest_house],
-area|z16-[tourism=hostel],
-node|z16-[tourism=guest_house],
-node|z16-[tourism=hostel]
-{
- icon-image: hostel.svg;
-}
-area|z16-[tourism=hotel],
-area|z16-[tourism=motel],
-node|z16-[tourism=hotel],
-node|z16-[tourism=motel]
-{
- icon-image: hotel.svg;
-}
-line|z16[boundary=administrative][border_type=region]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- z-index: 940;
- dashes: 12,4,4,4;
-}
-line|z16-[railway=monorail]::d1p3
-{
- color: #b3f0b3;
- width: 2;
- z-index: 566;
- dashes: 9.6,14.4;
- linecap: butt;
-}
-line|z16[railway=rail]
-{
- color: #191919;
- width: 2.4;
- z-index: 631;
-}
-line|z16[piste:lift=rope_tow]
-{
- color: #27273b;
- width: 2;
- dashes: 4,4;
- linecap: butt;
-}
-line|z16[barrier=hedge]
-{
- color: #4f4f4f;
- width: 0.4;
- z-index: 879;
-}
-line|z16[boundary=administrative][border_type=county]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- z-index: 939;
- dashes: 4,20;
-}
-line|z16[boundary=administrative][admin_level=8]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- z-index: 929;
- dashes: 12,4,4,4;
-}
-
-line|z16[boundary=administrative][admin_level=6]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- z-index: 931;
- dashes: 4,20;
-}
-line|z16[boundary=national_park]
-{
- color: #b106b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 946;
- dashes: 12,4,4,4;
-}
-line|z16[railway=narrow_gauge]::d1p2
-{
- color: #191919;
- width: 2;
- z-index: 632;
-}
-area|z17-[amenity=toilets],
-node|z17-[amenity=toilets],
-{
- icon-image: toilets.svg;
-}
-line|z16[boundary=administrative][border_type=suburb]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 0.8;
- z-index: 936;
- dashes: 4,20;
-}
-node|z16-[natural=volcano],
-area|z16-[natural=volcano],
-node|z16-[natural=cave_entrance],
-area|z16-[natural=cave_entrance],
-node|z16-[natural=cape],
-area|z16-[natural=cape],
-{
- text-offset: 10;
- text: name;
- font-size: 16;
- text-color: white;
-}
-area|z16-[railway=level_crossing],
-node|z16-[railway=level_crossing]
-{
- icon-image: railway-crossing.svg;
-}
-line|z16[barrier=bollard],
-node|z16[barrier=block],
-node|z16[barrier=bollard],
-node|z16[barrier=stile],
-node|z16[barrier=toll_booth]
-{
- symbol-shape: circle;
- symbol-fill-color: #8f8f8f;
- symbol-size: 1.2;
-}
-line|z16[boundary=administrative][admin_level=2]::d2p2
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 935;
- dashes: 12,12;
-}
-line|z16[railway=preserved]::d1p2
-{
- color: #191919;
- width: 2;
- z-index: 633;
-}
-line|z16[railway=abandoned]::d1p3
-{
- opacity: 0.4;
- color: #4d4d4d;
- linecap: butt;
- width: 2.4;
- z-index: 645;
- dashes: 12,12;
-}
-line|z16[communication=line][location=underground]
-{
- color: #0f7f0f;
- width: 0.4;
- z-index: 871;
- dashes: 1.2,2,1.2,2,1.2,4.4;
- linecap: butt;
-}
-line|z16[man_made=pipeline]::d1p2
-{
- color: #5f5f5f;
- width: 0.8;
- z-index: 876;
- dashes: 1.2,2,1.2,2,1.2,4.4;
- linecap: butt;
-}
-line|z16[railway=disused]::d1p3
-{
- opacity: 0.7;
- color: #575757;
- linecap: butt;
- width: 2.4;
- z-index: 643;
- dashes: 12,12;
-}
-line|z16[railway=funicular]::d1p2
-{
- color: #194848;
- width: 2;
- z-index: 636;
- dashes: 9.6,14.4;
- linecap: butt;
-}
-line|z16[power=minor_line]::d1p2
-{
- color: #575757;
- width: 0.8;
- z-index: 863;
- dashes: 1.2,2,1.2,2,1.2,4.4;
- linecap: butt;
-}
-line|z16[boundary=administrative][type=nation]::d2p2
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 944;
- dashes: 12,12;
-}
-area|z16-[amenity=fire_station],
-node|z16-[amenity=fire_station]
-{
- icon-image: firebrigade.svg;
-}
-
-area|z16[amenity=taxi],
-area|z17-[amenity=taxi],
-node|z16[amenity=taxi],
-node|z17-[amenity=taxi]
-{
- icon-image: taxi.svg;
-}
-line|z16[railway=preserved]::d1p3
-{
- color: silver;
- width: 2;
- z-index: 648;
- dashes: 12,12;
- linecap: butt;
-}
-line|z16[railway=narrow_gauge]
-{
- color: silver;
- width: 3.2;
- z-index: 544;
-}
-line|z16[power=minor_line]::d1p3
-{
- color: #575757;
- width: 0.8;
- z-index: 864;
- dashes: 8,4;
- linecap: butt;
-}
-area|z16-[amenity=fountain],
-node|z16-[amenity=fountain]
-{
- icon-image: fountain.svg;
-}
-line|z16[barrier=wall]
-{
- color: #4f4f4f;
- width: 1;
- z-index: 887;
-}
-line|z16[barrier=city_wall]
-{
- color: #4f4f4f;
- width: 1;
- z-index: 898;
- dashes: 0.0,2.0;
- linecap: butt;
-}
-line|z16[railway=siding]
-{
- color: silver;
- width: 2.4;
- z-index: 549;
-}
-area|z16-[amenity=car_rental],
-node|z16-[amenity=car_rental]
-{
- icon-image: car_rental.svg;
-}
-line|z16[railway=siding]::d1p2
-{
- color: #191919;
- width: 1.2;
- z-index: 640;
-}
-line|z16[railway=funicular]::d1p3
-{
- color: #b3f0f0;
- width: 0.6;
- z-index: 651;
-}
-area|z16-[amenity=marketplace],
-node|z16-[amenity=marketplace]
-{
- icon-image: supermarket.svg;
-}
-area|z16[amenity=pharmacy],
-area|z16-[amenity=doctors],
-area|z17-[amenity=pharmacy],
-node|z16[amenity=pharmacy],
-node|z16-[amenity=doctors],
-node|z17-[amenity=pharmacy]
-{
- icon-image: pharmacy.svg;
-}
-line|z16[aerialway=cable_car]
-{
- color: #dfdfdf;
- width: 1.6;
- z-index: 850;
-}
-area|z16[railway=platform],
-line|z16[railway=platform]
-{
- color: #444444;
- width: 4;
- z-index: 580;
-}
-line|z16[railway=disused]::d1p2
-{
- color: #0d0d0d;
- width: 2.4;
- z-index: 627;
- opacity: 0.7;
-}
-area|z16-[amenity=place_of_worship],
-node|z16-[amenity=place_of_worship]
-{
- icon-image: religion.svg;
-}
-line|z16[barrier=retaining_wall]
-{
- color: #4f4f4f;
- width: 1;
-}
-line|z16[communication=line]
-{
- color: black;
- width: 1.6;
- z-index: 870;
- opacity: 0.5;
-}
-area|z16-[railway=crossing],
-node|z16-[railway=crossing]
-{
- icon-image: railway-crossing-small.svg;
-}
-area|z16-[barrier=lift_gate],
-node|z16-[barrier=lift_gate]
-{
- icon-image: barrier.svg;
-}
-area|z16-[amenity=bar],
-area|z16-[amenity=nightclub],
-node|z16-[amenity=bar],
-node|z16-[amenity=nightclub]
-{
- icon-image: bar.svg;
-}
-area|z16-[historic=ruins],
-node|z16-[historic=ruins]
-{
- icon-image: ruins.svg;
-}
-line|z16[man_made=pier]
-{
- color: #2f2f2f;
- width: 0.4;
- z-index: 855;
-}
-line|z16[boundary=administrative][border_type=state]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 941;
- dashes: 12,4,4,4;
-}
-area|z16-[amenity=speed_trap],
-node|z16-[amenity=speed_trap]
-{
- icon-image: speed_trap.svg;
-}
-area|z16-[historic=memorial],
-area|z16-[historic=monument],
-node|z16-[historic=memorial],
-node|z16-[historic=monument]
-{
- icon-image: memorial.svg;
-}
-line|z16[boundary=administrative][admin_level=7]
-{
- color: #06a8b4;
- width: 1;
- z-index: 930;
- -x-kot-layer: top;
-}
-line|z16[railway=rail]::d1p5
-{
- color: #999999;
- width: 2.4;
- z-index: 646;
- dashes: 12,12;
- linecap: butt;
-}
-line|z16[man_made=pier]::d1p2
-{
- color: #2f2f2f;
- width: 3.2;
-}
-line|z16[barrier=city_wall]
-{
- color: #4f4f4f;
- width: 1;
- z-index: 897;
-}
-area|z16-[railway=platform],
-line|z16-[railway=platform]
-{
- fill-color: #444444;
-}
-line|z16[boundary=administrative][border_type=municipality]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- z-index: 937;
- dashes: 12,4,4,4;
-}
-line|z16[railway=razed]::d1p2
-{
- color: black;
- width: 2.4;
- z-index: 628;
- opacity: 0.3;
-}
-line|z16[railway=razed]::d1p3
-{
- opacity: 0.3;
- color: #3d3d3d;
- linecap: butt;
- width: 2.4;
- z-index: 644;
- dashes: 2.4,2.4,2.4,2.4,2.4,12;
-}
-line|z16[railway=abandoned]::d1p2
-{
- color: black;
- width: 2.4;
- z-index: 629;
- opacity: 0.4;
-}
-area|z16-[historic=castle],
-node|z16-[historic=castle]
-{
- icon-image: castle.svg;
-}
-line|z16[barrier=hedge]
-{
- color: #4f4f4f;
- width: 1;
- z-index: 881;
- dashes: 0.0,2.0;
- linecap: butt;
-}
-area|z17-[amenity=police],
-node|z17-[amenity=police]
-{
- icon-image: police.svg;
-}
-line|z16[boundary=administrative][border_type=city]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 0.8;
- z-index: 938;
- dashes: 12,4,4,4;
-}
-area|z17-[amenity=hospital],
-node|z17-[amenity=hospital]
-{
- icon-image: hospital.svg;
-}
-line|z16[boundary=administrative][type=nation]
-{
- color: blue;
- width: 6;
- z-index: 942;
- -x-kot-layer: top;
-}
-area|z16-[amenity=cafe],
-node|z16-[amenity=cafe]
-{
- icon-image: cafe.svg;
- z-index: 1;
-}
-line|z16[man_made=pipeline]
-{
- color: black;
- width: 1.6;
- z-index: 874;
- opacity: 0.5;
-}
-area|z16-[amenity=car_sharing],
-node|z16-[amenity=car_sharing]
-{
- icon-image: car_sharing.svg;
-}
-line|z16[piste:lift=magic_carpet]
-{
- color: #efefef;
- width: 3.2;
-}
-line|z16[railway=preserved]
-{
- color: #6f6f6f;
- width: 3.2;
-}
-area|z16-[amenity=cinema],
-node|z16-[amenity=cinema]
-{
- icon-image: cinema.svg;
-}
-area|z16-[historic=archaeological_site],
-area|z16-[historic=museum],
-area|z16-[tourism=museum],
-node|z16-[historic=archaeological_site],
-node|z16-[historic=museum],
-node|z16-[tourism=museum]
-{
- icon-image: museum.svg;
-}
-line|z16[barrier=retaining_wall]
-{
- color: #4f4f4f;
- width: 1;
- z-index: 891;
- dashes: 0.0,2.0;
- linecap: butt;
-}
-line|z16[railway=siding]::d1p3
-{
- color: silver;
- width: 1.2;
- z-index: 654;
- dashes: 8,16;
- linecap: butt;
-}
-line|z16[boundary=administrative][admin_level=9]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- z-index: 928;
- dashes: 12,12;
-}
-area|z16-[amenity=post_office],
-node|z16-[amenity=post_office]
-{
- icon-image: postoffice.svg;
-}
-line|z16[aerialway=mixed_lift]
-{
- color: #dfdfdf;
- width: 1.6;
- z-index: 853;
-}
-line|z16[railway=yard]::railfill
-{
- color: #191919;
- width: 1.2;
- z-index: 639;
-}
-line|z16[railway=yard]::railborder
-{
- color: silver;
- width: 2.4;
- z-index: 548;
-}
-line|z16[railway=yard]::raildash
-{
- color: silver;
- width: 1.2;
- z-index: 653;
- dashes: 8,16;
- linecap: butt;
-}
-area|z16-[amenity=library],
-node|z16-[amenity=library],
-{
- icon-image: library.svg;
-}
-
-line|z16[aerialway=gondola]
-{
- color: #dfdfdf;
- width: 1.6;
- z-index: 851;
-}
-line|z16-[power=line]
-{
- color: black;
- width: 1.6;
- z-index: 858;
- opacity: 0.5;
-}
-line|z16-[power=line]::d1p2
-{
- color: #575757;
- width: 0.8;
- z-index: 861;
- dashes: 16,8;
- linecap: butt;
-}
-line|z16-[power=line][location=underground]
-{
- color: #575757;
- width: 0.8;
- z-index: 859;
- dashes: 2.4,4,2.4,4,2.4,8.8;
- linecap: butt;
-}
-line|z17-[piste:lift=magic_carpet]
-{
- color: #efefef;
- width: 6.4;
-}
-line|z17-[railway=rail]
-{
- color: #999999;
- z-index: 568;
- width: 4.4;
-}
-line|z17-[man_made=pipeline]
-{
- color: black;
- width: 1.6;
- z-index: 947;
- opacity: 0.5;
-}
-line|z17-[aerialway=cable_car]
-{
- color: #dfdfdf;
- width: 3.2;
- z-index: 909;
-}
-line|z17-[boundary=administrative][admin_level=7]
-{
- color: #06a8b4;
- width: 0.8;
- z-index: 965;
- -x-kot-layer: top;
-}
-line|z17-[boundary=administrative][border_type=county]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- z-index: 973;
- dashes: 4,20;
-}
-line|z17-[communication=line]::d1p2
-{
- color: #0f7f0f;
- width: 0.8;
- z-index: 933;
- dashes: 8,4;
- linecap: butt;
-}
-line|z17-[railway=razed]::d1p3
-{
- opacity: 0.3;
- color: #3d3d3d;
- linecap: butt;
- width: 2;
- z-index: 678;
- dashes: 2.4,2.4,2.4,2.4,2.4,12;
-}
-line|z17-[railway=narrow_gauge]
-{
- color: silver;
- width: 3.2;
- z-index: 569;
-}
-line|z17-[barrier=retaining_wall]
-{
- color: #4f4f4f;
- width: 1;
- z-index: 958;
- dashes: 0.0,4.0;
- linecap: butt;
-}
-line|z17-[boundary=administrative][type=nation]::d2p2
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 978;
- dashes: 12,12;
-}
-area|z17-[building],
-node|z17-[building],
-area|z17-[addr:housenumber][addr:street],
-node|z17-[addr:housenumber][addr:street]
-{
- text: "addr:housenumber";
- font-size: 11;
- text-color: white;
- text-position: center;
-}
-line|z17-[man_made=pipeline]::d1p2
-{
- color: #5f5f5f;
- width: 0.8;
- z-index: 949;
- dashes: 1.2,2,1.2,2,1.2,4.4;
- linecap: butt;
-}
-line|z17-[man_made=pipeline][location=overground]
-{
- color: #5f5f5f;
- width: 0.8;
- z-index: 948;
- dashes: 8,4;
- linecap: butt;
-}
-line|z17-[boundary=administrative][admin_level=2]::d2p2
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 969;
- dashes: 12,12;
-}
-line|z17-[railway=narrow_gauge]::d1p2
-{
- color: #191919;
- width: 2;
- z-index: 665;
-}
-line|z17-[railway=light_rail]
-{
- color: #f0b3f0;
- width: 3.2;
- z-index: 571;
-}
-line|z17-[power=minor_line]::d1p3
-{
- color: #575757;
- width: 0.8;
- z-index: 923;
- dashes: 8,4;
- linecap: butt;
-}
-line|z17-[railway=yard]::d1p2
-{
- color: #191919;
- width: 1.36;
- z-index: 672;
-}
-line|z17-[aerialway=mixed_lift]
-{
- color: #dfdfdf;
- width: 3.2;
- z-index: 912;
-}
-area|z14-[tourism=camp_site],
-node|z14-[tourism=camp_site]
-{
- icon-image: campsite.svg;
-}
-area|z17-[leisure=slipway],
-node|z17-[leisure=slipway]
-{
- icon-image: slipway.svg;
-}
-line|z17-[boundary=administrative][border_type=country]::d2p2
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 979;
- dashes: 12,12;
-}
-line|z17-[railway=yard]
-{
- color: silver;
- width: 2.4;
- z-index: 577;
-}
-line|z17-[boundary=administrative][type=nation]
-{
- color: blue;
- width: 6;
- z-index: 976;
- -x-kot-layer: top;
-}
-line|z17-[barrier=hedge]
-{
- color: #dfdfdf;
- width: 0.8;
- z-index: 953;
- dashes: 0.0,4.0;
- linecap: butt;
-}
-area|z17-[power=generator]::d1p3,
-node|z17-[power=generator]::d1p3
-{
- z-index: 927;
-}
-line|z17-[railway=rail]::d1p5
-{
- color: #999999;
- width: 3.2;
- z-index: 681;
- dashes: 12,12;
- linecap: butt;
-}
-line|z17-[communication=line]
-{
- color: black;
- width: 1.6;
- z-index: 930;
- opacity: 0.5;
-}
-line|z17-[boundary=administrative][border_type=suburb]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 0.8;
- z-index: 970;
- dashes: 4,20;
-}
-line|z17-[boundary=administrative][admin_level=9]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- z-index: 963;
- dashes: 12,12;
-}
-line|z17-[boundary=administrative][admin_level=5]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- z-index: 967;
- dashes: 12,12;
-}
-line|z17-[man_made=pier]
-{
- color: #2f2f2f;
- width: 0.4;
- z-index: 914;
-}
-line|z17-[boundary=administrative][admin_level=6]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- z-index: 966;
- dashes: 4,20;
-}
-line|z17-[railway=spur]::d1p2
-{
- color: #191919;
- width: 1.36;
- z-index: 671;
-}
-line|z17-[railway=preserved]::d1p2
-{
- color: #191919;
- width: 2;
- z-index: 666;
-}
-area|z17-[amenity=college],
-area|z17-[amenity=university],
-node|z17-[amenity=college],
-node|z17-[amenity=university]
-{
- icon-image: university.svg;
-}
-line|z17-[boundary=administrative][border_type=city]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 0.8;
- z-index: 972;
- dashes: 12,4,4,4;
-}
-line|z17-[railway=disused]::d1p3
-{
- opacity: 0.7;
- color: #575757;
- linecap: butt;
- width: 2;
- z-index: 677;
- dashes: 12,12;
-}
-node|z17-[man_made=cairn]
-{
- symbol-shape: circle;
- symbol-fill-color: black;
- symbol-size: 3.2;
-}
-line|z17-[aerialway=chair_lift]
-{
- color: #dfdfdf;
- width: 3.2;
-}
-area|z17-[tourism=picnic_site],
-node|z17-[tourism=picnic_site]
-{
- icon-image: picnic.svg;
-}
-area|z17-[amenity=parking],
-node|z17-[amenity=parking]
-{
- icon-image: parking.svg;
-}
-area|z17-[railway=platform],
-line|z17-[railway=platform]
-{
- color: #444444;
- width: 8;
-}
-line|z17-[barrier=wall]
-{
- color: #4f4f4f;
- width: 1;
- z-index: 956;
-}
-line|z17-[communication=line][location=underground]
-{
- color: #0f7f0f;
- width: 0.8;
- z-index: 931;
- dashes: 1.2,2,1.2,2,1.2,4.4;
- linecap: butt;
-}
-area|z17-[man_made=windmill],
-node|z17-[man_made=windmill]
-{
- icon-image: windmill.svg;
-}
-line|z17-[boundary=administrative][admin_level=11]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 0.8;
- z-index: 961;
- dashes: 0.8,5.2;
-}
-line|z17-[railway=siding]::d1p3
-{
- color: silver;
- width: 1.36;
- z-index: 692;
- dashes: 7.2,16.8;
- linecap: butt;
-}
-area|z17-[amenity=kindergarten],
-node|z17-[amenity=kindergarten]
-{
- icon-image: kindergarten2.svg;
-}
-line|z17-[route=ferry]
-{
- color: #573727;
- width: 2;
- z-index: 950;
- dashes: 12,8;
- linecap: butt;
-}
-line|z17-[piste:lift=rope_tow]
-{
- color: #27273b;
- width: 4;
- dashes: 8,8;
- linecap: butt;
-}
-line|z17-[railway=siding]::d1p2
-{
- color: #191919;
- width: 1.36;
- z-index: 673;
-}
-line|z17-[man_made=cutline]
-{
- color: #0e1117;
- width: 6;
- z-index: 276;
-}
-line|z17-[railway=razed]::d1p2
-{
- color: black;
- width: 2;
- z-index: 662;
- opacity: 0.3;
-}
-line|z17-[man_made=pier]::d1p3
-{
- color: #1b1b1b;
- width: 2.4;
- z-index: 916;
-}
-area|z17-[tourism=information][information=guidepost],
-node|z17-[tourism=information][information=guidepost]
-{
- icon-image: information-guidepost.svg;
-}
-line|z16-[barrier=fence],
-line|z16-[historic=citywalls],
-{
- color: #4f4f4f;
- width: .1;
- z-index: 954;
-}
-line|z17-[railway=abandoned]
-{
- color: #4d4d4d;
- width: 3.2;
- z-index: 565;
- opacity: 0.4;
-}
-line|z17-[barrier=retaining_wall]
-{
- color: #4f4f4f;
- width: 1;
- z-index: 957;
-}
-line|z17-[railway=disused]
-{
- color: #575757;
- width: 3.2;
- z-index: 564;
- opacity: 0.7;
-}
-line|z17-[railway=light_rail]::d1p3
-{
- color: #f0b3f0;
- width: 2;
- z-index: 684;
- dashes: 9.6,14.4;
- linecap: butt;
-}
-line|z17-[railway=rail]::d1p4
-{
- color: #191919;
- width: 3.2;
- z-index: 664;
-}
-line|z17-[railway=spur]
-{
- color: silver;
- width: 2.4;
- z-index: 576;
-}
-line|z17-[barrier=city_wall]
-{
- color: #4f4f4f;
- width: 1;
- z-index: 959;
-}
-line|z17-[boundary=administrative][admin_level=10]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 0.8;
- z-index: 962;
- dashes: 4,20;
-}
-line|z17-[railway=siding]
-{
- color: silver;
- width: 2.4;
- z-index: 578;
-}
-line|z17-[railway=disused]::d1p2
-{
- color: #0d0d0d;
- width: 2;
- z-index: 661;
- opacity: 0.7;
-}
-line|z17-[boundary=administrative][border_type=region]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 974;
- dashes: 12,4,4,4;
-}
-line|z17-[barrier=bollard],
-node|z17-[barrier=block],
-node|z17-[barrier=bollard],
-node|z17-[barrier=stile],
-node|z17-[barrier=toll_booth]
-{
- symbol-shape: circle;
- symbol-fill-color: #8f8f8f;
- symbol-size: 1.6;
-}
-line|z17-[boundary=administrative][border_type=state]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- dashes: 12,4,4,4;
-}
-area|z17-[building]::int_name,
-node|z17-[building]::int_name
-{
- text: int_name;
- font-size: 11;
- text-color: #bfbfbf;
-}
-area|z15-[historic=ship]
-{
- fill-color: #32324b;
- text: name;
- font-size: 11;
-}
-line|z17-[railway=razed]
-{
- opacity: 0.3;
- color: #3d3d3d;
- linecap: butt;
- width: 3.2;
- z-index: 567;
- dashes: 2.4,2.4;
-}
-line|z17-[boundary=national_park]
-{
- color: #b106b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 2;
- z-index: 980;
- dashes: 12,4,4,4;
-}
-line|z17-[railway=funicular]
-{
- color: #b3f0f0;
- width: 3.2;
- z-index: 574;
-}
-line|z17-[man_made=pier]::d1p2
-{
- color: #2f2f2f;
- width: 3.2;
- z-index: 915;
-}
-line|z17-[railway=abandoned]::d1p3
-{
- opacity: 0.4;
- color: #4d4d4d;
- linecap: butt;
- width: 2;
- z-index: 679;
- dashes: 12,12;
-}
-line|z17-[barrier=city_wall]
-{
- color: #4f4f4f;
- width: 1;
- z-index: 960;
- dashes: 0.0,4.0;
- linecap: butt;
-}
-line|z17-[railway=light_rail]::d1p2
-{
- color: #481919;
- width: 2;
- z-index: 667;
-}
-line|z17-[power=minor_line]::d1p2
-{
- color: #575757;
- width: 0.8;
- dashes: 1.2,2,1.2,2,1.2,4.4;
- linecap: butt;
-}
-area|z17-[aerialway=station],
-node|z17-[aerialway=station]
-{
- symbol-shape: circle;
- symbol-fill-color: #cfaf27;
- symbol-size: 3.2;
-}
-line|z17-[railway=funicular]::d1p2
-{
- color: #194848;
- width: 2;
- z-index: 670;
- dashes: 9.6,14.4;
- linecap: butt;
-}
-line|z17-[aerialway=gondola]
-{
- color: #dfdfdf;
- width: 3.2;
- z-index: 910;
-}
-line|z17-[railway=preserved]
-{
- color: #6f6f6f;
- width: 3.2;
- z-index: 570;
-}
-line|z17-[boundary=administrative][border_type=municipality]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- z-index: 971;
- dashes: 12,4,4,4;
-}
-line|z17-[railway=preserved]::d1p3
-{
- color: silver;
- width: 2;
- z-index: 683;
- dashes: 12,12;
- linecap: butt;
-}
-line|z17-[boundary=administrative][admin_level=8]
-{
- color: #06a8b4;
- linecap: butt;
- -x-kot-layer: top;
- width: 1;
- z-index: 964;
- dashes: 12,4,4,4;
-}
-line|z17-[railway=funicular]::d1p3
-{
- color: #b3f0f0;
- width: 0.64;
- z-index: 688;
-}
-line|z17-[boundary=administrative][border_type=country]
-{
- color: blue;
- width: 6;
- z-index: 977;
- -x-kot-layer: top;
-}
-line|z17-[boundary=administrative][admin_level=2]
-{
- color: #111122;
- width: 6;
- -x-kot-layer: top;
-}
-line|z17-[railway=abandoned]::d1p2
-{
- color: black;
- width: 2;
- z-index: 663;
- opacity: 0.4;
-}
-line|z17-[railway=yard]::d1p3
-{
- color: silver;
- width: 1.36;
- z-index: 691;
- dashes: 7.2,16.8;
- linecap: butt;
-}
-line|z17-[railway=spur]::d1p3
-{
- color: silver;
- width: 1.36;
- z-index: 690;
- dashes: 7.2,16.8;
- linecap: butt;
-}
-line|z17-[barrier=hedge]
-{
- color: #4f4f4f;
- width: 1;
- z-index: 952;
-}
-line|z17-[piste:type=sled]
-{
- color: #0f1f23;
- width: 20;
-}
-line|z17-[railway=narrow_gauge]::d1p3
-{
- color: silver;
- width: 2;
- z-index: 682;
- dashes: 14.4,14.4;
- linecap: butt;
-}
-line|z17-[power=minor_line]
-{
- color: black;
- width: 1.6;
- z-index: 921;
- opacity: 0.5;
-}
-
-node|z17-[entrance]
-{
- symbol-shape: circle;
- symbol-fill-color: #dfdfdf;
- symbol-size: 2;
- font-size: 9;
- text: ref;
- text-offset-x: 6;
- z-index: 10;
-}
-node|z19-[entrance]::flats
-{
- text: "addr:flats";
- font-size: 9;
- text-offset-y: 10;
-}
-node|z15-[railway=station][!transport],
-node|z15-[railway=halt],
-area|z15-[railway=station][!transport],
-area|z15-[railway=halt],
-{
- font-size: 12;
- text-halo-radius: 2;
- text: name;
- text-color: #cfaf27;
- text-offset: 10;
- text-halo-color: #070300;
- z-index: 170;
-}
-
-/* POI icons */
-
-area|z17-[tourism=information][office],
-node|z17-[tourism=information][office]
-{
- icon-image: information-office.svg;
-}
-area|z17-[barrier=gate],
-node|z17-[barrier=gate]
-{
- icon-image: gate.svg;
-}
-area|z17-[man_made=lighthouse],
-node|z17-[man_made=lighthouse]
-{
- icon-image: lighthouse.svg;
-}
-area|z17-[tourism=information],
-node|z17-[tourism=information]
-{
- icon-image: information.svg;
-}
-area|z17-[amenity=post_box],
-node|z17-[amenity=post_box]
-{
- icon-image: postbox.svg;
-}
-area|z16-[amenity=bank],
-node|z16-[amenity=bank]
-{
- icon-image: bank.svg;
- z-index: 5;
-}
-area|z16-[amenity=pub],
-node|z16-[amenity=pub]
-{
- icon-image: pub.svg;
-}
-node|z17-[amenity=recycling],
-node|z17-[amenity=waste_disposal],
-{
- icon-image: recycling.svg;
-}
-node|z16-[amenity=telephone]
-{
- icon-image: telephone.svg;
-}
-area|z17-[amenity=school],
-node|z17-[amenity=school]
-{
- icon-image: school.svg;
-}
-area|z14-16[railway=halt],
-area|z14-15[railway=station],
-node|z14-16[railway=halt],
-node|z14-15[railway=station]
-{
- icon-image: railway-station-mini.svg;
- z-index: 150;
-}
-area|z17-[railway=halt],
-area|z16-[railway=station],
-node|z17-[railway=halt],
-node|z16-[railway=station]
-{
- icon-image: railway-station.svg;
-}
-
-@import("include/base_publictransport.mapcss");
-
-line[railway]
-{
- text-position: line;
-}
-
-/* Process bridge and tunnel */
-line|z15-[bridge?]::bridgewhite,
-line|z15-[tunnel?]::tunnelwhite
-{
- z-index: 3;
- casing-width: eval(prop("width")/2+4);
- casing-linecap: butt;
- casing-color: black;
-}
-line|z15-[bridge?]::bridgeblack
-{
- z-index: 2;
- casing-width: eval(prop("width")/2+5);
- casing-linecap: butt;
- casing-color: #8f8f8f;
-}
-line|z15-[tunnel?]::tunnelblack
-{
- z-index: 2;
- casing-width: eval(prop("width")/2+5);
- casing-linecap: butt;
- casing-color: #8f8f8f;
- casing-dashes: 5,5;
-}
-
-line|z16-[oneway?]::arrows
-{
- pattern-offset: 200;
- z-index: 1000;
- pattern-image: arrow.svg;
- pattern-spacing: 234;
-}
-
-/* Review roads styles for different access. Opacity == 0 is useless. */
-/*
-line[access][access!=yes]::*
-{
- opacity: 0;
- casing-opacity: 0;
-}
-*/
-
-line|z18-[lit]::lit
-{
- width: 0.3;
- color: yellow
-}
-
-/* Do not draw railway and waterway tunnels */
-line[railway][railway!=tram][railway!=monorail][railway!=funicular][tunnel?]::*,
-line[waterway][tunnel?]::*
-{
- font-size: 0;
- text: "";
- width: 0;
- casing-width: 0;
-}
-
-/* ======================== Special ink cases ====================== */
-
-*[place][place!=state][place!=suburb]
-{
- text-color: white;
- text-halo-color: black;
-}
-
-area|z14-[place=hamlet],
-area|z11-[place=village]
-{
- fill-color: "";
- fill-position: "";
-}
-
-node|z14-[natural=lake],
-node|z12-[natural=pond],
-node|z1-[place=ocean],
-node|z3-[place=sea]
-{
- text-color: black;
- text-halo-radius: 2;
- text-halo-color: #949494;
-}
-
-node|z1-[place=ocean]
-{
- font-size: 9;
-}
-node|z2-[place=ocean]
-{
- font-size: 10;
-}
-node|z5-[place=ocean]
-{
- font-size: 11;
-}
-node|z7-[place=ocean]
-{
- font-size: 12;
-}
-node|z3-[place=sea]
-{
- font-size: 9;
-}
-node|z7-[place=sea]
-{
- font-size: 11;
-}
-node|z9-[place=sea]
-{
- font-size: 12;
-}
-
-node|z16-[amenity],
-area|z16-[amenity],
-node|z16-[historic],
-area|z16-[historic],
-node|z16-[office],
-area|z16-[office],
-node|z16-[tourism],
-area|z16-[tourism],
-node|z16-[shop],
-area|z16-[shop]
-{
- text-color: white;
-}
-
-node|z16-[highway=bus_stop],
-node|z12-[railway],
-node|z12-[aeroway],
-area|z16-[highway=bus_stop],
-area|z12-[railway],
-area|z12-[aeroway]
-{
- text-color: white;
-}
-
-line[highway]
-{
- text-color: white;
-}
-
-line[railway=subway]
-{
- width: 0;
-}
-
-*::int_name
-{
- text: "";
-}
-
-line|z4-[boundary=administrative][admin_level=2],
-line|z4-[boundary=administrative][admin_level=3]
-{
- color: #949494;
-}
-line|z6-[boundary=administrative][admin_level=4]
-{
- color: #949494;
-}
-line[boundary=administrative][admin_level!=2][admin_level!=3][admin_level!=4]
-{
- width: 0;
-}
-
-area|z6-[natural=land]
-{
- fill-color: black;
- z-index: -5;
- fill-position: foreground;
-}
-
-area[natural=coastline]
-{
- fill-color: #949494;
- z-index: -10;
-}
-
-area|z12-[landuse=basin],
-area|z12-[landuse=reservoir],
-area|z13-[leisure=swimming_pool],
-area|z13-[leisure=water_park],
-area|z10-[natural=lake],
-area|z10-[natural=pond],
-area|z10-[natural=water],
-area|z14-[natural=bay],
-area|z14-[natural=wetland],
-area|z12-[man_made=wastewater_plant],
-area|z10-[waterway=dock],
-area|z10-[waterway=riverbank]
-{
- fill-color: #949494;
- text-color: black;
- text-halo-radius: 2;
- text-halo-color: #949494;
- z-index: 10;
-}
-
-line|z14-[natural=spring],
-line|z10-[waterway=river],
-line|z12-[waterway=drain],
-line|z12-[waterway=ditch],
-line|z12-[waterway=stream],
-line|z12-[waterway=canal],
-line|z14-[waterway=dam],
-line|z14-[waterway=lock],
-line|z14-[waterway=weir]
-{
- color: #949494;
- casing-color: #949494;
- text-color: black;
- text-halo-radius: 2;
- text-halo-color: #949494;
-}
-
-area|z12-[natural=scrub],
-area|z10-[natural=wood],
-area|z10-[landuse=forest]
-{
- fill-color: #727272;
-}
-
-node|z16-[natural=tree]
-{
- icon-image: "";
- text: "";
-}
-node|z17-[entrance]
-{
- symbol-shape: "";
- symbol-size: 0;
- text: "";
-}
-
-
-line[highway]
-{
- casing-color: #949494;
-}
-
-line|z8-[highway=primary],
-line|z10-[highway=primary_link],
-line|z9-[highway=secondary],
-line|z10-[highway=secondary_link],
-area|z15-[area:highway=primary],
-area|z15-[area:highway=secondary]
-{
- color: #282828;
-}
-
-/* Should be at the end of all highway changes */
-line[highway]
-{
- text-halo-color: eval(prop("color"));
-}
-*[highway][area?]
-{
- fill-color: eval(prop("color"));
- width: 0;
- casing-width: 0;
-}
diff --git a/data/styles/normal_dark.mapcss b/data/styles/normal_dark.mapcss
deleted file mode 100644
index 4155a2bebc..0000000000
--- a/data/styles/normal_dark.mapcss
+++ /dev/null
@@ -1,22 +0,0 @@
-@import("colors_dark.mapcss");
-@import("include/base_defaults.mapcss");
-@import("include/base_roads.mapcss");
-/* @import("include/base_roads_UK.mapcss"); */
-@import("include/base_shop.mapcss");
-@import("include/base_sport.mapcss");
-@import("include/base_place.mapcss");
-@import("include/base_landuse.mapcss");
-@import("include/base_water.mapcss");
-@import("include/base_boundaries.mapcss");
-@import("include/base_railways.mapcss");
-@import("include/base_piste.mapcss");
-@import("include/base_publictransport.mapcss");
-@import("include/base_other.mapcss");
-
-canvas
-{
- background-color: @background;
- fill-color: @water;
- default-lines: false;
- default-points: false;
-}
diff --git a/data/styles/normal_light.mapcss b/data/styles/normal_light.mapcss
deleted file mode 100644
index ea9b4969b0..0000000000
--- a/data/styles/normal_light.mapcss
+++ /dev/null
@@ -1,22 +0,0 @@
-@import("colors_light.mapcss");
-@import("include/base_defaults.mapcss");
-@import("include/base_roads.mapcss");
-/* @import("include/base_roads_UK.mapcss"); */
-@import("include/base_shop.mapcss");
-@import("include/base_sport.mapcss");
-@import("include/base_place.mapcss");
-@import("include/base_landuse.mapcss");
-@import("include/base_water.mapcss");
-@import("include/base_boundaries.mapcss");
-@import("include/base_railways.mapcss");
-@import("include/base_piste.mapcss");
-@import("include/base_publictransport.mapcss");
-@import("include/base_other.mapcss");
-
-canvas
-{
- background-color: @background;
- fill-color: @water;
- default-lines: false;
- default-points: false;
-}
diff --git a/data/styles/6plus/api-result.png b/data/styles/style-dark/6plus/api-result.png
similarity index 100%
rename from data/styles/6plus/api-result.png
rename to data/styles/style-dark/6plus/api-result.png
diff --git a/data/styles/6plus/compass-image.png b/data/styles/style-dark/6plus/compass-image.png
similarity index 100%
rename from data/styles/6plus/compass-image.png
rename to data/styles/style-dark/6plus/compass-image.png
diff --git a/data/styles/6plus/current-position-compas.png b/data/styles/style-dark/6plus/current-position-compas.png
similarity index 100%
rename from data/styles/6plus/current-position-compas.png
rename to data/styles/style-dark/6plus/current-position-compas.png
diff --git a/data/styles/6plus/current-position.png b/data/styles/style-dark/6plus/current-position.png
similarity index 100%
rename from data/styles/6plus/current-position.png
rename to data/styles/style-dark/6plus/current-position.png
diff --git a/data/styles/6plus/current-routing-compas.png b/data/styles/style-dark/6plus/current-routing-compas.png
similarity index 100%
rename from data/styles/6plus/current-routing-compas.png
rename to data/styles/style-dark/6plus/current-routing-compas.png
diff --git a/data/styles/6plus/placemark-blue.png b/data/styles/style-dark/6plus/placemark-blue.png
similarity index 100%
rename from data/styles/6plus/placemark-blue.png
rename to data/styles/style-dark/6plus/placemark-blue.png
diff --git a/data/styles/6plus/placemark-brown.png b/data/styles/style-dark/6plus/placemark-brown.png
similarity index 100%
rename from data/styles/6plus/placemark-brown.png
rename to data/styles/style-dark/6plus/placemark-brown.png
diff --git a/data/styles/6plus/placemark-green.png b/data/styles/style-dark/6plus/placemark-green.png
similarity index 100%
rename from data/styles/6plus/placemark-green.png
rename to data/styles/style-dark/6plus/placemark-green.png
diff --git a/data/styles/6plus/placemark-orange.png b/data/styles/style-dark/6plus/placemark-orange.png
similarity index 100%
rename from data/styles/6plus/placemark-orange.png
rename to data/styles/style-dark/6plus/placemark-orange.png
diff --git a/data/styles/6plus/placemark-pink.png b/data/styles/style-dark/6plus/placemark-pink.png
similarity index 100%
rename from data/styles/6plus/placemark-pink.png
rename to data/styles/style-dark/6plus/placemark-pink.png
diff --git a/data/styles/6plus/placemark-purple.png b/data/styles/style-dark/6plus/placemark-purple.png
similarity index 100%
rename from data/styles/6plus/placemark-purple.png
rename to data/styles/style-dark/6plus/placemark-purple.png
diff --git a/data/styles/6plus/placemark-red.png b/data/styles/style-dark/6plus/placemark-red.png
similarity index 100%
rename from data/styles/6plus/placemark-red.png
rename to data/styles/style-dark/6plus/placemark-red.png
diff --git a/data/styles/6plus/placemark-yellow.png b/data/styles/style-dark/6plus/placemark-yellow.png
similarity index 100%
rename from data/styles/6plus/placemark-yellow.png
rename to data/styles/style-dark/6plus/placemark-yellow.png
diff --git a/data/styles/6plus/route_from.png b/data/styles/style-dark/6plus/route_from.png
similarity index 100%
rename from data/styles/6plus/route_from.png
rename to data/styles/style-dark/6plus/route_from.png
diff --git a/data/styles/6plus/route_to.png b/data/styles/style-dark/6plus/route_to.png
similarity index 100%
rename from data/styles/6plus/route_to.png
rename to data/styles/style-dark/6plus/route_to.png
diff --git a/data/styles/6plus/search-result-active.png b/data/styles/style-dark/6plus/search-result-active.png
similarity index 100%
rename from data/styles/6plus/search-result-active.png
rename to data/styles/style-dark/6plus/search-result-active.png
diff --git a/data/styles/6plus/search-result.png b/data/styles/style-dark/6plus/search-result.png
similarity index 100%
rename from data/styles/6plus/search-result.png
rename to data/styles/style-dark/6plus/search-result.png
diff --git a/data/styles/colors_dark.mapcss b/data/styles/style-dark/colors_dark.mapcss
similarity index 100%
rename from data/styles/colors_dark.mapcss
rename to data/styles/style-dark/colors_dark.mapcss
diff --git a/data/styles/hdpi/api-result.png b/data/styles/style-dark/hdpi/api-result.png
similarity index 100%
rename from data/styles/hdpi/api-result.png
rename to data/styles/style-dark/hdpi/api-result.png
diff --git a/data/styles/hdpi/compass-image.png b/data/styles/style-dark/hdpi/compass-image.png
similarity index 100%
rename from data/styles/hdpi/compass-image.png
rename to data/styles/style-dark/hdpi/compass-image.png
diff --git a/data/styles/hdpi/current-position-compas.png b/data/styles/style-dark/hdpi/current-position-compas.png
similarity index 100%
rename from data/styles/hdpi/current-position-compas.png
rename to data/styles/style-dark/hdpi/current-position-compas.png
diff --git a/data/styles/hdpi/current-position.png b/data/styles/style-dark/hdpi/current-position.png
similarity index 100%
rename from data/styles/hdpi/current-position.png
rename to data/styles/style-dark/hdpi/current-position.png
diff --git a/data/styles/hdpi/current-routing-compas.png b/data/styles/style-dark/hdpi/current-routing-compas.png
similarity index 100%
rename from data/styles/hdpi/current-routing-compas.png
rename to data/styles/style-dark/hdpi/current-routing-compas.png
diff --git a/data/styles/hdpi/placemark-blue.png b/data/styles/style-dark/hdpi/placemark-blue.png
similarity index 100%
rename from data/styles/hdpi/placemark-blue.png
rename to data/styles/style-dark/hdpi/placemark-blue.png
diff --git a/data/styles/hdpi/placemark-brown.png b/data/styles/style-dark/hdpi/placemark-brown.png
similarity index 100%
rename from data/styles/hdpi/placemark-brown.png
rename to data/styles/style-dark/hdpi/placemark-brown.png
diff --git a/data/styles/hdpi/placemark-green.png b/data/styles/style-dark/hdpi/placemark-green.png
similarity index 100%
rename from data/styles/hdpi/placemark-green.png
rename to data/styles/style-dark/hdpi/placemark-green.png
diff --git a/data/styles/hdpi/placemark-orange.png b/data/styles/style-dark/hdpi/placemark-orange.png
similarity index 100%
rename from data/styles/hdpi/placemark-orange.png
rename to data/styles/style-dark/hdpi/placemark-orange.png
diff --git a/data/styles/hdpi/placemark-pink.png b/data/styles/style-dark/hdpi/placemark-pink.png
similarity index 100%
rename from data/styles/hdpi/placemark-pink.png
rename to data/styles/style-dark/hdpi/placemark-pink.png
diff --git a/data/styles/hdpi/placemark-purple.png b/data/styles/style-dark/hdpi/placemark-purple.png
similarity index 100%
rename from data/styles/hdpi/placemark-purple.png
rename to data/styles/style-dark/hdpi/placemark-purple.png
diff --git a/data/styles/hdpi/placemark-red.png b/data/styles/style-dark/hdpi/placemark-red.png
similarity index 100%
rename from data/styles/hdpi/placemark-red.png
rename to data/styles/style-dark/hdpi/placemark-red.png
diff --git a/data/styles/hdpi/placemark-yellow.png b/data/styles/style-dark/hdpi/placemark-yellow.png
similarity index 100%
rename from data/styles/hdpi/placemark-yellow.png
rename to data/styles/style-dark/hdpi/placemark-yellow.png
diff --git a/data/styles/hdpi/route_from.png b/data/styles/style-dark/hdpi/route_from.png
similarity index 100%
rename from data/styles/hdpi/route_from.png
rename to data/styles/style-dark/hdpi/route_from.png
diff --git a/data/styles/hdpi/route_to.png b/data/styles/style-dark/hdpi/route_to.png
similarity index 100%
rename from data/styles/hdpi/route_to.png
rename to data/styles/style-dark/hdpi/route_to.png
diff --git a/data/styles/hdpi/search-result-active.png b/data/styles/style-dark/hdpi/search-result-active.png
similarity index 100%
rename from data/styles/hdpi/search-result-active.png
rename to data/styles/style-dark/hdpi/search-result-active.png
diff --git a/data/styles/hdpi/search-result.png b/data/styles/style-dark/hdpi/search-result.png
similarity index 100%
rename from data/styles/hdpi/search-result.png
rename to data/styles/style-dark/hdpi/search-result.png
diff --git a/data/styles/ldpi/api-result.png b/data/styles/style-dark/ldpi/api-result.png
similarity index 100%
rename from data/styles/ldpi/api-result.png
rename to data/styles/style-dark/ldpi/api-result.png
diff --git a/data/styles/ldpi/compass-image.png b/data/styles/style-dark/ldpi/compass-image.png
similarity index 100%
rename from data/styles/ldpi/compass-image.png
rename to data/styles/style-dark/ldpi/compass-image.png
diff --git a/data/styles/ldpi/current-position-compas.png b/data/styles/style-dark/ldpi/current-position-compas.png
similarity index 100%
rename from data/styles/ldpi/current-position-compas.png
rename to data/styles/style-dark/ldpi/current-position-compas.png
diff --git a/data/styles/ldpi/current-position.png b/data/styles/style-dark/ldpi/current-position.png
similarity index 100%
rename from data/styles/ldpi/current-position.png
rename to data/styles/style-dark/ldpi/current-position.png
diff --git a/data/styles/ldpi/current-routing-compas.png b/data/styles/style-dark/ldpi/current-routing-compas.png
similarity index 100%
rename from data/styles/ldpi/current-routing-compas.png
rename to data/styles/style-dark/ldpi/current-routing-compas.png
diff --git a/data/styles/ldpi/placemark-blue.png b/data/styles/style-dark/ldpi/placemark-blue.png
similarity index 100%
rename from data/styles/ldpi/placemark-blue.png
rename to data/styles/style-dark/ldpi/placemark-blue.png
diff --git a/data/styles/ldpi/placemark-brown.png b/data/styles/style-dark/ldpi/placemark-brown.png
similarity index 100%
rename from data/styles/ldpi/placemark-brown.png
rename to data/styles/style-dark/ldpi/placemark-brown.png
diff --git a/data/styles/ldpi/placemark-green.png b/data/styles/style-dark/ldpi/placemark-green.png
similarity index 100%
rename from data/styles/ldpi/placemark-green.png
rename to data/styles/style-dark/ldpi/placemark-green.png
diff --git a/data/styles/ldpi/placemark-orange.png b/data/styles/style-dark/ldpi/placemark-orange.png
similarity index 100%
rename from data/styles/ldpi/placemark-orange.png
rename to data/styles/style-dark/ldpi/placemark-orange.png
diff --git a/data/styles/ldpi/placemark-pink.png b/data/styles/style-dark/ldpi/placemark-pink.png
similarity index 100%
rename from data/styles/ldpi/placemark-pink.png
rename to data/styles/style-dark/ldpi/placemark-pink.png
diff --git a/data/styles/ldpi/placemark-purple.png b/data/styles/style-dark/ldpi/placemark-purple.png
similarity index 100%
rename from data/styles/ldpi/placemark-purple.png
rename to data/styles/style-dark/ldpi/placemark-purple.png
diff --git a/data/styles/ldpi/placemark-red.png b/data/styles/style-dark/ldpi/placemark-red.png
similarity index 100%
rename from data/styles/ldpi/placemark-red.png
rename to data/styles/style-dark/ldpi/placemark-red.png
diff --git a/data/styles/ldpi/placemark-yellow.png b/data/styles/style-dark/ldpi/placemark-yellow.png
similarity index 100%
rename from data/styles/ldpi/placemark-yellow.png
rename to data/styles/style-dark/ldpi/placemark-yellow.png
diff --git a/data/styles/ldpi/route_from.png b/data/styles/style-dark/ldpi/route_from.png
similarity index 100%
rename from data/styles/ldpi/route_from.png
rename to data/styles/style-dark/ldpi/route_from.png
diff --git a/data/styles/ldpi/route_to.png b/data/styles/style-dark/ldpi/route_to.png
similarity index 100%
rename from data/styles/ldpi/route_to.png
rename to data/styles/style-dark/ldpi/route_to.png
diff --git a/data/styles/ldpi/search-result-active.png b/data/styles/style-dark/ldpi/search-result-active.png
similarity index 100%
rename from data/styles/ldpi/search-result-active.png
rename to data/styles/style-dark/ldpi/search-result-active.png
diff --git a/data/styles/ldpi/search-result.png b/data/styles/style-dark/ldpi/search-result.png
similarity index 100%
rename from data/styles/ldpi/search-result.png
rename to data/styles/style-dark/ldpi/search-result.png
diff --git a/data/styles/mdpi/api-result.png b/data/styles/style-dark/mdpi/api-result.png
similarity index 100%
rename from data/styles/mdpi/api-result.png
rename to data/styles/style-dark/mdpi/api-result.png
diff --git a/data/styles/mdpi/compass-image.png b/data/styles/style-dark/mdpi/compass-image.png
similarity index 100%
rename from data/styles/mdpi/compass-image.png
rename to data/styles/style-dark/mdpi/compass-image.png
diff --git a/data/styles/mdpi/current-position-compas.png b/data/styles/style-dark/mdpi/current-position-compas.png
similarity index 100%
rename from data/styles/mdpi/current-position-compas.png
rename to data/styles/style-dark/mdpi/current-position-compas.png
diff --git a/data/styles/mdpi/current-position.png b/data/styles/style-dark/mdpi/current-position.png
similarity index 100%
rename from data/styles/mdpi/current-position.png
rename to data/styles/style-dark/mdpi/current-position.png
diff --git a/data/styles/mdpi/current-routing-compas.png b/data/styles/style-dark/mdpi/current-routing-compas.png
similarity index 100%
rename from data/styles/mdpi/current-routing-compas.png
rename to data/styles/style-dark/mdpi/current-routing-compas.png
diff --git a/data/styles/mdpi/placemark-blue.png b/data/styles/style-dark/mdpi/placemark-blue.png
similarity index 100%
rename from data/styles/mdpi/placemark-blue.png
rename to data/styles/style-dark/mdpi/placemark-blue.png
diff --git a/data/styles/mdpi/placemark-brown.png b/data/styles/style-dark/mdpi/placemark-brown.png
similarity index 100%
rename from data/styles/mdpi/placemark-brown.png
rename to data/styles/style-dark/mdpi/placemark-brown.png
diff --git a/data/styles/mdpi/placemark-green.png b/data/styles/style-dark/mdpi/placemark-green.png
similarity index 100%
rename from data/styles/mdpi/placemark-green.png
rename to data/styles/style-dark/mdpi/placemark-green.png
diff --git a/data/styles/mdpi/placemark-orange.png b/data/styles/style-dark/mdpi/placemark-orange.png
similarity index 100%
rename from data/styles/mdpi/placemark-orange.png
rename to data/styles/style-dark/mdpi/placemark-orange.png
diff --git a/data/styles/mdpi/placemark-pink.png b/data/styles/style-dark/mdpi/placemark-pink.png
similarity index 100%
rename from data/styles/mdpi/placemark-pink.png
rename to data/styles/style-dark/mdpi/placemark-pink.png
diff --git a/data/styles/mdpi/placemark-purple.png b/data/styles/style-dark/mdpi/placemark-purple.png
similarity index 100%
rename from data/styles/mdpi/placemark-purple.png
rename to data/styles/style-dark/mdpi/placemark-purple.png
diff --git a/data/styles/mdpi/placemark-red.png b/data/styles/style-dark/mdpi/placemark-red.png
similarity index 100%
rename from data/styles/mdpi/placemark-red.png
rename to data/styles/style-dark/mdpi/placemark-red.png
diff --git a/data/styles/mdpi/placemark-yellow.png b/data/styles/style-dark/mdpi/placemark-yellow.png
similarity index 100%
rename from data/styles/mdpi/placemark-yellow.png
rename to data/styles/style-dark/mdpi/placemark-yellow.png
diff --git a/data/styles/mdpi/route_from.png b/data/styles/style-dark/mdpi/route_from.png
similarity index 100%
rename from data/styles/mdpi/route_from.png
rename to data/styles/style-dark/mdpi/route_from.png
diff --git a/data/styles/mdpi/route_to.png b/data/styles/style-dark/mdpi/route_to.png
similarity index 100%
rename from data/styles/mdpi/route_to.png
rename to data/styles/style-dark/mdpi/route_to.png
diff --git a/data/styles/mdpi/search-result-active.png b/data/styles/style-dark/mdpi/search-result-active.png
similarity index 100%
rename from data/styles/mdpi/search-result-active.png
rename to data/styles/style-dark/mdpi/search-result-active.png
diff --git a/data/styles/mdpi/search-result.png b/data/styles/style-dark/mdpi/search-result.png
similarity index 100%
rename from data/styles/mdpi/search-result.png
rename to data/styles/style-dark/mdpi/search-result.png
diff --git a/data/styles/mdpi/watch-my-direction.png b/data/styles/style-dark/mdpi/watch-my-direction.png
similarity index 100%
rename from data/styles/mdpi/watch-my-direction.png
rename to data/styles/style-dark/mdpi/watch-my-direction.png
diff --git a/data/styles/mdpi/watch-my-position.png b/data/styles/style-dark/mdpi/watch-my-position.png
similarity index 100%
rename from data/styles/mdpi/watch-my-position.png
rename to data/styles/style-dark/mdpi/watch-my-position.png
diff --git a/data/styles/mdpi/watch-search-result.png b/data/styles/style-dark/mdpi/watch-search-result.png
similarity index 100%
rename from data/styles/mdpi/watch-search-result.png
rename to data/styles/style-dark/mdpi/watch-search-result.png
diff --git a/data/styles/style-dark/style.mapcss b/data/styles/style-dark/style.mapcss
new file mode 100644
index 0000000000..3e1d664b1a
--- /dev/null
+++ b/data/styles/style-dark/style.mapcss
@@ -0,0 +1,22 @@
+@import("colors_dark.mapcss");
+@import("../include/base_defaults.mapcss");
+@import("../include/base_roads.mapcss");
+/* @import("../include/base_roads_UK.mapcss"); */
+@import("../include/base_shop.mapcss");
+@import("../include/base_sport.mapcss");
+@import("../include/base_place.mapcss");
+@import("../include/base_landuse.mapcss");
+@import("../include/base_water.mapcss");
+@import("../include/base_boundaries.mapcss");
+@import("../include/base_railways.mapcss");
+@import("../include/base_piste.mapcss");
+@import("../include/base_publictransport.mapcss");
+@import("../include/base_other.mapcss");
+
+canvas
+{
+ background-color: @background;
+ fill-color: @water;
+ default-lines: false;
+ default-points: false;
+}
diff --git a/data/styles/style-dark/symbols/airport.svg b/data/styles/style-dark/symbols/airport.svg
new file mode 100644
index 0000000000..2f264b0f41
--- /dev/null
+++ b/data/styles/style-dark/symbols/airport.svg
@@ -0,0 +1,90 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/alpine_hut.svg b/data/styles/style-dark/symbols/alpine_hut.svg
new file mode 100644
index 0000000000..dfe0f44137
--- /dev/null
+++ b/data/styles/style-dark/symbols/alpine_hut.svg
@@ -0,0 +1,60 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/archery-borderless.svg b/data/styles/style-dark/symbols/archery-borderless.svg
new file mode 100644
index 0000000000..12ae22a041
--- /dev/null
+++ b/data/styles/style-dark/symbols/archery-borderless.svg
@@ -0,0 +1,93 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/archery.svg b/data/styles/style-dark/symbols/archery.svg
new file mode 100644
index 0000000000..38b41a1989
--- /dev/null
+++ b/data/styles/style-dark/symbols/archery.svg
@@ -0,0 +1,100 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/arrow.svg b/data/styles/style-dark/symbols/arrow.svg
new file mode 100644
index 0000000000..36cf7e6295
--- /dev/null
+++ b/data/styles/style-dark/symbols/arrow.svg
@@ -0,0 +1,49 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/style-dark/symbols/athletics-borderless.svg b/data/styles/style-dark/symbols/athletics-borderless.svg
new file mode 100644
index 0000000000..ee8bf2d2ad
--- /dev/null
+++ b/data/styles/style-dark/symbols/athletics-borderless.svg
@@ -0,0 +1,84 @@
+
+
+
+
diff --git a/data/styles/symbols/athletics.svg b/data/styles/style-dark/symbols/athletics.svg
similarity index 100%
rename from data/styles/symbols/athletics.svg
rename to data/styles/style-dark/symbols/athletics.svg
diff --git a/data/styles/style-dark/symbols/atm.svg b/data/styles/style-dark/symbols/atm.svg
new file mode 100644
index 0000000000..c4ae195b8a
--- /dev/null
+++ b/data/styles/style-dark/symbols/atm.svg
@@ -0,0 +1,105 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/bakery.svg b/data/styles/style-dark/symbols/bakery.svg
new file mode 100644
index 0000000000..a13f3a9785
--- /dev/null
+++ b/data/styles/style-dark/symbols/bakery.svg
@@ -0,0 +1,72 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/bank.svg b/data/styles/style-dark/symbols/bank.svg
new file mode 100644
index 0000000000..1d8cde3b26
--- /dev/null
+++ b/data/styles/style-dark/symbols/bank.svg
@@ -0,0 +1,58 @@
+
+
diff --git a/data/styles/style-dark/symbols/bar.svg b/data/styles/style-dark/symbols/bar.svg
new file mode 100644
index 0000000000..a6a4c7c1c4
--- /dev/null
+++ b/data/styles/style-dark/symbols/bar.svg
@@ -0,0 +1,58 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/style-dark/symbols/barrier.svg b/data/styles/style-dark/symbols/barrier.svg
new file mode 100644
index 0000000000..9ea8396c0a
--- /dev/null
+++ b/data/styles/style-dark/symbols/barrier.svg
@@ -0,0 +1,125 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/style-dark/symbols/baseball-borderless.svg b/data/styles/style-dark/symbols/baseball-borderless.svg
new file mode 100644
index 0000000000..16943b1680
--- /dev/null
+++ b/data/styles/style-dark/symbols/baseball-borderless.svg
@@ -0,0 +1,72 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/baseball.svg b/data/styles/style-dark/symbols/baseball.svg
new file mode 100644
index 0000000000..16943b1680
--- /dev/null
+++ b/data/styles/style-dark/symbols/baseball.svg
@@ -0,0 +1,72 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/basketball-borderless.svg b/data/styles/style-dark/symbols/basketball-borderless.svg
new file mode 100644
index 0000000000..8d16c9e498
--- /dev/null
+++ b/data/styles/style-dark/symbols/basketball-borderless.svg
@@ -0,0 +1,75 @@
+
+
+
+
diff --git a/data/styles/symbols/bowls-borderless.svg b/data/styles/style-dark/symbols/basketball.svg
similarity index 100%
rename from data/styles/symbols/bowls-borderless.svg
rename to data/styles/style-dark/symbols/basketball.svg
diff --git a/data/styles/style-dark/symbols/bench.svg b/data/styles/style-dark/symbols/bench.svg
new file mode 100644
index 0000000000..9526420560
--- /dev/null
+++ b/data/styles/style-dark/symbols/bench.svg
@@ -0,0 +1,68 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/bicycle_rental.svg b/data/styles/style-dark/symbols/bicycle_rental.svg
new file mode 100644
index 0000000000..58968e0ba1
--- /dev/null
+++ b/data/styles/style-dark/symbols/bicycle_rental.svg
@@ -0,0 +1,77 @@
+
+
diff --git a/data/styles/style-dark/symbols/bird.svg b/data/styles/style-dark/symbols/bird.svg
new file mode 100644
index 0000000000..9ac6b49685
--- /dev/null
+++ b/data/styles/style-dark/symbols/bird.svg
@@ -0,0 +1,117 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/bowls.svg b/data/styles/style-dark/symbols/bowls.svg
new file mode 100644
index 0000000000..980603b9e1
--- /dev/null
+++ b/data/styles/style-dark/symbols/bowls.svg
@@ -0,0 +1,69 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/building.svg b/data/styles/style-dark/symbols/building.svg
new file mode 100644
index 0000000000..571259bfd4
--- /dev/null
+++ b/data/styles/style-dark/symbols/building.svg
@@ -0,0 +1,55 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/bureau_de_change.svg b/data/styles/style-dark/symbols/bureau_de_change.svg
new file mode 100644
index 0000000000..07b3500be1
--- /dev/null
+++ b/data/styles/style-dark/symbols/bureau_de_change.svg
@@ -0,0 +1,157 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/bus-mini.svg b/data/styles/style-dark/symbols/bus-mini.svg
new file mode 100644
index 0000000000..07ed5cf34a
--- /dev/null
+++ b/data/styles/style-dark/symbols/bus-mini.svg
@@ -0,0 +1,92 @@
+
+
diff --git a/data/styles/style-dark/symbols/bus.svg b/data/styles/style-dark/symbols/bus.svg
new file mode 100644
index 0000000000..e7fd497557
--- /dev/null
+++ b/data/styles/style-dark/symbols/bus.svg
@@ -0,0 +1,93 @@
+
+
diff --git a/data/styles/symbols/bus_sta.svg b/data/styles/style-dark/symbols/bus_sta.svg
similarity index 100%
rename from data/styles/symbols/bus_sta.svg
rename to data/styles/style-dark/symbols/bus_sta.svg
diff --git a/data/styles/style-dark/symbols/cafe.svg b/data/styles/style-dark/symbols/cafe.svg
new file mode 100644
index 0000000000..452b391a40
--- /dev/null
+++ b/data/styles/style-dark/symbols/cafe.svg
@@ -0,0 +1,109 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/campSite.svg b/data/styles/style-dark/symbols/campSite.svg
new file mode 100644
index 0000000000..8dc90f68b9
--- /dev/null
+++ b/data/styles/style-dark/symbols/campSite.svg
@@ -0,0 +1,66 @@
+
+
diff --git a/data/styles/style-dark/symbols/cannon.svg b/data/styles/style-dark/symbols/cannon.svg
new file mode 100644
index 0000000000..b6cd3dddf7
--- /dev/null
+++ b/data/styles/style-dark/symbols/cannon.svg
@@ -0,0 +1,70 @@
+
+
diff --git a/data/styles/style-dark/symbols/car_rental.svg b/data/styles/style-dark/symbols/car_rental.svg
new file mode 100644
index 0000000000..cb78ba1004
--- /dev/null
+++ b/data/styles/style-dark/symbols/car_rental.svg
@@ -0,0 +1,96 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/car_repair.svg b/data/styles/style-dark/symbols/car_repair.svg
new file mode 100644
index 0000000000..7ef880ac22
--- /dev/null
+++ b/data/styles/style-dark/symbols/car_repair.svg
@@ -0,0 +1,98 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/car_sharing.svg b/data/styles/style-dark/symbols/car_sharing.svg
new file mode 100644
index 0000000000..b5f3be7998
--- /dev/null
+++ b/data/styles/style-dark/symbols/car_sharing.svg
@@ -0,0 +1,165 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/castle.svg b/data/styles/style-dark/symbols/castle.svg
new file mode 100644
index 0000000000..b8084a21d5
--- /dev/null
+++ b/data/styles/style-dark/symbols/castle.svg
@@ -0,0 +1,69 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/cave_entrance.svg b/data/styles/style-dark/symbols/cave_entrance.svg
new file mode 100644
index 0000000000..32850faefa
--- /dev/null
+++ b/data/styles/style-dark/symbols/cave_entrance.svg
@@ -0,0 +1,67 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/church.svg b/data/styles/style-dark/symbols/church.svg
new file mode 100644
index 0000000000..a89e9cc570
--- /dev/null
+++ b/data/styles/style-dark/symbols/church.svg
@@ -0,0 +1,60 @@
+
+
diff --git a/data/styles/style-dark/symbols/cinema.svg b/data/styles/style-dark/symbols/cinema.svg
new file mode 100644
index 0000000000..046ec5046c
--- /dev/null
+++ b/data/styles/style-dark/symbols/cinema.svg
@@ -0,0 +1,61 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/style-dark/symbols/clothes.svg b/data/styles/style-dark/symbols/clothes.svg
new file mode 100644
index 0000000000..ed095e042c
--- /dev/null
+++ b/data/styles/style-dark/symbols/clothes.svg
@@ -0,0 +1,71 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/cricket-borderless.svg b/data/styles/style-dark/symbols/cricket-borderless.svg
new file mode 100644
index 0000000000..9d809c3c7a
--- /dev/null
+++ b/data/styles/style-dark/symbols/cricket-borderless.svg
@@ -0,0 +1,104 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/cricket.svg b/data/styles/style-dark/symbols/cricket.svg
new file mode 100644
index 0000000000..9d809c3c7a
--- /dev/null
+++ b/data/styles/style-dark/symbols/cricket.svg
@@ -0,0 +1,104 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/curling-borderless.svg b/data/styles/style-dark/symbols/curling-borderless.svg
new file mode 100644
index 0000000000..5bc0f3a83c
--- /dev/null
+++ b/data/styles/style-dark/symbols/curling-borderless.svg
@@ -0,0 +1,81 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/curling.svg b/data/styles/style-dark/symbols/curling.svg
new file mode 100644
index 0000000000..5bc0f3a83c
--- /dev/null
+++ b/data/styles/style-dark/symbols/curling.svg
@@ -0,0 +1,81 @@
+
+
+
+
diff --git a/data/styles/symbols/disused.svg b/data/styles/style-dark/symbols/disused.svg
similarity index 100%
rename from data/styles/symbols/disused.svg
rename to data/styles/style-dark/symbols/disused.svg
diff --git a/data/styles/style-dark/symbols/diving-borderless.svg b/data/styles/style-dark/symbols/diving-borderless.svg
new file mode 100644
index 0000000000..aabfce644b
--- /dev/null
+++ b/data/styles/style-dark/symbols/diving-borderless.svg
@@ -0,0 +1,80 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/diving.svg b/data/styles/style-dark/symbols/diving.svg
new file mode 100644
index 0000000000..950250472c
--- /dev/null
+++ b/data/styles/style-dark/symbols/diving.svg
@@ -0,0 +1,80 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/doctor.svg b/data/styles/style-dark/symbols/doctor.svg
new file mode 100644
index 0000000000..5d5888c40b
--- /dev/null
+++ b/data/styles/style-dark/symbols/doctor.svg
@@ -0,0 +1,63 @@
+
+
diff --git a/data/styles/style-dark/symbols/dog_park.svg b/data/styles/style-dark/symbols/dog_park.svg
new file mode 100644
index 0000000000..19d4c2848d
--- /dev/null
+++ b/data/styles/style-dark/symbols/dog_park.svg
@@ -0,0 +1,57 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/style-dark/symbols/drinking_water.svg b/data/styles/style-dark/symbols/drinking_water.svg
new file mode 100644
index 0000000000..8bc1f93712
--- /dev/null
+++ b/data/styles/style-dark/symbols/drinking_water.svg
@@ -0,0 +1,77 @@
+
+
diff --git a/data/styles/style-dark/symbols/earthquake-camp.svg b/data/styles/style-dark/symbols/earthquake-camp.svg
new file mode 100644
index 0000000000..f5b3fc663c
--- /dev/null
+++ b/data/styles/style-dark/symbols/earthquake-camp.svg
@@ -0,0 +1,67 @@
+
+
diff --git a/data/styles/style-dark/symbols/embassy.svg b/data/styles/style-dark/symbols/embassy.svg
new file mode 100644
index 0000000000..a88406c859
--- /dev/null
+++ b/data/styles/style-dark/symbols/embassy.svg
@@ -0,0 +1,76 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/equestrian-borderless.svg b/data/styles/style-dark/symbols/equestrian-borderless.svg
new file mode 100644
index 0000000000..99f43387ef
--- /dev/null
+++ b/data/styles/style-dark/symbols/equestrian-borderless.svg
@@ -0,0 +1,60 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/equestrian.svg b/data/styles/style-dark/symbols/equestrian.svg
new file mode 100644
index 0000000000..dcad05cc00
--- /dev/null
+++ b/data/styles/style-dark/symbols/equestrian.svg
@@ -0,0 +1,60 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/fastfood.svg b/data/styles/style-dark/symbols/fastfood.svg
new file mode 100644
index 0000000000..260ab19a66
--- /dev/null
+++ b/data/styles/style-dark/symbols/fastfood.svg
@@ -0,0 +1,97 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/firebrigade.svg b/data/styles/style-dark/symbols/firebrigade.svg
new file mode 100644
index 0000000000..31590b4fcd
--- /dev/null
+++ b/data/styles/style-dark/symbols/firebrigade.svg
@@ -0,0 +1,110 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/football-borderless.svg b/data/styles/style-dark/symbols/football-borderless.svg
new file mode 100644
index 0000000000..f4fb75c0d1
--- /dev/null
+++ b/data/styles/style-dark/symbols/football-borderless.svg
@@ -0,0 +1,80 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/football.svg b/data/styles/style-dark/symbols/football.svg
new file mode 100644
index 0000000000..7f2b514a90
--- /dev/null
+++ b/data/styles/style-dark/symbols/football.svg
@@ -0,0 +1,80 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/fountain.svg b/data/styles/style-dark/symbols/fountain.svg
new file mode 100644
index 0000000000..61328d10fb
--- /dev/null
+++ b/data/styles/style-dark/symbols/fountain.svg
@@ -0,0 +1,138 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/gate.svg b/data/styles/style-dark/symbols/gate.svg
new file mode 100644
index 0000000000..408619ebb8
--- /dev/null
+++ b/data/styles/style-dark/symbols/gate.svg
@@ -0,0 +1,69 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/golf-course.svg b/data/styles/style-dark/symbols/golf-course.svg
new file mode 100644
index 0000000000..dfbd5cb6ed
--- /dev/null
+++ b/data/styles/style-dark/symbols/golf-course.svg
@@ -0,0 +1,75 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/style-dark/symbols/gymnastics-borderless.svg b/data/styles/style-dark/symbols/gymnastics-borderless.svg
new file mode 100644
index 0000000000..8ee1bb0502
--- /dev/null
+++ b/data/styles/style-dark/symbols/gymnastics-borderless.svg
@@ -0,0 +1,76 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/gymnastics.svg b/data/styles/style-dark/symbols/gymnastics.svg
new file mode 100644
index 0000000000..125a636dcd
--- /dev/null
+++ b/data/styles/style-dark/symbols/gymnastics.svg
@@ -0,0 +1,76 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/hairdresser.svg b/data/styles/style-dark/symbols/hairdresser.svg
new file mode 100644
index 0000000000..29b0be64da
--- /dev/null
+++ b/data/styles/style-dark/symbols/hairdresser.svg
@@ -0,0 +1,274 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/handball-borderless.svg b/data/styles/style-dark/symbols/handball-borderless.svg
new file mode 100644
index 0000000000..9b1c6cf431
--- /dev/null
+++ b/data/styles/style-dark/symbols/handball-borderless.svg
@@ -0,0 +1,71 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/handball.svg b/data/styles/style-dark/symbols/handball.svg
new file mode 100644
index 0000000000..a1fdad000e
--- /dev/null
+++ b/data/styles/style-dark/symbols/handball.svg
@@ -0,0 +1,71 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/helipad.svg b/data/styles/style-dark/symbols/helipad.svg
new file mode 100644
index 0000000000..c7a071de53
--- /dev/null
+++ b/data/styles/style-dark/symbols/helipad.svg
@@ -0,0 +1,100 @@
+
+
diff --git a/data/styles/style-dark/symbols/hospital.svg b/data/styles/style-dark/symbols/hospital.svg
new file mode 100644
index 0000000000..1b6ffbb40e
--- /dev/null
+++ b/data/styles/style-dark/symbols/hospital.svg
@@ -0,0 +1,58 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/style-dark/symbols/hostel.svg b/data/styles/style-dark/symbols/hostel.svg
new file mode 100644
index 0000000000..6228399422
--- /dev/null
+++ b/data/styles/style-dark/symbols/hostel.svg
@@ -0,0 +1,58 @@
+
+
diff --git a/data/styles/style-dark/symbols/hotel.svg b/data/styles/style-dark/symbols/hotel.svg
new file mode 100644
index 0000000000..b6d0b28196
--- /dev/null
+++ b/data/styles/style-dark/symbols/hotel.svg
@@ -0,0 +1,163 @@
+
+
diff --git a/data/styles/style-dark/symbols/housenumber.svg b/data/styles/style-dark/symbols/housenumber.svg
new file mode 100644
index 0000000000..a7ed09f863
--- /dev/null
+++ b/data/styles/style-dark/symbols/housenumber.svg
@@ -0,0 +1,58 @@
+
+
diff --git a/data/styles/style-dark/symbols/hunting_closed_high.svg b/data/styles/style-dark/symbols/hunting_closed_high.svg
new file mode 100644
index 0000000000..27f523972f
--- /dev/null
+++ b/data/styles/style-dark/symbols/hunting_closed_high.svg
@@ -0,0 +1,79 @@
+
+
diff --git a/data/styles/style-dark/symbols/information-guidepost.svg b/data/styles/style-dark/symbols/information-guidepost.svg
new file mode 100644
index 0000000000..3817d3cbec
--- /dev/null
+++ b/data/styles/style-dark/symbols/information-guidepost.svg
@@ -0,0 +1,105 @@
+
+
diff --git a/data/styles/style-dark/symbols/information-office.svg b/data/styles/style-dark/symbols/information-office.svg
new file mode 100644
index 0000000000..3817d3cbec
--- /dev/null
+++ b/data/styles/style-dark/symbols/information-office.svg
@@ -0,0 +1,105 @@
+
+
diff --git a/data/styles/style-dark/symbols/information.svg b/data/styles/style-dark/symbols/information.svg
new file mode 100644
index 0000000000..3817d3cbec
--- /dev/null
+++ b/data/styles/style-dark/symbols/information.svg
@@ -0,0 +1,105 @@
+
+
diff --git a/data/styles/style-dark/symbols/khanda.svg b/data/styles/style-dark/symbols/khanda.svg
new file mode 100644
index 0000000000..7163ee4eda
--- /dev/null
+++ b/data/styles/style-dark/symbols/khanda.svg
@@ -0,0 +1,58 @@
+
+
diff --git a/data/styles/symbols/kindergarten.svg b/data/styles/style-dark/symbols/kindergarten.svg
similarity index 100%
rename from data/styles/symbols/kindergarten.svg
rename to data/styles/style-dark/symbols/kindergarten.svg
diff --git a/data/styles/style-dark/symbols/kindergarten2.svg b/data/styles/style-dark/symbols/kindergarten2.svg
new file mode 100644
index 0000000000..6a6255603f
--- /dev/null
+++ b/data/styles/style-dark/symbols/kindergarten2.svg
@@ -0,0 +1,123 @@
+
+
+
+
diff --git a/data/styles/symbols/kiosk.svg b/data/styles/style-dark/symbols/kiosk.svg
similarity index 100%
rename from data/styles/symbols/kiosk.svg
rename to data/styles/style-dark/symbols/kiosk.svg
diff --git a/data/styles/style-dark/symbols/library.svg b/data/styles/style-dark/symbols/library.svg
new file mode 100644
index 0000000000..2704bf5371
--- /dev/null
+++ b/data/styles/style-dark/symbols/library.svg
@@ -0,0 +1,72 @@
+
+
diff --git a/data/styles/style-dark/symbols/lighthouse.svg b/data/styles/style-dark/symbols/lighthouse.svg
new file mode 100644
index 0000000000..003db60939
--- /dev/null
+++ b/data/styles/style-dark/symbols/lighthouse.svg
@@ -0,0 +1,143 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/man-made-halfpipe.svg b/data/styles/style-dark/symbols/man-made-halfpipe.svg
new file mode 100644
index 0000000000..b7bf848c2f
--- /dev/null
+++ b/data/styles/style-dark/symbols/man-made-halfpipe.svg
@@ -0,0 +1,55 @@
+
+
diff --git a/data/styles/style-dark/symbols/memorial.svg b/data/styles/style-dark/symbols/memorial.svg
new file mode 100644
index 0000000000..55da8d9235
--- /dev/null
+++ b/data/styles/style-dark/symbols/memorial.svg
@@ -0,0 +1,76 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/mosque.svg b/data/styles/style-dark/symbols/mosque.svg
new file mode 100644
index 0000000000..356bc5b000
--- /dev/null
+++ b/data/styles/style-dark/symbols/mosque.svg
@@ -0,0 +1,55 @@
+
+
diff --git a/data/styles/style-dark/symbols/mountain_pass.svg b/data/styles/style-dark/symbols/mountain_pass.svg
new file mode 100644
index 0000000000..798c7f3cfb
--- /dev/null
+++ b/data/styles/style-dark/symbols/mountain_pass.svg
@@ -0,0 +1,59 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/museum.svg b/data/styles/style-dark/symbols/museum.svg
new file mode 100644
index 0000000000..4c0dd97d6a
--- /dev/null
+++ b/data/styles/style-dark/symbols/museum.svg
@@ -0,0 +1,76 @@
+
+
diff --git a/data/styles/style-dark/symbols/park_and_ride-permissive.svg b/data/styles/style-dark/symbols/park_and_ride-permissive.svg
new file mode 100644
index 0000000000..e1a63da2de
--- /dev/null
+++ b/data/styles/style-dark/symbols/park_and_ride-permissive.svg
@@ -0,0 +1,69 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/park_and_ride.svg b/data/styles/style-dark/symbols/park_and_ride.svg
new file mode 100644
index 0000000000..fdc52453e4
--- /dev/null
+++ b/data/styles/style-dark/symbols/park_and_ride.svg
@@ -0,0 +1,69 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/parking-mini.svg b/data/styles/style-dark/symbols/parking-mini.svg
new file mode 100644
index 0000000000..951469efc7
--- /dev/null
+++ b/data/styles/style-dark/symbols/parking-mini.svg
@@ -0,0 +1,96 @@
+
+
diff --git a/data/styles/style-dark/symbols/parking-permissive.svg b/data/styles/style-dark/symbols/parking-permissive.svg
new file mode 100644
index 0000000000..727a170b07
--- /dev/null
+++ b/data/styles/style-dark/symbols/parking-permissive.svg
@@ -0,0 +1,62 @@
+
+
diff --git a/data/styles/style-dark/symbols/parking-private.svg b/data/styles/style-dark/symbols/parking-private.svg
new file mode 100644
index 0000000000..8547f42288
--- /dev/null
+++ b/data/styles/style-dark/symbols/parking-private.svg
@@ -0,0 +1,62 @@
+
+
diff --git a/data/styles/style-dark/symbols/parking.svg b/data/styles/style-dark/symbols/parking.svg
new file mode 100644
index 0000000000..8327e155ab
--- /dev/null
+++ b/data/styles/style-dark/symbols/parking.svg
@@ -0,0 +1,89 @@
+
+
diff --git a/data/styles/style-dark/symbols/parking_fee-permissive copy.svg b/data/styles/style-dark/symbols/parking_fee-permissive copy.svg
new file mode 100644
index 0000000000..7680d9b472
--- /dev/null
+++ b/data/styles/style-dark/symbols/parking_fee-permissive copy.svg
@@ -0,0 +1,122 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/parking_fee-permissive.svg b/data/styles/style-dark/symbols/parking_fee-permissive.svg
new file mode 100644
index 0000000000..8b30fb264c
--- /dev/null
+++ b/data/styles/style-dark/symbols/parking_fee-permissive.svg
@@ -0,0 +1,122 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/parking_roof-permissive.svg b/data/styles/style-dark/symbols/parking_roof-permissive.svg
new file mode 100644
index 0000000000..fa7a08b1c0
--- /dev/null
+++ b/data/styles/style-dark/symbols/parking_roof-permissive.svg
@@ -0,0 +1,67 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/parking_roof.svg b/data/styles/style-dark/symbols/parking_roof.svg
new file mode 100644
index 0000000000..396a9e90b9
--- /dev/null
+++ b/data/styles/style-dark/symbols/parking_roof.svg
@@ -0,0 +1,109 @@
+
+
diff --git a/data/styles/style-dark/symbols/parking_roof_fee-permissive.svg b/data/styles/style-dark/symbols/parking_roof_fee-permissive.svg
new file mode 100644
index 0000000000..3932b99754
--- /dev/null
+++ b/data/styles/style-dark/symbols/parking_roof_fee-permissive.svg
@@ -0,0 +1,122 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/parking_roof_fee.svg b/data/styles/style-dark/symbols/parking_roof_fee.svg
new file mode 100644
index 0000000000..1682cf9719
--- /dev/null
+++ b/data/styles/style-dark/symbols/parking_roof_fee.svg
@@ -0,0 +1,122 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/peak-mini.svg b/data/styles/style-dark/symbols/peak-mini.svg
new file mode 100644
index 0000000000..6af9a816d1
--- /dev/null
+++ b/data/styles/style-dark/symbols/peak-mini.svg
@@ -0,0 +1,90 @@
+
+
diff --git a/data/styles/style-dark/symbols/peak.svg b/data/styles/style-dark/symbols/peak.svg
new file mode 100644
index 0000000000..9e2e3ae51f
--- /dev/null
+++ b/data/styles/style-dark/symbols/peak.svg
@@ -0,0 +1,90 @@
+
+
diff --git a/data/styles/style-dark/symbols/petrolStation.svg b/data/styles/style-dark/symbols/petrolStation.svg
new file mode 100644
index 0000000000..272ae76796
--- /dev/null
+++ b/data/styles/style-dark/symbols/petrolStation.svg
@@ -0,0 +1,66 @@
+
+
diff --git a/data/styles/style-dark/symbols/pharmacy.svg b/data/styles/style-dark/symbols/pharmacy.svg
new file mode 100644
index 0000000000..b6095f7ef0
--- /dev/null
+++ b/data/styles/style-dark/symbols/pharmacy.svg
@@ -0,0 +1,73 @@
+
+
diff --git a/data/styles/style-dark/symbols/picnic.svg b/data/styles/style-dark/symbols/picnic.svg
new file mode 100644
index 0000000000..d2eb4e0eda
--- /dev/null
+++ b/data/styles/style-dark/symbols/picnic.svg
@@ -0,0 +1,68 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/playground.svg b/data/styles/style-dark/symbols/playground.svg
new file mode 100644
index 0000000000..bb992ea041
--- /dev/null
+++ b/data/styles/style-dark/symbols/playground.svg
@@ -0,0 +1,97 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/police.svg b/data/styles/style-dark/symbols/police.svg
new file mode 100644
index 0000000000..4a06dcbfb6
--- /dev/null
+++ b/data/styles/style-dark/symbols/police.svg
@@ -0,0 +1,60 @@
+
+
\ No newline at end of file
diff --git a/data/styles/style-dark/symbols/postbox.svg b/data/styles/style-dark/symbols/postbox.svg
new file mode 100644
index 0000000000..cb30c8bd85
--- /dev/null
+++ b/data/styles/style-dark/symbols/postbox.svg
@@ -0,0 +1,64 @@
+
+
diff --git a/data/styles/style-dark/symbols/postoffice.svg b/data/styles/style-dark/symbols/postoffice.svg
new file mode 100644
index 0000000000..8afa1cc9e8
--- /dev/null
+++ b/data/styles/style-dark/symbols/postoffice.svg
@@ -0,0 +1,63 @@
+
+
diff --git a/data/styles/style-dark/symbols/power-pole.svg b/data/styles/style-dark/symbols/power-pole.svg
new file mode 100644
index 0000000000..9cd3465180
--- /dev/null
+++ b/data/styles/style-dark/symbols/power-pole.svg
@@ -0,0 +1,58 @@
+
+
diff --git a/data/styles/style-dark/symbols/power-tower.svg b/data/styles/style-dark/symbols/power-tower.svg
new file mode 100644
index 0000000000..16d1772597
--- /dev/null
+++ b/data/styles/style-dark/symbols/power-tower.svg
@@ -0,0 +1,56 @@
+
+
diff --git a/data/styles/style-dark/symbols/power_generic.svg b/data/styles/style-dark/symbols/power_generic.svg
new file mode 100644
index 0000000000..9ddf97420c
--- /dev/null
+++ b/data/styles/style-dark/symbols/power_generic.svg
@@ -0,0 +1,55 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/power_hydro.svg b/data/styles/style-dark/symbols/power_hydro.svg
new file mode 100644
index 0000000000..249b7c42d3
--- /dev/null
+++ b/data/styles/style-dark/symbols/power_hydro.svg
@@ -0,0 +1,55 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/power_photovoltaic.svg b/data/styles/style-dark/symbols/power_photovoltaic.svg
new file mode 100644
index 0000000000..ddbfdaf765
--- /dev/null
+++ b/data/styles/style-dark/symbols/power_photovoltaic.svg
@@ -0,0 +1,104 @@
+
+
diff --git a/data/styles/style-dark/symbols/power_wind.svg b/data/styles/style-dark/symbols/power_wind.svg
new file mode 100644
index 0000000000..c3a961b921
--- /dev/null
+++ b/data/styles/style-dark/symbols/power_wind.svg
@@ -0,0 +1,74 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/pub.svg b/data/styles/style-dark/symbols/pub.svg
new file mode 100644
index 0000000000..199da9e1f9
--- /dev/null
+++ b/data/styles/style-dark/symbols/pub.svg
@@ -0,0 +1,188 @@
+
+
diff --git a/data/styles/symbols/pubx.svg b/data/styles/style-dark/symbols/pubx.svg
similarity index 100%
rename from data/styles/symbols/pubx.svg
rename to data/styles/style-dark/symbols/pubx.svg
diff --git a/data/styles/style-dark/symbols/railway-crossing-small.svg b/data/styles/style-dark/symbols/railway-crossing-small.svg
new file mode 100644
index 0000000000..24dd0cb623
--- /dev/null
+++ b/data/styles/style-dark/symbols/railway-crossing-small.svg
@@ -0,0 +1,64 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/railway-crossing.svg b/data/styles/style-dark/symbols/railway-crossing.svg
new file mode 100644
index 0000000000..a56067ec36
--- /dev/null
+++ b/data/styles/style-dark/symbols/railway-crossing.svg
@@ -0,0 +1,63 @@
+
+
diff --git a/data/styles/style-dark/symbols/railway-station-mini.svg b/data/styles/style-dark/symbols/railway-station-mini.svg
new file mode 100644
index 0000000000..e0427d1a7a
--- /dev/null
+++ b/data/styles/style-dark/symbols/railway-station-mini.svg
@@ -0,0 +1,72 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/style-dark/symbols/railway-station.svg b/data/styles/style-dark/symbols/railway-station.svg
new file mode 100644
index 0000000000..9d7a69a9d5
--- /dev/null
+++ b/data/styles/style-dark/symbols/railway-station.svg
@@ -0,0 +1,72 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/style-dark/symbols/recycling.svg b/data/styles/style-dark/symbols/recycling.svg
new file mode 100644
index 0000000000..e655dedabf
--- /dev/null
+++ b/data/styles/style-dark/symbols/recycling.svg
@@ -0,0 +1,89 @@
+
+
diff --git a/data/styles/style-dark/symbols/religion.svg b/data/styles/style-dark/symbols/religion.svg
new file mode 100644
index 0000000000..559ef622c5
--- /dev/null
+++ b/data/styles/style-dark/symbols/religion.svg
@@ -0,0 +1,71 @@
+
+
diff --git a/data/styles/style-dark/symbols/restaurant.svg b/data/styles/style-dark/symbols/restaurant.svg
new file mode 100644
index 0000000000..cc3730c52a
--- /dev/null
+++ b/data/styles/style-dark/symbols/restaurant.svg
@@ -0,0 +1,103 @@
+
+
diff --git a/data/styles/style-dark/symbols/roundabout_left.svg b/data/styles/style-dark/symbols/roundabout_left.svg
new file mode 100644
index 0000000000..be19f7e6fa
--- /dev/null
+++ b/data/styles/style-dark/symbols/roundabout_left.svg
@@ -0,0 +1,70 @@
+
+
diff --git a/data/styles/style-dark/symbols/roundabout_right.svg b/data/styles/style-dark/symbols/roundabout_right.svg
new file mode 100644
index 0000000000..14b81b0998
--- /dev/null
+++ b/data/styles/style-dark/symbols/roundabout_right.svg
@@ -0,0 +1,74 @@
+
+
diff --git a/data/styles/style-dark/symbols/ruins.svg b/data/styles/style-dark/symbols/ruins.svg
new file mode 100644
index 0000000000..0d50ba976f
--- /dev/null
+++ b/data/styles/style-dark/symbols/ruins.svg
@@ -0,0 +1,105 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/style-dark/symbols/school.svg b/data/styles/style-dark/symbols/school.svg
new file mode 100644
index 0000000000..4b3da0b200
--- /dev/null
+++ b/data/styles/style-dark/symbols/school.svg
@@ -0,0 +1,114 @@
+
+
diff --git a/data/styles/style-dark/symbols/shelter-fireplace.svg b/data/styles/style-dark/symbols/shelter-fireplace.svg
new file mode 100644
index 0000000000..e5a098c1c1
--- /dev/null
+++ b/data/styles/style-dark/symbols/shelter-fireplace.svg
@@ -0,0 +1,132 @@
+
+
diff --git a/data/styles/style-dark/symbols/shelter.svg b/data/styles/style-dark/symbols/shelter.svg
new file mode 100644
index 0000000000..0614c58caa
--- /dev/null
+++ b/data/styles/style-dark/symbols/shelter.svg
@@ -0,0 +1,120 @@
+
+
diff --git a/data/styles/style-dark/symbols/shooting-borderless.svg b/data/styles/style-dark/symbols/shooting-borderless.svg
new file mode 100644
index 0000000000..efbb524c3e
--- /dev/null
+++ b/data/styles/style-dark/symbols/shooting-borderless.svg
@@ -0,0 +1,89 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/shooting.svg b/data/styles/style-dark/symbols/shooting.svg
new file mode 100644
index 0000000000..efbb524c3e
--- /dev/null
+++ b/data/styles/style-dark/symbols/shooting.svg
@@ -0,0 +1,89 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/slipway.svg b/data/styles/style-dark/symbols/slipway.svg
new file mode 100644
index 0000000000..f59814fccd
--- /dev/null
+++ b/data/styles/style-dark/symbols/slipway.svg
@@ -0,0 +1,60 @@
+
+
diff --git a/data/styles/style-dark/symbols/soccer-borderless.svg b/data/styles/style-dark/symbols/soccer-borderless.svg
new file mode 100644
index 0000000000..7b6d97a622
--- /dev/null
+++ b/data/styles/style-dark/symbols/soccer-borderless.svg
@@ -0,0 +1,72 @@
+
+
diff --git a/data/styles/style-dark/symbols/soccer.svg b/data/styles/style-dark/symbols/soccer.svg
new file mode 100644
index 0000000000..fcb6a1c654
--- /dev/null
+++ b/data/styles/style-dark/symbols/soccer.svg
@@ -0,0 +1,72 @@
+
+
diff --git a/data/styles/style-dark/symbols/speed_trap.svg b/data/styles/style-dark/symbols/speed_trap.svg
new file mode 100644
index 0000000000..876bdac7cb
--- /dev/null
+++ b/data/styles/style-dark/symbols/speed_trap.svg
@@ -0,0 +1,64 @@
+
+
diff --git a/data/styles/style-dark/symbols/subway-station-l.svg b/data/styles/style-dark/symbols/subway-station-l.svg
new file mode 100644
index 0000000000..19aa4db004
--- /dev/null
+++ b/data/styles/style-dark/symbols/subway-station-l.svg
@@ -0,0 +1,73 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/style-dark/symbols/subway-station-m.svg b/data/styles/style-dark/symbols/subway-station-m.svg
new file mode 100644
index 0000000000..c60f358ff4
--- /dev/null
+++ b/data/styles/style-dark/symbols/subway-station-m.svg
@@ -0,0 +1,73 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/style-dark/symbols/subway-station-s.svg b/data/styles/style-dark/symbols/subway-station-s.svg
new file mode 100644
index 0000000000..79a47fa2bf
--- /dev/null
+++ b/data/styles/style-dark/symbols/subway-station-s.svg
@@ -0,0 +1,73 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/style-dark/symbols/subway.svg b/data/styles/style-dark/symbols/subway.svg
new file mode 100644
index 0000000000..1738fcbe42
--- /dev/null
+++ b/data/styles/style-dark/symbols/subway.svg
@@ -0,0 +1,78 @@
+
+
diff --git a/data/styles/style-dark/symbols/supermarket.svg b/data/styles/style-dark/symbols/supermarket.svg
new file mode 100644
index 0000000000..bfcdfbca39
--- /dev/null
+++ b/data/styles/style-dark/symbols/supermarket.svg
@@ -0,0 +1,84 @@
+
+
diff --git a/data/styles/style-dark/symbols/survey_point.svg b/data/styles/style-dark/symbols/survey_point.svg
new file mode 100644
index 0000000000..018655812b
--- /dev/null
+++ b/data/styles/style-dark/symbols/survey_point.svg
@@ -0,0 +1,63 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/swimming-borderless.svg b/data/styles/style-dark/symbols/swimming-borderless.svg
new file mode 100644
index 0000000000..09d6d5852b
--- /dev/null
+++ b/data/styles/style-dark/symbols/swimming-borderless.svg
@@ -0,0 +1,59 @@
+
+
diff --git a/data/styles/style-dark/symbols/swimming.svg b/data/styles/style-dark/symbols/swimming.svg
new file mode 100644
index 0000000000..f0f3550b20
--- /dev/null
+++ b/data/styles/style-dark/symbols/swimming.svg
@@ -0,0 +1,59 @@
+
+
diff --git a/data/styles/style-dark/symbols/synagogue.svg b/data/styles/style-dark/symbols/synagogue.svg
new file mode 100644
index 0000000000..6ebb1493c9
--- /dev/null
+++ b/data/styles/style-dark/symbols/synagogue.svg
@@ -0,0 +1,75 @@
+
+
diff --git a/data/styles/style-dark/symbols/taxi.svg b/data/styles/style-dark/symbols/taxi.svg
new file mode 100644
index 0000000000..c5332eb069
--- /dev/null
+++ b/data/styles/style-dark/symbols/taxi.svg
@@ -0,0 +1,126 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/telephone.svg b/data/styles/style-dark/symbols/telephone.svg
new file mode 100644
index 0000000000..7e0b9dc6b2
--- /dev/null
+++ b/data/styles/style-dark/symbols/telephone.svg
@@ -0,0 +1,90 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/tennis-borderless.svg b/data/styles/style-dark/symbols/tennis-borderless.svg
new file mode 100644
index 0000000000..979eadb424
--- /dev/null
+++ b/data/styles/style-dark/symbols/tennis-borderless.svg
@@ -0,0 +1,76 @@
+
+
diff --git a/data/styles/style-dark/symbols/tennis.svg b/data/styles/style-dark/symbols/tennis.svg
new file mode 100644
index 0000000000..979eadb424
--- /dev/null
+++ b/data/styles/style-dark/symbols/tennis.svg
@@ -0,0 +1,76 @@
+
+
diff --git a/data/styles/style-dark/symbols/theatre.svg b/data/styles/style-dark/symbols/theatre.svg
new file mode 100644
index 0000000000..2db46a728c
--- /dev/null
+++ b/data/styles/style-dark/symbols/theatre.svg
@@ -0,0 +1,122 @@
+
+
diff --git a/data/styles/style-dark/symbols/toilets.svg b/data/styles/style-dark/symbols/toilets.svg
new file mode 100644
index 0000000000..993c925b83
--- /dev/null
+++ b/data/styles/style-dark/symbols/toilets.svg
@@ -0,0 +1,96 @@
+
+
diff --git a/data/styles/style-dark/symbols/traffic_signal.svg b/data/styles/style-dark/symbols/traffic_signal.svg
new file mode 100644
index 0000000000..fb2a1ff9be
--- /dev/null
+++ b/data/styles/style-dark/symbols/traffic_signal.svg
@@ -0,0 +1,81 @@
+
+
diff --git a/data/styles/style-dark/symbols/tramway-mini.svg b/data/styles/style-dark/symbols/tramway-mini.svg
new file mode 100644
index 0000000000..cd254a0391
--- /dev/null
+++ b/data/styles/style-dark/symbols/tramway-mini.svg
@@ -0,0 +1,132 @@
+
+
diff --git a/data/styles/style-dark/symbols/tramway.svg b/data/styles/style-dark/symbols/tramway.svg
new file mode 100644
index 0000000000..07dba15c74
--- /dev/null
+++ b/data/styles/style-dark/symbols/tramway.svg
@@ -0,0 +1,133 @@
+
+
diff --git a/data/styles/style-dark/symbols/tree.svg b/data/styles/style-dark/symbols/tree.svg
new file mode 100644
index 0000000000..3d0d0d5db1
--- /dev/null
+++ b/data/styles/style-dark/symbols/tree.svg
@@ -0,0 +1,55 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/university.svg b/data/styles/style-dark/symbols/university.svg
new file mode 100644
index 0000000000..d20a5afda2
--- /dev/null
+++ b/data/styles/style-dark/symbols/university.svg
@@ -0,0 +1,85 @@
+
+
diff --git a/data/styles/style-dark/symbols/viewpoint.svg b/data/styles/style-dark/symbols/viewpoint.svg
new file mode 100644
index 0000000000..c3fce900b2
--- /dev/null
+++ b/data/styles/style-dark/symbols/viewpoint.svg
@@ -0,0 +1,98 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/vulcan.svg b/data/styles/style-dark/symbols/vulcan.svg
new file mode 100644
index 0000000000..4b9c82d076
--- /dev/null
+++ b/data/styles/style-dark/symbols/vulcan.svg
@@ -0,0 +1,57 @@
+
+
diff --git a/data/styles/style-dark/symbols/wastewater.svg b/data/styles/style-dark/symbols/wastewater.svg
new file mode 100644
index 0000000000..63dd1f3743
--- /dev/null
+++ b/data/styles/style-dark/symbols/wastewater.svg
@@ -0,0 +1,67 @@
+
+
+
+
diff --git a/data/styles/style-dark/symbols/waterfall.svg b/data/styles/style-dark/symbols/waterfall.svg
new file mode 100644
index 0000000000..905239caad
--- /dev/null
+++ b/data/styles/style-dark/symbols/waterfall.svg
@@ -0,0 +1,128 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/style-dark/symbols/windmill.svg b/data/styles/style-dark/symbols/windmill.svg
new file mode 100644
index 0000000000..793959df0e
--- /dev/null
+++ b/data/styles/style-dark/symbols/windmill.svg
@@ -0,0 +1,73 @@
+
+
diff --git a/data/styles/watch/api-result.png b/data/styles/style-dark/watch/api-result.png
similarity index 100%
rename from data/styles/watch/api-result.png
rename to data/styles/style-dark/watch/api-result.png
diff --git a/data/styles/watch/arrow-direction.png b/data/styles/style-dark/watch/arrow-direction.png
similarity index 100%
rename from data/styles/watch/arrow-direction.png
rename to data/styles/style-dark/watch/arrow-direction.png
diff --git a/data/styles/watch/compass-image.png b/data/styles/style-dark/watch/compass-image.png
similarity index 100%
rename from data/styles/watch/compass-image.png
rename to data/styles/style-dark/watch/compass-image.png
diff --git a/data/styles/watch/current-position-compas.png b/data/styles/style-dark/watch/current-position-compas.png
similarity index 100%
rename from data/styles/watch/current-position-compas.png
rename to data/styles/style-dark/watch/current-position-compas.png
diff --git a/data/styles/watch/current-position.png b/data/styles/style-dark/watch/current-position.png
similarity index 100%
rename from data/styles/watch/current-position.png
rename to data/styles/style-dark/watch/current-position.png
diff --git a/data/styles/watch/current-routing-compas.png b/data/styles/style-dark/watch/current-routing-compas.png
similarity index 100%
rename from data/styles/watch/current-routing-compas.png
rename to data/styles/style-dark/watch/current-routing-compas.png
diff --git a/data/styles/watch/placemark-blue.png b/data/styles/style-dark/watch/placemark-blue.png
similarity index 100%
rename from data/styles/watch/placemark-blue.png
rename to data/styles/style-dark/watch/placemark-blue.png
diff --git a/data/styles/watch/placemark-brown.png b/data/styles/style-dark/watch/placemark-brown.png
similarity index 100%
rename from data/styles/watch/placemark-brown.png
rename to data/styles/style-dark/watch/placemark-brown.png
diff --git a/data/styles/watch/placemark-green.png b/data/styles/style-dark/watch/placemark-green.png
similarity index 100%
rename from data/styles/watch/placemark-green.png
rename to data/styles/style-dark/watch/placemark-green.png
diff --git a/data/styles/watch/placemark-orange.png b/data/styles/style-dark/watch/placemark-orange.png
similarity index 100%
rename from data/styles/watch/placemark-orange.png
rename to data/styles/style-dark/watch/placemark-orange.png
diff --git a/data/styles/watch/placemark-pink.png b/data/styles/style-dark/watch/placemark-pink.png
similarity index 100%
rename from data/styles/watch/placemark-pink.png
rename to data/styles/style-dark/watch/placemark-pink.png
diff --git a/data/styles/watch/placemark-purple.png b/data/styles/style-dark/watch/placemark-purple.png
similarity index 100%
rename from data/styles/watch/placemark-purple.png
rename to data/styles/style-dark/watch/placemark-purple.png
diff --git a/data/styles/watch/placemark-red.png b/data/styles/style-dark/watch/placemark-red.png
similarity index 100%
rename from data/styles/watch/placemark-red.png
rename to data/styles/style-dark/watch/placemark-red.png
diff --git a/data/styles/watch/placemark-yellow.png b/data/styles/style-dark/watch/placemark-yellow.png
similarity index 100%
rename from data/styles/watch/placemark-yellow.png
rename to data/styles/style-dark/watch/placemark-yellow.png
diff --git a/data/styles/watch/route_from.png b/data/styles/style-dark/watch/route_from.png
similarity index 100%
rename from data/styles/watch/route_from.png
rename to data/styles/style-dark/watch/route_from.png
diff --git a/data/styles/watch/route_to.png b/data/styles/style-dark/watch/route_to.png
similarity index 100%
rename from data/styles/watch/route_to.png
rename to data/styles/style-dark/watch/route_to.png
diff --git a/data/styles/watch/search-result-active.png b/data/styles/style-dark/watch/search-result-active.png
similarity index 100%
rename from data/styles/watch/search-result-active.png
rename to data/styles/style-dark/watch/search-result-active.png
diff --git a/data/styles/watch/search-result.png b/data/styles/style-dark/watch/search-result.png
similarity index 100%
rename from data/styles/watch/search-result.png
rename to data/styles/style-dark/watch/search-result.png
diff --git a/data/styles/xhdpi/api-result.png b/data/styles/style-dark/xhdpi/api-result.png
similarity index 100%
rename from data/styles/xhdpi/api-result.png
rename to data/styles/style-dark/xhdpi/api-result.png
diff --git a/data/styles/xhdpi/compass-image.png b/data/styles/style-dark/xhdpi/compass-image.png
similarity index 100%
rename from data/styles/xhdpi/compass-image.png
rename to data/styles/style-dark/xhdpi/compass-image.png
diff --git a/data/styles/xhdpi/current-position-compas.png b/data/styles/style-dark/xhdpi/current-position-compas.png
similarity index 100%
rename from data/styles/xhdpi/current-position-compas.png
rename to data/styles/style-dark/xhdpi/current-position-compas.png
diff --git a/data/styles/xhdpi/current-position.png b/data/styles/style-dark/xhdpi/current-position.png
similarity index 100%
rename from data/styles/xhdpi/current-position.png
rename to data/styles/style-dark/xhdpi/current-position.png
diff --git a/data/styles/xhdpi/current-routing-compas.png b/data/styles/style-dark/xhdpi/current-routing-compas.png
similarity index 100%
rename from data/styles/xhdpi/current-routing-compas.png
rename to data/styles/style-dark/xhdpi/current-routing-compas.png
diff --git a/data/styles/xhdpi/placemark-blue.png b/data/styles/style-dark/xhdpi/placemark-blue.png
similarity index 100%
rename from data/styles/xhdpi/placemark-blue.png
rename to data/styles/style-dark/xhdpi/placemark-blue.png
diff --git a/data/styles/xhdpi/placemark-brown.png b/data/styles/style-dark/xhdpi/placemark-brown.png
similarity index 100%
rename from data/styles/xhdpi/placemark-brown.png
rename to data/styles/style-dark/xhdpi/placemark-brown.png
diff --git a/data/styles/xhdpi/placemark-green.png b/data/styles/style-dark/xhdpi/placemark-green.png
similarity index 100%
rename from data/styles/xhdpi/placemark-green.png
rename to data/styles/style-dark/xhdpi/placemark-green.png
diff --git a/data/styles/xhdpi/placemark-orange.png b/data/styles/style-dark/xhdpi/placemark-orange.png
similarity index 100%
rename from data/styles/xhdpi/placemark-orange.png
rename to data/styles/style-dark/xhdpi/placemark-orange.png
diff --git a/data/styles/xhdpi/placemark-pink.png b/data/styles/style-dark/xhdpi/placemark-pink.png
similarity index 100%
rename from data/styles/xhdpi/placemark-pink.png
rename to data/styles/style-dark/xhdpi/placemark-pink.png
diff --git a/data/styles/xhdpi/placemark-purple.png b/data/styles/style-dark/xhdpi/placemark-purple.png
similarity index 100%
rename from data/styles/xhdpi/placemark-purple.png
rename to data/styles/style-dark/xhdpi/placemark-purple.png
diff --git a/data/styles/xhdpi/placemark-red.png b/data/styles/style-dark/xhdpi/placemark-red.png
similarity index 100%
rename from data/styles/xhdpi/placemark-red.png
rename to data/styles/style-dark/xhdpi/placemark-red.png
diff --git a/data/styles/xhdpi/placemark-yellow.png b/data/styles/style-dark/xhdpi/placemark-yellow.png
similarity index 100%
rename from data/styles/xhdpi/placemark-yellow.png
rename to data/styles/style-dark/xhdpi/placemark-yellow.png
diff --git a/data/styles/xhdpi/route_from.png b/data/styles/style-dark/xhdpi/route_from.png
similarity index 100%
rename from data/styles/xhdpi/route_from.png
rename to data/styles/style-dark/xhdpi/route_from.png
diff --git a/data/styles/xhdpi/route_to.png b/data/styles/style-dark/xhdpi/route_to.png
similarity index 100%
rename from data/styles/xhdpi/route_to.png
rename to data/styles/style-dark/xhdpi/route_to.png
diff --git a/data/styles/xhdpi/search-result-active.png b/data/styles/style-dark/xhdpi/search-result-active.png
similarity index 100%
rename from data/styles/xhdpi/search-result-active.png
rename to data/styles/style-dark/xhdpi/search-result-active.png
diff --git a/data/styles/xhdpi/search-result.png b/data/styles/style-dark/xhdpi/search-result.png
similarity index 100%
rename from data/styles/xhdpi/search-result.png
rename to data/styles/style-dark/xhdpi/search-result.png
diff --git a/data/styles/xhdpi/watch-my-direction.png b/data/styles/style-dark/xhdpi/watch-my-direction.png
similarity index 100%
rename from data/styles/xhdpi/watch-my-direction.png
rename to data/styles/style-dark/xhdpi/watch-my-direction.png
diff --git a/data/styles/xhdpi/watch-my-position.png b/data/styles/style-dark/xhdpi/watch-my-position.png
similarity index 100%
rename from data/styles/xhdpi/watch-my-position.png
rename to data/styles/style-dark/xhdpi/watch-my-position.png
diff --git a/data/styles/xhdpi/watch-search-result.png b/data/styles/style-dark/xhdpi/watch-search-result.png
similarity index 100%
rename from data/styles/xhdpi/watch-search-result.png
rename to data/styles/style-dark/xhdpi/watch-search-result.png
diff --git a/data/styles/xxhdpi/api-result.png b/data/styles/style-dark/xxhdpi/api-result.png
similarity index 100%
rename from data/styles/xxhdpi/api-result.png
rename to data/styles/style-dark/xxhdpi/api-result.png
diff --git a/data/styles/xxhdpi/compass-image.png b/data/styles/style-dark/xxhdpi/compass-image.png
similarity index 100%
rename from data/styles/xxhdpi/compass-image.png
rename to data/styles/style-dark/xxhdpi/compass-image.png
diff --git a/data/styles/xxhdpi/current-position-compas.png b/data/styles/style-dark/xxhdpi/current-position-compas.png
similarity index 100%
rename from data/styles/xxhdpi/current-position-compas.png
rename to data/styles/style-dark/xxhdpi/current-position-compas.png
diff --git a/data/styles/xxhdpi/current-position.png b/data/styles/style-dark/xxhdpi/current-position.png
similarity index 100%
rename from data/styles/xxhdpi/current-position.png
rename to data/styles/style-dark/xxhdpi/current-position.png
diff --git a/data/styles/xxhdpi/current-routing-compas.png b/data/styles/style-dark/xxhdpi/current-routing-compas.png
similarity index 100%
rename from data/styles/xxhdpi/current-routing-compas.png
rename to data/styles/style-dark/xxhdpi/current-routing-compas.png
diff --git a/data/styles/xxhdpi/placemark-blue.png b/data/styles/style-dark/xxhdpi/placemark-blue.png
similarity index 100%
rename from data/styles/xxhdpi/placemark-blue.png
rename to data/styles/style-dark/xxhdpi/placemark-blue.png
diff --git a/data/styles/xxhdpi/placemark-brown.png b/data/styles/style-dark/xxhdpi/placemark-brown.png
similarity index 100%
rename from data/styles/xxhdpi/placemark-brown.png
rename to data/styles/style-dark/xxhdpi/placemark-brown.png
diff --git a/data/styles/xxhdpi/placemark-green.png b/data/styles/style-dark/xxhdpi/placemark-green.png
similarity index 100%
rename from data/styles/xxhdpi/placemark-green.png
rename to data/styles/style-dark/xxhdpi/placemark-green.png
diff --git a/data/styles/xxhdpi/placemark-orange.png b/data/styles/style-dark/xxhdpi/placemark-orange.png
similarity index 100%
rename from data/styles/xxhdpi/placemark-orange.png
rename to data/styles/style-dark/xxhdpi/placemark-orange.png
diff --git a/data/styles/xxhdpi/placemark-pink.png b/data/styles/style-dark/xxhdpi/placemark-pink.png
similarity index 100%
rename from data/styles/xxhdpi/placemark-pink.png
rename to data/styles/style-dark/xxhdpi/placemark-pink.png
diff --git a/data/styles/xxhdpi/placemark-purple.png b/data/styles/style-dark/xxhdpi/placemark-purple.png
similarity index 100%
rename from data/styles/xxhdpi/placemark-purple.png
rename to data/styles/style-dark/xxhdpi/placemark-purple.png
diff --git a/data/styles/xxhdpi/placemark-red.png b/data/styles/style-dark/xxhdpi/placemark-red.png
similarity index 100%
rename from data/styles/xxhdpi/placemark-red.png
rename to data/styles/style-dark/xxhdpi/placemark-red.png
diff --git a/data/styles/xxhdpi/placemark-yellow.png b/data/styles/style-dark/xxhdpi/placemark-yellow.png
similarity index 100%
rename from data/styles/xxhdpi/placemark-yellow.png
rename to data/styles/style-dark/xxhdpi/placemark-yellow.png
diff --git a/data/styles/xxhdpi/route_from.png b/data/styles/style-dark/xxhdpi/route_from.png
similarity index 100%
rename from data/styles/xxhdpi/route_from.png
rename to data/styles/style-dark/xxhdpi/route_from.png
diff --git a/data/styles/xxhdpi/route_to.png b/data/styles/style-dark/xxhdpi/route_to.png
similarity index 100%
rename from data/styles/xxhdpi/route_to.png
rename to data/styles/style-dark/xxhdpi/route_to.png
diff --git a/data/styles/xxhdpi/search-result-active.png b/data/styles/style-dark/xxhdpi/search-result-active.png
similarity index 100%
rename from data/styles/xxhdpi/search-result-active.png
rename to data/styles/style-dark/xxhdpi/search-result-active.png
diff --git a/data/styles/xxhdpi/search-result.png b/data/styles/style-dark/xxhdpi/search-result.png
similarity index 100%
rename from data/styles/xxhdpi/search-result.png
rename to data/styles/style-dark/xxhdpi/search-result.png
diff --git a/data/styles/xxhdpi/watch-my-direction.png b/data/styles/style-dark/xxhdpi/watch-my-direction.png
similarity index 100%
rename from data/styles/xxhdpi/watch-my-direction.png
rename to data/styles/style-dark/xxhdpi/watch-my-direction.png
diff --git a/data/styles/xxhdpi/watch-my-position.png b/data/styles/style-dark/xxhdpi/watch-my-position.png
similarity index 100%
rename from data/styles/xxhdpi/watch-my-position.png
rename to data/styles/style-dark/xxhdpi/watch-my-position.png
diff --git a/data/styles/xxhdpi/watch-search-result.png b/data/styles/style-dark/xxhdpi/watch-search-result.png
similarity index 100%
rename from data/styles/xxhdpi/watch-search-result.png
rename to data/styles/style-dark/xxhdpi/watch-search-result.png
diff --git a/data/styles/style-light/6plus/api-result.png b/data/styles/style-light/6plus/api-result.png
new file mode 100644
index 0000000000..1c94aee888
Binary files /dev/null and b/data/styles/style-light/6plus/api-result.png differ
diff --git a/data/styles/style-light/6plus/compass-image.png b/data/styles/style-light/6plus/compass-image.png
new file mode 100644
index 0000000000..8d13c34686
Binary files /dev/null and b/data/styles/style-light/6plus/compass-image.png differ
diff --git a/data/styles/style-light/6plus/current-position-compas.png b/data/styles/style-light/6plus/current-position-compas.png
new file mode 100644
index 0000000000..46207ada5c
Binary files /dev/null and b/data/styles/style-light/6plus/current-position-compas.png differ
diff --git a/data/styles/style-light/6plus/current-position.png b/data/styles/style-light/6plus/current-position.png
new file mode 100644
index 0000000000..fa0a305f46
Binary files /dev/null and b/data/styles/style-light/6plus/current-position.png differ
diff --git a/data/styles/style-light/6plus/current-routing-compas.png b/data/styles/style-light/6plus/current-routing-compas.png
new file mode 100644
index 0000000000..5e02889e8b
Binary files /dev/null and b/data/styles/style-light/6plus/current-routing-compas.png differ
diff --git a/data/styles/style-light/6plus/placemark-blue.png b/data/styles/style-light/6plus/placemark-blue.png
new file mode 100644
index 0000000000..acc23b378d
Binary files /dev/null and b/data/styles/style-light/6plus/placemark-blue.png differ
diff --git a/data/styles/style-light/6plus/placemark-brown.png b/data/styles/style-light/6plus/placemark-brown.png
new file mode 100644
index 0000000000..ee1d1c3077
Binary files /dev/null and b/data/styles/style-light/6plus/placemark-brown.png differ
diff --git a/data/styles/style-light/6plus/placemark-green.png b/data/styles/style-light/6plus/placemark-green.png
new file mode 100644
index 0000000000..24b28d1a33
Binary files /dev/null and b/data/styles/style-light/6plus/placemark-green.png differ
diff --git a/data/styles/style-light/6plus/placemark-orange.png b/data/styles/style-light/6plus/placemark-orange.png
new file mode 100644
index 0000000000..b1b9c61b86
Binary files /dev/null and b/data/styles/style-light/6plus/placemark-orange.png differ
diff --git a/data/styles/style-light/6plus/placemark-pink.png b/data/styles/style-light/6plus/placemark-pink.png
new file mode 100644
index 0000000000..d5b12d1c89
Binary files /dev/null and b/data/styles/style-light/6plus/placemark-pink.png differ
diff --git a/data/styles/style-light/6plus/placemark-purple.png b/data/styles/style-light/6plus/placemark-purple.png
new file mode 100644
index 0000000000..e877796801
Binary files /dev/null and b/data/styles/style-light/6plus/placemark-purple.png differ
diff --git a/data/styles/style-light/6plus/placemark-red.png b/data/styles/style-light/6plus/placemark-red.png
new file mode 100644
index 0000000000..ccd1638c74
Binary files /dev/null and b/data/styles/style-light/6plus/placemark-red.png differ
diff --git a/data/styles/style-light/6plus/placemark-yellow.png b/data/styles/style-light/6plus/placemark-yellow.png
new file mode 100644
index 0000000000..fe0bcf918d
Binary files /dev/null and b/data/styles/style-light/6plus/placemark-yellow.png differ
diff --git a/data/styles/style-light/6plus/route_from.png b/data/styles/style-light/6plus/route_from.png
new file mode 100644
index 0000000000..130060ea78
Binary files /dev/null and b/data/styles/style-light/6plus/route_from.png differ
diff --git a/data/styles/style-light/6plus/route_to.png b/data/styles/style-light/6plus/route_to.png
new file mode 100644
index 0000000000..4c3f8b727b
Binary files /dev/null and b/data/styles/style-light/6plus/route_to.png differ
diff --git a/data/styles/style-light/6plus/search-result-active.png b/data/styles/style-light/6plus/search-result-active.png
new file mode 100644
index 0000000000..70f6fd6758
Binary files /dev/null and b/data/styles/style-light/6plus/search-result-active.png differ
diff --git a/data/styles/style-light/6plus/search-result.png b/data/styles/style-light/6plus/search-result.png
new file mode 100644
index 0000000000..1e25299cac
Binary files /dev/null and b/data/styles/style-light/6plus/search-result.png differ
diff --git a/data/styles/colors_light.mapcss b/data/styles/style-light/colors_light.mapcss
similarity index 100%
rename from data/styles/colors_light.mapcss
rename to data/styles/style-light/colors_light.mapcss
diff --git a/data/styles/style-light/hdpi/api-result.png b/data/styles/style-light/hdpi/api-result.png
new file mode 100644
index 0000000000..1c1d150469
Binary files /dev/null and b/data/styles/style-light/hdpi/api-result.png differ
diff --git a/data/styles/style-light/hdpi/compass-image.png b/data/styles/style-light/hdpi/compass-image.png
new file mode 100644
index 0000000000..f462052de7
Binary files /dev/null and b/data/styles/style-light/hdpi/compass-image.png differ
diff --git a/data/styles/style-light/hdpi/current-position-compas.png b/data/styles/style-light/hdpi/current-position-compas.png
new file mode 100644
index 0000000000..073435cb54
Binary files /dev/null and b/data/styles/style-light/hdpi/current-position-compas.png differ
diff --git a/data/styles/style-light/hdpi/current-position.png b/data/styles/style-light/hdpi/current-position.png
new file mode 100644
index 0000000000..3178dc370a
Binary files /dev/null and b/data/styles/style-light/hdpi/current-position.png differ
diff --git a/data/styles/style-light/hdpi/current-routing-compas.png b/data/styles/style-light/hdpi/current-routing-compas.png
new file mode 100644
index 0000000000..eb486b38ab
Binary files /dev/null and b/data/styles/style-light/hdpi/current-routing-compas.png differ
diff --git a/data/styles/style-light/hdpi/placemark-blue.png b/data/styles/style-light/hdpi/placemark-blue.png
new file mode 100644
index 0000000000..c304a16125
Binary files /dev/null and b/data/styles/style-light/hdpi/placemark-blue.png differ
diff --git a/data/styles/style-light/hdpi/placemark-brown.png b/data/styles/style-light/hdpi/placemark-brown.png
new file mode 100644
index 0000000000..e02c80f951
Binary files /dev/null and b/data/styles/style-light/hdpi/placemark-brown.png differ
diff --git a/data/styles/style-light/hdpi/placemark-green.png b/data/styles/style-light/hdpi/placemark-green.png
new file mode 100644
index 0000000000..1f1d00b206
Binary files /dev/null and b/data/styles/style-light/hdpi/placemark-green.png differ
diff --git a/data/styles/style-light/hdpi/placemark-orange.png b/data/styles/style-light/hdpi/placemark-orange.png
new file mode 100644
index 0000000000..95224d857d
Binary files /dev/null and b/data/styles/style-light/hdpi/placemark-orange.png differ
diff --git a/data/styles/style-light/hdpi/placemark-pink.png b/data/styles/style-light/hdpi/placemark-pink.png
new file mode 100644
index 0000000000..28f1605a33
Binary files /dev/null and b/data/styles/style-light/hdpi/placemark-pink.png differ
diff --git a/data/styles/style-light/hdpi/placemark-purple.png b/data/styles/style-light/hdpi/placemark-purple.png
new file mode 100644
index 0000000000..f00c5f5e39
Binary files /dev/null and b/data/styles/style-light/hdpi/placemark-purple.png differ
diff --git a/data/styles/style-light/hdpi/placemark-red.png b/data/styles/style-light/hdpi/placemark-red.png
new file mode 100644
index 0000000000..a5e1a0fb8e
Binary files /dev/null and b/data/styles/style-light/hdpi/placemark-red.png differ
diff --git a/data/styles/style-light/hdpi/placemark-yellow.png b/data/styles/style-light/hdpi/placemark-yellow.png
new file mode 100644
index 0000000000..e9ee880f71
Binary files /dev/null and b/data/styles/style-light/hdpi/placemark-yellow.png differ
diff --git a/data/styles/style-light/hdpi/route_from.png b/data/styles/style-light/hdpi/route_from.png
new file mode 100644
index 0000000000..b457b0f2a5
Binary files /dev/null and b/data/styles/style-light/hdpi/route_from.png differ
diff --git a/data/styles/style-light/hdpi/route_to.png b/data/styles/style-light/hdpi/route_to.png
new file mode 100644
index 0000000000..4b0ecaab94
Binary files /dev/null and b/data/styles/style-light/hdpi/route_to.png differ
diff --git a/data/styles/style-light/hdpi/search-result-active.png b/data/styles/style-light/hdpi/search-result-active.png
new file mode 100644
index 0000000000..96f8bc89f3
Binary files /dev/null and b/data/styles/style-light/hdpi/search-result-active.png differ
diff --git a/data/styles/style-light/hdpi/search-result.png b/data/styles/style-light/hdpi/search-result.png
new file mode 100644
index 0000000000..dd62f12f00
Binary files /dev/null and b/data/styles/style-light/hdpi/search-result.png differ
diff --git a/data/styles/style-light/ldpi/api-result.png b/data/styles/style-light/ldpi/api-result.png
new file mode 100644
index 0000000000..3e51253981
Binary files /dev/null and b/data/styles/style-light/ldpi/api-result.png differ
diff --git a/data/styles/style-light/ldpi/compass-image.png b/data/styles/style-light/ldpi/compass-image.png
new file mode 100644
index 0000000000..82ce5b84d3
Binary files /dev/null and b/data/styles/style-light/ldpi/compass-image.png differ
diff --git a/data/styles/style-light/ldpi/current-position-compas.png b/data/styles/style-light/ldpi/current-position-compas.png
new file mode 100644
index 0000000000..742339c6a5
Binary files /dev/null and b/data/styles/style-light/ldpi/current-position-compas.png differ
diff --git a/data/styles/style-light/ldpi/current-position.png b/data/styles/style-light/ldpi/current-position.png
new file mode 100644
index 0000000000..5138508aac
Binary files /dev/null and b/data/styles/style-light/ldpi/current-position.png differ
diff --git a/data/styles/style-light/ldpi/current-routing-compas.png b/data/styles/style-light/ldpi/current-routing-compas.png
new file mode 100644
index 0000000000..a2c850f6ff
Binary files /dev/null and b/data/styles/style-light/ldpi/current-routing-compas.png differ
diff --git a/data/styles/style-light/ldpi/placemark-blue.png b/data/styles/style-light/ldpi/placemark-blue.png
new file mode 100644
index 0000000000..76dddf53cb
Binary files /dev/null and b/data/styles/style-light/ldpi/placemark-blue.png differ
diff --git a/data/styles/style-light/ldpi/placemark-brown.png b/data/styles/style-light/ldpi/placemark-brown.png
new file mode 100644
index 0000000000..428d29f778
Binary files /dev/null and b/data/styles/style-light/ldpi/placemark-brown.png differ
diff --git a/data/styles/style-light/ldpi/placemark-green.png b/data/styles/style-light/ldpi/placemark-green.png
new file mode 100644
index 0000000000..1d21f7faa1
Binary files /dev/null and b/data/styles/style-light/ldpi/placemark-green.png differ
diff --git a/data/styles/style-light/ldpi/placemark-orange.png b/data/styles/style-light/ldpi/placemark-orange.png
new file mode 100644
index 0000000000..7263fc8c31
Binary files /dev/null and b/data/styles/style-light/ldpi/placemark-orange.png differ
diff --git a/data/styles/style-light/ldpi/placemark-pink.png b/data/styles/style-light/ldpi/placemark-pink.png
new file mode 100644
index 0000000000..7888043c77
Binary files /dev/null and b/data/styles/style-light/ldpi/placemark-pink.png differ
diff --git a/data/styles/style-light/ldpi/placemark-purple.png b/data/styles/style-light/ldpi/placemark-purple.png
new file mode 100644
index 0000000000..771176a0a2
Binary files /dev/null and b/data/styles/style-light/ldpi/placemark-purple.png differ
diff --git a/data/styles/style-light/ldpi/placemark-red.png b/data/styles/style-light/ldpi/placemark-red.png
new file mode 100644
index 0000000000..4d0ffc492d
Binary files /dev/null and b/data/styles/style-light/ldpi/placemark-red.png differ
diff --git a/data/styles/style-light/ldpi/placemark-yellow.png b/data/styles/style-light/ldpi/placemark-yellow.png
new file mode 100644
index 0000000000..f2277787e2
Binary files /dev/null and b/data/styles/style-light/ldpi/placemark-yellow.png differ
diff --git a/data/styles/style-light/ldpi/route_from.png b/data/styles/style-light/ldpi/route_from.png
new file mode 100644
index 0000000000..e305504f3b
Binary files /dev/null and b/data/styles/style-light/ldpi/route_from.png differ
diff --git a/data/styles/style-light/ldpi/route_to.png b/data/styles/style-light/ldpi/route_to.png
new file mode 100644
index 0000000000..4c87d967b2
Binary files /dev/null and b/data/styles/style-light/ldpi/route_to.png differ
diff --git a/data/styles/style-light/ldpi/search-result-active.png b/data/styles/style-light/ldpi/search-result-active.png
new file mode 100644
index 0000000000..8d53f21bcf
Binary files /dev/null and b/data/styles/style-light/ldpi/search-result-active.png differ
diff --git a/data/styles/style-light/ldpi/search-result.png b/data/styles/style-light/ldpi/search-result.png
new file mode 100644
index 0000000000..97234273fc
Binary files /dev/null and b/data/styles/style-light/ldpi/search-result.png differ
diff --git a/data/styles/style-light/mdpi/api-result.png b/data/styles/style-light/mdpi/api-result.png
new file mode 100644
index 0000000000..088abf16de
Binary files /dev/null and b/data/styles/style-light/mdpi/api-result.png differ
diff --git a/data/styles/style-light/mdpi/compass-image.png b/data/styles/style-light/mdpi/compass-image.png
new file mode 100644
index 0000000000..24fe4ba8f7
Binary files /dev/null and b/data/styles/style-light/mdpi/compass-image.png differ
diff --git a/data/styles/style-light/mdpi/current-position-compas.png b/data/styles/style-light/mdpi/current-position-compas.png
new file mode 100644
index 0000000000..fc6f0c3111
Binary files /dev/null and b/data/styles/style-light/mdpi/current-position-compas.png differ
diff --git a/data/styles/style-light/mdpi/current-position.png b/data/styles/style-light/mdpi/current-position.png
new file mode 100644
index 0000000000..9c5482003d
Binary files /dev/null and b/data/styles/style-light/mdpi/current-position.png differ
diff --git a/data/styles/style-light/mdpi/current-routing-compas.png b/data/styles/style-light/mdpi/current-routing-compas.png
new file mode 100644
index 0000000000..ee583b3e97
Binary files /dev/null and b/data/styles/style-light/mdpi/current-routing-compas.png differ
diff --git a/data/styles/style-light/mdpi/placemark-blue.png b/data/styles/style-light/mdpi/placemark-blue.png
new file mode 100644
index 0000000000..f6035b5e68
Binary files /dev/null and b/data/styles/style-light/mdpi/placemark-blue.png differ
diff --git a/data/styles/style-light/mdpi/placemark-brown.png b/data/styles/style-light/mdpi/placemark-brown.png
new file mode 100644
index 0000000000..f31f9e0f1e
Binary files /dev/null and b/data/styles/style-light/mdpi/placemark-brown.png differ
diff --git a/data/styles/style-light/mdpi/placemark-green.png b/data/styles/style-light/mdpi/placemark-green.png
new file mode 100644
index 0000000000..18bf41ae0a
Binary files /dev/null and b/data/styles/style-light/mdpi/placemark-green.png differ
diff --git a/data/styles/style-light/mdpi/placemark-orange.png b/data/styles/style-light/mdpi/placemark-orange.png
new file mode 100644
index 0000000000..1dd7243d47
Binary files /dev/null and b/data/styles/style-light/mdpi/placemark-orange.png differ
diff --git a/data/styles/style-light/mdpi/placemark-pink.png b/data/styles/style-light/mdpi/placemark-pink.png
new file mode 100644
index 0000000000..0252e99a87
Binary files /dev/null and b/data/styles/style-light/mdpi/placemark-pink.png differ
diff --git a/data/styles/style-light/mdpi/placemark-purple.png b/data/styles/style-light/mdpi/placemark-purple.png
new file mode 100644
index 0000000000..3d02194015
Binary files /dev/null and b/data/styles/style-light/mdpi/placemark-purple.png differ
diff --git a/data/styles/style-light/mdpi/placemark-red.png b/data/styles/style-light/mdpi/placemark-red.png
new file mode 100644
index 0000000000..7c1fff6861
Binary files /dev/null and b/data/styles/style-light/mdpi/placemark-red.png differ
diff --git a/data/styles/style-light/mdpi/placemark-yellow.png b/data/styles/style-light/mdpi/placemark-yellow.png
new file mode 100644
index 0000000000..bb0710e5a3
Binary files /dev/null and b/data/styles/style-light/mdpi/placemark-yellow.png differ
diff --git a/data/styles/style-light/mdpi/route_from.png b/data/styles/style-light/mdpi/route_from.png
new file mode 100644
index 0000000000..c3d31ff777
Binary files /dev/null and b/data/styles/style-light/mdpi/route_from.png differ
diff --git a/data/styles/style-light/mdpi/route_to.png b/data/styles/style-light/mdpi/route_to.png
new file mode 100644
index 0000000000..47d548989f
Binary files /dev/null and b/data/styles/style-light/mdpi/route_to.png differ
diff --git a/data/styles/style-light/mdpi/search-result-active.png b/data/styles/style-light/mdpi/search-result-active.png
new file mode 100644
index 0000000000..0981ef9448
Binary files /dev/null and b/data/styles/style-light/mdpi/search-result-active.png differ
diff --git a/data/styles/style-light/mdpi/search-result.png b/data/styles/style-light/mdpi/search-result.png
new file mode 100644
index 0000000000..3abda4fbbb
Binary files /dev/null and b/data/styles/style-light/mdpi/search-result.png differ
diff --git a/data/styles/style-light/mdpi/watch-my-direction.png b/data/styles/style-light/mdpi/watch-my-direction.png
new file mode 100644
index 0000000000..ec48e5278b
Binary files /dev/null and b/data/styles/style-light/mdpi/watch-my-direction.png differ
diff --git a/data/styles/style-light/mdpi/watch-my-position.png b/data/styles/style-light/mdpi/watch-my-position.png
new file mode 100644
index 0000000000..7a060d578c
Binary files /dev/null and b/data/styles/style-light/mdpi/watch-my-position.png differ
diff --git a/data/styles/style-light/mdpi/watch-search-result.png b/data/styles/style-light/mdpi/watch-search-result.png
new file mode 100644
index 0000000000..7e7636ec4d
Binary files /dev/null and b/data/styles/style-light/mdpi/watch-search-result.png differ
diff --git a/data/styles/style-light/style.mapcss b/data/styles/style-light/style.mapcss
new file mode 100644
index 0000000000..54afbfda88
--- /dev/null
+++ b/data/styles/style-light/style.mapcss
@@ -0,0 +1,22 @@
+@import("colors_light.mapcss");
+@import("../include/base_defaults.mapcss");
+@import("../include/base_roads.mapcss");
+/* @import("../include/base_roads_UK.mapcss"); */
+@import("../include/base_shop.mapcss");
+@import("../include/base_sport.mapcss");
+@import("../include/base_place.mapcss");
+@import("../include/base_landuse.mapcss");
+@import("../include/base_water.mapcss");
+@import("../include/base_boundaries.mapcss");
+@import("../include/base_railways.mapcss");
+@import("../include/base_piste.mapcss");
+@import("../include/base_publictransport.mapcss");
+@import("../include/base_other.mapcss");
+
+canvas
+{
+ background-color: @background;
+ fill-color: @water;
+ default-lines: false;
+ default-points: false;
+}
diff --git a/data/styles/symbols/airport.svg b/data/styles/style-light/symbols/airport.svg
similarity index 100%
rename from data/styles/symbols/airport.svg
rename to data/styles/style-light/symbols/airport.svg
diff --git a/data/styles/symbols/alpine_hut.svg b/data/styles/style-light/symbols/alpine_hut.svg
similarity index 100%
rename from data/styles/symbols/alpine_hut.svg
rename to data/styles/style-light/symbols/alpine_hut.svg
diff --git a/data/styles/symbols/archery-borderless.svg b/data/styles/style-light/symbols/archery-borderless.svg
similarity index 100%
rename from data/styles/symbols/archery-borderless.svg
rename to data/styles/style-light/symbols/archery-borderless.svg
diff --git a/data/styles/symbols/archery.svg b/data/styles/style-light/symbols/archery.svg
similarity index 100%
rename from data/styles/symbols/archery.svg
rename to data/styles/style-light/symbols/archery.svg
diff --git a/data/styles/symbols/arrow.svg b/data/styles/style-light/symbols/arrow.svg
similarity index 100%
rename from data/styles/symbols/arrow.svg
rename to data/styles/style-light/symbols/arrow.svg
diff --git a/data/styles/symbols/athletics-borderless.svg b/data/styles/style-light/symbols/athletics-borderless.svg
similarity index 100%
rename from data/styles/symbols/athletics-borderless.svg
rename to data/styles/style-light/symbols/athletics-borderless.svg
diff --git a/data/styles/style-light/symbols/athletics.svg b/data/styles/style-light/symbols/athletics.svg
new file mode 100644
index 0000000000..b905d1a196
--- /dev/null
+++ b/data/styles/style-light/symbols/athletics.svg
@@ -0,0 +1,49 @@
+
+
+
diff --git a/data/styles/symbols/atm.svg b/data/styles/style-light/symbols/atm.svg
similarity index 100%
rename from data/styles/symbols/atm.svg
rename to data/styles/style-light/symbols/atm.svg
diff --git a/data/styles/symbols/bakery.svg b/data/styles/style-light/symbols/bakery.svg
similarity index 100%
rename from data/styles/symbols/bakery.svg
rename to data/styles/style-light/symbols/bakery.svg
diff --git a/data/styles/symbols/bank.svg b/data/styles/style-light/symbols/bank.svg
similarity index 100%
rename from data/styles/symbols/bank.svg
rename to data/styles/style-light/symbols/bank.svg
diff --git a/data/styles/symbols/bar.svg b/data/styles/style-light/symbols/bar.svg
similarity index 100%
rename from data/styles/symbols/bar.svg
rename to data/styles/style-light/symbols/bar.svg
diff --git a/data/styles/symbols/barrier.svg b/data/styles/style-light/symbols/barrier.svg
similarity index 100%
rename from data/styles/symbols/barrier.svg
rename to data/styles/style-light/symbols/barrier.svg
diff --git a/data/styles/symbols/baseball-borderless.svg b/data/styles/style-light/symbols/baseball-borderless.svg
similarity index 100%
rename from data/styles/symbols/baseball-borderless.svg
rename to data/styles/style-light/symbols/baseball-borderless.svg
diff --git a/data/styles/symbols/baseball.svg b/data/styles/style-light/symbols/baseball.svg
similarity index 100%
rename from data/styles/symbols/baseball.svg
rename to data/styles/style-light/symbols/baseball.svg
diff --git a/data/styles/symbols/basketball-borderless.svg b/data/styles/style-light/symbols/basketball-borderless.svg
similarity index 100%
rename from data/styles/symbols/basketball-borderless.svg
rename to data/styles/style-light/symbols/basketball-borderless.svg
diff --git a/data/styles/symbols/basketball.svg b/data/styles/style-light/symbols/basketball.svg
similarity index 100%
rename from data/styles/symbols/basketball.svg
rename to data/styles/style-light/symbols/basketball.svg
diff --git a/data/styles/symbols/bench.svg b/data/styles/style-light/symbols/bench.svg
similarity index 100%
rename from data/styles/symbols/bench.svg
rename to data/styles/style-light/symbols/bench.svg
diff --git a/data/styles/symbols/bicycle_rental.svg b/data/styles/style-light/symbols/bicycle_rental.svg
similarity index 100%
rename from data/styles/symbols/bicycle_rental.svg
rename to data/styles/style-light/symbols/bicycle_rental.svg
diff --git a/data/styles/symbols/bird.svg b/data/styles/style-light/symbols/bird.svg
similarity index 100%
rename from data/styles/symbols/bird.svg
rename to data/styles/style-light/symbols/bird.svg
diff --git a/data/styles/style-light/symbols/bowls-borderless.svg b/data/styles/style-light/symbols/bowls-borderless.svg
new file mode 100644
index 0000000000..d95d848371
--- /dev/null
+++ b/data/styles/style-light/symbols/bowls-borderless.svg
@@ -0,0 +1,61 @@
+
+
+
+
diff --git a/data/styles/symbols/bowls.svg b/data/styles/style-light/symbols/bowls.svg
similarity index 100%
rename from data/styles/symbols/bowls.svg
rename to data/styles/style-light/symbols/bowls.svg
diff --git a/data/styles/symbols/building.svg b/data/styles/style-light/symbols/building.svg
similarity index 100%
rename from data/styles/symbols/building.svg
rename to data/styles/style-light/symbols/building.svg
diff --git a/data/styles/symbols/bureau_de_change.svg b/data/styles/style-light/symbols/bureau_de_change.svg
similarity index 100%
rename from data/styles/symbols/bureau_de_change.svg
rename to data/styles/style-light/symbols/bureau_de_change.svg
diff --git a/data/styles/symbols/bus-mini.svg b/data/styles/style-light/symbols/bus-mini.svg
similarity index 100%
rename from data/styles/symbols/bus-mini.svg
rename to data/styles/style-light/symbols/bus-mini.svg
diff --git a/data/styles/symbols/bus.svg b/data/styles/style-light/symbols/bus.svg
similarity index 100%
rename from data/styles/symbols/bus.svg
rename to data/styles/style-light/symbols/bus.svg
diff --git a/data/styles/style-light/symbols/bus_sta.svg b/data/styles/style-light/symbols/bus_sta.svg
new file mode 100644
index 0000000000..ebdf3012b9
--- /dev/null
+++ b/data/styles/style-light/symbols/bus_sta.svg
@@ -0,0 +1,84 @@
+
+
diff --git a/data/styles/symbols/cafe.svg b/data/styles/style-light/symbols/cafe.svg
similarity index 100%
rename from data/styles/symbols/cafe.svg
rename to data/styles/style-light/symbols/cafe.svg
diff --git a/data/styles/symbols/campSite.svg b/data/styles/style-light/symbols/campSite.svg
similarity index 100%
rename from data/styles/symbols/campSite.svg
rename to data/styles/style-light/symbols/campSite.svg
diff --git a/data/styles/symbols/cannon.svg b/data/styles/style-light/symbols/cannon.svg
similarity index 100%
rename from data/styles/symbols/cannon.svg
rename to data/styles/style-light/symbols/cannon.svg
diff --git a/data/styles/symbols/car_rental.svg b/data/styles/style-light/symbols/car_rental.svg
similarity index 100%
rename from data/styles/symbols/car_rental.svg
rename to data/styles/style-light/symbols/car_rental.svg
diff --git a/data/styles/symbols/car_repair.svg b/data/styles/style-light/symbols/car_repair.svg
similarity index 100%
rename from data/styles/symbols/car_repair.svg
rename to data/styles/style-light/symbols/car_repair.svg
diff --git a/data/styles/symbols/car_sharing.svg b/data/styles/style-light/symbols/car_sharing.svg
similarity index 100%
rename from data/styles/symbols/car_sharing.svg
rename to data/styles/style-light/symbols/car_sharing.svg
diff --git a/data/styles/symbols/castle.svg b/data/styles/style-light/symbols/castle.svg
similarity index 100%
rename from data/styles/symbols/castle.svg
rename to data/styles/style-light/symbols/castle.svg
diff --git a/data/styles/symbols/cave_entrance.svg b/data/styles/style-light/symbols/cave_entrance.svg
similarity index 100%
rename from data/styles/symbols/cave_entrance.svg
rename to data/styles/style-light/symbols/cave_entrance.svg
diff --git a/data/styles/symbols/church.svg b/data/styles/style-light/symbols/church.svg
similarity index 100%
rename from data/styles/symbols/church.svg
rename to data/styles/style-light/symbols/church.svg
diff --git a/data/styles/symbols/cinema.svg b/data/styles/style-light/symbols/cinema.svg
similarity index 100%
rename from data/styles/symbols/cinema.svg
rename to data/styles/style-light/symbols/cinema.svg
diff --git a/data/styles/symbols/clothes.svg b/data/styles/style-light/symbols/clothes.svg
similarity index 100%
rename from data/styles/symbols/clothes.svg
rename to data/styles/style-light/symbols/clothes.svg
diff --git a/data/styles/symbols/cricket-borderless.svg b/data/styles/style-light/symbols/cricket-borderless.svg
similarity index 100%
rename from data/styles/symbols/cricket-borderless.svg
rename to data/styles/style-light/symbols/cricket-borderless.svg
diff --git a/data/styles/symbols/cricket.svg b/data/styles/style-light/symbols/cricket.svg
similarity index 100%
rename from data/styles/symbols/cricket.svg
rename to data/styles/style-light/symbols/cricket.svg
diff --git a/data/styles/symbols/curling-borderless.svg b/data/styles/style-light/symbols/curling-borderless.svg
similarity index 100%
rename from data/styles/symbols/curling-borderless.svg
rename to data/styles/style-light/symbols/curling-borderless.svg
diff --git a/data/styles/symbols/curling.svg b/data/styles/style-light/symbols/curling.svg
similarity index 100%
rename from data/styles/symbols/curling.svg
rename to data/styles/style-light/symbols/curling.svg
diff --git a/data/styles/style-light/symbols/disused.svg b/data/styles/style-light/symbols/disused.svg
new file mode 100644
index 0000000000..cbc391c7e4
--- /dev/null
+++ b/data/styles/style-light/symbols/disused.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/data/styles/symbols/diving-borderless.svg b/data/styles/style-light/symbols/diving-borderless.svg
similarity index 100%
rename from data/styles/symbols/diving-borderless.svg
rename to data/styles/style-light/symbols/diving-borderless.svg
diff --git a/data/styles/symbols/diving.svg b/data/styles/style-light/symbols/diving.svg
similarity index 100%
rename from data/styles/symbols/diving.svg
rename to data/styles/style-light/symbols/diving.svg
diff --git a/data/styles/symbols/doctor.svg b/data/styles/style-light/symbols/doctor.svg
similarity index 100%
rename from data/styles/symbols/doctor.svg
rename to data/styles/style-light/symbols/doctor.svg
diff --git a/data/styles/symbols/dog_park.svg b/data/styles/style-light/symbols/dog_park.svg
similarity index 100%
rename from data/styles/symbols/dog_park.svg
rename to data/styles/style-light/symbols/dog_park.svg
diff --git a/data/styles/symbols/drinking_water.svg b/data/styles/style-light/symbols/drinking_water.svg
similarity index 100%
rename from data/styles/symbols/drinking_water.svg
rename to data/styles/style-light/symbols/drinking_water.svg
diff --git a/data/styles/symbols/earthquake-camp.svg b/data/styles/style-light/symbols/earthquake-camp.svg
similarity index 100%
rename from data/styles/symbols/earthquake-camp.svg
rename to data/styles/style-light/symbols/earthquake-camp.svg
diff --git a/data/styles/symbols/embassy.svg b/data/styles/style-light/symbols/embassy.svg
similarity index 100%
rename from data/styles/symbols/embassy.svg
rename to data/styles/style-light/symbols/embassy.svg
diff --git a/data/styles/symbols/equestrian-borderless.svg b/data/styles/style-light/symbols/equestrian-borderless.svg
similarity index 100%
rename from data/styles/symbols/equestrian-borderless.svg
rename to data/styles/style-light/symbols/equestrian-borderless.svg
diff --git a/data/styles/symbols/equestrian.svg b/data/styles/style-light/symbols/equestrian.svg
similarity index 100%
rename from data/styles/symbols/equestrian.svg
rename to data/styles/style-light/symbols/equestrian.svg
diff --git a/data/styles/symbols/fastfood.svg b/data/styles/style-light/symbols/fastfood.svg
similarity index 100%
rename from data/styles/symbols/fastfood.svg
rename to data/styles/style-light/symbols/fastfood.svg
diff --git a/data/styles/symbols/firebrigade.svg b/data/styles/style-light/symbols/firebrigade.svg
similarity index 100%
rename from data/styles/symbols/firebrigade.svg
rename to data/styles/style-light/symbols/firebrigade.svg
diff --git a/data/styles/symbols/football-borderless.svg b/data/styles/style-light/symbols/football-borderless.svg
similarity index 100%
rename from data/styles/symbols/football-borderless.svg
rename to data/styles/style-light/symbols/football-borderless.svg
diff --git a/data/styles/symbols/football.svg b/data/styles/style-light/symbols/football.svg
similarity index 100%
rename from data/styles/symbols/football.svg
rename to data/styles/style-light/symbols/football.svg
diff --git a/data/styles/symbols/fountain.svg b/data/styles/style-light/symbols/fountain.svg
similarity index 100%
rename from data/styles/symbols/fountain.svg
rename to data/styles/style-light/symbols/fountain.svg
diff --git a/data/styles/symbols/gate.svg b/data/styles/style-light/symbols/gate.svg
similarity index 100%
rename from data/styles/symbols/gate.svg
rename to data/styles/style-light/symbols/gate.svg
diff --git a/data/styles/symbols/golf-course.svg b/data/styles/style-light/symbols/golf-course.svg
similarity index 100%
rename from data/styles/symbols/golf-course.svg
rename to data/styles/style-light/symbols/golf-course.svg
diff --git a/data/styles/symbols/gymnastics-borderless.svg b/data/styles/style-light/symbols/gymnastics-borderless.svg
similarity index 100%
rename from data/styles/symbols/gymnastics-borderless.svg
rename to data/styles/style-light/symbols/gymnastics-borderless.svg
diff --git a/data/styles/symbols/gymnastics.svg b/data/styles/style-light/symbols/gymnastics.svg
similarity index 100%
rename from data/styles/symbols/gymnastics.svg
rename to data/styles/style-light/symbols/gymnastics.svg
diff --git a/data/styles/symbols/hairdresser.svg b/data/styles/style-light/symbols/hairdresser.svg
similarity index 100%
rename from data/styles/symbols/hairdresser.svg
rename to data/styles/style-light/symbols/hairdresser.svg
diff --git a/data/styles/symbols/handball-borderless.svg b/data/styles/style-light/symbols/handball-borderless.svg
similarity index 100%
rename from data/styles/symbols/handball-borderless.svg
rename to data/styles/style-light/symbols/handball-borderless.svg
diff --git a/data/styles/symbols/handball.svg b/data/styles/style-light/symbols/handball.svg
similarity index 100%
rename from data/styles/symbols/handball.svg
rename to data/styles/style-light/symbols/handball.svg
diff --git a/data/styles/symbols/helipad.svg b/data/styles/style-light/symbols/helipad.svg
similarity index 100%
rename from data/styles/symbols/helipad.svg
rename to data/styles/style-light/symbols/helipad.svg
diff --git a/data/styles/symbols/hospital.svg b/data/styles/style-light/symbols/hospital.svg
similarity index 100%
rename from data/styles/symbols/hospital.svg
rename to data/styles/style-light/symbols/hospital.svg
diff --git a/data/styles/symbols/hostel.svg b/data/styles/style-light/symbols/hostel.svg
similarity index 100%
rename from data/styles/symbols/hostel.svg
rename to data/styles/style-light/symbols/hostel.svg
diff --git a/data/styles/symbols/hotel.svg b/data/styles/style-light/symbols/hotel.svg
similarity index 100%
rename from data/styles/symbols/hotel.svg
rename to data/styles/style-light/symbols/hotel.svg
diff --git a/data/styles/symbols/housenumber.svg b/data/styles/style-light/symbols/housenumber.svg
similarity index 100%
rename from data/styles/symbols/housenumber.svg
rename to data/styles/style-light/symbols/housenumber.svg
diff --git a/data/styles/symbols/hunting_closed_high.svg b/data/styles/style-light/symbols/hunting_closed_high.svg
similarity index 100%
rename from data/styles/symbols/hunting_closed_high.svg
rename to data/styles/style-light/symbols/hunting_closed_high.svg
diff --git a/data/styles/symbols/information-guidepost.svg b/data/styles/style-light/symbols/information-guidepost.svg
similarity index 100%
rename from data/styles/symbols/information-guidepost.svg
rename to data/styles/style-light/symbols/information-guidepost.svg
diff --git a/data/styles/symbols/information-office.svg b/data/styles/style-light/symbols/information-office.svg
similarity index 100%
rename from data/styles/symbols/information-office.svg
rename to data/styles/style-light/symbols/information-office.svg
diff --git a/data/styles/symbols/information.svg b/data/styles/style-light/symbols/information.svg
similarity index 100%
rename from data/styles/symbols/information.svg
rename to data/styles/style-light/symbols/information.svg
diff --git a/data/styles/symbols/khanda.svg b/data/styles/style-light/symbols/khanda.svg
similarity index 100%
rename from data/styles/symbols/khanda.svg
rename to data/styles/style-light/symbols/khanda.svg
diff --git a/data/styles/style-light/symbols/kindergarten.svg b/data/styles/style-light/symbols/kindergarten.svg
new file mode 100644
index 0000000000..a5550608ed
--- /dev/null
+++ b/data/styles/style-light/symbols/kindergarten.svg
@@ -0,0 +1,77 @@
+
+
+
+
diff --git a/data/styles/symbols/kindergarten2.svg b/data/styles/style-light/symbols/kindergarten2.svg
similarity index 100%
rename from data/styles/symbols/kindergarten2.svg
rename to data/styles/style-light/symbols/kindergarten2.svg
diff --git a/data/styles/style-light/symbols/kiosk.svg b/data/styles/style-light/symbols/kiosk.svg
new file mode 100644
index 0000000000..a1264f9439
--- /dev/null
+++ b/data/styles/style-light/symbols/kiosk.svg
@@ -0,0 +1,125 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/symbols/library.svg b/data/styles/style-light/symbols/library.svg
similarity index 100%
rename from data/styles/symbols/library.svg
rename to data/styles/style-light/symbols/library.svg
diff --git a/data/styles/symbols/lighthouse.svg b/data/styles/style-light/symbols/lighthouse.svg
similarity index 100%
rename from data/styles/symbols/lighthouse.svg
rename to data/styles/style-light/symbols/lighthouse.svg
diff --git a/data/styles/symbols/man-made-halfpipe.svg b/data/styles/style-light/symbols/man-made-halfpipe.svg
similarity index 100%
rename from data/styles/symbols/man-made-halfpipe.svg
rename to data/styles/style-light/symbols/man-made-halfpipe.svg
diff --git a/data/styles/symbols/memorial.svg b/data/styles/style-light/symbols/memorial.svg
similarity index 100%
rename from data/styles/symbols/memorial.svg
rename to data/styles/style-light/symbols/memorial.svg
diff --git a/data/styles/symbols/mosque.svg b/data/styles/style-light/symbols/mosque.svg
similarity index 100%
rename from data/styles/symbols/mosque.svg
rename to data/styles/style-light/symbols/mosque.svg
diff --git a/data/styles/symbols/mountain_pass.svg b/data/styles/style-light/symbols/mountain_pass.svg
similarity index 100%
rename from data/styles/symbols/mountain_pass.svg
rename to data/styles/style-light/symbols/mountain_pass.svg
diff --git a/data/styles/symbols/museum.svg b/data/styles/style-light/symbols/museum.svg
similarity index 100%
rename from data/styles/symbols/museum.svg
rename to data/styles/style-light/symbols/museum.svg
diff --git a/data/styles/symbols/park_and_ride-permissive.svg b/data/styles/style-light/symbols/park_and_ride-permissive.svg
similarity index 100%
rename from data/styles/symbols/park_and_ride-permissive.svg
rename to data/styles/style-light/symbols/park_and_ride-permissive.svg
diff --git a/data/styles/symbols/park_and_ride.svg b/data/styles/style-light/symbols/park_and_ride.svg
similarity index 100%
rename from data/styles/symbols/park_and_ride.svg
rename to data/styles/style-light/symbols/park_and_ride.svg
diff --git a/data/styles/symbols/parking-mini.svg b/data/styles/style-light/symbols/parking-mini.svg
similarity index 100%
rename from data/styles/symbols/parking-mini.svg
rename to data/styles/style-light/symbols/parking-mini.svg
diff --git a/data/styles/symbols/parking-permissive.svg b/data/styles/style-light/symbols/parking-permissive.svg
similarity index 100%
rename from data/styles/symbols/parking-permissive.svg
rename to data/styles/style-light/symbols/parking-permissive.svg
diff --git a/data/styles/symbols/parking-private.svg b/data/styles/style-light/symbols/parking-private.svg
similarity index 100%
rename from data/styles/symbols/parking-private.svg
rename to data/styles/style-light/symbols/parking-private.svg
diff --git a/data/styles/symbols/parking.svg b/data/styles/style-light/symbols/parking.svg
similarity index 100%
rename from data/styles/symbols/parking.svg
rename to data/styles/style-light/symbols/parking.svg
diff --git a/data/styles/symbols/parking_fee-permissive.svg b/data/styles/style-light/symbols/parking_fee-permissive.svg
similarity index 100%
rename from data/styles/symbols/parking_fee-permissive.svg
rename to data/styles/style-light/symbols/parking_fee-permissive.svg
diff --git a/data/styles/symbols/parking_fee.svg b/data/styles/style-light/symbols/parking_fee.svg
similarity index 100%
rename from data/styles/symbols/parking_fee.svg
rename to data/styles/style-light/symbols/parking_fee.svg
diff --git a/data/styles/symbols/parking_roof-permissive.svg b/data/styles/style-light/symbols/parking_roof-permissive.svg
similarity index 100%
rename from data/styles/symbols/parking_roof-permissive.svg
rename to data/styles/style-light/symbols/parking_roof-permissive.svg
diff --git a/data/styles/symbols/parking_roof.svg b/data/styles/style-light/symbols/parking_roof.svg
similarity index 100%
rename from data/styles/symbols/parking_roof.svg
rename to data/styles/style-light/symbols/parking_roof.svg
diff --git a/data/styles/symbols/parking_roof_fee-permissive.svg b/data/styles/style-light/symbols/parking_roof_fee-permissive.svg
similarity index 100%
rename from data/styles/symbols/parking_roof_fee-permissive.svg
rename to data/styles/style-light/symbols/parking_roof_fee-permissive.svg
diff --git a/data/styles/symbols/parking_roof_fee.svg b/data/styles/style-light/symbols/parking_roof_fee.svg
similarity index 100%
rename from data/styles/symbols/parking_roof_fee.svg
rename to data/styles/style-light/symbols/parking_roof_fee.svg
diff --git a/data/styles/symbols/peak-mini.svg b/data/styles/style-light/symbols/peak-mini.svg
similarity index 100%
rename from data/styles/symbols/peak-mini.svg
rename to data/styles/style-light/symbols/peak-mini.svg
diff --git a/data/styles/symbols/peak.svg b/data/styles/style-light/symbols/peak.svg
similarity index 100%
rename from data/styles/symbols/peak.svg
rename to data/styles/style-light/symbols/peak.svg
diff --git a/data/styles/symbols/petrolStation.svg b/data/styles/style-light/symbols/petrolStation.svg
similarity index 100%
rename from data/styles/symbols/petrolStation.svg
rename to data/styles/style-light/symbols/petrolStation.svg
diff --git a/data/styles/symbols/pharmacy.svg b/data/styles/style-light/symbols/pharmacy.svg
similarity index 100%
rename from data/styles/symbols/pharmacy.svg
rename to data/styles/style-light/symbols/pharmacy.svg
diff --git a/data/styles/symbols/picnic.svg b/data/styles/style-light/symbols/picnic.svg
similarity index 100%
rename from data/styles/symbols/picnic.svg
rename to data/styles/style-light/symbols/picnic.svg
diff --git a/data/styles/symbols/playground.svg b/data/styles/style-light/symbols/playground.svg
similarity index 100%
rename from data/styles/symbols/playground.svg
rename to data/styles/style-light/symbols/playground.svg
diff --git a/data/styles/symbols/police.svg b/data/styles/style-light/symbols/police.svg
similarity index 100%
rename from data/styles/symbols/police.svg
rename to data/styles/style-light/symbols/police.svg
diff --git a/data/styles/symbols/postbox.svg b/data/styles/style-light/symbols/postbox.svg
similarity index 100%
rename from data/styles/symbols/postbox.svg
rename to data/styles/style-light/symbols/postbox.svg
diff --git a/data/styles/symbols/postoffice.svg b/data/styles/style-light/symbols/postoffice.svg
similarity index 100%
rename from data/styles/symbols/postoffice.svg
rename to data/styles/style-light/symbols/postoffice.svg
diff --git a/data/styles/symbols/power-pole.svg b/data/styles/style-light/symbols/power-pole.svg
similarity index 100%
rename from data/styles/symbols/power-pole.svg
rename to data/styles/style-light/symbols/power-pole.svg
diff --git a/data/styles/symbols/power-tower.svg b/data/styles/style-light/symbols/power-tower.svg
similarity index 100%
rename from data/styles/symbols/power-tower.svg
rename to data/styles/style-light/symbols/power-tower.svg
diff --git a/data/styles/symbols/power_generic.svg b/data/styles/style-light/symbols/power_generic.svg
similarity index 100%
rename from data/styles/symbols/power_generic.svg
rename to data/styles/style-light/symbols/power_generic.svg
diff --git a/data/styles/symbols/power_hydro.svg b/data/styles/style-light/symbols/power_hydro.svg
similarity index 100%
rename from data/styles/symbols/power_hydro.svg
rename to data/styles/style-light/symbols/power_hydro.svg
diff --git a/data/styles/symbols/power_photovoltaic.svg b/data/styles/style-light/symbols/power_photovoltaic.svg
similarity index 100%
rename from data/styles/symbols/power_photovoltaic.svg
rename to data/styles/style-light/symbols/power_photovoltaic.svg
diff --git a/data/styles/symbols/power_wind.svg b/data/styles/style-light/symbols/power_wind.svg
similarity index 100%
rename from data/styles/symbols/power_wind.svg
rename to data/styles/style-light/symbols/power_wind.svg
diff --git a/data/styles/symbols/pub.svg b/data/styles/style-light/symbols/pub.svg
similarity index 100%
rename from data/styles/symbols/pub.svg
rename to data/styles/style-light/symbols/pub.svg
diff --git a/data/styles/style-light/symbols/pubx.svg b/data/styles/style-light/symbols/pubx.svg
new file mode 100644
index 0000000000..b314e5b55d
--- /dev/null
+++ b/data/styles/style-light/symbols/pubx.svg
@@ -0,0 +1,12 @@
+
+
\ No newline at end of file
diff --git a/data/styles/symbols/railway-crossing-small.svg b/data/styles/style-light/symbols/railway-crossing-small.svg
similarity index 100%
rename from data/styles/symbols/railway-crossing-small.svg
rename to data/styles/style-light/symbols/railway-crossing-small.svg
diff --git a/data/styles/symbols/railway-crossing.svg b/data/styles/style-light/symbols/railway-crossing.svg
similarity index 100%
rename from data/styles/symbols/railway-crossing.svg
rename to data/styles/style-light/symbols/railway-crossing.svg
diff --git a/data/styles/symbols/railway-station-mini.svg b/data/styles/style-light/symbols/railway-station-mini.svg
similarity index 100%
rename from data/styles/symbols/railway-station-mini.svg
rename to data/styles/style-light/symbols/railway-station-mini.svg
diff --git a/data/styles/symbols/railway-station.svg b/data/styles/style-light/symbols/railway-station.svg
similarity index 100%
rename from data/styles/symbols/railway-station.svg
rename to data/styles/style-light/symbols/railway-station.svg
diff --git a/data/styles/symbols/recycling.svg b/data/styles/style-light/symbols/recycling.svg
similarity index 100%
rename from data/styles/symbols/recycling.svg
rename to data/styles/style-light/symbols/recycling.svg
diff --git a/data/styles/symbols/religion.svg b/data/styles/style-light/symbols/religion.svg
similarity index 100%
rename from data/styles/symbols/religion.svg
rename to data/styles/style-light/symbols/religion.svg
diff --git a/data/styles/symbols/restaurant.svg b/data/styles/style-light/symbols/restaurant.svg
similarity index 100%
rename from data/styles/symbols/restaurant.svg
rename to data/styles/style-light/symbols/restaurant.svg
diff --git a/data/styles/symbols/roundabout_left.svg b/data/styles/style-light/symbols/roundabout_left.svg
similarity index 100%
rename from data/styles/symbols/roundabout_left.svg
rename to data/styles/style-light/symbols/roundabout_left.svg
diff --git a/data/styles/symbols/roundabout_right.svg b/data/styles/style-light/symbols/roundabout_right.svg
similarity index 100%
rename from data/styles/symbols/roundabout_right.svg
rename to data/styles/style-light/symbols/roundabout_right.svg
diff --git a/data/styles/symbols/ruins.svg b/data/styles/style-light/symbols/ruins.svg
similarity index 100%
rename from data/styles/symbols/ruins.svg
rename to data/styles/style-light/symbols/ruins.svg
diff --git a/data/styles/symbols/school.svg b/data/styles/style-light/symbols/school.svg
similarity index 100%
rename from data/styles/symbols/school.svg
rename to data/styles/style-light/symbols/school.svg
diff --git a/data/styles/symbols/shelter-fireplace.svg b/data/styles/style-light/symbols/shelter-fireplace.svg
similarity index 100%
rename from data/styles/symbols/shelter-fireplace.svg
rename to data/styles/style-light/symbols/shelter-fireplace.svg
diff --git a/data/styles/symbols/shelter.svg b/data/styles/style-light/symbols/shelter.svg
similarity index 100%
rename from data/styles/symbols/shelter.svg
rename to data/styles/style-light/symbols/shelter.svg
diff --git a/data/styles/symbols/shooting-borderless.svg b/data/styles/style-light/symbols/shooting-borderless.svg
similarity index 100%
rename from data/styles/symbols/shooting-borderless.svg
rename to data/styles/style-light/symbols/shooting-borderless.svg
diff --git a/data/styles/symbols/shooting.svg b/data/styles/style-light/symbols/shooting.svg
similarity index 100%
rename from data/styles/symbols/shooting.svg
rename to data/styles/style-light/symbols/shooting.svg
diff --git a/data/styles/symbols/slipway.svg b/data/styles/style-light/symbols/slipway.svg
similarity index 100%
rename from data/styles/symbols/slipway.svg
rename to data/styles/style-light/symbols/slipway.svg
diff --git a/data/styles/symbols/soccer-borderless.svg b/data/styles/style-light/symbols/soccer-borderless.svg
similarity index 100%
rename from data/styles/symbols/soccer-borderless.svg
rename to data/styles/style-light/symbols/soccer-borderless.svg
diff --git a/data/styles/symbols/soccer.svg b/data/styles/style-light/symbols/soccer.svg
similarity index 100%
rename from data/styles/symbols/soccer.svg
rename to data/styles/style-light/symbols/soccer.svg
diff --git a/data/styles/symbols/speed_trap.svg b/data/styles/style-light/symbols/speed_trap.svg
similarity index 100%
rename from data/styles/symbols/speed_trap.svg
rename to data/styles/style-light/symbols/speed_trap.svg
diff --git a/data/styles/symbols/subway-station-l.svg b/data/styles/style-light/symbols/subway-station-l.svg
similarity index 100%
rename from data/styles/symbols/subway-station-l.svg
rename to data/styles/style-light/symbols/subway-station-l.svg
diff --git a/data/styles/symbols/subway-station-m.svg b/data/styles/style-light/symbols/subway-station-m.svg
similarity index 100%
rename from data/styles/symbols/subway-station-m.svg
rename to data/styles/style-light/symbols/subway-station-m.svg
diff --git a/data/styles/symbols/subway-station-s.svg b/data/styles/style-light/symbols/subway-station-s.svg
similarity index 100%
rename from data/styles/symbols/subway-station-s.svg
rename to data/styles/style-light/symbols/subway-station-s.svg
diff --git a/data/styles/symbols/subway.svg b/data/styles/style-light/symbols/subway.svg
similarity index 100%
rename from data/styles/symbols/subway.svg
rename to data/styles/style-light/symbols/subway.svg
diff --git a/data/styles/symbols/supermarket.svg b/data/styles/style-light/symbols/supermarket.svg
similarity index 100%
rename from data/styles/symbols/supermarket.svg
rename to data/styles/style-light/symbols/supermarket.svg
diff --git a/data/styles/symbols/survey_point.svg b/data/styles/style-light/symbols/survey_point.svg
similarity index 100%
rename from data/styles/symbols/survey_point.svg
rename to data/styles/style-light/symbols/survey_point.svg
diff --git a/data/styles/symbols/swimming-borderless.svg b/data/styles/style-light/symbols/swimming-borderless.svg
similarity index 100%
rename from data/styles/symbols/swimming-borderless.svg
rename to data/styles/style-light/symbols/swimming-borderless.svg
diff --git a/data/styles/symbols/swimming.svg b/data/styles/style-light/symbols/swimming.svg
similarity index 100%
rename from data/styles/symbols/swimming.svg
rename to data/styles/style-light/symbols/swimming.svg
diff --git a/data/styles/symbols/synagogue.svg b/data/styles/style-light/symbols/synagogue.svg
similarity index 100%
rename from data/styles/symbols/synagogue.svg
rename to data/styles/style-light/symbols/synagogue.svg
diff --git a/data/styles/symbols/taxi.svg b/data/styles/style-light/symbols/taxi.svg
similarity index 100%
rename from data/styles/symbols/taxi.svg
rename to data/styles/style-light/symbols/taxi.svg
diff --git a/data/styles/symbols/telephone.svg b/data/styles/style-light/symbols/telephone.svg
similarity index 100%
rename from data/styles/symbols/telephone.svg
rename to data/styles/style-light/symbols/telephone.svg
diff --git a/data/styles/symbols/tennis-borderless.svg b/data/styles/style-light/symbols/tennis-borderless.svg
similarity index 100%
rename from data/styles/symbols/tennis-borderless.svg
rename to data/styles/style-light/symbols/tennis-borderless.svg
diff --git a/data/styles/symbols/tennis.svg b/data/styles/style-light/symbols/tennis.svg
similarity index 100%
rename from data/styles/symbols/tennis.svg
rename to data/styles/style-light/symbols/tennis.svg
diff --git a/data/styles/symbols/theatre.svg b/data/styles/style-light/symbols/theatre.svg
similarity index 100%
rename from data/styles/symbols/theatre.svg
rename to data/styles/style-light/symbols/theatre.svg
diff --git a/data/styles/symbols/toilets.svg b/data/styles/style-light/symbols/toilets.svg
similarity index 100%
rename from data/styles/symbols/toilets.svg
rename to data/styles/style-light/symbols/toilets.svg
diff --git a/data/styles/symbols/traffic_signal.svg b/data/styles/style-light/symbols/traffic_signal.svg
similarity index 100%
rename from data/styles/symbols/traffic_signal.svg
rename to data/styles/style-light/symbols/traffic_signal.svg
diff --git a/data/styles/symbols/tramway-mini.svg b/data/styles/style-light/symbols/tramway-mini.svg
similarity index 100%
rename from data/styles/symbols/tramway-mini.svg
rename to data/styles/style-light/symbols/tramway-mini.svg
diff --git a/data/styles/symbols/tramway.svg b/data/styles/style-light/symbols/tramway.svg
similarity index 100%
rename from data/styles/symbols/tramway.svg
rename to data/styles/style-light/symbols/tramway.svg
diff --git a/data/styles/symbols/tree.svg b/data/styles/style-light/symbols/tree.svg
similarity index 100%
rename from data/styles/symbols/tree.svg
rename to data/styles/style-light/symbols/tree.svg
diff --git a/data/styles/symbols/university.svg b/data/styles/style-light/symbols/university.svg
similarity index 100%
rename from data/styles/symbols/university.svg
rename to data/styles/style-light/symbols/university.svg
diff --git a/data/styles/symbols/viewpoint.svg b/data/styles/style-light/symbols/viewpoint.svg
similarity index 100%
rename from data/styles/symbols/viewpoint.svg
rename to data/styles/style-light/symbols/viewpoint.svg
diff --git a/data/styles/symbols/vulcan.svg b/data/styles/style-light/symbols/vulcan.svg
similarity index 100%
rename from data/styles/symbols/vulcan.svg
rename to data/styles/style-light/symbols/vulcan.svg
diff --git a/data/styles/symbols/wastewater.svg b/data/styles/style-light/symbols/wastewater.svg
similarity index 100%
rename from data/styles/symbols/wastewater.svg
rename to data/styles/style-light/symbols/wastewater.svg
diff --git a/data/styles/symbols/waterfall.svg b/data/styles/style-light/symbols/waterfall.svg
similarity index 100%
rename from data/styles/symbols/waterfall.svg
rename to data/styles/style-light/symbols/waterfall.svg
diff --git a/data/styles/symbols/windmill.svg b/data/styles/style-light/symbols/windmill.svg
similarity index 100%
rename from data/styles/symbols/windmill.svg
rename to data/styles/style-light/symbols/windmill.svg
diff --git a/data/styles/yota/api-result.png b/data/styles/style-light/watch/api-result.png
similarity index 100%
rename from data/styles/yota/api-result.png
rename to data/styles/style-light/watch/api-result.png
diff --git a/data/styles/style-light/watch/arrow-direction.png b/data/styles/style-light/watch/arrow-direction.png
new file mode 100644
index 0000000000..0991a99dad
Binary files /dev/null and b/data/styles/style-light/watch/arrow-direction.png differ
diff --git a/data/styles/style-light/watch/compass-image.png b/data/styles/style-light/watch/compass-image.png
new file mode 100644
index 0000000000..3cb750cdf4
Binary files /dev/null and b/data/styles/style-light/watch/compass-image.png differ
diff --git a/data/styles/style-light/watch/current-position-compas.png b/data/styles/style-light/watch/current-position-compas.png
new file mode 100644
index 0000000000..a5a032db69
Binary files /dev/null and b/data/styles/style-light/watch/current-position-compas.png differ
diff --git a/data/styles/style-light/watch/current-position.png b/data/styles/style-light/watch/current-position.png
new file mode 100644
index 0000000000..d1868a2074
Binary files /dev/null and b/data/styles/style-light/watch/current-position.png differ
diff --git a/data/styles/yota/current-routing-compas.png b/data/styles/style-light/watch/current-routing-compas.png
similarity index 100%
rename from data/styles/yota/current-routing-compas.png
rename to data/styles/style-light/watch/current-routing-compas.png
diff --git a/data/styles/yota/placemark-blue.png b/data/styles/style-light/watch/placemark-blue.png
similarity index 100%
rename from data/styles/yota/placemark-blue.png
rename to data/styles/style-light/watch/placemark-blue.png
diff --git a/data/styles/yota/placemark-brown.png b/data/styles/style-light/watch/placemark-brown.png
similarity index 100%
rename from data/styles/yota/placemark-brown.png
rename to data/styles/style-light/watch/placemark-brown.png
diff --git a/data/styles/yota/placemark-green.png b/data/styles/style-light/watch/placemark-green.png
similarity index 100%
rename from data/styles/yota/placemark-green.png
rename to data/styles/style-light/watch/placemark-green.png
diff --git a/data/styles/yota/placemark-orange.png b/data/styles/style-light/watch/placemark-orange.png
similarity index 100%
rename from data/styles/yota/placemark-orange.png
rename to data/styles/style-light/watch/placemark-orange.png
diff --git a/data/styles/yota/placemark-pink.png b/data/styles/style-light/watch/placemark-pink.png
similarity index 100%
rename from data/styles/yota/placemark-pink.png
rename to data/styles/style-light/watch/placemark-pink.png
diff --git a/data/styles/yota/placemark-purple.png b/data/styles/style-light/watch/placemark-purple.png
similarity index 100%
rename from data/styles/yota/placemark-purple.png
rename to data/styles/style-light/watch/placemark-purple.png
diff --git a/data/styles/yota/placemark-red.png b/data/styles/style-light/watch/placemark-red.png
similarity index 100%
rename from data/styles/yota/placemark-red.png
rename to data/styles/style-light/watch/placemark-red.png
diff --git a/data/styles/yota/placemark-yellow.png b/data/styles/style-light/watch/placemark-yellow.png
similarity index 100%
rename from data/styles/yota/placemark-yellow.png
rename to data/styles/style-light/watch/placemark-yellow.png
diff --git a/data/styles/yota/route_from.png b/data/styles/style-light/watch/route_from.png
similarity index 100%
rename from data/styles/yota/route_from.png
rename to data/styles/style-light/watch/route_from.png
diff --git a/data/styles/yota/route_to.png b/data/styles/style-light/watch/route_to.png
similarity index 100%
rename from data/styles/yota/route_to.png
rename to data/styles/style-light/watch/route_to.png
diff --git a/data/styles/yota/search-result-active.png b/data/styles/style-light/watch/search-result-active.png
similarity index 100%
rename from data/styles/yota/search-result-active.png
rename to data/styles/style-light/watch/search-result-active.png
diff --git a/data/styles/style-light/watch/search-result.png b/data/styles/style-light/watch/search-result.png
new file mode 100644
index 0000000000..ec3f99e18a
Binary files /dev/null and b/data/styles/style-light/watch/search-result.png differ
diff --git a/data/styles/style-light/xhdpi/api-result.png b/data/styles/style-light/xhdpi/api-result.png
new file mode 100644
index 0000000000..9e05de31c7
Binary files /dev/null and b/data/styles/style-light/xhdpi/api-result.png differ
diff --git a/data/styles/style-light/xhdpi/compass-image.png b/data/styles/style-light/xhdpi/compass-image.png
new file mode 100644
index 0000000000..d89b458e23
Binary files /dev/null and b/data/styles/style-light/xhdpi/compass-image.png differ
diff --git a/data/styles/style-light/xhdpi/current-position-compas.png b/data/styles/style-light/xhdpi/current-position-compas.png
new file mode 100644
index 0000000000..60f95a28f0
Binary files /dev/null and b/data/styles/style-light/xhdpi/current-position-compas.png differ
diff --git a/data/styles/style-light/xhdpi/current-position.png b/data/styles/style-light/xhdpi/current-position.png
new file mode 100644
index 0000000000..72b70dc261
Binary files /dev/null and b/data/styles/style-light/xhdpi/current-position.png differ
diff --git a/data/styles/style-light/xhdpi/current-routing-compas.png b/data/styles/style-light/xhdpi/current-routing-compas.png
new file mode 100644
index 0000000000..cb6d23aac4
Binary files /dev/null and b/data/styles/style-light/xhdpi/current-routing-compas.png differ
diff --git a/data/styles/style-light/xhdpi/placemark-blue.png b/data/styles/style-light/xhdpi/placemark-blue.png
new file mode 100644
index 0000000000..859cd49206
Binary files /dev/null and b/data/styles/style-light/xhdpi/placemark-blue.png differ
diff --git a/data/styles/style-light/xhdpi/placemark-brown.png b/data/styles/style-light/xhdpi/placemark-brown.png
new file mode 100644
index 0000000000..4d519bc33e
Binary files /dev/null and b/data/styles/style-light/xhdpi/placemark-brown.png differ
diff --git a/data/styles/style-light/xhdpi/placemark-green.png b/data/styles/style-light/xhdpi/placemark-green.png
new file mode 100644
index 0000000000..f8e37096c5
Binary files /dev/null and b/data/styles/style-light/xhdpi/placemark-green.png differ
diff --git a/data/styles/style-light/xhdpi/placemark-orange.png b/data/styles/style-light/xhdpi/placemark-orange.png
new file mode 100644
index 0000000000..6c465b92bf
Binary files /dev/null and b/data/styles/style-light/xhdpi/placemark-orange.png differ
diff --git a/data/styles/style-light/xhdpi/placemark-pink.png b/data/styles/style-light/xhdpi/placemark-pink.png
new file mode 100644
index 0000000000..7960e4aeef
Binary files /dev/null and b/data/styles/style-light/xhdpi/placemark-pink.png differ
diff --git a/data/styles/style-light/xhdpi/placemark-purple.png b/data/styles/style-light/xhdpi/placemark-purple.png
new file mode 100644
index 0000000000..6ea0ae5620
Binary files /dev/null and b/data/styles/style-light/xhdpi/placemark-purple.png differ
diff --git a/data/styles/style-light/xhdpi/placemark-red.png b/data/styles/style-light/xhdpi/placemark-red.png
new file mode 100644
index 0000000000..a0b5fa79db
Binary files /dev/null and b/data/styles/style-light/xhdpi/placemark-red.png differ
diff --git a/data/styles/style-light/xhdpi/placemark-yellow.png b/data/styles/style-light/xhdpi/placemark-yellow.png
new file mode 100644
index 0000000000..8cc93b0523
Binary files /dev/null and b/data/styles/style-light/xhdpi/placemark-yellow.png differ
diff --git a/data/styles/style-light/xhdpi/route_from.png b/data/styles/style-light/xhdpi/route_from.png
new file mode 100644
index 0000000000..3e2de72ae2
Binary files /dev/null and b/data/styles/style-light/xhdpi/route_from.png differ
diff --git a/data/styles/style-light/xhdpi/route_to.png b/data/styles/style-light/xhdpi/route_to.png
new file mode 100644
index 0000000000..71ac6ff4ec
Binary files /dev/null and b/data/styles/style-light/xhdpi/route_to.png differ
diff --git a/data/styles/style-light/xhdpi/search-result-active.png b/data/styles/style-light/xhdpi/search-result-active.png
new file mode 100644
index 0000000000..38cb8a8fb7
Binary files /dev/null and b/data/styles/style-light/xhdpi/search-result-active.png differ
diff --git a/data/styles/style-light/xhdpi/search-result.png b/data/styles/style-light/xhdpi/search-result.png
new file mode 100644
index 0000000000..190fbb6992
Binary files /dev/null and b/data/styles/style-light/xhdpi/search-result.png differ
diff --git a/data/styles/style-light/xhdpi/watch-my-direction.png b/data/styles/style-light/xhdpi/watch-my-direction.png
new file mode 100644
index 0000000000..a24ad35677
Binary files /dev/null and b/data/styles/style-light/xhdpi/watch-my-direction.png differ
diff --git a/data/styles/style-light/xhdpi/watch-my-position.png b/data/styles/style-light/xhdpi/watch-my-position.png
new file mode 100644
index 0000000000..258fa395e3
Binary files /dev/null and b/data/styles/style-light/xhdpi/watch-my-position.png differ
diff --git a/data/styles/style-light/xhdpi/watch-search-result.png b/data/styles/style-light/xhdpi/watch-search-result.png
new file mode 100644
index 0000000000..452e7e6df6
Binary files /dev/null and b/data/styles/style-light/xhdpi/watch-search-result.png differ
diff --git a/data/styles/style-light/xxhdpi/api-result.png b/data/styles/style-light/xxhdpi/api-result.png
new file mode 100644
index 0000000000..6f33ed8066
Binary files /dev/null and b/data/styles/style-light/xxhdpi/api-result.png differ
diff --git a/data/styles/style-light/xxhdpi/compass-image.png b/data/styles/style-light/xxhdpi/compass-image.png
new file mode 100644
index 0000000000..af76e028e9
Binary files /dev/null and b/data/styles/style-light/xxhdpi/compass-image.png differ
diff --git a/data/styles/style-light/xxhdpi/current-position-compas.png b/data/styles/style-light/xxhdpi/current-position-compas.png
new file mode 100644
index 0000000000..1855baa68c
Binary files /dev/null and b/data/styles/style-light/xxhdpi/current-position-compas.png differ
diff --git a/data/styles/style-light/xxhdpi/current-position.png b/data/styles/style-light/xxhdpi/current-position.png
new file mode 100644
index 0000000000..c8773cab39
Binary files /dev/null and b/data/styles/style-light/xxhdpi/current-position.png differ
diff --git a/data/styles/style-light/xxhdpi/current-routing-compas.png b/data/styles/style-light/xxhdpi/current-routing-compas.png
new file mode 100644
index 0000000000..c841d09583
Binary files /dev/null and b/data/styles/style-light/xxhdpi/current-routing-compas.png differ
diff --git a/data/styles/style-light/xxhdpi/placemark-blue.png b/data/styles/style-light/xxhdpi/placemark-blue.png
new file mode 100644
index 0000000000..ea84dc76d6
Binary files /dev/null and b/data/styles/style-light/xxhdpi/placemark-blue.png differ
diff --git a/data/styles/style-light/xxhdpi/placemark-brown.png b/data/styles/style-light/xxhdpi/placemark-brown.png
new file mode 100644
index 0000000000..295ddf108e
Binary files /dev/null and b/data/styles/style-light/xxhdpi/placemark-brown.png differ
diff --git a/data/styles/style-light/xxhdpi/placemark-green.png b/data/styles/style-light/xxhdpi/placemark-green.png
new file mode 100644
index 0000000000..9629ac0be1
Binary files /dev/null and b/data/styles/style-light/xxhdpi/placemark-green.png differ
diff --git a/data/styles/style-light/xxhdpi/placemark-orange.png b/data/styles/style-light/xxhdpi/placemark-orange.png
new file mode 100644
index 0000000000..ae08d5ac1a
Binary files /dev/null and b/data/styles/style-light/xxhdpi/placemark-orange.png differ
diff --git a/data/styles/style-light/xxhdpi/placemark-pink.png b/data/styles/style-light/xxhdpi/placemark-pink.png
new file mode 100644
index 0000000000..17a0773b07
Binary files /dev/null and b/data/styles/style-light/xxhdpi/placemark-pink.png differ
diff --git a/data/styles/style-light/xxhdpi/placemark-purple.png b/data/styles/style-light/xxhdpi/placemark-purple.png
new file mode 100644
index 0000000000..318a91733b
Binary files /dev/null and b/data/styles/style-light/xxhdpi/placemark-purple.png differ
diff --git a/data/styles/style-light/xxhdpi/placemark-red.png b/data/styles/style-light/xxhdpi/placemark-red.png
new file mode 100644
index 0000000000..0f4253ea6e
Binary files /dev/null and b/data/styles/style-light/xxhdpi/placemark-red.png differ
diff --git a/data/styles/style-light/xxhdpi/placemark-yellow.png b/data/styles/style-light/xxhdpi/placemark-yellow.png
new file mode 100644
index 0000000000..699caedd63
Binary files /dev/null and b/data/styles/style-light/xxhdpi/placemark-yellow.png differ
diff --git a/data/styles/style-light/xxhdpi/route_from.png b/data/styles/style-light/xxhdpi/route_from.png
new file mode 100644
index 0000000000..3464497403
Binary files /dev/null and b/data/styles/style-light/xxhdpi/route_from.png differ
diff --git a/data/styles/style-light/xxhdpi/route_to.png b/data/styles/style-light/xxhdpi/route_to.png
new file mode 100644
index 0000000000..449b7be1b7
Binary files /dev/null and b/data/styles/style-light/xxhdpi/route_to.png differ
diff --git a/data/styles/style-light/xxhdpi/search-result-active.png b/data/styles/style-light/xxhdpi/search-result-active.png
new file mode 100644
index 0000000000..ae0742c19f
Binary files /dev/null and b/data/styles/style-light/xxhdpi/search-result-active.png differ
diff --git a/data/styles/style-light/xxhdpi/search-result.png b/data/styles/style-light/xxhdpi/search-result.png
new file mode 100644
index 0000000000..7d290ae012
Binary files /dev/null and b/data/styles/style-light/xxhdpi/search-result.png differ
diff --git a/data/styles/style-light/xxhdpi/watch-my-direction.png b/data/styles/style-light/xxhdpi/watch-my-direction.png
new file mode 100644
index 0000000000..d192bc09e2
Binary files /dev/null and b/data/styles/style-light/xxhdpi/watch-my-direction.png differ
diff --git a/data/styles/style-light/xxhdpi/watch-my-position.png b/data/styles/style-light/xxhdpi/watch-my-position.png
new file mode 100644
index 0000000000..7e39ede702
Binary files /dev/null and b/data/styles/style-light/xxhdpi/watch-my-position.png differ
diff --git a/data/styles/style-light/xxhdpi/watch-search-result.png b/data/styles/style-light/xxhdpi/watch-search-result.png
new file mode 100644
index 0000000000..870b95fdfe
Binary files /dev/null and b/data/styles/style-light/xxhdpi/watch-search-result.png differ
diff --git a/data/styles/ink.mapcss b/data/styles/style-yota/style.mapcss
similarity index 100%
rename from data/styles/ink.mapcss
rename to data/styles/style-yota/style.mapcss
diff --git a/data/styles/style-yota/symbols/airport.svg b/data/styles/style-yota/symbols/airport.svg
new file mode 100644
index 0000000000..5d9387e732
--- /dev/null
+++ b/data/styles/style-yota/symbols/airport.svg
@@ -0,0 +1,90 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/alpine_hut.svg b/data/styles/style-yota/symbols/alpine_hut.svg
new file mode 100644
index 0000000000..dc72309939
--- /dev/null
+++ b/data/styles/style-yota/symbols/alpine_hut.svg
@@ -0,0 +1,60 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/archery-borderless.svg b/data/styles/style-yota/symbols/archery-borderless.svg
new file mode 100644
index 0000000000..a604ed67f1
--- /dev/null
+++ b/data/styles/style-yota/symbols/archery-borderless.svg
@@ -0,0 +1,93 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/archery.svg b/data/styles/style-yota/symbols/archery.svg
new file mode 100644
index 0000000000..3bf34afed5
--- /dev/null
+++ b/data/styles/style-yota/symbols/archery.svg
@@ -0,0 +1,61 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/arrow.svg b/data/styles/style-yota/symbols/arrow.svg
new file mode 100644
index 0000000000..8f28bb91a4
--- /dev/null
+++ b/data/styles/style-yota/symbols/arrow.svg
@@ -0,0 +1,8 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/athletics-borderless.svg b/data/styles/style-yota/symbols/athletics-borderless.svg
new file mode 100644
index 0000000000..6aa26a9804
--- /dev/null
+++ b/data/styles/style-yota/symbols/athletics-borderless.svg
@@ -0,0 +1,45 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/athletics.svg b/data/styles/style-yota/symbols/athletics.svg
new file mode 100644
index 0000000000..b905d1a196
--- /dev/null
+++ b/data/styles/style-yota/symbols/athletics.svg
@@ -0,0 +1,49 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/atm.svg b/data/styles/style-yota/symbols/atm.svg
new file mode 100644
index 0000000000..2bfe1c66ea
--- /dev/null
+++ b/data/styles/style-yota/symbols/atm.svg
@@ -0,0 +1,105 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/bakery.svg b/data/styles/style-yota/symbols/bakery.svg
new file mode 100644
index 0000000000..92eccfe92d
--- /dev/null
+++ b/data/styles/style-yota/symbols/bakery.svg
@@ -0,0 +1,72 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/bank.svg b/data/styles/style-yota/symbols/bank.svg
new file mode 100644
index 0000000000..1cae24401f
--- /dev/null
+++ b/data/styles/style-yota/symbols/bank.svg
@@ -0,0 +1,58 @@
+
+
diff --git a/data/styles/style-yota/symbols/bar.svg b/data/styles/style-yota/symbols/bar.svg
new file mode 100644
index 0000000000..37da8ab0c3
--- /dev/null
+++ b/data/styles/style-yota/symbols/bar.svg
@@ -0,0 +1,61 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/barrier.svg b/data/styles/style-yota/symbols/barrier.svg
new file mode 100644
index 0000000000..f08368e4a1
--- /dev/null
+++ b/data/styles/style-yota/symbols/barrier.svg
@@ -0,0 +1,154 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/baseball-borderless.svg b/data/styles/style-yota/symbols/baseball-borderless.svg
new file mode 100644
index 0000000000..b47852d53a
--- /dev/null
+++ b/data/styles/style-yota/symbols/baseball-borderless.svg
@@ -0,0 +1,72 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/baseball.svg b/data/styles/style-yota/symbols/baseball.svg
new file mode 100644
index 0000000000..0badb9ebb7
--- /dev/null
+++ b/data/styles/style-yota/symbols/baseball.svg
@@ -0,0 +1,48 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/basketball-borderless.svg b/data/styles/style-yota/symbols/basketball-borderless.svg
new file mode 100644
index 0000000000..fdc888ea16
--- /dev/null
+++ b/data/styles/style-yota/symbols/basketball-borderless.svg
@@ -0,0 +1,37 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/basketball.svg b/data/styles/style-yota/symbols/basketball.svg
new file mode 100644
index 0000000000..dd52fe014b
--- /dev/null
+++ b/data/styles/style-yota/symbols/basketball.svg
@@ -0,0 +1,41 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/bench.svg b/data/styles/style-yota/symbols/bench.svg
new file mode 100644
index 0000000000..0ad08e8602
--- /dev/null
+++ b/data/styles/style-yota/symbols/bench.svg
@@ -0,0 +1,29 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/bicycle_rental.svg b/data/styles/style-yota/symbols/bicycle_rental.svg
new file mode 100644
index 0000000000..183548d5bb
--- /dev/null
+++ b/data/styles/style-yota/symbols/bicycle_rental.svg
@@ -0,0 +1,77 @@
+
+
diff --git a/data/styles/style-yota/symbols/bird.svg b/data/styles/style-yota/symbols/bird.svg
new file mode 100644
index 0000000000..90eacbd298
--- /dev/null
+++ b/data/styles/style-yota/symbols/bird.svg
@@ -0,0 +1,117 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/bowls-borderless.svg b/data/styles/style-yota/symbols/bowls-borderless.svg
new file mode 100644
index 0000000000..d95d848371
--- /dev/null
+++ b/data/styles/style-yota/symbols/bowls-borderless.svg
@@ -0,0 +1,61 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/bowls.svg b/data/styles/style-yota/symbols/bowls.svg
new file mode 100644
index 0000000000..d20e25da4b
--- /dev/null
+++ b/data/styles/style-yota/symbols/bowls.svg
@@ -0,0 +1,30 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/building.svg b/data/styles/style-yota/symbols/building.svg
new file mode 100644
index 0000000000..900852864f
--- /dev/null
+++ b/data/styles/style-yota/symbols/building.svg
@@ -0,0 +1,55 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/bureau_de_change.svg b/data/styles/style-yota/symbols/bureau_de_change.svg
new file mode 100644
index 0000000000..10517d841b
--- /dev/null
+++ b/data/styles/style-yota/symbols/bureau_de_change.svg
@@ -0,0 +1,114 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/bus-mini.svg b/data/styles/style-yota/symbols/bus-mini.svg
new file mode 100644
index 0000000000..7e6108fc3a
--- /dev/null
+++ b/data/styles/style-yota/symbols/bus-mini.svg
@@ -0,0 +1,92 @@
+
+
diff --git a/data/styles/style-yota/symbols/bus.svg b/data/styles/style-yota/symbols/bus.svg
new file mode 100644
index 0000000000..a443de46b5
--- /dev/null
+++ b/data/styles/style-yota/symbols/bus.svg
@@ -0,0 +1,93 @@
+
+
diff --git a/data/styles/style-yota/symbols/bus_sta.svg b/data/styles/style-yota/symbols/bus_sta.svg
new file mode 100644
index 0000000000..ebdf3012b9
--- /dev/null
+++ b/data/styles/style-yota/symbols/bus_sta.svg
@@ -0,0 +1,84 @@
+
+
diff --git a/data/styles/style-yota/symbols/cafe.svg b/data/styles/style-yota/symbols/cafe.svg
new file mode 100644
index 0000000000..0d6e9b2942
--- /dev/null
+++ b/data/styles/style-yota/symbols/cafe.svg
@@ -0,0 +1,109 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/campSite.svg b/data/styles/style-yota/symbols/campSite.svg
new file mode 100644
index 0000000000..829664c71a
--- /dev/null
+++ b/data/styles/style-yota/symbols/campSite.svg
@@ -0,0 +1,66 @@
+
+
diff --git a/data/styles/style-yota/symbols/cannon.svg b/data/styles/style-yota/symbols/cannon.svg
new file mode 100644
index 0000000000..064d2f07d5
--- /dev/null
+++ b/data/styles/style-yota/symbols/cannon.svg
@@ -0,0 +1,70 @@
+
+
diff --git a/data/styles/style-yota/symbols/car_rental.svg b/data/styles/style-yota/symbols/car_rental.svg
new file mode 100644
index 0000000000..b5b0587fdf
--- /dev/null
+++ b/data/styles/style-yota/symbols/car_rental.svg
@@ -0,0 +1,96 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/car_repair.svg b/data/styles/style-yota/symbols/car_repair.svg
new file mode 100644
index 0000000000..0f7ef50701
--- /dev/null
+++ b/data/styles/style-yota/symbols/car_repair.svg
@@ -0,0 +1,98 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/car_sharing.svg b/data/styles/style-yota/symbols/car_sharing.svg
new file mode 100644
index 0000000000..d5287b8cd3
--- /dev/null
+++ b/data/styles/style-yota/symbols/car_sharing.svg
@@ -0,0 +1,123 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/castle.svg b/data/styles/style-yota/symbols/castle.svg
new file mode 100644
index 0000000000..b97c04ad25
--- /dev/null
+++ b/data/styles/style-yota/symbols/castle.svg
@@ -0,0 +1,69 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/cave_entrance.svg b/data/styles/style-yota/symbols/cave_entrance.svg
new file mode 100644
index 0000000000..0ae66f07d3
--- /dev/null
+++ b/data/styles/style-yota/symbols/cave_entrance.svg
@@ -0,0 +1,28 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/church.svg b/data/styles/style-yota/symbols/church.svg
new file mode 100644
index 0000000000..eb6a3d63d7
--- /dev/null
+++ b/data/styles/style-yota/symbols/church.svg
@@ -0,0 +1,60 @@
+
+
diff --git a/data/styles/style-yota/symbols/cinema.svg b/data/styles/style-yota/symbols/cinema.svg
new file mode 100644
index 0000000000..d7596251a0
--- /dev/null
+++ b/data/styles/style-yota/symbols/cinema.svg
@@ -0,0 +1,64 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/clothes.svg b/data/styles/style-yota/symbols/clothes.svg
new file mode 100644
index 0000000000..04d031c610
--- /dev/null
+++ b/data/styles/style-yota/symbols/clothes.svg
@@ -0,0 +1,71 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/cricket-borderless.svg b/data/styles/style-yota/symbols/cricket-borderless.svg
new file mode 100644
index 0000000000..5c318c9ae7
--- /dev/null
+++ b/data/styles/style-yota/symbols/cricket-borderless.svg
@@ -0,0 +1,65 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/cricket.svg b/data/styles/style-yota/symbols/cricket.svg
new file mode 100644
index 0000000000..094b7ae19b
--- /dev/null
+++ b/data/styles/style-yota/symbols/cricket.svg
@@ -0,0 +1,73 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/curling-borderless.svg b/data/styles/style-yota/symbols/curling-borderless.svg
new file mode 100644
index 0000000000..addeb1f5b4
--- /dev/null
+++ b/data/styles/style-yota/symbols/curling-borderless.svg
@@ -0,0 +1,42 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/curling.svg b/data/styles/style-yota/symbols/curling.svg
new file mode 100644
index 0000000000..98483695d6
--- /dev/null
+++ b/data/styles/style-yota/symbols/curling.svg
@@ -0,0 +1,54 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/disused.svg b/data/styles/style-yota/symbols/disused.svg
new file mode 100644
index 0000000000..cbc391c7e4
--- /dev/null
+++ b/data/styles/style-yota/symbols/disused.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/data/styles/style-yota/symbols/diving-borderless.svg b/data/styles/style-yota/symbols/diving-borderless.svg
new file mode 100644
index 0000000000..f86c76a4af
--- /dev/null
+++ b/data/styles/style-yota/symbols/diving-borderless.svg
@@ -0,0 +1,41 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/diving.svg b/data/styles/style-yota/symbols/diving.svg
new file mode 100644
index 0000000000..ab74b03beb
--- /dev/null
+++ b/data/styles/style-yota/symbols/diving.svg
@@ -0,0 +1,49 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/doctor.svg b/data/styles/style-yota/symbols/doctor.svg
new file mode 100644
index 0000000000..3e03fb320a
--- /dev/null
+++ b/data/styles/style-yota/symbols/doctor.svg
@@ -0,0 +1,5 @@
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/dog_park.svg b/data/styles/style-yota/symbols/dog_park.svg
new file mode 100644
index 0000000000..9af0dec84f
--- /dev/null
+++ b/data/styles/style-yota/symbols/dog_park.svg
@@ -0,0 +1,61 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/drinking_water.svg b/data/styles/style-yota/symbols/drinking_water.svg
new file mode 100644
index 0000000000..5267d56eaf
--- /dev/null
+++ b/data/styles/style-yota/symbols/drinking_water.svg
@@ -0,0 +1,77 @@
+
+
diff --git a/data/styles/style-yota/symbols/earthquake-camp.svg b/data/styles/style-yota/symbols/earthquake-camp.svg
new file mode 100644
index 0000000000..4c7301c9a9
--- /dev/null
+++ b/data/styles/style-yota/symbols/earthquake-camp.svg
@@ -0,0 +1,67 @@
+
+
diff --git a/data/styles/style-yota/symbols/embassy.svg b/data/styles/style-yota/symbols/embassy.svg
new file mode 100644
index 0000000000..a68ad164cc
--- /dev/null
+++ b/data/styles/style-yota/symbols/embassy.svg
@@ -0,0 +1,76 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/equestrian-borderless.svg b/data/styles/style-yota/symbols/equestrian-borderless.svg
new file mode 100644
index 0000000000..1156883a1a
--- /dev/null
+++ b/data/styles/style-yota/symbols/equestrian-borderless.svg
@@ -0,0 +1,21 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/equestrian.svg b/data/styles/style-yota/symbols/equestrian.svg
new file mode 100644
index 0000000000..0427b645bd
--- /dev/null
+++ b/data/styles/style-yota/symbols/equestrian.svg
@@ -0,0 +1,30 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/fastfood.svg b/data/styles/style-yota/symbols/fastfood.svg
new file mode 100644
index 0000000000..f01473bda9
--- /dev/null
+++ b/data/styles/style-yota/symbols/fastfood.svg
@@ -0,0 +1,97 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/firebrigade.svg b/data/styles/style-yota/symbols/firebrigade.svg
new file mode 100644
index 0000000000..1f11df6006
--- /dev/null
+++ b/data/styles/style-yota/symbols/firebrigade.svg
@@ -0,0 +1,71 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/football-borderless.svg b/data/styles/style-yota/symbols/football-borderless.svg
new file mode 100644
index 0000000000..d481224523
--- /dev/null
+++ b/data/styles/style-yota/symbols/football-borderless.svg
@@ -0,0 +1,80 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/football.svg b/data/styles/style-yota/symbols/football.svg
new file mode 100644
index 0000000000..c9faadf6b9
--- /dev/null
+++ b/data/styles/style-yota/symbols/football.svg
@@ -0,0 +1,45 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/fountain.svg b/data/styles/style-yota/symbols/fountain.svg
new file mode 100644
index 0000000000..f1dc1f6257
--- /dev/null
+++ b/data/styles/style-yota/symbols/fountain.svg
@@ -0,0 +1,138 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/gate.svg b/data/styles/style-yota/symbols/gate.svg
new file mode 100644
index 0000000000..565f7e5503
--- /dev/null
+++ b/data/styles/style-yota/symbols/gate.svg
@@ -0,0 +1,69 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/golf-course.svg b/data/styles/style-yota/symbols/golf-course.svg
new file mode 100644
index 0000000000..fbbd510702
--- /dev/null
+++ b/data/styles/style-yota/symbols/golf-course.svg
@@ -0,0 +1,78 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/gymnastics-borderless.svg b/data/styles/style-yota/symbols/gymnastics-borderless.svg
new file mode 100644
index 0000000000..fd20f4fa42
--- /dev/null
+++ b/data/styles/style-yota/symbols/gymnastics-borderless.svg
@@ -0,0 +1,37 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/gymnastics.svg b/data/styles/style-yota/symbols/gymnastics.svg
new file mode 100644
index 0000000000..fe73b95794
--- /dev/null
+++ b/data/styles/style-yota/symbols/gymnastics.svg
@@ -0,0 +1,45 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/hairdresser.svg b/data/styles/style-yota/symbols/hairdresser.svg
new file mode 100644
index 0000000000..3ba4ea3272
--- /dev/null
+++ b/data/styles/style-yota/symbols/hairdresser.svg
@@ -0,0 +1,274 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/handball-borderless.svg b/data/styles/style-yota/symbols/handball-borderless.svg
new file mode 100644
index 0000000000..1fd796d33e
--- /dev/null
+++ b/data/styles/style-yota/symbols/handball-borderless.svg
@@ -0,0 +1,71 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/handball.svg b/data/styles/style-yota/symbols/handball.svg
new file mode 100644
index 0000000000..e2eb9aa2e9
--- /dev/null
+++ b/data/styles/style-yota/symbols/handball.svg
@@ -0,0 +1,46 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/helipad.svg b/data/styles/style-yota/symbols/helipad.svg
new file mode 100644
index 0000000000..299a8ed754
--- /dev/null
+++ b/data/styles/style-yota/symbols/helipad.svg
@@ -0,0 +1,105 @@
+
+
diff --git a/data/styles/style-yota/symbols/hospital.svg b/data/styles/style-yota/symbols/hospital.svg
new file mode 100644
index 0000000000..a9684e625b
--- /dev/null
+++ b/data/styles/style-yota/symbols/hospital.svg
@@ -0,0 +1,17 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/hostel.svg b/data/styles/style-yota/symbols/hostel.svg
new file mode 100644
index 0000000000..1f20c97e05
--- /dev/null
+++ b/data/styles/style-yota/symbols/hostel.svg
@@ -0,0 +1,4 @@
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/hotel.svg b/data/styles/style-yota/symbols/hotel.svg
new file mode 100644
index 0000000000..99ab2f5104
--- /dev/null
+++ b/data/styles/style-yota/symbols/hotel.svg
@@ -0,0 +1,163 @@
+
+
diff --git a/data/styles/style-yota/symbols/housenumber.svg b/data/styles/style-yota/symbols/housenumber.svg
new file mode 100644
index 0000000000..9d71f5ac7f
--- /dev/null
+++ b/data/styles/style-yota/symbols/housenumber.svg
@@ -0,0 +1,4 @@
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/hunting_closed_high.svg b/data/styles/style-yota/symbols/hunting_closed_high.svg
new file mode 100644
index 0000000000..699783eaca
--- /dev/null
+++ b/data/styles/style-yota/symbols/hunting_closed_high.svg
@@ -0,0 +1,79 @@
+
+
diff --git a/data/styles/style-yota/symbols/information-guidepost.svg b/data/styles/style-yota/symbols/information-guidepost.svg
new file mode 100644
index 0000000000..a29b2e82dc
--- /dev/null
+++ b/data/styles/style-yota/symbols/information-guidepost.svg
@@ -0,0 +1,105 @@
+
+
diff --git a/data/styles/style-yota/symbols/information-office.svg b/data/styles/style-yota/symbols/information-office.svg
new file mode 100644
index 0000000000..9be6d36f03
--- /dev/null
+++ b/data/styles/style-yota/symbols/information-office.svg
@@ -0,0 +1,105 @@
+
+
diff --git a/data/styles/style-yota/symbols/information.svg b/data/styles/style-yota/symbols/information.svg
new file mode 100644
index 0000000000..11f19f5747
--- /dev/null
+++ b/data/styles/style-yota/symbols/information.svg
@@ -0,0 +1,105 @@
+
+
diff --git a/data/styles/style-yota/symbols/khanda.svg b/data/styles/style-yota/symbols/khanda.svg
new file mode 100644
index 0000000000..daaaa3be80
--- /dev/null
+++ b/data/styles/style-yota/symbols/khanda.svg
@@ -0,0 +1,6 @@
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/kindergarten.svg b/data/styles/style-yota/symbols/kindergarten.svg
new file mode 100644
index 0000000000..a5550608ed
--- /dev/null
+++ b/data/styles/style-yota/symbols/kindergarten.svg
@@ -0,0 +1,77 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/kindergarten2.svg b/data/styles/style-yota/symbols/kindergarten2.svg
new file mode 100644
index 0000000000..1872d92db8
--- /dev/null
+++ b/data/styles/style-yota/symbols/kindergarten2.svg
@@ -0,0 +1,122 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/kiosk.svg b/data/styles/style-yota/symbols/kiosk.svg
new file mode 100644
index 0000000000..a1264f9439
--- /dev/null
+++ b/data/styles/style-yota/symbols/kiosk.svg
@@ -0,0 +1,125 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/library.svg b/data/styles/style-yota/symbols/library.svg
new file mode 100644
index 0000000000..c983a0ff77
--- /dev/null
+++ b/data/styles/style-yota/symbols/library.svg
@@ -0,0 +1,72 @@
+
+
diff --git a/data/styles/style-yota/symbols/lighthouse.svg b/data/styles/style-yota/symbols/lighthouse.svg
new file mode 100644
index 0000000000..e0dbfda151
--- /dev/null
+++ b/data/styles/style-yota/symbols/lighthouse.svg
@@ -0,0 +1,104 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/man-made-halfpipe.svg b/data/styles/style-yota/symbols/man-made-halfpipe.svg
new file mode 100644
index 0000000000..1eaef3939e
--- /dev/null
+++ b/data/styles/style-yota/symbols/man-made-halfpipe.svg
@@ -0,0 +1,4 @@
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/memorial.svg b/data/styles/style-yota/symbols/memorial.svg
new file mode 100644
index 0000000000..00ed21cb18
--- /dev/null
+++ b/data/styles/style-yota/symbols/memorial.svg
@@ -0,0 +1,76 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/mosque.svg b/data/styles/style-yota/symbols/mosque.svg
new file mode 100644
index 0000000000..8e5eaeac26
--- /dev/null
+++ b/data/styles/style-yota/symbols/mosque.svg
@@ -0,0 +1,4 @@
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/mountain_pass.svg b/data/styles/style-yota/symbols/mountain_pass.svg
new file mode 100644
index 0000000000..b8543c7aa4
--- /dev/null
+++ b/data/styles/style-yota/symbols/mountain_pass.svg
@@ -0,0 +1,20 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/museum.svg b/data/styles/style-yota/symbols/museum.svg
new file mode 100644
index 0000000000..8800cc153a
--- /dev/null
+++ b/data/styles/style-yota/symbols/museum.svg
@@ -0,0 +1,76 @@
+
+
diff --git a/data/styles/style-yota/symbols/park_and_ride-permissive.svg b/data/styles/style-yota/symbols/park_and_ride-permissive.svg
new file mode 100644
index 0000000000..03c9baa89c
--- /dev/null
+++ b/data/styles/style-yota/symbols/park_and_ride-permissive.svg
@@ -0,0 +1,30 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/park_and_ride.svg b/data/styles/style-yota/symbols/park_and_ride.svg
new file mode 100644
index 0000000000..c342ace4cb
--- /dev/null
+++ b/data/styles/style-yota/symbols/park_and_ride.svg
@@ -0,0 +1,30 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/parking-mini.svg b/data/styles/style-yota/symbols/parking-mini.svg
new file mode 100644
index 0000000000..7e0def8079
--- /dev/null
+++ b/data/styles/style-yota/symbols/parking-mini.svg
@@ -0,0 +1,96 @@
+
+
diff --git a/data/styles/style-yota/symbols/parking-permissive.svg b/data/styles/style-yota/symbols/parking-permissive.svg
new file mode 100644
index 0000000000..3be6ab30d0
--- /dev/null
+++ b/data/styles/style-yota/symbols/parking-permissive.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/data/styles/style-yota/symbols/parking-private.svg b/data/styles/style-yota/symbols/parking-private.svg
new file mode 100644
index 0000000000..68db8873cc
--- /dev/null
+++ b/data/styles/style-yota/symbols/parking-private.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/data/styles/style-yota/symbols/parking.svg b/data/styles/style-yota/symbols/parking.svg
new file mode 100644
index 0000000000..cfced222c1
--- /dev/null
+++ b/data/styles/style-yota/symbols/parking.svg
@@ -0,0 +1,89 @@
+
+
diff --git a/data/styles/style-yota/symbols/parking_fee-permissive.svg b/data/styles/style-yota/symbols/parking_fee-permissive.svg
new file mode 100644
index 0000000000..5baa4c67dc
--- /dev/null
+++ b/data/styles/style-yota/symbols/parking_fee-permissive.svg
@@ -0,0 +1,83 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/parking_fee.svg b/data/styles/style-yota/symbols/parking_fee.svg
new file mode 100644
index 0000000000..83c349d92d
--- /dev/null
+++ b/data/styles/style-yota/symbols/parking_fee.svg
@@ -0,0 +1,83 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/parking_roof-permissive.svg b/data/styles/style-yota/symbols/parking_roof-permissive.svg
new file mode 100644
index 0000000000..486dede727
--- /dev/null
+++ b/data/styles/style-yota/symbols/parking_roof-permissive.svg
@@ -0,0 +1,28 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/parking_roof.svg b/data/styles/style-yota/symbols/parking_roof.svg
new file mode 100644
index 0000000000..64890ea396
--- /dev/null
+++ b/data/styles/style-yota/symbols/parking_roof.svg
@@ -0,0 +1,109 @@
+
+
diff --git a/data/styles/style-yota/symbols/parking_roof_fee-permissive.svg b/data/styles/style-yota/symbols/parking_roof_fee-permissive.svg
new file mode 100644
index 0000000000..2bb04b4425
--- /dev/null
+++ b/data/styles/style-yota/symbols/parking_roof_fee-permissive.svg
@@ -0,0 +1,83 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/parking_roof_fee.svg b/data/styles/style-yota/symbols/parking_roof_fee.svg
new file mode 100644
index 0000000000..d569ca4212
--- /dev/null
+++ b/data/styles/style-yota/symbols/parking_roof_fee.svg
@@ -0,0 +1,83 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/peak-mini.svg b/data/styles/style-yota/symbols/peak-mini.svg
new file mode 100644
index 0000000000..f64081d5c1
--- /dev/null
+++ b/data/styles/style-yota/symbols/peak-mini.svg
@@ -0,0 +1,90 @@
+
+
diff --git a/data/styles/style-yota/symbols/peak.svg b/data/styles/style-yota/symbols/peak.svg
new file mode 100644
index 0000000000..ace28dc96c
--- /dev/null
+++ b/data/styles/style-yota/symbols/peak.svg
@@ -0,0 +1,90 @@
+
+
diff --git a/data/styles/style-yota/symbols/petrolStation.svg b/data/styles/style-yota/symbols/petrolStation.svg
new file mode 100644
index 0000000000..177d5926ef
--- /dev/null
+++ b/data/styles/style-yota/symbols/petrolStation.svg
@@ -0,0 +1,66 @@
+
+
diff --git a/data/styles/style-yota/symbols/pharmacy.svg b/data/styles/style-yota/symbols/pharmacy.svg
new file mode 100644
index 0000000000..4b8ac0e6d5
--- /dev/null
+++ b/data/styles/style-yota/symbols/pharmacy.svg
@@ -0,0 +1,73 @@
+
+
diff --git a/data/styles/style-yota/symbols/picnic.svg b/data/styles/style-yota/symbols/picnic.svg
new file mode 100644
index 0000000000..cf58c0144c
--- /dev/null
+++ b/data/styles/style-yota/symbols/picnic.svg
@@ -0,0 +1,29 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/playground.svg b/data/styles/style-yota/symbols/playground.svg
new file mode 100644
index 0000000000..447e8c728d
--- /dev/null
+++ b/data/styles/style-yota/symbols/playground.svg
@@ -0,0 +1,97 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/police.svg b/data/styles/style-yota/symbols/police.svg
new file mode 100644
index 0000000000..5438143da8
--- /dev/null
+++ b/data/styles/style-yota/symbols/police.svg
@@ -0,0 +1,66 @@
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/postbox.svg b/data/styles/style-yota/symbols/postbox.svg
new file mode 100644
index 0000000000..1e6490de83
--- /dev/null
+++ b/data/styles/style-yota/symbols/postbox.svg
@@ -0,0 +1,64 @@
+
+
diff --git a/data/styles/style-yota/symbols/postoffice.svg b/data/styles/style-yota/symbols/postoffice.svg
new file mode 100644
index 0000000000..d1989792ca
--- /dev/null
+++ b/data/styles/style-yota/symbols/postoffice.svg
@@ -0,0 +1,63 @@
+
+
diff --git a/data/styles/style-yota/symbols/power-pole.svg b/data/styles/style-yota/symbols/power-pole.svg
new file mode 100644
index 0000000000..0e3d90dafd
--- /dev/null
+++ b/data/styles/style-yota/symbols/power-pole.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/data/styles/style-yota/symbols/power-tower.svg b/data/styles/style-yota/symbols/power-tower.svg
new file mode 100644
index 0000000000..7fbd624f32
--- /dev/null
+++ b/data/styles/style-yota/symbols/power-tower.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/data/styles/style-yota/symbols/power_generic.svg b/data/styles/style-yota/symbols/power_generic.svg
new file mode 100644
index 0000000000..04d499e793
--- /dev/null
+++ b/data/styles/style-yota/symbols/power_generic.svg
@@ -0,0 +1,15 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/power_hydro.svg b/data/styles/style-yota/symbols/power_hydro.svg
new file mode 100644
index 0000000000..719b51b3a0
--- /dev/null
+++ b/data/styles/style-yota/symbols/power_hydro.svg
@@ -0,0 +1,15 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/power_photovoltaic.svg b/data/styles/style-yota/symbols/power_photovoltaic.svg
new file mode 100644
index 0000000000..f7e0bcdb8f
--- /dev/null
+++ b/data/styles/style-yota/symbols/power_photovoltaic.svg
@@ -0,0 +1,16 @@
+
+
diff --git a/data/styles/style-yota/symbols/power_wind.svg b/data/styles/style-yota/symbols/power_wind.svg
new file mode 100644
index 0000000000..88484b85df
--- /dev/null
+++ b/data/styles/style-yota/symbols/power_wind.svg
@@ -0,0 +1,33 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/pub.svg b/data/styles/style-yota/symbols/pub.svg
new file mode 100644
index 0000000000..7bffd548f2
--- /dev/null
+++ b/data/styles/style-yota/symbols/pub.svg
@@ -0,0 +1,188 @@
+
+
diff --git a/data/styles/style-yota/symbols/pubx.svg b/data/styles/style-yota/symbols/pubx.svg
new file mode 100644
index 0000000000..b314e5b55d
--- /dev/null
+++ b/data/styles/style-yota/symbols/pubx.svg
@@ -0,0 +1,12 @@
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/railway-crossing-small.svg b/data/styles/style-yota/symbols/railway-crossing-small.svg
new file mode 100644
index 0000000000..d09862ab70
--- /dev/null
+++ b/data/styles/style-yota/symbols/railway-crossing-small.svg
@@ -0,0 +1,25 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/railway-crossing.svg b/data/styles/style-yota/symbols/railway-crossing.svg
new file mode 100644
index 0000000000..0dd1f022a2
--- /dev/null
+++ b/data/styles/style-yota/symbols/railway-crossing.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/railway-station-mini.svg b/data/styles/style-yota/symbols/railway-station-mini.svg
new file mode 100644
index 0000000000..5946d96bb9
--- /dev/null
+++ b/data/styles/style-yota/symbols/railway-station-mini.svg
@@ -0,0 +1,76 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/railway-station.svg b/data/styles/style-yota/symbols/railway-station.svg
new file mode 100644
index 0000000000..cc6d3b8968
--- /dev/null
+++ b/data/styles/style-yota/symbols/railway-station.svg
@@ -0,0 +1,76 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/recycling.svg b/data/styles/style-yota/symbols/recycling.svg
new file mode 100644
index 0000000000..10666e0a5e
--- /dev/null
+++ b/data/styles/style-yota/symbols/recycling.svg
@@ -0,0 +1,89 @@
+
+
diff --git a/data/styles/style-yota/symbols/religion.svg b/data/styles/style-yota/symbols/religion.svg
new file mode 100644
index 0000000000..16073dae06
--- /dev/null
+++ b/data/styles/style-yota/symbols/religion.svg
@@ -0,0 +1,71 @@
+
+
diff --git a/data/styles/style-yota/symbols/restaurant.svg b/data/styles/style-yota/symbols/restaurant.svg
new file mode 100644
index 0000000000..4cfd72de98
--- /dev/null
+++ b/data/styles/style-yota/symbols/restaurant.svg
@@ -0,0 +1,103 @@
+
+
diff --git a/data/styles/style-yota/symbols/roundabout_left.svg b/data/styles/style-yota/symbols/roundabout_left.svg
new file mode 100644
index 0000000000..134c16b872
--- /dev/null
+++ b/data/styles/style-yota/symbols/roundabout_left.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/roundabout_right.svg b/data/styles/style-yota/symbols/roundabout_right.svg
new file mode 100644
index 0000000000..1f51026f49
--- /dev/null
+++ b/data/styles/style-yota/symbols/roundabout_right.svg
@@ -0,0 +1,9 @@
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/ruins.svg b/data/styles/style-yota/symbols/ruins.svg
new file mode 100644
index 0000000000..7c793a1141
--- /dev/null
+++ b/data/styles/style-yota/symbols/ruins.svg
@@ -0,0 +1,116 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/school.svg b/data/styles/style-yota/symbols/school.svg
new file mode 100644
index 0000000000..09cb5a6450
--- /dev/null
+++ b/data/styles/style-yota/symbols/school.svg
@@ -0,0 +1,114 @@
+
+
diff --git a/data/styles/style-yota/symbols/shelter-fireplace.svg b/data/styles/style-yota/symbols/shelter-fireplace.svg
new file mode 100644
index 0000000000..2329b8fd79
--- /dev/null
+++ b/data/styles/style-yota/symbols/shelter-fireplace.svg
@@ -0,0 +1,22 @@
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/shelter.svg b/data/styles/style-yota/symbols/shelter.svg
new file mode 100644
index 0000000000..0d020d544e
--- /dev/null
+++ b/data/styles/style-yota/symbols/shelter.svg
@@ -0,0 +1,19 @@
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/shooting-borderless.svg b/data/styles/style-yota/symbols/shooting-borderless.svg
new file mode 100644
index 0000000000..12d9375ef0
--- /dev/null
+++ b/data/styles/style-yota/symbols/shooting-borderless.svg
@@ -0,0 +1,49 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/shooting.svg b/data/styles/style-yota/symbols/shooting.svg
new file mode 100644
index 0000000000..f0f604a84d
--- /dev/null
+++ b/data/styles/style-yota/symbols/shooting.svg
@@ -0,0 +1,57 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/slipway.svg b/data/styles/style-yota/symbols/slipway.svg
new file mode 100644
index 0000000000..137efaa2e0
--- /dev/null
+++ b/data/styles/style-yota/symbols/slipway.svg
@@ -0,0 +1,6 @@
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/soccer-borderless.svg b/data/styles/style-yota/symbols/soccer-borderless.svg
new file mode 100644
index 0000000000..340ffde6a9
--- /dev/null
+++ b/data/styles/style-yota/symbols/soccer-borderless.svg
@@ -0,0 +1,8 @@
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/soccer.svg b/data/styles/style-yota/symbols/soccer.svg
new file mode 100644
index 0000000000..e859126a4a
--- /dev/null
+++ b/data/styles/style-yota/symbols/soccer.svg
@@ -0,0 +1,9 @@
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/speed_trap.svg b/data/styles/style-yota/symbols/speed_trap.svg
new file mode 100644
index 0000000000..fd31db4181
--- /dev/null
+++ b/data/styles/style-yota/symbols/speed_trap.svg
@@ -0,0 +1,5 @@
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/subway-station-l.svg b/data/styles/style-yota/symbols/subway-station-l.svg
new file mode 100644
index 0000000000..ddb80b7392
--- /dev/null
+++ b/data/styles/style-yota/symbols/subway-station-l.svg
@@ -0,0 +1,77 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/subway-station-m.svg b/data/styles/style-yota/symbols/subway-station-m.svg
new file mode 100644
index 0000000000..5728fb767b
--- /dev/null
+++ b/data/styles/style-yota/symbols/subway-station-m.svg
@@ -0,0 +1,77 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/subway-station-s.svg b/data/styles/style-yota/symbols/subway-station-s.svg
new file mode 100644
index 0000000000..53faabd3cb
--- /dev/null
+++ b/data/styles/style-yota/symbols/subway-station-s.svg
@@ -0,0 +1,77 @@
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/subway.svg b/data/styles/style-yota/symbols/subway.svg
new file mode 100644
index 0000000000..1c46805f1a
--- /dev/null
+++ b/data/styles/style-yota/symbols/subway.svg
@@ -0,0 +1,78 @@
+
+
diff --git a/data/styles/style-yota/symbols/supermarket.svg b/data/styles/style-yota/symbols/supermarket.svg
new file mode 100644
index 0000000000..17932e2c39
--- /dev/null
+++ b/data/styles/style-yota/symbols/supermarket.svg
@@ -0,0 +1,84 @@
+
+
diff --git a/data/styles/style-yota/symbols/survey_point.svg b/data/styles/style-yota/symbols/survey_point.svg
new file mode 100644
index 0000000000..f1970f3d9b
--- /dev/null
+++ b/data/styles/style-yota/symbols/survey_point.svg
@@ -0,0 +1,24 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/swimming-borderless.svg b/data/styles/style-yota/symbols/swimming-borderless.svg
new file mode 100644
index 0000000000..177b6f9143
--- /dev/null
+++ b/data/styles/style-yota/symbols/swimming-borderless.svg
@@ -0,0 +1,5 @@
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/swimming.svg b/data/styles/style-yota/symbols/swimming.svg
new file mode 100644
index 0000000000..93ea4adc5d
--- /dev/null
+++ b/data/styles/style-yota/symbols/swimming.svg
@@ -0,0 +1,6 @@
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/synagogue.svg b/data/styles/style-yota/symbols/synagogue.svg
new file mode 100644
index 0000000000..7ae1216767
--- /dev/null
+++ b/data/styles/style-yota/symbols/synagogue.svg
@@ -0,0 +1,75 @@
+
+
diff --git a/data/styles/style-yota/symbols/taxi.svg b/data/styles/style-yota/symbols/taxi.svg
new file mode 100644
index 0000000000..8785bb72f2
--- /dev/null
+++ b/data/styles/style-yota/symbols/taxi.svg
@@ -0,0 +1,126 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/telephone.svg b/data/styles/style-yota/symbols/telephone.svg
new file mode 100644
index 0000000000..0a99b2c5f3
--- /dev/null
+++ b/data/styles/style-yota/symbols/telephone.svg
@@ -0,0 +1,90 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/tennis-borderless.svg b/data/styles/style-yota/symbols/tennis-borderless.svg
new file mode 100644
index 0000000000..f36ede87a3
--- /dev/null
+++ b/data/styles/style-yota/symbols/tennis-borderless.svg
@@ -0,0 +1,9 @@
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/tennis.svg b/data/styles/style-yota/symbols/tennis.svg
new file mode 100644
index 0000000000..ea49b2eaf7
--- /dev/null
+++ b/data/styles/style-yota/symbols/tennis.svg
@@ -0,0 +1,10 @@
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/theatre.svg b/data/styles/style-yota/symbols/theatre.svg
new file mode 100644
index 0000000000..9d847670c8
--- /dev/null
+++ b/data/styles/style-yota/symbols/theatre.svg
@@ -0,0 +1,122 @@
+
+
diff --git a/data/styles/style-yota/symbols/toilets.svg b/data/styles/style-yota/symbols/toilets.svg
new file mode 100644
index 0000000000..59972928fd
--- /dev/null
+++ b/data/styles/style-yota/symbols/toilets.svg
@@ -0,0 +1,96 @@
+
+
diff --git a/data/styles/style-yota/symbols/traffic_signal.svg b/data/styles/style-yota/symbols/traffic_signal.svg
new file mode 100644
index 0000000000..c231e08175
--- /dev/null
+++ b/data/styles/style-yota/symbols/traffic_signal.svg
@@ -0,0 +1,11 @@
+
+
\ No newline at end of file
diff --git a/data/styles/style-yota/symbols/tramway-mini.svg b/data/styles/style-yota/symbols/tramway-mini.svg
new file mode 100644
index 0000000000..c0481e2110
--- /dev/null
+++ b/data/styles/style-yota/symbols/tramway-mini.svg
@@ -0,0 +1,132 @@
+
+
diff --git a/data/styles/style-yota/symbols/tramway.svg b/data/styles/style-yota/symbols/tramway.svg
new file mode 100644
index 0000000000..8225bbe397
--- /dev/null
+++ b/data/styles/style-yota/symbols/tramway.svg
@@ -0,0 +1,133 @@
+
+
diff --git a/data/styles/style-yota/symbols/tree.svg b/data/styles/style-yota/symbols/tree.svg
new file mode 100644
index 0000000000..03a42fbf83
--- /dev/null
+++ b/data/styles/style-yota/symbols/tree.svg
@@ -0,0 +1,14 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/university.svg b/data/styles/style-yota/symbols/university.svg
new file mode 100644
index 0000000000..ff79248e6e
--- /dev/null
+++ b/data/styles/style-yota/symbols/university.svg
@@ -0,0 +1,85 @@
+
+
diff --git a/data/styles/style-yota/symbols/viewpoint.svg b/data/styles/style-yota/symbols/viewpoint.svg
new file mode 100644
index 0000000000..d8ce2043df
--- /dev/null
+++ b/data/styles/style-yota/symbols/viewpoint.svg
@@ -0,0 +1,57 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/vulcan.svg b/data/styles/style-yota/symbols/vulcan.svg
new file mode 100644
index 0000000000..1bbe8cf958
--- /dev/null
+++ b/data/styles/style-yota/symbols/vulcan.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/data/styles/style-yota/symbols/wastewater.svg b/data/styles/style-yota/symbols/wastewater.svg
new file mode 100644
index 0000000000..bc9988e096
--- /dev/null
+++ b/data/styles/style-yota/symbols/wastewater.svg
@@ -0,0 +1,26 @@
+
+
+
diff --git a/data/styles/style-yota/symbols/waterfall.svg b/data/styles/style-yota/symbols/waterfall.svg
new file mode 100644
index 0000000000..5b6c632a47
--- /dev/null
+++ b/data/styles/style-yota/symbols/waterfall.svg
@@ -0,0 +1,38 @@
+
+
+
+
diff --git a/data/styles/style-yota/symbols/windmill.svg b/data/styles/style-yota/symbols/windmill.svg
new file mode 100644
index 0000000000..577ee9539a
--- /dev/null
+++ b/data/styles/style-yota/symbols/windmill.svg
@@ -0,0 +1,8 @@
+
+
diff --git a/data/styles/style-yota/yota/api-result.png b/data/styles/style-yota/yota/api-result.png
new file mode 100644
index 0000000000..8f3f27e7a7
Binary files /dev/null and b/data/styles/style-yota/yota/api-result.png differ
diff --git a/data/styles/yota/compass-image.png b/data/styles/style-yota/yota/compass-image.png
similarity index 100%
rename from data/styles/yota/compass-image.png
rename to data/styles/style-yota/yota/compass-image.png
diff --git a/data/styles/yota/current-position-compas.png b/data/styles/style-yota/yota/current-position-compas.png
similarity index 100%
rename from data/styles/yota/current-position-compas.png
rename to data/styles/style-yota/yota/current-position-compas.png
diff --git a/data/styles/yota/current-position.png b/data/styles/style-yota/yota/current-position.png
similarity index 100%
rename from data/styles/yota/current-position.png
rename to data/styles/style-yota/yota/current-position.png
diff --git a/data/styles/style-yota/yota/current-routing-compas.png b/data/styles/style-yota/yota/current-routing-compas.png
new file mode 100644
index 0000000000..6ee3b649cd
Binary files /dev/null and b/data/styles/style-yota/yota/current-routing-compas.png differ
diff --git a/data/styles/style-yota/yota/placemark-blue.png b/data/styles/style-yota/yota/placemark-blue.png
new file mode 100644
index 0000000000..c2b686de90
Binary files /dev/null and b/data/styles/style-yota/yota/placemark-blue.png differ
diff --git a/data/styles/style-yota/yota/placemark-brown.png b/data/styles/style-yota/yota/placemark-brown.png
new file mode 100644
index 0000000000..f638920852
Binary files /dev/null and b/data/styles/style-yota/yota/placemark-brown.png differ
diff --git a/data/styles/style-yota/yota/placemark-green.png b/data/styles/style-yota/yota/placemark-green.png
new file mode 100644
index 0000000000..44b8857ff1
Binary files /dev/null and b/data/styles/style-yota/yota/placemark-green.png differ
diff --git a/data/styles/style-yota/yota/placemark-orange.png b/data/styles/style-yota/yota/placemark-orange.png
new file mode 100644
index 0000000000..326ab640c4
Binary files /dev/null and b/data/styles/style-yota/yota/placemark-orange.png differ
diff --git a/data/styles/style-yota/yota/placemark-pink.png b/data/styles/style-yota/yota/placemark-pink.png
new file mode 100644
index 0000000000..8553c98345
Binary files /dev/null and b/data/styles/style-yota/yota/placemark-pink.png differ
diff --git a/data/styles/style-yota/yota/placemark-purple.png b/data/styles/style-yota/yota/placemark-purple.png
new file mode 100644
index 0000000000..878fbef6ac
Binary files /dev/null and b/data/styles/style-yota/yota/placemark-purple.png differ
diff --git a/data/styles/style-yota/yota/placemark-red.png b/data/styles/style-yota/yota/placemark-red.png
new file mode 100644
index 0000000000..33b159be2c
Binary files /dev/null and b/data/styles/style-yota/yota/placemark-red.png differ
diff --git a/data/styles/style-yota/yota/placemark-yellow.png b/data/styles/style-yota/yota/placemark-yellow.png
new file mode 100644
index 0000000000..55a61176ec
Binary files /dev/null and b/data/styles/style-yota/yota/placemark-yellow.png differ
diff --git a/data/styles/style-yota/yota/route_from.png b/data/styles/style-yota/yota/route_from.png
new file mode 100644
index 0000000000..6469d3a2b1
Binary files /dev/null and b/data/styles/style-yota/yota/route_from.png differ
diff --git a/data/styles/style-yota/yota/route_to.png b/data/styles/style-yota/yota/route_to.png
new file mode 100644
index 0000000000..b7e2d64f66
Binary files /dev/null and b/data/styles/style-yota/yota/route_to.png differ
diff --git a/data/styles/style-yota/yota/search-result-active.png b/data/styles/style-yota/yota/search-result-active.png
new file mode 100644
index 0000000000..942dfa2c3a
Binary files /dev/null and b/data/styles/style-yota/yota/search-result-active.png differ
diff --git a/data/styles/yota/search-result.png b/data/styles/style-yota/yota/search-result.png
similarity index 100%
rename from data/styles/yota/search-result.png
rename to data/styles/style-yota/yota/search-result.png