diff --git a/Google/Ghyb.zmp/params.txt b/Google/Ghyb.zmp/params.txt
index 3b5aa7ce6..0d94d7415 100644
--- a/Google/Ghyb.zmp/params.txt
+++ b/Google/Ghyb.zmp/params.txt
@@ -3,10 +3,12 @@
 pnum=1
 GUID={F25E37ED-923B-41E7-8BA6-CC0CC3213B93}
 asLayer=1
-name_ru=Гибрид (Google)
-name=Hybrid (Google)
-name_uk=Гібрид (Google)
-ParentSubMenu=Google
+ParentSubMenu_ru=Подписи и границы
+ParentSubMenu=Labels and borders
+ParentSubMenu_uk=Підписи та межі
+name_ru=Google - Гибрид
+name=Google - Hybrid 
+name_uk=Google - Гібрид
 NameInCache=Both
 DefURLBase=http://mt.google.com/vt/lyrs=h@169000000&hl=ru
 ContentType=image/png
diff --git a/Google/GoogleEarth/GoogleEarth.Direct/Terrain/GoogleEarth.Earth.Terrain.zmp/params.txt b/Google/GoogleEarth/GoogleEarth.Direct/Terrain/GoogleEarth.Earth.Terrain.zmp/params.txt
index 7b88f7e50..9fb48a010 100644
--- a/Google/GoogleEarth/GoogleEarth.Direct/Terrain/GoogleEarth.Earth.Terrain.zmp/params.txt
+++ b/Google/GoogleEarth/GoogleEarth.Direct/Terrain/GoogleEarth.Earth.Terrain.zmp/params.txt
@@ -3,7 +3,9 @@
 GUID={E45E5615-C318-4961-9247-E3139BAC1D80}
 name_ru=Земля - Рельеф (GoogleEarth)
 name=Earth - Terrain (GoogleEarth)
-ParentSubMenu=GoogleEarth
+ParentSubMenu_ru=Сломанные карты\GoogleEarth
+ParentSubMenu=Not working\GoogleEarth
+ParentSubMenu_uk=Сломанные карты\GoogleEarth
 asLayer=1
 EPSG=4326
 CacheType=51
diff --git a/Google/GoogleEarth/GoogleEarth.Direct/Terrain/GoogleEarth.Mars.Terrain.zmp/params.txt b/Google/GoogleEarth/GoogleEarth.Direct/Terrain/GoogleEarth.Mars.Terrain.zmp/params.txt
index 98f83b02b..94b31faf7 100644
--- a/Google/GoogleEarth/GoogleEarth.Direct/Terrain/GoogleEarth.Mars.Terrain.zmp/params.txt
+++ b/Google/GoogleEarth/GoogleEarth.Direct/Terrain/GoogleEarth.Mars.Terrain.zmp/params.txt
@@ -3,7 +3,9 @@
 GUID={309B0BF2-AC93-4A97-8DA3-E13FE6B8E95F}
 name_ru=Марс - Рельеф (GoogleEarth)
 name=Mars - Terrain (GoogleEarth)
-ParentSubMenu=GoogleEarth
+ParentSubMenu_ru=Сломанные карты\GoogleEarth
+ParentSubMenu=Not working\GoogleEarth
+ParentSubMenu_uk=Сломанные карты\GoogleEarth
 asLayer=1
 EPSG=4326
 CacheType=51
diff --git a/Google/GoogleEarth/GoogleEarth.Direct/Terrain/GoogleEarth.Moon.Terrain.zmp/params.txt b/Google/GoogleEarth/GoogleEarth.Direct/Terrain/GoogleEarth.Moon.Terrain.zmp/params.txt
index e147b6193..d20ad12f2 100644
--- a/Google/GoogleEarth/GoogleEarth.Direct/Terrain/GoogleEarth.Moon.Terrain.zmp/params.txt
+++ b/Google/GoogleEarth/GoogleEarth.Direct/Terrain/GoogleEarth.Moon.Terrain.zmp/params.txt
@@ -3,7 +3,9 @@
 GUID={17903835-5F6A-45F4-8D34-AB1FAC648319}
 name_ru=Луна - Рельеф (GoogleEarth)
 name=Moon - Terrain (GoogleEarth)
