diff --git a/MCServer/Plugins/Core/web_serversettings.lua b/MCServer/Plugins/Core/web_serversettings.lua
index 5e644ca3e..e256eb853 100644
--- a/MCServer/Plugins/Core/web_serversettings.lua
+++ b/MCServer/Plugins/Core/web_serversettings.lua
@@ -87,13 +87,13 @@ local function ShowGeneralSettings( Request )
 	<td><input type="text" name="Server_PortsIPv6" value="]] .. SettingsIni:GetValue("Server", "PortsIPv6") .. [["></td></tr>
 	<tr><td>Shown Version:</td>
 	<td>]] .. HTML_Select_Version("Server_Version", SettingsIni:GetValueI("Server", "PrimaryServerVersion") ) .. [[</td></tr>
-	</table><br>
+	</table><br />
 	
 	<table>
 	<th colspan="2">Authentication</th>
 	<tr><td style="width: 50%;">Authenticate:</td>
 	<td>]] .. HTML_Select_On_Off("Authentication_Authenticate", SettingsIni:GetValueI("Authentication", "Authenticate") ) .. [[</td></tr>
-	</table><br>
+	</table><br />
 	
 	<table>
 	<th colspan="2">LimitWorld</th>
@@ -101,7 +101,7 @@ local function ShowGeneralSettings( Request )
 	<td>]] .. HTML_Select_On_Off("Limit_World", SettingsIni:GetValueI("Worlds", "LimitWorld") ) .. [[</td></tr>
 	<tr><td>Max Chunks from spawn:</td>
 	<td><input type="text" name="LimitWorldWidth" value="]] .. SettingsIni:GetValue("Worlds", "LimitWorldWidth") .. [["></td></tr>
-	</table><br>
+	</table><br />
 	<input type="submit" value="Save Settings" name="general_submit"> WARNING: Any changes made here might require a server restart in order to be applied!
 	</form>]]
 	
@@ -151,7 +151,7 @@ local function ShowMonstersSettings( Request )
 	<td><input type="text" name="Monsters_AnimalSpawnInterval" value="]] .. SettingsIni:GetValue("Monsters", "AnimalSpawnInterval") .. [["></td></tr>
 	<tr><td>Monster Types:</td>
 	<td><input type="text" name="Monsters_Types" value="]] .. SettingsIni:GetValue("Monsters", "Types") .. [["></td></tr>
-	</table><br>
+	</table><br />
 	<input type="submit" value="Save Settings" name="monsters_submit"> WARNING: Any changes made here might require a server restart in order to be applied!
 	</form>]]
 	
@@ -174,7 +174,7 @@ local function ShowWorldsSettings( Request )
 		local KeyIdx = SettingsIni:FindKey("Worlds")
 		local WorldName = SettingsIni:GetValue( KeyIdx, WorldIdx )
 		if( SettingsIni:DeleteValueByID( KeyIdx, WorldIdx ) == true ) then
-			InfoMsg = "<b style=\"color: green;\">INFO: Successfully removed world " .. WorldName .. "!</b><br>"
+			InfoMsg = "<b style=\"color: green;\">INFO: Successfully removed world " .. WorldName .. "!</b><br />"
 			bSaveIni = true
 		end
 	end
@@ -182,7 +182,7 @@ local function ShowWorldsSettings( Request )
 	if( Request.PostParams["AddWorld"] ~= nil ) then
 		if( Request.PostParams["WorldName"] ~= nil and Request.PostParams["WorldName"] ~= "" ) then
 			SettingsIni:SetValue("Worlds", "World", Request.PostParams["WorldName"], true )
-			InfoMsg = "<b style=\"color: green;\">INFO: Successfully added world " .. Request.PostParams["WorldName"] .. "!</b><br>"
+			InfoMsg = "<b style=\"color: green;\">INFO: Successfully added world " .. Request.PostParams["WorldName"] .. "!</b><br />"
 			bSaveIni = true
 		end
 	end
@@ -214,7 +214,7 @@ local function ShowWorldsSettings( Request )
 	<table>
 	<th colspan="2">Worlds</th>
 	<tr><td style="width: 50%;">Default World:</td>
