diff --git a/abandoned_isles/map.conf b/abandoned_isles/map.conf
index e5c4eee..cd3a570 100644
--- a/abandoned_isles/map.conf
+++ b/abandoned_isles/map.conf
@@ -1,30 +1,20 @@
-disabled = true
-
-name = Abandoned Isles
+initial_stuff = return {"ctf_ranged:pistol_loaded", "default:pick_stone", "default:mossycobble 50", "default:torch 10"}
+map_version = 2
 author = gimp, caoutiouspotato, SoulSeeker
-
-r = 110
-h = 140
-rotation = x
-
-team.1 = red
-team.1.color = red
-team.1.pos = (-79,-4,91)
-team.2 = blue
-team.2.color = blue
-team.2.pos = (86,-4,-101)
-
-initial_stuff = shooter:pistol,default:pick_stone,default:mossycobble 50,default:torch 10
+name = Abandoned Isles
+enabled = false
 license = CC BY 4.0
+time_speed = 1
+size = return {["y"] = 140, ["x"] = 220, ["z"] = 220}
+hint = 
 others = Maps were originally created by gimp and caoutiouspotato and licensed under CC BY 4.0. It was improved by SoulSeeker: desert theme was converted into mossy cobble theme, holes were filled with dirt, some more bridges were added between bases and main path, lava was replaced with water, all mese blocks were removed and then replaced with 6 meseblocks on each side, designs of the bases were changed to Japanese buildings and some more trees, buildings and waterfalls were added across the map.
+treasures = return {"none"}
+skybox = none
+start_time = 5900
 phys_speed = 1.2
-base_node = ctf_map:stone
-
-# red side
-chests.1.n = 100
-chests.1.from = (-109,-28,109)
-chests.1.to = (109,0,1)
-# blue side
-chests.2.n = 100
-chests.2.from = (-109,-28,-1)
-chests.2.to = (109,0,-109)
+phys_jump = 1.1
+phys_gravity = 1
+chests = return {{["pos2"] = {["y"] = 70, ["x"] = 219, ["z"] = 219}, ["pos1"] = {["y"] = 42, ["x"] = 1, ["z"] = 111}, ["amount"] = 100}, {["pos2"] = {["y"] = 70, ["x"] = 219, ["z"] = 109}, ["pos1"] = {["y"] = 42, ["x"] = 1, ["z"] = 1}, ["amount"] = 100}}
+teams = return {["red"] = {["pos2"] = {["y"] = 139, ["x"] = 220, ["z"] = 110}, ["enabled"] = true, ["pos1"] = {["y"] = 0, ["x"] = 0, ["z"] = 220}, ["flag_pos"] = {["y"] = 66, ["x"] = 31, ["z"] = 201}}, ["blue"] = {["pos2"] = {["y"] = 0, ["x"] = 0, ["z"] = 0}, ["enabled"] = true, ["pos1"] = {["y"] = 139, ["x"] = 220, ["z"] = 110}, ["flag_pos"] = {["y"] = 66, ["x"] = 196, ["z"] = 9}}}
+barrier_area = return {["pos1"] = {["y"] = 139, ["x"] = 0, ["z"] = 110}, ["pos2"] = {["y"] = 0, ["x"] = 220, ["z"] = 110}}
+game_modes = return {"classes"}
diff --git a/abandoned_isles/map.mts b/abandoned_isles/map.mts
index 41f656a..d51e2b1 100644
Binary files a/abandoned_isles/map.mts and b/abandoned_isles/map.mts differ
diff --git a/ahkmenrah_pyramids/map.conf b/ahkmenrah_pyramids/map.conf
index 27ac715..defd8d4 100644
--- a/ahkmenrah_pyramids/map.conf
+++ b/ahkmenrah_pyramids/map.conf
@@ -1,18 +1,20 @@
-name = Pyramids of Ahkmenrah
+initial_stuff = return {"default:pick_stone", "default:desert_cobble 30", "default:torch 10"}
+map_version = 2
 author = Darkf4antom and SoulSeeker
-hint = There is an invisible labyrinth under your base and a treasure at the end of it!
-
-team.1 = red
-team.1.color = red
-team.1.pos = (-75,14,77)
-team.2 = blue
-team.2.color = blue
-team.2.pos = (75,14,-78)
-
-rotation = z
-h = 60
-r = 109
-
-initial_stuff = default:pick_stone,default:desert_cobble 30,default:torch 10
+name = Pyramids of Ahkmenrah
+enabled = true
 license = CC BY-SA 4.0
-base_node = ctf_map:desert_sandstone_block
+time_speed = 1
+size = return {["y"] = 60, ["x"] = 218, ["z"] = 218}
+hint = There is an invisible labyrinth under your base and a treasure at the end of it!
+others = 
+treasures = return {"none"}
+skybox = none
+start_time = 5900
+phys_speed = 1
+phys_jump = 1
+phys_gravity = 1
+chests = return {{["pos2"] = {["y"] = 41, ["x"] = 218, ["z"] = 218}, ["pos1"] = {["y"] = 20, ["x"] = 1, ["z"] = 1}, ["amount"] = 42}}
+teams = return {["red"] = {["pos2"] = {["y"] = 0, ["x"] = 1, ["z"] = 217}, ["enabled"] = true, ["pos1"] = {["y"] = 60, ["x"] = 217, ["z"] = 109}, ["flag_pos"] = {["y"] = 44, ["x"] = 34, ["z"] = 186}}, ["blue"] = {["pos2"] = {["y"] = 0, ["x"] = 217, ["z"] = 1}, ["enabled"] = true, ["pos1"] = {["y"] = 60, ["x"] = 1, ["z"] = 109}, ["flag_pos"] = {["y"] = 44, ["x"] = 184, ["z"] = 31}}}
+barrier_area = return {["pos1"] = {["y"] = 60, ["x"] = 217, ["z"] = 109}, ["pos2"] = {["y"] = 0, ["x"] = 0, ["z"] = 109}}
+game_modes = return {"classes", "nade_fight", "classic"}
diff --git a/ahkmenrah_pyramids/map.mts b/ahkmenrah_pyramids/map.mts
index 4a0d745..d784108 100644
Binary files a/ahkmenrah_pyramids/map.mts and b/ahkmenrah_pyramids/map.mts differ
diff --git a/ancient_pyramids/map.conf b/ancient_pyramids/map.conf
index f023e91..dfbf73e 100644
--- a/ancient_pyramids/map.conf
+++ b/ancient_pyramids/map.conf
@@ -1,21 +1,20 @@
-team.1.color = red
-team.1 = red
-team.1.pos = (60,-8,60)
-team.2.pos = (-60,-8,-60)
-team.2.color = blue
-author = Xenon
-rotation = z
-h = 38
-r = 115
+chests = return {{["pos2"] = {["y"] = 12, ["x"] = 168, ["z"] = 86}, ["pos1"] = {["y"] = 10, ["x"] = 144, ["z"] = 62}, ["amount"] = 50}, {["pos2"] = {["y"] = 12, ["x"] = 86, ["z"] = 168}, ["pos1"] = {["y"] = 10, ["x"] = 62, ["z"] = 144}, ["amount"] = 50}}
 name = Ancient Pyramids
-team.2 = blue
-initial_stuff = default:pick_steel,default:torch 10
-base_node = ctf_map:sandstonebrick
 hint = Beware of the Pyramids' Labyrinth!
-chests.1.n = 50
-chests.1.from = (29,-9,-29)
-chests.1.to = (54,-10,-54)
-chests.2.n = 50
-chests.2.from = (-29,-9,29)
-chests.2.to = (-54,-10,54)
+enabled = true
+map_version = 2
+phys_speed = 1
+phys_jump = 1
 license = CC BY-SA 4.0
