diff --git a/mk/windoze/glest_game.cbp b/mk/windoze/glest_game.cbp
index 9ac4bc5bf..d41e7ab83 100644
--- a/mk/windoze/glest_game.cbp
+++ b/mk/windoze/glest_game.cbp
@@ -365,6 +365,7 @@
 			</Target>
 			<Target title="Debug Linux">
 				<Option output="../linux/glest.bin" prefix_auto="0" extension_auto="0" />
+				<Option working_dir="../linux/" />
 				<Option object_output="Debug Linux/glest_game" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -568,6 +569,8 @@
 		<Unit filename="../../source/glest_game/menu/menu_state_root.h" />
 		<Unit filename="../../source/glest_game/menu/menu_state_scenario.cpp" />
 		<Unit filename="../../source/glest_game/menu/menu_state_scenario.h" />
+		<Unit filename="../../source/glest_game/menu/server_line.cpp" />
+		<Unit filename="../../source/glest_game/menu/server_line.h" />
 		<Unit filename="../../source/glest_game/network/client_interface.cpp" />
 		<Unit filename="../../source/glest_game/network/client_interface.h" />
 		<Unit filename="../../source/glest_game/network/connection_slot.cpp" />
diff --git a/mk/windoze/glest_game.layout b/mk/windoze/glest_game.layout
deleted file mode 100644
index 169cbc4c1..000000000
--- a/mk/windoze/glest_game.layout
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_layout_file>
-	<ActiveTarget name="Release Linux" />
-	<File name="../../source/glest_game/ai/ai.cpp" open="0" top="0" tabpos="10">
-		<Cursor position="12418" topLine="415" />
-	</File>
-	<File name="../../source/glest_game/ai/ai_interface.cpp" open="1" top="0" tabpos="7">
-		<Cursor position="15132" topLine="347" />
-	</File>
-	<File name="../../source/glest_game/ai/cartographer.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="8456" topLine="266" />
-	</File>
-	<File name="../../source/glest_game/facilities/components.cpp" open="0" top="0" tabpos="33">
-		<Cursor position="2395" topLine="56" />
-	</File>
-	<File name="../../source/glest_game/facilities/game_util.cpp" open="0" top="0" tabpos="32">
-		<Cursor position="5576" topLine="184" />
-	</File>
-	<File name="../../source/glest_game/facilities/game_util.h" open="0" top="0" tabpos="8">
-		<Cursor position="837" topLine="4" />
-	</File>
-	<File name="../../source/glest_game/facilities/logger.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="1195" topLine="115" />
-	</File>
-	<File name="../../source/glest_game/game/chat_manager.cpp" open="1" top="0" tabpos="5">
-		<Cursor position="4130" topLine="108" />
-	</File>
-	<File name="../../source/glest_game/game/chat_manager.h" open="1" top="0" tabpos="6">
-		<Cursor position="1009" topLine="27" />
-	</File>
-	<File name="../../source/glest_game/game/console.cpp" open="1" top="0" tabpos="3">
-		<Cursor position="2942" topLine="75" />
-	</File>
-	<File name="../../source/glest_game/game/console.h" open="1" top="0" tabpos="4">
-		<Cursor position="1790" topLine="50" />
-	</File>
-	<File name="../../source/glest_game/game/game.cpp" open="1" top="0" tabpos="26">
-		<Cursor position="62364" topLine="1627" />
-	</File>
-	<File name="../../source/glest_game/game/game.h" open="0" top="0" tabpos="27">
-		<Cursor position="2770" topLine="103" />
-	</File>
-	<File name="../../source/glest_game/game/game_constants.h" open="0" top="0" tabpos="7">
-		<Cursor position="3016" topLine="112" />
-	</File>
-	<File name="../../source/glest_game/game/game_settings.h" open="1" top="0" tabpos="20">
-		<Cursor position="4937" topLine="132" />
-	</File>
-	<File name="../../source/glest_game/global/config.cpp" open="0" top="0" tabpos="2">
-		<Cursor position="3309" topLine="80" />
-	</File>
-	<File name="../../source/glest_game/global/config.h" open="0" top="0" tabpos="0">
-		<Cursor position="1037" topLine="35" />
-	</File>
-	<File name="../../source/glest_game/global/core_data.cpp" open="0" top="0" tabpos="3">
-		<Cursor position="2143" topLine="156" />
-	</File>
-	<File name="../../source/glest_game/global/core_data.h" open="0" top="0" tabpos="14">
-		<Cursor position="603" topLine="1" />
-	</File>
-	<File name="../../source/glest_game/global/lang.cpp" open="0" top="0" tabpos="4">
-		<Cursor position="2007" topLine="41" />
-	</File>
-	<File name="../../source/glest_game/graphics/particle_type.cpp" open="0" top="0" tabpos="1">
-		<Cursor position="0" topLine="0" />
-	</File>
-	<File name="../../source/glest_game/graphics/particle_type.h" open="0" top="0" tabpos="0">
-		<Cursor position="654" topLine="2" />
-	</File>
-	<File name="../../source/glest_game/graphics/renderer.cpp" open="1" top="0" tabpos="8">
-		<Cursor position="101237" topLine="3435" />
-	</File>
-	<File name="../../source/glest_game/main/main.cpp" open="0" top="0" tabpos="1">
-		<Cursor position="28455" topLine="770" />
-	</File>
-	<File name="../../source/glest_game/main/program.cpp" open="0" top="0" tabpos="5">
-		<Cursor position="17186" topLine="504" />
-	</File>
-	<File name="../../source/glest_game/menu/main_menu.cpp" open="0" top="0" tabpos="9">
-		<Cursor position="4661" topLine="158" />
-	</File>
-	<File name="../../source/glest_game/menu/menu_background.cpp" open="0" top="0" tabpos="10">
-		<Cursor position="1052" topLine="28" />
-	</File>
-	<File name="../../source/glest_game/menu/menu_state_connected_game.cpp" open="1" top="0" tabpos="21">
-		<Cursor position="38856" topLine="936" />
-	</File>
-	<File name="../../source/glest_game/menu/menu_state_custom_game.cpp" open="0" top="0" tabpos="14">
-		<Cursor position="22810" topLine="566" />
-	</File>
-	<File name="../../source/glest_game/menu/menu_state_custom_game.h" open="0" top="0" tabpos="40">
-		<Cursor position="960" topLine="129" />
-	</File>
-	<File name="../../source/glest_game/menu/menu_state_join_game.cpp" open="0" top="0" tabpos="15">
-		<Cursor position="7351" topLine="216" />
-	</File>
-	<File name="../../source/glest_game/menu/menu_state_masterserver.cpp" open="1" top="0" tabpos="1">
-		<Cursor position="25214" topLine="663" />
-	</File>
-	<File name="../../source/glest_game/menu/menu_state_masterserver.h" open="1" top="0" tabpos="2">
-		<Cursor position="3370" topLine="94" />
-	</File>
-	<File name="../../source/glest_game/menu/menu_state_options.cpp" open="0" top="0" tabpos="13">
-		<Cursor position="4623" topLine="113" />
-	</File>
-	<File name="../../source/glest_game/menu/menu_state_root.cpp" open="0" top="0" tabpos="16">
-		<Cursor position="3513" topLine="86" />
-	</File>
-	<File name="../../source/glest_game/network/client_interface.cpp" open="1" top="0" tabpos="13">
-		<Cursor position="1139" topLine="29" />
-	</File>
-	<File name="../../source/glest_game/network/connection_slot.cpp" open="1" top="0" tabpos="11">
-		<Cursor position="31095" topLine="647" />
-	</File>
-	<File name="../../source/glest_game/network/connection_slot.h" open="1" top="0" tabpos="12">
-		<Cursor position="2843" topLine="100" />
-	</File>
-	<File name="../../source/glest_game/network/network_interface.cpp" open="0" top="0" tabpos="35">
-		<Cursor position="0" topLine="0" />
-	</File>
-	<File name="../../source/glest_game/network/network_manager.cpp" open="0" top="0" tabpos="21">
-		<Cursor position="777" topLine="15" />
-	</File>
-	<File name="../../source/glest_game/network/network_message.cpp" open="1" top="0" tabpos="22">
-		<Cursor position="8089" topLine="219" />
-	</File>
-	<File name="../../source/glest_game/network/network_message.h" open="0" top="0" tabpos="30">
-		<Cursor position="5699" topLine="207" />
-	</File>
-	<File name="../../source/glest_game/network/network_types.cpp" open="0" top="0" tabpos="29">
-		<Cursor position="517" topLine="0" />
-	</File>
-	<File name="../../source/glest_game/network/network_types.h" open="0" top="0" tabpos="0">
-		<Cursor position="628" topLine="0" />
-	</File>
-	<File name="../../source/glest_game/network/server_interface.cpp" open="1" top="0" tabpos="9">
-		<Cursor position="3765" topLine="72" />
-	</File>
-	<File name="../../source/glest_game/network/server_interface.h" open="1" top="0" tabpos="10">
-		<Cursor position="663" topLine="6" />
-	</File>
-	<File name="../../source/glest_game/type_instances/faction.cpp" open="1" top="0" tabpos="14">
-		<Cursor position="30798" topLine="865" />
-	</File>
-	<File name="../../source/glest_game/type_instances/unit.cpp" open="1" top="0" tabpos="15">
-		<Cursor position="53649" topLine="1782" />
-	</File>
-	<File name="../../source/glest_game/type_instances/unit.h" open="0" top="0" tabpos="24">
-		<Cursor position="9749" topLine="330" />
-	</File>
-	<File name="../../source/glest_game/types/command_type.cpp" open="0" top="0" tabpos="22">
-		<Cursor position="3996" topLine="101" />
-	</File>
-	<File name="../../source/glest_game/types/command_type.h" open="0" top="0" tabpos="23">
-		<Cursor position="2449" topLine="86" />
-	</File>
-	<File name="../../source/glest_game/types/skill_type.h" open="0" top="0" tabpos="25">
-		<Cursor position="1236" topLine="37" />
-	</File>
-	<File name="../../source/glest_game/types/unit_type.cpp" open="1" top="0" tabpos="18">
-		<Cursor position="589" topLine="0" />
-	</File>
-	<File name="../../source/glest_game/types/unit_type.h" open="1" top="0" tabpos="19">
-		<Cursor position="4730" topLine="152" />
-	</File>
-	<File name="../../source/glest_game/world/map.cpp" open="1" top="0" tabpos="25">
-		<Cursor position="10892" topLine="388" />
-	</File>
-	<File name="../../source/glest_game/world/map.h" open="1" top="0" tabpos="24">
-		<Cursor position="3852" topLine="105" />
-	</File>
-	<File name="../../source/glest_game/world/minimap.cpp" open="1" top="0" tabpos="23">
-		<Cursor position="2625" topLine="101" />
-	</File>
-	<File name="../../source/glest_game/world/minimap.h" open="0" top="0" tabpos="0">
-		<Cursor position="1287" topLine="21" />
-	</File>
-	<File name="../../source/glest_game/world/unit_updater.cpp" open="1" top="0" tabpos="27">
-		<Cursor position="64308" topLine="1581" />
-	</File>
-	<File name="../../source/glest_game/world/world.cpp" open="1" top="0" tabpos="16">
-		<Cursor position="43867" topLine="1286" />
-	</File>
-	<File name="../../source/glest_game/world/world.h" open="1" top="0" tabpos="17">
-		<Cursor position="6990" topLine="193" />
-	</File>
-</CodeBlocks_layout_file>
diff --git a/mk/windoze/libstreflop.layout b/mk/windoze/libstreflop.layout
deleted file mode 100644
index d77b945d5..000000000
--- a/mk/windoze/libstreflop.layout
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_layout_file>
-	<ActiveTarget name="Release Linux" />
-</CodeBlocks_layout_file>
diff --git a/mk/windoze/shared_lib.layout b/mk/windoze/shared_lib.layout
deleted file mode 100644
index b5ff147ee..000000000
--- a/mk/windoze/shared_lib.layout
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_layout_file>
-	<ActiveTarget name="Release Linux" />
-	<File name="../../source/shared_lib/include/feathery_ftp/ftpIfc.h" open="0" top="0" tabpos="0">
-		<Cursor position="1235" topLine="10" />
-	</File>
-	<File name="../../source/shared_lib/include/graphics/context.h" open="0" top="0" tabpos="15">
-		<Cursor position="924" topLine="17" />
-	</File>
-	<File name="../../source/shared_lib/include/graphics/gl/base_renderer.h" open="0" top="0" tabpos="13">
-		<Cursor position="830" topLine="0" />
-	</File>
-	<File name="../../source/shared_lib/include/graphics/gl/shader_gl.h" open="0" top="0" tabpos="9">
-		<Cursor position="2402" topLine="67" />
-	</File>
-	<File name="../../source/shared_lib/include/graphics/graphics_interface.h" open="0" top="0" tabpos="0">
-		<Cursor position="566" topLine="0" />
-	</File>
-	<File name="../../source/shared_lib/include/graphics/model.h" open="0" top="0" tabpos="12">
-		<Cursor position="1691" topLine="66" />
-	</File>
-	<File name="../../source/shared_lib/include/lua/lua_script.h" open="0" top="0" tabpos="7">
-		<Cursor position="558" topLine="0" />
-	</File>
-	<File name="../../source/shared_lib/include/map/map_preview.h" open="0" top="0" tabpos="0">
-		<Cursor position="2164" topLine="66" />
-	</File>
-	<File name="../../source/shared_lib/include/platform/common/base_thread.h" open="0" top="0" tabpos="19">
-		<Cursor position="1528" topLine="34" />
-	</File>
-	<File name="../../source/shared_lib/include/platform/common/platform_common.h" open="0" top="0" tabpos="6">
-		<Cursor position="2329" topLine="94" />
-	</File>
-	<File name="../../source/shared_lib/include/platform/common/simple_threads.h" open="1" top="0" tabpos="5">
-		<Cursor position="2615" topLine="70" />
-	</File>
-	<File name="../../source/shared_lib/include/platform/miniupnpc/upnpcommands.h" open="0" top="0" tabpos="25">
-		<Cursor position="4213" topLine="106" />
-	</File>
-	<File name="../../source/shared_lib/include/platform/posix/ftpserver.h" open="1" top="0" tabpos="0">
-		<Cursor position="0" topLine="0" />
-	</File>
-	<File name="../../source/shared_lib/include/platform/posix/ircclient.h" open="1" top="0" tabpos="2">
-		<Cursor position="0" topLine="45" />
-	</File>
-	<File name="../../source/shared_lib/include/platform/posix/socket.h" open="0" top="0" tabpos="24">
-		<Cursor position="5486" topLine="198" />
-	</File>
-	<File name="../../source/shared_lib/include/platform/sdl/gl_wrap.h" open="0" top="0" tabpos="0">
-		<Cursor position="621" topLine="0" />
-	</File>
-	<File name="../../source/shared_lib/include/platform/sdl/platform_main.h" open="0" top="0" tabpos="3">
-		<Cursor position="696" topLine="0" />
-	</File>
-	<File name="../../source/shared_lib/include/platform/sdl/thread.h" open="1" top="0" tabpos="6">
-		<Cursor position="2223" topLine="90" />
-	</File>
-	<File name="../../source/shared_lib/include/platform/sdl/window.h" open="0" top="0" tabpos="21">
-		<Cursor position="4768" topLine="171" />
-	</File>
-	<File name="../../source/shared_lib/include/streflop/FPUSettings.h" open="0" top="0" tabpos="4">
-		<Cursor position="6002" topLine="172" />
-	</File>
-	<File name="../../source/shared_lib/include/streflop/Random.h" open="0" top="0" tabpos="0">
-		<Cursor position="10411" topLine="174" />
-	</File>
-	<File name="../../source/shared_lib/include/streflop/streflop.h" open="0" top="0" tabpos="0">
-		<Cursor position="1089" topLine="3" />
-	</File>
-	<File name="../../source/shared_lib/include/util/properties.h" open="0" top="0" tabpos="5">
-		<Cursor position="1476" topLine="23" />
-	</File>
-	<File name="../../source/shared_lib/include/util/util.h" open="0" top="0" tabpos="26">
-		<Cursor position="498" topLine="2" />
-	</File>
-	<File name="../../source/shared_lib/include/xml/xml_parser.h" open="0" top="0" tabpos="1">
-		<Cursor position="576" topLine="1" />
-	</File>
-	<File name="../../source/shared_lib/sources/feathery_ftp/ftpAccount.c" open="1" top="0" tabpos="40">
-		<Cursor position="2358" topLine="53" />
-	</File>
-	<File name="../../source/shared_lib/sources/feathery_ftp/ftpServer.c" open="1" top="0" tabpos="37">
-		<Cursor position="1302" topLine="0" />
-	</File>
-	<File name="../../source/shared_lib/sources/feathery_ftp/ftpSession.c" open="1" top="0" tabpos="36">
-		<Cursor position="0" topLine="57" />
-	</File>
-	<File name="../../source/shared_lib/sources/graphics/BMPReader.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="0" topLine="6" />
-	</File>
-	<File name="../../source/shared_lib/sources/graphics/gl/base_renderer.cpp" open="0" top="0" tabpos="2">
-		<Cursor position="901" topLine="1" />
-	</File>
-	<File name="../../source/shared_lib/sources/graphics/gl/shader_gl.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="4619" topLine="220" />
-	</File>
-	<File name="../../source/shared_lib/sources/graphics/model.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="12079" topLine="424" />
-	</File>
-	<File name="../../source/shared_lib/sources/platform/common/base_thread.cpp" open="1" top="0" tabpos="7">
-		<Cursor position="5175" topLine="120" />
-	</File>
-	<File name="../../source/shared_lib/sources/platform/common/platform_common.cpp" open="0" top="0" tabpos="14">
-		<Cursor position="3512" topLine="176" />
-	</File>
-	<File name="../../source/shared_lib/sources/platform/common/simple_threads.cpp" open="1" top="0" tabpos="4">
-		<Cursor position="10781" topLine="238" />
-	</File>
-	<File name="../../source/shared_lib/sources/platform/miniupnpc/minisoap.c" open="0" top="0" tabpos="22">
-		<Cursor position="547" topLine="0" />
-	</File>
-	<File name="../../source/shared_lib/sources/platform/miniupnpc/miniupnpc.c" open="0" top="0" tabpos="23">
-		<Cursor position="506" topLine="39" />
-	</File>
-	<File name="../../source/shared_lib/sources/platform/miniupnpc/miniupnpcstrings.h" open="1" top="0" tabpos="62">
-		<Cursor position="442" topLine="0" />
-	</File>
-	<File name="../../source/shared_lib/sources/platform/posix/ftpserver.cpp" open="1" top="0" tabpos="0">
-		<Cursor position="0" topLine="0" />
-	</File>
-	<File name="../../source/shared_lib/sources/platform/posix/ircclient.cpp" open="1" top="0" tabpos="1">
-		<Cursor position="0" topLine="0" />
-	</File>
-	<File name="../../source/shared_lib/sources/platform/posix/socket.cpp" open="1" top="0" tabpos="8">
-		<Cursor position="33763" topLine="1022" />
-	</File>
-	<File name="../../source/shared_lib/sources/platform/sdl/thread.cpp" open="0" top="0" tabpos="11">
-		<Cursor position="2340" topLine="90" />
-	</File>
-	<File name="../../source/shared_lib/sources/platform/sdl/window.cpp" open="0" top="0" tabpos="17">
-		<Cursor position="12531" topLine="359" />
-	</File>
-	<File name="../../source/shared_lib/sources/platform/sdl/window_gl.cpp" open="0" top="0" tabpos="16">
-		<Cursor position="1087" topLine="0" />
-	</File>
-	<File name="../../source/shared_lib/sources/sound/ds8/sound_player_ds8.cpp" open="0" top="0" tabpos="10">
-		<Cursor position="490" topLine="0" />
-	</File>
-	<File name="../../source/shared_lib/sources/sound/openal/sound_player_openal.cpp" open="0" top="0" tabpos="2">
-		<Cursor position="8638" topLine="291" />
-	</File>
-	<File name="../../source/shared_lib/sources/util/conversion.cpp" open="0" top="0" tabpos="6">
-		<Cursor position="2757" topLine="112" />
-	</File>
-	<File name="../../source/shared_lib/sources/util/profiler.cpp" open="0" top="0" tabpos="5">
-		<Cursor position="2078" topLine="59" />
-	</File>
-	<File name="../../source/shared_lib/sources/util/properties.cpp" open="0" top="0" tabpos="1">
-		<Cursor position="4900" topLine="115" />
-	</File>
-	<File name="../../source/shared_lib/sources/util/util.cpp" open="1" top="0" tabpos="3">
-		<Cursor position="9094" topLine="273" />
-	</File>
-</CodeBlocks_layout_file>