-ParentSubMenu=GoogleEarth
+ParentSubMenu_ru=Сломанные карты\GoogleEarth
+ParentSubMenu=Not working\GoogleEarth
+ParentSubMenu_uk=Сломанные карты\GoogleEarth
 asLayer=1
 EPSG=4326
 CacheType=51
diff --git a/Google/GoogleTraf.zmp/params.txt b/Google/GoogleTraf.zmp/params.txt
index 321f0308f..1160d6899 100644
--- a/Google/GoogleTraf.zmp/params.txt
+++ b/Google/GoogleTraf.zmp/params.txt
@@ -3,10 +3,12 @@
 pnum=48
 GUID={D61F9933-CE83-46CE-96AD-AEC88E0E7E05}
 asLayer=1
-name_ru=Пробки (Google Maps)
-name=Traffic (Google Maps)
-name_uk=Пробки (Google Maps)
-ParentSubMenu=Google
+ParentSubMenu_ru=Пробки
+ParentSubMenu_uk=Пробки
+ParentSubMenu=Traffic
+name_ru=Google Maps - Пробки
+name=Google Maps - Traffic
+name_uk=Google Maps - Пробки
 NameInCache=googletraf
 DefURLBase=http://mt1.google.com/vt?hl=ru&lyrs=h@159000000,traffic|seconds_into_week:-1&style=15&
 ContentType=image/png
diff --git a/Google/Panoramio_KML.zmp/params.txt b/Google/Panoramio_KML.zmp/params.txt
index c2358b418..2c42e83ea 100644
--- a/Google/Panoramio_KML.zmp/params.txt
+++ b/Google/Panoramio_KML.zmp/params.txt
@@ -3,13 +3,14 @@
 pnum=44
 GUID={3C6C8E9B-D455-425F-9652-11F8CB3D3613}
 asLayer=1