+skybox = none
+others = 
+author = Xenon
+initial_stuff = return {"default:pick_steel", "default:torch 10"}
+game_modes = return {"classic", "classes", "nade_fight"}
+barrier_area = return {["pos1"] = {["y"] = 38, ["x"] = 200, ["z"] = 115}, ["pos2"] = {["y"] = 0, ["x"] = 30, ["z"] = 115}}
+time_speed = 1
+teams = return {["red"] = {["pos2"] = {["y"] = 38, ["x"] = 30, ["z"] = 115}, ["enabled"] = true, ["pos1"] = {["y"] = 0, ["x"] = 200, ["z"] = 200}, ["flag_pos"] = {["y"] = 11, ["x"] = 175, ["z"] = 175}}, ["blue"] = {["pos2"] = {["y"] = 0, ["x"] = 200, ["z"] = 30}, ["enabled"] = true, ["pos1"] = {["y"] = 38, ["x"] = 30, ["z"] = 115}, ["flag_pos"] = {["y"] = 11, ["x"] = 55, ["z"] = 55}}}
+size = return {["y"] = 38, ["x"] = 230, ["z"] = 230}
+treasures = return {"none"}
+start_time = 5900
+phys_gravity = 1
diff --git a/ancient_pyramids/map.mts b/ancient_pyramids/map.mts
index 31b1fc7..107faff 100644
Binary files a/ancient_pyramids/map.mts and b/ancient_pyramids/map.mts differ
diff --git a/big_ocean/map.conf b/big_ocean/map.conf
index 3e78815..e378034 100644
--- a/big_ocean/map.conf
+++ b/big_ocean/map.conf
@@ -1,13 +1,20 @@
-name = Big Ocean
+initial_stuff = return {"default:pick_steel", "ctf_ranged:pistol_loaded", "default:torch 5"}
+map_version = 2
 author = gameit
-r = 110
-h = 140
-rotation = x
-team.1 = red
-team.1.color = red
-team.1.pos = (-1,-9,100)
-team.2 = blue
-team.2.color = blue
-team.2.pos = (-1,-9,-100)
-initial_stuff = default:pick_steel,shooter:pistol,default:torch 5
+name = Big Ocean
+enabled = true
 license = CC BY-SA 4.0
+time_speed = 1
+size = return {["y"] = 140, ["x"] = 220, ["z"] = 220}
+hint = 
+others = 
+treasures = return {"none"}
+skybox = none
+start_time = 5900
+phys_speed = 1
+phys_jump = 1
+phys_gravity = 1
+chests = return {{["pos2"] = {["y"] = 133, ["x"] = 220, ["z"] = 220}, ["pos1"] = {["y"] = 107, ["x"] = 0, ["z"] = 0}, ["amount"] = 20}, {["pos2"] = {["y"] = 65, ["x"] = 220, ["z"] = 220}, ["pos1"] = {["y"] = 60, ["x"] = 0, ["z"] = 0}, ["amount"] = 24}}
+teams = return {["red"] = {["pos2"] = {["y"] = 140, ["x"] = 0, ["z"] = 110}, ["enabled"] = true, ["pos1"] = {["y"] = 0, ["x"] = 220, ["z"] = 220}, ["flag_pos"] = {["y"] = 61, ["x"] = 109, ["z"] = 210}}, ["blue"] = {["pos2"] = {["y"] = 140, ["x"] = 0, ["z"] = 110}, ["enabled"] = true, ["pos1"] = {["y"] = 0, ["x"] = 220, ["z"] = 0}, ["flag_pos"] = {["y"] = 61, ["x"] = 109, ["z"] = 10}}}
+barrier_area = return {["pos1"] = {["y"] = 140, ["x"] = 0, ["z"] = 110}, ["pos2"] = {["y"] = 0, ["x"] = 220, ["z"] = 110}}
+game_modes = return {"classic", "classes"}
diff --git a/big_ocean/map.mts b/big_ocean/map.mts
index 78a0c86..85d65d4 100644
Binary files a/big_ocean/map.mts and b/big_ocean/map.mts differ
diff --git a/bridge/map.conf b/bridge/map.conf
index 6b08ef4..fbaaf34 100644
--- a/bridge/map.conf
+++ b/bridge/map.conf
@@ -1,12 +1,20 @@
-name = The Bridge
+initial_stuff = return {}
+map_version = 2
 author = rubenwardy
-rotation = x
-r = 115
-h = 140
-team.1 = red
-team.1.color = red
-team.1.pos = -57,-20,93
-team.2 = blue
-team.2.color = blue
-team.2.pos = -74,-16,-70
+name = The Bridge
+enabled = true
 license = CC BY-SA 4.0
+time_speed = 1
+size = return {["y"] = 140, ["x"] = 230, ["z"] = 230}
+hint = 
+others = 
+treasures = return {"none"}
+skybox = none
+start_time = 5900
+phys_speed = 1
+phys_jump = 1
+phys_gravity = 1
+chests = return {{["pos2"] = {["y"] = 92, ["x"] = 225, ["z"] = 225}, ["pos1"] = {["y"] = 32, ["x"] = 5, ["z"] = 5}, ["amount"] = 42}}
+teams = return {["red"] = {["pos2"] = {["y"] = 0, ["x"] = 225, ["z"] = 5}, ["enabled"] = true, ["pos1"] = {["y"] = 140, ["x"] = 5, ["z"] = 115}, ["flag_pos"] = {["y"] = 54, ["x"] = 44, ["z"] = 42}}, ["blue"] = {["pos2"] = {["y"] = 140, ["x"] = 5, ["z"] = 115}, ["enabled"] = true, ["pos1"] = {["y"] = 0, ["x"] = 225, ["z"] = 225}, ["flag_pos"] = {["y"] = 51, ["x"] = 57, ["z"] = 216}}}
+barrier_area = return {["pos1"] = {["y"] = 140, ["x"] = 5, ["z"] = 115}, ["pos2"] = {["y"] = 0, ["x"] = 225, ["z"] = 115}}
+game_modes = return {"classic", "classes", "nade_fight"}
diff --git a/bridge/map.mts b/bridge/map.mts
index 0eabb3b..6318895 100644
Binary files a/bridge/map.mts and b/bridge/map.mts differ
diff --git a/caverns/map.conf b/caverns/map.conf
index b66919b..3bba5ac 100644
--- a/caverns/map.conf
+++ b/caverns/map.conf
@@ -1,23 +1,20 @@
+chests = return {{["pos2"] = {["y"] = 135, ["x"] = 109, ["z"] = 203}, ["pos1"] = {["y"] = 111, ["x"] = 52, ["z"] = 156}, ["amount"] = 12}, {["pos2"] = {["y"] = 130, ["x"] = 122, ["z"] = 82}, ["pos1"] = {["y"] = 111, ["x"] = 43, ["z"] = 18}, ["amount"] = 15}, {["pos2"] = {["y"] = 132, ["x"] = 122.5, ["z"] = 132}, ["pos1"] = {["y"] = 106, ["x"] = 60, ["z"] = 102}, ["amount"] = 15}}
 name = Caverns
-author = rubenwardy
 hint = Dig to reach the enemy!
-rotation = z
-r = 115
-h = 230
-initial_stuff = default:pick_steel,default:stick 3,default:torch 20
-team.1 = red
-team.1.color = red
-team.1.pos = -22,-2,81
-team.2 = blue
-team.2.color = blue
-team.2.pos = -45,0,-90
-chests.1.n = 12
-chests.1.from = -63,-4,41
-chests.1.to = -6,20,88
-chests.2.n = 15
-chests.2.from = -72,-4,-97
-chests.2.to = 7,15,-33
-chests.3.n = 15
-chests.3.from = -55,-9,-13
-chests.3.to = 7.5,17,17
+enabled = true
+map_version = 2
+phys_speed = 1
+phys_jump = 1
 license = CC BY-SA 4.0
+skybox = none
+others = 
+author = rubenwardy
+initial_stuff = return {"default:pick_steel", "default:stick 4", "default:torch 20"}
+game_modes = return {"classic", "classes", "nade_fight"}
+barrier_area = return {["pos1"] = {["y"] = 230, ["x"] = 230, ["z"] = 115}, ["pos2"] = {["y"] = 0, ["x"] = 0, ["z"] = 115}}
+time_speed = 1
+teams = return {["red"] = {["pos2"] = {["y"] = 0, ["x"] = 0, ["z"] = 230}, ["enabled"] = true, ["pos1"] = {["y"] = 230, ["x"] = 230, ["z"] = 115}, ["flag_pos"] = {["y"] = 113, ["x"] = 94, ["z"] = 199}}, ["blue"] = {["pos2"] = {["y"] = 0, ["x"] = 230, ["z"] = 0}, ["enabled"] = true, ["pos1"] = {["y"] = 230, ["x"] = 0, ["z"] = 115}, ["flag_pos"] = {["y"] = 115, ["x"] = 70, ["z"] = 24}}}
+size = return {["y"] = 230, ["x"] = 230, ["z"] = 230}
+treasures = return {"none"}
+start_time = 5900
+phys_gravity = 1
diff --git a/caverns/map.mts b/caverns/map.mts
index c239ce4..962ff71 100644
Binary files a/caverns/map.mts and b/caverns/map.mts differ
diff --git a/coast/map.conf b/coast/map.conf
index 27dfa7c..a12d812 100644
--- a/coast/map.conf
+++ b/coast/map.conf
@@ -1,12 +1,20 @@
-r = 110
-name = Coast of Nostalgia
-h = 140
-rotation = z
+initial_stuff = return {}
+map_version = 2
 author = rubenwardy
