diff --git a/4UMaps/4UMaps.xml b/4UMaps/4UMaps.xml
deleted file mode 100644
index a4babea..0000000
--- a/4UMaps/4UMaps.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 4UMaps
- 0
- 18
- png
- https://tileserver.4umaps.com/{$z}/{$x}/{$y}.png
- None
- #000000
- false
-
-
\ No newline at end of file
diff --git a/Bing/Bing_Hybrid.xml b/Bing/Bing_Hybrid.xml
index af058e2..3fdc002 100644
--- a/Bing/Bing_Hybrid.xml
+++ b/Bing/Bing_Hybrid.xml
@@ -1,6 +1,6 @@
- Bing Hybrid
+ Bing - Hybrid
0
20
png
diff --git a/Bing/Bing_Maps.xml b/Bing/Bing_Maps.xml
index 14d5dfa..e75e6a9 100644
--- a/Bing/Bing_Maps.xml
+++ b/Bing/Bing_Maps.xml
@@ -1,6 +1,6 @@
- Bing Street
+ Bing - Maps
0
20
png
diff --git a/Chartbundle/Chartbundle IFR High.xml b/Chartbundle/Chartbundle IFR High.xml
deleted file mode 100644
index 3b4e2c1..0000000
--- a/Chartbundle/Chartbundle IFR High.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
- Chartbundle IFR High
- 4
- 13
- png
- None
- http://wms.chartbundle.com/tms/v1.0/enrh/{$z}/{$x}/{$y}.png?type=google
- #000000
-
\ No newline at end of file
diff --git a/Chartbundle/Chartbundle IFR Low.xml b/Chartbundle/Chartbundle IFR Low.xml
deleted file mode 100644
index 301498f..0000000
--- a/Chartbundle/Chartbundle IFR Low.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
- Chartbundle IFR Low
- 4
- 13
- png
- None
- http://wms.chartbundle.com/tms/v1.0/enrl/{$z}/{$x}/{$y}.png?type=google
- #000000
-
\ No newline at end of file
diff --git a/Chartbundle/Chartbundle Sectional.xml b/Chartbundle/Chartbundle Sectional.xml
deleted file mode 100644
index 90c2b2a..0000000
--- a/Chartbundle/Chartbundle Sectional.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
- Chartbundle Sectional
- 4
- 12
- png
- None
- http://wms.chartbundle.com/tms/v1.0/sec/{$z}/{$x}/{$y}.png?type=google
- #000000
-
\ No newline at end of file
diff --git a/ESRI/ESRI Clarity.xml b/ESRI/esri_clarity.xml
similarity index 87%
rename from ESRI/ESRI Clarity.xml
rename to ESRI/esri_clarity.xml
index 039bef0..7478755 100644
--- a/ESRI/ESRI Clarity.xml
+++ b/ESRI/esri_clarity.xml
@@ -1,6 +1,6 @@
- ESRI World Imagery (Clarity) Beta
+ Esri - Clarity
1
20
jpg
diff --git a/ESRI/ESRI Nat Geo World.xml b/ESRI/esri_nat_geo_world.xml
similarity index 90%
rename from ESRI/ESRI Nat Geo World.xml
rename to ESRI/esri_nat_geo_world.xml
index 4597cec..b89ab32 100644
--- a/ESRI/ESRI Nat Geo World.xml
+++ b/ESRI/esri_nat_geo_world.xml
@@ -1,6 +1,6 @@
- ESRI Nat Geo World
+ Esri - Nat Geo World
1
20
jpg
diff --git a/ESRI/USA Topo Maps.xml b/ESRI/esri_usa_topo_maps.xml
similarity index 90%
rename from ESRI/USA Topo Maps.xml
rename to ESRI/esri_usa_topo_maps.xml
index c2c401c..0a5a8bb 100644
--- a/ESRI/USA Topo Maps.xml
+++ b/ESRI/esri_usa_topo_maps.xml
@@ -1,6 +1,6 @@
- USA Topo Maps
+ Esri - USA Topo Maps
0
15
png
diff --git a/ESRI/ESRI World Topo.xml b/ESRI/esri_world_topo.xml
similarity index 90%
rename from ESRI/ESRI World Topo.xml
rename to ESRI/esri_world_topo.xml
index a3fffcc..64e64db 100644
--- a/ESRI/ESRI World Topo.xml
+++ b/ESRI/esri_world_topo.xml
@@ -1,6 +1,6 @@
- ESRI World Topo
+ Esri - World Topo
1
20
jpg
diff --git a/GRG/WMFLabs Hillshading (Overlay).xml b/GRG/WMFLabs Hillshading (Overlay).xml
deleted file mode 100644
index 36d2bc3..0000000
--- a/GRG/WMFLabs Hillshading (Overlay).xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- WMFLabs Hillshading (Overlay)
- 0
- 16
- png
- https://a.tiles.wmflabs.org/hillshading/{$z}/{$x}/{$y}.png
- None
- #000000
- false
-
-
\ No newline at end of file
diff --git a/GRG/Google Road Only (Overlay).xml b/GRG/grg_google_road_only_overlay.xml
similarity index 86%
rename from GRG/Google Road Only (Overlay).xml
rename to GRG/grg_google_road_only_overlay.xml
index 81d29df..127348e 100644
--- a/GRG/Google Road Only (Overlay).xml
+++ b/GRG/grg_google_road_only_overlay.xml
@@ -1,6 +1,6 @@
- Google Road Only (Overlay)
+ GRG - Google Road Only Overlay
0
20
jpg
diff --git a/GRG/Google Terrain Shading (Overlay).xml b/GRG/grg_google_terrain_shading_overlay.xml
similarity index 85%
rename from GRG/Google Terrain Shading (Overlay).xml
rename to GRG/grg_google_terrain_shading_overlay.xml
index 21423bf..fc7d0f6 100644
--- a/GRG/Google Terrain Shading (Overlay).xml
+++ b/GRG/grg_google_terrain_shading_overlay.xml
@@ -1,6 +1,6 @@
- Google Terrain Shading (Overlay)
+ GRG - Google Terrain Shading Overlay
0
20
jpg
diff --git a/GRG/USDA FSTopo (Overlay).xml b/GRG/grg_usda_fstopo_overlay.xml
similarity index 88%
rename from GRG/USDA FSTopo (Overlay).xml
rename to GRG/grg_usda_fstopo_overlay.xml
index 0277edc..7cbcdff 100644
--- a/GRG/USDA FSTopo (Overlay).xml
+++ b/GRG/grg_usda_fstopo_overlay.xml
@@ -1,6 +1,6 @@
- USDA FSTopo (Overlay)
+ GRG - USDA Fstopo Overlay
0
17
png
diff --git a/GRG/Waymarkedtrails Cycle Routes (Overlay).xml b/GRG/grg_waymarkedtrails_cycle_routes_overlay.xml
similarity index 86%
rename from GRG/Waymarkedtrails Cycle Routes (Overlay).xml
rename to GRG/grg_waymarkedtrails_cycle_routes_overlay.xml
index 8cf3975..880f363 100644
--- a/GRG/Waymarkedtrails Cycle Routes (Overlay).xml
+++ b/GRG/grg_waymarkedtrails_cycle_routes_overlay.xml
@@ -1,6 +1,6 @@
- Waymarkedtrails Cycle Routes (Overlay)
+ GRG - WaymarkedTrails Cycle Routes Overlay
0
18
png
diff --git a/Google/Google Hybrid.xml b/Google/google_hybrid.xml
similarity index 90%
rename from Google/Google Hybrid.xml
rename to Google/google_hybrid.xml
index ecd03fd..13c37a0 100644
--- a/Google/Google Hybrid.xml
+++ b/Google/google_hybrid.xml
@@ -1,6 +1,6 @@
- Google Hybrid
+ Google - Hybrid
0
20
jpg
diff --git a/Google/Google Roadmap Alt.xml b/Google/google_roadmap_alt.xml
similarity index 89%
rename from Google/Google Roadmap Alt.xml
rename to Google/google_roadmap_alt.xml
index 0c940bc..a524b9f 100644
--- a/Google/Google Roadmap Alt.xml
+++ b/Google/google_roadmap_alt.xml
@@ -1,6 +1,6 @@
- Google Roadmap Alt
+ Google - Roadmap Alt
0
20
jpg
diff --git a/Google/Google Roadmap No POI.xml b/Google/google_roadmap_no_poi.xml
similarity index 90%
rename from Google/Google Roadmap No POI.xml
rename to Google/google_roadmap_no_poi.xml
index ea03c2e..94f28e8 100644
--- a/Google/Google Roadmap No POI.xml
+++ b/Google/google_roadmap_no_poi.xml
@@ -1,6 +1,6 @@
- Google Roadmap No POI
+ Google - Roadmap No Poi
0
20
jpg
diff --git a/Google/Google Roadmap Standard.xml b/Google/google_roadmap_standard.xml
similarity index 88%
rename from Google/Google Roadmap Standard.xml
rename to Google/google_roadmap_standard.xml
index 5d9ee59..129622e 100644
--- a/Google/Google Roadmap Standard.xml
+++ b/Google/google_roadmap_standard.xml
@@ -1,6 +1,6 @@
- Google Roadmap Standard
+ Google - Roadmap Standard
0
20
jpg
diff --git a/Google/Google Satellite Only.xml b/Google/google_satellite_only.xml
similarity index 88%
rename from Google/Google Satellite Only.xml
rename to Google/google_satellite_only.xml
index 2146241..f6fc8c7 100644
--- a/Google/Google Satellite Only.xml
+++ b/Google/google_satellite_only.xml
@@ -1,6 +1,6 @@
- Google Satellite Only
+ Google - Satellite Only
0
20
jpg
diff --git a/Google/Google Terrain.xml b/Google/google_terrain.xml
similarity index 90%
rename from Google/Google Terrain.xml
rename to Google/google_terrain.xml
index 5ac0baf..f25c15a 100644
--- a/Google/Google Terrain.xml
+++ b/Google/google_terrain.xml
@@ -1,6 +1,6 @@
- Google Terrain
+ Google - Terrain
0
20
jpg
diff --git a/NationalLandSurveyOfFinland/MML.xml b/NationalLandSurveyOfFinland/nationallandsurveyoffinland_mml.xml
similarity index 87%
rename from NationalLandSurveyOfFinland/MML.xml
rename to NationalLandSurveyOfFinland/nationallandsurveyoffinland_mml.xml
index a101b22..6ce162d 100644
--- a/NationalLandSurveyOfFinland/MML.xml
+++ b/NationalLandSurveyOfFinland/nationallandsurveyoffinland_mml.xml
@@ -1,6 +1,6 @@
- MML Topographic Map
+ National Land Survey of Finland - MML
jpg
https://tiles.kartat.kapsi.fi/peruskartta/{$z}/{$x}/{$y}.jpg
2
diff --git a/OSM/OSMStandard.xml b/OSM/OSMStandard.xml
deleted file mode 100644
index d88aad4..0000000
--- a/OSM/OSMStandard.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- OSM Standard
- 0
- 18
- png
- http://tile.openstreetmap.org/{$z}/{$x}/{$y}.png
- None
- #000000
- false
-
-
\ No newline at end of file
diff --git a/Stamen/Stamen Terrain.xml b/Stamen/Stamen Terrain.xml
deleted file mode 100644
index 96190f3..0000000
--- a/Stamen/Stamen Terrain.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- Stamen Terrain
- 0
- 18
- png
- http://tile.stamen.com/terrain/{$z}/{$x}/{$y}.png
- None
- #000000
- false
-
-
\ No newline at end of file
diff --git a/Stamen/Stamen Toner.xml b/Stamen/Stamen Toner.xml
deleted file mode 100644
index 15e5865..0000000
--- a/Stamen/Stamen Toner.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- Stamen Toner
- 0
- 18
- png
- http://tile.stamen.com/toner/{$z}/{$x}/{$y}.png
- None
- #000000
- false
-
-
\ No newline at end of file
diff --git a/Stamen/Stamen Watercolor.xml b/Stamen/Stamen Watercolor.xml
deleted file mode 100644
index d256995..0000000
--- a/Stamen/Stamen Watercolor.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- Stamen Watercolor
- 0
- 18
- png
- http://tile.stamen.com/watercolor/{$z}/{$x}/{$y}.png
- None
- #000000
- false
-
-
\ No newline at end of file
diff --git a/Wmflabs/Hike_Bike.xml b/Wmflabs/Hike_Bike.xml
deleted file mode 100644
index a9766e8..0000000
--- a/Wmflabs/Hike_Bike.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- OSM Hike Bike
- 0
- 21
- png
- https://tiles.wmflabs.org/hikebike/{$z}/{$x}/{$y}.png
- None
- #000000
- false
-
-
\ No newline at end of file
diff --git a/Wmflabs/MTB Map (Europe).xml b/Wmflabs/MTB Map (Europe).xml
deleted file mode 100644
index 69fcb50..0000000
--- a/Wmflabs/MTB Map (Europe).xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- MTB Map (Europe)
- 0
- 21
- png
- http://tile.mtbmap.cz/mtbmap_tiles/{$z}/{$x}/{$y}.png
- None
- #000000
- false
-
-
\ No newline at end of file
diff --git a/Wmflabs/OSM_No_Labels.xml b/Wmflabs/OSM_No_Labels.xml
deleted file mode 100644
index 3be90cd..0000000
--- a/Wmflabs/OSM_No_Labels.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- OSM No Labels
- 0
- 21
- png
- https://tiles.wmflabs.org/osm-no-labels/{$z}/{$x}/{$y}.png
- None
- #000000
- false
-
-
\ No newline at end of file
diff --git a/CycleOSM/OSM Cycle.xml b/cycleosm/cycleosm_osm_cycle.xml
similarity index 91%
rename from CycleOSM/OSM Cycle.xml
rename to cycleosm/cycleosm_osm_cycle.xml
index b256b82..6139881 100644
--- a/CycleOSM/OSM Cycle.xml
+++ b/cycleosm/cycleosm_osm_cycle.xml
@@ -1,6 +1,6 @@
- Cycle OSM
+ CycleOSM - OSM Cycle
0
21
png
diff --git a/Michelin/OSM Michelin.xml b/michelin/michelin_osm_michelin.xml
similarity index 90%
rename from Michelin/OSM Michelin.xml
rename to michelin/michelin_osm_michelin.xml
index 26421d1..3646139 100644
--- a/Michelin/OSM Michelin.xml
+++ b/michelin/michelin_osm_michelin.xml
@@ -1,7 +1,7 @@
- OSM Michelin
+ Michelin - OSM Michelin
0
19
https://map{$serverpart}.viamichelin.com/map/mapdirect?map=viamichelin&z={$z}&x={$x}&y={$y}&format=png&version=201901161110&layer=background&locale=default&cs=1&protocol=https
diff --git a/mtbmapcz/mtbmapcz_mtb_map_europe.xml b/mtbmapcz/mtbmapcz_mtb_map_europe.xml
new file mode 100644
index 0000000..4c81690
--- /dev/null
+++ b/mtbmapcz/mtbmapcz_mtb_map_europe.xml
@@ -0,0 +1,12 @@
+
+
+ MTBMap.cz - MTB Map Europe
+ 0
+ 21
+ png
+ http://tile.mtbmap.cz/mtbmap_tiles/{$z}/{$x}/{$y}.png
+ None
+ #000000
+ false
+
+
diff --git a/OpenTopo/opentopomap.xml b/opentopo/opentopo_opentopomap.xml
similarity index 89%
rename from OpenTopo/opentopomap.xml
rename to opentopo/opentopo_opentopomap.xml
index 7539c71..75d331b 100644
--- a/OpenTopo/opentopomap.xml
+++ b/opentopo/opentopo_opentopomap.xml
@@ -1,6 +1,6 @@
- Open Topo Map
+ OpenTopo - Opentopomap
1
17
PNG
diff --git a/USGS/USGSBasemap.xml b/usgs/usgs_usgsbasemap.xml
similarity index 90%
rename from USGS/USGSBasemap.xml
rename to usgs/usgs_usgsbasemap.xml
index 1b48847..3e8a6f7 100644
--- a/USGS/USGSBasemap.xml
+++ b/usgs/usgs_usgsbasemap.xml
@@ -1,6 +1,6 @@
- USGS
+ USGS - Usgsbasemap
0
15
png
diff --git a/USGS/USGSImageryOnly.xml b/usgs/usgs_usgsimageryonly.xml
similarity index 89%
rename from USGS/USGSImageryOnly.xml
rename to usgs/usgs_usgsimageryonly.xml
index c66b977..b1c73d3 100644
--- a/USGS/USGSImageryOnly.xml
+++ b/usgs/usgs_usgsimageryonly.xml
@@ -1,6 +1,6 @@
- USGSImageryOnly
+ USGS - Usgsimageryonly
0
15
png
diff --git a/USGS/USGSImageryTopo.xml b/usgs/usgs_usgsimagerytopo.xml
similarity index 89%
rename from USGS/USGSImageryTopo.xml
rename to usgs/usgs_usgsimagerytopo.xml
index a1cc500..8d21adf 100644
--- a/USGS/USGSImageryTopo.xml
+++ b/usgs/usgs_usgsimagerytopo.xml
@@ -1,6 +1,6 @@
- USGSImageryTopo
+ USGS - Usgsimagerytopo
0
15
png
diff --git a/USGS/USGSShadedRelief.xml b/usgs/usgs_usgsshadedrelief.xml
similarity index 89%
rename from USGS/USGSShadedRelief.xml
rename to usgs/usgs_usgsshadedrelief.xml
index 64e8962..5be0450 100644
--- a/USGS/USGSShadedRelief.xml
+++ b/usgs/usgs_usgsshadedrelief.xml
@@ -1,6 +1,6 @@
- USGSShadedRelief
+ USGS - Usgsshadedrelief
0
15
png