+ParentSubMenu_ru=Сломанные карты\Google
+ParentSubMenu=Not working\Google
 name=Panoramio KML
 NameInCache=Pano_KML
 DefURLBase=http://www.panoramio.com/panoramio.kml?all&LANG=ru_RU.utf8&BBOX=
 ContentType=application/vnd.google-earth.kml+xml; charset=utf-8
 MimeTypeSubst="""application/vnd.google-earth.kml+xml; charset=utf-8""=application/vnd.google-earth.kml+xml"
 MainStorageContentType=application/vnd.sas.wikimapia.kml+xml
-ParentSubMenu=Google
 Ext=.kml
 projection=1
 sradiusa=6378137
diff --git a/Osm/osm_layer_transport.zmp/params.txt b/Osm/osm_layer_transport.zmp/params.txt
index 3cd6eba82..92da87f42 100644
--- a/Osm/osm_layer_transport.zmp/params.txt
+++ b/Osm/osm_layer_transport.zmp/params.txt
@@ -3,6 +3,8 @@
 pnum=115
 GUID={36e3746e-20f7-4861-82f9-911195f9de9b}
 asLayer=1
+ParentSubMenu_ru=Сломанные карты\OSM
+ParentSubMenu=Not working\OSM
 name_ru=Транспорт OSM (osmosnimki.ru)
 name=Transport OSM (osmosnimki.ru)
 name_uk=Транспорт OSM (osmosnimki.ru)
@@ -14,7 +16,6 @@ projection=1
 sradiusa=6378137
 sradiusb=6378137
 separator=1
-PARENTSUBMENU=OSM
 RequestHead=User-Agent: SAS.Planet
 IteratorSubRectSize=8,8
 License=© OpenStreetMap contributors, CC-BY-SA; rendering by kosmosnimki.ru
diff --git a/Osm/osm_mapsurfer_hillshade.zmp/params.txt b/Osm/osm_mapsurfer_hillshade.zmp/params.txt
index 08f44997e..2a8c91bab 100644
--- a/Osm/osm_mapsurfer_hillshade.zmp/params.txt
+++ b/Osm/osm_mapsurfer_hillshade.zmp/params.txt
@@ -3,9 +3,9 @@
 pnum=118
 GUID={AB8A8685-AEC6-4E16-80DA-DA4AC37E4777}
 asLayer=1
-name_ru=OpenMapSurfer (рельеф)
-name=OpenMapSurfer (hillshade)
-name_uk=OpenMapSurfer (рельєф)
+name_ru=OpenMapSurfer
+name=OpenMapSurfer
+name_uk=OpenMapSurfer
 ParentSubMenu_ru=Рельеф и тополинии
 ParentSubMenu=Hillshade
 ParentSubMenu_uk=Рельєф і тополинии
diff --git a/Other/Water.zmp/params.txt b/Other/Water.zmp/params.txt
index c15bef738..4938ed694 100644
--- a/Other/Water.zmp/params.txt
+++ b/Other/Water.zmp/params.txt
@@ -3,13 +3,14 @@
 pnum=43
 GUID={BF0F5E1C-4E9B-43DE-990F-2F26618A6274}
 asLayer=1
+ParentSubMenu_ru=Водные карты
+ParentSubMenu=Water maps
 name_ru=Водные ресурсы (maps-for-free)
 name=Water resource (maps-for-free)
 name_uk=Водні ресурси (maps-for-free)
 NameInCache=water
 DefURLBase=http://www.maps-for-free.com/layer/water/
 ContentType=image/gif
-ParentSubMenu_ru=
 Ext=.gif
 projection=1
 sradiusa=6378137
diff --git a/Yandex/YaHyb.zmp/params.txt b/Yandex/YaHyb.zmp/params.txt
index cc46c821f..6364e1586 100644
--- a/Yandex/YaHyb.zmp/params.txt
+++ b/Yandex/YaHyb.zmp/params.txt
@@ -3,12 +3,12 @@
 pnum=5
 GUID={02D3A3D6-870D-4549-933C-172CB11EA71B}
 asLayer=1
-name_ru=Гибрид (Яндекс.Карты)
-name=Hybrid (Yandex.Maps)
-name_uk=Гібрид (Яндекс.Карты)
-ParentSubMenu_ru=Яндекс
-ParentSubMenu=Yandex
-ParentSubMenu_uk=Яндекс
+ParentSubMenu_ru=Подписи и границы
+ParentSubMenu_uk=Підписи та межі
+ParentSubMenu=Labels and borders
+name_ru=Яндекс.Карты - Гибрид
+name=Yandex.Maps - Hybrid
+name_uk=Яндекс.Карты - Гібрид
 NameInCache=yahyb
 DefURLBase=https://vec01.maps.yandex.net/tiles?l=skl&scale=1&lang=ru_RU&x=
 ContentType=image/png
diff --git a/Yandex/YaTraf.zmp/18.bmp b/Yandex/YaTraf.zmp/18.bmp
deleted file mode 100644
index 271375696..000000000
Binary files a/Yandex/YaTraf.zmp/18.bmp and /dev/null differ
diff --git a/Yandex/YaTraf.zmp/24.bmp b/Yandex/YaTraf.zmp/24.bmp
index 057d4a869..108dd576a 100644
Binary files a/Yandex/YaTraf.zmp/24.bmp and b/Yandex/YaTraf.zmp/24.bmp differ
diff --git a/Yandex/YaTraf.zmp/params.txt b/Yandex/YaTraf.zmp/params.txt
index b5af2fd14..a2a4e503e 100644
--- a/Yandex/YaTraf.zmp/params.txt
+++ b/Yandex/YaTraf.zmp/params.txt
@@ -1,14 +1,13 @@
 
 [PARAMS]
-pnum=47
 GUID={C32B96AD-3AC5-4170-ADD7-47B2222AFC99}
 asLayer=1
-name_ru=Пробки (Яндекс.Карты)
-name=Traffic (Yandex.Maps)
-name_uk=Пробки (Яндекс.Карты)
-ParentSubMenu_ru=Яндекс
-ParentSubMenu=Yandex
-ParentSubMenu_uk=Яндекс
+ParentSubMenu_ru=Пробки
+ParentSubMenu_uk=Пробки
+ParentSubMenu=Traffic
+name_ru=Яндекс - Пробки
+name=Yandex - Traffic
+name_uk=Яндекс - Пробки
 NameInCache=yatraf
 DefURLBase=https://core-jams-rdr.maps.yandex.net/1.1/tiles?trf&l=trf&scale=1&lang=ru&x=
 ContentType=image/png