-team.1 = red
-team.1.color = red
-team.1.pos = 15,3,39
-team.2 = blue
-team.2.color = blue
-team.2.pos = -50,11,-76
+name = Coast of Nostalgia
+enabled = true
 license = CC BY-SA 4.0
+time_speed = 1
+size = return {["y"] = 140, ["x"] = 220, ["z"] = 220}
+hint = 
+others = 
+treasures = return {"none"}
+skybox = none
+start_time = 5900
+phys_speed = 1
+phys_jump = 1
+phys_gravity = 1
+chests = return {{["pos2"] = {["y"] = 89, ["x"] = 210, ["z"] = 210}, ["pos1"] = {["y"] = 65, ["x"] = 10, ["z"] = 10}, ["amount"] = 42}}
+teams = return {["red"] = {["pos2"] = {["y"] = 0, ["x"] = 210, ["z"] = 210}, ["enabled"] = true, ["pos1"] = {["y"] = 140, ["x"] = 10, ["z"] = 110}, ["flag_pos"] = {["y"] = 73, ["x"] = 125, ["z"] = 149}}, ["blue"] = {["pos2"] = {["y"] = 0, ["x"] = 210, ["z"] = 10}, ["enabled"] = true, ["pos1"] = {["y"] = 140, ["x"] = 10, ["z"] = 110}, ["flag_pos"] = {["y"] = 81, ["x"] = 60, ["z"] = 34}}}
+barrier_area = return {["pos1"] = {["y"] = 140, ["x"] = 210, ["z"] = 110}, ["pos2"] = {["y"] = 0, ["x"] = 10, ["z"] = 110}}
+game_modes = return {"classic", "nade_fight", "classes"}
diff --git a/coast/map.mts b/coast/map.mts
index cab3232..7547432 100644
Binary files a/coast/map.mts and b/coast/map.mts differ
diff --git a/desert_spikes/map.conf b/desert_spikes/map.conf
index 38c72b9..0ca91a1 100644
--- a/desert_spikes/map.conf
+++ b/desert_spikes/map.conf
@@ -1,16 +1,20 @@
-name = Desert Spikes 
-author = WHYjustbecause
-
-r = 115
-h = 122
-rotation = x
-
-team.1 = red
-team.1.color = red
-team.1.pos = -32,-33,83
-team.2 = blue
-team.2.color = blue
-team.2.pos = 28,-17,-73
-
-license = CC BY-SA 4.0
-initial_stuff = default:ladder 30,default:pick_steel,default:torch 5
+initial_stuff = return {"default:ladder 30", "default:pick_steel", "default:torch 5"}
+map_version = 2
+author = WHYjustbecause
+name = Desert Spikes
+enabled = true
+license = CC BY-SA 4.0
+time_speed = 1
+size = return {["y"] = 122, ["x"] = 230, ["z"] = 230}
+hint = 
+others = 
+treasures = 
+skybox = none
+start_time = 5900
+phys_speed = 1
+phys_jump = 1
+phys_gravity = 0.9
+chests = return {{["pos2"] = {["y"] = 113, ["x"] = 225, ["z"] = 225}, ["pos1"] = {["y"] = 19, ["x"] = 5, ["z"] = 5}, ["amount"] = 50}}
+teams = return {["red"] = {["pos2"] = {["y"] = 122, ["x"] = 6, ["z"] = 115}, ["enabled"] = true, ["pos1"] = {["y"] = 0, ["x"] = 225, ["z"] = 5}, ["flag_pos"] = {["y"] = 44, ["x"] = 145, ["z"] = 37}}, ["blue"] = {["pos2"] = {["y"] = 0, ["x"] = 225, ["z"] = 225}, ["enabled"] = true, ["pos1"] = {["y"] = 122, ["x"] = 5, ["z"] = 115}, ["flag_pos"] = {["y"] = 28, ["x"] = 83, ["z"] = 198}}}
+barrier_area = return {["pos1"] = {["y"] = 122, ["x"] = 5, ["z"] = 115}, ["pos2"] = {["y"] = 0, ["x"] = 225, ["z"] = 115}}
+game_modes = return {"classic", "classes"}
diff --git a/desert_spikes/map.mts b/desert_spikes/map.mts
index 8b13c63..1ca3ef5 100644
Binary files a/desert_spikes/map.mts and b/desert_spikes/map.mts differ
diff --git a/ewok_village/map.conf b/ewok_village/map.conf
index 19ba7c5..804f2c4 100644
--- a/ewok_village/map.conf
+++ b/ewok_village/map.conf
@@ -1,15 +1,20 @@
-team.1 = red
-team.1.color = red
-team.1.pos = (38,-19,39)
-team.2 = blue
-team.2.color = blue
-team.2.pos = (-38,-19,-39)
-r = 50
-rotation = z
-h = 120
+initial_stuff = return {"default:pick_steel", "default:junglewood 50", "default:torch 3"}
+map_version = 2
 author = AnthonyDe, Kat, and PadrePio
 name = Ewok Village
-base_node = ctf_map:junglewood
-initial_stuff = default:pick_steel,default:junglewood 50,default:torch 3
+enabled = true
 license = CC BY-SA 4.0
-treasures = default:ladder,0.3,2,10,20;default:junglewood,0.3,5,30,60;ctf_traps:damage_cobble,0.3,2,10,15;default:axe_steel,0.15,2,1,2;shooter:shotgun,0.05,2,1;grenades:frag,0.1,2,1;grenades:smoke,0.1,2,1;shooter:machine_gun,0,05,2,1;shooter:pistol,0.4,2,1,4;shooter:ammo,0.3,2,1,10;medkits:medkit,0.8,5,2;sniper_rifles:rifle_762_loaded,0.1,5,3;sniper_rifles:rifle_magnum_loaded,0.05,8,2
+time_speed = 1
+size = return {["y"] = 120, ["x"] = 100, ["z"] = 100}
+hint = 
+others = 
+treasures = return {}
+skybox = none
+start_time = 5900
+phys_speed = 1
+phys_jump = 1
+phys_gravity = 1
+chests = return {{["pos2"] = {["y"] = 46, ["x"] = 100, ["z"] = 100}, ["pos1"] = {["y"] = 9, ["x"] = 0, ["z"] = 0}, ["amount"] = 44}}
+teams = return {["red"] = {["pos2"] = {["y"] = 120, ["x"] = 0, ["z"] = 50}, ["enabled"] = true, ["pos1"] = {["y"] = 0, ["x"] = 100, ["z"] = 100}, ["flag_pos"] = {["y"] = 41, ["x"] = 88, ["z"] = 89}}, ["blue"] = {["pos2"] = {["y"] = 0, ["x"] = 100, ["z"] = 0}, ["enabled"] = true, ["pos1"] = {["y"] = 120, ["x"] = 0, ["z"] = 50}, ["flag_pos"] = {["y"] = 41, ["x"] = 12, ["z"] = 11}}}
+barrier_area = return {["pos1"] = {["y"] = 120, ["x"] = 0, ["z"] = 50}, ["pos2"] = {["y"] = 0, ["x"] = 100, ["z"] = 50}}
+game_modes = return {"classic", "classes", "nade_fight"}
diff --git a/ewok_village/map.mts b/ewok_village/map.mts
index c7bed1d..f95064c 100644
Binary files a/ewok_village/map.mts and b/ewok_village/map.mts differ
diff --git a/green_hills/map.conf b/green_hills/map.conf
index 2139d16..7bd5045 100644
--- a/green_hills/map.conf
+++ b/green_hills/map.conf
@@ -1,14 +1,20 @@
-team.2.color = blue
-team.2.pos = (0,0,-83)
-team.1.pos = (0,0,83)
-team.1.color = red
-team.1 = red
+initial_stuff = return {"default:pick_steel", "default:torch 15", "default:ladder 30", "default:stick 2"}
+map_version = 2
 author = DiamondPlane
