diff --git a/templates/map/client/config.json b/templates/map/client/config.json
index da7f6851..1177cf15 100644
--- a/templates/map/client/config.json
+++ b/templates/map/client/config.json
@@ -1,12 +1,34 @@
 {
 	"layers":
 	[
-		{ "folder": 0, "type": "WMS", "title": "KOM Punkte", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=kom_p&", "name": "kom_p" },
-		{ "folder": 0, "type": "WMS", "title": "KOM Linien", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=kom_l&", "name": "kom_l" },
-		{ "folder": 0, "type": "WMS", "title": "KOM Flächen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=kom_f&", "name": "kom_f" },					
-		
+		{ "folder": 5, "type": "WMS", "title": "KOM Flächen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=kom_f&", "name": "kom_f" },
+		{ "folder": 5, "type": "WMS", "title": "KOM Linien", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=kom_l&", "name": "kom_l" },
+		{ "folder": 5, "type": "WMS", "title": "KOM Punkte", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=komon&", "name": "kom_p" },
+
+		{ "folder": 6, "type": "WMS", "title": "EIV Flächen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=eiv_f&", "name": "eiv_f" },
+		{ "folder": 6, "type": "WMS", "title": "EIV Linien", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=eiv_l&", "name": "eiv_l" },
+		{ "folder": 6, "type": "WMS", "title": "EIV Punkte", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=eiv_p&", "name": "eiv_p" },
+
+		{ "folder": 7, "type": "WMS", "title": "OEK Flächen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=oek_f&", "name": "oek_f" },
+
+		{ "folder": 8, "type": "WMS", "title": "EMA Flächen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=ema_f&", "name": "ema_f" },
+
+		{ "folder": 9, "type": "WMS", "title": "MAE Flächen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=mae&", "name": "mae" },
+
+		{ "folder": 10, "type": "WMS", "title": "Naturschutzgebiete", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=naturschutzgebiet&", "name": "naturschutzgebiet" },
+		{ "folder": 10, "type": "WMS", "title": "Naturparkzonen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=naturparkzonen&", "name": "naturparkzonen" },
+		{ "folder": 10, "type": "WMS", "title": "Landschaftsschutzgebiete", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=landschaftsschutzgebiet&", "name": "landschaftsschutzgebiet" },
+		{ "folder": 10, "type": "WMS", "title": "Vogelschutzgebiete", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=vogelschutzgebiet&", "name": "vogelschutzgebiet" },
+		{ "folder": 10, "type": "WMS", "title": "FFH Gebiete", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=ffh&", "name": "ffh" },
+
+		{ "folder": 11, "type": "WMS", "title": "Nationalpark Zonen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=nationalpark_zonen&", "name": "nationalpark_zonen" },
+		{ "folder": 11, "type": "WMS", "title": "Nationalpark Grenzen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=nationalpark_grenze&", "name": "nationalpark_grenze" },
+
+		{ "folder": 12, "type": "WMS", "title": "Naturräume Grenzen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=natraum_lkompvo_grenzen&", "name": "natraum_lkompvo_grenzen" },
+		{ "folder": 12, "type": "WMS", "title": "Naturräume Flächen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=natraum_lkompvo&", "name": "natraum_lkompvo" },
+
 		{ "folder": 1, "type": "WMS", "title": "Lagebezeichnungen", "url": "https://geo5.service24.rlp.de/wms/liegenschaften_rp.fcgi?", "name": "Lagebezeichnungen" },
-		{ "folder": 1, "type": "WMS", "title": "Flurstücke", "url": "https://geo5.service24.rlp.de/wms/liegenschaften_rp.fcgi?", "name": "Flurstueck", "username": "abc", "password": "123" },
+		{ "folder": 1, "type": "WMS", "title": "Flurstücke", "url": "https://geo5.service24.rlp.de/wms/liegenschaften_rp.fcgi?", "name": "Flurstueck", "active":  true},
 		{ "folder": 1, "type": "WMS", "title": "Gebäude / Bauwerke", "url": "https://geo5.service24.rlp.de/wms/liegenschaften_rp.fcgi?", "name": "GebaeudeBauwerke" },
 		{ "folder": 1, "type": "WMS", "title": "Nutzung", "url": "https://geo5.service24.rlp.de/wms/liegenschaften_rp.fcgi?", "name": "Nutzung" },
 
@@ -14,19 +36,28 @@
 		{ "folder": 2, "type": "WMS", "title": "Verbandsgemeinden", "url": "http://geo5.service24.rlp.de/wms/verwaltungsgrenzen_rp.fcgi?", "name": "Verbandsgemeinden" },
 		{ "folder": 2, "type": "WMS", "title": "Gemeinden", "url": "http://geo5.service24.rlp.de/wms/verwaltungsgrenzen_rp.fcgi?", "name": "Gemeinden" },
 
-		{ "folder": 3, "type": "WMS", "title": "Webatlas farbig", "attribution": "LVermGeo", "url": "https://maps.service24.rlp.de/gisserver/services/RP/RP_WebAtlasRP/MapServer/WmsServer?", "name": "RP_WebAtlasRP", "active": true },
-		{ "folder": 3, "type": "WMS", "title": "Webatlas grau", "attribution": "LVermGeo", "url": "https://maps.service24.rlp.de/gisserver/services/RP/RP_ETRS_Gt/MapServer/WmsServer?", "name": "0", "active": false },
-		{ "folder": 3, "type": "WMS", "title": "Luftbilder", "attribution": "LVermGeo", "url": "http://geo4.service24.rlp.de/wms/dop_basis.fcgi?", "name": "rp_dop", "active": false },
-		{ "folder": 3, "type": "WMS", "title": "TopPlusOpen", "attribution": "BKG", "url": "https://sgx.geodatenzentrum.de/wms_topplus_open?", "name": "web", "active": false },
-		{ "folder": 3, "type": "OSM", "title": "Open Street Map", "attribution": "OSM", "active":  false }
+		{ "folder": 0, "type": "WMS", "title": "Webatlas farbig", "attribution": "LVermGeo", "url": "https://maps.service24.rlp.de/gisserver/services/RP/RP_WebAtlasRP/MapServer/WmsServer?", "name": "RP_WebAtlasRP", "active": true },
+		{ "folder": 0, "type": "WMS", "title": "Webatlas grau", "attribution": "LVermGeo", "url": "https://maps.service24.rlp.de/gisserver/services/RP/RP_ETRS_Gt/MapServer/WmsServer?", "name": "0", "active": false },
+		{ "folder": 0, "type": "WMS", "title": "Luftbilder", "attribution": "LVermGeo", "url": "http://geo4.service24.rlp.de/wms/dop_basis.fcgi?", "name": "rp_dop", "active": false },
+		{ "folder": 0, "type": "WMS", "title": "TopPlusOpen", "attribution": "BKG", "url": "https://sgx.geodatenzentrum.de/wms_topplus_open?", "name": "web", "active": false },
+		{ "folder": 0, "type": "OSM", "title": "Open Street Map", "attribution": "OSM", "active":  false }
 	],
 	
 	"folders":
 	[
-		{ "title": "KOM Kompensationsmaßnahmen", "parent": -1 },
+		{ "title": "Hintergrund", "parent": -1 },
 		{ "title": "ALKIS Liegenschaften", "parent": -1 },
-		{ "title": "Grenzen", "parent": -1 },
-		{ "title": "Hintergrund", "parent": -1 }
+		{ "title": "Verwaltungsgrenzen", "parent": -1 },
+		{ "title": "Geofachdaten", "parent": -1 },
+		{ "title": "Kompensationsverzeichnis", "parent": 3 },
+		{ "title": "Kompensationen", "parent": 4 },
+		{ "title": "Eingriffe", "parent": 4 },
+		{ "title": "Ökokonten", "parent": 4 },
+		{ "title": "EMA", "parent": 4 },
+		{ "title": "MAE", "parent": 4 },
+		{ "title": "Schutzgebiete", "parent": 3 },
+		{ "title": "Nationalparke", "parent": 10 },
+		{ "title": "Naturräume", "parent": 10 }
 	],
 	
 	"projections":
@@ -39,8 +70,8 @@
 		"projection": "EPSG:25832",
 		"center": [ 385000, 5543000 ],
 		"minZoom": 5,
-		"maxZoom": 20,
-		"zoom": 8,
+		"maxZoom": 22,
+		"zoom": 9,
 		"attribution": "LANIS RLP"
 	},
 	
@@ -66,8 +97,8 @@
 	{
 		"buffer":
 		{
-			"defaultRadius": 10,
-			"defaultSegments": 3
+			"defaultRadius": 2,
+			"defaultSegments": 2
 		}
 	},
 
@@ -75,7 +106,7 @@
 	{
 		"editLayer":
 		{
-			"fill": "rgba( 255, 0, 0, 0.1 )",
+			"fill": "rgba( 255, 0, 0, 0.2 )",
 			"stroke": "#ff0000",
 			"strokeWidth": 3,
 			"pointRadius": 6
@@ -91,16 +122,16 @@
 
 		"sketch":
 		{
-			"fill": "rgba( 0, 127, 0, 0.2 )",
-			"stroke": "#ff0000",
+			"fill": "rgba( 0, 127, 255, 0.2 )",
+			"stroke": "#0080ff",
 			"strokeWidth": 3,
 			"pointRadius": 6
 		},
 
 		"modify":
 		{
-			"fill": "rgba( 0, 127, 0, 0.5 )",
-			"stroke": "#007f00",
+			"fill": "rgba( 0, 127, 255, 0.5 )",
+			"stroke": "#0080ff",
 			"strokeWidth": 3,
 			"pointRadius": 6
 		}
diff --git a/templates/map/geom_form.html b/templates/map/geom_form.html
index 5bfc4f7a..363c9406 100644
--- a/templates/map/geom_form.html
+++ b/templates/map/geom_form.html
@@ -19,6 +19,6 @@
     </div>
 {% endif %}
 
-<div style="height: 70vh">
+<div style="height: 85vh">
     {% include 'map/client/index.html' %}
 </div>