diff --git a/src/styles/osmosnimki-maps.mapcss b/src/styles/osmosnimki-maps.mapcss
index 30df3c5..637281c 100644
--- a/src/styles/osmosnimki-maps.mapcss
+++ b/src/styles/osmosnimki-maps.mapcss
@@ -5,21 +5,28 @@
 
 canvas {fill-color: #fcf8e4}
 
-area[place=city]
-       {fill-color:#f3eceb; z-index:2}
-
+area[place=city],
 area[place=town],
 area[place=hamlet],
 area[place=village],
-area[place=locality],
+area[place=locality]
+       {fill-color:#f3eceb; z-index:1}
+
+area[landuse=residential][residential!=urban]
        {fill-color:#f4d7c7; z-index:2}
- 
+area[landuse=residential][residential=urban]
+       {fill-color:#f4fded; z-index:2}
+
 
 area[landuse=allotments],
 area[leisure=garden],
 area[landuse=orchard]
        {fill-color:#edf2c1; z-index:3}
 
+area|z16-[leisure=garden],
+area|z16-[landuse=orchard]
+       {fill-image:sady10.png; z-index:3}
+
 area[natural=forest], area[natural=wood],
 area[landuse=forest], area[landuse=wood]
        {fill-color: #d6f4c6; z-index:4}
@@ -34,13 +41,17 @@ area[landuse=industrial],area[landuse=military] {fill-color: #ddd8da; z-index:6}
 
 area[landuse=garages] {fill-color: #ddd8da; z-index:7}
 
-area[landuse=cemetery] {fill-color: #e5f5dc; z-index:8}
+area[landuse=cemetery] {fill-color: #e5f5dc; z-index:8; fill-image:cemetry7_2.png}
+
+area[leisure=stadium]{fill-color: #d0ffff; casing-width: 2; casing-color: #00ccff;z-index:8;}
+
 
 way|z-10[waterway=river]   {color: #C4D4F5; width: .6; z-index:9}
 way|z-10[waterway=stream]  {color: #C4D4F5; width: .3; z-index:9}
-way|z10-13[waterway=river] {color: #C4D4F5; width: .7; z-index:9}
-way|z10-13[waterway=stream]{color: #C4D4F5; width: .5; z-index:9}
-way|z10-13[waterway=canal] {color: #abc4f5; width: .6; z-index:9}
+way|z10-14[waterway=river] {color: #C4D4F5; width: .7; z-index:9}
+way|z15-[waterway=river]    {color: #C4D4F5; width: .9; z-index:9}
+way|z10-[waterway=stream]{color: #C4D4F5; width: .5; z-index:9}
+way|z10-[waterway=canal] {color: #abc4f5; width: .6; z-index:9}
 
 way[waterway=riverbank],
 way[natural=water]
@@ -48,23 +59,90 @@ way[natural=water]
 
 way[natural=water]{text:name; text-offset:1; font-size:9; /* font-family: DejaVu Serif Oblique;*/; text-color:#285fd1; text-allow-overlap: false }
 
+way|z15-16[highway=construction]
+{text: name; text-position: line; text-color: #404040; font-family: DejaVu Sans Book; font-size:9;
+casing-width:0.5; casing-color:#996703;
+width:2; color: #ffffff; z-index:10; dashes:9,9}
+
+way|z17-[highway=construction]
+{text: name; text-position: line; text-color: #404040; font-family: DejaVu Sans Book; font-size:9;
+casing-width:0.5; casing-color:#996703;
+width:3; color: #ffffff; z-index:10; dashes:9,9}
+
+way|z15-[highway=footway],
+way|z15-[highway=path],
+way|z15-[highway=cycleway],
+way|z15-[highway=pedestrian],
+{text: name; text-position: line; text-color: #404040; font-family: DejaVu Sans Book; font-size:9;
+casing-width:.3; casing-color:#996703;
+width:.2; color: #ffffff; z-index:10; dashes:2,2}
 
 
 way|z-12[highway=road],
 way|z-12[highway=track]
         {text: name; text-position: line; width:0.2; opacity: 0.5; color: #996703; z-index:10}
 
+
 way|z13[highway=road],
 way|z13[highway=track]
 {text: name; text-position: line; text-color: #404040; font-family: DejaVu Sans Book; font-size:9;
         width:0.6; opacity: 0.5; color: #996703; z-index:10}
 
-way|z13[highway=residential],
+way|z14-16[highway=road],
+way|z14-16[highway=track]
 {text: name; text-position: line; text-color: #404040; font-family: DejaVu Sans Book; font-size:9;
-        width:0.7;  color: #ffffff;
-        casing-width:0.35; casing-color: #996703;
+width:1.5;  color: #ffffff;
+casing-width:0.5; casing-color: #996703;
+z-index:9}
+
+
+way|z16-[highway=road],
+way|z16-[highway=track]
+{text: name; text-position: line; text-color: #404040; font-family: DejaVu Sans Book; font-size:9;
+width:2.5;  color: #ffffff;
+casing-width:0.5; casing-color: #996703;
+z-index:9}
+
+
+
+way|z15[highway=service][living_street=yes],
+way|z15[highway=service][service=parking_aisle],
+{text: name; text-position: line; width:0.2; opacity: 0.5; color: #996703; z-index:10}
+
+
+
+way|z13[highway=residential],
+way|z16-[highway=service][living_street=yes],
+way|z16-[highway=service][service=parking_aisle],
+{text: name; text-position: line; text-color: #404040; font-family: DejaVu Sans Book; font-size:9;
+        width:1.2;  color: #ffffff;
+        casing-width:0.3; casing-color: #996703;
         z-index:10}
 
+way|z14-15[highway=residential],
+way|z14-15[highway=service][living_street!=yes][service!=parking_aisle],
+
+{text: name; text-position: line; text-color: #404040; font-family: DejaVu Sans Book; font-size:9;
+        width:2.5;  color: #ffffff;
+        casing-width:0.5; casing-color: #996703;
+        z-index:10}
+
+way|z16[highway=residential],
+way|z16[highway=service][living_street!=yes][service!=parking_aisle],
+{text: name; text-position: line; text-color: #404040; font-family: DejaVu Sans Book; font-size:9;
+        width:3.5;  color: #ffffff;
+        casing-width:0.5; casing-color: #996703;
+        z-index:10}
+
+way|z17[highway=residential],
+way|z17[highway=service][living_street!=yes][service!=parking_aisle],
+{text: name; text-position: line; text-color: #404040; font-family: DejaVu Sans Book; font-size:9;
+        width:4.5;  color: #ffffff;
+        casing-width:0.5; casing-color: #996703;
+        z-index:10}
+
+
+
 way|z-10[highway=secondary],
 way|z-10[highway=secondary_link]
         {text: name; text-position: line;
@@ -93,6 +171,36 @@ way|z13[highway=secondary_link]
         casing-width:0.35; casing-color: #996703;
         z-index:11}
 
+way|z14[highway=secondary],
+way|z14[highway=secondary_link]
+{text: name; text-position: line; text-color: #404040; font-family: DejaVu Sans Bold; font-size:9;
+        width:5;  color: #fcffd1;
+        casing-width:0.5; casing-color: #996703;
+        z-index:11}
+
+way|z15[highway=secondary],
+way|z15[highway=secondary_link]
+{text: name; text-position: line; text-color: #404040; font-family: DejaVu Sans Bold; font-size:9;
+        width:6;  color: #fcffd1;
+        casing-width:0.5; casing-color: #996703;
+        z-index:11}
+
+way|z16[highway=secondary],
+way|z16[highway=secondary_link]
+{text: name; text-position: line; text-color: #404040; font-family: DejaVu Sans Bold; font-size:9;
+        width:7;  color: #fcffd1;
+        casing-width:0.5; casing-color: #996703;
+        z-index:11}
+
+
+way|z17[highway=secondary],
+way|z17[highway=secondary_link]
+{text: name; text-position: line; text-color: #404040; font-family: DejaVu Sans Bold; font-size:9;
+        width:8;  color: #fcffd1;
+        casing-width:0.5; casing-color: #996703;
+        z-index:11}
+
+
 
 
 
@@ -123,6 +231,34 @@ way|z13[highway=primary_link]
         casing-width:.5; casing-color: #996703;
         z-index:12}
 
+way|z14[highway=primary],
+way|z14[highway=primary_link]
+        {text: name; text-position: line; text-color: #404040; font-family: DejaVu Sans Bold; font-size:9;
+        width:7;  color: #fcea97;
+        casing-width:.5; casing-color: #996703;
+        z-index:12}
+
+way|z15[highway=primary],
+way|z15[highway=primary_link]
+        {text: name; text-position: line; text-color: #404040; font-family: DejaVu Sans Bold; font-size:9;
+        width:8;  color: #fcea97;
+        casing-width:.5; casing-color: #996703;
+        z-index:12}
+
+way|z16[highway=primary],
+way|z16[highway=primary_link]
+        {text: name; text-position: line; text-color: #404040; font-family: DejaVu Sans Bold; font-size:9;
+        width:9;  color: #fcea97;
+        casing-width:.5; casing-color: #996703;
+        z-index:12}
+
+way|z17[highway=primary],
+way|z17[highway=primary_link]
+        {text: name; text-position: line; text-color: #404040; font-family: DejaVu Sans Bold; font-size:9;
+        width:10;  color: #fcea97;
+        casing-width:.5; casing-color: #996703;
+        z-index:12}
+
 
 
 way|z-10[highway=trunk],
@@ -155,19 +291,62 @@ way|z12[highway=motorway_link]
 way|z13[highway=trunk],
 way|z13[highway=trunk_link],
 way|z13[highway=motorway],
-way|z13[highway=motorway_link]
+way|z13[highway=motorway_link],
 {text: name; text-position: line; text-color: #404040; font-family: DejaVu Sans Bold; font-size:9;
         width:8;  color: #ffd780;
         casing-width:1; casing-color: #996703;
         z-index:13}
 
+way|z14[highway=trunk],
+way|z14[highway=trunk_link],
+way|z14[highway=motorway],
+way|z14[highway=motorway_link],
+{text: name; text-position: line; text-color: #404040; font-family: DejaVu Sans Bold; font-size:9;
+        width:9;  color: #ffd780;
+        casing-width:1; casing-color: #996703;
+        z-index:13}
+
+
+way|z15[highway=trunk],
+way|z15[highway=trunk_link],
+way|z15[highway=motorway],
+way|z15[highway=motorway_link],
+{text: name; text-position: line; text-color: #404040; font-family: DejaVu Sans Bold; font-size:9;
+        width:10;  color: #ffd780;
+        casing-width:1; casing-color: #996703;
+        z-index:13}
+
+way|z16[highway=trunk],
+way|z16[highway=trunk_link],
+way|z16[highway=motorway],
+way|z16[highway=motorway_link],
+{text: name; text-position: line; text-color: #404040; font-family: DejaVu Sans Bold; font-size:9;
+        width:11;  color: #ffd780;
+        casing-width:1; casing-color: #996703;
+        z-index:13}
+
+way|z17[highway=trunk],
+way|z17[highway=trunk_link],
+way|z17[highway=motorway],
+way|z17[highway=motorway_link],
+{text: name; text-position: line; text-color: #404040; font-family: DejaVu Sans Bold; font-size:9;
+        width:12;  color: #ffd780;
+        casing-width:1; casing-color: #996703;
+        z-index:13}
+
+
 
 way[highway=trunk]::centerline,
 way[highway=trunk_link]::centerline,
 way[highway=motorway]::centerline,
-way[highway=motorway_link]::centerline
+way[highway=motorway_link]::centerline,
+way|z13-[highway=primary]::centerline,
+way|z13-[highway=primary_link]::centerline,
         {width:.3;  color: #fa6478; z-index:14}
 
+way|z17-[oneway=yes]{line-style:arrows;z-index:15}
+
+
 way[railway=rail]
     {width:1.4; color: #606060;z-index:15}
 way[railway=rail]::ticks
@@ -177,6 +356,25 @@ way|z12-[railway=subway]
 {width:3; color: #072889;z-index:15; dashes:3,3; opacity:0.3}
 
 
+node|z15-[amenity=fuel]{icon-image:tankstelle1_10x11.png}
+node|z16-[amenity=pharmacy]{icon-image:med1_11x14.png}
+node|z16-[amenity=cinema]{icon-image:cinema_14x14.png}
+node|z16-[amenity=museum]{icon-image:mus_13x12.png}
+node|z16-[tourism=zoo]{icon-image:zoo4_14x14.png}
+node|z16-[amenity=сourthouse]{icon-image:sud_14x13.png}
+node|z16-[amenity=theatre]{icon-image:teater_14x14.png}
+node|z16-[amenity=university]{icon-image:univer_15x11.png}
+node|z16-[amenity=toilets]{icon-image:wc-3_13x13.png}
+node|z16-[amenity=place_of_worship][religion=christian]{icon-image:pravosl_kupol_11x15.png}
+
+node|z17-[amenity=kindergarten]{icon-image:kindergarten_14x14.png}
+node|z17-[amenity=school]{icon-image:school_13x13.png}
+node|z17-[amenity=library]{icon-image:lib_13x14.png}
+node|z17-[tourism=hotel]{icon-image:hotell_14x14.png}
+node|z17-[amenity=post_office]{icon-image:post_14x11.png}
+node|z17-[amenity=restaurant]{icon-image:rest_14x14.png}
+node|z17-[shop]{icon-image:superm_12x12.png}
+
 way[boundary=administrative][admin_level=2]
    {casing-width: 4; casing-opacity: 0.5; casing-color: #d4d4d4; casing-dashes:;
     width: 0.5; color: #202020; dashes: 6,4,1,4; opacity:0.7; z-index:16}
@@ -191,20 +389,21 @@ way[boundary=administrative][admin_level=6]
 {casing-width: 1; casing-opacity: 0.3; casing-color: #808080; casing-dashes:;
 width: 0.5; color: #808080; dashes: 2,2; opacity:0.3; z-index:16}*/
 
+way|z12-[railway=tram]{line-style:rway44.png;z-index:17}
 
 
 node[railway=station][transport!=subway] {icon-image:rw_stat_stanzii_2_blue.png;
-text:name; text-offset:7; font-size:9; font-family: DejaVu Sans Mono Book; text-halo-radius:1; text-color:#000d6c;text-halo-color:#ffffff; text-allow-overlap: false
+text:name; text-offset:7; font-size:9; font-family: DejaVu Sans Mono Book; text-halo-radius:1; text-color:#000d6c;text-halo-color:#ffffff; text-allow-overlap: false;z-index:17
 }
 
 node|z12-[railway=station][transport=subway] {icon-image:metro_others6.png;
-text:name; text-offset:11; font-size:9; font-family: DejaVu Sans Book; text-halo-radius:2; text-color:#1300bb;text-halo-color:#ffffff; text-allow-overlap: false
+text:name; text-offset:11; font-size:9; font-family: DejaVu Sans Book; text-halo-radius:2; text-color:#1300bb;text-halo-color:#ffffff; text-allow-overlap: false;z-index:17
 }
 
 
 node[aeroway=aerodrome]
        {icon-image:airport_world.png;
-       text:name; text-offset:12; font-size:9; font-family: DejaVu Sans Condensed Bold; text-halo-radius:1; text-color:#1e7ca5;text-halo-color:#ffffff; text-allow-overlap: false}
+       text:name; text-offset:12; font-size:9; font-family: DejaVu Sans Condensed Bold; text-halo-radius:1; text-color:#1e7ca5;text-halo-color:#ffffff; text-allow-overlap: false;z-index:17}
 
 
 node|z-12[place=city] {text:name; text-offset:-20; font-size:14; font-family: DejaVu Sans Bold; text-halo-radius:3; text-color:#101010;text-halo-color:#ffffff; text-allow-overlap: true}
@@ -263,7 +462,7 @@ area|z10-[boundary=administrative][admin_level=6]
 
 
 
-way[leisure=stadium]{fill-color: #d0ffff; casing-width: 2; casing-color: #00ccff;z-index:10;}
+
 
 /*way[railway=tram]{width: eval( any( metric(tag("width")), metric("1.52m")));color: #ffffff; casing-color: #000000}
             {width: eval( metric("2.7m")); color: #000000; dashes: 1,10; z-index:1; object-id: "shpala"}*/
@@ -271,15 +470,10 @@ way[leisure=stadium]{fill-color: #d0ffff; casing-width: 2; casing-color: #00ccff
 /*way[landuse=industrial] {fill-color: #855}*/
 
 
-
-area|z12-[building=yes] {
-  width: .5;
-  fill-color: #E7CCB4;
-  color: #D29D39;
-  z-index:7;
-}
-area|z12-[building][building != yes] {fill-color: #D8D1D1; z-index:7;}
-area|z15-[building=yes] {text: addr:housenumber; text-halo-radius:1; text-position: center;}
+area|z12-[building] {width: .5;color: #D29D39; z-index:17;}
+area|z12-[building=yes] { fill-color: #E7CCB4;  z-index:17;}
+area|z12-[building][building != yes] {fill-color: #D8D1D1; z-index:17;}
+area|z15-[building] {text: addr:housenumber; text-halo-radius:1; text-position: center;}
 
 
-node|z13-[highway=milestone][pk]{text:pk; }
+node|z13-[highway=milestone][pk]{text:pk; text-halo-radius:5}