-rotation = z
-h = 140
-team.2 = blue
 name = Green Hills
-initial_stuff = default:pick_steel,default:torch 15,default:ladder 30,default:stick 2
-r = 115
+enabled = true
 license = CC BY-SA 4.0
+time_speed = 1
+size = return {["y"] = 140, ["x"] = 230, ["z"] = 230}
 hint = You can find some ores in the mine!
+others = 
+treasures = return {"none"}
+skybox = none
+start_time = 5900
+phys_speed = 1
+phys_jump = 1
+phys_gravity = 1
+chests = return {{["pos2"] = {["y"] = 114, ["x"] = 205, ["z"] = 205}, ["pos1"] = {["y"] = 68, ["x"] = 25, ["z"] = 25}, ["amount"] = 42}}
+teams = return {["red"] = {["pos2"] = {["y"] = 0, ["x"] = 205, ["z"] = 115}, ["enabled"] = true, ["pos1"] = {["y"] = 140, ["x"] = 25, ["z"] = 205}, ["flag_pos"] = {["y"] = 70, ["x"] = 115, ["z"] = 198}}, ["blue"] = {["pos2"] = {["y"] = 0, ["x"] = 25, ["z"] = 25}, ["enabled"] = true, ["pos1"] = {["y"] = 140, ["x"] = 205, ["z"] = 115}, ["flag_pos"] = {["y"] = 70, ["x"] = 115, ["z"] = 32}}}
+barrier_area = return {["pos1"] = {["y"] = 140, ["x"] = 25, ["z"] = 115}, ["pos2"] = {["y"] = 0, ["x"] = 205, ["z"] = 115}}
+game_modes = return {"classic", "classes"}
diff --git a/green_hills/map.mts b/green_hills/map.mts
index 2072b59..e14bd79 100644
Binary files a/green_hills/map.mts and b/green_hills/map.mts differ
diff --git a/iceage/map.conf b/iceage/map.conf
index d2a0544..3deae39 100644
--- a/iceage/map.conf
+++ b/iceage/map.conf
@@ -1,13 +1,20 @@
+chests = return {{["pos2"] = {["y"] = 98.5, ["x"] = 220, ["z"] = 225}, ["pos1"] = {["y"] = -0.5, ["x"] = 0, ["z"] = 5}, ["amount"] = 42}}
 name = Intervention in the Ice Age
-author = ANAND
-rotation = z
-r = 115
-h = 140
-team.1 = red
-team.1.color = red
-team.1.pos = 26,-62,100
-team.2 = blue
-team.2.color = blue
-team.2.pos = -74,-62,-79
-initial_stuff = default:pick_steel,default:torch 5
+hint = 
+enabled = true
+map_version = 2
+phys_speed = 1
+phys_jump = 1
 license = CC BY-SA 4.0
+skybox = none
+others = 
+author = ANAND
+initial_stuff = return {"default:pick_steel", "default:torch 5"}
+game_modes = return {"classic", "classes"}
+barrier_area = return {["pos1"] = {["y"] = 99, ["x"] = 5, ["z"] = 115}, ["pos2"] = {["y"] = 0, ["x"] = 225, ["z"] = 115}}
+time_speed = 1
+teams = return {["red"] = {["pos2"] = {["y"] = -0.5, ["x"] = 220, ["z"] = 225}, ["enabled"] = true, ["pos1"] = {["y"] = 98.5, ["x"] = 0, ["z"] = 115}, ["flag_pos"] = {["y"] = 7.5, ["x"] = 136, ["z"] = 215}}, ["blue"] = {["pos2"] = {["y"] = -0.5, ["x"] = 0, ["z"] = 5}, ["enabled"] = true, ["pos1"] = {["y"] = 98.5, ["x"] = 220, ["z"] = 115}, ["flag_pos"] = {["y"] = 7.5, ["x"] = 36, ["z"] = 37}}}
+size = return {["y"] = 99, ["x"] = 225, ["z"] = 225}
+treasures = return {"none"}
+start_time = 5900
+phys_gravity = 1
diff --git a/iceage/map.mts b/iceage/map.mts
index f6638af..ff91212 100644
Binary files a/iceage/map.mts and b/iceage/map.mts differ
diff --git a/mayan_legend/map.conf b/mayan_legend/map.conf
index d2c6fd5..d4544f8 100644
--- a/mayan_legend/map.conf
+++ b/mayan_legend/map.conf
@@ -1,14 +1,20 @@
-team.1.pos = (4,21,77)
-r = 80
-initial_stuff = default:pick_mese,default:torch 10,default:mossycobble 20
-team.2 = blue
-rotation = z
-name = A Mayan Legend
+initial_stuff = return {"default:pick_mese", "default:torch 10", "default:mossycobble 20"}
+map_version = 2
 author = KOLLEGAH
-hint = Look for a secret passage and a hidden Mayan treasure!
+name = A Mayan Legend
+enabled = true
 license = CC BY-SA 4.0
-h = 50
-team.1.color = red
-team.2.color = blue
-team.2.pos = (7,-6,-53)
-team.1 = red
+time_speed = 1
+size = return {["y"] = 50, ["x"] = 160, ["z"] = 160}
+hint = Look for a secret passage and a hidden Mayan treasure!
+others = 
+treasures = return {"none"}
+skybox = none
+start_time = 5900
+phys_speed = 1
+phys_jump = 1
+phys_gravity = 1
+chests = return {{["pos2"] = {["y"] = 37, ["x"] = 131, ["z"] = 124}, ["pos1"] = {["y"] = 2, ["x"] = 28, ["z"] = 40}, ["amount"] = 42}}
+teams = return {["red"] = {["pos2"] = {["y"] = 0, ["x"] = 160, ["z"] = 160}, ["enabled"] = true, ["pos1"] = {["y"] = 50, ["x"] = 0, ["z"] = 80}, ["flag_pos"] = {["y"] = 46, ["x"] = 84, ["z"] = 157}}, ["blue"] = {["pos2"] = {["y"] = 0, ["x"] = 0, ["z"] = 80}, ["enabled"] = true, ["pos1"] = {["y"] = 50, ["x"] = 160, ["z"] = 0}, ["flag_pos"] = {["y"] = 19, ["x"] = 88, ["z"] = 27}}}
+barrier_area = return {["pos1"] = {["y"] = 50, ["x"] = 0, ["z"] = 80}, ["pos2"] = {["y"] = 0, ["x"] = 160, ["z"] = 80}}
+game_modes = return {"classes", "nade_fight"}
diff --git a/mayan_legend/map.mts b/mayan_legend/map.mts
index 89845c1..bba938b 100644
Binary files a/mayan_legend/map.mts and b/mayan_legend/map.mts differ
diff --git a/mini_village/map.conf b/mini_village/map.conf
index b0d35ef..f6e1b78 100644
--- a/mini_village/map.conf
+++ b/mini_village/map.conf
@@ -1,15 +1,20 @@
-disabled = true
-
-team.1.color = red
-team.1 = red
-team.1.pos = (-8, -8, 101)
-team.2.pos = (0, -8, -101)
-team.2.color = blue
+initial_stuff = return {"default:pick_steel", "default:torch 5"}
+map_version = 2
 author = DiamondPlane and Elvis26
-rotation = z
-h = 140
-team.2 = blue
 name = Mini Village
-initial_stuff = default:pick_steel,default:torch 5
-r = 115
+enabled = false
 license = CC BY-SA 4.0
