diff --git a/_ESRI/ArcGIS.Hybrid.zmp/24.bmp b/_ESRI/ArcGIS.Hybrid.zmp/24.bmp
new file mode 100644
index 000000000..71e2e11cc
Binary files /dev/null and b/_ESRI/ArcGIS.Hybrid.zmp/24.bmp differ
diff --git a/_Genshtab/Esri_Topo_maps.zmp/GetUrlScript.txt b/_ESRI/ArcGIS.Hybrid.zmp/GetUrlScript.txt
similarity index 100%
rename from _Genshtab/Esri_Topo_maps.zmp/GetUrlScript.txt
rename to _ESRI/ArcGIS.Hybrid.zmp/GetUrlScript.txt
diff --git a/_ESRI/ArcGIS.Hybrid.zmp/info.txt b/_ESRI/ArcGIS.Hybrid.zmp/info.txt
new file mode 100644
index 000000000..645333993
--- /dev/null
+++ b/_ESRI/ArcGIS.Hybrid.zmp/info.txt
@@ -0,0 +1,2 @@
+ESRI<br>
+<a href="http://www.arcgis.com/home/webmap/viewer.html?useExisting=1">www.arcgis.com</a>
\ No newline at end of file
diff --git a/_ESRI/ArcGIS.Hybrid.zmp/params.txt b/_ESRI/ArcGIS.Hybrid.zmp/params.txt
new file mode 100644
index 000000000..b0ff47829
--- /dev/null
+++ b/_ESRI/ArcGIS.Hybrid.zmp/params.txt
@@ -0,0 +1,17 @@
+[PARAMS]
+pnum=
+GUID={7B743985-BC5F-4AB6-8915-BC5DBBB8F552}
+asLayer=1
+name=ArcGIS.Hybrid
+name_en=ArcGIS.Hybrid
+NameInCache=ArcGIS.Hybrid
+DefURLBase=http://server.arcgisonline.com/ArcGIS/rest/services/Reference/World_Boundaries_and_Places/MapServer/tile/
+ContentType=image/png
+Ext=.png
+projection=1
+sradiusa=6378137
+sradiusb=6356752
+separator=0
+UseDwn=1
+Sleep=0
+DefHotKey=0
diff --git a/_ESRI/ArcGIS.Imagery.zmp/24.bmp b/_ESRI/ArcGIS.Imagery.zmp/24.bmp
new file mode 100644
index 000000000..71e2e11cc
Binary files /dev/null and b/_ESRI/ArcGIS.Imagery.zmp/24.bmp differ
diff --git a/_Genshtab/USA_Topo_Maps.zmp/GetUrlScript.txt b/_ESRI/ArcGIS.Imagery.zmp/GetUrlScript.txt
similarity index 100%
rename from _Genshtab/USA_Topo_Maps.zmp/GetUrlScript.txt
rename to _ESRI/ArcGIS.Imagery.zmp/GetUrlScript.txt
diff --git a/_ESRI/ArcGIS.Imagery.zmp/info.txt b/_ESRI/ArcGIS.Imagery.zmp/info.txt
new file mode 100644
index 000000000..645333993
--- /dev/null
+++ b/_ESRI/ArcGIS.Imagery.zmp/info.txt
@@ -0,0 +1,2 @@
+ESRI<br>
+<a href="http://www.arcgis.com/home/webmap/viewer.html?useExisting=1">www.arcgis.com</a>
\ No newline at end of file
diff --git a/_ESRI/ArcGIS.Imagery.zmp/params.txt b/_ESRI/ArcGIS.Imagery.zmp/params.txt
new file mode 100644
index 000000000..96536f3bb
--- /dev/null
+++ b/_ESRI/ArcGIS.Imagery.zmp/params.txt
@@ -0,0 +1,19 @@
+[PARAMS]
+pnum=
+GUID={7B743985-BC5F-4AB6-8915-AC5DBBB8F552}
+asLayer=0
+name=ArcGIS.Imagery
+name_en=ArcGIS.Imagery
+NameInCache=ArcGIS.Imagery
+ParentSubMenu=ESRI
+ParentSubMenu_en=ESRI
+DefURLBase=http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/
+ContentType=image/jpg
+Ext=.jpg
+projection=1
+sradiusa=6378137
+sradiusb=6356752
+separator=0
+UseDwn=1
+Sleep=0
+DefHotKey=0
diff --git a/_ESRI/Esri_Topo_maps.zmp/24.bmp b/_ESRI/Esri_Topo_maps.zmp/24.bmp
new file mode 100644
index 000000000..71e2e11cc
Binary files /dev/null and b/_ESRI/Esri_Topo_maps.zmp/24.bmp differ
diff --git a/_ESRI/Esri_Topo_maps.zmp/GetUrlScript.txt b/_ESRI/Esri_Topo_maps.zmp/GetUrlScript.txt
new file mode 100644
index 000000000..e9804e504
--- /dev/null
+++ b/_ESRI/Esri_Topo_maps.zmp/GetUrlScript.txt
@@ -0,0 +1,3 @@
+begin
+ ResultURL:=GetURLBase+inttostr(GetZ-1)+'/'+inttostr(GetY)+'/'+inttostr(GetX);
+end.
\ No newline at end of file
diff --git a/_ESRI/Esri_Topo_maps.zmp/info.txt b/_ESRI/Esri_Topo_maps.zmp/info.txt
new file mode 100644
index 000000000..645333993
--- /dev/null
+++ b/_ESRI/Esri_Topo_maps.zmp/info.txt
@@ -0,0 +1,2 @@
+ESRI<br>
+<a href="http://www.arcgis.com/home/webmap/viewer.html?useExisting=1">www.arcgis.com</a>
\ No newline at end of file
diff --git a/_Genshtab/Esri_Topo_maps.zmp/params.txt b/_ESRI/Esri_Topo_maps.zmp/params.txt
similarity index 75%
rename from _Genshtab/Esri_Topo_maps.zmp/params.txt
rename to _ESRI/Esri_Topo_maps.zmp/params.txt
index 6acf702cf..a1741753e 100644
--- a/_Genshtab/Esri_Topo_maps.zmp/params.txt
+++ b/_ESRI/Esri_Topo_maps.zmp/params.txt
@@ -6,9 +6,9 @@ name=ESRI_Topo_Maps
 name_en=ESRI_Topo_Maps
 NameInCache=ESRI_Topo_Maps
 DefURLBase=http://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer/tile/
