diff --git a/mods/ctf/ctf_map/ctf_map_core/maps b/mods/ctf/ctf_map/ctf_map_core/maps
index 30c292d..1097020 160000
--- a/mods/ctf/ctf_map/ctf_map_core/maps
+++ b/mods/ctf/ctf_map/ctf_map_core/maps
@@ -1 +1 @@
-Subproject commit 30c292d51e6a289c2f33bb5f0ad9f3774289a018
+Subproject commit 10970201c9961fc34158b68dd14ff1e073e1124e
diff --git a/mods/ctf/ctf_map/map_maker/mod.conf b/mods/ctf/ctf_map/map_maker/mod.conf
index d7c01fc..75dd924 100644
--- a/mods/ctf/ctf_map/map_maker/mod.conf
+++ b/mods/ctf/ctf_map/map_maker/mod.conf
@@ -1,3 +1,2 @@
 name = map_maker
-depends = ctf_map_core
-optional_depends = worldedit
+depends = ctf_map_core, worldedit
diff --git a/mods/mtg/default/init.lua b/mods/mtg/default/init.lua
index d7ee118..c4c020d 100644
--- a/mods/mtg/default/init.lua
+++ b/mods/mtg/default/init.lua
@@ -10,22 +10,10 @@ default.LIGHT_MAX = 14
 
 -- GUI related stuff
 minetest.register_on_joinplayer(function(player)
-	-- Set formspec prepend
-	local formspec = [[
-		bgcolor[#080808BB;true]
-		listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF]
-	]]
-
-	local name = player:get_player_name()
-	local info = minetest.get_player_information(name)
-
-	if info.formspec_version > 1 then
-		formspec = formspec .. "background9[5,5;1,1;gui_formbg.png;true;10]"
-	else
-		formspec = formspec .. "background[5,5;1,1;gui_formbg.png;true]"
-	end
-
-	player:set_formspec_prepend(formspec)
+	player:set_formspec_prepend([[
+			bgcolor[#080808BB;true]
+			background[5,5;1,1;gui_formbg.png;true]
+			listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF] ]])
 end)
 
 function default.get_hotbar_bg(x,y)