+time_speed = 1
+size = return {["y"] = 140, ["x"] = 230, ["z"] = 230}
+hint = 
+others = 
+treasures = return {"none"}
+skybox = none
+start_time = 5900
+phys_speed = 1
+phys_jump = 1
+phys_gravity = 1
+chests = return {{["pos2"] = {["y"] = 70, ["x"] = 225, ["z"] = 225}, ["pos1"] = {["y"] = 54, ["x"] = 5, ["z"] = 5}, ["amount"] = 42}}
+teams = return {["red"] = {["pos2"] = {["y"] = 140, ["x"] = 5, ["z"] = 115}, ["enabled"] = true, ["pos1"] = {["y"] = 0, ["x"] = 225, ["z"] = 225}, ["flag_pos"] = {["y"] = 62, ["x"] = 107, ["z"] = 216}}, ["blue"] = {["pos2"] = {["y"] = 0, ["x"] = 225, ["z"] = 5}, ["enabled"] = true, ["pos1"] = {["y"] = 140, ["x"] = 5, ["z"] = 115}, ["flag_pos"] = {["y"] = 62, ["x"] = 115, ["z"] = 14}}}
+barrier_area = return {["pos1"] = {["y"] = 140, ["x"] = 225, ["z"] = 115}, ["pos2"] = {["y"] = 0, ["x"] = 5, ["z"] = 115}}
+game_modes = return {"classic", "classes", "nade_fight"}
diff --git a/mini_village/map.mts b/mini_village/map.mts
index 28c8be0..5aecb90 100644
Binary files a/mini_village/map.mts and b/mini_village/map.mts differ
diff --git a/moon/map.conf b/moon/map.conf
index eb6fc00..7956c34 100644
--- a/moon/map.conf
+++ b/moon/map.conf
@@ -1,23 +1,20 @@
-disabled = true
-
-name = Moon
+initial_stuff = return {"default:shovel_steel", "ctf_ranged:pistol_loaded", "default:torch 3"}
+map_version = 2
 author = -sniper-