-ContentType=image/jpeg
-ParentSubMenu=Ãåíøòàá
-ParentSubMenu_en=Genshtab
+ContentType=image/jpg
+ParentSubMenu=ESRI
+ParentSubMenu_en=ESRI
 Ext=.jpg
 projection=1
 sradiusa=6378137
@@ -16,4 +16,4 @@ sradiusb=6356752
 separator=0
 UseDwn=1
 Sleep=0
-DefHotKey=0
+DefHotKey=0
\ No newline at end of file
diff --git a/_ESRI/USA_Topo_Maps.zmp/24.bmp b/_ESRI/USA_Topo_Maps.zmp/24.bmp
new file mode 100644
index 000000000..71e2e11cc
Binary files /dev/null and b/_ESRI/USA_Topo_Maps.zmp/24.bmp differ
diff --git a/_ESRI/USA_Topo_Maps.zmp/EmptyTiles/NA.jpg b/_ESRI/USA_Topo_Maps.zmp/EmptyTiles/NA.jpg
new file mode 100644
index 000000000..411c6dac3
Binary files /dev/null and b/_ESRI/USA_Topo_Maps.zmp/EmptyTiles/NA.jpg differ
diff --git a/_ESRI/USA_Topo_Maps.zmp/GetUrlScript.txt b/_ESRI/USA_Topo_Maps.zmp/GetUrlScript.txt
new file mode 100644
index 000000000..e9804e504
--- /dev/null
+++ b/_ESRI/USA_Topo_Maps.zmp/GetUrlScript.txt
@@ -0,0 +1,3 @@
+begin
+ ResultURL:=GetURLBase+inttostr(GetZ-1)+'/'+inttostr(GetY)+'/'+inttostr(GetX);
+end.
\ No newline at end of file
diff --git a/_ESRI/USA_Topo_Maps.zmp/info.txt b/_ESRI/USA_Topo_Maps.zmp/info.txt
new file mode 100644
index 000000000..645333993
--- /dev/null
+++ b/_ESRI/USA_Topo_Maps.zmp/info.txt
@@ -0,0 +1,2 @@
+ESRI<br>
+<a href="http://www.arcgis.com/home/webmap/viewer.html?useExisting=1">www.arcgis.com</a>
\ No newline at end of file
diff --git a/_Genshtab/USA_Topo_Maps.zmp/params.txt b/_ESRI/USA_Topo_Maps.zmp/params.txt
similarity index 75%
rename from _Genshtab/USA_Topo_Maps.zmp/params.txt
rename to _ESRI/USA_Topo_Maps.zmp/params.txt
index 3320be976..8a07a0178 100644
--- a/_Genshtab/USA_Topo_Maps.zmp/params.txt
+++ b/_ESRI/USA_Topo_Maps.zmp/params.txt
@@ -6,9 +6,9 @@ name=USA_Topo_Maps
 name_en=USA_Topo_Maps
 NameInCache=USA_Topo_Maps
 DefURLBase=http://services.arcgisonline.com/ArcGIS/rest/services/USA_Topo_Maps/MapServer/tile/
-ContentType=image/jpeg
-ParentSubMenu=Ãåíøòàá
-ParentSubMenu_en=Genshtab
+ContentType=image/jpg
+ParentSubMenu=ESRI
+ParentSubMenu_en=ESRI
 Ext=.jpg
 projection=1
 sradiusa=6378137
@@ -16,4 +16,4 @@ sradiusb=6356752
 separator=0
 UseDwn=1
 Sleep=0
-DefHotKey=0
+DefHotKey=0
\ No newline at end of file
diff --git a/_Genshtab/Esri_Topo_maps.zmp/18.bmp b/_Genshtab/Esri_Topo_maps.zmp/18.bmp
deleted file mode 100644
index 68d04cf31..000000000
Binary files a/_Genshtab/Esri_Topo_maps.zmp/18.bmp and /dev/null differ
diff --git a/_Genshtab/Esri_Topo_maps.zmp/24.bmp b/_Genshtab/Esri_Topo_maps.zmp/24.bmp
deleted file mode 100644
index 83ab3a291..000000000
Binary files a/_Genshtab/Esri_Topo_maps.zmp/24.bmp and /dev/null differ
diff --git a/_Genshtab/USA_Topo_Maps.zmp/18.bmp b/_Genshtab/USA_Topo_Maps.zmp/18.bmp
deleted file mode 100644
index e293f27a8..000000000
Binary files a/_Genshtab/USA_Topo_Maps.zmp/18.bmp and /dev/null differ
diff --git a/_Genshtab/USA_Topo_Maps.zmp/24.bmp b/_Genshtab/USA_Topo_Maps.zmp/24.bmp
deleted file mode 100644
index e0ca6efc7..000000000
Binary files a/_Genshtab/USA_Topo_Maps.zmp/24.bmp and /dev/null differ