-	<td><input type="text" name="Worlds_DefaultWorld" value="]] .. SettingsIni:GetValue("Worlds", "DefaultWorld") .. [["></td></tr>]]
+	<td><input type="Submit" name="Worlds_DefaultWorld" value="]] .. SettingsIni:GetValue("Worlds", "DefaultWorld") .. [["></td></tr>]]
 	
 	local KeyIdx = SettingsIni:FindKey("Worlds")
 	local NumValues = SettingsIni:GetNumValues( KeyIdx )
@@ -230,13 +230,333 @@ local function ShowWorldsSettings( Request )
 	Content = Content .. [[
 	<tr><td>Add World:</td>
 	<td><input type='text' name='WorldName'><input type='submit' name='AddWorld' value='Add World'></td></tr>
-	</table><br>
+	</table><br />
 	
 	<input type="submit" value="Save Settings" name="worlds_submit"> WARNING: Any changes made here might require a server restart in order to be applied!
 	</form>]]
 	return Content
 end
 
+local function SelectWorldButton( WorldName )
+	return "<form method='POST'><input type='hidden' name='WorldName' value='"..WorldName.."'><input type='submit' name='SelectWorld' value='Select'></form>"
+end
+
+local function HTML_Select_Dimension( name, defaultValue )
+	return [[<select name="]] .. name .. [[">]]
+		.. HTML_Option("0", "Overworld",  defaultValue == 0 )
+		.. HTML_Option("-1", "Nether", defaultValue == 1 )
+		.. HTML_Option("1", "The End",  defaultValue == 2 )
+		.. [[</select>]]
+end
+
+local function HTML_Select_GameMode( name, defaultValue )
+	return [[<select name="]] .. name .. [[">]]
+		.. HTML_Option("0", "Survival", defaultValue == 0 )
+		.. HTML_Option("1", "Creative",  defaultValue == 1 )
+		.. HTML_Option("2", "Adventure",  defaultValue == 2 )
+		.. [[</select>]]
+end
+
+local function HTML_Select_Simulator( name, defaultValue )
+	return [[<select name="]] .. name .. [[">]]
+		.. HTML_Option("Floody", "Floody", defaultValue == 0 )
+		.. HTML_Option("Noop", "Noop",  defaultValue == 1 )
+		.. HTML_Option("Vaporize", "Vaporize",  defaultValue == 2 )
+		.. [[</select>]]
+end
+
+local function HTML_Select_BiomeGen( name, defaultValue )
+	return [[<select name="]] .. name .. [[">]]
+		.. HTML_Option("MultiStepMap", "MultiStepMap", defaultValue == "MultiStepMap" )
+		.. HTML_Option("DistortedVoronoi", "DistortedVoronoi",  defaultValue == "DistortedVoronoi" )
+		.. HTML_Option("Voronoi", "Voronoi",  defaultValue == "Voronoi" )
+		.. HTML_Option("CheckerBoard", "CheckerBoard",  defaultValue == "CheckerBoard" )
+		.. HTML_Option("Constant", "Constant",  defaultValue == "Constant" )
+		.. [[</select>]]
+end
+
+local function HTML_Select_HeightGen( name, defaultValue )
+	return [[<select name="]] .. name .. [[">]]
+		.. HTML_Option("Biomal", "Biomal", defaultValue == "Biomal" )
+		.. HTML_Option("Classic", "Classic",  defaultValue == "Classic" )
+		.. HTML_Option("Flat", "Flat",  defaultValue == "Flat" )
+		.. [[</select>]]
+end
+
+local function HTML_Select_CompositionGen( name, defaultValue )
+	return [[<select name="]] .. name .. [[">]]
+		.. HTML_Option("Biomal", "Biomal", defaultValue == "Biomal" )
+		.. HTML_Option("Classic", "Classic",  defaultValue == "Classic" )
+		.. HTML_Option("SameBlock", "SameBlock",  defaultValue == "SameBlock" )
+		.. HTML_Option("DebugBiomes", "DebugBiomes",  defaultValue == "DebugBiomes" )
+		.. [[</select>]]
+end
+
+local function HTML_Select_Generator( name, defaultValue )
+	return [[<select name="]] .. name .. [[">]]
+		.. HTML_Option("Composable", "Composable", defaultValue == "Composable" )
+		.. [[</select>]]
+end
+
+function ShowWorldSettings( Request )
+	local Content = ""
+	local InfoMsg = nil
+	local SettingsIni = cIniFile("settings.ini")
+	if( SettingsIni:ReadFile() == false ) then
+		InfoMsg = [[<b style="color: red;">ERROR: Could not read settings.ini!</b>]]
+	end
+	if (Request.PostParams["SelectWorld"] ~= nil and Request.PostParams["WorldName"] ~= nil) then		-- World is selected!
+		WORLD = Request.PostParams["WorldName"]
+		SelectedWorld = cRoot:Get():GetWorld(WORLD)
+	elseif SelectedWorld == nil then
+		WORLD = SettingsIni:GetValue("Worlds", "DefaultWorld")
+		SelectedWorld = cRoot:Get():GetWorld( WORLD )
+	end
+	local WorldIni = cIniFile(SelectedWorld:GetName() .. "/world.ini")
+	WorldIni:ReadFile()
+	if (Request.PostParams["world_submit"]) ~= nil then
+		if( tonumber( Request.PostParams["World_Dimension"] ) ~= nil ) then
+			WorldIni:DeleteValue( "General", "Dimension" )
+			WorldIni:SetValue( "General", "Dimension", Request.PostParams["World_Dimension"] )
+		end
+		if( tonumber( Request.PostParams["World_SpawnX"] ) ~= nil ) then
+			WorldIni:DeleteValue( "SpawnPosition", "X" )
+			WorldIni:SetValue( "SpawnPosition", "X", Request.PostParams["World_SpawnX"] )
+		end
+		if( tonumber( Request.PostParams["World_SpawnY"] ) ~= nil ) then
+			WorldIni:DeleteValue( "SpawnPosition", "Y" )
+			WorldIni:SetValue( "SpawnPosition", "Y", Request.PostParams["World_SpawnY"] )
+		end
+		if( tonumber( Request.PostParams["World_SpawnZ"] ) ~= nil ) then
+			WorldIni:DeleteValue( "SpawnPosition", "Z" )
+			WorldIni:SetValue( "SpawnPosition", "Z", Request.PostParams["World_SpawnZ"] )
+		end
+		if( tonumber( Request.PostParams["World_Seed"] ) ~= nil ) then
+			WorldIni:DeleteValue( "Seed", "Seed" )
+			WorldIni:SetValue( "Seed", "Seed", Request.PostParams["World_Seed"] )
+		end
+		if( tonumber( Request.PostParams["World_PVP"] ) ~= nil ) then
+			WorldIni:DeleteValue( "PVP", "Enabled" )
+			WorldIni:SetValue( "PVP", "Enabled", Request.PostParams["World_PVP"] )
+		end
+		if( tonumber( Request.PostParams["World_GameMode"] ) ~= nil ) then
+			WorldIni:DeleteValue( "GameMode", "GameMode" )
+			WorldIni:SetValue( "GameMode", "GameMode", Request.PostParams["World_GameMode"] )
+		end
+		if( tonumber( Request.PostParams["World_DeepSnow"] ) ~= nil ) then
+			WorldIni:DeleteValue( "Physics", "DeepSnow" )
+			WorldIni:SetValue( "Physics", "DeepSnow", Request.PostParams["World_DeepSnow"] )
+		end
+		if( tonumber( Request.PostParams["World_SandInstantFall"] ) ~= nil ) then
+			WorldIni:DeleteValue( "Physics", "SandInstantFall" )
+			WorldIni:SetValue( "Physics", "SandInstantFall", Request.PostParams["World_SandInstantFall"] )
+		end
+		if( tonumber( Request.PostParams["World_WaterSimulator"] ) ~= nil ) then
+			WorldIni:DeleteValue( "Physics", "WaterSimulator" )
+			WorldIni:SetValue( "Physics", "WaterSimulator", Request.PostParams["World_WaterSimulator"] )
+		end
+		if( tonumber( Request.PostParams["World_LavaSimulator"] ) ~= nil ) then
+			WorldIni:DeleteValue( "Physics", "LavaSimulator" )
+			WorldIni:SetValue( "Physics", "LavaSimulator", Request.PostParams["World_LavaSimulator"] )
+		end
+		if( tonumber( Request.PostParams["World_MaxSugarcaneHeight"] ) ~= nil ) then
+			WorldIni:DeleteValue( "Plants", "MaxSugarcaneHeight" )
+			WorldIni:SetValue( "Plants", "MaxSugarcaneHeight", Request.PostParams["World_MaxSugarcaneHeight"] )
+		end
+		if( tonumber( Request.PostParams["World_MaxCactusHeight"] ) ~= nil ) then
+			WorldIni:DeleteValue( "Plants", "MaxCactusHeight" )
+			WorldIni:SetValue( "Plants", "MaxCactusHeight", Request.PostParams["World_MaxCactusHeight"] )
+		end
+		if( tonumber( Request.PostParams["World_CarrotsBonemealable"] ) ~= nil ) then
+			WorldIni:DeleteValue( "Plants", "IsCarrotsBonemealable" )
+			WorldIni:SetValue( "Plants", "IsCarrotsBonemealable", Request.PostParams["World_CarrotsBonemealable"] )
+		end
+		if( tonumber( Request.PostParams["World_CropsBonemealable"] ) ~= nil ) then
+			WorldIni:DeleteValue( "Plants", "IsCropsBonemealable" )
+			WorldIni:SetValue( "Plants", "IsCropsBonemealable", Request.PostParams["World_CropsBonemealable"] )
+		end
+		if( tonumber( Request.PostParams["World_GrassBonemealable"] ) ~= nil ) then
+			WorldIni:DeleteValue( "Plants", "IsGrassBonemealable" )
+			WorldIni:SetValue( "Plants", "IsGrassBonemealable", Request.PostParams["World_GrassBonemealable"] )
+		end
+		if( tonumber( Request.PostParams["World_SaplingBonemealable"] ) ~= nil ) then
+			WorldIni:DeleteValue( "Plants", "IsSaplingBonemealable" )
+			WorldIni:SetValue( "Plants", "IsSaplingBonemealable", Request.PostParams["World_SaplingBonemealable"] )
+		end
+		if( tonumber( Request.PostParams["World_MelonStemBonemealable"] ) ~= nil ) then
+			WorldIni:DeleteValue( "Plants", "IsMelonStemBonemealable" )
+			WorldIni:SetValue( "Plants", "IsMelonStemBonemealable", Request.PostParams["World_MelonStemBonemealable"] )
+		end
+		if( tonumber( Request.PostParams["World_MelonBonemealable"] ) ~= nil ) then
+			WorldIni:DeleteValue( "Plants", "IsMelonBonemealable" )
+			WorldIni:SetValue( "Plants", "IsMelonBonemealable", Request.PostParams["World_MelonBonemealable"] )
+		end
+		if( tonumber( Request.PostParams["World_PotatoesBonemealable"] ) ~= nil ) then
+			WorldIni:DeleteValue( "Plants", "IsPotatoesBonemealable" )
+			WorldIni:SetValue( "Plants", "IsPotatoesBonemealable", Request.PostParams["World_PotatoesBonemealable"] )
+		end
+		if( tonumber( Request.PostParams["World_PumpkinStemBonemealable"] ) ~= nil ) then
+			WorldIni:DeleteValue( "Plants", "IsPumpkinStemBonemealable" )
+			WorldIni:SetValue( "Plants", "IsPumpkinStemBonemealable", Request.PostParams["World_PumpkinStemBonemealable"] )
+		end
+		if( tonumber( Request.PostParams["World_PumpkinBonemealable"] ) ~= nil ) then
+			WorldIni:DeleteValue( "Plants", "IsPumpkinBonemealable" )
+			WorldIni:SetValue( "Plants", "IsPumpkinBonemealable", Request.PostParams["World_PumpkinBonemealable"] )
+		end
+		if( tonumber( Request.PostParams["World_SugarCaneBonemealable"] ) ~= nil ) then
+			WorldIni:DeleteValue( "Plants", "IsSugarCaneBonemealable" )
+			WorldIni:SetValue( "Plants", "IsSugarCaneBonemealable", Request.PostParams["World_SugarCaneBonemealable"] )
+		end
+		if( tonumber( Request.PostParams["World_CactusBonemealable"] ) ~= nil ) then
+			WorldIni:DeleteValue( "Plants", "IsCactusBonemealable" )
+			WorldIni:SetValue( "Plants", "IsCactusBonemealable", Request.PostParams["World_CactusBonemealable"] )
+		end
+		if( ( Request.PostParams["World_BiomeGen"] ) ~= nil ) then
+			WorldIni:DeleteValue( "Generator", "BiomeGen" )
+			WorldIni:SetValue( "Generator", "BiomeGen", Request.PostParams["World_BiomeGen"] )
+		end
+		if( ( Request.PostParams["World_HeightGen"] ) ~= nil ) then
+			WorldIni:DeleteValue( "Generator", "HeightGen" )
+			WorldIni:SetValue( "Generator", "HeightGen", Request.PostParams["World_HeightGen"] )
+		end
+		if( ( Request.PostParams["World_CompositionGen"] ) ~= nil ) then
+			WorldIni:DeleteValue( "Generator", "CompositionGen" )
+			WorldIni:SetValue( "Generator", "CompositionGen", Request.PostParams["World_CompositionGen"] )
+		end
+		if( ( Request.PostParams["World_Structures"] ) ~= nil ) then
+			WorldIni:DeleteValue( "Generator", "Structures" )
+			WorldIni:SetValue( "Generator", "Structures", Request.PostParams["World_Structures"] )
+		end
+		if( ( Request.PostParams["World_Finishers"] ) ~= nil ) then
+			WorldIni:DeleteValue( "Generator", "Finishers" )
+			WorldIni:SetValue( "Generator", "Finishers", Request.PostParams["World_Finishers"] )
+		end
+		if( ( Request.PostParams["World_Generator"] ) ~= nil ) then
+			WorldIni:DeleteValue( "Generator", "Generator" )
+			WorldIni:SetValue( "Generator", "Generator", Request.PostParams["World_Generator"] )
+		end
+		WorldIni:WriteFile()
+	end
+	Content = Content .. "<h4>World for operations: " .. WORLD .. "</h4>"
+	Content = Content .. "<table>"
+	local WorldNum = 0
+	local AddWorldToTable = function(World)
+		WorldNum = WorldNum + 1
+		Content = Content .. "<tr>"
+		Content = Content .. "<td style='width: 10px;'>" .. WorldNum .. ".</td>"
+		Content = Content .. "<td>" .. World:GetName() .. "</td>"
+		Content = Content .. "<td>" .. SelectWorldButton(World:GetName()) .. "</td>"
+		Content = Content .. "</tr>"
+	end
+	cRoot:Get():ForEachWorld(AddWorldToTable)
+	Content = Content .. "</table>"
+	
+	
+	Content = Content .. [[<table>
+	<form method="POST">
+	<br />
+	<th colspan="2">General</th>
+	<tr><td>Dimension:</td>
+	<td>]] .. HTML_Select_Dimension("World_Dimension", WorldIni:GetValueI("General", "Dimension") ) .. [[</td></tr>
+	</table>
+	<br />
+	<table>
+	<th colspan="2">Spawn Position</th>
+	<tr><td>X:</td>
+	<td><input type="text" name="World_SpawnX" value="]] .. WorldIni:GetValue("SpawnPosition", "X") .. [["></td></tr>
+	<tr><td>Y:</td>
+	<td><input type="text" name="World_SpawnY" value="]] .. WorldIni:GetValue("SpawnPosition", "Y") .. [["></td></tr>
+	<tr><td>Z:</td>
+	<td><input type="text" name="World_SpawnZ" value="]] .. WorldIni:GetValue("SpawnPosition", "Z") .. [["></td></tr>
+	</table>
+	<br />
+	<table>
+	<th colspan="2">Seed</th>
+	<tr><td>Seed:</td>
+	<td><input type="text" name="World_Seed" value="]] .. WorldIni:GetValue("Seed", "Seed") .. [["></td></tr>
+	</table>
+	<br />
+	<table>
+	<th colspan="2">PVP</th>
+	<tr><td style="width: 50%;">PVP:</td>
+	<td>]] .. HTML_Select_On_Off("World_PVP", WorldIni:GetValueI("PVP", "Enabled") ) .. [[</td></tr>
+	</table>
+	<br />
+	<table>
+	<th colspan="2">GameMode</th>
+	<tr><td style="width: 50%;">GameMode:</td>
+	<td>]] .. HTML_Select_GameMode("World_GameMode", WorldIni:GetValueI("GameMode", "GameMode") ) .. [[</td></tr>
+	</table>
+	<br />
+	<table>
+	<th colspan="2">Physics</th>
+	<tr><td style="width: 50%;">DeepSnow:</td>
+	<td>]] .. HTML_Select_On_Off("World_DeepSnow", WorldIni:GetValueI("Physics", "DeepSnow") ) .. [[</td></tr>
+	<tr><td style="width: 50%;">SandInstantFall:</td>
+	<td>]] .. HTML_Select_On_Off("World_SandInstantFall", WorldIni:GetValueI("Physics", "SandInstantFall") ) .. [[</td></tr>
+	<tr><td style="width: 50%;">WaterSimulator:</td>
+	<td>]] .. HTML_Select_Simulator("World_WaterSimulator", WorldIni:GetValue("Physics", "WaterSimulator") ) .. [[</td></tr>
+	<tr><td style="width: 50%;">LavaSimulator:</td>
+	<td>]] .. HTML_Select_Simulator("World_LavaSimulator", WorldIni:GetValue("Physics", "LavaSimulator") ) .. [[</td></tr>
+	</table>
+	<br />
+	<table>
+	<th colspan="2">Plants</th>
+	<tr><td>MaxCactusHeight:</td>
+	<td><input type="text" name="World_MaxCactusHeight" value="]] .. WorldIni:GetValue("Plants", "MaxCactusHeight") .. [["></td></tr>
+	<tr><td>MaxSugarcaneHeigh:</td>
+	<td><input type="text" name="World_MaxSugarcaneHeight" value="]] .. WorldIni:GetValue("Plants", "MaxSugarcaneHeight") .. [["></td></tr>
+	<tr><td style="width: 50%;">CarrotsBonemealable:</td>
+	<td>]] .. HTML_Select_On_Off("World_CarrotsBonemealable", WorldIni:GetValueI("Plants", "IsCarrotsBonemealable") ) .. [[</td></tr>
+	<tr><td style="width: 50%;">CropsBonemealable:</td>
+	<td>]] .. HTML_Select_On_Off("World_CropsBonemealable", WorldIni:GetValueI("Plants", "IsCropsBonemealable") ) .. [[</td></tr>
+	<tr><td style="width: 50%;">GrassBonemealabl:</td>
+	<td>]] .. HTML_Select_On_Off("World_GrassBonemealable", WorldIni:GetValueI("Plants", "IsGrassBonemealable") ) .. [[</td></tr>
+	<tr><td style="width: 50%;">SaplingBonemealable:</td>
+	<td>]] .. HTML_Select_On_Off("World_SaplingBonemealable", WorldIni:GetValueI("Plants", "IsSaplingBonemealable") ) .. [[</td></tr>
+	<tr><td style="width: 50%;">MelonStemBonemealable:</td>
+	<td>]] .. HTML_Select_On_Off("World_MelonStemBonemealable", WorldIni:GetValueI("Plants", "IsMelonStemBonemealable") ) .. [[</td></tr>
+	<tr><td style="width: 50%;">MelonBonemealable:</td>
+	<td>]] .. HTML_Select_On_Off("World_MelonBonemealable", WorldIni:GetValueI("Plants", "IsMelonBonemealable") ) .. [[</td></tr>
+	<tr><td style="width: 50%;">PotatoesBonemealable:</td>
+	<td>]] .. HTML_Select_On_Off("World_PotatoesBonemealable", WorldIni:GetValueI("Plants", "IsPotatoesBonemealable") ) .. [[</td></tr>
+	<tr><td style="width: 50%;">PumpkinStemBonemealable:</td>
+	<td>]] .. HTML_Select_On_Off("World_PumpkinStemBonemealable", WorldIni:GetValueI("Plants", "IsPumpkinStemBonemealable") ) .. [[</td></tr>
+	<tr><td style="width: 50%;">PumpkinBonemealable:</td>
+	<td>]] .. HTML_Select_On_Off("World_PumpkinBonemealable", WorldIni:GetValueI("Plants", "IsPumpkinBonemealable") ) .. [[</td></tr>
+	<tr><td style="width: 50%;">SugarcaneBonemealabl:</td>
+	<td>]] .. HTML_Select_On_Off("World_SugarcaneBonemealable", WorldIni:GetValueI("Plants", "IsSugarcaneBonemealable") ) .. [[</td></tr>
+	<tr><td style="width: 50%;">CactusBonemealable:</td>
+	<td>]] .. HTML_Select_On_Off("World_CactusBonemealable", WorldIni:GetValueI("Plants", "IsCactusBonemealable") ) .. [[</td></tr>
+	</table>
+	<br />
+	<table>
+	<th colspan="2">Generator</th>
+	<tr><td style="width: 50%;">BiomeGen:</td>
+	<td>]] .. HTML_Select_BiomeGen("World_BiomeGen", WorldIni:GetValue("Generator", "BiomeGen") ) .. [[</td></tr>
+	<tr><td style="width: 50%;">HeightGen:</td>
+	<td>]] .. HTML_Select_HeightGen("World_HeightGen", WorldIni:GetValue("Generator", "HeightGen") ) .. [[</td></tr>
+	<tr><td style="width: 50%;">CompositionGen:</td>
+	<td>]] .. HTML_Select_CompositionGen("World_CompositionGen", WorldIni:GetValue("Generator", "CompositionGen") ) .. [[</td></tr>
+	<tr><td>Structures:</td>
+	<td><input type="text" size="50" name="World_Structures" value="]] .. WorldIni:GetValue("Generator", "Structures") .. [["></td></tr>
+	<tr><td>Finishers:</td>
+	<td><input type="text" size="50" name="World_Finishers" value="]] .. WorldIni:GetValue("Generator", "Finishers") .. [["></td></tr>
+	<tr><td style="width: 50%;">Generator:</td>
+	<td>]] .. HTML_Select_Generator("World_Generator", WorldIni:GetValue("Generator", "Generator") ) .. [[</td></tr>
+
+	</table>
+	]]
+	
+	
+	Content = Content .. [[ <br />
+	<input type="submit" value="Save Settings" name="world_submit"> </form>WARNING: Any changes made here might require a server restart in order to be applied!
+	</form>]]
+	return Content
+end
+
+
+
 function HandleRequest_ServerSettings( Request )
 	local Content = ""
 
@@ -247,14 +567,17 @@ function HandleRequest_ServerSettings( Request )
 	<td><a href="?tab=General">General</a></td>
 	<td><a href="?tab=Monsters">Monsters</a></td>
 	<td><a href="?tab=Worlds">Worlds</a></td>
+	<td><a href="?tab=World">World</a></td>
 	</tr>
 	</table>
-	<br>]]
+	<br />]]
 	
 	if( Request.Params["tab"] == "Monsters" ) then
 		Content = Content .. ShowMonstersSettings( Request )
 	elseif( Request.Params["tab"] == "Worlds" ) then
 		Content = Content .. ShowWorldsSettings( Request )
+	elseif( Request.Params["tab"] == "World" ) then
+		Content = Content .. ShowWorldSettings( Request )
 	else
 		Content = Content .. ShowGeneralSettings( Request ) -- Default to general settings
 	end