-
-r = 110
-h = 100
-rotation = z
-
-team.1 = red
-team.1.color = red
-team.1.pos = (-96,-25,97)
-team.2 = blue
-team.2.color = blue
-team.2.pos = (85,-20,-90)
-
-phys_gravity = 0.16
+name = Moon
+enabled = false
+license = CC BY-SA 4.0. Skybox textures adapted from the skybox "Ulukai's space skyboxes" (from https://opengameart.org/content/ulukais-space-skyboxes) by Ulukai, originally licensed under CC BY 3.0. Earth with CC0 license (from https://purepng.com/photo/13214/nature-earth) was added to skybox_4.png. Rockets, machines, satellite dish, tunnels and ice were added by gimp and caoutiouspotato.
+time_speed = 0
+size = return {["y"] = 100, ["x"] = 220, ["z"] = 220}
+hint = 
+others = 
+treasures = return {"none"}
+skybox = moon
+start_time = 18600
 phys_speed = 1.2
 phys_jump = 0.8
-
-base_node = ctf_map:gravel
-initial_stuff = default:shovel_steel,shooter:pistol,default:torch 3
-license = CC BY-SA 4.0. Skybox textures adapted from the skybox "Ulukai's space skyboxes" (from https://opengameart.org/content/ulukais-space-skyboxes) by Ulukai, originally licensed under CC BY 3.0. Earth with CC0 license (from https://purepng.com/photo/13214/nature-earth) was added to skybox_4.png. Rockets, machines, satellite dish, tunnels and ice were added by gimp and caoutiouspotato.
+phys_gravity = 0.16
+chests = return {{["pos2"] = {["y"] = 45, ["x"] = 220, ["z"] = 220}, ["pos1"] = {["y"] = 15, ["x"] = 0, ["z"] = 0}, ["amount"] = 42}}
+teams = return {["red"] = {["pos2"] = {["y"] = 71, ["x"] = 220, ["z"] = 110}, ["enabled"] = true, ["pos1"] = {["y"] = 0, ["x"] = 0, ["z"] = 220}, ["flag_pos"] = {["y"] = 24, ["x"] = 14, ["z"] = 207}}, ["blue"] = {["pos2"] = {["y"] = 0, ["x"] = 0, ["z"] = 0}, ["enabled"] = true, ["pos1"] = {["y"] = 71, ["x"] = 220, ["z"] = 110}, ["flag_pos"] = {["y"] = 30, ["x"] = 195, ["z"] = 20}}}
+barrier_area = return {["pos1"] = {["y"] = 71, ["x"] = 220, ["z"] = 110}, ["pos2"] = {["y"] = 0, ["x"] = 0, ["z"] = 110}}
+game_modes = return {"classic", "classes"}
diff --git a/moon/map.mts b/moon/map.mts
index 88a3182..bc4720a 100644
Binary files a/moon/map.mts and b/moon/map.mts differ
diff --git a/moon/skybox_4.png b/moon/skybox/Back.png
similarity index 100%
rename from moon/skybox_4.png
rename to moon/skybox/Back.png
diff --git a/moon/skybox_2.png b/moon/skybox/Down.png
similarity index 100%
rename from moon/skybox_2.png
rename to moon/skybox/Down.png
diff --git a/moon/skybox_3.png b/moon/skybox/Front.png
similarity index 100%
rename from moon/skybox_3.png
rename to moon/skybox/Front.png
diff --git a/moon/skybox_5.png b/moon/skybox/Left.png
similarity index 100%
rename from moon/skybox_5.png
rename to moon/skybox/Left.png
diff --git a/moon/skybox_6.png b/moon/skybox/Right.png
similarity index 100%
rename from moon/skybox_6.png
rename to moon/skybox/Right.png
diff --git a/moon/skybox_1.png b/moon/skybox/Up.png
similarity index 100%
rename from moon/skybox_1.png
rename to moon/skybox/Up.png
diff --git a/nether_kingdom/map.conf b/nether_kingdom/map.conf
index 1a6d720..e51ee4c 100644
--- a/nether_kingdom/map.conf
+++ b/nether_kingdom/map.conf
@@ -1,13 +1,20 @@
-name = A Kingdom In The Nether
+initial_stuff = return {"default:pick_bronze", "default:desert_cobble 50", "default:torch 10"}
+map_version = 2
 author = Waterbug
+name = A Kingdom In The Nether
+enabled = true
 license = CC BY-SA 3.0
-r = 106
-h = 62
-rotation = x
-team.1 = red
-team.1.color = red
-team.1.pos = (-55,-9,35)
-team.2 = blue
-team.2.color = blue
-team.2.pos = (50,-9,-45)
-initial_stuff = default:pick_bronze,default:desert_cobble 50,default:torch 10
+time_speed = 1
+size = return {["y"] = 62, ["x"] = 212, ["z"] = 212}
+hint = 
+others = 
+treasures = return {"none"}
+skybox = none
+start_time = 5900
+phys_speed = 1
+phys_jump = 1
+phys_gravity = 1
+chests = return {{["pos2"] = {["y"] = 24, ["x"] = 212, ["z"] = 212}, ["pos1"] = {["y"] = 18, ["x"] = 0, ["z"] = 0}, ["amount"] = 42}}
+teams = return {["purple"] = {["pos2"] = {["y"] = 0, ["x"] = 111, ["z"] = 106}, ["enabled"] = true, ["pos1"] = {["y"] = 62, ["x"] = 0, ["z"] = 0}, ["flag_pos"] = {["y"] = 22, ["x"] = 36, ["z"] = 41}}, ["green"] = {["pos2"] = {["y"] = 62, ["x"] = 212, ["z"] = 0}, ["enabled"] = true, ["pos1"] = {["y"] = 0, ["x"] = 111, ["z"] = 106}, ["flag_pos"] = {["y"] = 22, ["x"] = 185, ["z"] = 21}}, ["orange"] = {["pos2"] = {["y"] = 0, ["x"] = 111, ["z"] = 106}, ["enabled"] = true, ["pos1"] = {["y"] = 62, ["x"] = 212, ["z"] = 212}, ["flag_pos"] = {["y"] = 22, ["x"] = 171, ["z"] = 171}}, ["blue"] = {["pos2"] = {["y"] = 62, ["x"] = 0, ["z"] = 212}, ["enabled"] = true, ["pos1"] = {["y"] = 0, ["x"] = 111, ["z"] = 106}, ["flag_pos"] = {["y"] = 22, ["x"] = 21, ["z"] = 191}}}
+barrier_area = return {["pos1"] = {["y"] = 62, ["x"] = 212, ["z"] = 212}, ["pos2"] = {["y"] = 0, ["x"] = 0, ["z"] = 0}}
+game_modes = return {"classes", "classic", "nade_fight"}
diff --git a/nether_kingdom/map.mts b/nether_kingdom/map.mts
index 79ed734..9a2e695 100644
Binary files a/nether_kingdom/map.mts and b/nether_kingdom/map.mts differ
diff --git a/plain_battle/map.conf b/plain_battle/map.conf
index 6ab4622..b0ab7c6 100644
--- a/plain_battle/map.conf
+++ b/plain_battle/map.conf
@@ -1,13 +1,20 @@
-team.2.color = blue
-team.2.pos = (6,1,-103)
-team.1.pos = (6,1,103)
-team.1.color = red
-team.1 = red
+initial_stuff = return {"default:pick_stone", "ctf_ranged:pistol_loaded", "default:torch 5"}
+map_version = 2
 author = -sniper-
-rotation = z
-h = 140
-team.2 = blue
 name = Plain battle
-initial_stuff = default:pick_stone,shooter:pistol,default:torch 5
-r = 110
+enabled = true
 license = CC BY-SA 4.0
+time_speed = 1
+size = return {["y"] = 140, ["x"] = 220, ["z"] = 220}
+hint = 
+others = 
+treasures = return {"none"}
+skybox = none
+start_time = 5400
+phys_speed = 1
+phys_jump = 1
+phys_gravity = 1
+chests = return {{["pos2"] = {["y"] = 85, ["x"] = 220, ["z"] = 220}, ["pos1"] = {["y"] = 66, ["x"] = 0, ["z"] = 0}, ["amount"] = 42}}
+teams = return {["red"] = {["pos2"] = {["y"] = 0, ["x"] = 220, ["z"] = 220}, ["enabled"] = true, ["pos1"] = {["y"] = 140, ["x"] = 0, ["z"] = 110}, ["flag_pos"] = {["y"] = 71, ["x"] = 116, ["z"] = 213}}, ["blue"] = {["pos2"] = {["y"] = 140, ["x"] = 220, ["z"] = 110}, ["enabled"] = true, ["pos1"] = {["y"] = 0, ["x"] = 0, ["z"] = 0}, ["flag_pos"] = {["y"] = 71, ["x"] = 116, ["z"] = 7}}}
+barrier_area = return {["pos1"] = {["y"] = 140, ["x"] = 220, ["z"] = 110}, ["pos2"] = {["y"] = 0, ["x"] = 0, ["z"] = 110}}
+game_modes = return {"nade_fight", "classic", "classes"}
diff --git a/plain_battle/map.mts b/plain_battle/map.mts
index fd956c9..4be7e7c 100644
Binary files a/plain_battle/map.mts and b/plain_battle/map.mts differ
diff --git a/plains/map.conf b/plains/map.conf
index 97a8d24..f31625c 100644
--- a/plains/map.conf
+++ b/plains/map.conf
@@ -1,12 +1,20 @@
-r = 112
-name = Plains of the Past
-h = 140
-rotation = z
+initial_stuff = return {}
+map_version = 2
 author = rubenwardy
-team.1 = red
-team.1.color = red
-team.1.pos = -64,16,85
-team.2 = blue
-team.2.color = blue
-team.2.pos = 23,14,-77
+name = Plains of the Past
+enabled = true
 license = CC BY-SA 4.0
+time_speed = 1
+size = return {["y"] = 140, ["x"] = 224, ["z"] = 224}
+hint = 
+others = 
+treasures = return {"none"}
+skybox = none
+start_time = 5900
+phys_speed = 1
+phys_jump = 1
+phys_gravity = 1
+chests = return {{["pos2"] = {["y"] = 98, ["x"] = 214, ["z"] = 214}, ["pos1"] = {["y"] = 71, ["x"] = 10, ["z"] = 10}, ["amount"] = 42}}
+teams = return {["red"] = {["pos2"] = {["y"] = 0, ["x"] = 10, ["z"] = 214}, ["enabled"] = true, ["pos1"] = {["y"] = 140, ["x"] = 214, ["z"] = 112}, ["flag_pos"] = {["y"] = 86, ["x"] = 48, ["z"] = 197}}, ["blue"] = {["pos2"] = {["y"] = 0, ["x"] = 214, ["z"] = 10}, ["enabled"] = true, ["pos1"] = {["y"] = 140, ["x"] = 10, ["z"] = 112}, ["flag_pos"] = {["y"] = 84, ["x"] = 135, ["z"] = 35}}}
+barrier_area = return {["pos1"] = {["y"] = 140, ["x"] = 214, ["z"] = 112}, ["pos2"] = {["y"] = 0, ["x"] = 11, ["z"] = 112}}
+game_modes = return {"classic", "nade_fight", "classes"}
diff --git a/plains/map.mts b/plains/map.mts
index ac385c9..84cbceb 100644
Binary files a/plains/map.mts and b/plains/map.mts differ
diff --git a/river_valley/map.conf b/river_valley/map.conf
index d2724b0..0dd04ca 100644
--- a/river_valley/map.conf
+++ b/river_valley/map.conf
@@ -1,13 +1,20 @@
-name = River valley
-r = 115
-rotation = z
-h = 140
-team.1 = red
-team.1.color = red
-team.1.pos = (19,19,81)
-team.2 = blue
-team.2.color = blue
-team.2.pos = (-1,11,-103)
+initial_stuff = return {"default:pick_stone", "default:torch 3"}
+map_version = 2
 author = -sniper-
-initial_stuff = default:pick_stone,default:torch 3
+name = River valley
+enabled = true
 license = CC BY-SA 4.0
+time_speed = 1
+size = return {["y"] = 140, ["x"] = 230, ["z"] = 230}
+hint = 
+others = 
+treasures = return {"none"}
+skybox = none
+start_time = 5900
+phys_speed = 1
+phys_jump = 1
+phys_gravity = 1
+chests = return {{["pos2"] = {["y"] = 113, ["x"] = 225, ["z"] = 230}, ["pos1"] = {["y"] = 59, ["x"] = 0, ["z"] = 5}, ["amount"] = 42}}
+teams = return {["red"] = {["pos2"] = {["y"] = 0, ["x"] = 0, ["z"] = 115}, ["enabled"] = true, ["pos1"] = {["y"] = 140, ["x"] = 225, ["z"] = 225}, ["flag_pos"] = {["y"] = 89, ["x"] = 134, ["z"] = 196}}, ["blue"] = {["pos2"] = {["y"] = 0, ["x"] = 5, ["z"] = 5}, ["enabled"] = true, ["pos1"] = {["y"] = 140, ["x"] = 225, ["z"] = 115}, ["flag_pos"] = {["y"] = 81, ["x"] = 114, ["z"] = 12}}}
+barrier_area = return {["pos1"] = {["y"] = 140, ["x"] = 5, ["z"] = 115}, ["pos2"] = {["y"] = 0, ["x"] = 225, ["z"] = 115}}
+game_modes = return {"classes", "classic", "nade_fight"}
diff --git a/river_valley/map.mts b/river_valley/map.mts
index e22fdbc..783953f 100644
Binary files a/river_valley/map.mts and b/river_valley/map.mts differ
diff --git a/sams_mansion/skybox_4.png b/sams_mansion/skybox/Back.png
similarity index 100%
rename from sams_mansion/skybox_4.png
rename to sams_mansion/skybox/Back.png
diff --git a/sams_mansion/skybox_2.png b/sams_mansion/skybox/Down.png
similarity index 100%
rename from sams_mansion/skybox_2.png
rename to sams_mansion/skybox/Down.png
diff --git a/sams_mansion/skybox_3.png b/sams_mansion/skybox/Front.png
similarity index 100%
rename from sams_mansion/skybox_3.png
rename to sams_mansion/skybox/Front.png
diff --git a/sams_mansion/skybox_5.png b/sams_mansion/skybox/Left.png
similarity index 100%
rename from sams_mansion/skybox_5.png
rename to sams_mansion/skybox/Left.png
diff --git a/sams_mansion/skybox_6.png b/sams_mansion/skybox/Right.png
similarity index 100%
rename from sams_mansion/skybox_6.png
rename to sams_mansion/skybox/Right.png
diff --git a/sams_mansion/skybox_1.png b/sams_mansion/skybox/Up.png
similarity index 100%
rename from sams_mansion/skybox_1.png
rename to sams_mansion/skybox/Up.png
diff --git a/snowland/map.conf b/snowland/map.conf
index ee69295..a2f5754 100644
--- a/snowland/map.conf
+++ b/snowland/map.conf
@@ -1,14 +1,20 @@
-team.1.color = red
-team.1 = red
-team.1.pos = (-12,-40,87)
-team.2.pos = (-9,-48,-76)
-team.2.color = blue
-author = Elvis26
-rotation = z
-h = 140
-team.2 = blue
+chests = return {{["pos2"] = {["y"] = 98.5, ["x"] = 225, ["z"] = 225}, ["pos1"] = {["y"] = -0.5, ["x"] = 5, ["z"] = 5}, ["amount"] = 42}}
 name = Snow Land
-initial_stuff = default:pick_steel,default:torch 10
-r = 115
-license = CC BY-SA 4.0
 hint = You can find some ores in the mine.
+enabled = true
+map_version = 2
+phys_speed = 1
+phys_jump = 1
+license = CC BY-SA 4.0
+skybox = none
+others = 
+author = Elvis26
+initial_stuff = return {"default:pick_steel", "default:torch 10"}
+game_modes = return {"classic", "nade_fight", "classes"}
+barrier_area = return {["pos1"] = {["y"] = 0, ["x"] = 5, ["z"] = 115}, ["pos2"] = {["y"] = 99, ["x"] = 225, ["z"] = 115}}
+time_speed = 1
+teams = return {["red"] = {["pos2"] = {["y"] = 0, ["x"] = 5, ["z"] = 115}, ["enabled"] = true, ["pos1"] = {["y"] = 99, ["x"] = 225, ["z"] = 225}, ["flag_pos"] = {["y"] = 29.5, ["x"] = 103, ["z"] = 202}}, ["blue"] = {["pos2"] = {["y"] = 0, ["x"] = 225, ["z"] = 5}, ["enabled"] = true, ["pos1"] = {["y"] = 99, ["x"] = 5, ["z"] = 115}, ["flag_pos"] = {["y"] = 21.5, ["x"] = 106, ["z"] = 39}}}
+size = return {["y"] = 99, ["x"] = 230, ["z"] = 230}
+treasures = return {"none"}
+start_time = 5900
+phys_gravity = 1
diff --git a/snowland/map.mts b/snowland/map.mts
index db8f70f..23e0235 100644
Binary files a/snowland/map.mts and b/snowland/map.mts differ
diff --git a/the_wall/map.conf b/the_wall/map.conf
index 82a364c..041dbce 100644
--- a/the_wall/map.conf
+++ b/the_wall/map.conf
@@ -1,20 +1,20 @@
-team.1.pos = (51,-15,51)
-team.1.color = red
-author = Thomas-S
-rotation = x
+chests = return {{["pos2"] = {["y"] = 48, ["x"] = 139, ["z"] = 139}, ["pos1"] = {["y"] = 9, ["x"] = 1, ["z"] = 74}, ["amount"] = 70}, {["pos2"] = {["y"] = 48, ["x"] = 139, ["z"] = 66}, ["pos1"] = {["y"] = 9, ["x"] = 1, ["z"] = 1}, ["amount"] = 70}}
 name = The Wall
 hint = Look for a treasure room inside the wall!
-r = 70
-initial_stuff = default:pick_steel,default:stick 5,default:torch 3
-team.2 = blue
-h = 50
-team.2.color = blue
-team.2.pos = (-51,-15,-51)
-team.1 = red
-chests.1.from = (-69,-16,4)
-chests.1.to = (69,23,69)
-chests.1.n = 70
-chests.2.from = (-69,-16,-69)
-chests.2.to = (69,23,-4)
-chests.2.n = 70
+enabled = true
+map_version = 2
+phys_speed = 1
+phys_jump = 1
 license = CC BY-SA 4.0
+skybox = none
+others = 
+author = Thomas-S
+initial_stuff = return {"default:pick_steel", "default:stick 5", "default:torch 3"}
+game_modes = return {"classes", "classic", "nade_fight"}
+barrier_area = return {["pos1"] = {["y"] = 11, ["x"] = 86, ["z"] = 70}, ["pos2"] = {["y"] = 10, ["x"] = 54, ["z"] = 70}}
+time_speed = 1
+teams = return {["red"] = {["pos2"] = {["y"] = 0, ["x"] = 0, ["z"] = 70}, ["enabled"] = true, ["pos1"] = {["y"] = 50, ["x"] = 140, ["z"] = 140}, ["flag_pos"] = {["y"] = 10, ["x"] = 121, ["z"] = 121}}, ["blue"] = {["pos2"] = {["y"] = 0, ["x"] = 140, ["z"] = 0}, ["enabled"] = true, ["pos1"] = {["y"] = 50, ["x"] = 0, ["z"] = 70}, ["flag_pos"] = {["y"] = 10, ["x"] = 19, ["z"] = 19}}}
+size = return {["y"] = 50, ["x"] = 140, ["z"] = 140}
+treasures = return {"none"}
+start_time = 5900
+phys_gravity = 1
diff --git a/the_wall/map.mts b/the_wall/map.mts
index 9ef8f2b..e07a0f3 100644
Binary files a/the_wall/map.mts and b/the_wall/map.mts differ
diff --git a/towers/map.conf b/towers/map.conf
index 21854d1..17c6d39 100644
--- a/towers/map.conf
+++ b/towers/map.conf
@@ -1,48 +1,20 @@
-disabled = true
-
-name = Towers
+initial_stuff = return {"default:pick_stone", "default:cobble 40", "default:torch 5", "default:stick 8"}
+map_version = 2
 author = Atmozpheric
+name = Towers
+enabled = false
 license = CC BY 4.0
-
-r = 115
-h = 240
-rotation = x
-
-team.1 = red
-team.1.color = red
-team.1.pos = (0,35,69)
-team.2 = blue
-team.2.color = blue
-team.2.pos = (0,35,-63)
-
-initial_stuff = default:pick_stone,default:cobble 20,default:torch 5,default:stick 8
-
-# bottom of towers
-chests.1.n = 10
-chests.1.from = (-2,-24,67)
-chests.1.to = (2,-23,71)
-chests.2.n = 10
-chests.2.from = (-2,-24,-60)
-chests.2.to = (2,-23,-66)
-
-# middle of towers
-chests.3.n = 20
-chests.3.from = (-3,14,66)
-chests.3.to = (3,28,72)
-chests.4.n = 20
-chests.4.from = (-3,14,-59)
-chests.4.to = (3,28,-67)
-
-# secrets deep into the forests
-chests.5.n = 10
-chests.5.from = (-35,-24,100)
-chests.5.to = (-100,-24,1)
-chests.6.n = 10
-chests.6.from = (35,-24,100)
-chests.6.to = (100,-24,1)
-chests.7.n = 10
-chests.7.from = (-35,-24,-100)
-chests.7.to = (-100,-24,-1)
-chests.8.n = 10
-chests.8.from = (35,-24,-100)
-chests.8.to = (100,-24,-1)
+time_speed = 1
+size = return {["y"] = 240, ["x"] = 230, ["z"] = 230}
+hint = 
+others = 
+treasures = return {"none"}
+skybox = none
+start_time = 5900
+phys_speed = 1
+phys_jump = 1
+phys_gravity = 1
+chests = return {{["pos2"] = {["y"] = 97, ["x"] = 117, ["z"] = 186}, ["pos1"] = {["y"] = 96, ["x"] = 113, ["z"] = 182}, ["amount"] = 10}, {["pos2"] = {["y"] = 97, ["x"] = 117, ["z"] = 55}, ["pos1"] = {["y"] = 96, ["x"] = 113, ["z"] = 49}, ["amount"] = 10}, {["pos2"] = {["y"] = 148, ["x"] = 118, ["z"] = 187}, ["pos1"] = {["y"] = 134, ["x"] = 112, ["z"] = 181}, ["amount"] = 20}, {["pos2"] = {["y"] = 148, ["x"] = 118, ["z"] = 56}, ["pos1"] = {["y"] = 134, ["x"] = 112, ["z"] = 48}, ["amount"] = 20}, {["pos2"] = {["y"] = 96, ["x"] = 80, ["z"] = 215}, ["pos1"] = {["y"] = 96, ["x"] = 15, ["z"] = 116}, ["amount"] = 10}, {["pos2"] = {["y"] = 96, ["x"] = 215, ["z"] = 215}, ["pos1"] = {["y"] = 96, ["x"] = 150, ["z"] = 116}, ["amount"] = 10}, {["pos2"] = {["y"] = 96, ["x"] = 80, ["z"] = 114}, ["pos1"] = {["y"] = 96, ["x"] = 15, ["z"] = 15}, ["amount"] = 10}, {["pos2"] = {["y"] = 96, ["x"] = 215, ["z"] = 114}, ["pos1"] = {["y"] = 96, ["x"] = 150, ["z"] = 15}, ["amount"] = 10}}
+teams = return {["red"] = {["pos2"] = {["y"] = 0, ["x"] = 225, ["z"] = 225}, ["enabled"] = true, ["pos1"] = {["y"] = 240, ["x"] = 5, ["z"] = 115}, ["flag_pos"] = {["y"] = 155, ["x"] = 115, ["z"] = 184}}, ["blue"] = {["pos2"] = {["y"] = 0, ["x"] = 5, ["z"] = 115}, ["enabled"] = true, ["pos1"] = {["y"] = 240, ["x"] = 225, ["z"] = 5}, ["flag_pos"] = {["y"] = 155, ["x"] = 115, ["z"] = 52}}}
+barrier_area = return {["pos1"] = {["y"] = 240, ["x"] = 5, ["z"] = 115}, ["pos2"] = {["y"] = 0, ["x"] = 225, ["z"] = 115}}
+game_modes = return {"classes", "nade_fight"}
diff --git a/towers/map.mts b/towers/map.mts
index afadb7c..67e7191 100644
Binary files a/towers/map.mts and b/towers/map.mts differ
diff --git a/tunnel/map.conf b/tunnel/map.conf
index ea7ac12..bd53727 100644
--- a/tunnel/map.conf
+++ b/tunnel/map.conf
@@ -1,21 +1,20 @@
-name = Tunnel
+initial_stuff = return {"default:pick_mese", "default:stick 5", "default:torch 20"}
+map_version = 2
 author = -sniper-
-hint = Dig to reach the enemy!
-r = 115
-h = 140
-rotation = x
-team.1 = red
-team.1.color = red
-team.1.pos = (-1,2,82)
-team.2 = blue
-team.2.color = blue
-team.2.pos = (-1,2,-82)
-initial_stuff = default:pick_mese,default:stick 5,default:torch 20
-chests.1.n = 30
-chests.1.from = -13,1,108
-chests.1.to = 11,5,93
-chests.2.n = 30
-chests.2.from = -13,1,-107
-chests.2.to = 11,5,-94
+name = Tunnel
+enabled = true
 license = CC BY-SA 4.0
-treasures = default:ladder,0.3,2,10,20;default:glass,0.3,2,5,15;default:cobble,0.4,5,45,99;default:stone,0.2,3,10,20;default:wood,0.3,5,30,60;default:gravel,0.3,3,10,20;default:obsidian,0.06,2,3,6;default:steel_ingot,0.15,2,5,10;default:mese_crystal,0.08,2,2,4;default:diamond,0.05,2,1,2;doors:door_steel,0.3,5,1,3;ctf_traps:damage_cobble,0.3,4,10,20;ctf_map:reinforced_cobble,0.3,4,10,20;default:sword_mese,0.1,3,1,2;default:sword_diamond,0.06,2,1,2;default:shovel_mese,0.1,3,1,2;default:shovel_diamond,0.06,2,1,2;default:axe_steel,0.15,2,1,2;default:axe_mese,0.1,3,1,2;default:axe_diamond,0.06,2,1,2;default:pick_diamond,0.1,2,1,2;shooter:shotgun,0.05,2,1;grenades:frag,0.1,2,1;grenades:smoke,0.1,2,1;shooter:machine_gun,0,03,2,1;shooter:crossbow,0.2,2,1,2;shooter:pistol,0.4,2,1,4;shooter:ammo,0.3,2,1,10;shooter:arrow_white,0.3,2,10,20;medkits:medkit,0.8,5,2
+time_speed = 1
+size = return {["y"] = 140, ["x"] = 230, ["z"] = 230}
+hint = Dig to reach the enemy!
+others = 
+treasures = return {}
+skybox = none
+start_time = 5900
+phys_speed = 1
+phys_jump = 1
+phys_gravity = 1
+chests = return {{["pos2"] = {["y"] = 75, ["x"] = 126, ["z"] = 223}, ["pos1"] = {["y"] = 71, ["x"] = 102, ["z"] = 208}, ["amount"] = 30}, {["pos2"] = {["y"] = 75, ["x"] = 126, ["z"] = 21}, ["pos1"] = {["y"] = 71, ["x"] = 102, ["z"] = 8}, ["amount"] = 30}}
+teams = return {["red"] = {["pos2"] = {["y"] = 0, ["x"] = 5, ["z"] = 225}, ["enabled"] = true, ["pos1"] = {["y"] = 140, ["x"] = 225, ["z"] = 115}, ["flag_pos"] = {["y"] = 72, ["x"] = 114, ["z"] = 197}}, ["blue"] = {["pos2"] = {["y"] = 0, ["x"] = 225, ["z"] = 5}, ["enabled"] = true, ["pos1"] = {["y"] = 140, ["x"] = 5, ["z"] = 115}, ["flag_pos"] = {["y"] = 72, ["x"] = 114, ["z"] = 33}}}
+barrier_area = return {["pos1"] = {["y"] = 140, ["x"] = 0, ["z"] = 115}, ["pos2"] = {["y"] = 0, ["x"] = 230, ["z"] = 115}}
+game_modes = return {"classic", "classes", "nade_fight"}
diff --git a/tunnel/map.mts b/tunnel/map.mts
index 13e62b3..533a2d4 100644
Binary files a/tunnel/map.mts and b/tunnel/map.mts differ
diff --git a/two_hills/map.conf b/two_hills/map.conf
index c2f0a6e..7a5f4d1 100644
--- a/two_hills/map.conf
+++ b/two_hills/map.conf
@@ -1,12 +1,20 @@
-name = Two Hills and Two Lakes
+initial_stuff = return {}
+map_version = 2
 author = rubenwardy
-rotation = z
-r = 115
-h = 140
-team.1 = red
-team.1.color = red
-team.1.pos = 7,27,93
-team.2 = blue
-team.2.color = blue
-team.2.pos = -22,28,-78
+name = Two Hills and Two Lakes
+enabled = true
 license = CC BY-SA 4.0
+time_speed = 1
+size = return {["y"] = 140, ["x"] = 230, ["z"] = 230}
+hint = 
+others = 
+treasures = return {"none"}
+skybox = none
+start_time = 5900
+phys_speed = 1
+phys_jump = 1
+phys_gravity = 1
+chests = return {{["pos2"] = {["y"] = 96, ["x"] = 225, ["z"] = 225}, ["pos1"] = {["y"] = 68, ["x"] = 5, ["z"] = 5}, ["amount"] = 42}}
+teams = return {["red"] = {["pos2"] = {["y"] = 0, ["x"] = 5, ["z"] = 5}, ["enabled"] = true, ["pos1"] = {["y"] = 140, ["x"] = 225, ["z"] = 115}, ["flag_pos"] = {["y"] = 98, ["x"] = 116, ["z"] = 17}}, ["blue"] = {["pos2"] = {["y"] = 0, ["x"] = 225, ["z"] = 225}, ["enabled"] = true, ["pos1"] = {["y"] = 140, ["x"] = 5, ["z"] = 115}, ["flag_pos"] = {["y"] = 97, ["x"] = 108, ["z"] = 206}}}
+barrier_area = return {["pos1"] = {["y"] = 140, ["x"] = 225, ["z"] = 115}, ["pos2"] = {["y"] = 0, ["x"] = 5, ["z"] = 115}}
+game_modes = return {"classes", "classic", "nade_fight"}
diff --git a/two_hills/map.mts b/two_hills/map.mts
index a30ebd9..8a29407 100644
Binary files a/two_hills/map.mts and b/two_hills/map.mts differ
diff --git a/wool_islands/skybox_4.png b/wool_islands/skybox/Back.png
similarity index 100%
rename from wool_islands/skybox_4.png
rename to wool_islands/skybox/Back.png
diff --git a/wool_islands/skybox_2.png b/wool_islands/skybox/Down.png
similarity index 100%
rename from wool_islands/skybox_2.png
rename to wool_islands/skybox/Down.png
diff --git a/wool_islands/skybox_3.png b/wool_islands/skybox/Front.png
similarity index 100%
rename from wool_islands/skybox_3.png
rename to wool_islands/skybox/Front.png
diff --git a/wool_islands/skybox_5.png b/wool_islands/skybox/Left.png
similarity index 100%
rename from wool_islands/skybox_5.png
rename to wool_islands/skybox/Left.png
diff --git a/wool_islands/skybox_6.png b/wool_islands/skybox/Right.png
similarity index 100%
rename from wool_islands/skybox_6.png
rename to wool_islands/skybox/Right.png
diff --git a/wool_islands/skybox_1.png b/wool_islands/skybox/Up.png
similarity index 100%
rename from wool_islands/skybox_1.png
rename to wool_islands/skybox/Up.png