diff --git a/.htaccess b/.htaccess
index 9b5fc3a..11469a0 100644
--- a/.htaccess
+++ b/.htaccess
@@ -3,12 +3,7 @@ Order Allow,Deny
 Deny from All
 </Files>
 
-<Files "common.php">
+<Files "global.php">
 Order Allow,Deny
 Deny from All
-</Files>
-
-<Files "extension.inc.php">
-Order Allow,Deny
-Deny from All
-</Files>
+</Files>
\ No newline at end of file
diff --git a/CombatReport.php b/CombatReport.php
index 67c76eb..d52ab68 100644
--- a/CombatReport.php
+++ b/CombatReport.php
@@ -1,35 +1,21 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-
-$xgp_root = './';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.'.$phpEx);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('XGP_ROOT',	'./');
+
+include(XGP_ROOT . 'global.php');
 
 includeLang('INGAME');
 $Page .= "<div id=\"content\">";
 
-$raportrow 	= doquery("SELECT * FROM {{table}} WHERE `rid` = '".(mysql_escape_string($_GET["raport"]))."';", 'rw', true);
+$raportrow 	= doquery("SELECT * FROM {{table}} WHERE `rid` = '".(mysql_escape_string($_GET["raport"]))."';", 'rw', TRUE);
 
 
 $owners	= explode(",", $raportrow["owners"]);
@@ -56,5 +42,5 @@
 	$Page 		   .= $report;
 }
 
-display($Page, false, '', false, false);
+display($Page, FALSE, '', FALSE, FALSE);
 ?>
\ No newline at end of file
diff --git a/FleetAjax.php b/FleetAjax.php
index 918bd2b..0b6a779 100644
--- a/FleetAjax.php
+++ b/FleetAjax.php
@@ -1,30 +1,16 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-
-$xgp_root = './';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+define('INSIDE'  ,  TRUE);
+define('INSTALL' , FALSE);
+define('XGP_ROOT',	'./');
+
+include(XGP_ROOT . 'global.php');
 
 $UserSpyProbes  = $planetrow['spy_sonde'];
 $UserRecycles   = $planetrow['recycler'];
@@ -33,7 +19,7 @@
 
 $fleet          = array();
 $speedalls      = array();
-$PartialFleet   = false;
+$PartialFleet   = FALSE;
 $PartialCount   = 0;
 
 foreach ($reslist['fleet'] as $Node => $ShipID)
@@ -47,7 +33,7 @@
 			$fleet['fleetlist']            .= $ShipID .",". $planetrow[$resource[$ShipID]] .";";
 			$fleet['amount']               += $planetrow[$resource[$ShipID]];
 			$PartialCount                  += $planetrow[$resource[$ShipID]];
-			$PartialFleet                   = true;
+			$PartialFleet                   = TRUE;
 		}
 		else
 		{
@@ -59,7 +45,7 @@
 	}
 }
 
-if ($PartialFleet == true)
+if ($PartialFleet == TRUE)
 {
 	if ( $PartialCount < 1 )
 	{
@@ -68,9 +54,9 @@
 	}
 }
 
-$PrNoob      = $game_config['noobprotection'];
-$PrNoobTime  = $game_config['noobprotectiontime'];
-$PrNoobMulti = $game_config['noobprotectionmulti'];
+$PrNoob      = read_config ( 'noobprotection' );
+$PrNoobTime  = read_config ( 'noobprotectiontime' );
+$PrNoobMulti = read_config ( 'noobprotectionmulti' );
 
 $galaxy          = intval($_POST['galaxy']);
 if ($galaxy > MAX_GALAXY_IN_WORLD || $galaxy < 1)
@@ -97,32 +83,46 @@
 
 $FleetArray = $fleet['fleetarray'];
 
-$CurrentFlyingFleets = doquery("SELECT COUNT(fleet_id) AS `Nbre` FROM {{table}} WHERE `fleet_owner` = '".$user['id']."';", 'fleets', true);
+$CurrentFlyingFleets = doquery("SELECT COUNT(fleet_id) AS `Nbre` FROM {{table}} WHERE `fleet_owner` = '".$user['id']."';", 'fleets', TRUE);
 $CurrentFlyingFleets = $CurrentFlyingFleets["Nbre"];
 
 $QrySelectEnemy  = "SELECT * FROM {{table}} ";
 $QrySelectEnemy .= "WHERE ";
-$QrySelectEnemy .= "`galaxy` = '". $_POST['galaxy'] ."' AND ";
-$QrySelectEnemy .= "`system` = '". $_POST['system'] ."' AND ";
-$QrySelectEnemy .= "`planet` = '". $_POST['planet'] ."' AND ";
-$QrySelectEnemy .= "`planet_type` = '". $_POST['planettype'] ."';";
-$TargetRow = doquery( $QrySelectEnemy, 'planets', true);
+$QrySelectEnemy .= "`galaxy` = '". intval($_POST['galaxy']) ."' AND ";
+$QrySelectEnemy .= "`system` = '". intval($_POST['system']) ."' AND ";
+$QrySelectEnemy .= "`planet` = '". intval($_POST['planet']) ."' AND ";
+$QrySelectEnemy .= "`planet_type` = '". intval($_POST['planettype']) ."';";
+$TargetRow = doquery( $QrySelectEnemy, 'planets', TRUE);
 
 if ($TargetRow['id_owner'] == '')
+{
 	$TargetUser = $user;
+}
 elseif ($TargetRow['id_owner'] != '')
-	$TargetUser = doquery("SELECT * FROM {{table}} WHERE `id` = '". $TargetRow['id_owner'] ."';", 'users', true);
+{
+	$TargetUser = doquery("SELECT * FROM {{table}} WHERE `id` = '". $TargetRow['id_owner'] ."';", 'users', TRUE);
+}
 
+// invisible debris by jstar
+if ($_POST['mission']== 8)
+{
+	$TargetGPlanet = doquery("SELECT invisible_start_time, metal, crystal FROM {{table}} WHERE galaxy = '". intval($_POST['galaxy']) ."' AND system = '". intval($_POST['system']) ."' AND planet = '". intval($_POST['planet']) ."'", "galaxy",TRUE);
+
+	if($TargetGPlanet['metal'] == 0 && $TargetGPlanet['crystal'] == 0 && time() > ($TargetGPlanet['invisible_start_time']+DEBRIS_LIFE_TIME))
+	{
+		die();
+	}
+}
 
-$UserPoints    = doquery("SELECT * FROM {{table}} WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '". $user['id'] ."';", 'statpoints', true);
-$User2Points   = doquery("SELECT * FROM {{table}} WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '". $TargetUser['id'] ."';", 'statpoints', true);
+$UserPoints    = doquery("SELECT * FROM {{table}} WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '". $user['id'] ."';", 'statpoints', TRUE);
+$User2Points   = doquery("SELECT * FROM {{table}} WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '". $TargetUser['id'] ."';", 'statpoints', TRUE);
 
 $CurrentPoints = $UserPoints['total_points'];
 $TargetPoints  = $User2Points['total_points'];
 
 $TargetVacat   = $TargetUser['urlaubs_modus'];
 
-if ((($user[$resource[108]] + 1) + ($user['rpg_commandant'] * COMMANDANT)) <= $CurrentFlyingFleets)
+if ((get_max_fleets ( $CurrentUser[$resource[108]] , $CurrentUser['rpg_amiral'] )) <= $CurrentFlyingFleets)
 {
 	$ResultMessage = "612; ".$lang['fa_no_more_slots']." |".$CurrentFlyingFleets." ".$UserSpyProbes." ".$UserRecycles." ".$UserMissiles;
 	die ($ResultMessage);
@@ -234,14 +234,14 @@
 
 if ($TargetRow['id_level'] > $user['authlevel'])
 {
-	$Allowed = true;
+	$Allowed = TRUE;
 	switch ($_POST['mission'])
 	{
 		case 1:
 		case 2:
 		case 6:
 		case 9:
-		$Allowed = false;
+		$Allowed = FALSE;
 		break;
 		case 3:
 		case 4:
@@ -252,7 +252,7 @@
 		break;
 		default:
 	}
-	if ($Allowed == false)
+	if ($Allowed == FALSE)
 	{
 		$ResultMessage = "619; ".$lang['fa_action_not_allowed']." |".$CurrentFlyingFleets." ".$UserSpyProbes." ".$UserRecycles." ".$UserMissiles;
 		die ( $ResultMessage );
@@ -292,7 +292,7 @@
 
 $CurrentFlyingFleets++;
 
-$planetrow 		= doquery("SELECT * FROM {{table}} WHERE `id` = '". $user['current_planet'] ."';", 'planets', true);
+$planetrow 		= doquery("SELECT * FROM {{table}} WHERE `id` = '". $user['current_planet'] ."';", 'planets', TRUE);
 $ResultMessage  = "600; ".$lang['fa_sending']." ". $FleetShipCount  ." ". $lang['tech'][$Ship] ." a ". $_POST['galaxy'] .":". $_POST['system'] .":". $_POST['planet'] ."...|";
 $ResultMessage .= $CurrentFlyingFleets ." ".$UserSpyProbes." ".$UserRecycles." ".$UserMissiles;
 
diff --git a/MissilesAjax.php b/MissilesAjax.php
index b7a0839..a6726cc 100644
--- a/MissilesAjax.php
+++ b/MissilesAjax.php
@@ -1,102 +1,120 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-
-$xgp_root = './';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.'.$phpEx);
-
-$g 		= intval($_GET['galaxy']);
-$s 		= intval($_GET['system']);
-$i 		= intval($_GET['planet']);
-$anz 	= intval($_POST['SendMI']);
-$pziel 	= $_POST['Target'];
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('XGP_ROOT',	'./');
+
+include(XGP_ROOT . 'global.php');
+
+$g     = intval($_GET['galaxy']);
+$s     = intval($_GET['system']);
+$i     = intval($_GET['planet']);
+$anz     = intval($_POST['SendMI']);
+$pziel     = $_POST['Target'];
 
 if ($anz < 0)
 {
 	$anz = 0;
 }
 
+$currentplanet      = doquery("SELECT * FROM {{table}} WHERE id={$user['current_planet']}",'planets',TRUE);
+$iraks          = $currentplanet['interplanetary_misil'];
+$tempvar1      = abs($s - $currentplanet['system']);
+$tempvar2      = ($user['impulse_motor_tech'] * 2) - 1;
+$tempvar3      = doquery("SELECT * FROM {{table}} WHERE galaxy = ".$g."  AND system = ".$s." AND planet = ".$i." AND planet_type = 1 limit 1",  'planets',TRUE);
+$tempvar4      = doquery("SELECT * FROM {{table}} WHERE id = ".$tempvar3['id_owner']. " limit 1",'users', TRUE);
 
-$currentplanet 		= doquery("SELECT * FROM {{table}} WHERE id={$user['current_planet']}",'planets',true);
-$iraks 				= $currentplanet['interplanetary_misil'];
-$tempvar1 			= abs($s - $currentplanet['system']);
-$tempvar2 			= ($user['impulse_motor_tech'] * 2) - 1;
-$tempvar3 			= doquery("SELECT * FROM {{table}} WHERE galaxy = ".$g." AND system = ".$s." AND planet = ".$i." AND planet_type = 1 limit 1", 'planets',true);
-$tempvar4 			= doquery("SELECT * FROM {{table}} WHERE id = ".$tempvar3['id_owner']. " limit 1",'users', true);
-
-$protection 		= $game_config['noobprotection'];
-$protectiontime 	= $game_config['noobprotectiontime'];
-$protectionmulti 	= $game_config['noobprotectionmulti'];
+$protection      = read_config ( 'noobprotection' );
+$protectiontime  = read_config ( 'noobprotectiontime' );
+$protectionmulti = read_config ( 'noobprotectionmulti' );
 
-$UserPoints 		= doquery("SELECT * FROM {{table}} WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '". $user['id'] ."';", 'statpoints', true);
-$User2Points 		= doquery("SELECT * FROM {{table}} WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '". $tempvar3['id_owner'] ."';", 'statpoints', true);
+$UserPoints      = doquery("SELECT * FROM {{table}} WHERE `stat_type` =  '1' AND `stat_code` = '1' AND `id_owner` = '". $user['id'] ."';",  'statpoints', TRUE);
+$User2Points      = doquery("SELECT * FROM {{table}} WHERE `stat_type` =  '1' AND `stat_code` = '1' AND `id_owner` = '". $tempvar3['id_owner']  ."';", 'statpoints', TRUE);
 
-$CurrentPoints 		= $UserPoints['total_points'];
-$RowUserPoints 		= $User2Points['total_points'];
-$MyGameLevel 		= $CurrentPoints * $protectionmulti['config_value'];
-$HeGameLevel 		= $RowUserPoints * $protectionmulti['config_value'];
+$MyGameLevel     = $UserPoints['total_points'];
+$HeGameLevel     = $User2Points['total_points'];
 
+$error = "";
 if ($currentplanet['silo'] < 4)
-	$error = $lang['ma_silo_level'];
-elseif ($user['impulse_motor_tech'] == 0)
-	$error = $lang['ma_impulse_drive_required'];
-elseif ($tempvar1 >= $tempvar2 || $g != $currentplanet['galaxy'])
-	$error = $lang['ma_not_send_other_galaxy'];
-elseif (!$tempvar3)
-	$error = $lang['ma_planet_doesnt_exists'];
-elseif ($anz > $iraks)
-	$error = $lang['ma_cant_send'] . $anz . $lang['ma_missile'] . $iraks;
-elseif ((!is_numeric($pziel) && $pziel != "all") OR ($pziel < 0 && $pziel > 7 && $pziel != "all"))
-	$error = $lang['ma_wrong_target'];
-elseif ($iraks==0)
-	$error = $lang['ma_no_missiles'];
-elseif ($anz==0)
-	$error = $lang['ma_add_missile_number'];
-elseif (($MyGameLevel > ($HeGameLevel * $protectionmulti)) && $protection == 1 && ($HeGameLevel < ($protectiontime * 1000)))
-	$error = $lang['fl_week_player'];
-elseif ((($MyGameLevel * $protectionmulti) < $HeGameLevel) && $protection == 1 && ($MyGameLevel < ($protectiontime * 1000)))
-	$error = $lang['fl_strong_player'];
-elseif ($tempvar4['urlaubs_modus']==1)
-	$error = $lang['fl_in_vacation_player'];
-
-if ($error != "")
-	exit ( message ( $error, "game.php?page=galaxy&mode=2&galaxy=".$g."&system=".$s."&planet=".$i."&current=".$user['current_planet']."", 2 ) );
+{
+	$error .= $lang['ma_silo_level'].'<br>';
+	$errors++;
+}
+if ($user['impulse_motor_tech'] == 0)
+{
+	$error .= $lang['ma_impulse_drive_required'].'<br>';
+	$errors++;
+}
+if ($tempvar1 >= $tempvar2 || $g != $currentplanet['galaxy'])
+{
+	$error .= $lang['ma_not_send_other_galaxy'].'<br>';
+	$errors++;
+}
+if (!$tempvar3)
+{
+	$error .= $lang['ma_planet_doesnt_exists'].'<br>';
+	$errors++;
+}
+if ($anz > $iraks)
+{
+	$error .= $lang['ma_cant_send'] . $anz . $lang['ma_missile'] . $iraks.'<br>';
+	$errors++;
+}
+if (((!is_numeric($pziel) && $pziel != "all") or ($pziel < 0 or $pziel > 8)))
+{
+	$error .= $lang['ma_wrong_target'].'<br>';
+	$errors++;
+}
+if ($iraks==0)
+{
+	$error .= $lang['ma_no_missiles'].'<br>';
+	$errors++;
+}
+if ($anz==0)
+{
+	$error .= $lang['ma_add_missile_number'].'<br>';
+	$errors++;
+}
+if ($tempvar4['onlinetime'] >= (time()-60 * 60 * 24 * 7)){
+	if (($MyGameLevel > ($HeGameLevel * $protectionmulti)) &&  $protection == 1 && ($HeGameLevel < $protectiontime))
+	{
+		$error .= $lang['fl_week_player'].'<br>';
+		$errors++;
+	}elseif ((($MyGameLevel * $protectionmulti) < $HeGameLevel)  && $protection == 1 && ($MyGameLevel <  $protectiontime)){
+		$error .= $lang['fl_strong_player'].'<br>';
+		$errors++;
+	}
+}
+if ($tempvar4['urlaubs_modus']==1){
+	$error .= $lang['fl_in_vacation_player'].'<br>';
+	$errors++;
+}
+
+if ($errors != 0)
+{
+	message ($error, "game.php?page=galaxy&mode=0&galaxy=".$g."&system=".$s, 3);
+}
 
 $ziel_id = $tempvar3["id_owner"];
 
-$flugzeit = round(((30 + (60 * $tempvar1)) * 2500) / $game_config['fleet_speed']);
+$flugzeit = round(((30 + (60 * $tempvar1)) * 2500) / read_config ( 'fleet_speed' ) );
 
 $DefenseLabel =
 array(
-'0' => $lang['ma_misil_launcher'],
-'1' => $lang['ma_small_laser'],
-'2' => $lang['ma_big_laser'],
-'3' => $lang['ma_gauss_canyon'],
-'4' => $lang['ma_ionic_canyon'],
-'5' => $lang['ma_buster_canyon'],
-'6' => $lang['ma_small_protection_shield'],
-'7' => $lang['ma_big_protection_shield'],
+0 => $lang['tech'][401],
+1 => $lang['tech'][402],
+2 => $lang['tech'][403],
+3 => $lang['tech'][404],
+4 => $lang['tech'][405],
+5 => $lang['tech'][406],
+6 => $lang['tech'][407],
+7 => $lang['tech'][408],
 'all' => $lang['ma_all']);
 
 
@@ -125,7 +143,7 @@
 fleet_mess = 0,
 start_time = ".time().";", 'fleets');
 
-doquery("UPDATE {{table}} SET interplanetary_misil = (interplanetary_misil - ".$anz.") WHERE id = '".$user['current_planet']."'", 'planets');
+doquery("UPDATE {{table}} SET interplanetary_misil =  (interplanetary_misil - ".$anz.") WHERE id =  '".$user['current_planet']."'", 'planets');
 
 message("<b>".$anz."</b>". $lang['ma_missiles_sended'] .$DefenseLabel[$pziel], "game.php?page=overview", 3);
 ?>
\ No newline at end of file
diff --git a/SendFleetBack.php b/SendFleetBack.php
index b89a28b..3337f7e 100644
--- a/SendFleetBack.php
+++ b/SendFleetBack.php
@@ -1,44 +1,31 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('XGP_ROOT',	'./');
 
-$xgp_root = './';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
+include(XGP_ROOT . 'global.php');
 
 if ( is_numeric($_POST['fleetid']) )
 {
 	$fleetid  = intval($_POST['fleetid']);
-	$FleetRow = doquery("SELECT * FROM {{table}} WHERE `fleet_id` = '". $fleetid ."';", 'fleets', true);
+	$FleetRow = doquery("SELECT * FROM {{table}} WHERE `fleet_id` = '". $fleetid ."';", 'fleets', TRUE);
 	$i = 0;
 
 	if ($FleetRow['fleet_owner'] == $user['id'])
 	{
-		if ($FleetRow['fleet_mess'] == 0)
+		//now we can call back the ships in maintaing position (2).
+		if ($FleetRow['fleet_mess'] == 0 || $FleetRow['fleet_mess'] == 2)
 		{
 			if ($FleetRow['fleet_group'] > 0)
 			{
-				$Aks = doquery("SELECT teilnehmer FROM {{table}} WHERE id = '". $FleetRow['fleet_group'] ."';", 'aks', true);
+				$Aks = doquery("SELECT teilnehmer FROM {{table}} WHERE id = '". $FleetRow['fleet_group'] ."';", 'aks', TRUE);
 				if ($Aks['teilnehmer'] == $FleetRow['fleet_owner'] AND $FleetRow['fleet_mission'] == 1)
 				{
 					doquery ("DELETE FROM {{table}} WHERE id ='". $FleetRow['fleet_group'] ."';", 'aks');
@@ -51,26 +38,19 @@
 			}
 
 			$CurrentFlyingTime = time() - $FleetRow['start_time'];
-			/*
-			if ($FleetRow['fleet_end_stay'] != 0)
-			{
-				if ($FleetRow['fleet_start_time'] < time())
-				{
-					$CurrentFlyingTime = time() - $FleetRow['start_time'];
-				}
-				else
-				{
-					$CurrentFlyingTime = time() - $FleetRow['start_time'];
-				}
 
-			}
-			else
-			{
-				$CurrentFlyingTime = time() - $FleetRow['start_time']; 	// LO QUE ESTA COMO COMENTARIO ES EL BETA DEL FIX PARA
-			}															// LOS TIEMPOS DE REGRESO DE LAS FLOTAS
-																		// FUNCIONABA BIEN PERO FALLABA PARA LA MISION MATENER POSICION
-			*/
-			$ReturnFlyingTime  = $CurrentFlyingTime + time();
+			/*** start fix by jstar ***/
+			//the fleet time duration between 2 planet, it is equal for go and return when maintaining time=0
+			$fleetLeght	=	$FleetRow['fleet_start_time'] - $FleetRow['start_time'];
+			//the return time when you press "call back ships"
+			$ReturnFlyingTime  =
+			//if the ships mission is maintaining position and they are already in target pianet
+			( $FleetRow['fleet_end_stay'] != 0 && $CurrentFlyingTime > $fleetLeght )
+			//then the return time is the $fleetLeght + the current time in maintaining position
+			  ? $fleetLeght + time()
+			// else normal mission
+			  : $CurrentFlyingTime + time();
+			/***end fix by jstar***/
 
 			$QryUpdateFleet  = "UPDATE {{table}} SET ";
 			$QryUpdateFleet .= "`fleet_start_time` = '". (time() - 1) ."', ";
diff --git a/adm/AccountDataPage.php b/adm/AccountDataPage.php
index 9f4b0cb..5b925b3 100644
--- a/adm/AccountDataPage.php
+++ b/adm/AccountDataPage.php
@@ -1,483 +1,464 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By Neko from xgproyect.net	         #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
-
-if ($Observation != 1) die(message ($lang['404_page']));
-
-$parse	= 	$lang;
-
-
-if ($user['authlevel']	!=	3)
-	$NOSUPERMI	=	"WHERE `authlevel` < '".$user['authlevel']."'";
-
-$UserWhileLogin	=	doquery("SELECT `id`, `username`, `authlevel` FROM {{table}} ".$NOSUPERMI." ORDER BY `username` ASC", "users");
-while($UserList	=	mysql_fetch_array($UserWhileLogin))
+/**
+* @project XG Proyect
+* @version 2.10.x build 0000
+* @copyright Copyright (C) 2008 - 2016
+*/
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
+
+include(XGP_ROOT . 'global.php');
+
+if ( $Observation != 1 )
 {
-	$parse['lista']	.=	"<option value=\"".$UserList['id']."\">".$UserList['username']."&nbsp;&nbsp; (".$lang['rank'][$UserList['authlevel']].")</option>";
+	die(message ($lang['404_page']));
 }
 
+$parse	= $lang;
 
-if($_GET['id_u'] != NULL)
-	$id_u	=	$_GET['id_u'];
-else
-	$id_u	=	$_GET['id_u2'];
 
+if ( $user['authlevel']	!= 3 )
+{
+	$NOSUPERMI	= "WHERE `authlevel` < '" . $user['authlevel'] . "'";
+}
+
+$UserWhileLogin		= doquery ( "SELECT `id`, `username`, `authlevel` FROM {{table}} " . $NOSUPERMI . " ORDER BY `username` ASC" , "users" );
+
+while ( $UserList 	= mysql_fetch_array ( $UserWhileLogin ) )
+{
+	$parse['lista']	.=	"<option value=\"".$UserList['id']."\">" . $UserList['username'] . "&nbsp;&nbsp; (" . $lang['rank'][$UserList['authlevel']] . ")</option>";
+}
 
-$OnlyQueryLogin 	= 	doquery("SELECT `id`, `authlevel` FROM {{table}} WHERE `id` = '".$id_u."'", "users", true);
+if ( $_GET['id_u'] != NULL )
+{
+	$id_u	= $_GET['id_u'];
+}
+else
+{
+	$id_u	= $_GET['id_u2'];
+}
 
+$OnlyQueryLogin 	= doquery ( "SELECT `id`, `authlevel` FROM {{table}} WHERE `id` = '" . $id_u . "'" , "users" , TRUE );
 
-	if ($_GET)
+if ($_GET)
+{
+	if ( $id_u == NULL )
 	{
-		if ($id_u == NULL)
-		{
-			$parse['error']	=	"<tr><th height=25 style=\"border: 2px red solid;\"><font color=red>".$lang['ac_user_id_required']."</font></th></tr>";
-		}
-		elseif($_GET['id_u'] != NULL && $_GET['id_u2'] != NULL)
-		{
-			$parse['error']	=	"<tr><th height=25 style=\"border: 2px red solid;\"><font color=red>".$lang['ac_select_one_id']."</font></th></tr>";
-		}
-		elseif(!is_numeric($id_u))
+		$parse['error']	=	"<tr><th height=25 style=\"border: 2px red solid;\"><font color=red>" . $lang['ac_user_id_required'] . "</font></th></tr>";
+	}
+	elseif ( $_GET['id_u'] != NULL && $_GET['id_u2'] != NULL )
+	{
+		$parse['error']	=	"<tr><th height=25 style=\"border: 2px red solid;\"><font color=red>" . $lang['ac_select_one_id'] . "</font></th></tr>";
+	}
+	elseif ( !is_numeric ( $id_u ) )
+	{
+		$parse['error']	=	"<tr><th height=25 style=\"border: 2px red solid;\"><font color=red>" . $lang['ac_no_character'] . "</font></th></tr>";
+	}
+	elseif ( $OnlyQueryLogin == NULL or $OnlyQueryLogin == 0 )
+	{
+		$parse['error']	=	"<tr><th height=25 style=\"border: 2px red solid;\"><font color=red>" . $lang['ac_username_doesnt'] . "</font></th></tr>";
+	}
+	elseif ( $user['authlevel'] != 3 && $OnlyQueryLogin['authlevel'] > $user['authlevel'] )
+	{
+		$parse['error']	=	"<tr><th height=25 style=\"border: 2px red solid;\"><font color=red>" . $lang['ac_no_rank_level'] . "</font></th></tr>";
+	}
+	else
+	{
+		// COMIENZA SAQUEO DE DATOS DE LA TABLA DE USUARIOS
+		$SpecifyItemsU	=
+		"id,username,email,email_2,authlevel,id_planet,galaxy,system,planet,user_lastip,ip_at_reg,user_agent,register_time,onlinetime,noipcheck,urlaubs_modus,
+		urlaubs_until,spy_tech,computer_tech,military_tech,defence_tech,shield_tech,energy_tech,hyperspace_tech,combustion_tech,impulse_motor_tech,
+		hyperspace_motor_tech,laser_tech,ionic_tech,buster_tech,intergalactic_tech,expedition_tech,graviton_tech,ally_id,ally_name,ally_request,
+		ally_request_text,ally_register_time,ally_rank_id,rpg_geologue,rpg_amiral,rpg_ingenieur,rpg_technocrate,darkmatter,bana,banaday";
+
+		$UserQuery 	= 	doquery ( "SELECT " . $SpecifyItemsU . " FROM {{table}} WHERE `id` = '" . $id_u . "'" , "users" , TRUE );
+
+
+		$parse['reg_time']		=	date("d-m-Y H:i:s", $UserQuery['register_time']);
+		$parse['onlinetime']	=	date("d-m-Y H:i:s", $UserQuery['onlinetime']);
+		$parse['id']			=	$UserQuery['id'];
+		$parse['nombre']		=	$UserQuery['username'];
+		$parse['email_1']		=	$UserQuery['email'];
+		$parse['email_2']		=	$UserQuery['email_2'];
+		$parse['ip']			=	$UserQuery['ip_at_reg'];
+		$parse['ip2']			=	$UserQuery['user_lastip'];
+		$parse['id_p']			=	$UserQuery['id_planet'];
+		$parse['g']				=	$UserQuery['galaxy'];
+		$parse['s']				=	$UserQuery['system'];
+		$parse['p']				=	$UserQuery['planet'];
+		$parse['info']			=	$UserQuery['user_agent'];
+		$alianza				=	$UserQuery['ally_name'];
+		$parse['nivel']			=	$lang['rank'][$UserQuery['authlevel']];
+		$parse['ipcheck']		=	$lang['ac_checkip'][$UserQuery['noipcheck']];
+
+		if ( $UserQuery['urlaubs_modus'] == 1 )
 		{
-			$parse['error']	=	"<tr><th height=25 style=\"border: 2px red solid;\"><font color=red>".$lang['ac_no_character']."</font></th></tr>";
+			$parse['vacas'] = $lang['one_is_yes'][1];
 		}
-		elseif($OnlyQueryLogin == NULL or $OnlyQueryLogin == 0)
+		else
 		{
-			$parse['error']	=	"<tr><th height=25 style=\"border: 2px red solid;\"><font color=red>".$lang['ac_username_doesnt']."</font></th></tr>";
+			$parse['vacas'] = $lang['one_is_yes'][0];
 		}
-		elseif($user['authlevel'] != 3 && $OnlyQueryLogin['authlevel'] > $user['authlevel'])
+
+		if ( $UserQuery['bana'] == 1 )
 		{
-			$parse['error']	=	"<tr><th height=25 style=\"border: 2px red solid;\"><font color=red>".$lang['ac_no_rank_level']."</font></th></tr>";
+			$parse['suspen'] = $lang['one_is_yes'][1];
 		}
 		else
 		{
-			// COMIENZA SAQUEO DE DATOS DE LA TABLA DE USUARIOS
-			$SpecifyItemsU	=
-			"id,username,email,email_2,authlevel,id_planet,galaxy,system,planet,user_lastip,ip_at_reg,user_agent,register_time,onlinetime,noipcheck,urlaubs_modus,
-			 urlaubs_until,spy_tech,computer_tech,military_tech,defence_tech,shield_tech,energy_tech,hyperspace_tech,combustion_tech,impulse_motor_tech,
-			 hyperspace_motor_tech,laser_tech,ionic_tech,buster_tech,intergalactic_tech,expedition_tech,graviton_tech,ally_id,ally_name,ally_request,
-			 ally_request_text,ally_register_time,ally_rank_id,rpg_geologue,rpg_amiral,rpg_ingenieur,rpg_technocrate,rpg_espion,rpg_constructeur,rpg_scientifique,
-			 rpg_commandant,rpg_stockeur,darkmatter,rpg_defenseur,rpg_destructeur,rpg_general,rpg_bunker,rpg_raideur,rpg_empereur,bana,banaday";
-
-			$UserQuery 	= 	doquery("SELECT ".$SpecifyItemsU." FROM {{table}} WHERE `id` = '".$id_u."'", "users", true);
-
-
-			$parse['reg_time']		=	date("d-m-Y H:i:s", $UserQuery['register_time']);
-			$parse['onlinetime']	=	date("d-m-Y H:i:s", $UserQuery['onlinetime']);
-			$parse['id']			=	$UserQuery['id'];
-			$parse['nombre']		=	$UserQuery['username'];
-			$parse['email_1']		=	$UserQuery['email'];
-			$parse['email_2']		=	$UserQuery['email_2'];
-			$parse['ip']			=	$UserQuery['ip_at_reg'];
-			$parse['ip2']			=	$UserQuery['user_lastip'];
-			$parse['id_p']			=	$UserQuery['id_planet'];
-			$parse['g']				=	$UserQuery['galaxy'];
-			$parse['s']				=	$UserQuery['system'];
-			$parse['p']				=	$UserQuery['planet'];
-			$parse['info']			=	$UserQuery['user_agent'];
-			$alianza				=	$UserQuery['ally_name'];
-			$parse['nivel']			=	$lang['rank'][$UserQuery['authlevel']];
-			$parse['ipcheck']		=	$lang['ac_checkip'][$UserQuery['noipcheck']];
-			if($UserQuery['urlaubs_modus'] == 1) $parse['vacas'] = $lang['one_is_yes'][1]; else $parse['vacas'] = $lang['one_is_yes'][0];
-			if($UserQuery['bana'] == 1) $parse['suspen'] = $lang['one_is_yes'][1]; else $parse['suspen'] = $lang['one_is_yes'][0];
-
-
-			$parse['mo']	=	"<a title=\"".pretty_number($UserQuery['darkmatter'])."\">".shortly_number($UserQuery['darkmatter'])."</a>";
-
-			$Log	.=	"\n".$lang['log_info_detail_title']."\n";
-			$Log	.=	$lang['log_the_user'].$user['username'].$lang['log_searchto_1'].$UserQuery['username']."\n";
-			LogFunction($Log, "GeneralLog", $LogCanWork);
-
-			$parse['tec_espia']				=	$UserQuery['spy_tech'];
-			$parse['tec_compu']				=	$UserQuery['computer_tech'];
-			$parse['tec_militar']			=	$UserQuery['military_tech'];
-			$parse['tec_defensa']			=	$UserQuery['defence_tech'];
-			$parse['tec_blindaje']			=	$UserQuery['shield_tech'];
-			$parse['tec_energia']			=	$UserQuery['energy_tech'];
-			$parse['tec_hiperespacio']		=	$UserQuery['hyperspace_tech'];
-			$parse['tec_combustion']		=	$UserQuery['combustion_tech'];
-			$parse['tec_impulso']			=	$UserQuery['impulse_motor_tech'];
-			$parse['tec_hiperespacio_p']	=	$UserQuery['hyperspace_motor_tech'];
-			$parse['tec_laser']				=	$UserQuery['laser_tech'];
-			$parse['tec_ionico']			=	$UserQuery['ionic_tech'];
-			$parse['tec_plasma']			=	$UserQuery['buster_tech'];
-			$parse['tec_intergalactico']	=	$UserQuery['intergalactic_tech'];
-			$parse['tec_expedicion']		=	$UserQuery['expedition_tech'];
-			$parse['tec_graviton']			=	$UserQuery['graviton_tech'];
-
-
-			$parse['ofi_geologo']			=	$UserQuery['rpg_geologue'];
-			$parse['ofi_almirante']			=	$UserQuery['rpg_amiral'];
-			$parse['ofi_ingeniero']			=	$UserQuery['rpg_ingenieur'];
-			$parse['ofi_tecnocrata']		=	$UserQuery['rpg_technocrate'];
-			$parse['ofi_espia']				=	$UserQuery['rpg_espion'];
-			$parse['ofi_constructor']		=	$UserQuery['rpg_constructeur'];
-			$parse['ofi_cientifico']		=	$UserQuery['rpg_scientifique'];
-			$parse['ofi_comandante']		=	$UserQuery['rpg_commandant'];
-			$parse['ofi_almacenista']		=	$UserQuery['rpg_stockeur'];
-			$parse['ofi_defensa']			=	$UserQuery['rpg_defenseur'];
-			$parse['ofi_destructor']		=	$UserQuery['rpg_destructeur'];
-			$parse['ofi_general']			=	$UserQuery['rpg_general'];
-			$parse['ofi_bunker']			=	$UserQuery['rpg_bunker'];
-			$parse['ofi_conquis']			=	$UserQuery['rpg_raideur'];
-			$parse['ofi_emperador']			=	$UserQuery['rpg_empereur'];
-
-
-			if ($UserQuery['bana'] != 0)
-			{
-				$parse['mas']			=	"<a href=\"javascript:animatedcollapse.toggle('banned')\">".$lang['ac_more']."</a>";
+			$parse['suspen'] = $lang['one_is_yes'][0];
+		}
 
-				$BannedQuery	=	doquery("SELECT theme,time,longer,author FROM {{table}} WHERE `who` = '".$UserQuery['username']."'", "banned", true);
+		$parse['mo'] = "<a title=\"" . pretty_number ( $UserQuery['darkmatter'] ) . "\">" . shortly_number ( $UserQuery['darkmatter'] ) . "</a>";
+
+		$Log	.=	"\n" . $lang['log_info_detail_title'] . "\n";
+		$Log	.=	$lang['log_the_user'] . $user['username'] . $lang['log_searchto_1'] . $UserQuery['username'] . "\n";
+
+		LogFunction ( $Log , "GeneralLog" , $LogCanWork );
+
+		// TECNOLOGIAS
+		$parse['tec_espia']				=	$UserQuery['spy_tech'];
+		$parse['tec_compu']				=	$UserQuery['computer_tech'];
+		$parse['tec_militar']			=	$UserQuery['military_tech'];
+		$parse['tec_defensa']			=	$UserQuery['defence_tech'];
+		$parse['tec_blindaje']			=	$UserQuery['shield_tech'];
+		$parse['tec_energia']			=	$UserQuery['energy_tech'];
+		$parse['tec_hiperespacio']		=	$UserQuery['hyperspace_tech'];
+		$parse['tec_combustion']		=	$UserQuery['combustion_tech'];
+		$parse['tec_impulso']			=	$UserQuery['impulse_motor_tech'];
+		$parse['tec_hiperespacio_p']	=	$UserQuery['hyperspace_motor_tech'];
+		$parse['tec_laser']				=	$UserQuery['laser_tech'];
+		$parse['tec_ionico']			=	$UserQuery['ionic_tech'];
+		$parse['tec_plasma']			=	$UserQuery['buster_tech'];
+		$parse['tec_intergalactico']	=	$UserQuery['intergalactic_tech'];
+		$parse['tec_expedicion']		=	$UserQuery['expedition_tech'];
+		$parse['tec_graviton']			=	$UserQuery['graviton_tech'];
+
+		//OFICIALES
+		$parse['ofi_geologo']			=	$UserQuery['rpg_geologue'];
+		$parse['ofi_almirante']			=	$UserQuery['rpg_amiral'];
+		$parse['ofi_ingeniero']			=	$UserQuery['rpg_ingenieur'];
+		$parse['ofi_tecnocrata']		=	$UserQuery['rpg_technocrate'];
+
+		if ($UserQuery['bana'] != 0)
+		{
+			$parse['mas']			= "<a href=\"javascript:animatedcollapse.toggle('banned')\">" . $lang['ac_more'] . "</a>";
 
+			$BannedQuery			= doquery ( "SELECT theme,time,longer,author FROM {{table}} WHERE `who` = '" . $UserQuery['username'] . "'" , "banned" , TRUE );
 
-				$parse['sus_longer']	=	date("d-m-Y H-i-s", $BannedQuery['longer']);
-				$parse['sus_time']		=	date("d-m-Y H-i-s", $BannedQuery['time']);
-				$parse['sus_reason']	=	$BannedQuery['theme'];
-				$parse['sus_author']	=	$BannedQuery['author'];
+			$parse['sus_longer']	=	date ( "d-m-Y H-i-s" , $BannedQuery['longer'] );
+			$parse['sus_time']		=	date ( "d-m-Y H-i-s" , $BannedQuery['time'] );
+			$parse['sus_reason']	=	$BannedQuery['theme'];
+			$parse['sus_author']	=	$BannedQuery['author'];
+		}
 
-			}
+		// COMIENZA EL SAQUEO DE DATOS DE LA TABLA DE PUNTAJE
+		$SpecifyItemsS	= "tech_count,defs_count,fleet_count,build_count,build_points,tech_points,defs_points,fleet_points,tech_rank,build_rank,defs_rank,fleet_rank,total_points,stat_type";
 
+		$StatQuery	=	doquery ( "SELECT " . $SpecifyItemsS . " FROM {{table}} WHERE `id_owner` = '" .$id_u . "' AND `stat_type` = '1'" , "statpoints" , TRUE );
 
-			// COMIENZA EL SAQUEO DE DATOS DE LA TABLA DE PUNTAJE
-			$SpecifyItemsS	=
-			"tech_count,defs_count,fleet_count,build_count,build_points,tech_points,defs_points,fleet_points,tech_rank,build_rank,defs_rank,fleet_rank,total_points,
-			stat_type";
+		$parse['count_tecno']		=	pretty_number ( $StatQuery['tech_count'] );
+		$parse['count_def']			=	pretty_number ( $StatQuery['defs_count'] );
+		$parse['count_fleet']		=	pretty_number ( $StatQuery['fleet_count'] );
+		$parse['count_builds']		=	pretty_number ( $StatQuery['build_count'] );
 
-			$StatQuery	=	doquery("SELECT ".$SpecifyItemsS." FROM {{table}} WHERE `id_owner` = '".$id_u."' AND `stat_type` = '1'", "statpoints", true);
+		$parse['point_builds']		=	pretty_number ( $StatQuery['build_points'] );
+		$parse['point_tecno']		=	pretty_number ( $StatQuery['tech_points'] );
+		$parse['point_def']			=	pretty_number ( $StatQuery['defs_points'] );
+		$parse['point_fleet']		=	pretty_number ( $StatQuery['fleet_points'] );
 
-			$parse['count_tecno']	=	pretty_number($StatQuery['tech_count']);
-			$parse['count_def']		=	pretty_number($StatQuery['defs_count']);
-			$parse['count_fleet']	=	pretty_number($StatQuery['fleet_count']);
-			$parse['count_builds']	=	pretty_number($StatQuery['build_count']);
+		$parse['ranking_tecno']		=	$StatQuery['tech_rank'];
+		$parse['ranking_builds']	=	$StatQuery['build_rank'];
+		$parse['ranking_def']		=	$StatQuery['defs_rank'];
+		$parse['ranking_fleet']		=	$StatQuery['fleet_rank'];
 
-			$parse['point_builds']	=	pretty_number($StatQuery['build_points']);
-			$parse['point_tecno']	=	pretty_number($StatQuery['tech_points']);
-			$parse['point_def']		=	pretty_number($StatQuery['defs_points']);
-			$parse['point_fleet']	=	pretty_number($StatQuery['fleet_points']);
+		$parse['total_points']		=	pretty_number ( $StatQuery['total_points'] );
 
+		// COMIENZA EL SAQUEO DE DATOS DE LA ALIANZA
+		$AliID	= $UserQuery['ally_id'];
 
-			$parse['ranking_tecno']		=	$StatQuery['tech_rank'];
-			$parse['ranking_builds']	=	$StatQuery['build_rank'];
-			$parse['ranking_def']		=	$StatQuery['defs_rank'];
-			$parse['ranking_fleet']		=	$StatQuery['fleet_rank'];
 
-			$parse['total_points']	=	pretty_number($StatQuery['total_points']);
+		if ( $alianza == 0 && $AliID == 0 )
+		{
+			$parse['alianza']		=	$lang['ac_no_ally'];
+			$parse['AllianceHave']	=	"<span class=\"no_moon\"><img src=\"../styles/images/Adm/arrowright.png\" width=\"16\" height=\"10\"/>" . $lang['ac_alliance'] . "&nbsp;" . $lang['ac_no_alliance'] . "</span>";
+		}
+		elseif ( $alianza != NULL && $AliID != 0 )
+		{
+			include_once("AdminFunctions/BBCode-Panel-Adm.php");
+			$bbcode = new bbcode;
 
+			$parse['AllianceHave'] 			= "<a href=\"javascript:animatedcollapse.toggle('alianza')\" class=\"link\"><img src=\"../styles/images/Adm/arrowright.png\" width=\"16\" height=\"10\"/> " . $lang['ac_alliance'] . "</a>";
 
+			$SpecifyItemsA					= "ally_owner,id,ally_tag,ally_name,ally_web,ally_description,ally_text,ally_request,ally_image,ally_members,ally_register_time";
 
-			// COMIENZA EL SAQUEO DE DATOS DE LA ALIANZA
-			$AliID	=	$UserQuery['ally_id'];
+			$AllianceQuery					=	doquery ( "SELECT " . $SpecifyItemsA . " FROM {{table}} WHERE `ally_name` = '" . $alianza . "'" , "alliance" , TRUE );
 
+			$parse['alianza']				=	$alianza;
+			$parse['id_ali']				=	" (".$lang['ac_ali_idid']."&nbsp;".$AliID.")";
+			$parse['id_aliz']				=	$AllianceQuery['id'];
+			$parse['tag']					=	$AllianceQuery['ally_tag'];
+			$parse['ali_nom']				=	$AllianceQuery['ally_name'];
+			$parse['ali_cant']				=	$AllianceQuery['ally_members'];
+			$parse['ally_register_time']	=	date("d-m-Y H:i:s", $AllianceQuery['ally_register_time']);
+			$ali_lider						=	$AllianceQuery['ally_owner'];
 
-			if ($alianza == 0 && $AliID == 0)
+			if ( $AllianceQuery['ally_web'] != NULL )
 			{
-				$parse['alianza']	=	$lang['ac_no_ally'];
-				$parse['AllianceHave']	=	"<span class=\"no_moon\"><img src=\"../styles/images/Adm/arrowright.png\" width=\"16\" height=\"10\"/>
-							".$lang['ac_alliance']."&nbsp;".$lang['ac_no_alliance']."</span>";
+				$parse['ali_web'] = "<a href=" . $AllianceQuery['ally_web'] . " target=_blank>" . $AllianceQuery['ally_web'] . "</a>";
 			}
-			elseif ($alianza != NULL && $AliID != 0)
+			else
 			{
-				include_once("AdminFunctions/BBCode-Panel-Adm.php");
-				$bbcode = new bbcode;
-
-				$parse['AllianceHave']	=	"<a href=\"javascript:animatedcollapse.toggle('alianza')\" class=\"link\">
-							<img src=\"../styles/images/Adm/arrowright.png\" width=\"16\" height=\"10\"/> ".$lang['ac_alliance']."</a>";
-
-
-
-				$SpecifyItemsA	=
-				"ally_owner,id,ally_tag,ally_name,ally_web,ally_description,ally_text,ally_request,ally_image,ally_members,ally_register_time";
-
-				$AllianceQuery		=	doquery("SELECT ".$SpecifyItemsA." FROM {{table}} WHERE `ally_name` = '".$alianza."'", "alliance", true);
-
-
-
-				$parse['alianza']				=	$alianza;
-				$parse['id_ali']				=	" (".$lang['ac_ali_idid']."&nbsp;".$AliID.")";
-				$parse['id_aliz']				=	$AllianceQuery['id'];
-				$parse['tag']					=	$AllianceQuery['ally_tag'];
-				$parse['ali_nom']				=	$AllianceQuery['ally_name'];
-				$parse['ali_cant']				=	$AllianceQuery['ally_members'];
-				$parse['ally_register_time']	=	date("d-m-Y H:i:s", $AllianceQuery['ally_register_time']);
-				$ali_lider						=	$AllianceQuery['ally_owner'];
-
-
-				if($AllianceQuery['ally_web'] != NULL)
-					$parse['ali_web'] = "<a href=".$AllianceQuery['ally_web']." target=_blank>".$AllianceQuery['ally_web']."</a>";
-				else
-					$parse['ali_web'] = $lang['ac_no_web'];
+				$parse['ali_web'] = $lang['ac_no_web'];
+			}
 
+			if ( $AllianceQuery['ally_description'] != NULL )
+			{
+				$parse['ali_ext2'] = $bbcode->reemplazo ( $AllianceQuery['ally_description'] );
+				$parse['ali_ext']  = "<a href=\"#\" rel=\"toggle[externo]\">" . $lang['ac_view_text_ext'] . "</a>";
+			}
+			else
+			{
+				$parse['ali_ext'] = $lang['ac_no_text_ext'];
+			}
 
-				if($AllianceQuery['ally_description'] != NULL)
-				{
-					$parse['ali_ext2'] = $bbcode->reemplazo($AllianceQuery['ally_description']);
-					$parse['ali_ext']  = "<a href=\"#\" rel=\"toggle[externo]\">".$lang['ac_view_text_ext']."</a>";
-				}
-				else
-				{
-					$parse['ali_ext'] = $lang['ac_no_text_ext'];
-				}
 
 
-				if($AllianceQuery['ally_text'] != NULL)
-				{
-					$parse['ali_int2'] = $bbcode->reemplazo($AllianceQuery['ally_text']);
-					$parse['ali_int']  = "<a href=\"#\" rel=\"toggle[interno]\">".$lang['ac_view_text_int']."</a>";
-				}
-				else
-				{
-					$parse['ali_int'] = $lang['ac_no_text_int'];
-				}
+			if ( $AllianceQuery['ally_text'] != NULL )
+			{
+				$parse['ali_int2'] = $bbcode->reemplazo($AllianceQuery['ally_text']);
+				$parse['ali_int']  = "<a href=\"#\" rel=\"toggle[interno]\">".$lang['ac_view_text_int']."</a>";
+			}
+			else
+			{
+				$parse['ali_int'] = $lang['ac_no_text_int'];
+			}
 
 
-				if($AllianceQuery['ally_request'] != NULL)
-				{
-					$parse['ali_sol2'] = $bbcode->reemplazo($AllianceQuery['ally_request']);
-					$parse['ali_sol']  = "<a href=\"#\" rel=\"toggle[solicitud]\">".$lang['ac_view_text_sol']."</a>";
-				}
-				else
-				{
-					$parse['ali_sol'] = $lang['ac_no_text_sol'];
-				}
+			if ( $AllianceQuery['ally_request'] != NULL )
+			{
+				$parse['ali_sol2'] = $bbcode->reemplazo($AllianceQuery['ally_request']);
+				$parse['ali_sol']  = "<a href=\"#\" rel=\"toggle[solicitud]\">".$lang['ac_view_text_sol']."</a>";
+			}
+			else
+			{
+				$parse['ali_sol'] = $lang['ac_no_text_sol'];
+			}
 
 
-				if($AllianceQuery['ally_image'] != NULL)
-				{
-					$parse['ali_logo2'] = $AllianceQuery['ally_image'];
-					$parse['ali_logo'] = "<a href=\"#\" rel=\"toggle[imagen]\">".$lang['ac_view_image2']."</a>";
-				}
-				else
-				{
-					$parse['ali_logo'] = $lang['ac_no_img'];
-				}
+			if ( $AllianceQuery['ally_image'] != NULL )
+			{
+				$parse['ali_logo2'] = $AllianceQuery['ally_image'];
+				$parse['ali_logo'] = "<a href=\"#\" rel=\"toggle[imagen]\">".$lang['ac_view_image2']."</a>";
+			}
+			else
+			{
+				$parse['ali_logo'] = $lang['ac_no_img'];
+			}
 
+			$SearchLeader			=	doquery("SELECT `username` FROM {{table}} WHERE `id` = '".$ali_lider."'", "users", TRUE);
+			$parse['ali_lider']		=	$SearchLeader['username'];
 
-				$SearchLeader		=	doquery("SELECT `username` FROM {{table}} WHERE `id` = '".$ali_lider."'", "users", true);
-				$parse['ali_lider']	=	$SearchLeader['username'];
+			$StatQueryAlly			=	doquery("SELECT " . $SpecifyItemsS . " FROM {{table}} WHERE `id_owner` = '".$ali_lider."' AND `stat_type` = '2'" , "statpoints" , TRUE );
 
+			$parse['count_tecno_ali']		=	pretty_number ( $StatQueryAlly['tech_count'] );
+			$parse['count_def_ali']			=	pretty_number ( $StatQueryAlly['defs_count'] );
+			$parse['count_fleet_ali']		=	pretty_number ( $StatQueryAlly['fleet_count'] );
+			$parse['count_builds_ali']		=	pretty_number ( $StatQueryAlly['build_count'] );
 
+			$parse['point_builds_ali']		=	pretty_number ( $StatQueryAlly['build_points'] );
+			$parse['point_tecno_ali']		=	pretty_number ( $StatQueryAlly['tech_points'] );
+			$parse['point_def_ali']			=	pretty_number ( $StatQueryAlly['defs_points'] );
+			$parse['point_fleet_ali']		=	pretty_number ( $StatQueryAlly['fleet_points'] );
 
-				$StatQueryAlly	=	doquery("SELECT ".$SpecifyItemsS." FROM {{table}} WHERE `id_owner` = '".$ali_lider."' AND
-									`stat_type` = '2'", "statpoints", true);
+			$parse['ranking_tecno_ali']		=	pretty_number ( $StatQueryAlly['tech_rank'] );
+			$parse['ranking_builds_ali']	=	pretty_number ( $StatQueryAlly['build_rank'] );
+			$parse['ranking_def_ali']		=	pretty_number ( $StatQueryAlly['defs_rank'] );
+			$parse['ranking_fleet_ali']		=	pretty_number ( $StatQueryAlly['fleet_rank'] );
 
-				$parse['count_tecno_ali']	=	pretty_number($StatQueryAlly['tech_count']);
-				$parse['count_def_ali']		=	pretty_number($StatQueryAlly['defs_count']);
-				$parse['count_fleet_ali']	=	pretty_number($StatQueryAlly['fleet_count']);
-				$parse['count_builds_ali']	=	pretty_number($StatQueryAlly['build_count']);
+			$parse['total_points_ali']		=	pretty_number ( $StatQueryAlly['total_points'] );
+		}
 
-				$parse['point_builds_ali']	=	pretty_number($StatQueryAlly['build_points']);
-				$parse['point_tecno_ali']	=	pretty_number($StatQueryAlly['tech_points']);
-				$parse['point_def_ali']		=	pretty_number($StatQueryAlly['defs_points']);
-				$parse['point_fleet_ali']	=	pretty_number($StatQueryAlly['fleet_points']);
+		// COMIENZA EL SAQUEO DE DATOS DE LOS PLANETAS
+		$SpecifyItemsP	=
+		"planet_type,id,name,galaxy,system,planet,destruyed,diameter,field_current,field_max,temp_min,temp_max,metal,crystal,deuterium,energy_max,
+		metal_mine,crystal_mine,deuterium_sintetizer,solar_plant,fusion_plant,robot_factory,nano_factory,hangar,metal_store,crystal_store,deuterium_store,
+		laboratory,terraformer,ally_deposit,silo,small_ship_cargo,big_ship_cargo,light_hunter,heavy_hunter,crusher,battle_ship,colonizer,recycler,
+		spy_sonde,bomber_ship,solar_satelit,destructor,dearth_star,battleship,misil_launcher,small_laser,big_laser,gauss_canyon,ionic_canyon,
+		buster_canyon,small_protection_shield,big_protection_shield,interceptor_misil,interplanetary_misil,mondbasis,phalanx,sprungtor,
+		energy_used";
 
+		$PlanetsQuery = doquery ( "SELECT " . $SpecifyItemsP . " FROM {{table}} WHERE `id_owner` = '" . $id_u . "'" , "planets" );
 
-				$parse['ranking_tecno_ali']		=	pretty_number($StatQueryAlly['tech_rank']);
-				$parse['ranking_builds_ali']	=	pretty_number($StatQueryAlly['build_rank']);
-				$parse['ranking_def_ali']		=	pretty_number($StatQueryAlly['defs_rank']);
-				$parse['ranking_fleet_ali']		=	pretty_number($StatQueryAlly['fleet_rank']);
+		while ( $PlanetsWhile = mysql_fetch_array ( $PlanetsQuery ) )
+		{
+			if ( $PlanetsWhile['planet_type'] == 3 )
+			{
+				$Planettt = $PlanetsWhile['name'] . "&nbsp;(" . $lang['ac_moon'] . ")<br><font color=aqua>[" . $PlanetsWhile['galaxy'] . ":" . $PlanetsWhile['system'] . ":" . $PlanetsWhile['planet'] . "]</font>";
 
-				$parse['total_points_ali']		=	pretty_number($StatQueryAlly['total_points']);
+				$MoonZ		=	0;
+				$Moons 		= $PlanetsWhile['name'] . "&nbsp;(" . $lang['ac_moon'] . ")<br><font color=aqua>[" . $PlanetsWhile['galaxy'] . ":" . $PlanetsWhile['system'] . ":" . $PlanetsWhile['planet'] . "]</font>";
+				$MoonZ++;
+			}
+			else
+			{
+				$Planettt = $PlanetsWhile['name'] . "<br><font color=aqua>[" . $PlanetsWhile['galaxy'] . ":" . $PlanetsWhile['system'] . ":" . $PlanetsWhile['planet'] . "]</font>";
 			}
 
-
-
-
-			// COMIENZA EL SAQUEO DE DATOS DE LOS PLANETAS
-			$SpecifyItemsP	=
-				"planet_type,id,name,galaxy,system,planet,destruyed,diameter,field_current,field_max,temp_min,temp_max,metal,crystal,deuterium,energy_max,
-				metal_mine,crystal_mine,deuterium_sintetizer,solar_plant,fusion_plant,robot_factory,nano_factory,hangar,metal_store,crystal_store,deuterium_store,
-				laboratory,terraformer,ally_deposit,silo,small_ship_cargo,big_ship_cargo,light_hunter,heavy_hunter,crusher,battle_ship,colonizer,recycler,
-				spy_sonde,bomber_ship,solar_satelit,destructor,dearth_star,battleship,supernova,misil_launcher,small_laser,big_laser,gauss_canyon,ionic_canyon,
-				buster_canyon,small_protection_shield,planet_protector,big_protection_shield,interceptor_misil,interplanetary_misil,mondbasis,phalanx,sprungtor,
-				energy_used";
-
-			$PlanetsQuery	=	doquery("SELECT ".$SpecifyItemsP." FROM {{table}} WHERE `id_owner` = '".$id_u."'", "planets");
-
-			while ($PlanetsWhile	=	mysql_fetch_array($PlanetsQuery))
+			if ($PlanetsWhile["destruyed"] == 0)
 			{
-				if ($PlanetsWhile['planet_type'] == 3)
+				$parse['planets_moons']	.=	"
+				<tr>
+				<th>" .$Planettt . "</th>
+				<th>" . $PlanetsWhile['id'] . "</th>
+				<th>" . pretty_number ( $PlanetsWhile['diameter'] ) . "</th>
+				<th>" . pretty_number ( $PlanetsWhile['field_current'] ) . "/" . pretty_number ( $PlanetsWhile['field_max'] ) ."</th>
+				<th>" . pretty_number ( $PlanetsWhile['temp_min'] ) . "/" . pretty_number ( $PlanetsWhile['temp_max'] ) ."</th>
+				</tr>";
+
+				$SumOfEnergy = ( $PlanetsWhile['energy_max'] + $PlanetsWhile['energy_used'] );
+
+				if ( $SumOfEnergy < 0 )
 				{
-					$Planettt = $PlanetsWhile['name']."&nbsp;(".$lang['ac_moon'].")<br><font color=aqua>["
-								.$PlanetsWhile['galaxy'].":".$PlanetsWhile['system'].":".$PlanetsWhile['planet']."]</font>";
+					$Color	=	"<font color=#FF6600>" . shortly_number ( $SumOfEnergy ) . "</font>";
+				}
 
-					$MoonZ	=	0;
-					$Moons = $PlanetsWhile['name']."&nbsp;(".$lang['ac_moon'].")<br><font color=aqua>["
-								.$PlanetsWhile['galaxy'].":".$PlanetsWhile['system'].":".$PlanetsWhile['planet']."]</font>";
-					$MoonZ++;
+				elseif ($SumOfEnergy > 0)
+				{
+					$Color	=	"<font color=lime>" . shortly_number ( $SumOfEnergy ) . "</font>";
 				}
+
 				else
 				{
-					$Planettt = $PlanetsWhile['name']."<br><font color=aqua>[".$PlanetsWhile['galaxy'].":".$PlanetsWhile['system'].":"
-								.$PlanetsWhile['planet']."]</font>";
+					$Color	=	shortly_number ( $SumOfEnergy );
 				}
 
-
-
-				if ($PlanetsWhile["destruyed"] == 0)
+				$parse['resources']	.=	"
+				<tr>
+				<th>".$Planettt."</th>
+				<th><a title=\"".pretty_number($PlanetsWhile['metal'])."\">".shortly_number($PlanetsWhile['metal'])."</a></th>
+
+				<th><a title=\"".pretty_number($PlanetsWhile['crystal'])."\">".shortly_number($PlanetsWhile['crystal'])."</a></th>
+				<th><a title=\"".pretty_number($PlanetsWhile['deuterium'])."\">".shortly_number($PlanetsWhile['deuterium'])."</a></th>
+				<th><a title=\"".pretty_number($SumOfEnergy)."\">".$Color."</a>/<a title=\"".pretty_number($PlanetsWhile['energy_max'])."\">".shortly_number($PlanetsWhile['energy_max'])."</a></th>
+				</tr>";
+
+				$parse['ships']	.=	"
+				<tr>
+				<th width=\"10%\">".$Planettt."</th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['small_ship_cargo'])."\">".shortly_number($PlanetsWhile['small_ship_cargo'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['big_ship_cargo'])."\">".shortly_number($PlanetsWhile['big_ship_cargo'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['light_hunter'])."\">".shortly_number($PlanetsWhile['light_hunter'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['heavy_hunter'])."\">".shortly_number($PlanetsWhile['heavy_hunter'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['crusher'])."\">".shortly_number($PlanetsWhile['crusher'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['battle_ship'])."\">".shortly_number($PlanetsWhile['battle_ship'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['colonizer'])."\">".shortly_number($PlanetsWhile['colonizer'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['recycler'])."\">".shortly_number($PlanetsWhile['recycler'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['spy_sonde'])."\">".shortly_number($PlanetsWhile['spy_sonde'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['bomber_ship'])."\">".shortly_number($PlanetsWhile['bomber_ship'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['solar_satelit'])."\">".shortly_number($PlanetsWhile['solar_satelit'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['destructor'])."\">".shortly_number($PlanetsWhile['destructor'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['dearth_star'])."\">".shortly_number($PlanetsWhile['dearth_star'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['battleship'])."\">".shortly_number($PlanetsWhile['battleship'])."</a></th>
+				</tr>";
+
+				$parse['defenses']	.=	"
+				<tr>
+				<th width=\"10%\">".$Planettt."</th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['misil_launcher'])."\">".shortly_number($PlanetsWhile['misil_launcher'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['small_laser'])."\">".shortly_number($PlanetsWhile['small_laser'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['big_laser'])."\">".shortly_number($PlanetsWhile['big_laser'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['gauss_canyon'])."\">".shortly_number($PlanetsWhile['gauss_canyon'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['ionic_canyon'])."\">".shortly_number($PlanetsWhile['ionic_canyon'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['buster_canyon'])."\">".shortly_number($PlanetsWhile['buster_canyon'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['small_protection_shield'])."\">".shortly_number($PlanetsWhile['small_protection_shield'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['big_protection_shield'])."\">".shortly_number($PlanetsWhile['big_protection_shield'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['interceptor_misil'])."\">".shortly_number($PlanetsWhile['interceptor_misil'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['interplanetary_misil'])."\">".shortly_number($PlanetsWhile['interplanetary_misil'])."</a></th>
+				</tr>";
+
+				$parse['buildings']	.=	"
+				<tr>
+				<th width=\"10%\">".$Planettt."</th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['metal_mine'])."\">".shortly_number($PlanetsWhile['metal_mine'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['crystal_mine'])."\">".shortly_number($PlanetsWhile['crystal_mine'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['deuterium_sintetizer'])."\">".shortly_number($PlanetsWhile['deuterium_sintetizer'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['solar_plant'])."\">".shortly_number($PlanetsWhile['solar_plant'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['fusion_plant'])."\">".shortly_number($PlanetsWhile['fusion_plant'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['robot_factory'])."\">".shortly_number($PlanetsWhile['robot_factory'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['nano_factory'])."\">".shortly_number($PlanetsWhile['nano_factory'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['hangar'])."\">".shortly_number($PlanetsWhile['hangar'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['metal_store'])."\">".shortly_number($PlanetsWhile['metal_store'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['crystal_store'])."\">".shortly_number($PlanetsWhile['crystal_store'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['deuterium_store'])."\">".shortly_number($PlanetsWhile['deuterium_store'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['laboratory'])."\">".shortly_number($PlanetsWhile['laboratory'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['terraformer'])."\">".shortly_number($PlanetsWhile['terraformer'])."</a></th>
+				<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['ally_deposit'])."\">".shortly_number($PlanetsWhile['ally_deposit'])."</a></th>
+				<th width=\"30%\"><a title=\"".pretty_number($PlanetsWhile['silo'])."\">".shortly_number($PlanetsWhile['silo'])."</a></th>
+				</tr>";
+
+				if ( $PlanetsWhile['planet_type'] == 3 )
 				{
-					$parse['planets_moons']	.=	"
+					$parse['moon_buildings'] .=	"
 					<tr>
-						<th>".$Planettt."</th>
-						<th>".$PlanetsWhile['id']."</th>
-						<th>".pretty_number($PlanetsWhile['diameter'])."</th>
-						<th>".pretty_number($PlanetsWhile['field_current'])."/".pretty_number($PlanetsWhile['field_max'])."</th>
-						<th>".pretty_number($PlanetsWhile['temp_min'])."/".pretty_number($PlanetsWhile['temp_max'])."</th>
+					<th width=\"10%\">".$Moons."</th>
+					<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['mondbasis'])."\">".shortly_number($PlanetsWhile['mondbasis'])."</a></th>
+					<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['phalanx'])."\">".shortly_number($PlanetsWhile['phalanx'])."</a></th>
+					<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['sprungtor'])."\">".shortly_number($PlanetsWhile['sprungtor'])."</a></th>
 					</tr>";
-
-
-					$SumOfEnergy	=	($PlanetsWhile['energy_max'] + $PlanetsWhile['energy_used']);
-
-					if ($SumOfEnergy < 0)
-						$Color	=	"<font color=#FF6600>".shortly_number($SumOfEnergy)."</font>";
-					elseif ($SumOfEnergy > 0)
-						$Color	=	"<font color=lime>".shortly_number($SumOfEnergy)."</font>";
-					else
-						$Color	=	shortly_number($SumOfEnergy);
-
-
-					$parse['resources']	.=	"
-					<tr>
-						<th>".$Planettt."</th>
-						<th><a title=\"".pretty_number($PlanetsWhile['metal'])."\">".shortly_number($PlanetsWhile['metal'])."</a></th>
-						<th><a title=\"".pretty_number($PlanetsWhile['crystal'])."\">".shortly_number($PlanetsWhile['crystal'])."</a></th>
-						<th><a title=\"".pretty_number($PlanetsWhile['deuterium'])."\">".shortly_number($PlanetsWhile['deuterium'])."</a></th>
-						<th><a title=\"".pretty_number($SumOfEnergy)."\">".$Color."</a>/<a title=\"".pretty_number($PlanetsWhile['energy_max'])."\">".shortly_number($PlanetsWhile['energy_max'])."</a></th>
-					</tr>";
-
-
-					$parse['ships']	.=	"
-					<tr>
-						<th width=\"10%\">".$Planettt."</th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['small_ship_cargo'])."\">".shortly_number($PlanetsWhile['small_ship_cargo'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['big_ship_cargo'])."\">".shortly_number($PlanetsWhile['big_ship_cargo'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['light_hunter'])."\">".shortly_number($PlanetsWhile['light_hunter'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['heavy_hunter'])."\">".shortly_number($PlanetsWhile['heavy_hunter'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['crusher'])."\">".shortly_number($PlanetsWhile['crusher'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['battle_ship'])."\">".shortly_number($PlanetsWhile['battle_ship'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['colonizer'])."\">".shortly_number($PlanetsWhile['colonizer'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['recycler'])."\">".shortly_number($PlanetsWhile['recycler'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['spy_sonde'])."\">".shortly_number($PlanetsWhile['spy_sonde'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['bomber_ship'])."\">".shortly_number($PlanetsWhile['bomber_ship'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['solar_satelit'])."\">".shortly_number($PlanetsWhile['solar_satelit'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['destructor'])."\">".shortly_number($PlanetsWhile['destructor'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['dearth_star'])."\">".shortly_number($PlanetsWhile['dearth_star'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['battleship'])."\">".shortly_number($PlanetsWhile['battleship'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['supernova'])."\">".shortly_number($PlanetsWhile['supernova'])."</a></th>
-					</tr>";
-
-
-					$parse['defenses']	.=	"
-					<tr>
-						<th width=\"10%\">".$Planettt."</th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['misil_launcher'])."\">".shortly_number($PlanetsWhile['misil_launcher'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['small_laser'])."\">".shortly_number($PlanetsWhile['small_laser'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['big_laser'])."\">".shortly_number($PlanetsWhile['big_laser'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['gauss_canyon'])."\">".shortly_number($PlanetsWhile['gauss_canyon'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['ionic_canyon'])."\">".shortly_number($PlanetsWhile['ionic_canyon'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['buster_canyon'])."\">".shortly_number($PlanetsWhile['buster_canyon'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['small_protection_shield'])."\">".shortly_number($PlanetsWhile['small_protection_shield'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['big_protection_shield'])."\">".shortly_number($PlanetsWhile['big_protection_shield'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['planet_protector'])."\">".shortly_number($PlanetsWhile['planet_protector'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['interceptor_misil'])."\">".shortly_number($PlanetsWhile['interceptor_misil'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['interplanetary_misil'])."\">".shortly_number($PlanetsWhile['interplanetary_misil'])."</a></th>
-					</tr>";
-
-
-					$parse['buildings']	.=	"
-					<tr>
-						<th width=\"10%\">".$Planettt."</th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['metal_mine'])."\">".shortly_number($PlanetsWhile['metal_mine'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['crystal_mine'])."\">".shortly_number($PlanetsWhile['crystal_mine'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['deuterium_sintetizer'])."\">".shortly_number($PlanetsWhile['deuterium_sintetizer'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['solar_plant'])."\">".shortly_number($PlanetsWhile['solar_plant'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['fusion_plant'])."\">".shortly_number($PlanetsWhile['fusion_plant'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['robot_factory'])."\">".shortly_number($PlanetsWhile['robot_factory'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['nano_factory'])."\">".shortly_number($PlanetsWhile['nano_factory'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['hangar'])."\">".shortly_number($PlanetsWhile['hangar'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['metal_store'])."\">".shortly_number($PlanetsWhile['metal_store'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['crystal_store'])."\">".shortly_number($PlanetsWhile['crystal_store'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['deuterium_store'])."\">".shortly_number($PlanetsWhile['deuterium_store'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['laboratory'])."\">".shortly_number($PlanetsWhile['laboratory'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['terraformer'])."\">".shortly_number($PlanetsWhile['terraformer'])."</a></th>
-						<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['ally_deposit'])."\">".shortly_number($PlanetsWhile['ally_deposit'])."</a></th>
-						<th width=\"30%\"><a title=\"".pretty_number($PlanetsWhile['silo'])."\">".shortly_number($PlanetsWhile['silo'])."</a></th>
-					</tr>";
-
-
-
-					if ($PlanetsWhile['planet_type'] == 3)
-					{
-						$parse['moon_buildings']	.=	"
-						<tr>
-							<th width=\"10%\">".$Moons."</th>
-							<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['mondbasis'])."\">".shortly_number($PlanetsWhile['mondbasis'])."</a></th>
-							<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['phalanx'])."\">".shortly_number($PlanetsWhile['phalanx'])."</a></th>
-							<th width=\"10%\"><a title=\"".pretty_number($PlanetsWhile['sprungtor'])."\">".shortly_number($PlanetsWhile['sprungtor'])."</a></th>
-						</tr>";
-					}
+				}
 
 
 
-					if ($MoonZ != 0)
-						$parse['MoonHave']	=	"<a href=\"javascript:animatedcollapse.toggle('especiales')\" class=\"link\">
-							<img src=\"../styles/images/Adm/arrowright.png\" width=\"16\" height=\"10\"/> ".$lang['moon_build']."</a>";
-					else
-						$parse['MoonHave']	=	"<span class=\"no_moon\"><img src=\"../styles/images/Adm/arrowright.png\" width=\"16\" height=\"10\"/>
-							".$lang['moon_build']."&nbsp;".$lang['ac_moons_no']."</span>";
 
+				if ( $MoonZ != 0 )
+				{
+					$parse['MoonHave']	=	"<a href=\"javascript:animatedcollapse.toggle('especiales')\" class=\"link\">
+					<img src=\"../styles/images/Adm/arrowright.png\" width=\"16\" height=\"10\"/> ".$lang['moon_build']."</a>";
 				}
-
-				$DestruyeD	=	0;
-				if ($PlanetsWhile["destruyed"] > 0)
+				else
 				{
-					$parse['destroyed']	.=	"
-						<tr>
-							<th>".$PlanetsWhile['name']."</th>
-							<th>".$PlanetsWhile['id']."</th>
-							<th>[".$PlanetsWhile['galaxy'].":".$PlanetsWhile['system'].":".$PlanetsWhile['planet']."]</th>
-							<th>".date("d-m-Y   H:i:s", $PlanetsWhile['destruyed'])."</th>
-						</tr>";
-					$DestruyeD++;
+					$parse['MoonHave']	=	"<span class=\"no_moon\"><img src=\"../styles/images/Adm/arrowright.png\" width=\"16\" height=\"10\"/>
+					".$lang['moon_build']."&nbsp;".$lang['ac_moons_no']."</span>";
 				}
+			}
 
+			$DestruyeD	=	0;
 
-				if ($DestruyeD != 0)
-					$parse['DestructionHave']	=	"<a href=\"javascript:animatedcollapse.toggle('destr')\" class=\"link\">
-						<img src=\"../styles/images/Adm/arrowright.png\" width=\"16\" height=\"10\"/> ".$lang['ac_recent_destroyed_planets']."</a>";
-				else
-					$parse['DestructionHave']	=	"<span class=\"no_moon\"><img src=\"../styles/images/Adm/arrowright.png\" width=\"16\" height=\"10\"/>
-						".$lang['ac_recent_destroyed_planets']."&nbsp;".$lang['ac_isnodestruyed']."</span>";
+			if ( $PlanetsWhile["destruyed"] > 0 )
+			{
+				$parse['destroyed']	.=	"
+				<tr>
+				<th>".$PlanetsWhile['name']."</th>
+				<th>".$PlanetsWhile['id']."</th>
+				<th>[".$PlanetsWhile['galaxy'].":".$PlanetsWhile['system'].":".$PlanetsWhile['planet']."]</th>
+				<th>".date("d-m-Y   H:i:s", $PlanetsWhile['destruyed'])."</th>
+				</tr>";
+
+				$DestruyeD++;
 			}
 
 
-			display (parsetemplate(gettemplate("adm/AccountDataBody"), $parse), false, '', true, false);
+			if ($DestruyeD != 0)
+			{
+				$parse['DestructionHave']	=	"<a href=\"javascript:animatedcollapse.toggle('destr')\" class=\"link\">
+				<img src=\"../styles/images/Adm/arrowright.png\" width=\"16\" height=\"10\"/> ".$lang['ac_recent_destroyed_planets']."</a>";
+			}
+			else
+			{
+				$parse['DestructionHave']	=	"<span class=\"no_moon\"><img src=\"../styles/images/Adm/arrowright.png\" width=\"16\" height=\"10\"/>
+				".$lang['ac_recent_destroyed_planets']."&nbsp;".$lang['ac_isnodestruyed']."</span>";
+			}
 		}
+
+
+		display (parsetemplate(gettemplate("adm/AccountDataBody"), $parse), FALSE, '', TRUE, FALSE);
 	}
+}
 
-display (parsetemplate(gettemplate("adm/AccountDataIntro"), $parse), false, '', true, false);
+display (parsetemplate(gettemplate("adm/AccountDataIntro"), $parse), FALSE, '', TRUE, FALSE);
 ?>
\ No newline at end of file
diff --git a/adm/AccountEditorPage.php b/adm/AccountEditorPage.php
index 8861358..8a8516e 100644
--- a/adm/AccountEditorPage.php
+++ b/adm/AccountEditorPage.php
@@ -1,32 +1,17 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2010 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
+
+include(XGP_ROOT . 'global.php');
 
 if ($EditUsers != 1) die(message ($lang['404_page']));
 
@@ -111,7 +96,7 @@
 
 	}
 
-			display (parsetemplate(gettemplate("adm/EditorTPL/ResourcesBody"), $parse), false, '', true, false);
+			display (parsetemplate(gettemplate("adm/EditorTPL/ResourcesBody"), $parse), FALSE, '', TRUE, FALSE);
 	break;
 
 	case'ships':
@@ -132,13 +117,12 @@
 			$destructor       	= $_POST['destructor'];
 			$dearth_star       	= $_POST['dearth_star'];
 			$battleship      	= $_POST['battleship'];
-			$supernova      	= $_POST['supernova'];
 
 
 			if(is_numeric($id) && is_numeric($light_hunter) && is_numeric($heavy_hunter) && is_numeric($small_ship_cargo) && is_numeric($big_ship_cargo) &&
 				is_numeric($crusher) && is_numeric($battle_ship) && is_numeric($colonizer) && is_numeric($recycler) && is_numeric($spy_sonde) &&
 				is_numeric($bomber_ship) && is_numeric($solar_satelit) && is_numeric($destructor) && is_numeric($dearth_star) &&
-				is_numeric($battleship) && is_numeric($supernova))
+				is_numeric($battleship))
 			{
 				if ($_POST['add'])
 				{
@@ -156,7 +140,6 @@
 					$QryUpdatePlanet .= "`crusher` = `crusher` + '". $crusher ."', ";
 					$QryUpdatePlanet .= "`heavy_hunter` = `heavy_hunter` + '". $heavy_hunter ."', ";
 					$QryUpdatePlanet .= "`big_ship_cargo` = `big_ship_cargo` + '". $big_ship_cargo ."', ";
-					$QryUpdatePlanet .= "`supernova` = `supernova` + '". $supernova ."', ";
 					$QryUpdatePlanet .= "`light_hunter` = `light_hunter` + '". $light_hunter ."' ";
 					$QryUpdatePlanet .= "WHERE ";
 					$QryUpdatePlanet .= "`id` = '". $id ."' ";
@@ -181,7 +164,6 @@
 					$QryUpdatePlanet .= "`crusher` = `crusher` - '". $crusher ."', ";
 					$QryUpdatePlanet .= "`heavy_hunter` = `heavy_hunter` - '". $heavy_hunter ."', ";
 					$QryUpdatePlanet .= "`big_ship_cargo` = `big_ship_cargo` - '". $big_ship_cargo ."', ";
-					$QryUpdatePlanet .= "`supernova` = `supernova` - '". $supernova ."', ";
 					$QryUpdatePlanet .= "`light_hunter` = `light_hunter` - '". $light_hunter ."' ";
 					$QryUpdatePlanet .= "WHERE ";
 					$QryUpdatePlanet .= "`id` = '". $id ."' ";
@@ -208,7 +190,6 @@
 					$Log	.=	$lang['destructor'].": ".$destructor."\n";
 					$Log	.=	$lang['dearth_star'].": ".$dearth_star."\n";
 					$Log	.=	$lang['battleship'].": ".$battleship."\n";
-					$Log	.=	$lang['supernova'].": ".$supernova."\n";
 					$Log	.=	$lang['log_to_planet'].$id."\n";
 
 					LogFunction($Log, "ShipsLog", $LogCanWork);
@@ -220,7 +201,7 @@
 			}
 		}
 
-		display (parsetemplate(gettemplate("adm/EditorTPL/ShipsBody"), $parse), false, '', true, false);
+		display (parsetemplate(gettemplate("adm/EditorTPL/ShipsBody"), $parse), FALSE, '', TRUE, FALSE);
 	break;
 
 	case'defenses':
@@ -235,14 +216,12 @@
 			$buster_canyon        		= $_POST['buster_canyon'];
 			$small_protection_shield	= $_POST['small_protection_shield'];
 			$big_protection_shield      = $_POST['big_protection_shield'];
-			$planet_protector      		= $_POST['planet_protector'];
-			$atom_protector             = $_POST['atom_protector'];
 			$interceptor_misil       	= $_POST['interceptor_misil'];
 			$interplanetary_misil      	= $_POST['interplanetary_misil'];
 
 			if(is_numeric($id) && is_numeric($misil_launcher) && is_numeric($small_laser) && is_numeric($big_laser) && is_numeric($gauss_canyon) &&
 				is_numeric($ionic_canyon) && is_numeric($buster_canyon) && is_numeric($small_protection_shield) && is_numeric($big_protection_shield) &&
-				is_numeric($interceptor_misil) && is_numeric($interplanetary_misil) && is_numeric($planet_protector))
+				is_numeric($interceptor_misil) && is_numeric($interplanetary_misil))
 			{
 				if ($_POST['add'])
 				{
@@ -255,8 +234,6 @@
 					$QryUpdatePlanet .= "`buster_canyon` = `buster_canyon` + '". $buster_canyon ."', ";
 					$QryUpdatePlanet .= "`small_protection_shield` = `small_protection_shield` + '". $small_protection_shield ."', ";
 					$QryUpdatePlanet .= "`big_protection_shield` = `big_protection_shield` + '". $big_protection_shield ."', ";
-					$QryUpdatePlanet .= "`planet_protector` = `planet_protector` + '". $planet_protector ."', ";
-					$QryUpdatePlanet .= "`atom_protector` = `atom_protector` + '". $atom_protector ."', ";
 					$QryUpdatePlanet .= "`interceptor_misil` = `interceptor_misil` + '". $interceptor_misil ."', ";
 					$QryUpdatePlanet .= "`interplanetary_misil` = `interplanetary_misil` + '". $interplanetary_misil ."' ";
 					$QryUpdatePlanet .= "WHERE ";
@@ -277,8 +254,6 @@
 					$QryUpdatePlanet .= "`buster_canyon` = `buster_canyon` - '". $buster_canyon ."', ";
 					$QryUpdatePlanet .= "`small_protection_shield` = `small_protection_shield` - '". $small_protection_shield ."', ";
 					$QryUpdatePlanet .= "`big_protection_shield` = `big_protection_shield` - '". $big_protection_shield ."', ";
-					$QryUpdatePlanet .= "`planet_protector` = `planet_protector` - '". $planet_protector ."', ";
-					$QryUpdatePlanet .= "`atom_protector` = `atom_protector` - '". $atom_protector ."', ";
 					$QryUpdatePlanet .= "`interceptor_misil` = `interceptor_misil` - '". $interceptor_misil ."', ";
 					$QryUpdatePlanet .= "`interplanetary_misil` = `interplanetary_misil` - '". $interplanetary_misil ."' ";
 					$QryUpdatePlanet .= "WHERE ";
@@ -300,7 +275,6 @@
 					$Log	.=	$lang['buster_canyon'].": ".$buster_canyon."\n";
 					$Log	.=	$lang['small_protection_shield'].": ".$small_protection_shield."\n";
 					$Log	.=	$lang['big_protection_shield'].": ".$big_protection_shield."\n";
-					$Log	.=	$lang['planet_protector'].": ".$planet_protector."\n";
 					$Log	.=	$lang['interceptor_misil'].": ".$interceptor_misil."\n";
 					$Log	.=	$lang['interplanetary_misil'].": ".$interplanetary_misil."\n";
 					$Log	.=	$lang['log_to_planet'].$id."\n";
@@ -314,7 +288,7 @@
 			}
 		}
 
-		display (parsetemplate(gettemplate("adm/EditorTPL/DefensesBody"), $parse), false, '', true, false);
+		display (parsetemplate(gettemplate("adm/EditorTPL/DefensesBody"), $parse), FALSE, '', TRUE, FALSE);
 	break;
 
 	case'buildings':
@@ -346,7 +320,7 @@
 				is_numeric($terraformer)&& is_numeric($ally_deposit) && is_numeric($silo) && is_numeric($mondbasis) &&
 				is_numeric($phalanx) && is_numeric($sprungtor))
 			{
-				$QueryFind	=	doquery("SELECT `planet_type` FROM {{table}} WHERE `id` = '".$id."'", "planets", true);
+				$QueryFind	=	doquery("SELECT `planet_type` FROM {{table}} WHERE `id` = '".$id."'", "planets", TRUE);
 
 				if ($_POST['add'])
 				{
@@ -385,7 +359,12 @@
 							if ($mondbasis > 0)
 							{
 								$Sum	=	$mondbasis * FIELDS_BY_MOONBASIS_LEVEL;
-								doquery("UPDATE {{table}} SET `field_max` = field_max + '".$Sum."', `field_current` = field_current + '".$mondbasis."'", "planets");
+								//doquery("UPDATE {{table}} SET `field_max` = field_max + '".$Sum."', `field_current` = field_current + '".$mondbasis."'", "planets");
+								// FIX START BY alivan
+								//doquery("UPDATE {{table}} SET `field_max` = field_max '".$Sum."', `field_current` = field_current '".$mondbasis."' WHERE `id` = '". $id ."'", "planets");
+								// FIX END BY alivan
+								//fix by jstar lol
+								doquery("UPDATE {{table}} SET `field_max` = field_max + '".$Sum."', `field_current` = field_current + '".$mondbasis."' WHERE `id` = '". $id ."'", "planets");
 							}
 						}
 						else
@@ -425,6 +404,8 @@
 						if ($QueryFind['planet_type']	==	'3')
 						{
 							$QryUpdatePlanet  = "UPDATE {{table}} SET ";
+
+
 							$QryUpdatePlanet .= "`mondbasis` = `mondbasis` - '". $mondbasis ."', ";
 							$QryUpdatePlanet .= "`phalanx` = `phalanx` - '". $phalanx ."', ";
 							$QryUpdatePlanet .= "`sprungtor` = `sprungtor` - '". $sprungtor ."' ";
@@ -435,7 +416,12 @@
 							if ($mondbasis > 0)
 							{
 								$Sum	=	$mondbasis * FIELDS_BY_MOONBASIS_LEVEL;
-								doquery("UPDATE {{table}} SET `field_max` = field_max - '".$Sum."', `field_current` = field_current - '".$mondbasis."'", "planets");
+								//doquery("UPDATE {{table}} SET `field_max` = field_max - '".$Sum."', `field_current` = field_current - '".$mondbasis."'", "planets");
+								// FIX START BY alivan
+								//doquery("UPDATE {{table}} SET `field_max` = field_max - '".$Sum."', `field_current` = field_current - '".$mondbasis."' WHERE `id` = '". $id ."'", "planets");
+								// FIX END BY alivan
+								//fix by jstar
+								doquery("UPDATE {{table}} SET `field_max` = field_max - '".$Sum."', `field_current` = field_current - '".$mondbasis."' WHERE `id` = '". $id ."'", "planets");
 							}
 						}
 						else
@@ -481,7 +467,7 @@
 			}
 		}
 
-		display (parsetemplate(gettemplate("adm/EditorTPL/BuildingsBody"), $parse), false, '', true, false);
+		display (parsetemplate(gettemplate("adm/EditorTPL/BuildingsBody"), $parse), FALSE, '', TRUE, FALSE);
 	break;
 
 	case'researchs':
@@ -503,14 +489,12 @@
 			$buster_tech       		= $_POST['buster_tech'];
 			$intergalactic_tech     = $_POST['intergalactic_tech'];
 			$expedition_tech     	= $_POST['expedition_tech'];
-			$atom_tech           	= $_POST['atom_tech'];
-			$colonisation_tech      = $_POST['colonisation_tech'];
 			$graviton_tech     		= $_POST['graviton_tech'];
 
 			if(is_numeric($id) && is_numeric($spy_tech) && is_numeric($computer_tech) && is_numeric($military_tech) && is_numeric($defence_tech) &&
 				is_numeric($shield_tech) && is_numeric($energy_tech) && is_numeric($hyperspace_tech) && is_numeric($combustion_tech) &&
 				is_numeric($impulse_motor_tech) && is_numeric($hyperspace_motor_tech) && is_numeric($laser_tech) && is_numeric($ionic_tech) &&
-				is_numeric($buster_tech)&& is_numeric($intergalactic_tech) && is_numeric($expedition_tech) && is_numeric($atom_tech) && is_numeric($colonisation_tech) && is_numeric($graviton_tech))
+				is_numeric($buster_tech)&& is_numeric($intergalactic_tech) && is_numeric($expedition_tech) && is_numeric($graviton_tech))
 			{
 
 				if ($_POST['add'])
@@ -531,8 +515,6 @@
 					$QryUpdatePlanet .= "`buster_tech` = `buster_tech` + '". $buster_tech ."', ";
 					$QryUpdatePlanet .= "`intergalactic_tech` = `intergalactic_tech` + '". $intergalactic_tech ."', ";
 					$QryUpdatePlanet .= "`expedition_tech` = `expedition_tech` + '". $expedition_tech ."', ";
-					$QryUpdatePlanet .= "`atom_tech` = `atom_tech` + '". $atom_tech ."', ";
-					$QryUpdatePlanet .= "`colonisation_tech` = `colonisation_tech` + '". $colonisation_tech ."', ";
 					$QryUpdatePlanet .= "`graviton_tech` = `graviton_tech` + '". $graviton_tech ."' ";
 					$QryUpdatePlanet .= "WHERE ";
 					$QryUpdatePlanet .= "`id` = '". $id ."' ";
@@ -559,8 +541,6 @@
 					$QryUpdatePlanet .= "`buster_tech` = `buster_tech` - '". $buster_tech ."', ";
 					$QryUpdatePlanet .= "`intergalactic_tech` = `intergalactic_tech` - '". $intergalactic_tech ."', ";
 					$QryUpdatePlanet .= "`expedition_tech` = `expedition_tech` - '". $expedition_tech ."', ";
-					$QryUpdatePlanet .= "`atom_tech` = `atom_tech` - '". $atom_tech ."', ";
-					$QryUpdatePlanet .= "`colonisation_tech` = `colonisation_tech` - '". $colonisation_tech ."', ";
 					$QryUpdatePlanet .= "`graviton_tech` = `graviton_tech` - '". $graviton_tech ."' ";
 					$QryUpdatePlanet .= "WHERE ";
 					$QryUpdatePlanet .= "`id` = '". $id ."' ";
@@ -588,7 +568,6 @@
 					$Log	.=	$lang['buster_tech'].": ".$buster_tech."\n";
 					$Log	.=	$lang['intergalactic_tech'].": ".$intergalactic_tech."\n";
 					$Log	.=	$lang['expedition_tech'].": ".$expedition_tech."\n";
-					$Log	.=	$lang['atom_tech'].": ".$atom_tech."\n";
 					$Log	.=	$lang['graviton_tech'].": ".$graviton_tech."\n";
 					$Log	.=	$lang['log_to_user'].$id."\n";
 
@@ -601,7 +580,7 @@
 			}
 		}
 
-		display (parsetemplate(gettemplate("adm/EditorTPL/ResearchBody"), $parse), false, '', true, false);
+		display (parsetemplate(gettemplate("adm/EditorTPL/ResearchBody"), $parse), FALSE, '', TRUE, FALSE);
 	break;
 
 	case 'personal':
@@ -622,6 +601,9 @@
 				$Log    .=    "\n".$lang['log_the_user'].$user['username']." ".$lang['log_modify_personal'].":\n";
 
 				$PersonalQuery    =    "UPDATE {{table}} SET ";
+
+
+
 				if($_POST['username'] != NULL){
 					$PersonalQuery    .=    "`username` = '".$_POST['username']."', ";
 					$Log    .=    $lang['ad_personal_name'].": ".$_POST['username']."\n";}
@@ -671,7 +653,7 @@
 				$parse['display']    =    '<tr><th colspan="3"><font color=lime>'.$lang['ad_personal_succes'].'</font></th></tr>';
 			}
 		}
-		display (parsetemplate(gettemplate("adm/EditorTPL/PersonalBody"), $parse), false, '', true, false);
+		display (parsetemplate(gettemplate("adm/EditorTPL/PersonalBody"), $parse), FALSE, '', TRUE, FALSE);
 	break;
 
 	case'officiers':
@@ -682,22 +664,8 @@
 			$rpg_amiral    		= $_POST['rpg_amiral'];
 			$rpg_ingenieur      = $_POST['rpg_ingenieur'];
 			$rpg_technocrate    = $_POST['rpg_technocrate'];
-			$rpg_espion    		= $_POST['rpg_espion'];
-			$rpg_constructeur   = $_POST['rpg_constructeur'];
-			$rpg_scientifique   = $_POST['rpg_scientifique'];
-			$rpg_commandant     = $_POST['rpg_commandant'];
-			$rpg_stockeur     	= $_POST['rpg_stockeur'];
-			$rpg_defenseur  	= $_POST['rpg_defenseur'];
-			$rpg_destructeur    = $_POST['rpg_destructeur'];
-			$rpg_general       	= $_POST['rpg_general'];
-			$rpg_bunker       	= $_POST['rpg_bunker'];
-			$rpg_raideur     	= $_POST['rpg_raideur'];
-			$rpg_empereur     	= $_POST['rpg_empereur'];
-
-			if(is_numeric($id) && is_numeric($rpg_geologue) && is_numeric($rpg_amiral) && is_numeric($rpg_ingenieur) && is_numeric($rpg_technocrate) &&
-				is_numeric($rpg_espion) && is_numeric($rpg_constructeur) && is_numeric($rpg_scientifique) && is_numeric($rpg_commandant) &&
-				is_numeric($rpg_stockeur) && is_numeric($rpg_defenseur) && is_numeric($rpg_destructeur) && is_numeric($rpg_general) &&
-				is_numeric($rpg_bunker)&& is_numeric($rpg_raideur) && is_numeric($rpg_empereur))
+
+			if(is_numeric($id) && is_numeric($rpg_geologue) && is_numeric($rpg_amiral) && is_numeric($rpg_ingenieur) && is_numeric($rpg_technocrate))
 			{
 
 				if ($_POST['add'])
@@ -706,18 +674,7 @@
 					$QryUpdatePlanet .= "`rpg_geologue` = `rpg_geologue` + '". $rpg_geologue ."', ";
 					$QryUpdatePlanet .= "`rpg_amiral` = `rpg_amiral` + '". $rpg_amiral ."', ";
 					$QryUpdatePlanet .= "`rpg_ingenieur` = `rpg_ingenieur` + '". $rpg_ingenieur ."', ";
-					$QryUpdatePlanet .= "`rpg_technocrate` = `rpg_technocrate` + '". $rpg_technocrate ."', ";
-					$QryUpdatePlanet .= "`rpg_espion` = `rpg_espion` + '". $rpg_espion ."', ";
-					$QryUpdatePlanet .= "`rpg_constructeur` = `rpg_constructeur` + '". $rpg_constructeur ."', ";
-					$QryUpdatePlanet .= "`rpg_scientifique` = `rpg_scientifique` + '". $rpg_scientifique ."', ";
-					$QryUpdatePlanet .= "`rpg_commandant` = `rpg_commandant` + '". $rpg_commandant ."', ";
-					$QryUpdatePlanet .= "`rpg_stockeur` = `rpg_stockeur` + '". $rpg_stockeur ."', ";
-					$QryUpdatePlanet .= "`rpg_defenseur` = `rpg_defenseur` + '". $rpg_defenseur ."', ";
-					$QryUpdatePlanet .= "`rpg_destructeur` = `rpg_destructeur` + '". $rpg_destructeur ."', ";
-					$QryUpdatePlanet .= "`rpg_general` = `rpg_general` + '". $rpg_general ."', ";
-					$QryUpdatePlanet .= "`rpg_bunker` = `rpg_bunker` + '". $rpg_bunker ."', ";
-					$QryUpdatePlanet .= "`rpg_raideur` = `rpg_raideur` + '". $rpg_raideur ."', ";
-					$QryUpdatePlanet .= "`rpg_empereur` = `rpg_empereur` + '". $rpg_empereur ."' ";
+					$QryUpdatePlanet .= "`rpg_technocrate` = `rpg_technocrate` + '". $rpg_technocrate ."' ";
 					$QryUpdatePlanet .= "WHERE ";
 					$QryUpdatePlanet .= "`id` = '". $id ."' ";
 					doquery( $QryUpdatePlanet, "users");
@@ -731,18 +688,7 @@
 					$QryUpdatePlanet .= "`rpg_geologue` = `rpg_geologue` - '". $rpg_geologue ."', ";
 					$QryUpdatePlanet .= "`rpg_amiral` = `rpg_amiral` - '". $rpg_amiral ."', ";
 					$QryUpdatePlanet .= "`rpg_ingenieur` = `rpg_ingenieur` - '". $rpg_ingenieur ."', ";
-					$QryUpdatePlanet .= "`rpg_technocrate` = `rpg_technocrate` - '". $rpg_technocrate ."', ";
-					$QryUpdatePlanet .= "`rpg_espion` = `rpg_espion` - '". $rpg_espion ."', ";
-					$QryUpdatePlanet .= "`rpg_constructeur` = `rpg_constructeur` - '". $rpg_constructeur ."', ";
-					$QryUpdatePlanet .= "`rpg_scientifique` = `rpg_scientifique` - '". $rpg_scientifique ."', ";
-					$QryUpdatePlanet .= "`rpg_commandant` = `rpg_commandant` - '". $rpg_commandant ."', ";
-					$QryUpdatePlanet .= "`rpg_stockeur` = `rpg_stockeur` - '". $rpg_stockeur ."', ";
-					$QryUpdatePlanet .= "`rpg_defenseur` = `rpg_defenseur` - '". $rpg_defenseur ."', ";
-					$QryUpdatePlanet .= "`rpg_destructeur` = `rpg_destructeur` - '". $rpg_destructeur ."', ";
-					$QryUpdatePlanet .= "`rpg_general` = `rpg_general` - '". $rpg_general ."', ";
-					$QryUpdatePlanet .= "`rpg_bunker` = `rpg_bunker` - '". $rpg_bunker ."', ";
-					$QryUpdatePlanet .= "`rpg_raideur` = `rpg_raideur` - '". $rpg_raideur ."', ";
-					$QryUpdatePlanet .= "`rpg_empereur` = `rpg_empereur` - '". $rpg_empereur ."' ";
+					$QryUpdatePlanet .= "`rpg_technocrate` = `rpg_technocrate` - '". $rpg_technocrate ."' ";
 					$QryUpdatePlanet .= "WHERE ";
 					$QryUpdatePlanet .= "`id` = '". $id ."' ";
 					doquery( $QryUpdatePlanet, "users");
@@ -758,17 +704,6 @@
 					$Log	.=	$lang['admiral'].": ".$rpg_amiral."\n";
 					$Log	.=	$lang['engineer'].": ".$rpg_ingenieur."\n";
 					$Log	.=	$lang['technocrat'].": ".$rpg_technocrate."\n";
-					$Log	.=	$lang['spy'].": ".$rpg_espion."\n";
-					$Log	.=	$lang['constructor'].": ".$rpg_constructeur."\n";
-					$Log	.=	$lang['scientific'].": ".$rpg_scientifique."\n";
-					$Log	.=	$lang['commander'].": ".$rpg_commandant."\n";
-					$Log	.=	$lang['storer'].": ".$rpg_stockeur."\n";
-					$Log	.=	$lang['defender'].": ".$rpg_defenseur."\n";
-					$Log	.=	$lang['destroyer'].": ".$rpg_destructeur."\n";
-					$Log	.=	$lang['general'].": ".$rpg_general."\n";
-					$Log	.=	$lang['protector'].": ".$rpg_bunker."\n";
-					$Log	.=	$lang['conqueror'].": ".$rpg_raideur."\n";
-					$Log	.=	$lang['emperor'].": ".$rpg_empereur."\n";
 					$Log	.=	$lang['log_to_user'].$id."\n";
 
 					LogFunction($Log, "OfficierLog", $LogCanWork);
@@ -780,7 +715,7 @@
 			}
 		}
 
-		display (parsetemplate(gettemplate("adm/EditorTPL/OfficiersBody"), $parse), false, '', true, false);
+		display (parsetemplate(gettemplate("adm/EditorTPL/OfficiersBody"), $parse), FALSE, '', TRUE, FALSE);
 	break;
 
 	case 'planets':
@@ -789,6 +724,7 @@
 			$id				=	$_POST['id'];
 			$name			=	$_POST['name'];
 			$change_id		=	$_POST['change_id'];
+
 			$diameter		=	$_POST['diameter'];
 			$fields			=	$_POST['fields'];
 			$buildings		=	$_POST['0_buildings'];
@@ -828,13 +764,13 @@
 									`heavy_hunter` = '0', `crusher` = '0', `battle_ship` = '0',
 									`colonizer` = '0', `recycler` = '0', `spy_sonde` = '0',
 									`bomber_ship` = '0', `solar_satelit` = '0', `destructor` = '0',
-									`dearth_star` = '0', `battleship` = '0', `supernova` = '0' WHERE `id` = '".$id."'", "planets");
+									`dearth_star` = '0', `battleship` = '0' WHERE `id` = '".$id."'", "planets");
 						$Log	.=	$lang['log_delete_all_ships']."\n";}
 
 					if ($defenses == 'on'){
 						doquery("UPDATE {{table}} SET `misil_launcher` = '0', `small_laser` = '0', `big_laser` = '0',
 									`gauss_canyon` = '0', `ionic_canyon` = '0', `buster_canyon` = '0',
-									`small_protection_shield` = '0', `planet_protector` = '0', `big_protection_shield` = '0',
+									`small_protection_shield` = '0', `big_protection_shield` = '0',
 									`interceptor_misil` = '0', `interplanetary_misil` = '0' WHERE `id` = '".$id."'", "planets");
 						$Log	.=	$lang['log_delete_all_def']."\n";}
 
@@ -848,7 +784,7 @@
 						$Log	.=	$lang['log_delete_all_c_edi']."\n";}
 
 
-					$P	=	doquery("SELECT * FROM {{table}} WHERE `id` = '".$id."'", "planets", true);
+					$P	=	doquery("SELECT * FROM {{table}} WHERE `id` = '".$id."'", "planets", TRUE);
 
 					if ($diameter != NULL && is_numeric($diameter) && $diameter > 0){
 						doquery("UPDATE {{table}} SET `diameter` = '".$diameter."' WHERE `id` = '".$id."'", "planets");
@@ -864,7 +800,7 @@
 							$galaxy <= MAX_GALAXY_IN_WORLD && $system <= MAX_SYSTEM_IN_GALAXY && $planet <= MAX_PLANET_IN_SYSTEM)
 						{
 							$Queryyy	=	doquery("SELECT * FROM {{table}} WHERE `galaxy` = '".$galaxy."' AND `system` = '".$system."' AND
-											`planet` = '".$planet."'", "galaxy", true);
+											`planet` = '".$planet."'", "galaxy", TRUE);
 
 							if ($P['planet_type'] == '1')
 							{
@@ -902,7 +838,7 @@
 										`id_luna` = '".$id."' WHERE `id_planet` = '".$Queryyy['id_planet']."'", "galaxy");
 
 										$QMOON2	=	doquery("SELECT * FROM {{table}} WHERE `galaxy` = '".$galaxy."' AND `system` = '".$system."' AND
-										`planet` = '".$planet."'", "planets", true);
+										`planet` = '".$planet."'", "planets", TRUE);
 
 										doquery ("UPDATE {{table}} SET `galaxy` = '".$galaxy."', `system` = '".$system."', `planet` = '".$planet."',
 										`id_owner` = '".$QMOON2['id_owner']."', `id_level` = '".$QMOON2['id_level']."' WHERE `id` = '".$id."' AND `planet_type` = '3'", "planets");
@@ -919,6 +855,7 @@
 								}
 							}
 
+
 							$Log	.=	$lang['log_change_pla_pos'].$Name.": [".$galaxy.":".$system.":".$planet."]\n";
 						}
 						else
@@ -932,7 +869,7 @@
 				}
 				else
 				{
-					$QueryPlanetsS	=	doquery("SELECT planet_type FROM {{table}} WHERE id = '".$id."'", "planets", true);
+					$QueryPlanetsS	=	doquery("SELECT planet_type FROM {{table}} WHERE id = '".$id."'", "planets", TRUE);
 					if ($QueryPlanetsS['planet_type'] == '1')
 					{
 						doquery("DELETE FROM {{table}} WHERE id = '".$id."'", "planets");
@@ -962,7 +899,7 @@
 			}
 		}
 
-		display (parsetemplate(gettemplate("adm/EditorTPL/PlanetsMoonsBody"), $parse), false, '', true, false);
+		display (parsetemplate(gettemplate("adm/EditorTPL/PlanetsMoonsBody"), $parse), FALSE, '', TRUE, FALSE);
 	break;
 
 	case 'alliances':
@@ -980,7 +917,7 @@
 
 			if ($id != NULL)
 			{
-				$QueryF	=	doquery("SELECT * FROM {{table}} WHERE `id` = '".$id."'", "alliance", true);
+				$QueryF	=	doquery("SELECT * FROM {{table}} WHERE `id` = '".$id."'", "alliance", TRUE);
 
 			 	if ($QueryF)
 			 	{
@@ -997,7 +934,7 @@
 
 
 					$i	=	0;
-					$QueryF2	=	doquery("SELECT * FROM {{table}} WHERE `id` = '".$changeleader."'", "users", true);
+					$QueryF2	=	doquery("SELECT * FROM {{table}} WHERE `id` = '".$changeleader."'", "users", TRUE);
 					if ($QueryF2 && $changeleader != NULL && $QueryF2['ally_id'] == $id){
 						doquery("UPDATE {{table}} SET `ally_owner` = '".$changeleader."' WHERE `id` = '".$id."'", "alliance");
 						doquery("UPDATE {{table}} SET `ally_rank_id` = '0' WHERE `id` = '".$changeleader."'", "users");
@@ -1026,7 +963,7 @@
 
 
 
-					$QueryF3	=	doquery("SELECT * FROM {{table}} WHERE `id` = '".$delete_u."'", "users", true);
+					$QueryF3	=	doquery("SELECT * FROM {{table}} WHERE `id` = '".$delete_u."'", "users", TRUE);
 					if ($QueryF3 && $delete_u != NULL){
 						doquery("UPDATE {{table}} SET `ally_members` = ally_members - 1 WHERE `id` = '".$id."'", "alliance");
 						doquery("UPDATE {{table}} SET `ally_id` = '0', `ally_name` = '', `ally_request` = '0', `ally_rank_id` = '0', `ally_register_time` = '0',
@@ -1057,7 +994,7 @@
 			}
 		}
 
-		display (parsetemplate(gettemplate("adm/EditorTPL/AllianceBody"), $parse), false, '', true, false);
+		display (parsetemplate(gettemplate("adm/EditorTPL/AllianceBody"), $parse), FALSE, '', TRUE, FALSE);
 	break;
 
 	default:
@@ -1068,6 +1005,6 @@
 	</tr>';
 
 
-	display(parsetemplate(gettemplate('adm/EditorTPL/EditorBody'), $parse), false, '', true, false);
+	display(parsetemplate(gettemplate('adm/EditorTPL/EditorBody'), $parse), FALSE, '', TRUE, FALSE);
 }
 ?>
\ No newline at end of file
diff --git a/adm/ActivePlanets.php b/adm/ActivePlanets.php
index 377ff54..6a487b5 100644
--- a/adm/ActivePlanets.php
+++ b/adm/ActivePlanets.php
@@ -1,32 +1,18 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
-include('AdminFunctions/Autorization.' . $phpEx);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
+
+include(XGP_ROOT . 'global.php');
+include('AdminFunctions/Autorization.php');
 
 if ($Observation != 1) die();
 
@@ -49,6 +35,6 @@
 $parse['online_list'] .= "<th colspan=\"4\">" . $lang['ap_there_are'] . $Count . $lang['ap_with_activity'] . "</th>";
 $parse['online_list'] .= "</tr>";
 
-display( parsetemplate( gettemplate('adm/ActivePlanetsBody')	, $parse ), false, '', true, false);
+display( parsetemplate( gettemplate('adm/ActivePlanetsBody')	, $parse ), FALSE, '', TRUE, FALSE);
 
 ?>
\ No newline at end of file
diff --git a/adm/AdminFunctions/Autorization.php b/adm/AdminFunctions/Autorization.php
index f136516..8dbad66 100644
--- a/adm/AdminFunctions/Autorization.php
+++ b/adm/AdminFunctions/Autorization.php
@@ -1,40 +1,29 @@
 <?php
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By Neko from xgproyect.net	         #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include_once('LogFunction.' . $phpEx);
-
-if ($user['authlevel'] < 1){die();}
-
-$QueryModeration	=	doquery("SELECT * FROM {{table}} WHERE `config_name` = 'moderation'", "config", true);
-$QueryModerationEx	=	explode(";", $QueryModeration[1]);
-$Moderator			=	explode(",", $QueryModerationEx[0]);
-$Operator			=	explode(",", $QueryModerationEx[1]);
-$Administrator		=	explode(",", $QueryModerationEx[2]);
-
-if ($user['authlevel'] == 1)
+
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+
+include_once ( 'LogFunction.php' );
+
+if ( $user['authlevel'] < 1 )
+{
+	die();
+}
+
+$QueryModeration	=	read_config ( 'moderation' );
+$QueryModerationEx	=	explode ( ";" , $QueryModeration[1] );
+$Moderator			=	explode ( "," , $QueryModerationEx[0] );
+$Operator			=	explode ( "," , $QueryModerationEx[1] );
+$Administrator		=	explode ( "," , $QueryModerationEx[2] );
+
+if ( $user['authlevel'] == 1 )
 {
 	$Observation	=	$Moderator[0];
 	$EditUsers		=	$Moderator[1];
@@ -43,7 +32,7 @@
 	$LogCanWork		=	$Moderator[4];
 }
 
-if ($user['authlevel'] == 2)
+if ( $user['authlevel'] == 2 )
 {
 	$Observation	=	$Operator[0];
 	$EditUsers		=	$Operator[1];
@@ -52,7 +41,7 @@
 	$LogCanWork		=	$Operator[4];
 }
 
-if ($user['authlevel'] == 3)
+if ( $user['authlevel'] == 3 )
 {
 	$Observation	=	1;
 	$EditUsers		=	1;
@@ -60,4 +49,5 @@
 	$ToolsCanUse	=	1;
 	$LogCanWork		=	$Administrator[0];
 }
+
 ?>
\ No newline at end of file
diff --git a/adm/AdminFunctions/BBCode-Panel-Adm.php b/adm/AdminFunctions/BBCode-Panel-Adm.php
index 3630205..06fb7fe 100644
--- a/adm/AdminFunctions/BBCode-Panel-Adm.php
+++ b/adm/AdminFunctions/BBCode-Panel-Adm.php
@@ -1,9 +1,19 @@
 <?php
-if ($user['authlevel'] < 1) die();
 
-class bbcode 
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+if ( $user['authlevel'] < 1 )
+{
+	die();
+}
+
+class bbcode
 {
-	function reemplazo($string)
+	function reemplazo ( $string )
 	{
 		$pattern = array(
 		    '/\\n/',
@@ -47,32 +57,38 @@ function reemplazo($string)
 		    '$this->sizefix(\'\\1\',\'\\2\')'
 		);
 
-		return preg_replace($pattern, $replace, nl2br(htmlspecialchars(stripslashes($string))));
+		return preg_replace ( $pattern , $replace , nl2br ( htmlspecialchars ( stripslashes ( $string ) ) ) );
 	}
 
-	function sCode($string)
+	function sCode ( $string )
 	{
-		$pattern =  '/\<img src=\\\"(.*?)img\/smilies\/(.*?).png\\\" alt=\\\"(.*?)\\\" \/>/s';
-		$string = preg_replace($pattern, '\3', $string);
-		return '<pre style="color: #DDDD00; background-color:gray ">' . trim($string) . '</pre>';
+		$pattern 	=  '/\<img src=\\\"(.*?)img\/smilies\/(.*?).png\\\" alt=\\\"(.*?)\\\" \/>/s';
+		$string 	= preg_replace ( $pattern , '\3' , $string );
+
+		return '<pre style="color: #DDDD00; background-color:gray ">' . trim ( $string ) . '</pre>';
 	}
 
-	function sQuote($string)
+	function sQuote ( $string )
 	{
-		$pattern =  '/\<img src=\\\"(.*?)img\/smilies\/(.*?).png\\\" alt=\\\"(.*?)\\\" \/>/s';
-		$string = preg_replace($pattern, '\3', $string);
+		$pattern 	=  '/\<img src=\\\"(.*?)img\/smilies\/(.*?).png\\\" alt=\\\"(.*?)\\\" \/>/s';
+		$string 	= preg_replace ( $pattern , '\3' , $string );
+
 		return '<blockquote><p style="color: #000000; font-size: 10pt; background-color:55AACC; font-family: Arial">' . trim($string) . '</p></blockquote>';
 	}
 
-	function sList($string)
+	function sList ( $string )
 	{
-		$tmp = explode('[*]', stripslashes($string));
-		$out = null;
-		foreach($tmp as $list) {
-			if(strlen(str_replace('', '', $list)) > 0) {
-				$out .= '<li>' . trim($list) . '</li>';
+		$tmp 	= explode ( '[*]' , stripslashes ( $string ) );
+		$out 	= NULL;
+
+		foreach ( $tmp as $list )
+		{
+			if ( strlen ( str_replace ( '' , '' , $list ) ) > 0 )
+			{
+				$out .= '<li>' . trim ( $list ) . '</li>';
 			}
 		}
+
 		return '<ul>' . $out . '</ul>';
 	}
 
@@ -85,45 +101,51 @@ function imagefix($img)
 		return '<img src="' . $img . '" alt="' . $img . '" title="' . $img . '" />';
 	}
 
-	function urlfix($url, $title)
+	function urlfix ( $url , $title )
 	{
-		$title = stripslashes($title);
+		$title = stripslashes ( $title );
+
 		return '<a href="' . $url . '" title="' . $title . '">' . $title . '</a>';
 	}
 
-	function fontfix($font, $title)
+	function fontfix ( $font , $title )
 	{
-		$title = stripslashes($title);
+		$title = stripslashes ( $title );
+
 		return '<span style="font-family:' . $font . '">' . $title . '</span>';
 	}
 
-	function bgfix($bg, $title)
+	function bgfix ( $bg , $title )
 	{
-		$title = stripslashes($title);
+		$title = stripslashes ( $title );
 		return '<span style="background-color:' . $bg . '">' . $title . '</span>';
 	}
 
-	function sizefix($size, $text)
+	function sizefix ( $size , $text )
 	{
-		$title = stripslashes($text);
+		$title = stripslashes ( $text );
 		return '<span style="font-size:' . $size . 'px">' . $title . '</span>';
 	}
 
-	function MessageForm($Title, $Message, $Goto = '', $Button = ' ok ', $TwoLines = false)
+	function MessageForm ( $Title , $Message , $Goto = '' , $Button = ' ok ' , $TwoLines = FALSE )
 	{
-		$Form .= "<div id=\"content\"><form action=\"". $Goto ."\" method=\"post\">";
+		$Form .= "<div id=\"content\"><form action=\"" . $Goto . "\" method=\"post\">";
 		$Form .= "<table width=\"519\">";
 		$Form .= "<tr>";
-		$Form .= "<td class=\"c\" colspan=\"2\">". $Title ."</td>";
+		$Form .= "<td class=\"c\" colspan=\"2\">" . $Title . "</td>";
 		$Form .= "</tr><tr>";
-		if ($TwoLines == true)
+
+		if ( $TwoLines == TRUE )
 		{
-			$Form .= "<th colspan=\"2\">". $Message ."</th>";
+			$Form .= "<th colspan=\"2\">" . $Message . "</th>";
 			$Form .= "</tr><tr>";
-			$Form .= "<th colspan=\"2\" align=\"center\"><input type=\"submit\" value=\"". $Button ."\"></th>";
+			$Form .= "<th colspan=\"2\" align=\"center\"><input type=\"submit\" value=\"" . $Button . "\"></th>";
 		}
 		else
-			$Form .= "<th colspan=\"2\">". $Message ."<input type=\"submit\" value=\"". $Button ."\"></th>";
+		{
+			$Form .= "<th colspan=\"2\">" . $Message . "<input type=\"submit\" value=\"" . $Button . "\"></th>";
+		}
+
 		$Form .= "</tr>";
 		$Form .= "</table>";
 		$Form .= "</form>";
diff --git a/adm/AdminFunctions/LogFunction.php b/adm/AdminFunctions/LogFunction.php
index fea6eb4..3725321 100644
--- a/adm/AdminFunctions/LogFunction.php
+++ b/adm/AdminFunctions/LogFunction.php
@@ -1,50 +1,42 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2010 By Neko from xgproyect.net	         #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-if ($user['authlevel'] < 1) die();
-
-function LogFunction ($Text, $Estado, $LogCanWork)
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+
+if ( $user['authlevel'] < 1 )
 {
-	global $lang;
+	die();
+}
 
-	$Archive	=	"../adm/Log/".$Estado.".php";
+function LogFunction ( $Text , $Estado , $LogCanWork )
+{
+	global $lang;
 
+	$Archive	=	"../adm/Log/" . $Estado . ".php";
 
-	if ($LogCanWork == 1)
+	if ( $LogCanWork == 1 )
 	{
-		if (!file_exists($Archive))
+		if ( !file_exists ( $Archive ) )
 		{
-			fopen($Archive, "w+");
-			fclose(fopen($Archive, "w+"));
+			fopen ( $Archive , "w+" );
+			fclose ( fopen ( $Archive , "w+" ) );
 		}
 
-		$FP		 =	fopen ($Archive, "r+");
+		$FP		 =	fopen ( $Archive , "r+" );
 		$Date	.=	$Text;
 		$Date	.=	$lang['log_operation_succes'];
-		$Date	.=	date("d-m-Y H:i:s", time())."\n";
-		fputs($FP, $Date);
-		fclose($FP);
+		$Date	.=	date ( "d-m-Y H:i:s" , time() ) . "\n";
+
+		fputs ( $FP , $Date );
+		fclose ( $FP );
 	}
 }
+
 ?>
diff --git a/styles/images/smileys/index.html b/adm/AdminFunctions/index.html
similarity index 100%
rename from styles/images/smileys/index.html
rename to adm/AdminFunctions/index.html
diff --git a/adm/BanPage.php b/adm/BanPage.php
index 289a763..0a88267 100644
--- a/adm/BanPage.php
+++ b/adm/BanPage.php
@@ -1,31 +1,18 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
+
+include(XGP_ROOT . 'global.php');
+include('AdminFunctions/Autorization.php');
 
 if ($EditUsers != 1) die(message ($lang['404_page']));
 
@@ -36,13 +23,13 @@
 	$ORDER	=	"id";
 else
 	$ORDER	=	"username";
-	
-	
-	
+
+
+
 if ($user['authlevel'] != 3)
-	$ListWHERE		=	"WHERE `authlevel` != 3";
-	
-	
+	$ListWHERE = "WHERE `authlevel` < '".($user['authlevel'])."'";
+
+
 if ($_GET['view'] == 'bana' && $user['authlevel'] != 3)
 	$WHEREBANA	=	"AND `bana` = 1";
 elseif ($_GET['view'] == 'bana' && $user['authlevel'] == 3)
@@ -57,7 +44,7 @@
 		$SuspendedNow	=	$lang['bo_characters_suus'];
 	else
 		$SuspendedNow	=	"";
-		
+
 	$parse['List']	.=	'<option value="'.$a['username'].'">'.$a['username'].'&nbsp;&nbsp;(ID:&nbsp;'.$a['id'].')'.$SuspendedNow.'</option>';
 	$Users++;
 }
@@ -67,7 +54,7 @@
 	$ORDER2	=	"id";
 else
 	$ORDER2	=	"username";
-	
+
 $Banneds	=	0;
 $UserListBan	=	doquery("SELECT `username`, `id` FROM {{table}} WHERE `bana` = '1' ORDER BY ".$ORDER2." ASC", "users");
 while ($b	=	mysql_fetch_array($UserListBan))
@@ -85,9 +72,9 @@
 
 if($_GET['panel'])
 {
-	$QueryUserBan			=	doquery("SELECT * FROM {{table}} WHERE `who` = '".$_GET['ban_name']."'", "banned", true);
-	$QueryUserBanVacation	=	doquery("SELECT urlaubs_modus FROM {{table}} WHERE `username` = '".$_GET['ban_name']."'", "users", true);
-		
+	$QueryUserBan			=	doquery("SELECT * FROM {{table}} WHERE `who` = '".$_GET['ban_name']."'", "banned", TRUE);
+	$QueryUserBanVacation	=	doquery("SELECT urlaubs_modus FROM {{table}} WHERE `username` = '".$_GET['ban_name']."'", "users", TRUE);
+
 	if (!$QueryUserBan)
 	{
 		$parse['title']			=	$lang['bo_bbb_title_1'];
@@ -97,23 +84,23 @@
 	{
 		$parse['title']			=	$lang['bo_bbb_title_3'];
 		$parse['changedate']	=	$lang['bo_bbb_title_6'];
-		$parse['changedate_advert']	=	"<td class=c width=5%><img src=\"../styles/images/Adm/i.gif\" onMouseOver='return overlib(\"".$lang['bo_bbb_title_4']."\", 
+		$parse['changedate_advert']	=	"<td class=c width=5%><img src=\"../styles/images/Adm/i.gif\" onMouseOver='return overlib(\"".$lang['bo_bbb_title_4']."\",
 			CENTER, OFFSETX, -80, OFFSETY, -65, WIDTH, 250);' onMouseOut='return nd();'></td>";
-			
+
 		$parse['reas']			=	$QueryUserBan['theme'];
-		$parse['timesus']		=	
+		$parse['timesus']		=
 			"<tr>
 				<th>".$lang['bo_bbb_title_5']."</th>
 				<th height=25 colspan=2>".date("d-m-Y H:i:s", $QueryUserBan['longer'])."</th>
 			</tr>";
 	}
-	
-	
+
+
 	if ($QueryUserBanVacation['urlaubs_modus'] == 1)
 		$parse['vacation']	=	'checked	=	"checked"';
 	else
 		$parse['vacation']	=	'';
-		
+
 	$parse['name']			=	$_GET['ban_name'];
 
 
@@ -121,8 +108,8 @@
 	if ($_POST['bannow'])
 	{
 		if(!is_numeric($_POST['days']) || !is_numeric($_POST['hour']) || !is_numeric($_POST['mins']) || !is_numeric($_POST['secs']))
-			return display( parsetemplate(gettemplate("adm/BanOptionsResultBody"), $parse), false, '', true, false);
-			
+			return display( parsetemplate(gettemplate("adm/BanOptionsResultBody"), $parse), FALSE, '', TRUE, FALSE);
+
 		$name              = $_POST['ban_name'];
 		$reas              = $_POST['why'];
 		$days              = $_POST['days'];
@@ -138,13 +125,13 @@
 		$BanTime          += $secs;
 		if ($QueryUserBan['longer'] > time())
 			$BanTime          += ($QueryUserBan['longer'] - time());
-			
+
 		if (($BanTime + $Now) < time())
 			$BannedUntil       = $Now;
 		else
 			$BannedUntil       = $Now + $BanTime;
-		
-		
+
+
 		if ($QueryUserBan)
 		{
 			$QryInsertBan      = "UPDATE {{table}} SET ";
@@ -197,44 +184,43 @@
 		$PunishThePlanets    .= "WHERE ";
 		$PunishThePlanets    .= "`id_owner` = '". $GetUserData['id'] ."';";
 		doquery( $PunishThePlanets, 'planets');
-		
-		
-		
+
+
+
 		$Log	.=	"\n".$lang['log_suspended_title']."\n";
 		$Log	.=	$lang['log_the_user'].$user['username']." ".$lang['log_suspended_1'].$name.$lang['log_suspended_2']."\n";
 		$Log	.=	$lang['log_reason'].$reas."\n";
 		$Log	.=	$lang['log_time'].date("d-m-Y H:i:s", time())."\n";
 		$Log	.=	$lang['log_longer'].date("d-m-Y H:i:s", $BannedUntil)."\n";
 		$Log	.=	$lang['log_vacations'].$lang['log_viewmod'][$ASD]."\n";
-				
-		LogFunction($Log, "GeneralLog", $LogCanWork);
 
+		LogFunction($Log, "GeneralLog", $LogCanWork);
 
-		header ("Location: BanPage.php?panel=ban_name&ban_name=".$_GET['ban_name']."&succes=yes");
+		header ( 'location:BanPage.php?panel=ban_name&ban_name='.$_GET['ban_name'].'&succes=yes' );
 	}
 	if ($_GET['succes']	==	'yes')
 		$parse['display']	=	"<tr><th colspan=\"2\"><font color=lime>". $lang['bo_the_player'] . $name . $lang['bo_banned'] ."</font></th></tr>";
-	display( parsetemplate(gettemplate("adm/BanOptionsResultBody"), $parse), false, '', true, false);
+	display( parsetemplate(gettemplate("adm/BanOptionsResultBody"), $parse), FALSE, '', TRUE, FALSE);
 }
 elseif($_POST && $_POST['unban_name'])
 {
 	$name = $_POST['unban_name'];
 	doquery("DELETE FROM {{table}} WHERE who = '".$name."'", 'banned');
 	doquery("UPDATE {{table}} SET bana = '0', banaday = '0' WHERE username = '".$name."'", "users");
-	
-	
-	
+
+
+
 	$Log	.=	"\n".$lang['log_suspended_title']."\n";
 	$Log	.=	$lang['log_the_user'].$user['username']." ".$lang['log_suspended_3'].$name."\n";
-				
+
 	LogFunction($Log, "GeneralLog", $LogCanWork);
-	
-	header ("Location: BanPage.php?succes2=yes");
+
+	header ( 'location:BanPage.php?succes2=yes' );
 }
 	if ($_GET['succes2'] == 'yes')
 		$parse['display2']	=	"<tr><th colspan=\"2\"><font color=lime>". $lang['bo_the_player2'] . $name . $lang['bo_unbanned'] ."</font></th></tr>";
 
 
 
-display( parsetemplate(gettemplate("adm/BanOptions"), $parse), false, '', true, false);
+display( parsetemplate(gettemplate("adm/BanOptions"), $parse), FALSE, '', TRUE, FALSE);
 ?>
\ No newline at end of file
diff --git a/adm/ChangePassPage.php b/adm/ChangePassPage.php
index 98c808f..02cf23f 100644
--- a/adm/ChangePassPage.php
+++ b/adm/ChangePassPage.php
@@ -1,40 +1,28 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
-include('AdminFunctions/Autorization.' . $phpEx);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
+
+include(XGP_ROOT . 'global.php');
+include('AdminFunctions/Autorization.php');
 
 if ($EditUsers != 1) die();
 
 	$parse = $lang;
 
 	if ($_POST['md5q'] != "")
+	{
 		doquery ("UPDATE {{table}} SET `password` = '" . md5 ($_POST['md5q']) . "' WHERE `username` = '".$_POST['user']."';", 'users');
+	}
 
-	display( parsetemplate( gettemplate("adm/ChangePassBody"), $parse), false, '', true, false);
+	display( parsetemplate( gettemplate("adm/ChangePassBody"), $parse), FALSE, '', TRUE, FALSE);
 
 ?>
\ No newline at end of file
diff --git a/adm/CombatReport.php b/adm/CombatReport.php
index 613aa69..6a62a19 100644
--- a/adm/CombatReport.php
+++ b/adm/CombatReport.php
@@ -1,34 +1,20 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('XGP_ROOT', './../');
 
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.'.$phpEx);
+include(XGP_ROOT . 'global.php');
 
 includeLang('INGAME');
 
-$raportrow 	= doquery("SELECT * FROM {{table}} WHERE `rid` = '".(mysql_escape_string($_GET["raport"]))."';", 'rw', true);
+$raportrow 	= doquery("SELECT * FROM {{table}} WHERE `rid` = '".(mysql_escape_string($_GET["raport"]))."';", 'rw', TRUE);
 if (($raportrow["owners"] == $user["id"]) && ($raportrow["a_zestrzelona"] == 1))
 {
 	$Page .= "<td>".$lang['cr_lost_contact']."<br>";
@@ -51,5 +37,5 @@
 	$Page 		   .= $report;
 }
 
-display($Page, false, '', false, false);
+display($Page, FALSE, '', FALSE, FALSE);
 ?>
\ No newline at end of file
diff --git a/adm/ConfigStatsPage.php b/adm/ConfigStatsPage.php
index 9b6f210..6d83ab1 100644
--- a/adm/ConfigStatsPage.php
+++ b/adm/ConfigStatsPage.php
@@ -1,96 +1,91 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
 
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
-include('AdminFunctions/Autorization.' . $phpEx);
+include(XGP_ROOT . 'global.php');
+include('AdminFunctions/Autorization.php');
 
 if ($ConfigGame != 1) die(message ($lang['404_page']));
 
+	$game_stat				=	read_config ( 'stat' );
+	$game_stat_level		=	read_config ( 'stat_level' );
+	$game_stat_flying		=	read_config ( 'stat_flying' );
+	$game_stat_settings		=	read_config ( 'stat_settings' );
+	$game_stat_amount		=	read_config ( 'stat_amount' );
+	$game_stat_update_time	=	read_config ( 'stat_update_time' );
+	$game_stat_last_update	=	read_config ( 'stat_last_update' );
+
 	if ($_POST['save'] == $lang['cs_save_changes'])
 	{
 		$Log	.=	"\n".$lang['log_the_user'].$user['username'].$lang['log_change_stats'].":\n";
-		if (isset($_POST['stat']) && $_POST['stat'] != $game_config['stat'])
+		if (isset($_POST['stat']) && $_POST['stat'] != $game_stat )
 		{
 			update_config('stat' , $_POST['stat']);
-			$game_config['stat'] = $_POST['stat'];
-			$ASD3	=	$_POST['stat'];
-			$Log	.=	$lang['log_stats_value_5'].": ".$lang['log_viewmod2'][$ASD3]."\n";
+			$game_stat	= $_POST['stat'];
+			$ASD3		=	$_POST['stat'];
+			$Log		.=	$lang['log_stats_value_5'].": ".$lang['log_viewmod2'][$ASD3]."\n";
 		}
-		if (isset($_POST['stat_level']) &&  is_numeric($_POST['stat_level']) && $_POST['stat_level'] != $game_config['stat_level'])
+		if (isset($_POST['stat_level']) &&  is_numeric($_POST['stat_level']) && $_POST['stat_level'] != $game_stat_level)
 		{
 			update_config('stat_level',  $_POST['stat_level']);
-			$game_config['stat_level'] = $_POST['stat_level'];
+			$game_stat_level = $_POST['stat_level'];
 			$ASD1	=	$_POST['stat_level'];
 			$Log	.=	$lang['log_stats_value_6'].": ".$lang['rank'][$ASD1]."\n";
 		}
-		if (isset($_POST['stat_flying']) && $_POST['stat_flying'] != $game_config['stat_flying'])
+		if (isset($_POST['stat_flying']) && $_POST['stat_flying'] != $game_stat_flying)
 		{
 			update_config('stat_flying',  $_POST['stat_flying']);
-			$game_config['stat_flying']	= $_POST['stat_flying'];
+			$game_stat_flying	= $_POST['stat_flying'];
 			$ASD2	=	$_POST['stat_flying'];
 			$Log	.=	$lang['log_stats_value_4'].": ".$lang['log_viewmod'][$ASD2]."\n";
 		}
-		if (isset($_POST['stat_settings']) &&  is_numeric($_POST['stat_settings']) && $_POST['stat_settings'] != $game_config['stat_settings'])
+		if (isset($_POST['stat_settings']) &&  is_numeric($_POST['stat_settings']) && $_POST['stat_settings'] != $game_stat_settings)
 		{
 			update_config('stat_settings',  $_POST['stat_settings']);
-			$game_config['stat_settings'] = $_POST['stat_settings'];
+			$game_stat_settings = $_POST['stat_settings'];
 			$Log	.=	$lang['log_stats_value'].": ".$_POST['stat_settings']."\n";
 		}
-		if (isset($_POST['stat_amount']) &&  is_numeric($_POST['stat_amount']) && $_POST['stat_amount'] != $game_config['stat_amount'] && $_POST['stat_amount'] >= 10)
+		if (isset($_POST['stat_amount']) &&  is_numeric($_POST['stat_amount']) && $_POST['stat_amount'] != $game_stat_amount && $_POST['stat_amount'] >= 10)
 		{
 			update_config('stat_amount',  $_POST['stat_amount']);
-			$game_config['stat_amount']	= $_POST['stat_amount'];
+			$game_stat_amount	= $_POST['stat_amount'];
 			$Log	.=	$lang['log_stats_value_3'].": ".$_POST['stat_amount']."\n";
 		}
-		if (isset($_POST['stat_update_time']) &&  is_numeric($_POST['stat_update_time']) && $_POST['stat_update_time'] != $game_config['stat_update_time'])
+		if (isset($_POST['stat_update_time']) &&  is_numeric($_POST['stat_update_time']) && $_POST['stat_update_time'] != $game_stat_update_time)
 		{
 			update_config('stat_update_time',  $_POST['stat_update_time']);
-			$game_config['stat_update_time'] = $_POST['stat_update_time'];
+			$game_stat_update_time = $_POST['stat_update_time'];
 			$Log	.=	$lang['log_stats_value_2'].": ".$_POST['stat_update_time']."\n";
 		}
 		LogFunction($Log, "ConfigLog", $LogCanWork);
-		header("location:ConfigStatsPage.php");
+		header ( 'location:ConfigStatsPage.php' );
+
 	}
 	else
 	{
 		$selected					=	"selected=\"selected\"";
-		$stat						=	(($game_config['stat'] == 1)? 'sel_sta0':'sel_sta1');
+		$stat						=	(($game_stat == 1)? 'sel_sta0':'sel_sta1');
 		$lang[$stat]				=	$selected;
-		$stat_fly					=	(($game_config['stat_flying'] == 1)? 'sel_sf1':'sel_sf0');
+		$stat_fly					=	(($game_stat_flying == 1)? 'sel_sf1':'sel_sf0');
 		$lang[$stat_fly]			=	$selected;
-		$lang['stat_level']			=	$game_config['stat_level'];
-		$lang['stat_settings']		=	$game_config['stat_settings'];
-		$lang['stat_amount']		=	$game_config['stat_amount'];
-		$lang['stat_update_time']	=	$game_config['stat_update_time'];
-		$lang['timeact']			=	gmdate("d/M/y H:i:s", $game_config['stat_last_update']);
+		$lang['stat_level']			=	$game_stat_level;
+		$lang['stat_settings']		=	$game_stat_settings;
+		$lang['stat_amount']		=	$game_stat_amount;
+		$lang['stat_update_time']	=	$game_stat_update_time;
+		$lang['timeact']			=	gmdate("d/M/y H:i:s", $game_stat_last_update);
 
 		$lang['yes']	=	$lang['one_is_yes'][1];
 		$lang['no']		=	$lang['one_is_yes'][0];
 		$admin_settings = parsetemplate(gettemplate('adm/ConfigStatsBody'), $lang);
-		display($admin_settings, false, '', true, false);
+		display($admin_settings, FALSE, '', TRUE, FALSE);
 	}
 ?>
\ No newline at end of file
diff --git a/adm/CreateNewUserPage.php b/adm/CreateNewUserPage.php
index e479ed5..62ed3ca 100644
--- a/adm/CreateNewUserPage.php
+++ b/adm/CreateNewUserPage.php
@@ -1,32 +1,18 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By Neko from xgproyect.net	         #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
-include('AdminFunctions/Autorization.' . $phpEx);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
+
+include(XGP_ROOT . 'global.php');
+include('AdminFunctions/Autorization.php');
 
 if ($EditUsers != 1) die();
 
@@ -43,9 +29,9 @@
 $i			=	0;
 if ($_POST)
 {
-	$CheckUser = doquery("SELECT `username` FROM {{table}} WHERE `username` = '" . mysql_escape_string($_POST['name']) . "' LIMIT 1", "users", true);
-	$CheckMail = doquery("SELECT `email` FROM {{table}} WHERE `email` = '" . mysql_escape_string($_POST['email']) . "' LIMIT 1", "users", true);
-	$CheckRows = doquery("SELECT * FROM {{table}} WHERE `galaxy` = '".$galaxy."' AND `system` = '".$system."' AND `planet` = '".$planet."' LIMIT 1", "galaxy", true);
+	$CheckUser = doquery("SELECT `username` FROM {{table}} WHERE `username` = '" . mysql_escape_string($_POST['name']) . "' LIMIT 1", "users", TRUE);
+	$CheckMail = doquery("SELECT `email` FROM {{table}} WHERE `email` = '" . mysql_escape_string($_POST['email']) . "' LIMIT 1", "users", TRUE);
+	$CheckRows = doquery("SELECT * FROM {{table}} WHERE `galaxy` = '".$galaxy."' AND `system` = '".$system."' AND `planet` = '".$planet."' LIMIT 1", "galaxy", TRUE);
 
 
 	if (!is_numeric($galaxy) &&  !is_numeric($system) && !is_numeric($planet)){
@@ -89,13 +75,13 @@
 		$Query1 .= "`password`='" . $pass . "';";
 		doquery($Query1, "users");
 
-		doquery("UPDATE {{table}} SET `config_value` = config_value + '1' WHERE `config_name` = 'users_amount';", 'config');
+		update_config ( 'users_amount' , read_config ( 'users_amount' ) + 1 );
 
-		$ID_USER 	= doquery("SELECT `id` FROM {{table}} WHERE `username` = '" . mysql_escape_string($name) . "' LIMIT 1", "users", true);
+		$ID_USER 	= doquery("SELECT `id` FROM {{table}} WHERE `username` = '" . mysql_escape_string($name) . "' LIMIT 1", "users", TRUE);
 
-		CreateOnePlanetRecord ($galaxy, $system, $planet, $ID_USER['id'], $UserPlanet, true);
+		CreateOnePlanetRecord ($galaxy, $system, $planet, $ID_USER['id'], $UserPlanet, TRUE);
 
-		$ID_PLANET 	= doquery("SELECT `id` FROM {{table}} WHERE `id_owner` = '". $ID_USER['id'] ."' LIMIT 1" , "planets", true);
+		$ID_PLANET 	= doquery("SELECT `id` FROM {{table}} WHERE `id_owner` = '". $ID_USER['id'] ."' LIMIT 1" , "planets", TRUE);
 
 		doquery("UPDATE {{table}} SET `id_level` = '".$auth."' WHERE `id` = '".$ID_PLANET['id']."'", "planets");
 
@@ -116,5 +102,5 @@
 
 
 
-display(parsetemplate(gettemplate('adm/CreateNewUserBody'), $parse), false, '', true, false);
+display(parsetemplate(gettemplate('adm/CreateNewUserBody'), $parse), FALSE, '', TRUE, FALSE);
 ?>
\ No newline at end of file
diff --git a/adm/DataBaseViewPage.php b/adm/DataBaseViewPage.php
index 8053ca2..4b814b8 100644
--- a/adm/DataBaseViewPage.php
+++ b/adm/DataBaseViewPage.php
@@ -1,31 +1,17 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
 
-$xgp_root = '../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
+include(XGP_ROOT . 'global.php');
 
 if ($ConfigGame != 1) die(message ($lang['404_page']));
 
@@ -47,7 +33,7 @@
 else
 {
 	$Tablas = doquery("SHOW TABLES",'todas');
-	
+
 	while ($row = mysql_fetch_assoc($Tablas))
 	{
 		foreach ($row as $opcion => $tabla)
@@ -56,17 +42,17 @@
 				doquery("OPTIMIZE TABLE {$tabla}", "$tabla");
 				$Message	=	$lang['od_opt'];
 				$Log	=	"\n".$lang['log_database_title']."\n".$lang['log_the_user'].$user['username'].$lang['log_database_view'].":\n".$lang['log_data_optimize']."\n";}
-				
+
 			if ($_POST['Repair']){
 				doquery("REPAIR TABLE {$tabla}", "$tabla");
 				$Message	=	$lang['od_rep'];
 				$Log	=	"\n".$lang['log_database_title']."\n".$lang['log_the_user'].$user['username'].$lang['log_database_view'].":\n".$lang['log_data_repair']."\n";}
-				
+
 			if ($_POST['Check']){
 				doquery("CHECK TABLE {$tabla}", "$tabla");
 				$Message	=	$lang['od_check_ok'];
 				$Log	=	"\n".$lang['log_database_title']."\n".$lang['log_the_user'].$user['username'].$lang['log_database_view'].":\n".$lang['log_data_check']."\n";}
-				
+
 			if (mysql_errno())
 			{
 				$parse['tabla'] .= "<tr>";
@@ -83,9 +69,9 @@
 			}
 		}
 	}
-		
+
 	LogFunction($Log, "GeneralLog", $LogCanWork);
 }
 
-display(parsetemplate(gettemplate('adm/DataBaseViewBody'), $parse), false, '', true, false);
+display(parsetemplate(gettemplate('adm/DataBaseViewBody'), $parse), FALSE, '', TRUE, FALSE);
 ?>
\ No newline at end of file
diff --git a/adm/ErrorPage.php b/adm/ErrorPage.php
index 2d4031d..292fa91 100644
--- a/adm/ErrorPage.php
+++ b/adm/ErrorPage.php
@@ -1,38 +1,24 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-$xgp_root = '../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
+
+include(XGP_ROOT . 'global.php');
 
 if ($ConfigGame != 1) die(message ($lang['404_page']));
 
 	$parse = $lang;
 
 	extract($_GET);
-	
+
 	$query = doquery("SELECT * FROM {{table}}", 'errors');
 
 	$i = 0;
@@ -51,21 +37,25 @@
 	}
 
 	$parse['errors_list'] .= "<tr><th class=b colspan=5>". $i . $lang['er_errors'] ."</th></tr>";
-	
-	
-	if (isset($delete)){
+
+
+	if (isset($delete))
+	{
 		doquery("DELETE FROM {{table}} WHERE `error_id`=$delete", 'errors');
 		$Log	.=	"\n".$lang['log_errores_title']."\n";
 		$Log	.=	$lang['log_the_user'].$user['username']." ".$lang['log_delete_errors']."\n";
 		LogFunction($Log, "GeneralLog", $LogCanWork);
-		header ("Location: ErrorPage.php");}
-	elseif ($deleteall == 'yes'){
+		header ( 'location:ErrorPage.php' );
+	}
+	elseif ($deleteall == 'yes')
+	{
 		doquery("TRUNCATE TABLE {{table}}", 'errors');
 		$Log	.=	"\n".$lang['log_errores_title']."\n";
 		$Log	.=	$lang['log_the_user'].$user['username']." ".$lang['log_delete_all_errors']."\n";
 		LogFunction($Log, "GeneralLog", $LogCanWork);
-		header ("Location: ErrorPage.php");}
+		header ( 'location:ErrorPage.php' );
+	}
 
-	display(parsetemplate(gettemplate('adm/ErrorMessagesBody'), $parse), false, '', true, false);
+	display(parsetemplate(gettemplate('adm/ErrorMessagesBody'), $parse), FALSE, '', TRUE, FALSE);
 
 ?>
\ No newline at end of file
diff --git a/adm/GlobalMessagePage.php b/adm/GlobalMessagePage.php
index 7dd80ed..e585bd2 100644
--- a/adm/GlobalMessagePage.php
+++ b/adm/GlobalMessagePage.php
@@ -1,90 +1,72 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
 
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
+include(XGP_ROOT . 'global.php');
 
 if ($ToolsCanUse != 1) die(message ($lang['404_page']));
 
-    $parse     = $lang;
+	$parse 	= $lang;
 
-    if ($_POST && $_GET['mode'] == "change")
-    {
-        if ($user['authlevel'] == 3)
-        {
-            $kolor = 'red';
-            $ranga = $lang['user_level'][3];
-        }
+	if ($_POST && $_GET['mode'] == "change")
+	{
+		if ($user['authlevel'] == 3)
+		{
+			$kolor = 'red';
+			$ranga = $lang['user_level'][3];
+		}
 
-        elseif ($user['authlevel'] == 2)
-        {
-            $kolor = 'skyblue';
-            $ranga = $lang['user_level'][2];
-        }
+		elseif ($user['authlevel'] == 2)
+		{
+			$kolor = 'skyblue';
+			$ranga = $lang['user_level'][2];
+		}
 
-        elseif ($user['authlevel'] == 1)
-        {
-            $kolor = 'yellow';
-            $ranga = $lang['user_level'][1];
-        }
-        if($_POST["still"]>0){
-        $still=intval($_POST['still']);
-        $ress_all = doquery("UPDATE {{table}} SET `darkmatter`=`darkmatter`+'".$still."';", 'users');
-        }
-        if ((isset($_POST["tresc"]) && $_POST["tresc"] != '') && (isset($_POST["temat"]) && $_POST["temat"] != ''))
-        {
-            $sq          = doquery("SELECT `id`,`username` FROM {{table}}", "users");
-            $Time        = time();
-            $From        = "<font color=\"". $kolor ."\">". $ranga ." ".$user['username']."</font>";
-            $Subject     = "<font color=\"". $kolor ."\">".$_POST['temat']."</font>";
-            $Message     = "<font color=\"". $kolor ."\"><b>".$_POST['tresc']."</b></font>";
-            $summery    = 0;
+		elseif ($user['authlevel'] == 1)
+		{
+			$kolor = 'yellow';
+			$ranga = $lang['user_level'][1];
+		}
+		if ((isset($_POST["tresc"]) && $_POST["tresc"] != '') && (isset($_POST["temat"]) && $_POST["temat"] != ''))
+		{
+			$sq      	= doquery("SELECT `id`,`username` FROM {{table}}", "users");
+			$Time    	= time();
+			$From    	= "<font color=\"". $kolor ."\">". $ranga ." ".$user['username']."</font>";
+			$Subject 	= "<font color=\"". $kolor ."\">".$_POST['temat']."</font>";
+			$Message 	= "<font color=\"". $kolor ."\"><b>".$_POST['tresc']."</b></font>";
+			$summery	= 0;
 
-            while ($u = mysql_fetch_array($sq))
-            {
-                SendSimpleMessage ( $u['id'], $user['id'], $Time, 1, $From, $Subject, $Message);
-                $_POST['tresc'] = str_replace(":name:",$u['username'],$_POST['tresc']);
-            }
-            
-            
-            $Log    .=    "\n".$lang['log_circular_message']."\n";
-            $Log    .=    $lang['log_the_user'].$user['username'].$lang['log_message_specify'].":\n";
-            $Log    .=    $lang['log_mes_subject'].": ".$_POST["temat"]."\n";
-            $Log    .=    $lang['log_mes_text'].": ".$_POST["tresc"]."\n";
-                
-            LogFunction($Log, "GeneralLog", $LogCanWork);
-        
-            $parse['display']    =    "<tr><th colspan=5><font color=lime>".$lang['ma_message_sended']."</font></th></tr>";
-        }
-        else
-        {
-            $parse['display']    =    "<tr><th colspan=5><font color=red>".$lang['ma_subject_needed']."</font></th></tr>";
-        }
-    }
-    
-    
-display(parsetemplate(gettemplate('adm/GlobalMessageBody'), $parse), false,'', true, false);
+			while ($u = mysql_fetch_array($sq))
+			{
+				SendSimpleMessage ( $u['id'], $user['id'], $Time, 1, $From, $Subject, $Message);
+				$_POST['tresc'] = str_replace(":name:",$u['username'],$_POST['tresc']);
+			}
+
+
+			$Log	.=	"\n".$lang['log_circular_message']."\n";
+			$Log	.=	$lang['log_the_user'].$user['username'].$lang['log_message_specify'].":\n";
+			$Log	.=	$lang['log_mes_subject'].": ".$_POST["temat"]."\n";
+			$Log	.=	$lang['log_mes_text'].": ".$_POST["tresc"]."\n";
+
+			LogFunction($Log, "GeneralLog", $LogCanWork);
+
+			$parse['display']	=	"<tr><th colspan=5><font color=lime>".$lang['ma_message_sended']."</font></th></tr>";
+		}
+		else
+		{
+			$parse['display']	=	"<tr><th colspan=5><font color=red>".$lang['ma_subject_needed']."</font></th></tr>";
+		}
+	}
+
+
+display(parsetemplate(gettemplate('adm/GlobalMessageBody'), $parse), FALSE,'', TRUE, FALSE);
 ?>
\ No newline at end of file
diff --git a/adm/Log/BuildingsLog.php b/adm/Log/BuildingsLog.php
index 87fc606..cc96e94 100644
--- a/adm/Log/BuildingsLog.php
+++ b/adm/Log/BuildingsLog.php
@@ -1,24 +1,24 @@
 
-Èãðîê admin óäàëèòü:
-Ðóäíèê ïî äîáû÷å ìåòàëëà: 0
-Ðóäíèê ïî äîáû÷å êðèñòàëëà: 0
-Ñèíòåçàòîð äåéòåðèÿ: 0
-Ñîëíå÷íàÿ ýëåêòðîñòàíöèÿ: 0
-Òåðìîÿäåðíûé ðåàêòîð: 0
-Ôàáðèêà ðîáîòîâ: 20
-Ôàáðèêà íàíèòîâ: 0
-Âåðôü: 0
-Õðàíèëèùå ìåòàëîâ: 0
-Õðàíèëèùå êðåñòàëîâ: 0
-Åìêîñòü äëÿ äåéòåðèÿ: 0
-Èññëåäîâàòåëüñêàÿ ëàáîðàòîðèÿ: 0
-Òåðàôîðìåðû: 0
-Ñêëàä Àëüÿíñà: 0
-Ðàêåòíàÿ øàõòà: 0
-Ëóíàÿ áàçà: 0
-Ñåíñîðíàÿ ôàëàíãà: 0
-Ïðûøêîâûå âðàòà: 0
-ê ïëàíåòå ñ ID: 1
-Operation on: 25-08-2010 21:59:39
-43
-23:10
+El usuario lucky agrego:
+Mina de metal: 0
+Mina de cristal: 0
+Sintetizador de deuterio: 0
+Planta de energía solar: 0
+Planta de fusión: 0
+Fábrica de Robots: 0
+Fábrica de Nanobots: 0
+Hangar: 0
+Almacén de Metal: 0
+Almacén de Cristal: 0
+Contenedor de deuterio: 0
+Laboratorio de investigación: 0
+Terraformer: 0
+Depósito de la Alianza: 0
+Silo: 0
+Base lunar: 1
+Phalanx: 1
+Salto cuántico: 1
+al planeta con el ID: 4
+Operación realizada el: 04-01-2012 18:14:07
+
+:39:55
diff --git a/adm/Log/ConfigLog.php b/adm/Log/ConfigLog.php
index 8aff876..e8ab058 100644
--- a/adm/Log/ConfigLog.php
+++ b/adm/Log/ConfigLog.php
@@ -1,10 +1,11 @@
 
-Èãðîê admin has changed the parameters of statistics:
-The administration may be in the ranking?: 
-Operation on: 23-08-2010 00:11:16
-zada el: 15-08-2010 20:08:38
-peración realizada el: 15-08-2010 19:55:09
-d de flota : x1
+El usuario  cambio la siguiente configuración:
+¿Servidor cerrado? : 
+¿Modo DEBUG activado? : 
+Nombre del juego : XG Proyect
+URL del foro : http://www.xgproyect.net/
+Velocidad del juego : x1
+Velocidad de flota : x1
 Velocidad de producción : x1
 Campos iniciales : 163
 Básico de metal por hora : 20
@@ -18,6 +19,4 @@
 ¿Protección contra novatos activado? : 
 Tiempo de protección contra novato : 5000
 Limite de puntos para la protección de novato : 5
-Operación realizada el: 04-08-2010 08:50:06
-:50
-:55
+Operación realizada el: 20-12-2011 22:17:36
diff --git a/adm/Log/DefensesLog.php b/adm/Log/DefensesLog.php
deleted file mode 100644
index 3e96ad5..0000000
--- a/adm/Log/DefensesLog.php
+++ /dev/null
@@ -1,15 +0,0 @@
-
-Èãðîê admin äàáàâèòü:
-Ðàêåòíàÿ óñòàíîâêà: 0
-Ëåãêèé ëàçåð: 0
-Òÿæ¸ëûé ëàçåð: 0
-Ïóøêà Ãàóññà: 0
-Èîííîå îðóäèå: 0
-Ïëàçìåííîå îðóäèå: 0
-Ìàëûé ùèòîâîé êóïîë: 0
-Áîëüøîé ùèòîâîé êóïîë: 0
-Íåéòðîííûé êóïîë: 0
-Ðàêåòà-ïåðåõâàò÷èê: 0
-Ìåæïëàíåòíàÿ ðàêåòà: 0
-ê ïëàíåòå ñ ID: 1
-Operation on: 25-08-2010 22:54:39
diff --git a/adm/Log/GeneralLog.php b/adm/Log/GeneralLog.php
index f9174c5..cb55979 100644
--- a/adm/Log/GeneralLog.php
+++ b/adm/Log/GeneralLog.php
@@ -1,10 +1,10 @@
 
-<font color=lime>||| LIST OF ERRORS |||</font>
-Èãðîê admin has removed an error
-Operation on: 25-08-2010 23:02:54
-guientes especificaciones:
-Razón: Estoy haciendo una prueba.
-el: 15-08-2010 19:43:52
-hasta el: 15-08-2010 19:44:52
+<font color=lime>||| LISTA DE ERRORES |||</font>
+El usuario lucky ha borrado todos los mensajes de error
+Operaci&oacute;n realizada el: 05-01-2012 04:16:21
+: 23-11-2011 01:45:07
+5
+21:15:04
+hasta el: 04-10-2011 21:15:04
 ¿En modo vacaciones? 
-Operación realizada el: 15-08-2010 19:43:52
+Operación realizada el: 03-10-2011 21:15:04
diff --git a/adm/Log/OfficierLog.php b/adm/Log/OfficierLog.php
index e69de29..ab8dc53 100644
--- a/adm/Log/OfficierLog.php
+++ b/adm/Log/OfficierLog.php
@@ -0,0 +1,8 @@
+
+El usuario lucky borro:
+Geólogo: 1
+Almirante: 1
+Ingeniero: 1
+Tecnócrata: 1
+al usuario con el ID: 1
+Operación realizada el: 23-11-2011 01:48:57
diff --git a/adm/Log/PersonalLog.php b/adm/Log/PersonalLog.php
deleted file mode 100644
index e61f8bf..0000000
--- a/adm/Log/PersonalLog.php
+++ /dev/null
@@ -1,4 +0,0 @@
-
-El usuario lucky modifico los siguientes datos:
-al usuario con el ID: 1
-Operación realizada el: 25-02-2010 19:49:01
diff --git a/adm/Log/ResearchLog.php b/adm/Log/ResearchLog.php
index a5083b4..6c06a07 100644
--- a/adm/Log/ResearchLog.php
+++ b/adm/Log/ResearchLog.php
@@ -1,21 +1,22 @@
 
-Èãðîê admin äàáàâèòü:
-Øïèîíñêàÿ Òåõíîëîãèÿ: 0
-Êîìïüþòåðíàÿ òåõíîëîãèÿ: 0
-Îðóæåéíàÿ òåõíîëîãèÿ: 0
-Ùèòîâàÿ òåõíîëîãèÿ: 0
-Òåõíîëîãèÿ çàùèòû êîñìè÷åñêèõ àïïàðàòîâ: 0
-Ýíåðãåòè÷åñêàÿ òåõíîëîãèÿ: 0
-Ãèïåðïðîñòðàíñòâåííàÿ òåõíîëîãèÿ: 0
-Ðàêåòíûé äâèãàòåëü: 0
-Èìïóëüñíûé äâèãàòåëü: 0
-Ãèïåðïðîñòðàíñòâåííûé äâèãàòåëü: 0
-Ëàçåðíàÿ òåõíîëîãèÿ: 0
-Èîííàÿ òåõíîëîãèÿ: 0
-Ïëàçìåííàÿ òåõíîëîãèÿ: 0
-Ìåæãàëàêòè÷åñêàÿ íàó÷íî-èññëåäîâàòåëüñêàÿ ñåòü: 0
-Ýêñïåäèöèîííàÿ òåõíîëîãèÿ: 0
-Àòîìíàÿ òåõíîëîãèÿ: 3
-Ãðàâèòàöèîííàÿ òåõíîëîãèÿ: 0
-ê èãðîêó ñ ID: 1
-Operation on: 25-08-2010 23:10:11
+El usuario lucky agrego:
+Tecnología de espionaje: 0
+Tecnología de computación: 0
+Tecnología militar: 0
+Tecnología de defensa: 0
+Tecnología de blindaje: 0
+Tecnología de energía: 0
+Tecnología de hiperespacio: 0
+Motor de combustión: 0
+Motor de impulso: 0
+Propulsor hiperespacial: 0
+Tecnología láser: 0
+Tecnología iónica: 0
+Tecnología de plasma: 0
+Red de investigación intergaláctica: 0
+Tecnología de expedicion: 0
+Tecnología de gravitón: 1
+al usuario con el ID: 1
+Operación realizada el: 20-12-2011 19:51:16
+6
+:12
diff --git a/adm/Log/ResourcesLog.php b/adm/Log/ResourcesLog.php
index be740a7..9ff7618 100644
--- a/adm/Log/ResourcesLog.php
+++ b/adm/Log/ResourcesLog.php
@@ -1,11 +1,9 @@
 
-Èãðîê admin äàáàâèòü:
-Ìåòàë: 1000000
-Êðèñòàëû: 1000000
-Äåéòåðèé: 1000000
-ê ïëàíåòå ñ ID: 1
-and Òåìíàÿ ìàòåðèÿ: 0
-ê èãðîêó ñ ID: 0
-Operation on: 24-08-2010 23:38:40
-10 19:56:58
-42
+El usuario lucky agrego:
+Metal: 1000000
+Cristal: 1000000
+Deuterio: 1000000
+al planeta con el ID: 1
+y Materia oscura: 0
+al usuario con el ID: 0
+Operación realizada el: 21-12-2011 12:05:03
diff --git a/adm/Log/ShipsLog.php b/adm/Log/ShipsLog.php
index ff44edd..55214f9 100644
--- a/adm/Log/ShipsLog.php
+++ b/adm/Log/ShipsLog.php
@@ -1,12 +1,12 @@
 
 El usuario lucky agrego:
-Nave pequeña de carga: 1000
-Nave grande de carga: 1000
-Cazador ligero: 1000
-Cazador pesado: 1000
-Crucero: 1000
-Nave de batalla: 1000
-Colonizador: 1000
+Nave pequeña de carga: 10
+Nave grande de carga: 10
+Cazador ligero: 10
+Cazador pesado: 10
+Crucero: 0
+Nave de batalla: 0
+Colonizador: 0
 Reciclador: 0
 Sonda de espionaje: 0
 Bombardero: 0
@@ -14,7 +14,5 @@
 Destructor: 0
 Estrella de la muerte: 0
 Acorazado: 0
-Supernova: 0
 al planeta con el ID: 1
-Operación realizada el: 15-08-2010 19:59:41
- el: 27-02-2010 15:25:06
+Operación realizada el: 06-12-2011 20:52:44
diff --git a/styles/skins/New-Year!/gebaeude/index.html b/adm/Log/index.html
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/index.html
rename to adm/Log/index.html
diff --git a/adm/LogToolPage.php b/adm/LogToolPage.php
index 4b3f9e9..13fda36 100644
--- a/adm/LogToolPage.php
+++ b/adm/LogToolPage.php
@@ -1,36 +1,22 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2010 By Neko from xgproyect.net	         #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
+
+include(XGP_ROOT . 'global.php');
 
 if ($user['authlevel'] < 1) die(message ($lang['404_page']));
 
 $parse		=	$lang;
-$Archive	=	"Log/".$_GET['file'].".".$phpEx;
+$Archive	=	"Log/".$_GET['file'].".php";
 
 switch ($_GET['options'])
 {
@@ -66,11 +52,11 @@
 		$parse['setsize']		=	"&nbsp;&nbsp;(".$FinalSize." KB)";
 		$parse['setarchive']	=	$_GET['file'];
 
-		display (parsetemplate(gettemplate('adm/LogEditBody'), $parse), false, '', true, false);
+		display (parsetemplate(gettemplate('adm/LogEditBody'), $parse), FALSE, '', TRUE, FALSE);
 	break;
 
 	case 'links':
-		$Archive	=	"Log/".$_GET['file'].".".$phpEx;
+		$Archive	=	"Log/".$_GET['file'].".php";
 		if (!file_exists($Archive))
 		{
 			fopen($Archive, "w+");
@@ -117,10 +103,10 @@
 		$FinalSize				=	$FileSize / 1000;
 		$parse['setsize']		=	"&nbsp;&nbsp;(".$FinalSize." KB)";
 		$parse['setarchive']	=	$_GET['file'];
-		display (parsetemplate(gettemplate('adm/LogBody'), $parse), false, '', true, false);
+		display (parsetemplate(gettemplate('adm/LogBody'), $parse), FALSE, '', TRUE, FALSE);
 	break;
 
 	default:
-		display (parsetemplate(gettemplate('adm/LogBody'), $parse), false, '', true, false);
+		display (parsetemplate(gettemplate('adm/LogBody'), $parse), FALSE, '', TRUE, FALSE);
 }
 ?>
\ No newline at end of file
diff --git a/adm/MakerPage.php b/adm/MakerPage.php
index a9de795..e8e6c2c 100644
--- a/adm/MakerPage.php
+++ b/adm/MakerPage.php
@@ -1,31 +1,17 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2010 By Neko from xgproyect.net	         #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
+
+include(XGP_ROOT . 'global.php');
 
 if ($EditUsers != 1) die(message ($lang['404_page']));
 
@@ -57,9 +43,9 @@
 
 	if ($_POST)
 	{
-		$CheckUser = doquery("SELECT `username` FROM {{table}} WHERE `username` = '" . mysql_escape_string($_POST['name']) . "' LIMIT 1", "users", true);
-		$CheckMail = doquery("SELECT `email` FROM {{table}} WHERE `email` = '" . mysql_escape_string($_POST['email']) . "' LIMIT 1", "users", true);
-		$CheckRows = doquery("SELECT * FROM {{table}} WHERE `galaxy` = '".$galaxy."' AND `system` = '".$system."' AND `planet` = '".$planet."' LIMIT 1", "galaxy", true);
+		$CheckUser = doquery("SELECT `username` FROM {{table}} WHERE `username` = '" . mysql_escape_string($_POST['name']) . "' LIMIT 1", "users", TRUE);
+		$CheckMail = doquery("SELECT `email` FROM {{table}} WHERE `email` = '" . mysql_escape_string($_POST['email']) . "' LIMIT 1", "users", TRUE);
+		$CheckRows = doquery("SELECT * FROM {{table}} WHERE `galaxy` = '".$galaxy."' AND `system` = '".$system."' AND `planet` = '".$planet."' LIMIT 1", "galaxy", TRUE);
 
 
 		if (!ctype_digit($galaxy) &&  !ctype_digit($system) && !ctype_digit($planet)){
@@ -108,13 +94,13 @@
 			$Query1 .= "`password`='" . md5($pass) . "';";
 			doquery($Query1, "users");
 
-			doquery("UPDATE {{table}} SET `config_value` = config_value + '1' WHERE `config_name` = 'users_amount';", 'config');
+			update_config ( 'users_amount' , read_config ( 'users_amount' ) + 1 );
 
-			$ID_USER 	= doquery("SELECT `id` FROM {{table}} WHERE `username` = '" . mysql_escape_string($name) . "' LIMIT 1", "users", true);
+			$ID_USER 	= doquery("SELECT `id` FROM {{table}} WHERE `username` = '" . mysql_escape_string($name) . "' LIMIT 1", "users", TRUE);
 
-			CreateOnePlanetRecord ($galaxy, $system, $planet, $ID_USER['id'], $UserPlanet, true);
+			CreateOnePlanetRecord ($galaxy, $system, $planet, $ID_USER['id'], $UserPlanet, TRUE);
 
-			$ID_PLANET 	= doquery("SELECT `id` FROM {{table}} WHERE `id_owner` = '". $ID_USER['id'] ."' LIMIT 1" , "planets", true);
+			$ID_PLANET 	= doquery("SELECT `id` FROM {{table}} WHERE `id_owner` = '". $ID_USER['id'] ."' LIMIT 1" , "planets", TRUE);
 
 			doquery("UPDATE {{table}} SET `id_level` = '".$auth."' WHERE `id` = '".$ID_PLANET['id']."'", "planets");
 
@@ -142,7 +128,7 @@
 		}
 	}
 
-	display(parsetemplate(gettemplate('adm/CreateNewUserBody'), $parse), false, '', true, false);
+	display(parsetemplate(gettemplate('adm/CreateNewUserBody'), $parse), FALSE, '', TRUE, FALSE);
 	break;
 
 	case 'new_moon':
@@ -155,8 +141,8 @@
 		$TempMax	= $_POST['temp_max'];
 		$FieldMax	= $_POST['field_max'];
 
-		$MoonPlanet		= 	doquery("SELECT * FROM {{table}} WHERE `id` = '".$PlanetID."' AND `planet_type` = '1'", 'planets', true);
-		$MoonGalaxy		= 	doquery("SELECT * FROM {{table}} WHERE `id_planet` = '".$PlanetID."'", 'galaxy', true);
+		$MoonPlanet		= 	doquery("SELECT * FROM {{table}} WHERE `id` = '".$PlanetID."' AND `planet_type` = '1'", 'planets', TRUE);
+		$MoonGalaxy		= 	doquery("SELECT * FROM {{table}} WHERE `id_planet` = '".$PlanetID."'", 'galaxy', TRUE);
 
 
 	if ($MoonPlanet && is_numeric($PlanetID))
@@ -201,7 +187,7 @@
 				$parse['display']	=	"<tr><th colspan=3><font color=red>".$lang['only_numbers']."</font></th></tr>";
 			}
 
-				$QueryFind	=	doquery("SELECT `id_level` FROM {{table}} WHERE `id` = '".$PlanetID."'", "planets", true);
+				$QueryFind	=	doquery("SELECT `id_level` FROM {{table}} WHERE `id` = '".$PlanetID."'", "planets", TRUE);
 
 				$QryInsertMoonInPlanet  = "INSERT INTO {{table}} SET ";
 				$QryInsertMoonInPlanet .= "`name` = '".$MoonName."', ";
@@ -233,7 +219,7 @@
 				$QryGetMoonIdFromLunas .= "`system` = '".  $System ."' AND ";
 				$QryGetMoonIdFromLunas .= "`planet` = '". $Planet ."' AND ";
 				$QryGetMoonIdFromLunas .= "`planet_type` = '3';";
-				$PlanetRow = doquery( $QryGetMoonIdFromLunas , 'planets', true);
+				$PlanetRow = doquery( $QryGetMoonIdFromLunas , 'planets', TRUE);
 
 				$QryUpdateMoonInGalaxy  = "UPDATE {{table}} SET ";
 				$QryUpdateMoonInGalaxy .= "`id_luna` = '". $PlanetRow['id'] ."', ";
@@ -260,7 +246,7 @@
 	{
 		$MoonID	= $_POST['del_moon'];
 
-		$MoonSelected  			= doquery("SELECT * FROM {{table}} WHERE `id` = '". $MoonID ."'", 'planets', true);
+		$MoonSelected  			= doquery("SELECT * FROM {{table}} WHERE `id` = '". $MoonID ."'", 'planets', TRUE);
 		if ($MoonSelected && is_numeric($MoonID))
 		{
 			if ($MoonSelected['planet_type'] == 3)
@@ -293,7 +279,7 @@
 		}
 	}
 
-	display (parsetemplate(gettemplate("adm/MoonOptionsBody"), $parse), false, '', true, false);
+	display (parsetemplate(gettemplate("adm/MoonOptionsBody"), $parse), FALSE, '', TRUE, FALSE);
 	break;
 
 	case 'new_planet':
@@ -306,11 +292,14 @@
    	 	$system      = $_POST['system'];
    	 	$planet      = $_POST['planet'];
 		$name        = $_POST['name'];
+
+
+
 		$field_max   = $_POST['field_max'];
 
 		$i	=	0;
-		$QueryS	=	doquery("SELECT * FROM {{table}} WHERE `galaxy` = '".$galaxy."' AND `system` = '".$system."' AND `planet` = '".$planet."'", "galaxy", true);
-		$QueryS2	=	doquery("SELECT * FROM {{table}} WHERE `id` = '".$id."'", "users", true);
+		$QueryS	=	doquery("SELECT * FROM {{table}} WHERE `galaxy` = '".$galaxy."' AND `system` = '".$system."' AND `planet` = '".$planet."'", "galaxy", TRUE);
+		$QueryS2	=	doquery("SELECT * FROM {{table}} WHERE `id` = '".$id."'", "users", TRUE);
 		if (is_numeric($_POST['id']) && isset($_POST['id']) && !$QueryS && $QueryS2)
 		{
     		if ($galaxy < 1 or $system < 1 or $planet < 1 or !is_numeric($galaxy) or !is_numeric($system) or !is_numeric($planet)){
@@ -323,8 +312,8 @@
 
 			if ($i	==	0)
 			{
-				CreateOnePlanetRecord ($galaxy, $system, $planet, $id, '', '', false) ;
-				$QueryS3	=	doquery("SELECT * FROM {{table}} WHERE `id_owner` = '".$id."' LIMIT 1", "planets", true);
+				CreateOnePlanetRecord ($galaxy, $system, $planet, $id, '', '', FALSE) ;
+				$QueryS3	=	doquery("SELECT * FROM {{table}} WHERE `id_owner` = '".$id."' LIMIT 1", "planets", TRUE);
 
 				$QryUpdatePlanet  = "UPDATE {{table}} SET ";
 				if ($field_max > 0 && is_numeric($field_max))
@@ -356,13 +345,13 @@
 		$id	=	$_POST['id'];
 		if (is_numeric($id) && isset($id))
 		{
-			$QueryS	=	doquery("SELECT * FROM {{table}} WHERE `id` = '".$id."'", "planets", true);
+			$QueryS	=	doquery("SELECT * FROM {{table}} WHERE `id` = '".$id."'", "planets", TRUE);
 
 			if ($QueryS)
 			{
 				if ($QueryS['planet_type'] == '1')
 				{
-					$QueryS2	=	doquery("SELECT * FROM {{table}} WHERE `id_planet` = '".$id."'", "galaxy", true);
+					$QueryS2	=	doquery("SELECT * FROM {{table}} WHERE `id_planet` = '".$id."'", "galaxy", TRUE);
 					if ($QueryS2['id_luna'] > 0)
 					{
 						doquery("DELETE FROM {{table}} WHERE `galaxy` = '".$QueryS['galaxy']."' AND `system` = '".$QueryS['system']."' AND
@@ -389,12 +378,12 @@
 		$parse['display2']	=	$Error;
 	}
 
-	display (parsetemplate(gettemplate('adm/PlanetOptionsBody'),  $parse), false, '', true, false);
+	display (parsetemplate(gettemplate('adm/PlanetOptionsBody'),  $parse), FALSE, '', TRUE, FALSE);
 	break;
 
 	default:
 
-	display( parsetemplate(gettemplate('adm/CreatorBody'), $parse), false, '', true, false);
+	display( parsetemplate(gettemplate('adm/CreatorBody'), $parse), FALSE, '', TRUE, FALSE);
 	break;
 }
 ?>
\ No newline at end of file
diff --git a/adm/MessageListPage.php b/adm/MessageListPage.php
index 4426112..5fe16ae 100644
--- a/adm/MessageListPage.php
+++ b/adm/MessageListPage.php
@@ -1,39 +1,25 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
+
+include(XGP_ROOT . 'global.php');
 
 if ($Observation != 1) die(message ($lang['404_page']));
 
 	$parse		= $lang;
-	$Prev       = ( !empty($_POST['prev'])   ) ? true : false;
-	$Next       = ( !empty($_POST['next'])   ) ? true : false;
-	$DelSel     = ( !empty($_POST['delsel']) ) ? true : false;
-	$DelDat     = ( !empty($_POST['deldat']) ) ? true : false;
+	$Prev       = ( !empty($_POST['prev'])   ) ? TRUE : FALSE;
+	$Next       = ( !empty($_POST['next'])   ) ? TRUE : FALSE;
+	$DelSel     = ( !empty($_POST['delsel']) ) ? TRUE : FALSE;
+	$DelDat     = ( !empty($_POST['deldat']) ) ? TRUE : FALSE;
 	$CurrPage   = ( !empty($_POST['curr'])   ) ? $_POST['curr'] : 1;
 	$Selected   = ( !empty($_POST['sele'])   ) ? $_POST['sele'] : 0;
 	$SelType    = $_POST['type'];
@@ -50,21 +36,22 @@
 		$ViewPage = ( !empty($SelPage) ) ? $SelPage : 1;
 	}
 
-	if($Prev   == true)
+	if($Prev   == TRUE)
 	{
 		$CurrPage -= 1;
 		if ($CurrPage >= 1)
 			$ViewPage = $CurrPage;
 		else
 			$ViewPage = 1;
+
 	}
-	elseif ($Next   == true && $_POST['page'])
+	elseif ($Next   == TRUE && $_POST['page'])
 	{
 		if ($Selected < 100)
-			$Mess      = doquery("SELECT COUNT(*) AS `max` FROM {{table}} WHERE `message_type` = '". $Selected ."';", 'messages', true);
+			$Mess      = doquery("SELECT COUNT(*) AS `max` FROM {{table}} WHERE `message_type` = '". $Selected ."';", 'messages', TRUE);
 		elseif ($Selected == 100)
-			$Mess      = doquery("SELECT COUNT(*) AS `max` FROM {{table}}", 'messages', true);
-			
+			$Mess      = doquery("SELECT COUNT(*) AS `max` FROM {{table}}", 'messages', TRUE);
+
 		$MaxPage   = ceil ( ($Mess['max'] / 25) );
 		$CurrPage += 1;
 		if ($CurrPage <= $MaxPage)
@@ -72,10 +59,10 @@
 		else
 			$ViewPage = $MaxPage;
 	}
-	
+
 	if ($_POST['delsel'] && $_POST['sele'] >= 1 && $_POST['page'])
 	{
-		if ($DelSel == true)
+		if ($DelSel == TRUE)
 		{
 			foreach($_POST['sele'] as $MessId => $Value)
 			{
@@ -84,17 +71,17 @@
 			}
 		}
 	}
-	
+
 	if ($_POST['deldat'] && $_POST['sele'] >= 1 && is_numeric($_POST['selday']) && is_numeric($_POST['selmonth']) && is_numeric($_POST['selyear'])
 		&& $_POST['page'])
 	{
-		if ($DelDat == true)
+		if ($DelDat == TRUE)
 		{
 			$SelDay    = $_POST['selday'];
 			$SelMonth  = $_POST['selmonth'];
 			$SelYear   = $_POST['selyear'];
 			$LimitDate = mktime (0,0,0, $SelMonth, $SelDay, $SelYear );
-			if ($LimitDate != false)
+			if ($LimitDate != FALSE)
 			{
 				doquery ( "DELETE FROM {{table}} WHERE `message_time` <= '". $LimitDate ."';", 'messages');
 				doquery ( "DELETE FROM {{table}} WHERE `time` <= '". $LimitDate ."';", 'rw');
@@ -103,10 +90,10 @@
 	}
 
 	if ($Selected < 100)
-		$Mess      = doquery("SELECT COUNT(*) AS `max` FROM {{table}} WHERE `message_type` = '". $Selected ."';", 'messages', true);
+		$Mess      = doquery("SELECT COUNT(*) AS `max` FROM {{table}} WHERE `message_type` = '". $Selected ."';", 'messages', TRUE);
 	elseif ($Selected == 100)
-		$Mess      = doquery("SELECT COUNT(*) AS `max` FROM {{table}}", 'messages', true);
-			
+		$Mess      = doquery("SELECT COUNT(*) AS `max` FROM {{table}}", 'messages', TRUE);
+
 	$MaxPage  = ceil ( ($Mess['max'] / 25) );
 
 	$parse['mlst_data_page']    = $ViewPage;
@@ -128,7 +115,8 @@
 		$parse['mlst_data_pages'] .= "<option value=\"".$cPage."\"".  (($ViewPage == $cPage)  ? " SELECTED" : "") .">". $cPage ."/". $MaxPage ."</option>";
 	}
 
-	$StartRec            = 1 + (($ViewPage - 1) * 25);
+	$StartRec            = ($ViewPage - 1) * 25;
+
 	if ($Selected < 100)
 		$Messages            = doquery("SELECT * FROM {{table}} WHERE `message_type` = '". $Selected ."' ORDER BY `message_time` DESC LIMIT ". $StartRec .",25;", 'messages');
 	elseif ($Selected == 100)
@@ -136,15 +124,15 @@
 
 		while ($row = mysql_fetch_assoc($Messages))
 		{
-			$OwnerData = doquery ("SELECT `username` FROM {{table}} WHERE `id` = '". $row['message_owner'] ."';", 'users',true);
+			$OwnerData = doquery ("SELECT `username` FROM {{table}} WHERE `id` = '". $row['message_owner'] ."';", 'users',TRUE);
 			$bloc['mlst_id']      = $row['message_id'];
 			$bloc['mlst_from']    = $row['message_from'];
 			$bloc['mlst_to']      = $OwnerData['username'] ." ".$lang['input_id'].":". $row['message_owner'];
 			$bloc['mlst_subject'] = $row['message_subject'];
 			$bloc['mlst_text']    = $row['message_text'];
-			$bloc['mlst_time']    = gmdate ("d/M/y H:i:s", $row['message_time'] );
+			$bloc['mlst_time']    = date ("d/M/y H:i:s", $row['message_time'] );
 
 			$parse['mlst_data_rows'] .= parsetemplate(gettemplate('adm/MessageListRows'), $bloc);
 		}
-	display (parsetemplate(gettemplate('adm/MessageListBody'), $parse), false, '', true, false);
+	display (parsetemplate(gettemplate('adm/MessageListBody'), $parse), FALSE, '', TRUE, FALSE);
 ?>
\ No newline at end of file
diff --git a/adm/Moderation.php b/adm/Moderation.php
index aaa1e65..33b77c7 100644
--- a/adm/Moderation.php
+++ b/adm/Moderation.php
@@ -1,32 +1,18 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 Neko from xgproyect.net	         #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
+
+include(XGP_ROOT . 'global.php');
 
 if ($user['authlevel'] < 3) die(message ($lang['404_page']));
 
@@ -35,7 +21,7 @@
 
 if ($_GET['moderation'] == '1')
 {
-	$QueryModeration	=	doquery("SELECT * FROM {{table}} WHERE `config_name` = 'moderation'", "config", true);
+	$QueryModeration	=	read_config ( 'moderation' );
 	$QueryModerationEx	=	explode(";", $QueryModeration[1]);
 	$Moderator			=	explode(",", $QueryModerationEx[0]);
 	$Operator			=	explode(",", $QueryModerationEx[1]);
@@ -76,6 +62,7 @@
 
 		if($_POST['view_o'] == 'on') $view_o = 1; else $view_o = 0;
 		if($_POST['edit_o'] == 'on') $edit_o = 1; else $edit_o = 0;
+
 		if($_POST['config_o'] == 'on') $config_o = 1; else $config_o = 0;
 		if($_POST['tools_o'] == 'on') $tools_o = 1; else $tools_o = 0;
 		if($_POST['log_o'] == 'on') $log_o = 1; else $log_o = 0;
@@ -103,12 +90,11 @@
 
 		LogFunction($Log, "ModerationLog", $LogCanWork);
 
-
-		doquery("UPDATE {{table}} SET `config_value` = '".$QueryEdit."' WHERE `config_name` = 'moderation'", "config");
-		header("Location: Moderation.php?moderation=1");
+		update_config ( 'moderation' , $QueryEdit );
+		header ( 'location:Moderation.php?moderation=1' );
 	}
 
-	display(parsetemplate(gettemplate('adm/ModerationBody'), $parse), false, '' , true, false);
+	display(parsetemplate(gettemplate('adm/ModerationBody'), $parse), FALSE, '' , TRUE, FALSE);
 }
 elseif ($_GET['moderation'] == '2')
 {
@@ -163,7 +149,7 @@
 					$id	=	$_POST['id_2'];
 
 
-				$QueryFind	=	doquery("SELECT `authlevel` FROM {{table}} WHERE `id` = '".$id."'", "users", true);
+				$QueryFind	=	doquery("SELECT `authlevel` FROM {{table}} WHERE `id` = '".$id."'", "users", TRUE);
 
 				if($QueryFind['authlevel'] != $_POST['authlevel'])
 				{
@@ -178,7 +164,7 @@
 
 					LogFunction($Log, "ModerationLog", $LogCanWork);
 
-					header ("Location: Moderation.php?moderation=2&succes=yes");
+					header ( 'location:Moderation.php?moderation=2&succes=yes' );
 				}
 				else
 				{
@@ -191,7 +177,7 @@
 			$parse['display']	=	'<tr><th colspan="3"><font color=lime>'.$lang['ad_authlevel_succes'].'</font></th></tr>';
 
 
-		display (parsetemplate(gettemplate("adm/AuthlevelBody"), $parse), false, '', true, false);
+		display (parsetemplate(gettemplate("adm/AuthlevelBody"), $parse), FALSE, '', TRUE, FALSE);
 }
 else
 {
diff --git a/adm/MoonListPage.php b/adm/MoonListPage.php
index 1fe1e08..5142f00 100644
--- a/adm/MoonListPage.php
+++ b/adm/MoonListPage.php
@@ -1,32 +1,18 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
-include('AdminFunctions/Autorization.' . $phpEx);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
+
+include(XGP_ROOT . 'global.php');
+include('AdminFunctions/Autorization.php');
 
 if ($Observation != 1) die();
 
@@ -52,5 +38,5 @@
 	else
 		$parse['moon'] .= "<tr><th class=b colspan=6>". $lang['mt_there_are'] . $i . $lang['mt_moons'] ."</th></tr>";
 
-	display(parsetemplate(gettemplate('adm/MoonListBody'), $parse), false, '', true, false);
+	display(parsetemplate(gettemplate('adm/MoonListBody'), $parse), FALSE, '', TRUE, FALSE);
 ?>
\ No newline at end of file
diff --git a/adm/MoonOptionsPage.php b/adm/MoonOptionsPage.php
index 6ec9b94..993afea 100644
--- a/adm/MoonOptionsPage.php
+++ b/adm/MoonOptionsPage.php
@@ -1,32 +1,18 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
-include('AdminFunctions/Autorization.' . $phpEx);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
+
+include(XGP_ROOT . 'global.php');
+include('AdminFunctions/Autorization.php');
 
 if ($EditUsers != 1) die();
 
@@ -41,10 +27,10 @@
 	$TempMin	= $_POST['temp_min'];
 	$TempMax	= $_POST['temp_max'];
 	$FieldMax	= $_POST['field_max'];
-	
+
 	$search			=	doquery("SELECT * FROM {{table}} WHERE `id` LIKE '%{$PlanetID}%'", "planets");
-	$MoonPlanet		= 	doquery("SELECT * FROM {{table}} WHERE `id` = '".$PlanetID."'", 'planets', true);
-	$MoonGalaxy		= 	doquery("SELECT * FROM {{table}} WHERE `id_planet` = '".$PlanetID."'", 'galaxy', true);
+	$MoonPlanet		= 	doquery("SELECT * FROM {{table}} WHERE `id` = '".$PlanetID."'", 'planets', TRUE);
+	$MoonGalaxy		= 	doquery("SELECT * FROM {{table}} WHERE `id_planet` = '".$PlanetID."'", 'galaxy', TRUE);
 
 
 if (mysql_num_rows($search) != 0)
@@ -72,8 +58,8 @@
 		{
 			message ($lang['mo_only_numbers'], "MoonOptionsPage.php", 2);
 		}
-				
-				
+
+
 		if ($_POST['temp_check']	==	'on')
 		{
 			$maxtemp	= $MoonPlanet['temp_max'] - rand(10, 45);
@@ -88,8 +74,8 @@
 		{
 			message ($lang['mo_only_numbers'], "MoonOptionsPage.php", 2);
 		}
-			$QueryFind	=	doquery("SELECT `id_level` FROM {{table}} WHERE `id` = '".$PlanetID."'", "planets", true);
-			
+			$QueryFind	=	doquery("SELECT `id_level` FROM {{table}} WHERE `id` = '".$PlanetID."'", "planets", TRUE);
+
 			$QryInsertMoonInPlanet  = "INSERT INTO {{table}} SET ";
 			$QryInsertMoonInPlanet .= "`name` = '".$MoonName."', ";
 			$QryInsertMoonInPlanet .= "`id_owner` = '". $Owner ."', ";
@@ -114,13 +100,13 @@
 			$QryInsertMoonInPlanet .= "`deuterium_perhour` = '0', ";
 			$QryInsertMoonInPlanet .= "`deuterium_max` = '".BASE_STORAGE_SIZE."';";
 			doquery( $QryInsertMoonInPlanet , 'planets');
-			
+
 			$QryGetMoonIdFromLunas  = "SELECT * FROM {{table}} WHERE ";
 			$QryGetMoonIdFromLunas .= "`galaxy` = '".  $Galaxy ."' AND ";
 			$QryGetMoonIdFromLunas .= "`system` = '".  $System ."' AND ";
 			$QryGetMoonIdFromLunas .= "`planet` = '". $Planet ."' AND ";
 			$QryGetMoonIdFromLunas .= "`planet_type` = '3';";
-			$PlanetRow = doquery( $QryGetMoonIdFromLunas , 'planets', true);
+			$PlanetRow = doquery( $QryGetMoonIdFromLunas , 'planets', TRUE);
 
 			$QryUpdateMoonInGalaxy  = "UPDATE {{table}} SET ";
 			$QryUpdateMoonInGalaxy .= "`id_luna` = '". $PlanetRow['id'] ."', ";
@@ -130,7 +116,7 @@
 			$QryUpdateMoonInGalaxy .= "`system` = '". $System ."' AND ";
 			$QryUpdateMoonInGalaxy .= "`planet` = '". $Planet ."';";
 			doquery( $QryUpdateMoonInGalaxy , 'galaxy');
-			
+
 			message ($lang['mo_moon_added'],"MoonOptionsPage.php",2);
 		}
 		else
@@ -150,14 +136,14 @@
 	$search	=	doquery("SELECT * FROM {{table}} WHERE `id` LIKE '%{$MoonID}%'", "planets");
 	if (mysql_num_rows($search) != 0)
 	{
-		$MoonSelected  			= doquery("SELECT * FROM {{table}} WHERE `id` = '". $MoonID ."'", 'planets', true);
-		
+		$MoonSelected  			= doquery("SELECT * FROM {{table}} WHERE `id` = '". $MoonID ."'", 'planets', TRUE);
+
 		if ($MoonSelected['planet_type'] == 3)
 		{
 			$Galaxy    = $MoonSelected['galaxy'];
 			$System    = $MoonSelected['system'];
 			$Planet    = $MoonSelected['planet'];
-		
+
 			doquery("DELETE FROM {{table}} WHERE `galaxy` ='".$Galaxy."' AND `system` ='".$System."' AND `planet` ='".$Planet."' AND `planet_type` = '3'",'planets');
 
 			$QryUpdateGalaxy  = "UPDATE {{table}} SET ";
@@ -199,6 +185,6 @@
 }
 
 
-display (parsetemplate(gettemplate("adm/MoonOptionsBody"), $parse), false, '', true, false);
+display (parsetemplate(gettemplate("adm/MoonOptionsBody"), $parse), FALSE, '', TRUE, FALSE);
 
 ?>
\ No newline at end of file
diff --git a/adm/OnlineUsersPage.php b/adm/OnlineUsersPage.php
index 1daddb4..2a902aa 100644
--- a/adm/OnlineUsersPage.php
+++ b/adm/OnlineUsersPage.php
@@ -1,32 +1,18 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
-include('AdminFunctions/Autorization.' . $phpEx);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
+
+include(XGP_ROOT . 'global.php');
+include('AdminFunctions/Autorization.php');
 
 if ($Observation != 1) die();
 
@@ -55,7 +41,8 @@
 	else
 		$Color = "lime";
 
-	$Bloc['dpath']              = $dpath;
+
+	$Bloc['dpath']              = DPATH;
 	$Bloc['adm_ov_data_id']     = $TheUser['id'];
 	$Bloc['adm_ov_data_name']   = $TheUser['username'];
 	$Bloc['adm_ov_data_agen']   = $TheUser['user_agent'];
@@ -89,6 +76,6 @@
 
 $parse['adm_ov_data_count']  	= $Count;
 
-display ( parsetemplate(gettemplate('adm/OnlineUsersBody'), $parse), false, '', true, false);
+display ( parsetemplate(gettemplate('adm/OnlineUsersBody'), $parse), FALSE, '', TRUE, FALSE);
 
 ?>
\ No newline at end of file
diff --git a/adm/OverviewPage.php b/adm/OverviewPage.php
index f0c2a51..831dc69 100644
--- a/adm/OverviewPage.php
+++ b/adm/OverviewPage.php
@@ -1,56 +1,40 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
 
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
+include(XGP_ROOT . 'global.php');
 
 if ($user['authlevel'] < 1) die(message ($lang['404_page']));
 
 function check_updates()
 {
-	global $game_config;
-
-	if (function_exists('file_get_contents'))
+	if ( function_exists ( 'file_get_contents' ) )
 	{
-		$current = @file_get_contents('http://www.xgproyect.net/xgproyect/current.php');
+		$current = @file_get_contents ( 'http://www.xgproyect.net/xgproyect/current.php' );
 
-		if ($current > $game_config['VERSION'])
+		if ( str_replace ( '.' , '' , $current ) > str_replace ( '.' , '' , read_config ( 'version' ) ) )
 		{
-			return true;
+			return TRUE;
 		}
 		else
 		{
-			return false;
+			return FALSE;
 		}
 	}
 }
 
 $parse	=	$lang;
 
-if(file_exists($xgp_root . 'install/') && defined('IN_ADMIN'))
+if(file_exists(XGP_ROOT . 'install/') && defined('IN_ADMIN'))
 {
 	$Message	.= "<font color=\"red\">".$lang['ow_install_file_detected']."</font><br/><br/>";
 	$error++;
@@ -64,7 +48,7 @@ function check_updates()
 		$error++;
 	}
 
-	$Errors = doquery("SELECT COUNT(*) AS `errors` FROM {{table}} WHERE 1;", 'errors', true);
+	$Errors = doquery("SELECT COUNT(*) AS `errors` FROM {{table}} WHERE 1;", 'errors', TRUE);
 
 	if($Errors['errors'] != 0)
 	{
@@ -90,5 +74,5 @@ function check_updates()
 }
 
 
-display( parsetemplate(gettemplate('adm/OverviewBody'), $parse), false, '', true, false);
+display( parsetemplate(gettemplate('adm/OverviewBody'), $parse), FALSE, '', TRUE, FALSE);
 ?>
\ No newline at end of file
diff --git a/adm/PassEncripterPage.php b/adm/PassEncripterPage.php
index fe8dbeb..7471b8f 100644
--- a/adm/PassEncripterPage.php
+++ b/adm/PassEncripterPage.php
@@ -1,31 +1,18 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
 
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
+include(XGP_ROOT . 'global.php');
+include('AdminFunctions/Autorization.php');
 
 if ($ToolsCanUse != 1) die(message ($lang['404_page']));
 
@@ -40,6 +27,6 @@
 		$parse['md5_md5'] = "";
 		$parse['md5_enc'] = md5 ("");
 	}
-	display(parsetemplate(gettemplate('adm/PassEncripterBody'), $parse), false, '', true, false);
+	display(parsetemplate(gettemplate('adm/PassEncripterBody'), $parse), FALSE, '', TRUE, FALSE);
 
 ?>
\ No newline at end of file
diff --git a/adm/PlanetListPage.php b/adm/PlanetListPage.php
index bc94611..4527fad 100644
--- a/adm/PlanetListPage.php
+++ b/adm/PlanetListPage.php
@@ -1,32 +1,18 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
-include('AdminFunctions/Autorization.' . $phpEx);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
+
+include(XGP_ROOT . 'global.php');
+include('AdminFunctions/Autorization.php');
 
 if ($Observation != 1) die();
 
@@ -51,6 +37,6 @@
 	else
 		$parse['lista_planetas'] .= "<tr><th class=b colspan=5>". $lang['pl_there_are'] . $i . $lang['pl_planets'] ."</th></tr>";
 
-	display(parsetemplate(gettemplate('adm/PlanetListBody'), $parse), false, '', true, false);
+	display(parsetemplate(gettemplate('adm/PlanetListBody'), $parse), FALSE, '', TRUE, FALSE);
 
 ?>
\ No newline at end of file
diff --git a/adm/PlanetsOptionsPage.php b/adm/PlanetsOptionsPage.php
index 941dc72..f09eb9f 100644
--- a/adm/PlanetsOptionsPage.php
+++ b/adm/PlanetsOptionsPage.php
@@ -1,32 +1,18 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By Neko from xgproyect.net	         #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
-include('AdminFunctions/Autorization.' . $phpEx);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
+
+include(XGP_ROOT . 'global.php');
+include('AdminFunctions/Autorization.php');
 
 if ($EditUsers != 1) die();
 
@@ -43,22 +29,23 @@
     $planet        = $_POST['planet'];
 
 	$i	=	0;
-	$QueryS	=	doquery("SELECT * FROM {{table}} WHERE `galaxy` = '".$galaxy."' AND `system` = '".$system."' AND `planet` = '".$planet."'", "galaxy", true);
-	$QueryS2	=	doquery("SELECT * FROM {{table}} WHERE `id` = '".$id."'", "users", true);
+	$QueryS	=	doquery("SELECT * FROM {{table}} WHERE `galaxy` = '".$galaxy."' AND `system` = '".$system."' AND `planet` = '".$planet."'", "galaxy", TRUE);
+	$QueryS2	=	doquery("SELECT * FROM {{table}} WHERE `id` = '".$id."'", "users", TRUE);
 	if (is_numeric($_POST['id']) && isset($_POST['id']) && !$QueryS && $QueryS2)
 	{
     	if ($galaxy < 1 or $system < 1 or $planet < 1 or !is_numeric($galaxy) or !is_numeric($system) or !is_numeric($planet)){
     		$Error	.=	'<tr><th colspan="2"><font color=red>'.$lang['po_complete_all'].'</font></th></tr>';
 			$i++;}
 
+
 		if ($galaxy > MAX_GALAXY_IN_WORLD or $system > MAX_SYSTEM_IN_GALAXY or $planet > MAX_PLANET_IN_SYSTEM){
 			$Error	.=	'<tr><th colspan="2"><font color=red>'.$lang['po_complete_all2'].'</font></th></tr>';
 			$i++;}
 
 		if ($i	==	0)
 		{
-			CreateOnePlanetRecord ($galaxy, $system, $planet, $id, '', '', false) ;
-			$QueryS3	=	doquery("SELECT * FROM {{table}} WHERE `id_owner` = '".$id."'", "planets", true);
+			CreateOnePlanetRecord ($galaxy, $system, $planet, $id, '', '', FALSE) ;
+			$QueryS3	=	doquery("SELECT * FROM {{table}} WHERE `id_owner` = '".$id."'", "planets", TRUE);
 			doquery("UPDATE {{table}} SET `id_level` = '".$QueryS3['id_level']."' WHERE
 			`galaxy` = '".$galaxy."' AND `system` = '".$system."' AND `planet` = '".$planet."' AND `planet_type` = '1'", "planets");
     		$parse['display']	=	'<tr><th colspan="2"><font color=lime>'.$lang['po_complete_succes'].'</font></th></tr>';
@@ -78,13 +65,13 @@
 	$id	=	$_POST['id'];
 	if (is_numeric($id) && isset($id))
 	{
-		$QueryS	=	doquery("SELECT * FROM {{table}} WHERE `id` = '".$id."'", "planets", true);
+		$QueryS	=	doquery("SELECT * FROM {{table}} WHERE `id` = '".$id."'", "planets", TRUE);
 
 		if ($QueryS)
 		{
 			if ($QueryS['planet_type'] == '1')
 			{
-				$QueryS2	=	doquery("SELECT * FROM {{table}} WHERE `id_planet` = '".$id."'", "galaxy", true);
+				$QueryS2	=	doquery("SELECT * FROM {{table}} WHERE `id_planet` = '".$id."'", "galaxy", TRUE);
 				if ($QueryS2['id_luna'] > 0)
 				{
 					doquery("DELETE FROM {{table}} WHERE `galaxy` = '".$QueryS['galaxy']."' AND `system` = '".$QueryS['system']."' AND
@@ -113,5 +100,5 @@
 }
 
 
-display (parsetemplate(gettemplate('adm/PlanetOptionsBody'),  $parse), false, '', true, false);
+display (parsetemplate(gettemplate('adm/PlanetOptionsBody'),  $parse), FALSE, '', TRUE, FALSE);
 ?>
\ No newline at end of file
diff --git a/adm/QueriesPage.php b/adm/QueriesPage.php
index 51cc62b..a15246f 100644
--- a/adm/QueriesPage.php
+++ b/adm/QueriesPage.php
@@ -1,31 +1,17 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By Neko from xgproyect.net	         #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-$xgp_root = '../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
+
+include(XGP_ROOT . 'global.php');
 
 if ($user['authlevel'] != 3) die(message ($lang['404_page']));
 
@@ -52,5 +38,5 @@
 	}
 }
 
-display(parsetemplate(gettemplate('adm/QueriesBody'), $parse), false, '', true, false);
+display(parsetemplate(gettemplate('adm/QueriesBody'), $parse), FALSE, '', TRUE, FALSE);
 ?>
\ No newline at end of file
diff --git a/adm/ResetPage.php b/adm/ResetPage.php
index 00a2ce8..9a7ab04 100644
--- a/adm/ResetPage.php
+++ b/adm/ResetPage.php
@@ -1,31 +1,17 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.'.$phpEx);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
+
+include(XGP_ROOT . 'global.php');
 
 if ($user['authlevel'] != 3) die(message ($lang['404_page']));
 
@@ -34,8 +20,6 @@
 
 function ResetUniverse ( $CurrentUser )
 {
-	global $phpEx;
-
 		doquery( "RENAME TABLE {{table}} TO {{table}}_s", 'planets' );
 		doquery( "RENAME TABLE {{table}} TO {{table}}_s", 'users' );
 
@@ -61,7 +45,7 @@ function ResetUniverse ( $CurrentUser )
 		{
 			if ( $TheUser['onlinetime'] > $LimitTime )
 			{
-				$UserPlanet     = doquery ("SELECT `name` FROM {{table}} WHERE `id` = '". $TheUser['id_planet']."';", 'planets_s', true);
+				$UserPlanet     = doquery ("SELECT `name` FROM {{table}} WHERE `id` = '". $TheUser['id_planet']."';", 'planets_s', TRUE);
 				if ($UserPlanet['name'] != "")
 				{
 					$Time	=	time();
@@ -82,12 +66,13 @@ function ResetUniverse ( $CurrentUser )
 					doquery( $QryInsertUser, 'users');
 					doquery("UPDATE {{table}} SET `bana` = '0' WHERE `id` > '1'", "users");
 
-					$NewUser        = doquery("SELECT `id` FROM {{table}} WHERE `username` = '". $TheUser['username'] ."' LIMIT 1;", 'users', true);
+					$NewUser        = doquery("SELECT `id` FROM {{table}} WHERE `username` = '". $TheUser['username'] ."' LIMIT 1;", 'users', TRUE);
+
+					CreateOnePlanetRecord ($TheUser['galaxy'], $TheUser['system'], $TheUser['planet'], $NewUser['id'], $UserPlanet['name'], TRUE);
 
-					CreateOnePlanetRecord ($TheUser['galaxy'], $TheUser['system'], $TheUser['planet'], $NewUser['id'], $UserPlanet['name'], true);
 
 					doquery("UPDATE {{table}} SET `id_level` = '".$TheUser['authlevel']."' WHERE `id_owner` = '".$NewUser['id']."'", "planets");
-					$PlanetID       = doquery("SELECT `id` FROM {{table}} WHERE `id_owner` = '". $NewUser['id'] ."' LIMIT 1;", 'planets', true);
+					$PlanetID       = doquery("SELECT `id` FROM {{table}} WHERE `id_owner` = '". $NewUser['id'] ."' LIMIT 1;", 'planets', TRUE);
 
 					$QryUpdateUser  = "UPDATE {{table}} SET ";
 					$QryUpdateUser .= "`id_planet` = '".      $PlanetID['id'] ."', ";
@@ -99,7 +84,8 @@ function ResetUniverse ( $CurrentUser )
 				}
 			}
 		}
-		doquery("UPDATE {{table}} SET `config_value` = '". $TransUser ."' WHERE `config_name` = 'users_amount' LIMIT 1;", 'config');
+
+		update_config ( 'users_amount' , $TransUser );
 		doquery("DROP TABLE {{table}}", 'planets_s');
 		doquery("DROP TABLE {{table}}", 'users_s');
 }
@@ -114,7 +100,7 @@ function ResetUniverse ( $CurrentUser )
 	if ($_POST['defenses']	==	'on'){
 		doquery("UPDATE {{table}} SET `misil_launcher` = '0', `small_laser` = '0', `big_laser` = '0',
 									`gauss_canyon` = '0', `ionic_canyon` = '0', `buster_canyon` = '0',
-									`small_protection_shield` = '0', `planet_protector` = '0', `big_protection_shield` = '0',
+									`small_protection_shield` = '0', `big_protection_shield` = '0',
 									`interceptor_misil` = '0', `interplanetary_misil` = '0'", "planets");
 		$Log	.=	$lang['log_defenses']."\n";}
 
@@ -123,7 +109,7 @@ function ResetUniverse ( $CurrentUser )
 									`heavy_hunter` = '0', `crusher` = '0', `battle_ship` = '0',
 									`colonizer` = '0', `recycler` = '0', `spy_sonde` = '0',
 									`bomber_ship` = '0', `solar_satelit` = '0', `destructor` = '0',
-									`dearth_star` = '0', `battleship` = '0', `supernova` = '0'", "planets");
+									`dearth_star` = '0', `battleship` = '0'", "planets");
 		$Log	.=	$lang['log_ships']."\n";}
 
 	if ($_POST['h_d']	==	'on'){
@@ -166,8 +152,7 @@ function ResetUniverse ( $CurrentUser )
 
 	if ($_POST['ofis']	==	'on'){
 		doquery("UPDATE {{table}} SET `rpg_geologue` = '0', `rpg_amiral` = '0', `rpg_ingenieur` = '0',
-									`rpg_technocrate` = '0', `rpg_espion` = '0', `rpg_constructeur` = '0',
-									`rpg_scientifique` = '0', `rpg_commandant` = '0', `rpg_stockeur` = '0'", "users");
+									`rpg_technocrate` = '0'", "users");
 		$Log	.=	$lang['log_officiers']."\n";}
 
 	if ($_POST['inves_c']	==	'on'){
@@ -246,5 +231,5 @@ function ResetUniverse ( $CurrentUser )
 }
 
 
-display(parsetemplate(gettemplate('adm/ResetBody'), $parse), false, '', true, false);
+display(parsetemplate(gettemplate('adm/ResetBody'), $parse), FALSE, '', TRUE, FALSE);
 ?>
\ No newline at end of file
diff --git a/adm/SearchInDBPage.php b/adm/SearchInDBPage.php
index 22961cc..14a39a4 100644
--- a/adm/SearchInDBPage.php
+++ b/adm/SearchInDBPage.php
@@ -1,32 +1,18 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By Neko from xgproyect.net	         #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
-include('AdminFunctions/Autorization.' . $phpEx);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
+
+include(XGP_ROOT . 'global.php');
+include('AdminFunctions/Autorization.php');
 
 if ($Observation != 1) die();
 
@@ -89,7 +75,7 @@
 				</tr>
 				</table>';
 
-	$QueryFind	=	doquery("SELECT * FROM {{table}}", "users", true);
+	$QueryFind	=	doquery("SELECT * FROM {{table}}", "users", TRUE);
 	$ORDERBY	=	$_POST['key_order'];
 	$ORDERBY2	=	$_POST['key_acc'];
 	if (!$ORDERBY || !$QueryFind[$ORDERBY])
@@ -150,7 +136,7 @@
 	{
 		$parse['error']	=	$lang['se_no_data'];
 	}
-	display(parsetemplate(gettemplate('adm/SearchInDBBody'), $parse), false, '', true, false);
+	display(parsetemplate(gettemplate('adm/SearchInDBBody'), $parse), FALSE, '', TRUE, FALSE);
 	break;
 
 
@@ -202,7 +188,7 @@
 				</tr>
 				</table>';
 
-	$QueryFind	=	doquery("SELECT * FROM {{table}}", "planets", true);
+	$QueryFind	=	doquery("SELECT * FROM {{table}}", "planets", TRUE);
 	$ORDERBY	=	$_POST['key_order'];
 	$ORDERBY2	=	$_POST['key_acc'];
 	if (!$ORDERBY || !$QueryFind[$ORDERBY])
@@ -235,7 +221,7 @@
 			$s			=	$planet['system'];
 			$p			=	$planet['planet'];
 
-			$QueryFiind	=	doquery("SELECT `id_luna` FROM {{table}} WHERE `galaxy` = '".$g."' AND `system` = '".$s."' AND `planet` = '".$p."'", "galaxy", true);
+			$QueryFiind	=	doquery("SELECT `id_luna` FROM {{table}} WHERE `galaxy` = '".$g."' AND `system` = '".$s."' AND `planet` = '".$p."'", "galaxy", TRUE);
 
 			if ($QueryFiind['id_luna']	!=	'0')
 				$moons	=	"<font color=lime>".$lang['se_yes']."</font>";
@@ -254,7 +240,7 @@
 			$parse['table3']	 =	"<tr><th colspan=\"20\">".$lang['se_input_hay'].$cnt.$lang['se_input_planett']."</th></tr></table>";
 		}
 	}
-	display(parsetemplate(gettemplate('adm/SearchInDBBody'), $parse), false, '', true, false);
+	display(parsetemplate(gettemplate('adm/SearchInDBBody'), $parse), FALSE, '', TRUE, FALSE);
 	break;
 
 
@@ -306,7 +292,7 @@
 				</tr>
 				</table>';
 
-	$QueryFind	=	doquery("SELECT * FROM {{table}}", "planets", true);
+	$QueryFind	=	doquery("SELECT * FROM {{table}}", "planets", TRUE);
 	$ORDERBY	=	$_POST['key_order'];
 	$ORDERBY2	=	$_POST['key_acc'];
 	if (!$ORDERBY || !$QueryFind[$ORDERBY])
@@ -351,7 +337,7 @@
 			$parse['table3']	 =	"<tr><th colspan=\"20\">".$lang['se_input_hay'].$cnt.$lang['se_input_moonn']."</th></tr></table>";
 		}
 	}
-	display(parsetemplate(gettemplate('adm/SearchInDBBody'), $parse), false, '', true, false);
+	display(parsetemplate(gettemplate('adm/SearchInDBBody'), $parse), FALSE, '', TRUE, FALSE);
 	break;
 
 	// ALIANZAS ####################################################################
@@ -402,7 +388,7 @@
 				</tr>
 				</table>';
 
-	$QueryFind	=	doquery("SELECT * FROM {{table}}", "alliance", true);
+	$QueryFind	=	doquery("SELECT * FROM {{table}}", "alliance", TRUE);
 	$ORDERBY	=	$_POST['key_order'];
 	$ORDERBY2	=	$_POST['key_acc'];
 	if (!$ORDERBY || !$QueryFind[$ORDERBY])
@@ -448,7 +434,7 @@
 			$parse['table3']	 =	"<tr><th colspan=\"20\">".$lang['se_input_hay'].$cnt.$lang['se_input_allyy']."</th></tr></table>";
 		}
 	}
-	display(parsetemplate(gettemplate('adm/SearchInDBBody'), $parse), false, '', true, false);
+	display(parsetemplate(gettemplate('adm/SearchInDBBody'), $parse), FALSE, '', TRUE, FALSE);
 	break;
 
 
@@ -492,7 +478,7 @@
 				</tr>
 				</table>';
 
-	$QueryFind	=	doquery("SELECT * FROM {{table}}", "users", true);
+	$QueryFind	=	doquery("SELECT * FROM {{table}}", "users", TRUE);
 	$ORDERBY	=	$_POST['key_order'];
 	$ORDERBY2	=	$_POST['key_acc'];
 	if (!$ORDERBY || !$QueryFind[$ORDERBY])
@@ -544,7 +530,7 @@
 			$parse['table3']	 =	"<tr><th colspan=\"20\">".$lang['se_input_hay'].$cnt.$lang['se_input_vacatii']."</th></tr></table>";
 		}
 	}
-	display(parsetemplate(gettemplate('adm/SearchInDBBody'), $parse), false, '', true, false);
+	display(parsetemplate(gettemplate('adm/SearchInDBBody'), $parse), FALSE, '', TRUE, FALSE);
 	break;
 
 
@@ -588,7 +574,7 @@
 				</tr>
 				</table>';
 
-	$QueryFind	=	doquery("SELECT * FROM {{table}}", "banned", true);
+	$QueryFind	=	doquery("SELECT * FROM {{table}}", "banned", TRUE);
 	$ORDERBY	=	$_POST['key_order'];
 	$ORDERBY2	=	$_POST['key_acc'];
 	if (!$ORDERBY || !$QueryFind[$ORDERBY])
@@ -636,7 +622,7 @@
 			$parse['table3']	 =	"<tr><th colspan=\"20\">".$lang['se_input_hay'].$cnt.$lang['se_input_susss']."</th></tr></table>";
 		}
 	}
-	display(parsetemplate(gettemplate('adm/SearchInDBBody'), $parse), false, '', true, false);
+	display(parsetemplate(gettemplate('adm/SearchInDBBody'), $parse), FALSE, '', TRUE, FALSE);
 	break;
 
 
@@ -680,7 +666,7 @@
 				</tr>
 				</table>';
 
-	$QueryFind	=	doquery("SELECT * FROM {{table}}", "users", true);
+	$QueryFind	=	doquery("SELECT * FROM {{table}}", "users", TRUE);
 	$ORDERBY	=	$_POST['key_order'];
 	$ORDERBY2	=	$_POST['key_acc'];
 	if (!$ORDERBY || !$QueryFind[$ORDERBY])
@@ -704,6 +690,7 @@
 	}
 	else
 	{
+
 		while ($admin	=	mysql_fetch_array($search))
 		{
 			$id			=	$admin['id'];
@@ -732,7 +719,7 @@
 			$parse['table3']	 =	"<tr><th colspan=\"20\">".$lang['se_input_hay'].$cnt.$lang['se_input_admm']."</th></tr></table>";
 		}
 	}
-	display(parsetemplate(gettemplate('adm/SearchInDBBody'), $parse), false, '', true, false);
+	display(parsetemplate(gettemplate('adm/SearchInDBBody'), $parse), FALSE, '', TRUE, FALSE);
 	break;
 
 
@@ -774,7 +761,7 @@
 				</tr>
 				</table>';
 
-	$QueryFind	=	doquery("SELECT * FROM {{table}}", "users", true);
+	$QueryFind	=	doquery("SELECT * FROM {{table}}", "users", TRUE);
 	$ORDERBY	=	$_POST['key_order'];
 	$ORDERBY2	=	$_POST['key_acc'];
 	if (!$ORDERBY || !$QueryFind[$ORDERBY])
@@ -830,10 +817,10 @@
 		}
 
 	}
-	display(parsetemplate(gettemplate('adm/SearchInDBBody'), $parse), false, '', true, false);
+	display(parsetemplate(gettemplate('adm/SearchInDBBody'), $parse), FALSE, '', TRUE, FALSE);
 	break;
 
 	default:
-	display(parsetemplate(gettemplate('adm/SearchInDBBody'), $parse), false, '', true, false);
+	display(parsetemplate(gettemplate('adm/SearchInDBBody'), $parse), FALSE, '', TRUE, FALSE);
 }
 ?>
\ No newline at end of file
diff --git a/adm/SearchingPage.php b/adm/SearchingPage.php
index 685ef5f..84e7936 100644
--- a/adm/SearchingPage.php
+++ b/adm/SearchingPage.php
@@ -1,31 +1,17 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By Neko from xgproyect.net	         #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2012
+ */
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
+
+include(XGP_ROOT . 'global.php');
 
 if ($Observation != 1) die(message ($lang['404_page']));
 
@@ -36,7 +22,7 @@
 
 function MyCrazyLittleSearch($SpecifyItems, $WhereItem, $SpecifyWhere, $SpecialSpecify, $Order, $OrderBY, $Limit, $Table, $Page, $NameLang, $ArrayOSec, $Minimize, $SName)
 {
-	global $user, $phpEx, $xgp_root, $lang, $EditUsers;
+	global $user, $lang, $EditUsers;
 
 	$parse	=	$lang;
 
@@ -66,7 +52,7 @@ function MyCrazyLittleSearch($SpecifyItems, $WhereItem, $SpecifyWhere, $SpecialS
 	$QueryCSearch	 =	"SELECT COUNT(".$ArrayEx[0].") AS `total` FROM {{table}} ";
 	$QueryCSearch	.=	$WhereItem." ";
 	$QueryCSearch	.=	$SpecifyWhere." ".$SpecialSpecify." ";
-	$CountQuery		=	doquery($QueryCSearch, $Table, true);
+	$CountQuery		=	doquery($QueryCSearch, $Table, TRUE);
 
 	if ($CountQuery['total'] > 0)
 	{
@@ -192,7 +178,7 @@ function MyCrazyLittleSearch($SpecifyItems, $WhereItem, $SpecifyWhere, $SpecialS
 
 				if($_GET['search'] == 'planet')
 				{
-				$QueryForMoons	=	doquery("SELECT id_luna FROM {{table}} WHERE id_planet = '".$WhileResult[0]."'", "galaxy", true);
+				$QueryForMoons	=	doquery("SELECT id_luna FROM {{table}} WHERE id_planet = '".$WhileResult[0]."'", "galaxy", TRUE);
 				(($QueryForMoons['id_luna'] > '0')	? $QueryForMoons2 = "<font color=lime>".$lang['one_is_yes'][1]."</font>" : $QueryForMoons2 = $lang['one_is_yes'][0]);
 				$Search['LIST']	.=	"<th>".$QueryForMoons2."</th>";}
 
@@ -227,7 +213,7 @@ function MyCrazyLittleSearch($SpecifyItems, $WhereItem, $SpecifyWhere, $SpecialS
 }
 
 // BORRADO
-include_once($xgp_root . 'includes/functions/DeleteSelectedUser.' . $phpEx);
+include_once(XGP_ROOT . 'includes/functions/DeleteSelectedUser.php');
 if ($_GET['delete'] == 'user'){
 	DeleteSelectedUser ($_GET['user']);
 	$Log	.=	"\n".$lang['log_searchindb_del1'].$_GET['user'].$lang['log_searchindb_del2'].$user['username']."\n";
@@ -436,5 +422,5 @@ function MyCrazyLittleSearch($SpecifyItems, $WhereItem, $SpecifyWhere, $SpecialS
 $parse['TimeToCreatePage']	=	$lang['se_time_of_page'].$Time_Two."&nbsp;".$lang['time_seconds'];
 
 
-display(parsetemplate(gettemplate('adm/SearchInDBBody'), $parse), false, '', true, false);
+display(parsetemplate(gettemplate('adm/SearchInDBBody'), $parse), FALSE, '', TRUE, FALSE);
 ?>
\ No newline at end of file
diff --git a/adm/SettingsPage.php b/adm/SettingsPage.php
index cce8010..87d251a 100644
--- a/adm/SettingsPage.php
+++ b/adm/SettingsPage.php
@@ -1,44 +1,31 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
+
+include(XGP_ROOT . 'global.php');
 
 if ($ConfigGame != 1) die(message ($lang['404_page']));
 $AreLog	=	$LogCanWork;
 
 function DisplayGameSettingsPage ( $CurrentUser )
 {
-	global $game_config, $lang, $AreLog;
+	global $lang, $AreLog;
 
-	if ($_POST['opt_save'] == "1")
+	$game_config	= 	read_config ( '' , TRUE );
+
+	if ( $_POST['opt_save'] == "1" )
 	{
 		$Log	.=	"\n".$lang['log_the_user'].$user['username'].$lang['log_sett_no1'].":\n";
 
-
 		if (isset($_POST['closed']) && $_POST['closed'] == 'on') {
 		$game_config['game_disable']         = 1;
 		$game_config['close_reason']         = addslashes( $_POST['close_reason'] );
@@ -119,16 +106,16 @@ function DisplayGameSettingsPage ( $CurrentUser )
 		}
 
 		if (isset($_POST['cookie_name']) && $_POST['game_name'] != '') {
-			$game_config['COOKIE_NAME'] = $_POST['cookie_name'];
+			$game_config['cookie_name'] = $_POST['cookie_name'];
 			$Log	.=	$lang['log_sett_name_cookie'].": ".$_POST['cookie_name']."\n";
 		}
 
 		if (isset($_POST['Defs_Cdr']) && is_numeric($_POST['Defs_Cdr'])) {
 			if ($_POST['Defs_Cdr'] < 0){
-				$game_config['Defs_Cdr'] = 0;
+				$game_config['defs_cdr'] = 0;
 				$Number	=	0;}
 			else{
-				$game_config['Defs_Cdr'] = $_POST['Defs_Cdr'];
+				$game_config['defs_cdr'] = $_POST['Defs_Cdr'];
 				$Number	=	$_POST['Defs_Cdr'];}
 
 			$Log	.=	$lang['log_sett_debris_def'].": ".$Number."%\n";
@@ -136,10 +123,10 @@ function DisplayGameSettingsPage ( $CurrentUser )
 
 		if (isset($_POST['Fleet_Cdr']) && is_numeric($_POST['Fleet_Cdr'])) {
 			if ($_POST['Fleet_Cdr'] < 0){
-				$game_config['Fleet_Cdr'] = 0;
+				$game_config['fleet_cdr'] = 0;
 				$Number2	=	0;}
 			else{
-				$game_config['Fleet_Cdr'] = $_POST['Fleet_Cdr'];
+				$game_config['fleet_cdr'] = $_POST['Fleet_Cdr'];
 				$Number2	=	$_POST['Fleet_Cdr'];}
 
 			$Log	.=	$lang['log_sett_debris_flot'].": ".$Number2."%\n";
@@ -166,28 +153,28 @@ function DisplayGameSettingsPage ( $CurrentUser )
 
 		LogFunction($Log, "ConfigLog", $AreLog);
 
-		doquery("UPDATE {{table}} SET `config_value` = '". $game_config['game_disable']           ."' WHERE `config_name` = 'game_disable';", 'config');
-		doquery("UPDATE {{table}} SET `config_value` = '". $game_config['close_reason']           ."' WHERE `config_name` = 'close_reason';", 'config');
-		doquery("UPDATE {{table}} SET `config_value` = '". $game_config['game_name']              ."' WHERE `config_name` = 'game_name';", 'config');
-		doquery("UPDATE {{table}} SET `config_value` = '". $game_config['forum_url']              ."' WHERE `config_name` = 'forum_url';", 'config');
-		doquery("UPDATE {{table}} SET `config_value` = '". $game_config['game_speed']             ."' WHERE `config_name` = 'game_speed';", 'config');
-		doquery("UPDATE {{table}} SET `config_value` = '". $game_config['fleet_speed']            ."' WHERE `config_name` = 'fleet_speed';", 'config');
-		doquery("UPDATE {{table}} SET `config_value` = '". $game_config['resource_multiplier']    ."' WHERE `config_name` = 'resource_multiplier';", 'config');
-		doquery("UPDATE {{table}} SET `config_value` = '". $game_config['initial_fields']         ."' WHERE `config_name` = 'initial_fields';", 'config');
-		doquery("UPDATE {{table}} SET `config_value` = '". $game_config['metal_basic_income']     ."' WHERE `config_name` = 'metal_basic_income';", 'config');
-		doquery("UPDATE {{table}} SET `config_value` = '". $game_config['crystal_basic_income']   ."' WHERE `config_name` = 'crystal_basic_income';", 'config');
-		doquery("UPDATE {{table}} SET `config_value` = '". $game_config['deuterium_basic_income'] ."' WHERE `config_name` = 'deuterium_basic_income';", 'config');
-		doquery("UPDATE {{table}} SET `config_value` = '" .$game_config['debug']                  ."' WHERE `config_name` = 'debug'", 'config');
-		doquery("UPDATE {{table}} SET `config_value` = '" .$game_config['adm_attack']             ."' WHERE `config_name` = 'adm_attack'", 'config');
-		doquery("UPDATE {{table}} SET `config_value` = '" .$game_config['lang']             	  ."' WHERE `config_name` = 'lang'", 'config');
-		doquery("UPDATE {{table}} SET `config_value` = '" .$game_config['COOKIE_NAME'] 			  ."' WHERE `config_name` = 'COOKIE_NAME';", 'config');
-		doquery("UPDATE {{table}} SET `config_value` = '" .$game_config['noobprotection']         ."' WHERE `config_name` = 'noobprotection'", 'config');
-		doquery("UPDATE {{table}} SET `config_value` = '" .$game_config['Defs_Cdr'] 	  		  ."' WHERE `config_name` = 'Defs_Cdr';", 'config');
-		doquery("UPDATE {{table}} SET `config_value` = '" .$game_config['Fleet_Cdr'] 	  		  ."' WHERE `config_name` = 'Fleet_Cdr';", 'config');
-		doquery("UPDATE {{table}} SET `config_value` = '" .$game_config['noobprotectiontime'] 	  ."' WHERE `config_name` = 'noobprotectiontime';", 'config');
-		doquery("UPDATE {{table}} SET `config_value` = '" .$game_config['noobprotectionmulti'] 	  ."' WHERE `config_name` = 'noobprotectionmulti';", 'config');
-
-		header("location:SettingsPage.php");
+		update_config ( 'game_disable'				, $game_config['game_disable'] 			);
+		update_config ( 'close_reason' 				, $game_config['close_reason'] 			);
+		update_config ( 'game_name' 				, $game_config['game_name'] 				);
+		update_config ( 'forum_url' 				, $game_config['forum_url'] 				);
+		update_config ( 'game_speed' 				, $game_config['game_speed'] 				);
+		update_config ( 'fleet_speed' 				, $game_config['fleet_speed']            	);
+		update_config ( 'resource_multiplier' 		, $game_config['resource_multiplier']    	);
+		update_config ( 'initial_fields' 			, $game_config['initial_fields']         	);
+		update_config ( 'metal_basic_income' 		, $game_config['metal_basic_income']     	);
+		update_config ( 'crystal_basic_income' 		, $game_config['crystal_basic_income']   	);
+		update_config ( 'deuterium_basic_income'	, $game_config['deuterium_basic_income']	);
+		update_config ( 'debug' 					, $game_config['debug'] 					);
+		update_config ( 'adm_attack' 				, $game_config['adm_attack'] 				);
+		update_config ( 'lang' 						, $game_config['lang'] 					);
+		update_config ( 'cookie_name' 				, $game_config['cookie_name'] 			);
+		update_config ( 'noobprotection' 			, $game_config['noobprotection'] 			);
+		update_config ( 'defs_cdr' 					, $game_config['defs_cdr'] 				);
+		update_config ( 'fleet_cdr' 				, $game_config['fleet_cdr'] 				);
+		update_config ( 'noobprotectiontime' 		, $game_config['noobprotectiontime'] 		);
+		update_config ( 'noobprotectionmulti' 		, $game_config['noobprotectionmulti'] 	);
+
+		header ( 'location:SettingsPage.php' );
 	}
 	else
 	{
@@ -205,18 +192,18 @@ function DisplayGameSettingsPage ( $CurrentUser )
 		$parse['close_reason']           	= stripslashes($game_config['close_reason']);
 		$parse['debug']                  	= ($game_config['debug'] == 1)        ? " checked = 'checked' ":"";
 		$parse['adm_attack']             	= ($game_config['adm_attack'] == 1)   ? " checked = 'checked' ":"";
-		$parse['cookie'] 					= $game_config['COOKIE_NAME'];
-		$parse['defenses'] 					= $game_config['Defs_Cdr'];
-		$parse['shiips'] 					= $game_config['Fleet_Cdr'];
+		$parse['cookie'] 					= $game_config['cookie_name'];
+		$parse['defenses'] 					= $game_config['defs_cdr'];
+		$parse['shiips'] 					= $game_config['fleet_cdr'];
 		$parse['noobprot']            	 	= ($game_config['noobprotection'] == 1)   ? " checked = 'checked' ":"";
 		$parse['noobprot2'] 				= $game_config['noobprotectiontime'];
 		$parse['noobprot3'] 				= $game_config['noobprotectionmulti'];
 
 		$LangFolder = opendir("./../" . 'language');
 
-		while (($LangSubFolder = readdir($LangFolder)) !== false)
+		while (($LangSubFolder = readdir($LangFolder)) !== FALSE)
 		{
-			if($LangSubFolder != '.' && $LangSubFolder != '..' && $LangSubFolder != '.htaccess' && $LangSubFolder != '.svn')
+			if($LangSubFolder != '.' && $LangSubFolder != '..' && $LangSubFolder != '.htaccess' && $LangSubFolder != '.svn' && $LangSubFolder != 'index.html')
 			{
 				$parse['language_settings'] .= "<option ";
 
@@ -227,7 +214,7 @@ function DisplayGameSettingsPage ( $CurrentUser )
 			}
 		}
 
-		return display (parsetemplate(gettemplate('adm/SettingsBody'),  $parse), false, '', true, false);
+		return display (parsetemplate(gettemplate('adm/SettingsBody'),  $parse), FALSE, '', TRUE, FALSE);
 	}
 }
 
diff --git a/adm/ShowFlyingFleets.php b/adm/ShowFlyingFleets.php
index 5430ced..dab776f 100644
--- a/adm/ShowFlyingFleets.php
+++ b/adm/ShowFlyingFleets.php
@@ -1,33 +1,19 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
 
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
-include($xgp_root . 'includes/classes/class.FlyingFleetsTable.' . $phpEx);
-include('AdminFunctions/Autorization.' . $phpEx);
+include(XGP_ROOT . 'global.php');
+include(XGP_ROOT . 'includes/classes/class.FlyingFleetsTable.php');
+include('AdminFunctions/Autorization.php');
 
 if ($Observation != 1) die();
 
@@ -35,5 +21,5 @@
 $FlyingFleetsTable 	= new FlyingFleetsTable();
 $parse['flt_table'] = $FlyingFleetsTable->BuildFlyingFleetTable();
 
-display(parsetemplate(gettemplate('adm/fleet_body'), $parse), false, '', true, false);
+display(parsetemplate(gettemplate('adm/fleet_body'), $parse), FALSE, '', TRUE, FALSE);
 ?>
\ No newline at end of file
diff --git a/adm/UserListPage.php b/adm/UserListPage.php
index 503dac1..344a6f8 100644
--- a/adm/UserListPage.php
+++ b/adm/UserListPage.php
@@ -1,33 +1,19 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
+define('INSIDE'  ,    TRUE);
+define('INSTALL' ,   FALSE);
+define('IN_ADMIN',    TRUE);
+define('XGP_ROOT', './../');
 
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
-include($xgp_root . 'includes/functions/DeleteSelectedUser.' . $phpEx);
-include('AdminFunctions/Autorization.' . $phpEx);
+include(XGP_ROOT . 'global.php');
+include(XGP_ROOT . 'includes/functions/DeleteSelectedUser.php');
+include('AdminFunctions/Autorization.php');
 
 if ($Observation != 1) die();
 
@@ -67,9 +53,10 @@
 		$PrevIP                     		= $u['user_lastip'];
 		$parse['adm_ul_table']     			.= parsetemplate(gettemplate('adm/UserListRows'), $Bloc);
 		$i++;
+
 	}
 	$parse['adm_ul_count'] 					= $i;
 
-	display( parsetemplate( gettemplate('adm/UserListBody'), $parse ), false, '', true, false);
+	display( parsetemplate( gettemplate('adm/UserListBody'), $parse ), FALSE, '', TRUE, FALSE);
 
 ?>
\ No newline at end of file
diff --git a/adm/chat.php b/adm/chat.php
deleted file mode 100644
index 598d79d..0000000
--- a/adm/chat.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * chat.php
- *
- * @version 1
- * @copyright 2008 By e-Zobar for XNova
- */
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
-if ($user['authlevel'] >= 3) {
-     // Systeme de suppression
-     $parse    = $lang;
-     extract($_GET);
-     if (isset($delete)) {
-         doquery("DELETE FROM {{table}} WHERE `messageid`=".$delete, 'chat');
-       } elseif ($deleteall == 'yes') {
-           doquery("DELETE FROM {{table}}", 'chat');
-       }
-
-        // Affichage des messages
-        $query = doquery("SELECT * FROM {{table}} ORDER BY messageid DESC LIMIT 25", 'chat');
-        $i = 0;
-        while ($e = mysql_fetch_array($query)) {
-            $i++;
-            $parse['msg_list'] .= stripslashes("<tr><td class=n rowspan=2>{$e['messageid']}</td>" .
-            "<td class=n style=color:red;><center><a href=?delete={$e['messageid']}><img src=\"/styles/images/r1.png\"></a></center></td>" .
-            "<td class=n><center>{$e['user']}</center></td>" .
-            "<td class=n><center>" . date('d/m/Y - h:i:s', $e['timestamp']) . "</center></td></tr><tr>" .
-            "<td class=b colspan=4 width=700>" . nl2br($e['message']) . "</td></tr>");
-        }
-        $parse['msg_list'] .= "<tr><th class=b colspan=4>Ñîîáùåíèé <font color=lime>{$i} </font> ".$lang['ch_nbs']."</th></tr>";
-
-        display(parsetemplate(gettemplate('adm/chat_body'), $parse),false, '', true, false);
-    } else {
-        message ($lang['not_enough_permissions']);
-    }
-?>
\ No newline at end of file
diff --git a/styles/skins/New-Year!/gfx/index.html b/adm/index.html
similarity index 100%
rename from styles/skins/New-Year!/gfx/index.html
rename to adm/index.html
diff --git a/adm/index.php b/adm/index.php
index b52d504..41a7d90 100644
--- a/adm/index.php
+++ b/adm/index.php
@@ -1,38 +1,24 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
 
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
+include(XGP_ROOT . 'global.php');
 
 if ($user['authlevel'] < 1) die(message ($lang['404_page']));
 
 	$page  = "<html>\n";
 	$page .= "<head>\n";
-	$page .= "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=cp1251\" />\n";
-	$page .= "<title>". $game_config['game_name'] ." - Admin CP</title>\n";
+	$page .= "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n";
+	$page .= "<title>". read_config ( 'game_name' ) ." - Admin CP</title>\n";
 	$page .= "<link rel=\"shortcut icon\" href=\"./../favicon.ico\">\n";
 	$page .= "</head>\n";
 	$page .= "<frameset cols=\"180,*\" frameborder=\"no\" border=\"0\" framespacing=\"0\">\n";
diff --git a/adm/menu.php b/adm/menu.php
index 8cd7928..2fdca63 100644
--- a/adm/menu.php
+++ b/adm/menu.php
@@ -1,31 +1,17 @@
-<?PHP
-
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.'.$phpEx);
+<?php
+
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
+
+include(XGP_ROOT . 'global.php');
 
 if ($user['authlevel'] < 1) die(message ($lang['404_page']));
 
@@ -56,9 +42,9 @@
         	<th ".$onMouseOverIE." class=\"ForIE\"><a href=\"ConfigStatsPage.php\" target=\"Hauptframe\">".$lang['mu_stats_options']."</a></th>
     	</tr>
 		</table>";
-		
-		
-$EditTable	= 
+
+
+$EditTable	=
 		"<table width=\"150\" class=\"s\">
     	<tr>
         	<td colspan=\"2\" class=\"t\">".$lang['mu_users_settings']."</td>
@@ -73,7 +59,9 @@
         	<th ".$onMouseOverIE." class=\"ForIE\"><a href=\"BanPage.php\" target=\"Hauptframe\">".$lang['mu_ban_options']."</a></th>
     	</tr>
 		</table>";
-		
+
+
+
 $ViewTable	=
 		"<table width=\"150\" class=\"s\">
     	<tr>
@@ -107,18 +95,13 @@
         	<th ".$onMouseOverIE." class=\"ForIE\"><a href=\"SearchingPage.php\" target=\"Hauptframe\">".$lang['mu_search_page']."</a></th>
     	</tr>
 		</table>";
-		
-		
+
+
 $ToolsTable	=
 		"<table width=\"150\" class=\"s\">
     	<tr>
         	<td colspan=\"2\" class=\"t\">".$lang['mu_tools']."</td>
     	</tr>
-
-		<tr>
-        	<th ".$onMouseOverIE." class=\"ForIE\"><a href=\"chat.php\" target=\"Hauptframe\">".$lang['chat_title']."</a></th>
-    	</tr>
-
 		<tr>
         	<th ".$onMouseOverIE." class=\"ForIE\"><a href=\"GlobalMessagePage.php\" target=\"Hauptframe\">".$lang['mu_global_message']."</a></th>
     	</tr>
@@ -144,7 +127,7 @@
 // OPERADORES
 if($user['authlevel'] == 2)
 {
-	if($Observation == 1) $parse['ViewTable']	=	$ViewTable; 
+	if($Observation == 1) $parse['ViewTable']	=	$ViewTable;
 	if($EditUsers 	== 1) $parse['EditTable']	=	$EditTable;
 	if($ConfigGame 	== 1) $parse['ConfigTable']	=	$ConfigTable;
 	if($ToolsCanUse == 1) $parse['ToolsTable']	=	$ToolsTable;
@@ -161,5 +144,5 @@
 
 
 
-display( parsetemplate(gettemplate('adm/menu'), $parse), false, '', true, false);
+display( parsetemplate(gettemplate('adm/menu'), $parse), FALSE, '', TRUE, FALSE);
 ?>
\ No newline at end of file
diff --git a/adm/statbuilder.php b/adm/statbuilder.php
index e3b2714..a99239c 100644
--- a/adm/statbuilder.php
+++ b/adm/statbuilder.php
@@ -1,32 +1,18 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
-include($xgp_root . 'adm/statfunctions.' . $phpEx);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
+
+include(XGP_ROOT . 'global.php');
+include(XGP_ROOT . 'adm/statfunctions.php');
 
 if ($user['authlevel'] < 2) die(message ($lang['not_enough_permissions']));
 
@@ -39,7 +25,7 @@
 
 	update_config( 'stat_last_update', $result['stats_time']);
 
-	$using_flying 	= (($game_config['stat_flying']==1) ? $lang['sb_using_fleet_array'] : $lang['sb_using_fleet_query']);
+	$using_flying 	= ( ( read_config ( 'stat_flying' ) == 1 ) ? $lang['sb_using_fleet_array'] : $lang['sb_using_fleet_query']);
 
 	message($lang['sb_stats_updated'].$stats_end_time.$memory_i.$memory_e.$memory_p.$stats_block.$using_flying);
 
diff --git a/adm/statfunctions.php b/adm/statfunctions.php
index f5e0f7a..6b291b5 100644
--- a/adm/statfunctions.php
+++ b/adm/statfunctions.php
@@ -1,23 +1,10 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 function GetTechnoPoints ( $CurrentUser ) {
 	global $resource, $pricelist, $reslist;
@@ -124,10 +111,10 @@ function GetFlyingFleetPoints($fleet_array)
 //FIN FIX ACTUALIZACION PUNTOS CON FLOTA VOLANDO
 function MakeStats()
 {
-	global $resource, $pricelist, $reslist, $game_config, $xgp_root, $phpEx;
+	global $resource, $pricelist, $reslist;
 
-	$CheckUserQuery = false;
-	$CheckAllyQuery	= false;
+	$CheckUserQuery = FALSE;
+	$CheckAllyQuery	= FALSE;
 
 	// Initial Time
 	$mtime        = microtime();
@@ -139,15 +126,15 @@ function MakeStats()
 	//Change the last stats time
 	$stats_time   = time();
 	//Delete old messages
-	$del_before 	= time() - (60 * 60 * 24); // 1 Äåíü - ýòî âðåìÿ õðàíåíèÿ ìåññàã è îò÷åòîâ
-	$del_inactive 	= time() - (60 * 60 * 24 * 30); // 1 Ìåñÿö - ýòî âîò õðàíåíèå àêêàóííòîâ ñî äíÿ ïîñëåäíåãî ïîñåùåíèÿ
-	$del_deleted 	= time() - (60 * 60 * 24 * 7); // 1 Íåäåëÿ ýòî óäàëåíèå àêêàóíòà â îïöèÿõ
+	$del_before 	= time() - (60 * 60 * 24); // 1 DAY
+	$del_inactive 	= time() - (60 * 60 * 24 * 30); // 1 MONTH
+	$del_deleted 	= time() - (60 * 60 * 24 * 7); // 1 WEEK
 
 	$ChooseToDelete = doquery("SELECT `id` FROM `{{table}}` WHERE (`db_deaktjava` < '".$del_deleted."' AND `db_deaktjava` <> 0) OR (`onlinetime` < '".$del_inactive."' AND `authlevel` <> 3)", 'users');
 
 	if($ChooseToDelete)
 	{
-		include_once($xgp_root . 'includes/functions/DeleteSelectedUser.' . $phpEx);
+		include_once(XGP_ROOT . 'includes/functions/DeleteSelectedUser.php');
 
 		while($delete = mysql_fetch_array($ChooseToDelete))
 		{
@@ -164,23 +151,23 @@ function MakeStats()
 	{
 		if ($resource[ $Defense ] != 'small_protection_shield' && $resource[ $Defense ] != 'big_protection_shield')
 		{
-			$select_defenses	.= " SUM(p.".$resource[ $Defense ].") AS ".$resource[ $Defense ].",";
+			$select_defenses	.= " SUM(p.`".$resource[ $Defense ]."`) AS `".$resource[ $Defense ]."`,";
 		}
 	}
 	$select_buildings	=	'';
 	foreach($reslist['build'] as $n => $Building)
 	{
-		$select_buildings	.= " p.".$resource[ $Building ].",";
+		$select_buildings	.= " p.`".$resource[ $Building ]."`,";
 	}
 	$selected_tech	=	'';
 	foreach($reslist['tech'] as $n => $Techno)
 	{
-			$selected_tech	.= " u.".$resource[ $Techno ].",";
+			$selected_tech	.= " u.`".$resource[ $Techno ]."`,";
 	}
 	$select_fleets	=	'';
 	foreach($reslist['fleet'] as $n => $Fleet)
 	{
-			$select_fleets	.= " SUM(p.".$resource[ $Fleet ].") AS ".$resource[ $Fleet ].",";
+			$select_fleets	.= " SUM(p.`".$resource[ $Fleet ]."`) AS `".$resource[ $Fleet ]."`,";
 	}
 	//If you have some data type enmu is better if you put it here, because that data give a error in the SUM function.
 	$selected_enum	=	"p.small_protection_shield, p.big_protection_shield";//For now...
@@ -190,11 +177,19 @@ function MakeStats()
 	//For users table
 	$select_user		= " u.id, u.ally_id, u.authlevel ";
 	//We check how many users are for not overload the server...
-	$total_users = doquery("SELECT COUNT(*) AS `count` FROM {{table}} WHERE 1;", 'users', true);
-	//We will make query every $game_config['stat_amount'] users
+	$total_users = doquery("SELECT COUNT(*) AS `count` FROM {{table}} WHERE 1;", 'users', TRUE);
+	//We will make query every 'stat_amount' users
 	//Min amount = 10, if it is less than 10, it is not a good system
-	$game_config['stat_amount']	= (($game_config['stat_amount']>=10)?$game_config['stat_amount']:10);
-	$amount_per_block	= (($game_config['stat_amount']<$game_config['users_amount'])?$game_config['users_amount']:$game_config['stat_amount']);
+
+	$game_stat_amount	=	read_config ( 'stat_amount' );
+	$game_users_amount	=	read_config ( 'users_amount' );
+	$game_stat_flying	=	read_config ( 'stat_flying' );
+	$game_stat_settings	=	read_config ( 'stat_settings' );
+	$game_stat_level	=	read_config ( 'stat_level' );
+	$game_stat			=	read_config ( 'stat' );
+
+	$game_stat_amount	= (($game_stat_amount>=10)?$game_stat_amount:10);
+	$amount_per_block	= (($game_stat_amount<$game_users_amount)?$game_users_amount:$game_stat_amount);
 	if ($total_users['count'] > $amount_per_block)
 	{
 		$LastQuery = roundUp($total_users['count'] / $amount_per_block);
@@ -217,7 +212,7 @@ function MakeStats()
 		$minmax_sql	=	'SELECT Max(id) AS `max`, Min(id) AS `min` FROM
 						(SELECT id FROM {{table}}users ORDER BY id ASC LIMIT
 						'. $start.','. ($amount_per_block) .') AS A';
-		$minmax	= doquery($minmax_sql, '',true);
+		$minmax	= doquery($minmax_sql, '',TRUE);
 		$sql_parcial = 	'SELECT '.$select_buildings .$select_planet . $selected_enum.', p.id FROM {{table}}planets as p WHERE p.id_owner <='.  $minmax['max'].' AND p.id_owner >= ' .$minmax['min'].';';
 		//We delete now the old stats of the users
 		$sql_old_stats	=	'SELECT '.$select_old_ranks.' FROM {{table}} WHERE stat_type = 1 AND stat_code = 1 AND id_owner <= '.$minmax['max'].' AND id_owner >=  '.$minmax['min'].';';
@@ -239,7 +234,7 @@ function MakeStats()
 		unset($CurStats, $old_stats);
 		//We take the data of flying fleets if stat_flying is =1 in game config
 		//If you have trouble with the RAM and CPU usage, please set stat_flying = 0 and a low value of stat_amount (25, 15...)
-		if($game_config['stat_flying'] == 1)
+		if($game_stat_flying == 1)
 		{
 			$sql_flying_fleets	=	'SELECT fleet_array, fleet_owner, fleet_id FROM {{table}} WHERE fleet_owner <= '. $minmax['max'].' AND fleet_owner >= '. $minmax['min'].';';
 			$flying_fleets		=	doquery($sql_flying_fleets, 'fleets');
@@ -275,22 +270,22 @@ function MakeStats()
 			$u_OldFleetRank = (($old_stats_array[$CurUser['id']]['old_fleet_rank'])? $old_stats_array[$CurUser['id']]['old_fleet_rank']:0);
 			//We dont need this anymore...
 			unset($old_stats_array[$CurUser['id']]);
-			//1 point=  $game_config['stat_settings'] ressources
+			//1 point=  'stat_settings' ressources
 			//Make the tech points XD
 			$u_points			= GetTechnoPoints ( $CurUser );
 			$u_TTechCount		= $u_points['TechCount'];
-			$u_TTechPoints	= ($u_points['TechPoint'] / $game_config['stat_settings']);
+			$u_TTechPoints	= ($u_points['TechPoint'] / $game_stat_settings);
 			//Make the defense points
 			$u_points			= GetDefensePoints ( $CurUser );
 			$u_TDefsCount		= $u_points['DefenseCount'];
-			$u_TDefsPoints	= ($u_points['DefensePoint'] / $game_config['stat_settings']);
+			$u_TDefsPoints	= ($u_points['DefensePoint'] / $game_stat_settings);
 			//Make the fleets points (without the flying fleets...
 			$u_points			= GetFleetPoints ( $CurUser );
 			$u_TFleetCount	= $u_points['FleetCount'];
-			$u_TFleetPoints	= ($u_points['FleetPoint'] / $game_config['stat_settings']);
+			$u_TFleetPoints	= ($u_points['FleetPoint'] / $game_stat_settings);
 			//Now we add the flying fleets points
-			//This is used if($game_config['stat_flying'] == 1)
-			if($game_config['stat_flying'] == 1)
+			//This is used if($game_stat_flying == 1)
+			if($game_stat_flying == 1)
 			{
 				if($flying_fleets_array[$CurUser['id']])
 				{
@@ -298,7 +293,7 @@ function MakeStats()
 					{
 						$u_points			= GetFlyingFleetPoints ( $fleet_array );
 						$u_TFleetCount  	+= $u_points['FleetCount'];
-						$u_TFleetPoints 	+= ($u_points['FleetPoint'] / $game_config['stat_settings']);
+						$u_TFleetPoints 	+= ($u_points['FleetPoint'] / $game_stat_settings);
 					}
 				}
 				//We dont need this anymore...
@@ -311,7 +306,7 @@ function MakeStats()
 				{
 						$u_points			= GetFlyingFleetPoints ( $FleetRow['fleet_array'] );
 						$u_TFleetCount  	+= $u_points['FleetCount'];
-						$u_TFleetPoints 	+= ($u_points['FleetPoint'] / $game_config['stat_settings']);
+						$u_TFleetPoints 	+= ($u_points['FleetPoint'] / $game_stat_settings);
 				}
 				//We dont need this anymore...
 				unset($OwnFleets, $FleetRow);
@@ -324,11 +319,11 @@ function MakeStats()
 				{
 					$u_points				= GetBuildPoints ( $building );
 					$u_TBuildCount		+= $u_points['BuildCount'];
-					$u_TBuildPoints		+= ($u_points['BuildPoint'] / $game_config['stat_settings']);
+					$u_TBuildPoints		+= ($u_points['BuildPoint'] / $game_stat_settings);
 					//We add the shields points (this way is a temporary way...)
 					$u_points				= GetDefensePoints ( $building );
 					$u_TDefsCount			+= $u_points['DefenseCount'];
-					$u_TDefsPoints		+= ($u_points['DefensePoint'] / $game_config['stat_settings']);
+					$u_TDefsPoints		+= ($u_points['DefensePoint'] / $game_stat_settings);
 				}
 				//We dont need this anymore...
 				unset($Buildings_array[$CurUser['id']],$planet_id,$building);
@@ -339,7 +334,7 @@ function MakeStats()
 			}
 			$u_GCount			= $u_TDefsCount  + $u_TTechCount  + $u_TFleetCount  + $u_TBuildCount;
 			$u_GPoints		= $u_TTechPoints + $u_TDefsPoints + $u_TFleetPoints + $u_TBuildPoints;
-			if (($CurUser['authlevel'] >= $game_config['stat_level']&& $game_config['stat']==1 ) || $CurUser['bana']==1)
+			if (($CurUser['authlevel'] >= $game_stat_level&& $game_stat==1 ) || $CurUser['bana']==1)
 			{
 				$insert_user_query  .= '('.$CurUser['id'].','.$CurUser['ally_id'].',1,1,'.$u_OldTechRank.',
 										0,0,'.$u_OldBuildRank.',0,0,'.$u_OldDefsRank.',0,0,'.$u_OldFleetRank.',
@@ -355,12 +350,12 @@ function MakeStats()
 			}
 			unset_vars( 'u_' );
 
-			$CheckUserQuery = true;
+			$CheckUserQuery = TRUE;
 		}
 		//TODO, make a end string check in case that insert_user_query end in VALUE...
 		//Here we change the end of the query for ;
 
-		if($CheckUserQuery == true)
+		if($CheckUserQuery == TRUE)
 		{
 			$insert_user_query	=	substr_replace($insert_user_query, ';', -1);
 			doquery ( $insert_user_query , 'statpoints');
@@ -386,8 +381,8 @@ function MakeStats()
 	if ($total_ally > 0)//We only update allys if at least 1 ally exist...
 	{
 		//Min amount = 10, if it is less than 10, it is not a good system
-		$game_config['stat_amount']= (($game_config['stat_amount']>=10)?$game_config['stat_amount']:10);
-		$amount_per_block	= (($game_config['stat_amount']<$game_config['users_amount'])?$game_config['users_amount']:$game_config['stat_amount']);
+		$game_stat_amount= (($game_stat_amount>=10)?$game_stat_amount:10);
+		$amount_per_block	= (($game_stat_amount<$game_users_amount)?$game_users_amount:$game_stat_amount);
 		if ($total_ally > $amount_per_block)
 		{
 			$LastQuery = roundUp($total_ally / $amount_per_block);
@@ -410,7 +405,7 @@ function MakeStats()
 			$minmax_sql	=	'SELECT Max(id) AS `max`, Min(id) AS `min` FROM
 						(SELECT id FROM {{table}}alliance ORDER BY id ASC LIMIT
 						'. $start.','. $amount_per_block.') AS A';
-			$minmax	= doquery($minmax_sql, '',true);
+			$minmax	= doquery($minmax_sql, '',TRUE);
 			$select_old_a_ranks	=	"s.id_owner , s.stat_type,	s.tech_rank AS old_tech_rank,
 								s.build_rank AS old_build_rank, s.defs_rank AS old_defs_rank, s.fleet_rank AS old_fleet_rank,
 								s.total_rank AS old_total_rank";
@@ -480,11 +475,11 @@ function MakeStats()
 					doquery ( "UPDATE {{table}}	SET `ally_id`=0, `ally_name` = '', 	`ally_register_time`= 0, `ally_rank_id`= 0 	WHERE `ally_id`='{$CurAlly['id_ally']}'", "users");
 				}
 
-				$CheckAllyQuery	= true;
+				$CheckAllyQuery	= TRUE;
 			}
 			//Here we change the end of the query for ;
 
-			if($CheckAllyQuery == true)
+			if($CheckAllyQuery == TRUE)
 			{
 				$insert_ally_query	=	substr_replace($insert_ally_query, ';', -1);
 				doquery ( $insert_ally_query , 'statpoints');
diff --git a/adm/topnav.php b/adm/topnav.php
index 1ade8c2..f31d7ad 100644
--- a/adm/topnav.php
+++ b/adm/topnav.php
@@ -1,31 +1,17 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN', true);
-
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('IN_ADMIN', TRUE);
+define('XGP_ROOT', './../');
+
+include(XGP_ROOT . 'global.php');
 
 if ($user['authlevel'] < 1) die(message ($lang['404_page']));
 
@@ -38,7 +24,7 @@
 	$parse['resetuniverse']	=	'<a href="ResetPage.php" target="Hauptframe" class="topn">&nbsp;'.$lang['re_reset_universe'].'&nbsp;</a>';
 	$parse['queries']		=	'<a href="QueriesPage.php" target="Hauptframe" class="topn">&nbsp;'.$lang['qe_title_menu'].'&nbsp;</a>';
 }
-	
-	
-display( parsetemplate(gettemplate('adm/Topnav'), $parse), false, '', true, false);
+
+
+display( parsetemplate(gettemplate('adm/Topnav'), $parse), FALSE, '', TRUE, FALSE);
 ?>
\ No newline at end of file
diff --git a/chat.php b/chat.php
deleted file mode 100644
index e09cb9d..0000000
--- a/chat.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-  ini_set('display_error',0);
- ini_set('error_reporting',0);
-/**
- * chat.php
- *
- * @version 1.0
- * @version 1.2 by Ihor
- * @copyright 2008 by e-Zobar for XNova
- */
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-
-$xgp_root_path = './';
-include($xgp_root_path . 'extension.inc.php');
-include($xgp_root_path . 'common.' . $phpEx);
-
-  
-
-if ($IsUserChecked == false) {
-    includeLang('INGAME');
-    header("Location: login.php");
-}
-    includeLang('chat');
-    $BodyTPL = gettemplate('chat/chat_body');
-    $nick = $user['username'];
-    $parse = $lang;
-    if ($_GET) {
-        if($_GET["chat_type"]=="ally"){
-            $parse['chat_type'] = $_GET["chat_type"];
-            $parse['ally_id']   = $user['ally_id'];
-        }
-    }
-	
-    //Îíëàéí
-        $OnlineUsers = doquery("SELECT COUNT(*) FROM {{table}} WHERE onlinetime>='".(time()-15*60)."'",'users', 'true');
-        $parse['NumberMembersOnline'] = $OnlineUsers[0];
-        ////caha
-        $searchtext="chat";
-        $OnlineAdmins = doquery("SELECT * FROM {{table}} WHERE authlevel<=1 AND current_page LIKE '%{$searchtext}%'  ",'users');
-        ////
-        if($OnlineAdmins){
-            $parse['OnlineAdmins'] = "";
-            while ($oas = mysql_fetch_array($OnlineAdmins)) {
-                $parse['OnlineAdmins'] .= "&nbsp;<a href=\"game.php?page=messages&mode=write&id=". $oas['id'] ."\" ><font color='lime'>". $oas['username'] ."&nbsp;,&nbsp;</a></font><br>";
-            }                                                          
-        }else{
-            $parse['OnlineAdmins'] = "--";
-        }
-	
-    $page = parsetemplate($BodyTPL, $parse);
-    display($page, $lang['chat']);
-
-// Shoutbox by e-Zobar - Copyright XNova Team 2008
-?>
\ No newline at end of file
diff --git a/chat_add.php b/chat_add.php
deleted file mode 100644
index 91f25d3..0000000
--- a/chat_add.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * chat_add.php
- *
- * @version 1.0
- * @version 1.2 by Ihor
- * @copyright 2008 by e-Zobar for XNova
- */
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-
-$xgp_root_path = './';
-include($xgp_root_path . 'extension.inc.php');
-include($xgp_root_path . 'common.' . $phpEx);
-
-if ($IsUserChecked == false) {
-    includeLang('INGAME');
-    header("Location: login.php");
-}
-
-    // On récupère les informations du message et de l'envoyeur
-	if (isset($_POST["msg"]) && isset($user['username'])) {
-	   $msg  = addslashes ($_POST["msg"]);
-	   $nick = addslashes ($user['username']);
-	   $chat_type = addslashes ($_POST["chat_type"]);
-	   $ally_id = addslashes ($_POST["ally_id"]);
-	   $nick = addslashes ($user['username']);
-	   $msg = iconv('UTF-8', 'CP1251', $msg); // CHANGE IT !!!!!!!!!!!
-    }
-    else {
-       $msg="";
-       $nick="";
-    }
-    if ($msg!="" && $nick!="") {
-        if($chat_type=="ally" && $ally_id>""){
-            $query = doquery("INSERT INTO {{table}}(user, ally_id, message, timestamp) VALUES ('".$nick."','".$ally_id."','".$msg."', '".time()."')", "chat");
-        }else{
-            $query = doquery("INSERT INTO {{table}}(user, ally_id, message, timestamp) VALUES ('".$nick."','0', '".$msg."', '".time()."')", "chat");
-        }
-    }
-?>
\ No newline at end of file
diff --git a/chat_msg.php b/chat_msg.php
deleted file mode 100644
index 693f47f..0000000
--- a/chat_msg.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
- ini_set('display_error',0);
- ini_set('error_reporting',0);
-/**
- * chat_msg.php
- *
- * @version 1.0
- * @version 1.2 by Ihor
- * @copyright 2008 by e-Zobar for XNova
- */
-
-define('INSIDE'  , true);
-define('INSTALL' , false);
-
-$xgp_root_path = './';
-include($xgp_root_path . 'extension.inc.php');
-include($xgp_root_path . 'common.' . $phpEx);
-
-if ($IsUserChecked == false) {
-    includeLang('INGAME');
-    header("Location: login.php");
-}
-
-includeLang('chat');
-
-$page_limit = 30; // Chat rows Limit
-if($_GET['page']>''){
-    $page = $_GET['page'];
-}else{
-    $page = 0;
-}
-$start_row = $page * $page_limit;
-
-if ($_GET) {
-	if($_GET['chat_type']=='ally' && $_GET['ally_id']>''){
-		if ($_GET['show']=='history') {
-			showPageButtons($page,'ally');
-			$query = doquery("SELECT * FROM {{table}} WHERE ally_id = '".$_GET['ally_id']."' ORDER BY messageid DESC LIMIT ".$start_row.",".$page_limit." ", "chat");
-		}else{
-			$query = doquery("SELECT * FROM {{table}} WHERE ally_id = '".$_GET['ally_id']."' ORDER BY messageid DESC LIMIT ".$page_limit." ", "chat");
-		}
-	}else{
-		if ($_GET['show']=='history') {
-			showPageButtons($page,'all');
-			$query = doquery("SELECT * FROM {{table}} WHERE ally_id < 1 ORDER BY messageid DESC LIMIT ".$start_row.",".$page_limit." ", "chat");
-		}else{
-			$query = doquery("SELECT * FROM {{table}} WHERE ally_id < 1 ORDER BY messageid DESC LIMIT ".$page_limit." ", "chat");
-		}
-	}
-}else{
-	if($_POST['chat_type']=='ally' && $_POST['ally_id']>''){
-		$query = doquery("SELECT * FROM {{table}} WHERE ally_id = '".$_POST['ally_id']."' ORDER BY messageid DESC LIMIT ".$page_limit." ", "chat");
-	}else{
-		$query = doquery("SELECT * FROM {{table}} WHERE ally_id < 1 ORDER BY messageid DESC LIMIT ".$page_limit." ", "chat");
-	}
-}
-
-$buff = "";
-while($v=mysql_fetch_object($query)){
-	$msg = "";
-	if($_GET['show']!='history'){
-$nick="<a href='#' onmousedown=\"addSmiley('[ ".htmlentities($v->user, ENT_QUOTES, cp1251)." ]')\">".htmlentities($v->user, ENT_QUOTES, cp1251)."</a>";	}else{
-		$nick=htmlentities($v->user, ENT_QUOTES, cp1251);
-	}
-	$msg=htmlentities($v->message, ENT_QUOTES, cp1251);
-	$msgtimestamp=htmlentities($v->timestamp, ENT_QUOTES, cp1251);
-	$msgtimestamp=date("m/d H:i:s", $msgtimestamp);
-	// Les différentes polices (gras, italique, couleurs, etc...)
-	include("includes/msg_replace.php");  
-
-	// Affichage du message
-	$msg="<div align=\"left\" style='color:white;'><span style='font:menu;color:PaleGreen;'>[".$msgtimestamp."]</span> <span style='width:50px;font:menu;'><b>".$nick."</b></span> : ".$msg."<br></div>";
-	$buff = $msg . $buff;
-}
-print $buff;
-
-function showPageButtons($curPage,$type){
-    global $page_limit,$lang;
-    echo "<div style='width:100%;border:1px solid red;padding:4px;' align=center>";
-    echo "<b><font size=3>".$lang['AllyChat']." / ".$lang['chat_history']."</font></b> ";
-    echo "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
-    echo "<b><font size=2>".$lang['chat_page'].":</font></b> ";
-    echo "<select name='page' onchange='document.location.assign(\"chat_msg.php?chat_type=".$_GET['chat_type']."&ally_id=".$_GET['ally_id']."&show=".$_GET['show']."&page=\"+this.value)'>";
-    if($type=='ally'){
-        $rows = doquery("SELECT count(1) AS CNT FROM {{table}} WHERE ally_id = '".$_GET['ally_id']."'", "chat",true);
-        $cnt = $rows['CNT'] / $page_limit;
-        for($i = 0; $i < $cnt; $i++) {
-            if($curPage==$i){
-                echo "<option value=".$i." selected>".$i."</option> ";
-            }else{
-                echo "<option value=".$i.">".$i."</option> ";
-            }
-        }
-    }else{
-        $rows = doquery("SELECT count(1) AS CNT FROM {{table}} WHERE ally_id < 1", "chat",true);
-        $cnt = $rows['CNT'] / $page_limit;
-        for($i = 0; $i < $cnt; $i++) {
-            if($curPage==$i){
-                echo "<option value=".$i." selected>".$i."</option> ";
-            }else{
-                echo "<option value=".$i.">".$i."</option> ";
-            }
-        }
-    }
-    echo "</select> ";
-    echo "</div>";
-}
-
-// Shoutbox by e-Zobar - Copyright XNova Team 2008
-?>
diff --git a/clock.php b/clock.php
deleted file mode 100644
index bbfa662..0000000
--- a/clock.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$time = mktime(date("H")-1,date("i"),date("s"),date("m"),date("d"),date("Y"));
-echo date(' d.m.Y         H:i:s' , $time);
-
-?>
\ No newline at end of file
diff --git a/common.php b/common.php
deleted file mode 100644
index 43b85db..0000000
--- a/common.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-if(filesize($xgp_root . 'config.php') == 0 && INSTALL != true)
-{
-	exit ( header ( "location:" . $xgp_root .  "install/" ) );
-}
-
-$phpEx			= "php";
-$game_config   	= array();
-$user          	= array();
-$lang          	= array();
-$link          	= "";
-$IsUserChecked 	= false;
-
-include_once($xgp_root . 'includes/constants.'.$phpEx);
-include_once($xgp_root . 'includes/GeneralFunctions.'.$phpEx);
-include_once($xgp_root . 'includes/vendor/simplehtmldom/simple_html_dom.' . $phpEx);
-include_once($xgp_root . 'includes/classes/class.debug.'.$phpEx);
-$debug 		= new debug();
-
-if (INSTALL != true)
-{
-	include($xgp_root . 'includes/vars.'.$phpEx);
-	include($xgp_root . 'includes/functions/RoundUp.' . $phpEx);
-	include($xgp_root . 'includes/functions/CreateOneMoonRecord.'.$phpEx);
-	include($xgp_root . 'includes/functions/CreateOnePlanetRecord.'.$phpEx);
-	include($xgp_root . 'includes/functions/SendSimpleMessage.'.$phpEx);
-	include($xgp_root . 'includes/functions/calculateAttack.'.$phpEx);
-	include($xgp_root . 'includes/functions/formatCR.'.$phpEx);
-	include($xgp_root . 'includes/functions/GetBuildingTime.' . $phpEx);
-	include($xgp_root . 'includes/functions/HandleElementBuildingQueue.' . $phpEx);
-	include($xgp_root . 'includes/functions/PlanetResourceUpdate.' . $phpEx);
-
-	$query = doquery("SELECT * FROM {{table}}",'config');
-
-	while ($row = mysql_fetch_assoc($query))
-	{
-		$game_config[$row['config_name']] = $row['config_value'];
-	}
-
-	define('DEFAULT_LANG'	, (	$game_config['lang'] 	== ''	) ? "spanish" : 	$game_config['lang']	);
-	define('VERSION'		, (	$game_config['VERSION'] == ''	) ? "		" : "v".$game_config['VERSION']	);
-
-	includeLang('INGAME');
-
-	if ($InLogin != true)
-	{
-		include($xgp_root . 'includes/classes/class.CheckSession.'.$phpEx);
-
-		$Result        	= new CheckSession();
-		$Result			= $Result->CheckUser($IsUserChecked);
-		$IsUserChecked 	= $Result['state'];
-		$user          	= $Result['record'];
-
-		if($game_config['game_disable'] == 0 && $user['authlevel'] == 0)
-		{
-			message(stripslashes($game_config['close_reason']), '', '', false, false);
-		}
-	}
-
-	if ( ( time() >= ( $game_config['stat_last_update'] + ( 60 * $game_config['stat_update_time'] ) ) ) )
-	{
-		include($xgp_root . 'adm/statfunctions.' . $phpEx);
-		$result		= MakeStats();
-		update_config('stat_last_update', $result['stats_time']);
-	}
-
-	if (isset($user))
-	{
-		include($xgp_root . 'includes/classes/class.FlyingFleetHandler.'.$phpEx);
-		$_fleets = doquery("SELECT fleet_start_galaxy,fleet_start_system,fleet_start_planet,fleet_start_type FROM {{table}} WHERE `fleet_start_time` <= '".time()."' and `fleet_mess` ='0' order by fleet_id asc;", 'fleets'); // OR fleet_end_time <= ".time()
-
-		while ($row = mysql_fetch_array($_fleets))
-		{
-			$array = array();
-			$array['galaxy'] 		= $row['fleet_start_galaxy'];
-			$array['system'] 		= $row['fleet_start_system'];
-			$array['planet'] 		= $row['fleet_start_planet'];
-			$array['planet_type'] 	= $row['fleet_start_type'];
-
-			$temp = new FlyingFleetHandler ($array);
-		}
-		mysql_free_result($_fleets);
-		$_fleets = doquery("SELECT fleet_end_galaxy,fleet_end_system,fleet_end_planet ,fleet_end_type FROM {{table}} WHERE `fleet_end_time` <= '".time()." order by fleet_id asc';", 'fleets'); // OR fleet_end_time <= ".time()
-
-		while ($row = mysql_fetch_array($_fleets))
-		{
-			$array = array();
-			$array['galaxy'] 		= $row['fleet_end_galaxy'];
-			$array['system'] 		= $row['fleet_end_system'];
-			$array['planet'] 		= $row['fleet_end_planet'];
-			$array['planet_type'] 	= $row['fleet_end_type'];
-
-			$temp = new FlyingFleetHandler ($array);
-		}
-
-		mysql_free_result($_fleets);
-		unset($_fleets);
-
-		if ( defined('IN_ADMIN') )
-		{
-			includeLang('ADMIN');
-			include('../adm/AdminFunctions/Autorization.' . $phpEx);
-			$dpath     = "../". DEFAULT_SKINPATH  ;
-		}
-		else
-		{
-			$dpath     = (!$user["dpath"]) ? DEFAULT_SKINPATH : $user["dpath"];
-		}
-        //We include the plugin system 0.3
-        include($xgp_root . 'includes/plugins.'.$phpEx);
-
-		include($xgp_root . 'includes/functions/SetSelectedPlanet.' . $phpEx);
-		SetSelectedPlanet ($user);
-
-		$planetrow = doquery("SELECT * FROM `{{table}}` WHERE `id` = '".$user['current_planet']."';", "planets", true);
-
-		include($xgp_root . 'includes/functions/CheckPlanetUsedFields.' . $phpEx);
-		CheckPlanetUsedFields($planetrow);
-	}
-}
-else
-{
-	$dpath     = "../" . DEFAULT_SKINPATH;
-}
-
-include('includes/classes/class.SecurePage.' . $phpEx ); // include the class
-$SecureSqlInjection	= new SecureSqlInjection(); // load the class
-$SecureSqlInjection->secureGlobals(); // run the main class function
-
-?>
\ No newline at end of file
diff --git a/config.php b/config.php
index e69de29..05c888b 100644
--- a/config.php
+++ b/config.php
@@ -0,0 +1,10 @@
+<?php
+if(!defined("INSIDE")){ header("location:./../"); }
+$dbsettings = Array(
+"server"     => "localhost", // MySQL server name.
+"user"       => "root", // MySQL username.
+"pass"       => "root", // MySQL password.
+"name"       => "ogame", // MySQL database name.
+"prefix"     => "xgp_", // Tables prefix.
+"secretword" => "XGProyect875208701"); // Cookies.
+?>
\ No newline at end of file
diff --git a/extension.inc.php b/extension.inc.php
deleted file mode 100644
index 1f90126..0000000
--- a/extension.inc.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-if (!defined('INSIDE'))
-{
-	die("Intento de hackeo");
-}
-
-
-$phpEx = "php";
-
-?>
\ No newline at end of file
diff --git a/game.php b/game.php
index 8aa65e7..6c2af62 100644
--- a/game.php
+++ b/game.php
@@ -1,185 +1,171 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('XGP_ROOT',	'./');
 
-$xgp_root = './';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
+include(XGP_ROOT . 'global.php');
 
-include($xgp_root . 'includes/functions/CheckPlanetBuildingQueue.' . $phpEx);
-include($xgp_root . 'includes/functions/GetBuildingPrice.' . $phpEx);
-include($xgp_root . 'includes/functions/IsElementBuyable.' . $phpEx);
-include($xgp_root . 'includes/functions/SetNextQueueElementOnTop.' . $phpEx);
-include($xgp_root . 'includes/functions/SortUserPlanets.' . $phpEx);
-include($xgp_root . 'includes/functions/UpdatePlanetBatimentQueueList.' . $phpEx);
+include(XGP_ROOT . 'includes/functions/CheckPlanetBuildingQueue.php');
+include(XGP_ROOT . 'includes/functions/GetBuildingPrice.php');
+include(XGP_ROOT . 'includes/functions/IsElementBuyable.php');
+include(XGP_ROOT . 'includes/functions/SetNextQueueElementOnTop.php');
+include(XGP_ROOT . 'includes/functions/SortUserPlanets.php');
+include(XGP_ROOT . 'includes/functions/UpdatePlanetBatimentQueueList.php');
 
 switch($_GET[page])
 {
 // ----------------------------------------------------------------------------------------------------------------------------------------------//
 	case'changelog':
-		include_once($xgp_root . 'includes/pages/ShowChangelogPage.' . $phpEx);
-		ShowChangelogPage();
+		include_once(XGP_ROOT . 'includes/pages/class.ShowChangelogPage.php');
+		new ShowChangelogPage();
 	break;
 // ----------------------------------------------------------------------------------------------------------------------------------------------//
 	case'overview':
-		include_once($xgp_root . 'includes/pages/ShowOverviewPage.' . $phpEx);
-		ShowOverviewPage($user, $planetrow);
+		include_once(XGP_ROOT . 'includes/pages/class.ShowOverviewPage.php');
+		new ShowOverviewPage ( $user , $planetrow );
 	break;
 // ----------------------------------------------------------------------------------------------------------------------------------------------//
 	case'galaxy':
-		include_once($xgp_root . 'includes/pages/class.ShowGalaxyPage.' . $phpEx);
-		$ShowGalaxyPage = new ShowGalaxyPage($user, $planetrow);
+		include_once(XGP_ROOT . 'includes/pages/class.ShowGalaxyPage.php');
+		new ShowGalaxyPage ( $user , $planetrow );
 	break;
 	case'phalanx':
-		include_once($xgp_root . 'includes/pages/ShowPhalanxPage.' . $phpEx);
-		ShowPhalanxPage($user, $planetrow);
+		include_once(XGP_ROOT . 'includes/pages/class.ShowPhalanxPage.php');
+		new ShowPhalanxPage ( $user , $planetrow );
 	break;
 // ----------------------------------------------------------------------------------------------------------------------------------------------//
 	case'imperium':
-		include_once($xgp_root . 'includes/pages/ShowImperiumPage.' . $phpEx);
-		ShowImperiumPage($user);
+		include_once(XGP_ROOT . 'includes/pages/class.ShowImperiumPage.php');
+		new ShowImperiumPage ( $user );
 	break;
 // ----------------------------------------------------------------------------------------------------------------------------------------------//
 	case'fleet':
-		include_once($xgp_root . 'includes/pages/ShowFleetPage.' . $phpEx);
-		ShowFleetPage($user, $planetrow);
+		include_once(XGP_ROOT . 'includes/pages/class.ShowFleetPage.php');
+		new ShowFleetPage ( $user , $planetrow );
 	break;
 	case'fleet1':
-		include_once($xgp_root . 'includes/pages/ShowFleet1Page.' . $phpEx);
-		ShowFleet1Page($user, $planetrow);
+		include_once(XGP_ROOT . 'includes/pages/class.ShowFleet1Page.php');
+		new ShowFleet1Page ( $user , $planetrow );
 	break;
 	case'fleet2':
-		include_once($xgp_root . 'includes/pages/ShowFleet2Page.' . $phpEx);
-		ShowFleet2Page($user, $planetrow);
+		include_once(XGP_ROOT . 'includes/pages/class.ShowFleet2Page.php');
+		new ShowFleet2Page ( $user , $planetrow );
 	break;
 	case'fleet3':
-		include_once($xgp_root . 'includes/pages/ShowFleet3Page.' . $phpEx);
-		ShowFleet3Page($user, $planetrow);
+		include_once(XGP_ROOT . 'includes/pages/class.ShowFleet3Page.php');
+		new ShowFleet3Page ( $user , $planetrow );
 	break;
 	case'fleetACS':
-		include_once($xgp_root . 'includes/pages/ShowFleetACSPage.' . $phpEx);
-		ShowFleetACSPage($user, $planetrow);
+		include_once(XGP_ROOT . 'includes/pages/class.ShowFleetACSPage.php');
+		new ShowFleetACSPage ( $user , $planetrow );
 	break;
 	case'shortcuts':
-		include_once($xgp_root . 'includes/pages/ShowFleetShortcuts.' . $phpEx);
-		ShowFleetShortcuts($user);
+		include_once(XGP_ROOT . 'includes/pages/class.ShowFleetShortcuts.php');
+		new ShowFleetShortcuts ( $user );
 	break;
 // ----------------------------------------------------------------------------------------------------------------------------------------------//
 	case'buildings':
-		include_once($xgp_root . 'includes/functions/HandleTechnologieBuild.' . $phpEx);
+		include_once(XGP_ROOT . 'includes/functions/HandleTechnologieBuild.php');
 		UpdatePlanetBatimentQueueList ($planetrow, $user);
 		$IsWorking = HandleTechnologieBuild($planetrow, $user);
 		switch ($_GET['mode'])
 		{
 			case 'research':
-				include_once($xgp_root . 'includes/pages/class.ShowResearchPage.' . $phpEx);
+				include_once(XGP_ROOT . 'includes/pages/class.ShowResearchPage.php');
 				new ShowResearchPage($planetrow, $user, $IsWorking['OnWork'], $IsWorking['WorkOn']);
 			break;
 			case 'fleet':
-				include_once($xgp_root . 'includes/pages/class.ShowShipyardPage.' . $phpEx);
+				include_once(XGP_ROOT . 'includes/pages/class.ShowShipyardPage.php');
 				$FleetBuildingPage = new ShowShipyardPage();
 				$FleetBuildingPage->FleetBuildingPage ($planetrow, $user);
 			break;
 			case 'defense':
-				include_once($xgp_root . 'includes/pages/class.ShowShipyardPage.' . $phpEx);
+				include_once(XGP_ROOT . 'includes/pages/class.ShowShipyardPage.php');
 				$DefensesBuildingPage = new ShowShipyardPage();
 				$DefensesBuildingPage->DefensesBuildingPage ($planetrow, $user);
 			break;
 			default:
-				include_once($xgp_root . 'includes/pages/class.ShowBuildingsPage.' . $phpEx);
+				include_once(XGP_ROOT . 'includes/pages/class.ShowBuildingsPage.php');
 				new ShowBuildingsPage($planetrow, $user);
 			break;
 		}
 	break;
 // ----------------------------------------------------------------------------------------------------------------------------------------------//
 	case'resources':
-		include_once($xgp_root . 'includes/pages/ShowResourcesPage.' . $phpEx);
-		ShowResourcesPage($user, $planetrow);
+		include_once(XGP_ROOT . 'includes/pages/class.ShowResourcesPage.php');
+		new ShowResourcesPage($user, $planetrow);
 	break;
 // ----------------------------------------------------------------------------------------------------------------------------------------------//
 	case'officier':
-		include_once($xgp_root . 'includes/pages/class.ShowOfficierPage.' . $phpEx);
+		include_once(XGP_ROOT . 'includes/pages/class.ShowOfficierPage.php');
 		new ShowOfficierPage($user);
 	break;
 // ----------------------------------------------------------------------------------------------------------------------------------------------//
 	case'trader':
-		include_once($xgp_root . 'includes/pages/ShowTraderPage.' . $phpEx);
-		ShowTraderPage($user, $planetrow);
+		include_once(XGP_ROOT . 'includes/pages/class.ShowTraderPage.php');
+		new ShowTraderPage ( $user , $planetrow );
 	break;
 // ----------------------------------------------------------------------------------------------------------------------------------------------//
 	case'techtree':
-		include_once($xgp_root . 'includes/pages/ShowTechTreePage.' . $phpEx);
-		ShowTechTreePage($user, $planetrow);
+		include_once(XGP_ROOT . 'includes/pages/class.ShowTechTreePage.php');
+		new ShowTechTreePage($user, $planetrow);
 	break;
 // ----------------------------------------------------------------------------------------------------------------------------------------------//
 	case'infos':
-		include_once($xgp_root . 'includes/pages/class.ShowInfosPage.' . $phpEx);
+		include_once(XGP_ROOT . 'includes/pages/class.ShowInfosPage.php');
 		new ShowInfosPage($user, $planetrow, $_GET['gid']);
 	break;
 // ----------------------------------------------------------------------------------------------------------------------------------------------//
 	case'messages':
-		include_once($xgp_root . 'includes/pages/ShowMessagesPage.' . $phpEx);
-		ShowMessagesPage($user);
+		include_once(XGP_ROOT . 'includes/pages/class.ShowMessagesPage.php');
+		new ShowMessagesPage($user);
 	break;
 // ----------------------------------------------------------------------------------------------------------------------------------------------//
 	case'alliance':
-		include_once($xgp_root . 'includes/pages/class.ShowAlliancePage.' . $phpEx);
+		include_once(XGP_ROOT . 'includes/pages/class.ShowAlliancePage.php');
 		new ShowAlliancePage($user);
 	break;
 // ----------------------------------------------------------------------------------------------------------------------------------------------//
 	case'buddy':
-		include_once($xgp_root . 'includes/pages/ShowBuddyPage.' . $phpEx);
-		ShowBuddyPage($user);
+		include_once(XGP_ROOT . 'includes/pages/class.ShowBuddyPage.php');
+		new ShowBuddyPage($user);
 	break;
 // ----------------------------------------------------------------------------------------------------------------------------------------------//
 	case'notes':
-		include_once($xgp_root . 'includes/pages/ShowNotesPage.' . $phpEx);
-		ShowNotesPage($user);
+		include_once(XGP_ROOT . 'includes/pages/class.ShowNotesPage.php');
+		new ShowNotesPage($user);
 	break;
 // ----------------------------------------------------------------------------------------------------------------------------------------------//
 	case'statistics':
-		include_once($xgp_root . 'includes/pages/ShowStatisticsPage.' . $phpEx);
-		ShowStatisticsPage($user);
+		include_once(XGP_ROOT . 'includes/pages/class.ShowStatisticsPage.php');
+		new ShowStatisticsPage($user);
 	break;
 // ----------------------------------------------------------------------------------------------------------------------------------------------//
 	case'search':
-		include_once($xgp_root . 'includes/pages/ShowSearchPage.' . $phpEx);
-		ShowSearchPage();
+		include_once(XGP_ROOT . 'includes/pages/class.ShowSearchPage.php');
+		new ShowSearchPage();
 	break;
 // ----------------------------------------------------------------------------------------------------------------------------------------------//
 	case'options':
-		include_once($xgp_root . 'includes/pages/class.ShowOptionsPage.' . $phpEx);
+		include_once(XGP_ROOT . 'includes/pages/class.ShowOptionsPage.php');
 		new ShowOptionsPage($user);
 	break;
 // ----------------------------------------------------------------------------------------------------------------------------------------------//
 	case'banned':
-		include_once($xgp_root . 'includes/pages/ShowBannedPage.' . $phpEx);
-		ShowBannedPage();
+		include_once(XGP_ROOT . 'includes/pages/class.ShowBannedPage.php');
+		new ShowBannedPage();
 	break;
 // ----------------------------------------------------------------------------------------------------------------------------------------------//
 	case'logout':
-		setcookie($game_config['COOKIE_NAME'], "", time()-100000, "/", "", 0);
-		message($lang['see_you_soon'], $xgp_root, 1, false, false);
+		setcookie(read_config ( 'cookie_name' ), "", time()-100000, "/", "", 0);
+		message($lang['see_you_soon'], XGP_ROOT, 1, FALSE, FALSE);
 	break;
 // ----------------------------------------------------------------------------------------------------------------------------------------------//
 	default:
diff --git a/global.php b/global.php
new file mode 100644
index 0000000..9898c3a
--- /dev/null
+++ b/global.php
@@ -0,0 +1,140 @@
+<?php
+
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+// SETEADO PARA EVITAR ERRORRES EN VERSION DE PHP MAYORES A 5.3.0
+error_reporting ( E_ALL & ~E_NOTICE );
+
+$user          	= array();
+$lang          	= array();
+$link          	= "";
+$IsUserChecked 	= FALSE;
+
+include_once ( XGP_ROOT . 'includes/constants.php' );
+include_once ( XGP_ROOT . 'includes/GeneralFunctions.php' );
+include_once ( XGP_ROOT . 'includes/classes/class.simple_html_dom.php' );
+include_once ( XGP_ROOT . 'includes/classes/class.debug.php' );
+include_once ( XGP_ROOT . 'includes/classes/class.xml.php' );
+$debug 		= new debug();
+
+if ( filesize ( XGP_ROOT . 'config.php' ) == 0 && INSTALL != TRUE )
+{
+	exit ( header ( 'location:' . XGP_ROOT .  'install/' ) );
+}
+
+if ( filesize ( XGP_ROOT . 'config.php' ) != 0 )
+{
+	$game_version	=	read_config ( 'version' );
+
+	define ( 'VERSION' , ( $game_version == '' ) ? "		  " : "v" . $game_version );
+}
+
+if ( INSTALL != TRUE )
+{
+	include ( XGP_ROOT . 'includes/vars.php' );
+	include ( XGP_ROOT . 'includes/functions/CreateOneMoonRecord.php' );
+	include ( XGP_ROOT . 'includes/functions/CreateOnePlanetRecord.php' );
+	include ( XGP_ROOT . 'includes/functions/SendSimpleMessage.php' );
+	include ( XGP_ROOT . 'includes/functions/calculateAttack.php' );
+	include ( XGP_ROOT . 'includes/functions/formatCR.php' );
+	include ( XGP_ROOT . 'includes/functions/GetBuildingTime.php' );
+	include ( XGP_ROOT . 'includes/functions/HandleElementBuildingQueue.php' );
+	include ( XGP_ROOT . 'includes/functions/PlanetResourceUpdate.php' );
+
+	$game_lang	=	read_config ( 'lang' );
+
+	define ( 'DEFAULT_LANG'	, (	$game_lang  == '' ) ? "spanish" : $game_lang );
+
+	includeLang ( 'INGAME' );
+
+	if ( $InLogin != TRUE )
+	{
+		include ( XGP_ROOT . 'includes/classes/class.CheckSession.php' );
+
+		$Result        	= new CheckSession();
+		$Result			= $Result->CheckUser ( $IsUserChecked );
+		$IsUserChecked 	= $Result['state'];
+		$user          	= $Result['record'];
+
+		if ( read_config ( 'game_disable' ) == 0 && $user['authlevel'] == 0 )
+		{
+			message ( stripslashes ( read_config ( 'close_reason' ) ) , '' , '' , FALSE , FALSE );
+		}
+	}
+
+	if ( ( time() >= ( read_config ( 'stat_last_update' ) + ( 60 * read_config ( 'stat_update_time' ) ) ) ) )
+	{
+		include	( XGP_ROOT . 'adm/statfunctions.php' );
+		$result	= MakeStats();
+		update_config ( 'stat_last_update' , $result['stats_time'] );
+	}
+
+	if ( isset ( $user ) )
+	{
+		include ( XGP_ROOT . 'includes/classes/class.FlyingFleetHandler.php' );
+		$_fleets = doquery ( "SELECT fleet_start_galaxy,fleet_start_system,fleet_start_planet,fleet_start_type FROM {{table}} WHERE `fleet_start_time` <= '" . time() . "' and `fleet_mess` ='0' order by fleet_id asc;" , 'fleets' ); // OR fleet_end_time <= ".time()
+
+		while ( $row = mysql_fetch_array ( $_fleets ) )
+		{
+			$array 					= array();
+			$array['galaxy'] 		= $row['fleet_start_galaxy'];
+			$array['system'] 		= $row['fleet_start_system'];
+			$array['planet'] 		= $row['fleet_start_planet'];
+			$array['planet_type'] 	= $row['fleet_start_type'];
+
+			$temp = new FlyingFleetHandler ( $array );
+		}
+
+		mysql_free_result ( $_fleets );
+
+		$_fleets = doquery ( "SELECT fleet_end_galaxy,fleet_end_system,fleet_end_planet ,fleet_end_type FROM {{table}} WHERE `fleet_end_time` <= '" . time() . " order by fleet_id asc';" , 'fleets' ); // OR fleet_end_time <= ".time()
+
+		while ( $row = mysql_fetch_array ($_fleets ) )
+		{
+			$array 					= array();
+			$array['galaxy'] 		= $row['fleet_end_galaxy'];
+			$array['system'] 		= $row['fleet_end_system'];
+			$array['planet'] 		= $row['fleet_end_planet'];
+			$array['planet_type'] 	= $row['fleet_end_type'];
+
+			$temp = new FlyingFleetHandler ( $array );
+		}
+
+		mysql_free_result ( $_fleets);
+		unset ( $_fleets );
+
+		if ( defined ( 'IN_ADMIN' ) )
+		{
+			includeLang ( 'ADMIN' );
+			include ( '../adm/AdminFunctions/Autorization.php' );
+
+			define('DPATH' , "../". DEFAULT_SKINPATH );
+		}
+		else
+		{
+			define('DPATH' , ( ( !$user["dpath"] ) ? DEFAULT_SKINPATH : SKIN_PATH . $user["dpath"] . '/' ) );
+		}
+
+		include ( XGP_ROOT . 'includes/functions/SetSelectedPlanet.php' );
+		SetSelectedPlanet ( $user );
+
+		$planetrow = doquery ( "SELECT * FROM `{{table}}` WHERE `id` = '" . $user['current_planet'] . "';" , "planets" , TRUE );
+
+		// Include the plugin system 0.3
+		include ( XGP_ROOT . 'includes/plugins.php' );
+	}
+}
+else
+{
+	define('DPATH' , "../". DEFAULT_SKINPATH );
+}
+
+include ( 'includes/classes/class.SecurePage.php' ); // include the class
+$SecureSqlInjection	= new SecureSqlInjection(); // load the class
+$SecureSqlInjection->secureGlobals(); // run the main class function
+
+?>
\ No newline at end of file
diff --git a/includes/GeneralFunctions.php b/includes/GeneralFunctions.php
index e0d56df..526e204 100644
--- a/includes/GeneralFunctions.php
+++ b/includes/GeneralFunctions.php
@@ -1,64 +1,48 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-$_POST 		=	array_map ( 'deep' , $_POST );
-$_POST 		= 	array_map ( 'addslashes_deep' , $_POST );
-$_GET 		= 	array_map ( 'deep' ,  $_GET );
-$_GET 		= 	array_map ( 'addslashes_deep' , $_GET );
-$_REQUEST 	=  	array_map ( 'deep' , $_REQUEST );
-$_REQUEST 	= 	array_map ( 'addslashes_deep' ,  $_REQUEST );
-$_SERVER 	= 	array_map ( 'deep' , $_SERVER );
-$_SERVER	=  	array_map ( 'addslashes_deep' , $_SERVER );
-$_COOKIE 	= 	array_map ( 'deep' , $_COOKIE );
-$_COOKIE	= 	array_map ( 'addslashes_deep' , $_COOKIE );
-
-function deep ( $value )
-{
-	$value = is_array($value) ? array_map('deep', $value) :  addslashes(trim( nl2br( strip_tags($value ) ) ));
-	return $value;
-}
-
-function  addslashes_deep ( $value )
-{
-	$value = is_array($value) ?  array_map('addslashes_deep', $value) : addslashes($value);
-	return $value;
-}
-
-function unset_vars( $prefix )
-{
-	$vars = array_keys($GLOBALS);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+function unset_vars ( $prefix )
+{
+	$vars = array_keys ( $GLOBALS );
+
 	for( $n = 0, $i = 0;  $i < count($vars);  $i ++ )
-		if( strpos($vars[$i], $prefix) === 0 )
+	{
+		if ( strpos ( $vars[$i] , $prefix ) === 0 )
 		{
-			unset($GLOBALS[$vars[$i]]);
+			unset ( $GLOBALS[$vars[$i]] );
+
 			$n ++;
 		}
+	}
 
 	return  $n;
 }
 
-function update_config( $config_name, $config_value )
+function read_config ( $config_name = '' , $all = FALSE )
 {
-	global $game_config;
-	doquery("UPDATE {{table}} SET `config_value` = '".$config_value."' WHERE `config_name` = '".$config_name."';",'config');
+	$configs		= new xml ( 'config.xml' );
+
+	if ( $all )
+	{
+		return $configs->get_configs ();
+	}
+	else
+	{
+		return $configs->get_config ( $config_name );
+	}
+
+}
+
+function update_config ( $config_name, $config_value )
+{
+	$configs		= new xml ( 'config.xml' );
+
+	$configs->write_config ( $config_name , $config_value );
 }
 
 function is_email($email)
@@ -66,26 +50,26 @@ function is_email($email)
 	return(preg_match("/^[-_.[:alnum:]]+@((([[:alnum:]]|[[:alnum:]][[:alnum:]-]*[[:alnum:]])\.)+(ad|ae|aero|af|ag|ai|al|am|an|ao|aq|ar|arpa|as|at|au|aw|az|ba|bb|bd|be|bf|bg|bh|bi|biz|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|ca|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|com|coop|cr|cs|cu|cv|cx|cy|cz|de|dj|dk|dm|do|dz|ec|edu|ee|eg|eh|er|es|et|eu|fi|fj|fk|fm|fo|fr|ga|gb|gd|ge|gf|gh|gi|gl|gm|gn|gov|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|il|in|info|int|io|iq|ir|is|it|jm|jo|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|mg|mh|mil|mk|ml|mm|mn|mo|mp|mq|mr|ms|mt|mu|museum|mv|mw|mx|my|mz|na|name|nc|ne|net|nf|ng|ni|nl|no|np|nr|nt|nu|nz|om|org|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|pro|ps|pt|pw|py|qa|re|ro|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sj|sk|sl|sm|sn|so|sr|st|su|sv|sy|sz|tc|td|tf|tg|th|tj|tk|tm|tn|to|tp|tr|tt|tv|tw|tz|ua|ug|uk|um|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|yu|za|zm|zw)$|(([0-9][0-9]?|[0-1][0-9][0-9]|[2][0-4][0-9]|[2][5][0-5])\.){3}([0-9][0-9]?|[0-1][0-9][0-9]|[2][0-4][0-9]|[2][5][0-5]))$/i", $email));
 }
 
-function message ($mes, $dest = "", $time = "3", $topnav = false, $menu = true)
+function message ($mes, $dest = "", $time = "3", $topnav = FALSE, $menu = TRUE)
 {
 	$parse['mes']   = $mes;
 
-	$page .= parsetemplate(gettemplate('message_body'), $parse);
+	$page .= parsetemplate(gettemplate('general/message_body'), $parse);
 
 	if (!defined('IN_ADMIN'))
 	{
-		display ($page, $topnav, (($dest != "") ? "<meta http-equiv=\"refresh\" content=\"$time;URL=$dest\">" : ""), false, $menu);
+		display ($page, $topnav, (($dest != "") ? "<meta http-equiv=\"refresh\" content=\"$time;URL=$dest\">" : ""), FALSE, $menu);
 	}
 	else
 	{
-		display ($page, $topnav, (($dest != "") ? "<meta http-equiv=\"refresh\" content=\"$time;URL=$dest\">" : ""), true, false);
+		display ($page, $topnav, (($dest != "") ? "<meta http-equiv=\"refresh\" content=\"$time;URL=$dest\">" : ""), TRUE, FALSE);
 	}
 
 }
 
-function display ($page, $topnav = true, $metatags = '', $AdminPage = false, $menu = true)
+function display ($page, $topnav = TRUE, $metatags = '', $AdminPage = FALSE, $menu = TRUE)
 {
-	global $link, $game_config, $debug, $user, $planetrow, $xgp_root, $phpEx;
+	global $link, $debug, $user, $planetrow;
 
 	if (!$AdminPage)
 		$DisplayPage  = StdUserHeader($metatags);
@@ -94,27 +78,27 @@ function display ($page, $topnav = true, $metatags = '', $AdminPage = false, $me
 
 	if ($topnav)
 	{
-		include_once($xgp_root . 'includes/functions/ShowTopNavigationBar.' . $phpEx);
+		include_once(XGP_ROOT . 'includes/functions/ShowTopNavigationBar.php');
 		$DisplayPage .= ShowTopNavigationBar( $user, $planetrow );
 	}
 
 	if ($menu && !$AdminPage)
 	{
-		include_once($xgp_root . 'includes/functions/ShowLeftMenu.' . $phpEx);
-		$DisplayPage .= ShowLeftMenu ($user['authlevel']);
+		include_once(XGP_ROOT . 'includes/functions/ShowLeftMenu.php');
+		$DisplayPage .= ShowLeftMenu ($user);
 	}
 
 	$DisplayPage .= "\n<center>\n". $page ."\n</center>\n";
 
 	if(!defined('LOGIN') && $_GET['page'] != 'galaxy')
-		$DisplayPage .= parsetemplate(gettemplate('footer'), $parse);
+		$DisplayPage .= parsetemplate(gettemplate('general/footer'), $parse);
 
 	if ($link)
 	{
 		mysql_close($link);
 	}
 
-	if ( $user['authlevel'] == 3 && $game_config['debug'] == 1 && !$AdminPage )
+	if ( $user['authlevel'] == 3 && read_config ( 'debug' ) == 1 && !$AdminPage )
 	{
 		// Convertir a objeto dom
 		$DisplayPage = str_get_html($DisplayPage);
@@ -128,7 +112,7 @@ function display ($page, $topnav = true, $metatags = '', $AdminPage = false, $me
 
 	echo $DisplayPage;
 
-	if ( $user['authlevel'] == 3 && $game_config['debug'] == 1 && $AdminPage)
+	if ( $user['authlevel'] == 3 && read_config ( 'debug' ) == 1 && $AdminPage)
 	{
 
 		echo "<center>";
@@ -141,17 +125,17 @@ function display ($page, $topnav = true, $metatags = '', $AdminPage = false, $me
 
 function StdUserHeader ($metatags = '')
 {
-	global $dpath, $game_config;
-
-	$parse['-title-'] 	.= $game_config['game_name'];
+	$parse['-title-'] 	.= read_config ( 'game_name' );
 	$parse['-favi-']	.= "<link rel=\"shortcut icon\" href=\"./favicon.ico\">\n";
-	$parse['-meta-']	.= "<meta http-equiv=\"Content-Type\" content=\"text/html;charset=cp1251\">\n";
+	$parse['-meta-']	.= "<meta http-equiv=\"Content-Type\" content=\"text/html;charset=UTF-8\">\n";
+	$parse['-meta-']	.= "<meta name=\"generator\" content=\"XG Proyect " . VERSION . "\" />\n";
 
 	if(!defined('LOGIN'))
 	{
 		$parse['-style-']  	.= "<link rel=\"stylesheet\" type=\"text/css\" href=\"styles/css/default.css\">\n";
 		$parse['-style-']  	.= "<link rel=\"stylesheet\" type=\"text/css\" href=\"styles/css/formate.css\">\n";
-		$parse['-style-'] 	.= "<link rel=\"stylesheet\" type=\"text/css\" href=\"". $dpath ."formate.css\" />\n";
+		$parse['-style-'] 	.= "<link rel=\"stylesheet\" type=\"text/css\" href=\"". DPATH ."formate.css\" />\n";
+		$parse['-meta-']	.= "<script type=\"text/javascript\" src=\"js/overlib-min.js\"></script>\n";
 	}
 	else
 	{
@@ -159,24 +143,27 @@ function StdUserHeader ($metatags = '')
 	}
 
 	$parse['-meta-']	.= ($metatags) ? $metatags : "";
-	$parse['-meta-']	.= "<script type=\"text/javascript\" src=\"scripts/overlib.js\"></script>\n";
 
-	return parsetemplate(gettemplate('simple_header'), $parse);
+	return parsetemplate(gettemplate('general/simple_header'), $parse);
 }
 
 function AdminUserHeader ($metatags = '')
 {
-	global $game_config;
-
 	if (!defined('IN_ADMIN'))
+	{
 		$parse['-title-'] 	.= 	"XG Proyect - Install";
+	}
 	else
-		$parse['-title-'] 	.= 	$game_config['game_name'] . " - Admin CP";
+	{
+		$parse['-title-'] 	.= 	read_config ( 'game_name' ) . " - Admin CP";
+	}
+
 
 	$parse['-favi-']	.= 	"<link rel=\"shortcut icon\" href=\"./../favicon.ico\">\n";
 	$parse['-style-']	.=	"<link rel=\"stylesheet\" type=\"text/css\" href=\"./../styles/css/admin.css\">\n";
-	$parse['-meta-']	.= 	"<script type=\"text/javascript\" src=\"./../scripts/overlib.js\"></script>\n";
+	$parse['-meta-']	.= 	"<script type=\"text/javascript\" src=\"./../js/overlib-min.js\"></script>\n";
 	$parse['-meta-'] 	.= ($metatags) ? $metatags : "";
+
 	return parsetemplate(gettemplate('adm/simple_header'), $parse);
 }
 
@@ -211,8 +198,7 @@ function GetMissionDuration ($GameSpeed, $MaxFleetSpeed, $Distance, $SpeedFactor
 
 function GetGameSpeedFactor ()
 {
-	global $game_config;
-	return $game_config['fleet_speed'] / 2500;
+	return read_config ( 'fleet_speed' ) / 2500;
 }
 
 function GetFleetMaxSpeed ($FleetArray, $Fleet, $Player)
@@ -245,7 +231,7 @@ function GetFleetMaxSpeed ($FleetArray, $Fleet, $Player)
 				$speedalls[$Ship] = $pricelist[$Ship]['speed']  + (($pricelist[$Ship]['speed'] * $Player['impulse_motor_tech']) * 0.2);
 		}
 
-		if ($Ship == 207 or $Ship == 213 or $Ship == 214 or $Ship == 215 or $Ship == 216)
+		if ($Ship == 207 or $Ship == 213 or $Ship == 214 or $Ship == 215)
 			$speedalls[$Ship] = $pricelist[$Ship]['speed'] + (($pricelist[$Ship]['speed'] * $Player['hyperspace_motor_tech']) * 0.3);
 	}
 
@@ -304,10 +290,10 @@ function pretty_time ($seconds)
 	if ($sr < 10) { $ss = "0" . $sr; } else { $ss = $sr; }
 
 	$time = '';
-	if ($day != 0) { $time .= $day . 'äåíü '; }
-	if ($hs  != 0) { $time .= $hh . '÷àñ. ';  } else { $time .= '00÷àñ. '; }
-	if ($ms  != 0) { $time .= $mm . 'ìèí. ';  } else { $time .= '00ìèí. '; }
-	$time .= $ss . 'ñåê.';
+	if ($day != 0) { $time .= $day . 'd '; }
+	if ($hs  != 0) { $time .= $hh . 'h ';  } else { $time .= '00h '; }
+	if ($ms  != 0) { $time .= $mm . 'm ';  } else { $time .= '00m '; }
+	$time .= $ss . 's';
 
 	return $time;
 }
@@ -326,22 +312,26 @@ function ShowBuildTime($time)
 	return "<br>". $lang['fgf_time'] . pretty_time($time);
 }
 
-function parsetemplate ($template, $array)
+function get_max_fleets ( $computer_tech , $amiral_level )
+{
+	return ( 1 + $computer_tech + ( $amiral_level * AMIRAL ) );
+}
+
+function parsetemplate ( $template , $array )
 {
-	return preg_replace('#\{([a-zà-ÿ0-9\-_]*?)\}#Ssie', '( ( isset($array[\'\1\']) ) ? $array[\'\1\'] : \'\' );', $template);
+	return preg_replace ( '#\{([a-z0-9\-_]*?)\}#Ssie' , '( ( isset($array[\'\1\']) ) ? $array[\'\1\'] : \'\' );' , $template );
 }
 
-function gettemplate ($templatename)
+function gettemplate ( $templatename )
 {
-	global $xgp_root;
-	return @file_get_contents($xgp_root . TEMPLATE_DIR . '/' . $templatename . ".tpl");
+	return @file_get_contents ( XGP_ROOT . TEMPLATE_DIR . '/' . $templatename . '.php' );
 }
 
-function includeLang ($filename, $ext = '.mo')
+function includeLang ( $filename )
 {
-	global $xgp_root, $lang;
+	global $lang;
 
-	include ($xgp_root . "language/". DEFAULT_LANG ."/". $filename.$ext);
+	include ( XGP_ROOT . "language/" . DEFAULT_LANG ."/". $filename . '.php' );
 }
 
 function GetStartAdressLink ( $FleetRow, $FleetType )
@@ -365,33 +355,44 @@ function BuildPlanetAdressLink ( $CurrentPlanet )
 	return $Link;
 }
 
-function doquery($query, $table, $fetch = false)
+function doquery($query, $table, $fetch = FALSE)
 {
-	global $link, $debug, $xgp_root;
+	global $link, $debug;
 
-	require($xgp_root.'config.php');
+	require ( XGP_ROOT . 'config.php' );
 
 	if(!$link)
 	{
-		$link = mysql_connect($dbsettings["server"], $dbsettings["user"], $dbsettings["pass"]) or $debug->error(mysql_error()."<br />$query","SQL Error");
-		mysql_select_db($dbsettings["name"]) or $debug->error(mysql_error()."<br />$query","SQL Error");
+		$link = mysql_connect	(
+									$dbsettings["server"],
+									$dbsettings["user"],
+									$dbsettings["pass"]
+								) or $debug->error ( mysql_error() . "<br />$query" , "SQL Error" );
+
+		mysql_select_db ( $dbsettings["name"] ) or $debug->error ( mysql_error() . "<br />$query" , "SQL Error" );
+
 		echo mysql_error();
 	}
 
-	$sql 		= str_replace("{{table}}", $dbsettings["prefix"].$table, $query);
-	$sqlquery 	= mysql_query($sql) or $debug->error(mysql_error()."<br />$sql<br />","SQL Error");
+	$sql 		= str_replace ( "{{table}}" , $dbsettings["prefix"] . $table , $query );
+	$sqlquery 	= mysql_query ( $sql ) or $debug->error ( mysql_error() . "<br />$sql<br />" , "SQL Error" );
 
-	unset($dbsettings);
+	unset ( $dbsettings );
 
 	global $numqueries,$debug;
 	$numqueries++;
 
-	$debug->add("<tr><th>Query $numqueries: </th><th>$query</th><th>$table</th><th>$fetch</th></tr>");
+	$debug->add ( "<tr><th>Query $numqueries: </th><th>$query</th><th>$table</th><th>$fetch</th></tr>");
 
-	if($fetch)
-		return mysql_fetch_array($sqlquery);
+	if ( $fetch )
+	{
+		return mysql_fetch_array ( $sqlquery );
+	}
 	else
+	{
 		return $sqlquery;
+	}
+
 }
 
 function colorNumber($n, $s = '')
@@ -425,7 +426,7 @@ function colorGreen($n)
 	return '<font color="#00ff00">' . $n . '</font>';
 }
 
-function pretty_number($n, $floor = true)
+function pretty_number($n, $floor = TRUE)
 {
 	if ($floor)
 		$n = floor($n);
@@ -460,9 +461,24 @@ function shortly_number($number)
 		return pretty_number($number);
 }
 
-function floattostring($Numeric, $Pro = 0, $Output = false)
+function floattostring($Numeric, $Pro = 0, $Output = FALSE)
 {
 	return ($Output) ? str_replace(",",".", sprintf("%.".$Pro."f", $Numeric)) : sprintf("%.".$Pro."f", $Numeric);
 }
 
+function roundUp($value, $precision = 0)
+{
+	if ( $precision == 0 )
+	{
+		$precisionFactor = 1;
+	}
+
+	else
+	{
+		$precisionFactor = pow( 10, $precision );
+	}
+
+	return ceil( $value * $precisionFactor )/$precisionFactor;
+}
+
 ?>
\ No newline at end of file
diff --git a/includes/classes/class.BBCode.php b/includes/classes/class.BBCode.php
new file mode 100644
index 0000000..081c7d9
--- /dev/null
+++ b/includes/classes/class.BBCode.php
@@ -0,0 +1,120 @@
+<?php
+
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+if(!defined('INSIDE')){ die(header("location:../../"));}
+
+class bbCode
+{
+	public function bbCode ( $string )
+	{
+		$pattern = array(
+		    '/\\n/',
+		    '/\\r/',
+		    '/\[list\](.*?)\[\/list\]/ise',
+		    '/\[b\](.*?)\[\/b\]/is',
+		    '/\[strong\](.*?)\[\/strong\]/is',
+		    '/\[i\](.*?)\[\/i\]/is',
+		    '/\[u\](.*?)\[\/u\]/is',
+		    '/\[s\](.*?)\[\/s\]/is',
+		    '/\[del\](.*?)\[\/del\]/is',
+		    '/\[url=(.*?)\](.*?)\[\/url\]/ise',
+		    '/\[email=(.*?)\](.*?)\[\/email\]/is',
+		    '/\[img](.*?)\[\/img\]/ise',
+		    '/\[color=(.*?)\](.*?)\[\/color\]/is',
+		    '/\[quote\](.*?)\[\/quote\]/ise',
+		    '/\[code\](.*?)\[\/code\]/ise',
+		    '/\[font=(.*?)\](.*?)\[\/font\]/ise',
+		    '/\[bg=(.*?)\](.*?)\[\/bg\]/ise',
+		    '/\[size=(.*?)\](.*?)\[\/size\]/ise'
+		);
+
+		$replace = array(
+		    '<br/>',
+		    '',
+		    '$this->sList(\'\\1\')',
+		    '<b>\1</b>',
+		    '<strong>\1</strong>',
+		    '<i>\1</i>',
+		    '<span style="text-decoration: underline;">\1</span>',
+		    '<span style="text-decoration: line-through;">\1</span>',
+		    '<span style="text-decoration: line-through;">\1</span>',
+		    '$this->urlfix(\'\\1\',\'\\2\')',
+		    '<a href="mailto:\1" title="\1">\2</a>',
+		    '$this->imagefix(\'\\1\')',
+		    '<span style="color: \1;">\2</span>',
+		    '$this->sQuote(\'\1\')',
+		    '$this->sCode(\'\1\')',
+		    '$this->fontfix(\'\\1\',\'\\2\')',
+		    '$this->bgfix(\'\\1\',\'\\2\')',
+		    '$this->sizefix(\'\\1\',\'\\2\')'
+		);
+
+		return preg_replace($pattern, $replace, nl2br(htmlspecialchars(stripslashes($string))));
+	}
+
+	private function sCode($string)
+	{
+		$pattern =  '/\<img src=\\\"(.*?)img\/smilies\/(.*?).png\\\" alt=\\\"(.*?)\\\" \/>/s';
+		$string = preg_replace($pattern, '\3', $string);
+		return '<pre style="color: #DDDD00; background-color:gray ">' . trim($string) . '</pre>';
+	}
+
+	private function sQuote($string)
+	{
+		$pattern =  '/\<img src=\\\"(.*?)img\/smilies\/(.*?).png\\\" alt=\\\"(.*?)\\\" \/>/s';
+		$string = preg_replace($pattern, '\3', $string);
+		return '<blockquote><p style="color: #000000; font-size: 10pt; background-color:55AACC; font-family: Arial">' . trim($string) . '</p></blockquote>';
+	}
+
+	private function sList($string)
+	{
+		$tmp = explode('[*]', stripslashes($string));
+		$out = NULL;
+		foreach($tmp as $list) {
+			if(strlen(str_replace('', '', $list)) > 0) {
+				$out .= '<li>' . trim($list) . '</li>';
+			}
+		}
+		return '<ul>' . $out . '</ul>';
+	}
+
+	private function imagefix($img)
+	{
+		if(substr($img, 0, 7) != 'http://')
+		{
+			$img = './images/' . $img;
+		}
+		return '<img src="' . $img . '" alt="' . $img . '" title="' . $img . '" />';
+	}
+
+	private function urlfix($url, $title)
+	{
+		$title = stripslashes($title);
+		$url   = trim($url);
+		return (substr ($url, 0, 5) == 'data:' || substr ($url, 0, 5) ==  'file:' || substr ($url, 0, 11) == 'javascript:' || substr  ($url, 0, 4) == 'jar:' || substr ($url, 0, 1) == '#') ? '' : '<a  href="' . $url . '" title="'.htmlspecialchars($title,  ENT_QUOTES).'">'.htmlspecialchars($title, ENT_QUOTES).'</a>';
+	}
+
+	private function fontfix($font, $title)
+	{
+		$title = stripslashes($title);
+		return '<span style="font-family:' . $font . '">' . $title . '</span>';
+	}
+
+	private function bgfix($bg, $title)
+	{
+		$title = stripslashes($title);
+		return '<span style="background-color:' . $bg . '">' . $title . '</span>';
+	}
+
+	private function sizefix($size, $text)
+	{
+		$title = stripslashes($text);
+		return '<span style="font-size:' . $size . 'px">' . $title . '</span>';
+	}
+}
+?>
\ No newline at end of file
diff --git a/includes/classes/class.CheckSession.php b/includes/classes/class.CheckSession.php
index ea4379a..75b8dc2 100644
--- a/includes/classes/class.CheckSession.php
+++ b/includes/classes/class.CheckSession.php
@@ -1,130 +1,129 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+if(!defined('INSIDE')){ die(header ( 'location:../../' ));}
 
 class CheckSession
 {
-	private function CheckCookies ($IsUserChecked)
-	{
-		global $game_config, $xgp_root, $phpEx, $lang;
-
-		$UserRow = array();
-
-		include($xgp_root . 'config.' . $phpEx);
-
-		if (isset($_COOKIE[$game_config['COOKIE_NAME']]))
-		{
-			$TheCookie  = explode("/%/", $_COOKIE[$game_config['COOKIE_NAME']]);
-			$TheCookie 	= array_map('mysql_escape_string',$TheCookie);
-			$UserResult = doquery("SELECT * FROM {{table}} WHERE `username` = '". mysql_escape_string($TheCookie[1]). "';", 'users');
-
-			if (mysql_num_rows($UserResult) != 1)
-			{
-				message($lang['ccs_multiple_users'], $xgp_root, 5, false, false);
-			}
-
-			$UserRow    = mysql_fetch_array($UserResult);
-
-			if ($UserRow["id"] != $TheCookie[0])
-			{
-				message($lang['ccs_other_user'], $xgp_root, 5,  false, false);
-			}
-
-			if (md5($UserRow["password"] . "--" . $dbsettings["secretword"]) !== $TheCookie[2])
-			{
-				message($lang['css_different_password'], $xgp_root, 5,  false, false);
-			}
-
-			$NextCookie = implode("/%/", $TheCookie);
-
-			if ($TheCookie[3] == 1)
-			{
-				$ExpireTime = time() + 31536000;
-			}
-			else
-			{
-				$ExpireTime = 0;
-			}
-
-			if ($IsUserChecked == false)
-			{
-				setcookie ($game_config['COOKIE_NAME'], $NextCookie, $ExpireTime, "/", "", 0);
-				$QryUpdateUser  = "UPDATE {{table}} SET ";
-				$QryUpdateUser .= "`onlinetime` = '". time() ."', ";
-				$QryUpdateUser .= "`current_page` = '". mysql_escape_string($_SERVER['REQUEST_URI']) ."', ";
-				$QryUpdateUser .= "`user_lastip` = '". mysql_escape_string($_SERVER['REMOTE_ADDR']) ."', ";
-				$QryUpdateUser .= "`user_agent` = '". mysql_escape_string($_SERVER['HTTP_USER_AGENT']) ."' ";
-				$QryUpdateUser .= "WHERE ";
-				$QryUpdateUser .= "`id` = '". intval($TheCookie[0]) ."' LIMIT 1;";
-				doquery( $QryUpdateUser, 'users');
-				$IsUserChecked = true;
-			}
-			else
-			{
-				$QryUpdateUser  = "UPDATE {{table}} SET ";
-				$QryUpdateUser .= "`onlinetime` = '". time() ."', ";
-				$QryUpdateUser .= "`current_page` = '". mysql_escape_string($_SERVER['REQUEST_URI']) ."', ";
-				$QryUpdateUser .= "`user_lastip` = '". mysql_escape_string($_SERVER['REMOTE_ADDR']) ."', ";
-				$QryUpdateUser .= "`user_agent` = '". mysql_escape_string($_SERVER['HTTP_USER_AGENT']) ."' ";
-				$QryUpdateUser .= "WHERE ";
-				$QryUpdateUser .= "`id` = '". intval($TheCookie[0]) ."' LIMIT 1;";
-				doquery( $QryUpdateUser, 'users');
-				$IsUserChecked = true;
-			}
-		}
-
-		unset($dbsettings);
-
-		$Return['state']  = $IsUserChecked;
-		$Return['record'] = $UserRow;
-
-		return $Return;
-	}
-
-	public function CheckUser($IsUserChecked)
-	{
-		global $user, $xgp_root, $lang;
-
-		$Result        = $this->CheckCookies($IsUserChecked);
-		$IsUserChecked = $Result['state'];
-
-		if ($Result['record'] != false)
-		{
-			$user = $Result['record'];
-
-			if ($user['bana'] == 1)
-			{
-				die("<div align=\"center\"><h1>".$lang['css_account_banned_message']."</h1><br /> <strong>".$lang['css_account_banned_expire'].date("d-m-y H:i", $user['banaday'])."</strong></div>");
-			}
-
-			$RetValue['record'] = $user;
-			$RetValue['state']  = $IsUserChecked;
-		}
-		else
-		{
-			$RetValue['record'] = array();
-			$RetValue['state']  = false;
-			header("location:".$xgp_root);
-		}
-
-		return $RetValue;
-	}
-}
-?>
\ No newline at end of file
+    private function CheckCookies ($IsUserChecked)
+    {
+        global $lang;
+
+        $UserRow = array();
+
+        include(XGP_ROOT . 'config.php');
+
+    	$game_cookie	=	read_config ( 'cookie_name' );
+
+        if (isset($_COOKIE[$game_cookie]))
+        {
+            $TheCookie	= explode("/%/", $_COOKIE[$game_cookie]);
+
+            // START FIX BY JSTAR
+            $TheCookie	= array_map ( 'mysql_escape_string' , $TheCookie );
+            // END FIX BY JSTAR
+
+            // BETTER QUERY BY LUCKY! REDUCE GENERAL QUERY FROM 11 TO 10.
+            $UserResult = doquery("SELECT {{table}}users.*, {{table}}statpoints.total_rank, {{table}}statpoints.total_points, {{table}}users.id
+                                    FROM {{table}}statpoints
+                                    RIGHT JOIN {{table}}users ON {{table}}statpoints.id_owner = {{table}}users.id
+                                    WHERE ({{table}}users.username = '{$TheCookie[1]}') LIMIT 1;", '');
+
+
+            if (mysql_num_rows($UserResult) != 1)
+            {
+                message($lang['ccs_multiple_users'], XGP_ROOT, 5, FALSE, FALSE);
+            }
+
+            $UserRow    = mysql_fetch_array($UserResult);
+
+            if ($UserRow["id"] != $TheCookie[0])
+            {
+                message($lang['ccs_other_user'], XGP_ROOT, 5,  FALSE, FALSE);
+            }
+
+            if (md5($UserRow["password"] . "--" . $dbsettings["secretword"]) !== $TheCookie[2])
+            {
+                message($lang['css_different_password'], XGP_ROOT, 5,  FALSE, FALSE);
+            }
+
+            $NextCookie = implode("/%/", $TheCookie);
+
+            if ($TheCookie[3] == 1)
+            {
+                $ExpireTime = time() + 31536000;
+            }
+            else
+            {
+                $ExpireTime = 0;
+            }
+
+            if ($IsUserChecked == FALSE)
+            {
+                setcookie ($game_cookie, $NextCookie, $ExpireTime, "/", "", 0);
+                $QryUpdateUser  = "UPDATE {{table}} SET ";
+                $QryUpdateUser .= "`onlinetime` = '". time() ."', ";
+                $QryUpdateUser .= "`current_page` = '". mysql_real_escape_string(htmlspecialchars($_SERVER['REQUEST_URI'])) ."', ";
+                $QryUpdateUser .= "`user_lastip` = '". mysql_real_escape_string(htmlspecialchars($_SERVER['REMOTE_ADDR'])) ."', ";
+                $QryUpdateUser .= "`user_agent` = '". mysql_real_escape_string(htmlspecialchars($_SERVER['HTTP_USER_AGENT'])) ."' ";
+                $QryUpdateUser .= "WHERE ";
+                $QryUpdateUser .= "`id` = '". intval($TheCookie[0]) ."' LIMIT 1;";
+                doquery( $QryUpdateUser, 'users');
+                $IsUserChecked = TRUE;
+            }
+            else
+            {
+                $QryUpdateUser  = "UPDATE {{table}} SET ";
+                $QryUpdateUser .= "`onlinetime` = '". time() ."', ";
+                $QryUpdateUser .= "`current_page` = '". mysql_real_escape_string(htmlspecialchars($_SERVER['REQUEST_URI'])) ."', ";
+                $QryUpdateUser .= "`user_lastip` = '". mysql_real_escape_string(htmlspecialchars($_SERVER['REMOTE_ADDR'])) ."', ";
+                $QryUpdateUser .= "`user_agent` = '". mysql_real_escape_string(htmlspecialchars($_SERVER['HTTP_USER_AGENT'])) ."' ";
+                $QryUpdateUser .= "WHERE ";
+                $QryUpdateUser .= "`id` = '". intval($TheCookie[0]) ."' LIMIT 1;";
+                doquery( $QryUpdateUser, 'users');
+                $IsUserChecked = TRUE;
+            }
+        }
+
+        unset($dbsettings);
+
+        $Return['state']  = $IsUserChecked;
+        $Return['record'] = $UserRow;
+
+        return $Return;
+    }
+
+    public function CheckUser($IsUserChecked)
+    {
+        global $user, $lang;
+
+        $Result        = $this->CheckCookies($IsUserChecked);
+        $IsUserChecked = $Result['state'];
+
+        if ($Result['record'] != FALSE)
+        {
+            $user = $Result['record'];
+
+            if ($user['bana'] == 1)
+            {
+                die("<div align=\"center\"><h1>".$lang['css_account_banned_message']."</h1><br /> <strong>".$lang['css_account_banned_expire'].date("d-m-y H:i", $user['banaday'])."</strong></div>");
+            }
+
+            $RetValue['record'] = $user;
+            $RetValue['state']  = $IsUserChecked;
+        }
+        else
+        {
+            $RetValue['record'] = array();
+            $RetValue['state']  = FALSE;
+        	header ( 'location:' . XGP_ROOT );
+        }
+
+        return $RetValue;
+    }
+}
\ No newline at end of file
diff --git a/includes/classes/class.FlyingFleetHandler.php b/includes/classes/class.FlyingFleetHandler.php
index de5fbd0..b3f0354 100644
--- a/includes/classes/class.FlyingFleetHandler.php
+++ b/includes/classes/class.FlyingFleetHandler.php
@@ -1,86 +1,73 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if (!defined('INSIDE'))die(header("location:../../"));
 
 class FlyingFleetHandler
 {
-	public static function calculateAKSSteal($attackFleets, $defenderPlanet, $ForSim = false)
+	public static function calculateAKSSteal($attackFleets, $defenderPlanet, $ForSim = FALSE)
 	{
-		//Steal-Math by Slaver for 2Moons(http://code.google.com/p/2moons/) based on http://www.owiki.de/Beute
-		global $pricelist;
+		//Steal-Math by Slaver for 2Moons(http://www.titanspace.org) based on http://www.owiki.de/Beute
+		global $pricelist, $db;
 
 		$SortFleets = array();
+
 		foreach ($attackFleets as $FleetID => $Attacker)
 		{
 			foreach($Attacker['detail'] as $Element => $amount)
 			{
-				$SortFleets[$FleetID]        += $pricelist[$Element]['capacity'] * $amount;
+				if ($Element != 210) //fix probos capacity in attack by jstar
+					$SortFleets[$FleetID]        += $pricelist[$Element]['capacity'] * $amount;
 			}
 
 			$SortFleets[$FleetID]            -= $Attacker['fleet']['fleet_resource_metal'] - $Attacker['fleet']['fleet_resource_crystal'] - $Attacker['fleet']['fleet_resource_deuterium'];
 		}
 
 		$Sumcapacity              = array_sum($SortFleets);
+		//FIX JTSAMPER
+		$booty['deuterium']       = min($Sumcapacity / 3,  ($defenderPlanet['deuterium'] / 2));
+		$Sumcapacity             -= $booty['deuterium'];
 
-		// Step 1
-		$booty['metal']         = min(($Sumcapacity / 3),  ($defenderPlanet['metal'] / 2));
-		$Sumcapacity             -= $booty['metal'];
-
-		// Step 2
 		$booty['crystal']         = min(($Sumcapacity / 2),  ($defenderPlanet['crystal'] / 2));
 		$Sumcapacity             -= $booty['crystal'];
 
-		// Step 3
-		$booty['deuterium']     = min($Sumcapacity,  ($defenderPlanet['deuterium'] / 2));
-		$Sumcapacity             -= $booty['deuterium'];
+		$booty['metal']           = min(($Sumcapacity ),  ($defenderPlanet['metal'] / 2));
+		$Sumcapacity             -= $booty['metal'];
+
+
+		$oldMetalBooty            = $booty['crystal'] ;
+		$booty['crystal']         += min(($Sumcapacity /2 ),  max((($defenderPlanet['crystal']) / 2) - $booty['crystal'], 0));
 
-		// Step 4
-		$oldMetalBooty             = $booty['metal'];
-		$booty['metal']         += min(($Sumcapacity / 2),  max((($defenderPlanet['metal']) / 2) - $booty['metal'], 0));
-		$Sumcapacity             += $oldMetalBooty - $booty['metal'];
+		$Sumcapacity             += $oldMetalBooty - $booty['crystal'] ;
 
-		// Step 5
-		$booty['crystal']         += min(($Sumcapacity),  max((($defenderPlanet['crystal']) / 2) - $booty['crystal'], 0));
+		$booty['metal']          += min(($Sumcapacity ),  max(($defenderPlanet['metal'] / 2) - $booty['metal'], 0));
 
-		$booty['metal']            = max($booty['metal'] ,0);
-		$booty['crystal']        = max($booty['crystal'] ,0);
-		$booty['deuterium']        = max($booty['deuterium'] ,0);
 
-		$steal                    = array_map('floor', $booty);
+		$booty['metal']             = max($booty['metal'] ,0);
+		$booty['crystal']           = max($booty['crystal'] ,0);
+		$booty['deuterium']         = max($booty['deuterium'] ,0);
+		//END FIX
 
+		$steal                 = array_map('floor', $booty);
 		if($ForSim)
 			return $steal;
 
-		$AllCapacity        = array_sum($SortFleets);
-		$QryUpdateFleet        = "";
+		$AllCapacity    = array_sum($SortFleets);
+		$QryUpdateFleet    = "";
 
 		foreach($SortFleets as $FleetID => $Capacity)
 		{
-			$QryUpdateFleet     = "UPDATE {{table}} SET ";
-			$QryUpdateFleet .= "`fleet_resource_metal` =  `fleet_resource_metal` + '".floattostring($steal['metal'] * ($Capacity /  $AllCapacity))."', ";
-			$QryUpdateFleet .= "`fleet_resource_crystal` =  `fleet_resource_crystal` +'".floattostring($steal['crystal'] * ($Capacity  / $AllCapacity))."', ";
-			$QryUpdateFleet .= "`fleet_resource_deuterium` =  `fleet_resource_deuterium` +'".floattostring($steal['deuterium'] * ($Capacity / $AllCapacity))."' ";
-			$QryUpdateFleet .= "WHERE fleet_id = '".$FleetID."' ";
-			$QryUpdateFleet .= "LIMIT 1;";
+			$QryUpdateFleet = 'UPDATE {{table}} SET ';
+			$QryUpdateFleet .= '`fleet_resource_metal` = `fleet_resource_metal` + '.floattostring($steal['metal'] * ($Capacity / $AllCapacity)).', ';
+			$QryUpdateFleet .= '`fleet_resource_crystal` = `fleet_resource_crystal` +'.floattostring($steal['crystal'] * ($Capacity / $AllCapacity)).', ';
+			$QryUpdateFleet .= '`fleet_resource_deuterium` = `fleet_resource_deuterium` +'.floattostring($steal['deuterium'] * ($Capacity / $AllCapacity)).' ';
+			$QryUpdateFleet .= 'WHERE fleet_id = '.$FleetID.' ';
+			$QryUpdateFleet .= 'LIMIT 1;';
 			doquery($QryUpdateFleet, 'fleets');
 
 		}
@@ -92,14 +79,14 @@ private function SpyTarget ($TargetPlanet, $Mode, $TitleString)
 	{
 		global $lang, $resource;
 
-		$LookAtLoop = true;
+		$LookAtLoop = TRUE;
 		if ($Mode == 0)
 		{
 			$String  = "<table width=\"440\"><tr><td class=\"c\" colspan=\"5\">";
 			$String .= $TitleString ." ". $TargetPlanet['name'];
 			$String .= " <a href=\"game.php?page=galaxy&mode=3&galaxy=". $TargetPlanet["galaxy"] ."&system=". $TargetPlanet["system"]. "\">";
 			$String .= "[". $TargetPlanet["galaxy"] .":". $TargetPlanet["system"] .":". $TargetPlanet["planet"] ."]</a>";
-			$String .= $lang['sys_the'] . gmdate("d-m-Y H:i:s", time() + 2 * 60 * 60) ."</td>";
+			$String .= $lang['sys_the'] . date("d-m-Y H:i:s", time()) ."</td>";
 			$String .= "</tr><tr>";
 			$String .= "<td width=220>". $lang['Metal']     ."</td><td width=220 align=right>". pretty_number($TargetPlanet['metal'])      ."</td><td>&nbsp;</td>";
 			$String .= "<td width=220>". $lang['Crystal']   ."</td></td><td width=220 align=right>". pretty_number($TargetPlanet['crystal'])    ."</td>";
@@ -107,7 +94,7 @@ private function SpyTarget ($TargetPlanet, $Mode, $TitleString)
 			$String .= "<td width=220>". $lang['Deuterium'] ."</td><td width=220 align=right>". pretty_number($TargetPlanet['deuterium'])  ."</td><td>&nbsp;</td>";
 			$String .= "<td width=220>". $lang['Energy']    ."</td><td width=220 align=right>". pretty_number($TargetPlanet['energy_max']) ."</td>";
 			$String .= "</tr>";
-			$LookAtLoop = false;
+			$LookAtLoop = FALSE;
 		}
 		elseif ($Mode == 1)
 		{
@@ -136,7 +123,7 @@ private function SpyTarget ($TargetPlanet, $Mode, $TitleString)
 			$Loops      = 1;
 		}
 
-		if ($LookAtLoop == true)
+		if ($LookAtLoop == TRUE)
 		{
 			$String  = "<table width=\"440\" cellspacing=\"1\"><tr><td class=\"c\" colspan=\"". ((2 * SPY_REPORT_ROW) + (SPY_REPORT_ROW - 1))."\">". $TitleString ."</td></tr>";
 			$Count       = 0;
@@ -188,7 +175,7 @@ private function SpyTarget ($TargetPlanet, $Mode, $TitleString)
 
 	private function walka ($CurrentSet, $TargetSet, $CurrentTechno, $TargetTechno)
 	{
-		global $pricelist, $CombatCaps, $game_config, $user;
+		global $pricelist, $CombatCaps, $user;
 
 		$runda       = array();
 		$atakujacy_n = array();
@@ -241,11 +228,11 @@ private function walka ($CurrentSet, $TargetSet, $CurrentTechno, $TargetTechno)
 			{
 				foreach($CurrentSet as $a => $b)
 				{
-					$CurrentSet[$a]["obrona"] 	= $CurrentSet[$a]['count'] * ($pricelist[$a]['metal'] + $pricelist[$a]['crystal']) / 10 * (1 + (0.1 * ($CurrentTechno["defence_tech"]) + (AMIRAL * $user['rpg_amiral'])));
+					$CurrentSet[$a]["obrona"] 	= $CurrentSet[$a]['count'] * ($pricelist[$a]['metal'] + $pricelist[$a]['crystal']) / 10 * (1 + (0.1 * ($CurrentTechno["defence_tech"])));
 					$rand 						= rand(80, 120) / 100;
-					$CurrentSet[$a]["tarcza"] 	= $CurrentSet[$a]['count'] * $CombatCaps[$a]['shield'] * (1 + (0.1 * $CurrentTechno["shield_tech"]) + (AMIRAL * $user['rpg_amiral'])) * $rand;
+					$CurrentSet[$a]["tarcza"] 	= $CurrentSet[$a]['count'] * $CombatCaps[$a]['shield'] * (1 + (0.1 * $CurrentTechno["shield_tech"])) * $rand;
 					$atak_statku 				= $CombatCaps[$a]['attack'];
-					$technologie 				= (1 + (0.1 * $CurrentTechno["military_tech"]+(AMIRAL * $user['rpg_amiral'])));
+					$technologie 				= (1 + (0.1 * $CurrentTechno["military_tech"]));
 					$rand 						= rand(80, 120) / 100;
 					$ilosc 						= $CurrentSet[$a]['count'];
 					$CurrentSet[$a]["atak"] 	= $ilosc * $atak_statku * $technologie * $rand;
@@ -264,11 +251,11 @@ private function walka ($CurrentSet, $TargetSet, $CurrentTechno, $TargetTechno)
 			{
 				foreach($TargetSet as $a => $b)
 				{
-					$TargetSet[$a]["obrona"] 	= $TargetSet[$a]['count'] * ($pricelist[$a]['metal'] + $pricelist[$a]['crystal']) / 10 * (1 + (0.1 * ($TargetTechno["defence_tech"]) + (AMIRAL* $user['rpg_amiral'])));
+					$TargetSet[$a]["obrona"] 	= $TargetSet[$a]['count'] * ($pricelist[$a]['metal'] + $pricelist[$a]['crystal']) / 10 * (1 + (0.1 * ($TargetTechno["defence_tech"])));
 					$rand 						= rand(80, 120) / 100;
-					$TargetSet[$a]["tarcza"] 	= $TargetSet[$a]['count'] * $CombatCaps[$a]['shield'] * (1 + (0.1 * $TargetTechno["shield_tech"])+ (AMIRAL * $user['rpg_amiral'])) * $rand;
+					$TargetSet[$a]["tarcza"] 	= $TargetSet[$a]['count'] * $CombatCaps[$a]['shield'] * (1 + (0.1 * $TargetTechno["shield_tech"])) * $rand;
 					$atak_statku 				= $CombatCaps[$a]['attack'];
-					$technologie 				= (1 + (0.1 * $TargetTechno["military_tech"]) + (AMIRAL * $user['rpg_amiral']));
+					$technologie 				= (1 + (0.1 * $TargetTechno["military_tech"]));
 					$rand 						= rand(80, 120) / 100;
 					$ilosc 						= $TargetSet[$a]['count'];
 					$TargetSet[$a]["atak"] 		= $ilosc * $atak_statku * $technologie * $rand;
@@ -467,11 +454,14 @@ private function walka ($CurrentSet, $TargetSet, $CurrentTechno, $TargetTechno)
 		if (($ilosc_wrog > 0) && ($atakujacy_ilosc == 0))
 			$wygrana = "w";
 
-		$zlom['metal']    = ((($atakujacy_zlom_poczatek['metal']   - $atakujacy_zlom_koniec['metal'])   + ($wrog_zlom_poczatek['metal']   - $wrog_zlom_koniec['metal']))   * ($game_config['Fleet_Cdr'] / 100));
-		$zlom['crystal']  = ((($atakujacy_zlom_poczatek['crystal'] - $atakujacy_zlom_koniec['crystal']) + ($wrog_zlom_poczatek['crystal'] - $wrog_zlom_koniec['crystal'])) * ($game_config['Fleet_Cdr'] / 100));
+		$game_fleet_cdr	=	read_config ( 'fleet_cdr' );
+		$game_def_cdr	=	read_config ( 'defs_cdr' );
 
-		$zlom['metal']   += ((($atakujacy_zlom_poczatek['metal']   - $atakujacy_zlom_koniec['metal'])   + ($wrog_zlom_poczatek['metal']   - $wrog_zlom_koniec['metal']))   * ($game_config['Defs_Cdr'] / 100));
-		$zlom['crystal'] += ((($atakujacy_zlom_poczatek['crystal'] - $atakujacy_zlom_koniec['crystal']) + ($wrog_zlom_poczatek['crystal'] - $wrog_zlom_koniec['crystal'])) * ($game_config['Defs_Cdr'] / 100));
+		$zlom['metal']    = ((($atakujacy_zlom_poczatek['metal']   - $atakujacy_zlom_koniec['metal'])   + ($wrog_zlom_poczatek['metal']   - $wrog_zlom_koniec['metal']))   * ($game_fleet_cdr / 100));
+		$zlom['crystal']  = ((($atakujacy_zlom_poczatek['crystal'] - $atakujacy_zlom_koniec['crystal']) + ($wrog_zlom_poczatek['crystal'] - $wrog_zlom_koniec['crystal'])) * ($game_fleet_cdr / 100));
+
+		$zlom['metal']   += ((($atakujacy_zlom_poczatek['metal']   - $atakujacy_zlom_koniec['metal'])   + ($wrog_zlom_poczatek['metal']   - $wrog_zlom_koniec['metal']))   * ($game_def_cdr / 100));
+		$zlom['crystal'] += ((($atakujacy_zlom_poczatek['crystal'] - $atakujacy_zlom_koniec['crystal']) + ($wrog_zlom_poczatek['crystal'] - $wrog_zlom_koniec['crystal'])) * ($game_def_cdr / 100));
 
 		$zlom["atakujacy"] = (($atakujacy_zlom_poczatek['metal'] - $atakujacy_zlom_koniec['metal']) + ($atakujacy_zlom_poczatek['crystal'] - $atakujacy_zlom_koniec['crystal']));
 		$zlom["wrog"]      = (($wrog_zlom_poczatek['metal']      - $wrog_zlom_koniec['metal'])      + ($wrog_zlom_poczatek['crystal']      - $wrog_zlom_koniec['crystal']) + $straty_obrona_wrog);
@@ -479,10 +469,16 @@ private function walka ($CurrentSet, $TargetSet, $CurrentTechno, $TargetTechno)
 		return array("atakujacy" => $CurrentSet, "wrog" => $TargetSet, "wygrana" => $wygrana, "dane_do_rw" => $runda, "zlom" => $zlom);
 	}
 
-	private function RestoreFleetToPlanet ($FleetRow, $Start = true)
+	private function RestoreFleetToPlanet ($FleetRow, $Start = TRUE)
 	{
 		global $resource;
 
+		//fix resource by jstar
+		$targetPlanet = doquery("SELECT * FROM {{table}} WHERE `galaxy` = ". intval($FleetRow['fleet_start_galaxy']) ." AND `system` = ". intval($FleetRow['fleet_start_system']) ." AND `planet_type` = ". intval($FleetRow['fleet_start_type']) ." AND `planet` = ". intval($FleetRow['fleet_start_planet']) .";",'planets', TRUE);
+		$targetUser   = doquery('SELECT * FROM {{table}} WHERE id='.intval($targetPlanet['id_owner']),'users', TRUE);
+		PlanetResourceUpdate ( $targetUser, $targetPlanet, time() );
+		//
+
 		$FleetRecord         = explode(";", $FleetRow['fleet_array']);
 		$QryUpdFleet         = "";
 		foreach ($FleetRecord as $Item => $Group)
@@ -503,7 +499,7 @@ private function RestoreFleetToPlanet ($FleetRow, $Start = true)
 		$QryUpdatePlanet  .= "`deuterium` = `deuterium` + '". $FleetRow['fleet_resource_deuterium'] ."' ";
 		$QryUpdatePlanet  .= "WHERE ";
 
-		if ($Start == true)
+		if ($Start == TRUE)
 		{
 			$QryUpdatePlanet  .= "`galaxy` = '". $FleetRow['fleet_start_galaxy'] ."' AND ";
 			$QryUpdatePlanet  .= "`system` = '". $FleetRow['fleet_start_system'] ."' AND ";
@@ -521,15 +517,22 @@ private function RestoreFleetToPlanet ($FleetRow, $Start = true)
 		doquery( $QryUpdatePlanet, 'planets');
 	}
 
-	private function StoreGoodsToPlanet ($FleetRow, $Start = false)
+	private function StoreGoodsToPlanet ($FleetRow, $Start = FALSE)
 	{
+
+		//fix resource by jstar
+		$targetPlanet = doquery("SELECT * FROM {{table}} WHERE `galaxy` = ". intval($FleetRow['fleet_start_galaxy']) ." AND `system` = ". intval($FleetRow['fleet_start_system']) ." AND `planet_type` = ". intval($FleetRow['fleet_start_type']) ." AND `planet` = ". intval($FleetRow['fleet_start_planet']) .";",'planets', TRUE);
+		$targetUser   = doquery('SELECT * FROM {{table}} WHERE id='.intval($targetPlanet['id_owner']),'users', TRUE);
+		PlanetResourceUpdate ( $targetUser, $targetPlanet, time() );
+		//
+
 		$QryUpdatePlanet   = "UPDATE {{table}} SET ";
 		$QryUpdatePlanet  .= "`metal` = `metal` + '". $FleetRow['fleet_resource_metal'] ."', ";
 		$QryUpdatePlanet  .= "`crystal` = `crystal` + '". $FleetRow['fleet_resource_crystal'] ."', ";
 		$QryUpdatePlanet  .= "`deuterium` = `deuterium` + '". $FleetRow['fleet_resource_deuterium'] ."' ";
 		$QryUpdatePlanet  .= "WHERE ";
 
-		if ($Start == true)
+		if ($Start == TRUE)
 		{
 			$QryUpdatePlanet  .= "`galaxy` = '". $FleetRow['fleet_start_galaxy'] ."' AND ";
 			$QryUpdatePlanet  .= "`system` = '". $FleetRow['fleet_start_system'] ."' AND ";
@@ -548,135 +551,13 @@ private function StoreGoodsToPlanet ($FleetRow, $Start = false)
 		doquery( $QryUpdatePlanet, 'planets');
 	}
 
-	private function raketenangriff($verteidiger_panzerung, $angreifer_waffen, $iraks, $def, $primaerziel = '0')
-	{
-		$temp = '';
-		$temp2 = '';
-
-		$def[10] = $iraks;
-
-		$metall     = Array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-		$kristall   = Array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-		$deut       = Array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-		$verblieben = Array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-
-		for($temp = 0; $temp < 11; $temp++)
-			$verblieben[$temp] = $def[$temp];
-
-		$kaputt  = Array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-		$hull 	 = Array();
-		$hull[0] = 200 * (1 + $verteidiger_panzerung / 10);
-		$hull[1] = $hull[0];
-		$hull[2] = 800 * (1 + ($verteidiger_panzerung / 10));
-		$hull[3] = 3500 * (1 + ($verteidiger_panzerung / 10));
-		$hull[4] = $hull[2];
-		$hull[5] = 10000 * (1 + ($verteidiger_panzerung / 10));
-		$hull[6] = 2000 * (1 + ($verteidiger_panzerung / 10));
-		$hull[7] = $hull[5];
-		$hull[8] = 1500 * (1 + ($verteidiger_panzerung / 10));
-
-		$metall_cost_tab   = Array( 2, 1.5, 6, 20, 2, 50, 10, 50, 12.5, 8);
-		$kristall_cost_tab = Array( 0, 0.5, 2, 15, 6, 50, 10, 50,  2.5, 0);
-		$deut_cost_tab     = Array( 0,   0, 0,  2, 0, 30,  0,  0, 10.0, 2);
-
-		$schaden = floor(($def[10] - $def[9]) * (12000 * (1 + ($angreifer_waffen / 10))));
-		if ($schaden < 0)
-			$schaden = 0;
-
-		switch ($primaerziel)
-		{
-			case 0:
-				$beschussreihenfolge = Array(0, 1, 2, 3, 4, 5, 6, 7, 8);
-				break;
-			case 1:
-				$beschussreihenfolge = Array(1, 0, 2, 3, 4, 5, 6, 7, 8);
-				break;
-			case 2:
-				$beschussreihenfolge = Array(2, 0, 1, 3, 4, 5, 6, 7, 8);
-				break;
-			case 3:
-				$beschussreihenfolge = Array(3, 0, 1, 2, 4, 5, 6, 7, 8);
-				break;
-			case 4:
-				$beschussreihenfolge = Array(4, 0, 1, 2, 3, 5, 6, 7, 8);
-				break;
-			case 5:
-				$beschussreihenfolge = Array(5, 0, 1, 2, 3, 4, 6, 7, 8);
-				break;
-			case 6:
-				$beschussreihenfolge = Array(6, 0, 1, 2, 3, 4, 5, 7, 8);
-				break;
-			case 7:
-				$beschussreihenfolge = Array(7, 0, 1, 2, 3, 4, 5, 6, 8);
-				break;
-			case 8:
-				$beschussreihenfolge = Array(0, 1, 2, 3, 4, 5, 6, 7, 8);
-				break;
-		}
-
-		$verblieben[10] 	= 0;
-		$kaputt[10] 	   += $def[10];
-		$metall[10] 	   += $kaputt[10] * $metall_cost_tab[8];
-		$kristall[10]      += $kaputt[10] * $kristall_cost_tab[8];
-		$deut[10]          += $kaputt[10] * $deut_cost_tab[8];
-		$verblieben[9]      = ($def[9] - $def[10]);
-
-		if ($verblieben[9] < 0)
-			$verblieben[9] = 0;
-
-		$kaputt[11]    = $def[9] - $verblieben[9];
-		$kaputt[9]    += ($def[9] - $verblieben[9]);
-		$metall[9]    += $kaputt[9] * $metall_cost_tab[9];
-		$kristall[9]  += $kaputt[9] * $kristall_cost_tab[9];
-		$deut[9] 	  += $kaputt[9] * $deut_cost_tab[9];
-		$metall[11]   += $metall[9];
-		$kristall[11] += $kristall[9];
-		$deut[11]     += $deut[9];
-
-		for($temp = 0; $temp < 9; $temp++)
-		{
-			if ($schaden >= ($hull[$beschussreihenfolge[$temp]] * $def[$beschussreihenfolge[$temp]]))
-			{
-				$kaputt[$beschussreihenfolge[$temp]] += $def[$beschussreihenfolge[$temp]];
-				$verblieben[$beschussreihenfolge[$temp]] = 0;
-				$schaden -= ($hull[$beschussreihenfolge[$temp]] * $kaputt[$beschussreihenfolge[$temp]]);
-			}
-			else
-			{
-				$kaputt[$beschussreihenfolge[$temp]] += floor($schaden / $hull[$beschussreihenfolge[$temp]]);
-				$schaden -= $kaputt[$beschussreihenfolge[$temp]] * $hull[$beschussreihenfolge[$temp]];
-				$verblieben[$beschussreihenfolge[$temp]] = ($def[$beschussreihenfolge[$temp]] - $kaputt[$beschussreihenfolge[$temp]]);
-			}
-
-			$metall[$beschussreihenfolge[$temp]] += $kaputt[$beschussreihenfolge[$temp]] * $metall_cost_tab[$beschussreihenfolge[$temp]];
-			$kristall[$beschussreihenfolge[$temp]] += $kaputt[$beschussreihenfolge[$temp]] * $kristall_cost_tab[$beschussreihenfolge[$temp]];
-			$deut[$beschussreihenfolge[$temp]] += $kaputt[$beschussreihenfolge[$temp]] * $deut_cost_tab[$beschussreihenfolge[$temp]];
-
-			$verblieben[11] += $verblieben[$beschussreihenfolge[$temp]];
-			$kaputt[11] += $kaputt[$beschussreihenfolge[$temp]];
-			$metall[11] += $metall[$beschussreihenfolge[$temp]];
-			$kristall[11] += $kristall[$beschussreihenfolge[$temp]];
-			$deut[11] += $deut[$beschussreihenfolge[$temp]];
-		}
-
-		$return = array();
-
-		$return['verbleibt'] = $verblieben;
-		$return['zerstoert'] = $kaputt;
-		$return['verluste_metall'] = $metall;
-		$return['verluste_kristall'] = $kristall;
-		$return['verluste_deuterium'] = $deut;
-
-		return $return;
-	}
-
 	private function MissionCaseAttack ($FleetRow)
 	{
-		global $pricelist, $lang, $resource, $CombatCaps, $game_config, $user;
+		global $pricelist, $lang, $resource, $CombatCaps, $user;
 
 		if ($FleetRow['fleet_mess'] == 0 && $FleetRow['fleet_start_time'] <= time())
 		{
-			$targetPlanet = doquery("SELECT * FROM {{table}} WHERE `galaxy` = ". intval($FleetRow['fleet_end_galaxy']) ." AND `system` = ". intval($FleetRow['fleet_end_system']) ." AND `planet_type` = ". intval($FleetRow['fleet_end_type']) ." AND `planet` = ". intval($FleetRow['fleet_end_planet']) .";",'planets', true);
+			$targetPlanet = doquery("SELECT * FROM {{table}} WHERE `galaxy` = ". intval($FleetRow['fleet_end_galaxy']) ." AND `system` = ". intval($FleetRow['fleet_end_system']) ." AND `planet_type` = ". intval($FleetRow['fleet_end_type']) ." AND `planet` = ". intval($FleetRow['fleet_end_planet']) .";",'planets', TRUE);
 
 			if ($FleetRow['fleet_group'] > 0)
 			{
@@ -688,13 +569,13 @@ private function MissionCaseAttack ($FleetRow)
 				doquery("UPDATE {{table}} SET fleet_mess=1 WHERE fleet_id=".intval($FleetRow['fleet_id']),'fleets');
 			}
 
-			$targetGalaxy = doquery('SELECT * FROM {{table}} WHERE `galaxy` = '. intval($FleetRow['fleet_end_galaxy']) .' AND `system` = '. intval($FleetRow['fleet_end_system']) .' AND `planet` = '. intval($FleetRow['fleet_end_planet']) .';','galaxy', true);
-			$targetUser   = doquery('SELECT * FROM {{table}} WHERE id='.intval($targetPlanet['id_owner']),'users', true);
+			$targetGalaxy = doquery('SELECT * FROM {{table}} WHERE `galaxy` = '. intval($FleetRow['fleet_end_galaxy']) .' AND `system` = '. intval($FleetRow['fleet_end_system']) .' AND `planet` = '. intval($FleetRow['fleet_end_planet']) .';','galaxy', TRUE);
+			$targetUser   = doquery('SELECT * FROM {{table}} WHERE id='.intval($targetPlanet['id_owner']),'users', TRUE);
 
 			PlanetResourceUpdate ( $targetUser, $targetPlanet, time() );
 
-			$targetGalaxy = doquery('SELECT * FROM {{table}} WHERE `galaxy` = '. intval($FleetRow['fleet_end_galaxy']) .' AND `system` = '. intval($FleetRow['fleet_end_system']) .' AND `planet` = '. intval($FleetRow['fleet_end_planet']) .';','galaxy', true);
-			$targetUser   = doquery('SELECT * FROM {{table}} WHERE id='.intval($targetPlanet['id_owner']),'users', true);
+			$targetGalaxy = doquery('SELECT * FROM {{table}} WHERE `galaxy` = '. intval($FleetRow['fleet_end_galaxy']) .' AND `system` = '. intval($FleetRow['fleet_end_system']) .' AND `planet` = '. intval($FleetRow['fleet_end_planet']) .';','galaxy', TRUE);
+			$targetUser   = doquery('SELECT * FROM {{table}} WHERE id='.intval($targetPlanet['id_owner']),'users', TRUE);
 
 			$TargetUserID = $targetUser['id'];
 			$attackFleets = array();
@@ -705,7 +586,7 @@ private function MissionCaseAttack ($FleetRow)
 				while ($fleet = mysql_fetch_assoc($fleets))
 				{
 					$attackFleets[$fleet['fleet_id']]['fleet'] = $fleet;
-					$attackFleets[$fleet['fleet_id']]['user'] = doquery('SELECT * FROM {{table}} WHERE id ='.intval($fleet['fleet_owner']),'users', true);
+					$attackFleets[$fleet['fleet_id']]['user'] = doquery('SELECT * FROM {{table}} WHERE id ='.intval($fleet['fleet_owner']),'users', TRUE);
 					$attackFleets[$fleet['fleet_id']]['detail'] = array();
 					$temp = explode(';', $fleet['fleet_array']);
 					foreach ($temp as $temp2)
@@ -725,7 +606,7 @@ private function MissionCaseAttack ($FleetRow)
 			else
 			{
 				$attackFleets[$FleetRow['fleet_id']]['fleet'] = $FleetRow;
-				$attackFleets[$FleetRow['fleet_id']]['user'] = doquery('SELECT * FROM {{table}} WHERE id='.intval($FleetRow['fleet_owner']),'users', true);
+				$attackFleets[$FleetRow['fleet_id']]['user'] = doquery('SELECT * FROM {{table}} WHERE id='.intval($FleetRow['fleet_owner']),'users', TRUE);
 				$attackFleets[$FleetRow['fleet_id']]['detail'] = array();
 				$temp = explode(';', $FleetRow['fleet_array']);
 				foreach ($temp as $temp2)
@@ -756,7 +637,7 @@ private function MissionCaseAttack ($FleetRow)
 						$defense[$defRow['fleet_id']][$Element[0]] = 0;
 
 					$defense[$defRow['fleet_id']]['def'][$Element[0]] += $Element[1];
-					$defense[$defRow['fleet_id']]['user'] = doquery('SELECT * FROM {{table}} WHERE id='.intval($defRow['fleet_owner']),'users', true);
+					$defense[$defRow['fleet_id']]['user'] = doquery('SELECT * FROM {{table}} WHERE id='.intval($defRow['fleet_owner']),'users', TRUE);
 				}
 			}
 
@@ -769,11 +650,12 @@ private function MissionCaseAttack ($FleetRow)
 					$defense[0]['def'][$i] = $targetPlanet[$resource[$i]];
 				}
 			}
-			$start 		= microtime(true);
+			$start 		= microtime(TRUE);
 			$result 	= calculateAttack($attackFleets, $defense);
-			$totaltime 	= microtime(true) - $start;
+			$totaltime 	= microtime(TRUE) - $start;
 
 			$QryUpdateGalaxy = "UPDATE {{table}} SET ";
+			$QryUpdateGalaxy .= "`invisible_start_time` = '".time()."', ";
 			$QryUpdateGalaxy .= "`metal` = `metal` +'".($result['debree']['att'][0]+$result['debree']['def'][0]) . "', ";
 			$QryUpdateGalaxy .= "`crystal` = `crystal` + '" .($result['debree']['att'][1]+$result['debree']['def'][1]). "' ";
 			$QryUpdateGalaxy .= "WHERE ";
@@ -834,7 +716,7 @@ private function MissionCaseAttack ($FleetRow)
 					}
 					else
 					{
-						doquery('UPDATE {{table}} SET fleet_array="'.$fleetArray.'", fleet_amount='.$totalCount.', fleet_mess=1 WHERE fleet_id='.$fleetID,'fleets');
+						doquery("UPDATE {{table}} SET fleet_array='$fleetArray', fleet_amount='$totalCount' WHERE fleet_id='$fleetID'",'fleets');
 					}
 
 				}
@@ -935,7 +817,7 @@ private function MissionCaseAttack ($FleetRow)
 				$style = "red";
 			}
 
-			$raport  = "<a href=\"#\" style=\"color:".$style.";\" OnClick='f(\"CombatReport.php?raport=". $rid ."\", \"\");' >" . $lang['sys_mess_attack_report'] ." [". $FleetRow['fleet_end_galaxy'] .":". $FleetRow['fleet_end_system'] .":". $FleetRow['fleet_end_planet'] ."]</a>";
+			$raport  = "<a href=\"#\" style=\"color:".$style.";\" OnClick=\'f(\"CombatReport.php?raport=". $rid ."\", \"\");\' >" . $lang['sys_mess_attack_report'] ." [". $FleetRow['fleet_end_galaxy'] .":". $FleetRow['fleet_end_system'] .":". $FleetRow['fleet_end_planet'] ."]</a>";
 
 			SendSimpleMessage ( $FleetRow['fleet_owner'], '', $FleetRow['fleet_start_time'], 3, $lang['sys_mess_tower'], $raport, '' );
 
@@ -952,7 +834,7 @@ private function MissionCaseAttack ($FleetRow)
 				$style = "green";
 			}
 
-			$raport2  = "<a href=\"#\" style=\"color:".$style.";\" OnClick='f(\"CombatReport.php?raport=". $rid ."\", \"\");' >" . $lang['sys_mess_attack_report'] ." [". $FleetRow['fleet_end_galaxy'] .":". $FleetRow['fleet_end_system'] .":". $FleetRow['fleet_end_planet'] ."]</a>";
+			$raport2  = "<a href=\"#\" style=\"color:".$style.";\" OnClick=\'f(\"CombatReport.php?raport=". $rid ."\", \"\");\' >" . $lang['sys_mess_attack_report'] ." [". $FleetRow['fleet_end_galaxy'] .":". $FleetRow['fleet_end_system'] .":". $FleetRow['fleet_end_planet'] ."]</a>";
 
 			foreach ($users2 as $id)
 			{
@@ -977,7 +859,7 @@ private function MissionCaseAttack ($FleetRow)
 
 	private function MissionCaseACS($FleetRow)
 	{
-		global $pricelist, $lang, $resource, $CombatCaps, $game_config;
+		global $pricelist, $lang, $resource, $CombatCaps;
 
 		if ($FleetRow['fleet_mess'] == 0 && $FleetRow['fleet_start_time'] > time())
 		{
@@ -1001,7 +883,7 @@ private function MissionCaseTransport ( $FleetRow )
 		$QryStartPlanet  .= "`system` = '". $FleetRow['fleet_start_system'] ."' AND ";
 		$QryStartPlanet  .= "`planet` = '". $FleetRow['fleet_start_planet'] ."' AND ";
 		$QryStartPlanet  .= "`planet_type` = '". $FleetRow['fleet_start_type'] ."';";
-		$StartPlanet      = doquery( $QryStartPlanet, 'planets', true);
+		$StartPlanet      = doquery( $QryStartPlanet, 'planets', TRUE);
 		$StartName        = $StartPlanet['name'];
 		$StartOwner       = $StartPlanet['id_owner'];
 
@@ -1011,7 +893,7 @@ private function MissionCaseTransport ( $FleetRow )
 		$QryTargetPlanet .= "`system` = '". $FleetRow['fleet_end_system'] ."' AND ";
 		$QryTargetPlanet .= "`planet` = '". $FleetRow['fleet_end_planet'] ."' AND ";
 		$QryTargetPlanet .= "`planet_type` = '". $FleetRow['fleet_end_type'] ."';";
-		$TargetPlanet     = doquery( $QryTargetPlanet, 'planets', true);
+		$TargetPlanet     = doquery( $QryTargetPlanet, 'planets', TRUE);
 		$TargetName       = $TargetPlanet['name'];
 		$TargetOwner      = $TargetPlanet['id_owner'];
 
@@ -1019,7 +901,7 @@ private function MissionCaseTransport ( $FleetRow )
 		{
 			if ($FleetRow['fleet_start_time'] < time())
 			{
-				$this->StoreGoodsToPlanet ($FleetRow, false);
+				$this->StoreGoodsToPlanet ($FleetRow, FALSE);
 				$Message         = sprintf( $lang['sys_tran_mess_owner'],
 							$TargetName, GetTargetAdressLink($FleetRow, ''),
 							$FleetRow['fleet_resource_metal'], $lang['Metal'],
@@ -1054,7 +936,7 @@ private function MissionCaseTransport ( $FleetRow )
 			{
 				$Message             = sprintf ($lang['sys_tran_mess_back'], $StartName, GetStartAdressLink($FleetRow, ''));
 				SendSimpleMessage ( $StartOwner, '', $FleetRow['fleet_end_time'], 5, $lang['sys_mess_tower'], $lang['sys_mess_fleetback'], $Message);
-				$this->RestoreFleetToPlanet ( $FleetRow, true );
+				$this->RestoreFleetToPlanet ( $FleetRow, TRUE );
 				doquery("DELETE FROM {{table}} WHERE fleet_id=" . $FleetRow["fleet_id"], 'fleets');
 			}
 		}
@@ -1074,7 +956,7 @@ private function MissionCaseStay($FleetRow)
 				$QryGetTargetPlanet  .= "`system` = '". $FleetRow['fleet_end_system'] ."' AND ";
 				$QryGetTargetPlanet  .= "`planet` = '". $FleetRow['fleet_end_planet'] ."' AND ";
 				$QryGetTargetPlanet  .= "`planet_type` = '". $FleetRow['fleet_end_type'] ."';";
-				$TargetPlanet         = doquery( $QryGetTargetPlanet, 'planets', true);
+				$TargetPlanet         = doquery( $QryGetTargetPlanet, 'planets', TRUE);
 				$TargetUserID         = $TargetPlanet['id_owner'];
 
 				$TargetAdress         = sprintf ($lang['sys_adress_planet'], $FleetRow['fleet_end_galaxy'], $FleetRow['fleet_end_system'], $FleetRow['fleet_end_planet']);
@@ -1087,7 +969,7 @@ private function MissionCaseStay($FleetRow)
 				$TargetMessage       .= $TargetAdress. "</a>". $lang['sys_stay_mess_end'] ."<br />". $TargetAddedGoods;
 
 				SendSimpleMessage ( $TargetUserID, '', $FleetRow['fleet_start_time'], 5, $lang['sys_mess_qg'], $lang['sys_stay_mess_stay'], $TargetMessage);
-				$this->RestoreFleetToPlanet ( $FleetRow, false );
+				$this->RestoreFleetToPlanet ( $FleetRow, FALSE );
 				doquery("DELETE FROM {{table}} WHERE `fleet_id` = '". $FleetRow["fleet_id"] ."';", 'fleets');
 			}
 		}
@@ -1105,7 +987,7 @@ private function MissionCaseStay($FleetRow)
 				$TargetMessage       .= $TargetAdress. "</a>". $lang['sys_stay_mess_bend'] ."<br />". $TargetAddedGoods;
 
 				SendSimpleMessage ( $FleetRow['fleet_owner'], '', $FleetRow['fleet_end_time'], 5, $lang['sys_mess_qg'], $lang['sys_mess_fleetback'], $TargetMessage);
-				$this->RestoreFleetToPlanet ( $FleetRow, true );
+				$this->RestoreFleetToPlanet ( $FleetRow, TRUE );
 				doquery("DELETE FROM {{table}} WHERE `fleet_id` = '". $FleetRow["fleet_id"] ."';", 'fleets');
 			}
 		}
@@ -1120,7 +1002,7 @@ private function MissionCaseStayAlly($FleetRow)
 		$QryStartPlanet  .= "`galaxy` = '". $FleetRow['fleet_start_galaxy'] ."' AND ";
 		$QryStartPlanet  .= "`system` = '". $FleetRow['fleet_start_system'] ."' AND ";
 		$QryStartPlanet  .= "`planet` = '". $FleetRow['fleet_start_planet'] ."';";
-		$StartPlanet      = doquery( $QryStartPlanet, 'planets', true);
+		$StartPlanet      = doquery( $QryStartPlanet, 'planets', TRUE);
 		$StartName        = $StartPlanet['name'];
 		$StartOwner       = $StartPlanet['id_owner'];
 
@@ -1129,7 +1011,7 @@ private function MissionCaseStayAlly($FleetRow)
 		$QryTargetPlanet .= "`galaxy` = '". $FleetRow['fleet_end_galaxy'] ."' AND ";
 		$QryTargetPlanet .= "`system` = '". $FleetRow['fleet_end_system'] ."' AND ";
 		$QryTargetPlanet .= "`planet` = '". $FleetRow['fleet_end_planet'] ."';";
-		$TargetPlanet     = doquery( $QryTargetPlanet, 'planets', true);
+		$TargetPlanet     = doquery( $QryTargetPlanet, 'planets', TRUE);
 		$TargetName       = $TargetPlanet['name'];
 		$TargetOwner      = $TargetPlanet['id_owner'];
 
@@ -1174,7 +1056,7 @@ private function MissionCaseStayAlly($FleetRow)
 			{
 				$Message         = sprintf ($lang['sys_tran_mess_back'], $StartName, GetStartAdressLink($FleetRow, ''));
 				SendSimpleMessage ( $StartOwner, '', $FleetRow['fleet_end_time'], 5, $lang['sys_mess_tower'], $lang['sys_mess_fleetback'], $Message);
-				$this->RestoreFleetToPlanet ( $FleetRow, true );
+				$this->RestoreFleetToPlanet ( $FleetRow, TRUE );
 				doquery("DELETE FROM {{table}} WHERE fleet_id=" . $FleetRow["fleet_id"], 'fleets');
 			}
 		}
@@ -1186,7 +1068,7 @@ private function MissionCaseSpy($FleetRow)
 
 		if ($FleetRow['fleet_start_time'] <= time())
 		{
-			$CurrentUser         = doquery("SELECT * FROM {{table}} WHERE `id` = '".$FleetRow['fleet_owner']."';", 'users', true);
+			$CurrentUser         = doquery("SELECT * FROM {{table}} WHERE `id` = '".$FleetRow['fleet_owner']."';", 'users', TRUE);
 			$CurrentUserID       = $FleetRow['fleet_owner'];
 			$QryGetTargetPlanet  = "SELECT * FROM {{table}} ";
 			$QryGetTargetPlanet .= "WHERE ";
@@ -1194,12 +1076,12 @@ private function MissionCaseSpy($FleetRow)
 			$QryGetTargetPlanet .= "`system` = '". $FleetRow['fleet_end_system'] ."' AND ";
 			$QryGetTargetPlanet .= "`planet` = '". $FleetRow['fleet_end_planet'] ."' AND ";
 			$QryGetTargetPlanet .= "`planet_type` = '". $FleetRow['fleet_end_type'] ."';";
-			$TargetPlanet        = doquery( $QryGetTargetPlanet, 'planets', true);
+			$TargetPlanet        = doquery( $QryGetTargetPlanet, 'planets', TRUE);
 			$TargetUserID        = $TargetPlanet['id_owner'];
-			$CurrentPlanet       = doquery("SELECT * FROM {{table}} WHERE `galaxy` = '".$FleetRow['fleet_start_galaxy']."' AND `system` = '".$FleetRow['fleet_start_system']."' AND `planet` = '".$FleetRow['fleet_start_planet']."';", 'planets', true);
-			$CurrentSpyLvl       = $CurrentUser['spy_tech'] + ($CurrentUser['rpg_espion'] * ESPION);
-			$TargetUser          = doquery("SELECT * FROM {{table}} WHERE `id` = '".$TargetUserID."';", 'users', true);
-			$TargetSpyLvl        = $TargetUser['spy_tech'] + ($TargetUser['rpg_espion'] * ESPION);
+			$CurrentPlanet       = doquery("SELECT * FROM {{table}} WHERE `galaxy` = '".$FleetRow['fleet_start_galaxy']."' AND `system` = '".$FleetRow['fleet_start_system']."' AND `planet` = '".$FleetRow['fleet_start_planet']."';", 'planets', TRUE);
+			$CurrentSpyLvl       = $CurrentUser['spy_tech'] + ($CurrentUser['rpg_technocrate'] * TECHNOCRATE_SPY);
+			$TargetUser          = doquery("SELECT * FROM {{table}} WHERE `id` = '".$TargetUserID."';", 'users', TRUE);
+			$TargetSpyLvl        = $TargetUser['spy_tech'] + ($TargetUser['rpg_technocrate'] * TECHNOCRATE_SPY);
 			$fleet               = explode(";", $FleetRow['fleet_array']);
 			$fquery              = "";
 
@@ -1211,95 +1093,94 @@ private function MissionCaseSpy($FleetRow)
 				{
 					$a = explode(",", $b);
 					$fquery .= "{$resource[$a[0]]}={$resource[$a[0]]} + {$a[1]}, \n";
-					if ($FleetRow["fleet_mess"] != "1")
+					if ($FleetRow["fleet_mess"] != "1" && $a[0] == "210")
 					{
-						if ($a[0] == "210")
-						{
-							$LS    = $a[1];
-							$QryTargetGalaxy  = "SELECT * FROM {{table}} WHERE ";
-							$QryTargetGalaxy .= "`galaxy` = '". $FleetRow['fleet_end_galaxy'] ."' AND ";
-							$QryTargetGalaxy .= "`system` = '". $FleetRow['fleet_end_system'] ."' AND ";
-							$QryTargetGalaxy .= "`planet` = '". $FleetRow['fleet_end_planet'] ."';";
-							$TargetGalaxy     = doquery( $QryTargetGalaxy, 'galaxy', true);
-							$CristalDebris    = $TargetGalaxy['crystal'];
-							$SpyToolDebris    = $LS * 300;
-
-							$MaterialsInfo    = $this->SpyTarget ( $TargetPlanet, 0, $lang['sys_spy_maretials'] );
-							$Materials        = $MaterialsInfo['String'];
-
-							$PlanetFleetInfo  = $this->SpyTarget ( $TargetPlanet, 1, $lang['sys_spy_fleet'] );
-							$PlanetFleet      = $Materials;
-							$PlanetFleet     .= $PlanetFleetInfo['String'];
-
-							$PlanetDefenInfo  = $this->SpyTarget ( $TargetPlanet, 2, $lang['sys_spy_defenses'] );
-							$PlanetDefense    = $PlanetFleet;
-							$PlanetDefense   .= $PlanetDefenInfo['String'];
-
-							$PlanetBuildInfo  = $this->SpyTarget ( $TargetPlanet, 3, $lang['tech'][0] );
-							$PlanetBuildings  = $PlanetDefense;
-							$PlanetBuildings .= $PlanetBuildInfo['String'];
-
-							$TargetTechnInfo  = $this->SpyTarget ( $TargetUser, 4, $lang['tech'][100] );
-							$TargetTechnos    = $PlanetBuildings;
-							$TargetTechnos   .= $TargetTechnInfo['String'];
-
-							$TargetForce      = ($PlanetFleetInfo['Count'] * $LS) / 4;
-
-							if ($TargetForce > 100)
-								$TargetForce = 100;
-
-							$TargetChances = rand(0, $TargetForce);
-							$SpyerChances  = rand(0, 100);
-
-							if ($TargetChances >= $SpyerChances)
-								$DestProba = "<font color=\"red\">".$lang['sys_mess_spy_destroyed']."</font>";
-							elseif ($TargetChances < $SpyerChances)
-								$DestProba = sprintf( $lang['sys_mess_spy_lostproba'], $TargetChances);
-
-							$AttackLink = "<center>";
-							$AttackLink .= "<a href=\"game.php?page=fleet&galaxy=". $FleetRow['fleet_end_galaxy'] ."&system=". $FleetRow['fleet_end_system'] ."";
-							$AttackLink .= "&planet=".$FleetRow['fleet_end_planet']."&planettype=".$FleetRow['fleet_end_type']."";
-							$AttackLink .= "&target_mission=1";
-							$AttackLink .= " \">". $lang['type_mission'][1] ."";
-							$AttackLink .= "</a></center>";
-							$MessageEnd  = "<center>".$DestProba."</center>";
-
-							$pT = ($TargetSpyLvl - $CurrentSpyLvl);
-							$pW = ($CurrentSpyLvl - $TargetSpyLvl);
-							if ($TargetSpyLvl > $CurrentSpyLvl)
-								$ST = ($LS - pow($pT, 2));
-							if ($CurrentSpyLvl > $TargetSpyLvl)
-								$ST = ($LS + pow($pW, 2));
-							if ($TargetSpyLvl == $CurrentSpyLvl)
-								$ST = $CurrentSpyLvl;
-							if ($ST <= "1")
-								$SpyMessage = $Materials."<br />".$AttackLink.$MessageEnd;
-							if ($ST == "2")
-								$SpyMessage = $PlanetFleet."<br />".$AttackLink.$MessageEnd;
-							if ($ST == "4" or $ST == "3")
-								$SpyMessage = $PlanetDefense."<br />".$AttackLink.$MessageEnd;
-							if ($ST == "5" or $ST == "6")
-								$SpyMessage = $PlanetBuildings."<br />".$AttackLink.$MessageEnd;
-							if ($ST >= "7")
-								$SpyMessage = $TargetTechnos."<br />".$AttackLink.$MessageEnd;
-
-							SendSimpleMessage ( $CurrentUserID, '', $FleetRow['fleet_start_time'], 0, $lang['sys_mess_qg'], $lang['sys_mess_spy_report'], $SpyMessage);
-
-							$TargetMessage  = $lang['sys_mess_spy_ennemyfleet'] ." ". $CurrentPlanet['name'];
-
-							if($FleetRow['fleet_start_type'] == 3)
-								$TargetMessage .= $lang['sys_mess_spy_report_moon'] . " ";
-
-							$TargetMessage .= "<a href=\"game.php?page=galaxy&mode=3&galaxy=". $CurrentPlanet["galaxy"] ."&system=". $CurrentPlanet["system"] ."\">";
-							$TargetMessage .= "[". $CurrentPlanet["galaxy"] .":". $CurrentPlanet["system"] .":". $CurrentPlanet["planet"] ."]</a> ";
-							$TargetMessage .= $lang['sys_mess_spy_seen_at'] ." ". $TargetPlanet['name'];
-							$TargetMessage .= " [". $TargetPlanet["galaxy"] .":". $TargetPlanet["system"] .":". $TargetPlanet["planet"] ."].";
-
-							SendSimpleMessage ( $TargetUserID, '', $FleetRow['fleet_start_time'], 0, $lang['sys_mess_spy_control'], $lang['sys_mess_spy_activity'], $TargetMessage);
-						}
+						$LS    = $a[1];
+						$QryTargetGalaxy  = "SELECT * FROM {{table}} WHERE ";
+						$QryTargetGalaxy .= "`galaxy` = '". $FleetRow['fleet_end_galaxy'] ."' AND ";
+						$QryTargetGalaxy .= "`system` = '". $FleetRow['fleet_end_system'] ."' AND ";
+						$QryTargetGalaxy .= "`planet` = '". $FleetRow['fleet_end_planet'] ."';";
+						$TargetGalaxy     = doquery( $QryTargetGalaxy, 'galaxy', TRUE);
+						$CristalDebris    = $TargetGalaxy['crystal'];
+						$SpyToolDebris    = $LS * 300;
+
+						$MaterialsInfo    = $this->SpyTarget ( $TargetPlanet, 0, $lang['sys_spy_maretials'] );
+						$Materials        = $MaterialsInfo['String'];
+
+						$PlanetFleetInfo  = $this->SpyTarget ( $TargetPlanet, 1, $lang['sys_spy_fleet'] );
+						$PlanetFleet      = $Materials;
+						$PlanetFleet     .= $PlanetFleetInfo['String'];
+
+						$PlanetDefenInfo  = $this->SpyTarget ( $TargetPlanet, 2, $lang['sys_spy_defenses'] );
+						$PlanetDefense    = $PlanetFleet;
+						$PlanetDefense   .= $PlanetDefenInfo['String'];
+
+						$PlanetBuildInfo  = $this->SpyTarget ( $TargetPlanet, 3, $lang['tech'][0] );
+						$PlanetBuildings  = $PlanetDefense;
+						$PlanetBuildings .= $PlanetBuildInfo['String'];
+
+						$TargetTechnInfo  = $this->SpyTarget ( $TargetUser, 4, $lang['tech'][100] );
+						$TargetTechnos    = $PlanetBuildings;
+						$TargetTechnos   .= $TargetTechnInfo['String'];
+
+						$TargetForce      = ($PlanetFleetInfo['Count'] * $LS) / 4;
+
+						if ($TargetForce > 100)
+							$TargetForce = 100;
+
+						$TargetChances = rand(0, $TargetForce);
+						$SpyerChances  = rand(0, 100);
+
+						if ($TargetChances >= $SpyerChances)
+							$DestProba = "<font color=\"red\">".$lang['sys_mess_spy_destroyed']."</font>";
+						elseif ($TargetChances < $SpyerChances)
+							$DestProba = sprintf( $lang['sys_mess_spy_lostproba'], $TargetChances);
+
+						$AttackLink = "<center>";
+						$AttackLink .= "<a href=\"game.php?page=fleet&galaxy=". $FleetRow['fleet_end_galaxy'] ."&system=". $FleetRow['fleet_end_system'] ."";
+						$AttackLink .= "&planet=".$FleetRow['fleet_end_planet']."&planettype=".$FleetRow['fleet_end_type']."";
+						$AttackLink .= "&target_mission=1";
+						$AttackLink .= " \">". $lang['type_mission'][1] ."";
+						$AttackLink .= "</a></center>";
+						$MessageEnd  = "<center>".$DestProba."</center>";
+
+						$pT = ($TargetSpyLvl - $CurrentSpyLvl);
+						$pW = ($CurrentSpyLvl - $TargetSpyLvl);
+						if ($TargetSpyLvl > $CurrentSpyLvl)
+							$ST = ($LS - pow($pT, 2));
+						if ($CurrentSpyLvl > $TargetSpyLvl)
+							$ST = ($LS + pow($pW, 2));
+						if ($TargetSpyLvl == $CurrentSpyLvl)
+							$ST = $CurrentSpyLvl;
+						if ($ST <= "1")
+							$SpyMessage = $Materials."<br />".$AttackLink.$MessageEnd;
+						if ($ST == "2")
+							$SpyMessage = $PlanetFleet."<br />".$AttackLink.$MessageEnd;
+						if ($ST == "4" or $ST == "3")
+							$SpyMessage = $PlanetDefense."<br />".$AttackLink.$MessageEnd;
+						if ($ST == "5" or $ST == "6")
+							$SpyMessage = $PlanetBuildings."<br />".$AttackLink.$MessageEnd;
+						if ($ST >= "7")
+							$SpyMessage = $TargetTechnos."<br />".$AttackLink.$MessageEnd;
+
+						SendSimpleMessage ( $CurrentUserID, '', $FleetRow['fleet_start_time'], 0, $lang['sys_mess_qg'], $lang['sys_mess_spy_report'], $SpyMessage);
+
+						$TargetMessage  = $lang['sys_mess_spy_ennemyfleet'] ." ". $CurrentPlanet['name'];
+
+						if($FleetRow['fleet_start_type'] == 3)
+							$TargetMessage .= $lang['sys_mess_spy_report_moon'] . " ";
+
+						$TargetMessage .= "<a href=\"game.php?page=galaxy&mode=3&galaxy=". $CurrentPlanet["galaxy"] ."&system=". $CurrentPlanet["system"] ."\">";
+						$TargetMessage .= "[". $CurrentPlanet["galaxy"] .":". $CurrentPlanet["system"] .":". $CurrentPlanet["planet"] ."]</a> ";
+						$TargetMessage .= $lang['sys_mess_spy_seen_at'] ." ". $TargetPlanet['name'];
+						$TargetMessage .= " [". $TargetPlanet["galaxy"] .":". $TargetPlanet["system"] .":". $TargetPlanet["planet"] ."].";
+
+						SendSimpleMessage ( $TargetUserID, '', $FleetRow['fleet_start_time'], 0, $lang['sys_mess_spy_control'], $lang['sys_mess_spy_activity'], $TargetMessage);
+
 						if ($TargetChances >= $SpyerChances)
 						{
 							$QryUpdateGalaxy  = "UPDATE {{table}} SET ";
+							$QryUpdateGalaxy .= "`invisible_start_time` = '".time()."', ";
 							$QryUpdateGalaxy .= "`crystal` = `crystal` + '". (0 + $SpyToolDebris) ."' ";
 							$QryUpdateGalaxy .= "WHERE `id_planet` = '". $TargetPlanet['id'] ."';";
 							doquery( $QryUpdateGalaxy, 'galaxy');
@@ -1313,7 +1194,7 @@ private function MissionCaseSpy($FleetRow)
 				{
 					if ($FleetRow['fleet_end_time'] <= time())
 					{
-						$this->RestoreFleetToPlanet ( $FleetRow, true );
+						$this->RestoreFleetToPlanet ( $FleetRow, TRUE );
 						doquery("DELETE FROM {{table}} WHERE `fleet_id` = ". $FleetRow["fleet_id"], 'fleets');
 					}
 				}
@@ -1335,7 +1216,7 @@ private function MissionCaseRecycling ($FleetRow)
 				$QrySelectGalaxy .= "`system` = '".$FleetRow['fleet_end_system']."' AND ";
 				$QrySelectGalaxy .= "`planet` = '".$FleetRow['fleet_end_planet']."' ";
 				$QrySelectGalaxy .= "LIMIT 1;";
-				$TargetGalaxy     = doquery( $QrySelectGalaxy, 'galaxy', true);
+				$TargetGalaxy     = doquery( $QrySelectGalaxy, 'galaxy', TRUE);
 
 				$FleetRecord         = explode(";", $FleetRow['fleet_array']);
 				$RecyclerCapacity    = 0;
@@ -1422,112 +1303,111 @@ private function MissionCaseRecycling ($FleetRow)
 				pretty_number($FleetRow['fleet_resource_crystal']), $lang['Crystal'],
 				pretty_number($FleetRow['fleet_resource_deuterium']), $lang['Deuterium'] );
 				SendSimpleMessage ( $FleetRow['fleet_owner'], '', $FleetRow['fleet_end_time'], 4, $lang['sys_mess_spy_control'], $lang['sys_mess_fleetback'], $Message);
-				$this->RestoreFleetToPlanet ( $FleetRow, true );
+				$this->RestoreFleetToPlanet ( $FleetRow, TRUE );
 				doquery("DELETE FROM {{table}} WHERE `fleet_id` = '". $FleetRow["fleet_id"] ."';", 'fleets');
 			}
 		}
 	}
 
-private function MissionCaseColonisation($FleetRow)
-{
-global $lang, $resource;
-$iMaxColo = mysql_result(doquery("SELECT `colonisation_tech` + 1 FROM `{{table}}` WHERE `id`='". $FleetRow['fleet_owner']."'",'users'), 0); 
-$iPlanetCount = mysql_result(doquery ("SELECT count(*) FROM {{table}} WHERE `id_owner` = '". $FleetRow['fleet_owner'] ."' AND `planet_type` = '1' AND `destruyed` = '0'", 'planets'), 0);
+	private function MissionCaseColonisation($FleetRow)
+	{
+		global $lang, $resource;
 
-if ($FleetRow['fleet_mess'] == 0)
-{
-$iGalaxyPlace = mysql_result(doquery ("SELECT count(*) FROM {{table}} WHERE `galaxy` = '". $FleetRow['fleet_end_galaxy']."' AND `system` = '". $FleetRow['fleet_end_system']."' AND `planet` = '". $FleetRow['fleet_end_planet']."' AND `planet_type` = '". $FleetRow['fleet_end_type']."';", 'planets'), 0);
-$TargetAdress = sprintf ($lang['sys_adress_planet'], $FleetRow['fleet_end_galaxy'], $FleetRow['fleet_end_system'], $FleetRow['fleet_end_planet']);
-if ($iGalaxyPlace == 0)
-{
-if ($iPlanetCount >= $iMaxColo || $iPlanetCount >= MAX_PLAYER_PLANETS) {
-$TheMessage = $lang['sys_colo_arrival'] . $TargetAdress . $lang['sys_colo_maxcolo'];
-SendSimpleMessage ( $FleetRow['fleet_owner'], '', $FleetRow['fleet_start_time'], 6, $lang['sys_colo_mess_from'], $lang['sys_colo_mess_report'], $TheMessage);
-doquery("UPDATE `{{table}}` SET `fleet_mess` = '1' WHERE `fleet_id` = ". $FleetRow["fleet_id"], 'fleets');
-}
-else
-{
-$NewOwnerPlanet = CreateOnePlanetRecord($FleetRow['fleet_end_galaxy'], $FleetRow['fleet_end_system'], $FleetRow['fleet_end_planet'], $FleetRow['fleet_owner'], $lang['sys_colo_defaultname'], false);
-if ( $NewOwnerPlanet == true )
-{
-$TheMessage = $lang['sys_colo_arrival'] . $TargetAdress . $lang['sys_colo_allisok'];
-$TheMessage = sprintf( $lang['sys_colo_arrival'] . $TargetAdress .$lang['sys_colo_tran']. $lang['sys_colo_allisok'],
-$lang['Metal'], $FleetRow['fleet_resource_metal'], 
-$lang['Crystal'], $FleetRow['fleet_resource_crystal'], 
-$lang['Deuterium'], $FleetRow['fleet_resource_deuterium'] );
-SendSimpleMessage ( $FleetRow['fleet_owner'], '', $FleetRow['fleet_start_time'], 6, $lang['sys_colo_mess_from'], $lang['sys_colo_mess_report'], $TheMessage);
-if ($FleetRow['fleet_amount'] == 1) {
-$this->StoreGoodsToPlanet ($FleetRow, false);
-doquery("DELETE FROM {{table}} WHERE fleet_id=" . $FleetRow["fleet_id"], 'fleets');
-} else {
-$this->StoreGoodsToPlanet ($FleetRow, false);
-$CurrentFleet = explode(";", $FleetRow['fleet_array']);
-$NewFleet = "";
-foreach ($CurrentFleet as $Item => $Group)
-{
-if ($Group != '')
-{
-$Class = explode (",", $Group);
-if ($Class[0] == 208)
-{
-if ($Class[1] > 1)
-{
-$NewFleet .= $Class[0].",".($Class[1] - 1).";";
-}
-}
-else
-{
-if ($Class[1] <> 0)
-{
-$NewFleet .= $Class[0].",".$Class[1].";";
-}
-}
-}
-}
-$QryUpdateFleet = "UPDATE {{table}} SET ";
-$QryUpdateFleet .= "`fleet_array` = '". $NewFleet ."', ";
-$QryUpdateFleet .= "`fleet_amount` = `fleet_amount` - 1, ";
-$QryUpdateFleet .= "`fleet_resource_metal` = 0, ";
-$QryUpdateFleet .= "`fleet_resource_crystal` = 0, ";
-$QryUpdateFleet .= "`fleet_resource_deuterium` = 0, ";
-$QryUpdateFleet .= "`fleet_mess` = '1' ";
-$QryUpdateFleet .= "WHERE `fleet_id` = '". $FleetRow["fleet_id"] ."';";
-doquery( $QryUpdateFleet, 'fleets');
-}
-}
-else
-{
-$TheMessage = $lang['sys_colo_arrival'] . $TargetAdress . $lang['sys_colo_badpos'];
-SendSimpleMessage ( $FleetRow['fleet_owner'], '', $FleetRow['fleet_start_time'], 6, $lang['sys_colo_mess_from'], $lang['sys_colo_mess_report'], $TheMessage);
-doquery("UPDATE {{table}} SET `fleet_mess` = '1' WHERE `fleet_id` = ". $FleetRow["fleet_id"], 'fleets');
-}
-}
-}
-else
-{
-$TheMessage = $lang['sys_colo_arrival'] . $TargetAdress . $lang['sys_colo_notfree'];
-SendSimpleMessage ( $FleetRow['fleet_owner'], '', $FleetRow['fleet_end_time'], 6, $lang['sys_colo_mess_from'], $lang['sys_colo_mess_report'], $TheMessage);
-doquery("UPDATE {{table}} SET `fleet_mess` = '1' WHERE `fleet_id` = ". $FleetRow["fleet_id"], 'fleets');
-}
-}
-elseif ($FleetRow['fleet_end_time'] < time())
-{
+		$iPlanetCount = mysql_result(doquery ("SELECT count(*) FROM {{table}} WHERE `id_owner` = '". $FleetRow['fleet_owner'] ."' AND `planet_type` = '1' AND `destruyed` = '0'", 'planets'), 0);
 
-$this->RestoreFleetToPlanet ( $FleetRow, true );
-doquery("DELETE FROM {{table}} WHERE fleet_id=" . $FleetRow["fleet_id"], 'fleets');
-}
-}
+		if ($FleetRow['fleet_mess'] == 0)
+		{
+			$iGalaxyPlace = mysql_result(doquery ("SELECT count(*) FROM {{table}} WHERE `galaxy` = '". $FleetRow['fleet_end_galaxy']."' AND `system` = '". $FleetRow['fleet_end_system']."' AND `planet` = '". $FleetRow['fleet_end_planet']."';", 'galaxy'), 0);
+			$TargetAdress = sprintf ($lang['sys_adress_planet'], $FleetRow['fleet_end_galaxy'], $FleetRow['fleet_end_system'], $FleetRow['fleet_end_planet']);
+			if ($iGalaxyPlace == 0)
+			{
+				if ($iPlanetCount >= MAX_PLAYER_PLANETS)
+				{
+					$TheMessage = $lang['sys_colo_arrival'] . $TargetAdress . $lang['sys_colo_maxcolo'] . MAX_PLAYER_PLANETS . $lang['sys_colo_planet'];
+					SendSimpleMessage ( $FleetRow['fleet_owner'], '', $FleetRow['fleet_start_time'], 0, $lang['sys_colo_mess_from'], $lang['sys_colo_mess_report'], $TheMessage);
+					doquery("UPDATE {{table}} SET `fleet_mess` = '1' WHERE `fleet_id` = ". $FleetRow["fleet_id"], 'fleets');
+				}
+				else
+				{
+					$NewOwnerPlanet = CreateOnePlanetRecord($FleetRow['fleet_end_galaxy'], $FleetRow['fleet_end_system'], $FleetRow['fleet_end_planet'], $FleetRow['fleet_owner'], $lang['sys_colo_defaultname'], FALSE);
+					if ( $NewOwnerPlanet == TRUE )
+					{
+						$TheMessage = $lang['sys_colo_arrival'] . $TargetAdress . $lang['sys_colo_allisok'];
+						SendSimpleMessage ( $FleetRow['fleet_owner'], '', $FleetRow['fleet_start_time'], 0, $lang['sys_colo_mess_from'], $lang['sys_colo_mess_report'], $TheMessage);
+						if ($FleetRow['fleet_amount'] == 1)
+						{
+							$this->StoreGoodsToPlanet ($FleetRow);
+							doquery("DELETE FROM {{table}} WHERE fleet_id=" . $FleetRow["fleet_id"], 'fleets');
+						}
+						else
+						{
+							$this->StoreGoodsToPlanet ($FleetRow);
+							$CurrentFleet = explode(";", $FleetRow['fleet_array']);
+							$NewFleet     = "";
+							foreach ($CurrentFleet as $Item => $Group)
+							{
+								if ($Group != '')
+								{
+									$Class = explode (",", $Group);
+									if ($Class[0] == 208)
+									{
+										if ($Class[1] > 1)
+										{
+											$NewFleet  .= $Class[0].",".($Class[1] - 1).";";
+										}
+									}
+									else
+									{
+										if ($Class[1] <> 0)
+										{
+											$NewFleet  .= $Class[0].",".$Class[1].";";
+										}
+									}
+								}
+							}
+							$QryUpdateFleet  = "UPDATE {{table}} SET ";
+							$QryUpdateFleet .= "`fleet_array` = '". $NewFleet ."', ";
+							$QryUpdateFleet .= "`fleet_amount` = `fleet_amount` - 1, ";
+							$QryUpdateFleet .= "`fleet_resource_metal` = '0' , ";
+							$QryUpdateFleet .= "`fleet_resource_crystal` = '0' , ";
+							$QryUpdateFleet .= "`fleet_resource_deuterium` = '0' , ";
+							$QryUpdateFleet .= "`fleet_mess` = '1' ";
+							$QryUpdateFleet .= "WHERE `fleet_id` = '". $FleetRow["fleet_id"] ."';";
+							doquery( $QryUpdateFleet, 'fleets');
+						}
+					}
+					else
+					{
+						$TheMessage = $lang['sys_colo_arrival'] . $TargetAdress . $lang['sys_colo_badpos'];
+						SendSimpleMessage ( $FleetRow['fleet_owner'], '', $FleetRow['fleet_start_time'], 0, $lang['sys_colo_mess_from'], $lang['sys_colo_mess_report'], $TheMessage);
+						doquery("UPDATE {{table}} SET `fleet_mess` = '1' WHERE `fleet_id` = ". $FleetRow["fleet_id"], 'fleets');
+					}
+				}
+			}
+			else
+			{
+				$TheMessage = $lang['sys_colo_arrival'] . $TargetAdress . $lang['sys_colo_notfree'];
+				SendSimpleMessage ( $FleetRow['fleet_owner'], '', $FleetRow['fleet_end_time'], 0, $lang['sys_colo_mess_from'], $lang['sys_colo_mess_report'], $TheMessage);
+				doquery("UPDATE {{table}} SET `fleet_mess` = '1' WHERE `fleet_id` = ". $FleetRow["fleet_id"], 'fleets');
+			}
+		}
+		elseif ($FleetRow['fleet_end_time'] < time())
+		{
+			$this->RestoreFleetToPlanet ( $FleetRow, TRUE );
+			doquery("DELETE FROM {{table}} WHERE fleet_id=" . $FleetRow["fleet_id"], 'fleets');
+		}
+	}
 
 	private function MissionCaseDestruction($FleetRow)
 	{
-		global $user, $phpEx, $pricelist, $lang, $resource, $CombatCaps;
+		global $user, $pricelist, $lang, $resource, $CombatCaps;
 
 		if ($FleetRow['fleet_start_time'] <= time())
 		{
 			if ($FleetRow['fleet_mess'] == 0)
 			{
 				if (!isset($CombatCaps[202]['sd']))
-					header("location:game." . $phpEx . "?page=fleet");
+					header("location:game.php?page=fleet");
 
 				$QryTargetPlanet  = "SELECT * FROM {{table}} ";
 				$QryTargetPlanet .= "WHERE ";
@@ -1535,7 +1415,7 @@ private function MissionCaseDestruction($FleetRow)
 				$QryTargetPlanet .= "`system` = '". $FleetRow['fleet_end_system'] ."' AND ";
 				$QryTargetPlanet .= "`planet` = '". $FleetRow['fleet_end_planet'] ."' AND ";
 				$QryTargetPlanet .= "`planet_type` = '". $FleetRow['fleet_end_type'] ."';";
-				$TargetPlanet     = doquery( $QryTargetPlanet, 'planets', true);
+				$TargetPlanet     = doquery( $QryTargetPlanet, 'planets', TRUE);
 				$TargetUserID     = $TargetPlanet['id_owner'];
 
 				$QryDepPlanet  = "SELECT * FROM {{table}} ";
@@ -1544,19 +1424,19 @@ private function MissionCaseDestruction($FleetRow)
 				$QryDepPlanet .= "`system` = '". $FleetRow['fleet_start_system'] ."' AND ";
 				$QryDepPlanet .= "`planet` = '". $FleetRow['fleet_start_planet'] ."' AND ";
 				$QryDepPlanet .= "`planet_type` = '". $FleetRow['fleet_start_type'] ."';";
-				$DepPlanet     = doquery( $QryDepPlanet, 'planets', true);
+				$DepPlanet     = doquery( $QryDepPlanet, 'planets', TRUE);
 				$DepName       = $DepPlanet['name'];
 
 				$QryCurrentUser   = "SELECT * FROM {{table}} ";
 				$QryCurrentUser  .= "WHERE ";
 				$QryCurrentUser  .= "`id` = '". $FleetRow['fleet_owner'] ."';";
-				$CurrentUser      = doquery($QryCurrentUser , 'users', true);
+				$CurrentUser      = doquery($QryCurrentUser , 'users', TRUE);
 				$CurrentUserID    = $CurrentUser['id'];
 
 				$QryTargetUser    = "SELECT * FROM {{table}} ";
 				$QryTargetUser   .= "WHERE ";
 				$QryTargetUser   .= "`id` = '". $TargetUserID ."';";
-				$TargetUser       = doquery($QryTargetUser, 'users', true);
+				$TargetUser       = doquery($QryTargetUser, 'users', TRUE);
 
 				for ($SetItem = 200; $SetItem < 500; $SetItem++)
 				{
@@ -1660,7 +1540,7 @@ private function MissionCaseDestruction($FleetRow)
 							$QryPlanet .= "`system` = '". $FleetRow['fleet_end_system'] ."' AND ";
 							$QryPlanet .= "`planet` = '". $FleetRow['fleet_end_planet'] ."' AND ";
 							$QryPlanet .= "`planet_type` = '1';";
-							$Planet     = doquery( $QryPlanet, 'planets', true);
+							$Planet     = doquery( $QryPlanet, 'planets', TRUE);
 							$IDPlanet     = $Planet['id'];
 
 							$Qryvue  = "UPDATE {{table}} SET ";
@@ -1711,6 +1591,7 @@ private function MissionCaseDestruction($FleetRow)
 				doquery( $QryUpdateTarget , 'planets');
 
 				$QryUpdateGalaxy  = "UPDATE {{table}} SET ";
+				$QryUpdateGalaxy .= "`invisible_start_time` = '".time()."', ";
 				$QryUpdateGalaxy .= "`metal` = `metal` + '". $zlom['metal'] ."', ";
 				$QryUpdateGalaxy .= "`crystal` = `crystal` + '". $zlom['crystal'] ."' ";
 				$QryUpdateGalaxy .= "WHERE ";
@@ -1754,7 +1635,7 @@ private function MissionCaseDestruction($FleetRow)
 				$AttackDate        = date("r", $FleetRow["fleet_start_time"]);
 				$title             = sprintf ($lang['sys_destruc_title'], $AttackDate);
 				$raport            = "<center><table><tr><td>". $title ."<br />";
-				$zniszczony        = false;
+				$zniszczony        = FALSE;
 				$a_zestrzelona     = 0;
 				$AttackTechon['A'] = $CurrentUser["military_tech"] * 10;
 				$AttackTechon['B'] = $CurrentUser["defence_tech"] * 10;
@@ -1807,7 +1688,7 @@ private function MissionCaseDestruction($FleetRow)
 						if ($a == 2)
 							$a_zestrzelona = 1;
 
-						$zniszczony = true;
+						$zniszczony = TRUE;
 						$raport .= "<br />". $lang['sys_destroyed'];
 					}
 
@@ -1847,7 +1728,7 @@ private function MissionCaseDestruction($FleetRow)
 					}
 					else
 					{
-						$zniszczony = true;
+						$zniszczony = TRUE;
 						$raport .= "<br />". $lang['sys_destroyed'];
 					}
 
@@ -1855,7 +1736,7 @@ private function MissionCaseDestruction($FleetRow)
 
 
 
-					if (($zniszczony == false) and !($a == 8))
+					if (($zniszczony == FALSE) and !($a == 8))
 					{
 						$AttackWaveStat    = sprintf ($lang['sys_attack_attack_wave'], floor($b["atakujacy"]["atak"]), floor($b["wrog"]["tarcza"]));
 						$DefendWavaStat    = sprintf ($lang['sys_attack_defend_wave'], floor($b["wrog"]["atak"]), floor($b["atakujacy"]["tarcza"]));
@@ -1894,16 +1775,16 @@ private function MissionCaseDestruction($FleetRow)
 				$raport           .= "</table>";
 				$rid   			   = md5($raport);
 
-				$QryInsertRapport  = "INSERT INTO {{table}} SET ";
-				$QryInsertRapport .= "`time` = UNIX_TIMESTAMP(), ";
-				$QryInsertRapport .= "`id_owner1` = '". $FleetRow['fleet_owner'] ."', ";
-				$QryInsertRapport .= "`id_owner2` = '". $TargetUserID ."', ";
-				$QryInsertRapport .= "`rid` = '". $rid ."', ";
-				$QryInsertRapport .= "`a_zestrzelona` = '". $a_zestrzelona ."', ";
-				$QryInsertRapport .= "`raport` = '". addslashes ( $raport ) ."';";
+				$owners 			 = $FleetRow['fleet_owner'].",".$TargetUserID;
+				$QryInsertRapport  	 = "INSERT INTO {{table}} SET ";
+				$QryInsertRapport 	.= "`time` = UNIX_TIMESTAMP(), ";
+				$QryInsertRapport 	.= "`owners` = '". $owners ."', ";
+				$QryInsertRapport 	.= "`rid` = '". $rid ."', ";
+				$QryInsertRapport 	.= "`a_zestrzelona` = '". $a_zestrzelona ."', ";
+				$QryInsertRapport 	.= "`raport` = '". addslashes ( $raport ) ."';";
 				doquery( $QryInsertRapport , 'rw');
 
-				$raport  = "<a href # OnClick=\"f( 'CombatReport.php?raport=". $rid ."', '');\" >";
+				$raport  = "<a href=\"#\" OnClick=\'f(\"CombatReport.php?raport=". $rid ."\", \"\");\' >";
 				$raport .= "<center>";
 
 				if($FleetResult == "a")
@@ -1928,7 +1809,7 @@ private function MissionCaseDestruction($FleetRow)
 
 				SendSimpleMessage ( $CurrentUserID, '', $FleetRow['fleet_start_time'], 3, $lang['sys_mess_tower'], $lang['sys_mess_destruc_report'], $raport );
 
-				$raport2  = "<a href # OnClick=\"f( 'CombatReport.php?raport=". $rid ."', '');\" >";
+				$raport2  = "<a href=\"#\" OnClick=\'f(\"CombatReport.php?raport=". $rid ."\", \"\");\' >";
 				$raport2 .= "<center>";
 
 				if($FleetResult == "a")
@@ -1989,132 +1870,102 @@ private function MissionCaseDestruction($FleetRow)
 
 	private function MissionCaseMIP ($FleetRow)
 	{
-		global $user, $phpEx, $pricelist, $lang, $resource, $CombatCaps;
+		global $user, $pricelist, $lang, $resource, $CombatCaps;
 
 		if ($FleetRow['fleet_start_time'] <= time())
 		{
 			if ($FleetRow['fleet_mess'] == 0)
 			{
-				if (!isset($CombatCaps[202]['sd']))
-					header("location:game." . $phpEx . "?page=fleet");
-
-				$QryTargetPlanet = "SELECT * FROM {{table}} ";
-				$QryTargetPlanet .= "WHERE ";
-				$QryTargetPlanet .= "`galaxy` = '" . $FleetRow['fleet_end_galaxy'] . "' AND ";
-				$QryTargetPlanet .= "`system` = '" . $FleetRow['fleet_end_system'] . "' AND ";
-				$QryTargetPlanet .= "`planet` = '" . $FleetRow['fleet_end_planet'] . "' AND ";
-				$QryTargetPlanet .= "`planet_type` = '" . $FleetRow['fleet_end_type'] . "';";
-				$planet = doquery($QryTargetPlanet, 'planets', true);
-
-				$QrySelect  = "SELECT defence_tech,military_tech FROM {{table}} ";
-				$QrySelect .= "WHERE ";
-				$QrySelect .= "`id` = '".$FleetRow['fleet_owner']."';";
-				$UserFleet = doquery( $QrySelect, 'users',true);
-
-				$verteidiger = $UserFleet["defence_tech"];
-				$angreifer 	 = $UserFleet["military_tech"];
-
-				$ids = array(
-				0 => 401,
-				1 => 402,
-				2 => 403,
-				3 => 404,
-				4 => 405,
-				5 => 406,
-				6 => 407,
-				7 => 408,
-				8 => 502,
-				9 => 503,
-				10 => 409);
-
-				$def =   array(
-				0 => $planet['misil_launcher'],
-				1 => $planet['small_laser'],
-				2 => $planet['big_laser'],
-				3 => $planet['gauss_canyon'],
-				4 => $planet['ionic_canyon'],
-				5 => $planet['buster_canyon'],
-				6 => $planet['small_protection_shield'],
-				7 => $planet['big_protection_shield'],
-				8 => $planet['interceptor_misil'],
-				9 => $planet['interplanetary_misil'],
-				10 => $planet['planet_protector']);
-
-				$DefenseLabel =   array(0 => $lang['tech'][401],
-				1 => $lang['tech'][402],
-				2 => $lang['tech'][403],
-				3 => $lang['tech'][404],
-				4 => $lang['tech'][405],
-				5 => $lang['tech'][406],
-				6 => $lang['tech'][407],
-				7 => $lang['tech'][408],
-				8 => $lang['tech'][502],
-				9 => $lang['tech'][503],
-				10 => $lang['tech'][409]);
-
-				$message = '';
+				$planet = doquery('SELECT * FROM {{table}} WHERE `galaxy` = '.$FleetRow['fleet_end_galaxy'].' AND `system` = '.$FleetRow['fleet_end_system'].' AND `planet` = '.$FleetRow['fleet_end_planet'].' AND `planet_type` = '.$FleetRow['fleet_end_type'], 'planets', TRUE);
+				$Target = doquery('SELECT id, defence_tech FROM  {{table}} WHERE `galaxy` = '.$FleetRow['fleet_end_galaxy'].' AND  `system` = '.$FleetRow['fleet_end_system'].' AND `planet` =  '.$FleetRow['fleet_end_planet'], 'users', TRUE);
 
 				if ($planet['interceptor_misil'] >= $FleetRow['fleet_amount'])
 				{
-					$message = 'Tus misiles de intersepci&oacute;n destruyeron los misiles interplanetarios<br>';
-					$x = $resource[$ids[8]];
-					doquery("UPDATE {{table}} SET " . $x . " = " . $x . "-" . $FleetRow['fleet_amount'] . " WHERE id = " . $planet['id'], 'planets');
+					$message = $lang["ma_all_destroyed"] . '<br>';
+					doquery("UPDATE {{table}} SET ".$resource[502]." = ".$resource[502]." - ".$FleetRow['fleet_amount']." WHERE id = ".$planet['id'],  'planets');
 				}
 				else
 				{
+					doquery("UPDATE {{table}} SET ".$resource[502]." = '0' WHERE id = ".$planet['id'], 'planets');
+
 					if ($planet['interceptor_misil'] > 0)
+						$message .= $planet['interceptor_misil'].$lang['ma_some_destroyed']." <br>";
+
+					$attack = floor(($FleetRow['fleet_amount'] - $planet['interceptor_misil']) * ($CombatCaps[503]['attack'] * (1 + ($user["military_tech"] / 10))));
+
+					switch ($FleetRow['fleet_target_obj'])
 					{
-						$x = $resource[$ids[8]];
-						doquery("UPDATE {{table}} SET " . $x . " = '0'  WHERE id = " . $planet['id'], 'planets');
-						$message = $planet['interceptor_misil'] . "interplanetario misiles fueron destruidos por misiles interceptores.<br>";
-						$irak = $this->raketenangriff($verteidiger, $angreifer, $FleetRow['fleet_amount']-$planet['interceptor_misil'], $def, $FleetRow['fleet_target_obj']);
+						case 0:
+							$attack_order = Array(401, 402, 403, 404, 405, 406, 407, 408, 503);
+							break;
+						case 1:
+							$attack_order = Array(402, 401, 403, 404, 405, 406, 407, 408, 503);
+							break;
+						case 2:
+							$attack_order = Array(403, 401, 402, 404, 405, 406, 407, 408, 503);
+							break;
+						case 3:
+							$attack_order = Array(404, 401, 402, 403, 405, 406, 407, 408, 503);
+							break;
+						case 4:
+							$attack_order = Array(405, 401, 402, 403, 404, 406, 407, 408, 503);
+							break;
+						case 5:
+							$attack_order = Array(406, 401, 402, 403, 404, 405, 407, 408, 503);
+							break;
+						case 6:
+							$attack_order = Array(407, 401, 402, 403, 404, 405, 406, 408, 503);
+							break;
+						case 7:
+							$attack_order = Array(408, 401, 402, 403, 404, 405, 406, 407, 503);
+							break;
+						case 8:
+							$attack_order = Array(401, 402, 403, 404, 405, 406, 407, 408, 503);
+							break;
 					}
 
-					$irak = $this->raketenangriff($verteidiger, $angreifer, $FleetRow['fleet_amount'], $def, $FleetRow['fleet_target_obj']);
-
-					foreach ($irak['zerstoert'] as $id => $anzahl)
+					for ($t = 0; $t < 10; $t++)
 					{
-						if ($id < 10)
+						$n = $attack_order[$t];
+
+						if ($planet[$resource[$n]])
 						{
-							if ($id != 8)
-								$message .= $DefenseLabel[$id] . " (- " . $anzahl . ")<br>";
+							$defense = (($pricelist[$n]['metal'] + $pricelist[$n]['crystal']) / 10) * (1 + ($Target['defence_tech'] / 10));
 
-							$x = $resource[$ids[$id]];
-							$x1 = $x ."-". $anzahl;
-							doquery("UPDATE {{table}} SET " . $x . " = " . $x1 . " WHERE id = " . $planet['id'], 'planets');
+							if ($attack >= ($defense * $planet[$resource[$n]]))
+							{
+								$destroyed = $planet[$resource[$n]];
+							}
+							else
+							{
+								$destroyed = floor($attack / $defense);
+							}
+
+							$attack -= $destroyed * $defense;
+
+							if ($destroyed != 0)
+							{
+								$message .= $lang['tech'][$n] . " (-" . $destroyed . ")<br>";
+								doquery("UPDATE {{table}} SET ".$resource[$n]."  = ".$resource[$n]." - ".$destroyed." WHERE id = ".$planet['id'], 'planets');
+							}
 						}
 					}
 				}
-				$UserPlanet 		= doquery("SELECT name FROM {{table}} WHERE id = '" . $FleetRow['fleet_owner'] . "'", 'planets',true);
-				$name 				= $UserPlanet['name'];
-				$name_deffer 		= $QryTargetPlanet['name'];
-				$message_vorlage  	= 'Un ataque con misiles (' .$FleetRow['fleet_amount']. ') de ' .$name. ' ';
-				$message_vorlage   .= 'al planeta ' .$name_deffer.'<br><br>';
+
+				$UserPlanet = doquery('SELECT name FROM {{table}} WHERE `galaxy` = '.$FleetRow['fleet_start_galaxy'].' AND `system` = '.$FleetRow['fleet_start_system'].' AND `planet` = '.$FleetRow['fleet_start_planet'].' AND `planet_type` = '.$FleetRow['fleet_start_type'], 'planets', TRUE);
+
+				$search=array('%1%','%2%','%3%');
+				$replace=array($FleetRow['fleet_amount'], $UserPlanet['name'].' ['.  $FleetRow['fleet_start_galaxy'] .':'. $FleetRow['fleet_start_system']  .':'. $FleetRow['fleet_start_planet'].'] ', $planet['name']. ' ['.  $FleetRow['fleet_end_galaxy'] .':'. $FleetRow['fleet_end_system'] .':'.  $FleetRow['fleet_end_planet'].'] ');
+				$message_vorlage=str_replace($search,$replace,$lang['ma_missile_string']);
 
 				if (empty($message))
-					$message = "Tu planeta no tenia defensa!";
-
-				doquery("INSERT INTO {{table}} SET
-				`message_owner`='" . $FleetRow['fleet_target_owner'] . "',
-				`message_sender`='".$UserPlanet['id']."',
-				`message_time`=UNIX_TIMESTAMP(),
-				`message_type`='3',
-				`message_from`='Torre de Control',
-				`message_subject`='Ataque con misiles',
-				`message_text`='" . $message_vorlage . $message . "'" , 'messages');
-				doquery("INSERT INTO {{table}} SET
-				`message_owner`='" . $UserPlanet['id'] . "',
-				`message_sender`='".$FleetRow['fleet_target_owner']."',
-				`message_time`=UNIX_TIMESTAMP(),
-				`message_type`='3',
-				`message_from`='Torre de Control',
-				`message_subject`='Ataque con misiles',
-				`message_text`='" . $message_vorlage . $message . "'" , 'messages');
+					$message = $lang['ma_planet_without_defens'];
+
+				SendSimpleMessage($Target['id'], '', $FleetRow['fleet_end_time'], 3, $lang['sys_mess_tower'], $lang['gl_missile_attack'], $message_vorlage . $message);
 
 				doquery("DELETE FROM {{table}} WHERE fleet_id = '" . intval($FleetRow['fleet_id']) . "'", 'fleets');
 			}
 		}
-		$FleetRow['fleet_start_time'] <= time();
 	}
 
 	private function MissionCaseExpedition($FleetRow)
@@ -2129,41 +1980,39 @@ private function MissionCaseExpedition($FleetRow)
 		{
 			if ($FleetRow['fleet_end_stay'] < time())
 			{
-				$PointsFlotte = array(
-				202 => 1.0,
-				203 => 1.5,
-				204 => 0.5,
-				205 => 1.5,
-				206 => 2.0,
-				207 => 2.5,
-				208 => 0.5,
-				209 => 1.0,
-				210 => 0.01,
-				211 => 3.0,
-				212 => 0.0,
-				213 => 3.5,
-				214 => 5.0,
-				215 => 3.2,
-				216 => 3.5,
-				);
-
-				$RatioGain = array (
-				202 => 0.1,
-				203 => 0.1,
-				204 => 0.1,
-				205 => 0.5,
-				206 => 0.25,
-				207 => 0.125,
-				208 => 0.5,
-				209 => 0.1,
-				210 => 0.1,
-				211 => 0.0625,
-				212 => 0.0,
-				213 => 0.0625,
-				214 => 0.03125,
-				215 => 0.0625,
-				216 => 0.03125,
-				);
+				$PointsFlotte = array	(
+											202 => 1.0,
+											203 => 1.5,
+											204 => 0.5,
+											205 => 1.5,
+											206 => 2.0,
+											207 => 2.5,
+											208 => 0.5,
+											209 => 1.0,
+											210 => 0.01,
+											211 => 3.0,
+											212 => 0.0,
+											213 => 3.5,
+											214 => 5.0,
+											215 => 3.2,
+										);
+
+				$RatioGain = array	(
+										202 => 0.1,
+										203 => 0.1,
+										204 => 0.1,
+										205 => 0.5,
+										206 => 0.25,
+										207 => 0.125,
+										208 => 0.5,
+										209 => 0.1,
+										210 => 0.1,
+										211 => 0.0625,
+										212 => 0.0,
+										213 => 0.0625,
+										214 => 0.03125,
+										215 => 0.0625,
+									);
 
 				$FleetStayDuration 	= ($FleetRow['fleet_end_stay'] - $FleetRow['fleet_start_time']) / 3600;
 				$farray 			= explode(";", $FleetRow['fleet_array']);
@@ -2176,7 +2025,7 @@ private function MissionCaseExpedition($FleetRow)
 						$TypeVaisseau 				= $Class[0];
 						$NbreVaisseau 				= $Class[1];
 						$LaFlotte[$TypeVaisseau]	= $NbreVaisseau;
-						$FleetCapacity 			   += $pricelist[$TypeVaisseau]['capacity'];
+						$FleetCapacity             += $pricelist[$TypeVaisseau]['capacity'] * $NbreVaisseau;
 						$FleetPoints   			   += ($NbreVaisseau * $PointsFlotte[$TypeVaisseau]);
 					}
 				}
@@ -2192,25 +2041,38 @@ private function MissionCaseExpedition($FleetRow)
 					$Hasard     += 1;
 					$LostAmount  = (($Hasard * 33) + 1) / 100;
 
-					if ($LostAmount == 100)
+					if ($LostAmount == 1)
 					{
 						SendSimpleMessage ( $FleetOwner, '', $FleetRow['fleet_end_stay'], 15, $MessSender, $MessTitle, $lang['sys_expe_blackholl_2'] );
 						doquery ("DELETE FROM {{table}} WHERE `fleet_id` = ". $FleetRow["fleet_id"], 'fleets');
 					}
 					else
 					{
+						$all_destroyed = TRUE;
 						foreach ($LaFlotte as $Ship => $Count)
 						{
-							$LostShips[$Ship] = intval($Count * $LostAmount);
-							$NewFleetArray   .= $Ship.",". ($Count - $LostShips[$Ship]) .";";
+							if(floor($Count * $LostAmount)!=0)
+							{
+								$LostShips[$Ship] 	= floor($Count * $LostAmount);
+								$NewFleetArray     .= $Ship.",". ($Count - $LostShips[$Ship]) .";";
+								$all_destroyed 		= FALSE;
+							}
+						}
+						if(!$all_destroyed)
+						{
+							$QryUpdateFleet  = "UPDATE {{table}} SET ";
+							$QryUpdateFleet .= "`fleet_array` = '". $NewFleetArray ."', ";
+							$QryUpdateFleet .= "`fleet_mess` = '1'  ";
+							$QryUpdateFleet .= "WHERE ";
+							$QryUpdateFleet .= "`fleet_id` = '". $FleetRow["fleet_id"] ."';";
+							doquery( $QryUpdateFleet, 'fleets');
+							SendSimpleMessage ( $FleetOwner, '', $FleetRow['fleet_end_stay'], 15, $MessSender, $MessTitle, $lang['sys_expe_blackholl_1'] );
+						}
+						else
+						{
+							SendSimpleMessage ( $FleetOwner, '', $FleetRow['fleet_end_stay'], 15, $MessSender, $MessTitle, $lang['sys_expe_blackholl_2'] );
+							doquery ("DELETE FROM {{table}} WHERE `fleet_id` = ". $FleetRow["fleet_id"], 'fleets');
 						}
-						$QryUpdateFleet  = "UPDATE {{table}} SET ";
-						$QryUpdateFleet .= "`fleet_array` = '". $NewFleetArray ."', ";
-						$QryUpdateFleet .= "`fleet_mess` = '1'  ";
-						$QryUpdateFleet .= "WHERE ";
-						$QryUpdateFleet .= "`fleet_id` = '". $FleetRow["fleet_id"] ."';";
-						doquery( $QryUpdateFleet, 'fleets');
-						SendSimpleMessage ( $FleetOwner, '', $FleetRow['fleet_end_stay'], 15, $MessSender, $MessTitle, $lang['sys_expe_blackholl_1'] );
 					}
 				}
 				elseif ($Hasard == 3)
@@ -2222,13 +2084,14 @@ private function MissionCaseExpedition($FleetRow)
 				{
 					if ($FleetCapacity > 5000)
 					{
-						$MinCapacity = $FleetCapacity - 5000;
-						$MaxCapacity = $FleetCapacity;
-						$FoundGoods  = rand($MinCapacity, $MaxCapacity);
-						$FoundMetal  = intval($FoundGoods / 2);
-						$FoundCrist  = intval($FoundGoods / 4);
-						$FoundDeute  = intval($FoundGoods / 6);
-						$FoundDark   = intval($FoundGoods / 20);
+						$MinCapacity	= $FleetCapacity - 5000;
+						$MaxCapacity 	= $FleetCapacity;
+						$FoundGoods  	= rand($MinCapacity, $MaxCapacity);
+						$FoundMetal  	= intval($FoundGoods / 2);
+						$FoundCrist  	= intval($FoundGoods / 4);
+						$FoundDeute  	= intval($FoundGoods / 6);
+						$FoundDark	 	= ( $FleetCapacity > 10000 ) ? intval ( 3 * log ( $FleetCapacity / 10000 ) * 100 ) : 0;
+						$FoundDark		= mt_rand ( $FoundDark / 2 , $FoundDark );
 
 						$QryUpdateFleet  = "UPDATE {{table}} SET ";
 						$QryUpdateFleet .= "`fleet_resource_metal` = `fleet_resource_metal` + '". $FoundMetal ."', ";
@@ -2257,7 +2120,7 @@ private function MissionCaseExpedition($FleetRow)
 				elseif ($Hasard >= 8 && $Hasard < 11)
 				{
 					$FoundChance = $FleetPoints / $FleetCount;
-					for ($Ship = 202; $Ship < 216; $Ship++)
+					for ($Ship = 202; $Ship <= 215; $Ship++)
 					{
 						if ($LaFlotte[$Ship] != 0)
 						{
@@ -2275,7 +2138,7 @@ private function MissionCaseExpedition($FleetRow)
 							$NewFleetArray   .= $Ship.",". $Count .";";
 					}
 
-					if ( $FoundShip != null )
+					if ( $FoundShip != NULL )
 					{
 						foreach ($FoundShip as $Ship => $Count)
 						{
@@ -2314,6 +2177,7 @@ private function MissionCaseExpedition($FleetRow)
 				$QryUpdatePlanet .= "`metal` = `metal` + ". $FleetRow['fleet_resource_metal'] .", ";
 				$QryUpdatePlanet .= "`crystal` = `crystal` + ". $FleetRow['fleet_resource_crystal'] .", ";
 				$QryUpdatePlanet .= "`deuterium` = `deuterium` + ". $FleetRow['fleet_resource_deuterium'] ." ";
+
 				$QryUpdatePlanet .= "WHERE ";
 				$QryUpdatePlanet .= "`galaxy` = '". $FleetRow['fleet_start_galaxy'] ."' AND ";
 				$QryUpdatePlanet .= "`system` = '". $FleetRow['fleet_start_system'] ."' AND ";
@@ -2351,6 +2215,7 @@ public function __construct (&$planet)
 		$QryFleet  .= "( `fleet_start_time` < '". time() ."' OR `fleet_end_time` < '". time() ."' );";
 		$fleetquery = doquery( $QryFleet, 'fleets' );
 
+
 		while ($CurrentFleet = mysql_fetch_array($fleetquery))
 		{
 			switch ($CurrentFleet["fleet_mission"])
diff --git a/includes/classes/class.FlyingFleetsTable.php b/includes/classes/class.FlyingFleetsTable.php
index 2dc3d9e..56acdeb 100644
--- a/includes/classes/class.FlyingFleetsTable.php
+++ b/includes/classes/class.FlyingFleetsTable.php
@@ -1,23 +1,10 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
@@ -107,17 +94,19 @@ private function CreateFleetPopupedFleetLink($FleetRow, $Texte, $FleetType)
 		$FleetPopup  .= "</table>";
 		$FleetPopup  .= "');\" onmouseout=\"return nd();\" class=\"". $FleetType ."\">". $Texte ."</a>";
 
+
+
 		return $FleetPopup;
 	}
 
 	private function BuildHostileFleetPlayerLink($FleetRow)
 	{
-		global $lang, $dpath;
+		global $lang;
 
-		$PlayerName  = doquery ("SELECT `username` FROM {{table}} WHERE `id` = '". intval($FleetRow['fleet_owner'])."';", 'users', true);
+		$PlayerName  = doquery ("SELECT `username` FROM {{table}} WHERE `id` = '". intval($FleetRow['fleet_owner'])."';", 'users', TRUE);
 		$Link  		 = $PlayerName['username']. " ";
 		$Link 		.= "<a href=\"game.php?page=messages&mode=write&id=".$FleetRow['fleet_owner']."\">";
-		$Link 		.= "<img src=\"".$dpath."/img/m.gif\" title=\"".$lang['write_message']."\" border=\"0\"></a>";
+		$Link 		.= "<img src=\"".DPATH."/img/m.gif\" title=\"".$lang['write_message']."\" border=\"0\"></a>";
 
 		return $Link;
 	}
@@ -131,8 +120,8 @@ public function BuildFlyingFleetTable ()
 
 		while ( $CurrentFleet = mysql_fetch_assoc( $FlyingFleets ) )
 		{
-			$FleetOwner       = doquery("SELECT `username` FROM {{table}} WHERE `id` = '". intval($CurrentFleet['fleet_owner']) ."';", 'users', true);
-			$TargetOwner      = doquery("SELECT `username` FROM {{table}} WHERE `id` = '". intval($CurrentFleet['fleet_target_owner']) ."';", 'users', true);
+			$FleetOwner       = doquery("SELECT `username` FROM {{table}} WHERE `id` = '". intval($CurrentFleet['fleet_owner']) ."';", 'users', TRUE);
+			$TargetOwner      = doquery("SELECT `username` FROM {{table}} WHERE `id` = '". intval($CurrentFleet['fleet_target_owner']) ."';", 'users', TRUE);
 
 			$Bloc['Id']       = $CurrentFleet['fleet_id'];
 			$Bloc['Mission']  = $this->CreateFleetPopupedMissionLink ( $CurrentFleet, $lang['type_mission'][ $CurrentFleet['fleet_mission'] ], '' );
@@ -191,18 +180,18 @@ public function BuildFleetEventTable($FleetRow, $Status, $Owner, $Label, $Record
 
 		$FleetStatus = array ( 0 => 'flight', 1 => 'holding', 2 => 'return' );
 
-		if ( $Owner == true )
+		if ( $Owner == TRUE )
 			$FleetPrefix = 'own';
 		else
 			$FleetPrefix = '';
 
 		$RowsTPL        = gettemplate ('overview/overview_fleet_event');
 		$MissionType    = $FleetRow['fleet_mission'];
-		$FleetContent   = $this->CreateFleetPopupedFleetLink ( $FleetRow, "<font color='#FFFF00'>ôëîòîâ</font>", $FleetPrefix . $FleetStyle[ $MissionType ] );
+		$FleetContent   = $this->CreateFleetPopupedFleetLink ( $FleetRow, "flotas", $FleetPrefix . $FleetStyle[ $MissionType ] );
 		$FleetCapacity  = $this->CreateFleetPopupedMissionLink ( $FleetRow, $lang['type_mission'][ $MissionType ], $FleetPrefix . $FleetStyle[ $MissionType ] );
-		$StartPlanet    = doquery("SELECT `name` FROM {{table}} WHERE `galaxy` = '".intval($FleetRow['fleet_start_galaxy'])."' AND `system` = '".intval($FleetRow['fleet_start_system'])."' AND `planet` = '".intval($FleetRow['fleet_start_planet'])."' AND `planet_type` = '".intval($FleetRow['fleet_start_type'])."';", 'planets', true);
+		$StartPlanet    = doquery("SELECT `name` FROM {{table}} WHERE `galaxy` = '".intval($FleetRow['fleet_start_galaxy'])."' AND `system` = '".intval($FleetRow['fleet_start_system'])."' AND `planet` = '".intval($FleetRow['fleet_start_planet'])."' AND `planet_type` = '".intval($FleetRow['fleet_start_type'])."';", 'planets', TRUE);
 		$StartType      = $FleetRow['fleet_start_type'];
-		$TargetPlanet   = doquery("SELECT `name` FROM {{table}} WHERE `galaxy` = '".intval($FleetRow['fleet_end_galaxy'])."' AND `system` = '".intval($FleetRow['fleet_end_system'])."' AND `planet` = '".intval($FleetRow['fleet_end_planet'])."' AND `planet_type` = '".intval($FleetRow['fleet_end_type'])."';", 'planets', true);
+		$TargetPlanet   = doquery("SELECT `name` FROM {{table}} WHERE `galaxy` = '".intval($FleetRow['fleet_end_galaxy'])."' AND `system` = '".intval($FleetRow['fleet_end_system'])."' AND `planet` = '".intval($FleetRow['fleet_end_planet'])."' AND `planet_type` = '".intval($FleetRow['fleet_end_type'])."';", 'planets', TRUE);
 		$TargetType     = $FleetRow['fleet_end_type'];
 
 		if ($Status != 2)
@@ -221,6 +210,7 @@ public function BuildFleetEventTable($FleetRow, $Status, $Owner, $Label, $Record
 					$TargetID  = $lang['cff_the_planet'];
 				elseif ($TargetType == 2)
 					$TargetID  = $lang['cff_debris_field'];
+
 				elseif ($TargetType == 3)
 					$TargetID  = $lang['cff_to_the_moon'];
 			}
@@ -269,7 +259,7 @@ public function BuildFleetEventTable($FleetRow, $Status, $Owner, $Label, $Record
 		}
 		else
 		{
-			if ($Owner == true)
+			if ($Owner == TRUE)
 			{
 				$EventString  = $lang['cff_one_of_your'];
 				$EventString .= $FleetContent;
@@ -317,10 +307,10 @@ public function BuildFleetEventTable($FleetRow, $Status, $Owner, $Label, $Record
 		$bloc['fleet_status'] = $FleetStatus[ $Status ];
 		$bloc['fleet_prefix'] = $FleetPrefix;
 		$bloc['fleet_style']  = $FleetStyle[ $MissionType ];
-		$bloc['fleet_javai']  = InsertJavaScriptChronoApplet ( $Label, $Record, $Rest, true );
+		$bloc['fleet_javai']  = InsertJavaScriptChronoApplet ( $Label, $Record, $Rest, TRUE );
 		$bloc['fleet_order']  = $Label . $Record;
 		$bloc['fleet_descr']  = $EventString;
-		$bloc['fleet_javas']  = InsertJavaScriptChronoApplet ( $Label, $Record, $Rest, false );
+		$bloc['fleet_javas']  = InsertJavaScriptChronoApplet ( $Label, $Record, $Rest, FALSE );
 
 		return parsetemplate($RowsTPL, $bloc);
 	}
diff --git a/includes/classes/class.GalaxyRows.php b/includes/classes/class.GalaxyRows.php
index fad1152..d9f1e98 100644
--- a/includes/classes/class.GalaxyRows.php
+++ b/includes/classes/class.GalaxyRows.php
@@ -1,23 +1,10 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
@@ -56,34 +43,35 @@ public function GetPhalanxRange($PhalanxLevel)
 
 	public function CheckAbandonMoonState($lunarow)
 	{
-		if (($lunarow['destruyed'] + 172800) <= time() && $lunarow['destruyed'] != 0)
+		if (($lunarow['destruyed_moon'] + 172800) <= time() && $lunarow['destruyed_moon'] != 0)
+		{
 			$QryUpdateGalaxy  = "UPDATE {{table}} SET `id_luna` = '0' WHERE `galaxy` = '". intval($lunarow['galaxy']) ."' AND `system` = '". intval($lunarow['system']) ."' AND `planet` = '". intval($lunarow['planet']) ."' LIMIT 1;";
+		}
+
 		doquery( $QryUpdateGalaxy , 'galaxy');
 		doquery("DELETE FROM {{table}} WHERE `id` = ".intval($lunarow['id'])."", 'planets');
 	}
 
 	public function CheckAbandonPlanetState(&$planet)
+    {
+        if ($planet['destruyed'] <= time())
+        {
+            doquery("DELETE FROM {{table}} WHERE `id_planet` = '".$planet['id_planet']."' LIMIT 1;" , 'galaxy');
+            doquery("DELETE FROM {{table}} WHERE `id` = '".$planet['id_planet']."'", 'planets');
+        }
+    }
+
+	public function GalaxyRowActions($GalaxyInfo, $Galaxy, $System, $Planet, $CurrentGalaxy, $CurrentSystem, $CurrentMIP)
 	{
-		if ($planet['destruyed'] <= time())
-		{
-			doquery("DELETE FROM {{table}} WHERE `id_planet` = '".intval($planet['id'])."' LIMIT 1;" , 'galaxy');
-			doquery("DELETE FROM {{table}} WHERE `id` = ".intval($planet['id'])."", 'planets');
-		}
-	}
-
-	public function GalaxyRowActions($GalaxyRow, $GalaxyRowPlanet, $GalaxyRowPlayer, $Galaxy, $System, $Planet, $PlanetType, $CurrentGalaxy, $CurrentSystem, $CurrentMIP)
-	{
-		global $user, $dpath, $lang;
-
-		$Result = "<th style=\"white-space: nowrap;\" width=125>";
+		global $user, $lang;
 
-		if ($GalaxyRowPlayer['id'] != $user['id'])
+		if ($GalaxyInfo['id'] != $user['id'])
 		{
 			if ($CurrentMIP <> 0)
 			{
-				if ($GalaxyRowUser['id'] != $user['id'])
+				if ($GalaxyInfo['id'] != $user['id'])
 				{
-					if ($GalaxyRowPlanet["galaxy"] == $CurrentGalaxy)
+					if ($GalaxyInfo["galaxy"] == $CurrentGalaxy)
 					{
 						$Range = $this->GetMissileRange();
 						$SystemLimitMin = $CurrentSystem - $Range;
@@ -97,272 +85,213 @@ public function GalaxyRowActions($GalaxyRow, $GalaxyRowPlanet, $GalaxyRowPlayer,
 						{
 							if ($System >= $SystemLimitMin)
 							{
-								$MissileBtn = true;
+								$MissileBtn = TRUE;
 							}
 							else
 							{
-								$MissileBtn = false;
+								$MissileBtn = FALSE;
 							}
 						}
 						else
 						{
-							$MissileBtn = false;
+							$MissileBtn = FALSE;
 						}
 					}
 					else
 					{
-						$MissileBtn = false;
+						$MissileBtn = FALSE;
 					}
 				}
 				else
 				{
-					$MissileBtn = false;
+					$MissileBtn = FALSE;
 				}
 			}
 			else
 			{
-				$MissileBtn = false;
+				$MissileBtn = FALSE;
 			}
 
-			if ($GalaxyRowPlayer && $GalaxyRowPlanet["destruyed"] == 0)
+			if ($GalaxyInfo && $GalaxyInfo["destruyed"] == 0)
 			{
-				if ($user["settings_esp"] == "1" && $GalaxyRowPlayer['id'])
+				if ($user["settings_esp"] == "1" && $GalaxyInfo['id'])
 				{
-					$Result .= "<a href=# onclick=\"javascript:doit(6, ".$Galaxy.", ".$System.", ".$Planet.", 1, ".$user["spio_anz"].");\" >";
-					$Result .= "<img src=". $dpath ."img/e.gif title=\"".$lang['gl_spy']."\" border=0></a>";
-					$Result .= "&nbsp;";
+					$links .= "<a href=# onclick=\"javascript:doit(6, ".$Galaxy.", ".$System.", ".$Planet.", 1, ".$user["spio_anz"].");\" >";
+					$links .= "<img src=". DPATH ."img/e.gif title=\"".$lang['gl_spy']."\" border=0></a>";
+					$links .= "&nbsp;";
 				}
-				if ($user["settings_wri"] == "1" && $GalaxyRowPlayer['id'])
+				if ($user["settings_wri"] == "1" && $GalaxyInfo['id'])
 				{
-					$Result .= "<a href=game.php?page=messages&mode=write&id=".$GalaxyRowPlayer["id"].">";
-					$Result .= "<img src=". $dpath ."img/m.gif title=\"".$lang['write_message']."\" border=0></a>";
-					$Result .= "&nbsp;";
+					$links .= "<a href=game.php?page=messages&mode=write&id=".$GalaxyInfo["id"].">";
+					$links .= "<img src=". DPATH ."img/m.gif title=\"".$lang['write_message']."\" border=0></a>";
+					$links .= "&nbsp;";
 				}
-				if ($user["settings_bud"] == "1" && $GalaxyRowPlayer['id'])
+				if ($user["settings_bud"] == "1" && $GalaxyInfo['id'])
 				{
-					$Result .= "<a href=game.php?page=buddy&mode=2&u=".$GalaxyRowPlayer['id']." >";
-					$Result .= "<img src=". $dpath ."img/b.gif title=\"".$lang['gl_buddy_request']."\" border=0></a>";
-					$Result .= "&nbsp;";
+					$links .= "<a href=game.php?page=buddy&mode=2&u=".$GalaxyInfo['id']." >";
+					$links .= "<img src=". DPATH ."img/b.gif title=\"".$lang['gl_buddy_request']."\" border=0></a>";
+					$links .= "&nbsp;";
 				}
-				if ($user["settings_mis"] == "1" && $MissileBtn == true && $GalaxyRowPlayer['id'])
+				if ($user["settings_mis"] == "1" && $MissileBtn == TRUE && $GalaxyInfo['id'])
 				{
-					$Result .= "<a href=game.php?page=galaxy&mode=2&galaxy=".$Galaxy."&system=".$System."&planet=".$Planet."&current=".$user['current_planet']." >";
-					$Result .= "<img src=". $dpath ."img/r.gif title=\"".$lang['gl_missile_attack']."\" border=0></a>";
+					$links .= "<a href=game.php?page=galaxy&mode=2&galaxy=".$Galaxy."&system=".$System."&planet=".$Planet."&current=".$user['current_planet']." >";
+					$links .= "<img src=". DPATH ."img/r.gif title=\"".$lang['gl_missile_attack']."\" border=0></a>";
 				}
 			}
 		}
-		$Result .= "</th>";
-
-		return $Result;
+		return $links;
 	}
 
-	public function GalaxyRowAlly($GalaxyRow, $GalaxyRowPlanet, $GalaxyRowUser, $Galaxy, $System, $Planet, $PlanetType)
+	public function GalaxyRowAlly($GalaxyInfo, $Galaxy, $System, $Planet)
 	{
 		global $user, $lang;
 
-		$Result  = "<th width=80>";
-		if ($GalaxyRowUser['ally_id'] && $GalaxyRowUser['ally_id'] != 0)
+		if ($GalaxyInfo['ally_id'] && $GalaxyInfo['ally_id'] != 0)
 		{
-			$allyquery = doquery("SELECT * FROM {{table}} WHERE id=" . intval($GalaxyRowUser['ally_id']), "alliance", true);
-			if ($allyquery)
+			if ($GalaxyInfo['ally_members'] > 1)
+			{
+				$add = $lang['gl_member_add'];
+			}
+			else
 			{
-				$members_count = doquery("SELECT COUNT(DISTINCT(id)) FROM {{table}} WHERE ally_id=" . intval($allyquery['id']) . ";", "users", true);
+				$add = "";
+			}
 
-				if ($members_count[0] > 1)
-					$add = $lang['gl_member_add'];
-				else
-					$add = "";
-
-				$Result .= "<a style=\"cursor: pointer;\"";
-				$Result .= " onmouseover='return overlib(\"";
-				$Result .= "<table width=240>";
-				$Result .= "<tr>";
-				$Result .= "<td class=c>".$lang['gl_alliance']. " " . $allyquery['ally_name'] . $lang['gl_with'] . $members_count[0] . $lang['gl_member'] . $add ."</td>";
-				$Result .= "</tr>";
-				$Result .= "<th>";
-				$Result .= "<table>";
-				$Result .= "<tr>";
-				$Result .= "<td><a href=game.php?page=alliance&mode=ainfo&a=". $allyquery['id'] .">".$lang['gl_alliance_page']."</a></td>";
-				$Result .= "</tr><tr>";
-				$Result .= "<td><a href=game.php?page=statistics&start=101&who=ally>".$lang['gl_see_on_stats']."</a></td>";
-				if ($allyquery["ally_web"] != "")
-				{
-					$Result .= "</tr><tr>";
-					$Result .= "<td><a href=". $allyquery["ally_web"] ." target=_new>".$lang['gl_alliance_web_page']."</td>";
-				}
-				$Result .= "</tr>";
-				$Result .= "</table>";
-				$Result .= "</th>";
-				$Result .= "</table>\"";
-				$Result .= ", STICKY, MOUSEOFF, DELAY, 750, CENTER, OFFSETX, -40, OFFSETY, -40 );'";
-				$Result .= " onmouseout='return nd();'>";
-				if ($user['ally_id'] == $GalaxyRowPlayer['ally_id'])
-				{
-					$Result .= "<span class=\"allymember\">". $allyquery['ally_tag'] ."</span></a>";
-				}
-				elseif ($GalaxyRowUser['ally_id'] == $user['ally_id'])
-				{
-					$Result .= "<font color=lime>".$allyquery['ally_tag'] ."</font></a>";
-				}
-				else
-				{
-					$Result .= $allyquery['ally_tag'] ."</a>";
-				}
+			$parse					=	$lang;
+			$parse['ally_name']		=	$GalaxyInfo['ally_name'];
+			$parse['ally_members']	=	$GalaxyInfo['ally_members'];
+			$parse['add']			=	$add;
+			$parse['ally_id']		=	$GalaxyInfo['ally_id'];
+
+			if ($GalaxyInfo["ally_web"] != "")
+			{
+				$parse['web'] 	   = "</tr><tr>";
+				$parse['web']     .= "<td><a href=". $GalaxyInfo["ally_web"] ." target=_new>".$lang['gl_alliance_web_page']."</td>";
+			}
+
+			if ($user['ally_id'] == $GalaxyInfo['ally_id'])
+			{
+				$parse['tag']		= "<span class=\"allymember\">". $GalaxyInfo['ally_tag'] ."</span>";
+			}
+			elseif ($GalaxyInfo['ally_id'] == $user['ally_id'])
+			{
+				$parse['tag']  		= "<font color=lime>".$GalaxyInfo['ally_tag'] ."</font>";
+			}
+			else
+			{
+				$parse['tag']  		= $GalaxyInfo['ally_tag'];
 			}
 		}
-		$Result .= "</th>";
-		return $Result;
+		return parsetemplate(gettemplate('galaxy/galaxy_alliance_block'), $parse);
 	}
 
-	public function GalaxyRowDebris($GalaxyRow, $GalaxyRowPlanet, $GalaxyRowUser, $Galaxy, $System, $Planet, $PlanetType, $CurrentRC)
+	public function GalaxyRowDebris($GalaxyInfo, $Galaxy, $System, $Planet, $PlanetType, $CurrentRC)
 	{
-		global $dpath, $user, $pricelist, $lang;
+		global $user, $pricelist, $lang;
 
-		$Result  = "<th style=\"white-space: nowrap;\" width=30>";
-		if ($GalaxyRow)
+		if ($GalaxyInfo)
 		{
-			if ($GalaxyRow["metal"] != 0 || $GalaxyRow["crystal"] != 0)
+			if ($GalaxyInfo["metal"]+$GalaxyInfo["crystal"] >= DEBRIS_MIN_VISIBLE_SIZE)
 			{
-				$RecNeeded = ceil(($GalaxyRow["metal"] + $GalaxyRow["crystal"]) / $pricelist[209]['capacity']);
+				$RecNeeded = ceil(($GalaxyInfo["metal"] + $GalaxyInfo["crystal"]) / $pricelist[209]['capacity']);
 
 				if ($RecNeeded < $CurrentRC)
+				{
 					$RecSended = $RecNeeded;
+				}
 				elseif ($RecNeeded >= $CurrentRC)
+				{
 					$RecSended = $CurrentRC;
+				}
 				else
+				{
 					$RecSended = $RecyclerCount;
+				}
 
-				$Result .= "<a style=\"cursor: pointer;\"";
-				$Result .= " onmouseover='return overlib(\"";
-				$Result .= "<table width=240>";
-				$Result .= "<tr>";
-				$Result .= "<td class=c colspan=2>";
-				$Result .= $lang['gl_debris_field'] . "[".$Galaxy.":".$System.":".$Planet."]";
-				$Result .= "</td>";
-				$Result .= "</tr><tr>";
-				$Result .= "<th width=80>";
-				$Result .= "<img src=". $dpath ."planeten/debris.jpg height=75 width=75 />";
-				$Result .= "</th>";
-				$Result .= "<th>";
-				$Result .= "<table>";
-				$Result .= "<tr>";
-				$Result .= "<td class=c colspan=2>".$lang['gl_resources'].":</td>";
-				$Result .= "</tr><tr>";
-				$Result .= "<th>".$lang['Metal'].": </th><th>". number_format( $GalaxyRow['metal'], 0, '', '.') ."</th>";
-				$Result .= "</tr><tr>";
-				$Result .= "<th>".$lang['Crystal'].": </th><th>". number_format( $GalaxyRow['crystal'], 0, '', '.') ."</th>";
-				$Result .= "</tr><tr>";
-				$Result .= "<td class=c colspan=2>".$lang['gl_actions'].":</td>";
-				$Result .= "</tr><tr>";
-				$Result .= "<th colspan=2 align=left>";
-				$Result .= "<a href= # onclick=&#039javascript:doit (8, ".$Galaxy.", ".$System.", ".$Planet.", ".$PlanetType.", ".$RecSended."); return nd();&#039 >".$lang['gl_collect']."</a>";
-				$Result .= "</tr>";
-				$Result .= "</table>";
-				$Result .= "</th>";
-				$Result .= "</tr>";
-				$Result .= "</table>\"";
-				$Result .= ", STICKY, MOUSEOFF, DELAY, 750, CENTER, OFFSETX, -40, OFFSETY, -40 );'";
-				$Result .= " onmouseout='return nd();'>";
-				$Result .= "<img src=". $dpath ."planeten/debris.jpg height=22 width=22></a>";
+				$parse						=	$lang;
+				$parse['dpath']				=	DPATH;
+				$parse['galaxy']			=	$Galaxy;
+				$parse['system']			=	$System;
+				$parse['planet']			=	$Planet;
+				$parse['planettype']		=	$PlanetType;
+				$parse['recsended']			=	$RecSended;
+				$parse['debris_metal']		=	number_format( $GalaxyInfo['metal'], 0, '', '.');
+				$parse['debris_crystal']	=	number_format( $GalaxyInfo['crystal'], 0, '', '.');
+
+				return parsetemplate(gettemplate('galaxy/galaxy_debris_block'), $parse);
 			}
 		}
-		$Result .= "</th>";
-		return $Result;
+		return '';
 	}
 
-	public function GalaxyRowMoon($GalaxyRow, $GalaxyRowPlanet, $GalaxyRowUser, $Galaxy, $System, $Planet, $PlanetType)
+	public function GalaxyRowMoon($GalaxyInfo, $Galaxy, $System, $Planet, $PlanetType)
 	{
-		global $user, $dpath, $CanDestroy, $lang;
+		global $user, $CanDestroy, $lang;
 
-		$Result  = "<th style=\"white-space: nowrap;\" width=30>";
-		if ($GalaxyRowUser['id'] != $user['id'])
+		if ($GalaxyInfo['id'] != $user['id'])
 			$MissionType6Link = "<a href=# onclick=&#039javascript:doit(6, ".$Galaxy.", ".$System.", ".$Planet.", ".$PlanetType.", ".$user["spio_anz"].");&#039 >".$lang['type_mission'][6]."</a><br /><br />";
-		elseif ($GalaxyRowUser['id'] == $user['id'])
+		elseif ($GalaxyInfo['id'] == $user['id'])
 			$MissionType6Link = "";
 
-		if ($GalaxyRowUser['id'] != $user['id'])
+		if ($GalaxyInfo['id'] != $user['id'])
 			$MissionType1Link = "<a href=game.php?page=fleet&galaxy=".$Galaxy."&amp;system=".$System."&amp;planet=".$Planet."&amp;planettype=".$PlanetType."&amp;target_mission=1>".$lang['type_mission'][1]."</a><br />";
-		elseif ($GalaxyRowUser['id'] == $user['id'])
+		elseif ($GalaxyInfo['id'] == $user['id'])
 			$MissionType1Link = "";
 
-		if ($GalaxyRowUser['id'] != $user['id'])
+		if ($GalaxyInfo['id'] != $user['id'])
 			$MissionType5Link = "<a href=game.php?page=fleet&galaxy=".$Galaxy."&system=".$System."&planet=".$Planet."&planettype=".$PlanetType."&target_mission=5>".$lang['type_mission'][5]."</a><br />";
-		elseif ($GalaxyRowUser['id'] == $user['id'])
+		elseif ($GalaxyInfo['id'] == $user['id'])
 			$MissionType5Link = "";
 
-		if ($GalaxyRowUser['id'] == $user['id'])
+		if ($GalaxyInfo['id'] == $user['id'])
 			$MissionType4Link = "<a href=game.php?page=fleet&galaxy=".$Galaxy."&system=".$System."&planet=".$Planet."&planettype=".$PlanetType."&target_mission=4>".$lang['type_mission'][4]."</a><br />";
-		elseif ($GalaxyRowUser['id'] != $user['id'])
+		elseif ($GalaxyInfo['id'] != $user['id'])
 			$MissionType4Link = "";
 
-		if ($GalaxyRowUser['id'] != $user['id'])
+		if ($GalaxyInfo['id'] != $user['id'])
 			if ($CanDestroy > 0)
 				$MissionType9Link = "<a href=game.php?page=fleet&galaxy=".$Galaxy."&system=".$System."&planet=".$Planet."&planettype=".$PlanetType."&target_mission=9>".$lang['type_mission'][9]."</a>";
 		else
 			$MissionType9Link = "";
-		elseif ($GalaxyRowUser['id'] == $user['id'])
+		elseif ($GalaxyInfo['id'] == $user['id'])
 			$MissionType9Link = "";
 
 		$MissionType3Link = "<a href=game.php?page=fleet&galaxy=".$Galaxy."&system=".$System."&planet=".$Planet."&planettype=".$PlanetType."&target_mission=3>".$lang['type_mission'][3]."</a><br />";
 
-		if ($GalaxyRow && $GalaxyRowPlanet["destruyed"] == 0 && $GalaxyRow["id_luna"] != 0)
+		if ($GalaxyInfo && $GalaxyInfo["destruyed_moon"] == 0 && $GalaxyInfo["id_luna"] != 0)
 		{
-			$Result .= "<a style=\"cursor: pointer;\"";
-			$Result .= " onmouseover='return overlib(\"";
-			$Result .= "<table width=240>";
-			$Result .= "<tr>";
-			$Result .= "<td class=c colspan=2>";
-			$Result .= $lang['gl_moon'] . " ".$GalaxyRowPlanet["name"]." [".$Galaxy.":".$System.":".$Planet."]";
-			$Result .= "</td>";
-			$Result .= "</tr><tr>";
-			$Result .= "<th width=80>";
-			$Result .= "<img src=". $dpath ."planeten/mond.jpg height=75 width=75 />";
-			$Result .= "</th>";
-			$Result .= "<th>";
-			$Result .= "<table>";
-			$Result .= "<tr>";
-			$Result .= "<td class=c colspan=2>".$lang['gl_features']."</td>";
-			$Result .= "</tr><tr>";
-			$Result .= "<th>".$lang['gl_diameter']."</th>";
-			$Result .= "<th>". number_format($GalaxyRowPlanet['diameter'], 0, '', '.') ."</th>";
-			$Result .= "</tr><tr>";
-			$Result .= "<th>".$lang['gl_temperature']."</th><th>". number_format($GalaxyRowPlanet['temp_min'], 0, '', '.') ."</th>";
-			$Result .= "</tr><tr>";
-			$Result .= "<td class=c colspan=2>".$lang['gl_actions']."</td>";
-			$Result .= "</tr><tr>";
-			$Result .= "<th colspan=2 align=center>";
-			$Result .= $MissionType6Link;
-			$Result .= $MissionType3Link;
-			$Result .= $MissionType4Link;
-			$Result .= $MissionType1Link;
-			$Result .= $MissionType5Link;
-			$Result .= $MissionType9Link;
-			$Result .= "</tr>";
-			$Result .= "</table>";
-			$Result .= "</th>";
-			$Result .= "</tr>";
-			$Result .= "</table>\"";
-			$Result .= ", STICKY, MOUSEOFF, DELAY, 750, CENTER, OFFSETX, -40, OFFSETY, -40 );'";
-			$Result .= " onmouseout='return nd();'>";
-			$Result .= "<img src=". $dpath ."planeten/small/s_mond.jpg height=22 width=22>";
-			$Result .= "</a>";
+			$parse					=	$lang;
+			$parse['dpath']			= 	DPATH;
+			$parse['name_moon']		=	$GalaxyInfo["name_moon"];
+			$parse['galaxy']		=	$Galaxy;
+			$parse['system']		=	$System;
+			$parse['planet']		=	$Planet;
+			$parse['diameter']		=	number_format($GalaxyInfo['diameter'], 0, '', '.');
+			$parse['temperature']	=	number_format($GalaxyInfo['temp_min'], 0, '', '.');
+			$parse['links'] 		= $MissionType6Link;
+			$parse['links'] 	   .= $MissionType3Link;
+			$parse['links'] 	   .= $MissionType4Link;
+			$parse['links'] 	   .= $MissionType1Link;
+			$parse['links'] 	   .= $MissionType5Link;
+			$parse['links'] 	   .= $MissionType9Link;
+
+			return parsetemplate(gettemplate('galaxy/galaxy_moon_block'), $parse);
+
 		}
-		$Result .= "</th>";
-		return $Result;
+		return '';
 	}
 
-	public function GalaxyRowPlanet($GalaxyRow, $GalaxyRowPlanet, $GalaxyRowUser, $Galaxy, $System, $Planet, $PlanetType, $HavePhalanx, $CurrentGalaxy, $CurrentSystem)
+	public function GalaxyRowPlanet($GalaxyInfo, $Galaxy, $System, $Planet, $PlanetType, $HavePhalanx, $CurrentGalaxy, $CurrentSystem)
 	{
-		global $dpath, $user, $CurrentMIP, $CurrentSystem, $game_config, $lang;
+		global $user, $CurrentMIP, $CurrentSystem, $lang;
 
-		$Result  = "<th width=30>";
-		if ($GalaxyRow && $GalaxyRowPlanet["destruyed"] == 0 && $GalaxyRow["id_planet"] != 0)
+		if ($GalaxyInfo && $GalaxyInfo["destruyed"] == 0 && $GalaxyInfo["id_planet"] != 0)
 		{
 			if ($HavePhalanx <> 0)
 			{
-				if ($GalaxyRowUser['id'] != $user['id'])
+				if ($GalaxyInfo['id'] != $user['id'])
 				{
-					if ($GalaxyRowPlanet["galaxy"] == $CurrentGalaxy)
+					if ($GalaxyInfo["galaxy"] == $CurrentGalaxy)
 					{
 						$PhRange = $this->GetPhalanxRange ( $HavePhalanx );
 						$SystemLimitMin = $CurrentSystem - $PhRange;
@@ -399,9 +328,9 @@ public function GalaxyRowPlanet($GalaxyRow, $GalaxyRowPlanet, $GalaxyRowUser, $G
 
 			if ($CurrentMIP <> 0)
 			{
-				if ($GalaxyRowUser['id'] != $user['id'])
+				if ($GalaxyInfo['id'] != $user['id'])
 				{
-					if ($GalaxyRowPlanet["galaxy"] == $CurrentGalaxy)
+					if ($GalaxyInfo["galaxy"] == $CurrentGalaxy)
 					{
 						$MiRange = $this->GetMissileRange();
 						$SystemLimitMin = $CurrentSystem - $MiRange;
@@ -413,201 +342,172 @@ public function GalaxyRowPlanet($GalaxyRow, $GalaxyRowPlanet, $GalaxyRowUser, $G
 						if ($System <= $SystemLimitMax)
 						{
 							if ($System >= $SystemLimitMin)
-								$MissileBtn = true;
+								$MissileBtn = TRUE;
 							else
-								$MissileBtn = false;
+								$MissileBtn = FALSE;
 						}
 						else
 						{
-							$MissileBtn = false;
+							$MissileBtn = FALSE;
 						}
 					}
 					else
 					{
-						$MissileBtn = false;
+						$MissileBtn = FALSE;
 					}
 				}
 				else
 				{
-					$MissileBtn = false;
+					$MissileBtn = FALSE;
 				}
 			}
 			else
 			{
-				$MissileBtn = false;
+				$MissileBtn = FALSE;
 			}
 
-			if ($GalaxyRowUser['id'] != $user['id'])
+			if ($GalaxyInfo['id'] != $user['id'])
 				$MissionType6Link = "<a href=# onclick=&#039javascript:doit(6, ".$Galaxy.", ".$System.", ".$Planet.", ".$PlanetType.", ".$user["spio_anz"].");&#039 >".$lang['type_mission'][6]."</a><br /><br />";
-			elseif ($GalaxyRowUser['id'] == $user['id'])
+			elseif ($GalaxyInfo['id'] == $user['id'])
 				$MissionType6Link = "";
 
-			if ($GalaxyRowUser['id'] != $user['id'])
+			if ($GalaxyInfo['id'] != $user['id'])
 				$MissionType1Link = "<a href=game.php?page=fleet&galaxy=".$Galaxy."&amp;system=".$System."&amp;planet=".$Planet."&amp;planettype=".$PlanetType."&amp;target_mission=1>".$lang['type_mission'][1]."</a><br />";
-			elseif ($GalaxyRowUser['id'] == $user['id'])
+			elseif ($GalaxyInfo['id'] == $user['id'])
 				$MissionType1Link = "";
 
-			if ($GalaxyRowUser['id'] == $user['id'])
+			if ($GalaxyInfo['id'] == $user['id'])
 				$MissionType5Link = "<a href=game.php?page=fleet&galaxy=".$Galaxy."&system=".$System."&planet=".$Planet."&planettype=".$PlanetType."&target_mission=5>".$lang['type_mission'][5]."</a><br />";
-			elseif ($GalaxyRowUser['id'] == $user['id'])
+			elseif ($GalaxyInfo['id'] == $user['id'])
 				$MissionType5Link = "";
 
-			if ($GalaxyRowUser['id'] == $user['id'])
+			if ($GalaxyInfo['id'] == $user['id'])
 				$MissionType4Link = "<a href=game.php?page=fleet&galaxy=".$Galaxy."&system=".$System."&planet=".$Planet."&planettype=".$PlanetType."&target_mission=4>".$lang['type_mission'][4]."</a><br />";
-			elseif ($GalaxyRowUser['id'] != $user['id'])
+			elseif ($GalaxyInfo['id'] != $user['id'])
 				$MissionType4Link = "";
 
-			if ($user["settings_mis"] == "1" AND $MissileBtn == true && $GalaxyRowUser['id'])
+			if ($user["settings_mis"] == "1" AND $MissileBtn == TRUE && $GalaxyInfo['id'])
 				$MissionType10Link = "<a href=game.php?page=galaxy&mode=2&galaxy=".$Galaxy."&system=".$System."&planet=".$Planet."&current=".$user['current_planet']." >".$lang['gl_missile_attack']."</a><br />";
-			elseif ($GalaxyRowUser['id'] != $user['id'])
+			elseif ($GalaxyInfo['id'] != $user['id'])
 				$MissionType10Link = "";
 
 			$MissionType3Link = "<a href=game.php?page=fleet&galaxy=".$Galaxy."&system=".$System."&planet=".$Planet."&planettype=".$PlanetType."&target_mission=3>".$lang['type_mission'][3]."</a><br />";
 
-			$Result .= "<a style=\"cursor: pointer;\"";
-			$Result .= " onmouseover='return overlib(\"";
-			$Result .= "<table width=240>";
-			$Result .= "<tr>";
-			$Result .= "<td class=c colspan=2>";
-			$Result .= $lang['gl_planet'] . " " . $GalaxyRowPlanet["name"] ." [".$Galaxy.":".$System.":".$Planet."]";
-			$Result .= "</td>";
-			$Result .= "</tr>";
-			$Result .= "<tr>";
-			$Result .= "<th width=80>";
-			$Result .= "<img src=". $dpath ."planeten/small/s_". $GalaxyRowPlanet["image"] .".jpg height=75 width=75 />";
-			$Result .= "</th>";
-			$Result .= "<th align=left>";
-			$Result .= $MissionType6Link;
-			$Result .= $PhalanxTypeLink;
-			$Result .= $MissionType1Link;
-			$Result .= $MissionType5Link;
-			$Result .= $MissionType4Link;
-			$Result .= $MissionType3Link;
-			$Result .= $MissionType10Link;
-			$Result .= "</th>";
-			$Result .= "</tr>";
-			$Result .= "</table>\"";
-			$Result .= ", STICKY, MOUSEOFF, DELAY, 750, CENTER, OFFSETX, -40, OFFSETY, -40 );'";
-			$Result .= " onmouseout='return nd();'>";
-			$Result .= "<img src=".   $dpath ."planeten/small/s_". $GalaxyRowPlanet["image"] .".jpg height=30 width=30>";
-			$Result .= "</a>";
-		}
-		$Result .= "</th>";
+			$parse				=	$lang;
+			$parse['dpath']		=	DPATH;
+			$parse['name']		=	$GalaxyInfo["name"];
+			$parse['galaxy']	=	$Galaxy;
+			$parse['system']	=	$System;
+			$parse['planet']	=	$Planet;
+			$parse['image']		=	$GalaxyInfo["image"];
+			$parse['links'] 	= $MissionType6Link;
+			$parse['links']    .= $PhalanxTypeLink;
+			$parse['links']    .= $MissionType1Link;
+			$parse['links']    .= $MissionType5Link;
+			$parse['links']    .= $MissionType4Link;
+			$parse['links']    .= $MissionType3Link;
+			$parse['links']    .= $MissionType10Link;
 
-		return $Result;
+		}
+		return parsetemplate(gettemplate('galaxy/galaxy_planet_block'), $parse);
 	}
 
-	public function GalaxyRowPlanetName($GalaxyRow, $GalaxyRowPlanet, $GalaxyRowUser, $Galaxy, $System, $Planet, $PlanetType, $HavePhalanx, $CurrentGalaxy, $CurrentSystem)
+	public function GalaxyRowPlanetName($GalaxyInfo, $Galaxy, $System, $Planet, $PlanetType, $HavePhalanx, $CurrentGalaxy, $CurrentSystem)
 	{
 		global $user, $lang;
 
-		$Result  = "<th style=\"white-space: nowrap;\" width=130>";
-
-		if ($GalaxyRowPlanet['last_update'] > (time()-59 * 60) && $GalaxyRowUser['id'] != $user['id'])
-			$Inactivity = pretty_time_hour(time() - $GalaxyRowPlanet['last_update']);
+		if ($GalaxyInfo['last_update'] > (time()-59 * 60) && $GalaxyInfo['id'] != $user['id'])
+		{
+			$Inactivity = pretty_time_hour(time() - $GalaxyInfo['last_update']);
+		}
 
-		if ($GalaxyRow && $GalaxyRowPlanet["destruyed"] == 0)
+		if ($GalaxyInfo && $GalaxyInfo["destruyed"] == 0)
 		{
 			if ($HavePhalanx <> 0)
 			{
-				if ($GalaxyRowPlanet["galaxy"] == $CurrentGalaxy)
+				if ($GalaxyInfo["galaxy"] == $CurrentGalaxy)
 				{
 					$Range = $this->GetPhalanxRange ( $HavePhalanx );
 					if ($CurrentGalaxy + $Range <= $CurrentSystem && $CurrentSystem >= $CurrentGalaxy - $Range)
-						$PhalanxTypeLink = "<a href=# onclick=fenster('game.php?page=phalanx&galaxy=".$Galaxy."&amp;system=".$System."&amp;planet=".$Planet."&amp;planettype=".$PlanetType."')  title=\"Phalanx\">".$GalaxyRowPlanet['name']."</a><br />";
+						$PhalanxTypeLink = "<a href=# onclick=fenster('game.php?page=phalanx&galaxy=".$Galaxy."&amp;system=".$System."&amp;planet=".$Planet."&amp;planettype=".$PlanetType."')  title=\"Phalanx\">".$GalaxyInfo['name']."</a><br />";
 					else
-						$PhalanxTypeLink = stripslashes($GalaxyRowPlanet['name']);
+						$PhalanxTypeLink = stripslashes($GalaxyInfo['name']);
 				}
 				else
 				{
-					$PhalanxTypeLink = stripslashes($GalaxyRowPlanet['name']);
+					$PhalanxTypeLink = stripslashes($GalaxyInfo['name']);
 				}
 			}
 			else
 			{
-				$PhalanxTypeLink = stripslashes($GalaxyRowPlanet['name']);
+				$PhalanxTypeLink = stripslashes($GalaxyInfo['name']);
 			}
 
-			$Result .= $TextColor . $PhalanxTypeLink . $EndColor;
+			$planetname .= $TextColor . $PhalanxTypeLink . $EndColor;
 
-			if ($GalaxyRowPlanet['last_update']  > (time()-59 * 60) && $GalaxyRowUser['id'] != $user['id'])
+			if ($GalaxyInfo['last_update']  > (time()-59 * 60) && $GalaxyInfo['id'] != $user['id'])
 			{
-				if ($GalaxyRowPlanet['last_update']  > (time()-10 * 60) && $GalaxyRowUser['id'] != $user['id'])
-					$Result .= "(*)";
+				if ($GalaxyInfo['last_update']  > (time()-10 * 60) && $GalaxyInfo['id'] != $user['id'])
+				{
+					$planetname .= "(*)";
+				}
 				else
-					$Result .= " (".$Inactivity.")";
+				{
+					$planetname .= " (".$Inactivity.")";
+				}
 			}
 		}
-		elseif($GalaxyRowPlanet["destruyed"] != 0)
+		elseif($GalaxyInfo["destruyed"] != 0)
 		{
-			$Result .= $lang['gl_planet_destroyed'];
+			$planetname .= $lang['gl_planet_destroyed'];
 		}
 
-		$Result .= "</th>";
-
-		return $Result;
-	}
-
-	public function GalaxyRowPos($GalaxyRow, $Galaxy, $System, $Planet)
-	{
-		$Result  = "<th width=30>";
-		$Result .= "<a href=\"game.php?page=fleet&galaxy=".$Galaxy."&system=".$System."&planet=".$Planet."&planettype=0&target_mission=7\"";
-		if ($GalaxyRow)
-			$Result .= " tabindex=\"". ($Planet + 1) ."\"";
-		$Result .= ">". $Planet ."</a>";
-		$Result .= "</th>";
-
-		return $Result;
+		return $planetname;
 	}
 
-	public function GalaxyRowUser($GalaxyRow, $GalaxyRowPlanet, $GalaxyRowUser, $Galaxy, $System, $Planet, $PlanetType, $UserPoints)
+	public function GalaxyRowUser($GalaxyInfo, $Galaxy, $System, $Planet)
 	{
-		global $game_config, $user, $lang;
-
-		$Result = "<th width=150>";
+		global $user, $lang;
 
-		if ($GalaxyRowUser && $GalaxyRowPlanet["destruyed"] == 0)
+		if ($GalaxyInfo && $GalaxyInfo["destruyed"] == 0)
 		{
-			$protection      	= $game_config['noobprotection'];
-			$protectiontime  	= $game_config['noobprotectiontime'];
-			$protectionmulti 	= $game_config['noobprotectionmulti'];
-			$User2Points 		= doquery("SELECT * FROM {{table}} WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '". $GalaxyRowUser['id'] ."';", 'statpoints', true);
-			$CurrentPoints 		= $UserPoints['total_points'];
-			$RowUserPoints 		= $User2Points['total_points'];
-			$MyGameLevel 		= $CurrentPoints * $protectionmulti['config_value'];
-			$HeGameLevel 		= $RowUserPoints * $protectionmulti['config_value'];
-
-			if ($GalaxyRowUser['bana'] == 1 && $GalaxyRowUser['urlaubs_modus'] == 1)
+			$protection      	= read_config ( 'noobprotection' );
+			$protectiontime  	= read_config ( 'noobprotectiontime' );
+			$protectionmulti 	= read_config ( 'noobprotectionmulti' );
+			$MyGameLevel		= $user['total_points'];
+			$HeGameLevel		= $GalaxyInfo['total_points'];
+
+			if ($GalaxyInfo['bana'] == 1 && $GalaxyInfo['urlaubs_modus'] == 1)
 			{
 				$Systemtatus2 	= "v <a href=\"game.php?page=banned\"><span class=\"banned\">".$lang['gl_b']."</span></a>";
 				$Systemtatus 	= "<span class=\"vacation\">";
 			}
-			elseif ($GalaxyRowUser['bana'] == 1)
+			elseif ($GalaxyInfo['bana'] == 1)
 			{
 				$Systemtatus2 	= "<a href=\"game.php?page=banned\"><span class=\"banned\">".$lang['gl_b']."</span></a>";
 				$Systemtatus 	= "";
 			}
-			elseif ($GalaxyRowUser['urlaubs_modus'] == 1)
+			elseif ($GalaxyInfo['urlaubs_modus'] == 1)
 			{
 				$Systemtatus2 	= "<span class=\"vacation\">".$lang['gl_v']."</span>";
 				$Systemtatus 	= "<span class=\"vacation\">";
 			}
-			elseif ($GalaxyRowUser['onlinetime'] < (time()-60 * 60 * 24 * 7) && $GalaxyRowUser['onlinetime'] > (time()-60 * 60 * 24 * 28))
+			elseif ($GalaxyInfo['onlinetime'] < (time()-60 * 60 * 24 * 7) && $GalaxyInfo['onlinetime'] > (time()-60 * 60 * 24 * 28))
 			{
 				$Systemtatus2 	= "<span class=\"inactive\">".$lang['gl_i']."</span>";
 				$Systemtatus 	= "<span class=\"inactive\">";
 			}
-			elseif ($GalaxyRowUser['onlinetime'] < (time()-60 * 60 * 24 * 28))
+			elseif ($GalaxyInfo['onlinetime'] < (time()-60 * 60 * 24 * 28))
 			{
 				$Systemtatus2 	= "<span class=\"inactive\">".$lang['gl_i']."</span><span class=\"longinactive\">".$lang['gl_I']."</span>";
 				$Systemtatus 	= "<span class=\"longinactive\">";
 			}
-			elseif (($MyGameLevel > ($HeGameLevel * $protectionmulti)) && $protection == 1 && ($HeGameLevel < ($protectiontime * 1000)))
+			elseif (($MyGameLevel > ($HeGameLevel * $protectionmulti)) && $protection == 1 && ($HeGameLevel < $protectiontime))
 			{
 				$Systemtatus2 	= "<span class=\"noob\">".$lang['gl_w']."</span>";
 				$Systemtatus 	= "<span class=\"noob\">";
 			}
-			elseif ((($MyGameLevel * $protectionmulti) < $HeGameLevel) && $protection == 1 && ($MyGameLevel < ($protectiontime * 1000)))
+			elseif ((($MyGameLevel * $protectionmulti) < $HeGameLevel) && $protection == 1 && ($MyGameLevel < $protectiontime))
 			{
 				$Systemtatus2 	= $lang['gl_s'];
 				$Systemtatus 	= "<span class=\"strong\">";
@@ -617,7 +517,7 @@ public function GalaxyRowUser($GalaxyRow, $GalaxyRowPlanet, $GalaxyRowUser, $Gal
 				$Systemtatus2 	= "";
 				$Systemtatus 	= "";
 			}
-			$Systemtatus4 		= $User2Points['total_rank'];
+			$Systemtatus4 		= $GalaxyInfo['total_rank'];
 
 			if ($Systemtatus2 != '')
 			{
@@ -630,42 +530,34 @@ public function GalaxyRowUser($GalaxyRow, $GalaxyRowPlanet, $GalaxyRowUser, $Gal
 				$Systemtatus7 	= "";
 			}
 
-			$Systemtart = $User2Points['total_rank'];
+			$Systemtart = $GalaxyInfo['total_rank'];
 
 			if (strlen($Systemtart) < 3)
 				$Systemtart = 1;
 			else
-				$Systemtart = (floor( $User2Points['total_rank'] / 100 ) * 100) + 1;
-
-			$Result .= "<a style=\"cursor: pointer;\"";
-			$Result .= " onmouseover='return overlib(\"";
-			$Result .= "<table width=190>";
-			$Result .= "<tr>";
-			$Result .= "<td class=c colspan=2>". $lang['gl_player'] .$GalaxyRowUser['username']. $lang['gl_in_the_rank'] .$Systemtatus4."</td>";
-			$Result .= "</tr><tr>";
-			if ($GalaxyRowUser['id'] != $user['id'])
+				$Systemtart = (floor( $GalaxyInfo['total_rank'] / 100 ) * 100) + 1;
+
+			$parse					=	$lang;
+			$parse['username']		=	$GalaxyInfo['username'];
+			$parse['systemtatus4']	=	$Systemtatus4;
+			$parse['systemtart']	=	$Systemtart;
+
+			if ($GalaxyInfo['id'] != $user['id'])
 			{
-				$Result .= "<td><a href=game.php?page=messages&mode=write&id=".$GalaxyRowUser['id'].">".$lang['write_message']."</a></td>";
-				$Result .= "</tr><tr>";
-				$Result .= "<td><a href=game.php?page=buddy&mode=2&u=".$GalaxyRowUser['id'].">".$lang['gl_buddy_request']."</a></td>";
-				$Result .= "</tr><tr>";
+				$parse['actions'] 	= "<td><a href=game.php?page=messages&mode=write&id=".$GalaxyInfo['id'].">".$lang['write_message']."</a></td>";
+				$parse['actions']  .= "</tr><tr>";
+				$parse['actions']  .= "<td><a href=game.php?page=buddy&mode=2&u=".$GalaxyInfo['id'].">".$lang['gl_buddy_request']."</a></td>";
+				$parse['actions']  .= "</tr><tr>";
 			}
-			$Result .= "<td><a href=game.php?page=statistics&who=player&start=".$Systemtart.">".$lang['gl_stat']."</a></td>";
-			$Result .= "</tr>";
-			$Result .= "</table>\"";
-			$Result .= ", STICKY, MOUSEOFF, DELAY, 750, CENTER, OFFSETX, -40, OFFSETY, -40 );'";
-			$Result .= " onmouseout='return nd();'>";
-			$Result .= $Systemtatus;
-			$Result .= $GalaxyRowUser["username"]."</span>";
-			$Result .= $Systemtatus6;
-			$Result .= $Systemtatus;
-			$Result .= $Systemtatus2;
-			$Result .= $Systemtatus7." ".$admin;
-			$Result .= "</span></a>";
-		}
-		$Result .= "</th>";
 
-		return $Result;
+			$parse['status'] 	 	= $Systemtatus;
+			$parse['status'] 	   .= $GalaxyInfo["username"]."</span>";
+			$parse['status'] 	   .= $Systemtatus6;
+			$parse['status'] 	   .= $Systemtatus;
+			$parse['status'] 	   .= $Systemtatus2;
+			$parse['status'] 	   .= $Systemtatus7." ".$admin;
+		}
+		return parsetemplate(gettemplate('galaxy/galaxy_username_block'), $parse);
 	}
 }
 ?>
\ No newline at end of file
diff --git a/includes/classes/class.SecurePage.php b/includes/classes/class.SecurePage.php
index 23b7b61..46a310a 100644
--- a/includes/classes/class.SecurePage.php
+++ b/includes/classes/class.SecurePage.php
@@ -1,23 +1,10 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
  // This class is originally developed by "Bendikt Martin Myklebust" this is updated by "Rakesh Chandel".
  //To Secure Global varaible values consisting in array while posting from GET,Session, and POST.
diff --git a/includes/classes/class.debug.php b/includes/classes/class.debug.php
index 01ae330..6e75170 100644
--- a/includes/classes/class.debug.php
+++ b/includes/classes/class.debug.php
@@ -1,25 +1,12 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-if(!defined('INSIDE')){ die(header("location:../../"));}
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+if(!defined('INSIDE')){ die(header ( 'location:../../' ));}
 
 class debug
 {
@@ -39,23 +26,21 @@ function add($mes)
 
 	function echo_log()
 	{
-		global $xgp_root;
-		return  "<br><table><tr><td class=k colspan=4><a href=".$xgp_root."adm/settings.php>Debug Log</a>:</td></tr>".$this->log."</table>";
+		return  "<br><table><tr><td class=k colspan=4><a href=".XGP_ROOT."adm/settings.php>Debug Log</a>:</td></tr>".$this->log."</table>";
 		die();
 	}
 
 	function error($message,$title)
 	{
-		global $link, $game_config, $lang;
+		global $link, $lang, $user;
 
-		if($game_config['debug']==1)
+		if ( read_config ( 'debug' ) == 1 )
 		{
 			echo "<h2>$title</h2><br><font color=red>$message</font><br><hr>";
 			echo  "<table>".$this->log."</table>";
 		}
 
-		global $user,$xgp_root,$phpEx;
-		include($xgp_root . 'config.'.$phpEx);
+		include(XGP_ROOT . 'config.php');
 
 		if(!$link)
 			die($lang['cdg_mysql_not_available']);
@@ -75,7 +60,7 @@ function error($message,$title)
 		if (!function_exists('message'))
 			echo $lang['cdg_error_message']." <b>".$q['rows']."</b>";
 		else
-			message($lang['cdg_error_message']." <b>".$q['rows']."</b>", '', '', false, false);
+			message($lang['cdg_error_message']." <b>".$q['rows']."</b>", '', '', FALSE, FALSE);
 
 		die();
 	}
diff --git a/includes/vendor/simplehtmldom/simple_html_dom.php b/includes/classes/class.simple_html_dom.php
similarity index 93%
rename from includes/vendor/simplehtmldom/simple_html_dom.php
rename to includes/classes/class.simple_html_dom.php
index 19e5f66..5f2c56b 100644
--- a/includes/vendor/simplehtmldom/simple_html_dom.php
+++ b/includes/classes/class.simple_html_dom.php
@@ -36,19 +36,19 @@
 function file_get_html() {
     $dom = new simple_html_dom;
     $args = func_get_args();
-    $dom->load(call_user_func_array('file_get_contents', $args), true);
+    $dom->load(call_user_func_array('file_get_contents', $args), TRUE);
     return $dom;
 }
 
 // get html dom form string
-function str_get_html($str, $lowercase=true) {
+function str_get_html($str, $lowercase=TRUE) {
     $dom = new simple_html_dom;
     $dom->load($str, $lowercase);
     return $dom;
 }
 
 // dump html dom tree
-function dump_html_tree($node, $show_attr=true, $deep=0) {
+function dump_html_tree($node, $show_attr=TRUE, $deep=0) {
     $lead = str_repeat('    ', $deep);
     echo $lead.$node->tag;
     if ($show_attr && count($node->attr)>0) {
@@ -67,12 +67,12 @@ function dump_html_tree($node, $show_attr=true, $deep=0) {
 function file_get_dom() {
     $dom = new simple_html_dom;
     $args = func_get_args();
-    $dom->load(call_user_func_array('file_get_contents', $args), true);
+    $dom->load(call_user_func_array('file_get_contents', $args), TRUE);
     return $dom;
 }
 
 // get dom form string (deprecated)
-function str_get_dom($str, $lowercase=true) {
+function str_get_dom($str, $lowercase=TRUE) {
     $dom = new simple_html_dom;
     $dom->load($str, $lowercase);
     return $dom;
@@ -112,7 +112,7 @@ function clear() {
     }
     
     // dump node's tree
-    function dump($show_attr=true) {
+    function dump($show_attr=TRUE) {
         dump_html_tree($this, $show_attr);
     }
 
@@ -237,12 +237,12 @@ function makeup() {
             ++$i;
 
             // skip removed attribute
-            if ($val===null || $val===false)
+            if ($val===null || $val===FALSE)
                 continue;
 
             $ret .= $this->_[HDOM_INFO_SPACE][$i][0];
             //no value attr: nowrap, checked selected...
-            if ($val===true)
+            if ($val===TRUE)
                 $ret .= $key;
             else {
                 switch($this->_[HDOM_INFO_QUOTE][$i]) {
@@ -329,22 +329,22 @@ protected function seek($selector, &$ret) {
 
         for($i=$this->_[HDOM_INFO_BEGIN]+1; $i<$end; ++$i) {
             $node = $this->dom->nodes[$i];
-            $pass = true;
+            $pass = TRUE;
 
             if ($tag==='*' && !$key) {
-                if (in_array($node, $this->children, true))
+                if (in_array($node, $this->children, TRUE))
                     $ret[$i] = 1;
                 continue;
             }
 
             // compare tag
-            if ($tag && $tag!=$node->tag && $tag!=='*') {$pass=false;}
+            if ($tag && $tag!=$node->tag && $tag!=='*') {$pass=FALSE;}
             // compare key
             if ($pass && $key) {
                 if ($no_key) {
-                    if (isset($node->attr[$key])) $pass=false;
+                    if (isset($node->attr[$key])) $pass=FALSE;
                 }
-                else if (!isset($node->attr[$key])) $pass=false;
+                else if (!isset($node->attr[$key])) $pass=FALSE;
             }
             // compare value
             if ($pass && $key && $val  && $val!=='*') {
@@ -356,7 +356,7 @@ protected function seek($selector, &$ret) {
                         if ($check) break;
                     }
                 }
-                if (!$check) $pass = false;
+                if (!$check) $pass = FALSE;
             }
             if ($pass) $ret[$i] = 1;
             unset($node);
@@ -378,7 +378,7 @@ protected function match($exp, $pattern, $value) {
                     return preg_match($pattern, $value);
                 return preg_match("/".$pattern."/i", $value);
         }
-        return false;
+        return FALSE;
     }
 
     protected function parse_selector($selector_string) {
@@ -395,7 +395,7 @@ protected function parse_selector($selector_string) {
             // for borwser grnreated xpath
             if ($m[1]==='tbody') continue;
 
-            list($tag, $key, $val, $exp, $no_key) = array($m[1], null, null, '=', false);
+            list($tag, $key, $val, $exp, $no_key) = array($m[1], null, null, '=', FALSE);
             if(!empty($m[2])) {$key='id'; $val=$m[2];}
             if(!empty($m[3])) {$key='class'; $val=$m[3];}
             if(!empty($m[4])) {$key=$m[4];}
@@ -405,7 +405,7 @@ protected function parse_selector($selector_string) {
             // convert to lowercase
             if ($this->dom->lowercase) {$tag=strtolower($tag); $key=strtolower($key);}
             //elements that do NOT have the specified attribute
-            if (isset($key[0]) && $key[0]==='!') {$key=substr($key, 1); $no_key=true;}
+            if (isset($key[0]) && $key[0]==='!') {$key=substr($key, 1); $no_key=TRUE;}
 
             $result[] = array($tag, $key, $val, $exp, $no_key);
             if (trim($m[7])===',') {
@@ -445,12 +445,12 @@ function __set($name, $value) {
 
     function __isset($name) {
         switch($name) {
-            case 'outertext': return true;
-            case 'innertext': return true;
-            case 'plaintext': return true;
+            case 'outertext': return TRUE;
+            case 'innertext': return TRUE;
+            case 'plaintext': return TRUE;
         }
         //no value attr: nowrap, checked selected...
-        return (array_key_exists($name, $this->attr)) ? true : isset($this->attr[$name]);
+        return (array_key_exists($name, $this->attr)) ? TRUE : isset($this->attr[$name]);
     }
 
     function __unset($name) {
@@ -482,7 +482,7 @@ class simple_html_dom {
     public $root = null;
     public $nodes = array();
     public $callback = null;
-    public $lowercase = false;
+    public $lowercase = FALSE;
     protected $pos;
     protected $doc;
     protected $char;
@@ -523,13 +523,13 @@ function __destruct() {
     }
 
     // load html from string
-    function load($str, $lowercase=true) {
+    function load($str, $lowercase=TRUE) {
         // prepare
         $this->prepare($str, $lowercase);
         // strip out comments
         $this->remove_noise("'<!--(.*?)-->'is");
         // strip out cdata
-        $this->remove_noise("'<!\[CDATA\[(.*?)\]\]>'is", true);
+        $this->remove_noise("'<!\[CDATA\[(.*?)\]\]>'is", TRUE);
         // strip out <style> tags
         $this->remove_noise("'<\s*style[^>]*[^/]>(.*?)<\s*/\s*style\s*>'is");
         $this->remove_noise("'<\s*style\s*>(.*?)<\s*/\s*style\s*>'is");
@@ -539,9 +539,9 @@ function load($str, $lowercase=true) {
         // strip out preformatted tags
         $this->remove_noise("'<\s*(?:code)[^>]*>(.*?)<\s*/\s*(?:code)\s*>'is");
         // strip out server side scripts
-        $this->remove_noise("'(<\?)(.*?)(\?>)'s", true);
+        $this->remove_noise("'(<\?)(.*?)(\?>)'s", TRUE);
         // strip smarty scripts
-        $this->remove_noise("'(\{\w)(.*?)(\})'s", true);
+        $this->remove_noise("'(\{\w)(.*?)(\})'s", TRUE);
 
         // parsing
         while ($this->parse());
@@ -552,7 +552,7 @@ function load($str, $lowercase=true) {
     // load html from file
     function load_file() {
         $args = func_get_args();
-        $this->load(call_user_func_array('file_get_contents', $args), true);
+        $this->load(call_user_func_array('file_get_contents', $args), TRUE);
     }
 
     // set callback function
@@ -586,12 +586,12 @@ function clear() {
         unset($this->noise);
     }
     
-    function dump($show_attr=true) {
+    function dump($show_attr=TRUE) {
         $this->root->dump($show_attr);
     }
 
     // prepare HTML data and init everything
-    protected function prepare($str, $lowercase=true) {
+    protected function prepare($str, $lowercase=TRUE) {
         $this->clear();
         $this->doc = $str;
         $this->pos = 0;
@@ -618,15 +618,15 @@ protected function parse() {
         $node = new simple_html_dom_node($this);
         ++$this->cursor;
         $node->_[HDOM_INFO_TEXT] = $s;
-        $this->link_nodes($node, false);
-        return true;
+        $this->link_nodes($node, FALSE);
+        return TRUE;
     }
 
     // read tag info
     protected function read_tag() {
         if ($this->char!=='<') {
             $this->root->_[HDOM_INFO_END] = $this->cursor;
-            return false;
+            return FALSE;
         }
         $begin_tag_pos = $this->pos;
         $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
@@ -638,7 +638,7 @@ protected function read_tag() {
             $tag = $this->copy_until_char('>');
 
             // skip attributes in end tag
-            if (($pos = strpos($tag, ' '))!==false)
+            if (($pos = strpos($tag, ' '))!==FALSE)
                 $tag = substr($tag, 0, $pos);
 
             $parent_lower = strtolower($this->parent->tag);
@@ -684,7 +684,7 @@ protected function read_tag() {
             if ($this->parent->parent) $this->parent = $this->parent->parent;
 
             $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-            return true;
+            return TRUE;
         }
 
         $node = new simple_html_dom_node($this);
@@ -705,31 +705,31 @@ protected function read_tag() {
             }
 
             if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>';
-            $this->link_nodes($node, true);
+            $this->link_nodes($node, TRUE);
             $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-            return true;
+            return TRUE;
         }
 
         // text
-        if ($pos=strpos($tag, '<')!==false) {
+        if ($pos=strpos($tag, '<')!==FALSE) {
             $tag = '<' . substr($tag, 0, -1);
             $node->_[HDOM_INFO_TEXT] = $tag;
-            $this->link_nodes($node, false);
+            $this->link_nodes($node, FALSE);
             $this->char = $this->doc[--$this->pos]; // prev
-            return true;
+            return TRUE;
         }
 
         if (!preg_match("/^[\w-:]+$/", $tag)) {
             $node->_[HDOM_INFO_TEXT] = '<' . $tag . $this->copy_until('<>');
             if ($this->char==='<') {
-                $this->link_nodes($node, false);
-                return true;
+                $this->link_nodes($node, FALSE);
+                return TRUE;
             }
 
             if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>';
-            $this->link_nodes($node, false);
+            $this->link_nodes($node, FALSE);
             $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-            return true;
+            return TRUE;
         }
 
         // begin tag
@@ -765,8 +765,8 @@ protected function read_tag() {
                 $node->_[HDOM_INFO_END] = 0;
                 $node->_[HDOM_INFO_TEXT] = '<'.$tag . $space[0] . $name;
                 $node->tag = 'text';
-                $this->link_nodes($node, false);
-                return true;
+                $this->link_nodes($node, FALSE);
+                return TRUE;
             }
 
             // handle mismatch '<'
@@ -778,8 +778,8 @@ protected function read_tag() {
                 $node->_[HDOM_INFO_TEXT] = substr($this->doc, $begin_tag_pos, $this->pos-$begin_tag_pos-1);
                 $this->pos -= 2;
                 $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-                $this->link_nodes($node, false);
-                return true;
+                $this->link_nodes($node, FALSE);
+                return TRUE;
             }
 
             if ($name!=='/' && $name!=='') {
@@ -793,7 +793,7 @@ protected function read_tag() {
                 else {
                     //no value attr: nowrap, checked selected...
                     $node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO;
-                    $node->attr[$name] = true;
+                    $node->attr[$name] = TRUE;
                     if ($this->char!='>') $this->char = $this->doc[--$this->pos]; // prev
                 }
                 $node->_[HDOM_INFO_SPACE][] = $space;
@@ -803,7 +803,7 @@ protected function read_tag() {
                 break;
         } while($this->char!=='>' && $this->char!=='/');
 
-        $this->link_nodes($node, true);
+        $this->link_nodes($node, TRUE);
         $node->_[HDOM_INFO_ENDSPACE] = $space[0];
 
         // check self closing
@@ -816,7 +816,7 @@ protected function read_tag() {
             if (!isset($this->self_closing_tags[strtolower($node->tag)])) $this->parent = $node;
         }
         $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-        return true;
+        return TRUE;
     }
 
     // parse attributes
@@ -854,9 +854,9 @@ protected function as_text_node($tag) {
         $node = new simple_html_dom_node($this);
         ++$this->cursor;
         $node->_[HDOM_INFO_TEXT] = '</' . $tag . '>';
-        $this->link_nodes($node, false);
+        $this->link_nodes($node, FALSE);
         $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-        return true;
+        return TRUE;
     }
 
     protected function skip($chars) {
@@ -884,7 +884,7 @@ protected function copy_until($chars) {
     protected function copy_until_char($char) {
         if ($this->char===null) return '';
 
-        if (($pos = strpos($this->doc, $char, $this->pos))===false) {
+        if (($pos = strpos($this->doc, $char, $this->pos))===FALSE) {
             $ret = substr($this->doc, $this->pos, $this->size-$this->pos);
             $this->char = null;
             $this->pos = $this->size;
@@ -903,7 +903,7 @@ protected function copy_until_char_escape($char) {
 
         $start = $this->pos;
         while(1) {
-            if (($pos = strpos($this->doc, $char, $start))===false) {
+            if (($pos = strpos($this->doc, $char, $start))===FALSE) {
                 $ret = substr($this->doc, $this->pos, $this->size-$this->pos);
                 $this->char = null;
                 $this->pos = $this->size;
@@ -925,7 +925,7 @@ protected function copy_until_char_escape($char) {
     }
 
     // remove noise from html content
-    protected function remove_noise($pattern, $remove_tag=false) {
+    protected function remove_noise($pattern, $remove_tag=FALSE) {
         $count = preg_match_all($pattern, $this->doc, $matches, PREG_SET_ORDER|PREG_OFFSET_CAPTURE);
 
         for ($i=$count-1; $i>-1; --$i) {
@@ -942,7 +942,7 @@ protected function remove_noise($pattern, $remove_tag=false) {
 
     // restore noise to html content
     function restore_noise($text) {
-        while(($pos=strpos($text, '___noise___'))!==false) {
+        while(($pos=strpos($text, '___noise___'))!==FALSE) {
             $key = '___noise___'.$text[$pos+11].$text[$pos+12].$text[$pos+13];
             if (isset($this->noise[$key]))
                 $text = substr($text, 0, $pos).$this->noise[$key].substr($text, $pos+14);
@@ -970,6 +970,6 @@ function getElementById($id) {return $this->find("#$id", 0);}
     function getElementsById($id, $idx=null) {return $this->find("#$id", $idx);}
     function getElementByTagName($name) {return $this->find($name, 0);}
     function getElementsByTagName($name, $idx=-1) {return $this->find($name, $idx);}
-    function loadFile() {$args = func_get_args();$this->load(call_user_func_array('file_get_contents', $args), true);}
+    function loadFile() {$args = func_get_args();$this->load(call_user_func_array('file_get_contents', $args), TRUE);}
 }
 ?>
\ No newline at end of file
diff --git a/includes/classes/class.xml.php b/includes/classes/class.xml.php
new file mode 100644
index 0000000..01074da
--- /dev/null
+++ b/includes/classes/class.xml.php
@@ -0,0 +1,93 @@
+<?php
+
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2012
+ */
+
+if(!defined('INSIDE')){ die(header ( 'location:../../' ));}
+
+class xml
+{
+	// INSTANCIA DE simplexml
+	private $instance_xml = NULL;
+	private $sheet = NULL;
+
+	// ABRE LA HOJA y LA LEE
+	public function __construct ( $sheet )
+	{
+		$this->sheet	=	$sheet; // PASAMOS LA HOJA A TOMAR
+
+		// SETEAMOS EL DIRECTORIO BASE DE LECTURA.
+		$path			=	"http://" . $_SERVER['HTTP_HOST'];
+		$path		   .=	preg_replace ( '@/+$@' , '' , dirname ( $_SERVER['SCRIPT_NAME'] ) ) . '/includes/xml/';
+		$path			=	str_replace ( array ( '/adm' , '/install' ) , '' , $path );
+
+		// CHECK  instance_xml EXISTENCE
+		if ( !$this->instance_xml )
+		{
+			// START DOM
+			$document = new DOMDocument("1.0");
+			$document->load ( $path . $this->sheet );
+
+			// ERROR
+			if ( $document == FALSE )
+			{
+				die ( 'Error nº1: Problems loading the page content.' );
+			}
+
+			// CREA UN OBJETO DOM
+			$this->instance_xml = $document;
+		}
+	}
+
+	// OBTIENE LOS ELEMENTOS DE ACUERDO A LA ETIQUETA PASADA
+	private function get_elements ( $element )
+	{
+		return $this->instance_xml->getElementsByTagName( $element );
+	}
+
+	// RETORNA LAS CONFIGURACIONES
+	public function get_configs ()
+	{
+		$configs = $this->get_elements ( 'config' );
+
+		foreach ( $configs as $config )
+		{
+			$name					=	$config->getElementsByTagName( "name" )->item(0)->nodeValue;
+			$value					=	$config->getElementsByTagName( "value" )->item(0)->nodeValue;
+			$config_array[$name]	=	$value;
+		}
+
+		return $config_array;
+	}
+
+	// RETORNA UNA CONFIGURACION ESPECIFICA
+	public function get_config ( $config_name )
+	{
+		$xpath				=	new DOMXPath ( $this->instance_xml );
+		$result				=	$xpath->query ( '/configurations/config[name="' . $config_name . '"]/value' );
+		return $result->item(0)->nodeValue;
+	}
+
+	// ESCRIBE LA CONFIGURACION
+	public function write_config ( $config_name , $config_value )
+	{
+		$xpath				=	new DOMXPath ( $this->instance_xml );
+		$result				=	$xpath->query ( '/configurations/config[name="' . $config_name . '"]/value' );
+		$result->item(0)
+				->nodeValue	= $config_value;
+
+	//	header ( "Content-type: text/xml" );
+		if ( $this->instance_xml->save ( XGP_ROOT . "includes/xml/" . $this->sheet ) )
+		{
+			return TRUE;
+		}
+		else
+		{
+			return FALSE;
+		}
+	}
+}
+?>
\ No newline at end of file
diff --git a/styles/skins/New-Year!/images/index.html b/includes/classes/index.html
similarity index 100%
rename from styles/skins/New-Year!/images/index.html
rename to includes/classes/index.html
diff --git a/includes/constants.php b/includes/constants.php
index 56dc55c..ed2c72e 100644
--- a/includes/constants.php
+++ b/includes/constants.php
@@ -1,81 +1,74 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if ( !defined('INSIDE') ) die(header("location:../"));
 
-	//TEMPLATES DEFAULT SETTINGS
-	define('DEFAULT_SKINPATH' 		 , 'styles/skins/evolution/');
-	define('TEMPLATE_DIR'     		 , 'styles/templates/');
+	// VERSION
+	define('SYSTEM_VERSION' , '2.10.0');
+
+	// TEMPLATES DEFAULT SETTINGS
+	define('SKIN_PATH'					, 'styles/skins/');
+	define('TEMPLATE_DIR'     		 	, 'styles/views/');
+	define('DEFAULT_SKINPATH' 		 	, 'styles/skins/xgproyect/');
 
 	// ADMINISTRATOR EMAIL AND GAME URL - THIS DATA IS REQUESTED BY REG.PHP
-	define('ADMINEMAIL'               , "info@xgproyect.com");
-	define('GAMEURL'                  , "http://".$_SERVER['HTTP_HOST']."/");
+	define('ADMINEMAIL'               	, "info@xgproyect.com");
+	define('GAMEURL'                  	, "http://".$_SERVER['HTTP_HOST']."/");
 
 	// UNIVERSE DATA, GALAXY, SYSTEMS AND PLANETS || DEFAULT 9-499-15 RESPECTIVELY
-	define('MAX_GALAXY_IN_WORLD'      ,   9);
-	define('MAX_SYSTEM_IN_GALAXY'     , 499);
-	define('MAX_PLANET_IN_SYSTEM'     ,  15);
+	define('MAX_GALAXY_IN_WORLD'      	,       9);
+	define('MAX_SYSTEM_IN_GALAXY'     	,     499);
+	define('MAX_PLANET_IN_SYSTEM'     	,      15);
 
 	// NUMBER OF COLUMNS FOR SPY REPORTS
-	define('SPY_REPORT_ROW'           , 3);
+	define('SPY_REPORT_ROW'           	,       3);
 
 	// FIELDS FOR EACH LEVEL OF THE LUNAR BASE
-	define('FIELDS_BY_MOONBASIS_LEVEL', 3);
+	define('FIELDS_BY_MOONBASIS_LEVEL'	,       3);
 
 	// FIELDS FOR EACH LEVEL OF THE TERRAFORMER
-	define('FIELDS_BY_TERRAFORMER'	  , 5);
+	define('FIELDS_BY_TERRAFORMER'	  	,       5);
 
 	// NUMBER OF PLANETS THAT MAY HAVE A PLAYER
-	define('MAX_PLAYER_PLANETS'       , 9);
+	define('MAX_PLAYER_PLANETS'       	,       9);
 
 	// NUMBER OF BUILDINGS THAT CAN GO IN THE CONSTRUCTION QUEUE
-	define('MAX_BUILDING_QUEUE_SIZE'  , 5);
+	define('MAX_BUILDING_QUEUE_SIZE'  	,       5);
 
 	// NUMBER OF SHIPS THAT CAN BUILD FOR ONCE
-	define('MAX_FLEET_OR_DEFS_PER_ROW', 1000000);
+	define('MAX_FLEET_OR_DEFS_PER_ROW'	, 1000000);
 
 	// PERCENTAGE OF RESOURCES THAT CAN BE OVER STORED
 	// 1.0 TO 100% - 1.1% FOR 110 AND SO ON
-	define('MAX_OVERFLOW'             , 1);
+	define('MAX_OVERFLOW'             	,       1);
+
+	//PLANET SIZE MULTIPLER
+	define('PLANETSIZE_MULTIPLER'		,       1);
 
 	// INITIAL RESOURCE OF NEW PLANETS
-	define('BASE_STORAGE_SIZE'        , 500000);
-	define('BUILD_METAL'              ,    1000);
-	define('BUILD_CRISTAL'            ,    1000);
-	define('BUILD_DEUTERIUM'          ,    1000);
+	define('BASE_STORAGE_SIZE'        	,  100000);
+	define('BUILD_METAL'              	,     500);
+	define('BUILD_CRISTAL'            	,     500);
+	define('BUILD_DEUTERIUM'          	, 	    0);
 
 	// OFFICIERS DEFAULT VALUES
-	define('COMMANDANT'				  ,      3);
-	define('AMIRAL'				  	  ,   0.05);
-	define('ESPION'				  	  ,      5);
-	define('CONSTRUCTEUR'             ,    0.1);
-	define('SCIENTIFIQUE'			  ,    0.1);
-	define('GENERAL'			      ,   0.10);
-	define('DEFENSEUR'			  	  ,   0.25);
-	define('TECHNOCRATE'			  ,   0.05);
-	define('STOCKEUR'				  ,    0.5);
-	define('GEOLOGUE'				  ,   0.05);
-	define('INGENIEUR'				  ,   0.05);
+	define('AMIRAL'				  		,       2);
+	define('ENGINEER_DEFENSE'			,       2);
+	define('ENGINEER_ENERGY'			,     0.5);
+	define('GEOLOGUE'				  	,     0.1);
+	define('TECHNOCRATE_SPY'			,       2);
+	define('TECHNOCRATE_SPEED'			,    0.25);
 
 	// TRADER DARK MATTER DEFAULT VALUE
-	define('TR_DARK_MATTER'			  ,   10000);
+	define('TR_DARK_MATTER'			  	,    3500);
+
+	// INVISIBLES DEBRIS
+	define('DEBRIS_LIFE_TIME'      		,  604800);
+	define('DEBRIS_MIN_VISIBLE_SIZE'	, 	  300);
 
 ?>
\ No newline at end of file
diff --git a/includes/functions/CheckPlanetBuildingQueue.php b/includes/functions/CheckPlanetBuildingQueue.php
index 69c037a..ac0889e 100644
--- a/includes/functions/CheckPlanetBuildingQueue.php
+++ b/includes/functions/CheckPlanetBuildingQueue.php
@@ -1,23 +1,10 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
@@ -25,7 +12,7 @@ function CheckPlanetBuildingQueue ( &$CurrentPlanet, &$CurrentUser )
 	{
 		global $resource;
 
-		$RetValue     = false;
+		$RetValue     = FALSE;
 		if ($CurrentPlanet['b_building_id'] != 0)
 		{
 			$CurrentQueue  = $CurrentPlanet['b_building_id'];
@@ -42,13 +29,13 @@ function CheckPlanetBuildingQueue ( &$CurrentPlanet, &$CurrentUser )
 			array_shift ( $QueueArray );
 
 			if ($BuildMode == 'destroy')
-				$ForDestroy = true;
+				$ForDestroy = TRUE;
 			else
-				$ForDestroy = false;
+				$ForDestroy = FALSE;
 
 			if ($BuildEndTime <= time())
 			{
-				$Needed                        = GetBuildingPrice ($CurrentUser, $CurrentPlanet, $Element, true, $ForDestroy);
+				$Needed                        = GetBuildingPrice ($CurrentUser, $CurrentPlanet, $Element, TRUE, $ForDestroy);
 				$Units                         = $Needed['metal'] + $Needed['crystal'] + $Needed['deuterium'];
 
 				$current = intval($CurrentPlanet['field_current']);
@@ -64,7 +51,7 @@ function CheckPlanetBuildingQueue ( &$CurrentPlanet, &$CurrentUser )
 					}
 					elseif ($Element != 0)
 					{
-						if ($ForDestroy == false)
+						if ($ForDestroy == FALSE)
 						{
 							$current += 1;
 							$CurrentPlanet[$resource[$Element]]++;
@@ -78,7 +65,7 @@ function CheckPlanetBuildingQueue ( &$CurrentPlanet, &$CurrentUser )
 				}
 				elseif ($CurrentPlanet['planet_type'] == 1)
 				{
-					if ($ForDestroy == false)
+					if ($ForDestroy == FALSE)
 					{
 						$current += 1;
 						$CurrentPlanet[$resource[$Element]]++;
@@ -96,6 +83,7 @@ function CheckPlanetBuildingQueue ( &$CurrentPlanet, &$CurrentUser )
 
 				$CurrentPlanet['b_building']    = 0;
 				$CurrentPlanet['b_building_id'] = $NewQueue;
+
 				$CurrentPlanet['field_current'] = $current;
 				$CurrentPlanet['field_max']     = $max;
 
@@ -109,10 +97,10 @@ function CheckPlanetBuildingQueue ( &$CurrentPlanet, &$CurrentUser )
 				$QryUpdatePlanet .= "`id` = '" . $CurrentPlanet['id'] . "';";
 				doquery( $QryUpdatePlanet, 'planets');
 
-				$RetValue = true;
+				$RetValue = TRUE;
 			}
 			else
-				$RetValue = false;
+				$RetValue = FALSE;
 		}
 		else
 		{
@@ -126,7 +114,7 @@ function CheckPlanetBuildingQueue ( &$CurrentPlanet, &$CurrentUser )
 			$QryUpdatePlanet .= "`id` = '" . $CurrentPlanet['id'] . "';";
 			doquery( $QryUpdatePlanet, 'planets');
 
-			$RetValue = false;
+			$RetValue = FALSE;
 		}
 		return $RetValue;
 	}
diff --git a/includes/functions/CheckPlanetUsedFields.php b/includes/functions/CheckPlanetUsedFields.php
index 17c7e0a..a0712ab 100644
--- a/includes/functions/CheckPlanetUsedFields.php
+++ b/includes/functions/CheckPlanetUsedFields.php
@@ -1,23 +1,10 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
diff --git a/includes/functions/CreateOneMoonRecord.php b/includes/functions/CreateOneMoonRecord.php
index 461934f..4d47503 100644
--- a/includes/functions/CreateOneMoonRecord.php
+++ b/includes/functions/CreateOneMoonRecord.php
@@ -1,23 +1,10 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
@@ -32,20 +19,21 @@ function CreateOneMoonRecord ( $Galaxy, $System, $Planet, $Owner, $MoonID, $Moon
 	$QryGetMoonPlanetData .= "`galaxy` = '". $Galaxy ."' AND ";
 	$QryGetMoonPlanetData .= "`system` = '". $System ."' AND ";
 	$QryGetMoonPlanetData .= "`planet` = '". $Planet ."';";
-	$MoonPlanet = doquery ( $QryGetMoonPlanetData, 'planets', true);
+	$MoonPlanet = doquery ( $QryGetMoonPlanetData, 'planets', TRUE);
 
 	$QryGetMoonGalaxyData  = "SELECT * FROM {{table}} ";
 	$QryGetMoonGalaxyData .= "WHERE ";
 	$QryGetMoonGalaxyData .= "`galaxy` = '". $Galaxy ."' AND ";
 	$QryGetMoonGalaxyData .= "`system` = '". $System ."' AND ";
 	$QryGetMoonGalaxyData .= "`planet` = '". $Planet ."';";
-	$MoonGalaxy = doquery ( $QryGetMoonGalaxyData, 'galaxy', true);
+	$MoonGalaxy = doquery ( $QryGetMoonGalaxyData, 'galaxy', TRUE);
 
 	if ($MoonGalaxy['id_luna'] == 0)
 	{
 		if ($MoonPlanet['id'] != 0)
 		{
 			$SizeMin                = 2000 + ( $Chance * 100 );
+
 			$SizeMax                = 6000 + ( $Chance * 200 );
 
 			$PlanetName             = $MoonPlanet['name'];
@@ -84,7 +72,7 @@ function CreateOneMoonRecord ( $Galaxy, $System, $Planet, $Owner, $MoonID, $Moon
 			$QryGetMoonIdFromPlanet .= "`system` = '".  $System ."' AND ";
 			$QryGetMoonIdFromPlanet .= "`planet` = '".  $Planet ."' AND ";
 			$QryGetMoonIdFromPlanet .= "`planet_type` = '3';";
-			$lunarow = doquery( $QryGetMoonIdFromPlanet , 'planets', true);
+			$lunarow = doquery( $QryGetMoonIdFromPlanet , 'planets', TRUE);
 
 			$QryUpdateMoonInGalaxy  = "UPDATE {{table}} SET ";
 			$QryUpdateMoonInGalaxy .= "`id_luna` = '". $lunarow['id'] ."', ";
diff --git a/includes/functions/CreateOnePlanetRecord.php b/includes/functions/CreateOnePlanetRecord.php
index 0134e17..d3fcb98 100644
--- a/includes/functions/CreateOnePlanetRecord.php
+++ b/includes/functions/CreateOnePlanetRecord.php
@@ -1,210 +1,201 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-if(!defined('INSIDE')){ die(header("location:../../"));}
-
-	function PlanetSizeRandomiser ($Position, $HomeWorld = false)
-	{
-		global $game_config, $user;
-
-		if (!$HomeWorld)
-		{
-			$ClassicBase      = 163;
-			$SettingSize      = $game_config['initial_fields'];
-			$PlanetRatio      = floor ( ($ClassicBase / $SettingSize) * 10000 ) / 100;
-			$RandomMin        = array (  140,  150,  155, 200, 195, 180, 215, 220, 225, 175, 180, 185, 160, 140, 150);
-			$RandomMax        = array (  290,  295,  295, 440, 440, 430, 380, 380, 390, 325, 320, 330, 360, 500, 350);
-			$CalculMin        = floor ( $RandomMin[$Position - 1] + ( $RandomMin[$Position - 1] * $PlanetRatio ) / 100 );
-			$CalculMax        = floor ( $RandomMax[$Position - 1] + ( $RandomMax[$Position - 1] * $PlanetRatio ) / 100 );
-			$RandomSize       = mt_rand($CalculMin, $CalculMax);
-			$MaxAddon         = mt_rand(0, 110);
-			$MinAddon         = mt_rand(0, 100);
-			$Addon            = ($MaxAddon - $MinAddon);
-			$PlanetFields     = ($RandomSize + $Addon);
-		}
-		else
-		{
-			$PlanetFields     = $game_config['initial_fields'];
-		}
-		$PlanetSize           = ($PlanetFields ^ (14 / 1.5)) * 75;
-
-		$return['diameter']   = $PlanetSize;
-		$return['field_max']  = $PlanetFields;
-		return $return;
-	}
-
-	function CreateOnePlanetRecord($Galaxy, $System, $Position, $PlanetOwnerID, $PlanetName = '', $HomeWorld = false)
-	{
-		global $lang;
-
-		$QrySelectPlanet  = "SELECT	`id` ";
-		$QrySelectPlanet .= "FROM {{table}} ";
-		$QrySelectPlanet .= "WHERE ";
-		$QrySelectPlanet .= "`galaxy` = '". $Galaxy ."' AND ";
-		$QrySelectPlanet .= "`system` = '". $System ."' AND ";
-		$QrySelectPlanet .= "`planet` = '". $Position ."';";
-		$PlanetExist = doquery( $QrySelectPlanet, 'planets', true);
-
-		if (!$PlanetExist)
-		{
-			$planet                      = PlanetSizeRandomiser ($Position, $HomeWorld);
-			$planet['diameter']          = ($planet['field_max'] ^ (14 / 1.5)) * 75 ;
-			$planet['metal']             = BUILD_METAL;
-			$planet['crystal']           = BUILD_CRISTAL;
-			$planet['deuterium']         = BUILD_DEUTERIUM;
-			$planet['metal_perhour']     = $game_config['metal_basic_income'];
-			$planet['crystal_perhour']   = $game_config['crystal_basic_income'];
-			$planet['deuterium_perhour'] = $game_config['deuterium_basic_income'];
-			$planet['metal_max']         = BASE_STORAGE_SIZE;
-			$planet['crystal_max']       = BASE_STORAGE_SIZE;
-			$planet['deuterium_max']     = BASE_STORAGE_SIZE;
-
-			// Posistion  1 -  3: 80% entre  40 et  70 Cases (  55+ / -15 )
-			// Posistion  4 -  6: 80% entre 120 et 310 Cases ( 215+ / -95 )
-			// Posistion  7 -  9: 80% entre 105 et 195 Cases ( 150+ / -45 )
-			// Posistion 10 - 12: 80% entre  75 et 125 Cases ( 100+ / -25 )
-			// Posistion 13 - 15: 80% entre  60 et 190 Cases ( 125+ / -65 )
-
-			$planet['galaxy'] = $Galaxy;
-			$planet['system'] = $System;
-			$planet['planet'] = $Position;
-
-			if ($Position == 1 || $Position == 2 || $Position == 3) {
-				$PlanetType         = array('trocken');
-				$PlanetClass        = array('planet');
-				$PlanetDesign       = array('01', '02', '03', '04', '05', '06', '07', '08', '09', '10');
-				$planet['temp_min'] = rand(0, 100);
-				$planet['temp_max'] = $planet['temp_min'] + 40;
-			} elseif ($Position == 4 || $Position == 5 || $Position == 6) {
-				$PlanetType         = array('dschjungel');
-				$PlanetClass        = array('planet');
-				$PlanetDesign       = array('01', '02', '03', '04', '05', '06', '07', '08', '09', '10');
-				$planet['temp_min'] = rand(-25, 75);
-				$planet['temp_max'] = $planet['temp_min'] + 40;
-			} elseif ($Position == 7 || $Position == 8 || $Position == 9) {
-				$PlanetType         = array('normaltemp');
-				$PlanetClass        = array('planet');
-				$PlanetDesign       = array('01', '02', '03', '04', '05', '06', '07');
-				$planet['temp_min'] = rand(-50, 50);
-				$planet['temp_max'] = $planet['temp_min'] + 40;
-			} elseif ($Position == 10 || $Position == 11 || $Position == 12) {
-				$PlanetType         = array('wasser');
-				$PlanetClass        = array('planet');
-				$PlanetDesign       = array('01', '02', '03', '04', '05', '06', '07', '08', '09');
-				$planet['temp_min'] = rand(-75, 25);
-				$planet['temp_max'] = $planet['temp_min'] + 40;
-			} elseif ($Position == 13 || $Position == 14 || $Position == 15) {
-				$PlanetType         = array('eis');
-				$PlanetClass        = array('planet');
-				$PlanetDesign       = array('01', '02', '03', '04', '05', '06', '07', '08', '09', '10');
-				$planet['temp_min'] = rand(-100, 10);
-				$planet['temp_max'] = $planet['temp_min'] + 40;
-			} else {
-				$PlanetType         = array('dschjungel', 'gas', 'normaltemp', 'trocken', 'wasser', 'wuesten', 'eis');
-				$PlanetClass        = array('planet');
-				$PlanetDesign       = array('01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '00',);
-				$planet['temp_min'] = rand(-120, 10);
-				$planet['temp_max'] = $planet['temp_min'] + 40;
-			}
-
-			$planet['image']       = $PlanetType[ rand( 0, count( $PlanetType ) -1 ) ];
-			$planet['image']      .= $PlanetClass[ rand( 0, count( $PlanetClass ) - 1 ) ];
-			$planet['image']      .= $PlanetDesign[ rand( 0, count( $PlanetDesign ) - 1 ) ];
-			$planet['planet_type'] = 1;
-			$planet['id_owner']    = $PlanetOwnerID;
-			$planet['last_update'] = time();
-			$planet['name']        = ($PlanetName == '') ? $lang['sys_colo_defaultname'] : $PlanetName;
-
-			$QryInsertPlanet  = "INSERT INTO {{table}} SET ";
-
-			if($HomeWorld == false)
-				$QryInsertPlanet .= "`name` = '".$lang['fcp_colony']."', ";
-
-			$QryInsertPlanet .= "`id_owner` = '".          $planet['id_owner']          ."', ";
-			$QryInsertPlanet .= "`id_level` = '".          $user['authlevel']           ."', ";
-			$QryInsertPlanet .= "`galaxy` = '".            $planet['galaxy']            ."', ";
-			$QryInsertPlanet .= "`system` = '".            $planet['system']            ."', ";
-			$QryInsertPlanet .= "`planet` = '".            $planet['planet']            ."', ";
-			$QryInsertPlanet .= "`last_update` = '".       $planet['last_update']       ."', ";
-			$QryInsertPlanet .= "`planet_type` = '".       $planet['planet_type']       ."', ";
-			$QryInsertPlanet .= "`image` = '".             $planet['image']             ."', ";
-			$QryInsertPlanet .= "`diameter` = '".          $planet['diameter']          ."', ";
-			$QryInsertPlanet .= "`field_max` = '".         $planet['field_max']         ."', ";
-			$QryInsertPlanet .= "`temp_min` = '".          $planet['temp_min']          ."', ";
-			$QryInsertPlanet .= "`temp_max` = '".          $planet['temp_max']          ."', ";
-			$QryInsertPlanet .= "`metal` = '".             $planet['metal']             ."', ";
-			$QryInsertPlanet .= "`metal_perhour` = '".     $planet['metal_perhour']     ."', ";
-			$QryInsertPlanet .= "`metal_max` = '".         $planet['metal_max']         ."', ";
-			$QryInsertPlanet .= "`crystal` = '".           $planet['crystal']           ."', ";
-			$QryInsertPlanet .= "`crystal_perhour` = '".   $planet['crystal_perhour']   ."', ";
-			$QryInsertPlanet .= "`crystal_max` = '".       $planet['crystal_max']       ."', ";
-			$QryInsertPlanet .= "`deuterium` = '".         $planet['deuterium']         ."', ";
-			$QryInsertPlanet .= "`deuterium_perhour` = '". $planet['deuterium_perhour'] ."', ";
-			$QryInsertPlanet .= "`deuterium_max` = '".     $planet['deuterium_max']     ."';";
-			doquery( $QryInsertPlanet, 'planets');
-
-			$QrySelectPlanet  = "SELECT `id` ";
-			$QrySelectPlanet .= "FROM {{table}} ";
-			$QrySelectPlanet .= "WHERE ";
-			$QrySelectPlanet .= "`galaxy` = '".   $planet['galaxy']   ."' AND ";
-			$QrySelectPlanet .= "`system` = '".   $planet['system']   ."' AND ";
-			$QrySelectPlanet .= "`planet` = '".   $planet['planet']   ."' AND ";
-			$QrySelectPlanet .= "`id_owner` = '". $planet['id_owner'] ."';";
-			$GetPlanetID      = doquery( $QrySelectPlanet , 'planets', true);
-
-			$QrySelectGalaxy  = "SELECT * ";
-			$QrySelectGalaxy .= "FROM {{table}} ";
-			$QrySelectGalaxy .= "WHERE ";
-			$QrySelectGalaxy .= "`galaxy` = '". $planet['galaxy'] ."' AND ";
-			$QrySelectGalaxy .= "`system` = '". $planet['system'] ."' AND ";
-			$QrySelectGalaxy .= "`planet` = '". $planet['planet'] ."';";
-			$GetGalaxyID      = doquery( $QrySelectGalaxy, 'galaxy', true);
-
-			if ($GetGalaxyID)
-			{
-				$QryUpdateGalaxy  = "UPDATE {{table}} SET ";
-				$QryUpdateGalaxy .= "`id_planet` = '". $GetPlanetID['id'] ."' ";
-				$QryUpdateGalaxy .= "WHERE ";
-				$QryUpdateGalaxy .= "`galaxy` = '". $planet['galaxy'] ."' AND ";
-				$QryUpdateGalaxy .= "`system` = '". $planet['system'] ."' AND ";
-				$QryUpdateGalaxy .= "`planet` = '". $planet['planet'] ."';";
-				doquery( $QryUpdateGalaxy, 'galaxy');
-			}
-			else
-			{
-				$QryInsertGalaxy  = "INSERT INTO {{table}} SET ";
-				$QryInsertGalaxy .= "`galaxy` = '". $planet['galaxy'] ."', ";
-				$QryInsertGalaxy .= "`system` = '". $planet['system'] ."', ";
-				$QryInsertGalaxy .= "`planet` = '". $planet['planet'] ."', ";
-				$QryInsertGalaxy .= "`id_planet` = '". $GetPlanetID['id'] ."';";
-				doquery( $QryInsertGalaxy, 'galaxy');
-			}
-
-			$RetValue = true;
-		}
-		else
-		{
-			$RetValue = false;
-		}
-
-		return $RetValue;
-	}
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+
+if(!defined('INSIDE')){die(header("location:../../"));}
+
+function PlanetSizeRandomiser($Position,$HomeWorld = FALSE)
+{
+   global $user;
+   if(!$HomeWorld)
+   {
+      // linear distribution probability with right average, information from http://www.osite.it/index.php?zone=guide=colonizzare
+      $RandomMin = array(37,43,50,65,47,34,97,105,110,65,71,71,30,14,22);
+      $RandomMax = array(91,93,100,283,287,276,192,195,207,136,127,143,190,154,171);
+      $PlanetFields = mt_rand($RandomMin[$Position - 1],$RandomMax[$Position - 1]);
+      $PlanetFields *= PLANETSIZE_MULTIPLER;
+   }
+   else
+   {
+      $PlanetFields = read_config ( 'initial_fields' );
+   }
+   $PlanetSize = floor(sqrt($PlanetFields) * 1000);
+   $return['diameter'] = $PlanetSize;
+   $return['field_max'] = $PlanetFields;
+   return $return;
+}
+
+function CreateOnePlanetRecord($Galaxy,$System,$Position,$PlanetOwnerID,$PlanetName = '',$HomeWorld = FALSE)
+{
+   global $lang;
+
+   $QrySelectPlanet = "SELECT	`id` ";
+   $QrySelectPlanet .= "FROM {{table}} ";
+   $QrySelectPlanet .= "WHERE ";
+   $QrySelectPlanet .= "`galaxy` = '" . $Galaxy . "' AND ";
+   $QrySelectPlanet .= "`system` = '" . $System . "' AND ";
+   $QrySelectPlanet .= "`planet` = '" . $Position . "';";
+   $PlanetExist = doquery($QrySelectPlanet,'planets',TRUE);
+
+   if(!$PlanetExist)
+   {
+      $planet = PlanetSizeRandomiser($Position,$HomeWorld);
+      $planet['diameter'] = ($planet['field_max'] ^ (14 / 1.5)) * 75;
+      $planet['metal'] = BUILD_METAL;
+      $planet['crystal'] = BUILD_CRISTAL;
+      $planet['deuterium'] = BUILD_DEUTERIUM;
+      $planet['metal_perhour'] = read_config ( 'metal_basic_income' );
+      $planet['crystal_perhour'] = read_config ( 'crystal_basic_income' );
+      $planet['deuterium_perhour'] = read_config ( 'deuterium_basic_income' );
+      $planet['metal_max'] = BASE_STORAGE_SIZE;
+      $planet['crystal_max'] = BASE_STORAGE_SIZE;
+      $planet['deuterium_max'] = BASE_STORAGE_SIZE;
+
+      // Posistion  1 -  3: 80% entre  40 et  70 Cases (  55+ / -15 )
+      // Posistion  4 -  6: 80% entre 120 et 310 Cases ( 215+ / -95 )
+      // Posistion  7 -  9: 80% entre 105 et 195 Cases ( 150+ / -45 )
+      // Posistion 10 - 12: 80% entre  75 et 125 Cases ( 100+ / -25 )
+      // Posistion 13 - 15: 80% entre  60 et 190 Cases ( 125+ / -65 )
+
+
+      $planet['galaxy'] = $Galaxy;
+      $planet['system'] = $System;
+      $planet['planet'] = $Position;
+
+      if($Position == 1 || $Position == 2 || $Position == 3)
+      {
+         $PlanetType = array('trocken');
+         $PlanetClass = array('planet');
+         $PlanetDesign = array('01','02','03','04','05','06','07','08','09','10');
+         $planet['temp_min'] = rand(0,100);
+         $planet['temp_max'] = $planet['temp_min'] + 40;
+      }
+      elseif($Position == 4 || $Position == 5 || $Position == 6)
+      {
+         $PlanetType = array('dschjungel');
+         $PlanetClass = array('planet');
+         $PlanetDesign = array('01','02','03','04','05','06','07','08','09','10');
+         $planet['temp_min'] = rand(-25,75);
+         $planet['temp_max'] = $planet['temp_min'] + 40;
+      }
+      elseif($Position == 7 || $Position == 8 || $Position == 9)
+      {
+         $PlanetType = array('normaltemp');
+         $PlanetClass = array('planet');
+         $PlanetDesign = array('01','02','03','04','05','06','07');
+         $planet['temp_min'] = rand(-50,50);
+         $planet['temp_max'] = $planet['temp_min'] + 40;
+      }
+      elseif($Position == 10 || $Position == 11 || $Position == 12)
+      {
+         $PlanetType = array('wasser');
+         $PlanetClass = array('planet');
+         $PlanetDesign = array('01','02','03','04','05','06','07','08','09');
+         $planet['temp_min'] = rand(-75,25);
+         $planet['temp_max'] = $planet['temp_min'] + 40;
+      }
+      elseif($Position == 13 || $Position == 14 || $Position == 15)
+      {
+         $PlanetType = array('eis');
+         $PlanetClass = array('planet');
+         $PlanetDesign = array('01','02','03','04','05','06','07','08','09','10');
+         $planet['temp_min'] = rand(-100,10);
+         $planet['temp_max'] = $planet['temp_min'] + 40;
+      }
+      else
+      {
+         $PlanetType = array('dschjungel','gas','normaltemp','trocken','wasser','wuesten','eis');
+         $PlanetClass = array('planet');
+         $PlanetDesign = array('01','02','03','04','05','06','07','08','09','10','00');
+         $planet['temp_min'] = rand(-120,10);
+         $planet['temp_max'] = $planet['temp_min'] + 40;
+      }
+
+      $planet['image'] = $PlanetType[rand(0,count($PlanetType) - 1)];
+      $planet['image'] .= $PlanetClass[rand(0,count($PlanetClass) - 1)];
+      $planet['image'] .= $PlanetDesign[rand(0,count($PlanetDesign) - 1)];
+      $planet['planet_type'] = 1;
+      $planet['id_owner'] = $PlanetOwnerID;
+      $planet['last_update'] = time();
+      $planet['name'] = ($PlanetName == '') ? $lang['sys_colo_defaultname'] : $PlanetName;
+
+      $QryInsertPlanet = "INSERT INTO {{table}} SET ";
+
+      if($HomeWorld == FALSE)
+         $QryInsertPlanet .= "`name` = '" . $lang['fcp_colony'] . "', ";
+
+      $QryInsertPlanet .= "`id_owner` = '" . $planet['id_owner'] . "', ";
+      $QryInsertPlanet .= "`id_level` = '" . $user['authlevel'] . "', ";
+      $QryInsertPlanet .= "`galaxy` = '" . $planet['galaxy'] . "', ";
+      $QryInsertPlanet .= "`system` = '" . $planet['system'] . "', ";
+      $QryInsertPlanet .= "`planet` = '" . $planet['planet'] . "', ";
+      $QryInsertPlanet .= "`last_update` = '" . $planet['last_update'] . "', ";
+      $QryInsertPlanet .= "`planet_type` = '" . $planet['planet_type'] . "', ";
+      $QryInsertPlanet .= "`image` = '" . $planet['image'] . "', ";
+      $QryInsertPlanet .= "`diameter` = '" . $planet['diameter'] . "', ";
+      $QryInsertPlanet .= "`field_max` = '" . $planet['field_max'] . "', ";
+      $QryInsertPlanet .= "`temp_min` = '" . $planet['temp_min'] . "', ";
+      $QryInsertPlanet .= "`temp_max` = '" . $planet['temp_max'] . "', ";
+      $QryInsertPlanet .= "`metal` = '" . $planet['metal'] . "', ";
+      $QryInsertPlanet .= "`metal_perhour` = '" . $planet['metal_perhour'] . "', ";
+      $QryInsertPlanet .= "`metal_max` = '" . $planet['metal_max'] . "', ";
+      $QryInsertPlanet .= "`crystal` = '" . $planet['crystal'] . "', ";
+      $QryInsertPlanet .= "`crystal_perhour` = '" . $planet['crystal_perhour'] . "', ";
+      $QryInsertPlanet .= "`crystal_max` = '" . $planet['crystal_max'] . "', ";
+      $QryInsertPlanet .= "`deuterium` = '" . $planet['deuterium'] . "', ";
+      $QryInsertPlanet .= "`deuterium_perhour` = '" . $planet['deuterium_perhour'] . "', ";
+      $QryInsertPlanet .= "`deuterium_max` = '" . $planet['deuterium_max'] . "';";
+      doquery($QryInsertPlanet,'planets');
+
+      $QrySelectPlanet = "SELECT `id` ";
+      $QrySelectPlanet .= "FROM {{table}} ";
+      $QrySelectPlanet .= "WHERE ";
+      $QrySelectPlanet .= "`galaxy` = '" . $planet['galaxy'] . "' AND ";
+      $QrySelectPlanet .= "`system` = '" . $planet['system'] . "' AND ";
+      $QrySelectPlanet .= "`planet` = '" . $planet['planet'] . "' AND ";
+      $QrySelectPlanet .= "`id_owner` = '" . $planet['id_owner'] . "';";
+      $GetPlanetID = doquery($QrySelectPlanet,'planets',TRUE);
+
+      $QrySelectGalaxy = "SELECT * ";
+      $QrySelectGalaxy .= "FROM {{table}} ";
+      $QrySelectGalaxy .= "WHERE ";
+      $QrySelectGalaxy .= "`galaxy` = '" . $planet['galaxy'] . "' AND ";
+      $QrySelectGalaxy .= "`system` = '" . $planet['system'] . "' AND ";
+      $QrySelectGalaxy .= "`planet` = '" . $planet['planet'] . "';";
+      $GetGalaxyID = doquery($QrySelectGalaxy,'galaxy',TRUE);
+
+      if($GetGalaxyID)
+      {
+         $QryUpdateGalaxy = "UPDATE {{table}} SET ";
+         $QryUpdateGalaxy .= "`id_planet` = '" . $GetPlanetID['id'] . "' ";
+         $QryUpdateGalaxy .= "WHERE ";
+         $QryUpdateGalaxy .= "`galaxy` = '" . $planet['galaxy'] . "' AND ";
+         $QryUpdateGalaxy .= "`system` = '" . $planet['system'] . "' AND ";
+         $QryUpdateGalaxy .= "`planet` = '" . $planet['planet'] . "';";
+         doquery($QryUpdateGalaxy,'galaxy');
+      }
+      else
+      {
+         $QryInsertGalaxy = "INSERT INTO {{table}} SET ";
+         $QryInsertGalaxy .= "`galaxy` = '" . $planet['galaxy'] . "', ";
+         $QryInsertGalaxy .= "`system` = '" . $planet['system'] . "', ";
+         $QryInsertGalaxy .= "`planet` = '" . $planet['planet'] . "', ";
+         $QryInsertGalaxy .= "`id_planet` = '" . $GetPlanetID['id'] . "';";
+         doquery($QryInsertGalaxy,'galaxy');
+      }
+
+      $RetValue = TRUE;
+   }
+   else
+   {
+      $RetValue = FALSE;
+   }
+
+   return $RetValue;
+}
 ?>
\ No newline at end of file
diff --git a/includes/functions/DeleteSelectedUser.php b/includes/functions/DeleteSelectedUser.php
index 3d463db..1afe959 100644
--- a/includes/functions/DeleteSelectedUser.php
+++ b/includes/functions/DeleteSelectedUser.php
@@ -1,33 +1,20 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2010 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
 	function DeleteSelectedUser($UserID)
 	{
-		$TheUser = doquery ( "SELECT * FROM {{table}} WHERE `id` = '" . $UserID . "';", 'users', true );
+		$TheUser = doquery ( "SELECT * FROM {{table}} WHERE `id` = '" . $UserID . "';", 'users', TRUE );
 
 		if ( $TheUser['ally_id'] != 0 )
 		{
-			$TheAlly = doquery ( "SELECT * FROM {{table}} WHERE `id` = '" . $TheUser['ally_id'] . "';", 'alliance', true );
+			$TheAlly = doquery ( "SELECT * FROM {{table}} WHERE `id` = '" . $TheUser['ally_id'] . "';", 'alliance', TRUE );
 			$TheAlly['ally_members'] -= 1;
 
 			if ($TheAlly['ally_members'] > 0)
@@ -61,14 +48,15 @@ function DeleteSelectedUser($UserID)
 		doquery ( "DELETE FROM {{table}} WHERE `sender` = '" . $UserID . "';", 'buddy' );
 		doquery ( "DELETE FROM {{table}} WHERE `owner` = '" . $UserID . "';", 'buddy' );
 		doquery ( "DELETE FROM {{table}} WHERE `id` = '" . $UserID . "';", 'users' );
-		doquery ( "UPDATE `{{table}}` SET `config_value` = `config_value` - '1' WHERE `config_name` = 'users_amount' LIMIT 1 ;", "config" );
+
+		update_config ( 'users_amount' , read_config ( 'users_amount' ) - 1 );
 	}
 
 	function DeleteSelectedPlanet ($ID)
 	{
 		global $lang;
 
-		$QueryPlanet = doquery ("SELECT galaxy,planet,system,planet_type FROM {{table}} WHERE id = '".$ID."'", 'planets', true );
+		$QueryPlanet = doquery ("SELECT galaxy,planet,system,planet_type FROM {{table}} WHERE id = '".$ID."'", 'planets', TRUE );
 
 		if ($QueryPlanet['planet_type'] == '3')
 		{
diff --git a/includes/functions/GetBuildingPrice.php b/includes/functions/GetBuildingPrice.php
index fce0dfe..2b12a22 100644
--- a/includes/functions/GetBuildingPrice.php
+++ b/includes/functions/GetBuildingPrice.php
@@ -1,27 +1,14 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
-	function GetBuildingPrice ($CurrentUser, $CurrentPlanet, $Element, $Incremental = true, $ForDestroy = false)
+	function GetBuildingPrice ($CurrentUser, $CurrentPlanet, $Element, $Incremental = TRUE, $ForDestroy = FALSE)
 	{
 		global $pricelist, $resource;
 
@@ -36,7 +23,7 @@ function GetBuildingPrice ($CurrentUser, $CurrentPlanet, $Element, $Incremental
 			else
 				$cost[$ResType] = floor($pricelist[$Element][$ResType]);
 
-			if ($ForDestroy == true)
+			if ($ForDestroy == TRUE)
 			{
 				$cost[$ResType]  = floor($cost[$ResType]) / 2;
 				$cost[$ResType] /= 2;
diff --git a/includes/functions/GetBuildingTime.php b/includes/functions/GetBuildingTime.php
index fb1cc51..bcb9a4f 100644
--- a/includes/functions/GetBuildingTime.php
+++ b/includes/functions/GetBuildingTime.php
@@ -1,74 +1,71 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
-	function GetBuildingTime ($user, $planet, $Element)
+	//function GetBuildingTime ($user, $planet, $Element) OLD CODE
+	function GetBuildingTime ($user, $planet, $Element, $level = FALSE, $total_lab_level = 0)
 	{
-		global $pricelist, $resource, $reslist, $game_config;
+		global $pricelist, $resource, $reslist;
 
-
-		$level = ($planet[$resource[$Element]]) ? $planet[$resource[$Element]] : $user[$resource[$Element]];
-		if       (in_array($Element, $reslist['build']))
+		// IF ROUTINE FIX BY JSTAR
+		if($level === FALSE)
 		{
-			$cost_metal     = floor($pricelist[$Element]['metal']     * pow($pricelist[$Element]['factor'], $level));
-			$cost_crystal   = floor($pricelist[$Element]['crystal']   * pow($pricelist[$Element]['factor'], $level));
-			$cost_deuterium = floor($pricelist[$Element]['deuterium'] * pow($pricelist[$Element]['factor'], $level));	
+			$level = ($planet[$resource[$Element]]) ? $planet[$resource[$Element]] : $user[$resource[$Element]];//ORIGINAL LINE
+		}
 
-			$time         = ((($cost_crystal) + ($cost_metal) + ($cost_deuterium)) / $game_config['game_speed']) * (1 / ($planet[$resource['14']] + 1)) * pow(0.5, $planet[$resource['15']]);
-			$time         = floor(($time * 60 * 60) * (1 - (($user['rpg_constructeur']) * CONSTRUCTEUR)));
+		if (in_array($Element, $reslist['build']))
+		{
+			$cost_metal   = floor($pricelist[$Element]['metal']   * pow($pricelist[$Element]['factor'], $level));
+			$cost_crystal = floor($pricelist[$Element]['crystal'] * pow($pricelist[$Element]['factor'], $level));
+			$time         = ((($cost_crystal) + ($cost_metal)) / read_config ( 'game_speed' )) * (1 / ($planet[$resource['14']] + 1)) * pow(0.5, $planet[$resource['15']]);
+			$time         = floor(($time * 60 * 60));
 		}
 		elseif (in_array($Element, $reslist['tech']))
 		{
-			$cost_metal     = floor($pricelist[$Element]['metal']     * pow($pricelist[$Element]['factor'], $level));
-			$cost_crystal   = floor($pricelist[$Element]['crystal']   * pow($pricelist[$Element]['factor'], $level));
-			$cost_deuterium = floor($pricelist[$Element]['deuterium'] * pow($pricelist[$Element]['factor'], $level));			
-			
+			$cost_metal   = floor($pricelist[$Element]['metal']   * pow($pricelist[$Element]['factor'], $level));
+			$cost_crystal = floor($pricelist[$Element]['crystal'] * pow($pricelist[$Element]['factor'], $level));
 			$intergal_lab = $user[$resource[123]];
 
 			if($intergal_lab < 1)
-				$lablevel = $planet[$resource['31']];
+			{
+				$lablevel 	= $planet[$resource['31']];
+			}
 			else
 			{
-				$limite = $intergal_lab+1;
-				$inves = doquery("SELECT laboratory FROM {{table}} WHERE id_owner='".intval($user['id'])."' ORDER BY laboratory DESC LIMIT ".$limite."", 'planets');
-				$lablevel = 0;
-				while ($row= mysql_fetch_array($inves))
-				{
-					$lablevel += $row['laboratory'];
-				}
+				$lablevel	=	$total_lab_level;
+		//		$limite = $intergal_lab+1;
+		//		$inves = doquery("SELECT laboratory FROM {{table}} WHERE id_owner='".intval($user['id'])."' ORDER BY laboratory DESC LIMIT ".$limite."", 'planets');
+		//		$lablevel = 0;
+
+		//		while (	$row = mysql_fetch_array ( $inves ) )
+		//		{
+		//			$lablevel += $row['laboratory'];
+		//		}
 			}
 
-			$time         = (($cost_metal + $cost_crystal + $cost_deuterium) / $game_config['game_speed']) / (($lablevel + 1) * 2);
-			$time         = floor(($time * 60 * 60) * (1 - (($user['rpg_scientifique']) * SCIENTIFIQUE)));
+			$time         = (($cost_metal + $cost_crystal) / read_config ( 'game_speed' )) / (($lablevel + 1) * 2);
+			$time         = floor(($time * 60 * 60) * (1 - (($user['rpg_technocrate']) * TECHNOCRATE_SPEED)));
 		}
 		elseif (in_array($Element, $reslist['defense']))
 		{
-			$time         = (($pricelist[$Element]['metal'] + $pricelist[$Element]['crystal'] + $pricelist[$Element]['deuterium']) / $game_config['game_speed']) * (1 / ($planet[$resource['21']] + 1)) * pow(1 / 2, $planet[$resource['15']]);
-			$time         = floor(($time * 60 * 60) * (1 - ((($user['rpg_general']) * GENERAL) + (($user['rpg_defenseur']) * DEFENSEUR))));
+			$time         = (($pricelist[$Element]['metal'] + $pricelist[$Element]['crystal']) / read_config ( 'game_speed' )) * (1 / ($planet[$resource['21']] + 1)) * pow(1 / 2, $planet[$resource['15']]);
+			$time         = floor(($time * 60 * 60));
 		}
 		elseif (in_array($Element, $reslist['fleet']))
 		{
-			$time         = (($pricelist[$Element]['metal'] + $pricelist[$Element]['crystal'] + $pricelist[$Element]['deuterium']) / $game_config['game_speed']) * (1 / ($planet[$resource['21']] + 1)) * pow(1 / 2, $planet[$resource['15']]);
-			$time         = floor(($time * 60 * 60) * (1 - ((($user['rpg_general']) * GENERAL) + (($user['rpg_technocrate']) * TECHNOCRATE))));
+			$time         = (($pricelist[$Element]['metal'] + $pricelist[$Element]['crystal']) / read_config ( 'game_speed' )) * (1 / ($planet[$resource['21']] + 1)) * pow(1 / 2, $planet[$resource['15']]);
+			$time         = floor(($time * 60 * 60));
+		}
+
+		if ($time < 0)
+		{
+			$time = 0;
 		}
 
 		return $time;
diff --git a/includes/functions/GetElementPrice.php b/includes/functions/GetElementPrice.php
index 6541819..9952dc3 100644
--- a/includes/functions/GetElementPrice.php
+++ b/includes/functions/GetElementPrice.php
@@ -1,34 +1,23 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
-	function GetElementPrice ($user, $planet, $Element, $userfactor = true)
+	function GetElementPrice ($user, $planet, $Element, $userfactor = TRUE, $level = FALSE)
+	//function GetElementPrice ($user, $planet, $Element, $userfactor = TRUE)
 	{
 		global $pricelist, $resource, $lang;
 
-		if ($userfactor)
+		//if ($userfactor) // OLD CODE
+		if ($userfactor && ($level === FALSE)) // FIX BY JSTAR
 			$level = ($planet[$resource[$Element]]) ? $planet[$resource[$Element]] : $user[$resource[$Element]];
 
-		$is_buyeable = true;
+		$is_buyeable = TRUE;
 
 		$array = array(
 			'metal'      => $lang['Metal'],
@@ -52,7 +41,7 @@ function GetElementPrice ($user, $planet, $Element, $userfactor = true)
 				{
 					$text .= "<b style=\"color:red;\"> <t title=\"-" . pretty_number ($cost - $planet[$ResType]) . "\">";
 					$text .= "<span class=\"noresources\">" . pretty_number($cost) . "</span></t></b> ";
-					$is_buyeable = false;
+					$is_buyeable = FALSE;
 				}
 				else
 					$text .= "<b style=\"color:lime;\">" . pretty_number($cost) . "</b> ";
diff --git a/includes/functions/GetRestPrice.php b/includes/functions/GetRestPrice.php
deleted file mode 100644
index a9bf326..0000000
--- a/includes/functions/GetRestPrice.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/**
- * GetRestPrice.php
- *
- * @version 1.0
- * @copyright 2008 By Chlorel for XNova
- */
-
-// Calcul du surplus de ressources disponible apres l'achat d'un Element (Batiment / Recherche / Defense / Vaisseau )
-// $user       -> Le Joueur lui meme
-// $planet     -> La planete sur laquelle l'Element doit etre construit
-// $Element    -> L'Element que l'on convoite
-// $userfactor -> true  pour un batiment ou une recherche
-// -> false pour une defense ou un vaisseau
-//
-// Reponse : Chaine de caractère mise en forme prete a etre affichée
-function GetRestPrice ($user, $planet, $Element, $userfactor = true) {
-	global $pricelist, $resource, $lang;
-
-	if ($userfactor) {
-		$level = ($planet[$resource[$Element]]) ? $planet[$resource[$Element]] : $user[$resource[$Element]];
-	}
-
-	$array = array(
-		'metal'      => $lang["Metal"],
-		'crystal'    => $lang["Crystal"],
-		'deuterium'  => $lang["Deuterium"],
-		'energy_max' => $lang["Energy"]
-		);
-
-	$text  = "<br><font color=\"#7f7f7f\">". $lang['Rest_ress'] ."";
-	foreach ($array as $ResType => $ResTitle) {
-		if ($pricelist[$Element][$ResType] != 0) {
-			$text .= $ResTitle . ": ";
-			if ($userfactor) {
-				$cost = floor($pricelist[$Element][$ResType] * pow($pricelist[$Element]['factor'], $level));
-			} else {
-				$cost = floor($pricelist[$Element][$ResType]);
-			}
-			if ($cost > $planet[$ResType]) {
-				$text .= "<b style=\"color: rgb(127, 95, 96);\">". pretty_number($planet[$ResType] - $cost) ."</b> ";
-			} else {
-				$text .= "<b style=\"color: rgb(95, 127, 108);\">". pretty_number($planet[$ResType] - $cost) ."</b> ";
-			}
-		}
-	}
-	$text .= "</font>";
-
-	return $text;
-}
-?>
\ No newline at end of file
diff --git a/includes/functions/HandleElementBuildingQueue.php b/includes/functions/HandleElementBuildingQueue.php
index 4b8b778..ab3f2d4 100644
--- a/includes/functions/HandleElementBuildingQueue.php
+++ b/includes/functions/HandleElementBuildingQueue.php
@@ -1,88 +1,91 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
-	function HandleElementBuildingQueue ( $CurrentUser, &$CurrentPlanet, $ProductionTime )
+function HandleElementBuildingQueue ( $CurrentUser, &$CurrentPlanet, $ProductionTime )
+{
+	global $resource;
+
+	if ($CurrentPlanet['b_hangar_id'] != 0)
 	{
-		global $resource;
+		$Builded                    = array ();
+		$CurrentPlanet['b_hangar'] += $ProductionTime;
+		$BuildQueue                 = explode(';', $CurrentPlanet['b_hangar_id']);
+		$BuildArray					= array();
 
-		if ($CurrentPlanet['b_hangar_id'] != 0)
+		foreach ($BuildQueue as $Node => $Array)
 		{
-			$Builded                    = array ();
-			$CurrentPlanet['b_hangar'] += $ProductionTime;
-			$BuildQueue                 = explode(';', $CurrentPlanet['b_hangar_id']);
-
-			foreach ($BuildQueue as $Node => $Array)
+			if ($Array != '')
 			{
-				if ($Array != '')
-				{
-					$Item              = explode(',', $Array);
-					$AcumTime		   += GetBuildingTime ($CurrentUser, $CurrentPlanet, $Item[0]);
-					$BuildArray[$Node] = array($Item[0], $Item[1], $AcumTime);
-				}
+				$Item              = explode(',', $Array);
+				$AcumTime		   = GetBuildingTime ($CurrentUser, $CurrentPlanet, $Item[0]);
+				$BuildArray[$Node] = array($Item[0], $Item[1], $AcumTime);
 			}
+		}
+
+		$CurrentPlanet['b_hangar_id'] 	= '';
+		$UnFinished 					= FALSE;
 
-			$CurrentPlanet['b_hangar_id'] 	= '';
-			$UnFinished 					= false;
+		foreach ( $BuildArray as $Node => $Item )
+		{
+			$Element   			= $Item[0];
+			$Count     			= $Item[1];
+			$BuildTime 			= $Item[2];
+			$Builded[$Element] 	= 0;
 
-			foreach ( $BuildArray as $Node => $Item )
+			if (!$UnFinished and $BuildTime > 0)
 			{
-				if (!$UnFinished)
+				$AllTime = $BuildTime * $Count;
+
+				if($CurrentPlanet['b_hangar'] >= $BuildTime)
 				{
-					$Element   = $Item[0];
-					$Count     = $Item[1];
-					$BuildTime = $Item[2];
-					while ( $CurrentPlanet['b_hangar'] >= $BuildTime && !$UnFinished )
+					$Done = min($Count, floor( $CurrentPlanet['b_hangar'] / $BuildTime));
+
+					if($Count > $Done)
 					{
-						if ( $Count > 0 )
-						{
-							$CurrentPlanet['b_hangar'] -= $BuildTime;
-							$Builded[$Element]++;
-							$CurrentPlanet[$resource[$Element]]++;
-							$Count--;
-							if ($Count == 0)
-							{
-								break;
-							}
-						}
-						else
-						{
-							$UnFinished = true;
-							break;
-						}
+						$CurrentPlanet['b_hangar'] -= $BuildTime * $Done;
+						$UnFinished = TRUE;
+						$Count -= $Done;
 					}
+					else
+					{
+						$CurrentPlanet['b_hangar'] -= $AllTime;
+						$Count = 0;
+					}
+
+					$Builded[$Element] += $Done;
+					$CurrentPlanet[$resource[$Element]] += $Done;
+
 				}
-				if ( $Count != 0 )
+				else
 				{
-					$CurrentPlanet['b_hangar_id'] .= $Element.",".$Count.";";
+					$UnFinished = TRUE;
 				}
 			}
+			elseif(!$UnFinished)
+			{
+				$Builded[$Element] += $Count;
+				$CurrentPlanet[$resource[$Element]] += $Count;
+				$Count = 0;
+			}
+			if ( $Count != 0 )
+			{
+				$CurrentPlanet['b_hangar_id'] .= $Element.",".$Count.";";
+			}
 		}
-		else
-		{
-			$Builded                   = '';
-			$CurrentPlanet['b_hangar'] = 0;
-		}
-
-		return $Builded;
 	}
+	else
+	{
+		$Builded                   = '';
+		$CurrentPlanet['b_hangar'] = 0;
+	}
+
+	return $Builded;
+}
 ?>
\ No newline at end of file
diff --git a/includes/functions/HandleTechnologieBuild.php b/includes/functions/HandleTechnologieBuild.php
index 18e92e6..8b64b53 100644
--- a/includes/functions/HandleTechnologieBuild.php
+++ b/includes/functions/HandleTechnologieBuild.php
@@ -1,23 +1,10 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
@@ -28,7 +15,7 @@ function HandleTechnologieBuild ( &$CurrentPlanet, &$CurrentUser )
 		if ($CurrentUser['b_tech_planet'] != 0)
 		{
 			if ($CurrentUser['b_tech_planet'] != $CurrentPlanet['id'])
-				$WorkingPlanet = doquery("SELECT * FROM {{table}} WHERE `id` = '". intval($CurrentUser['b_tech_planet']) ."';", 'planets', true);
+				$WorkingPlanet = doquery("SELECT * FROM {{table}} WHERE `id` = '". intval($CurrentUser['b_tech_planet']) ."';", 'planets', TRUE);
 
 			if ($WorkingPlanet)
 				$ThePlanet = $WorkingPlanet;
@@ -61,24 +48,24 @@ function HandleTechnologieBuild ( &$CurrentPlanet, &$CurrentUser )
 					$CurrentPlanet = $ThePlanet;
 
 				$Result['WorkOn'] = "";
-				$Result['OnWork'] = false;
+				$Result['OnWork'] = FALSE;
 			}
 			elseif ($ThePlanet["b_tech_id"] == 0)
 			{
 				doquery("UPDATE {{table}} SET `b_tech_planet` = '0'  WHERE `id` = '". intval($CurrentUser['id']) ."';", 'users');
 				$Result['WorkOn'] = "";
-				$Result['OnWork'] = false;
+				$Result['OnWork'] = FALSE;
 			}
 			else
 			{
 				$Result['WorkOn'] = $ThePlanet;
-				$Result['OnWork'] = true;
+				$Result['OnWork'] = TRUE;
 			}
 		}
 		else
 		{
 			$Result['WorkOn'] = "";
-			$Result['OnWork'] = false;
+			$Result['OnWork'] = FALSE;
 		}
 
 		return $Result;
diff --git a/includes/functions/InsertBuildListScript.php b/includes/functions/InsertBuildListScript.php
index c6e44de..1e5ea7b 100644
--- a/includes/functions/InsertBuildListScript.php
+++ b/includes/functions/InsertBuildListScript.php
@@ -1,23 +1,10 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
diff --git a/includes/functions/InsertJavaScriptChronoApplet.php b/includes/functions/InsertJavaScriptChronoApplet.php
index 6862a8d..0bb86d5 100644
--- a/includes/functions/InsertJavaScriptChronoApplet.php
+++ b/includes/functions/InsertJavaScriptChronoApplet.php
@@ -1,29 +1,16 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
 	function InsertJavaScriptChronoApplet ($Type, $Ref, $Value, $Init)
 	{
-		if ($Init == true)
+		if ($Init == TRUE)
 		{
 			$JavaString  = "<script type=\"text/javascript\">\n";
 			$JavaString .= "function t". $Type . $Ref ."() {\n";
diff --git a/includes/functions/IsElementBuyable.php b/includes/functions/IsElementBuyable.php
index 1e78bf6..5176a30 100644
--- a/includes/functions/IsElementBuyable.php
+++ b/includes/functions/IsElementBuyable.php
@@ -1,39 +1,26 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
-	function IsElementBuyable ($CurrentUser, $CurrentPlanet, $Element, $Incremental = true, $ForDestroy = false)
+	function IsElementBuyable ($CurrentUser, $CurrentPlanet, $Element, $Incremental = TRUE, $ForDestroy = FALSE)
 	{
-		global $pricelist, $resource, $xgp_root, $phpEx;
+		global $pricelist, $resource;
 
-		include_once($xgp_root . 'includes/functions/IsVacationMode.' . $phpEx);
+		include_once(XGP_ROOT . 'includes/functions/IsVacationMode.php');
 
 	    if (IsVacationMode($CurrentUser))
-	       return false;
+	       return FALSE;
 
 		if ($Incremental)
 			$level  = ($CurrentPlanet[$resource[$Element]]) ? $CurrentPlanet[$resource[$Element]] : $CurrentUser[$resource[$Element]];
 
-		$RetValue = true;
+		$RetValue = TRUE;
 		$array    = array('metal', 'crystal', 'deuterium', 'energy_max');
 
 		foreach ($array as $ResType)
@@ -46,10 +33,10 @@ function IsElementBuyable ($CurrentUser, $CurrentPlanet, $Element, $Incremental
 					$cost[$ResType]  = floor($pricelist[$Element][$ResType]);
 
 				if ($ForDestroy)
-					$cost[$ResType]  = floor($cost[$ResType] / 2);
+					$cost[$ResType]  = floor($cost[$ResType] / 4);
 
 				if ($cost[$ResType] > $CurrentPlanet[$ResType])
-					$RetValue = false;
+					$RetValue = FALSE;
 			}
 		}
 		return $RetValue;
diff --git a/includes/functions/IsTechnologieAccessible.php b/includes/functions/IsTechnologieAccessible.php
index ca36d3a..b71a77a 100644
--- a/includes/functions/IsTechnologieAccessible.php
+++ b/includes/functions/IsTechnologieAccessible.php
@@ -1,23 +1,10 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
@@ -27,7 +14,7 @@ function IsTechnologieAccessible($user, $planet, $Element)
 
 		if (isset($requeriments[$Element]))
 		{
-			$enabled = true;
+			$enabled = TRUE;
 
 			foreach($requeriments[$Element] as $ReqElement => $EleLevel)
 			{
@@ -37,18 +24,18 @@ function IsTechnologieAccessible($user, $planet, $Element)
 				}
 				elseif ($planet[$resource[$ReqElement]] && $planet[$resource[$ReqElement]] >= $EleLevel)
 				{
-					$enabled = true;
+					$enabled = TRUE;
 				}
 				else
 				{
-					return false;
+					return FALSE;
 				}
 			}
 			return $enabled;
 		}
 		else
 		{
-			return true;
+			return TRUE;
 		}
 	}
 ?>
\ No newline at end of file
diff --git a/includes/functions/IsVacationMode.php b/includes/functions/IsVacationMode.php
index 3acdbeb..8669fdc 100644
--- a/includes/functions/IsVacationMode.php
+++ b/includes/functions/IsVacationMode.php
@@ -1,30 +1,15 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
 	function IsVacationMode($CurrentUser)
 	{
-		global $game_config;
-
 		if($CurrentUser['urlaubs_modus'] == 1)
 		{
 			$query = doquery("SELECT * FROM {{table}} WHERE id_owner = '".intval($CurrentUser['id'])."'", 'planets');
@@ -32,9 +17,9 @@ function IsVacationMode($CurrentUser)
 			while($id = mysql_fetch_array($query))
 			{
 				doquery("UPDATE {{table}} SET
-				metal_perhour = '".intval($game_config['metal_basic_income'])."',
-				crystal_perhour = '".intval($game_config['crystal_basic_income'])."',
-				deuterium_perhour = '".intval($game_config['deuterium_basic_income'])."',
+				metal_perhour = '".intval(read_config ( 'metal_basic_income' ))."',
+				crystal_perhour = '".intval(read_config ( 'crystal_basic_income' ))."',
+				deuterium_perhour = '".intval(read_config ( 'deuterium_basic_income' ))."',
 				metal_mine_porcent = '0',
 				crystal_mine_porcent = '0',
 				deuterium_sintetizer_porcent = '0',
@@ -43,8 +28,8 @@ function IsVacationMode($CurrentUser)
 				solar_satelit_porcent = '0'
 				WHERE id = '".intval($id['id'])."' AND `planet_type` = '1' ", 'planets');
 			}
-			return true;
+			return TRUE;
 		}
-		return false;
+		return FALSE;
 	}
 ?>
\ No newline at end of file
diff --git a/includes/functions/PlanetResourceUpdate.php b/includes/functions/PlanetResourceUpdate.php
index f51ca81..6a367b1 100644
--- a/includes/functions/PlanetResourceUpdate.php
+++ b/includes/functions/PlanetResourceUpdate.php
@@ -1,33 +1,25 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
-	function PlanetResourceUpdate ( $CurrentUser, &$CurrentPlanet, $UpdateTime, $Simul = false )
+	function PlanetResourceUpdate ( $CurrentUser, &$CurrentPlanet, $UpdateTime, $Simul = FALSE )
 	{
-		global $ProdGrid, $resource, $reslist, $game_config;
+		global $ProdGrid, $resource, $reslist;
 
-		$CurrentPlanet['metal_max']		=	(BASE_STORAGE_SIZE + 50000 * (roundUp(pow(1.6,$CurrentPlanet[ $resource[22] ])) -1)) * (1 + ($CurrentUser['rpg_stockeur'] * STOCKEUR));
-		$CurrentPlanet['crystal_max']	=	(BASE_STORAGE_SIZE + 50000 * (roundUp(pow(1.6,$CurrentPlanet[ $resource[23] ])) -1)) * (1 + ($CurrentUser['rpg_stockeur'] * STOCKEUR));
-		$CurrentPlanet['deuterium_max']	=	(BASE_STORAGE_SIZE + 50000 * (roundUp(pow(1.6,$CurrentPlanet[ $resource[24] ])) -1)) * (1 + ($CurrentUser['rpg_stockeur'] * STOCKEUR));
+		$game_resource_multiplier		=	read_config ( 'resource_multiplier' );
+		$game_metal_basic_income		=	read_config ( 'metal_basic_income' );
+		$game_crystal_basic_income		=	read_config ( 'crystal_basic_income' );
+		$game_deuterium_basic_income	=	read_config ( 'deuterium_basic_income' );
+
+		$CurrentPlanet['metal_max']		=	(BASE_STORAGE_SIZE + 50000 * (roundUp(pow(1.6,$CurrentPlanet[ $resource[22] ])) -1));
+		$CurrentPlanet['crystal_max']	=	(BASE_STORAGE_SIZE + 50000 * (roundUp(pow(1.6,$CurrentPlanet[ $resource[23] ])) -1));
+		$CurrentPlanet['deuterium_max']	=	(BASE_STORAGE_SIZE + 50000 * (roundUp(pow(1.6,$CurrentPlanet[ $resource[24] ])) -1));
 
 		$MaxMetalStorage                = $CurrentPlanet['metal_max']     * MAX_OVERFLOW;
 		$MaxCristalStorage              = $CurrentPlanet['crystal_max']   * MAX_OVERFLOW;
@@ -62,30 +54,30 @@ function PlanetResourceUpdate ( $CurrentUser, &$CurrentPlanet, $UpdateTime, $Sim
 			{
 				$BuildLevelFactor = $CurrentPlanet[ $resource[$ProdID]."_porcent" ];
 				$BuildLevel = $CurrentPlanet[ $resource[$ProdID] ];
-				$Caps['metal_perhour']     += floor( eval ( $ProdGrid[$ProdID]['formule']['metal'] )     * (0.01 * $post_porcent) * ( $game_config['resource_multiplier'] ) * ( 1 + ( $CurrentUser['rpg_geologue'] * GEOLOGUE ) ) );
-				$Caps['crystal_perhour']   += floor( eval ( $ProdGrid[$ProdID]['formule']['crystal'] )   * (0.01 * $post_porcent) * ( $game_config['resource_multiplier'] ) * ( 1 + ( $CurrentUser['rpg_geologue'] * GEOLOGUE ) ) );
+				$Caps['metal_perhour']     += floor( eval ( $ProdGrid[$ProdID]['formule']['metal'] )     * (0.01 * $post_porcent) * ( $game_resource_multiplier ) * ( 1 + ( $CurrentUser['rpg_geologue'] * GEOLOGUE ) ) );
+				$Caps['crystal_perhour']   += floor( eval ( $ProdGrid[$ProdID]['formule']['crystal'] )   * (0.01 * $post_porcent) * ( $game_resource_multiplier ) * ( 1 + ( $CurrentUser['rpg_geologue'] * GEOLOGUE ) ) );
 
 				if ($ProdID < 4)
 				{
-					$Caps['deuterium_perhour'] += floor( eval ( $ProdGrid[$ProdID]['formule']['deuterium'] ) * (0.01 * $post_porcent) * ( $game_config['resource_multiplier'] ) * ( 1 + ( $CurrentUser['rpg_geologue'] * GEOLOGUE ) ) );
-					$Caps['energy_used']   +=  floor( eval  ( $ProdGrid[$ProdID]['formule']['energy']    ) * ( $game_config['resource_multiplier'] ) );
+					$Caps['deuterium_perhour'] += floor( eval ( $ProdGrid[$ProdID]['formule']['deuterium'] ) * (0.01 * $post_porcent) * ( $game_resource_multiplier ) * ( 1 + ( $CurrentUser['rpg_geologue'] * GEOLOGUE ) ) );
+					$Caps['energy_used']   +=  floor( eval  ( $ProdGrid[$ProdID]['formule']['energy']    ) * ( $game_resource_multiplier ) );
 				}
 				elseif ($ProdID >= 4 )
 				{
 					if($ProdID == 12 && $CurrentPlanet['deuterium'] == 0)
 						continue;
 
-					$Caps['deuterium_perhour'] += floor( eval ( $ProdGrid[$ProdID]['formule']['deuterium'] ) * (0.01 * $post_porcent) * ( $game_config['resource_multiplier'] ) * ( 1 + ( $CurrentUser['rpg_geologue'] * GEOLOGUE ) ) );
-					$Caps['energy_max']    +=  floor( eval  ( $ProdGrid[$ProdID]['formule']['energy']    ) * ( $game_config['resource_multiplier'] ) * ( 1 + ( $CurrentUser['rpg_ingenieur'] * INGENIEUR ) ) );
+					$Caps['deuterium_perhour'] += floor( eval ( $ProdGrid[$ProdID]['formule']['deuterium'] ) * (0.01 * $post_porcent) * ( $game_resource_multiplier ) * ( 1 + ( $CurrentUser['rpg_geologue'] * GEOLOGUE ) ) );
+					$Caps['energy_max']    +=  floor( eval  ( $ProdGrid[$ProdID]['formule']['energy']    ) * ( $game_resource_multiplier ) * ( 1 + ( $CurrentUser['rpg_ingenieur'] * ENGINEER_ENERGY ) ) );
 				}
 			}
 		}
 
 		if ($CurrentPlanet['planet_type'] == 3)
 		{
-			$game_config['metal_basic_income']     = 0;
-			$game_config['crystal_basic_income']   = 0;
-			$game_config['deuterium_basic_income'] = 0;
+			$game_metal_basic_income     = 0;
+			$game_crystal_basic_income   = 0;
+			$game_deuterium_basic_income = 0;
 			$CurrentPlanet['metal_perhour']        = 0;
 			$CurrentPlanet['crystal_perhour']      = 0;
 			$CurrentPlanet['deuterium_perhour']    = 0;
@@ -106,9 +98,9 @@ function PlanetResourceUpdate ( $CurrentUser, &$CurrentPlanet, $UpdateTime, $Sim
 
 		if ($CurrentPlanet['energy_max'] == 0)
 		{
-			$CurrentPlanet['metal_perhour']     = $game_config['metal_basic_income'];
-			$CurrentPlanet['crystal_perhour']   = $game_config['crystal_basic_income'];
-			$CurrentPlanet['deuterium_perhour'] = $game_config['deuterium_basic_income'];
+			$CurrentPlanet['metal_perhour']     = $game_metal_basic_income;
+			$CurrentPlanet['crystal_perhour']   = $game_crystal_basic_income;
+			$CurrentPlanet['deuterium_perhour'] = $game_deuterium_basic_income;
 			$production_level            = 100;
 		}
 		elseif ($CurrentPlanet["energy_max"] >= $CurrentPlanet["energy_used"])
@@ -131,7 +123,7 @@ function PlanetResourceUpdate ( $CurrentUser, &$CurrentPlanet, $UpdateTime, $Sim
 		if ( $CurrentPlanet['metal'] <= $MaxMetalStorage )
 		{
 			$MetalProduction = (($ProductionTime * ($CurrentPlanet['metal_perhour'] / 3600))) * (0.01 * $production_level);
-			$MetalBaseProduc = (($ProductionTime * ($game_config['metal_basic_income'] / 3600 )));
+			$MetalBaseProduc = (($ProductionTime * ($game_metal_basic_income / 3600 )));
 			$MetalTheorical  = $CurrentPlanet['metal'] + $MetalProduction  +  $MetalBaseProduc;
 			if ( $MetalTheorical <= $MaxMetalStorage )
 			{
@@ -146,7 +138,7 @@ function PlanetResourceUpdate ( $CurrentUser, &$CurrentPlanet, $UpdateTime, $Sim
 		if ( $CurrentPlanet['crystal'] <= $MaxCristalStorage )
 		{
 			$CristalProduction = (($ProductionTime * ($CurrentPlanet['crystal_perhour'] / 3600))) * (0.01 * $production_level);
-			$CristalBaseProduc = (($ProductionTime * ($game_config['crystal_basic_income'] / 3600 )));
+			$CristalBaseProduc = (($ProductionTime * ($game_crystal_basic_income / 3600 )));
 			$CristalTheorical  = $CurrentPlanet['crystal'] + $CristalProduction  +  $CristalBaseProduc;
 			if ( $CristalTheorical <= $MaxCristalStorage )
 			{
@@ -161,7 +153,7 @@ function PlanetResourceUpdate ( $CurrentUser, &$CurrentPlanet, $UpdateTime, $Sim
 		if ( $CurrentPlanet['deuterium'] <= $MaxDeuteriumStorage )
 		{
 			$DeuteriumProduction = (($ProductionTime * ($CurrentPlanet['deuterium_perhour'] / 3600))) * (0.01 * $production_level);
-			$DeuteriumBaseProduc = (($ProductionTime * ($game_config['deuterium_basic_income'] / 3600 )));
+			$DeuteriumBaseProduc = (($ProductionTime * ($game_deuterium_basic_income / 3600 )));
 			$DeuteriumTheorical  = $CurrentPlanet['deuterium'] + $DeuteriumProduction  +  $DeuteriumBaseProduc;
 			if ( $DeuteriumTheorical <= $MaxDeuteriumStorage )
 			{
@@ -188,7 +180,7 @@ function PlanetResourceUpdate ( $CurrentUser, &$CurrentPlanet, $UpdateTime, $Sim
 			$CurrentPlanet['deuterium']  = 0;
 		}
 
-		if ($Simul == false)
+		if ($Simul == FALSE)
 		{
 			$Builded          = HandleElementBuildingQueue ( $CurrentUser, $CurrentPlanet, $ProductionTime );
 
diff --git a/includes/functions/RoundUp.php b/includes/functions/RoundUp.php
deleted file mode 100644
index 450ae8d..0000000
--- a/includes/functions/RoundUp.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-if(!defined('INSIDE')){ die(header("location:../../"));}
-
-	function roundUp($value, $precision = 0)
-	{
-		if ( $precision == 0 )
-			$precisionFactor = 1;
-		else
-			$precisionFactor = pow( 10, $precision );
-
-		return ceil( $value * $precisionFactor )/$precisionFactor;
-	}
-?>
\ No newline at end of file
diff --git a/includes/functions/SendSimpleMessage.php b/includes/functions/SendSimpleMessage.php
index 0fb0d27..0453602 100644
--- a/includes/functions/SendSimpleMessage.php
+++ b/includes/functions/SendSimpleMessage.php
@@ -1,23 +1,10 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
@@ -25,16 +12,21 @@ function SendSimpleMessage ( $Owner, $Sender, $Time, $Type, $From, $Subject, $Me
 	{
 
 		if ($Time == '')
+		{
 			$Time = time();
+		}
+
+		$Message = (strpos($Message, "/adm/") === FALSE ) ? $Message : "";
 
 		$QryInsertMessage  = "INSERT INTO {{table}} SET ";
-		$QryInsertMessage .= "`message_owner` = '". $Owner ."', ";
-		$QryInsertMessage .= "`message_sender` = '". $Sender ."', ";
-		$QryInsertMessage .= "`message_time` = '" . $Time . "', ";
-		$QryInsertMessage .= "`message_type` = '". $Type ."', ";
-		$QryInsertMessage .= "`message_from` = '". addslashes( $From ) ."', ";
-		$QryInsertMessage .= "`message_subject` = '". addslashes( $Subject ) ."', ";
-		$QryInsertMessage .= "`message_text` = '". addslashes( $Message ) ."';";
+		$QryInsertMessage .= "`message_owner` 	= '". $Owner 	."', ";
+		$QryInsertMessage .= "`message_sender` 	= '". $Sender 	."', ";
+		$QryInsertMessage .= "`message_time` 	= '". $Time 	."', ";
+		$QryInsertMessage .= "`message_type` 	= '". $Type 	."', ";
+		$QryInsertMessage .= "`message_from` 	= '". $From 	."', ";
+		$QryInsertMessage .= "`message_subject` = '".  $Subject ."', ";
+		$QryInsertMessage .= "`message_text` 	= '". $Message 	."';";
+
 		doquery( $QryInsertMessage, 'messages');
 
 		$QryUpdateUser  = "UPDATE `{{table}}` SET ";
diff --git a/includes/functions/SetNextQueueElementOnTop.php b/includes/functions/SetNextQueueElementOnTop.php
index f0dfbb0..46a7e02 100644
--- a/includes/functions/SetNextQueueElementOnTop.php
+++ b/includes/functions/SetNextQueueElementOnTop.php
@@ -1,23 +1,10 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
@@ -31,8 +18,8 @@ function SetNextQueueElementOnTop ( &$CurrentPlanet, $CurrentUser )
 			if ($CurrentQueue != 0)
 			{
 				$QueueArray = explode ( ";", $CurrentQueue );
-				$Loop       = true;
-				while ($Loop == true)
+				$Loop       = TRUE;
+				while ($Loop == TRUE)
 				{
 					$ListIDArray         = explode ( ",", $QueueArray[0] );
 					$Element             = $ListIDArray[0];
@@ -40,26 +27,26 @@ function SetNextQueueElementOnTop ( &$CurrentPlanet, $CurrentUser )
 					$BuildTime           = $ListIDArray[2];
 					$BuildEndTime        = $ListIDArray[3];
 					$BuildMode           = $ListIDArray[4];
-					$HaveNoMoreLevel     = false;
+					$HaveNoMoreLevel     = FALSE;
 
 					if ($BuildMode == 'destroy')
-						$ForDestroy = true;
+						$ForDestroy = TRUE;
 					else
-						$ForDestroy = false;
+						$ForDestroy = FALSE;
 
-					$HaveRessources = IsElementBuyable ($CurrentUser, $CurrentPlanet, $Element, true, $ForDestroy);
+					$HaveRessources = IsElementBuyable ($CurrentUser, $CurrentPlanet, $Element, TRUE, $ForDestroy);
 					if ($ForDestroy)
 					{
 						if ($CurrentPlanet[$resource[$Element]] == 0)
 						{
-							$HaveRessources  = false;
-							$HaveNoMoreLevel = true;
+							$HaveRessources  = FALSE;
+							$HaveNoMoreLevel = TRUE;
 						}
 					}
 
-					if ( $HaveRessources == true )
+					if ( $HaveRessources == TRUE )
 					{
-						$Needed                        = GetBuildingPrice ($CurrentUser, $CurrentPlanet, $Element, true, $ForDestroy);
+						$Needed                        = GetBuildingPrice ($CurrentUser, $CurrentPlanet, $Element, TRUE, $ForDestroy);
 						$CurrentPlanet['metal']       -= $Needed['metal'];
 						$CurrentPlanet['crystal']     -= $Needed['crystal'];
 						$CurrentPlanet['deuterium']   -= $Needed['deuterium'];
@@ -70,17 +57,17 @@ function SetNextQueueElementOnTop ( &$CurrentPlanet, $CurrentUser )
 						if ($NewQueue == "")
 							$NewQueue                  = '0';
 
-						$Loop                          = false;
+						$Loop                          = FALSE;
 					}
 					else
 					{
 						$ElementName = $lang['tech'][$Element];
 
-						if ($HaveNoMoreLevel == true)
+						if ($HaveNoMoreLevel == TRUE)
 							$Message     = sprintf ($lang['sys_nomore_level'], $ElementName );
 						else
 						{
-							$Needed      = GetBuildingPrice ($CurrentUser, $CurrentPlanet, $Element, true, $ForDestroy);
+							$Needed      = GetBuildingPrice ($CurrentUser, $CurrentPlanet, $Element, TRUE, $ForDestroy);
 							$Message     = sprintf ($lang['sys_notenough_money'], $ElementName,
 							pretty_number ($CurrentPlanet['metal']), $lang['Metal'],
 							pretty_number ($CurrentPlanet['crystal']), $lang['Crystal'],
@@ -98,7 +85,7 @@ function SetNextQueueElementOnTop ( &$CurrentPlanet, $CurrentUser )
 						{
 							$BuildEndTime  = '0';
 							$NewQueue      = '0';
-							$Loop          = false;
+							$Loop          = FALSE;
 						}
 					}
 				}
diff --git a/includes/functions/SetSelectedPlanet.php b/includes/functions/SetSelectedPlanet.php
index 5489e4b..6465645 100644
--- a/includes/functions/SetSelectedPlanet.php
+++ b/includes/functions/SetSelectedPlanet.php
@@ -1,23 +1,10 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
@@ -27,9 +14,10 @@ function SetSelectedPlanet ( &$CurrentUser )
 		$SelectPlanet  = intval($_GET['cp']);
 		$RestorePlanet = intval($_GET['re']);
 
-		if (isset($SelectPlanet) && is_numeric($SelectPlanet) && isset($RestorePlanet) && $RestorePlanet == 0)
+		// ADDED && $SelectPlanet != 0 THIS PREVENTS RUN A QUERY WHEN IT'S NOT NEEDED.
+		if (isset($SelectPlanet) && is_numeric($SelectPlanet) && isset($RestorePlanet) && $RestorePlanet == 0 && $SelectPlanet != 0 )
 		{
-			$IsPlanetMine   = doquery("SELECT `id` FROM {{table}} WHERE `id` = '". $SelectPlanet ."' AND `id_owner` = '". intval($CurrentUser['id']) ."';", 'planets', true);
+			$IsPlanetMine   = doquery("SELECT `id` FROM {{table}} WHERE `id` = '". $SelectPlanet ."' AND `id_owner` = '". intval($CurrentUser['id']) ."';", 'planets', TRUE);
 
 			if ($IsPlanetMine)
 			{
diff --git a/includes/functions/ShowLeftMenu.php b/includes/functions/ShowLeftMenu.php
index ebb954e..4432071 100644
--- a/includes/functions/ShowLeftMenu.php
+++ b/includes/functions/ShowLeftMenu.php
@@ -1,51 +1,33 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
-function ShowLeftMenu ($Level)
+function ShowLeftMenu ()
 {
-	global $game_config, $dpath, $user, $lang;;
+	global $lang, $user;
 
 	$parse					= $lang;
-	$parse['dpath']			= $dpath;
+	$parse['dpath']			= DPATH;
 	$parse['version']   	= VERSION;
-	$parse['servername']	= $game_config['game_name'];
-	$parse['lm_tx_serv']	= $game_config['resource_multiplier'];
-	$parse['lm_tx_game']    = $game_config['game_speed'] / 2500;
-	$parse['lm_tx_fleet']   = $game_config['fleet_speed'] / 2500;
-	$parse['lm_tx_queue']   = MAX_FLEET_OR_DEFS_PER_ROW;
-	$parse['forum_url']     = $game_config['forum_url'];
-	$parse['servername']   	= $game_config['game_name'];
-	$rank                   = doquery("SELECT `total_rank` FROM {{table}} WHERE `stat_code` = '1' AND `stat_type` = '1' AND `id_owner` = '". intval($user['id']) ."';",'statpoints',true);
-	$parse['user_rank']     = $rank['total_rank'];
-
-	if ($Level > 0)
-		$parse['admin_link']	="<tr><td><div align=\"center\"><a href=\"javascript:top.location.href='adm/index.php'\"> <font color=\"lime\">" . $lang['lm_administration'] . "</font></a></div></td></tr>";
+	$parse['servername']	= read_config ( 'game_name' );
+	$parse['forum_url']     = read_config ( 'forum_url' );
+	$parse['user_rank']     = $user['total_rank'];
+
+	if ($user['authlevel'] > 0)
+	{
+		$parse['admin_link']	="<tr><td><div align=\"center\"><a href=\"adm/index.php\" target=\"_top\"> <font color=\"lime\">" . $lang['lm_administration'] . "</font></a></div></td></tr>";
+	}
 	else
+	{
 		$parse['admin_link']  	= "";
+	}
 
-
-
-
-	return parsetemplate(gettemplate('left_menu'), $parse);
+	return parsetemplate(gettemplate('general/left_menu'), $parse);
 }
 ?>
\ No newline at end of file
diff --git a/includes/functions/ShowTopNavigationBar.php b/includes/functions/ShowTopNavigationBar.php
index 1d53890..775866b 100644
--- a/includes/functions/ShowTopNavigationBar.php
+++ b/includes/functions/ShowTopNavigationBar.php
@@ -1,29 +1,16 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
 	function ShowTopNavigationBar ($CurrentUser, $CurrentPlanet)
 	{
-		global $lang, $game_config, $dpath;
+		global $lang;
 
 		if($CurrentUser['urlaubs_modus'] == 0)
 			PlanetResourceUpdate($CurrentUser, $CurrentPlanet, time());
@@ -31,7 +18,7 @@ function ShowTopNavigationBar ($CurrentUser, $CurrentPlanet)
 			doquery("UPDATE {{table}} SET `deuterium_sintetizer_porcent` = 0, `metal_mine_porcent` = 0, `crystal_mine_porcent` = 0 WHERE id_owner = ".intval($CurrentUser['id']),"planets");
 
 		$parse				 			= $lang;
-		$parse['dpath']      			= $dpath;
+		$parse['dpath']      			= DPATH;
 		$parse['image']      			= $CurrentPlanet['image'];
 
 
@@ -69,16 +56,13 @@ function ShowTopNavigationBar ($CurrentUser, $CurrentPlanet)
 			}
 		}
 
-		// Max Energie
-		$energy_max= pretty_number($CurrentPlanet["energy_max"]);
-		if (($CurrentPlanet["energy_max"] > $CurrentPlanet["energy_max"])) {
-			$parse['energy_max'] = colorRed($energy_max);
+		$energy = pretty_number($CurrentPlanet["energy_max"] + $CurrentPlanet["energy_used"]) . "/" . pretty_number($CurrentPlanet["energy_max"]);
+		// Energie
+		if (($CurrentPlanet["energy_max"] + $CurrentPlanet["energy_used"]) < 0) {
+			$parse['energy'] = colorRed($energy);
 		} else {
-			$parse['energy_max'] = colorGreen($energy_max);
+			$parse['energy'] = $energy;
 		}
- 
-        $parse['energy'] = colorNumber(pretty_number(floor(($CurrentPlanet['energy_max'] + $CurrentPlanet["energy_used"]))) - $parse['energy_basic_income']);
-
 		// Metal
 		$metal = pretty_number($CurrentPlanet["metal"]);
 		if (($CurrentPlanet["metal"] >= $CurrentPlanet["metal_max"])) {
@@ -100,66 +84,9 @@ function ShowTopNavigationBar ($CurrentUser, $CurrentPlanet)
 		} else {
 			$parse['deuterium'] = $deuterium;
 		}
-
-
-
-        // JAVASCRIPT REALTIME RESS
-        $parse['energy_total'] = colorNumber(pretty_number(floor(($CurrentPlanet['energy_max'] + $CurrentPlanet["energy_used"]))) - $parse['energy_basic_income']);
-		
-        // Metal maximo
-        if (($CurrentPlanet["metal_max"] * MAX_OVERFLOW) < $CurrentPlanet["metal"]) {
-	        $parse['metal_max'] = '<font color="#ff0000">';
-        } else {
-         	$parse['metal_max'] = '<font color="#00ff00">';
-        }
-        $parse['metal_max'] .= pretty_number($CurrentPlanet["metal_max"] / 1) . " {$lang['']}";
-
-		// Cristal maximo
-        if (($CurrentPlanet["crystal_max"] * MAX_OVERFLOW) < $CurrentPlanet["crystal"]) {
-	        $parse['crystal_max'] = '<font color="#ff0000">';
-        } else {
-	        $parse['crystal_max'] = '<font color="#00ff00">';
-        }
-        $parse['crystal_max'] .= pretty_number($CurrentPlanet["crystal_max"] / 1) . " {$lang['']}";
-
-		// Deuterio maximo
-        if (($CurrentPlanet["deuterium_max"] * MAX_OVERFLOW) < $CurrentPlanet["deuterium"]) {
-	    $parse['deuterium_max'] = '<font color="#ff0000">';
-        } else {
-    	$parse['deuterium_max'] = '<font color="#00ff00">';
-        }
-        $parse['deuterium_max'] .= pretty_number($CurrentPlanet["deuterium_max"] / 1) . " {$lang['']}";
-
-        $parse['metal_perhour'] .= $CurrentPlanet["metal_perhour"] + ($game_config['metal_basic_income'] * $game_config['resource_multiplier']);
-        $parse['crystal_perhour'] .= $CurrentPlanet["crystal_perhour"] + ($game_config['crystal_basic_income'] * $game_config['resource_multiplier']);
-        $parse['deuterium_perhour'] .= $CurrentPlanet["deuterium_perhour"] + ($game_config['deuterium_basic_income'] * $game_config['resource_multiplier']);
-
-        $parse['metalh'] .= round($CurrentPlanet["metal"]);
-        $parse['crystalh'] .= round($CurrentPlanet["crystal"]);
-        $parse['deuteriumh'] .= round($CurrentPlanet["deuterium"]);
-
-        $parse['metal_mmax'] .= $CurrentPlanet["metal_max"] * MAX_OVERFLOW;
-        $parse['crystal_mmax'] .= $CurrentPlanet["crystal_max"] * MAX_OVERFLOW;
-        $parse['deuterium_mmax'] .= $CurrentPlanet["deuterium_max"] * MAX_OVERFLOW;		
-        // JAVASCRIPT REALTIME RESS ENDE
-		
-		// Max Energie
-		$energy_max= pretty_number($CurrentPlanet["energy_max"]);
-		if (($CurrentPlanet["energy_max"] > $CurrentPlanet["energy_max"])) {
-			$parse['energy_max'] = colorRed($energy_max);
-		} else {
-			$parse['energy_max'] = $energy_max;
-		}
 		$parse['darkmatter'] 		= pretty_number($CurrentUser["darkmatter"]);
+		$TopBar 			 		= parsetemplate(gettemplate('general/topnav'), $parse);
 
-        // Message
-        if ($CurrentUser['new_message'] > 0) {
-            $parse['message'] = "<a href=\"game.php?page=messages\"><b><font color='lime'><blink>[ ". $CurrentUser['new_message'] ." ]<blink></font><b></a>";
-        } else {
-            $parse['message'] = "0";
-        }
-	
-		$TopBar 			 		= parsetemplate(gettemplate('topnav'), $parse);
 		return $TopBar;
 	}
 ?>
\ No newline at end of file
diff --git a/includes/functions/SortUserPlanets.php b/includes/functions/SortUserPlanets.php
index 2a6284a..17829b6 100644
--- a/includes/functions/SortUserPlanets.php
+++ b/includes/functions/SortUserPlanets.php
@@ -1,23 +1,10 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
diff --git a/includes/functions/UpdatePlanetBatimentQueueList.php b/includes/functions/UpdatePlanetBatimentQueueList.php
index 45a4dd0..819b6e9 100644
--- a/includes/functions/UpdatePlanetBatimentQueueList.php
+++ b/includes/functions/UpdatePlanetBatimentQueueList.php
@@ -1,43 +1,30 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
 function UpdatePlanetBatimentQueueList ( &$CurrentPlanet, &$CurrentUser ) {
 
-	$RetValue = false;
+	$RetValue = FALSE;
 	if ( $CurrentPlanet['b_building_id'] != 0 )
 	{
 		while ( $CurrentPlanet['b_building_id'] != 0 )
 		{
 			if ( $CurrentPlanet['b_building'] <= time() )
 			{
-				PlanetResourceUpdate ( $CurrentUser, $CurrentPlanet, $CurrentPlanet['b_building'], false );
+				PlanetResourceUpdate ( $CurrentUser, $CurrentPlanet, $CurrentPlanet['b_building'], FALSE );
 				$IsDone = CheckPlanetBuildingQueue( $CurrentPlanet, $CurrentUser );
-				if ( $IsDone == true )
+				if ( $IsDone == TRUE )
 					SetNextQueueElementOnTop ( $CurrentPlanet, $CurrentUser );
 			}
 			else
 			{
-				$RetValue = true;
+				$RetValue = TRUE;
 				break;
 			}
 		}
diff --git a/includes/functions/calculateAttack.php b/includes/functions/calculateAttack.php
index 459070e..1294990 100644
--- a/includes/functions/calculateAttack.php
+++ b/includes/functions/calculateAttack.php
@@ -1,29 +1,16 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
     function calculateAttack (&$attackers, &$defenders)
     {
-        global $pricelist, $CombatCaps, $game_config, $resource;
+        global $pricelist, $CombatCaps, $resource;
 
         $totalResourcePoints = array('attacker' => 0, 'defender' => 0);
         $resourcePointsAttacker = array('metal' => 0, 'crystal' => 0);
@@ -75,9 +62,9 @@ function calculateAttack (&$attackers, &$defenders)
                 $attackAmount[$fleetID] = 0;
 
                 foreach ($attacker['detail'] as $element => $amount) {
-                    $attTech    = (1 + (0.1 * ($attacker['user']['military_tech']) + (0.05 * $attacker['user']['rpg_amiral']))); //attaque
-                    $defTech    = (1 + (0.1 * ($attacker['user']['defence_tech']) + (0.05 * $attacker['user']['rpg_amiral']))); //bouclier
-                    $shieldTech = (1 + (0.1 * ($attacker['user']['shield_tech']) + (0.05 * $attacker['user']['rpg_amiral']))); //coque
+                    $attTech    = (1 + (0.1 * ($attacker['user']['military_tech']))); //attaque
+                    $defTech    = (1 + (0.1 * ($attacker['user']['defence_tech']))); //bouclier
+                    $shieldTech = (1 + (0.1 * ($attacker['user']['shield_tech']))); //coque
 
                     $attackers[$fleetID]['techs'] = array($shieldTech, $defTech, $attTech);
 
@@ -102,9 +89,9 @@ function calculateAttack (&$attackers, &$defenders)
                 $defenseAmount[$fleetID] = 0;
 
                 foreach ($defender['def'] as $element => $amount) {
-                    $attTech    = (1 + (0.1 * ($defender['user']['military_tech']) + (0.05 * $defender['user']['rpg_amiral']))); //attaquue
-                    $defTech    = (1 + (0.1 * ($defender['user']['defence_tech']) + (0.05 * $defender['user']['rpg_amiral']))); //bouclier
-                    $shieldTech = (1 + (0.1 * ($defender['user']['shield_tech']) + (0.05 * $defender['user']['rpg_amiral']))); //coque
+                    $attTech    = (1 + (0.1 * ($defender['user']['military_tech']))); //attaquue
+                    $defTech    = (1 + (0.1 * ($defender['user']['defence_tech']))); //bouclier
+                    $shieldTech = (1 + (0.1 * ($defender['user']['shield_tech']))); //coque
 
                     $defenders[$fleetID]['techs'] = array($shieldTech, $defTech, $attTech);
 
@@ -112,7 +99,7 @@ function calculateAttack (&$attackers, &$defenders)
                     $thisDef    = $amount * ($CombatCaps[$element]['shield']) * $defTech ; //bouclier
                     $thisShield    = $amount * ($pricelist[$element]['metal'] + $pricelist[$element]['crystal']) / 10 * $shieldTech; //coque
 
-                    if ($element == 407 || $element == 408 || $element == 409) $thisAtt = 0;
+                    if ($element == 407 || $element == 408 ) $thisAtt = 0;
 
                     $defArray[$fleetID][$element] = array('def' => $thisDef, 'shield' => $thisShield, 'att' => $thisAtt);
 
@@ -306,8 +293,16 @@ function calculateAttack (&$attackers, &$defenders)
                     $totalResourcePoints['defender'] -= $pricelist[$element]['metal'] * $amount ;
                     $totalResourcePoints['defender'] -= $pricelist[$element]['crystal'] * $amount ;
 
-                    $lost = $originalDef[$element] - $amount;
-                    $giveback = round($lost * (rand(70*0.8, 70*1.2) / 100));
+                	if ( $user['rpg_technocrate'] == 1 )
+                	{
+						$lost = floor ( ( $originalDef[$element] - $amount ) / ENGINEER_DEFENSE );
+                	}
+                	else
+                	{
+                		$lost = $originalDef[$element] - $amount;
+                	}
+
+                	$giveback = round ( $lost * ( rand ( 70 * 0.8 , 70 * 1.2 ) / 100 ) );
                     $defenders[$fleetID]['def'][$element] += $giveback;
                     $resourcePointsDefenderDefs['metal'] += $pricelist[$element]['metal'] * ($lost - $giveback) ;
                     $resourcePointsDefenderDefs['crystal'] += $pricelist[$element]['crystal'] * ($lost - $giveback) ;
@@ -316,12 +311,13 @@ function calculateAttack (&$attackers, &$defenders)
             }
         }
 
-
-        $totalLost = array('att' => $totalResourcePoints['attacker'], 'def' => $totalResourcePoints['defender']);
-        $debAttMet = ($resourcePointsAttacker['metal'] * ($game_config['Fleet_Cdr'] / 100));
-        $debAttCry = ($resourcePointsAttacker['crystal'] * ($game_config['Fleet_Cdr'] / 100));
-        $debDefMet = ($resourcePointsDefender['metal'] * ($game_config['Fleet_Cdr'] / 100)) + ($resourcePointsDefenderDefs['metal'] * ($game_config['Defs_Cdr'] / 100));
-        $debDefCry = ($resourcePointsDefender['crystal'] * ($game_config['Fleet_Cdr'] / 100)) + ($resourcePointsDefenderDefs['crystal'] * ($game_config['Defs_Cdr'] / 100));
+		$game_fleet_cdr	=	read_config ( 'fleet_cdr' );
+		$game_defs_cdr	=	read_config ( 'defs_cdr' );
+        $totalLost 		= array('att' => $totalResourcePoints['attacker'], 'def' => $totalResourcePoints['defender']);
+        $debAttMet 		= ($resourcePointsAttacker['metal'] * ($game_fleet_cdr / 100));
+        $debAttCry 		= ($resourcePointsAttacker['crystal'] * ($game_fleet_cdr / 100));
+        $debDefMet 		= ($resourcePointsDefender['metal'] * ($game_fleet_cdr / 100)) + ($resourcePointsDefenderDefs['metal'] * ($game_defs_cdr / 100));
+        $debDefCry 		= ($resourcePointsDefender['crystal'] * ($game_fleet_cdr / 100)) + ($resourcePointsDefenderDefs['crystal'] * ($game_defs_cdr / 100));
 
         return array('won' => $won, 'debree' => array('att' => array($debAttMet, $debAttCry), 'def' => array($debDefMet, $debDefCry)), 'rw' => $rounds, 'lost' => $totalLost);
     }
diff --git a/includes/functions/formatCR.php b/includes/functions/formatCR.php
index 98d4428..8b40ee0 100644
--- a/includes/functions/formatCR.php
+++ b/includes/functions/formatCR.php
@@ -1,23 +1,10 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
diff --git a/styles/skins/New-Year!/img/index.html b/includes/functions/index.html
similarity index 100%
rename from styles/skins/New-Year!/img/index.html
rename to includes/functions/index.html
diff --git a/styles/skins/New-Year!/index.html b/includes/index.html
similarity index 100%
rename from styles/skins/New-Year!/index.html
rename to includes/index.html
diff --git a/includes/msg_replace.php b/includes/msg_replace.php
deleted file mode 100644
index e073882..0000000
--- a/includes/msg_replace.php
+++ /dev/null
@@ -1,70 +0,0 @@
-	<?php
-	$msg=preg_replace("#\[a=(ft|https?://)(.+)\](.+)\[/a\]#isU", "<a href=\"$1$2\" target=\"_blank\">$3</a>", $msg);
-	$msg=preg_replace("#\[b\](.+)\[/b\]#isU","<b>$1</b>",$msg);
-	$msg=preg_replace("#\[i\](.+)\[/i\]#isU","<i>$1</i>",$msg);
-	$msg=preg_replace("#\[u\](.+)\[/u\]#isU","<u>$1</u>",$msg);
-	$msg=preg_replace("#\[c=(white|Blue|yellow|green|pink|red|orange|lime|BlueViolet|cyan)\](.+)\[/c\]#isU","<font color=\"$1\">$2</font>",$msg);
-
-	// Les smileys avec leurs raccourcis
-	$msg=preg_replace("#:agr:#isU","<img src=\"styles/images/smileys/aggressive.gif\" align=\"absmiddle\" title=\":agr:\" alt=\":agr:\">",$msg);
-	$msg=preg_replace("#:angel:#isU","<img src=\"styles/images/smileys/angel.gif\" align=\"absmiddle\" title=\":angel:\" alt=\":angel:\">",$msg);
-	$msg=preg_replace("#:bad:#isU","<img src=\"styles/images/smileys/bad.gif\" align=\"absmiddle\" title=\":bad:\" alt=\":bad:\">",$msg);
-	$msg=preg_replace("#:blink:#isU","<img src=\"styles/images/smileys/blink.gif\" align=\"absmiddle\" title=\":blink:\" alt=\":blink:\">",$msg);
-	$msg=preg_replace("#:blush:#isU","<img src=\"styles/images/smileys/blush.gif\" align=\"absmiddle\" title=\":blush:\" alt=\":blush:\">",$msg);
-	$msg=preg_replace("#:bomb:#isU","<img src=\"styles/images/smileys/bomb.gif\" align=\"absmiddle\" title=\":bomb:\" alt=\":bomb:\">",$msg);
-	$msg=preg_replace("#:clap:#isU","<img src=\"styles/images/smileys/clapping.gif\" align=\"absmiddle\" title=\":clap:\" alt=\":clap:\">",$msg);
-	$msg=preg_replace("#:cool:#isU","<img src=\"styles/images/smileys/cool.gif\" align=\"absmiddle\" title=\":cool:\" alt=\":cool:\">",$msg);
-	$msg=preg_replace("#:c:#isU","<img src=\"styles/images/smileys/cray.gif\" align=\"absmiddle\" title=\":c:\" alt=\":c:\">",$msg);
-	$msg=preg_replace("#:crz:#isU","<img src=\"styles/images/smileys/crazy.gif\" align=\"absmiddle\" title=\":crz:\" alt=\":crz:\">",$msg);
-	$msg=preg_replace("#:diablo:#isU","<img src=\"styles/images/smileys/diablo.gif\" align=\"absmiddle\" title=\":diablo:\" alt=\":diablo:\">",$msg);
-	$msg=preg_replace("#:cool2:#isU","<img src=\"styles/images/smileys/dirol.gif\" align=\"absmiddle\" title=\":cool2:\" alt=\":cool2:\">",$msg);
-	$msg=preg_replace("#:fool:#isU","<img src=\"styles/images/smileys/fool.gif\" align=\"absmiddle\" title=\":fool:\" alt=\":fool:\">",$msg);
-	$msg=preg_replace("#:rose:#isU","<img src=\"styles/images/smileys/give_rose.gif\" align=\"absmiddle\" title=\":rose:\" alt=\":rose:\">",$msg);
-	$msg=preg_replace("#:good:#isU","<img src=\"styles/images/smileys/good.gif\" align=\"absmiddle\" title=\":good:\" alt=\":good:\">",$msg);
-	$msg=preg_replace("#:huh:#isU","<img src=\"styles/images/smileys/huh.gif\" align=\"absmiddle\" title=\":huh:\" alt=\":|\">",$msg);
-	$msg=preg_replace("#:D:#isU","<img src=\"styles/images/smileys/lol.gif\" align=\"absmiddle\" title=\":D\" alt=\":D\">",$msg);
-	$msg=preg_replace("#:/#isU","<img src=\"styles/images/smileys/mellow.gif\" align=\"absmiddle\" title=\":/\" alt=\":/\">",$msg);
- 	$msg=preg_replace("#:yu#isU","<img src=\"styles/images/smileys/yu.gif\" align=\"absmiddle\" title=\":yu\" alt=\":yu\">",$msg);
-	$msg=preg_replace("#:unknw:#isU","<img src=\"styles/images/smileys/unknw.gif\" align=\"absmiddle\" title=\":unknw:\" alt=\":unknw:\">",$msg);
- 	$msg=preg_replace("#:sad#isU","<img src=\"styles/images/smileys/sad.gif\" align=\"absmiddle\" title=\":(\" alt=\":(\">",$msg);
-	$msg=preg_replace("#:smile#isU","<img src=\"styles/images/smileys/smile.gif\" align=\"absmiddle\" title=\":)\" alt=\":)\">",$msg); 
-	$msg=preg_replace("#:shok:#isU","<img src=\"styles/images/smileys/shok.gif\" align=\"absmiddle\" title=\":shok:\" alt=\":shok:\">",$msg);
-	$msg=preg_replace("#:rofl#isU","<img src=\"styles/images/smileys/rofl.gif\" align=\"absmiddle\" title=\":rofl\" alt=\":rofl\">",$msg);
-	$msg=preg_replace("#:eye#isU","<img src=\"styles/images/smileys/blackeye.gif\" align=\"absmiddle\" title=\":eye\" alt=\":eye\">",$msg);
- 	$msg=preg_replace("#:p#isU","<img src=\"styles/images/smileys/tongue.gif\" align=\"absmiddle\" title=\":p\" alt=\":p\">",$msg);
- 	$msg=preg_replace("#;\)#isU","<img src=\"styles/images/smileys/wink.gif\" align=\"absmiddle\" title=\";)\" alt=\";)\">",$msg); 
-	$msg=preg_replace("#:yahoo:#isU","<img src=\"styles/images/smileys/yahoo.gif\" align=\"absmiddle\" title=\":yahoo:\" alt=\":yahoo:\">",$msg);
-	$msg=preg_replace("#:tratata:#isU","<img src=\"styles/images/smileys/mill.gif\" align=\"absmiddle\" title=\":tratata:\" alt=\":tratata:\">",$msg);
-	$msg=preg_replace("#:fr#isU","<img src=\"styles/images/smileys/friends.gif\" align=\"absmiddle\" title=\":fr\" alt=\":fr\">",$msg);
-	$msg=preg_replace("#:dr#isU","<img src=\"styles/images/smileys/drinks.gif\" align=\"absmiddle\" title=\":dr\" alt=\":dr\">",$msg);
-	$msg=preg_replace("#:tease:#isU","<img src=\"styles/images/smileys/tease.gif\" align=\"absmiddle\" title=\":tease:\" alt=\":tease:\">",$msg);  
-	
-	$msg=preg_replace("#:mail1:#isU","<img src=\"styles/images/smileys/mail1.gif\" align=\"absmiddle\" title=\":mail1:\" alt=\":mail1:\">",$msg);  
-	$msg=preg_replace("#:beee:#isU","<img src=\"styles/images/smileys/beee.gif\" align=\"absmiddle\" title=\":beee:\" alt=\":beee:\">",$msg);  
-	$msg=preg_replace("#:preved:#isU","<img src=\"styles/images/smileys/preved.gif\" align=\"absmiddle\" title=\":preved:\" alt=\":preved:\">",$msg);  
-	$msg=preg_replace("#:posle:#isU","<img src=\"styles/images/smileys/posle.gif\" align=\"absmiddle\" title=\":posle:\" alt=\":posle:\">",$msg);  
-	$msg=preg_replace("#:nono:#isU","<img src=\"styles/images/smileys/nono.gif\" align=\"absmiddle\" title=\":nono:\" alt=\":nono:\">",$msg);  
-	$msg=preg_replace("#:scratch:#isU","<img src=\"styles/images/smileys/scratch.gif\" align=\"absmiddle\" title=\":scratch:\" alt=\":scratch:\">",$msg);
-	
-	$msg=preg_replace("#:bc:#isU","<img src=\"styles/images/smileys/bc.gif\" align=\"absmiddle\" title=\":bc:\" alt=\":bc:\">",$msg);
-	$msg=preg_replace("#:be:#isU","<img src=\"styles/images/smileys/be.gif\" align=\"absmiddle\" title=\":be:\" alt=\":be:\">",$msg);
-	$msg=preg_replace("#:bh:#isU","<img src=\"styles/images/smileys/bh.gif\" align=\"absmiddle\" title=\":bh:\" alt=\":bh:\">",$msg);
-	$msg=preg_replace("#:bi:#isU","<img src=\"styles/images/smileys/bi.gif\" align=\"absmiddle\" title=\":bi:\" alt=\":bi:\">",$msg);	
-	$msg=preg_replace("#:bh:#isU","<img src=\"styles/images/smileys/bh.gif\" align=\"absmiddle\" title=\":bh:\" alt=\":bh:\">",$msg);
-	$msg=preg_replace("#:bk:#isU","<img src=\"styles/images/smileys/bk.gif\" align=\"absmiddle\" title=\":bk:\" alt=\":bk:\">",$msg);		
-	$msg=preg_replace("#:bl:#isU","<img src=\"styles/images/smileys/bl.gif\" align=\"absmiddle\" title=\":bl:\" alt=\":bl:\">",$msg);	
-	$msg=preg_replace("#:br:#isU","<img src=\"styles/images/smileys/br.gif\" align=\"absmiddle\" title=\":br:\" alt=\":br:\">",$msg);	
-	$msg=preg_replace("#:bx:#isU","<img src=\"styles/images/smileys/bx.gif\" align=\"absmiddle\" title=\":bx:\" alt=\":bx:\">",$msg);		
-	$msg=preg_replace("#:cc:#isU","<img src=\"styles/images/smileys/cc.gif\" align=\"absmiddle\" title=\":cc:\" alt=\":cc:\">",$msg);	
-	$msg=preg_replace("#:cr:#isU","<img src=\"styles/images/smileys/cr.gif\" align=\"absmiddle\" title=\":cr:\" alt=\":cr:\">",$msg);		
-	$msg=preg_replace("#:cg:#isU","<img src=\"styles/images/smileys/cg.gif\" align=\"absmiddle\" title=\":cg:\" alt=\":cg:\">",$msg);		
-	$msg=preg_replace("#:ci:#isU","<img src=\"styles/images/smileys/ci.gif\" align=\"absmiddle\" title=\":ci:\" alt=\":ci:\">",$msg);	
-	$msg=preg_replace("#:co:#isU","<img src=\"styles/images/smileys/co.gif\" align=\"absmiddle\" title=\":co:\" alt=\":co:\">",$msg);	
-	
-	
-	
-	
-	
-	
-	
-	?>
\ No newline at end of file
diff --git a/includes/pages/ShowBannedPage.php b/includes/pages/ShowBannedPage.php
deleted file mode 100644
index 055272f..0000000
--- a/includes/pages/ShowBannedPage.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-if(!defined('INSIDE')){ die(header("location:../../"));}
-
-function ShowBannedPage()
-{
-	global $lang;
-
-	$parse = $lang;
-	$query = doquery("SELECT * FROM {{table}} ORDER BY `id`;",'banned');
-
-	$i=0;
-
-	while($u = mysql_fetch_array($query))
-	{
-		$parse['banned'] .=
-	        "<tr><td class=b><center><b>".$u[1]."</center></td></b>".
-		"<td class=b><center><b>".$u[2]."</center></b></td>".
-		"<td class=b><center><b>".gmdate("d/m/Y G:i:s",$u[4])."</center></b></td>".
-		"<td class=b><center><b>".gmdate("d/m/Y G:i:s",$u[5])."</center></b></td>".
-		"<td class=b><center><b>".$u[6]."</center></b></td></tr>";
-		$i++;
-	}
-
-	if ($i == 0)
-		$parse['banned'] .= "<tr><th class=b colspan=6>".$lang['bn_no_players_banned']."</th></tr>";
-	else
-	  	$parse['banned'] .= "<tr><th class=b colspan=6>".$lang['bn_exists'] . $i . $lang['bn_players_banned']."</th></tr>";
-
-	return display(parsetemplate(gettemplate('banned_body'), $parse));
-}
-?>
\ No newline at end of file
diff --git a/includes/pages/ShowBuddyPage.php b/includes/pages/ShowBuddyPage.php
deleted file mode 100644
index 83f2ae3..0000000
--- a/includes/pages/ShowBuddyPage.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-if(!defined('INSIDE')){ die(header("location:../../"));}
-
-function ShowBuddyPage($CurrentUser)
-{
-	global $lang;
-
-	foreach($_GET as $name => $value)
-	{
-		$$name = intval( $value );
-	}
-	switch($mode)
-	{
-		case 1:
-			switch($sm)
-			{
-				case 1:
-					doquery("DELETE FROM {{table}} WHERE `id`='".intval($bid)."'","buddy");
-					header("location:game.php?page=buddy");
-				break;
-
-				case 2:
-					doquery("UPDATE {{table}} SET `active` = '1' WHERE `id` ='".intval($bid)."'","buddy");
-					header("location:game.php?page=buddy");
-				break;
-
-				case 3:
-					$test = doquery("SELECT `id` FROM {{table}} WHERE `sender`='".intval($CurrentUser[id])."' AND `owner`='".intval($_POST)."' OR `owner`='".intval($CurrentUser[id])."' AND `sender`='".intval($_POST[u])."'","buddy",true);
-					if($test == array())
-					{
-						$text = mysql_escape_string( strip_tags( $_POST['text'] ) );
-						doquery("INSERT INTO {{table}} SET `sender`='".intval($CurrentUser[id])."' ,`owner`='".intval($_POST[u])."' ,`active`='0' ,`text`='{$text}'","buddy");
-						header("location:game.php?page=buddy");
-					}
-					else
-					{
-						message($lang['bu_request_exists'], 'game.php?page=buddy',2 );
-					}
-				break;
-			}
-		break;
-
-		case 2:
-			if($u==$CurrentUser['id'])
-			{
-				message($lang['bu_cannot_request_yourself'],'game.php?page=buddy',2);
-			}
-			else
-			{
-				$player=doquery("SELECT `username` FROM {{table}} WHERE `id`='".intval($u)."'","users",true);
-				$page="<script src=scripts/cntchar.js type=text/javascript></script>
-				<center>
-				<form action=game.php?page=buddy&mode=1&sm=3 method=post>
-				<input type=hidden name=u value={$u}>
-				<div id=\"content\"><table width=520>
-				<tr><td class=c colspan=2>".$lang['bu_request_message']."</td></tr>
-				<tr><th>".$lang['bu_player']."</th><th>{$player[username]}</th></tr>
-				<tr><th>".$lang['bu_request_text']." (<span id=cntChars>0</span> / 5000 ".$lang['bu_characters'].")</th><th><textarea name=text cols=60 rows=10 onKeyUp=javascript:cntchar(5000)></textarea></th></tr>
-				<tr><td class=c><a href=javascript:back();>".$lang['bu_back']."</a></td><td class=c><input type=submit value=\"".$lang['bu_send']."\"></td></tr>
-				</table></form></div>";
-				display ($page);
-			}
-		break;
-		default:
-
-			$liste=doquery("SELECT * FROM {{table}} WHERE `sender`='".intval($CurrentUser[id])."' OR `owner`='".intval($CurrentUser[id])."'","buddy");
-
-			while($buddy	=	mysql_fetch_assoc($liste))
-			{
-				if($buddy['active']	==0)
-				{
-					if($buddy['sender']==$CurrentUser['id'])
-					{
-						$owner=doquery("SELECT `id`, `username`, `galaxy`, `system`, `planet`,`ally_id`, `ally_name` FROM {{table}} WHERE `id`='".intval($buddy[owner])."'","users",true);
-						$myrequest.="<tr><th><a href=game.php?page=messages&mode=write&id={$owner[id]}>{$owner[username]}</a></th>
-						<th><a href=game.php?page=alliance&mode=ainfo&a={$owner[ally_id]}>{$owner[ally_name]}</a></th>
-						<th><a href=game.php?page=galaxy&mode=3&galaxy={$owner[galaxy]}&system={$owner[system]}>{$owner[galaxy]}:{$owner[system]}:{$owner[planet]}</a></th>
-						<th>{$buddy[text]}</th>
-						<th><a href=game.php?page=buddy&mode=1&sm=1&bid={$buddy[id]}>".$lang['bu_cancel_request']."</a></th></tr>";
-					}
-					else
-					{
-						$sender=doquery("SELECT `id`, `username`, `galaxy`, `system`, `planet`,`ally_id`, `ally_name` FROM {{table}} WHERE `id`='".intval($buddy[sender])."'","users",true);
-						$outrequest.="<tr><th><a href=game.php?page=messages&mode=write&id={$sender[id]}>{$sender[username]}</a></th>
-						<th><a href=game.php?page=alliance&mode=ainfo&a={$sender[ally_id]}>{$sender[ally_name]}</a></th>
-						<th><a href=game.php?page=galaxy&mode=3&galaxy={$sender[galaxy]}&system={$sender[system]}>{$sender[galaxy]}:{$sender[system]}:{$sender[planet]}</a></th>
-						<th>{$buddy[text]}</th>
-						<th><a href=game.php?page=buddy&mode=1&sm=2&bid={$buddy[id]}>".$lang['bu_accept']."</a><br><a href=game.php?page=buddy&mode=1&sm=1&bid={$buddy[id]}>".$lang['bu_decline']."</a></th></tr>";
-					}
-				}
-				else
-				{
-					if($buddy['sender']==$CurrentUser['id'])
-						$owner = doquery("SELECT `id`, `username`, `onlinetime`, `galaxy`, `system`, `planet`,`ally_id`, `ally_name` FROM {{table}} WHERE `id`='".intval($buddy[owner])."'","users",true);
-					else
-						$owner = doquery("SELECT `id`, `username`, `onlinetime`, `galaxy`, `system`, `planet`,`ally_id`, `ally_name` FROM {{table}} WHERE `id`='".intval($buddy[sender])."'","users",true);
-
-						$myfriends.="<tr><th><a href=game.php?page=messages&mode=write&id={$owner[id]}>{$owner[username]}</a></th>
-						<th><a href=game.php?page=alliance&mode=ainfo&a={$owner[ally_id]}>{$owner[ally_name]}</a></th>
-						<th><a href=game.php?page=galaxy&mode=3&galaxy={$owner[galaxy]}&system={$owner[system]}>{$owner[galaxy]}:{$owner[system]}:{$owner[planet]}</a></th>
-						<th><font color=".(( $owner["onlinetime"] + 60 * 10 >= time() )?"lime>".$lang['bu_connected']."":(( $owner["onlinetime"] + 60 * 15 >= time() )?"yellow>".$lang['bu_fifteen_minutes']."":"red>".$lang['bu_disconnected'].""))."</font></th>
-						<th><a href=game.php?page=buddy&mode=1&sm=1&bid={$buddy[id]}>".$lang['bu_delete']."</a></th></tr>";
-				}
-			}
-
-			$myfriends=($myfriends!='')?$myfriends:'<th colspan=6></th>';
-			$nor='<th colspan=6></th>';
-			$outrequest=($outrequest!='')?$outrequest:$nor;
-			$myrequest=($myrequest!='')?$myrequest:$nor;
-			$page="<br/><div id=\"content\"><table width=520>
-			<tr><td class=c colspan=6>".$lang['bu_buddy_list']."</td></tr>
-			<tr><td class=c colspan=6><center>".$lang['bu_requests']."</a></td></tr>
-			<tr><td class=c>".$lang['bu_player']."</td>
-			<td class=c>".$lang['bu_alliance']."</td>
-			<td class=c>".$lang['bu_coords']."</td>
-			<td class=c>".$lang['bu_text']."</td>
-			<td class=c>".$lang['bu_action']."</td>
-			</tr>
-			<tr>{$outrequest}</tr>
-			<tr><td class=c colspan=6><center>".$lang['bu_my_requests']."</a></td></tr>
-			<tr><td class=c>".$lang['bu_player']."</td>
-			<td class=c>".$lang['bu_alliance']."</td>
-			<td class=c>".$lang['bu_coords']."</td>
-			<td class=c>".$lang['bu_text']."</td>
-			<td class=c>".$lang['bu_action']."</td>
-			</tr>
-			<tr>{$myrequest}</tr>
-			<tr><td class=c colspan=6><center>".$lang['bu_partners']."</a></td></tr>
-			<tr><td class=c>".$lang['bu_player']."</td>
-			<td class=c>".$lang['bu_alliance']."</td>
-			<td class=c>".$lang['bu_coords']."</td>
-			<td class=c>".$lang['bu_estate']."</td>
-			<td class=c>".$lang['bu_action']."</td>
-			</tr>
-			<tr>{$myfriends}</tr>
-			</table></div>";
-
-			display ($page);
-
-		break;
-	}
-}
-?>
\ No newline at end of file
diff --git a/includes/pages/ShowChangelogPage.php b/includes/pages/ShowChangelogPage.php
deleted file mode 100644
index f68b7b3..0000000
--- a/includes/pages/ShowChangelogPage.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-if(!defined('INSIDE')){ die(header("location:../../"));}
-
-function ShowChangelogPage()
-{
-	global $lang;
-
-	includeLang('CHANGELOG');
-
-	foreach($lang['changelog'] as $a => $b)
-	{
-		$parse['version_number'] = $a;
-		$parse['description'] = nl2br($b);
-
-		$body .= parsetemplate(gettemplate('changelog_table'), $parse);
-	}
-
-	$parse 			= $lang;
-	$parse['body'] 	= $body;
-
-	return display(parsetemplate(gettemplate('changelog_body'), $parse));
-}
-?>
\ No newline at end of file
diff --git a/includes/pages/ShowFleet1Page.php b/includes/pages/ShowFleet1Page.php
deleted file mode 100644
index 887cad9..0000000
--- a/includes/pages/ShowFleet1Page.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-function ShowFleet1Page($CurrentUser, $CurrentPlanet)
-{
-	global $resource, $pricelist, $reslist, $phpEx, $lang;
-
-	$parse = $lang;
-	$speed = array(10 => 100,
-					9 => 90,
-					8 => 80,
-					7 => 70,
-					6 => 60,
-					5 => 50,
-					4 => 40,
-					3 => 30,
-					2 => 20,
-					1 => 10,
-					);
-
-	$g = $_POST['galaxy'];
-	$s = $_POST['system'];
-	$p = $_POST['planet'];
-	$t = $_POST['planet_type'];
-
-	if (!$g)
-		$g = $CurrentPlanet['galaxy'];
-	if (!$s)
-		$s = $CurrentPlanet['system'];
-	if (!$p)
-		$p = $CurrentPlanet['planet'];
-	if (!$t)
-		$t = $CurrentPlanet['planet_type'];
-
-	$FleetHiddenBlock  = "";
-	foreach ($reslist['fleet'] as $n => $i)
-	{
-		if ($i > 201 && $i < 217 && $_POST["ship$i"] > "0")
-		{
-			if (($_POST["ship$i"] > $CurrentPlanet[$resource[$i]]) OR (!ctype_digit( $_POST["ship$i"] )))
-				header("location:game.php?page=fleet");
-			else
-			{
-				$fleet['fleetarray'][$i]   = $_POST["ship$i"];
-				$fleet['fleetlist']       .= $i . "," . $_POST["ship$i"] . ";";
-				$fleet['amount']          += $_POST["ship$i"];
-				$FleetHiddenBlock         .= "<input type=\"hidden\" name=\"consumption". $i ."\" value=\"". GetShipConsumption ( $i, $CurrentUser ) ."\" />";
-				$FleetHiddenBlock         .= "<input type=\"hidden\" name=\"speed". $i ."\"       value=\"". GetFleetMaxSpeed ( "", $i, $CurrentUser ) ."\" />";
-				$FleetHiddenBlock         .= "<input type=\"hidden\" name=\"capacity". $i ."\"    value=\"". $pricelist[$i]['capacity'] ."\" />";
-				$FleetHiddenBlock         .= "<input type=\"hidden\" name=\"ship". $i ."\"        value=\"". $_POST["ship$i"] ."\" />";
-				$speedalls[$i]             = GetFleetMaxSpeed( "", $i, $CurrentUser);
-			}
-		}
-	}
-
-	if (!$fleet['fleetlist'])
-		header("location:game." . $phpEx . "?page=fleet");
-	else
-		$speedallsmin = min($speedalls);
-
-	$parse['fleetblock'] 			= $FleetHiddenBlock;
-	$parse['speedallsmin'] 			= $speedallsmin;
-	$parse['fleetarray'] 			= str_rot13(base64_encode(serialize($fleet['fleetarray'])));
-	$parse['galaxy'] 				= $CurrentPlanet['galaxy'];
-	$parse['system'] 				= $CurrentPlanet['system'];
-	$parse['planet'] 				= $CurrentPlanet['planet'];
-	$parse['galaxy_post'] 			= intval($_POST['galaxy']);
-	$parse['system_post'] 			= intval($_POST['system']);
-	$parse['planet_post'] 			= intval($_POST['planet']);
-	$parse['speedfactor'] 			= GetGameSpeedFactor();
-	$parse['planet_type'] 			= $CurrentPlanet['planet_type'];
-	$parse['metal'] 				= floor($CurrentPlanet['metal']);
-	$parse['crystal'] 				= floor($CurrentPlanet['crystal']);
-	$parse['deuterium'] 			= floor($CurrentPlanet['deuterium']);
-	$parse['g'] 					= $g;
-	$parse['s'] 					= $s;
-	$parse['p'] 					= $p;
-	$parse['options_planettype']   .= "<option value=\"1\"". (($t == 1) ? " SELECTED" : "" ) .">".$lang['fl_planet']."</option>";
-	$parse['options_planettype']   .= "<option value=\"2\"". (($t == 2) ? " SELECTED" : "" ) .">".$lang['fl_debris']."</option>";
-	$parse['options_planettype']   .= "<option value=\"3\"". (($t == 3) ? " SELECTED" : "" ) .">".$lang['fl_moon']."</option>";
-
-	foreach ($speed as $a => $b)
-	{
-		$parse['options'] .= "<option value=\"".$a."\">".$b."</option>";
-	}
-
-	if ($CurrentUser['fleet_shortcut'])
-	{
-		$scarray = explode("\r\n", $CurrentUser['fleet_shortcut']);
-		$i = 0;
-		foreach ($scarray as $a => $b)
-		{
-			if ($b != "")
-			{
-				$c = explode(',', $b);
-				if ($i == 0)
-					$ShortCut .= "<tr height=\"20\">";
-
-				$ShortCut .= "<th><a href=\"javascript:setTarget(". $c[1] .",". $c[2] .",". $c[3] .",". $c[4] ."); shortInfo();\"";
-				$ShortCut .= ">". $c[0] ." ". $c[1] .":". $c[2] .":". $c[3] ." ";
-
-				if ($c[4] == 1)
-					$ShortCut .= $lang['fl_planet_shortcut'];
-				elseif ($c[4] == 2)
-					$ShortCut .= $lang['fl_debris_shortcut'];
-				elseif ($c[4] == 3)
-					$ShortCut .= $lang['fl_moon_shortcut'];
-
-				$ShortCut .= "</a></th>";
-
-				if ($i == 1)
-					$ShortCut .= "</tr>";
-
-				if ($i == 1)
-					$i = 0;
-				else
-					$i = 1;
-			}
-		}
-		if ($i == 1)
-			$ShortCut .= "<th></th></tr>";
-	}
-	else
-	{
-		$ShortCut .= "<tr height=\"20\">";
-		$ShortCut .= "<th colspan=\"2\">".$lang['fl_no_shortcuts']."</th>";
-		$ShortCut .= "</tr>";
-	}
-
-	$parse['shortcut'] 	= $ShortCut;
-	$kolonien      		= SortUserPlanets($CurrentUser);
-
-	if (mysql_num_rows($kolonien) > 1)
-	{
-		$i = 0;
-		$w = 0;
-		$tr = true;
-		while ($row = mysql_fetch_array($kolonien))
-		{
-			if ($w == 0 && $tr)
-			{
-				$ColonyList .= "<tr height=\"20\">";
-				$tr = false;
-			}
-
-			if ($w == 2)
-			{
-				$ColonyList .= "</tr>";
-				$w = 0;
-				$tr = true;
-			}
-
-			if ($row['planet_type'] == 3)
-				$row['name'] .= " ". $lang['fl_moon_shortcut'];
-
-			if ($CurrentPlanet['galaxy'] == $row['galaxy'] && $CurrentPlanet['system'] == $row['system'] &&
-				$CurrentPlanet['planet'] == $row['planet'] && $CurrentPlanet['planet_type'] == $row['planet_type'])
-			{/* HERE NOTHING HAPPENS.. =p*/}
-			else
-			{
-				$ColonyList .= "<th><a href=\"javascript:setTarget(". $row['galaxy'] .",". $row['system'] .",". $row['planet'] .",". $row['planet_type'] ."); shortInfo();\">". $row['name'] ." ". $row['galaxy'] .":". $row['system'] .":". $row['planet'] ."</a></th>";
-				$w++;
-				$i++;
-			}
-		}
-
-		if ($i % 2 != 0)
-			$ColonyList .= "<th>&nbsp;</th></tr>";
-		elseif ($w == 2)
-			$ColonyList .= "</tr>";
-	}
-	else
-		$ColonyList .= "<th colspan=\"2\">".$lang['fl_no_colony']."</th>";
-
-	$parse['colonylist'] = $ColonyList;
-
-	$aks_madnessred = doquery("SELECT * FROM {{table}} ;", 'aks');
-
-	$aks_code_mr = '';
-	$aks_invited_mr = '';
-
-	while($row = mysql_fetch_array($aks_madnessred))
-	{
-		$members = explode(",", $row['eingeladen']);
-		foreach($members as $a => $b)
-		{
-			if ($b == $CurrentUser['id'])
-			{
-				$aks_fleets_mr .= "<tr height=\"20\">";
-				$aks_fleets_mr .= "<th colspan=\"2\">";
-				$aks_fleets_mr .= "<a href=\"javascript:";
-				$aks_fleets_mr .= "setTarget(". $row['galaxy'] .",". $row['system'] .",". $row['planet'] ."); ";
-				$aks_fleets_mr .= "shortInfo(); ";
-				$aks_fleets_mr .= "setACS(". $row['id'] ."); ";
-				$aks_fleets_mr .= "setACS_target('"."g". $row['galaxy'] ."s". $row['system'] ."p". $row['planet'] ."t". $row['planet_type'] ."');";
-				$aks_fleets_mr .= "\">";
-				$aks_fleets_mr .= "(".$row['name'].")";
-				$aks_fleets_mr .= "</a>";
-				$aks_fleets_mr .= "</th>";
-				$aks_fleets_mr .= "</tr>";
-			}
-		}
-	}
-
-	$parse['asc'] 				= $aks_fleets_mr;
-	$parse['maxepedition'] 		= $_POST['maxepedition'];
-	$parse['curepedition'] 		= $_POST['curepedition'];
-	$parse['target_mission'] 	= $_POST['target_mission'];
-
-	display(parsetemplate(gettemplate('fleet/fleet1_table'), $parse));
-}
-?>
\ No newline at end of file
diff --git a/includes/pages/ShowFleet2Page.php b/includes/pages/ShowFleet2Page.php
deleted file mode 100644
index 2dc74bf..0000000
--- a/includes/pages/ShowFleet2Page.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-function ShowFleet2Page($CurrentUser, $CurrentPlanet)
-{
-	global $resource, $pricelist, $reslist, $phpEx, $lang;
-
-	$parse			= $lang;
-	$galaxy     	= intval($_POST['galaxy']);
-	$system     	= intval($_POST['system']);
-	$planet     	= intval($_POST['planet']);
-	$planettype 	= intval($_POST['planettype']);
-	$fleet_group_mr = intval($_POST['fleet_group']);
-
-	$YourPlanet 	= false;
-	$UsedPlanet 	= false;
-	$select       	= doquery("SELECT `id_owner`,`galaxy`,`system`,`planet`,`planet_type` FROM `{{table}}`", "planets");
-
-	while ($row = mysql_fetch_array($select))
-	{
-		if ($galaxy == $row['galaxy'] && $system == $row['system'] && $planet == $row['planet'] && $planettype == $row['planet_type'])
-		{
-			if ($row['id_owner'] == $CurrentUser['id'])
-			{
-				$YourPlanet = true;
-				$UsedPlanet = true;
-			}
-			else
-				$UsedPlanet = true;
-
-			break;
-		}
-	}
-
-	if ($_POST['planettype'] == 2)
-	{
-		if ($_POST['ship209'] >= 1)
-			$missiontype = array(8 => $lang['type_mission'][8]);
-		else
-			$missiontype = array();
-	}
-	elseif ($_POST['planettype'] == 1 or $_POST['planettype'] == 3)
-	{
-		if ($_POST['ship208'] >= 1 && !$UsedPlanet)
-			$missiontype = array(7 => $lang['type_mission'][7]);
-		elseif ($_POST['ship210'] >= 1 && !$YourPlanet)
-			$missiontype = array(6 => $lang['type_mission'][6]);
-
-		if ($_POST['ship202'] >= 1 ||
-			$_POST['ship203'] >= 1 ||
-			$_POST['ship204'] >= 1 ||
-			$_POST['ship205'] >= 1 ||
-			$_POST['ship206'] >= 1 ||
-			$_POST['ship207'] >= 1 ||
-			$_POST['ship210'] >= 1 ||
-			$_POST['ship211'] >= 1 ||
-			$_POST['ship213'] >= 1 ||
-			$_POST['ship214'] >= 1 ||
-			$_POST['ship215'] >= 1 ||
-			$_POST['ship216'] >= 1 ||
-			$_POST['ship217'] >= 1 ||
-			$_POST['ship218'] >= 1 ||
-			$_POST['ship219'] >= 1 ||
-			$_POST['ship220'] >= 1 ||
-			$_POST['ship221'] >= 1 ||
-			$_POST['ship222'] >= 1 ||
-			$_POST['ship223'] >= 1 ||
-			$_POST['ship224'] >= 1 ||
-			$_POST['ship225'] >= 1 ||
-		$_POST['ship226'] >= 1) {
-
-			if (!$YourPlanet)
-				$missiontype[1] = $lang['type_mission'][1];
-
-			$missiontype[3] = $lang['type_mission'][3];
-			$missiontype[5] = $lang['type_mission'][5];
-		}
-	}
-	elseif ($_POST['ship209'] >= 1 || $_POST['ship208'])
-		$missiontype[3] = $lang['type_mission'][3];
-
-	if ($YourPlanet)
-		$missiontype[4] = $lang['type_mission'][4];
-
-	if (($_POST['planettype'] == 3 || $_POST['planettype'] == 1) && ($fleet_group_mr > 0) && ($UsedPlanet))
-	{
-		$missiontype[2] = $lang['type_mission'][2];
-	}
-
-	if($_POST['planettype'] == 3 && $_POST['ship214'] >= 1 && !$YourPlanet && $UsedPlanet && $CurrentUser['rpg_empereur'] == 1)
-		$missiontype[9] = $lang['type_mission'][9];
-
-	$fleetarray    		= unserialize(base64_decode(str_rot13($_POST["usedfleet"])));
-	$mission       		= $_POST['target_mission'];
-	$SpeedFactor   		= $_POST['speedfactor'];
-	$AllFleetSpeed 		= GetFleetMaxSpeed ($fleetarray, 0, $CurrentUser);
-	$GenFleetSpeed 		= $_POST['speed'];
-	$MaxFleetSpeed 		= min($AllFleetSpeed);
-	$distance      		= GetTargetDistance($_POST['thisgalaxy'], $_POST['galaxy'], $_POST['thissystem'], $_POST['system'], $_POST['thisplanet'], $_POST['planet']);
-	$duration      		= GetMissionDuration($GenFleetSpeed, $MaxFleetSpeed, $distance, $SpeedFactor);
-	$consumption   		= GetFleetConsumption($fleetarray, $SpeedFactor, $duration, $distance, $MaxFleetSpeed, $CurrentUser);
-	$MissionSelector	= "";
-
-	if (count($missiontype) > 0)
-	{
-		if ($planet == 16)
-		{
-			$MissionSelector .= "<tr height=\"20\">";
-			$MissionSelector .= "<th>";
-			$MissionSelector .= "<input type=\"radio\" name=\"mission\" value=\"15\" checked=\"checked\">". $lang['type_mission'][15] ."<br /><br />";
-			$MissionSelector .= "<font color=\"red\">".$lang['fl_expedition_alert_message']."</font>";
-			$MissionSelector .= "</th>";
-			$MissionSelector .= "</tr>";
-		}
-		else
-		{
-			$i = 0;
-			foreach ($missiontype as $a => $b)
-			{
-				$MissionSelector .= "<tr height=\"20\">";
-				$MissionSelector .= "<th>";
-				$MissionSelector .= "<input id=\"inpuT_".$i."\" type=\"radio\" name=\"mission\" value=\"".$a."\"". ($mission == $a ? " checked=\"checked\"":"") .">";
-				$MissionSelector .= "<label for=\"inpuT_".$i."\">".$b."</label><br>";
-				$MissionSelector .= "</th>";
-				$MissionSelector .= "</tr>";
-				$i++;
-			}
-		}
-	}
-	else
-	{
-		header("location:game.php?page=fleet");
-	}
-
-	if($_POST['thisplanettype'] == 1)
-		$parse['title'] = "". $_POST['thisgalaxy'] .":". $_POST['thissystem'] .":". $_POST['thisplanet'] ." - ".$lang['fl_planet']."";
-	elseif ($_POST['thisplanettype'] == 3)
-		$parse['title'] = "". $_POST['thisgalaxy'] .":". $_POST['thissystem'] .":". $_POST['thisplanet'] ." - ".$lang['fl_moon']."";
-
-	$parse['metal'] 			= floor($CurrentPlanet["metal"]);
-	$parse['crystal'] 			= floor($CurrentPlanet["crystal"]);
-	$parse['deuterium'] 		= floor($CurrentPlanet["deuterium"]);
-	$parse['consumption'] 		= $consumption;
-	$parse['distance']			= $distance;
-	$parse['speedfactor'] 		= $_POST['speedfactor'];
-	$parse['thisgalaxy'] 		= $_POST["thisgalaxy"];
-	$parse['thissystem'] 		= $_POST["thissystem"];
-	$parse['thisplanet'] 		= $_POST["thisplanet"];
-	$parse['galaxy'] 			= $_POST["galaxy"];
-	$parse['system'] 			= $_POST["system"];
-	$parse['planet'] 			= $_POST["planet"];
-	$parse['thisplanettype']	= $_POST["thisplanettype"];
-	$parse['planettype'] 		= $_POST["planettype"];
-	$parse['speedallsmin'] 		= $_POST["speedallsmin"];
-	$parse['speed'] 			= $_POST['speed'];
-	$parse['speedfactor'] 		= $_POST["speedfactor"];
-	$parse['usedfleet'] 		= $_POST["usedfleet"];
-	$parse['maxepedition'] 		= $_POST['maxepedition'];
-	$parse['curepedition'] 		= $_POST['curepedition'];
-	$parse['fleet_group'] 		= $_POST['fleet_group'];
-	$parse['acs_target_mr'] 	= $_POST['acs_target_mr'];
-
-	foreach ($fleetarray as $Ship => $Count)
-	{
-		$input_extra .= "<input type=\"hidden\" name=\"ship". $Ship ."\"        value=\"". $Count ."\" />\n";
-		$input_extra .= "<input type=\"hidden\" name=\"capacity". $Ship ."\"    value=\"". $pricelist[$Ship]['capacity'] ."\" />\n";
-		$input_extra .= "<input type=\"hidden\" name=\"consumption". $Ship ."\" value=\"". GetShipConsumption ( $Ship, $CurrentUser ) ."\" />\n";
-		$input_extra .= "<input type=\"hidden\" name=\"speed". $Ship ."\"       value=\"". GetFleetMaxSpeed ( "", $Ship, $CurrentUser ) ."\" />\n";
-	}
-
-	$parse['input_extra'] 			= $input_extra;
-	$parse['missionselector'] 		= $MissionSelector;
-
-	if ($planet == 16)
-	{
-		$StayBlock .= "<tr height=\"20\">";
-		$StayBlock .= "<td class=\"c\" colspan=\"3\">".$lang['fl_hold_time']."</td>";
-		$StayBlock .= "</tr>";
-		$StayBlock .= "<tr height=\"20\">";
-		$StayBlock .= "<th colspan=\"3\">";
-		$StayBlock .= "<select name=\"expeditiontime\" >";
-		$StayBlock .= "<option value=\"1\">1</option>";
-		$StayBlock .= "<option value=\"2\">2</option>";
-		$StayBlock .= "</select>";
-		$StayBlock .= "hora(s)";
-		$StayBlock .= "</th>";
-		$StayBlock .= "</tr>";
-	}
-	elseif($missiontype[5] != '')
-	{
-		$StayBlock .= "<tr height=\"20\">";
-		$StayBlock .= "<td class=\"c\" colspan=\"3\">".$lang['fl_hold_time']."</td>";
-		$StayBlock .= "</tr>";
-		$StayBlock .= "<tr height=\"20\">";
-		$StayBlock .= "<th colspan=\"3\">";
-		$StayBlock .= "<select name=\"holdingtime\" >";
-		$StayBlock .= "<option value=\"0\">0</option>";
-		$StayBlock .= "<option value=\"1\">1</option>";
-		$StayBlock .= "<option value=\"2\">2</option>";
-		$StayBlock .= "<option value=\"4\">4</option>";
-		$StayBlock .= "<option value=\"8\">8</option>";
-		$StayBlock .= "<option value=\"16\">16</option>";
-		$StayBlock .= "<option value=\"32\">32</option>";
-		$StayBlock .= "</select>";
-		$StayBlock .= "hora(s)";
-		$StayBlock .= "</th>";
-		$StayBlock .= "</tr>";
-	}
-	$parse['stayblock'] = $StayBlock;
-	display(parsetemplate(gettemplate('fleet/fleet2_table'), $parse));
-}
-?>
\ No newline at end of file
diff --git a/includes/pages/ShowFleet3Page.php b/includes/pages/ShowFleet3Page.php
deleted file mode 100644
index 575c3d7..0000000
--- a/includes/pages/ShowFleet3Page.php
+++ /dev/null
@@ -1,419 +0,0 @@
-<?php
-
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-function ShowFleet3Page($CurrentUser, $CurrentPlanet)
-{
-	global $resource, $pricelist, $reslist, $phpEx, $lang, $xgp_root, $game_config;
-	include_once($xgp_root . 'includes/functions/IsVacationMode.' . $phpEx);
-
-	$parse = $lang;
-
-	if (IsVacationMode($CurrentUser))
-		exit(message($lang['fl_vacation_mode_active'],"game.php?page=overview",2));
-
-	$fleet_group_mr = 0;
-	if($_POST['fleet_group'] > 0)
-	{
-		if($_POST['mission'] == 2)
-		{
-			$target = "g".intval($_POST["galaxy"])."s".intval($_POST["system"])."p".intval($_POST["planet"])."t".intval($_POST["planettype"]);
-			if($_POST['acs_target_mr'] == $target)
-			{
-				$aks_count_mr = doquery("SELECT * FROM {{table}} WHERE id = '".intval($_POST['fleet_group'])."'",'aks');
-				if (mysql_num_rows($aks_count_mr) > 0)
-					$fleet_group_mr = $_POST['fleet_group'];
-			}
-		}
-	}
-
-	if(($_POST['fleet_group'] == 0) && ($_POST['mission'] == 2))
-		$_POST['mission'] = 1;
-
-
-	$TargetPlanet  		= doquery("SELECT `id_owner`,`id_level`,`destruyed`,`ally_deposit` FROM {{table}} WHERE `galaxy` = '". intval($_POST['galaxy']) ."' AND `system` = '". intval($_POST['system']) ."' AND `planet` = '". intval($_POST['planet']) ."' AND `planet_type` = '". intval($_POST['planettype']) ."';", 'planets', true);
-	$MyDBRec       		= doquery("SELECT `id`,`onlinetime`,`ally_id`,`urlaubs_modus` FROM {{table}} WHERE `id` = '". intval($CurrentUser['id'])."';", 'users', true);
-
-	$protection      	= $game_config['noobprotection'];
-	$protectiontime  	= $game_config['noobprotectiontime'];
-	$protectionmulti 	= $game_config['noobprotectionmulti'];
-
-	if ($protectiontime < 1)
-		$protectiontime = 9999999999999999;
-
-	$fleetarray  = unserialize(base64_decode(str_rot13($_POST["usedfleet"])));
-
-	if($TargetPlanet["destruyed"] != 0)
-		exit(header("Location: game.php?page=fleet"));
-
-	if (!is_array($fleetarray))
-		exit(header("Location: game.php?page=fleet"));
-
-	foreach ($fleetarray as $Ship => $Count)
-	{
-		if ($Count > $CurrentPlanet[$resource[$Ship]])
-			exit(header("location:game." . $phpEx . "?page=fleet"));
-	}
-
-	$error              = 0;
-	$galaxy             = intval($_POST['galaxy']);
-	$system             = intval($_POST['system']);
-	$planet             = intval($_POST['planet']);
-	$planettype         = intval($_POST['planettype']);
-	$fleetmission       = intval($_POST['mission']);
-
-	if ($planettype != 1 && $planettype != 2 && $planettype != 3)
-		exit(header("location:game." . $phpEx . "?page=fleet"));
-
-	if ($fleetmission == 8)
-	{
-		$YourPlanet = false;
-		$UsedPlanet = false;
-		$select     = doquery("SELECT * FROM {{table}} WHERE galaxy = '". $galaxy ."' AND system = '". $system ."' AND planet = '". $planet ."'", "planets");
-	}
-	else
-	{
-		$YourPlanet = false;
-		$UsedPlanet = false;
-		$select     = doquery("SELECT * FROM {{table}} WHERE galaxy = '". $galaxy ."' AND system = '". $system ."' AND planet = '". $planet ."' AND planet_type = '". $planettype ."'", "planets");
-	}
-
-	if ($CurrentPlanet['galaxy'] == $galaxy && $CurrentPlanet['system'] == $system &&
-		$CurrentPlanet['planet'] == $planet && $CurrentPlanet['planet_type'] == $planettype)
-		exit(header("location:game." . $phpEx . "?page=fleet"));
-
-	if ($_POST['mission'] != 15)
-	{
-		if (mysql_num_rows($select) < 1 && $fleetmission != 7)
-			exit(header("location:game." . $phpEx . "?page=fleet"));
-		elseif ($fleetmission == 9 && mysql_num_rows($select) < 1)
-			exit(header("location:game." . $phpEx . "?page=fleet"));
-	}
-	else
-	{
-		$MaxExpedition      = $CurrentUser[$resource[124]];
-
-		if ($MaxExpedition >= 1)
-		{
-			$maxexpde  			= doquery("SELECT COUNT(fleet_owner) AS `expedi` FROM {{table}} WHERE `fleet_owner` = '".intval($CurrentUser['id'])."' AND `fleet_mission` = '15';", 'fleets', true);
-			$ExpeditionEnCours  = $maxexpde['expedi'];
-			$EnvoiMaxExpedition = 1 + floor( $MaxExpedition / 3 );
-		}
-		else
-		{
-			$ExpeditionEnCours 	= 0;
-			$EnvoiMaxExpedition = 0;
-		}
-
-		if($EnvoiMaxExpedition == 0 )
-			message ("<font color=\"red\"><b>".$lang['fl_expedition_tech_required']."</b></font>", "game." . $phpEx . "?page=fleet", 2);
-		elseif ($ExpeditionEnCours >= $EnvoiMaxExpedition )
-			message ("<font color=\"red\"><b>".$lang['fl_expedition_fleets_limit']."</b></font>", "game." . $phpEx . "?page=fleet", 2);
-	}
-
-	$select = mysql_fetch_array($select);
-
-	if ($select['id_owner'] == $CurrentUser['id'])
-	{
-		$YourPlanet = true;
-		$UsedPlanet = true;
-	}
-	elseif (!empty($select['id_owner']))
-	{
-		$YourPlanet = false;
-		$UsedPlanet = true;
-	}
-	else
-	{
-		$YourPlanet = false;
-		$UsedPlanet = false;
-	}
-
-	if (empty($fleetmission))
-		exit(header("location:game." . $phpEx . "?page=fleet"));
-
-	if ($TargetPlanet['id_owner'] == '')
-		$HeDBRec = $MyDBRec;
-	elseif ($TargetPlanet['id_owner'] != '')
-		$HeDBRec = doquery("SELECT `id`,`onlinetime`,`ally_id`,`urlaubs_modus` FROM {{table}} WHERE `id` = '". intval($TargetPlanet['id_owner']) ."';", 'users', true);
-
-	$UserPoints    = doquery("SELECT `total_points` FROM {{table}} WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '". intval($MyDBRec['id']) ."';", 'statpoints', true);
-	$User2Points   = doquery("SELECT `total_points` FROM {{table}} WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '". intval($HeDBRec['id']) ."';", 'statpoints', true);
-
-	$MyGameLevel  = $UserPoints['total_points'];
-	$HeGameLevel  = $User2Points['total_points'];
-
-	if($HeDBRec['onlinetime'] >= (time()-60 * 60 * 24 * 7))
-	{
-		if ($MyGameLevel > ($HeGameLevel * $protectionmulti)
-			&& $TargetPlanet['id_owner'] != ''
-			&& ($_POST['mission'] == 1 or $_POST['mission'] == 6 or $_POST['mission'] == 9)
-			&& $protection == 1
-			&& $HeGameLevel < ($protectiontime * 1000))
-			message("<font color=\"lime\"><b>".$lang['fl_week_player']."</b></font>", "game." . $phpEx . "?page=fleet", 2);
-
-		if (($MyGameLevel * $protectionmulti) < $HeGameLevel
-			&& $TargetPlanet['id_owner'] != ''
-			&& ($_POST['mission'] == 1 or $_POST['mission'] == 5 or $_POST['mission'] == 6 or $_POST['mission'] == 9)
-			&& $protection == 1
-			&& $MyGameLevel < ($protectiontime * 1000))
-			message("<font color=\"red\"><b>".$lang['fl_strong_player']."</b></font>", "game." . $phpEx . "?page=fleet", 2);
-	}
-
-	if ($HeDBRec['urlaubs_modus'] && $_POST['mission'] != 8)
-		message("<font color=\"lime\"><b>".$lang['fl_in_vacation_player']."</b></font>", "game." . $phpEx . "?page=fleet", 2);
-
-	$FlyingFleets = mysql_fetch_assoc(doquery("SELECT COUNT(fleet_id) as Number FROM {{table}} WHERE `fleet_owner`='".intval($CurrentUser['id'])."'", 'fleets'));
-	$ActualFleets = $FlyingFleets["Number"];
-
-	if ((1 + $CurrentUser[$resource[108]]) + ($CurrentUser['rpg_commandant'] * COMMANDANT) <= $ActualFleets)
-	{
-		message($lang['fl_no_slots'], "game." . $phpEx . "?page=fleet", 1);
-	}
-
-	if ($_POST['resource1'] + $_POST['resource2'] + $_POST['resource3'] < 1 && $_POST['mission'] == 3)
-		message("<font color=\"lime\"><b>".$lang['fl_empty_transport']."</b></font>", "game." . $phpEx . "?page=fleet", 1);
-
-	if ($_POST['mission'] != 15)
-	{
-		if ($TargetPlanet['id_owner'] == '' && $_POST['mission'] < 7)
-			exit(header("location:game." . $phpEx . "?page=fleet"));
-
-		if ($TargetPlanet['id_owner'] != '' && $_POST['mission'] == 7)
-			message ("<font color=\"red\"><b>".$lang['fl_planet_populed']."</b></font>", "game." . $phpEx . "?page=fleet", 2);
-
-		if ($HeDBRec['ally_id'] != $MyDBRec['ally_id'] && $_POST['mission'] == 4)
-			message ("<font color=\"red\"><b>".$lang['fl_stay_not_on_enemy']."</b></font>", "game." . $phpEx . "?page=fleet", 2);
-
-		if ($TargetPlanet['ally_deposit'] < 1 && $HeDBRec != $MyDBRec && $_POST['mission'] == 5)
-			message ("<font color=\"red\"><b>".$lang['fl_not_ally_deposit']."</b></font>", "game." . $phpEx . "?page=fleet", 2);
-
-		if (($TargetPlanet["id_owner"] == $CurrentPlanet["id_owner"]) && (($_POST["mission"] == 1) or ($_POST["mission"] == 6)))
-			exit(header("location:game." . $phpEx . "?page=fleet"));
-
-		if (($TargetPlanet["id_owner"] != $CurrentPlanet["id_owner"]) && ($_POST["mission"] == 4))
-			message ("<font color=\"red\"><b>".$lang['fl_deploy_only_your_planets']."</b></font>","game." . $phpEx . "?page=fleet", 2);
-	}
-
-	$missiontype = array(
-		1 => $lang['type_mission'][1],
-		2 => $lang['type_mission'][2],
-		3 => $lang['type_mission'][3],
-		4 => $lang['type_mission'][4],
-		5 => $lang['type_mission'][5],
-		6 => $lang['type_mission'][6],
-		7 => $lang['type_mission'][7],
-		8 => $lang['type_mission'][8],
-		9 => $lang['type_mission'][9],
-		15 => $lang['type_mission'][15],
-		);
-
-	$speed_possible = array(10, 9, 8, 7, 6, 5, 4, 3, 2, 1);
-	$AllFleetSpeed  = GetFleetMaxSpeed ($fleetarray, 0, $CurrentUser);
-	$GenFleetSpeed  = $_POST['speed'];
-	$SpeedFactor    = $game_config['fleet_speed'] / 2500;
-	$MaxFleetSpeed  = min($AllFleetSpeed);
-
-	if (!in_array($GenFleetSpeed, $speed_possible))
-		exit(header("location:game." . $phpEx . "?page=fleet"));
-
-	if ($MaxFleetSpeed != $_POST['speedallsmin'])
-		exit(header("location:game." . $phpEx . "?page=fleet"));
-
-	if (!$_POST['planettype'])
-		exit(header("location:game." . $phpEx . "?page=fleet"));
-
-	if (!$_POST['galaxy'] || !is_numeric($_POST['galaxy']) || $_POST['galaxy'] > MAX_GALAXY_IN_WORLD || $_POST['galaxy'] < 1)
-		exit(header("location:game." . $phpEx . "?page=fleet"));
-
-	if (!$_POST['system'] || !is_numeric($_POST['system']) || $_POST['system'] > MAX_SYSTEM_IN_GALAXY || $_POST['system'] < 1)
-		exit(header("location:game." . $phpEx . "?page=fleet"));
-
-	if (!$_POST['planet'] || !is_numeric($_POST['planet']) || $_POST['planet'] > (MAX_PLANET_IN_SYSTEM + 1) || $_POST['planet'] < 1)
-		exit(header("location:game." . $phpEx . "?page=fleet"));
-
-	if ($_POST['thisgalaxy'] != $CurrentPlanet['galaxy'] |
-		$_POST['thissystem'] != $CurrentPlanet['system'] |
-		$_POST['thisplanet'] != $CurrentPlanet['planet'] |
-		$_POST['thisplanettype'] != $CurrentPlanet['planet_type'])
-		exit(header("location:game." . $phpEx . "?page=fleet"));
-
-	if (!isset($fleetarray))
-		exit(header("location:game." . $phpEx . "?page=fleet"));
-
-	$distance      = GetTargetDistance($_POST['thisgalaxy'], $_POST['galaxy'], $_POST['thissystem'], $_POST['system'], $_POST['thisplanet'], $_POST['planet']);
-	$duration      = GetMissionDuration($GenFleetSpeed, $MaxFleetSpeed, $distance, $SpeedFactor);
-	$consumption   = GetFleetConsumption($fleetarray, $SpeedFactor, $duration, $distance, $MaxFleetSpeed, $CurrentUser);
-
-	$fleet['start_time'] = $duration + time();
-	if ($_POST['mission'] == 15)
-	{
-		$StayDuration    = $_POST['expeditiontime'] * 3600;
-		$StayTime        = $fleet['start_time'] + $_POST['expeditiontime'] * 3600;
-	}
-	elseif ($_POST['mission'] == 5)
-	{
-		$StayDuration    = $_POST['holdingtime'] * 3600;
-		$StayTime        = $fleet['start_time'] + $_POST['holdingtime'] * 3600;
-	}
-	else
-	{
-		$StayDuration    = 0;
-		$StayTime        = 0;
-	}
-
-	$fleet['end_time']   = $StayDuration + (2 * $duration) + time();
-	$FleetStorage        = 0;
-	$FleetShipCount      = 0;
-	$fleet_array         = "";
-	$FleetSubQRY         = "";
-
-	foreach ($fleetarray as $Ship => $Count)
-	{
-		$FleetStorage    += $pricelist[$Ship]["capacity"] * $Count;
-		$FleetShipCount  += $Count;
-		$fleet_array     .= $Ship .",". $Count .";";
-		$FleetSubQRY     .= "`".$resource[$Ship] . "` = `" . $resource[$Ship] . "` - " . $Count . ", ";
-	}
-
-	$FleetStorage        -= $consumption;
-	$StorageNeeded        = 0;
-
-	$_POST['resource1'] = max(0, (int)trim($_POST['resource1']));
-	$_POST['resource2'] = max(0, (int)trim($_POST['resource2']));
-	$_POST['resource3'] = max(0, (int)trim($_POST['resource3']));
-
-	if ($_POST['resource1'] < 1)
-		$TransMetal      = 0;
-	else
-	{
-		$TransMetal      = $_POST['resource1'];
-		$StorageNeeded  += $TransMetal;
-	}
-
-	if ($_POST['resource2'] < 1)
-		$TransCrystal    = 0;
-	else
-	{
-		$TransCrystal    = $_POST['resource2'];
-		$StorageNeeded  += $TransCrystal;
-	}
-	if ($_POST['resource3'] < 1)
-		$TransDeuterium  = 0;
-	else
-	{
-		$TransDeuterium  = $_POST['resource3'];
-		$StorageNeeded  += $TransDeuterium;
-	}
-
-	$StockMetal      = $CurrentPlanet['metal'];
-	$StockCrystal    = $CurrentPlanet['crystal'];
-	$StockDeuterium  = $CurrentPlanet['deuterium'];
-	$StockDeuterium -= $consumption;
-
-	$StockOk         = false;
-	if ($StockMetal >= $TransMetal)
-		if ($StockCrystal >= $TransCrystal)
-			if ($StockDeuterium >= $TransDeuterium)
-				$StockOk         = true;
-	if (!$StockOk)
-		message ("<font color=\"red\"><b>". $lang['fl_no_enought_deuterium'] . pretty_number($consumption) ."</b></font>", "game." . $phpEx . "?page=fleet", 2);
-
-	if ( $StorageNeeded > $FleetStorage)
-		message ("<font color=\"red\"><b>". $lang['fl_no_enought_cargo_capacity'] . pretty_number($StorageNeeded - $FleetStorage) ."</b></font>", "game." . $phpEx . "?page=fleet", 2);
-
-	if ($TargetPlanet['id_level'] > $CurrentUser['authlevel'] && $game_config['adm_attack'] == 0)
-		message($lang['fl_admins_cannot_be_attacked'], "game." . $phpEx . "?page=fleet",2);
-
-	if ($fleet_group_mr != 0)
-	{
-		$AksStartTime = doquery("SELECT MAX(`fleet_start_time`) AS Start FROM {{table}} WHERE `fleet_group` = '". $fleet_group_mr . "';", "fleets", true);
-
-		if ($AksStartTime['Start'] >= $fleet['start_time'])
-		{
-			$fleet['end_time']        += $AksStartTime['Start'] -  $fleet['start_time'];
-			$fleet['start_time']     = $AksStartTime['Start'];
-		}
-		else
-		{
-			$QryUpdateFleets = "UPDATE {{table}} SET ";
-			$QryUpdateFleets .= "`fleet_start_time` = '". $fleet['start_time'] ."', ";
-			$QryUpdateFleets .= "`fleet_end_time` = fleet_end_time + '".($fleet['start_time'] - $AksStartTime['Start'])."' ";
-			$QryUpdateFleets .= "WHERE ";
-			$QryUpdateFleets .= "`fleet_group` = '". $fleet_group_mr ."';";
-			doquery($QryUpdateFleets, 'fleets');
-			$fleet['end_time']         += $fleet['start_time'] -  $AksStartTime['Start'];
-		}
-	}
-
-	$QryInsertFleet  = "INSERT INTO {{table}} SET ";
-	$QryInsertFleet .= "`fleet_owner` = '". intval($CurrentUser['id']) ."', ";
-	$QryInsertFleet .= "`fleet_mission` = '".intval($_POST['mission'])."',  ";
-	$QryInsertFleet .= "`fleet_amount` = '". intval($FleetShipCount) ."', ";
-	$QryInsertFleet .= "`fleet_array` = '". $fleet_array ."', ";
-	$QryInsertFleet .= "`fleet_start_time` = '". $fleet['start_time'] ."', ";
-	$QryInsertFleet .= "`fleet_start_galaxy` = '". intval($_POST['thisgalaxy']) ."', ";
-	$QryInsertFleet .= "`fleet_start_system` = '". intval($_POST['thissystem']) ."', ";
-	$QryInsertFleet .= "`fleet_start_planet` = '". intval($_POST['thisplanet']) ."', ";
-	$QryInsertFleet .= "`fleet_start_type` = '". intval($_POST['thisplanettype']) ."', ";
-	$QryInsertFleet .= "`fleet_end_time` = '". intval($fleet['end_time']) ."', ";
-	$QryInsertFleet .= "`fleet_end_stay` = '". intval($StayTime) ."', ";
-	$QryInsertFleet .= "`fleet_end_galaxy` = '". intval($_POST['galaxy']) ."', ";
-	$QryInsertFleet .= "`fleet_end_system` = '". intval($_POST['system']) ."', ";
-	$QryInsertFleet .= "`fleet_end_planet` = '". intval($_POST['planet']) ."', ";
-	$QryInsertFleet .= "`fleet_end_type` = '". intval($_POST['planettype']) ."', ";
-	$QryInsertFleet .= "`fleet_resource_metal` = '". $TransMetal ."', ";
-	$QryInsertFleet .= "`fleet_resource_crystal` = '". $TransCrystal ."', ";
-	$QryInsertFleet .= "`fleet_resource_deuterium` = '". $TransDeuterium ."', ";
-	$QryInsertFleet .= "`fleet_target_owner` = '". intval($TargetPlanet['id_owner']) ."', ";
-	$QryInsertFleet .= "`fleet_group` = '".intval($fleet_group_mr)."',  ";
-	$QryInsertFleet .= "`start_time` = '". time() ."';";
-	doquery( $QryInsertFleet, 'fleets');
-
-	$QryUpdatePlanet  = "UPDATE `{{table}}` SET ";
-	$QryUpdatePlanet .= $FleetSubQRY;
-	$QryUpdatePlanet .= "`metal` = `metal` - ". $TransMetal .", ";
-	$QryUpdatePlanet .= "`crystal` = `crystal` - ". $TransCrystal .", ";
-	$QryUpdatePlanet .= "`deuterium` = `deuterium` - ". ($TransDeuterium + $consumption) ." ";
-	$QryUpdatePlanet .= "WHERE ";
-	$QryUpdatePlanet .= "`id` = ". intval($CurrentPlanet['id']) ." LIMIT 1;";
-	doquery ($QryUpdatePlanet, "planets");
-
-	$parse['mission'] 		= $missiontype[$_POST['mission']];
-	$parse['distance'] 		= pretty_number($distance);
-	$parse['speedallsmin'] 	= pretty_number($_POST['speedallsmin']);
-	$parse['consumption'] 	= pretty_number($consumption);
-	$parse['from']	 		= $_POST['thisgalaxy'] .":". $_POST['thissystem']. ":". $_POST['thisplanet'];
-	$parse['destination']	= $_POST['galaxy'] .":". $_POST['system'] .":". $_POST['planet'];
-	$parse['start_time'] 	= date("M D d H:i:s", $fleet['start_time']);
-	$parse['end_time'] 		= date("M D d H:i:s", $fleet['end_time']);
-
-	foreach ($fleetarray as $Ship => $Count)
-	{
-		$fleet_list .= "</tr><tr height=\"20\">";
-		$fleet_list .= "<th>". $lang['tech'][$Ship] ."</th>";
-		$fleet_list .= "<th>". pretty_number($Count) ."</th>";
-	}
-
-	$parse['fleet_list'] 	= $fleet_list;
-
-	display(parsetemplate(gettemplate('fleet/fleet3_table'), $parse), false);
-}
-?>
\ No newline at end of file
diff --git a/includes/pages/ShowFleetACSPage.php b/includes/pages/ShowFleetACSPage.php
deleted file mode 100644
index 1996b48..0000000
--- a/includes/pages/ShowFleetACSPage.php
+++ /dev/null
@@ -1,354 +0,0 @@
-<?php
-
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-function ShowFleetACSPage($CurrentUser, $CurrentPlanet)
-{
-	global $resource, $pricelist, $reslist, $phpEx, $lang;
-
-	$parse		= $lang;
-	$fleetid 	= $_POST['fleetid'];
-
-	if (!is_numeric($fleetid) || empty($fleetid))
-		exit(header("Location: game.".$phpEx."?page=fleet"));
-
-	if(isset($_POST['add_member_to_aks']) && !empty($_POST['add_member_to_aks']))
-	{
-		$added_user_id_mr 	= 0;
-		$member_qry_mr 		= doquery("SELECT `id` FROM {{table}} WHERE `username` ='".mysql_escape_string($_POST['addtogroup'])."' ;",'users');
-
-		while($row = mysql_fetch_array($member_qry_mr))
-		{
-			$added_user_id_mr .= $row['id'];
-		}
-
-		if($added_user_id_mr > 0)
-		{
-			$new_eingeladen_mr = mysql_escape_string($_POST['aks_invited_mr']).','.$added_user_id_mr;
-			doquery("UPDATE {{table}} SET `eingeladen` = '".$new_eingeladen_mr."' ;",'aks');
-			$add_user_message_mr = "<font color=\"lime\">".$lang['fl_player']." ".$_POST['addtogroup']." ". $lang['fl_Add_to_attack'];
-		}
-		else
-		{
-			$add_user_message_mr = "<font color=\"red\">".$lang['fl_player']." ".$_POST['addtogroup']." ".$lang['fl_dont_exist']."";
-		}
-
-		$invite_message = $lang['fl_player'] . $CurrentUser['username'] . $lang['fl_acs_invitation_message'];
-		SendSimpleMessage ($added_user_id_mr, $CurrentUser['id'], time(), 1, $CurrentUser['username'], $lang['fl_acs_invitation_title'], $invite_message);
-	}
-
-	$query = doquery("SELECT * FROM {{table}} WHERE fleet_id = '" . intval($fleetid) . "'", 'fleets');
-
-	if (mysql_num_rows($query) != 1)
-		exit(header("Location: game.".$phpEx."?page=fleet"));
-
-	$daten = mysql_fetch_array($query);
-
-	if ($daten['fleet_start_time'] <= time() || $daten['fleet_end_time'] < time() || $daten['fleet_mess'] == 1)
-		exit(header("Location: game.".$phpEx."?page=fleet"));
-
-	if (!isset($_POST['send']))
-	{
-		SetSelectedPlanet($CurrentUser);
-
-		$galaxyrow 		= doquery("SELECT * FROM {{table}} WHERE `id_planet` = '".intval($CurrentPlanet['id'])."';", 'galaxy', true);
-		$maxfleet  		= doquery("SELECT COUNT(fleet_owner) as ilosc FROM {{table}} WHERE fleet_owner='".intval($CurrentPlanet['id'])."'", 'fleets', true);
-		$maxfleet_count = $maxfleet["ilosc"];
-
-		$fleet = doquery("SELECT * FROM {{table}} WHERE fleet_id = '" . intval($fleetid) . "'", 'fleets', true);
-
-		if (empty($fleet['fleet_group']))
-		{
-			$rand 			= mt_rand(100000, 999999999);
-			$aks_code_mr 	= "AG".$rand;
-			$aks_invited_mr = intval($CurrentUser['id']);
-
-			doquery(
-			"INSERT INTO {{table}} SET
-			`name` = '" . $aks_code_mr . "',
-			`teilnehmer` = '" . $CurrentUser['id'] . "',
-			`flotten` = '" . $fleetid . "',
-			`ankunft` = '" . $fleet['fleet_start_time'] . "',
-			`galaxy` = '" . $fleet['fleet_end_galaxy'] . "',
-			`system` = '" . $fleet['fleet_end_system'] . "',
-			`planet` = '" . $fleet['fleet_end_planet'] . "',
-			`planet_type` = '" . $fleet['fleet_end_type'] . "',
-			`eingeladen` = '" . $aks_invited_mr . "'
-			",
-			'aks');
-
-			$aks = doquery(
-			"SELECT * FROM {{table}} WHERE
-			`name` = '" . $aks_code_mr . "' AND
-			`teilnehmer` = '" . $CurrentUser['id'] . "' AND
-			`flotten` = '" . $fleetid . "' AND
-			`ankunft` = '" . $fleet['fleet_start_time'] . "' AND
-			`galaxy` = '" . $fleet['fleet_end_galaxy'] . "' AND
-			`system` = '" . $fleet['fleet_end_system'] . "' AND
-			`planet` = '" . $fleet['fleet_end_planet'] . "' AND
-			`eingeladen` = '" . intval($CurrentUser['id']) . "'
-			", 'aks', true);
-
-			$aks_madnessred = doquery(
-			"SELECT * FROM {{table}} WHERE
-			`name` = '" . $aks_code_mr . "' AND
-			`teilnehmer` = '" . $CurrentUser['id'] . "' AND
-			`flotten` = '" . $fleetid . "' AND
-			`ankunft` = '" . $fleet['fleet_start_time'] . "' AND
-			`galaxy` = '" . $fleet['fleet_end_galaxy'] . "' AND
-			`system` = '" . $fleet['fleet_end_system'] . "' AND
-			`planet` = '" . $fleet['fleet_end_planet'] . "' AND
-			`eingeladen` = '" . intval($CurrentUser['id']) . "'
-			", 'aks');
-
-			doquery(
-			"UPDATE {{table}} SET
-			fleet_group = '" . intval($aks['id']) . "'
-			WHERE
-			fleet_id = '" . intval($fleetid) . "'", 'fleets');
-		}
-		else
-		{
-			$aks = doquery("SELECT * FROM {{table}} WHERE id = '" . intval($fleet['fleet_group']) . "'", 'aks');
-			$aks_madnessred = doquery("SELECT * FROM {{table}} WHERE id = '" . intval($fleet['fleet_group']) . "'", 'aks');
-
-			if (mysql_num_rows($aks) != 1)
-				exit(header("Location: game.".$phpEx."?page=fleet"));
-
-			$aks = mysql_num_rows($aks);
-		}
-
-		$missiontype = array(
-				1 => $lang['type_mission'][1],
-				2 => $lang['type_mission'][2],
-				3 => $lang['type_mission'][3],
-				4 => $lang['type_mission'][4],
-				5 => $lang['type_mission'][5],
-				6 => $lang['type_mission'][6],
-				7 => $lang['type_mission'][7],
-				8 => $lang['type_mission'][8],
-				9 => $lang['type_mission'][9],
-				15 => $lang['type_mission'][15],
-				16 => $lang['type_mission'][16],
-				17 => $lang['type_mission'][17],
-				);
-
-		$speed = array(
-				10 => 100,
-				9 => 90,
-				8 => 80,
-				7 => 70,
-				6 => 60,
-				5 => 50,
-				4 => 40,
-				3 => 30,
-				2 => 20,
-				1 => 10,
-		);
-
-		$galaxy 		= intval($_GET['galaxy']);
-		$system 		= intval($_GET['system']);
-		$planet 		= intval($_GET['planet']);
-		$planettype 	= intval($_GET['planettype']);
-		$target_mission = intval($_GET['target_mission']);
-
-		if (!$galaxy)
-			$galaxy = $CurrentPlanet['galaxy'];
-		if (!$system)
-			$system = $CurrentPlanet['system'];
-		if (!$planet)
-			$planet = $CurrentPlanet['planet'];
-		if (!$planettype)
-			$planettype = $CurrentPlanet['planet_type'];
-
-		$ile 	= '' . (1 + $CurrentUser[$resource[108]]) + ($CurrentUser['rpg_commandant'] * COMMANDANT) . '';
-
-		$parse['ile']	= $ile;
-
-		$fq = doquery("SELECT * FROM {{table}} WHERE fleet_owner='".intval($CurrentUser['id'])."' AND fleet_mission <> 10", "fleets");
-
-		$i = 0;
-		while ($f = mysql_fetch_array($fq))
-		{
-			$i++;
-
-			$page .= "<tr height=20><th>$i</th><th>";
-
-			$page .= "<a title=\"\">{$missiontype[$f[fleet_mission]]}</a>";
-
-			if (($f['fleet_start_time'] + 1) == $f['fleet_end_time'])
-				$page .= " <a title=\"".$lang['fl_returning']."\">".$lang['fl_r']."</a>";
-
-			$page .= "</th><th><a title=\"";
-
-			$fleet = explode(";", $f['fleet_array']);
-			$e = 0;
-			foreach($fleet as $a => $b)
-			{
-				if ($b != '')
-				{
-					$e++;
-					$a 		= explode(",", $b);
-					$page  .= "{$lang['tech']{$a[0]}}: {$a[1]}\n";
-					if ($e > 1)
-						$page .= "\t";
-				}
-			}
-			$page .= "\">" . pretty_number($f[fleet_amount]) . "</a></th>";
-			$page .= "<th>[{$f[fleet_start_galaxy]}:{$f[fleet_start_system]}:{$f[fleet_start_planet]}]</th>";
-			$page .= "<th>" . gmdate("d. M Y H:i:s", $f['fleet_start_time']) . "</th>";
-			$page .= "<th>[{$f[fleet_end_galaxy]}:{$f[fleet_end_system]}:{$f[fleet_end_planet]}]</th>";
-			$page .= "<th>" . gmdate("d. M Y H:i:s", $f['fleet_end_time']) . "</th>";
-			$page .= " </form>";
-			$page .= "<th><font color=\"lime\"><div id=\"time_0\"><font>" . pretty_time(floor($f['fleet_end_time'] + 1 - time())) . "</font></th><th>";
-
-			if ($f['fleet_mess'] == 0)
-			{
-				$page .= "<form action=\"SendFleetBack.php\" method=\"post\">
-				<input name=\"zawracanie\" value=" . $f['fleet_id'] . " type=hidden>
-				<input value=\"".$lang['fl_send_back']."\" type=\"submit\">
-				</form></th>";
-			}
-			else
-				$page .= "&nbsp;</th>";
-
-			$page .= "</div></font></tr>";
-		}
-
-		if ($i == 0)
-			$page .= "<th>-</th><th>-</th><th>-</th><th>-</th><th>-</th><th>-</th><th>-</th><th>-</th><th>-</th>";
-
-		$parse['page1']	= $page;
-
-		if ($ile == $maxfleet_count)
-			$maxflot = "<tr height=\"20\"><th colspan=\"9\"><font color=\"red\">".$lang['fl_no_more_slots']."</font></th></tr>";
-
-		while($row = mysql_fetch_array($aks_madnessred))
-		{
-			$aks_code_mr  	.= $row['name'];
-			$aks_invited_mr .= $row['eingeladen'];
-		}
-
-		$parse['maxflot']		= $maxflot;
-		$parse['aks_code_mr']	= $aks_code_mr;
-
-		$members = explode(",", $aks_invited_mr);
-		foreach($members as $a => $b)
-		{
-			if ($b != '')
-			{
-				$member_qry_mr = doquery("SELECT `username` FROM {{table}} WHERE `id` ='".intval($b)."' ;",'users');
-				while($row = mysql_fetch_array($member_qry_mr))
-				{
-					$pageDos .= "<option>".$row['username']."</option>";
-				}
-			}
-		}
-
-		$parse['page2']					= $pageDos;
-		$parse['fleetid']				= $_POST[fleetid];
-		$parse['aks_invited_mr']		= $aks_invited_mr;
-		$parse['add_user_message_mr']	= $add_user_message_mr;
-
-		if (!$CurrentPlanet)
-			exit(header("Location: game.".$phpEx."?page=fleet"));
-
-		foreach($reslist['fleet'] as $n => $i)
-		{
-			if ($CurrentPlanet[$resource[$i]] > 0)
-			{
-				if ($i == 202 or $i == 203 or $i == 204 or $i == 209 or $i == 210)
-					$pricelist[$i]['speed'] = $pricelist[$i]['speed'] + (($pricelist[$i]['speed'] * $CurrentUser['combustion_tech']) * 0.1);
-				if ($i == 205 or $i == 206 or $i == 208 or $i == 211)
-					$pricelist[$i]['speed'] = $pricelist[$i]['speed'] + (($pricelist[$i]['speed'] * $CurrentUser['impulse_motor_tech']) * 0.2);
-				if ($i == 207 or $i == 213 or $i == 214 or $i == 215 or $i == 216)
-					$pricelist[$i]['speed'] = $pricelist[$i]['speed'] + (($pricelist[$i]['speed'] * $CurrentUser['hyperspace_motor_tech']) * 0.3);
-
-				$page3 .= '<tr height="20">
-				<th><a title="'. $lang[fl_fleet_speed]. ': ' . $pricelist[$i]['speed'] . '">' . $lang['tech'][$i] . '</a></th>
-				<th>' . pretty_number($CurrentPlanet[$resource[$i]]) . '
-				<input type="hidden" name="maxship' . $i . '" value="' . $CurrentPlanet[$resource[$i]] . '"/></th>
-
-				<input type="hidden" name="consumption' . $i . '" value="' . $pricelist[$i]['consumption'] . '"/>
-
-				<input type="hidden" name="speed' . $i . '" value="' . $pricelist[$i]['speed'] . '" />
-				<input type="hidden" name="galaxy" value="' . $galaxy . '"/>
-
-				<input type="hidden" name="system" value="' . $system . '"/>
-				<input type="hidden" name="planet" value="' . $planet . '"/>
-				<input type="hidden" name="planet_type" value="' . $planettype . '"/>
-				<input type="hidden" name="mission" value="' . $target_mission . '"/>
-				</th>
-				<input type="hidden" name="capacity' . $i . '" value="' . $pricelist[$i]['capacity'] . '" />
-				</th>';
-				if ($i == 212)
-					$page3 .= '<th></th><th></th></tr>';
-				else
-				{
-					$page3 .= '<th><a href="javascript:maxShip(\'ship' . $i . '\'); shortInfo();">'.$lang['fl_max'].'</a> </th>
-					<th><input name="ship' . $i . '" size="10" value="0" onfocus="javascript:if(this.value == \'0\') this.value=\'\';" onblur="javascript:if(this.value == \'\') this.value=\'0\';" alt="' . $lang['tech'][$i] . $CurrentPlanet[$resource[$i]] . '"  onChange="shortInfo()" onKeyUp="shortInfo()"/></th>
-					</tr>';
-					$aaaaaaa = $pricelist[$i]['consumption'];
-				}
-				$have_ships = true;
-			}
-		}
-
-		if (!$have_ships)
-		{
-			$page3 .= '<tr height="20">
-			<th colspan="4">'.$lang['fl_no_ships'].'/th>
-			</tr>
-			<tr height="20">
-			<th colspan="4">
-			<input type="button" value="'.$lang['fl_continue'].'" enabled/></th>
-			</tr>
-			</table>
-			</center>
-			</form>';
-		}
-		else
-		{
-			$page3 .= '
-			<tr height="20">
-			<th colspan="2"><a href="javascript:noShips();shortInfo();noResources();" >'.$lang['fl_remove_all_ships'].'</a></th>
-			<th colspan="2"><a href="javascript:maxShips();shortInfo();" >'.$lang['fl_select_all_ships'].'</a></th>
-			</tr>';
-
-			$przydalej = '<tr height="20"><th colspan="4"><input type="submit" value="'.$lang['fl_continue'].'" /></th></tr>';
-			if ($ile == $maxfleet_count)
-				$przydalej = '';
-			$page3 .= '
-			' . $przydalej . '
-			<tr><th colspan="4">
-			<br><center></center><br>
-			</th></tr>
-			</table>
-			</center>
-			</form>';
-		}
-
-		$parse['page3']	= $page3;
-	}
-
-	display(parsetemplate(gettemplate('fleet/fleetACS_table'), $parse));
-
-}
-?>
\ No newline at end of file
diff --git a/includes/pages/ShowFleetPage.php b/includes/pages/ShowFleetPage.php
deleted file mode 100644
index 28c1290..0000000
--- a/includes/pages/ShowFleetPage.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-if(!defined('INSIDE')){ die(header("location:../../"));}
-
-function ShowFleetPage($CurrentUser, $CurrentPlanet)
-{
-	global $lang, $reslist, $resource;
-
-	$parse				= $lang;
-
-	$maxfleet  			= doquery("SELECT COUNT(fleet_owner) AS `actcnt` FROM {{table}} WHERE `fleet_owner` = '".intval($CurrentUser['id'])."';", 'fleets', true);
-	$MaxFlyingFleets    = $maxfleet['actcnt'];
-	$MaxExpedition      = $CurrentUser[$resource[124]];
-
-	if ($MaxExpedition >= 1)
-	{
-		$maxexpde  			= doquery("SELECT COUNT(fleet_owner) AS `expedi` FROM {{table}} WHERE `fleet_owner` = '".intval($CurrentUser['id'])."' AND `fleet_mission` = '15';", 'fleets', true);
-	    $ExpeditionEnCours  = $maxexpde['expedi'];
-		$EnvoiMaxExpedition = 1 + floor( $MaxExpedition / 3 );
-	}
-	else
-	{
-		$ExpeditionEnCours 	= 0;
-		$EnvoiMaxExpedition = 0;
-	}
-
-	$MaxFlottes         = (1 + $CurrentUser[$resource[108]]) + ($CurrentUser['rpg_commandant'] * COMMANDANT);
-
-	$missiontype = array(
-		1 => $lang['type_mission'][1],
-		2 => $lang['type_mission'][2],
-		3 => $lang['type_mission'][3],
-		4 => $lang['type_mission'][4],
-		5 => $lang['type_mission'][5],
-		6 => $lang['type_mission'][6],
-		7 => $lang['type_mission'][7],
-		8 => $lang['type_mission'][8],
-		9 => $lang['type_mission'][9],
-		15 => $lang['type_mission'][15]
-	);
-
-	$galaxy         = intval($_GET['galaxy']);
-	$system         = intval($_GET['system']);
-	$planet         = intval($_GET['planet']);
-	$planettype     = intval($_GET['planettype']);
-	$target_mission = intval($_GET['target_mission']);
-	$ShipData       = "";
-
-	if (!$galaxy)
-		$galaxy = $CurrentPlanet['galaxy'];
-	if (!$system)
-		$system = $CurrentPlanet['system'];
-	if (!$planet)
-		$planet = $CurrentPlanet['planet'];
-	if (!$planettype)
-		$planettype = $CurrentPlanet['planet_type'];
-
-	$parse['flyingfleets']			= $MaxFlyingFleets;
-	$parse['maxfleets']				= $MaxFlottes;
-	$parse['currentexpeditions']	= $ExpeditionEnCours;
-	$parse['maxexpeditions']		= $EnvoiMaxExpedition;
-
-	$fq = doquery("SELECT * FROM {{table}} WHERE fleet_owner='".intval($CurrentUser[id])."' AND fleet_mission <> 10", "fleets");
-	$i  = 0;
-
-	while ($f = mysql_fetch_array($fq))
-	{
-		$i++;
-		$FleetPageRow .= "<tr height=20>";
-		$FleetPageRow .= "<th>".$i."</th>";
-		$FleetPageRow .= "<th>";
-		$FleetPageRow .= "<a>". $missiontype[$f[fleet_mission]] ."</a>";
-		if (($f['fleet_start_time'] + 1) == $f['fleet_end_time'])
-			$FleetPageRow .= "<br><a title=\"".$lang['fl_returning']."\">".$lang['fl_r']."</a>";
-		else
-			$FleetPageRow .= "<br><a title=\"".$lang['fl_onway']."\">".$lang['fl_a']."</a>";
-		$FleetPageRow .= "</th>";
-		$FleetPageRow .= "<th><a title=\"";
-
-		$fleet = explode(";", $f['fleet_array']);
-		$e = 0;
-		foreach ($fleet as $a => $b)
-		{
-			if ($b != '')
-			{
-				$e++;
-				$a = explode(",", $b);
-				$FleetPageRow .= $lang['tech'][$a[0]]. ":". $a[1] ."\n";
-				if ($e > 1)
-				{
-					$FleetPageRow .= "\t";
-				}
-			}
-		}
-		$FleetPageRow .= "\">". pretty_number($f[fleet_amount]) ."</a></th>";
-		$FleetPageRow .= "<th>[".$f[fleet_start_galaxy].":".$f[fleet_start_system].":".$f[fleet_start_planet]."]</th>";
-		$FleetPageRow .= "<th>". gmdate("d M Y H:i:s", $f['fleet_start_time']) ."</th>";
-		$FleetPageRow .= "<th>[".$f[fleet_end_galaxy].":".$f[fleet_end_system].":".$f[fleet_end_planet]."]</th>";
-		$FleetPageRow .= "<th>". gmdate("d M Y H:i:s", $f['fleet_end_time']) ."</th>";
-		$FleetPageRow .= "<th><font color=\"lime\"><div id=\"time_0\"><font>". pretty_time(floor($f['fleet_end_time'] + 1 - time())) ."</font></th>";
-		$FleetPageRow .= "<th>";
-
-		if ($f['fleet_mess'] == 0)
-		{
-				$FleetPageRow .= "<form action=\"SendFleetBack.php\" method=\"post\">";
-				$FleetPageRow .= "<input name=\"fleetid\" value=\"". $f['fleet_id'] ."\" type=\"hidden\">";
-				$FleetPageRow .= "<input value=\"".$lang['fl_send_back']."\" type=\"submit\" name=\"send\">";
-				$FleetPageRow .= "</form>";
-
-			if ($f[fleet_mission] == 1)
-			{
-				$FleetPageRow .= "<form action=\"game.php?page=fleetACS\" method=\"post\">";
-				$FleetPageRow .= "<input name=\"fleetid\" value=\"". $f['fleet_id'] ."\" type=\"hidden\">";
-				$FleetPageRow .= "<input value=\"".$lang['fl_acs']."\" type=\"submit\">";
-				$FleetPageRow .= "</form>";
-			}
-		}
-		else
-			$FleetPageRow .= "&nbsp;-&nbsp;";
-
-		$FleetPageRow .= "</th>";
-		$FleetPageRow .= "</tr>";
-	}
-
-	if ($i == 0)
-	{
-		$FleetPageRow .= "<tr>";
-		$FleetPageRow .= "<th>-</th>";
-		$FleetPageRow .= "<th>-</th>";
-		$FleetPageRow .= "<th>-</th>";
-		$FleetPageRow .= "<th>-</th>";
-		$FleetPageRow .= "<th>-</th>";
-		$FleetPageRow .= "<th>-</th>";
-		$FleetPageRow .= "<th>-</th>";
-		$FleetPageRow .= "<th>-</th>";
-		$FleetPageRow .= "<th>-</th>";
-		$FleetPageRow .= "</tr>";
-	}
-
-	$parse['fleetpagerow'] = $FleetPageRow;
-
-	if ($MaxFlottes == $MaxFlyingFleets)
-		$parse['message_nofreeslot'] .= "<tr height=\"20\"><th colspan=\"9\"><font color=\"red\">".$lang['fl_no_more_slots']."</font></th></tr>";
-
-	if (!$CurrentPlanet)
-		header("location:game.php?page=fleet");
-
-	foreach ($reslist['fleet'] as $n => $i)
-	{
-		if ($CurrentPlanet[$resource[$i]] > 0)
-		{
-			$page .= "<tr height=\"20\">";
-			$page .= "<th>";
-			$page .= ($i == 212)? "": "<a title=\"" . $lang['fl_speed_title'] . (GetFleetMaxSpeed ( "", $i, $CurrentUser )) ."\">";
-			$page .= $lang['tech'][$i] . "</a></th>";
-			$page .= "<th>". pretty_number ($CurrentPlanet[$resource[$i]]);
-			$ShipData .= "<input type=\"hidden\" name=\"maxship". $i ."\" value=\"". $CurrentPlanet[$resource[$i]] ."\" />";
-			$ShipData .= "<input type=\"hidden\" name=\"consumption". $i ."\" value=\"". GetShipConsumption ( $i, $CurrentUser ) ."\" />";
-			$ShipData .= "<input type=\"hidden\" name=\"speed" .$i ."\" value=\"" . GetFleetMaxSpeed ("", $i, $CurrentUser) . "\" />";
-			$ShipData .= "<input type=\"hidden\" name=\"capacity". $i ."\" value=\"". $pricelist[$i]['capacity'] ."\" />";
-			$page .= "</th>";
-
-			if ($i == 212)
-				$page .= "<th></th><th></th>";
-			else
-			{
-				$page .= "<th><a href=\"javascript:maxShip('ship". $i ."'); shortInfo();\">".$lang['fl_max']."</a> </th>";
-				$page .= "<th><input name=\"ship". $i ."\" size=\"10\" value=\"0\" onfocus=\"javascript:if(this.value == '0') this.value='';\" onblur=\"javascript:if(this.value == '') this.value='0';\" alt=\"". $lang['tech'][$i] . $CurrentPlanet[$resource[$i]] ."\" onChange=\"shortInfo()\" onKeyUp=\"shortInfo()\" /></th>";
-			}
-			$page .= "</tr>";
-		}
-		$have_ships = true;
-	}
-
-	$btncontinue = "<tr height=\"20\"><th colspan=\"4\"><input type=\"submit\" value=\"".$lang['fl_continue']."\" /></th>";
-
-	$page .= "<tr height=\"20\">";
-
-	if (!$have_ships)
-	{
-		$page .= "<th colspan=\"4\">".$lang['fl_no_ships']."</th>";
-		$page .= "</tr>";
-		$page .= $btncontinue;
-	}
-	else
-	{
-		$page .= "<th colspan=\"2\"><a href=\"javascript:noShips();shortInfo();noResources();\" >".$lang['fl_remove_all_ships']."</a></th>";
-		$page .= "<th colspan=\"2\"><a href=\"javascript:maxShips();shortInfo();\" >".$lang['fl_select_all_ships']."</a></th>";
-		$page .= "</tr>";
-
-		if ($MaxFlottes > $MaxFlyingFleets)
-			$page .= $btncontinue;
-	}
-	$parse['body'] 					= $page;
-	$parse['shipdata'] 				= $ShipData;
-	$parse['galaxy']				= $galaxy;
-	$parse['system']				= $system;
-	$parse['planet']				= $planet;
-	$parse['planettype']			= $planettype;
-	$parse['target_mission']		= $target_mission;
-	$parse['envoimaxexpedition']	= $EnvoiMaxExpedition;
-	$parse['expeditionencours']		= $ExpeditionEnCours;
-	$parse['target_mission']		= $target_mission;
-
-	display(parsetemplate(gettemplate('fleet/fleet_table'), $parse));
-}
-?>
\ No newline at end of file
diff --git a/includes/pages/ShowFleetShortcuts.php b/includes/pages/ShowFleetShortcuts.php
deleted file mode 100644
index c41e58e..0000000
--- a/includes/pages/ShowFleetShortcuts.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-function ShowFleetShortcuts($CurrentUser)
-{
-	global $lang, $phpEx;
-
-	$a = $_GET['a'];
-
-	if (isset($_GET['mode']))
-	{
-		if ($_POST)
-		{
-			if ($_POST["n"] == "")
-				$_POST["n"] = $lang['fl_anonymous'];
-
-			$r = strip_tags($_POST[n]) . "," . intval($_POST[g]) . "," . intval($_POST[s]) . "," . intval($_POST[p]) . "," . intval($_POST[t]) . "\r\n";
-			$CurrentUser['fleet_shortcut'] .= $r;
-			doquery("UPDATE {{table}} SET fleet_shortcut='".addslashes(mysql_escape_string($CurrentUser[fleet_shortcut]))."' WHERE id=".intval($CurrentUser[id])."", "users");
-			header("location:game.".$phpEx."?page=shortcuts");
-		}
-
-		$page = "<div id=\"content\"><form method=POST><table border=0 cellpadding=0 cellspacing=1 width=519>
-				<tr height=20>
-				<td colspan=2 class=c>".$lang['fl_shortcut_add_title']."</td>
-				</tr><tr height=\"20\"><th>
-				<input type=text name=n value=\"$g\" size=32 maxlength=32 title=\"".$lang['fl_shortcut_name']."\">
-				<input type=text name=g value=\"$s\" size=3 maxlength=1 title=\"".$lang['fl_shortcut_galaxy']."\">
-				<input type=text name=s value=\"$p\" size=3 maxlength=3 title=\"".$lang['fl_shortcut_solar_system']."\">
-				<input type=text name=p value=\"$t\" size=3 maxlength=3 title=\"".$lang['fl_planet']."\">
-				<select name=t>";
-		$page .= '<option value="1"' . (($c[4] == 1)?" SELECTED":"") . ">".$lang['fl_planet']."</option>";
-		$page .= '<option value="2"' . (($c[4] == 2)?" SELECTED":"") . ">".$lang['fl_debris']."</option>";
-		$page .= '<option value="3"' . (($c[4] == 3)?" SELECTED":"") . ">".$lang['fl_moon']."</option>";
-		$page .= "</select>
-				</th></tr><tr>
-				<th><input type=\"reset\" value=\"".$lang['fl_clean']."\"> <input type=\"submit\" value=\"".$lang['fl_register_shorcut']."\">";
-		$page .= "</th></tr>";
-		$page .= "<tr><td colspan=2 class=c><a href=\"game.".$phpEx ."?page=shortcuts\">".$lang['fl_shortcuts']."</a></td></tr></tr></table></form></div>";
-	}
-	elseif (isset($_GET['a']))
-	{
-		if ($_POST)
-		{
-			$scarray = explode("\r\n", $CurrentUser['fleet_shortcut']);
-			if ($_POST["delete"])
-			{
-				unset($scarray[$a]);
-				$CurrentUser['fleet_shortcut'] = implode("\r\n", $scarray);
-				doquery("UPDATE {{table}} SET fleet_shortcut='".addslashes(mysql_escape_string($CurrentUser[fleet_shortcut]))."' WHERE id=".intval($CurrentUser[id])."", "users");
-				header("location:game.".$phpEx."?page=shortcuts");
-			}
-			else
-			{
-				$r = explode(",", $scarray[$a]);
-				$r[0] = strip_tags($_POST['n']);
-				$r[1] = intval($_POST['g']);
-				$r[2] = intval($_POST['s']);
-				$r[3] = intval($_POST['p']);
-				$r[4] = intval($_POST['t']);
-				$scarray[$a] = implode(",", $r);
-				$CurrentUser['fleet_shortcut'] = implode("\r\n", $scarray);
-				doquery("UPDATE {{table}} SET fleet_shortcut='".addslashes(mysql_escape_string($CurrentUser[fleet_shortcut]))."' WHERE id=".intval($CurrentUser[id])."", "users");
-				header("location:game.".$phpEx."?page=shortcuts");
-			}
-		}
-
-		if ($CurrentUser['fleet_shortcut'])
-		{
-			$scarray = explode("\r\n", $CurrentUser['fleet_shortcut']);
-			$c = explode(',', $scarray[$a]);
-			$page = "<div id=\"content\"><form method=POST><table border=0 cellpadding=0 cellspacing=1 width=519>
-					<tr height=20>
-					<td colspan=2 class=c>". $lang['fl_shortcut_edition'] ."{$c[0]} [{$c[1]}:{$c[2]}:{$c[3]}]</td>
-					</tr>";
-			$page .= "<tr height=\"20\"><th>
-					<input type=hidden name=a value=$a>
-					<input type=text name=n value=\"{$c[0]}\" size=32 maxlength=32>
-					<input type=text name=g value=\"{$c[1]}\" size=3 maxlength=1>
-					<input type=text name=s value=\"{$c[2]}\" size=3 maxlength=3>
-					<input type=text name=p value=\"{$c[3]}\" size=3 maxlength=3>
-					<select name=t>";
-			$page .= '<option value="1"' . (($c[4] == 1)?" SELECTED":"") . ">".$lang['fl_planet']."</option>";
-			$page .= '<option value="2"' . (($c[4] == 2)?" SELECTED":"") . ">".$lang['fl_debris']."</option>";
-			$page .= '<option value="3"' . (($c[4] == 3)?" SELECTED":"") . ">".$lang['fl_moon']."</option>";
-			$page .= "</select>
-					</th></tr><tr>
-					<th><input type=\"reset\" value=\"".$lang['fl_reset_shortcut']."\"><input type=submit value=\"".$lang['fl_register_shorcut']."\"> <input type=submit name=delete value=\"".$lang['fl_dlte_shortcut']."\">";
-			$page .= "</th></tr>";
-		}
-		else
-			header("location:game.".$phpEx."?page=shortcuts");
-
-		$page .= "<tr><td colspan=2 class=c><a href=\"game.".$phpEx ."?page=shortcuts\">".$lang['fl_back']."</a></td></tr></tr></table></form></div>";
-	}
-	else
-	{
-		$page = "<div id=\"content\"><table border=\"0\" cellpadding=\"0\" cellspacing=\"1\" width=\"519\">
-				<tr height=\"20\">
-				<td class=\"c\" colspan=\"2\">".$lang['fl_shortcuts']." (<a href=\"game.".$phpEx."?page=shortcuts&mode=add\">".$lang['fl_shortcut_add']."</a>)</td>
-				</tr>";
-
-		if ($CurrentUser['fleet_shortcut'])
-		{
-			$scarray = explode("\r\n", $CurrentUser['fleet_shortcut']);
-			$i = $e = 0;
-			foreach($scarray as $a => $b)
-			{
-				if ($b != "") {
-					$c = explode(',', $b);
-					if ($i == 0)
-						$page .= "<tr height=\"20\">";
-
-					$page .= "<th><a href=\"game.".$phpEx ."?page=shortcuts&a=" . $e++ . "\">";
-					$page .= "{$c[0]} {$c[1]}:{$c[2]}:{$c[3]}";
-
-					if ($c[4] == 2)
-						$page .= " " . $lang['fl_debris_shortcut'];
-					elseif ($c[4] == 3)
-						$page .= " " . $lang['fl_moon_shortcut'];
-
-					$page .= "</a></th>";
-					if ($i == 1)
-						$page .= "</tr>";
-
-					if ($i == 1)
-						$i = 0;
-					else
-						$i = 1;
-				}
-			}
-			if ($i == 1)
-				$page .= "<th></th></tr>";
-		}
-		else
-			$page .= "<th colspan=\"2\">".$lang['fl_no_shortcuts']."</th>";
-
-		$page .= "<tr><td class=c colspan=2><a href=game.php?page=fleet>".$lang['fl_back']."</a></td></tr></tr></table></div>";
-	}
-	display($page);
-}
-?>
\ No newline at end of file
diff --git a/includes/pages/ShowImperiumPage.php b/includes/pages/ShowImperiumPage.php
deleted file mode 100644
index ee490ba..0000000
--- a/includes/pages/ShowImperiumPage.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-if(!defined('INSIDE')){ die(header("location:../../"));}
-
-function ShowImperiumPage($CurrentUser)
-{
-	global $lang, $resource, $reslist, $dpath;
-
-	$planetsrow = doquery("
-	SELECT `id`,`name`,`galaxy`,`system`,`planet`,`planet_type`,
-	`image`,`field_current`,`field_max`,`metal`,`metal_perhour`,
-	`crystal`,`crystal_perhour`,`deuterium`,`deuterium_perhour`,
-	`energy_used`,`energy_max`,`metal_mine`,`crystal_mine`,`deuterium_sintetizer`,
-	`solar_plant`,`fusion_plant`,`robot_factory`,`nano_factory`,`hangar`,`metal_store`,
-	`crystal_store`,`deuterium_store`,`laboratory`,`terraformer`,`ally_deposit`,`silo`,
-	`small_ship_cargo`,`big_ship_cargo`,`light_hunter`,`heavy_hunter`,`crusher`,`battle_ship`,
-	`colonizer`,`recycler`,`spy_sonde`,`bomber_ship`,`solar_satelit`,`destructor`,`dearth_star`,
-	`battleship`,`supernova`,`misil_launcher`,`small_laser`,`big_laser`,`gauss_canyon`,`ionic_canyon`,
-	`buster_canyon`,`small_protection_shield`,`atom_protector`,`planet_protector`,`big_protection_shield`,`interceptor_misil`,
-	`interplanetary_misil`, `mondbasis`, `phalanx`, `sprungtor` FROM {{table}} WHERE `id_owner` = '" . intval($CurrentUser['id']) . "' AND `destruyed` = 0;", 'planets');
-
-	$parse 	= $lang;
-	$planet = array();
-
-	while ($p = mysql_fetch_array($planetsrow))
-	{
-		$planet[] = $p;
-	}
-
-	$parse['mount'] = count($planet) + 1;
-
-	foreach ($planet as $p)
-	{
-		$datat = array('<a href="game.php?page=overview&cp=' . $p['id'] . '&amp;re=0"><img src="' . $dpath . 'planeten/small/s_' . $p['image'] . '.jpg" border="0" height="80" width="80"></a>', $p['name'], "[<a href=\"game.php?page=galaxy&mode=3&galaxy={$p['galaxy']}&system={$p['system']}\">{$p['galaxy']}:{$p['system']}:{$p['planet']}</a>]", $p['field_current'] . '/' . $p['field_max'], '<a href="game.php?page=resources&cp=' . $p['id'] . '&amp;re=0&amp;planettype=' . $p['planet_type'] . '">' . pretty_number($p['metal']) . '</a> / ' . pretty_number($p['metal_perhour']), '<a href="game.php?page=resources&cp=' . $p['id'] . '&amp;re=0&amp;planettype=' . $p['planet_type'] . '">' . pretty_number($p['crystal']) . '</a> / ' . pretty_number($p['crystal_perhour']), '<a href="game.php?page=resources&cp=' . $p['id'] . '&amp;re=0&amp;planettype=' . $p['planet_type'] . '">' . pretty_number($p['deuterium']) . '</a> / ' . pretty_number($p['deuterium_perhour']), pretty_number($p['energy_max'] - $p['energy_used']) . ' / ' . pretty_number($p['energy_max']));
-		$f = array('file_images', 'file_names', 'file_coordinates', 'file_fields', 'file_metal', 'file_crystal', 'file_deuterium', 'file_energy');
-		for ($k = 0; $k < 8; $k++)
-		{
-			$data['text'] = $datat[$k];
-			$parse[$f[$k]] .= parsetemplate(gettemplate('empire/empire_row'), $data);
-		}
-
-		foreach ($resource as $i => $res)
-		{
-			$data['text'] = ($p[$resource[$i]] == 0 && $CurrentUser[$resource[$i]] == 0) ? '-' : ((in_array($i, $reslist['build'])) ? "<a href=\"game.php?page=buildings&cp={$p['id']}&amp;re=0&amp;planettype={$p['planet_type']}\">{$p[$resource[$i]]}</a>" : ((in_array($i, $reslist['tech'])) ? "<a href=\"game.php?page=buildings&mode=research&cp={$p['id']}&amp;re=0&amp;planettype={$p['planet_type']}\">{$CurrentUser[$resource[$i]]}</a>" : ((in_array($i, $reslist['fleet'])) ? "<a href=\"game.php?page=buildings&mode=fleet&cp={$p['id']}&amp;re=0&amp;planettype={$p['planet_type']}\">{$p[$resource[$i]]}</a>" : ((in_array($i, $reslist['defense'])) ? "<a href=\"game.php?page=buildings&mode=defense&cp={$p['id']}&amp;re=0&amp;planettype={$p['planet_type']}\">{$p[$resource[$i]]}</a>" : '-'))));
-			$r[$i] .= parsetemplate(gettemplate('empire/empire_row'), $data);
-		}
-	}
-
-	$m = array('build', 'tech', 'fleet', 'defense');
-
-	$n = array('building_row', 'technology_row', 'fleet_row', 'defense_row');
-
-	for ($j = 0; $j < 4; $j++)
-	{
-		foreach ($reslist[$m[$j]] as $a => $i)
-		{
-			$data['text'] = $lang['tech'][$i];
-			$parse[$n[$j]] .= "<tr>" . parsetemplate(gettemplate('empire/empire_row'), $data) . $r[$i] . "</tr>";
-		}
-	}
-
-	return display(parsetemplate(gettemplate('empire/empire_table'), $parse), false);
-}
-?>
\ No newline at end of file
diff --git a/includes/pages/ShowMessagesPage.php b/includes/pages/ShowMessagesPage.php
deleted file mode 100644
index 6365956..0000000
--- a/includes/pages/ShowMessagesPage.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<?php
-
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-if(!defined('INSIDE')){ die(header("location:../../"));}
-
-function ShowMessagesPage($CurrentUser)
-{
-	global $xgp_root, $phpEx, $game_config, $dpath, $lang;
-
-	$OwnerID       = intval($_GET['id']);
-	$MessCategory  = intval($_GET['messcat']);
-	$MessPageMode  = addslashes(mysql_escape_string($_GET["mode"]));
-	$DeleteWhat    = $_POST['deletemessages'];
-
-	if (isset ($DeleteWhat))
-		$MessPageMode = "delete";
-
-	$UsrMess       = doquery("SELECT * FROM {{table}} WHERE `message_owner` = '".intval($CurrentUser['id'])."' ORDER BY `message_time` DESC;", 'messages');
-	$UnRead        = doquery("SELECT * FROM {{table}} WHERE `id` = '". intval($CurrentUser['id']) ."';", 'users', true);
-
-	$MessageType   = array ( 0, 1, 2, 3, 4, 5, 15, 99, 100 );
-	$TitleColor    = array ( 0 => '#FFFF00', 1 => '#FF6699', 2 => '#FF3300', 3 => '#FF9900', 4 => '#773399', 5 => '#009933', 15 => '#030070', 99 => '#007070', 100 => '#ABABAB'  );
-
-	for ($MessType = 0; $MessType < 101; $MessType++)
-	{
-		if (in_array($MessType, $MessageType))
-		{
-			$WaitingMess[$MessType] = $UnRead[$messfields[$MessType]];
-			$TotalMess[$MessType]   = 0;
-		}
-	}
-
-	while ($CurMess = mysql_fetch_array($UsrMess))
-	{
-		$MessType              = $CurMess['message_type'];
-		$TotalMess[$MessType] += 1;
-		$TotalMess[100]       += 1;
-	}
-
-	$page  .= "<script language=\"JavaScript\">\n";
-	$page .= "function f(target_url, win_name) {\n";
-	$page .= "var new_win = window.open(target_url,win_name,'resizable=yes,scrollbars=yes,menubar=no,toolbar=no,width=800,height=600,top=0,left=0');\n";
-	$page .= "new_win.focus();\n";
-	$page .= "}\n";
-	$page .= "</script>\n";
-	$page .= "<br />\n";
-	$page .= "<div id=\"content\">\n";
-
-	switch ($MessPageMode)
-	{
-		case 'write':
-			if (!is_numeric($OwnerID))
-				header("location:game.php?page=messages");
-
-			$OwnerRecord = doquery("SELECT * FROM {{table}} WHERE `id` = '".intval($OwnerID)."';", 'users', true);
-
-			if (!$OwnerRecord)
-				header("location:game.php?page=messages");
-
-			$OwnerHome   = doquery("SELECT * FROM {{table}} WHERE `id_planet` = '". intval($OwnerRecord["id_planet"]) ."';", 'galaxy', true);
-			if (!$OwnerHome)
-				header("location:game.php?page=messages");
-
-			if ($_POST)
-			{
-				$error = 0;
-				if (!$_POST["subject"])
-				{
-					$error++;
-					$page .= "<table><tr><td><font color=#FF0000".$lang['mg_no_subject']."</font></td></tr></table>";
-				}
-				if (!$_POST["text"])
-				{
-					$error++;
-					$page .= "<table><tr><td><font color=#FF0000>".$lang['mg_no_text']."</font></td></tr></table>";
-				}
-				if ($error == 0)
-				{
-					$page .= "<table><tr><td><font color=\"#00FF00\">".$lang['mg_msg_sended']."</font></td></tr></table>";
-
-					$_POST['text'] = str_replace("'", '&#39;', $_POST['text']);
-
-					$Owner   	= $OwnerID;
-					$Sender  	= intval($CurrentUser['id']);
-					$From    	= $CurrentUser['username'] ." [".$CurrentUser['galaxy'].":".$CurrentUser['system'].":".$CurrentUser['planet']."]";
-					$Subject 	= $_POST['subject'];
-                    $Message	= preg_replace ( "/([^\s]{80}?)/" , "\\1<br />" , trim ( nl2br ( strip_tags ( $_POST['text'], '<br>' ) ) ) );
-
-					SendSimpleMessage($Owner, $Sender, '', 1, $From, $Subject, $Message);
-
-					$subject 	= "";
-					$text    	= "";
-				}
-			}
-			$parse['id']           = $OwnerID;
-			$parse['to']           = $OwnerRecord['username'] ." [".$OwnerHome['galaxy'].":".$OwnerHome['system'].":".$OwnerHome['planet']."]";
-			$parse['subject']      = (!isset($subject)) ? $lang['mg_no_subject'] : $subject ;
-			$parse['text']         = $text;
-			$page                 .= parsetemplate(gettemplate('messages_pm_form'), $parse);
-		break;
-		case 'delete':
-			$DeleteWhat = $_POST['deletemessages'];
-			if($DeleteWhat == 'deleteall')
-				doquery("DELETE FROM {{table}} WHERE `message_owner` = '". intval($CurrentUser['id']) ."';", 'messages');
-			elseif ($DeleteWhat == 'deletemarked')
-			{
-				foreach($_POST as $Message => $Answer)
-				{
-					if (preg_match("/delmes/i", $Message) && $Answer == 'on')
-					{
-						$MessId   = str_replace("delmes", "", $Message);
-						$MessHere = doquery("SELECT * FROM {{table}} WHERE `message_id` = '". intval($MessId) ."' AND `message_owner` = '". intval($CurrentUser['id']) ."';", 'messages');
-						if ($MessHere)
-							doquery("DELETE FROM {{table}} WHERE `message_id` = '".intval($MessId)."';", 'messages');
-
-					}
-				}
-			}
-			elseif ($DeleteWhat == 'deleteunmarked')
-			{
-				foreach($_POST as $Message => $Answer)
-				{
-					$CurMess    = preg_match("/showmes/i", $Message);
-					$MessId     = str_replace("showmes", "", $Message);
-					$Selected   = "delmes".$MessId;
-					$IsSelected = $_POST[ $Selected ];
-					if (preg_match("/showmes/i", $Message) && !isset($IsSelected))
-					{
-						$MessHere = doquery("SELECT * FROM {{table}} WHERE `message_id` = '". intval($MessId) ."' AND `message_owner` = '". intval($CurrentUser['id']) ."';", 'messages');
-						if ($MessHere)
-							doquery("DELETE FROM {{table}} WHERE `message_id` = '".intval($MessId)."';", 'messages');
-
-					}
-				}
-			}
-			$MessCategory = $_POST['category'];
-			header("location:game.php?page=messages");
-		break;
-		case 'show':
-			$page .= "<table width=\"519\">\n";
-			$page .= "<form action=\"game.php?page=messages\" method=\"post\">\n";
-			$page .= "<table>\n";
-			$page .= "<tr>\n";
-			$page .= "<td>\n<input name=\"messages\" value=\"1\" type=\"hidden\">\n";
-			$page .= "<table width=\"519\">\n";
-			$page .= "<tr><td class=\"c\" colspan=\"4\">".$lang['mg_message_title']."</td></tr>";
-			$page .= "<tr>\n";
-			$page .= "<th>".$lang['mg_action']."</th>\n";
-			$page .= "<th>".$lang['mg_date']."</th>\n";
-			$page .= "<th>".$lang['mg_from']."</th>\n";
-			$page .= "<th>".$lang['mg_subject']."</th>\n";
-			$page .= "</tr>\n";
-
-			if ($MessCategory == 100)
-			{
-				$UsrMess       = doquery("SELECT * FROM {{table}} WHERE `message_owner` = '".intval($CurrentUser['id'])."' ORDER BY `message_time` DESC;", 'messages');
-				$SubUpdateQry  = "";
-
-				$QryUpdateUser  = "UPDATE {{table}} SET ";
-				$QryUpdateUser .= "`new_message` = '0' ";
-				$QryUpdateUser .= "WHERE ";
-				$QryUpdateUser .= "`id` = '".intval($CurrentUser['id'])."';";
-				doquery ( $QryUpdateUser, 'users');
-
-				while ($CurMess = mysql_fetch_array($UsrMess))
-				{
-					$page .= "<tr>\n";
-					$page .= "<input name=\"showmes". $CurMess['message_id'] . "\" type=\"hidden\" value=\"1\">\n";
-					$page .= "<th><input name=\"delmes". $CurMess['message_id'] . "\" type=\"checkbox\"></th>\n";
-					$page .= "<th>". date("m-d H:i:s", $CurMess['message_time']) ."</th>\n";
-					$page .= "<th>". stripslashes( $CurMess['message_from'] ) ."</th>\n";
-					$page .= "<th>". stripslashes( $CurMess['message_subject'] ) ." ";
-					if ($CurMess['message_type'] == 1)
-					{
-						$page .= "<a href=\"game.php?page=messages&mode=write&amp;id=". $CurMess['message_sender'] ."&amp;subject=Re: " . htmlspecialchars( $CurMess['message_subject']) ."\">";
-						$page .= "<img src=\"". $dpath ."img/m.gif\" border=\"0\"></a></th>\n";
-					}
-					else
-					{
-						$page .= "</th>";
-					}
-					$page .= "</tr><tr>";
-					$page .= "<td>&nbsp;</td>";
-					$page .= "<td colspan=\"3\" class=\"b\">". stripslashes( nl2br( $CurMess['message_text'] ) ) ."</td>";
-					$page .= "</tr>";
-				}
-			}
-			else
-			{
-				$UsrMess       = doquery("SELECT * FROM {{table}} WHERE `message_owner` = '".intval($CurrentUser['id'])."' AND `message_type` = '".$MessCategory."' ORDER BY `message_time` DESC;", 'messages');
-
-				while ($CurMess = mysql_fetch_array($UsrMess))
-				{
-					if ($CurMess['message_type'] == $MessCategory)
-					{
-						$QryUpdateUser  = "UPDATE {{table}} SET ";
-						$QryUpdateUser .= "`new_message` = '0' ";
-						$QryUpdateUser .= "WHERE ";
-						$QryUpdateUser .= "`id` = '".intval($CurrentUser['id'])."';";
-						doquery ( $QryUpdateUser, 'users');
-
-						$page .= "\n<tr>";
-						$page .= "<input name=\"showmes". $CurMess['message_id'] . "\" type=\"hidden\" value=\"1\">";
-						$page .= "<th><input name=\"delmes". $CurMess['message_id'] ."\" type=\"checkbox\"></th>";
-						$page .= "<th>". date("m-d H:i:s O", $CurMess['message_time']) ."</th>";
-						$page .= "<th>". stripslashes( $CurMess['message_from'] ) ."</th>";
-						$page .= "<th>". stripslashes( $CurMess['message_subject'] ) ." ";
-						if ($CurMess['message_type'] == 1)
-						{
-							$page .= "<a href=\"game.php?page=messages&mode=write&amp;id=". $CurMess['message_sender'] ."&amp;subject=Re:". htmlspecialchars( $CurMess['message_subject']) ."\">";
-							$page .= "<img src=\"". $dpath ."img/m.gif\" border=\"0\"></a></th>";
-						}
-						else
-							$page .= "</th>";
-
-						$page .= "</tr><tr>";
-						$page .= "<td class=\"b\"> </td>";
-						$page .= "<td colspan=\"3\" class=\"b\">". nl2br( stripslashes( $CurMess['message_text'] ) ) ."</td>";
-						$page .= "</tr>";
-					}
-				}
-			}
-
-
-			$page .= "<tr>";
-			$page .= "<th colspan=\"4\">";
-			$page .= "<input id=\"fullreports\" name=\"fullreports\" type=\"checkbox\">".$lang['mg_show_only_header_spy_reports']."</th>";
-			$page .= "</tr><tr>";
-			$page .= "<th colspan=\"4\">";
-			$page .= "<select id=\"deletemessages\" name=\"deletemessages\">";
-			$page .= "<option value=\"deletemarked\">".$lang['mg_delete_marked']."</option>";
-			$page .= "<option value=\"deleteunmarked\">".$lang['mg_delete_unmarked']."</option>";
-			$page .= "<option value=\"deleteall\">".$lang['mg_delete_all']."</option>";
-			$page .= "</select>";
-			$page .= "<input value=\"".$lang['mg_confirm_delete']."\" type=\"submit\">";
-			$page .= "</th>";
-			$page .= "</tr><tr>";
-			$page .= "<td colspan=\"4\"></td>";
-			$page .= "</tr>";
-			$page .= "</table>\n";
-			$page .= "<table width=\"100%\">";
-			$page .= "<tr>";
-			$page .= "<td class=\"c\">".$lang['mg_game_operators']."</td>";
-			$page .= "</tr>";
-
-			$QrySelectUser  = "SELECT `username`, `email` ";
-			$QrySelectUser .= "FROM `{{table}}` ";
-			$QrySelectUser .= "WHERE `authlevel` != '0' ORDER BY `username` ASC;";
-			$GameOps = doquery ($QrySelectUser, 'users');
-
-			while($Ops = mysql_fetch_assoc($GameOps))
-				$page .= "<tr><th>".$Ops['username']." <a href=\"mailto:".$Ops['email']."\"><img src=\"". $dpath ."img/m.gif\" /></a></th></tr>";
-
-			$page .= "</table>";
-			$page .= "</td>";
-			$page .= "</tr>";
-			$page .= "</table>\n";
-			$page .= "</form>";
-		break;
-		default:
-			$page .= "<br>";
-			$page .= "<table width=\"569\">";
-			$page .= "<tr>";
-			$page .= "	<td class=\"c\" colspan=\"3\">".$lang['mg_message_title']."</td>";
-			$page .= "</tr><tr>";
-			$page .= "	<th colspan=\"2\">".$lang['mg_message_type']."</th>";
-			$page .= "	<th>".$lang['mg_total']."</th>";
-			$page .= "</tr>";
-			$page .= "<tr>";
-			$page .= "	<th colspan=\"2\"><a href=\"game.php?page=messages&mode=show&amp;messcat=100\"><font color=\"". $TitleColor[100] ."\">". $lang['mg_type'][100] ."</a></th>";
-			$page .= "	<th><font color=\"". $TitleColor[100] ."\">". $TotalMess[100] ."</font></th>";
-			$page .= "</tr>";
-			for ($MessType = 0; $MessType < 100; $MessType++)
-			{
-				if ( in_array($MessType, $MessageType) )
-				{
-					$page .= "<tr>";
-					$page .= "	<th colspan=\"2\"><a href=\"game.php?page=messages&mode=show&amp;messcat=". $MessType ." \"><font color=\"". $TitleColor[$MessType] ."\">". $lang['mg_type'][$MessType] ."</a></th>";
-					$page .= "	<th><font color=\"". $TitleColor[$MessType] ."\">". $TotalMess[$MessType] ."</font></th>";
-					$page .= "</tr>";
-				}
-			}
-			$page .= "</table>";
-
-		break;
-	}
-	$page .= "</div>";
-	display($page);
-}
-?>
\ No newline at end of file
diff --git a/includes/pages/ShowNotesPage.php b/includes/pages/ShowNotesPage.php
deleted file mode 100644
index 7516df6..0000000
--- a/includes/pages/ShowNotesPage.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-if(!defined('INSIDE')){ die(header("location:../../"));}
-
-function ShowNotesPage($CurrentUser)
-{
-	global $lang;
-
-	$parse 	= $lang;
-	$a 		= intval($_GET['a']);
-	$n 		= intval($_GET['n']);
-
-	if($_POST["s"] == 1 || $_POST["s"] == 2)
-	{
-		$time 		= time();
-		$priority 	= intval($_POST["u"]);
-		$title 		= ($_POST["title"]) ? mysql_escape_string(strip_tags($_POST["title"])) : "Sin t&iacute;tulo";
-		$text 		= ($_POST["text"]) ? mysql_escape_string(strip_tags($_POST["text"])) : "Sin texto";
-
-		if($_POST["s"] ==1)
-		{
-			doquery("INSERT INTO {{table}} SET owner=".intval($CurrentUser[id]).", time=$time, priority=$priority, title='$title', text='$text'","notes");
-			header("location:game.php?page=notes");
-		}
-		elseif($_POST["s"] == 2)
-		{
-			$id = intval($_POST["n"]);
-			$note_query = doquery("SELECT * FROM {{table}} WHERE id=".intval($id)." AND owner=".intval($CurrentUser[id])."","notes");
-
-			if(!$note_query)
-				header("location:game.php?page=notes");
-
-			doquery("UPDATE {{table}} SET time=$time, priority=$priority, title='$title', text='$text' WHERE id=".intval($id)."","notes");
-			header("location:game.php?page=notes");
-		}
-	}
-	elseif($_POST)
-	{
-		foreach($_POST as $a => $b)
-		{
-			if(preg_match("/delmes/i",$a) && $b == "y")
-			{
-				$id = str_replace("delmes","",$a);
-				$note_query = doquery("SELECT * FROM {{table}} WHERE id=".intval($id)." AND owner=".intval($CurrentUser[id])."","notes");
-
-				if($note_query)
-				{
-					$deleted++;
-					doquery("DELETE FROM {{table}} WHERE `id`=".intval($id).";","notes");
-				}
-			}
-		}
-
-		if($deleted)
-			header("location:game.php?page=notes");
-		else
-			header("Location:game.php?page=notes");
-	}
-	else
-	{
-		if($_GET["a"] == 1)
-		{
-			$parse['c_Options'] = "<option value=2 selected=selected>".$lang['nt_important']."</option>
-			<option value=1>".$lang['nt_normal']."</option>
-			<option value=0>".$lang['nt_unimportant']."</option>";
-			$parse['TITLE'] 	= $lang['nt_create_note'];
-			$parse[inputs]  	= "<input type=hidden name=s value=1>";
-
-			display(parsetemplate(gettemplate('notes/notes_form'), $parse), false, '', false, false);
-
-		}
-		elseif($_GET["a"] == 2)
-		{
-			$note = doquery("SELECT * FROM {{table}} WHERE owner=".intval($CurrentUser[id])." AND id=".intval($n)."",'notes',true);
-
-			if(!$note)
-				header("location:game.php?page=notes");
-
-			$SELECTED[$note['priority']] = ' selected="selected"';
-
-			$parse['c_Options'] = "<option value=2{$SELECTED[2]}>".$lang['nt_important']."</option>
-			<option value=1{$SELECTED[1]}>".$lang['nt_normal']."</option>
-			<option value=0{$SELECTED[0]}>".$lang['nt_unimportant']."</option>";
-
-			$parse['TITLE'] 	= $lang['nt_edit_note'];
-			$parse['inputs'] 	= '<input type=hidden name=s value=2><input type=hidden name=n value='.$note['id'].'>';
-			$parse[asunto]		= $note[title];
-			$parse[texto]		= $note[text];
-
-			display(parsetemplate(gettemplate('notes/notes_form'), $parse), false, '', false, false);
-
-		}
-		else
-		{
-			$notes_query = doquery("SELECT * FROM {{table}} WHERE owner=".intval($CurrentUser[id])." ORDER BY time DESC",'notes');
-
-			$count = 0;
-
-			while($note = mysql_fetch_array($notes_query))
-			{
-				$count++;
-
-				if($note["priority"] == 0){ $parse['NOTE_COLOR'] = "lime";}
-				elseif($note["priority"] == 1){ $parse['NOTE_COLOR'] = "yellow";}
-				elseif($note["priority"] == 2){ $parse['NOTE_COLOR'] = "red";}
-
-				$parse['NOTE_ID'] 		= $note['id'];
-				$parse['NOTE_TIME'] 	= date("Y-m-d h:i:s",$note["time"]);
-				$parse['NOTE_TITLE'] 	= $note['title'];
-				$parse['NOTE_TEXT'] 	= strlen($note['text']);
-
-				$list .= parsetemplate(gettemplate('notes/notes_body_entry'), $parse);
-
-			}
-
-			if($count == 0)
-			{
-				$list .= "<tr><th colspan=4>".$lang['nt_you_dont_have_notes']."</th>\n";
-			}
-
-			$parse['BODY_LIST'] = $list;
-
-			display(parsetemplate(gettemplate('notes/notes_body'), $parse), false, '', false, false);
-		}
-	}
-}
-?>
\ No newline at end of file
diff --git a/includes/pages/ShowOverviewPage.php b/includes/pages/ShowOverviewPage.php
deleted file mode 100644
index f6cf0bd..0000000
--- a/includes/pages/ShowOverviewPage.php
+++ /dev/null
@@ -1,429 +0,0 @@
-<?php
-
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-if(!defined('INSIDE')){ die(header("location:../../"));}
-
-function ShowOverviewPage($CurrentUser, $CurrentPlanet)
-{
-	global $xgp_root, $phpEx, $dpath, $game_config, $lang, $planetrow, $user;
-
-	include_once($xgp_root . 'includes/functions/InsertJavaScriptChronoApplet.' . $phpEx);
-	include_once($xgp_root . 'includes/classes/class.FlyingFleetsTable.' . $phpEx);
-
-	$FlyingFleetsTable = new FlyingFleetsTable();
-
-	$lunarow = 	 doquery("SELECT * FROM {{table}} WHERE `id_owner` = '".intval($CurrentPlanet['id_owner']) . "' AND `galaxy` = '" . intval($CurrentPlanet['galaxy']) . "' AND `system` = '" . intval($CurrentPlanet['system']) . "' AND  `planet` = '" . intval($CurrentPlanet['planet']) . "' AND `planet_type`='3'", 'planets', true);
-
-	if (empty($lunarow)) { unset($lunarow); }
-
-	CheckPlanetUsedFields($lunarow);
-
-	$parse					= $lang;
-	$parse['planet_id'] 	= $CurrentPlanet['id'];
-	$parse['planet_name'] 	= $CurrentPlanet['name'];
-	$parse['galaxy_galaxy'] = $CurrentPlanet['galaxy'];
-	$parse['galaxy_system'] = $CurrentPlanet['system'];
-	$parse['galaxy_planet'] = $CurrentPlanet['planet'];
-
-	switch ($_GET['mode'])
-	{
-		case 'renameplanet':
-
-			if ($_POST['action'] == $lang['ov_planet_rename_action'])
-			{
-				$newname        = mysql_escape_string(strip_tags(trim($_POST['newname'])));
-
-				if (preg_match("/[^A-zÀ-ÿ0-9_\- ]/", $newname) == 1)
-				{
-					message($lang['ov_newname_error'], "game.php?page=overview&mode=renameplanet",2);
-				}
-				if ($newname != "")
-				{
-					doquery("UPDATE {{table}} SET `name` = '" . $newname . "' WHERE `id` = '" . intval($CurrentUser['current_planet']) . "' LIMIT 1;", "planets");
-				}
-			}
-			elseif ($_POST['action'] == $lang['ov_abandon_planet'])
-			{
-				return display(parsetemplate(gettemplate('overview/overview_deleteplanet'), $parse));
-			}
-			elseif (intval($_POST['kolonieloeschen']) == 1 && intval($_POST['deleteid']) == $CurrentUser['current_planet'])
-			{
-				$filokontrol = doquery("SELECT * FROM {{table}} WHERE fleet_owner = '".intval($user['id'])."' AND fleet_start_galaxy='".intval($CurrentPlanet['galaxy'])."' AND fleet_start_system='".intval($CurrentPlanet['system'])."' AND fleet_start_planet='".intval($CurrentPlanet['planet'])."'", 'fleets');
-
-				while($satir = mysql_fetch_array($filokontrol))
-				{
-					$kendifilo 	= $satir['fleet_owner'];
-					$digerfilo 	= $satir['fleet_target_owner'];
-					$harabeyeri = $satir['fleet_end_type'];
-					$mess 		= $satir['fleet_mess'];
-				}
-
-				$filokontrol = doquery("SELECT * FROM {{table}} WHERE fleet_target_owner = '".intval($user['id'])."' AND fleet_end_galaxy='".intval($CurrentPlanet['galaxy'])."' AND fleet_end_system='".intval($CurrentPlanet['system'])."' AND fleet_end_planet='".intval($CurrentPlanet['planet'])."'" , 'fleets');
-
-				while($satir = mysql_fetch_array($filokontrol))
-				{
-					$kendifilo 	= $satir['fleet_owner'];
-					$digerfilo 	= $satir['fleet_target_owner'];
-					$gezoay 	= $satir['fleet_end_type'];
-					$mess 		= $satir['fleet_mess'];
-				}
-
-				if ($kendifilo > 0)
-				{
-					message($lang['ov_abandon_planet_not_possible'], 'game.php?page=overview&mode=renameplanet');
-				}
-				elseif ((($digerfilo > 0) && ($mess < 1 )) && $gezoay <> 2  )
-				{
-					message($lang['ov_abandon_planet_not_possible'], 'game.php?page=overview&mode=renameplanet');
-				}
-				else
-				{
-					if (md5($_POST['pw']) == $CurrentUser["password"] && $CurrentUser['id_planet'] != $CurrentUser['current_planet'])
-					{
-
-						doquery("UPDATE {{table}} SET `destruyed` = '".(time()+ 86400)."' WHERE `id` = '".intval($CurrentUser['current_planet'])."' LIMIT 1;" , 'planets');
-						doquery("UPDATE {{table}} SET `current_planet` = `id_planet` WHERE `id` = '". intval($CurrentUser['id']) ."' LIMIT 1", "users");
-						doquery("DELETE FROM {{table}} WHERE `galaxy` = '". intval($CurrentPlanet['galaxy']) ."' AND `system` = '". intval($CurrentPlanet['system']) ."' AND `planet` = '". intval($CurrentPlanet['planet']) ."' AND `planet_type` = 3;", 'planets');
-
-						message($lang['ov_planet_abandoned'], 'game.php?page=overview&mode=renameplanet');
-					}
-					elseif ($CurrentUser['id_planet'] == $CurrentUser["current_planet"])
-					{
-						message($lang['ov_principal_planet_cant_abanone'], 'game.php?page=overview&mode=renameplanet');
-					}
-					else
-					{
-						message($lang['ov_wrong_pass'], 'game.php?page=overview&mode=renameplanet');
-					}
-				}
-			}
-
-			return display(parsetemplate(gettemplate('overview/overview_renameplanet'), $parse));
-			break;
-
-		default:
-			if ($CurrentUser['new_message'] != 0)
-			{
-				$Have_new_message .= "<tr>";
-				if ($CurrentUser['new_message'] == 1)
-				{
-					$Have_new_message .= "<th colspan=4><a href=game.$phpEx?page=messages>". $lang['ov_have_new_message'] ."</a></th>";
-				}
-				elseif ($CurrentUser['new_message'] > 1)
-				{
-					$Have_new_message .= "<th colspan=4><a href=game.$phpEx?page=messages>";
-					$Have_new_message .= str_replace('%m', pretty_number($CurrentUser['new_message']), $lang['ov_have_new_messages']);
-					$Have_new_message .= "</a></th>";
-				}
-				$Have_new_message .= "</tr>";
-			}
-
-			$OwnFleets = doquery("SELECT * FROM {{table}} WHERE `fleet_owner` = '" . intval($CurrentUser['id']) . "';", 'fleets');
-
-			$Record = 0;
-
-			while ($FleetRow = mysql_fetch_array($OwnFleets))
-			{
-				$Record++;
-
-				$StartTime 	= $FleetRow['fleet_start_time'];
-				$StayTime 	= $FleetRow['fleet_end_stay'];
-				$EndTime 	= $FleetRow['fleet_end_time'];
-				/////// // ### LUCKY , CODES ARE BELOW
-				$hedefgalaksi 	= $FleetRow['fleet_end_galaxy'];
-				$hedefsistem 	= $FleetRow['fleet_end_system'];
-				$hedefgezegen 	= $FleetRow['fleet_end_planet'];
-				$mess 			= $FleetRow['fleet_mess'];
-				$filogrubu 		= $FleetRow['fleet_group'];
-				$id         	= $FleetRow['fleet_id'];
-				//////
-				$Label = "fs";
-				if ($StartTime > time())
-				{
-					$fpage[$StartTime.$id]  = $FlyingFleetsTable->BuildFleetEventTable ($FleetRow, 0, true, $Label, $Record);
-				}
-
-				if(($FleetRow['fleet_mission'] <> 4) && ($FleetRow['fleet_mission'] <> 10))
-				{
-					$Label = "ft";
-
-					if ($StayTime > time())
-					{
-						$fpage[$StayTime.$id] = $FlyingFleetsTable->BuildFleetEventTable ($FleetRow, 1, true, $Label, $Record);
-					}
-					$Label = "fe";
-
-					if ($EndTime > time())
-					{
-						$fpage[$EndTime.$id] = $FlyingFleetsTable->BuildFleetEventTable ($FleetRow, 2, true, $Label, $Record);
-					}
-				}
-			}
-			mysql_free_result($OwnFleets);
-			//iss ye katilan filo////////////////////////////////////
-
-			// ### LUCKY , CODES ARE BELOW
-
-			$dostfilo = doquery("SELECT * FROM {{table}} WHERE `fleet_end_galaxy` = '" . intval($hedefgalaksi) . "' AND `fleet_end_system` = '" . intval($hedefsistem) . "' AND `fleet_end_planet` = '" . intval($hedefgezegen) . "' AND `fleet_group` = '" . intval($filogrubu) . "';", 'fleets');
-			$Record1 = 0;
-			while ($FleetRow = mysql_fetch_array($dostfilo)) {
-
-
-				$StartTime = $FleetRow['fleet_start_time'];
-				$StayTime = $FleetRow['fleet_end_stay'];
-				$EndTime = $FleetRow['fleet_end_time'];
-
-				///////
-				$hedefgalaksi = $FleetRow['fleet_end_galaxy'];
-				$hedefsistem = $FleetRow['fleet_end_system'];
-				$hedefgezegen = $FleetRow['fleet_end_planet'];
-				$mess = $FleetRow['fleet_mess'];
-				$filogrubu = $FleetRow['fleet_group'];
-				$id             = $FleetRow['fleet_id'];
-				///////
-				if (($FleetRow['fleet_mission'] == 2) && ($FleetRow['fleet_owner'] != $CurrentUser['id'])) {
-					$Record1++;
-					//		if (($FleetRow['fleet_mission'] == 2) ){
-					if($mess > 0){
-						$StartTime = "";
-					}else{
-						$StartTime = $FleetRow['fleet_start_time'];
-					}
-
-					if ($StartTime > time()) {
-						$Label = "ofs";
-						$fpage[$StartTime.$id]  =$FlyingFleetsTable-> BuildFleetEventTable ($FleetRow, 0, false, $Label, $Record1);
-					}
-
-					//	}
-				} ///""
-
-				if (($FleetRow['fleet_mission'] == 1) && ($FleetRow['fleet_owner'] != $CurrentUser['id']) && ($filogrubu > 0 ) ){
-					$Record++;
-					if($mess > 0){
-						$StartTime = "";
-					}else{
-						$StartTime = $FleetRow['fleet_start_time'];
-					}
-					if ($StartTime > time()) {
-						$Label = "ofs";
-						$fpage[$StartTime.$id]  = $FlyingFleetsTable-> BuildFleetEventTable ($FleetRow, 0, false, $Label, $Record);
-					}
-
-				}
-
-			}
-			mysql_free_result($dostfilo);
-			//
-			//////////////////////////////////////////////////
-
-			$OtherFleets = doquery("SELECT * FROM {{table}} WHERE `fleet_target_owner` = '" . intval($CurrentUser['id']) . "';", 'fleets');
-
-			$Record = 2000;
-			while ($FleetRow = mysql_fetch_array($OtherFleets))
-			{
-				if ($FleetRow['fleet_owner'] != $CurrentUser['id'])
-				{
-					if ($FleetRow['fleet_mission'] != 8)
-					{
-						$Record++;
-						$StartTime 	= $FleetRow['fleet_start_time'];
-						$StayTime 	= $FleetRow['fleet_end_stay'];
-						$id         = $FleetRow['fleet_id'];
-
-						if ($StartTime > time())
-						{
-							$Label = "ofs";
-							$fpage[$StartTime.$id]  = $FlyingFleetsTable->BuildFleetEventTable ($FleetRow, 0, false, $Label, $Record);
-						}
-						if ($FleetRow['fleet_mission'] == 5)
-						{
-							$Label = "oft";
-							if ($StayTime > time())
-							{
-								$fpage[$StayTime.$id] = $FlyingFleetsTable->BuildFleetEventTable ($FleetRow, 1, false, $Label, $Record);
-							}
-						}
-					}
-				}
-			}
-			mysql_free_result($OtherFleets);
-
-			$planets_query = doquery("SELECT * FROM `{{table}}` WHERE id_owner='".intval($CurrentUser['id'])."' AND `destruyed` = 0", "planets");
-			$Colone  	= 1;
-			$AllPlanets = "<tr>";
-			while ($CurrentUserPlanet = mysql_fetch_array($planets_query))
-			{
-				if ($CurrentUserPlanet["id"] != $CurrentUser["current_planet"] && $CurrentUserPlanet['planet_type'] != 3)
-				{
-					$Coloneshow++;
-					$AllPlanets .= "<th>". $CurrentUserPlanet['name'] ."<br>";
-					$AllPlanets .= "<a href=\"game.php?page=overview&cp=". $CurrentUserPlanet['id'] ."&re=0\" title=\"". $CurrentUserPlanet['name'] ."\"><img src=\"". $dpath ."planeten/small/s_". $CurrentUserPlanet['image'] .".jpg\" height=\"50\" width=\"50\"></a><br>";
-					$AllPlanets .= "<center>";
-
-					if ($CurrentUserPlanet['b_building'] != 0)
-					{
-						UpdatePlanetBatimentQueueList ($CurrentUserPlanet, $CurrentUser);
-						if ($CurrentUserPlanet['b_building'] != 0 )
-						{
-							$BuildQueue      = $CurrentUserPlanet['b_building_id'];
-							$QueueArray      = explode ( ";", $BuildQueue );
-							$CurrentBuild    = explode ( ",", $QueueArray[0] );
-							$BuildElement    = $CurrentBuild[0];
-							$BuildLevel      = $CurrentBuild[1];
-							$BuildRestTime   = pretty_time( $CurrentBuild[3] - time() );
-							$AllPlanets     .= '' . $lang['tech'][$BuildElement] . ' (' . $BuildLevel . ')';
-							$AllPlanets     .= "<br><font color=\"#7f7f7f\">(". $BuildRestTime .")</font>";
-						}
-						else
-						{
-							CheckPlanetUsedFields ($CurrentUserPlanet);
-							$AllPlanets     .= $lang['ov_free'];
-						}
-					}
-					else
-					{
-						$AllPlanets    .= $lang['ov_free'];
-					}
-
-					$AllPlanets .= "</center></th>";
-
-					if ($Colone <= 1)
-						$Colone++;
-					else
-					{
-						$AllPlanets .= "</tr><tr>";
-						$Colone = 1;
-					}
-				}
-			}
-			mysql_free_result($planets_query);
-
-			$AllPlanets .= "</tr>";
-
-			if ($lunarow['id'] <> 0 && $lunarow['destruyed'] != 1 && $CurrentPlanet['planet_type'] != 3)
-			{
-				if ($CurrentPlanet['planet_type'] == 1 or $lunarow['id'] <> 0)
-				{
-					$moon = doquery ("SELECT `id`,`name`,`image` FROM {{table}} WHERE `galaxy` = '" . intval($CurrentPlanet['galaxy']) . "' AND `system` = '" . intval($CurrentPlanet['system']) . "' AND `planet` = '" . intval($CurrentPlanet['planet']) . "' AND `planet_type` = '3'", 'planets', true);
-					$parse['moon_img'] = "<a href=\"game.php?page=overview&cp=" . $moon['id'] . "&re=0\" title=\"" . $moon['name'] . "\"><img src=\"" . $dpath . "planeten/" . $moon['image'] . ".jpg\" height=\"50\" width=\"50\"></a>";
-					$parse['moon'] = $moon['name'] ." (" . $lang['fcm_moon'] . ")";
-				}
-				else
-				{
-					$parse['moon_img'] = "";
-					$parse['moon'] = "";
-				}
-			}
-			else
-			{
-				$parse['moon_img'] = "";
-				$parse['moon'] = "";
-			}
-
-			$parse['planet_diameter'] 		= pretty_number($CurrentPlanet['diameter']);
-			$parse['planet_field_current']  = $CurrentPlanet['field_current'];
-			$parse['planet_field_max'] 		= CalculateMaxPlanetFields($CurrentPlanet);
-			$parse['planet_temp_min'] 		= $CurrentPlanet['temp_min'];
-			$parse['planet_temp_max'] 		= $CurrentPlanet['temp_max'];
-
-			$StatRecord = doquery("SELECT `total_rank`,`total_points` FROM `{{table}}` WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '" . intval($CurrentUser['id']) . "';", 'statpoints', true);
-
-			$parse['user_username']        = $CurrentUser['username'];
-
-			if (count($fpage) > 0)
-			{
-				ksort($fpage);
-				foreach ($fpage as $time => $content)
-				{
-					$flotten .= $content . "\n";
-				}
-			}
-
-			if ($CurrentPlanet['b_building'] != 0)
-			{
-				include($xgp_root . 'includes/functions/InsertBuildListScript.' . $phpEx);
-
-				UpdatePlanetBatimentQueueList ($planetrow, $user);
-				if ($CurrentPlanet['b_building'] != 0)
-				{
-					$BuildQueue  		 = explode (";", $CurrentPlanet['b_building_id']);
-					$CurrBuild 	 		 = explode (",", $BuildQueue[0]);
-					$RestTime 	 		 = $CurrentPlanet['b_building'] - time();
-					$PlanetID 	 		 = $CurrentPlanet['id'];
-					$Build 		 		 = InsertBuildListScript ("overview");
-					$Build 	   			.= $lang['tech'][$CurrBuild[0]] . ' (' . ($CurrBuild[1]) . ')';
-					$Build 				.= "<br /><div id=\"blc\" class=\"z\">" . pretty_time($RestTime) . "</div>";
-					$Build 				.= "\n<script language=\"JavaScript\">";
-					$Build 				.= "\n	pp = \"" . $RestTime . "\";\n";
-					$Build 				.= "\n	pk = \"" . 1 . "\";\n";
-					$Build 				.= "\n	pm = \"cancel\";\n";
-					$Build 				.= "\n	pl = \"" . $PlanetID . "\";\n";
-					$Build 				.= "\n	t();\n";
-					$Build 				.= "\n</script>\n";
-					$parse['building'] 	 = $Build;
-				}
-				else
-				{
-					$parse['building'] = $lang['ov_free'];
-				}
-			}
-			else
-			{
-				$parse['building'] = $lang['ov_free'];
-			}
-
-			$parse['fleet_list']  			= $flotten;
-			$parse['Have_new_message'] 		= $Have_new_message;
-			$parse['planet_image'] 			= $CurrentPlanet['image'];
-			$parse['anothers_planets'] 		= $AllPlanets;
-			$parse["dpath"] 				= $dpath;
-			if($game_config['stat'] == 0)
-				$parse['user_rank']			= pretty_number($StatRecord['total_points']) . " (". $lang['ov_place'] ." <a href=\"game.php?page=statistics&range=".$StatRecord['total_rank']."\">".$StatRecord['total_rank']."</a> ". $lang['ov_of'] ." ".$game_config['users_amount'].")";
-			elseif($game_config['stat'] == 1 && $CurrentUser['authlevel'] < $game_config['stat_level'])
-				$parse['user_rank']			= pretty_number($StatRecord['total_points']) . " (". $lang['ov_place'] ." <a href=\"game.php?page=statistics&range=".$StatRecord['total_rank']."\">".$StatRecord['total_rank']."</a> ". $lang['ov_of'] ." ".$game_config['users_amount'].")";
-			else
-				$parse['user_rank']			= "-";
-
-			$parse['date_time']				= date("D M j H:i:s", time());
-
-			// Ïîñëåäíèå 5 îòâåòîâ èç ÷àòà START
-            $mess = doquery("SELECT `timestamp`, `user`,`message` FROM {{table}} WHERE `ally_id` = '0' ORDER BY `messageid` DESC LIMIT 5", 'chat');
-            $msg = '<table width="100%">';
-            while ($result = mysql_fetch_array($mess)) {
-            //$str = substr($result['message'], 0, 85);
-            $str = $result['message'];
-            $usr = $result['user'];
-            $msgtimestamp=date("m/d H:i:s", $result['timestamp']);
-                $msg .= "<tr align='left'> <td width='110'><font color='PaleGreen'><b>[".$msgtimestamp."]</b></font></td> <td align='left'>".$usr.":</td>
-                        <td align='left' width='400'>".$str."</td></tr>";
-            }
-            $msg .= '</table>';
-            include("includes/msg_replace.php");
-            $parse['LastChat'] = $msg;
-			// Ïîñëåäíèå 5 îòâåòîâ èç ÷àòà END
-			
-			
-			return display(parsetemplate(gettemplate('overview/overview_body'), $parse));
-			break;
-	}
-}
-?>
\ No newline at end of file
diff --git a/includes/pages/ShowPhalanxPage.php b/includes/pages/ShowPhalanxPage.php
deleted file mode 100644
index a030d1b..0000000
--- a/includes/pages/ShowPhalanxPage.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-
-function ShowPhalanxPage($CurrentUser, $CurrentPlanet)
-{
-	global $xgp_root, $phpEx, $lang;
-
-	include_once($xgp_root . 'includes/functions/InsertJavaScriptChronoApplet.' . $phpEx);
-	include_once($xgp_root . 'includes/classes/class.FlyingFleetsTable.' . $phpEx);
-	include_once($xgp_root . 'includes/classes/class.GalaxyRows.' . $phpEx);
-
-	$FlyingFleetsTable 	= new FlyingFleetsTable();
-	$GalaxyRows 		= new GalaxyRows();
-
-	$parse	= $lang;
-
-	$radar_menzil_min = $CurrentPlanet['system'] - $GalaxyRows->GetPhalanxRange ( $CurrentPlanet['phalanx'] );
-	$radar_menzil_max = $CurrentPlanet['system'] + $GalaxyRows->GetPhalanxRange ( $CurrentPlanet['phalanx'] );
-
-	if ( $radar_menzil_min < 1 )
-		$radar_menzil_min = 1;
-
-	if ( $radar_menzil_max > MAX_SYSTEM_IN_GALAXY )
-		$radar_menzil_max = MAX_SYSTEM_IN_GALAXY;
-
-	if ( ( intval ( $_GET["system"] ) < $radar_menzil_min ) or ( intval ( $_GET["system"] ) > $radar_menzil_max ) )
-	{
-		$DoScan = false;
-	}
-
-	if ($CurrentPlanet['planet_type'] == 3)
-	{
-		$parse['phl_pl_galaxy']    = $CurrentPlanet['galaxy'];
-		$parse['phl_pl_system']    = $CurrentPlanet['system'];
-		$parse['phl_pl_place']     = $CurrentPlanet['planet'];
-		$parse['phl_pl_name']      = $CurrentUser['username'];
-
-		if ($CurrentPlanet['deuterium'] > 10000)
-		{
-			doquery ("UPDATE {{table}} SET `deuterium` = `deuterium` - '10000' WHERE `id` = '". $CurrentUser['current_planet'] ."';", 'planets');
-			$parse['phl_er_deuter'] = "";
-			$DoScan                 = true;
-		}
-		else
-		{
-			$parse['phl_er_deuter'] = $lang['px_no_deuterium'];
-			$DoScan                 = false;
-		}
-
-		if ($DoScan == true)
-		{
-			$Galaxy  = intval($_GET["galaxy"]);
-			$System  = intval($_GET["system"]);
-			$Planet  = intval($_GET["planet"]);
-			$PlType  = intval($_GET["planettype"]);
-
-			if ( $PlType == 1 )
-			{
-
-			}
-			else
-			{
-				die(header("Location: game.php?page=galaxy"));
-			}
-
-			$TargetInfo = doquery("SELECT * FROM {{table}} WHERE `galaxy` = '". $Galaxy ."' AND `system` = '". $System ."' AND `planet` = '". $Planet ."' AND `planet_type` = '". $PlType ."';", 'planets', true);
-			$TargetName = $TargetInfo['name'];
-
-			$QryLookFleets  = "SELECT * ";
-			$QryLookFleets .= "FROM {{table}} ";
-			$QryLookFleets .= "WHERE ( ( ";
-			$QryLookFleets .= "`fleet_start_galaxy` = '". $Galaxy ."' AND ";
-			$QryLookFleets .= "`fleet_start_system` = '". $System ."' AND ";
-			$QryLookFleets .= "`fleet_start_planet` = '". $Planet ."' AND ";
-			$QryLookFleets .= "`fleet_start_type` = '". $PlType ."' ";
-			$QryLookFleets .= ") OR ( ";
-			$QryLookFleets .= "`fleet_end_galaxy` = '". $Galaxy ."' AND ";
-			$QryLookFleets .= "`fleet_end_system` = '". $System ."' AND ";
-			$QryLookFleets .= "`fleet_end_planet` = '". $Planet ."' AND ";
-			$QryLookFleets .= "`fleet_end_type` = '". $PlType ."' ";
-			$QryLookFleets .= ") ) ";
-			$QryLookFleets .= "ORDER BY `fleet_start_time`;";
-
-			$FleetToTarget  = doquery( $QryLookFleets, 'fleets' );
-
-			if (mysql_num_rows($FleetToTarget) <> 0 )
-			{
-				while ($FleetRow = mysql_fetch_array($FleetToTarget))
-				{
-					$Record++;
-
-					$StartTime   = $FleetRow['fleet_start_time'];
-					$StayTime    = $FleetRow['fleet_end_stay'];
-					$EndTime     = $FleetRow['fleet_end_time'];
-
-					if ($FleetRow['fleet_owner'] == $TargetInfo['id_owner'])
-						$FleetType = true;
-					else
-						$FleetType = false;
-
-					$FleetRow['fleet_resource_metal']     = 0;
-					$FleetRow['fleet_resource_crystal']   = 0;
-					$FleetRow['fleet_resource_deuterium'] = 0;
-
-					$Label = "fs";
-					if ($StartTime > time())
-						$fpage[$StartTime] = $FlyingFleetsTable->BuildFleetEventTable ( $FleetRow, 0, $FleetType, $Label, $Record );
-
-					if ($FleetRow['fleet_mission'] <> 4)
-					{
-						$Label = "ft";
-						if ($StayTime > time())
-							$fpage[$StayTime] = $FlyingFleetsTable->BuildFleetEventTable ( $FleetRow, 1, $FleetType, $Label, $Record );
-
-						if ($FleetType == true)
-						{
-							$Label = "fe";
-							if ($EndTime > time())
-								$fpage[$EndTime]  = $FlyingFleetsTable->BuildFleetEventTable ( $FleetRow, 2, $FleetType, $Label, $Record );
-						}
-					}
-				}
-			}
-
-			if (count($fpage) > 0)
-			{
-				ksort($fpage);
-				foreach ($fpage as $FleetTime => $FleetContent)
-				{
-					$Fleets .= $FleetContent ."\n";
-				}
-			}
-		}
-
-		$parse['phl_fleets_table'] = $Fleets;
-	}
-	else
-	{
-		header("location:game.php?page=overview");
-	}
-
-	return display(parsetemplate(gettemplate('galaxy/phalanx_body'), $parse), false, '', false, false);
-}
-?>
\ No newline at end of file
diff --git a/includes/pages/ShowResourcesPage.php b/includes/pages/ShowResourcesPage.php
deleted file mode 100644
index 0a8152b..0000000
--- a/includes/pages/ShowResourcesPage.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<?php
-
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-if(!defined('INSIDE')){ die(header("location:../../"));}
-
-function ShowResourcesPage($CurrentUser, $CurrentPlanet)
-{
-	global $lang, $ProdGrid, $resource, $reslist, $game_config;
-
-	$parse = $lang;
-
-	if ($CurrentPlanet['planet_type'] == 3)
-	{
-		$game_config['metal_basic_income']     = 0;
-		$game_config['crystal_basic_income']   = 0;
-		$game_config['deuterium_basic_income'] = 0;
-	}
-
-	$ValidList['percent'] = array (  0,  10,  20,  30,  40,  50,  60,  70,  80,  90, 100 );
-	$SubQry               = "";
-
-	if ($_POST)
-	{
-		foreach($_POST as $Field => $Value)
-		{
-			$FieldName = $Field."_porcent";
-			if ( isset( $CurrentPlanet[ $FieldName ] ) )
-			{
-				if ( ! in_array( $Value, $ValidList['percent']) )
-				{
-					header("Location: game.php?page=ressources");
-					exit;
-				}
-
-				$Value                        = $Value / 10;
-				$CurrentPlanet[ $FieldName ]  = $Value;
-				$SubQry                      .= ", `".$FieldName."` = '".$Value."'";
-			}
-		}
-	}
-
-	$parse['production_level'] = 100;
-	if       ($CurrentPlanet['energy_max'] == 0 && $CurrentPlanet['energy_used'] > 0)
-	{
-		$post_porcent = 0;
-	}
-	elseif ($CurrentPlanet['energy_max'] >  0 && ($CurrentPlanet['energy_used'] + $CurrentPlanet['energy_max']) < 0 )
-	{
-		$post_porcent = floor(($CurrentPlanet['energy_max']) / ($CurrentPlanet['energy_used']*-1) * 100);
-	}
-	else
-	{
-		$post_porcent = 100;
-	}
-
-	if ($post_porcent > 100)
-	{
-		$post_porcent = 100;
-	}
-
-	$CurrentPlanet['metal_max']		=	(BASE_STORAGE_SIZE + 50000 * (roundUp(pow(1.6,$CurrentPlanet[ $resource[22] ])) -1)) * (1 + ($CurrentUser['rpg_stockeur'] * STOCKEUR));
-	$CurrentPlanet['crystal_max']	=	(BASE_STORAGE_SIZE + 50000 * (roundUp(pow(1.6,$CurrentPlanet[ $resource[23] ])) -1)) * (1 + ($CurrentUser['rpg_stockeur'] * STOCKEUR));
-	$CurrentPlanet['deuterium_max']	=	(BASE_STORAGE_SIZE + 50000 * (roundUp(pow(1.6,$CurrentPlanet[ $resource[24] ])) -1)) * (1 + ($CurrentUser['rpg_stockeur'] * STOCKEUR));
-
-	$parse['resource_row']               = "";
-	$CurrentPlanet['metal_perhour']      = 0;
-	$CurrentPlanet['crystal_perhour']    = 0;
-	$CurrentPlanet['deuterium_perhour']  = 0;
-	$CurrentPlanet['energy_max']         = 0;
-	$CurrentPlanet['energy_used']        = 0;
-	$BuildTemp                           = $CurrentPlanet[ 'temp_max' ];
-
-	foreach($reslist['prod'] as $ProdID)
-	{
-		if ($CurrentPlanet[$resource[$ProdID]] > 0 && isset($ProdGrid[$ProdID]))
-		{
-			$BuildLevelFactor                    = $CurrentPlanet[ $resource[$ProdID]."_porcent" ];
-			$BuildLevel                          = $CurrentPlanet[ $resource[$ProdID] ];
-			$metal     = floor( eval ( $ProdGrid[$ProdID]['formule']['metal']     ) * ( $game_config['resource_multiplier'] ) * ( 1 + ( $CurrentUser['rpg_geologue']  * GEOLOGUE ) ) );
-			$crystal   = floor( eval ( $ProdGrid[$ProdID]['formule']['crystal']   ) * ( $game_config['resource_multiplier'] ) * ( 1 + ( $CurrentUser['rpg_geologue']  * GEOLOGUE ) ) );
-			$deuterium = floor( eval ( $ProdGrid[$ProdID]['formule']['deuterium'] ) * ( $game_config['resource_multiplier'] ) * ( 1 + ( $CurrentUser['rpg_geologue']  * GEOLOGUE ) ) );
-
-			if( $ProdID >= 4 )
-			{
-				$energy = floor( eval ( $ProdGrid[$ProdID]['formule']['energy']    ) * ( $game_config['resource_multiplier'] ) * ( 1 + ( $CurrentUser['rpg_ingenieur'] * INGENIEUR ) ) );
-			}
-			else $energy = floor( eval ( $ProdGrid[$ProdID]['formule']['energy']    ) * ( $game_config['resource_multiplier'] ) );
-				if ($energy > 0)
-				{
-					$CurrentPlanet['energy_max']    += $energy;
-				}
-				else
-				{
-					$CurrentPlanet['energy_used']   += $energy;
-				}
-
-			$CurrentPlanet['metal_perhour']     += $metal;
-			$CurrentPlanet['crystal_perhour']   += $crystal;
-			$CurrentPlanet['deuterium_perhour'] += $deuterium;
-
-			$metal                               = $metal     * 0.01 * $post_porcent;
-			$crystal                             = $crystal   * 0.01 * $post_porcent;
-			$deuterium                           = $deuterium * 0.01 * $post_porcent;
-			$energy                              = $energy    * 0.01 * $post_porcent;
-			$Field                               = $resource[$ProdID] ."_porcent";
-			$CurrRow                             = array();
-			$CurrRow['name']                     = $resource[$ProdID];
-			$CurrRow['porcent']                  = $CurrentPlanet[$Field];
-
-			for ($Option = 10; $Option >= 0; $Option--)
-			{
-				$OptValue = $Option * 10;
-
-				if ($Option == $CurrRow['porcent'])
-				{
-					$OptSelected    = " selected=selected";
-				}
-				else
-				{
-					$OptSelected    = "";
-				}
-					$CurrRow['option'] .= "<option value=\"".$OptValue."\"".$OptSelected.">".$OptValue."%</option>";
-			}
-
-			$CurrRow['type']                     = $lang['tech'][$ProdID];
-			$CurrRow['level']                    = ($ProdID > 200) ? $lang['rs_amount'] : $lang['rs_lvl'];
-			$CurrRow['level_type']               = $CurrentPlanet[ $resource[$ProdID] ];
-			$CurrRow['metal_type']               = pretty_number ( $metal     );
-			$CurrRow['crystal_type']             = pretty_number ( $crystal   );
-			$CurrRow['deuterium_type']           = pretty_number ( $deuterium );
-			$CurrRow['energy_type']              = pretty_number ( $energy    );
-			$CurrRow['metal_type']               = colorNumber ( $CurrRow['metal_type']     );
-			$CurrRow['crystal_type']             = colorNumber ( $CurrRow['crystal_type']   );
-			$CurrRow['deuterium_type']           = colorNumber ( $CurrRow['deuterium_type'] );
-			$CurrRow['energy_type']              = colorNumber ( $CurrRow['energy_type']    );
-			$parse['resource_row']              .= parsetemplate ( gettemplate('resources/resources_row'), $CurrRow );
-		}
-	}
-
-	$parse['Production_of_resources_in_the_planet'] = str_replace('%s', $CurrentPlanet['name'], $lang['rs_production_on_planet']);
-
-	if ($CurrentPlanet['energy_max'] == 0 && $CurrentPlanet['energy_used'] > 0)
-	{
-		$parse['production_level'] = 0;
-	}
-	elseif ($CurrentPlanet['energy_max']  > 0 && abs($CurrentPlanet['energy_used']) > $CurrentPlanet['energy_max'])
-	{
-		$parse['production_level'] = floor(($CurrentPlanet['energy_max']) / ($CurrentPlanet['energy_used']*-1) * 100);
-	}
-	elseif ($CurrentPlanet['energy_max'] == 0 && abs($CurrentPlanet['energy_used']) > $CurrentPlanet['energy_max'])
-	{
-		$parse['production_level'] = 0;
-	}
-	else
-	{
-		$parse['production_level'] = 100;
-	}
-
-	if ($parse['production_level'] > 100)
-	{
-		$parse['production_level'] = 100;
-	}
-
-	$parse['metal_basic_income']     = $game_config['metal_basic_income'];
-	$parse['crystal_basic_income']   = $game_config['crystal_basic_income'];
-	$parse['deuterium_basic_income'] = $game_config['deuterium_basic_income'];
-	$parse['energy_basic_income']    = $game_config['energy_basic_income'];
-
-	if ($CurrentPlanet['metal_max'] < $CurrentPlanet['metal'])
-	{
-		$parse['metal_max']         = "<font color=\"#ff0000\">";
-	}
-	else
-	{
-		$parse['metal_max']         = "<font color=\"#00ff00\">";
-	}
-	$parse['metal_max']            .= pretty_number($CurrentPlanet['metal_max'] / 1000) ."k</font>";
-
-	if ($CurrentPlanet['crystal_max'] < $CurrentPlanet['crystal'])
-	{
-		$parse['crystal_max']       = "<font color=\"#ff0000\">";
-	}
-	else
-	{
-		$parse['crystal_max']       = "<font color=\"#00ff00\">";
-	}
-	$parse['crystal_max']          .= pretty_number($CurrentPlanet['crystal_max'] / 1000) ."k</font>";
-
-	if ($CurrentPlanet['deuterium_max'] < $CurrentPlanet['deuterium'])
-	{
-		$parse['deuterium_max']     = "<font color=\"#ff0000\">";
-	}
-	else
-	{
-		$parse['deuterium_max']     = "<font color=\"#00ff00\">";
-	}
-	$parse['deuterium_max']        .= pretty_number($CurrentPlanet['deuterium_max'] / 1000) ."k</font>";
-
-	$parse['metal_total']           = colorNumber( pretty_number( floor( ( ($CurrentPlanet['metal_perhour']     * 0.01 * $parse['production_level'] ) + $parse['metal_basic_income']))));
-	$parse['crystal_total']         = colorNumber( pretty_number( floor( ( ($CurrentPlanet['crystal_perhour']   * 0.01 * $parse['production_level'] ) + $parse['crystal_basic_income']))));
-	$parse['deuterium_total']       = colorNumber( pretty_number( floor( ( ($CurrentPlanet['deuterium_perhour'] * 0.01 * $parse['production_level'] ) + $parse['deuterium_basic_income']))));
-	$parse['energy_total']          = colorNumber( pretty_number( floor( ( $CurrentPlanet['energy_max'] + $parse['energy_basic_income']    ) + $CurrentPlanet['energy_used'] ) ) );
-
-	$parse['daily_metal']           = floor($CurrentPlanet['metal_perhour']     * 24      * 0.01 * $parse['production_level']  + $parse['metal_basic_income']      * 24      );
-	$parse['weekly_metal']          = floor($CurrentPlanet['metal_perhour']     * 24 * 7  * 0.01 * $parse['production_level']  + $parse['metal_basic_income']      * 24 * 7  );
-
-	$parse['daily_crystal']         = floor($CurrentPlanet['crystal_perhour']   * 24      * 0.01 * $parse['production_level']  + $parse['crystal_basic_income']    * 24      );
-	$parse['weekly_crystal']        = floor($CurrentPlanet['crystal_perhour']   * 24 * 7  * 0.01 * $parse['production_level']  + $parse['crystal_basic_income']    * 24 * 7  );
-
-	$parse['daily_deuterium']       = floor($CurrentPlanet['deuterium_perhour'] * 24      * 0.01 * $parse['production_level']  + $parse['deuterium_basic_income']  * 24      );
-	$parse['weekly_deuterium']      = floor($CurrentPlanet['deuterium_perhour'] * 24 * 7  * 0.01 * $parse['production_level']  + $parse['deuterium_basic_income']  * 24 * 7  );
-
-	$parse['daily_metal']           = colorNumber(pretty_number($parse['daily_metal']));
-	$parse['weekly_metal']          = colorNumber(pretty_number($parse['weekly_metal']));
-
-	$parse['daily_crystal']         = colorNumber(pretty_number($parse['daily_crystal']));
-	$parse['weekly_crystal']        = colorNumber(pretty_number($parse['weekly_crystal']));
-
-	$parse['daily_deuterium']       = colorNumber(pretty_number($parse['daily_deuterium']));
-	$parse['weekly_deuterium']      = colorNumber(pretty_number($parse['weekly_deuterium']));
-
-
-	$QryUpdatePlanet  = "UPDATE {{table}} SET ";
-	$QryUpdatePlanet .= "`id` = '". $CurrentPlanet['id'] ."' ";
-	$QryUpdatePlanet .= $SubQry;
-	$QryUpdatePlanet .= "WHERE ";
-	$QryUpdatePlanet .= "`id` = '". $CurrentPlanet['id'] ."';";
-	doquery( $QryUpdatePlanet, 'planets');
-
-	return display(parsetemplate( gettemplate('resources/resources'), $parse));
-}
-
-?>
\ No newline at end of file
diff --git a/includes/pages/ShowSearchPage.php b/includes/pages/ShowSearchPage.php
deleted file mode 100644
index ad197d9..0000000
--- a/includes/pages/ShowSearchPage.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-if(!defined('INSIDE')){ die(header("location:../../"));}
-
-function ShowSearchPage()
-{
-	global $dpath, $lang;
-
-	$parse 	= $lang;
-	$type 	= $_POST['type'];
-
-	$searchtext = mysql_escape_string($_POST["searchtext"]);
-
-	switch($type)
-	{
-		case "playername":
-			$table 	= gettemplate('search/search_user_table');
-			$row 	= gettemplate('search/search_user_row');
-			$search = doquery("SELECT * FROM {{table}} WHERE username LIKE '%{$searchtext}%' LIMIT 25;","users");
-		break;
-		case "planetname":
-			$table 	= gettemplate('search/search_user_table');
-			$row 	= gettemplate('search/search_user_row');
-			$search = doquery("SELECT * FROM {{table}} WHERE name LIKE '%{$searchtext}%' LIMIT 25",'planets');
-		break;
-		case "allytag":
-			$table 	= gettemplate('search/search_ally_table');
-			$row 	= gettemplate('search/search_ally_row');
-			$search = doquery("SELECT * FROM {{table}} WHERE ally_tag LIKE '%{$searchtext}%' LIMIT 25","alliance");
-		break;
-		case "allyname":
-			$table 	= gettemplate('search/search_ally_table');
-			$row 	= gettemplate('search/search_ally_row');
-			$search = doquery("SELECT * FROM {{table}} WHERE ally_name LIKE '%{$searchtext}%' LIMIT 25","alliance");
-		break;
-		default:
-			$table 	= gettemplate('search/search_user_table');
-			$row 	= gettemplate('search/search_user_row');
-			$search = doquery("SELECT * FROM {{table}} WHERE username LIKE '%{$searchtext}%' LIMIT 25","users");
-	}
-
-	if(isset($searchtext) && isset($type))
-	{
-		while($s = mysql_fetch_array($search, MYSQL_BOTH))
-		{
-			if($type == 'playername' or $type == 'planetname')
-			{
-				if($s['ally_id'] != 0 && $s['ally_request'] == 0)
-				{
-					$aquery = doquery("SELECT id,ally_name FROM {{table}} WHERE id = ".intval($s['ally_id'])."","alliance",true);
-				}
-				else
-				{
-					$aquery = array();
-				}
-
-				if ($type == "planetname")
-				{
-					$pquery 			= doquery("SELECT username,ally_id,ally_name FROM {{table}} WHERE id = ".intval($s['id_owner'])."","users",true);
-					$s['planet_name'] 	= $s['name'];
-					$s['username'] 		= $pquery['username'];
-					$s['ally_name'] 	= ($pquery['ally_name']!='')?"<a href=\"game.php?page=alliance&mode=ainfo&a={$pquery['ally_id']}\">{$pquery['ally_name']}</a>":'';
-				}
-				else
-				{
-					$pquery 			= doquery("SELECT name FROM {{table}} WHERE id = ".intval($s['id_planet'])."","planets",true);
-					$s['planet_name']	= $pquery['name'];
-					$s['ally_name'] 	= ($aquery['ally_name']!='')?"<a href=\"game.php?page=alliance&mode=ainfo&a={$aquery['id']}\">{$aquery['ally_name']}</a>":'';
-				}
-
-				$s['position'] 		= "<a href=\"game.php?page=statistics&start=".$s['rank']."\">".$s['rank']."</a>";
-				$s['dpath'] 		= $dpath;
-				$s['coordinated'] 	= "{$s['galaxy']}:{$s['system']}:{$s['planet']}";
-				$result_list 	   .= parsetemplate($row, $s);
-			}
-			elseif($type=='allytag'||$type=='allyname')
-			{
-				$s['ally_points'] = pretty_number($s['ally_points']);
-
-				$s['ally_tag'] = "<a href=\"game.php?page=alliance&mode=ainfo&tag={$s['ally_tag']}\">{$s['ally_tag']}</a>";
-				$result_list .= parsetemplate($row, $s);
-			}
-		}
-		if($result_list!='')
-		{
-			$parse['result_list'] = $result_list;
-			$search_results = parsetemplate($table, $parse);
-		}
-	}
-
-	$parse['type_playername'] 	= ($_POST["type"] == "playername") ? " SELECTED" : "";
-	$parse['type_planetname'] 	= ($_POST["type"] == "planetname") ? " SELECTED" : "";
-	$parse['type_allytag'] 		= ($_POST["type"] == "allytag") ? " SELECTED" : "";
-	$parse['type_allyname'] 	= ($_POST["type"] == "allyname") ? " SELECTED" : "";
-	$parse['searchtext'] 		= $searchtext;
-	$parse['search_results'] 	= $search_results;
-
-	display(parsetemplate(gettemplate('search/search_body'), $parse));
-}
-?>
\ No newline at end of file
diff --git a/includes/pages/ShowStatisticsPage.php b/includes/pages/ShowStatisticsPage.php
deleted file mode 100644
index 82f6861..0000000
--- a/includes/pages/ShowStatisticsPage.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php
-
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-if(!defined('INSIDE')){ die(header("location:../../"));}
-
-function ShowStatisticsPage($CurrentUser)
-{
-	global $game_config, $dpath, $lang;
-
-	$parse	= $lang;
-	$who   	= (isset($_POST['who']))   ? $_POST['who']   : $_GET['who'];
-	if (!isset($who))
-		$who   = 1;
-
-	$type  	= (isset($_POST['type']))  ? $_POST['type']  : $_GET['type'];
-	if (!isset($type))
-		$type  = 1;
-
-	$range 	= (isset($_POST['range'])) ? $_POST['range'] : $_GET['range'];
-	if (!isset($range))
-		$range = 1;
-
-	$parse['who']    = "<option value=\"1\"". (($who == "1") ? " SELECTED" : "") .">".$lang['st_player']."</option>";
-	$parse['who']   .= "<option value=\"2\"". (($who == "2") ? " SELECTED" : "") .">".$lang['st_alliance']."</option>";
-
-	$parse['type']   = "<option value=\"1\"". (($type == "1") ? " SELECTED" : "") .">".$lang['st_points']."</option>";
-	$parse['type']  .= "<option value=\"2\"". (($type == "2") ? " SELECTED" : "") .">".$lang['st_fleets']."</option>";
-	$parse['type']  .= "<option value=\"3\"". (($type == "3") ? " SELECTED" : "") .">".$lang['st_researh']."</option>";
-	$parse['type']  .= "<option value=\"4\"". (($type == "4") ? " SELECTED" : "") .">".$lang['st_buildings']."</option>";
-	$parse['type']  .= "<option value=\"5\"". (($type == "5") ? " SELECTED" : "") .">".$lang['st_defenses']."</option>";
-
-	switch ($type)
-	{
-		case 1:
-			$Order   = "total_points";
-			$Points  = "total_points";
-			$Counts  = "total_count";
-			$Rank    = "total_rank";
-			$OldRank = "total_old_rank";
-		break;
-		case 2:
-			$Order   = "fleet_count";
-			$Points  = "fleet_points";
-			$Counts  = "fleet_count";
-			$Rank    = "fleet_rank";
-			$OldRank = "fleet_old_rank";
-		break;
-		case 3:
-			$Order   = "tech_count";
-			$Points  = "tech_points";
-			$Counts  = "tech_count";
-			$Rank    = "tech_rank";
-			$OldRank = "tech_old_rank";
-		break;
-		case 4:
-			$Order   = "build_points";
-			$Points  = "build_points";
-			$Counts  = "build_count";
-			$Rank    = "build_rank";
-			$OldRank = "build_old_rank";
-		break;
-		case 5:
-			$Order   = "defs_points";
-			$Points  = "defs_points";
-			$Counts  = "defs_count";
-			$Rank    = "defs_rank";
-			$OldRank = "defs_old_rank";
-		break;
-		default:
-			$Order   = "total_points";
-			$Points  = "total_points";
-			$Counts  = "total_count";
-			$Rank    = "total_rank";
-			$OldRank = "total_old_rank";
-		break;
-	}
-
-	if ($who == 2)
-	{
-		$MaxAllys = doquery ("SELECT COUNT(*) AS `count` FROM {{table}};", 'alliance', true);
-
-		if ($MaxAllys['count'] > 100)
-		{
-			$LastPage = floor($MaxAllys['count'] / 100);
-		}
-
-		$parse['range'] = "";
-
-		for ($Page = 0; $Page <= $LastPage; $Page++)
-		{
-			$PageValue      = ($Page * 100) + 1;
-			$PageRange      = $PageValue + 99;
-			$parse['range'] .= "<option value=\"". $PageValue ."\"". (($range >= $PageValue && $range <= $PageRange) ? " SELECTED" : "") .">". $PageValue ."-". $PageRange ."</option>";
-		}
-
-		$parse['stat_header'] = parsetemplate(gettemplate('stat/stat_alliancetable_header'), $parse);
-		$start = floor($range / 100 % 100) * 100;
-		$stats_sql	=	'SELECT s.*, a.id, a.ally_members, a.ally_tag, a.ally_name FROM {{table}}statpoints as s
-		INNER JOIN {{table}}alliance as a ON a.id = s.id_owner
-		WHERE `stat_type` = 2 AND `stat_code` = 1
-		ORDER BY `'. $Order .'` DESC LIMIT '. $start .',100;';
-
-		$start++;
-		$parse['stat_date']   = date("Y-m-d, H:i:s",$game_config['stat_last_update']);
-		$parse['stat_values'] = "";
-		$query = doquery($stats_sql, '');
-
-		while ($StatRow = mysql_fetch_assoc($query))
-		{
-			$parse['ally_rank']       = $start;
-			if ( $StatRow[ $OldRank ] == 0 || $StatRow[ $Rank ] == 0)
-			{
-				$rank_old				= $start;
-				$QryUpdRank				= doquery("UPDATE {{table}} SET `".$Rank."` = '".$start."', `".$OldRank."` = '".$start."' WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '". intval($StatRow['id_owner']) ."';" , "statpoints");
-				$StatRow[ $OldRank ]	= $start;
-				$StatRow[ $Rank ]		= $start;
-			}
-
-			$ranking                  = $StatRow[ $OldRank ] - $StatRow[ $Rank ];
-
-			if ($ranking == 0)
-			{
-				$parse['ally_rankplus']   = "<font color=#87CEEB>*</font>";
-			}
-
-			if ($ranking < 0)
-			{
-				$parse['ally_rankplus']   = "<font color=red>-".$ranking."</font>";
-			}
-
-			if ($ranking > 0)
-			{
-				$parse['ally_rankplus']   = "<font color=green>+".$ranking."</font>";
-			}
-
-			$parse['ally_tag']        	  = $StatRow['ally_tag'];
-			$parse['ally_name']       	  = $StatRow['ally_name'];
-			$parse['ally_mes']        	  = '';
-			$parse['ally_members']    	  = $StatRow['ally_members'];
-			$parse['ally_points']     	  = pretty_number( $StatRow[ $Order ] );
-			$parse['ally_members_points'] =  pretty_number( floor($StatRow[ $Order ] / $StatRow['ally_members']) );
-			$parse['stat_values']    	 .= parsetemplate(gettemplate('stat/stat_alliancetable'), $parse);
-			$start++;
-		}
-	}
-	else
-	{
-		$MaxUsers = doquery ("SELECT COUNT(*) AS `count` FROM {{table}} WHERE `db_deaktjava` = '0';", 'users', true);
-
-		if ($MaxUsers['count'] > 100)
-		{
-			$LastPage = floor($MaxUsers['count'] / 100);
-		}
-
-		$parse['range'] = "";
-
-		for ($Page = 0; $Page <= $LastPage; $Page++)
-		{
-			$PageValue      = ($Page * 100) + 1;
-			$PageRange      = $PageValue + 99;
-
-			$parse['range'] .= "<option value=\"". $PageValue ."\"". (($range >= $PageValue && $range <= $PageRange) ? " SELECTED" : "") .">". $PageValue ."-". $PageRange ."</option>";
-		}
-
-
-		$parse['stat_header'] = parsetemplate(gettemplate('stat/stat_playertable_header'), $parse);
-
-		$start = floor($range / 100 % 100) * 100;
-
-		$stats_sql	=	'SELECT s.*, u.id, u.username, u.ally_id, u.ally_name FROM {{table}}statpoints as s
-		INNER JOIN {{table}}users as u ON u.id = s.id_owner
-		WHERE `stat_type` = 1 AND `stat_code` = 1
-		ORDER BY `'. $Order .'` DESC LIMIT '. $start .',100;';
-
-		$query = doquery($stats_sql, '');
-
-		$start++;
-
-		$parse['stat_date']   = date("Y-m-d, H:i:s",$game_config['stat_last_update']);
-		$parse['stat_values'] = "";
-
-		$previusId = 0;
-
-		while ($StatRow = mysql_fetch_assoc($query))
-		{
-			$parse['player_rank']     = $start;
-			if ( $StatRow[ $OldRank ] == 0 || $StatRow[ $Rank ] == 0)
-			{
-				$rank_old				= $start;
-				$QryUpdRank				= doquery("UPDATE {{table}} SET `".$Rank."` = '".$start."', `".$OldRank."` = '".$start."' WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '". intval($StatRow['id_owner']) ."';" , "statpoints");
-				$StatRow[ $OldRank ]	= $start;
-				$StatRow[ $Rank ]		= $start;
-			}
-
-			$ranking                  = $StatRow[ $OldRank ] - $StatRow[ $Rank ];
-
-			if ($StatRow['id'] != $previusId)
-			{
-				$previusId 			= $StatRow['id'];
-
-				if ($ranking == 0)
-				{
-					$parse['player_rankplus'] = "<font color=#87CEEB>*</font>";
-				}
-
-				if ($ranking < 0)
-					$parse['player_rankplus'] = "<font color=red>".$ranking."</font>";
-
-				if ($ranking > 0)
-					$parse['player_rankplus'] = "<font color=green>+".$ranking."</font>";
-
-				if ($StatRow['id'] == $CurrentUser['id'])
-					$parse['player_name']     = "<font color=\"lime\">".$StatRow['username']."</font>";
-				else
-					$parse['player_name']     = $StatRow['username'];
-
-				if ($StatRow['id'] != $CurrentUser['id'])
-					$parse['player_mes']      = "<a href=\"game.php?page=messages&mode=write&id=" . $StatRow['id'] . "\"><img src=\"" . $dpath . "img/m.gif\" border=\"0\" title=\"Escribir un mensaje\" /></a>";
-				else
-					$parse['player_mes']      = "";
-
-				if ($UsrRow['ally_name'] == $CurrentUser['ally_name'])
-				{
-					$parse['player_alliance'] = "<a href=\"game.php?page=alliance&mode=ainfo&a=".$StatRow['ally_id']."\"><font color=\"#33CCFF\">".$StatRow['ally_name']."</font></a>";
-				}
-				else
-				{
-					$parse['player_alliance'] = "<a href=\"game.php?page=alliance&mode=ainfo&a=".$StatRow['ally_id']."\">".$StatRow['ally_name']."</a>";
-				}
-				$parse['player_points']   = pretty_number( $StatRow[ $Order ] );
-				$parse['stat_values']    .= parsetemplate(gettemplate('stat/stat_playertable'), $parse);
-				$start++;
-			}
-		}
-	}
-
-	display(parsetemplate( gettemplate('stat/stat_body'), $parse ));
-}
-?>
\ No newline at end of file
diff --git a/includes/pages/ShowTechTreePage.php b/includes/pages/ShowTechTreePage.php
deleted file mode 100644
index cb209f0..0000000
--- a/includes/pages/ShowTechTreePage.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-if(!defined('INSIDE')){ die(header("location:../../"));}
-
-function ShowTechTreePage($CurrentUser, $CurrentPlanet)
-{
-	global $resource, $requeriments, $lang;
-
-	$parse = $lang;
-
-	foreach($lang['tech'] as $Element => $ElementName)
-	{
-		$parse            = array();
-		$parse['tt_name'] = $ElementName;
-
-		if (!isset($resource[$Element]))
-		{
-			$parse['Requirements']  = $lang['tt_requirements'];
-			$page                  .= parsetemplate(gettemplate('techtree/techtree_head'), $parse);
-		}
-		else
-		{
-			if (isset($requeriments[$Element]))
-			{
-				$parse['required_list'] = "";
-				foreach($requeriments[$Element] as $ResClass => $Level)
-				{
-					if( isset($CurrentUser[$resource[$ResClass]] ) && $CurrentUser[$resource[$ResClass]] >= $Level)
-						$parse['required_list'] .= "<font color=\"#00ff00\">";
-					elseif ( isset($CurrentPlanet[$resource[$ResClass]] ) && $CurrentPlanet[$resource[$ResClass]] >= $Level)
-						$parse['required_list'] .= "<font color=\"#00ff00\">";
-					else
-						$parse['required_list'] .= "<font color=\"#ff0000\">";
-
-					$parse['required_list'] .= $lang['tech'][$ResClass] ." (". $lang['tt_lvl'] . $Level .")";
-					$parse['required_list'] .= "</font><br>";
-				};
-			}
-			else
-			{
-				$parse['required_list'] = "";
-				$parse['tt_detail']     = "";
-			}
-			$parse['tt_info']   = $Element;
-			$page              .= parsetemplate(gettemplate('techtree/techtree_row'), $parse);
-		}
-	}
-
-	$parse['techtree_list'] = $page;
-
-	return display(parsetemplate(gettemplate('techtree/techtree_body'), $parse));
-}
-?>
\ No newline at end of file
diff --git a/includes/pages/ShowTraderPage.php b/includes/pages/ShowTraderPage.php
deleted file mode 100644
index 324462e..0000000
--- a/includes/pages/ShowTraderPage.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-if(!defined('INSIDE')){ die(header("location:../../"));}
-
-function ShowTraderPage($CurrentUser, $CurrentPlanet)
-{
-	global $phpEx, $lang;
-
-	$parse = $lang;
-
-	if($CurrentUser['darkmatter'] < TR_DARK_MATTER)
-	{
-		message(str_replace('%s',TR_DARK_MATTER,$lang['tr_darkmatter_needed']), '', '', true);
-		die();
-	}
-
-	if (isset($_POST['ress']) && $_POST['ress'] != '')
-	{
-		switch ($_POST['ress'])
-		{
-			case 'metal':
-			{
-				if ($_POST['cristal'] < 0 or $_POST['deut'] < 0)
-				{
-					message($lang['tr_only_positive_numbers'], "game." . $phpEx . "?page=trader",1);
-				}
-				else
-				{
-					$necessaire   = (($_POST['cristal'] * 2) + ($_POST['deut'] * 4));
-
-					if ($CurrentPlanet['metal'] > $necessaire)
-					{
-						$QryUpdatePlanet  = "UPDATE {{table}} SET ";
-						$QryUpdatePlanet .= "`metal` = `metal` - ".round($necessaire).", ";
-						$QryUpdatePlanet .= "`crystal` = `crystal` + ".round($_POST['cristal']).", ";
-						$QryUpdatePlanet .= "`deuterium` = `deuterium` + ".round($_POST['deut'])." ";
-						$QryUpdatePlanet .= "WHERE ";
-						$QryUpdatePlanet .= "`id` = '".$CurrentPlanet['id']."';";
-
-						doquery($QryUpdatePlanet , 'planets');
-
-						$planetrow['metal']     -= $necessaire;
-						$CurrentPlanet['cristal']   += $_POST['cristal'];
-						$CurrentPlanet['deuterium'] += $_POST['deut'];
-						doquery("UPDATE `{{table}}` SET `darkmatter` = `darkmatter` - ".TR_DARK_MATTER." WHERE `id` = ".$CurrentUser['id']."", 'users');
-					}
-					else
-					{
-						message($lang['tr_not_enought_metal'], "game." . $phpEx . "?page=trader",1);
-					}
-				}
-				break;
-			}
-			case 'cristal':
-			{
-				if ($_POST['metal'] < 0 or $_POST['deut'] < 0)
-				{
-					message($lang['tr_only_positive_numbers'], "game." . $phpEx . "?page=trader",1);
-				}
-				else
-				{
-					$necessaire   = ((abs($_POST['metal']) * 0.5) + (abs($_POST['deut']) * 2));
-
-					if ($CurrentPlanet['crystal'] > $necessaire)
-					{
-						$QryUpdatePlanet  = "UPDATE {{table}} SET ";
-						$QryUpdatePlanet .= "`metal` = `metal` + ".round($_POST['metal']).", ";
-						$QryUpdatePlanet .= "`crystal` = `crystal` - ".round($necessaire).", ";
-						$QryUpdatePlanet .= "`deuterium` = `deuterium` + ".round($_POST['deut'])." ";
-						$QryUpdatePlanet .= "WHERE ";
-						$QryUpdatePlanet .= "`id` = '".$CurrentPlanet['id']."';";
-
-						doquery($QryUpdatePlanet , 'planets');
-
-						$CurrentPlanet['metal']     += $_POST['metal'];
-						$CurrentPlanet['cristal']   -= $necessaire;
-						$CurrentPlanet['deuterium'] += $_POST['deut'];
-						doquery("UPDATE `{{table}}` SET `darkmatter` = `darkmatter` - ".TR_DARK_MATTER." WHERE `id` = ".$CurrentUser['id']."", 'users');
-					}
-					else
-					{
-						message($lang['tr_not_enought_crystal'], "game." . $phpEx . "?page=trader",1);
-					}
-				}
-				break;
-			}
-			case 'deuterium':
-			{
-				if ($_POST['cristal'] < 0 or $_POST['metal'] < 0)
-				{
-					message($lang['tr_only_positive_numbers'], "game." . $phpEx . "?page=trader",1);
-				}
-				else
-				{
-					$necessaire   = ((abs($_POST['metal']) * 0.25) + (abs($_POST['cristal']) * 0.5));
-
-					if ($CurrentPlanet['deuterium'] > $necessaire)
-					{
-						$QryUpdatePlanet  = "UPDATE {{table}} SET ";
-						$QryUpdatePlanet .= "`metal` = `metal` + ".round($_POST['metal']).", ";
-						$QryUpdatePlanet .= "`crystal` = `crystal` + ".round($_POST['cristal']).", ";
-						$QryUpdatePlanet .= "`deuterium` = `deuterium` - ".round($necessaire)." ";
-						$QryUpdatePlanet .= "WHERE ";
-						$QryUpdatePlanet .= "`id` = '".$CurrentPlanet['id']."';";
-
-						doquery($QryUpdatePlanet , 'planets');
-
-						$CurrentPlanet['metal']     += $_POST['metal'];
-						$CurrentPlanet['cristal']   += $_POST['cristal'];
-						$CurrentPlanet['deuterium'] -= $necessaire;
-						doquery("UPDATE `{{table}}` SET `darkmatter` = `darkmatter` - ".TR_DARK_MATTER." WHERE `id` = ".$CurrentUser['id']."", 'users');
-					}
-					else
-					{
-						message($lang['tr_not_enought_deuterium'], "game." . $phpEx . "?page=trader",1);
-					}
-				}
-				break;
-			}
-		}
-
-		message($lang['tr_exchange_done'],"game." . $phpEx . "?page=trader",1);
-	}
-	else
-	{
-		if ($_POST['action'] != 2)
-		{
-			$template = gettemplate('trader/trader_main');
-		}
-		else
-		{
-			$parse['mod_ma_res'] = '1';
-
-			switch ($_POST['choix'])
-			{
-				case 'metal':
-				$template = gettemplate('trader/trader_metal');
-				$parse['mod_ma_res_a'] = '2';
-				$parse['mod_ma_res_b'] = '4';
-				break;
-				case 'cristal':
-				$template = gettemplate('trader/trader_cristal');
-				$parse['mod_ma_res_a'] = '0.5';
-				$parse['mod_ma_res_b'] = '2';
-				break;
-				case 'deut':
-				$template = gettemplate('trader/trader_deuterium');
-				$parse['mod_ma_res_a'] = '0.25';
-				$parse['mod_ma_res_b'] = '0.5';
-				break;
-			}
-		}
-	}
-
-	return display(parsetemplate($template,$parse));
-}
-?>
\ No newline at end of file
diff --git a/includes/pages/class.ShowAlliancePage.php b/includes/pages/class.ShowAlliancePage.php
index 0959553..b7186cd 100644
--- a/includes/pages/class.ShowAlliancePage.php
+++ b/includes/pages/class.ShowAlliancePage.php
@@ -1,230 +1,196 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2012
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
-class ShowAlliancePage
+include ( './includes/classes/class.BBCode.php' );
+
+class ShowAlliancePage extends bbCode
 {
-	private function bbcode($string)
+	private function message_box ( $title , $message , $goto = '' , $button = ' ok ' , $two_lines = FALSE )
 	{
-		$pattern = array(
-		    '/\\n/',
-		    '/\\r/',
-		    '/\[list\](.*?)\[\/list\]/ise',
-		    '/\[b\](.*?)\[\/b\]/is',
-		    '/\[strong\](.*?)\[\/strong\]/is',
-		    '/\[i\](.*?)\[\/i\]/is',
-		    '/\[u\](.*?)\[\/u\]/is',
-		    '/\[s\](.*?)\[\/s\]/is',
-		    '/\[del\](.*?)\[\/del\]/is',
-		    '/\[url=(.*?)\](.*?)\[\/url\]/ise',
-		    '/\[email=(.*?)\](.*?)\[\/email\]/is',
-		    '/\[img](.*?)\[\/img\]/ise',
-		    '/\[color=(.*?)\](.*?)\[\/color\]/is',
-		    '/\[quote\](.*?)\[\/quote\]/ise',
-		    '/\[code\](.*?)\[\/code\]/ise',
-		    '/\[font=(.*?)\](.*?)\[\/font\]/ise',
-		    '/\[bg=(.*?)\](.*?)\[\/bg\]/ise',
-		    '/\[size=(.*?)\](.*?)\[\/size\]/ise'
-		);
-
-		$replace = array(
-		    '<br/>',
-		    '',
-		    '$this->sList(\'\\1\')',
-		    '<b>\1</b>',
-		    '<strong>\1</strong>',
-		    '<i>\1</i>',
-		    '<span style="text-decoration: underline;">\1</span>',
-		    '<span style="text-decoration: line-through;">\1</span>',
-		    '<span style="text-decoration: line-through;">\1</span>',
-		    '$this->urlfix(\'\\1\',\'\\2\')',
-		    '<a href="mailto:\1" title="\1">\2</a>',
-		    '$this->imagefix(\'\\1\')',
-		    '<span style="color: \1;">\2</span>',
-		    '$this->sQuote(\'\1\')',
-		    '$this->sCode(\'\1\')',
-		    '$this->fontfix(\'\\1\',\'\\2\')',
-		    '$this->bgfix(\'\\1\',\'\\2\')',
-		    '$this->sizefix(\'\\1\',\'\\2\')'
-		);
-
-		return preg_replace($pattern, $replace, nl2br(htmlspecialchars(stripslashes($string))));
-	}
+		$parse['goto']		=	$goto;
+		$parse['title']		=	$title;
+		$parse['message']	=	$message;
+		$parse['button']	=	$button;
 
-	private function sCode($string)
-	{
-		$pattern =  '/\<img src=\\\"(.*?)img\/smilies\/(.*?).png\\\" alt=\\\"(.*?)\\\" \/>/s';
-		$string = preg_replace($pattern, '\3', $string);
-		return '<pre style="color: #DDDD00; background-color:gray ">' . trim($string) . '</pre>';
-	}
+		if ( $two_lines )
+		{
+			$parse['message_box_row']	= parsetemplate ( gettemplate ( 'alliance/alliance_message_box_row_two' ) , $parse );
+		}
+		else
+		{
+			$parse['message_box_row']	= parsetemplate ( gettemplate ( 'alliance/alliance_message_box_row_one' ) , $parse );
+		}
 
-	private function sQuote($string)
-	{
-		$pattern =  '/\<img src=\\\"(.*?)img\/smilies\/(.*?).png\\\" alt=\\\"(.*?)\\\" \/>/s';
-		$string = preg_replace($pattern, '\3', $string);
-		return '<blockquote><p style="color: #000000; font-size: 10pt; background-color:55AACC; font-family: Arial">' . trim($string) . '</p></blockquote>';
+		return parsetemplate ( gettemplate ( 'alliance/alliance_message_box' ) , $parse );
 	}
 
-	private function sList($string)
+	private function return_rank ( $ally_ranks , $rank_type , $ally_owner , $user )
 	{
-		$tmp = explode('[*]', stripslashes($string));
-		$out = null;
-		foreach($tmp as $list) {
-			if(strlen(str_replace('', '', $list)) > 0) {
-				$out .= '<li>' . trim($list) . '</li>';
-			}
+		if ( $ally_ranks[$user['ally_rank_id']-1][$rank_type] == 1 or $ally_owner == $user )
+		{
+			return TRUE;
+		}
+		else
+		{
+			return FALSE;
 		}
-		return '<ul>' . $out . '</ul>';
 	}
 
-	private function imagefix($img)
+	private function return_sort ( $sort1 , $sort2 )
 	{
-		if(substr($img, 0, 7) != 'http://')
+		// PRIMER ORDEN
+		switch ( $sort1 )
 		{
-			$img = './images/' . $img;
+			case 1:
+				$sort	= " ORDER BY `username`";
+			break;
+			case 2:
+				$sort	= " ORDER BY `ally_rank_id`";
+			break;
+			case 3:
+				$sort	= " ORDER BY `total_points`";
+			break;
+			case 4:
+				$sort	= " ORDER BY `ally_register_time`";
+			break;
+			case 5:
+				$sort	= " ORDER BY `onlinetime`";
+			break;
+			default:
+				$sort 	= " ORDER BY `id`";
+			break;
 		}
-		return '<img src="' . $img . '" alt="' . $img . '" title="' . $img . '" />';
-	}
 
-	private function urlfix($url, $title)
-	{
-		$title = stripslashes($title);
-		$url   = trim($url);
-		return (substr ($url, 0, 5) == 'data:' || substr ($url, 0, 5) ==  'file:' || substr ($url, 0, 11) == 'javascript:' || substr  ($url, 0, 4) == 'jar:' || substr ($url, 0, 1) == '#') ? '' : '<a  href="' . $url . '" title="'.htmlspecialchars($title,  ENT_QUOTES).'">'.htmlspecialchars($title, ENT_QUOTES).'</a>';
-	}
+		// SEGUNDO ORDEN
+		if ( $sort2 == 1 )
+		{
+			$sort .= " DESC;";
+		}
+		elseif ( $sort2 == 2 )
+		{
+			$sort .= " ASC;";
+		}
 
-	private function fontfix($font, $title)
-	{
-		$title = stripslashes($title);
-		return '<span style="font-family:' . $font . '">' . $title . '</span>';
+		return $sort; // RETORNA LA FORMA DE ORDEN
 	}
 
-	private function bgfix($bg, $title)
+	public function __construct ( $CurrentUser )
 	{
-		$title = stripslashes($title);
-		return '<span style="background-color:' . $bg . '">' . $title . '</span>';
-	}
+		global $lang;
+
+		$parse 		= $lang;
+		$mode		= $_GET['mode']; //MODO PRINCIPAL
+		$a			= intval ( $_GET['a'] ); // ORDEN ALTERNATIVA "A"
+		$sort1 		= intval ( $_GET['sort1'] ); // ORDEN 1
+		$sort2 		= intval ( $_GET['sort2'] ); // ORDEN 2
+		$d 			= $_GET['d']; // ELIMINAR RANGO
+		$edit 		= $_GET['edit']; // EDITAR
+		$rank 		= intval ( $_GET['rank'] ); // ADMIN -> RANGOS -> MIEMBROS
+		$kick 		= intval ( $_GET['kick'] ); // ADMIN -> EXPULSAR -> MIEMBROS
+		$id 		= intval ( $_GET['id'] ); // ID DE LA ALIANZA
+		$yes      	= $_GET['yes']; //CONFIRMACION
+		$allyid   	= intval ( $_GET['allyid'] ); // ID DE LA ALIANZA
+		$show     	= intval ( $_GET['show'] ); // ID DE LA ALIANZA
+		$sendmail	= intval ( $_GET['sendmail'] ); // VALOR = 1, COFIRMA ENVIO DEL EMAIL
+		$t        	= intval ( $_GET['t'] ); // TEXTO A EDITAR DE LA ALIANZA
+		$tag      	= mysql_escape_string ( $_GET['tag'] ); // ETIQUETA DE LA ALIANZA
+
+		// VALIDACIONES
+		if ( empty ( $mode ) )
+		{
+			unset ( $mode );
+		}
 
-	private function sizefix($size, $text)
-	{
-		$title = stripslashes($text);
-		return '<span style="font-size:' . $size . 'px">' . $title . '</span>';
-	}
+		if ( empty ( $a ) )
+		{
+			unset ( $a );
+		}
 
-	private function MessageForm($Title, $Message, $Goto = '', $Button = ' ok ', $TwoLines = false)
-	{
-		$Form .= "<div id=\"content\"><form action=\"". $Goto ."\" method=\"post\">";
-		$Form .= "<table width=\"519\">";
-		$Form .= "<tr>";
-		$Form .= "<td class=\"c\" colspan=\"2\">". $Title ."</td>";
-		$Form .= "</tr><tr>";
-		if ($TwoLines == true)
+		if ( empty ( $sort1 ) )
 		{
-			$Form .= "<th colspan=\"2\">". $Message ."</th>";
-			$Form .= "</tr><tr>";
-			$Form .= "<th colspan=\"2\" align=\"center\"><input type=\"submit\" value=\"". $Button ."\"></th>";
+			unset ( $sort1 );
 		}
-		else
-			$Form .= "<th colspan=\"2\">". $Message ."<input type=\"submit\" value=\"". $Button ."\"></th>";
-		$Form .= "</tr>";
-		$Form .= "</table>";
-		$Form .= "</form>";
-		$Form .= "</div>";
 
-		return $Form;
-	}
+		if ( empty ( $sort2 ) )
+		{
+			unset ( $sort2 );
+		}
 
-	public function __construct($CurrentUser)
-	{
-		global $dpath, $phpEx, $lang;
-
-		$parse = $lang;
-
-		//MODO PRINCIPAL
-		$mode = $_GET['mode'];
-		if (empty($mode))   { unset($mode); }
-		// ORDEN ALTERNATIVA "A"
-		$a     = intval($_GET['a']);
-		if (empty($a))      { unset($a); }
-		// ORDEN 1
-		$sort1 = intval($_GET['sort1']);
-		if (empty($sort1))  { unset($sort1); }
-		// ORDEN 2
-		$sort2 = intval($_GET['sort2']);
-		if (empty($sort2))  { unset($sort2); }
-		// ELIMINAR RANGO
-		$d = $_GET['d'];
-		if ((!is_numeric($d)) || (empty($d) && $d != 0))unset($d);
-		// EDITAR
-		$edit = $_GET['edit'];
-		if (empty($edit))unset($edit);
-		// ADMIN -> RANGOS -> MIEMBROS
-		$rank = intval($_GET['rank']);
-		if (empty($rank))unset($rank);
-		// ADMIN -> EXPULSAR -> MIEMBROS
-		$kick = intval($_GET['kick']);
-		if (empty($kick))unset($kick);
-
-		$id = intval($_GET['id']);
-		if (empty($id))unset($id);
-
-		$yes      = $_GET['yes'];
-		$allyid   = intval($_GET['allyid']);
-		$show     = intval($_GET['show']);
-		$sendmail = intval($_GET['sendmail']);
-		$t        = $_GET['t'];
-		$tag      = mysql_escape_string($_GET['tag']);
+		if ( ( !is_numeric ( $d ) ) or ( empty ( $d ) && $d != 0 ) )
+		{
+			unset ( $d );
+		}
+
+		if ( empty ( $edit ) )
+		{
+			unset ( $edit );
+		}
+
+		if ( empty ( $rank ) )
+		{
+			unset ( $rank );
+		}
+
+		if ( empty ( $kick ) )
+		{
+			unset ( $kick );
+		}
+
+		if ( empty ( $id ) )
+		{
+			unset ( $id );
+		}
 
 		// EN ESTE CASO EL USUARIO SOLO ESTÁ DE VISITA EN LA ALIANZA
 		if ($_GET['mode'] == 'ainfo')
 		{
-            if (isset($tag) && $a == "")
-                $allyrow = doquery("SELECT * FROM {{table}} WHERE ally_tag='".mysql_escape_string ( $tag )."'", "alliance", true);
-            elseif(is_numeric($a) && $a != 0 && $tag == "")
-                $allyrow = doquery("SELECT * FROM {{table}} WHERE id='".mysql_escape_string ( $a )."'", "alliance", true);
+			if ( isset ( $tag ) && $a == "" )
+			{
+				$allyrow	= doquery ( "SELECT * FROM {{table}} WHERE ally_tag=' " .mysql_escape_string ( $tag ) . "'" , "alliance" , TRUE );
+			}
+			elseif ( is_numeric ( $a ) && $a != 0 && $tag == "" )
+			{
+				$allyrow	= doquery ( "SELECT * FROM {{table}} WHERE id= " . intval ( $a ) . "" , "alliance" , TRUE );
+			}
 			else
-				header("location:game.". $phpEx . "?page=alliance",2);
+			{
+				header ( "location:game.php?page=alliance" , 2 );
+			}
 
-			if (!$allyrow)
-				header("location:game.". $phpEx . "?page=alliance",2);
+			if ( !$allyrow )
+			{
+				header ( "location:game.php?page=alliance" , 2 );
+			}
 
-			extract($allyrow);
+			extract ( $allyrow );
 
-			if ($ally_image != "")
-				$ally_image = "<tr><th colspan=2><img src=\"".$ally_image."\"></td></tr>";
+			if ( $ally_image != "" )
+			{
+				$ally_image 		= "<tr><th colspan=2><img src=\"" . $ally_image . "\"></td></tr>";
+			}
 
-			if ($ally_description != "")
-				$ally_description = "<tr><th colspan=2 height=100>".nl2br($this->bbcode($ally_description))."</th></tr>";
+			if ( $ally_description != "" )
+			{
+				$ally_description 	= "<tr><th colspan=2 height=100>" . nl2br ( $this->bbCode ( $ally_description ) ) . "</th></tr>";
+			}
 			else
-				$ally_description = "<tr><th colspan=2 height=100>".$lang['al_description_message']	."</th></tr>";
+			{
+				$ally_description 	= "<tr><th colspan=2 height=100>" . $lang['al_description_message'] . "</th></tr>";
+			}
 
 			if ($ally_web != "")
 			{
 				$ally_web = str_replace ( "http://" , "" , $ally_web );
-
-				$ally_web = "<tr><th>".$lang['al_web_text']."</th><th><a href=\"http://$ally_web\">$ally_web</a></th></tr>";
+				$ally_web = "<tr><th>" . $lang['al_web_text'] . "</th><th><a href=\"http://\"" . $ally_web . "\">" . $ally_web . "</a></th></tr>";
 			}
 
-
 			$parse['ally_description'] 		= $ally_description;
 			$parse['ally_image'] 			= $ally_image;
 			$parse['ally_web'] 				= $ally_web;
@@ -233,540 +199,609 @@ public function __construct($CurrentUser)
 			$parse['ally_tag'] 				= $ally_tag;
 
 			if ($CurrentUser['ally_id'] == 0)
-				$parse['solicitud'] = "<tr><th>".$lang['al_request']."</th><th><a href=\"game.php?page=alliance&mode=apply&amp;allyid=" . $id . "\">".$lang['al_click_to_send_request']."</a></th></tr>";
+			{
+				$parse['solicitud'] 		= "<tr><th>" . $lang['al_request'] . "</th><th><a href=\"game.php?page=alliance&mode=apply&amp;allyid=" . $id . "\">" . $lang['al_click_to_send_request'] . "</a></th></tr>";
+			}
 			else
-				$parse['solicitud'] = "";
+			{
+				$parse['solicitud'] 		= "";
+			}
 
-			display(parsetemplate(gettemplate('alliance/alliance_ainfo'), $parse));
+			display ( parsetemplate ( gettemplate ( 'alliance/alliance_ainfo' ) , $parse ) );
 		}
+
 		// EN ESTE CASO EL USUARIO NO SE ENCUENTRA AUN EN NINGUNA ALIANZA
-		if ($CurrentUser['ally_id'] == 0)
-		{	//CREAR ALIANZA
-			if ($mode == 'make' && $CurrentUser['ally_request'] == 0)
+		if ( $CurrentUser['ally_id'] == 0 )
+		{
+			##############################################################################################
+			# CREAR ALIANZA
+			##############################################################################################
+			if ( $mode == 'make' && $CurrentUser['ally_request'] == 0 )
 			{
-				if ($yes == 1 && $_POST)
+				if ( $yes == 1 && $_POST )
 				{
 					if (!$_POST['atag'])
-						message($lang['al_tag_required'], "game.php?page=alliance&mode=make",2);
+					{
+						message ( $lang['al_tag_required'] , "game.php?page=alliance&mode=make" , 2 );
+					}
 
 					if (!$_POST['aname'])
-						message($lang['al_name_required'],"game.php?page=alliance&mode=make",2);
+					{
+						message ( $lang['al_name_required'] , "game.php?page=alliance&mode=make" , 2 );
+					}
 
-					$tagquery = doquery("SELECT * FROM `{{table}}` WHERE ally_tag='".mysql_escape_string($_POST['atag'])."'", 'alliance', true);
+					$tagquery	= doquery ( "SELECT * FROM `{{table}}` WHERE ally_tag='" . mysql_escape_string ( $_POST['atag'] ) . "'" , 'alliance' , TRUE );
 
 					if ($tagquery)
-						message(str_replace('%s', $_POST['atag'], $lang['al_already_exists']),"game.php?page=alliance&mode=make",2);
-
+					{
+						message ( str_replace ( '%s' , $_POST['atag'] , $lang['al_already_exists'] ) , "game.php?page=alliance&mode=make" , 2 );
+					}
 
 					doquery("INSERT INTO {{table}} SET
-					`ally_name`='".mysql_escape_string($_POST['aname'])."',
-					`ally_tag`='".mysql_escape_string($_POST['atag'])."' ,
-					`ally_owner`='{$CurrentUser['id']}',
-					`ally_owner_range`='Leader',
-					`ally_members`='1',
-					`ally_register_time`=" . time() , "alliance");
+								`ally_name`='" . mysql_escape_string ( $_POST['aname'] ) . "',
+								`ally_tag`='" . mysql_escape_string ( $_POST['atag'] ) . "' ,
+								`ally_owner`='" . intval ( $CurrentUser['id'] ) . "',
+								`ally_owner_range`='Leader',
+								`ally_members`='1',
+								`ally_register_time`=" . time()
+							, "alliance" );
 
-					$allyquery = doquery("SELECT * FROM {{table}} WHERE ally_tag='".mysql_escape_string($_POST['atag'])."'", 'alliance', true);
+					$allyquery 	= doquery ( "SELECT * FROM {{table}} WHERE ally_tag='" . mysql_escape_string ( $_POST['atag'] ) . "'" , 'alliance' , TRUE );
 
 					doquery("UPDATE {{table}} SET
-					`ally_id`='{$allyquery['id']}',
-					`ally_name`='".mysql_escape_string($allyquery['ally_name'])."',
-					`ally_register_time`='" . time() . "'
-					WHERE `id`='{$CurrentUser['id']}'", "users");
+								`ally_id`='" . $allyquery['id'] . "',
+								`ally_name`='" . mysql_escape_string ( $allyquery['ally_name'] ) . "',
+								`ally_register_time`='" . time() . "'
+								WHERE `id`='" . intval ( $CurrentUser['id'] ) . "'"
+							, "users" );
 
-					$page = $this->MessageForm(str_replace('%s', $_POST['atag'], $lang['al_created']),
+					$page 		= $this->message_box ( str_replace ( '%s' , $_POST['atag'] , $lang['al_created'] ),
 
-					str_replace('%s', $_POST['atag'], $lang['al_created']) . "<br><br>", "", $lang['al_continue']);
+					str_replace ( '%s' , $_POST['atag'] , $lang['al_created'] ) . "<br/><br/>" , "" , $lang['al_continue'] );
 				}
 				else
+				{
 					$page .= parsetemplate(gettemplate('alliance/alliance_make'), $parse);
+				}
 
-				display($page);
+				display ( $page );
 			}
-			//BUSCAR ALIANZA
-			if ($mode == 'search' && $CurrentUser['ally_request'] == 0)
+
+			##############################################################################################
+			# BUSCAR ALIANZA
+			##############################################################################################
+			if ( $mode == 'search' && $CurrentUser['ally_request'] == 0 )
 			{
-				$page = parsetemplate(gettemplate('alliance/alliance_searchform'), $parse);
+				$page = parsetemplate ( gettemplate ( 'alliance/alliance_searchform' ) , $parse );
 
-				if ($_POST)
+				if ( $_POST )
 				{
-					$search = doquery("SELECT * FROM {{table}} WHERE ally_name LIKE '%".mysql_escape_string ($_POST['searchtext'])."%' or ally_tag LIKE '%".mysql_escape_string ($_POST['searchtext'])."%' LIMIT 30", "alliance");
+					$search = doquery ( "SELECT * FROM {{table}} WHERE ally_name LIKE '%" . mysql_escape_string ( $_POST['searchtext'] ) . "%' or ally_tag LIKE '%" . mysql_escape_string ( $_POST['searchtext'] ) . "%' LIMIT 30" , "alliance" );
 
-					if (mysql_num_rows($search) != 0)
+					if ( mysql_num_rows ( $search ) != 0 )
 					{
-						while ($s = mysql_fetch_array($search))
+						while ( $s = mysql_fetch_array ( $search ) )
 						{
 							$searchData 					= array();
-							$searchData['ally_tag'] 		= "<a href=\"game.php?page=alliance&mode=apply&allyid={$s['id']}\">{$s['ally_tag']}</a>";
+							$searchData['ally_tag'] 		= "<a href=\"game.php?page=alliance&mode=apply&allyid=" . $s['id'] . "\">" . $s['ally_tag'] . "</a>";
 							$searchData['ally_name'] 		= $s['ally_name'];
 							$searchData['ally_members'] 	= $s['ally_members'];
-
-							$parse['result'] .= parsetemplate(gettemplate('alliance/alliance_searchresult_row'), $searchData);
+							$parse['result'] 				.= parsetemplate ( gettemplate ( 'alliance/alliance_searchresult_row' ) , $searchData );
 						}
 
-						$page .= parsetemplate(gettemplate('alliance/alliance_searchresult_table'), $parse);
+						$page .= parsetemplate ( gettemplate ( 'alliance/alliance_searchresult_table' ) , $parse );
 					}
 				}
-				display($page);
+				display ( $page );
 			}
 
-			if ($mode == 'apply' && $CurrentUser['ally_request'] == 0)
-			{ //SOLICITUDES
-				if($_GET['allyid'] != NULL)
-					$alianza = doquery("SELECT * FROM {{table}} WHERE id='{".intval($_GET['allyid'])."'", "alliance", true);
+			##############################################################################################
+			# SOLICITUDES - ENVIAR SOLICITUD
+			##############################################################################################
+			if ( $mode == 'apply' && $CurrentUser['ally_request'] == 0 )
+			{
+				if ( $_GET['allyid'] != NULL )
+				{
+					$alianza = doquery ( "SELECT * FROM {{table}} WHERE id='" . intval ( $_GET['allyid'] ) . "'" , "alliance" , TRUE );
+				}
 
-				if($alianza['ally_request_notallow'] == 1)
-					message($lang['al_alliance_closed'], "game.php?page=alliance",2);
+				if ( $alianza['ally_request_notallow'] == 1 )
+				{
+					message ( $lang['al_alliance_closed'] , "game.php?page=alliance" , 2 );
+				}
 				else
 				{
-					if (!is_numeric($_GET['allyid']) || !$_GET['allyid'] || $CurrentUser['ally_request'] != 0 || $CurrentUser['ally_id'] != 0)
-						header("location:game.". $phpEx . "?page=alliance",2);
+					if ( !is_numeric ( $_GET['allyid'] ) or !$_GET['allyid'] or $CurrentUser['ally_request'] != 0 or $CurrentUser['ally_id'] != 0 )
+					{
+						header ( "location:game.php?page=alliance" , 2 );
+					}
 
-					$allyrow = doquery("SELECT ally_tag,ally_request FROM {{table}} WHERE id='" . intval($_GET['allyid']) . "'", "alliance", true);
+					$allyrow = doquery ( "SELECT ally_tag,ally_request FROM {{table}} WHERE id='" . intval ( $_GET['allyid'] ) . "'", "alliance", TRUE);
 
-					if (!$allyrow)
-						header("location:game.". $phpEx . "?page=alliance",2);
+					if ( !$allyrow )
+					{
+						header ( "location:game.php?page=alliance" , 2 );
+					}
 
-					extract($allyrow);
+					extract ( $allyrow );
 
-					if ($_POST['enviar'] == $lang['al_applyform_send'])
+					if ( $_POST['enviar'] == $lang['al_applyform_send'] )
 					{
-						doquery("UPDATE {{table}} SET `ally_request`='" . intval($allyid) . "', ally_request_text='" . mysql_escape_string(strip_tags($_POST['text'])) . "', ally_register_time='" . time() . "' WHERE `id`='" . $CurrentUser['id'] . "'", "users");
-
-						message($lang['al_request_confirmation_message'],"game.php?page=alliance",2);
+						doquery ( "UPDATE {{table}} SET `ally_request`='" . intval ( $allyid ) . "' , ally_request_text='" . mysql_escape_string ( strip_tags ( $_POST['text'] ) ) . "' , ally_register_time='" . time() . "' WHERE `id`='" . $CurrentUser['id'] . "'" , "users" );
+						message ( $lang['al_request_confirmation_message'] , "game.php?page=alliance" , 2 );
 					}
 					else
-						$text_apply = ($ally_request) ? $ally_request : $lang['al_default_request_text'];
+					{
+						$text_apply = ( $ally_request ) ? $ally_request : $lang['al_default_request_text'];
+					}
 
 					$parse['allyid'] 			= intval($_GET['allyid']);
 					$parse['chars_count'] 		= strlen($text_apply);
 					$parse['text_apply'] 		= $text_apply;
 					$parse['Write_to_alliance'] = str_replace('%s', $ally_tag, $lang['al_write_request']);
 
-					display(parsetemplate(gettemplate('alliance/alliance_applyform'), $parse));
+					display ( parsetemplate ( gettemplate ( 'alliance/alliance_applyform' ) , $parse ) );
 				}
 			}
 
-			if ($CurrentUser['ally_request'] != 0)
+			##############################################################################################
+			# SOLICITUDES - SOLICITUD PENDIENTE
+			##############################################################################################
+			if ( $CurrentUser['ally_id'] == 0 && $CurrentUser['ally_request'] != 0 )
 			{
-				$allyquery = doquery("SELECT ally_tag FROM {{table}} WHERE id='" . intval($CurrentUser['ally_request']) . "' ORDER BY `id`", "alliance", true);
+				$allyquery = doquery ( "SELECT ally_tag FROM {{table}} WHERE id='" . intval ( $CurrentUser['ally_request'] ) . "' ORDER BY `id`" , "alliance" , TRUE );
 
-				extract($allyquery);
+				extract ( $allyquery );
 
-				if ($_POST['bcancel'])
+				if ( $_POST['bcancel'] )
 				{
-					doquery("UPDATE {{table}} SET `ally_request`=0 WHERE `id`=" . intval($CurrentUser['id']), "users");
+					doquery ( "UPDATE {{table}} SET `ally_request`=0 WHERE `id`=" . intval ( $CurrentUser['id'] ) , "users" );
+
+					$lang['request_text']	= str_replace ( '%s' , $ally_tag , $lang['al_request_deleted'] );
+					$lang['button_text'] 	= $lang['al_continue'];
 
-					$lang['request_text'] = str_replace('%s', $ally_tag, $lang['al_request_deleted']);
-					$lang['button_text'] = $lang['al_continue'];
-					$page = parsetemplate(gettemplate('alliance/alliance_apply_waitform'), $lang);
+					$page = parsetemplate ( gettemplate ( 'alliance/alliance_apply_waitform' ) , $lang );
 				}
 				else
 				{
-					$lang['request_text'] = str_replace('%s', $ally_tag, $lang['al_request_wait_message']);
-					$lang['button_text'] = $lang['al_delete_request'];
-					$page = parsetemplate(gettemplate('alliance/alliance_apply_waitform'), $lang);
+					$lang['request_text']	= str_replace ( '%s' , $ally_tag , $lang['al_request_wait_message'] );
+					$lang['button_text'] 	= $lang['al_delete_request'];
+					$page = parsetemplate ( gettemplate ( 'alliance/alliance_apply_waitform' ) , $lang );
 				}
 
-				display($page);
+				display ( $page );
 			}
 			else
 			{
-				display(parsetemplate(gettemplate('alliance/alliance_defaultmenu'), $lang));
+				display ( parsetemplate ( gettemplate ( 'alliance/alliance_defaultmenu' ) , $lang ) );
 			}
 		}
-		elseif ($CurrentUser['ally_id'] != 0 && $CurrentUser['ally_request'] == 0) // CUANDO YA ESTA EN UNA ALIANZA
-		{
-			$ally = doquery("SELECT * FROM {{table}} WHERE id='".intval($CurrentUser['ally_id'])."'", "alliance", true);
-			$ally_ranks = unserialize($ally['ally_ranks']);
-
-			if ($ally_ranks[$CurrentUser['ally_rank_id']-1]['onlinestatus'] == 1 || $ally['ally_owner'] == $CurrentUser['id'])
-				$user_can_watch_memberlist_status = true;
-			else
-				$user_can_watch_memberlist_status = false;
-
-			if ($ally_ranks[$CurrentUser['ally_rank_id']-1]['memberlist'] == 1 || $ally['ally_owner'] == $CurrentUser['id'])
-				$user_can_watch_memberlist = true;
-			else
-				$user_can_watch_memberlist = false;
 
-			if ($ally_ranks[$CurrentUser['ally_rank_id']-1]['mails'] == 1 || $ally['ally_owner'] == $CurrentUser['id'])
-				$user_can_send_mails = true;
-			else
-				$user_can_send_mails = false;
-
-			if ($ally_ranks[$CurrentUser['ally_rank_id']-1]['kick'] == 1 || $ally['ally_owner'] == $CurrentUser['id'])
-				$user_can_kick = true;
-			else
-				$user_can_kick = false;
-
-			if ($ally_ranks[$CurrentUser['ally_rank_id']-1]['rechtehand'] == 1 || $ally['ally_owner'] == $CurrentUser['id'])
-				$user_can_edit_rights = true;
-			else
-				$user_can_edit_rights = false;
-
-			if ($ally_ranks[$CurrentUser['ally_rank_id']-1]['delete'] == 1 || $ally['ally_owner'] == $CurrentUser['id'])
-				$user_can_exit_alliance = true;
-			else
-				$user_can_exit_alliance = false;
-
-			if ($ally_ranks[$CurrentUser['ally_rank_id']-1]['bewerbungen'] == 1 || $ally['ally_owner'] == $CurrentUser['id'])
-				$user_bewerbungen_einsehen = true;
-			else
-				$user_bewerbungen_einsehen = false;
-
-			if ($ally_ranks[$CurrentUser['ally_rank_id']-1]['bewerbungenbearbeiten'] == 1 || $ally['ally_owner'] == $CurrentUser['id'])
-				$user_bewerbungen_bearbeiten = true;
-			else
-				$user_bewerbungen_bearbeiten = false;
-
-			if ($ally_ranks[$CurrentUser['ally_rank_id']-1]['administrieren'] == 1 || $ally['ally_owner'] == $CurrentUser['id'])
-				$user_admin = true;
-			else
-				$user_admin = false;
-
-			if ($ally_ranks[$CurrentUser['ally_rank_id']-1]['onlinestatus'] == 1 || $ally['ally_owner'] == $CurrentUser['id'])
-				$user_onlinestatus = true;
-			else
-				$user_onlinestatus = false;
-
-			if (!$ally)
+		##############################################################################################
+		# CUANDO YA ESTA EN UNA ALIANZA
+		##############################################################################################
+		if ( $CurrentUser['ally_id'] != 0 && $CurrentUser['ally_request'] == 0 )
+		{
+			$ally 		= doquery ( "SELECT * FROM {{table}} WHERE id='" . intval ( $CurrentUser['ally_id'] ) . "'" , "alliance" , TRUE );
+			$ally_ranks = unserialize ( $ally['ally_ranks'] );
+
+			$user_can_watch_memberlist_status	= $this->return_rank ( $ally_ranks , 'onlinestatus' , $ally['ally_owner'] , $CurrentUser['id'] );
+			$user_can_watch_memberlist			= $this->return_rank ( $ally_ranks , 'memberlist' , $ally['ally_owner'] , $CurrentUser['id'] );
+			$user_can_send_mails				= $this->return_rank ( $ally_ranks , 'mails' , $ally['ally_owner'] , $CurrentUser['id'] );
+			$user_can_kick						= $this->return_rank ( $ally_ranks , 'kick' , $ally['ally_owner'] , $CurrentUser['id'] );
+			$user_can_edit_rights				= $this->return_rank ( $ally_ranks , 'rechtehand' , $ally['ally_owner'] , $CurrentUser['id'] );
+			$user_can_exit_alliance				= $this->return_rank ( $ally_ranks , 'delete' , $ally['ally_owner'] , $CurrentUser['id'] );
+			$user_bewerbungen_einsehen			= $this->return_rank ( $ally_ranks , 'bewerbungen' , $ally['ally_owner'] , $CurrentUser['id'] );
+			$user_bewerbungen_bearbeiten		= $this->return_rank ( $ally_ranks , 'bewerbungenbearbeiten' , $ally['ally_owner'] , $CurrentUser['id'] );
+			$user_admin							= $this->return_rank ( $ally_ranks , 'administrieren' , $ally['ally_owner'] , $CurrentUser['id'] );
+			$user_onlinestatus					= $this->return_rank ( $ally_ranks , 'onlinestatus' , $ally['ally_owner'] , $CurrentUser['id'] );
+
+			if ( !$ally )
 			{
-				doquery("UPDATE `{{table}}` SET `ally_id` = 0 WHERE `id` = ".intval($CurrentUser['id'])."", "users");
-				header("location:game.". $phpEx . "?page=alliance",2);
+				doquery ( "UPDATE `{{table}}` SET `ally_id` = 0 WHERE `id` = " . intval ( $CurrentUser['id'] ) . "" , "users" );
+				header ( "location:game.php?page=alliance" , 2 );
 			}
-		// < ------------------------------------------------------------ SALIR DE LA ALIANZA ------------------------------------------------------------ >
-			if ($mode == 'exit')
+			##############################################################################################
+			# SALIR DE LA ALIANZA
+			##############################################################################################
+			if ( $mode == 'exit' )
 			{
 				if ($ally['ally_owner'] == $CurrentUser['id'])
-					message($lang['al_founder_cant_leave_alliance'],"game.php?page=alliance",2);
+				{
+					message ( $lang['al_founder_cant_leave_alliance'] , "game.php?page=alliance" , 2 );
+				}
 
-				if ($_GET['yes'] == 1)
+				if ( $_GET['yes'] == 1 )
 				{
-					doquery("UPDATE {{table}} SET `ally_id` = 0, `ally_name` = '', ally_rank_id = 0 WHERE `id`='".intval($CurrentUser['id'])."'", "users");
-					doquery("UPDATE {{table}} SET `ally_members` = `ally_members` - 1 WHERE `id`='".intval($ally['id'])."'", "alliance");
+					doquery ( "UPDATE {{table}} SET `ally_id` = 0, `ally_name` = '', ally_rank_id = 0 WHERE `id`='" . intval ( $CurrentUser['id'] ) . "'" , "users" );
+					doquery ( "UPDATE {{table}} SET `ally_members` = `ally_members` - 1 WHERE `id`='" . intval ( $ally['id'] ) . "'" , "alliance" );
 
-					$lang['Go_out_welldone'] = str_replace("%s", $ally_name, $lang['al_leave_sucess']);
-					$page = $this->MessageForm($lang['Go_out_welldone'], "<br>", $PHP_SELF, $lang['al_continue']);
+					$lang['Go_out_welldone'] 	= str_replace ( "%s" , $ally_name , $lang['al_leave_sucess'] );
+					$page 						= $this->message_box ( $lang['Go_out_welldone'] , "<br>" , $PHP_SELF , $lang['al_continue'] );
 				}
 				else
 				{
-					$lang['Want_go_out'] = str_replace("%s", $ally_name, $lang['al_do_you_really_want_to_go_out']);
-					$page = $this->MessageForm($lang['Want_go_out'], "<br>", "game.php?page=alliance&mode=exit&yes=1", $lang['al_go_out_yes']);
+					$lang['Want_go_out'] 	= str_replace ( "%s" , $ally_name , $lang['al_do_you_really_want_to_go_out'] );
+					$page 					= $this->message_box ( $lang['Want_go_out'] , "<br>" , "game.php?page=alliance&mode=exit&yes=1" , $lang['al_go_out_yes'] );
 				}
-				display($page);
+
+				display ( $page );
 			}
-		// < ------------------------------------------------------------- LISTA DE MIEMBROS ------------------------------------------------------------- >
-			if ($mode == 'memberslist')
+			##############################################################################################
+			# LISTA DE MIEMBROS
+			##############################################################################################
+			if ( $mode == 'memberslist' )
 			{
-				if ($ally['ally_owner'] != $CurrentUser['id'] && !$user_can_watch_memberlist)
-					header("location:game.". $phpEx . "?page=alliance",2);
-
-				if ($sort2)
-				{
-					$sort1 = intval($_GET['sort1']);
-					$sort2 = intval($_GET['sort2']);
-
-					if ($sort1 == 1) {
-					$sort = " ORDER BY `username`";
-					} elseif ($sort1 == 2) {
-					$sort = " ORDER BY `ally_rank_id`";
-					} elseif ($sort1 == 3) {
-					$sort = " ORDER BY `total_points`";
-					} elseif ($sort1 == 4) {
-					$sort = " ORDER BY `ally_register_time`";
-					} elseif ($sort1 == 5) {
-					$sort = " ORDER BY `onlinetime`";
-					} else {
-					$sort = " ORDER BY `id`";
-					}
+				if ( $ally['ally_owner'] != $CurrentUser['id'] && !$user_can_watch_memberlist )
+				{
+					header ( "location:game.php?page=alliance" , 2 );
+				}
 
-					if ($sort2 == 1) {
-					$sort .= " DESC;";
-					} elseif ($sort2 == 2) {
-					$sort .= " ASC;";
-					}
-					$listuser = doquery("SELECT * FROM `{{table}}users` inner join `{{table}}statpoints` on `{{table}}users`.`id`=`{{table}}statpoints`.`id_owner` WHERE ally_id='".intval($CurrentUser['ally_id'])."' AND STAT_type=1 $sort", '');
+				if ( $sort2 )
+				{
+					$sort1 		= intval ( $_GET['sort1'] );
+					$sort2 		= intval ( $_GET['sort2'] );
+					$sort		= $this->return_sort ( $sort1 , $sort2 );
+
+					$listuser	= doquery ( "SELECT * FROM `{{table}}users` inner join `{{table}}statpoints` on `{{table}}users`.`id`=`{{table}}statpoints`.`id_owner` WHERE ally_id='" . intval ( $CurrentUser['ally_id'] ) . "' AND STAT_type=1 " . $sort . "" , '' );
 				}
 				else
-					$listuser = doquery("SELECT * FROM {{table}} WHERE ally_id='".intval($CurrentUser['ally_id'])."'", 'users');
+				{
+					$listuser	= doquery ( "SELECT * FROM {{table}} WHERE ally_id='" . intval ( $CurrentUser['ally_id'] ) . "'" , 'users' );
+				}
 
 				$i = 0;
 
-				while ($u = mysql_fetch_array($listuser))
+				while ( $u = mysql_fetch_array ( $listuser ) )
 				{
-					$UserPoints = doquery("SELECT * FROM {{table}} WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '" . intval($u['id']) . "';", 'statpoints', true);
+					$UserPoints = doquery ( "SELECT * FROM {{table}} WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '" . intval ( $u['id'] ) . "';" , 'statpoints' , TRUE );
 
 					$i++;
 					$u['i'] = $i;
 
-					if ($u["onlinetime"] + 60 * 10 >= time() && $user_can_watch_memberlist_status)
-						$u["onlinetime"] = "\"lime\">Conectado<";
-					elseif ($u["onlinetime"] + 60 * 20 >= time() && $user_can_watch_memberlist_status)
-						$u["onlinetime"] = "\"yellow\">15 min<";
-					elseif ($user_can_watch_memberlist_status)
-						$u["onlinetime"] = "\"red\">Desconectado<";
+					if ( $u["onlinetime"] + 60 * 10 >= time() && $user_can_watch_memberlist_status )
+					{
+						$u["onlinetime"]	= "\"lime\">Conectado<";
+					}
+					elseif ( $u["onlinetime"] + 60 * 20 >= time() && $user_can_watch_memberlist_status )
+					{
+						$u["onlinetime"]	= "\"yellow\">15 min<";
+					}
+					elseif ( $user_can_watch_memberlist_status )
+					{
+						$u["onlinetime"] 	= "\"red\">Desconectado<";
+					}
 					else
-						$u["onlinetime"] = "\"orange\">-<";
+					{
+						$u["onlinetime"] 	= "\"orange\">-<";
+					}
+
+					if ( $ally['ally_owner'] == $u['id'] )
+					{
+						$u["ally_range"] 	= ( $ally['ally_owner_range'] == '' ) ? $lang['al_founder_rank_text'] : $ally['ally_owner_range'];
+
+					}
+					elseif ( $u['ally_rank_id'] == 0 )
+					{
+						$u["ally_range"] 	= $lang['al_new_member_rank_text'];
 
-					if ($ally['ally_owner'] == $u['id'])
-						$u["ally_range"] = ($ally['ally_owner_range'] == '')?$lang['al_founder_rank_text']:$ally['ally_owner_range'];
-					elseif ($u['ally_rank_id'] == 0 )
-						$u["ally_range"] = $lang['al_new_member_rank_text'];
+					}
 					else
-						$u["ally_range"] = $ally_ranks[$u['ally_rank_id']-1]['name'];
+					{
+						$u["ally_range"] 	= $ally_ranks[$u['ally_rank_id']-1]['name'];
+					}
+
+					$u["dpath"] 			= DPATH;
+					$u['points'] 			= pretty_number ( $UserPoints['total_points'] );
 
-					$u["dpath"] 	= $dpath;
-					$u['points'] 	= "" . pretty_number($UserPoints['total_points']) . "";
+					if ( $u['ally_register_time'] > 0 )
+					{
+						$u['ally_register_time'] = date ( "Y-m-d h:i:s" , $u['ally_register_time'] );
 
-					if ($u['ally_register_time'] > 0)
-						$u['ally_register_time'] = date("Y-m-d h:i:s", $u['ally_register_time']);
+					}
 					else
+					{
 						$u['ally_register_time'] = "-";
+					}
+
+					$page_list .= parsetemplate ( gettemplate ( 'alliance/alliance_memberslist_row' ) , $u );
+				}
 
-					$page_list .= parsetemplate(gettemplate('alliance/alliance_memberslist_row'), $u);
+				switch ( $sort2 )
+				{
+					case 1:
+						$s	= 2;
+					break;
+					case 2:
+						$s = 1;
+					break;
+					default:
+						$s = 1;
+					break;
 				}
 
-				if ($sort2 == 1) {$s = 2;}
-				elseif ($sort2 == 2) {$s = 1;}
-				else {$s = 1;}
+				if ( $i != $ally['ally_members'] )
+				{
+					doquery ( "UPDATE {{table}} SET `ally_members`='" . intval ( $i ) . "' WHERE `id`='" . intval ( $ally['id'] ) . "'" , 'alliance' );
+				}
 
-				if ($i != $ally['ally_members'])
-					doquery("UPDATE {{table}} SET `ally_members`='".intval($i)."' WHERE `id`='".intval($ally['id'])."'", 'alliance');
-				$parse['i'] = $i;
-				$parse['s'] = $s;
-				$parse['list'] = $page_list;
+				$parse['i'] 	= $i;
+				$parse['s'] 	= $s;
+				$parse['list'] 	= $page_list;
 
-				display(parsetemplate(gettemplate('alliance/alliance_memberslist_table'), $parse));
+				display ( parsetemplate ( gettemplate ( 'alliance/alliance_memberslist_table' ) , $parse ) );
 			}
-		// < ------------------------------------------------------------- CORREO CIRCULAR ------------------------------------------------------------- >
-			if ($mode == 'circular')
+			##############################################################################################
+			# CORREO CIRCULAR
+			##############################################################################################
+			if ( $mode == 'circular' )
 			{
-				if ($ally['ally_owner'] != $CurrentUser['id'] && !$user_can_send_mails)
-					header("location:game.". $phpEx . "?page=alliance",2);
+				if ( $ally['ally_owner'] != $CurrentUser['id'] && !$user_can_send_mails )
+				{
+					header ( "location:game.php?page=alliance" , 2 );
+				}
+
 
-				if ($sendmail == 1)
+				if ( $sendmail == 1 )
 				{
-					$_POST['r'] 	= intval($_POST['r']);
+					$list 			= '';
+					$_POST['r'] 	= intval ( $_POST['r'] );
 					$_POST['text']	= preg_replace ( "/([^\s]{80}?)/" , "\\1<br />" , trim ( nl2br ( strip_tags ( $_POST['text'], '<br>' ) ) ) );
 
-					if ($_POST['r'] == 0)
-						$sq = doquery("SELECT id,username FROM {{table}} WHERE ally_id='".intval($CurrentUser['ally_id'])."'", "users");
+					if ( $_POST['r'] == 0 )
+					{
+						$sq	= doquery ( "SELECT id,username FROM {{table}} WHERE ally_id='" . intval ( $CurrentUser['ally_id'] ) . "'" , "users" );
+					}
 					else
-						$sq = doquery("SELECT id,username FROM {{table}} WHERE ally_id='".intval($CurrentUser['ally_id'])."' AND ally_rank_id='".intval($_POST['r'])."'", "users");
-
-					$list = '';
+					{
+						$sq	= doquery ( "SELECT id,username FROM {{table}} WHERE ally_id='" . intval ( $CurrentUser['ally_id'] ) . "' AND ally_rank_id='" . intval ( $_POST['r'] ) . "'" , "users" );
+					}
 
-					while ($u = mysql_fetch_array($sq))
+					while ( $u = mysql_fetch_array ( $sq ) )
 					{
-						SendSimpleMessage($u['id'],$CurrentUser['id'],'',2,$ally['ally_tag'],$CurrentUser['username'],$_POST['text']);
+						SendSimpleMessage ( $u['id'] , $CurrentUser['id'] , '' , 2 , $ally['ally_tag'] , $CurrentUser['username'] , $_POST['text'] );
 
 						$list .= "<br>{$u['username']} ";
 					}
 
-					$page = $this->MessageForm($lang['al_circular_sended'],$list, "game.php?page=alliance", $lang['al_continue'], true);
+					$page	= $this->message_box ( $lang['al_circular_sended'] , $list , "game.php?page=alliance" , $lang['al_continue'] , TRUE );
 
-					display($page);
+					display ( $page );
 				}
 
 				$lang['r_list'] = "<option value=\"0\">".$lang['al_all_players']."</option>";
 
-				if ($ally_ranks)
+				if ( $ally_ranks )
 				{
-					foreach($ally_ranks as $id => $array)
+					foreach ( $ally_ranks as $id => $array )
 					{
-						$lang['r_list'] .= "<option value=\"" . ($id + 1) . "\">" . $array['name'] . "</option>";
+						$lang['r_list'] .= "<option value=\"" . ( $id + 1 ) . "\">" . $array['name'] . "</option>";
 					}
 				}
 
-				display(parsetemplate(gettemplate('alliance/alliance_circular'), $lang));
+				display ( parsetemplate ( gettemplate ( 'alliance/alliance_circular' ) , $lang ) );
 			}
-		// < ------------------------------------------------------ EDICION DE LOS PERMISOS O LEYES ------------------------------------------------------ >
-			if ($mode == 'admin' && $edit == 'rights')
+			##############################################################################################
+			# EDICION DE LOS PERMISOS O LEYES
+			##############################################################################################
+			if ( $mode == 'admin' && $edit == 'rights' )
 			{
-				if ($ally['ally_owner'] != $CurrentUser['id'] && !$user_can_edit_rights)
-					header("location:game.". $phpEx . "?page=alliance",2);
-				elseif (!empty($_POST['newrangname']))
+				if ( $ally['ally_owner'] != $CurrentUser['id'] && !$user_can_edit_rights )
+				{
+					header ( "location:game.php?page=alliance" , 2 );
+				}
+
+				if ( !empty ( $_POST['newrangname'] ) )
 				{
-					$name = mysql_escape_string(strip_tags($_POST['newrangname']));
 
-					$ally_ranks[] = array('name' => $name,
-					'mails' => 0,
-					'delete' => 0,
-					'kick' => 0,
-					'bewerbungen' => 0,
-					'administrieren' => 0,
-					'bewerbungenbearbeiten' => 0,
-					'memberlist' => 0,
-					'onlinestatus' => 0,
-					'rechtehand' => 0
-					);
+					$name			= mysql_escape_string ( strip_tags ( $_POST['newrangname'] ) );
+					$ally_ranks[]	= array	(
+												'name' => $name,
+												'mails' => 0,
+												'delete' => 0,
+												'kick' => 0,
+												'bewerbungen' => 0,
+												'administrieren' => 0,
+												'bewerbungenbearbeiten' => 0,
+												'memberlist' => 0,
+												'onlinestatus' => 0,
+												'rechtehand' => 0
+											);
 
-					$ranks = serialize($ally_ranks);
+					$ranks 			= serialize ( $ally_ranks );
 
-					doquery("UPDATE {{table}} SET `ally_ranks`='" . $ranks . "' WHERE `id`=" . intval($ally['id']), "alliance");
+					doquery ( "UPDATE {{table}} SET `ally_ranks`='" . $ranks . "' WHERE `id`=" . intval ( $ally['id'] ) , "alliance" );
 
-					$goto = $_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'];
+					$goto 			= $_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'];
 
-					header("Location: " . $goto);
-					exit();
+					exit ( header ( "Location: " . $goto ) );
 				}
-				elseif ($_POST['id'] != '' && is_array($_POST['id']))
+				elseif ( $_POST['id'] != '' && is_array ( $_POST['id'] ) )
 				{
-					$ally_ranks_new = array();
+					$ally_ranks_new	= array();
 
-					foreach ($_POST['id'] as $id)
+					foreach ( $_POST['id'] as $id )
 					{
-						$name = $ally_ranks[$id]['name'];
-
-						$ally_ranks_new[$id]['name'] = $name;
+						$name									= $ally_ranks[$id]['name'];
+						$ally_ranks_new[$id]['name'] 			= $name;
 
-						if (isset($_POST['u' . $id . 'r0'])) {
-						$ally_ranks_new[$id]['delete'] = 1;
-						} else {
-						$ally_ranks_new[$id]['delete'] = 0;
+						if ( isset ( $_POST['u' . $id . 'r0'] ) )
+						{
+							$ally_ranks_new[$id]['delete']		= 1;
+						}
+						else
+						{
+							$ally_ranks_new[$id]['delete']		= 0;
 						}
 
-						if (isset($_POST['u' . $id . 'r1']) && $ally['ally_owner'] == $CurrentUser['id']) {
-						$ally_ranks_new[$id]['kick'] = 1;
-						} else {
-						$ally_ranks_new[$id]['kick'] = 0;
+						if ( isset ( $_POST['u' . $id . 'r1'] ) && $ally['ally_owner'] == $CurrentUser['id'] )
+						{
+							$ally_ranks_new[$id]['kick'] 		= 1;
+						}
+						else
+						{
+							$ally_ranks_new[$id]['kick'] 		= 0;
 						}
 
-						if (isset($_POST['u' . $id . 'r2'])) {
-						$ally_ranks_new[$id]['bewerbungen'] = 1;
-						} else {
-						$ally_ranks_new[$id]['bewerbungen'] = 0;
+						if ( isset ( $_POST['u' . $id . 'r2'] ) )
+						{
+							$ally_ranks_new[$id]['bewerbungen']	= 1;
+						}
+						else
+						{
+							$ally_ranks_new[$id]['bewerbungen'] = 0;
 						}
 
-						if (isset($_POST['u' . $id . 'r3'])) {
-						$ally_ranks_new[$id]['memberlist'] = 1;
-						} else {
-						$ally_ranks_new[$id]['memberlist'] = 0;
+						if ( isset ( $_POST['u' . $id . 'r3'] ) )
+						{
+							$ally_ranks_new[$id]['memberlist'] 	= 1;
+						}
+						else
+						{
+							$ally_ranks_new[$id]['memberlist'] 	= 0;
 						}
 
-						if (isset($_POST['u' . $id . 'r4'])) {
-						$ally_ranks_new[$id]['bewerbungenbearbeiten'] = 1;
-						} else {
-						$ally_ranks_new[$id]['bewerbungenbearbeiten'] = 0;
+						if ( isset ( $_POST['u' . $id . 'r4'] ) )
+						{
+							$ally_ranks_new[$id]['bewerbungenbearbeiten']	= 1;
+						}
+						else
+						{
+							$ally_ranks_new[$id]['bewerbungenbearbeiten']	= 0;
 						}
 
-						if (isset($_POST['u' . $id . 'r5'])) {
-						$ally_ranks_new[$id]['administrieren'] = 1;
-						} else {
-						$ally_ranks_new[$id]['administrieren'] = 0;
+						if ( isset ( $_POST['u' . $id . 'r5'] ) )
+						{
+							$ally_ranks_new[$id]['administrieren'] = 1;
+						}
+						else
+						{
+							$ally_ranks_new[$id]['administrieren'] = 0;
 						}
 
-						if (isset($_POST['u' . $id . 'r6'])) {
-						$ally_ranks_new[$id]['onlinestatus'] = 1;
-						} else {
-						$ally_ranks_new[$id]['onlinestatus'] = 0;
+						if ( isset ( $_POST['u' . $id . 'r6'] ) )
+						{
+							$ally_ranks_new[$id]['onlinestatus'] 	= 1;
+						}
+						else
+						{
+							$ally_ranks_new[$id]['onlinestatus'] 	= 0;
 						}
 
-						if (isset($_POST['u' . $id . 'r7'])) {
-						$ally_ranks_new[$id]['mails'] = 1;
-						} else {
-						$ally_ranks_new[$id]['mails'] = 0;
+						if ( isset ( $_POST['u' . $id . 'r7'] ) )
+						{
+							$ally_ranks_new[$id]['mails'] 			= 1;
+						}
+						else
+						{
+							$ally_ranks_new[$id]['mails'] 			= 0;
 						}
 
-						if (isset($_POST['u' . $id . 'r8'])) {
-						$ally_ranks_new[$id]['rechtehand'] = 1;
-						} else {
-						$ally_ranks_new[$id]['rechtehand'] = 0;
+						if ( isset ( $_POST['u' . $id . 'r8'] ) )
+						{
+							$ally_ranks_new[$id]['rechtehand'] 		= 1;
+						}
+						else
+						{
+							$ally_ranks_new[$id]['rechtehand'] 		= 0;
 						}
 					}
 
-					$ranks = serialize($ally_ranks_new);
+					$ranks	=	serialize ( $ally_ranks_new );
 
-					doquery("UPDATE {{table}} SET `ally_ranks`='" . $ranks . "' WHERE `id`=" . intval($ally['id']), "alliance");
+					doquery ( "UPDATE {{table}} SET `ally_ranks`='" . $ranks . "' WHERE `id`=" . intval ( $ally['id'] ) , "alliance" );
 
-					$goto = $_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'];
+					$goto 	= $_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'];
 
-					header("Location: " . $goto);
-					exit();
+					exit ( header ( "Location: " . $goto ) );
 
 				}
-				elseif(isset($d) && isset($ally_ranks[$d]))
+				elseif ( isset ( $d ) && isset ( $ally_ranks[$d] ) )
 				{
-					unset($ally_ranks[$d]);
+					unset ( $ally_ranks[$d] );
 
-					$ally['ally_rank'] = serialize($ally_ranks);
+					$ally['ally_rank']	= serialize ( $ally_ranks );
 
-					doquery("UPDATE {{table}} SET `ally_ranks`='{$ally['ally_rank']}' WHERE `id`=".intval($ally['id'])."", "alliance");
+					doquery ( "UPDATE {{table}} SET `ally_ranks`='" . $ally['ally_rank'] . "' WHERE `id`=" . intval ( $ally['id'] ) . "" , "alliance" );
 				}
 
-				if (count($ally_ranks) == 0 || $ally_ranks == '')
+				if ( count ( $ally_ranks ) == 0 or $ally_ranks == '' )
 				{
 					$list = "<th>".$lang['al_no_ranks_defined']."</th>";
 				}
 				else
 				{
-					$list = parsetemplate(gettemplate('alliance/alliance_admin_laws_head'), $lang);
-					$i = 0;
-					foreach($ally_ranks as $a => $b)
+					$list 	= parsetemplate ( gettemplate ( 'alliance/alliance_admin_laws_head' ) , $lang );
+					$i 		= 0;
+
+					foreach ( $ally_ranks as $a => $b )
 					{
-						if ($ally['ally_owner'] == $CurrentUser['id'])
+						if ( $ally['ally_owner'] == $CurrentUser['id'] )
 						{
-							$lang['id'] = $a;
-							$lang['delete'] = "<a href=\"game.php?page=alliance&mode=admin&edit=rights&d={$a}\"><img src=\"{$dpath}pic/abort.gif\" title=\"Borrar rango\" border=\"0\"></a>";
-							$lang['r0'] = $b['name'];
-							$lang['a'] = $a;
-							$lang['r1'] = "<input type=checkbox name=\"u{$a}r0\"" . (($b['delete'] == 1)?' checked="checked"':'') . ">"; //{$b[1]}
-							$lang['r2'] = "<input type=checkbox name=\"u{$a}r1\"" . (($b['kick'] == 1)?' checked="checked"':'') . ">";
-							$lang['r3'] = "<input type=checkbox name=\"u{$a}r2\"" . (($b['bewerbungen'] == 1)?' checked="checked"':'') . ">";
-							$lang['r4'] = "<input type=checkbox name=\"u{$a}r3\"" . (($b['memberlist'] == 1)?' checked="checked"':'') . ">";
-							$lang['r5'] = "<input type=checkbox name=\"u{$a}r4\"" . (($b['bewerbungenbearbeiten'] == 1)?' checked="checked"':'') . ">";
-							$lang['r6'] = "<input type=checkbox name=\"u{$a}r5\"" . (($b['administrieren'] == 1)?' checked="checked"':'') . ">";
-							$lang['r7'] = "<input type=checkbox name=\"u{$a}r6\"" . (($b['onlinestatus'] == 1)?' checked="checked"':'') . ">";
-							$lang['r8'] = "<input type=checkbox name=\"u{$a}r7\"" . (($b['mails'] == 1)?' checked="checked"':'') . ">";
-							$lang['r9'] = "<input type=checkbox name=\"u{$a}r8\"" . (($b['rechtehand'] == 1)?' checked="checked"':'') . ">";
-
-							$list .= parsetemplate(gettemplate('alliance/alliance_admin_laws_row'), $lang);
+							$lang['id'] 	= $a;
+							$lang['delete']	= "<a href=\"game.php?page=alliance&mode=admin&edit=rights&d={$a}\"><img src=\"{DPATH}pic/abort.gif\" title=\"Borrar rango\" border=\"0\"></a>";
+							$lang['r0'] 	= $b['name'];
+							$lang['a'] 		= $a;
+							$lang['r1'] 	= "<input type=checkbox name=\"u{$a}r0\"" . (($b['delete'] == 1)?' checked="checked"':'') . ">"; //{$b[1]}
+							$lang['r2'] 	= "<input type=checkbox name=\"u{$a}r1\"" . (($b['kick'] == 1)?' checked="checked"':'') . ">";
+							$lang['r3'] 	= "<input type=checkbox name=\"u{$a}r2\"" . (($b['bewerbungen'] == 1)?' checked="checked"':'') . ">";
+							$lang['r4'] 	= "<input type=checkbox name=\"u{$a}r3\"" . (($b['memberlist'] == 1)?' checked="checked"':'') . ">";
+							$lang['r5'] 	= "<input type=checkbox name=\"u{$a}r4\"" . (($b['bewerbungenbearbeiten'] == 1)?' checked="checked"':'') . ">";
+							$lang['r6'] 	= "<input type=checkbox name=\"u{$a}r5\"" . (($b['administrieren'] == 1)?' checked="checked"':'') . ">";
+							$lang['r7'] 	= "<input type=checkbox name=\"u{$a}r6\"" . (($b['onlinestatus'] == 1)?' checked="checked"':'') . ">";
+							$lang['r8'] 	= "<input type=checkbox name=\"u{$a}r7\"" . (($b['mails'] == 1)?' checked="checked"':'') . ">";
+							$lang['r9'] 	= "<input type=checkbox name=\"u{$a}r8\"" . (($b['rechtehand'] == 1)?' checked="checked"':'') . ">";
+
+							$list 			.= parsetemplate ( gettemplate ( 'alliance/alliance_admin_laws_row' ) , $lang );
 						}
 						else
 						{
-							$lang['id'] = $a;
-							$lang['r0'] = $b['name'];
-							$lang['delete'] = "<a href=\"game.php?page=alliance&mode=admin&edit=rights&d={$a}\"><img src=\"{$dpath}pic/abort.gif\" alt=\"{$lang['Delete_range']}\" border=0></a>";
-							$lang['a'] = $a;
-							$lang['r1'] = "<b>-</b>";
-							$lang['r2'] = "<input type=checkbox name=\"u{$a}r1\"" . (($b['kick'] == 1)?' checked="checked"':'') . ">";
-							$lang['r3'] = "<input type=checkbox name=\"u{$a}r2\"" . (($b['bewerbungen'] == 1)?' checked="checked"':'') . ">";
-							$lang['r4'] = "<input type=checkbox name=\"u{$a}r3\"" . (($b['memberlist'] == 1)?' checked="checked"':'') . ">";
-							$lang['r5'] = "<input type=checkbox name=\"u{$a}r4\"" . (($b['bewerbungenbearbeiten'] == 1)?' checked="checked"':'') . ">";
-							$lang['r6'] = "<input type=checkbox name=\"u{$a}r5\"" . (($b['administrieren'] == 1)?' checked="checked"':'') . ">";
-							$lang['r7'] = "<input type=checkbox name=\"u{$a}r6\"" . (($b['onlinestatus'] == 1)?' checked="checked"':'') . ">";
-							$lang['r8'] = "<input type=checkbox name=\"u{$a}r7\"" . (($b['mails'] == 1)?' checked="checked"':'') . ">";
-							$lang['r9'] = "<input type=checkbox name=\"u{$a}r8\"" . (($b['rechtehand'] == 1)?' checked="checked"':'') . ">";
-
-							$list .= parsetemplate(gettemplate('alliance/alliance_admin_laws_row'), $lang);
+							$lang['id'] 	= $a;
+							$lang['r0'] 	= $b['name'];
+							$lang['delete'] = "<a href=\"game.php?page=alliance&mode=admin&edit=rights&d={$a}\"><img src=\"{DPATH}pic/abort.gif\" alt=\"{$lang['Delete_range']}\" border=0></a>";
+							$lang['a'] 		= $a;
+							$lang['r1'] 	= "<b>-</b>";
+							$lang['r2'] 	= "<input type=checkbox name=\"u{$a}r1\"" . (($b['kick'] == 1)?' checked="checked"':'') . ">";
+							$lang['r3'] 	= "<input type=checkbox name=\"u{$a}r2\"" . (($b['bewerbungen'] == 1)?' checked="checked"':'') . ">";
+							$lang['r4'] 	= "<input type=checkbox name=\"u{$a}r3\"" . (($b['memberlist'] == 1)?' checked="checked"':'') . ">";
+							$lang['r5'] 	= "<input type=checkbox name=\"u{$a}r4\"" . (($b['bewerbungenbearbeiten'] == 1)?' checked="checked"':'') . ">";
+							$lang['r6'] 	= "<input type=checkbox name=\"u{$a}r5\"" . (($b['administrieren'] == 1)?' checked="checked"':'') . ">";
+							$lang['r7'] 	= "<input type=checkbox name=\"u{$a}r6\"" . (($b['onlinestatus'] == 1)?' checked="checked"':'') . ">";
+							$lang['r8'] 	= "<input type=checkbox name=\"u{$a}r7\"" . (($b['mails'] == 1)?' checked="checked"':'') . ">";
+							$lang['r9'] 	= "<input type=checkbox name=\"u{$a}r8\"" . (($b['rechtehand'] == 1)?' checked="checked"':'') . ">";
+
+							$list 			.= parsetemplate ( gettemplate ( 'alliance/alliance_admin_laws_row' ) , $lang );
 						}
 					}
 
-					if (count($ally_ranks) != 0)
-						$list .= parsetemplate(gettemplate('alliance/alliance_admin_laws_feet'), $lang);
+					if ( count ( $ally_ranks ) != 0 )
+					{
+						$list 				.= parsetemplate ( gettemplate ( 'alliance/alliance_admin_laws_feet' ) , $lang );
+					}
 				}
 
-				$lang['list'] 	= $list;
-				$lang['dpath'] 	= $dpath;
-				display(parsetemplate(gettemplate('alliance/alliance_admin_laws'), $lang));
+				$lang['list']	= $list;
+				$lang['dpath'] 	= DPATH;
+				display ( parsetemplate ( gettemplate ( 'alliance/alliance_admin_laws' ) , $lang ) );
 			}
-		// < ----------------------------------------------------- EDICIONES GENERALES DE LA ALIANZA ----------------------------------------------------- >
-			if ($mode == 'admin' && $edit == 'ally')
+			##############################################################################################
+			# EDICIONES GENERALES DE LA ALIANZA
+			##############################################################################################
+			if ( $mode == 'admin' && $edit == 'ally' )
 			{
-				if ($t != 1 && $t != 2 && $t != 3)
+				if ( $t != 1 && $t != 2 && $t != 3 )
 				{
 					$t = 1;
 				}
 
-				if ($_POST)
+				if ( $_POST )
 				{
-					if (!get_magic_quotes_gpc())
+					if ( !get_magic_quotes_gpc() )
 					{
-						$_POST['owner_range'] 	= stripslashes($_POST['owner_range']);
-						$_POST['web'] 			= stripslashes($_POST['web']);
-						$_POST['image'] 		= stripslashes($_POST['image']);
-						$_POST['text'] 			= stripslashes($_POST['text']);
+						$_POST['owner_range'] 		= stripslashes ( $_POST['owner_range'] );
+						$_POST['web'] 				= stripslashes ( $_POST['web'] );
+						$_POST['image'] 			= stripslashes ( $_POST['image'] );
+						$_POST['text'] 				= stripslashes ( $_POST['text'] );
 					}
 				}
 
@@ -775,65 +810,83 @@ public function __construct($CurrentUser)
 					$ally['ally_owner_range'] 		= mysql_escape_string(htmlspecialchars(strip_tags($_POST['owner_range'])));
 					$ally['ally_web'] 				= mysql_escape_string(htmlspecialchars(strip_tags($_POST['web'])));
 					$ally['ally_image'] 			= mysql_escape_string(htmlspecialchars(strip_tags($_POST['image'])));
-					$ally['ally_request_notallow'] 	= intval($_POST['request_notallow']);
+					$ally['ally_request_notallow']	= intval($_POST['request_notallow']);
 
-					if ($ally['ally_request_notallow'] != 0 && $ally['ally_request_notallow'] != 1)
-						exit(header("location:game.". $phpEx . "?page=alliance?mode=admin&edit=ally",2));
+					if ( $ally['ally_request_notallow'] != 0 && $ally['ally_request_notallow'] != 1 )
+					{
+						exit ( header ( "location:game.php?page=alliance?mode=admin&edit=ally" , 2 ) );
+					}
 
-					doquery("UPDATE {{table}} SET
-					`ally_owner_range`='{$ally['ally_owner_range']}',
-					`ally_image`='{$ally['ally_image']}',
-					`ally_web`='{$ally['ally_web']}',
-					`ally_request_notallow`='{$ally['ally_request_notallow']}'
-					WHERE `id`='{$ally['id']}'", "alliance");
+					doquery ( "UPDATE {{table}} SET
+								`ally_owner_range`='" . $ally['ally_owner_range'] . "',
+								`ally_image`='" . $ally['ally_image'] . "',
+								`ally_web`='" . $ally['ally_web'] . "',
+								`ally_request_notallow`='" . $ally['ally_request_notallow'] . "'
+								WHERE `id`='" . $ally['id'] . "'"
+								, "alliance" );
 				}
-				elseif ($_POST['t'])
+				elseif ( $_POST['t'] )
 				{
-					if ($t == 3)
+					if ( $t == 3 )
 					{
+						$ally['ally_request']		= mysql_escape_string ( strip_tags ( $_POST['text'] ) );
 
-						$ally['ally_request'] = mysql_escape_string(strip_tags($_POST['text']));
 						doquery("UPDATE {{table}} SET
-						`ally_request`='{$ally['ally_request']}'
-						WHERE `id`='{$ally['id']}'", "alliance");
-						header ("Location: game.php?page=alliance&mode=admin&edit=ally&t=3");
+						`ally_request`='" . $ally['ally_request'] . "'
+						WHERE `id`='" . $ally['id'] . "'", "alliance");
+
+						header ( "Location: game.php?page=alliance&mode=admin&edit=ally&t=3" );
 					}
 					elseif ($t == 2)
 					{
-						$ally['ally_text'] = mysql_escape_string(strip_tags($_POST['text']));
+						$ally['ally_text']			= mysql_escape_string ( strip_tags ( $_POST['text'] ) );
+
 						doquery("UPDATE {{table}} SET
-						`ally_text`='{$ally['ally_text']}'
-						WHERE `id`='{$ally['id']}'", "alliance");
-						header ("Location: game.php?page=alliance&mode=admin&edit=ally&t=2");
+						`ally_text`='" . $ally['ally_text'] . "'
+						WHERE `id`='" . $ally['id'] . "'", "alliance");
+
+						header ( "Location: game.php?page=alliance&mode=admin&edit=ally&t=2" );
 					}
 					else
 					{
-						$ally['ally_description'] = mysql_escape_string(strip_tags($_POST['text']));
+						$ally['ally_description']	= mysql_escape_string ( strip_tags ( $_POST['text'] ) );
 
 						doquery("UPDATE {{table}} SET
 						`ally_description`='" . $ally['ally_description'] . "'
-						WHERE `id`='{$ally['id']}'", "alliance");
-						header ("Location: game.php?page=alliance&mode=admin&edit=ally&t=1");
+						WHERE `id`='" . $ally['id'] . "'", "alliance");
+
+						header ( "Location: game.php?page=alliance&mode=admin&edit=ally&t=1" );
 					}
 				}
 
-				$lang['dpath'] = $dpath;
+				$lang['dpath']	= DPATH;
 
-				if ($t == 3) {
-				$lang['request_type'] = $lang['al_request_text'];
-				} elseif ($t == 2) {
-				$lang['request_type'] = $lang['al_inside_text'];
-				} else {
-				$lang['request_type'] = $lang['al_outside_text'];
+				if ( $t == 3 )
+				{
+					$lang['request_type'] 	= $lang['al_request_text'];
+				}
+				elseif ( $t == 2 )
+				{
+					$lang['request_type'] 	= $lang['al_inside_text'];
+				}
+				else
+				{
+					$lang['request_type'] 	= $lang['al_outside_text'];
 				}
 
-				if ($t == 2)
-					$lang['text'] = $ally['ally_text'];
+				if ( $t == 2 )
+				{
+					$lang['text'] 			= $ally['ally_text'];
+				}
 				else
-					$lang['text'] = $ally['ally_description'];
+				{
+					$lang['text'] 			= $ally['ally_description'];
+				}
 
-				if ($t == 3)
-					$lang['text'] = $ally['ally_request'];
+				if ( $t == 3 )
+				{
+					$lang['text'] 			= $ally['ally_request'];
+				}
 
 				$lang['t'] 							= $t;
 				$lang['ally_web'] 					= $ally['ally_web'];
@@ -841,61 +894,53 @@ public function __construct($CurrentUser)
 				$lang['ally_request_notallow_0'] 	= (($ally['ally_request_notallow'] == 1) ? ' SELECTED' : '');
 				$lang['ally_request_notallow_1'] 	= (($ally['ally_request_notallow'] == 0) ? ' SELECTED' : '');
 				$lang['ally_owner_range'] 			= $ally['ally_owner_range'];
-				display(parsetemplate(gettemplate('alliance/alliance_admin'), $lang));
+
+				display ( parsetemplate ( gettemplate ( 'alliance/alliance_admin' ) , $lang ) );
 			}
-		// < -------------------------------------------------------- EDICION DE LOS MIEMBROS -------------------------------------------------------- >
-			if ($mode == 'admin' && $edit == 'members')
+			##############################################################################################
+			# EDICION DE LOS MIEMBROS
+			##############################################################################################
+			if ( $mode == 'admin' && $edit == 'members' )
 			{
-				if ($ally['ally_owner'] != $CurrentUser['id'] && $user_admin == false)
-					header("location:game.". $phpEx . "?page=alliance",2);
+				if ( $ally['ally_owner'] != $CurrentUser['id'] && $user_admin == FALSE )
+				{
+					header ( "location:game.php?page=alliance" , 2 );
+				}
 
-				if (isset($kick))
+				if ( isset ( $kick ) )
 				{
 					if ($ally['ally_owner'] != $CurrentUser['id'] && !$user_can_kick)
-						header("location:game.". $phpEx . "?page=alliance",2);
+					{
+						header ( "location:game.php?page=alliance" , 2 );
+					}
 
-					$u = doquery("SELECT * FROM {{table}} WHERE id='".intval($kick)."' LIMIT 1", 'users', true);
+					$u	= doquery ( "SELECT * FROM {{table}} WHERE id='" . intval ( $kick ) . "' LIMIT 1" , 'users' , TRUE );
 
-					if ($u['ally_id'] == $ally['id'] && $u['id'] != $ally['ally_owner'])
-						doquery("UPDATE {{table}} SET `ally_id`='0', `ally_name`='', `ally_rank_id` = 0 WHERE `id`='".intval($u['id'])."' LIMIT 1;", 'users');
+					if ( $u['ally_id'] == $ally['id'] && $u['id'] != $ally['ally_owner'] )
+					{
+						doquery ( "UPDATE {{table}} SET `ally_id`='0', `ally_name`='', `ally_rank_id` = 0 WHERE `id`='" . intval ( $u['id'] ) . "' LIMIT 1;" , 'users' );
+					}
 				}
-				elseif (isset($_POST['newrang']))
+				elseif ( isset ( $_POST['newrang'] ) )
 				{
-					$q = doquery("SELECT * FROM {{table}} WHERE id='".intval($u)."' LIMIT 1", 'users', true);
+					$q	= doquery ( "SELECT * FROM {{table}} WHERE id='" . intval ( $u ) . "' LIMIT 1" , 'users' , TRUE );
 
-					if ((isset($ally_ranks[$_POST['newrang']-1]) || $_POST['newrang'] == 0) && $q['id'] != $ally['ally_owner'])
-						doquery("UPDATE {{table}} SET `ally_rank_id`='" . mysql_escape_string(strip_tags($_POST['newrang'])) . "' WHERE `id`='" . intval($id) . "'", 'users');
+					if ( ( isset ( $ally_ranks[$_POST['newrang']-1] ) or $_POST['newrang'] == 0 ) && $q['id'] != $ally['ally_owner'] )
+					{
+						doquery ( "UPDATE {{table}} SET `ally_rank_id`='" . mysql_escape_string ( strip_tags ( $_POST['newrang'] ) ) . "' WHERE `id`='" . intval ( $id ) . "'" , 'users' );
+					}
 				}
 
-				if ($sort2)
+				if ( $sort2 )
 				{
-					$sort1 = intval($_GET['sort1']);
-					$sort2 = intval($_GET['sort2']);
-
-					if ($sort1 == 1) {
-					$sort = " ORDER BY `username`";
-					} elseif ($sort1 == 2) {
-					$sort = " ORDER BY `ally_rank_id`";
-					} elseif ($sort1 == 3) {
-					$sort = " ORDER BY `total_points`";
-					} elseif ($sort1 == 4) {
-					$sort = " ORDER BY `ally_register_time`";
-					} elseif ($sort1 == 5) {
-					$sort = " ORDER BY `onlinetime`";
-					} else {
-					$sort = " ORDER BY `id`";
-					}
-
-					if ($sort2 == 1) {
-					$sort .= " DESC;";
-					} elseif ($sort2 == 2) {
-					$sort .= " ASC;";
-					}
-					$listuser = doquery("SELECT * FROM `{{table}}users` inner join `{{table}}statpoints` on `{{table}}users`.`id`=`{{table}}statpoints`.`id_owner` WHERE ally_id='".intval($CurrentUser['ally_id'])."' AND STAT_type=1 $sort", '');
+					$sort1 		= intval ( $_GET['sort1'] );
+					$sort2 		= intval ( $_GET['sort2'] );
+					$sort		= $this->return_sort ( $sort1 , $sort2 );
+					$listuser	= doquery ( "SELECT * FROM `{{table}}users` inner join `{{table}}statpoints` on `{{table}}users`.`id`=`{{table}}statpoints`.`id_owner` WHERE ally_id='" . intval ( $CurrentUser['ally_id'] ) . "' AND STAT_type=1 " . $sort . "" , '' );
 				}
 				else
 				{
-					$listuser = doquery("SELECT * FROM {{table}} WHERE ally_id='".intval($CurrentUser['ally_id'])."'", 'users');
+					$listuser 	= doquery ( "SELECT * FROM {{table}} WHERE ally_id='" . intval ( $CurrentUser['ally_id'] ) ."'" , 'users' );
 				}
 
 				$i 				= 0;
@@ -903,229 +948,275 @@ public function __construct($CurrentUser)
 				$s				= $lang;
 				$lang['i'] 		= mysql_num_rows($listuser);
 
-				while ($u = mysql_fetch_array($listuser))
+				while ( $u = mysql_fetch_array ( $listuser ) )
 				{
-					$UserPoints = doquery("SELECT * FROM {{table}} WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '" . intval($u['id']) . "';", 'statpoints', true);
+					$UserPoints			= doquery ( "SELECT * FROM {{table}} WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '" . intval ( $u['id'] ) . "';" , 'statpoints' , TRUE );
 
 					$i++;
-					$u['i'] = $i;
-
-					$u['points'] = "" . pretty_number($UserPoints['total_points']) . "";
-
-					$days = floor(round(time() - $u["onlinetime"]) / 3600 * 24);
-
-					$u["onlinetime"] = str_replace("%s", $days, "%s d");
+					$u['i'] 			= $i;
+					$u['points'] 		= pretty_number ( $UserPoints['total_points'] );
+					$days 				= floor ( round ( time() - $u["onlinetime"] ) / 3600 * 24 );
+					$u["onlinetime"]	= str_replace ( "%s" , $days , "%s d" );
 
-					if ($ally['ally_owner'] == $u['id'])
-						$ally_range = ($ally['ally_owner_range'] == '')?$lang['al_founder_rank_text']:$ally['ally_owner_range'];
-					elseif ($u['ally_rank_id'] == 0 || !isset($ally_ranks[$u['ally_rank_id']-1]['name']))
-						$ally_range = $lang['al_new_member_rank_text'];
+					if ( $ally['ally_owner'] == $u['id'] )
+					{
+						$ally_range 	= ( $ally['ally_owner_range'] == '' ) ? $lang['al_founder_rank_text'] : $ally['ally_owner_range'];
+					}
+					elseif ( $u['ally_rank_id'] == 0 or !isset ( $ally_ranks[$u['ally_rank_id']-1]['name'] ) )
+					{
+						$ally_range 	= $lang['al_new_member_rank_text'];
+					}
 					else
-						$ally_range = $ally_ranks[$u['ally_rank_id']-1]['name'];
+					{
+						$ally_range 	= $ally_ranks[$u['ally_rank_id']-1]['name'];
+					}
 
-					if ($ally['ally_owner'] == $u['id'] || $rank == $u['id'])
-						$u["acciones"] = '-';
-					elseif ($ally_ranks[$CurrentUser['ally_rank_id']-1]['kick'] == 1  &&  $ally_ranks[$CurrentUser['ally_rank_id']-1]['administrieren'] == 1 || $ally['ally_owner'] == $CurrentUser['id'])
-						$u["acciones"] = "<a href=\"game.php?page=alliance&mode=admin&edit=members&kick=$u[id]\" onclick=\"javascript:return confirm('¿Estás seguro que deseas expulsar a $u[username]?');\"><img src=\"".$dpath."pic/abort.gif\" border=\"0\"></a> <a href=\"game.php?page=alliance&mode=admin&edit=members&rank=$u[id]\"><img src=\"".$dpath."pic/key.gif\" border=\"0\"></a>";
+					if ( $ally['ally_owner'] == $u['id'] or $rank == $u['id'] )
+					{
+						$u["acciones"] 	= '-';
+					}
+					elseif ( $ally_ranks[$CurrentUser['ally_rank_id']-1]['kick'] == 1  &&  $ally_ranks[$CurrentUser['ally_rank_id']-1]['administrieren'] == 1 or $ally['ally_owner'] == $CurrentUser['id'] )
+					{
+						$u["acciones"] 	= "<a href=\"game.php?page=alliance&mode=admin&edit=members&kick=" . $u[id] . "\" onclick=\"javascript:return confirm('¿Estás seguro que deseas expulsar a " . $a[username] . "?');\"><img src=\"".DPATH."pic/abort.gif\" border=\"0\"></a> <a href=\"game.php?page=alliance&mode=admin&edit=members&rank=" . $u[id] . "\"><img src=\"" . DPATH . "pic/key.gif\" border=\"0\"></a>";
+					}
 					elseif ($ally_ranks[$CurrentUser['ally_rank_id']-1]['administrieren'] == 1 )
-						$u["acciones"] = "<a href=\"game.php?page=alliance&mode=admin&edit=members&kick=$u[id]\" onclick=\"javascript:return confirm('¿Estás seguro que deseas expulsar a $u[username]?');\"><img src=\"".$dpath."pic/abort.gif\" border=\"0\"></a> <a href=\"game.php?page=alliance&mode=admin&edit=members&rank=$u[id]\"><img src=\"".$dpath."pic/key.gif\" border=\"0\"></a>";
+					{
+						$u["acciones"] 	= "<a href=\"game.php?page=alliance&mode=admin&edit=members&kick=" . $u[id] . "\" onclick=\"javascript:return confirm('¿Estás seguro que deseas expulsar a " . $a[username] . "?');\"><img src=\"".DPATH."pic/abort.gif\" border=\"0\"></a> <a href=\"game.php?page=alliance&mode=admin&edit=members&rank=" . $u[id] . "\"><img src=\"" . DPATH . "pic/key.gif\" border=\"0\"></a>";
+					}
 					else
-						$u["acciones"] = '-';
-
-					$u["dpath"] = $dpath;
+					{
+						$u["acciones"] 	= '-';
+					}
 
-					$u['ally_register_time'] = date("Y-m-d h:i:s", $u['ally_register_time']);
+					$u["dpath"]						= DPATH;
+					$u['ally_register_time']		= date ( "Y-m-d h:i:s" , $u['ally_register_time'] );
 
-					if ($rank == $u['id'])
+					if ( $rank == $u['id'] )
 					{
-						$r['Rank_for'] = str_replace("%s", $u['username'], $lang['Rank_for']);
-						$r['options'] .= "<option onclick=\"document.editar_usu_rango.submit();\" value=\"0\">".$lang['al_new_member_rank_text']."</option>";
+						$r['Rank_for'] 				= str_replace("%s", $u['username'], $lang['Rank_for']);
+						$r['options'] 				.= "<option onclick=\"document.editar_usu_rango.submit();\" value=\"0\">" . $lang['al_new_member_rank_text'] . "</option>";
 
-						if($ally_ranks != null )
+						if ( $ally_ranks != NULL )
 						{
-							foreach($ally_ranks as $a => $b)
+							foreach ( $ally_ranks as $a => $b )
 							{
-								$r['options'] 	.= "<option onclick=\"document.editar_usu_rango.submit();\" value=\"" . ($a + 1) . "\"";
+								$r['options'] 		.= "<option onclick=\"document.editar_usu_rango.submit();\" value=\"" . ($a + 1) . "\"";
 
-								if ($u['ally_rank_id']-1 == $a)
+								if ( $u['ally_rank_id']-1 == $a )
 								{
-									$r['options'] .= ' selected=selected';
+									$r['options'] 	.= ' selected=selected';
 								}
 
-								$r['options'] .= ">{$b['name']}</option>";
+								$r['options'] 		.= ">{$b['name']}</option>";
 							}
 						}
-						$r['id'] = $u['id'];
+						$r['id'] 					= $u['id'];
 
-						$editar_miembros = parsetemplate(gettemplate('alliance/alliance_admin_members_row_edit'), $r);
+						$editar_miembros = parsetemplate ( gettemplate ( 'alliance/alliance_admin_members_row_edit' ) , $r );
 					}
 
 					if ($rank != $u['id'])
+					{
 						$u['ally_range'] = $ally_range;
+					}
 					else
+					{
 						$u['ally_range'] = $editar_miembros;
+					}
 
 					$page_list .= parsetemplate(gettemplate('alliance/alliance_admin_members_row'), $u);
 
 				}
-				if ($sort2 == 1) {$s = 2;}
-				elseif ($sort2 == 2) {$s = 1;}
-				else {$s = 1;}
 
-				if ($i != $ally['ally_members'])
-					doquery("UPDATE {{table}} SET `ally_members`='".intval($i)."' WHERE `id`='".intval($ally['id'])."'", 'alliance');
+				if ($sort2 == 1)
+				{
+					$s = 2;
+				}
+				elseif ( $sort2 == 2 )
+				{
+					$s = 1;
+				}
+				else
+				{
+					$s = 1;
+				}
+
+				if ( $i != $ally['ally_members'] )
+				{
+					doquery ( "UPDATE {{table}} SET `ally_members`='" . intval ( $i ) . "' WHERE `id`='" . intval ( $ally['id'] ) . "'" , 'alliance' );
+				}
 
-				$lang['memberslist'] = $page_list;
-				$lang['s'] = $s;
+				$lang['memberslist'] 	= $page_list;
+				$lang['s'] 				= $s;
 
-				display(parsetemplate(gettemplate('alliance/alliance_admin_members_table'), $lang));
+				display ( parsetemplate ( gettemplate ( 'alliance/alliance_admin_members_table' ) , $lang ) );
 			}
 
-		// < -------------------------------------------------------- EDICION DE LAS SOLICITUDES -------------------------------------------------------- >
-			if ($mode == 'admin' && $edit == 'requests')
+			##############################################################################################
+			# EDICION DE LAS SOLICITUDES
+			##############################################################################################
+			if ( $mode == 'admin' && $edit == 'requests' )
 			{
-				if ($ally['ally_owner'] != $CurrentUser['id'] && !$user_bewerbungen_bearbeiten)
-					header("location:game.". $phpEx . "?page=alliance",2);
+				if ( $ally['ally_owner'] != $CurrentUser['id'] && !$user_bewerbungen_bearbeiten )
+				{
+					header ( "location:game.php?page=alliance" , 2 );
+				}
 
-				if ($_POST['action'] == $lang['al_acept_request'])
+				if ( $_POST['action'] == $lang['al_acept_request'] )
 				{
 					$_POST['text']  = trim ( nl2br ( strip_tags ( $_POST['text'], '<br>' ) ) );
 
-					doquery("UPDATE {{table}} SET `ally_members` = `ally_members` + 1 WHERE id='".intval($ally['id'])."'", 'alliance');
+					doquery ( "UPDATE {{table}} SET `ally_members` = `ally_members` + 1 WHERE id='".intval($ally['id'])."'", 'alliance');
 
 					doquery("UPDATE {{table}} SET
-					ally_name='{$ally['ally_name']}',
-					ally_request_text='',
-					ally_request='0',
-					ally_id='{$ally['id']}'
-					WHERE id='{$show}'", 'users');
+								ally_name='" . $ally['ally_name'] . "',
+								ally_request_text='',
+								ally_request='0',
+								ally_id='" . $ally['id'] . "'
+								WHERE id='" . $show . "'"
+								, 'users');
 
-					SendSimpleMessage($show,$CurrentUser['id'],'', 2,$ally['ally_tag'],$lang['al_you_was_acceted'] . $ally['ally_name'], $lang['al_hi_the_alliance'] . $ally['ally_name'] . $lang['al_has_accepted'] . $_POST['text']);
+					SendSimpleMessage ( $show , $CurrentUser['id'] , '' , 2 ,$ally['ally_tag'] , $lang['al_you_was_acceted'] . $ally['ally_name'] , $lang['al_hi_the_alliance'] . $ally['ally_name'] . $lang['al_has_accepted'] . $_POST['text'] );
 
-					exit(header('Location:game.php?page=alliance&mode=admin&edit=ally'));
+					exit ( header ( 'Location:game.php?page=alliance&mode=admin&edit=ally' ) );
 				}
 				elseif($_POST['action'] == $lang['al_decline_request'] && $_POST['action'] != '')
 				{
 					$_POST['text']  = trim ( nl2br ( strip_tags ( $_POST['text'], '<br>' ) ) );
 
-					doquery("UPDATE {{table}} SET ally_request_text='',ally_request='0',ally_id='0' WHERE id='".intval($show)."'", 'users');
+					doquery ( "UPDATE {{table}} SET ally_request_text='',ally_request='0',ally_id='0' WHERE id='" . intval ( $show ) . "'" , 'users' );
 
-					SendSimpleMessage($show,$CurrentUser['id'],'', 2,$ally['ally_tag'],$lang['al_you_was_declined'] . $ally['ally_name'], $lang['al_hi_the_alliance'] . $ally['ally_name'] . $lang['al_has_declined'] . $_POST['text']);
+					SendSimpleMessage ( $show , $CurrentUser['id'] , '' , 2 , $ally['ally_tag'] , $lang['al_you_was_declined'] . $ally['ally_name'] , $lang['al_hi_the_alliance'] . $ally['ally_name'] . $lang['al_has_declined'] . $_POST['text'] );
 
-					exit(header('Location:game.php?page=alliance&mode=admin&edit=ally'));
+					exit ( header ( 'Location:game.php?page=alliance&mode=admin&edit=ally' ) );
 				}
 
-				$i = 0;
+				$i 		= 0;
+				$query 	= doquery ( "SELECT id,username,ally_request_text,ally_register_time FROM {{table}} WHERE ally_request='" . intval ( $ally['id'] ) . "'" , 'users' );
 
-				$query = doquery("SELECT id,username,ally_request_text,ally_register_time FROM {{table}} WHERE ally_request='".($ally['id'])."'", 'users');
+				/***start fix by jstar***/
+				$s 		= array();
 
-				while ($r = mysql_fetch_array($query))
+				while ( $r = mysql_fetch_array ( $query ) )
 				{
-					$s = $lang;
-					if (isset($show) && $r['id'] == $show)
+
+					if ( isset ( $show ) && $r['id'] == $show )
 					{
-						$s['username'] 			= $r['username'];
-						$s['ally_request_text'] = nl2br($r['ally_request_text']);
-						$s['id'] 				= $r['id'];
+						$s[$show]['username']          	= $r['username'];
+						$s[$show]['ally_request_text']	= nl2br ( $r['ally_request_text'] );
+						$s[$show]['id']					= $r['id'];
 					}
 
-					$r['time'] 		= date("Y-m-d h:i:s", $r['ally_register_time']);
-					$parse['list'] .= parsetemplate(gettemplate('alliance/alliance_admin_request_row'), $r);
+					$r['time']		= date("Y-m-d h:i:s", $r['ally_register_time']);
+					$parse['list'] 	.= parsetemplate ( gettemplate ( 'alliance/alliance_admin_request_row' ) , $r );
 					$i++;
 				}
 
-				if ($parse['list'] == '')
+				if ( $parse['list'] == '' )
 				{
-					$parse['list'] = "<tr><th colspan=2>".$lang['al_no_requests']."</th></tr>";
+					$parse['list'] = "<tr><th colspan=2>" . $lang['al_no_requests'] . "</th></tr>";
 				}
 
-				if (isset($show) && $show != 0 && $parse['list'] != '')
+				if ( isset ( $show ) && $show != 0 && $parse['list'] != '' )
 				{
-					$s['Request_from'] 	= str_replace('%s', $s['username'], $lang['al_request_from']);
-					$parse['request'] 	= parsetemplate(gettemplate('alliance/alliance_admin_request_form'), $s);
-				}
+					$s[$show]['Request_from']	= str_replace ( '%s' , $s[$show]['username'] , $lang['al_request_from'] );
+					$parse['request']     		= parsetemplate ( gettemplate ( 'alliance/alliance_admin_request_form' ) , array_merge ( $s[$show] , $lang ) );
+				} /***end fix***/
 				else
+				{
 					$parse['request'] = '';
+				}
 
 				$parse['ally_tag'] 					= $ally['ally_tag'];
-				$parse['There_is_hanging_request'] 	= str_replace('%n', $i, $lang['al_no_request_pending']);
+				$parse['There_is_hanging_request'] 	= str_replace ( '%n' , $i , $lang['al_no_request_pending'] );
 
-				display(parsetemplate(gettemplate('alliance/alliance_admin_request_table'), $parse));
+				display ( parsetemplate ( gettemplate ( 'alliance/alliance_admin_request_table' ) , $parse ) );
 			}
-		// < -------------------------------------------------------- CAMBIAR NOMBRE DE LA ALIANZA -------------------------------------------------------- >
-			if ($mode == 'admin' && $edit == 'name')
+			##############################################################################################
+			# CAMBIAR NOMBRE DE LA ALIANZA
+			##############################################################################################
+			if ( $mode == 'admin' && $edit == 'name' )
 			{
-				if ($ally['ally_owner'] != $CurrentUser['id'] && !$user_admin)
-					header("location:game.". $phpEx . "?page=alliance",2);
+				if ( $ally['ally_owner'] != $CurrentUser['id'] && !$user_admin )
+				{
+					header ( "location:game.php?page=alliance" , 2 );
+				}
 
-				if ($_POST['nombre'] && !empty($_POST['nombre']))
+				if ( $_POST['nombre'] && !empty($_POST['nombre'] ) )
 				{
-					$ally['ally_name'] = mysql_escape_string(strip_tags($_POST['nombre']));
-					doquery("UPDATE {{table}} SET `ally_name` = '". $ally['ally_name'] ."' WHERE `id` = '". intval($CurrentUser['ally_id']) ."';", 'alliance');
-					doquery("UPDATE {{table}} SET `ally_name` = '". $ally['ally_name'] ."' WHERE `ally_id` = '". intval($ally['id']) ."';", 'users');
+					$ally['ally_name']	= mysql_escape_string ( strip_tags ( $_POST['nombre'] ) );
+					doquery ( "UPDATE {{table}} SET `ally_name` = '" . $ally['ally_name'] . "' WHERE `id` = '" . intval ( $CurrentUser['ally_id']) . "';" , 'alliance' );
+					doquery ( "UPDATE {{table}} SET `ally_name` = '" . $ally['ally_name'] . "' WHERE `ally_id` = '" . intval ( $ally['id'] ) . "';" , 'users' );
 				}
 
 				$parse[caso] 		= $lang['al_name'];
 				$parse[caso_titulo]	= $lang['al_new_name'];
 
-				display(parsetemplate(gettemplate('alliance/alliance_admin_rename'), $parse));
+				display ( parsetemplate ( gettemplate ( 'alliance/alliance_admin_rename' ) , $parse ) );
 			}
-		// < ------------------------------------------------------- CAMBIAR ETIQUETA DE LA ALIANZA ------------------------------------------------------- >
-			if ($mode == 'admin' && $edit == 'tag')
+			##############################################################################################
+			# CAMBIAR ETIQUETA DE LA ALIANZA
+			##############################################################################################
+			if ( $mode == 'admin' && $edit == 'tag')
 			{
-				if ($ally['ally_owner'] != $CurrentUser['id'] && !$user_admin)
-					header("location:game.". $phpEx . "?page=alliance",2);
-
-				if ($_POST['etiqueta'] && !empty($_POST['etiqueta']))
-					doquery("UPDATE {{table}} SET `ally_tag` = '". mysql_escape_string(strip_tags($_POST['etiqueta'])) ."' WHERE `id` = '". $CurrentUser['ally_id'] ."';", 'alliance');
+				if ( $ally['ally_owner'] != $CurrentUser['id'] && !$user_admin )
+				{
+					header ( "location:game.php?page=alliance" , 2 );
+				}
 
+				if ( $_POST['etiqueta'] && !empty ( $_POST['etiqueta'] ) )
+				{
+					doquery ( "UPDATE {{table}} SET `ally_tag` = '". mysql_escape_string ( strip_tags ( $_POST['etiqueta'] ) ) . "' WHERE `id` = '" . $CurrentUser['ally_id'] . "';" , 'alliance' );
+				}
 
 				$parse[caso] 		= $lang['al_tag'];
 				$parse[caso_titulo]	= $lang['al_new_tag'];
 
-				display(parsetemplate(gettemplate('alliance/alliance_admin_rename'), $parse));
+				display ( parsetemplate ( gettemplate ( 'alliance/alliance_admin_rename' ) , $parse ) );
 			}
-		// < ------------------------------------------------------------- SALIR DE LA ALIANZA ------------------------------------------------------------- >
-			if ($mode == 'admin' && $edit == 'exit')
+			##############################################################################################
+			# SALIR DE LA ALIANZA
+			##############################################################################################
+			if ( $mode == 'admin' && $edit == 'exit' )
 			{
-				if ($ally['ally_owner'] != $CurrentUser['id'] && !$user_can_exit_alliance)
-					header("location:game.". $phpEx . "?page=alliance",2);
-
-				$BorrarAlianza = doquery("SELECT id FROM {{table}} WHERE `ally_id`='".intval($ally['id'])."'",'users');
-
-				while ($v = mysql_fetch_array($BorrarAlianza))
+				if ( $ally['ally_owner'] != $CurrentUser['id'] && !$user_can_exit_alliance )
 				{
-					doquery("UPDATE {{table}} SET `ally_name` = '', `ally_id`='0' WHERE `id`='".intval($v['id'])."'", 'users');
+					header ( "location:game.php?page=alliance" , 2 );
 				}
 
-				doquery("DELETE FROM {{table}} WHERE id='".intval($ally['id'])."' LIMIT 1", "alliance");
+				doquery ( "UPDATE {{table}} SET `ally_name` = '', `ally_id`='0' WHERE `ally_id`='" . intval ( $ally['id'] ) . "'" , 'users' );
+				doquery ( "DELETE FROM {{table}} WHERE id='" . intval ( $ally['id'] ) . "' LIMIT 1" , "alliance" );
 
-				exit(header("location:game.". $phpEx . "?page=alliance",2));
+				exit ( header ( "location:game.php?page=alliance" , 2 ) );
 			}
-		// < ----------------------------------------------------------- TRANSFERIR LA ALIANZA ----------------------------------------------------------- >
-			if ($mode == 'admin' && $edit == 'transfer')
+			##############################################################################################
+			# TRANSFERIR LA ALIANZA
+			##############################################################################################
+			if ( $mode == 'admin' && $edit == 'transfer' )
 			{
-				if (isset($_POST['newleader']))
+				if ( isset ( $_POST['newleader'] ) )
 				{
-					doquery("UPDATE {{table}} SET `ally_rank_id`='0' WHERE `id`=".intval($CurrentUser['id'])."", 'users');
-					doquery("UPDATE {{table}} SET `ally_owner`='" . mysql_escape_string(strip_tags($_POST['newleader'])) . "' WHERE `id`=".intval($CurrentUser['ally_id'])."", 'alliance');
-					doquery("UPDATE {{table}} SET `ally_rank_id`='0' WHERE `id`='" . mysql_escape_string(strip_tags($_POST['newleader'])) . "' ", 'users');
-					exit(header("location:game.". $phpEx . "?page=alliance",2));
+					doquery ( "UPDATE {{table}} SET `ally_rank_id`='0' WHERE `id`=" . intval ( $CurrentUser['id'] ) . "", 'users');
+					doquery ( "UPDATE {{table}} SET `ally_owner`='" . mysql_escape_string ( strip_tags ( $_POST['newleader'] ) ) . "' WHERE `id`=" . intval ( $CurrentUser['ally_id'] ) . "" , 'alliance' );
+					doquery ( "UPDATE {{table}} SET `ally_rank_id`='0' WHERE `id`='" . mysql_escape_string ( strip_tags ( $_POST['newleader'] ) ) . "' " , 'users' );
+					exit ( header ( "location:game.php?page=alliance" , 2 ) );
+				}
+				if ( $ally['ally_owner'] != $CurrentUser['id'] )
+				{
+					header ( "location:game.php?page=alliance" , 2 );
 				}
-				if ($ally['ally_owner'] != $CurrentUser['id'])
-					header("location:game.". $phpEx . "?page=alliance",2);
 				else
 				{
-					$listuser 		= doquery("SELECT * FROM {{table}} WHERE ally_id='".intval($CurrentUser['ally_id'])."'", 'users');
+					$listuser 		= doquery ( "SELECT * FROM {{table}} WHERE ally_id='" . intval ( $CurrentUser['ally_id'] ) . "'" , 'users' );
 					$righthand		= $lang;
 
-					while ($u = mysql_fetch_array($listuser))
+					while ( $u = mysql_fetch_array ( $listuser ) )
 					{
-						if ($ally['ally_owner'] != $u['id'])
+						if ( $ally['ally_owner'] != $u['id'] )
 						{
-							if ($u['ally_rank_id'] != 0 )
+							if ( $u['ally_rank_id'] != 0 )
 							{
-								if ($ally_ranks[$u['ally_rank_id']-1]['rechtehand'] == 1)
+								if ( $ally_ranks[$u['ally_rank_id']-1]['rechtehand'] == 1 )
 								{
 									$righthand['righthand'] .= "\n<option value=\"" . $u['id'] . "\"";
 									$righthand['righthand'] .= ">";
@@ -1135,85 +1226,111 @@ public function __construct($CurrentUser)
 								}
 							}
 						}
-						$righthand["dpath"] = $dpath;
+						$righthand["dpath"] = DPATH;
 					}
 
 					$page_list 	   .= parsetemplate(gettemplate('alliance/alliance_admin_transfer_row'), $righthand);
 					$parse['s'] 	= $s;
 					$parse['list'] 	= $page_list;
 
-					display(parsetemplate(gettemplate('alliance/alliance_admin_transfer'), $parse));
+					display ( parsetemplate ( gettemplate ( 'alliance/alliance_admin_transfer' ) , $parse ) );
 				}
 			}
-		// < -------------------------------------------------------- PARTE DEFAULT DE LA ALIANZA -------------------------------------------------------- >
+			##############################################################################################
+			# PARTE DEFAULT DE LA ALIANZA
+			##############################################################################################
 			{
 				// IMAGEN
-				if ($ally['ally_ranks'] != '')
-					$ally['ally_ranks'] = "<tr><td colspan=2><img src=\"{$ally['ally_image']}\"></td></tr>";
+				if ( $ally['ally_ranks'] != '' )
+				{
+					$parse['ally_image']	=	$ally['ally_image'];
+					$ally['ally_ranks']	 	=	parsetemplate ( gettemplate ( 'alliance/alliance_image_row' ) ,  $parse );
+				}
 
 				//RANGOS
-				if ($ally['ally_owner'] == $CurrentUser['id'])
-					$range = ($ally['ally_owner_range'] != '') ? $ally['ally_owner_range'] : $lang['al_founder_rank_text'];
-				elseif ($CurrentUser['ally_rank_id'] != 0 && isset($ally_ranks[$CurrentUser['ally_rank_id']-1]['name']))
-					$range = $ally_ranks[$CurrentUser['ally_rank_id']-1]['name'];
+				if ( $ally['ally_owner'] == $CurrentUser['id'] )
+				{
+					$range	= ( $ally['ally_owner_range'] != '' ) ? $ally['ally_owner_range'] : $lang['al_founder_rank_text'];
+				}
+				elseif ( $CurrentUser['ally_rank_id'] != 0 && isset ( $ally_ranks[$CurrentUser['ally_rank_id']-1]['name'] ) )
+				{
+					$range	= $ally_ranks[$CurrentUser['ally_rank_id']-1]['name'];
+				}
 				else
-					$range = $lang['al_new_member_rank_text'];
+				{
+					$range	= $lang['al_new_member_rank_text'];
+				}
 
 				// LISTA DE MIEMBROS
-				if ($ally['ally_owner'] == $CurrentUser['id'] || $ally_ranks[$CurrentUser['ally_rank_id']-1]['memberlist'] != 0)
-					$lang['members_list'] = " (<a href=\"game.php?page=alliance&mode=memberslist\">".$lang['al_user_list']."</a>)";
+				if ( $ally['ally_owner'] == $CurrentUser['id'] or $ally_ranks[$CurrentUser['ally_rank_id']-1]['memberlist'] != 0 )
+				{
+					$lang['members_list']	= " (<a href=\"game.php?page=alliance&mode=memberslist\">" . $lang['al_user_list'] . "</a>)";
+				}
 				else
-					$lang['members_list'] = '';
+				{
+					$lang['members_list']	= '';
+				}
 
 				// ADMINISTRAR ALIANZA
 				if ($ally['ally_owner'] == $CurrentUser['id'] || $ally_ranks[$CurrentUser['ally_rank_id']-1]['administrieren'] != 0)
-					$lang['alliance_admin'] = " (<a href=\"game.php?page=alliance&mode=admin&edit=ally\">".$lang['al_manage_alliance']."</a>)";
+				{
+					$lang['alliance_admin']	= " (<a href=\"game.php?page=alliance&mode=admin&edit=ally\">" . $lang['al_manage_alliance'] . "</a>)";
+
+				}
 				else
+				{
 					$lang['alliance_admin'] = '';
+				}
 
 				// CORREO CIRCULAR
 				if ($ally['ally_owner'] == $CurrentUser['id'] || $ally_ranks[$CurrentUser['ally_rank_id']-1]['mails'] != 0)
-					$lang['send_circular_mail'] = "<tr><th>".$lang['al_circular_message']."</th><th><a href=\"game.php?page=alliance&mode=circular\">".$lang['al_send_circular_message']."</a></th></tr>";
+				{
+					$lang['send_circular_mail']	= parsetemplate ( gettemplate ( 'alliance/alliance_circular_row' ) , $parse );
+				}
 				else
+				{
 					$lang['send_circular_mail'] = '';
+				}
 
 				// SOLICITUDES
-				$request_count = mysql_num_rows(doquery("SELECT id FROM {{table}} WHERE ally_request='".intval($ally['id'])."'", 'users'));
+				$request_count	= mysql_num_rows ( doquery ( "SELECT id FROM {{table}} WHERE ally_request='" . intval ( $ally['id'] ) . "'" , 'users' ) );
 
-				if ($request_count != 0)
+				if ( $request_count != 0 )
 				{
-					if ($ally['ally_owner'] == $CurrentUser['id'] || $ally_ranks[$CurrentUser['ally_rank_id']-1]['bewerbungen'] != 0)
-						$lang['requests'] = "<tr><th>".$lang['al_requests']."</th><th><a href=\"game.php?page=alliance&mode=admin&edit=requests\">{$request_count} ".$lang['al_new_requests']."</a></th></tr>";
+					if ( $ally['ally_owner'] == $CurrentUser['id'] or $ally_ranks[$CurrentUser['ally_rank_id']-1]['bewerbungen'] != 0 )
+					{
+						$parse['request_count']	=	$request_count;
+						$lang['requests'] 		=	parsetemplate ( gettemplate ( 'alliance/alliance_requests_row' ) , $parse );
+					}
 				}
 				// SALIR DE LA ALIANZA
-				if ($ally['ally_owner'] != $CurrentUser['id'])
+				if ( $ally['ally_owner'] != $CurrentUser['id'] )
 				{
-					$lang['ally_owner'] .= "<table width=\"519\">";
-					$lang['ally_owner'] .= "<tr><td class=\"c\">".$lang['al_leave_alliance']."</td>";
-					$lang['ally_owner'] .= "</tr><tr>";
-					$lang['ally_owner'] .= "<th><input type=\"button\" onclick=\"javascript:location.href='game.php?page=alliance&mode=exit';\" value=\"".$lang['al_continue']."\"/></th>";
-					$lang['ally_owner'] .= "</tr></table>";
+					$lang['ally_owner']		= parsetemplate ( gettemplate ( 'alliance/alliance_abandon_alliance' ) , $parse );
 				}
 				else
-					$lang['ally_owner'] .= '';
+				{
+					$lang['ally_owner']		= '';
+				}
 
-				// IMAGEN DEL LOGO
-				$lang['ally_image'] 		= ($ally['ally_image'] != '')?"<tr><th colspan=2><img src=\"{$ally['ally_image']}\"></td></tr>":'';
+				// INFORMACIÓN RESTANTE
+				$lang['ally_image'] 		= ( $ally['ally_image'] != '' ) ? "<tr><th colspan=2><img src=\"{$ally['ally_image']}\"></td></tr>" : '';
 				$lang['range'] 				= $range;
-
-				$lang['ally_description'] 	= nl2br($this->bbcode($ally['ally_description']));
-				$lang['ally_text'] 			= nl2br($this->bbcode($ally['ally_text']));
-
+				$lang['ally_description'] 	= nl2br($this->bbCode($ally['ally_description']));
+				$lang['ally_text'] 			= nl2br($this->bbCode($ally['ally_text']));
 				if($ally['ally_web'] != '')
+				{
 					$lang['ally_web'] 		= str_replace ( "http://" , "" , $ally['ally_web'] );
+				}
 				else
+				{
 					$lang['ally_web']		= "-";
-
+				}
 				$lang['ally_tag'] 			= $ally['ally_tag'];
 				$lang['ally_members'] 		= $ally['ally_members'];
 				$lang['ally_name'] 			= $ally['ally_name'];
 
-				display(parsetemplate(gettemplate('alliance/alliance_frontpage'), $lang));
+				display ( parsetemplate ( gettemplate ( 'alliance/alliance_frontpage' ) , $lang ) );
 			}
 		}
 	}
diff --git a/includes/pages/class.ShowBannedPage.php b/includes/pages/class.ShowBannedPage.php
new file mode 100644
index 0000000..150fdac
--- /dev/null
+++ b/includes/pages/class.ShowBannedPage.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+if(!defined('INSIDE')){ die(header("location:../../"));}
+
+class ShowBannedPage
+{
+	function ShowBannedPage()
+	{
+		global $lang;
+
+		$parse	= $lang;
+		$query	= doquery ( "SELECT * FROM {{table}} ORDER BY `id`;" , 'banned' );
+
+		$i 				= 0;
+		$subTemplate	= gettemplate ( 'banned/banned_row' );
+
+		while ( $u = mysql_fetch_array ( $query ) )
+		{
+			$parse['player']	= $u[1];
+			$parse['reason']	= $u[2];
+			$parse['since']		= date ( "d/m/Y G:i:s" , $u[4] );
+			$parse['until']		= date ( "d/m/Y G:i:s" , $u[5] );
+			$parse['by']		= $u[6];
+
+			$i++;
+
+			$body .= parsetemplate ( $subTemplate , $parse );
+		}
+
+		if ( $i == 0 )
+		{
+			$parse['banned_msg']	.= $lang['bn_no_players_banned'];
+		}
+		else
+		{
+			$parse['banned_msg']	.= $lang['bn_exists'] . $i . $lang['bn_players_banned'];
+		}
+
+		$parse['banned_players']	= $body;
+
+		display ( parsetemplate ( gettemplate ( 'banned/banned_body' ) , $parse ) );
+	}
+}
+?>
\ No newline at end of file
diff --git a/includes/pages/class.ShowBuddyPage.php b/includes/pages/class.ShowBuddyPage.php
new file mode 100644
index 0000000..56b20a7
--- /dev/null
+++ b/includes/pages/class.ShowBuddyPage.php
@@ -0,0 +1,215 @@
+<?php
+
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+if(!defined('INSIDE')){ die(header("location:../../"));}
+
+class ShowBuddyPage
+{
+	function __construct ( $CurrentUser )
+	{
+		global $lang;
+
+		$mode	= intval ( $_GET['mode'] );
+		$bid	= intval ( $_GET['bid'] );
+		$sm		= intval ( $_GET['sm'] );
+		$user	= intval ( $_GET['u'] );
+		$parse	= $lang;
+
+		switch ( $mode )
+		{
+			case 1:
+
+				switch ( $sm )
+				{
+					// REJECT / CANCEL
+					case 1:
+
+						$senderID = doquery ( "SELECT * FROM {{table}} WHERE `id`='" . intval ( $bid ) . "'" , "buddy" , TRUE );
+
+						if ( $senderID['active'] == 0 )
+						{
+							if ( $senderID['sender'] != $CurrentUser['id'] )
+							{
+								SendSimpleMessage ( $senderID['sender'] , $CurrentUser['id'] , '' , 1 , $CurrentUser['username'] , $lang['bu_rejected_title'] , str_replace ( '%u' , $CurrentUser['username'] , $lang['bu_rejected_text'] ) );
+							}
+							elseif ( $senderID['sender'] == $CurrentUser['id'] )
+							{
+								SendSimpleMessage ( $senderID['owner'] , $CurrentUser['id'] , '' , 1 , $CurrentUser['username'] , $lang['bu_rejected_title'] , str_replace ( '%u' , $CurrentUser['username'] , $lang['bu_rejected_title'] ) );
+							}
+						}
+						else
+						{
+							if ( $senderID['sender'] != $CurrentUser['id'] )
+							{
+								SendSimpleMessage ( $senderID['sender'] , $CurrentUser['id'] , '' , 1 , $CurrentUser['username'] , $lang['bu_deleted_title'] , str_replace ( '%u' , $CurrentUser['username'] , $lang['bu_deleted_text'] ) );
+							}
+							elseif ( $senderID['sender'] == $CurrentUser['id'] )
+							{
+								SendSimpleMessage ( $senderID['owner'] , $CurrentUser['id'] , '' , 1 , $CurrentUser['username'] , $lang['bu_deleted_title'] , str_replace ( '%u' , $CurrentUser['username'] , $lang['bu_deleted_text'] ) );
+							}
+						}
+
+						doquery ( "DELETE FROM {{table}} WHERE `id`='" . intval ( $bid ) . "' AND (`owner`='" . $CurrentUser['id'] . "' OR `sender`='" . $CurrentUser['id'] . "') " , "buddy" );
+
+						header("location:game.php?page=buddy");
+
+						break;
+
+						// ACCEPT
+					case 2:
+
+						$senderID = doquery ( "SELECT * FROM {{table}} WHERE `id`='" . intval ( $bid ) . "'" , "buddy" , TRUE );
+
+						SendSimpleMessage ( $senderID['sender'] , $CurrentUser['id'] , '' , 1 , $CurrentUser['username'] , $lang['bu_accepted_title'] , str_replace ( '%u' , $CurrentUser['username'] , $lang['bu_accepted_text'] ) );
+
+						doquery ( "UPDATE {{table}} SET `active` = '1' WHERE `id` ='" . intval ( $bid ) . "' AND `owner`='" . $CurrentUser['id'] . "'" , "buddy" );
+
+						header("location:game.php?page=buddy");
+
+						break;
+
+						// SEND REQUEST
+					case 3:
+
+						$query = doquery ( "SELECT `id` FROM {{table}} WHERE (`owner`='" . intval ( $CurrentUser[id] ) . "' AND `sender`='" . intval ( $_POST['user'] ) . "') OR (`owner`='" . intval ( $_POST['user'] ) . "' AND `sender`='" . intval( $CurrentUser[id] ) . "')" , "buddy" , TRUE );
+
+						if ( !$query )
+						{
+
+							$text = mysql_escape_string ( strip_tags ( $_POST['text'] ) );
+
+							SendSimpleMessage ( intval ( $_POST['user'] ) , $CurrentUser['id'] , '' , 1 , $CurrentUser['username'] , $lang['bu_to_accept_title'] , str_replace ( '%u' , $CurrentUser['username'] , $lang['bu_to_accept_text'] ) );
+
+							doquery ( "INSERT INTO {{table}} SET `sender`='" . intval ( $CurrentUser[id] ) . "', `owner`='" . intval ( $_POST['user'] ) . "', `active`='0', `text`='" . $text . "'" , "buddy" );
+
+							header("location:game.php?page=buddy");
+						}
+						else
+						{
+							message ( $lang['bu_request_exists'] , 'game.php?page=buddy' , 2 );
+						}
+
+						break;
+						// ANY OTHER OPTION EXIT
+					default:
+
+						header("location:game.php?page=buddy");
+
+						break;
+				}
+
+				break;
+
+				// FRIENDSHIP REQUEST
+			case 2:
+
+				// IF USER = REQUESTED USER, SHOW ERROR.
+				if ( $user == $CurrentUser['id'] )
+				{
+					message ( $lang['bu_cannot_request_yourself'] , 'game.php?page=buddy' , 2 );
+				}
+				else
+				{
+					// SEARCH THE PLAYER
+					$player				= doquery ( "SELECT `username` FROM {{table}} WHERE `id`='" . intval ( $user ) . "'" , "users" , TRUE );
+
+					// IF PLAYER EXISTS, PROCEED
+					if ( $player )
+					{
+						$parse['user']		= $user;
+						$parse['player']	= $player['username'];
+
+						display ( parsetemplate( gettemplate ( 'buddy/buddy_request' ) , $parse ) );
+					}
+					else // EXIT
+					{
+						header("location:game.php?page=buddy");
+					}
+				}
+
+				break;
+
+				// NOTHING SELECTED
+			default:
+
+				$getBuddys 		= doquery ( "SELECT * FROM {{table}} WHERE `sender`='" . intval ( $CurrentUser[id] ) . "' OR `owner`='" . intval ( $CurrentUser[id] ) . "'" , "buddy" );
+				$subTemplate	= gettemplate ( 'buddy/buddy_row' );
+
+				while ( $buddy = mysql_fetch_assoc ( $getBuddys ) )
+				{
+					if ( $buddy['active'] == 0 )
+					{
+						if ( $buddy['sender'] == $CurrentUser['id'] )
+						{
+							$owner = doquery ( "SELECT `id`, `username`, `galaxy`, `system`, `planet`,`ally_id`, `ally_name` FROM {{table}} WHERE `id`='" . intval ( $buddy[owner] ) . "'" , "users" , TRUE );
+
+							$parse['id']				= $owner['id'];
+							$parse['username']			= $owner['username'];
+							$parse['ally_id']			= $owner['ally_id'];
+							$parse['ally_name']			= $owner['ally_name'];
+							$parse['galaxy']			= $owner['galaxy'];
+							$parse['system']			= $owner['system'];
+							$parse['planet']			= $owner['planet'];
+							$parse['text']				= $buddy['text'];
+							$parse['action']			= '<a href="game.php?page=buddy&mode=1&sm=1&bid=' . $buddy[id] . '">' . $lang['bu_cancel_request'] . '</a>';
+
+							$requestsSended .= parsetemplate ( $subTemplate , $parse );
+						}
+						else
+						{
+							$sender	= doquery ( "SELECT `id`, `username`, `galaxy`, `system`, `planet`,`ally_id`, `ally_name` FROM {{table}} WHERE `id`='" . intval ( $buddy[sender] ) . "'" , "users" , TRUE );
+
+							$parse['id']				= $sender['id'];
+							$parse['username']			= $sender['username'];
+							$parse['ally_id']			= $sender['ally_id'];
+							$parse['ally_name']			= $sender['ally_name'];
+							$parse['galaxy']			= $sender['galaxy'];
+							$parse['system']			= $sender['system'];
+							$parse['planet']			= $sender['planet'];
+							$parse['text']				= $buddy['text'];
+							$parse['action']			= '<a href="game.php?page=buddy&mode=1&sm=2&bid=' . $buddy[id] . '">' . $lang['bu_accept'] . '</a><br /><a href="game.php?page=buddy&mode=1&sm=1&bid=' . $buddy[id] . '">' . $lang['bu_decline'] . '</a>';
+
+							$requestsReceived .= parsetemplate ( $subTemplate , $parse );
+						}
+					}
+					else
+					{
+						if ( $buddy['sender'] == $CurrentUser['id'] )
+						{
+							$owner = doquery ( "SELECT `id`, `username`, `onlinetime`, `galaxy`, `system`, `planet`,`ally_id`, `ally_name` FROM {{table}} WHERE `id`='" . intval ( $buddy[owner] ) . "'" , "users" , TRUE );
+						}
+						else
+						{
+							$owner = doquery ( "SELECT `id`, `username`, `onlinetime`, `galaxy`, `system`, `planet`,`ally_id`, `ally_name` FROM {{table}} WHERE `id`='" . intval ( $buddy[sender] ) . "'" , "users" , TRUE );
+						}
+
+						$parse['id']				= $owner['id'];
+						$parse['username']			= $owner['username'];
+						$parse['ally_id']			= $owner['ally_id'];
+						$parse['ally_name']			= $owner['ally_name'];
+						$parse['galaxy']			= $owner['galaxy'];
+						$parse['system']			= $owner['system'];
+						$parse['planet']			= $owner['planet'];
+						$parse['text']				= '<font color="' . ( ( $owner["onlinetime"] + 60 * 10 >= time() ) ? 'lime">' . $lang['bu_connected'] . "" : ( ( $owner["onlinetime"] + 60 * 15 >= time() )? 'yellow">' . $lang['bu_fifteen_minutes'] : 'red">' . $lang['bu_disconnected'] ) ) . '</font>';
+						$parse['action']			= '<a href="game.php?page=buddy&mode=1&sm=1&bid=' . $buddy[id] . '">' . $lang['bu_delete'] . '</a>';
+
+						$budys .= parsetemplate ( $subTemplate , $parse );
+					}
+				}
+
+				$parse['request_received']	= $requestsSended;
+				$parse['request_sended']	= $requestsReceived;
+				$parse['buddys']			= $budys;
+
+				display ( parsetemplate( gettemplate ( 'buddy/buddy_body' ) , $parse ) );
+
+				break;
+		}
+	}
+}
+?>
\ No newline at end of file
diff --git a/includes/pages/class.ShowBuildingsPage.php b/includes/pages/class.ShowBuildingsPage.php
index 0310140..9f482da 100644
--- a/includes/pages/class.ShowBuildingsPage.php
+++ b/includes/pages/class.ShowBuildingsPage.php
@@ -1,23 +1,10 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
@@ -54,32 +41,35 @@ private function CancelBuildingFromQueue (&$CurrentPlanet, &$CurrentUser)
 				for ($ID = 0; $ID < $NewCount ; $ID++ )
 				{
 					$ListIDArray          = explode ( ",", $QueueArray[$ID] );
+					if($ListIDArray[0] == $Element)
+						$ListIDArray[1] -= 1;
+
 					$BuildEndTime        += $ListIDArray[2];
 					$ListIDArray[3]       = $BuildEndTime;
 					$QueueArray[$ID]      = implode ( ",", $ListIDArray );
 				}
 				$NewQueue        = implode(";", $QueueArray );
-				$ReturnValue     = true;
+				$ReturnValue     = TRUE;
 				$BuildEndTime    = '0';
 			}
 			else
 			{
 				$NewQueue        = '0';
-				$ReturnValue     = false;
+				$ReturnValue     = FALSE;
 				$BuildEndTime    = '0';
 			}
 
 			if ($BuildMode == 'destroy')
 			{
-				$ForDestroy = true;
+				$ForDestroy = TRUE;
 			}
 			else
 			{
-				$ForDestroy = false;
+				$ForDestroy = FALSE;
 			}
 
-			if ( $Element != false ) {
-			$Needed                        = GetBuildingPrice ($CurrentUser, $CurrentPlanet, $Element, true, $ForDestroy);
+			if ( $Element != FALSE ) {
+			$Needed                        = GetBuildingPrice ($CurrentUser, $CurrentPlanet, $Element, TRUE, $ForDestroy);
 			$CurrentPlanet['metal']       += $Needed['metal'];
 			$CurrentPlanet['crystal']     += $Needed['crystal'];
 			$CurrentPlanet['deuterium']   += $Needed['deuterium'];
@@ -90,7 +80,7 @@ private function CancelBuildingFromQueue (&$CurrentPlanet, &$CurrentUser)
 		{
 			$NewQueue          = '0';
 			$BuildEndTime      = '0';
-			$ReturnValue       = false;
+			$ReturnValue       = FALSE;
 		}
 
 		$CurrentPlanet['b_building_id']  = $NewQueue;
@@ -104,28 +94,55 @@ private function RemoveBuildingFromQueue ( &$CurrentPlanet, $CurrentUser, $Queue
 		if ($QueueID > 1)
 		{
 			$CurrentQueue  = $CurrentPlanet['b_building_id'];
-			if ($CurrentQueue != 0)
-			{
-				$QueueArray    = explode ( ";", $CurrentQueue );
-				$ActualCount   = count ( $QueueArray );
-				$ListIDArray   = explode ( ",", $QueueArray[$QueueID - 2] );
-				$BuildEndTime  = $ListIDArray[3];
-				for ($ID = $QueueID; $ID < $ActualCount; $ID++ )
+
+			if (!empty($CurrentQueue))
+            {
+                $QueueArray    = explode ( ";", $CurrentQueue );
+                $ActualCount   = count ( $QueueArray );
+                if ($ActualCount< 2)
+                   die(header("location:game.php?page=buildings"));
+
+				//  finding the buildings time
+				$ListIDArrayToDelete   = explode ( ",", $QueueArray[$QueueID - 1] );
+				$lastB	= $ListIDArrayToDelete;
+				$lastID	= $QueueID-1;
+
+				//search for biggest element
+				for ( $ID = $QueueID; $ID < $ActualCount; $ID++ )
 				{
-					$ListIDArray          = explode ( ",", $QueueArray[$ID] );
-					$BuildEndTime        += $ListIDArray[2];
-					$ListIDArray[3]       = $BuildEndTime;
-					$QueueArray[$ID - 1]  = implode ( ",", $ListIDArray );
+					//next buildings
+					$nextListIDArray     = explode ( ",", $QueueArray[$ID] );
+					//if same type of element
+					if($nextListIDArray[0] == $ListIDArrayToDelete[0])
+					{
+						$lastB=$nextListIDArray;
+						$lastID=$ID;
+					}
 				}
+
+				// update the rest of buildings queue
+				for( $ID=$lastID; $ID < $ActualCount-1; $ID++ )
+				{
+
+					$nextListIDArray		= explode ( ",", $QueueArray[$ID+1] );
+					$nextBuildEndTime    	= $nextListIDArray[3]-$lastB[2];
+					$nextListIDArray[3]  	= $nextBuildEndTime;
+					$QueueArray[$ID] 		= implode ( ",", $nextListIDArray );
+				}
+
 				unset ($QueueArray[$ActualCount - 1]);
 				$NewQueue     = implode ( ";", $QueueArray );
 			}
+
 			$CurrentPlanet['b_building_id'] = $NewQueue;
+
 		}
+
 		return $QueueID;
+
 	}
 
-	private function AddBuildingToQueue (&$CurrentPlanet, $CurrentUser, $Element, $AddMode = true)
+	private function AddBuildingToQueue (&$CurrentPlanet, $CurrentUser, $Element, $AddMode = TRUE)
 	{
 		global $resource;
 
@@ -148,7 +165,7 @@ private function AddBuildingToQueue (&$CurrentPlanet, $CurrentUser, $Element, $A
 			$ActualCount   = 0;
 		}
 
-		if ($AddMode == true)
+		if ($AddMode == TRUE)
 		{
 			$BuildMode = 'build';
 		}
@@ -163,10 +180,10 @@ private function AddBuildingToQueue (&$CurrentPlanet, $CurrentUser, $Element, $A
 		}
 		else
 		{
-			$QueueID      = false;
+			$QueueID      = FALSE;
 		}
 
-		if ( $QueueID != false && IsElementBuyable ($CurrentUser, $CurrentPlanet, $Element, true, false) && IsTechnologieAccessible($CurrentUser, $CurrentPlanet, $Element) )
+		if ( $QueueID != FALSE && IsElementBuyable ($CurrentUser, $CurrentPlanet, $Element, TRUE, FALSE) && IsTechnologieAccessible($CurrentUser, $CurrentPlanet, $Element) )
 		{
 			if ($QueueID > 1)
 			{
@@ -188,7 +205,7 @@ private function AddBuildingToQueue (&$CurrentPlanet, $CurrentUser, $Element, $A
 			if ($InArray != 0)
 			{
 				$ActualLevel  = $CurrentPlanet[$resource[$Element]];
-				if ($AddMode == true)
+				if ($AddMode == TRUE)
 				{
 					$BuildLevel   = $ActualLevel + 1 + $InArray;
 					$CurrentPlanet[$resource[$Element]] += $InArray;
@@ -206,7 +223,7 @@ private function AddBuildingToQueue (&$CurrentPlanet, $CurrentUser, $Element, $A
 			else
 			{
 				$ActualLevel  = $CurrentPlanet[$resource[$Element]];
-				if ($AddMode == true)
+				if ($AddMode == TRUE)
 				{
 					$BuildLevel   = $ActualLevel + 1;
 					$BuildTime    = GetBuildingTime($CurrentUser, $CurrentPlanet, $Element);
@@ -235,7 +252,7 @@ private function AddBuildingToQueue (&$CurrentPlanet, $CurrentUser, $Element, $A
 		return $QueueID;
 	}
 
-	private function ShowBuildingQueue ( $CurrentPlanet, $CurrentUser )
+	private function ShowBuildingQueue ( $CurrentPlanet, $CurrentUser, &$Sprice = FALSE )
 	{
 		global $lang;
 
@@ -270,6 +287,10 @@ private function ShowBuildingQueue ( $CurrentPlanet, $CurrentUser )
 					$BuildMode    = $BuildArray[4];
 					$BuildTime    = $BuildEndTime - time();
 					$ElementTitle = $lang['tech'][$Element];
+					// START FIX BY JSTAR
+					if ( $Sprice !== FALSE && $BuildLevel > $Sprice[$Element] )
+						$Sprice[$Element]	=	$BuildLevel;
+					// END FIX BY JSTAR
 
 					if ($ListID > 0)
 					{
@@ -298,6 +319,9 @@ private function ShowBuildingQueue ( $CurrentPlanet, $CurrentUser )
 							$ListIDRow .= "		<strong color=\"lime\"><br><font color=\"lime\">". date("j/m H:i:s" ,$BuildEndTime) ."</font></strong>";
 						}
 						else
+
+
+
 						{
 							$ListIDRow .= "		<font color=\"red\">";
 							$ListIDRow .= "		<a href=\"game.php?page=buildings&listid=". $ListID ."&amp;cmd=remove&amp;planet=". $PlanetID ."\">".$lang['bd_cancel']."</a></font>";
@@ -317,21 +341,22 @@ private function ShowBuildingQueue ( $CurrentPlanet, $CurrentUser )
 
 	public function __construct (&$CurrentPlanet, $CurrentUser)
 	{
-		global $ProdGrid, $lang, $resource, $reslist, $phpEx, $dpath, $game_config, $_GET, $xgp_root;
+		global $ProdGrid, $lang, $resource, $reslist, $_GET;
 
-		include_once($xgp_root . 'includes/functions/IsTechnologieAccessible.' . $phpEx);
-		include_once($xgp_root . 'includes/functions/GetElementPrice.' . $phpEx);
-		include_once($xgp_root . 'includes/functions/GetRestPrice.' . $phpEx);
+		include_once(XGP_ROOT . 'includes/functions/IsTechnologieAccessible.php');
+		include_once(XGP_ROOT . 'includes/functions/GetElementPrice.php');
+		include_once(XGP_ROOT . 'includes/functions/CheckPlanetUsedFields.php');
 
 		CheckPlanetUsedFields ( $CurrentPlanet );
 
 		$parse			= $lang;
-		$Allowed['1'] 	= array(  1,  2,  3,  4, 12, 14, 15, 21, 22, 23, 24, 31, 33, 34, 35, 44, 45);
+		$Allowed['1'] 	= array(  1,  2,  3,  4, 12, 14, 15, 21, 22, 23, 24, 31, 33, 34, 44);
 		$Allowed['3'] 	= array( 12, 14, 21, 22, 23, 24, 34, 41, 42, 43);
 
+
 		if (isset($_GET['cmd']))
 		{
-			$bDoItNow 	= false;
+			$bDoItNow 	= FALSE;
 			$TheCommand = $_GET['cmd'];
 			$Element 	= $_GET['building'];
 			$ListID 	= $_GET['listid'];
@@ -354,7 +379,7 @@ public function __construct (&$CurrentPlanet, $CurrentUser)
 				{
 					if (in_array( trim($Element), $Allowed[$CurrentPlanet['planet_type']]))
 					{
-						$bDoItNow = true;
+						$bDoItNow = TRUE;
 					}
 				}
 				else
@@ -364,20 +389,20 @@ public function __construct (&$CurrentPlanet, $CurrentUser)
 			}
 			elseif ( isset ( $ListID ))
 			{
-				$bDoItNow = true;
+				$bDoItNow = TRUE;
 			}
 
 			if ($Element == 31 && $CurrentUser["b_tech_planet"] != 0)
 			{
-				$bDoItNow = false;
+				$bDoItNow = FALSE;
 			}
 
 			if ( ( $Element == 21 or $Element == 14 or $Element == 15 ) && $CurrentPlanet["b_hangar"] != 0)
 			{
-				$bDoItNow = false;
+				$bDoItNow = FALSE;
 			}
 
-			if ($bDoItNow == true)
+			if ($bDoItNow == TRUE)
 			{
 				switch($TheCommand)
 				{
@@ -388,10 +413,10 @@ public function __construct (&$CurrentPlanet, $CurrentUser)
 						$this->RemoveBuildingFromQueue ($CurrentPlanet, $CurrentUser, $ListID);
 					break;
 					case 'insert':
-						$this->AddBuildingToQueue ($CurrentPlanet, $CurrentUser, $Element, true);
+						$this->AddBuildingToQueue ($CurrentPlanet, $CurrentUser, $Element, TRUE);
 					break;
 					case 'destroy':
-						$this->AddBuildingToQueue ($CurrentPlanet, $CurrentUser, $Element, false);
+						$this->AddBuildingToQueue ($CurrentPlanet, $CurrentUser, $Element, FALSE);
 					break;
 				}
 			}
@@ -407,16 +432,20 @@ public function __construct (&$CurrentPlanet, $CurrentUser)
 		}
 
 		SetNextQueueElementOnTop($CurrentPlanet, $CurrentUser);
-		$Queue = $this->ShowBuildingQueue($CurrentPlanet, $CurrentUser);
+		// $Queue = $this->ShowBuildingQueue($CurrentPlanet, $CurrentUser); // OLD CODE
+		// START FIX BY JSTAR
+		$Sprice	=	array();
+		$Queue 	= 	$this->ShowBuildingQueue($CurrentPlanet, $CurrentUser, $Sprice);
+		// END FIX BY JSTAR
 		$this->BuildingSavePlanetRecord($CurrentPlanet);
 
 		if ($Queue['lenght'] < (MAX_BUILDING_QUEUE_SIZE))
 		{
-			$CanBuildElement = true;
+			$CanBuildElement = TRUE;
 		}
 		else
 		{
-			$CanBuildElement = false;
+			$CanBuildElement = FALSE;
 		}
 
 		$BuildingPage        = "";
@@ -429,64 +458,40 @@ public function __construct (&$CurrentPlanet, $CurrentUser)
 				$CurrentMaxFields      = CalculateMaxPlanetFields($CurrentPlanet);
 				if ($CurrentPlanet["field_current"] < ($CurrentMaxFields - $Queue['lenght']))
 				{
-					$RoomIsOk = true;
+					$RoomIsOk = TRUE;
 				}
 				else
 				{
-					$RoomIsOk = false;
+					$RoomIsOk = FALSE;
 				}
 
 				if (IsTechnologieAccessible($CurrentUser, $CurrentPlanet, $Element))
 				{
-					$HaveRessources        	= IsElementBuyable ($CurrentUser, $CurrentPlanet, $Element, true, false);
+
+					$HaveRessources        	= IsElementBuyable ($CurrentUser, $CurrentPlanet, $Element, TRUE, FALSE);
 					$parse                 	= array();
 					$parse 					= $lang;
-					$parse['dpath']        	= $dpath;
+					$parse['dpath']        	= DPATH;
 					$parse['i']            	= $Element;
 					$BuildingLevel         	= $CurrentPlanet[$resource[$Element]];
 					$parse['nivel']        	= ($BuildingLevel == 0) ? "" : " (". $lang['bd_lvl'] . " " . $BuildingLevel .")";
 					$parse['n']            	= $ElementName;
 					$parse['descriptions'] 	= $lang['res']['descriptions'][$Element];
+/* OLD CODE ---------------------------------------------------- OLD CODE ------------------------------------- //
 					$ElementBuildTime      	= GetBuildingTime($CurrentUser, $CurrentPlanet, $Element);
 					$parse['time']         	= ShowBuildTime($ElementBuildTime);
 					$parse['price']        	= GetElementPrice($CurrentUser, $CurrentPlanet, $Element);
-				    $parse['rest_price']    = GetRestPrice($CurrentUser, $CurrentPlanet, $Element);
+   OLD CODE ---------------------------------------------------- OLD CODE ------------------------------------- //
+*/
+					// START FIX BY JSTAR
+					$really_lvl 			= ( isset ( $Sprice[$Element] ) ) ? $Sprice[$Element]:$BuildingLevel;
+					$ElementBuildTime 		= GetBuildingTime ( $CurrentUser , $CurrentPlanet , $Element , $really_lvl );
+					$parse['price'] 		= GetElementPrice ( $CurrentUser , $CurrentPlanet , $Element , TRUE , $really_lvl );
+					$parse['time'] 			= ShowBuildTime ( $ElementBuildTime );
+					// END FIX BY JSTAR
+
 					$parse['click']        	= '';
 					$NextBuildLevel        	= $CurrentPlanet[$resource[$Element]] + 1;
-					
-					
-// Ïîêàç êîë-âà ïîòðà÷åíîé/äîáîàâëÿåìîé ýíåðãèè START
-$parse['nivel']            = ($BuildingLevel == 0) ? "" : " (". $lang['bd_lvl'] . " " . $BuildingLevel .")"; 
-                    $BuildLevelFactor     = 10;
-                    $BuildTemp            = $CurrentPlanet[ 'temp_max' ];
-                    $CurrentBuildtLvl     = $BuildingLevel;
-                    $BuildLevel           = ($CurrentBuildtLvl > 0) ? $CurrentBuildtLvl : 1;
-                    $EnergyTechLevel      = $CurrentUser["energy_tech"];
-                    $Prod[4]         = (floor(eval($ProdGrid[$Element]['formule']['energy'])    
-                                        * $game_config['resource_multiplier']) * (1 + ($CurrentUser['rpg_ingenieur'] * 0.05)));
-                    $ActualNeed     = floor($Prod[4]);
-                    $BuildLevel++;
-                    $Prod[4]         = (floor(eval($ProdGrid[$Element]['formule']['energy'])    
-                                        * $game_config['resource_multiplier']) * (1 + ($CurrentUser['rpg_ingenieur'] * 0.05)));
-                                        
-                    $EnergyNeed = colorNumber( pretty_number(floor($Prod[4] - $ActualNeed)) );           
-                    if ($Element >= 1 && $Element <= 3) {
-                         $parse['energia'] = "("."<font color=#FF0000>". $EnergyNeed." ".$lang['Energy']."</font>".")";
-                         $BuildLevel = 0;
-                    }elseif ($Element == 4 || $Element == 12) {
-                         $parse['energia'] = "("."<font color=#00FF00>+". $EnergyNeed." ".$lang['Energy']."</font>".")";
-                         $BuildLevel = 0;
-                    }
-                                  
-// Ïîêàç êîë-âà ïîòðà÷åíîé/äîáîàâëÿåìîé ýíåðãèè END
-
-					// Êîëè÷åñòâî ïîëåé:  Îñòàòîê ïîëåé/Îáùåå Êîëè÷åñòâî ïîëåé START
-
-         			$parse['planet_field_current']  = $CurrentPlanet['field_current'];
-			        $parse['planet_field_max'] 		= CalculateMaxPlanetFields($CurrentPlanet);
-                    $parse['field_libre']           = $parse['planet_field_max']  - $CurrentPlanet['field_current'];
-
-					// Êîëè÷åñòâî ïîëåé:  Îñòàòîê ïîëåé/Îáùåå Êîëè÷åñòâî ïîëåé END
 
 					if ($RoomIsOk && $CanBuildElement)
 					{
@@ -494,45 +499,43 @@ public function __construct (&$CurrentPlanet, $CurrentUser)
 						{
 							if ($NextBuildLevel == 1)
 							{
-								if ( $HaveRessources == true )
-
-								$parse['click'] = "<form action='game.php?page=buildings&cmd=insert&building=". $Element ."' method='post'><input type='submit' style='width:100px;color:lime;font-weight:bold;' value=' ".$lang['bd_build']."'></form>";
-
+								if ( $HaveRessources == TRUE )
+									$parse['click'] = "<a href=\"game.php?page=buildings&cmd=insert&building=". $Element ."\"><font color=#00FF00>".$lang['bd_build']."</font></a>";
 								else
-								    $parse['click'] = "<form action='' method='post'><input type='submit' style='width:100px;color:red;font-weight:bold;' value=' ".$lang['bd_build']."'></form>";
-
-									}
+									$parse['click'] = "<font color=#FF0000>".$lang['bd_build']."</font>";
+							}
 							else
 							{
-								if ( $HaveRessources == true )
-							    	$parse['click'] = "<form action='game.php?page=buildings&cmd=insert&building=". $Element ."' method='post'><input type='submit' style='width:100px;color:lime;font-weight:bold;' value=' ". $lang['bd_build_next_level'] ."'></form>";
+								if ( $HaveRessources == TRUE )
+									$parse['click'] = "<a href=\"game.php?page=buildings&cmd=insert&building=". $Element ."\"><font color=#00FF00>". $lang['bd_build_next_level'] . $NextBuildLevel ."</font></a>";
 								else
-							    	$parse['click'] = "<form action='' method='post'><input type='submit' style='width:100px;color:red;font-weight:bold;' value=' ". $lang['bd_build_next_level'] ."'></form>";
-									}
+									$parse['click'] = "<font color=#FF0000>". $lang['bd_build_next_level'] . $NextBuildLevel ."</font>";
+							}
 						}
 						else
 						{
-					    	$parse['click'] = "<form action='game.php?page=buildings&cmd=insert&building=". $Element ."' method='post'><input type='submit' style='width:100px;color:lime;font-weight:bold;' value=' ".$lang['bd_add_to_list']."'></form>";
-							}
+							$parse['click'] = "<a href=\"game.php?page=buildings&cmd=insert&building=". $Element ."\"><font color=#00FF00>".$lang['bd_add_to_list']."</font></a>";
+						}
 					}
 					elseif ($RoomIsOk && !$CanBuildElement)
 					{
 						if ($NextBuildLevel == 1)
-						    $parse['click'] = "<form action='' method='post'><input type='submit' style='width:100px;color:red;font-weight:bold;' value=' ".$lang['bd_build'] ."'></form>";
-							else
-					    	$parse['click'] = "<form action='' method='post'><input type='submit' style='width:100px;color:red;font-weight:bold;' value=' ". $lang['bd_build_next_level'] ."'></form>";
-							}
+							$parse['click'] = "<font color=#FF0000>".$lang['bd_build']."</font>";
+						else
+							$parse['click'] = "<font color=#FF0000>". $lang['bd_build_next_level'] . $NextBuildLevel ."</font>";
+					}
 					else
-						$parse['click'] = "<form action='' method='post'><input type='submit' style='width:100px;color:red;font-weight:bold;' value=' ".$lang['bd_no_more_fields'] ."'></form>";
+						$parse['click'] = "<font color=#FF0000>".$lang['bd_no_more_fields']."</font>";
+
 					if ($Element == 31 && $CurrentUser["b_tech_planet"] != 0)
 					{
-						$parse['click'] = "<form action='' method='post'><input type='submit' style='width:100px;color:red;font-weight:bold;' value=' ".$lang['bd_working'] ."'></form>";
-						}
+						$parse['click'] = "<font color=#FF0000>".$lang['bd_working']."</font>";
+					}
 
 					if ( ( $Element == 21 or $Element == 14 or $Element == 15 ) && $CurrentPlanet["b_hangar"] != 0)
 					{
-						$parse['click'] = "<form action='' method='post'><input type='submit' style='width:100px;color:red;font-weight:bold;' value=' ".$lang['bd_working'] ."'></form>";
-						}
+						$parse['click'] = "<font color=#FF0000>".$lang['bd_working']."</font>";
+					}
 
 					$BuildingPage .= parsetemplate(gettemplate('buildings/buildings_builds_row'), $parse);
 				}
@@ -541,7 +544,7 @@ public function __construct (&$CurrentPlanet, $CurrentUser)
 
 		if ($Queue['lenght'] > 0)
 		{
-			include($xgp_root . 'includes/functions/InsertBuildListScript.' . $phpEx);
+			include(XGP_ROOT . 'includes/functions/InsertBuildListScript.php');
 
 			$parse['BuildListScript']  = InsertBuildListScript ("buildings");
 			$parse['BuildList']        = $Queue['buildlist'];
@@ -549,7 +552,7 @@ public function __construct (&$CurrentPlanet, $CurrentUser)
 		else
 		{
 			$parse['BuildListScript']  = "";
-		    $parse['BuildList']        = "<th colspan='3'><font color=gold><blink>Î÷åðåäü ïîñòðîåê ïóñòà!</blink></font></th>";
+			$parse['BuildList']        = "";
 		}
 
 		$parse['BuildingsList']        = $BuildingPage;
diff --git a/includes/pages/class.ShowChangelogPage.php b/includes/pages/class.ShowChangelogPage.php
new file mode 100644
index 0000000..72ea4c5
--- /dev/null
+++ b/includes/pages/class.ShowChangelogPage.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+if(!defined('INSIDE')){ die(header("location:../../"));}
+
+class ShowChangelogPage
+{
+	public function __construct()
+	{
+		global $lang;
+
+		includeLang ( 'CHANGELOG' );
+		$template	=	gettemplate ( 'changelog/changelog_table' );
+
+		foreach ( $lang['changelog'] as $version => $description )
+		{
+			$parse['version_number']	= $version;
+			$parse['description'] 		= nl2br ( $description );
+
+			$body .= parsetemplate ( $template , $parse );
+		}
+
+		$parse 			= $lang;
+		$parse['body'] 	= $body;
+
+		display ( parsetemplate ( gettemplate ( 'changelog/changelog_body' ) , $parse ) );
+	}
+}
+?>
\ No newline at end of file
diff --git a/includes/pages/class.ShowFleet1Page.php b/includes/pages/class.ShowFleet1Page.php
new file mode 100644
index 0000000..165fc4f
--- /dev/null
+++ b/includes/pages/class.ShowFleet1Page.php
@@ -0,0 +1,256 @@
+<?php
+
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+if(!defined('INSIDE')){ die(header ( 'location:../../' ));}
+
+class ShowFleet1Page
+{
+	function __construct ( $CurrentUser , $CurrentPlanet )
+	{
+		global $resource, $pricelist, $reslist, $lang;
+
+		#####################################################################################################
+		// SOME DEFAULT VALUES
+		#####################################################################################################
+		// QUERYS
+		$getCurrentAcs		= doquery ( 'SELECT * FROM {{table}};' , 'aks' );
+
+		// ARRAYS
+		$speed_values		= array(10 => 100,9 => 90,8 => 80,7 => 70,6 => 60,5 => 50,4 => 40,3 => 30,2 => 20,1 => 10);
+		$planet_type		= array ( 'fl_planet' , 'fl_debris' , 'fl_moon' );
+
+		// LOAD TEMPLATES REQUIRED
+		$inputs_template			= gettemplate ( 'fleet/fleet1_inputs' );
+		$options_template			= gettemplate ( 'fleet/fleet_options' );
+		$shortcut_row_template		= gettemplate ( 'fleet/fleet1_shortcuts_row' );
+		$shortcut_noshortcuts 		= gettemplate ( 'fleet/fleet1_shortcuts_noshortcuts_row' );
+		$shortcut_acs_row			= gettemplate ( 'fleet/fleet1_shortcut_acs_row' );
+
+		// LANGUAGE
+		$parse 						= $lang;
+
+		// COORDS
+		$g 					= ( ( $_POST['galaxy'] == '' ) ? $CurrentPlanet['galaxy'] : $_POST['galaxy'] );
+		$s 					= ( ( $_POST['system'] == '' ) ? $CurrentPlanet['system'] : $_POST['system'] );
+		$p 					= ( ( $_POST['planet'] == '' ) ? $CurrentPlanet['planet'] : $_POST['planet'] );
+		$t 					= ( ( $_POST['planet_type'] == '' ) ? $CurrentPlanet['planet_type'] : $_POST['planet_type'] );
+
+		// OTHER VALUES
+		$value				= 0;
+		$FleetHiddenBlock  	= '';
+		#####################################################################################################
+		// END DEFAULT VALUES
+		#####################################################################################################
+
+		#####################################################################################################
+		// LOAD SHIPS INPUTS
+		#####################################################################################################
+		foreach ( $reslist['fleet'] as $n => $i )
+		{
+			if ( $i >= 201 && $i <= 215 && $_POST["ship$i"] > "0" )
+			{
+				if ( ( $_POST["ship$i"] > $CurrentPlanet[$resource[$i]]) OR (!ctype_digit( $_POST["ship$i"] )))
+				{
+					header ( 'location:game.php?page=fleet' );
+				}
+				else
+				{
+					$fleet['fleetarray'][$i]   	= $_POST["ship$i"];
+					$fleet['fleetlist']        .= $i . "," . $_POST["ship$i"] . ";";
+					$fleet['amount']           += $_POST["ship$i"];
+					$fleet['i']				   	= $i;
+					$fleet['consumption']		= GetShipConsumption ( $i, $CurrentUser );
+					$fleet['speed']				= GetFleetMaxSpeed ( "", $i, $CurrentUser );
+					$fleet['capacity']			= $pricelist[$i]['capacity'];
+					$fleet['ship']				= $_POST["ship$i"];
+
+					$speedalls[$i]             = GetFleetMaxSpeed( "", $i, $CurrentUser);
+					$FleetHiddenBlock		  .= parsetemplate ( $inputs_template , $fleet );
+				}
+			}
+		}
+
+		if ( !$fleet['fleetlist'] )
+		{
+			header ( 'location:game.php?page=fleet' );
+		}
+
+		else
+		{
+			$speedallsmin = min ( $speedalls );
+		}
+
+		#####################################################################################################
+		// LOAD PLANET TYPES OPTIONS
+		#####################################################################################################
+		foreach ( $planet_type as $type )
+		{
+			$value++;
+
+			$options['value']			=	$value;
+
+			if ( $value == $t )
+			{
+				$options['selected']	=	'SELECTED';
+			}
+			else
+			{
+				$options['selected']	=	'';
+			}
+
+			$options['title']			=	$lang[$type];
+
+
+			$parse['options_planettype'] .= parsetemplate ( $options_template , $options );
+		}
+
+		#####################################################################################################
+		// LOAD SPEED OPTIONS
+		#####################################################################################################
+		foreach ( $speed_values as $value => $porcentage )
+		{
+			$speed_porcentage['value']		=	$value;
+			$speed_porcentage['selected']	=	'';
+			$speed_porcentage['title']		=	$porcentage;
+
+			$parse['options'] .= parsetemplate ( $options_template , $speed_porcentage );
+		}
+
+		#####################################################################################################
+		// PARSE THE REST OF THE OPTIONS
+		#####################################################################################################
+		$parse['fleetblock'] 			= $FleetHiddenBlock;
+		$parse['speedallsmin'] 			= $speedallsmin;
+		$parse['fleetarray'] 			= str_rot13(base64_encode(serialize($fleet['fleetarray'])));
+		$parse['galaxy'] 				= $CurrentPlanet['galaxy'];
+		$parse['system'] 				= $CurrentPlanet['system'];
+		$parse['planet'] 				= $CurrentPlanet['planet'];
+		$parse['galaxy_post'] 			= intval($_POST['galaxy']);
+		$parse['system_post'] 			= intval($_POST['system']);
+		$parse['planet_post'] 			= intval($_POST['planet']);
+		$parse['speedfactor'] 			= GetGameSpeedFactor();
+		$parse['planet_type'] 			= $CurrentPlanet['planet_type'];
+		$parse['metal'] 				= floor($CurrentPlanet['metal']);
+		$parse['crystal'] 				= floor($CurrentPlanet['crystal']);
+		$parse['deuterium'] 			= floor($CurrentPlanet['deuterium']);
+		$parse['g'] 					= $g;
+		$parse['s'] 					= $s;
+		$parse['p'] 					= $p;
+
+		#####################################################################################################
+		// LOAD FLEET SHORTCUTS
+		#####################################################################################################
+		if ( $CurrentUser['fleet_shortcut'] )
+		{
+			$scarray 	= explode ( ";" , $CurrentUser['fleet_shortcut'] );
+
+			foreach ( $scarray as $a => $b )
+			{
+				if ( $b != "" )
+				{
+					$c 	= explode ( ',' , $b );
+
+					$shortcut['description']   		= $c[0] ." ". $c[1] .":". $c[2] .":". $c[3] . " ";
+
+					switch ( $c[4] )
+					{
+						case 1:
+							$shortcut['description'] .= $lang['fl_planet_shortcut'];
+						break;
+						case 2:
+							$shortcut['description'] .= $lang['fl_debris_shortcut'];
+						break;
+						case 3:
+							$shortcut['description'] .= $lang['fl_moon_shortcut'];
+						break;
+						default:
+							$shortcut['description'] .= '';
+						break;
+					}
+
+					$shortcut['selected']			= '';
+					$shortcut['value']			   	= $c['1'].';'.$c['2'].';'.$c['3'].';'.$c['4'];
+					$shortcut['title']			   	= $shortcut['description'];
+					$shortcut['shortcut_options']  .= parsetemplate( $options_template , $shortcut );
+				}
+			}
+
+			$parse['shortcut'] 				= parsetemplate ( $shortcut_row_template , $shortcut );
+		}
+		else
+		{
+			$parse['fl_shorcut_message']	= $lang['fl_no_shortcuts'];
+			$parse['shortcut'] 				= parsetemplate ( $shortcut_noshortcuts , $parse );
+		}
+
+		#####################################################################################################
+		// LOAD COLONY SHORTCUTS
+		#####################################################################################################
+		$colonies	= SortUserPlanets ( $CurrentUser );
+
+		if ( mysql_num_rows ( $colonies ) > 1 )
+		{
+			while ( $row = mysql_fetch_array ( $colonies ) )
+			{
+				if ( $CurrentPlanet['galaxy'] <> $row['galaxy'] or
+					 $CurrentPlanet['system'] <> $row['system'] or
+					 $CurrentPlanet['planet'] <> $row['planet'] or
+					 $CurrentPlanet['planet_type'] <> $row['planet_type'] )
+				{
+					if ( $row['planet_type'] == 3 )
+					{
+						$row['name'] .= " " . $lang['fl_moon_shortcut'];
+					}
+
+					$colony['selected']				= '';
+					$colony['value']			   	= $row['galaxy'].';'.$row['system'].';'.$row['planet'].';'.$row['planet_type'];
+					$colony['title']			   	= $row['name'] ." ". $row['galaxy'] .":". $row['system'] .":". $row['planet'];
+					$colony['shortcut_options']    .= parsetemplate( $options_template , $colony );
+				}
+
+				$parse['colonylist']				= parsetemplate ( $shortcut_row_template , $colony );
+			}
+		}
+		else
+		{
+			$parse['fl_shorcut_message']			= $lang['fl_no_colony'];
+			$parse['colonylist']					= parsetemplate ( $shortcut_noshortcuts , $parse );
+		}
+
+		#####################################################################################################
+		// LOAD SAC SHORTCUTS
+		#####################################################################################################
+		while ( $row = mysql_fetch_array ( $getCurrentAcs ) )
+		{
+			$members = explode ( "," , $row['eingeladen'] );
+
+			foreach ( $members as $a => $b )
+			{
+				if ( $b == $CurrentUser['id'] )
+				{
+					$acs['galaxy']		=	$row['galaxy'];
+					$acs['system']		=	$row['system'];
+					$acs['planet']		=	$row['planet'];
+					$acs['planet_type']	=	$row['planet_type'];
+					$acs['id']			=	$row['id'];
+					$acs['name']		=	$row['name'];
+
+					$acs_fleets 	   .= parsetemplate ( $shortcut_acs_row , $acs );
+				}
+			}
+		}
+
+		$parse['asc'] 				= $acs_fleets;
+		$parse['maxepedition'] 		= $_POST['maxepedition'];
+		$parse['curepedition'] 		= $_POST['curepedition'];
+		$parse['target_mission'] 	= $_POST['target_mission'];
+
+		display(parsetemplate(gettemplate('fleet/fleet1_table'), $parse));
+	}
+}
+?>
\ No newline at end of file
diff --git a/includes/pages/class.ShowFleet2Page.php b/includes/pages/class.ShowFleet2Page.php
new file mode 100644
index 0000000..58f0432
--- /dev/null
+++ b/includes/pages/class.ShowFleet2Page.php
@@ -0,0 +1,281 @@
+<?php
+
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+if(!defined('INSIDE')){ die(header("location:../../"));}
+
+class ShowFleet2Page
+{
+	function __construct ( $CurrentUser , $CurrentPlanet )
+	{
+		global $resource, $pricelist, $reslist, $lang;
+
+		#####################################################################################################
+		// SOME DEFAULT VALUES
+		#####################################################################################################
+		// ARRAYS
+		$exp_values		= array ( 1,2,3,4,5 );
+		$hold_values	= array ( 0,1,2,4,8,16,32 );
+
+		// LANG
+		$parse					= $lang;
+
+		// LOAD TEMPLATES REQUIRED
+		$mission_row_template	= gettemplate ( 'fleet/fleet2_mission_row' );
+		$input_template			= gettemplate ( 'fleet/fleet2_inputs' );
+		$stay_template			= gettemplate ( 'fleet/fleet2_stay_row' );
+		$options_template		= gettemplate ( 'fleet/fleet_options' );
+
+		// OTHER VALUES
+		$galaxy     			= intval($_POST['galaxy']);
+		$system     			= intval($_POST['system']);
+		$planet     			= intval($_POST['planet']);
+		$planettype 			= intval($_POST['planettype']);
+		$fleet_acs 				= intval($_POST['fleet_group']);
+		$YourPlanet 			= FALSE;
+		$UsedPlanet 			= FALSE;
+		$MissionSelector		= '';
+
+		// QUERYS
+		$select        			= doquery ( "SELECT `id_owner`
+												FROM `{{table}}`
+												WHERE galaxy = '$galaxy' AND
+														system = '$system' AND
+														planet = '$planet' AND
+														planet_type = '$planettype'" , "planets" , TRUE );
+
+		if ( $select )
+		{
+			if ( $select['id_owner'] == $CurrentUser['id'] )
+			{
+				$YourPlanet = TRUE;
+				$UsedPlanet = TRUE;
+			}
+			else
+			{
+				$UsedPlanet = TRUE;
+			}
+		}
+
+		if ( $_POST['planettype'] == 2 )
+		{
+			if ($_POST['ship209'] >= 1)
+			{
+				$missiontype = array ( 8 => $lang['type_mission'][8] );
+			}
+			else
+			{
+				$missiontype = array();
+			}
+		}
+		elseif ($_POST['planettype'] == 1 or $_POST['planettype'] == 3)
+		{
+			if ($_POST['ship208'] >= 1 && !$UsedPlanet)
+			{
+				$missiontype = array ( 7 => $lang['type_mission'][7] );
+			}
+
+			elseif ($_POST['ship210'] >= 1 && !$YourPlanet)
+			{
+				$missiontype = array ( 6 => $lang['type_mission'][6] );
+			}
+
+
+			if ( $_POST['ship202'] >= 1 or
+				 $_POST['ship203'] >= 1 or
+				 $_POST['ship204'] >= 1 or
+				 $_POST['ship205'] >= 1 or
+				 $_POST['ship206'] >= 1 or
+				 $_POST['ship207'] >= 1 or
+				 $_POST['ship210'] >= 1 or
+				 $_POST['ship211'] >= 1 or
+				 $_POST['ship213'] >= 1 or
+				 $_POST['ship214'] >= 1 or
+				 $_POST['ship215'] >= 1 )
+			{
+
+				if ( !$YourPlanet )
+				{
+					$missiontype[1] = $lang['type_mission'][1];
+				}
+
+				$missiontype[3] 	= $lang['type_mission'][3];
+				$missiontype[5] 	= $lang['type_mission'][5];
+			}
+		}
+		elseif ( $_POST['ship209'] >= 1 or $_POST['ship208'] )
+		{
+			$missiontype[3] 		= $lang['type_mission'][3];
+		}
+
+		if ($YourPlanet)
+		{
+			$missiontype[4] 		= $lang['type_mission'][4];
+		}
+
+		if ($_POST['planettype'] == 3 || $_POST['planettype'] == 1 && ($fleet_acs > 0) && $UsedPlanet)
+		{
+			$acs = doquery ( "SELECT * FROM `{{table}}` WHERE `id`= ".$fleet_acs."" , "aks" , TRUE );
+
+			if ( 	$acs['galaxy'] == $galaxy &&
+					$acs['planet'] == $planet &&
+					$acs['system'] == $system &&
+					$acs['planet_type'] == $planettype )
+			{
+				$missiontype[2] 	= $lang['type_mission'][2];
+			}
+		}
+
+		if($_POST['planettype'] == 3 && $_POST['ship214'] >= 1 && !$YourPlanet && $UsedPlanet)
+		{
+			$missiontype[9] = $lang['type_mission'][9];
+		}
+
+		$fleetarray    		= unserialize(base64_decode(str_rot13($_POST["usedfleet"])));
+		$mission       		= $_POST['target_mission'];
+		$SpeedFactor   		= $_POST['speedfactor'];
+		$AllFleetSpeed 		= GetFleetMaxSpeed ($fleetarray, 0, $CurrentUser);
+		$GenFleetSpeed 		= $_POST['speed'];
+		$MaxFleetSpeed 		= min($AllFleetSpeed);
+		$distance      		= GetTargetDistance($_POST['thisgalaxy'], $_POST['galaxy'], $_POST['thissystem'], $_POST['system'], $_POST['thisplanet'], $_POST['planet']);
+		$duration      		= GetMissionDuration($GenFleetSpeed, $MaxFleetSpeed, $distance, $SpeedFactor);
+		$consumption   		= GetFleetConsumption($fleetarray, $SpeedFactor, $duration, $distance, $MaxFleetSpeed, $CurrentUser);
+
+		#####################################################################################################
+		// INPUTS DATA
+		#####################################################################################################
+		$parse['metal'] 			= floor($CurrentPlanet["metal"]);
+		$parse['crystal'] 			= floor($CurrentPlanet["crystal"]);
+		$parse['deuterium'] 		= floor($CurrentPlanet["deuterium"]);
+		$parse['consumption'] 		= $consumption;
+		$parse['distance']			= $distance;
+		$parse['speedfactor'] 		= $_POST['speedfactor'];
+		$parse['thisgalaxy'] 		= $_POST["thisgalaxy"];
+		$parse['thissystem'] 		= $_POST["thissystem"];
+		$parse['thisplanet'] 		= $_POST["thisplanet"];
+		$parse['galaxy'] 			= $_POST["galaxy"];
+		$parse['system'] 			= $_POST["system"];
+		$parse['planet'] 			= $_POST["planet"];
+		$parse['thisplanettype']	= $_POST["thisplanettype"];
+		$parse['planettype'] 		= $_POST["planettype"];
+		$parse['speedallsmin'] 		= $_POST["speedallsmin"];
+		$parse['speed'] 			= $_POST['speed'];
+		$parse['speedfactor'] 		= $_POST["speedfactor"];
+		$parse['usedfleet'] 		= $_POST["usedfleet"];
+		$parse['maxepedition'] 		= $_POST['maxepedition'];
+		$parse['curepedition'] 		= $_POST['curepedition'];
+		$parse['fleet_group'] 		= $_POST['fleet_group'];
+		$parse['acs_target_mr'] 	= $_POST['acs_target_mr'];
+
+		#####################################################################################################
+		// EXTRA INPUTS
+		#####################################################################################################
+		foreach ( $fleetarray as $Ship => $Count )
+		{
+			$input_parse['ship']		=	$Ship;
+			$input_parse['amount']		=	$Count;
+			$input_parse['capacity']	=	$pricelist[$Ship]['capacity'];
+			$input_parse['consumption']	=	GetShipConsumption ( $Ship , $CurrentUser );
+			$input_parse['speed']		=	GetFleetMaxSpeed ( "" , $Ship , $CurrentUser );
+
+			$input_extra .= parsetemplate ( $input_template , $input_parse );
+		}
+
+		#####################################################################################################
+		// TOP TABLE TITLE
+		#####################################################################################################
+		if ( $_POST['thisplanettype'] == 1 )
+		{
+			$parse['title'] = "". $_POST['thisgalaxy'] .":". $_POST['thissystem'] .":". $_POST['thisplanet'] ." - ".$lang['fl_planet']."";
+
+		}
+		elseif ( $_POST['thisplanettype'] == 3 )
+		{
+			$parse['title'] = "". $_POST['thisgalaxy'] .":". $_POST['thissystem'] .":". $_POST['thisplanet'] ." - ".$lang['fl_moon']."";
+		}
+
+		#####################################################################################################
+		// MISSION TYPES
+		#####################################################################################################
+		if ( count ( $missiontype ) > 0 )
+		{
+			if ( $planet == 16 )
+			{
+				$parse_mission['value']					= 15;
+				$parse_mission['mission']				= $lang['type_mission'][15];
+				$parse_mission['expedition_message']	= $lang['fl_expedition_alert_message'];
+				$parse_mission['id']					= ' ';
+				$parse_mission['checked']				= ' checked="checked"';
+
+				$MissionSelector	.=	parsetemplate ( $mission_row_template , $parse_mission );
+			}
+			else
+			{
+				$i = 0;
+
+				foreach ( $missiontype as $a => $b )
+				{
+					$parse_mission['value']					= $a;
+					$parse_mission['mission']				= $b;
+					$parse_mission['expedition_message']	= '';
+					$parse_mission['id']					= ' id="inpuT_' . $i . '" ';
+					$parse_mission['checked']				= ( ( $mission == $a ) ? ' checked="checked"' : '' );
+
+					$i++;
+
+					$MissionSelector	.=	parsetemplate ( $mission_row_template , $parse_mission );
+				}
+			}
+		}
+		else
+		{
+			header ( "location:game.php?page=fleet" );
+		}
+
+		#####################################################################################################
+		// STAY / EXPEDITION BLOCKS
+		#####################################################################################################
+		if ( $planet == 16 )
+		{
+			$stay['stay_type']			= 'expeditiontime';
+
+			foreach ( $exp_values as $value )
+			{
+				$stay['value']			= $value;
+				$stay['selected']		= '';
+				$stay['title']			= $value;
+
+				$stay_row['options']  .= parsetemplate ( $options_template , $stay );
+			}
+
+			$StayBlock = parsetemplate ( $stay_template , $stay_row );
+		}
+		elseif ( $missiontype[5] != '' )
+		{
+			$stay['stay_type']				= 'holdingtime';
+
+			foreach ( $hold_values as $value )
+			{
+
+				$stay['value']			= $value;
+				$stay['selected']		= ( ( $value == 1 ) ? ' selected' : '' );
+				$stay['title']			= $value;
+
+				$stay_row['options']  .= parsetemplate ( $options_template , $stay );
+			}
+
+			$StayBlock = parsetemplate ( $stay_template , $stay_row );
+		}
+
+		$parse['input_extra'] 			= $input_extra;
+		$parse['missionselector'] 		= $MissionSelector;
+		$parse['stayblock'] 			= $StayBlock;
+
+		display ( parsetemplate ( gettemplate ( 'fleet/fleet2_table' ) , $parse ) );
+	}
+}
+?>
\ No newline at end of file
diff --git a/includes/pages/class.ShowFleet3Page.php b/includes/pages/class.ShowFleet3Page.php
new file mode 100644
index 0000000..84be246
--- /dev/null
+++ b/includes/pages/class.ShowFleet3Page.php
@@ -0,0 +1,593 @@
+<?php
+
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+if(!defined('INSIDE')){ die(header("location:../../"));}
+
+class ShowFleet3Page
+{
+	function ShowFleet3Page($CurrentUser, $CurrentPlanet)
+	{
+		global $resource, $pricelist, $reslist, $lang;
+
+		include_once ( XGP_ROOT . 'includes/functions/IsVacationMode.php' );
+
+		$parse	=	$lang;
+
+		if ( IsVacationMode ( $CurrentUser ) )
+		{
+			exit ( message ( $lang['fl_vacation_mode_active'] , "game.php?page=overview" , 2 ) );
+		}
+
+		$fleet_group_mr = 0;
+
+		if ( $_POST['fleet_group'] > 0 )
+		{
+			if ( $_POST['mission'] == 2 )
+			{
+				$target = 	"g" .
+							intval ( $_POST["galaxy"] ) .
+							"s" .
+							intval ( $_POST["system"] ) .
+							"p" . intval ( $_POST["planet"] ) .
+							"t" . intval ( $_POST["planettype"] );
+
+				if ( $_POST['acs_target_mr'] == $target )
+				{
+					$aks_count_mr = doquery ( "SELECT COUNT(*)
+												FROM {{table}}
+												WHERE id = '" . intval ( $_POST['fleet_group'] ) . "'" , 'aks' );
+
+					if ($aks_count_mr > 0)
+					{
+						$fleet_group_mr = $_POST['fleet_group'];
+					}
+				}
+			}
+		}
+
+		if(($_POST['fleet_group'] == 0) && ($_POST['mission'] == 2))
+		{
+			$_POST['mission'] = 1;
+		}
+
+		$TargetPlanet  		= doquery("SELECT `id_owner`,`id_level`,`destruyed`,`ally_deposit` FROM {{table}} WHERE `galaxy` = '". intval($_POST['galaxy']) ."' AND `system` = '". intval($_POST['system']) ."' AND `planet` = '". intval($_POST['planet']) ."' AND `planet_type` = '". intval($_POST['planettype']) ."';", 'planets', TRUE);
+		$MyDBRec       		= doquery("SELECT `id`,`onlinetime`,`ally_id`,`urlaubs_modus` FROM {{table}} WHERE `id` = '". intval($CurrentUser['id'])."';", 'users', TRUE);
+
+		$protection      	= read_config ( 'noobprotection' );
+		$protectiontime  	= read_config ( 'noobprotectiontime' );
+		$protectionmulti 	= read_config ( 'noobprotectionmulti' );
+
+		if ( $protectiontime < 1 )
+		{
+			$protectiontime = 9999999999999999;
+		}
+
+
+		$fleetarray  = unserialize ( base64_decode ( str_rot13 ( $_POST["usedfleet"] ) ) );
+
+		if ( $TargetPlanet["destruyed"] != 0 )
+		{
+			exit ( header ( "Location: game.php?page=fleet" ) );
+		}
+
+
+		if ( !is_array ( $fleetarray ) )
+		{
+			exit ( header ( "Location: game.php?page=fleet" ) );
+		}
+
+
+		foreach ( $fleetarray as $Ship => $Count )
+		{
+			$Count = intval ( $Count );
+
+			if ($Count > $CurrentPlanet[$resource[$Ship]])
+			{
+				exit ( header ( "location:game.php?page=fleet" ) );
+			}
+		}
+
+		$error              = 0;
+		$galaxy             = intval($_POST['galaxy']);
+		$system             = intval($_POST['system']);
+		$planet             = intval($_POST['planet']);
+		$planettype         = intval($_POST['planettype']);
+		$fleetmission       = intval($_POST['mission']);
+
+		//fix by jstar
+		if ( $fleetmission == 7 && !isset($fleetarray[208]) )
+		{
+			exit ( header ( "location:game.php?page=fleet" ) );
+		}
+
+		if ($planettype != 1 && $planettype != 2 && $planettype != 3)
+		{
+			exit ( header ( "location:game.php?page=fleet" ) );
+		}
+
+		//fix invisible debris like ogame by jstar
+		if ($fleetmission == 8)
+		{
+			$YourPlanet = FALSE;
+			$UsedPlanet = FALSE;
+			$select     = doquery("SELECT * FROM {{table}} WHERE galaxy = '". $galaxy ."' AND system = '". $system ."' AND planet = '". $planet ."'", "planets");
+			$select2    = doquery("SELECT invisible_start_time, metal, crystal FROM {{table}} WHERE galaxy = '". $galaxy ."' AND system = '". $system ."' AND planet = '". $planet ."'", "galaxy",TRUE);
+			if($select2['metal'] == 0 && $select2['crystal'] == 0 && time() > ($select2['invisible_start_time']+DEBRIS_LIFE_TIME))
+			{
+				exit ( header ( "location:game.php?page=fleet" ) );
+			}
+		}
+		else
+		{
+			$YourPlanet = FALSE;
+			$UsedPlanet = FALSE;
+			$select     = doquery("SELECT * FROM {{table}} WHERE galaxy = '". $galaxy ."' AND system = '". $system ."' AND planet = '". $planet ."' AND planet_type = '". $planettype ."'", "planets");
+		}
+
+		if ($CurrentPlanet['galaxy'] == $galaxy && $CurrentPlanet['system'] == $system &&
+			$CurrentPlanet['planet'] == $planet && $CurrentPlanet['planet_type'] == $planettype)
+		{
+			exit ( header ( "location:game.php?page=fleet" ) );
+		}
+
+		if ($_POST['mission'] != 15)
+		{
+			if (mysql_num_rows($select) < 1 && $fleetmission != 7)
+			{
+				exit ( header ( "location:game.php?page=fleet" ) );
+			}
+			elseif ($fleetmission == 9 && mysql_num_rows($select) < 1)
+			{
+				exit ( header ( "location:game.php?page=fleet" ) );
+			}
+		}
+		else
+		{
+			$MaxExpedition      = $CurrentUser[$resource[124]];
+
+			if ($MaxExpedition >= 1)
+			{
+				$maxexpde  			= doquery("SELECT COUNT(fleet_owner) AS `expedi` FROM {{table}} WHERE `fleet_owner` = '".intval($CurrentUser['id'])."' AND `fleet_mission` = '15';", 'fleets', TRUE);
+				$ExpeditionEnCours  = $maxexpde['expedi'];
+				$EnvoiMaxExpedition = 1 + floor( $MaxExpedition / 3 );
+			}
+			else
+			{
+				$ExpeditionEnCours 	= 0;
+				$EnvoiMaxExpedition = 0;
+			}
+
+			if($EnvoiMaxExpedition == 0 )
+			{
+				message ("<font color=\"red\"><b>".$lang['fl_expedition_tech_required']."</b></font>", "game.php?page=fleet", 2);
+
+			}
+			elseif ($ExpeditionEnCours >= $EnvoiMaxExpedition )
+			{
+				message ("<font color=\"red\"><b>".$lang['fl_expedition_fleets_limit']."</b></font>", "game.php?page=fleet", 2);
+			}
+		}
+
+		$select = mysql_fetch_array($select);
+
+		if ($select['id_owner'] == $CurrentUser['id'])
+		{
+			$YourPlanet = TRUE;
+			$UsedPlanet = TRUE;
+		}
+		elseif (!empty($select['id_owner']))
+		{
+			$YourPlanet = FALSE;
+			$UsedPlanet = TRUE;
+		}
+		else
+		{
+			$YourPlanet = FALSE;
+			$UsedPlanet = FALSE;
+		}
+
+		//fix by jstar
+		if($fleetmission == 9)
+		{
+			$countfleettype = count ( $fleetarray );
+
+			if($YourPlanet or !$UsedPlanet or $planettype != 3)
+			{
+				exit ( header ( "location:game.php?page=fleet" ) );
+			}
+			elseif($countfleettype==1 && !(isset($fleetarray[214])))
+			{
+				exit ( header ( "location:game.php?page=fleet" ) );
+			}
+			elseif($countfleettype==2 && !(isset($fleetarray[214])))
+			{
+				exit ( header ( "location:game.php?page=fleet" ) );
+			}
+			elseif($countfleettype>2)
+			{
+				exit ( header ( "location:game.php?page=fleet" ) );
+			}
+		}
+
+		if (empty($fleetmission))
+		{
+			exit ( header ( "location:game.php?page=fleet" ) );
+		}
+
+		if ($TargetPlanet['id_owner'] == '')
+		{
+			$HeDBRec = $MyDBRec;
+		}
+		elseif ($TargetPlanet['id_owner'] != '')
+		{
+			$HeDBRec = doquery("SELECT `id`,`onlinetime`,`ally_id`,`urlaubs_modus` FROM {{table}} WHERE `id` = '". intval($TargetPlanet['id_owner']) ."';", 'users', TRUE);
+		}
+
+		$UserPoints    = doquery("SELECT `total_points` FROM {{table}} WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '". intval($MyDBRec['id']) ."';", 'statpoints', TRUE);
+		$User2Points   = doquery("SELECT `total_points` FROM {{table}} WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '". intval($HeDBRec['id']) ."';", 'statpoints', TRUE);
+
+		$MyGameLevel  = $UserPoints['total_points'];
+		$HeGameLevel  = $User2Points['total_points'];
+
+		if($HeDBRec['onlinetime'] >= (time()-60 * 60 * 24 * 7))
+		{
+			if ($MyGameLevel > ($HeGameLevel * $protectionmulti)
+				&& $TargetPlanet['id_owner'] != ''
+				&& ($_POST['mission'] == 1 or $_POST['mission'] == 6 or $_POST['mission'] == 9)
+				&& $protection == 1
+				&& $HeGameLevel < $protectiontime)
+			{
+				message("<font color=\"lime\"><b>".$lang['fl_week_player']."</b></font>", "game.php?page=fleet", 2);
+			}
+
+			if (($MyGameLevel * $protectionmulti) < $HeGameLevel
+				&& $TargetPlanet['id_owner'] != ''
+				&& ($_POST['mission'] == 1 or $_POST['mission'] == 5 or $_POST['mission'] == 6 or $_POST['mission'] == 9)
+				&& $protection == 1
+				&& $MyGameLevel < $protectiontime)
+			{
+				message("<font color=\"red\"><b>".$lang['fl_strong_player']."</b></font>", "game.php?page=fleet", 2);
+			}
+		}
+
+		if ($HeDBRec['urlaubs_modus'] && $_POST['mission'] != 8)
+		{
+			message("<font color=\"lime\"><b>".$lang['fl_in_vacation_player']."</b></font>", "game.php?page=fleet", 2);
+		}
+
+		$FlyingFleets = mysql_fetch_assoc(doquery("SELECT COUNT(fleet_id) as Number FROM {{table}} WHERE `fleet_owner`='".intval($CurrentUser['id'])."'", 'fleets'));
+		$ActualFleets = $FlyingFleets["Number"];
+
+		if ((get_max_fleets ( $CurrentUser[$resource[108]] , $CurrentUser['rpg_amiral'] ) ) <= $ActualFleets)
+		{
+			message($lang['fl_no_slots'], "game.php?page=fleet", 1);
+		}
+
+		if ($_POST['resource1'] + $_POST['resource2'] + $_POST['resource3'] < 1 && $_POST['mission'] == 3)
+		{
+			message("<font color=\"lime\"><b>".$lang['fl_empty_transport']."</b></font>", "game.php?page=fleet", 1);
+		}
+
+		if ($_POST['mission'] != 15)
+		{
+			if ($TargetPlanet['id_owner'] == '' && $_POST['mission'] < 7)
+			{
+				exit ( header ( "location:game.php?page=fleet" ) );
+			}
+
+			if ($TargetPlanet['id_owner'] != '' && $_POST['mission'] == 7)
+			{
+				message ("<font color=\"red\"><b>".$lang['fl_planet_populed']."</b></font>", "game.php?page=fleet", 2);
+			}
+
+			if ($HeDBRec['ally_id'] != $MyDBRec['ally_id'] && $_POST['mission'] == 4)
+			{
+				message ("<font color=\"red\"><b>".$lang['fl_stay_not_on_enemy']."</b></font>", "game.php?page=fleet", 2);
+			}
+
+			if (($TargetPlanet["id_owner"] == $CurrentPlanet["id_owner"]) && (($_POST["mission"] == 1) or ($_POST["mission"] == 6)))
+			{
+				exit ( header ( "location:game.php?page=fleet" ) );
+			}
+
+			if (($TargetPlanet["id_owner"] != $CurrentPlanet["id_owner"]) && ($_POST["mission"] == 4))
+			{
+				message ("<font color=\"red\"><b>".$lang['fl_deploy_only_your_planets']."</b></font>","game.php?page=fleet", 2);
+			}
+
+			if($_POST['mission'] == 5)
+			{
+				$buddy = doquery("SELECT count(*) FROM {{table}} WHERE `owner` = '". intval($TargetPlanet['id_owner']) ."' OR `sender`='".intval($TargetPlanet['id_owner'])."' AND `active` = '1';", 'buddy');
+
+				if ($_POST['planettype']==3)
+				{
+					$x = doquery("SELECT `ally_deposit` FROM {{table}} WHERE `galaxy` = '". intval($_POST['galaxy']) ."' AND `system` = '". intval($_POST['system']) ."' AND `planet` = '". intval($_POST['planet']) ."' AND `planet_type` = 1;", 'planets', TRUE);
+				}
+				else
+				{
+					$x = $TargetPlanet;
+				}
+
+				if (($HeDBRec['ally_id'] != $MyDBRec['ally_id'] && $buddy<1) ||  $x['ally_deposit'] < 1)
+				{
+					message ("<font color=\"red\"><b>".$lang['fl_stay_not_on_enemy']."</b></font>", "game.php?page=fleet", 2);
+				}
+			}
+		}
+
+		$missiontype	=	array	(
+										1 => $lang['type_mission'][1],
+										2 => $lang['type_mission'][2],
+										3 => $lang['type_mission'][3],
+										4 => $lang['type_mission'][4],
+										5 => $lang['type_mission'][5],
+										6 => $lang['type_mission'][6],
+										7 => $lang['type_mission'][7],
+										8 => $lang['type_mission'][8],
+										9 => $lang['type_mission'][9],
+										15 => $lang['type_mission'][15],
+									);
+
+		$speed_possible	= array(10, 9, 8, 7, 6, 5, 4, 3, 2, 1);
+		$AllFleetSpeed	= GetFleetMaxSpeed ($fleetarray, 0, $CurrentUser);
+		$GenFleetSpeed  = $_POST['speed'];
+		$SpeedFactor    = read_config ( 'fleet_speed' ) / 2500;
+		$MaxFleetSpeed  = min($AllFleetSpeed);
+
+		if (!in_array($GenFleetSpeed, $speed_possible))
+		{
+			exit ( header ( "location:game.php?page=fleet" ) );
+		}
+
+		if ($MaxFleetSpeed != $_POST['speedallsmin'])
+		{
+			exit ( header ( "location:game.php?page=fleet" ) );
+		}
+
+		if (!$_POST['planettype'])
+		{
+			exit ( header ( "location:game.php?page=fleet" ) );
+		}
+
+		if (!$_POST['galaxy'] || !is_numeric($_POST['galaxy']) || $_POST['galaxy'] > MAX_GALAXY_IN_WORLD || $_POST['galaxy'] < 1)
+		{
+			exit ( header ( "location:game.php?page=fleet" ) );
+		}
+
+		if (!$_POST['system'] || !is_numeric($_POST['system']) || $_POST['system'] > MAX_SYSTEM_IN_GALAXY || $_POST['system'] < 1)
+		{
+			exit ( header ( "location:game.php?page=fleet" ) );
+		}
+
+		if (!$_POST['planet'] || !is_numeric($_POST['planet']) || $_POST['planet'] > (MAX_PLANET_IN_SYSTEM + 1) || $_POST['planet'] < 1)
+		{
+			exit ( header ( "location:game.php?page=fleet" ) );
+		}
+
+		if ($_POST['thisgalaxy'] != $CurrentPlanet['galaxy'] |
+			$_POST['thissystem'] != $CurrentPlanet['system'] |
+			$_POST['thisplanet'] != $CurrentPlanet['planet'] |
+			$_POST['thisplanettype'] != $CurrentPlanet['planet_type'])
+		{
+			exit ( header ( "location:game.php?page=fleet" ) );
+		}
+
+		if (!isset($fleetarray))
+		{
+			exit ( header ( "location:game.php?page=fleet" ) );
+		}
+
+		$distance      = GetTargetDistance($_POST['thisgalaxy'], $_POST['galaxy'], $_POST['thissystem'], $_POST['system'], $_POST['thisplanet'], $_POST['planet']);
+		$duration      = GetMissionDuration($GenFleetSpeed, $MaxFleetSpeed, $distance, $SpeedFactor);
+		$consumption   = GetFleetConsumption($fleetarray, $SpeedFactor, $duration, $distance, $MaxFleetSpeed, $CurrentUser);
+
+		$fleet['start_time'] = $duration + time();
+
+		// START CODE BY JSTAR
+		if ($_POST['mission'] == 15)
+		{
+			$StayDuration	= floor($_POST['expeditiontime']);
+
+			if ( $StayDuration <= floor ( sqrt ( $CurrentUser['expedition_tech'] ) ) && $StayDuration > 0 )
+			{
+				$StayDuration    = $StayDuration  * 3600;
+				$StayTime        = $fleet['start_time'] + $StayDuration;
+			}
+			else
+			{
+				exit ( header ( "location:game.php?page=fleet" ) );
+			}
+		} // END CODE BY JSTAR
+		elseif ($_POST['mission'] == 5)
+		{
+			$StayDuration    = $_POST['holdingtime'] * 3600;
+			$StayTime        = $fleet['start_time'] + $_POST['holdingtime'] * 3600;
+		}
+		else
+		{
+			$StayDuration    = 0;
+			$StayTime        = 0;
+		}
+
+		$fleet['end_time']   = $StayDuration + (2 * $duration) + time();
+		$FleetStorage        = 0;
+		$FleetShipCount      = 0;
+		$fleet_array         = "";
+		$FleetSubQRY         = "";
+
+		//fix by jstar
+		$haveSpyProbos		= FALSE;
+
+		foreach ($fleetarray as $Ship => $Count)
+		{
+			$Count = intval($Count);
+
+			if($Ship == 210)
+			{
+				$haveSpyProbos = TRUE;
+			}
+
+			$FleetStorage    += $pricelist[$Ship]["capacity"] * $Count;
+			$FleetShipCount  += $Count;
+			$fleet_array     .= $Ship .",". $Count .";";
+			$FleetSubQRY     .= "`".$resource[$Ship] . "` = `" . $resource[$Ship] . "` - " . $Count . ", ";
+		}
+
+		if(!$haveSpyProbos AND $_POST['mission'] == 6)
+		{
+			exit ( header ( "location:game.php?page=fleet" ) );
+		}
+
+		$FleetStorage        -= $consumption;
+		$StorageNeeded        = 0;
+
+		$_POST['resource1'] = max(0, (int)trim($_POST['resource1']));
+		$_POST['resource2'] = max(0, (int)trim($_POST['resource2']));
+		$_POST['resource3'] = max(0, (int)trim($_POST['resource3']));
+
+		if ($_POST['resource1'] < 1)
+		{
+			$TransMetal      = 0;
+		}
+		else
+		{
+			$TransMetal      = $_POST['resource1'];
+			$StorageNeeded  += $TransMetal;
+		}
+
+		if ($_POST['resource2'] < 1)
+		{
+			$TransCrystal    = 0;
+		}
+		else
+		{
+			$TransCrystal    = $_POST['resource2'];
+			$StorageNeeded  += $TransCrystal;
+		}
+		if ($_POST['resource3'] < 1)
+		{
+			$TransDeuterium  = 0;
+		}
+		else
+		{
+			$TransDeuterium  = $_POST['resource3'];
+			$StorageNeeded  += $TransDeuterium;
+		}
+
+		$StockMetal      = $CurrentPlanet['metal'];
+		$StockCrystal    = $CurrentPlanet['crystal'];
+		$StockDeuterium  = $CurrentPlanet['deuterium'];
+		$StockDeuterium -= $consumption;
+
+		$StockOk         = FALSE;
+
+		if ($StockMetal >= $TransMetal)
+		{
+			if ($StockCrystal >= $TransCrystal)
+			{
+				if ($StockDeuterium >= $TransDeuterium)
+				{
+					$StockOk         = TRUE;
+				}
+			}
+		}
+
+		if (!$StockOk)
+		{
+			message ("<font color=\"red\"><b>". $lang['fl_no_enought_deuterium'] . pretty_number($consumption) ."</b></font>", "game.php?page=fleet", 2);
+		}
+
+		if ( $StorageNeeded > $FleetStorage)
+		{
+			message ("<font color=\"red\"><b>". $lang['fl_no_enought_cargo_capacity'] . pretty_number($StorageNeeded - $FleetStorage) ."</b></font>", "game.php?page=fleet", 2);
+		}
+
+		if ($TargetPlanet['id_level'] > $CurrentUser['authlevel'] && read_config ( 'adm_attack' ) == 0)
+		{
+			message($lang['fl_admins_cannot_be_attacked'], "game.php?page=fleet",2);
+		}
+
+		if ($fleet_group_mr != 0)
+		{
+			$AksStartTime = doquery("SELECT MAX(`fleet_start_time`) AS Start FROM {{table}} WHERE `fleet_group` = '". $fleet_group_mr . "';", "fleets", TRUE);
+
+			if ($AksStartTime['Start'] >= $fleet['start_time'])
+			{
+				$fleet['end_time']        += $AksStartTime['Start'] -  $fleet['start_time'];
+				$fleet['start_time']     = $AksStartTime['Start'];
+			}
+			else
+			{
+				$QryUpdateFleets = "UPDATE {{table}} SET ";
+				$QryUpdateFleets .= "`fleet_start_time` = '". $fleet['start_time'] ."', ";
+				$QryUpdateFleets .= "`fleet_end_time` = fleet_end_time + '".($fleet['start_time'] - $AksStartTime['Start'])."' ";
+				$QryUpdateFleets .= "WHERE ";
+				$QryUpdateFleets .= "`fleet_group` = '". $fleet_group_mr ."';";
+				doquery($QryUpdateFleets, 'fleets');
+				$fleet['end_time']         += $fleet['start_time'] -  $AksStartTime['Start'];
+			}
+		}
+
+		$QryInsertFleet  = "INSERT INTO {{table}} SET ";
+		$QryInsertFleet .= "`fleet_owner` = '". intval($CurrentUser['id']) ."', ";
+		$QryInsertFleet .= "`fleet_mission` = '".intval($_POST['mission'])."',  ";
+		$QryInsertFleet .= "`fleet_amount` = '". intval($FleetShipCount) ."', ";
+		$QryInsertFleet .= "`fleet_array` = '". $fleet_array ."', ";
+		$QryInsertFleet .= "`fleet_start_time` = '". $fleet['start_time'] ."', ";
+		$QryInsertFleet .= "`fleet_start_galaxy` = '". intval($_POST['thisgalaxy']) ."', ";
+		$QryInsertFleet .= "`fleet_start_system` = '". intval($_POST['thissystem']) ."', ";
+		$QryInsertFleet .= "`fleet_start_planet` = '". intval($_POST['thisplanet']) ."', ";
+		$QryInsertFleet .= "`fleet_start_type` = '". intval($_POST['thisplanettype']) ."', ";
+		$QryInsertFleet .= "`fleet_end_time` = '". intval($fleet['end_time']) ."', ";
+		$QryInsertFleet .= "`fleet_end_stay` = '". intval($StayTime) ."', ";
+		$QryInsertFleet .= "`fleet_end_galaxy` = '". intval($_POST['galaxy']) ."', ";
+		$QryInsertFleet .= "`fleet_end_system` = '". intval($_POST['system']) ."', ";
+		$QryInsertFleet .= "`fleet_end_planet` = '". intval($_POST['planet']) ."', ";
+		$QryInsertFleet .= "`fleet_end_type` = '". intval($_POST['planettype']) ."', ";
+		$QryInsertFleet .= "`fleet_resource_metal` = '". $TransMetal ."', ";
+		$QryInsertFleet .= "`fleet_resource_crystal` = '". $TransCrystal ."', ";
+		$QryInsertFleet .= "`fleet_resource_deuterium` = '". $TransDeuterium ."', ";
+		$QryInsertFleet .= "`fleet_target_owner` = '". intval($TargetPlanet['id_owner']) ."', ";
+		$QryInsertFleet .= "`fleet_group` = '".intval($fleet_group_mr)."',  ";
+		$QryInsertFleet .= "`start_time` = '". time() ."';";
+		doquery( $QryInsertFleet, 'fleets');
+
+		$QryUpdatePlanet  = "UPDATE `{{table}}` SET ";
+		$QryUpdatePlanet .= $FleetSubQRY;
+		$QryUpdatePlanet .= "`metal` = `metal` - ". $TransMetal .", ";
+		$QryUpdatePlanet .= "`crystal` = `crystal` - ". $TransCrystal .", ";
+		$QryUpdatePlanet .= "`deuterium` = `deuterium` - ". ($TransDeuterium + $consumption) ." ";
+		$QryUpdatePlanet .= "WHERE ";
+		$QryUpdatePlanet .= "`id` = ". intval($CurrentPlanet['id']) ." LIMIT 1;";
+		doquery ($QryUpdatePlanet, "planets");
+
+		$parse['mission'] 		= $missiontype[$_POST['mission']];
+		$parse['distance'] 		= pretty_number($distance);
+		$parse['speedallsmin'] 	= pretty_number($_POST['speedallsmin']);
+		$parse['consumption'] 	= pretty_number($consumption);
+		$parse['from']	 		= $_POST['thisgalaxy'] .":". $_POST['thissystem']. ":". $_POST['thisplanet'];
+		$parse['destination']	= $_POST['galaxy'] .":". $_POST['system'] .":". $_POST['planet'];
+		$parse['start_time'] 	= date("M D d H:i:s", $fleet['start_time']);
+		$parse['end_time'] 		= date("M D d H:i:s", $fleet['end_time']);
+
+		$ships_row_template		= gettemplate ( 'fleet/fleet3_ships_row' );
+
+		foreach ( $fleetarray as $Ship => $Count )
+		{
+			$fleet_list['ship']		=	$lang['tech'][$Ship];
+			$fleet_list['amount']	=	pretty_number ( $Count );
+
+			$ships_list			   .=	parsetemplate ( $ships_row_template , $fleet_list );
+		}
+
+		$parse['fleet_list'] 	= $ships_list;
+
+		display ( parsetemplate ( gettemplate ( 'fleet/fleet3_table' ) , $parse ) , FALSE );
+	}
+}
+?>
\ No newline at end of file
diff --git a/includes/pages/class.ShowFleetACSPage.php b/includes/pages/class.ShowFleetACSPage.php
new file mode 100644
index 0000000..eb49abd
--- /dev/null
+++ b/includes/pages/class.ShowFleetACSPage.php
@@ -0,0 +1,392 @@
+<?php
+
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+if(!defined('INSIDE')){ die(header("location:../../"));}
+
+class ShowFleetACSPage
+{
+	function __construct ( $CurrentUser , $CurrentPlanet )
+	{
+		global $resource, $pricelist, $reslist, $lang;
+
+		#####################################################################################################
+		// SOME DEFAULT VALUES
+		#####################################################################################################
+		// ARRAYS
+		$missiontype		=	array	(
+											1 => $lang['type_mission'][1],
+											2 => $lang['type_mission'][2],
+											3 => $lang['type_mission'][3],
+											4 => $lang['type_mission'][4],
+											5 => $lang['type_mission'][5],
+											6 => $lang['type_mission'][6],
+											7 => $lang['type_mission'][7],
+											8 => $lang['type_mission'][8],
+											9 => $lang['type_mission'][9],
+											15 => $lang['type_mission'][15],
+											16 => $lang['type_mission'][16],
+											17 => $lang['type_mission'][17],
+										);
+
+		$speed				= array (10 => 100,9 => 90,8 => 80,7 => 70,6 => 60,5 => 50,4 => 40,3 => 30,2 => 20,1 => 10 );
+
+		// TEMPLATES
+		$options_template	= gettemplate ( 'fleet/fleet_options' );
+
+		// QUERY
+		$count				= doquery("SELECT
+										(SELECT COUNT(fleet_owner) AS `actcnt` FROM {{table}}fleets WHERE `fleet_owner` = '".intval($CurrentUser['id'])."') AS max_fleet,
+										(SELECT COUNT(fleet_owner) AS `expedi` FROM {{table}}fleets WHERE `fleet_owner` = '".intval($CurrentUser['id'])."' AND `fleet_mission` = '15') AS max_expeditions" , '' , TRUE);
+
+		// LOAD TEMPLATES REQUIRED
+		$options_template	= gettemplate ( 'fleet/fleet_options' );
+
+		// LANGUAGE
+		$parse 				= $lang;
+
+		// COORDS
+		$galaxy 			= ( ( $_GET['galaxy'] == '' ) ? $CurrentPlanet['galaxy'] : $_GET['galaxy'] );
+		$system 			= ( ( $_GET['system'] == '' ) ? $CurrentPlanet['system'] : $_GET['system'] );
+		$planet 			= ( ( $_GET['planet'] == '' ) ? $CurrentPlanet['planet'] : $_GET['planet'] );
+		$planettype 		= ( ( $_GET['planet_type'] == '' ) ? $CurrentPlanet['planet_type'] : $_GET['planet_type'] );
+
+
+		// OTHER VALUES
+		$fleetid 			= $_POST['fleetid'];
+		$MaxFlyingFleets    = $count['max_fleet'];
+		$MaxExpedition      = $CurrentUser[$resource[124]];
+
+		if ($MaxExpedition >= 1)
+		{
+			$ExpeditionEnCours  = $count['max_expeditions'];
+			$EnvoiMaxExpedition = 1 + floor( $MaxExpedition / 3 );
+		}
+		else
+		{
+			$ExpeditionEnCours 	= 0;
+			$EnvoiMaxExpedition = 0;
+		}
+
+		$MaxFlottes 		= get_max_fleets ( $CurrentUser[$resource[108]] , $CurrentUser['rpg_amiral'] );
+
+		if ( !is_numeric ( $fleetid ) or empty ( $fleetid ) )
+		{
+			exit ( header ( "Location: game.php?page=fleet" ) );
+		}
+
+		if ( isset ( $_POST['add_member_to_acs'] ) && !empty ( $_POST['add_member_to_acs'] ) )
+		{
+			$added_user_id 	= 0;
+			$member_qry 		= doquery("SELECT `id` FROM {{table}} WHERE `username` ='".mysql_escape_string($_POST['addtogroup'])."' ;",'users');
+
+			while ( $row = mysql_fetch_array ( $member_qry ) )
+			{
+				$added_user_id .= $row['id'];
+			}
+
+			if ( $added_user_id > 0 )
+			{
+				$new_eingeladen_mr = mysql_escape_string($_POST['acs_invited']).','.$added_user_id;
+				doquery("UPDATE {{table}} SET `eingeladen` = '".$new_eingeladen_mr."' ;",'aks');
+				$acs_user_message = "<font color=\"lime\">".$lang['fl_player']." ".$_POST['addtogroup']." ". $lang['fl_add_to_attack'];
+			}
+			else
+			{
+				$acs_user_message = "<font color=\"red\">".$lang['fl_player']." ".$_POST['addtogroup']." ".$lang['fl_dont_exist']."";
+			}
+
+			$invite_message = $lang['fl_player'] . $CurrentUser['username'] . $lang['fl_acs_invitation_message'];
+			SendSimpleMessage ($added_user_id, $CurrentUser['id'], time(), 1, $CurrentUser['username'], $lang['fl_acs_invitation_title'], $invite_message);
+		}
+
+		$query = doquery("SELECT * FROM {{table}} WHERE fleet_id = '" . intval($fleetid) . "'", 'fleets');
+
+		if ( mysql_num_rows ( $query ) != 1 )
+		{
+			exit ( header ( "Location: game.php?page=fleet" ) );
+		}
+
+		$daten = mysql_fetch_array ( $query );
+
+		if ( $daten['fleet_start_time'] <= time() or
+			 $daten['fleet_end_time'] < time() or
+			 $daten['fleet_mess'] == 1 )
+		{
+			exit ( header ( "Location: game.php?page=fleet" ) );
+		}
+
+		if ( !isset ( $_POST['send'] ) )
+		{
+			$fleet 				= doquery("SELECT * FROM {{table}} WHERE fleet_id = '" . intval($fleetid) . "'", 'fleets', TRUE);
+
+			if ( empty ( $fleet['fleet_group'] ) )
+			{
+				$rand 			= mt_rand ( 100000 , 999999999 );
+				$acs_code 		= "AG" . $rand;
+				$acs_invited 	= intval ( $CurrentUser['id'] );
+
+				doquery ( "INSERT INTO {{table}}
+							SET
+								`name` = '" . $acs_code . "',
+								`teilnehmer` = '" . $CurrentUser['id'] . "',
+								`flotten` = '" . $fleetid . "',
+								`ankunft` = '" . $fleet['fleet_start_time'] . "',
+								`galaxy` = '" . $fleet['fleet_end_galaxy'] . "',
+								`system` = '" . $fleet['fleet_end_system'] . "',
+								`planet` = '" . $fleet['fleet_end_planet'] . "',
+								`planet_type` = '" . $fleet['fleet_end_type'] . "',
+								`eingeladen` = '" . $acs_invited . "'" , 'aks' );
+
+				$acs = doquery ( "SELECT `id`
+									FROM {{table}}
+									WHERE `name` = '" . $acs_code . "' AND
+											`teilnehmer` = '" . $CurrentUser['id'] . "' AND
+											`flotten` = '" . $fleetid . "' AND
+											`ankunft` = '" . $fleet['fleet_start_time'] . "' AND
+											`galaxy` = '" . $fleet['fleet_end_galaxy'] . "' AND
+											`system` = '" . $fleet['fleet_end_system'] . "' AND
+											`planet` = '" . $fleet['fleet_end_planet'] . "' AND
+											`eingeladen` = '" . intval($CurrentUser['id']) . "'
+											" , 'aks' , TRUE);
+
+				$acs_madnessred = doquery ( "SELECT *
+												FROM {{table}}
+												WHERE `name` = '" . $acs_code . "' AND
+														`teilnehmer` = '" . $CurrentUser['id'] . "' AND
+														`flotten` = '" . $fleetid . "' AND
+														`ankunft` = '" . $fleet['fleet_start_time'] . "' AND
+														`galaxy` = '" . $fleet['fleet_end_galaxy'] . "' AND
+														`system` = '" . $fleet['fleet_end_system'] . "' AND
+														`planet` = '" . $fleet['fleet_end_planet'] . "' AND
+														`eingeladen` = '" . intval($CurrentUser['id']) . "'
+														" , 'aks' );
+
+				doquery("UPDATE {{table}}
+							SET fleet_group = '" . intval ( $acs['id'] ) . "'
+							WHERE fleet_id = '" . intval ( $fleetid ) . "'" , 'fleets');
+			}
+			else
+			{
+				if ( $_POST['txt_name_acs'] != "" )
+				{
+					doquery ( "UPDATE {{table}}
+								SET name = '" . mysql_escape_string($_POST['txt_name_acs']) . "'
+								WHERE teilnehmer = '" . intval($CurrentUser['id']) . "'", 'aks');
+				}
+
+				$acs 			= doquery("SELECT COUNT(`id`) FROM {{table}} WHERE id = '" . intval($fleet['fleet_group']) . "'" , 'aks' , TRUE );
+				$acs_madnessred = doquery("SELECT * FROM {{table}} WHERE id = '" . intval($fleet['fleet_group']) . "'", 'aks');
+
+				if ( $acs[0] != 1 )
+				{
+					exit ( header ( "Location: game.php?page=fleet" ) );
+				}
+			}
+
+			if ( $count['max_fleet'] <> 0 or $MaxExpedition <> 0 )
+			{
+
+				$fq = doquery("SELECT * FROM {{table}} WHERE fleet_owner='".intval($CurrentUser[id])."'", "fleets");
+				$i  = 0;
+
+				while ( $f = mysql_fetch_array ( $fq ) )
+				{
+					$i++;
+
+					$parse['num']				=	$i;
+					$parse['fleet_mission']		=	$missiontype[$f[fleet_mission]];
+
+					if (($f['fleet_start_time'] + 1) == $f['fleet_end_time'])
+					{
+						$parse['tooltip']		=	$lang['fl_returning'];
+						$parse['title']			=	$lang['fl_r'];
+					}
+					else
+					{
+						$parse['tooltip']		=	$lang['fl_onway'];
+						$parse['title']			=	$lang['fl_a'];
+					}
+
+					$fleet 						= 	explode ( ";" , $f['fleet_array'] );
+					$e 							= 	0;
+
+					foreach ( $fleet as $a => $b )
+					{
+						if ( $b != '' )
+						{
+							$e++;
+							$a 					= explode(",", $b);
+							$parse['fleet']    .= $lang['tech'][$a[0]]. ":". $a[1] ."\n";
+
+							if ($e > 1)
+							{
+								$parse['fleet'].= "\t";
+							}
+						}
+					}
+
+					$parse['fleet_amount']		=	pretty_number ( $f[fleet_amount] );
+					$parse['fleet_start']		=	"[".$f[fleet_start_galaxy].":".$f[fleet_start_system].":".$f[fleet_start_planet]."]";
+					$parse['fleet_start_time']	=	date ( "d M Y H:i:s" , $f['fleet_start_time'] );
+					$parse['fleet_end']			=	"[".$f[fleet_end_galaxy].":".$f[fleet_end_system].":".$f[fleet_end_planet]."]";
+					$parse['fleet_end_time']	=	date ( "d M Y H:i:s" , $f['fleet_end_time'] );
+					$parse['fleet_arrival']		=	pretty_time ( floor ( $f['fleet_end_time'] + 1 - time() ) );
+
+					if ($f['fleet_mess'] == 0 or $f['fleet_mess'] == 2)
+					{
+						$parse['inputs']  = "<form action=\"SendFleetBack.php\" method=\"post\">";
+						$parse['inputs'] .= "<input name=\"fleetid\" value=\"". $f['fleet_id'] ."\" type=\"hidden\">";
+						$parse['inputs'] .= "<input value=\"".$lang['fl_send_back']."\" type=\"submit\" name=\"send\">";
+						$parse['inputs'] .= "</form>";
+
+						if ($f[fleet_mission] == 1)
+						{
+							$parse['inputs'] .= "<form action=\"game.php?page=fleetACS\" method=\"post\">";
+							$parse['inputs'] .= "<input name=\"fleetid\" value=\"". $f['fleet_id'] ."\" type=\"hidden\">";
+							$parse['inputs'] .= "<input value=\"".$lang['fl_acs']."\" type=\"submit\">";
+							$parse['inputs'] .= "</form>";
+						}
+					}
+					else
+					{
+						$parse['inputs'] = "&nbsp;-&nbsp;";
+					}
+
+					$flying_fleets	.= parsetemplate ( gettemplate ( 'fleet/fleet_row_fleets' ) , $parse );
+				}
+			}
+
+			if ( $i == 0 )
+			{
+				$parse['num']				=	'-';
+				$parse['fleet_mission']		=	'-';
+				$parse['title']				=	'';
+				$parse['fleet_amount']		=	'-';
+				$parse['fleet_start']		=	'-';
+				$parse['fleet_start_time']	=	'-';
+				$parse['fleet_end']			=	'-';
+				$parse['fleet_end_time']	=	'-';
+				$parse['fleet_arrival']		=	'-';
+				$parse['inputs']			=	'-';
+
+				$flying_fleets	.= parsetemplate ( gettemplate ( 'fleet/fleet_row_fleets' ) , $parse );
+			}
+
+			$parse['fleetpagerow']	=	$flying_fleets;
+
+			while ( $row = mysql_fetch_array ( $acs_madnessred ) )
+			{
+				$acs_code  			.= $row['name'];
+				$acs_invited 		.= $row['eingeladen'];
+			}
+
+			$parse['acs_code']		= $acs_code;
+			$members 				= explode ( "," , $acs_invited );
+
+			foreach ( $members as $a => $b )
+			{
+				if ( $b != '' )
+				{
+					$member_qry 	= doquery("SELECT `username` FROM {{table}} WHERE `id` ='".intval($b)."' ;",'users');
+
+					while ( $row = mysql_fetch_array ( $member_qry ) )
+					{
+						$members_option['value']	= '';
+						$members_option['selected']	= '';
+						$members_option['title']	= $row['username'];
+						$members_row    			.= parsetemplate ( $options_template , $members_option );
+					}
+				}
+			}
+
+			$parse['invited_members']		= $members_row;
+			$parse['fleetid']				= $_POST[fleetid];
+			$parse['acs_invited']			= $acs_invited;
+			$parse['add_user_message']		= $acs_user_message;
+
+			if ($MaxFlottes == $MaxFlyingFleets)
+			{
+				$parse['message_nofreeslot'] .= parsetemplate ( gettemplate ( 'fleet/fleet_noslots_row' ) , $parse );
+			}
+
+			if (!$CurrentPlanet)
+			{
+				header("location:game.php?page=fleet");
+			}
+
+			$ships							=	$lang;
+
+			foreach ($reslist['fleet'] as $n => $i)
+			{
+				if ($CurrentPlanet[$resource[$i]] > 0)
+				{
+					if ( $i == 212 )
+					{
+						$ships['fleet_max_speed'] 	= '-';
+					}
+					else
+					{
+						$ships['fleet_max_speed']	= GetFleetMaxSpeed ( "" , $i , $CurrentUser );
+					}
+
+					$ships['ship']					= 	$lang['tech'][$i];
+					$ships['amount']				= 	pretty_number ( $CurrentPlanet[$resource[$i]] );
+					$inputs['i']					=	$i;
+					$inputs['maxship']				=	$CurrentPlanet[$resource[$i]];
+					$inputs['consumption']			=	GetShipConsumption ( $i, $CurrentUser );
+					$inputs['speed']				=	GetFleetMaxSpeed ("", $i, $CurrentUser );
+					$inputs['capacity']				=	$pricelist[$i]['capacity'];
+
+					if ($i == 212)
+					{
+						$ships['max_ships']			=	'';
+						$ships['set_ships']			=	'';
+					}
+					else
+					{
+						$ships['max_ships'] 	   	= "<a href=\"javascript:maxShip('ship". $i ."'); shortInfo();\">".$lang['fl_max']."</a>";
+						$ships['set_ships'] 		= "<input name=\"ship". $i ."\" size=\"10\" value=\"0\" onfocus=\"javascript:if(this.value == '0') this.value='';\" onblur=\"javascript:if(this.value == '') this.value='0';\" alt=\"". $lang['tech'][$i] . $CurrentPlanet[$resource[$i]] ."\" onChange=\"shortInfo()\" onKeyUp=\"shortInfo()\" />";
+					}
+
+					$ship_inputs	.=	parsetemplate ( gettemplate ( 'fleet/fleet_inputs' ) , $inputs );
+					$ships_row		.= 	parsetemplate ( gettemplate ( 'fleet/fleet_row_ships' ) , $ships );
+				}
+
+				$have_ships = TRUE;
+
+				if (!$have_ships)
+				{
+					$parse['noships_row']	=	parsetemplate ( gettemplate ( 'fleet/fleet_noships_row' ) , $lang );
+				}
+				else
+				{
+					if ( $MaxFlottes > $MaxFlyingFleets )
+					{
+						$parse['none_max_selector']	=	parsetemplate ( gettemplate ( 'fleet/fleet_selectors' ) , $lang );
+						$parse['continue_button']	=	parsetemplate ( gettemplate ( 'fleet/fleet_button' ) , $lang );
+					}
+				}
+			}
+
+			$parse['acs_members']			= parsetemplate ( gettemplate ( 'fleet/fleetACS_table' ) , $parse );
+			$parse['body']					= $ships_row;
+			$parse['shipdata'] 				= $ship_inputs;
+			$parse['galaxy']				= $galaxy;
+			$parse['system']				= $system;
+			$parse['planet']				= $planet;
+			$parse['planettype']			= $planettype;
+			$parse['target_mission']		= $target_mission;
+			$parse['flyingfleets']			= $MaxFlyingFleets;
+			$parse['maxfleets']				= $MaxFlottes;
+			$parse['currentexpeditions']	= $ExpeditionEnCours;
+			$parse['maxexpeditions']		= $EnvoiMaxExpedition;
+		}
+		display ( parsetemplate ( gettemplate ( 'fleet/fleet_table' ) , $parse ) );
+	}
+}
+?>
\ No newline at end of file
diff --git a/includes/pages/class.ShowFleetPage.php b/includes/pages/class.ShowFleetPage.php
new file mode 100644
index 0000000..99c8fb9
--- /dev/null
+++ b/includes/pages/class.ShowFleetPage.php
@@ -0,0 +1,242 @@
+<?php
+
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+if(!defined('INSIDE')){ die(header("location:../../"));}
+
+class ShowFleetPage
+{
+	function __construct ( $CurrentUser , $CurrentPlanet )
+	{
+		global $lang, $reslist, $resource;
+
+		$parse				= $lang;
+
+		$count				= doquery("SELECT
+										(SELECT COUNT(fleet_owner) AS `actcnt` FROM {{table}}fleets WHERE `fleet_owner` = '".intval($CurrentUser['id'])."') AS max_fleet,
+										(SELECT COUNT(fleet_owner) AS `expedi` FROM {{table}}fleets WHERE `fleet_owner` = '".intval($CurrentUser['id'])."' AND `fleet_mission` = '15') AS max_expeditions" , '' , TRUE);
+
+		$MaxFlyingFleets    = $count['max_fleet'];
+		$MaxExpedition      = $CurrentUser[$resource[124]];
+
+		if ($MaxExpedition >= 1)
+		{
+			$ExpeditionEnCours  = $count['max_expeditions'];
+			$EnvoiMaxExpedition = 1 + floor( $MaxExpedition / 3 );
+		}
+		else
+		{
+			$ExpeditionEnCours 	= 0;
+			$EnvoiMaxExpedition = 0;
+		}
+
+		$MaxFlottes         = get_max_fleets ( $CurrentUser[$resource[108]] , $CurrentUser['rpg_amiral'] );
+
+		$missiontype = array	(
+									1 => $lang['type_mission'][1],
+									2 => $lang['type_mission'][2],
+									3 => $lang['type_mission'][3],
+									4 => $lang['type_mission'][4],
+									5 => $lang['type_mission'][5],
+									6 => $lang['type_mission'][6],
+									7 => $lang['type_mission'][7],
+									8 => $lang['type_mission'][8],
+									9 => $lang['type_mission'][9],
+									15 => $lang['type_mission'][15]
+								);
+
+		$galaxy         = intval($_GET['galaxy']);
+		$system         = intval($_GET['system']);
+		$planet         = intval($_GET['planet']);
+		$planettype     = intval($_GET['planettype']);
+		$target_mission = intval($_GET['target_mission']);
+		$ShipData       = "";
+
+		if (!$galaxy)
+			$galaxy = $CurrentPlanet['galaxy'];
+		if (!$system)
+			$system = $CurrentPlanet['system'];
+		if (!$planet)
+			$planet = $CurrentPlanet['planet'];
+		if (!$planettype)
+			$planettype = $CurrentPlanet['planet_type'];
+
+		$parse['flyingfleets']			= $MaxFlyingFleets;
+		$parse['maxfleets']				= $MaxFlottes;
+		$parse['currentexpeditions']	= $ExpeditionEnCours;
+		$parse['maxexpeditions']		= $EnvoiMaxExpedition;
+
+		if ( $count['max_fleet'] <> 0 or $MaxExpedition <> 0 )
+		{
+
+			$fq = doquery("SELECT * FROM {{table}} WHERE fleet_owner='".intval($CurrentUser[id])."'", "fleets");
+			$i  = 0;
+
+			while ( $f = mysql_fetch_array ( $fq ) )
+			{
+				$i++;
+
+				$parse['num']				=	$i;
+				$parse['fleet_mission']		=	$missiontype[$f[fleet_mission]];
+
+				if (($f['fleet_start_time'] + 1) == $f['fleet_end_time'])
+				{
+					$parse['tooltip']		=	$lang['fl_returning'];
+					$parse['title']			=	$lang['fl_r'];
+				}
+				else
+				{
+					$parse['tooltip']		=	$lang['fl_onway'];
+					$parse['title']			=	$lang['fl_a'];
+				}
+
+				$fleet 						= 	explode ( ";" , $f['fleet_array'] );
+				$e 							= 	0;
+
+				foreach ( $fleet as $a => $b )
+				{
+					if ( $b != '' )
+					{
+						$e++;
+						$a 					= explode(",", $b);
+						$parse['fleet']    .= $lang['tech'][$a[0]]. ":". $a[1] ."\n";
+
+						if ($e > 1)
+						{
+							$parse['fleet'].= "\t";
+						}
+					}
+				}
+
+				$parse['fleet_amount']		=	pretty_number ( $f[fleet_amount] );
+				$parse['fleet_start']		=	"[".$f[fleet_start_galaxy].":".$f[fleet_start_system].":".$f[fleet_start_planet]."]";
+				$parse['fleet_start_time']	=	date ( "d M Y H:i:s" , $f['fleet_start_time'] );
+				$parse['fleet_end']			=	"[".$f[fleet_end_galaxy].":".$f[fleet_end_system].":".$f[fleet_end_planet]."]";
+				$parse['fleet_end_time']	=	date ( "d M Y H:i:s" , $f['fleet_end_time'] );
+				$parse['fleet_arrival']		=	pretty_time ( floor ( $f['fleet_end_time'] + 1 - time() ) );
+
+				//now we can view the call back button for ships in maintaing position (2)
+				if ($f['fleet_mess'] == 0 or $f['fleet_mess'] == 2)
+				{
+					$parse['inputs']  = "<form action=\"SendFleetBack.php\" method=\"post\">";
+					$parse['inputs'] .= "<input name=\"fleetid\" value=\"". $f['fleet_id'] ."\" type=\"hidden\">";
+					$parse['inputs'] .= "<input value=\"".$lang['fl_send_back']."\" type=\"submit\" name=\"send\">";
+					$parse['inputs'] .= "</form>";
+
+					if ($f[fleet_mission] == 1)
+					{
+						$parse['inputs'] .= "<form action=\"game.php?page=fleetACS\" method=\"post\">";
+						$parse['inputs'] .= "<input name=\"fleetid\" value=\"". $f['fleet_id'] ."\" type=\"hidden\">";
+						$parse['inputs'] .= "<input value=\"".$lang['fl_acs']."\" type=\"submit\">";
+						$parse['inputs'] .= "</form>";
+					}
+				}
+				else
+				{
+					$parse['inputs'] = "&nbsp;-&nbsp;";
+				}
+
+				$flying_fleets	.= parsetemplate ( gettemplate ( 'fleet/fleet_row_fleets' ) , $parse );
+			}
+		}
+
+		if ( $i == 0 )
+		{
+			$parse['num']				=	'-';
+			$parse['fleet_mission']		=	'-';
+			$parse['title']				=	'';
+			$parse['fleet_amount']		=	'-';
+			$parse['fleet_start']		=	'-';
+			$parse['fleet_start_time']	=	'-';
+			$parse['fleet_end']			=	'-';
+			$parse['fleet_end_time']	=	'-';
+			$parse['fleet_arrival']		=	'-';
+			$parse['inputs']			=	'-';
+
+			$flying_fleets	.= parsetemplate ( gettemplate ( 'fleet/fleet_row_fleets' ) , $parse );
+		}
+
+		$parse['fleetpagerow'] = $flying_fleets;
+
+		if ($MaxFlottes == $MaxFlyingFleets)
+		{
+			$parse['message_nofreeslot'] .= parsetemplate ( gettemplate ( 'fleet/fleet_noslots_row' ) , $parse );
+		}
+
+		if (!$CurrentPlanet)
+		{
+			header("location:game.php?page=fleet");
+		}
+
+		$ships							=	$lang;
+
+		foreach ($reslist['fleet'] as $n => $i)
+		{
+			if ($CurrentPlanet[$resource[$i]] > 0)
+			{
+				if ( $i == 212 )
+				{
+					$ships['fleet_max_speed'] 	= '-';
+				}
+				else
+				{
+					$ships['fleet_max_speed']	= GetFleetMaxSpeed ( "" , $i , $CurrentUser );
+				}
+
+				$ships['ship']					= 	$lang['tech'][$i];
+				$ships['amount']				= 	pretty_number ( $CurrentPlanet[$resource[$i]] );
+				$inputs['i']					=	$i;
+				$inputs['maxship']				=	$CurrentPlanet[$resource[$i]];
+				$inputs['consumption']			=	GetShipConsumption ( $i, $CurrentUser );
+				$inputs['speed']				=	GetFleetMaxSpeed ("", $i, $CurrentUser );
+				$inputs['capacity']				=	$pricelist[$i]['capacity'];
+
+				if ($i == 212)
+				{
+					$ships['max_ships']			=	'';
+					$ships['set_ships']			=	'';
+				}
+				else
+				{
+					$ships['max_ships'] 	   	= "<a href=\"javascript:maxShip('ship". $i ."'); shortInfo();\">".$lang['fl_max']."</a>";
+					$ships['set_ships'] 		= "<input name=\"ship". $i ."\" size=\"10\" value=\"0\" onfocus=\"javascript:if(this.value == '0') this.value='';\" onblur=\"javascript:if(this.value == '') this.value='0';\" alt=\"". $lang['tech'][$i] . $CurrentPlanet[$resource[$i]] ."\" onChange=\"shortInfo()\" onKeyUp=\"shortInfo()\" />";
+				}
+
+				$ship_inputs	.=	parsetemplate ( gettemplate ( 'fleet/fleet_inputs' ) , $inputs );
+				$ships_row		.= 	parsetemplate ( gettemplate ( 'fleet/fleet_row_ships' ) , $ships );
+			}
+			$have_ships = TRUE;
+		}
+
+		if (!$have_ships)
+		{
+			$parse['noships_row']	=	parsetemplate ( gettemplate ( 'fleet/fleet_noships_row' ) , $lang );
+		}
+		else
+		{
+			if ( $MaxFlottes > $MaxFlyingFleets )
+			{
+				$parse['none_max_selector']	=	parsetemplate ( gettemplate ( 'fleet/fleet_selectors' ) , $lang );
+				$parse['continue_button']	=	parsetemplate ( gettemplate ( 'fleet/fleet_button' ) , $lang );
+			}
+		}
+
+		$parse['body'] 					= $ships_row;
+		$parse['shipdata'] 				= $ship_inputs;
+		$parse['galaxy']				= $galaxy;
+		$parse['system']				= $system;
+		$parse['planet']				= $planet;
+		$parse['planettype']			= $planettype;
+		$parse['target_mission']		= $target_mission;
+		$parse['envoimaxexpedition']	= $EnvoiMaxExpedition;
+		$parse['expeditionencours']		= $ExpeditionEnCours;
+		$parse['target_mission']		= $target_mission;
+
+		display(parsetemplate(gettemplate('fleet/fleet_table'), $parse));
+	}
+}
+?>
\ No newline at end of file
diff --git a/includes/pages/class.ShowFleetShortcuts.php b/includes/pages/class.ShowFleetShortcuts.php
new file mode 100644
index 0000000..986a0fa
--- /dev/null
+++ b/includes/pages/class.ShowFleetShortcuts.php
@@ -0,0 +1,186 @@
+<?php
+
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+if(!defined('INSIDE')){ die(header("location:../../"));}
+
+class ShowFleetShortcuts
+{
+	private $CurrentUser;
+
+	public function __construct($CurrentUser)
+	{
+		$this->CurrentUser=$CurrentUser;
+
+		if(!empty($_GET['mode']))
+		{
+			$mode=$_GET['mode'];
+
+			if($mode == "add" && !empty($_POST['galaxy'])&&!empty($_POST['system'])&&!empty($_POST['planet']))
+			{
+				$this->addFleetShortcuts(mysql_real_escape_string(strip_tags($_POST["name"])),intval($_POST["galaxy"]),intval($_POST["system"]),intval($_POST["planet"]),intval($_POST["moon"]));
+			}
+			elseif($mode=="edit" && isset($_GET['a']) && !empty($_POST['galaxy'])&&!empty($_POST['system'])&&!empty($_POST['planet']) )
+			{
+				$this->saveFleetShortcuts(intval($_GET['a']),mysql_real_escape_string(strip_tags($_POST["name"])),intval($_POST["galaxy"]),intval($_POST["system"]),intval($_POST["planet"]),intval($_POST["moon"]));
+			}
+			elseif($mode=="delete" && isset($_GET['a']))
+			{
+				$this->deleteFleetShortcuts(intval($_GET['a']));
+			}
+			elseif(isset($_GET['a']))
+			{
+				$this->showEditPanelWithID(intval($_GET['a']));
+			}
+			else
+			{
+				$this->showEditPanel();
+			}
+		}
+		else
+		{
+			$this->showAll();
+		}
+	}
+
+	private function showEditPanel()
+	{
+		global $lang;
+
+		$parse 					= $lang;
+		$parse['mode']			="add";
+		$parse['visibility'] 	="hidden";
+
+		display(parsetemplate(gettemplate("shortcuts/shortcuts_editPanel"),$parse));
+	}
+
+	private function showEditPanelWithID($id)
+	{
+		global $lang;
+
+		echo "entered";
+
+		$parse					= $lang;
+		$parse['shortcut_id'] 	="&a=".$id;
+		$parse['mode']			="edit";
+
+		$scarray 				= explode(";", $this->CurrentUser['fleet_shortcut']);
+		$c 						= explode(',', $scarray[$id]);
+
+		echo "name=".$id;
+
+		$parse['name']			=$c[0];
+		$parse['galaxy']		=$c[1];
+		$parse['system']		=$c[2];
+		$parse['planet']		=$c[3];
+		$parse['moon'.$c[4]]	='selected="selected"';
+      	$parse['visibility'] 	="button";
+
+		display(parsetemplate(gettemplate("shortcuts/shortcuts_editPanel"),$parse));
+	}
+
+	private function saveFleetShortcuts($id,$name,$galaxy,$system,$planet,$position,$moon)
+	{
+		$scarray 		= explode(";", $this->CurrentUser['fleet_shortcut']);
+		$scarray[$id]	="{$name},{$galaxy},{$system},{$planet},{$position},{$moon};";
+
+		$this->CurrentUser['fleet_shortcut'] = implode(";", $scarray);
+
+		doquery("UPDATE {{table}} SET fleet_shortcut='".($this->CurrentUser['fleet_shortcut'])."' WHERE id=".($this->CurrentUser['id']), "users");
+
+		header("location:game.php?page=shortcuts");
+	}
+
+    private function addFleetShortcuts($name,$galaxy,$system,$planet,$position,$moon)
+	{
+		$this->CurrentUser['fleet_shortcut'] .= "{$name},{$galaxy},{$system},{$planet},{$position},{$moon};";
+
+		doquery("UPDATE {{table}} SET fleet_shortcut='".($this->CurrentUser['fleet_shortcut'])."' WHERE id=".($this->CurrentUser['id']), "users");
+
+		header("location:game.php?page=shortcuts");
+	}
+
+	private function deleteFleetShortcuts($id)
+	{
+		$scarray = explode(";", $this->CurrentUser['fleet_shortcut']);
+
+		unset($scarray[$id]);
+
+		$this->CurrentUser['fleet_shortcut'] = implode(";", $scarray);
+
+		doquery("UPDATE {{table}} SET fleet_shortcut='".($this->CurrentUser['fleet_shortcut'])."' WHERE id=".($this->CurrentUser['id']), "users");
+
+		header("location:game.php?page=shortcuts");
+	}
+
+	private function showAll()
+	{
+		global $lang;
+
+		$parse = $lang;
+
+		if ( $this->CurrentUser['fleet_shortcut'] )
+		{
+			$scarray 	= explode(";", $this->CurrentUser['fleet_shortcut']);
+			$sx 		= TRUE;
+			$e 			= 0;
+			$ShortcutsRowTPL=gettemplate("shortcuts/shortcuts_row");
+
+			foreach ( $scarray as $a => $b )
+			{
+				if (!empty($b))
+				{
+					$c = explode(',', $b);
+
+					if ($sx)
+					{
+						$parse['block_rows'] .= "<tr height=\"20\">";
+					}
+
+					$block['shortcut_id']       = $e++;
+					$block['shortcut_name']     = $c[0];
+					$block['shortcut_galaxy']   = $c[1];
+					$block['shortcut_system']   = $c[2];
+					$block['shortcut_planet']   = $c[3];
+
+					if ($c[4] == 2)
+					{
+						$block['shortcut_moon'] =  $lang['fl_debris_shortcut'];
+					}
+					elseif ($c[4] == 3)
+					{
+						$block['shortcut_moon'] = $lang['fl_moon_shortcut'];
+					}
+					else
+					{
+						$block['shortcut_moon'] = "";
+					}
+
+					$parse['block_rows'] .= parsetemplate($ShortcutsRowTPL,$block);
+
+					if (!$sx)
+					{
+						$parse['block_rows'] .= "</tr>";
+					}
+
+					$sx=!$sx;
+				}
+			}
+			if (!$sx)
+			{
+				$parse['block_rows'] .= "<td>&nbsp;</td></tr>";
+			}
+		}
+		else
+		{
+			$parse['block_rows'] = "<th colspan=\"2\">".$lang['fl_no_shortcuts']."</th>";
+		}
+
+		display(parsetemplate(gettemplate("shortcuts/shortcuts_table"),$parse));
+	}
+}
+?>
\ No newline at end of file
diff --git a/includes/pages/class.ShowGalaxyPage.php b/includes/pages/class.ShowGalaxyPage.php
index c0ff503..e27b150 100644
--- a/includes/pages/class.ShowGalaxyPage.php
+++ b/includes/pages/class.ShowGalaxyPage.php
@@ -1,194 +1,24 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
-include_once($xgp_root . 'includes/classes/class.GalaxyRows.' . $phpEx);
+include_once(XGP_ROOT . 'includes/classes/class.GalaxyRows.php');
 
 class ShowGalaxyPage extends GalaxyRows
 {
-	private function InsertGalaxyScripts ($CurrentPlanet)
-	{
-		$Script  = "<div style=\"top: 10px;\" id=\"content\">";
-		$Script .= "<script language=\"JavaScript\">\n";
-		$Script .= "function galaxy_submit(value) {\n";
-		$Script .= "	document.getElementById('auto').name = value;\n";
-		$Script .= "	document.getElementById('galaxy_form').submit();\n";
-		$Script .= "}\n\n";
-		$Script .= "function fenster(target_url,win_name) {\n";
-		$Script .= "	var new_win = window.open(target_url,win_name,'resizable=yes,scrollbars=yes,menubar=no,toolbar=no,width=640,height=480,top=0,left=0');\n";
-		$Script .= "	new_win.focus();\n";
-		$Script .= "}\n";
-		$Script .= "</script>\n";
-		$Script .= "<script language=\"JavaScript\" src=\"scripts/tw-sack.js\"></script>\n";
-		$Script .= "<script type=\"text/javascript\">\n\n";
-		$Script .= "var ajax = new sack();\n";
-		$Script .= "var strInfo = \"\";\n";
-		$Script .= "function whenResponse () {\n";
-		$Script .= "	retVals   = this.response.split(\"|\");\n";
-		$Script .= "	Message   = retVals[0];\n";
-		$Script .= "	Infos     = retVals[1];\n";
-		$Script .= "	retVals   = Infos.split(\" \");\n";
-		$Script .= "	UsedSlots = retVals[0];\n";
-		$Script .= "	SpyProbes = retVals[1];\n";
-		$Script .= "	Recyclers = retVals[2];\n";
-		$Script .= "	Missiles  = retVals[3];\n";
-		$Script .= "	retVals   = Message.split(\";\");\n";
-		$Script .= "	CmdCode   = retVals[0];\n";
-		$Script .= "	strInfo   = retVals[1];\n";
-		$Script .= "	addToTable(\"done\", \"success\");\n";
-		$Script .= "	changeSlots( UsedSlots );\n";
-		$Script .= "	setShips(\"probes\", SpyProbes );\n";
-		$Script .= "	setShips(\"recyclers\", Recyclers );\n";
-		$Script .= "	setShips(\"missiles\", Missiles );\n";
-		$Script .= "}\n\n";
-		$Script .= "function doit (order, galaxy, system, planet, planettype, shipcount) {\n";
-		$Script .= "	ajax.requestFile = \"FleetAjax.php?action=send\";\n";
-		$Script .= "	ajax.runResponse = whenResponse;\n";
-		$Script .= "	ajax.execute = true;\n\n";
-		$Script .= "	ajax.setVar(\"thisgalaxy\", ". $CurrentPlanet["galaxy"] .");\n";
-		$Script .= "	ajax.setVar(\"thissystem\", ". $CurrentPlanet["system"] .");\n";
-		$Script .= "	ajax.setVar(\"thisplanet\", ". $CurrentPlanet["planet"] .");\n";
-		$Script .= "	ajax.setVar(\"thisplanettype\", ". $CurrentPlanet["planet_type"] .");\n";
-		$Script .= "	ajax.setVar(\"mission\", order);\n";
-		$Script .= "	ajax.setVar(\"galaxy\", galaxy);\n";
-		$Script .= "	ajax.setVar(\"system\", system);\n";
-		$Script .= "	ajax.setVar(\"planet\", planet);\n";
-		$Script .= "	ajax.setVar(\"planettype\", planettype);\n";
-		$Script .= "	if (order == 6)\n";
-		$Script .= "		ajax.setVar(\"ship210\", shipcount);\n";
-		$Script .= "	if (order == 7) {\n";
-		$Script .= "		ajax.setVar(\"ship208\", 1);\n\n";
-		$Script .= "		ajax.setVar(\"ship203\", 2);\n\n";
-		$Script .= "	}\n";
-		$Script .= "	if (order == 8)\n";
-		$Script .= "		ajax.setVar(\"ship209\", shipcount);\n\n";
-		$Script .= "	ajax.runAJAX();\n";
-		$Script .= "}\n\n";
-		$Script .= "function addToTable(strDataResult, strClass) {\n";
-		$Script .= "	var e = document.getElementById('fleetstatusrow');\n";
-		$Script .= "	var e2 = document.getElementById('fleetstatustable');\n";
-		$Script .= "	e.style.display = '';\n";
-		$Script .= "	if(e2.rows.length > 2) {\n";
-		$Script .= "		e2.deleteRow(2);\n";
-		$Script .= "	}\n";
-		$Script .= "	var row = e2.insertRow(0);\n";
-		$Script .= "	var td1 = document.createElement(\"td\");\n";
-		$Script .= "	var td1text = document.createTextNode(strInfo);\n";
-		$Script .= "	td1.appendChild(td1text);\n";
-		$Script .= "	var td2 = document.createElement(\"td\");\n";
-		$Script .= "	var span = document.createElement(\"span\");\n";
-		$Script .= "	var spantext = document.createTextNode(strDataResult);\n";
-		$Script .= "	var spanclass = document.createAttribute(\"class\");\n";
-		$Script .= "	spanclass.nodeValue = strClass;\n";
-		$Script .= "	span.setAttributeNode(spanclass);\n";
-		$Script .= "	span.appendChild(spantext);\n";
-		$Script .= "	td2.appendChild(span);\n";
-		$Script .= "	row.appendChild(td1);\n";
-		$Script .= "	row.appendChild(td2);\n";
-		$Script .= "}\n\n";
-		$Script .= "function changeSlots(slotsInUse) {\n";
-		$Script .= "	var e = document.getElementById('slots');\n";
-		$Script .= "	e.innerHTML = slotsInUse;\n";
-		$Script .= "}\n\n";
-		$Script .= "function setShips(ship, count) {\n";
-		$Script .= "	var e = document.getElementById(ship);\n";
-		$Script .= "	e.innerHTML = count;\n";
-		$Script .= "}\n";
-		$Script .= "</script>\n";
-
-		return $Script;
-	}
-
-	private function ShowGalaxyRows($Galaxy, $System, $HavePhalanx, $CurrentGalaxy, $CurrentSystem, $CurrentRC, $CurrentMIP)
-	{
-		global $planetcount, $dpath, $user, $xgp_root, $phpEx;
-
-		$UserPoints    = doquery("SELECT * FROM {{table}} WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '". intval($user['id']) ."';", 'statpoints', true);
-
-		$Result = "";
-		for ($Planet = 1; $Planet < 1+(MAX_PLANET_IN_SYSTEM); $Planet++)
-		{
-			unset($GalaxyRowPlanet);
-			unset($GalaxyRowMoon);
-			unset($GalaxyRowPlayer);
-			unset($GalaxyRowAlly);
-
-			$GalaxyRow = doquery("SELECT * FROM {{table}} WHERE `galaxy` = '".$Galaxy."' AND `system` = '".$System."' AND `planet` = '".$Planet."';", 'galaxy', true);
-
-			$Result .= "\n";
-			$Result .= "<tr>";
-
-			if ($GalaxyRow)
-			{
-				if ($GalaxyRow["id_planet"] != 0)
-				{
-					$GalaxyRowPlanet = doquery("SELECT * FROM {{table}} WHERE `id` = '". $GalaxyRow["id_planet"] ."';", 'planets', true);
-
-					if ($GalaxyRowPlanet['destruyed'] != 0 && $GalaxyRowPlanet['id_owner'] != '' && $GalaxyRow["id_planet"] != '')
-					{
-						$this->CheckAbandonPlanetState ($GalaxyRowPlanet);
-					}
-					else
-					{
-						$planetcount++;
-						$GalaxyRowPlayer = doquery("SELECT * FROM {{table}} WHERE `id` = '". $GalaxyRowPlanet["id_owner"] ."';", 'users', true);
-					}
-
-					if ($GalaxyRow["id_luna"] != 0)
-					{
-						$GalaxyRowMoon   = doquery("SELECT * FROM {{table}} WHERE `id` = '". $GalaxyRow["id_luna"] ."' AND planet_type='3';", 'planets', true);
-
-						if ($GalaxyRowMoon["destruyed"] != 0)
-						{
-							$this->CheckAbandonMoonState ($GalaxyRowMoon);
-						}
-					}
-
-					if ($GalaxyRowPlanet['id_owner'] <> 0)
-						$GalaxyRowUser     = doquery("SELECT * FROM {{table}} WHERE `id` = '". $GalaxyRowPlanet['id_owner'] ."';", 'users', true);
-					else
-						$GalaxyRowUser     = array();
-
-				}
-			}
-
-			$Result .= $this->GalaxyRowPos        ( $GalaxyRow, $Galaxy, $System, $Planet, 1 );
-			$Result .= $this->GalaxyRowPlanet     ( $GalaxyRow, $GalaxyRowPlanet, $GalaxyRowPlayer, $Galaxy, $System, $Planet, 1, $HavePhalanx, $CurrentGalaxy, $CurrentSystem);
-			$Result .= $this->GalaxyRowPlanetName ( $GalaxyRow, $GalaxyRowPlanet, $GalaxyRowPlayer, $Galaxy, $System, $Planet, 1, $HavePhalanx, $CurrentGalaxy, $CurrentSystem);
-			$Result .= $this->GalaxyRowMoon       ( $GalaxyRow, $GalaxyRowMoon  , $GalaxyRowPlayer, $Galaxy, $System, $Planet, 3 );
-			$Result .= $this->GalaxyRowDebris     ( $GalaxyRow, $GalaxyRowPlanet, $GalaxyRowPlayer, $Galaxy, $System, $Planet, 2, $CurrentRC);
-			$Result .= $this->GalaxyRowUser       ( $GalaxyRow, $GalaxyRowPlanet, $GalaxyRowPlayer, $Galaxy, $System, $Planet, 0, $UserPoints );
-			$Result .= $this->GalaxyRowAlly       ( $GalaxyRow, $GalaxyRowPlanet, $GalaxyRowPlayer, $Galaxy, $System, $Planet, 0 );
-			$Result .= $this->GalaxyRowActions    ( $GalaxyRow, $GalaxyRowPlanet, $GalaxyRowPlayer, $Galaxy, $System, $Planet, 0, $CurrentGalaxy, $CurrentSystem, $CurrentMIP);
-			$Result .= "</tr>";
-		}
-		return $Result;
-	}
+	private $planet_count = 0;
 
 	public function __construct($CurrentUser, $CurrentPlanet)
 	{
-		global $xgp_root, $phpEx, $dpath, $resource, $lang, $planetcount;
+		global $resource, $lang;
 
-		$fleetmax      	= ($CurrentUser['computer_tech'] + 1) + ($CurrentUser['rpg_commandant'] * COMMANDANT);
+		$fleetmax      	= get_max_fleets ( $CurrentUser['computer_tech'] , $CurrentUser['rpg_amiral'] );
 		$CurrentPlID   	= $CurrentPlanet['id'];
 		$CurrentMIP    	= $CurrentPlanet['interplanetary_misil'];
 		$CurrentRC     	= $CurrentPlanet['recycler'];
@@ -223,7 +53,8 @@ public function __construct($CurrentUser, $CurrentPlanet)
 		{
 			if (intval($_POST["galaxy"]))
 			{
-				$_POST["galaxy"] = ereg_replace("[^0-9]","",$_POST["galaxy"]);
+				// ereg_replace REEMPLAZADO POR preg_replace PARA PHP MAYORES A 5.3.0
+				$_POST["galaxy"] = preg_replace("[^0-9]","",$_POST["galaxy"]);
 			}
 			else
 			{
@@ -232,7 +63,8 @@ public function __construct($CurrentUser, $CurrentPlanet)
 
 			if (intval($_POST["system"]))
 			{
-				$_POST["system"] = ereg_replace("[^0-9]","",$_POST["system"]);
+				// ereg_replace REEMPLAZADO POR preg_replace PARA PHP MAYORES A 5.3.0
+				$_POST["system"] = preg_replace("[^0-9]","",$_POST["system"]);
 			}
 			else
 			{
@@ -336,27 +168,40 @@ public function __construct($CurrentUser, $CurrentPlanet)
 			$system        = intval($_GET['system']);
 		}
 		else
+
 		{
 			$galaxy        = 1;
 			$system        = 1;
 		}
 
-		if ( ( $CurrentPlanet['system'] != ( $_POST["system"] - 1 ) ) && ( $mode != 0 ) && ( $CurrentPlanet['deuterium'] < 10 ) )
+		// START FIX BY alivan
+		if ($mode != 2)
 		{
-			die (message($lang['gl_no_deuterium_to_view_galaxy'], "game.php?page=galaxy&mode=0", 2));
+			if ( ( $CurrentPlanet['system'] != ( $_POST["system"] - 1 ) ) && ( $CurrentPlanet['system'] != $_GET['system'] or $CurrentPlanet['galaxy'] != $_GET['galaxy'] ) && ( $mode != 0 ) && ( $CurrentPlanet['deuterium'] < 10 ) )
+			{
+				die (message($lang['gl_no_deuterium_to_view_galaxy'], "game.php?page=galaxy&mode=0", 2));
+			}
+			elseif( ( $CurrentPlanet['system'] != ( $_POST["system"] - 1 ) ) && ( $CurrentPlanet['system'] != $_GET['system'] or $CurrentPlanet['galaxy'] != $_GET['galaxy'] ) && ( $mode != 0 ) )
+			{
+				$QryGalaxyDeuterium   = "UPDATE {{table}} SET ";
+				$QryGalaxyDeuterium  .= "`deuterium` = `deuterium` -  10 ";
+				$QryGalaxyDeuterium  .= "WHERE ";
+				$QryGalaxyDeuterium  .= "`id` = '". $CurrentPlanet['id'] ."' ";
+				$QryGalaxyDeuterium  .= "LIMIT 1;";
+				doquery($QryGalaxyDeuterium, 'planets');
+			}
 		}
-		elseif( ( $CurrentPlanet['system'] != ( $_POST["system"] - 1 ) ) && ( $mode != 0 ) )
+		elseif ($mode == 2 && $CurrentPlanet['interplanetary_misil'] < 1)
 		{
-			$QryGalaxyDeuterium   = "UPDATE {{table}} SET ";
-			$QryGalaxyDeuterium  .= "`deuterium` = `deuterium` -  10 ";
-			$QryGalaxyDeuterium  .= "WHERE ";
-			$QryGalaxyDeuterium  .= "`id` = '". $CurrentPlanet['id'] ."' ";
-			$QryGalaxyDeuterium  .= "LIMIT 1;";
-			doquery($QryGalaxyDeuterium, 'planets');
+			die (message($lang['ma_no_missiles'], "game.php?page=galaxy&mode=0", 2));
 		}
+		// END FIX BY alivan
 
-		$planetcount = 0;
-		$lunacount   = 0;
+		$GalaxyInfo = doquery( "SELECT {{table}}galaxy.metal, {{table}}galaxy.crystal, {{table}}galaxy.id_luna, {{table}}galaxy.id_planet, {{table}}planets.galaxy, {{table}}planets.system, {{table}}planets.planet, {{table}}planets.destruyed, {{table}}planets.name, {{table}}planets.image, {{table}}planets.last_update,{{table}}planets.id_owner,{{table}}users.id, {{table}}users.ally_id, {{table}}users.bana, {{table}}users.urlaubs_modus, {{table}}users.onlinetime, {{table}}users.username,{{table}}statpoints.stat_type, {{table}}statpoints.stat_code, {{table}}statpoints.total_rank, {{table}}statpoints.total_points, {{table}}moons.diameter, {{table}}moons.temp_min, {{table}}moons.destruyed AS destruyed_moon, {{table}}moons.name AS name_moon, {{table}}alliance.ally_name, {{table}}alliance.ally_tag, {{table}}alliance.ally_web, {{table}}alliance.ally_members,{{table}}buddy.owner AS friends_owner,{{table}}buddy.sender AS friends_sender
+			FROM {{table}}alliance RIGHT JOIN ({{table}}planets AS {{table}}moons RIGHT JOIN ({{table}}statpoints RIGHT JOIN ((({{table}}planets INNER JOIN {{table}}users ON {{table}}planets.id_owner = {{table}}users.id ) INNER JOIN {{table}}galaxy ON {{table}}planets.id = {{table}}galaxy.id_planet ) LEFT JOIN {{table}}buddy ON ({{table}}buddy.owner = {{table}}planets.id_owner OR {{table}}buddy.sender = {{table}}planets.id_owner ))  ON {{table}}statpoints.id_owner={{table}}users.id AND {{table}}statpoints.stat_code=1 AND {{table}}statpoints.stat_type=1 ) ON {{table}}moons.id = {{table}}galaxy.id_luna) ON {{table}}alliance.id = {{table}}users.ally_id
+			WHERE ({{table}}galaxy.galaxy='".$galaxy."' AND {{table}}galaxy.system='".$system."' AND ({{table}}galaxy.planet>'0' AND {{table}}galaxy.planet<='".MAX_PLANET_IN_SYSTEM."'))
+			GROUP BY `id_planet`
+			ORDER BY {{table}}planets.planet; " , '' );
 
 		$parse						= $lang;
 		$parse['galaxy']			= $galaxy;
@@ -374,17 +219,97 @@ public function __construct($CurrentUser, $CurrentPlanet)
 		$parse['current_planet']	= $CurrentPlanet["planet"];
 		$parse['planet_type'] 		= $CurrentPlanet["planet_type"];
 
-		$page['galaxyscripts']		= $this->InsertGalaxyScripts ($CurrentPlanet);
+		$page['galaxyscripts']		= parsetemplate(gettemplate('galaxy/galaxy_script'), $parse);
 		$page['galaxyselector']		= parsetemplate(gettemplate('galaxy/galaxy_selector'), $parse);
 		($mode == 2) ? $page['mip'] = parsetemplate(gettemplate('galaxy/galaxy_missile_selector'), $parse) : " ";
 		$page['galaxytitles'] 		= parsetemplate(gettemplate('galaxy/galaxy_titles'), $parse);
-		$page['galaxyrows'] 		= $this->ShowGalaxyRows   ($galaxy, $system, $HavePhalanx, $CurrentGalaxy, $CurrentSystem, $CurrentRC, $CurrentMIP);
+		$page['galaxyrows'] 		= $this->ShowGalaxyRows   ($GalaxyInfo, $galaxy, $system, $HavePhalanx, $CurrentGalaxy, $CurrentSystem, $CurrentRC, $CurrentMIP);
 
-		$parse['planetcount'] 		= $planetcount ." ". $lang['gl_populed_planets'];
+		$parse['planetcount'] 		= $this->planet_count ." ". $lang['gl_populed_planets'];
 
 		$page['galaxyfooter'] 		= parsetemplate(gettemplate('galaxy/galaxy_footer'), $parse);
 
-		return display(parsetemplate(gettemplate('galaxy/galaxy_body'), $page), false);
+		return display(parsetemplate(gettemplate('galaxy/galaxy_body'), $page), FALSE);
+	}
+
+	private function ShowGalaxyRows($GalaxyQuery, $Galaxy, $System, $HavePhalanx, $CurrentGalaxy, $CurrentSystem, $CurrentRC, $CurrentMIP)
+	{
+		$rows		= '';
+		$start		= 1;
+		$template	=	gettemplate('galaxy/galaxy_row');
+
+		while ( $GalaxyInfo = mysql_fetch_array ( $GalaxyQuery ) )
+		{
+			for ($Planet = $start; $Planet < 1+(MAX_PLANET_IN_SYSTEM); $Planet++)
+			{
+				$parcialCount++;
+
+				if ( $GalaxyInfo['galaxy'] == $Galaxy && $GalaxyInfo['system'] == $System && $GalaxyInfo['planet'] == $Planet )
+				{
+					if ($GalaxyInfo["id_planet"] != 0)
+					{
+						if ($GalaxyInfo['destruyed'] != 0 && $GalaxyInfo['id_owner'] != '' && $GalaxyInfo["id_planet"] != '')
+						{
+							$this->CheckAbandonPlanetState ($GalaxyInfo);
+						}
+						else
+						{
+							$this->planet_count++;
+						}
+
+						if ($GalaxyInfo["id_luna"] != 0 && $GalaxyInfo["destruyed_moon"] != 0)
+						{
+							$this->CheckAbandonMoonState ($GalaxyInfo);
+						}
+					}
+
+					$parse['pos']  	   		= $Planet;
+					$parse['planet'] 		= $this->GalaxyRowPlanet     ( $GalaxyInfo, $Galaxy, $System, $Planet, 1, $HavePhalanx, $CurrentGalaxy, $CurrentSystem);
+					$parse['planetname'] 	= $this->GalaxyRowPlanetName ( $GalaxyInfo, $Galaxy, $System, $Planet, 1, $HavePhalanx, $CurrentGalaxy, $CurrentSystem);
+					$parse['moon'] 			= $this->GalaxyRowMoon       ( $GalaxyInfo, $Galaxy, $System, $Planet, 3 );
+					$parse['debris'] 		= $this->GalaxyRowDebris     ( $GalaxyInfo, $Galaxy, $System, $Planet, 2, $CurrentRC);
+					$parse['username'] 		= $this->GalaxyRowUser       ( $GalaxyInfo, $Galaxy, $System, $Planet );
+					$parse['alliance'] 		= $this->GalaxyRowAlly       ( $GalaxyInfo, $Galaxy, $System, $Planet );
+					$parse['actions'] 		= $this->GalaxyRowActions    ( $GalaxyInfo, $Galaxy, $System, $Planet, $CurrentGalaxy, $CurrentSystem, $CurrentMIP);
+
+					$rows	.= parsetemplate($template, $parse);
+
+					$start++;
+					break;
+				}
+				else
+				{
+					$parse['pos']			= $start;
+					$parse['planet'] 		= '';
+					$parse['planetname'] 	= '';
+					$parse['moon'] 			= '';
+					$parse['debris'] 		= '';
+					$parse['username'] 		= '';
+					$parse['alliance'] 		= '';
+					$parse['actions'] 		= '';
+
+					$rows 	.= parsetemplate($template, $parse);
+					$start++;
+				}
+			}
+		}
+
+		for ( $i = $start; $i <= MAX_PLANET_IN_SYSTEM; $i++ )
+		{
+			$parse['pos']			= $i;
+			$parse['planet'] 		= '';
+			$parse['planetname'] 	= '';
+			$parse['moon'] 			= '';
+			$parse['debris'] 		= '';
+			$parse['username'] 		= '';
+			$parse['alliance'] 		= '';
+			$parse['actions'] 		= '';
+			$rows .= parsetemplate($template, $parse);
+		}
+
+		unset($GalaxyInfo);
+
+		return	$rows;
 	}
 }
 ?>
\ No newline at end of file
diff --git a/includes/pages/class.ShowImperiumPage.php b/includes/pages/class.ShowImperiumPage.php
new file mode 100644
index 0000000..3b23c87
--- /dev/null
+++ b/includes/pages/class.ShowImperiumPage.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+if(!defined('INSIDE')){ die(header("location:../../"));}
+
+class ShowImperiumPage
+{
+	function __construct ( $CurrentUser )
+	{
+		global $lang, $resource, $reslist;
+
+		$planetsrow = doquery("
+		SELECT `id`,`name`,`galaxy`,`system`,`planet`,`planet_type`,
+		`image`,`field_current`,`field_max`,`metal`,`metal_perhour`,
+		`crystal`,`crystal_perhour`,`deuterium`,`deuterium_perhour`,
+		`energy_used`,`energy_max`,`metal_mine`,`crystal_mine`,`deuterium_sintetizer`,
+		`solar_plant`,`fusion_plant`,`robot_factory`,`nano_factory`,`hangar`,`metal_store`,
+		`crystal_store`,`deuterium_store`,`laboratory`,`terraformer`,`ally_deposit`,`silo`,
+		`small_ship_cargo`,`big_ship_cargo`,`light_hunter`,`heavy_hunter`,`crusher`,`battle_ship`,
+		`colonizer`,`recycler`,`spy_sonde`,`bomber_ship`,`solar_satelit`,`destructor`,`dearth_star`,
+		`battleship`,`misil_launcher`,`small_laser`,`big_laser`,`gauss_canyon`,`ionic_canyon`,
+		`buster_canyon`,`small_protection_shield`,`big_protection_shield`,`interceptor_misil`,
+		`interplanetary_misil`, `mondbasis`, `phalanx`, `sprungtor`
+		FROM {{table}}
+		WHERE `id_owner` = '" . intval($CurrentUser['id']) . "' AND `destruyed` = 0;", 'planets');
+
+		$parse 	= $lang;
+		$planet = array();
+
+		while ( $p = mysql_fetch_array ( $planetsrow ) )
+		{
+			$planet[] = $p;
+		}
+
+		$parse['mount'] = 	count ( $planet ) + 1;
+
+		$EmpireRowTPL	=	gettemplate ( 'empire/empire_row' );
+
+		foreach ( $planet as $p )
+		{
+			$datat	= array ( '<a href="game.php?page=overview&cp=' . $p['id'] . '&amp;re=0"><img src="' . DPATH . 'planeten/small/s_' . $p['image'] . '.jpg" border="0" height="80" width="80"></a>', $p['name'], "[<a href=\"game.php?page=galaxy&mode=3&galaxy={$p['galaxy']}&system={$p['system']}\">{$p['galaxy']}:{$p['system']}:{$p['planet']}</a>]", $p['field_current'] . '/' . $p['field_max'], '<a href="game.php?page=resources&cp=' . $p['id'] . '&amp;re=0&amp;planettype=' . $p['planet_type'] . '">' . pretty_number($p['metal']) . '</a> / ' . pretty_number($p['metal_perhour']), '<a href="game.php?page=resources&cp=' . $p['id'] . '&amp;re=0&amp;planettype=' . $p['planet_type'] . '">' . pretty_number($p['crystal']) . '</a> / ' . pretty_number($p['crystal_perhour']), '<a href="game.php?page=resources&cp=' . $p['id'] . '&amp;re=0&amp;planettype=' . $p['planet_type'] . '">' . pretty_number($p['deuterium']) . '</a> / ' . pretty_number($p['deuterium_perhour']), pretty_number($p['energy_max'] - $p['energy_used']) . ' / ' . pretty_number($p['energy_max']));
+			$f 		= array ( 'file_images' , 'file_names' , 'file_coordinates' , 'file_fields' , 'file_metal', 'file_crystal' , 'file_deuterium' , 'file_energy' );
+
+			for ($k = 0; $k < 8; $k++)
+			{
+				$data['text'] = $datat[$k];
+				$parse[$f[$k]] .= parsetemplate($EmpireRowTPL, $data);
+			}
+
+			foreach ($resource as $i => $res)
+			{
+				$data['text'] = ($p[$resource[$i]] == 0 && $CurrentUser[$resource[$i]] == 0) ? '-' : ((in_array($i, $reslist['build'])) ? "<a href=\"game.php?page=buildings&cp={$p['id']}&amp;re=0&amp;planettype={$p['planet_type']}\">{$p[$resource[$i]]}</a>" : ((in_array($i, $reslist['tech'])) ? "<a href=\"game.php?page=buildings&mode=research&cp={$p['id']}&amp;re=0&amp;planettype={$p['planet_type']}\">{$CurrentUser[$resource[$i]]}</a>" : ((in_array($i, $reslist['fleet'])) ? "<a href=\"game.php?page=buildings&mode=fleet&cp={$p['id']}&amp;re=0&amp;planettype={$p['planet_type']}\">{$p[$resource[$i]]}</a>" : ((in_array($i, $reslist['defense'])) ? "<a href=\"game.php?page=buildings&mode=defense&cp={$p['id']}&amp;re=0&amp;planettype={$p['planet_type']}\">{$p[$resource[$i]]}</a>" : '-'))));
+				$r[$i] .= parsetemplate($EmpireRowTPL, $data);
+			}
+		}
+
+		$m = array ( 'build' , 'tech' , 'fleet' , 'defense' );
+		$n = array ( 'building_row' , 'technology_row' , 'fleet_row' , 'defense_row' );
+
+		for ( $j = 0; $j < 4; $j++ )
+		{
+			foreach ( $reslist[$m[$j]] as $a => $i )
+			{
+				$data['text'] 	= $lang['tech'][$i];
+				$parse[$n[$j]] .= "<tr>" . parsetemplate ( $EmpireRowTPL , $data ) . $r[$i] . "</tr>";
+			}
+		}
+
+		return display ( parsetemplate ( gettemplate ( 'empire/empire_table' ) , $parse ) , FALSE );
+	}
+}
+?>
\ No newline at end of file
diff --git a/includes/pages/class.ShowInfosPage.php b/includes/pages/class.ShowInfosPage.php
index 8cf13f6..91a7d58 100644
--- a/includes/pages/class.ShowInfosPage.php
+++ b/includes/pages/class.ShowInfosPage.php
@@ -1,538 +1,525 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2012
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
 class ShowInfosPage
 {
-	private function GetNextJumpWaitTime($CurMoon)
-	{
-		global $resource;
-
-		$JumpGateLevel  = $CurMoon[$resource[43]];
-		$LastJumpTime   = $CurMoon['last_jump_time'];
-		if ($JumpGateLevel > 0)
-		{
-			$WaitBetweenJmp = (60 * 60) * (1 / $JumpGateLevel);
-			$NextJumpTime   = $LastJumpTime + $WaitBetweenJmp;
-			if ($NextJumpTime >= time())
-			{
-				$RestWait   = $NextJumpTime - time();
-				$RestString = " ". pretty_time($RestWait);
-			}
-			else
-			{
-				$RestWait   = 0;
-				$RestString = "";
-			}
-		}
-		else
-		{
-			$RestWait   = 0;
-			$RestString = "";
-		}
-		$RetValue['string'] = $RestString;
-		$RetValue['value']  = $RestWait;
-
-		return $RetValue;
-	}
-
-	private function DoFleetJump ($CurrentUser, $CurrentPlanet)
-	{
-		global $resource, $lang;
-
-		$inp_ok	= TRUE;
-		for ($Ship = 300; $Ship > 200; $Ship-- )
-		{
-			if ($resource[$Ship] != "")
-			{
-				if ($CurrentPlanet[$resource[$Ship]] > 0)
-				{
-					$bla['c' .strval($Ship)]= $CurrentPlanet[$resource[$Ship]];
-				}
-			}
-		}
-
-		$keyPOST	= array_keys($_POST);
-		$keyBLA		= array_keys($bla);
-		$pos	= 0;
-		$pos2	= 0;
-
-		foreach ($_POST as &$fldp)
-		{
-			if (is_numeric($fldp))
-			{
-				foreach ($bla as &$fmax)
-				{
-					if ($keyPOST[$pos]==$keyBLA[$pos2])
-					{
-						if (!($fldp >= 0 && $fldp <= $fmax))
-						{
-							$inp_ok=FALSE;
-						}
-					}
-					$pos2++;
-				}
-				$pos2=0;
-
-			}
-			else
-			{
-				$inp_ok=FALSE;
-			}
-			$pos++;
-		}
-
+    private function GetNextJumpWaitTime($CurMoon)
+    {
+        global $resource;
+
+        $JumpGateLevel  = $CurMoon[$resource[43]];
+        $LastJumpTime   = $CurMoon['last_jump_time'];
+        if ($JumpGateLevel > 0)
+        {
+            $WaitBetweenJmp = (60 * 60) * (1 / $JumpGateLevel);
+            $NextJumpTime   = $LastJumpTime + $WaitBetweenJmp;
+            if ($NextJumpTime >= time())
+            {
+                $RestWait   = $NextJumpTime - time();
+                $RestString = " ". pretty_time($RestWait);
+            }
+            else
+            {
+                $RestWait   = 0;
+                $RestString = "";
+            }
+        }
+        else
+        {
+            $RestWait   = 0;
+            $RestString = "";
+        }
+        $RetValue['string'] = $RestString;
+        $RetValue['value']  = $RestWait;
+
+        return $RetValue;
+    }
+
+    private function DoFleetJump ($CurrentUser, $CurrentPlanet)
+    {
+        global $resource, $lang;
+
+        $inp_ok    = TRUE;
+        for ($Ship = 300; $Ship > 200; $Ship-- )
+        {
+            if ($resource[$Ship] != "")
+            {
+                if ($CurrentPlanet[$resource[$Ship]] > 0)
+                {
+                    $bla['c' .strval($Ship)]= $CurrentPlanet[$resource[$Ship]];
+                }
+            }
+        }
+
+        $keyPOST    = array_keys($_POST);
+        $keyBLA        = array_keys($bla);
+        $pos    = 0;
+        $pos2    = 0;
+
+        foreach ($_POST as &$fldp)
+        {
+            if (is_numeric($fldp))
+            {
+                foreach ($bla as &$fmax)
+                {
+                    if ($keyPOST[$pos]==$keyBLA[$pos2])
+                    {
+                        if (!($fldp >= 0 && $fldp <= $fmax))
+                        {
+                            $inp_ok=FALSE;
+                        }
+                    }
+                    $pos2++;
+                }
+                $pos2=0;
+
+            }
+            else
+            {
+                $inp_ok=FALSE;
+            }
+            $pos++;
+        }
+
+    	//fix redirect by quaua
 		if ($inp_ok == FALSE)
-		{
-			header("location:overview.php");
-		}
-
-		if ($_POST)
-		{
-			$RestString   = $this->GetNextJumpWaitTime ($CurrentPlanet);
-			$NextJumpTime = $RestString['value'];
-			$JumpTime     = time();
-
-			if ( $NextJumpTime == 0 )
-			{
-				$TargetPlanet = $_POST['jmpto'];
-				$TargetGate   = doquery ( "SELECT `id`, `sprungtor`, `last_jump_time` FROM {{table}} WHERE `id` = '". intval($TargetPlanet) ."';", 'planets', true);
-
-				if ($TargetGate['sprungtor'] > 0)
-				{
-					$RestString   = $this->GetNextJumpWaitTime ( $TargetGate );
-					$NextDestTime = $RestString['value'];
-
-					if ( $NextDestTime == 0 )
-					{
-						$ShipArray   = array();
-						$SubQueryOri = "";
-						$SubQueryDes = "";
-
-						for ( $Ship = 200; $Ship < 300; $Ship++ )
-						{
-							$ShipLabel = "c". $Ship;
-
-							$gemi_kontrol	=	abs(intval($_POST[ $ShipLabel ]));
-
-							if ( $gemi_kontrol > $CurrentPlanet[ $resource[ $Ship ] ] && ctype_digit($_POST[ $ShipLabel ]))
-							{
-								$ShipArray[ $Ship ] = $CurrentPlanet[ $resource[ $Ship ] ];
-							}
-							else
-							{
-								$ShipArray[ $Ship ] = $gemi_kontrol;
-							}
-
-							if ($ShipArray[ $Ship ] <> 0)
-							{
-								$SubQueryOri .= "`". $resource[ $Ship ] ."` = `". $resource[ $Ship ] ."` - '". $ShipArray[ $Ship ] ."', ";
-								$SubQueryDes .= "`". $resource[ $Ship ] ."` = `". $resource[ $Ship ] ."` + '". $ShipArray[ $Ship ] ."', ";
-							}
-						}
-
-						if ($SubQueryOri != "")
-						{
-							$QryUpdateOri  = "UPDATE {{table}} SET ";
-							$QryUpdateOri .= $SubQueryOri;
-							$QryUpdateOri .= "`last_jump_time` = '". $JumpTime ."' ";
-							$QryUpdateOri .= "WHERE ";
-							$QryUpdateOri .= "`id` = '". $CurrentPlanet['id'] ."';";
-							doquery ( $QryUpdateOri, 'planets');
-
-							$QryUpdateDes  = "UPDATE {{table}} SET ";
-							$QryUpdateDes .= $SubQueryDes;
-							$QryUpdateDes .= "`last_jump_time` = '". $JumpTime ."' ";
-							$QryUpdateDes .= "WHERE ";
-							$QryUpdateDes .= "`id` = '". $TargetGate['id'] ."';";
-							doquery ( $QryUpdateDes, 'planets');
-
-							$QryUpdateUsr  = "UPDATE {{table}} SET ";
-							$QryUpdateUsr .= "`current_planet` = '". $TargetGate['id'] ."' ";
-							$QryUpdateUsr .= "WHERE ";
-							$QryUpdateUsr .= "`id` = '". $CurrentUser['id'] ."';";
-							doquery ( $QryUpdateUsr, 'users');
-
-							$CurrentPlanet['last_jump_time'] = $JumpTime;
-							$RestString    = $this->GetNextJumpWaitTime ( $CurrentPlanet );
-							$RetMessage    = $lang['in_jump_gate_done'] . $RestString['string'];
-						}
-						else
-						{
-							$RetMessage = $lang['in_jump_gate_error_data'];
-						}
-					}
-					else
-					{
-						$RetMessage = $lang['in_jump_gate_not_ready_target'] . $RestString['string'];
-					}
-				}
-				else
-				{
-					$RetMessage = $lang['in_jump_gate_doesnt_have_one'];
-				}
-			}
-			else
-			{
-				$RetMessage = $lang['in_jump_gate_already_used'] . $RestString['string'];
-			}
-		}
-		else
-		{
-			$RetMessage = $lang['in_jump_gate_error_data'];
-		}
-
-		return $RetMessage;
-	}
-
-	private function BuildFleetListRows ($CurrentPlanet)
-	{
-		global $resource, $lang;
-
-		$RowsTPL  = gettemplate('infos/info_gate_rows');
-		$CurrIdx  = 1;
-		$Result   = "";
-		for ($Ship = 300; $Ship > 200; $Ship-- )
-		{
-			if ($resource[$Ship] != "")
-			{
-				if ($CurrentPlanet[$resource[$Ship]] > 0)
-				{
-					$bloc['idx']             = $CurrIdx;
-					$bloc['fleet_id']        = $Ship;
-					$bloc['fleet_name']      = $lang['tech'][$Ship];
-					$bloc['fleet_max']       = pretty_number ( $CurrentPlanet[$resource[$Ship]] );
-					$bloc['gate_ship_dispo'] = $lang['in_jump_gate_available'];
-					$Result                 .= parsetemplate ( $RowsTPL, $bloc );
-					$CurrIdx++;
-				}
-			}
-		}
-		return $Result;
-	}
-
-	private function BuildJumpableMoonCombo ( $CurrentUser, $CurrentPlanet )
-	{
-		global $resource;
-		$QrySelectMoons  = "SELECT * FROM {{table}} WHERE `planet_type` = '3' AND `id_owner` = '". intval($CurrentUser['id']) ."';";
-		$MoonList        = doquery ( $QrySelectMoons, 'planets');
-		$Combo           = "";
-		while ( $CurMoon = mysql_fetch_assoc($MoonList) )
-		{
-			if ( $CurMoon['id'] != $CurrentPlanet['id'] )
-			{
-				$RestString = $this->GetNextJumpWaitTime ( $CurMoon );
-				if ($CurMoon[$resource[43]] >= 1)
-					$Combo .= "<option value=\"". $CurMoon['id'] ."\">[". $CurMoon['galaxy'] .":". $CurMoon['system'] .":". $CurMoon['planet'] ."] ". $CurMoon['name'] . $RestString['string'] ."</option>\n";
-			}
-		}
-		return $Combo;
-	}
-
-	private function ShowProductionTable ($CurrentUser, $CurrentPlanet, $BuildID, $Template)
-	{
-		global $ProdGrid, $resource, $game_config;
-
-		$BuildLevelFactor = $CurrentPlanet[ $resource[$BuildID]."_porcent" ];
-		$BuildTemp        = $CurrentPlanet[ 'temp_max' ];
-		$CurrentBuildtLvl = $CurrentPlanet[ $resource[$BuildID] ];
-
-		$BuildLevel       = ($CurrentBuildtLvl > 0) ? $CurrentBuildtLvl : 1;
-		$Prod[1]          = (floor(eval($ProdGrid[$BuildID]['formule']['metal'])     * $game_config['resource_multiplier']) * (1 + ($CurrentUser['rpg_geologue']  * GEOLOGUE)));
-		$Prod[2]          = (floor(eval($ProdGrid[$BuildID]['formule']['crystal'])   * $game_config['resource_multiplier']) * (1 + ($CurrentUser['rpg_geologue']  * GEOLOGUE)));
-		$Prod[3]          = (floor(eval($ProdGrid[$BuildID]['formule']['deuterium']) * $game_config['resource_multiplier']) * (1 + ($CurrentUser['rpg_geologue']  * GEOLOGUE)));
-
-		if( $BuildID >= 4 )
-			$Prod[4] = (floor(eval($ProdGrid[$BuildID]['formule']['energy'])    * $game_config['resource_multiplier']) * (1 + ($CurrentUser['rpg_ingenieur'] * INGENIEUR)));
-		else
-			$Prod[4] = (floor(eval($ProdGrid[$BuildID]['formule']['energy'])    * $game_config['resource_multiplier']));
-
-		$ActualProd       = floor($Prod[$BuildID]);
-
-		if ($BuildID != 12)
-			$ActualNeed       = floor($Prod[4]);
-		else
-			$ActualNeed       = floor($Prod[3]);
-
-		$BuildStartLvl    = $CurrentBuildtLvl - 2;
-		if ($BuildStartLvl < 1)
-			$BuildStartLvl = 1;
-
-		$Table     = "";
-		$ProdFirst = 0;
-
-		for ( $BuildLevel = $BuildStartLvl; $BuildLevel < $BuildStartLvl + 15; $BuildLevel++ )
-		{
-			if ($BuildID != 42)
-			{
-				$Prod[1] = (floor(eval($ProdGrid[$BuildID]['formule']['metal'])     * $game_config['resource_multiplier']) * (1 + ($CurrentUser['rpg_geologue']  * GEOLOGUE)));
-				$Prod[2] = (floor(eval($ProdGrid[$BuildID]['formule']['crystal'])   * $game_config['resource_multiplier']) * (1 + ($CurrentUser['rpg_geologue']  * GEOLOGUE)));
-				$Prod[3] = (floor(eval($ProdGrid[$BuildID]['formule']['deuterium']) * $game_config['resource_multiplier']) * (1 + ($CurrentUser['rpg_geologue']  * GEOLOGUE)));
-
-				if( $BuildID >= 4 )
-					$Prod[4] = (floor(eval($ProdGrid[$BuildID]['formule']['energy'])    * $game_config['resource_multiplier']) * (1 + ($CurrentUser['rpg_ingenieur'] * INGENIEUR)));
-				else
-					$Prod[4] = (floor(eval($ProdGrid[$BuildID]['formule']['energy'])    * $game_config['resource_multiplier']));
-
-				$bloc['build_lvl']       = ($CurrentBuildtLvl == $BuildLevel) ? "<font color=\"#ff0000\">".$BuildLevel."</font>" : $BuildLevel;
-
-				if ($ProdFirst > 0)
-					if ($BuildID != 12)
-						$bloc['build_gain']      = "<font color=\"lime\">(". pretty_number(floor($Prod[$BuildID] - $ProdFirst)) .")</font>";
-					else
-						$bloc['build_gain']      = "<font color=\"lime\">(". pretty_number(floor($Prod[4] - $ProdFirst)) .")</font>";
-				else
-					$bloc['build_gain']      = "";
-
-				if ($BuildID != 12)
-				{
-					$bloc['build_prod']      = pretty_number(floor($Prod[$BuildID]));
-					$bloc['build_prod_diff'] = colorNumber( pretty_number(floor($Prod[$BuildID] - $ActualProd)) );
-					$bloc['build_need']      = colorNumber( pretty_number(floor($Prod[4])) );
-					$bloc['build_need_diff'] = colorNumber( pretty_number(floor($Prod[4] - $ActualNeed)) );
-				}
-				else
-				{
-					$bloc['build_prod']      = pretty_number(floor($Prod[4]));
-					$bloc['build_prod_diff'] = colorNumber( pretty_number(floor($Prod[4] - $ActualProd)) );
-					$bloc['build_need']      = colorNumber( pretty_number(floor($Prod[3])) );
-					$bloc['build_need_diff'] = colorNumber( pretty_number(floor($Prod[3] - $ActualNeed)) );
-				}
-				if ($ProdFirst == 0)
-				{
-					if ($BuildID != 12)
-						$ProdFirst = floor($Prod[$BuildID]);
-					else
-						$ProdFirst = floor($Prod[4]);
-				}
-			}
-			else
-			{
-				$bloc['build_lvl']       = ($CurrentBuildtLvl == $BuildLevel) ? "<font color=\"#ff0000\">".$BuildLevel."</font>" : $BuildLevel;
-				$bloc['build_range']     = ($BuildLevel * $BuildLevel) - 1;
-			}
-			$Table    .= parsetemplate($Template, $bloc);
-		}
-
-		return $Table;
-	}
-
-	private function ShowRapidFireTo ($BuildID)
-	{
-		global $lang, $CombatCaps;
-		$ResultString = "";
-		for ($Type = 200; $Type < 500; $Type++)
-		{
-			if ($CombatCaps[$BuildID]['sd'][$Type] > 1)
-				$ResultString .= $lang['in_rf_again']. " ". $lang['tech'][$Type] ." <font color=\"#00ff00\">".$CombatCaps[$BuildID]['sd'][$Type]."</font><br>";
-		}
-		return $ResultString;
-	}
-
-	private function ShowRapidFireFrom ($BuildID)
-	{
-		global $lang, $CombatCaps;
-
-		$ResultString = "";
-		for ($Type = 200; $Type < 500; $Type++)
-		{
-			if ($CombatCaps[$Type]['sd'][$BuildID] > 1)
-				$ResultString .= $lang['in_rf_from']. " ". $lang['tech'][$Type] ." <font color=\"#ff0000\">".$CombatCaps[$Type]['sd'][$BuildID]."</font><br>";
-		}
-		return $ResultString;
-	}
-
-	public function __construct ($CurrentUser, $CurrentPlanet, $BuildID)
-	{
-		global $dpath, $lang, $resource, $pricelist, $CombatCaps, $phpEx, $xgp_root;
-
-		$GateTPL              = '';
-		$DestroyTPL           = '';
-		$TableHeadTPL         = '';
-
-		$parse                = $lang;
-		$parse['dpath']       = $dpath;
-		$parse['name']        = $lang['info'][$BuildID]['name'];
-		$parse['image']       = $BuildID;
-		$parse['description'] = $lang['info'][$BuildID]['description'];
-
-		if ($BuildID >=   1 && $BuildID <=   3)
-		{
-			$PageTPL              = gettemplate('infos/info_buildings_table');
-			$DestroyTPL           = gettemplate('infos/info_buildings_destroy');
-			$TableHeadTPL         = "<tr><td class=\"c\">{in_level}</td><td class=\"c\">{in_prod_p_hour}</td><td class=\"c\">{in_difference}</td><td class=\"c\">{in_used_energy}</td><td class=\"c\">{in_difference}</td></tr>";
-			$TableTPL             = "<tr><th>{build_lvl}</th><th>{build_prod} {build_gain}</th><th>{build_prod_diff}</th><th>{build_need}</th><th>{build_need_diff}</th></tr>";
-		}
-		elseif ($BuildID ==   4)
-		{
-			$PageTPL              = gettemplate('infos/info_buildings_table');
-			$DestroyTPL           = gettemplate('infos/info_buildings_destroy');
-			$TableHeadTPL         = "<tr><td class=\"c\">{in_level}</td><td class=\"c\">{in_prod_energy}</td><td class=\"c\">{in_difference}</td></tr>";
-			$TableTPL             = "<tr><th>{build_lvl}</th><th>{build_prod} {build_gain}</th><th>{build_prod_diff}</th></tr>";
-		}
-		elseif ($BuildID ==  12)
-		{
-			$PageTPL              = gettemplate('infos/info_buildings_table');
-			$DestroyTPL           = gettemplate('infos/info_buildings_destroy');
-			$TableHeadTPL         = "<tr><td class=\"c\">{in_level}</td><td class=\"c\">{in_prod_energy}</td><td class=\"c\">{in_difference}</td><td class=\"c\">{in_used_deuter}</td><td class=\"c\">{in_difference}</td></tr>";
-			$TableTPL             = "<tr><th>{build_lvl}</th><th>{build_prod} {build_gain}</th><th>{build_prod_diff}</th><th>{build_need}</th><th>{build_need_diff}</th></tr>";
-		}
-		elseif ($BuildID >=  14 && $BuildID <=  32)
-		{
-			$PageTPL              = gettemplate('infos/info_buildings_general');
-			$DestroyTPL           = gettemplate('infos/info_buildings_destroy');
-		}
-		elseif ($BuildID ==  33)
-		{
-			$PageTPL              = gettemplate('infos/info_buildings_general');
-		}
-		elseif ($BuildID ==  34)
-		{
-			$PageTPL              = gettemplate('infos/info_buildings_general');
-			$DestroyTPL           = gettemplate('infos/info_buildings_destroy');
-		}
-		elseif ($BuildID ==  44)
-		{
-			$PageTPL              = gettemplate('infos/info_buildings_general');
-			$DestroyTPL           = gettemplate('infos/info_buildings_destroy');
-		}
-		elseif ($BuildID ==  41)
-		{
-			$PageTPL              = gettemplate('infos/info_buildings_general');
-		}
-		elseif ($BuildID ==  42)
-		{
-			$PageTPL              = gettemplate('infos/info_buildings_table');
-			$TableHeadTPL         = "<tr><td class=\"c\">{in_level}</td><td class=\"c\">{in_range}</td></tr>";
-			$TableTPL             = "<tr><th>{build_lvl}</th><th>{build_range}</th></tr>";
-			$DestroyTPL           = gettemplate('infos/info_buildings_destroy');
-		}
-		elseif ($BuildID ==  43)
-		{
-			$PageTPL              = gettemplate('infos/info_buildings_general');
-			$GateTPL              = gettemplate('infos/info_gate_table');
-			$DestroyTPL           = gettemplate('infos/info_buildings_destroy');
-
-			if($_POST)
-				message($this->DoFleetJump($CurrentUser, $CurrentPlanet), "game.php?page=infos&gid=43", 2);
-		}
-		elseif ($BuildID >= 106 && $BuildID <= 199)
-		{
-			$PageTPL              = gettemplate('infos/info_buildings_general');
-		}
-		elseif ($BuildID >= 202 && $BuildID <= 224)
-		{
-			$PageTPL              = gettemplate('infos/info_buildings_fleet');
-			$parse['element_typ'] = $lang['tech'][200];
-			$parse['rf_info_to']  = $this->ShowRapidFireTo($BuildID);
-			$parse['rf_info_fr']  = $this->ShowRapidFireFrom($BuildID);
-			$parse['hull_pt']     = pretty_number ($pricelist[$BuildID]['metal'] + $pricelist[$BuildID]['crystal']);
-			$parse['shield_pt']   = pretty_number ($CombatCaps[$BuildID]['shield']);
-			$parse['attack_pt']   = pretty_number ($CombatCaps[$BuildID]['attack']);
-			$parse['capacity_pt'] = pretty_number ($pricelist[$BuildID]['capacity']);
-			$parse['base_speed']  = pretty_number ($pricelist[$BuildID]['speed']);
-			$parse['base_conso']  = pretty_number ($pricelist[$BuildID]['consumption']);
-			if ($BuildID == 202)
-			{
-				$parse['upd_speed']   = "<font color=\"yellow\">(". pretty_number ($pricelist[$BuildID]['speed2']) .")</font>";
-				$parse['upd_conso']   = "<font color=\"yellow\">(". pretty_number ($pricelist[$BuildID]['consumption2']) .")</font>";
-			}
-			elseif ($BuildID == 211)
-				$parse['upd_speed']   = "<font color=\"yellow\">(". pretty_number ($pricelist[$BuildID]['speed2']) .")</font>";
-		}
-		elseif ($BuildID >= 401 && $BuildID <= 411)
-		{
-			$PageTPL              = gettemplate('infos/info_buildings_defense');
-			$parse['element_typ'] = $lang['tech'][400];
-
-			$parse['rf_info_to']  = $this->ShowRapidFireTo ($BuildID);
-			$parse['rf_info_fr']  = $this->ShowRapidFireFrom ($BuildID);
-			$parse['hull_pt']     = pretty_number ($pricelist[$BuildID]['metal'] + $pricelist[$BuildID]['crystal']);
-			$parse['shield_pt']   = pretty_number ($CombatCaps[$BuildID]['shield']);
-			$parse['attack_pt']   = pretty_number ($CombatCaps[$BuildID]['attack']);
-		}
-		elseif ($BuildID >= 502 && $BuildID <= 503)
-		{
-			$PageTPL              = gettemplate('infos/info_buildings_defense');
-			$parse['element_typ'] = $lang['tech'][400];
-			$parse['hull_pt']     = pretty_number ($pricelist[$BuildID]['metal'] + $pricelist[$BuildID]['crystal']);
-			$parse['shield_pt']   = pretty_number ($CombatCaps[$BuildID]['shield']);
-			$parse['attack_pt']   = pretty_number ($CombatCaps[$BuildID]['attack']);
-		}
-		elseif ($BuildID >= 601 && $BuildID <= 615)
-			$PageTPL              = gettemplate('infos/info_officiers_general');
-
-		if ($TableHeadTPL != '')
-		{
-			$parse['table_head']  = parsetemplate ($TableHeadTPL, $lang);
-			$parse['table_data']  = $this->ShowProductionTable ($CurrentUser, $CurrentPlanet, $BuildID, $TableTPL);
-		}
-
-		$page  = parsetemplate($PageTPL, $parse);
-		if ($GateTPL != '')
-		{
-			if ($CurrentPlanet[$resource[$BuildID]] > 0)
-			{
-				$RestString               = $this->GetNextJumpWaitTime ( $CurrentPlanet );
-				$parse['gate_start_link'] = BuildPlanetAdressLink ( $CurrentPlanet );
-				if ($RestString['value'] != 0)
-				{
-					include($xgp_root . 'includes/functions/InsertJavaScriptChronoApplet.' . $phpEx);
-
-					$parse['gate_time_script'] = InsertJavaScriptChronoApplet ( "Gate", "1", $RestString['value'], true );
-					$parse['gate_wait_time']   = "<div id=\"bxx". "Gate" . "1" ."\"></div>";
-					$parse['gate_script_go']   = InsertJavaScriptChronoApplet ( "Gate", "1", $RestString['value'], false );
-				}
-				else
-				{
-					$parse['gate_time_script'] = "";
-					$parse['gate_wait_time']   = "";
-					$parse['gate_script_go']   = "";
-				}
-				$parse['gate_dest_moons'] = $this->BuildJumpableMoonCombo ($CurrentUser, $CurrentPlanet);
-				$parse['gate_fleet_rows'] = $this->BuildFleetListRows ($CurrentPlanet);
-				$page .= parsetemplate($GateTPL, $parse);
-			}
-		}
-
-		if ($DestroyTPL != '')
-		{
-			if ($CurrentPlanet[$resource[$BuildID]] > 0)
-			{
-				$NeededRessources     = GetBuildingPrice ($CurrentUser, $CurrentPlanet, $BuildID, true, true);
-				$DestroyTime          = GetBuildingTime  ($CurrentUser, $CurrentPlanet, $BuildID) / 2;
-				$parse['destroyurl']  = "game.php?page=buildings&cmd=destroy&building=".$BuildID;
-				$parse['levelvalue']  = $CurrentPlanet[$resource[$BuildID]];
-				$parse['nfo_metal']   = $lang['Metal'];
-				$parse['nfo_crysta']  = $lang['Crystal'];
-				$parse['nfo_deuter']  = $lang['Deuterium'];
-				$parse['metal']       = pretty_number ($NeededRessources['metal']);
-				$parse['crystal']     = pretty_number ($NeededRessources['crystal']);
-				$parse['deuterium']   = pretty_number ($NeededRessources['deuterium']);
-				$parse['destroytime'] = pretty_time   ($DestroyTime);
-				$page .= parsetemplate($DestroyTPL, $parse);
-			}
-		}
-		return display($page);
-	}
-}
-?>
\ No newline at end of file
+        {
+            header("location:game.php?page=infos&gid=43");
+        }
+
+        if ($_POST)
+        {
+            $RestString   = $this->GetNextJumpWaitTime ($CurrentPlanet);
+            $NextJumpTime = $RestString['value'];
+            $JumpTime     = time();
+
+            if ( $NextJumpTime == 0 )
+            {
+                $TargetPlanet = $_POST['jmpto'];
+                $TargetGate   = doquery ( "SELECT `id`, `sprungtor`, `last_jump_time` FROM {{table}} WHERE `id` = '". intval($TargetPlanet) ."';", 'planets', TRUE);
+
+                if ($TargetGate['sprungtor'] > 0)
+                {
+                    $RestString   = $this->GetNextJumpWaitTime ( $TargetGate );
+                    $NextDestTime = $RestString['value'];
+
+                    if ( $NextDestTime == 0 )
+                    {
+                        $ShipArray   = array();
+                        $SubQueryOri = "";
+                        $SubQueryDes = "";
+
+                        for ( $Ship = 200; $Ship < 300; $Ship++ )
+                        {
+                            $ShipLabel = "c". $Ship;
+
+                            $gemi_kontrol    =    abs(intval($_POST[ $ShipLabel ]));
+
+                            if ( $gemi_kontrol > $CurrentPlanet[ $resource[ $Ship ] ] && ctype_digit($_POST[ $ShipLabel ]))
+                            {
+                                $ShipArray[ $Ship ] = $CurrentPlanet[ $resource[ $Ship ] ];
+                            }
+                            else
+                            {
+                                $ShipArray[ $Ship ] = $gemi_kontrol;
+                            }
+
+                            if ($ShipArray[ $Ship ] <> 0)
+                            {
+                                $SubQueryOri .= "`". $resource[ $Ship ] ."` = `". $resource[ $Ship ] ."` - '". $ShipArray[ $Ship ] ."', ";
+                                $SubQueryDes .= "`". $resource[ $Ship ] ."` = `". $resource[ $Ship ] ."` + '". $ShipArray[ $Ship ] ."', ";
+                            }
+                        }
+
+                        if ($SubQueryOri != "")
+                        {
+                            $QryUpdateOri  = "UPDATE {{table}} SET ";
+                            $QryUpdateOri .= $SubQueryOri;
+                            $QryUpdateOri .= "`last_jump_time` = '". $JumpTime ."' ";
+                            $QryUpdateOri .= "WHERE ";
+                            $QryUpdateOri .= "`id` = '". $CurrentPlanet['id'] ."';";
+                            doquery ( $QryUpdateOri, 'planets');
+
+                            $QryUpdateDes  = "UPDATE {{table}} SET ";
+                            $QryUpdateDes .= $SubQueryDes;
+                            $QryUpdateDes .= "`last_jump_time` = '". $JumpTime ."' ";
+                            $QryUpdateDes .= "WHERE ";
+                            $QryUpdateDes .= "`id` = '". $TargetGate['id'] ."';";
+                            doquery ( $QryUpdateDes, 'planets');
+
+                            $QryUpdateUsr  = "UPDATE {{table}} SET ";
+                            $QryUpdateUsr .= "`current_planet` = '". $TargetGate['id'] ."' ";
+                            $QryUpdateUsr .= "WHERE ";
+                            $QryUpdateUsr .= "`id` = '". $CurrentUser['id'] ."';";
+                            doquery ( $QryUpdateUsr, 'users');
+
+                            $CurrentPlanet['last_jump_time'] = $JumpTime;
+                            $RestString    = $this->GetNextJumpWaitTime ( $CurrentPlanet );
+                            $RetMessage    = $lang['in_jump_gate_done'] . $RestString['string'];
+                        }
+                        else
+                        {
+                            $RetMessage = $lang['in_jump_gate_error_data'];
+                        }
+                    }
+                    else
+                    {
+                        $RetMessage = $lang['in_jump_gate_not_ready_target'] . $RestString['string'];
+                    }
+                }
+                else
+                {
+                    $RetMessage = $lang['in_jump_gate_doesnt_have_one'];
+                }
+            }
+            else
+            {
+                $RetMessage = $lang['in_jump_gate_already_used'] . $RestString['string'];
+            }
+        }
+        else
+        {
+            $RetMessage = $lang['in_jump_gate_error_data'];
+        }
+
+        return $RetMessage;
+    }
+
+    private function BuildFleetListRows ($CurrentPlanet)
+    {
+        global $resource, $lang;
+
+        $RowsTPL  = gettemplate('infos/info_gate_rows');
+        $CurrIdx  = 1;
+        $Result   = "";
+        for ($Ship = 200; $Ship < 250; $Ship++ )
+        {
+            if ($resource[$Ship] != "")
+            {
+                if ($CurrentPlanet[$resource[$Ship]] > 0)
+                {
+                    $bloc['idx']             = $CurrIdx;
+                    $bloc['fleet_id']        = $Ship;
+                    $bloc['fleet_name']      = $lang['tech'][$Ship];
+                    $bloc['fleet_max']       = pretty_number ( $CurrentPlanet[$resource[$Ship]] );
+                    $bloc['gate_ship_dispo'] = $lang['in_jump_gate_available'];
+                    $Result                 .= parsetemplate ( $RowsTPL, $bloc );
+                    $CurrIdx++;
+                }
+            }
+        }
+        return $Result;
+    }
+
+    private function BuildJumpableMoonCombo ( $CurrentUser, $CurrentPlanet )
+    {
+        global $resource;
+        $QrySelectMoons  = "SELECT * FROM {{table}} WHERE `planet_type` = '3' AND `id_owner` = '". intval($CurrentUser['id']) ."';";
+        $MoonList        = doquery ( $QrySelectMoons, 'planets');
+        $Combo           = "";
+        while ( $CurMoon = mysql_fetch_assoc($MoonList) )
+        {
+            if ( $CurMoon['id'] != $CurrentPlanet['id'] )
+            {
+                $RestString = $this->GetNextJumpWaitTime ( $CurMoon );
+                if ($CurMoon[$resource[43]] >= 1)
+                    $Combo .= "<option value=\"". $CurMoon['id'] ."\">[". $CurMoon['galaxy'] .":". $CurMoon['system'] .":". $CurMoon['planet'] ."] ". $CurMoon['name'] . $RestString['string'] ."</option>\n";
+            }
+        }
+        return $Combo;
+    }
+
+    private function ShowProductionTable ($CurrentUser, $CurrentPlanet, $BuildID, $Template)
+    {
+        global $ProdGrid, $resource;
+
+        $BuildLevelFactor = $CurrentPlanet[ $resource[$BuildID]."_porcent" ];
+        $BuildTemp        = $CurrentPlanet[ 'temp_max' ];
+        $CurrentBuildtLvl = $CurrentPlanet[ $resource[$BuildID] ];
+
+        $BuildLevel       = ($CurrentBuildtLvl > 0) ? $CurrentBuildtLvl : 1;
+        $Prod[1]          = (floor(eval($ProdGrid[$BuildID]['formule']['metal'])     * read_config ( 'resource_multiplier' ) ) * (1 + ($CurrentUser['rpg_geologue']  * GEOLOGUE)));
+        $Prod[2]          = (floor(eval($ProdGrid[$BuildID]['formule']['crystal'])   * read_config ( 'resource_multiplier' ) ) * (1 + ($CurrentUser['rpg_geologue']  * GEOLOGUE)));
+        $Prod[3]          = (floor(eval($ProdGrid[$BuildID]['formule']['deuterium']) * read_config ( 'resource_multiplier' ) ) * (1 + ($CurrentUser['rpg_geologue']  * GEOLOGUE)));
+
+        if( $BuildID >= 4 )
+        {
+            $Prod[4]     = (floor(eval($ProdGrid[$BuildID]['formule']['energy']) * read_config ( 'resource_multiplier' )) * (1 + ($CurrentUser['rpg_ingenieur'] * ENGINEER_ENERGY)));
+            $ActualProd    = floor($Prod[4]);
+        }
+        else
+        {
+            $Prod[4]     = (floor(eval($ProdGrid[$BuildID]['formule']['energy']) * read_config ( 'resource_multiplier' )));
+            $ActualProd    = floor($Prod[$BuildID]);
+        }
+
+        if ($BuildID != 12)
+            $ActualNeed       = floor($Prod[4]);
+        else
+            $ActualNeed       = floor($Prod[3]);
+
+        $BuildStartLvl    = $CurrentBuildtLvl - 2;
+        if ($BuildStartLvl < 1)
+            $BuildStartLvl = 1;
+
+        $Table     = "";
+        $ProdFirst = 0;
+
+        for ( $BuildLevel = $BuildStartLvl; $BuildLevel < $BuildStartLvl + 15; $BuildLevel++ )
+        {
+            if ($BuildID != 42)
+            {
+                $Prod[1] = (floor(eval($ProdGrid[$BuildID]['formule']['metal'])     * read_config ( 'resource_multiplier' )) * (1 + ($CurrentUser['rpg_geologue']  * GEOLOGUE)));
+                $Prod[2] = (floor(eval($ProdGrid[$BuildID]['formule']['crystal'])   * read_config ( 'resource_multiplier' )) * (1 + ($CurrentUser['rpg_geologue']  * GEOLOGUE)));
+                $Prod[3] = (floor(eval($ProdGrid[$BuildID]['formule']['deuterium']) * read_config ( 'resource_multiplier' )) * (1 + ($CurrentUser['rpg_geologue']  * GEOLOGUE)));
+
+                if( $BuildID >= 4 )
+                    $Prod[4] = (floor(eval($ProdGrid[$BuildID]['formule']['energy'])    * read_config ( 'resource_multiplier' )) * (1 + ($CurrentUser['rpg_ingenieur'] * ENGINEER_ENERGY)));
+                else
+                    $Prod[4] = (floor(eval($ProdGrid[$BuildID]['formule']['energy'])    * read_config ( 'resource_multiplier' )));
+
+                $bloc['build_lvl']       = ($CurrentBuildtLvl == $BuildLevel) ? "<font color=\"#ff0000\">".$BuildLevel."</font>" : $BuildLevel;
+
+                if ($ProdFirst > 0)
+                    if ($BuildID != 12)
+                        $bloc['build_gain']      = "<font color=\"lime\">(". pretty_number(floor($Prod[$BuildID] - $ProdFirst)) .")</font>";
+                    else
+                        $bloc['build_gain']      = "<font color=\"lime\">(". pretty_number(floor($Prod[4] - $ProdFirst)) .")</font>";
+                else
+                    $bloc['build_gain']      = "";
+
+                if ($BuildID != 12)
+                {
+                    $bloc['build_prod']      = pretty_number(floor($Prod[$BuildID]));
+                    $bloc['build_prod_diff'] = colorNumber( pretty_number(floor($Prod[$BuildID] - $ActualProd)) );
+                    $bloc['build_need']      = colorNumber( pretty_number(floor($Prod[4])) );
+                    $bloc['build_need_diff'] = colorNumber( pretty_number(floor($Prod[4] - $ActualNeed)) );
+                }
+                else
+                {
+                    $bloc['build_prod']      = pretty_number(floor($Prod[4]));
+                    $bloc['build_prod_diff'] = colorNumber( pretty_number(floor($Prod[4] - $ActualProd)) );
+                    $bloc['build_need']      = colorNumber( pretty_number(floor($Prod[3])) );
+                    $bloc['build_need_diff'] = colorNumber( pretty_number(floor($Prod[3] - $ActualNeed)) );
+                }
+                if ($ProdFirst == 0)
+                {
+                    if ($BuildID != 12)
+                        $ProdFirst = floor($Prod[$BuildID]);
+                    else
+                        $ProdFirst = floor($Prod[4]);
+                }
+            }
+            else
+            {
+                $bloc['build_lvl']       = ($CurrentBuildtLvl == $BuildLevel) ? "<font color=\"#ff0000\">".$BuildLevel."</font>" : $BuildLevel;
+                $bloc['build_range']     = ($BuildLevel * $BuildLevel) - 1;
+            }
+            $Table    .= parsetemplate($Template, $bloc);
+        }
+
+        return $Table;
+    }
+
+    private function ShowRapidFireTo ($BuildID)
+    {
+        global $lang, $CombatCaps;
+        $ResultString = "";
+        for ($Type = 200; $Type < 500; $Type++)
+        {
+            if ($CombatCaps[$BuildID]['sd'][$Type] > 1)
+                $ResultString .= $lang['in_rf_again']. " ". $lang['tech'][$Type] ." <font color=\"#00ff00\">".$CombatCaps[$BuildID]['sd'][$Type]."</font><br>";
+        }
+        return $ResultString;
+    }
+
+    private function ShowRapidFireFrom ($BuildID)
+    {
+        global $lang, $CombatCaps;
+
+        $ResultString = "";
+        for ($Type = 200; $Type < 500; $Type++)
+        {
+            if ($CombatCaps[$Type]['sd'][$BuildID] > 1)
+                $ResultString .= $lang['in_rf_from']. " ". $lang['tech'][$Type] ." <font color=\"#ff0000\">".$CombatCaps[$Type]['sd'][$BuildID]."</font><br>";
+        }
+        return $ResultString;
+    }
+
+    public function __construct ($CurrentUser, $CurrentPlanet, $BuildID)
+    {
+        global $lang, $resource, $pricelist, $CombatCaps;
+
+        $GateTPL              = '';
+        $DestroyTPL           = '';
+        $TableHeadTPL         = '';
+
+        $parse                = $lang;
+        $parse['dpath']       = DPATH;
+        $parse['name']        = $lang['info'][$BuildID]['name'];
+        $parse['image']       = $BuildID;
+        $parse['description'] = $lang['info'][$BuildID]['description'];
+
+        if($BuildID < 13 OR $BuildID == 43)
+            $PageTPL = gettemplate('infos/info_buildings_table');
+        elseif($BuildID < 200)
+            $PageTPL = gettemplate('infos/info_buildings_general');
+        elseif($BuildID < 400)
+            $PageTPL = gettemplate('infos/info_buildings_fleet');
+        elseif($BuildID < 600)
+            $PageTPL = gettemplate('infos/info_buildings_defense');
+        else
+            $PageTPL = gettemplate('infos/info_officiers_general');
+
+        //Sólo hay destroy en <200
+        if($BuildID < 200 AND $BuildID != 33 AND $BuildID != 41)
+            $DestroyTPL           = gettemplate('infos/info_buildings_destroy');
+
+        if ($BuildID >=   1 && $BuildID <=   3)
+        {
+            $PageTPL              = gettemplate('infos/info_buildings_table');
+            $TableHeadTPL         = gettemplate('infos/info_production_header');
+            $TableTPL             = gettemplate('infos/info_production_body');
+        }
+        elseif ($BuildID ==   4)
+        {
+            $PageTPL              = gettemplate('infos/info_buildings_table');
+            $TableHeadTPL         = gettemplate('infos/info_production_simple_header');
+            $TableTPL             = gettemplate('infos/info_production_simple_body');
+        }
+        elseif ($BuildID ==  12)
+        {
+            $TableHeadTPL         = gettemplate('infos/info_energy_header');
+            $TableTPL             = gettemplate('infos/info_energy_body');
+        }
+        /*elseif ($BuildID >=  14 AND $BuildID <= 100 AND $BuildID != 42 AND $BuildID != 41 AND $BuildID != 33 AND $BuildID != 43)
+        {
+            No hacemos NADA
+        }*/
+        /*elseif ($BuildID ==  33)
+        {
+            $PageTPL              = gettemplate('infos/info_buildings_general');
+        }
+        elseif ($BuildID ==  41)
+        {
+            $PageTPL              = gettemplate('infos/info_buildings_general');
+        }*/
+        elseif ($BuildID ==  42)
+        {
+        	$TableHeadTPL         = gettemplate('infos/info_range_header');
+        	$TableTPL             = gettemplate('infos/info_range_body');
+        }
+        elseif ($BuildID ==  43)
+        {
+            $GateTPL              = gettemplate('infos/info_gate_table');
+
+            if($_POST)
+                message($this->DoFleetJump($CurrentUser, $CurrentPlanet), "game.php?page=infos&gid=43", 2);
+        }
+        /*elseif ($BuildID >= 106 && $BuildID <= 199)
+        {
+            NADA! -- $PageTPL              = gettemplate('infos/info_buildings_general');
+        }*/
+        elseif ($BuildID >= 202 && $BuildID <= 250)
+        {
+            $PageTPL              = gettemplate('infos/info_buildings_fleet');
+            $parse['element_typ'] = $lang['tech'][200];
+            $parse['rf_info_to']  = $this->ShowRapidFireTo($BuildID);
+            $parse['rf_info_fr']  = $this->ShowRapidFireFrom($BuildID);
+            $parse['hull_pt']     = pretty_number ($pricelist[$BuildID]['metal'] + $pricelist[$BuildID]['crystal']);
+            $parse['shield_pt']   = pretty_number ($CombatCaps[$BuildID]['shield']);
+            $parse['attack_pt']   = pretty_number ($CombatCaps[$BuildID]['attack']);
+            $parse['capacity_pt'] = pretty_number ($pricelist[$BuildID]['capacity']);
+            $parse['base_speed']  = pretty_number ($pricelist[$BuildID]['speed']);
+            $parse['base_conso']  = pretty_number ($pricelist[$BuildID]['consumption']);
+            if ($BuildID == 202)
+            {
+                $parse['upd_speed']   = "<font color=\"yellow\">(". pretty_number ($pricelist[$BuildID]['speed2']) .")</font>";
+                $parse['upd_conso']   = "<font color=\"yellow\">(". pretty_number ($pricelist[$BuildID]['consumption2']) .")</font>";
+            }
+            elseif ($BuildID == 211)
+                $parse['upd_speed']   = "<font color=\"yellow\">(". pretty_number ($pricelist[$BuildID]['speed2']) .")</font>";
+        }
+        elseif ($BuildID >= 401 && $BuildID <= 450)
+        {
+            $PageTPL              = gettemplate('infos/info_buildings_defense');
+            $parse['element_typ'] = $lang['tech'][400];
+
+            $parse['rf_info_to']  = $this->ShowRapidFireTo ($BuildID);
+            $parse['rf_info_fr']  = $this->ShowRapidFireFrom ($BuildID);
+            $parse['hull_pt']     = pretty_number ($pricelist[$BuildID]['metal'] + $pricelist[$BuildID]['crystal']);
+            $parse['shield_pt']   = pretty_number ($CombatCaps[$BuildID]['shield']);
+            $parse['attack_pt']   = pretty_number ($CombatCaps[$BuildID]['attack']);
+        }
+        elseif ($BuildID == 502 && $BuildID == 503)
+        {
+            $PageTPL              = gettemplate('infos/info_buildings_defense');
+            $parse['element_typ'] = $lang['tech'][400];
+            $parse['hull_pt']     = pretty_number ($pricelist[$BuildID]['metal'] + $pricelist[$BuildID]['crystal']);
+            $parse['shield_pt']   = pretty_number ($CombatCaps[$BuildID]['shield']);
+            $parse['attack_pt']   = pretty_number ($CombatCaps[$BuildID]['attack']);
+        }
+        elseif ($BuildID >= 601 && $BuildID <= 604)
+            $PageTPL              = gettemplate('infos/info_officiers_general');
+
+        if ($TableHeadTPL != '')
+        {
+            $parse['table_head']  = parsetemplate ($TableHeadTPL, $lang);
+            $parse['table_data']  = $this->ShowProductionTable ($CurrentUser, $CurrentPlanet, $BuildID, $TableTPL);
+        }
+
+        $page  = parsetemplate($PageTPL, $parse);
+        if ($GateTPL != '')
+        {
+            if ($CurrentPlanet[$resource[$BuildID]] > 0)
+            {
+                $RestString               = $this->GetNextJumpWaitTime ( $CurrentPlanet );
+                $parse['gate_start_link'] = BuildPlanetAdressLink ( $CurrentPlanet );
+                if ($RestString['value'] != 0)
+                {
+                    include(XGP_ROOT . 'includes/functions/InsertJavaScriptChronoApplet.php');
+
+                    $parse['gate_time_script'] = InsertJavaScriptChronoApplet ( "Gate", "1", $RestString['value'], TRUE );
+                    $parse['gate_wait_time']   = "<div id=\"bxx". "Gate" . "1" ."\"></div>";
+                    $parse['gate_script_go']   = InsertJavaScriptChronoApplet ( "Gate", "1", $RestString['value'], FALSE );
+                }
+                else
+                {
+                    $parse['gate_time_script'] = "";
+                    $parse['gate_wait_time']   = "";
+                    $parse['gate_script_go']   = "";
+                }
+                $parse['gate_dest_moons'] = $this->BuildJumpableMoonCombo ($CurrentUser, $CurrentPlanet);
+                $parse['gate_fleet_rows'] = $this->BuildFleetListRows ($CurrentPlanet);
+                $page .= parsetemplate($GateTPL, $parse);
+            }
+        }
+
+        if ($DestroyTPL != '')
+        {
+            if ($CurrentPlanet[$resource[$BuildID]] > 0)
+            {
+                $NeededRessources     = GetBuildingPrice ($CurrentUser, $CurrentPlanet, $BuildID, TRUE, TRUE);
+                $DestroyTime          = GetBuildingTime  ($CurrentUser, $CurrentPlanet, $BuildID) / 2;
+                $parse['destroyurl']  = "game.php?page=buildings&cmd=destroy&building=".$BuildID;
+                $parse['levelvalue']  = $CurrentPlanet[$resource[$BuildID]];
+                $parse['nfo_metal']   = $lang['Metal'];
+                $parse['nfo_crysta']  = $lang['Crystal'];
+                $parse['nfo_deuter']  = $lang['Deuterium'];
+                $parse['metal']       = pretty_number ($NeededRessources['metal']);
+                $parse['crystal']     = pretty_number ($NeededRessources['crystal']);
+                $parse['deuterium']   = pretty_number ($NeededRessources['deuterium']);
+                $parse['destroytime'] = pretty_time   ($DestroyTime);
+                $page .= parsetemplate($DestroyTPL, $parse);
+            }
+        }
+        display($page);
+    }
+}
\ No newline at end of file
diff --git a/includes/pages/class.ShowMessagesPage.php b/includes/pages/class.ShowMessagesPage.php
new file mode 100644
index 0000000..795db0b
--- /dev/null
+++ b/includes/pages/class.ShowMessagesPage.php
@@ -0,0 +1,285 @@
+<?php
+
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+if(!defined('INSIDE')){ die(header("location:../../"));}
+
+class ShowMessagesPage
+{
+	function __construct ( $CurrentUser )
+	{
+		global $lang;
+
+		$OwnerID		= intval ( $_GET['id'] );
+		$MessCategory  	= intval ( $_GET['messcat'] );
+		$MessPageMode  	= addslashes ( mysql_escape_string ( $_GET["mode"] ) );
+		$DeleteWhat    	= $_POST['deletemessages'];
+
+		if ( isset ( $DeleteWhat ) )
+		{
+			$MessPageMode = "delete";
+		}
+
+		$UsrMess       = doquery("SELECT * FROM {{table}} WHERE `message_owner` = '" . intval ( $CurrentUser['id'] ) . "' ORDER BY `message_time` DESC;" , 'messages' );
+		$UnRead        = doquery("SELECT * FROM {{table}} WHERE `id` = '" . intval ( $CurrentUser['id'] ) . "';" , 'users' , TRUE );
+
+		$MessageType   = array ( 0, 1, 2, 3, 4, 5, 15, 99, 100 );
+		$TitleColor    = array (
+									0 => '#FFFF00',
+									1 => '#FF6699',
+									2 => '#FF3300',
+									3 => '#FF9900',
+									4 => '#773399',
+									5 => '#009933',
+									15 => '#030070',
+									99 => '#007070',
+									100 => '#ABABAB'
+								);
+
+		for ( $MessType = 0 ; $MessType < 101 ; $MessType++ )
+		{
+			if ( in_array ( $MessType , $MessageType ) )
+			{
+				$WaitingMess[$MessType]	= $UnRead[$messfields[$MessType]];
+				$TotalMess[$MessType]   = 0;
+			}
+		}
+
+		while ( $CurMess = mysql_fetch_array ( $UsrMess ) )
+		{
+			$MessType              = $CurMess['message_type'];
+			$TotalMess[$MessType] += 1;
+			$TotalMess[100]       += 1;
+		}
+
+		switch ( $MessPageMode )
+		{
+			case 'write':
+
+				if ( !is_numeric ( $OwnerID ) )
+				{
+					header ( "location:game.php?page=messages" );
+				}
+				else
+				{
+					$OwnerRecord	=	doquery ( "SELECT `id_planet`,`username` FROM {{table}} WHERE `id` = '" . intval ( $OwnerID ) . "';" , 'users' , TRUE );
+					$OwnerHome		= 	doquery ( "SELECT `galaxy`,`system`,`planet` FROM {{table}} WHERE `id_planet` = '" . intval ( $OwnerRecord["id_planet"] ) . "';" , 'galaxy' , TRUE );
+
+					if ( !$OwnerRecord or !$OwnerHome )
+					{
+						header ( "location:game.php?page=messages" );
+					}
+				}
+
+				$parse	=	$lang;
+
+				if ( $_POST )
+				{
+					$error 	= 	0;
+
+					if ( !$_POST["subject"] )
+					{
+						$error++;
+						$parse['error_text']	=	$lang['mg_no_subject'];
+						$parse['error_color']	=	'#FF0000';
+						$error_page				=	parsetemplate ( gettemplate ( 'messages/messages_error_table' ) , $parse );
+					}
+
+					if ( !$_POST["text"] )
+					{
+						$error++;
+						$parse['error_text']	=	$lang['mg_no_text'];
+						$parse['error_color']	=	'#FF0000';
+						$error_page				=	parsetemplate ( gettemplate ( 'messages/messages_error_table' ) , $parse );
+					}
+
+					if ( $error == 0 )
+					{
+						$parse['error_text']	=	$lang['mg_msg_sended'];
+						$parse['error_color']	=	'#00FF00';
+						$error_page				=	parsetemplate ( gettemplate ( 'messages/messages_error_table' ) , $parse );
+
+						$_POST['text'] 			= str_replace ( "'" , '&#39;' , $_POST['text'] );
+						$Owner   				= $OwnerID;
+						$Sender  				= intval ( $CurrentUser['id'] );
+						$From    				= $CurrentUser['username'] . " [" .$CurrentUser['galaxy'] . ":" . $CurrentUser['system'] . ":" . $CurrentUser['planet'] . "]";
+						$Subject 				= $_POST['subject'];
+						$Message				= preg_replace ( "/([^\s]{80}?)/" , "\\1<br />" , trim ( nl2br ( strip_tags ( $_POST['text'] , '<br>' ) ) ) );
+
+						SendSimpleMessage ( $Owner , $Sender , '' , 1 , $From , $Subject , $Message );
+
+						$subject 				= "";
+						$text    				= "";
+					}
+				}
+
+				$parse['id']           		= $OwnerID;
+				$parse['to']           		= $OwnerRecord['username'] . " [" .$OwnerHome['galaxy'] . ":" . $OwnerHome['system'] . ":" . $OwnerHome['planet'] . "]";
+				$parse['subject']      		= ( !isset ( $subject ) ) ? $lang['mg_no_subject'] : $subject;
+				$parse['text']         		= $text;
+				$parse['status_message']	= $error_page;
+
+				display ( parsetemplate ( gettemplate ( 'messages/messages_pm_form' ) , $parse ) );
+
+				break;
+
+			case 'delete':
+
+				$DeleteWhat 	= $_POST['deletemessages'];
+
+				if($DeleteWhat == 'deleteall')
+				{
+					doquery("DELETE FROM {{table}} WHERE `message_owner` = '". intval($CurrentUser['id']) ."';", 'messages');
+				}
+				elseif ( $DeleteWhat == 'deletemarked' )
+				{
+					foreach ( $_POST as $Message => $Answer )
+					{
+						if ( preg_match ( "/delmes/i" , $Message ) && $Answer == 'on' )
+						{
+							$MessId   = str_replace("delmes", "", $Message);
+							$MessHere = doquery("SELECT * FROM {{table}} WHERE `message_id` = '". intval($MessId) ."' AND `message_owner` = '". intval($CurrentUser['id']) ."';", 'messages');
+
+							if ( $MessHere )
+							{
+								doquery ( "DELETE FROM {{table}} WHERE `message_id` = '" . intval ( $MessId ) . "';" , 'messages' );
+							}
+						}
+					}
+				}
+				elseif ( $DeleteWhat == 'deleteunmarked' )
+				{
+					foreach ( $_POST as $Message => $Answer )
+					{
+						$CurMess    	= preg_match ( "/showmes/i" , $Message );
+						$MessId     	= str_replace ( "showmes" , "" , $Message );
+						$Selected   	= "delmes" . $MessId;
+						$IsSelected		= $_POST[$Selected];
+
+						if ( preg_match ( "/showmes/i" , $Message ) && !isset ( $IsSelected ) )
+						{
+							$MessHere = doquery("SELECT * FROM {{table}} WHERE `message_id` = '" . intval ( $MessId ) . "' AND `message_owner` = '" . intval ( $CurrentUser['id'] ) . "';" , 'messages' );
+
+							if ( $MessHere )
+							{
+								doquery("DELETE FROM {{table}} WHERE `message_id` = '" . intval ( $MessId ) . "';" , 'messages' );
+							}
+						}
+					}
+				}
+
+				header("location:game.php?page=messages");
+
+				break;
+			case 'show':
+
+				###############################################################################################
+				#
+				# LOAD MESSAGES
+				#
+				###############################################################################################
+
+				$parse					=	$lang;
+				$subTemplateMessages	= 	gettemplate ( 'messages/messages_row' );
+				$subTemplateOperators	=   gettemplate ( 'messages/messages_adm_row' );
+
+				if ( $MessCategory == 100 )
+				{
+					$UsrMess	= doquery ( "SELECT * FROM {{table}} WHERE `message_owner` = '" . intval ( $CurrentUser['id'] ) . "' ORDER BY `message_time` DESC;" , 'messages' );
+				}
+				else
+				{
+					$UsrMess	= doquery ( "SELECT * FROM {{table}} WHERE `message_owner` = '" . intval ( $CurrentUser['id'] ) . "' AND `message_type` = '" . $MessCategory . "' ORDER BY `message_time` DESC;" , 'messages' );
+				}
+
+				$QryUpdateUser  = "UPDATE {{table}} SET ";
+				$QryUpdateUser .= "`new_message` = '0' ";
+				$QryUpdateUser .= "WHERE ";
+				$QryUpdateUser .= "`id` = '" . intval ( $CurrentUser['id'] ) . "';";
+				doquery ( $QryUpdateUser, 'users');
+
+				while ( $CurMess = mysql_fetch_array ( $UsrMess ) )
+				{
+					$parse['message_id']		=	$CurMess['message_id'];
+					$parse['message_date']		=	date ( "m-d H:i:s" , $CurMess['message_time'] );
+					$parse['message_from']		=   stripslashes( $CurMess['message_from'] );
+					$parse['message_subject']	=	stripslashes( $CurMess['message_subject'] );
+
+
+					if ( $CurMess['message_type'] == 1 )
+					{
+						$parse['message_subject'] .= "<a href=\"game.php?page=messages&mode=write&amp;id=". $CurMess['message_sender'] ."&amp;subject=Re: " . htmlspecialchars( $CurMess['message_subject']) ."\">";
+						$parse['message_subject'] .= " <img src=\"". DPATH ."img/m.gif\" border=\"0\"></a>\n";
+					}
+					else
+					{
+						$parse['message_subject'] .= "";
+					}
+
+					$parse['message_text']		= stripslashes( nl2br( $CurMess['message_text'] ) );
+
+					$messagesBody				.= parsetemplate ( $subTemplateMessages , $parse );
+				}
+
+				###############################################################################################
+				#
+				# LOAD OPERATORS
+				#
+				###############################################################################################
+
+				$QrySelectUser  = "SELECT `username`, `email` ";
+				$QrySelectUser .= "FROM `{{table}}` ";
+				$QrySelectUser .= "WHERE `authlevel` != '0' ORDER BY `username` ASC;";
+				$GameOps = doquery ($QrySelectUser, 'users');
+
+				while ( $Ops = mysql_fetch_assoc ( $GameOps ) )
+				{
+					$parse['dpath']		= DPATH;
+					$parse['username'] 	= $Ops['username'];
+					$parse['mail']		= $Ops['email'];
+					$operatorsBody		.= parsetemplate ( $subTemplateOperators , $parse );
+				}
+
+				// SUBTEMPLATES
+				$parse['show_messages']			= $messagesBody;
+				$parse['show_operators']		= $operatorsBody;
+
+				display ( parsetemplate ( gettemplate ( 'messages/messages_body' ) , $parse ) );
+
+				break;
+			default:
+
+				$parse				=   $lang;
+				$parse['all_color']	=	$TitleColor[100];
+				$parse['all_total']	=  	$TotalMess[100];
+				$parse['all_lang']	= 	$lang['mg_type'][100];
+
+				$subTemplate 	= gettemplate ( 'messages/messages_menu_row' );
+
+				for ( $MessType = 0 ; $MessType < 100 ; $MessType++ )
+				{
+					if ( in_array ( $MessType , $MessageType ) )
+					{
+
+						$parse['color'] = $TitleColor[$MessType];
+						$parse['total'] = $TotalMess[$MessType];
+						$parse['lang']	= $lang['mg_type'][$MessType];
+						$parse['type']	= $MessType;
+
+						$body .= parsetemplate ( $subTemplate , $parse );
+					}
+				}
+
+				$parse['messages_menu_row']	= $body;
+
+				display ( parsetemplate ( gettemplate ( 'messages/messages_menu_body' ) , $parse ) );
+
+				break;
+		}
+	}
+}
+?>
\ No newline at end of file
diff --git a/includes/pages/class.ShowNotesPage.php b/includes/pages/class.ShowNotesPage.php
new file mode 100644
index 0000000..c66e7c4
--- /dev/null
+++ b/includes/pages/class.ShowNotesPage.php
@@ -0,0 +1,137 @@
+<?php
+
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+if(!defined('INSIDE')){ die(header("location:../../"));}
+
+class ShowNotesPage
+{
+	function __construct ( $CurrentUser )
+	{
+		global $lang;
+
+		$parse 	= $lang;
+		$a 		= intval($_GET['a']);
+		$n 		= intval($_GET['n']);
+
+		if($_POST["s"] == 1 || $_POST["s"] == 2)
+		{
+			$time 		= time();
+			$priority 	= intval($_POST["u"]);
+			$title 		= ($_POST["title"]) ? mysql_escape_string(strip_tags($_POST["title"])) : "Sin t&iacute;tulo";
+			$text 		= ($_POST["text"]) ? mysql_escape_string(strip_tags($_POST["text"])) : "Sin texto";
+
+			if($_POST["s"] ==1)
+			{
+				doquery("INSERT INTO {{table}} SET owner=".intval($CurrentUser[id]).", time=$time, priority=$priority, title='$title', text='$text'","notes");
+				header("location:game.php?page=notes");
+			}
+			elseif($_POST["s"] == 2)
+			{
+				$id = intval($_POST["n"]);
+				$note_query = doquery("SELECT * FROM {{table}} WHERE id=".intval($id)." AND owner=".intval($CurrentUser[id])."","notes");
+
+				if(!$note_query)
+					header("location:game.php?page=notes");
+
+				doquery("UPDATE {{table}} SET time=$time, priority=$priority, title='$title', text='$text' WHERE id=".intval($id)."","notes");
+				header("location:game.php?page=notes");
+			}
+		}
+		elseif($_POST)
+		{
+			foreach($_POST as $a => $b)
+			{
+				if(preg_match("/delmes/i",$a) && $b == "y")
+				{
+					$id = str_replace("delmes","",$a);
+					$note_query = doquery("SELECT * FROM {{table}} WHERE id=".intval($id)." AND owner=".intval($CurrentUser[id])."","notes");
+
+					if($note_query)
+					{
+						$deleted++;
+						doquery("DELETE FROM {{table}} WHERE `id`=".intval($id).";","notes");
+					}
+				}
+			}
+
+			if($deleted)
+				header("location:game.php?page=notes");
+			else
+				header("Location:game.php?page=notes");
+		}
+		else
+		{
+			if($_GET["a"] == 1)
+			{
+				$parse['c_Options'] = "<option value=2 selected=selected>".$lang['nt_important']."</option>
+				<option value=1>".$lang['nt_normal']."</option>
+				<option value=0>".$lang['nt_unimportant']."</option>";
+				$parse['TITLE'] 	= $lang['nt_create_note'];
+				$parse[inputs]  	= "<input type=hidden name=s value=1>";
+
+				display(parsetemplate(gettemplate('notes/notes_form'), $parse), FALSE, '', FALSE, FALSE);
+
+			}
+			elseif($_GET["a"] == 2)
+			{
+				$note = doquery("SELECT * FROM {{table}} WHERE owner=".intval($CurrentUser[id])." AND id=".intval($n)."",'notes',TRUE);
+
+				if(!$note)
+					header("location:game.php?page=notes");
+
+				$SELECTED[$note['priority']] = ' selected="selected"';
+
+				$parse['c_Options'] = "<option value=2{$SELECTED[2]}>".$lang['nt_important']."</option>
+				<option value=1{$SELECTED[1]}>".$lang['nt_normal']."</option>
+				<option value=0{$SELECTED[0]}>".$lang['nt_unimportant']."</option>";
+
+				$parse['TITLE'] 	= $lang['nt_edit_note'];
+				$parse['inputs'] 	= '<input type=hidden name=s value=2><input type=hidden name=n value='.$note['id'].'>';
+				$parse[asunto]		= $note[title];
+				$parse[texto]		= $note[text];
+
+				display(parsetemplate(gettemplate('notes/notes_form'), $parse), FALSE, '', FALSE, FALSE);
+
+			}
+			else
+			{
+				$notes_query = doquery("SELECT * FROM {{table}} WHERE owner=".intval($CurrentUser[id])." ORDER BY time DESC",'notes');
+
+				$count = 0;
+
+				$NotesBodyEntryTPL=gettemplate('notes/notes_body_entry');
+				while($note = mysql_fetch_array($notes_query))
+				{
+					$count++;
+
+					if($note["priority"] == 0){ $parse['NOTE_COLOR'] = "lime";}
+					elseif($note["priority"] == 1){ $parse['NOTE_COLOR'] = "yellow";}
+					elseif($note["priority"] == 2){ $parse['NOTE_COLOR'] = "red";}
+
+					$parse['NOTE_ID'] 		= $note['id'];
+					$parse['NOTE_TIME'] 	= date("Y-m-d h:i:s",$note["time"]);
+					$parse['NOTE_TITLE'] 	= $note['title'];
+					$parse['NOTE_TEXT'] 	= strlen($note['text']);
+
+					$list .= parsetemplate($NotesBodyEntryTPL, $parse);
+
+				}
+
+				if($count == 0)
+				{
+					$list .= "<tr><th colspan=4>".$lang['nt_you_dont_have_notes']."</th>\n";
+				}
+
+				$parse['BODY_LIST'] = $list;
+
+				display(parsetemplate(gettemplate('notes/notes_body'), $parse), FALSE, '', FALSE, FALSE);
+			}
+		}
+	}
+}
+?>
\ No newline at end of file
diff --git a/includes/pages/class.ShowOfficierPage.php b/includes/pages/class.ShowOfficierPage.php
index 39a2d58..c2d2065 100644
--- a/includes/pages/class.ShowOfficierPage.php
+++ b/includes/pages/class.ShowOfficierPage.php
@@ -1,57 +1,15 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
 class ShowOfficierPage
 {
-	private function IsOfficierAccessible ($CurrentUser, $Officier)
-	{
-		global $requeriments, $resource, $pricelist;
-
-		if (isset($requeriments[$Officier]))
-		{
-			$enabled = true;
-			foreach($requeriments[$Officier] as $ReqOfficier => $OfficierLevel)
-			{
-				if ($CurrentUser[$resource[$ReqOfficier]] && $CurrentUser[$resource[$ReqOfficier]] >= $OfficierLevel)
-				{
-					$enabled = 1;
-				}
-				else
-				{
-					return 0;
-				}
-			}
-		}
-		if ($CurrentUser[$resource[$Officier]] < $pricelist[$Officier]['max']  )
-		{
-			return 1;
-		}
-		else
-		{
-			return -1;
-		}
-	}
-
 	public function __construct ( &$CurrentUser )
 	{
 		global $resource, $reslist, $lang;
@@ -61,38 +19,29 @@ public function __construct ( &$CurrentUser )
 
 		if ($_GET['mode'] == 2)
 		{
-			if ((floor($CurrentUser['darkmatter'] / 1000)) > 0)
+			$Selected    = $_GET['offi'];
+
+			if ( in_array($Selected, $reslist['officier']) )
 			{
-				$Selected    = $_GET['offi'];
-				if ( in_array($Selected, $reslist['officier']) )
+				$Result =	$this->IsOfficierAccessible ( $CurrentUser, $Selected );
+				$Price	=	$this->GetOfficierPrice ( $Selected );
+
+				if ( $Result !== FALSE )
 				{
-					$Result = $this->IsOfficierAccessible ( $CurrentUser, $Selected );
+					$CurrentUser[$resource[$Selected]] += 1;
+					$CurrentUser['darkmatter']         -= $Price;
 
-					if ( $Result == 1 )
-					{
-						$CurrentUser[$resource[$Selected]] += 1;
-						$CurrentUser['darkmatter']         -= 1000;
-
-						$QryUpdateUser  = "UPDATE {{table}} SET ";
-						$QryUpdateUser .= "`darkmatter` = '". $CurrentUser['darkmatter'] ."', ";
-						$QryUpdateUser .= "`".$resource[$Selected]."` = '". $CurrentUser[$resource[$Selected]] ."' ";
-						$QryUpdateUser .= "WHERE ";
-						$QryUpdateUser .= "`id` = '". $CurrentUser['id'] ."';";
-						doquery( $QryUpdateUser, 'users' );
-					}
-					elseif ( $Result == -1 )
-					{
-						header("location:game.php?page=officier");
-					}
-					elseif ( $Result == 0 )
-					{
-						header("location:game.php?page=officier");
-					}
+					$QryUpdateUser  = "UPDATE {{table}} SET ";
+					$QryUpdateUser .= "`darkmatter` = '". $CurrentUser['darkmatter'] ."', ";
+					$QryUpdateUser .= "`".$resource[$Selected]."` = '". $CurrentUser[$resource[$Selected]] ."' ";
+					$QryUpdateUser .= "WHERE ";
+					$QryUpdateUser .= "`id` = '". $CurrentUser['id'] ."';";
+					doquery( $QryUpdateUser, 'users' );
+				}
+				else
+				{
+					header("location:game.php?page=officier");
 				}
-			}
-			else
-			{
-				header("location:game.php?page=officier");
 			}
 
 			header("location:game.php?page=officier");
@@ -100,31 +49,32 @@ public function __construct ( &$CurrentUser )
 		}
 		else
 		{
-			$parse['alv_points']   	= floor($CurrentUser['darkmatter'] / 1000);
+			$OfficierRowTPL			=	gettemplate('officier/officier_row');
+
 			foreach($lang['tech'] as $Element => $ElementName)
 			{
 				$Result = $this->IsOfficierAccessible ($CurrentUser, $Element);
-				if ($Result != 0 && $Element >= 601)
+				$Price	= $this->GetOfficierPrice ( $Element );
+
+				if ($Element >= 601 && $Element <= 604)
 				{
-					$bloc['off_id']       = $Element;
-					$bloc['off_lvl']      = $CurrentUser[$resource[$Element]];
-					$bloc['off_name']	  = $ElementName;
-					$bloc['off_desc']     = $lang['res']['descriptions'][$Element];
+					$bloc['dpath']		= DPATH;
+					$bloc['off_id']   	= $Element;
+					$bloc['off_status']	= ( ( $CurrentUser[$resource[$Element]] == 1 ) ? $lang['of_active'] : $lang['of_inactive'] );
+					$bloc['off_name']	= $ElementName;
+					$bloc['off_desc'] 	= $lang['res']['descriptions'][$Element];
 
-					if ($Result == 1 && $parse['alv_points'] >= 1)
-					{
-						$bloc['off_link'] = "<a href=\"game.php?page=officier&mode=2&offi=".$Element."\"><font color=\"#00ff00\">".$lang['of_recruit']."</font>";
-					}
-					elseif($Result == 1 && $parse['alv_points'] == 0)
+					if ( $Result )
 					{
-						$bloc['off_link'] = "<font color=\"red\">".$lang['of_recruit']."</font>";
+						$bloc['off_link']  = "<font color=\"lime\"><strong>".pretty_number ( $Price ) . '</strong><br />' . $lang['Darkmatter'] . "</font>";
+						$bloc['off_link'] .= "<br /><a href=\"game.php?page=officier&mode=2&offi=".$Element."\"><font color=\"#00ff00\">".$lang['of_recruit']."</font>";
 					}
 					else
 					{
-						$bloc['off_link'] = "<font color=\"red\">".$lang['of_max_lvl']."</font>";
+						$bloc['off_link'] = "<font color=\"red\"><strong>".pretty_number ( $Price ) . '</strong><br />' . $lang['Darkmatter'] . "</font>";
 					}
 
-					$parse['disp_off_tbl'] .= parsetemplate( gettemplate('officier/officier_row'), $bloc );
+					$parse['disp_off_tbl'] .= parsetemplate( $OfficierRowTPL , $bloc );
 				}
 			}
 			$page = parsetemplate( gettemplate('officier/officier_table'), $parse);
@@ -132,5 +82,35 @@ public function __construct ( &$CurrentUser )
 
 		display($page);
 	}
+
+	private function IsOfficierAccessible ( $CurrentUser , $Officier )
+	{
+		global $resource, $pricelist;
+
+		if ( $CurrentUser[$resource[$Officier]] < $pricelist[$Officier]['max']  )
+		{
+			$cost['darkmatter']  = floor ( $pricelist[$Officier]['darkmatter'] );
+
+			if ( $cost['darkmatter'] > $CurrentUser['darkmatter'] )
+			{
+				return FALSE;
+			}
+			else
+			{
+				return TRUE;
+			}
+		}
+		else
+		{
+			return FALSE;
+		}
+	}
+
+	private function GetOfficierPrice ( $Officier )
+	{
+		global $pricelist;
+
+		return floor ( $pricelist[$Officier]['darkmatter'] );
+	}
 }
 ?>
\ No newline at end of file
diff --git a/includes/pages/class.ShowOptionsPage.php b/includes/pages/class.ShowOptionsPage.php
index d120bbc..70af96d 100644
--- a/includes/pages/class.ShowOptionsPage.php
+++ b/includes/pages/class.ShowOptionsPage.php
@@ -1,23 +1,10 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2012
+ */
 
 class ShowOptionsPage
 {
@@ -30,29 +17,29 @@ private function CheckIfIsBuilding($CurrentUser)
 			if($id['b_building'] != 0)
 			{
 				if($id['b_building'] != "")
-					return true;
+					return TRUE;
 			}
 			elseif($id['b_tech'] != 0)
 			{
 				if($id['b_tech'] != "")
-					return true;
+					return TRUE;
 			}
 			elseif($id['b_hangar'] != 0)
 			{
 				if($id['b_hangar'] != "")
-					return true;
+					return TRUE;
 			}
 		}
-		$fleets = doquery("SELECT * FROM {{table}} WHERE `fleet_owner` = '".intval($CurrentUser['id'])."'", 'fleets',true);
+		$fleets = doquery("SELECT * FROM {{table}} WHERE `fleet_owner` = '".intval($CurrentUser['id'])."'", 'fleets',TRUE);
 		if($fleets != 0)
-			return true;
+			return TRUE;
 
-		return false;
+		return FALSE;
 	}
 
 	public function __construct($CurrentUser)
 	{
-		global $game_config, $dpath, $lang;
+		global $lang;
 
 		$mode = $_GET['mode'];
 
@@ -176,6 +163,7 @@ public function __construct($CurrentUser)
 			{
 				$settings_bud = "0";
 			}
+
 			// < ------------------------------------------------------------ ATAQUE CON MISILES ------------------------------------------------------------ >
 			if (isset($_POST["settings_mis"]) && $_POST["settings_mis"] == 'on')
 			{
@@ -214,9 +202,9 @@ public function __construct($CurrentUser)
 				while($id = mysql_fetch_array($query))
 				{
 					doquery("UPDATE {{table}} SET
-					metal_perhour = '".$game_config['metal_basic_income']."',
-					crystal_perhour = '".$game_config['crystal_basic_income']."',
-					deuterium_perhour = '".$game_config['deuterium_basic_income']."',
+					metal_perhour = '".read_config ( 'metal_basic_income' )."',
+					crystal_perhour = '".read_config ( 'crystal_basic_income' )."',
+					deuterium_perhour = '".read_config ( 'deuterium_basic_income' )."',
 					energy_used = '0',
 					energy_max = '0',
 					metal_mine_porcent = '0',
@@ -280,7 +268,7 @@ public function __construct($CurrentUser)
 			// < ------------------------------------------------------- CAMBIO DE NOMBRE DE USUARIO ------------------------------------------------------ >
 			if ($CurrentUser['username'] != $_POST["db_character"])
 			{
-				$query = doquery("SELECT id FROM {{table}} WHERE username='".mysql_escape_string ($_POST["db_character"])."'", 'users', true);
+				$query = doquery("SELECT id FROM {{table}} WHERE username='".mysql_escape_string ($_POST["db_character"])."'", 'users', TRUE);
 
 				if (!$query)
 				{
@@ -294,7 +282,7 @@ public function __construct($CurrentUser)
 		else
 		{
 			$parse			= $lang;
-			$parse['dpath'] = $dpath;
+			$parse['dpath'] = DPATH;
 
 			if($CurrentUser['urlaubs_modus'])
 			{
@@ -302,21 +290,36 @@ public function __construct($CurrentUser)
 				$parse['opt_modev_exit'] 	= ($CurrentUser['urlaubs_modus'] == 0)?" checked='1'/":'';
 				$parse['vacation_until'] 	= date("d.m.Y G:i:s",$CurrentUser['urlaubs_until']);
 
-				display(parsetemplate(gettemplate('options/options_body_vmode'), $parse), false);
+				display(parsetemplate(gettemplate('options/options_body_vmode'), $parse), FALSE);
 			}
 			else
 			{
-				$parse['opt_lst_ord_data']   = "<option value =\"0\"". (($CurrentUser['planet_sort'] == 0) ? " selected": "") .">Fecha de colonización</option>";
-				$parse['opt_lst_ord_data']  .= "<option value =\"1\"". (($CurrentUser['planet_sort'] == 1) ? " selected": "") .">Coordenadas</option>";
-				$parse['opt_lst_ord_data']  .= "<option value =\"2\"". (($CurrentUser['planet_sort'] == 2) ? " selected": "") .">Orden alfabético</option>";
-				$parse['opt_lst_cla_data']   = "<option value =\"0\"". (($CurrentUser['planet_sort_order'] == 0) ? " selected": "") .">creciente</option>";
-				$parse['opt_lst_cla_data']  .= "<option value =\"1\"". (($CurrentUser['planet_sort_order'] == 1) ? " selected": "") .">Decreciente</option>";
+				$parse['opt_lst_ord_data']   = "<option value =\"0\"". (($CurrentUser['planet_sort'] == 0) ? " selected": "") .">" . $lang['op_sort_colonization'] . "</option>";
+				$parse['opt_lst_ord_data']  .= "<option value =\"1\"". (($CurrentUser['planet_sort'] == 1) ? " selected": "") .">" . $lang['op_sort_coords'] . "</option>";
+				$parse['opt_lst_ord_data']  .= "<option value =\"2\"". (($CurrentUser['planet_sort'] == 2) ? " selected": "") .">" . $lang['op_sort_alpha'] . "</option>";
+				$parse['opt_lst_cla_data']   = "<option value =\"0\"". (($CurrentUser['planet_sort_order'] == 0) ? " selected": "") .">" . $lang['op_sort_asc'] . "</option>";
+				$parse['opt_lst_cla_data']  .= "<option value =\"1\"". (($CurrentUser['planet_sort_order'] == 1) ? " selected": "") .">" . $lang['op_sort_desc'] . "</option>";
+
+				$SkinsFolder = opendir(XGP_ROOT . 'styles/skins');
+
+				while (($SkinsSubFolder = readdir($SkinsFolder)) !== FALSE)
+				{
+					if($SkinsSubFolder != '.' && $SkinsSubFolder != '..' && $SkinsSubFolder != '.htaccess' && $SkinsSubFolder != '.svn' && $SkinsSubFolder != 'index.html')
+					{
+						$parse['opt_skin_data'] .= "<option ";
+
+						if($CurrentUser['dpath'] == $SkinsSubFolder)
+							$parse['opt_skin_data'] .= "selected = selected";
+
+						$parse['opt_skin_data'] .= " value=\"".$SkinsSubFolder."\">".$SkinsSubFolder."</option>";
+					}
+				}
 
 				if ($CurrentUser['authlevel'] > 0)
 				{
-					$IsProtOn = doquery ("SELECT `id_level` FROM {{table}} WHERE `id_owner` = '".intval($CurrentUser['id'])."' LIMIT 1;", 'planets', true);
-					$parse['adm_pl_prot_data']    = ($IsProtOn['id_level'] > 0) ? " checked='checked'/":'';
-					$parse['opt_adm_frame']      = parsetemplate(gettemplate('options/options_admadd'), $parse);
+					$IsProtOn 					= doquery ("SELECT `id_level` FROM {{table}} WHERE `id_owner` = '".intval($CurrentUser['id'])."' LIMIT 1;", 'planets', TRUE);
+					$parse['adm_pl_prot_data']	= ($IsProtOn['id_level'] > 0) ? " checked='checked'/":'';
+					$parse['opt_adm_frame']  	= parsetemplate(gettemplate('options/options_admadd'), $parse);
 				}
 				$parse['opt_usern_data'] 	= $CurrentUser['username'];
 				$parse['opt_mail1_data'] 	= $CurrentUser['email'];
diff --git a/includes/pages/class.ShowOverviewPage.php b/includes/pages/class.ShowOverviewPage.php
new file mode 100644
index 0000000..b3b3e24
--- /dev/null
+++ b/includes/pages/class.ShowOverviewPage.php
@@ -0,0 +1,417 @@
+<?php
+
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+if(!defined('INSIDE')) {die(header("location:../../"));}
+
+class ShowOverviewPage
+{
+	function __construct ( $CurrentUser , $CurrentPlanet )
+	{
+		global $planetrow, $lang;
+
+		include_once (XGP_ROOT . 'includes/functions/InsertJavaScriptChronoApplet.php');
+		include_once (XGP_ROOT . 'includes/classes/class.FlyingFleetsTable.php');
+		include_once (XGP_ROOT . 'includes/functions/CheckPlanetUsedFields.php');
+
+		$FlyingFleetsTable = new FlyingFleetsTable();
+
+		$lunarow = doquery("SELECT * FROM {{table}} WHERE `id_owner` = '" . intval($CurrentPlanet['id_owner']) . "' AND `galaxy` = '" . intval($CurrentPlanet['galaxy']) . "' AND `system` = '" . intval($CurrentPlanet['system']) . "' AND  `planet` = '" . intval($CurrentPlanet['planet']) . "' AND `planet_type`='3'",'planets',TRUE);
+
+		if(empty($lunarow))
+		{
+			unset($lunarow);
+		}
+
+		CheckPlanetUsedFields($lunarow);
+
+		$parse 						= $lang;
+		$parse['planet_id'] 		= $CurrentPlanet['id'];
+		$parse['planet_name'] 		= $CurrentPlanet['name'];
+		$parse['galaxy_galaxy'] 	= $CurrentPlanet['galaxy'];
+		$parse['galaxy_system'] 	= $CurrentPlanet['system'];
+		$parse['galaxy_planet'] 	= $CurrentPlanet['planet'];
+
+		switch($_GET['mode'])
+		{
+			case 'renameplanet':
+
+				if($_POST['action'] == $lang['ov_planet_rename_action'])
+				{
+					$newname = mysql_escape_string(strip_tags(trim($_POST['newname'])));
+
+					if(preg_match("/[^A-z0-9_\- ]/",$newname) == 1)
+					{
+						message($lang['ov_newname_error'],"game.php?page=overview&mode=renameplanet",2);
+					}
+					if($newname != "")
+					{
+						doquery("UPDATE {{table}} SET `name` = '" . $newname . "' WHERE `id` = '" . intval($CurrentUser['current_planet']) . "' LIMIT 1;","planets");
+					}
+				}
+				elseif($_POST['action'] == $lang['ov_abandon_planet'])
+				{
+					return display(parsetemplate(gettemplate('overview/overview_deleteplanet'),$parse));
+				}
+				elseif(intval($_POST['kolonieloeschen']) == 1 && intval($_POST['deleteid']) == $CurrentUser['current_planet'])
+				{
+					$filokontrol = doquery("SELECT * FROM {{table}} WHERE fleet_owner = '" . intval($CurrentUser['id']) . "' AND fleet_start_galaxy='" . intval($CurrentPlanet['galaxy']) . "' AND fleet_start_system='" . intval($CurrentPlanet['system']) . "' AND fleet_start_planet='" . intval($CurrentPlanet['planet']) . "'",'fleets');
+
+					while($satir = mysql_fetch_array($filokontrol))
+					{
+						$kendifilo = $satir['fleet_owner'];
+						$digerfilo = $satir['fleet_target_owner'];
+						$harabeyeri = $satir['fleet_end_type'];
+						$mess = $satir['fleet_mess'];
+					}
+
+					$filokontrol = doquery("SELECT * FROM {{table}} WHERE fleet_target_owner = '" . intval($CurrentUser['id']) . "' AND fleet_end_galaxy='" . intval($CurrentPlanet['galaxy']) . "' AND fleet_end_system='" . intval($CurrentPlanet['system']) . "' AND fleet_end_planet='" . intval($CurrentPlanet['planet']) . "'",'fleets');
+
+					while($satir = mysql_fetch_array($filokontrol))
+					{
+						$kendifilo = $satir['fleet_owner'];
+						$digerfilo = $satir['fleet_target_owner'];
+						$gezoay = $satir['fleet_end_type'];
+						$mess = $satir['fleet_mess'];
+					}
+
+					if($kendifilo > 0)
+					{
+						message($lang['ov_abandon_planet_not_possible'],'game.php?page=overview&mode=renameplanet');
+					}
+					elseif((($digerfilo > 0) && ($mess < 1)) && $gezoay != 2)
+					{
+						message($lang['ov_abandon_planet_not_possible'],'game.php?page=overview&mode=renameplanet');
+					}
+					else
+					{
+						if(md5($_POST['pw']) == $CurrentUser["password"] && $CurrentUser['id_planet'] != $CurrentUser['current_planet'])
+						{
+
+							doquery("UPDATE {{table}} SET `destruyed` = '" . (time() + 86400) . "' WHERE `id` = '" . intval($CurrentUser['current_planet']) . "' LIMIT 1;",'planets');
+							doquery("UPDATE {{table}} SET `current_planet` = `id_planet` WHERE `id` = '" . intval($CurrentUser['id']) . "' LIMIT 1","users");
+							doquery("DELETE FROM {{table}} WHERE `galaxy` = '" . intval($CurrentPlanet['galaxy']) . "' AND `system` = '" . intval($CurrentPlanet['system']) . "' AND `planet` = '" . intval($CurrentPlanet['planet']) . "' AND `planet_type` = 3;",'planets');
+
+							message($lang['ov_planet_abandoned'],'game.php?page=overview&mode=renameplanet');
+						}
+						elseif($CurrentUser['id_planet'] == $CurrentUser["current_planet"])
+						{
+							message($lang['ov_principal_planet_cant_abanone'],'game.php?page=overview&mode=renameplanet');
+						}
+						else
+						{
+							message($lang['ov_wrong_pass'],'game.php?page=overview&mode=renameplanet');
+						}
+					}
+				}
+
+				return display(parsetemplate(gettemplate('overview/overview_renameplanet'),$parse));
+				break;
+
+			default:
+				if($CurrentUser['new_message'] != 0)
+				{
+					$Have_new_message .= "<tr>";
+					if($CurrentUser['new_message'] == 1)
+					{
+						$Have_new_message .= "<th colspan=4><a href=game.php?page=messages>" . $lang['ov_have_new_message'] . "</a></th>";
+					}
+					elseif($CurrentUser['new_message'] > 1)
+					{
+						$Have_new_message .= "<th colspan=4><a href=game.php?page=messages>";
+						$Have_new_message .= str_replace('%m',pretty_number($CurrentUser['new_message']),$lang['ov_have_new_messages']);
+						$Have_new_message .= "</a></th>";
+					}
+					$Have_new_message .= "</tr>";
+				}
+
+				$OwnFleets = doquery("SELECT * FROM {{table}} WHERE `fleet_owner` = '" . intval($CurrentUser['id']) . "';",'fleets');
+
+				$Record = 0;
+
+				while($FleetRow = mysql_fetch_array($OwnFleets))
+				{
+					$Record++;
+
+					$StartTime = $FleetRow['fleet_start_time'];
+					$StayTime = $FleetRow['fleet_end_stay'];
+					$EndTime = $FleetRow['fleet_end_time'];
+					/////// // ### LUCKY , CODES ARE BELOW
+					$hedefgalaksi = $FleetRow['fleet_end_galaxy'];
+					$hedefsistem = $FleetRow['fleet_end_system'];
+					$hedefgezegen = $FleetRow['fleet_end_planet'];
+					$mess = $FleetRow['fleet_mess'];
+					$filogrubu = $FleetRow['fleet_group'];
+					$id = $FleetRow['fleet_id'];
+					//////
+					$Label = "fs";
+					if($StartTime > time())
+					{
+						$fpage[$StartTime . $id] = $FlyingFleetsTable->BuildFleetEventTable($FleetRow,0,TRUE,$Label,$Record);
+					}
+
+					if(($FleetRow['fleet_mission'] != 4) && ($FleetRow['fleet_mission'] != 10))
+					{
+						$Label = "ft";
+
+						if($StayTime > time())
+						{
+							$fpage[$StayTime . $id] = $FlyingFleetsTable->BuildFleetEventTable($FleetRow,1,TRUE,$Label,$Record);
+						}
+						$Label = "fe";
+
+						if($EndTime > time())
+						{
+							$fpage[$EndTime . $id] = $FlyingFleetsTable->BuildFleetEventTable($FleetRow,2,TRUE,$Label,$Record);
+						}
+					}
+
+					/**fix fleet table return by jstar**/
+					if($FleetRow['fleet_mission'] == 4 && $StartTime < time() && $EndTime > time())
+					{
+						$fpage[$EndTime . $id] = $FlyingFleetsTable->BuildFleetEventTable($FleetRow,2,TRUE,"fjstar",$Record);
+					}
+					/**end fix**/
+
+				}
+				mysql_free_result($OwnFleets);
+				//iss ye katilan filo////////////////////////////////////
+
+
+				// ### LUCKY , CODES ARE BELOW
+				if(!empty($hedefgalaksi) && !empty($hedefsistem) && !empty($hedefgezegen) && !empty($filogrubu))
+				{
+					$dostfilo = doquery("SELECT * FROM {{table}} WHERE `fleet_end_galaxy` = '" . intval($hedefgalaksi) . "' AND `fleet_end_system` = '" . intval($hedefsistem) . "' AND `fleet_end_planet` = '" . intval($hedefgezegen) . "' AND `fleet_group` = '" . intval($filogrubu) . "';",'fleets');
+					$Record1 = 0;
+					while($FleetRow = mysql_fetch_array($dostfilo))
+					{
+						$StartTime = $FleetRow['fleet_start_time'];
+						$StayTime = $FleetRow['fleet_end_stay'];
+						$EndTime = $FleetRow['fleet_end_time'];
+
+						$hedefgalaksi = $FleetRow['fleet_end_galaxy'];
+						$hedefsistem = $FleetRow['fleet_end_system'];
+						$hedefgezegen = $FleetRow['fleet_end_planet'];
+						$mess = $FleetRow['fleet_mess'];
+						$filogrubu = $FleetRow['fleet_group'];
+						$id = $FleetRow['fleet_id'];
+
+						if(($FleetRow['fleet_mission'] == 2) && ($FleetRow['fleet_owner'] != $CurrentUser['id']))
+						{
+							$Record1++;
+							$StartTime = ($mess > 0) ? "" : $FleetRow['fleet_start_time'];
+
+							if($StartTime > time())
+							{
+								$Label = "ofs";
+								$fpage[$StartTime . $id] = $FlyingFleetsTable->BuildFleetEventTable($FleetRow,0,FALSE,$Label,$Record1);
+							}
+
+						}
+
+						if(($FleetRow['fleet_mission'] == 1) && ($FleetRow['fleet_owner'] != $CurrentUser['id']) && ($filogrubu > 0))
+						{
+							$Record++;
+							if($mess > 0)
+							{
+								$StartTime = "";
+							}
+							else
+							{
+								$StartTime = $FleetRow['fleet_start_time'];
+							}
+							if($StartTime > time())
+							{
+								$Label = "ofs";
+								$fpage[$StartTime . $id] = $FlyingFleetsTable->BuildFleetEventTable($FleetRow,0,FALSE,$Label,$Record);
+							}
+
+						}
+
+					}
+					mysql_free_result($dostfilo);
+				}
+				//
+				//////////////////////////////////////////////////
+
+
+				$OtherFleets = doquery("SELECT * FROM {{table}} WHERE `fleet_target_owner` = '" . intval($CurrentUser['id']) . "';",'fleets');
+
+				$Record = 2000;
+				while($FleetRow = mysql_fetch_array($OtherFleets))
+				{
+					if($FleetRow['fleet_owner'] != $CurrentUser['id'])
+					{
+						if($FleetRow['fleet_mission'] != 8)
+						{
+							$Record++;
+							$StartTime = $FleetRow['fleet_start_time'];
+							$StayTime = $FleetRow['fleet_end_stay'];
+							$id = $FleetRow['fleet_id'];
+
+							if($StartTime > time())
+							{
+								$Label = "ofs";
+								$fpage[$StartTime . $id] = $FlyingFleetsTable->BuildFleetEventTable($FleetRow,0,FALSE,$Label,$Record);
+							}
+							if($FleetRow['fleet_mission'] == 5)
+							{
+								$Label = "oft";
+								if($StayTime > time())
+								{
+									$fpage[$StayTime . $id] = $FlyingFleetsTable->BuildFleetEventTable($FleetRow,1,FALSE,$Label,$Record);
+								}
+							}
+						}
+					}
+				}
+				mysql_free_result($OtherFleets);
+
+				$planets_query = doquery("SELECT * FROM `{{table}}` WHERE id_owner='" . intval($CurrentUser['id']) . "' AND `destruyed` = 0","planets");
+				$Colone = 1;
+				$AllPlanets = "<tr>";
+				while($CurrentUserPlanet = mysql_fetch_array($planets_query))
+				{
+					if($CurrentUserPlanet["id"] != $CurrentUser["current_planet"] && $CurrentUserPlanet['planet_type'] != 3)
+					{
+						$Coloneshow++;
+						$AllPlanets .= "<th>" . $CurrentUserPlanet['name'] . "<br>";
+						$AllPlanets .= "<a href=\"game.php?page=overview&cp=" . $CurrentUserPlanet['id'] . "&re=0\" title=\"" . $CurrentUserPlanet['name'] . "\"><img src=\"" . DPATH . "planeten/small/s_" . $CurrentUserPlanet['image'] . ".jpg\" height=\"50\" width=\"50\"></a><br>";
+						$AllPlanets .= "<center>";
+
+						if($CurrentUserPlanet['b_building'] != 0)
+						{
+							UpdatePlanetBatimentQueueList($CurrentUserPlanet,$CurrentUser);
+							if($CurrentUserPlanet['b_building'] != 0)
+							{
+								$BuildQueue = $CurrentUserPlanet['b_building_id'];
+								$QueueArray = explode(";",$BuildQueue);
+								$CurrentBuild = explode(",",$QueueArray[0]);
+								$BuildElement = $CurrentBuild[0];
+								$BuildLevel = $CurrentBuild[1];
+								$BuildRestTime = pretty_time($CurrentBuild[3] - time());
+								$AllPlanets .= '' . $lang['tech'][$BuildElement] . ' (' . $BuildLevel . ')';
+								$AllPlanets .= "<br><font color=\"#7f7f7f\">(" . $BuildRestTime . ")</font>";
+							}
+							else
+							{
+								CheckPlanetUsedFields($CurrentUserPlanet);
+								$AllPlanets .= $lang['ov_free'];
+							}
+						}
+						else
+						{
+							$AllPlanets .= $lang['ov_free'];
+						}
+
+						$AllPlanets .= "</center></th>";
+
+						if($Colone <= 1)
+							$Colone++;
+						else
+						{
+							$AllPlanets .= "</tr><tr>";
+							$Colone = 1;
+						}
+					}
+				}
+				mysql_free_result($planets_query);
+
+				$AllPlanets .= "</tr>";
+
+				if($lunarow['id'] != 0 && $lunarow['destruyed'] != 1 && $CurrentPlanet['planet_type'] != 3)
+				{
+					if($CurrentPlanet['planet_type'] == 1 or $lunarow['id'] != 0)
+					{
+						$moon = doquery("SELECT `id`,`name`,`image` FROM {{table}} WHERE `galaxy` = '" . intval($CurrentPlanet['galaxy']) . "' AND `system` = '" . intval($CurrentPlanet['system']) . "' AND `planet` = '" . intval($CurrentPlanet['planet']) . "' AND `planet_type` = '3'",'planets',TRUE);
+						$parse['moon_img'] = "<a href=\"game.php?page=overview&cp=" . $moon['id'] . "&re=0\" title=\"" . $moon['name'] . "\"><img src=\"" . DPATH . "planeten/" . $moon['image'] . ".jpg\" height=\"50\" width=\"50\"></a>";
+						$parse['moon'] = $moon['name'] . " (" . $lang['fcm_moon'] . ")";
+					}
+					else
+					{
+						$parse['moon_img'] = "";
+						$parse['moon'] = "";
+					}
+				}
+				else
+				{
+					$parse['moon_img'] = "";
+					$parse['moon'] = "";
+				}
+
+				$parse['planet_diameter'] = pretty_number($CurrentPlanet['diameter']);
+				$parse['planet_field_current'] = $CurrentPlanet['field_current'];
+				$parse['planet_field_max'] = CalculateMaxPlanetFields($CurrentPlanet);
+				$parse['planet_temp_min'] = $CurrentPlanet['temp_min'];
+				$parse['planet_temp_max'] = $CurrentPlanet['temp_max'];
+
+				$StatRecord = doquery("SELECT `total_rank`,`total_points` FROM `{{table}}` WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '" . intval($CurrentUser['id']) . "';",'statpoints',TRUE);
+
+				$parse['user_username'] = $CurrentUser['username'];
+
+				if(count($fpage) > 0)
+				{
+					ksort($fpage);
+					foreach($fpage as $time => $content)
+					{
+						$flotten .= $content . "\n";
+					}
+				}
+
+				if($CurrentPlanet['b_building'] != 0)
+				{
+					include (XGP_ROOT . 'includes/functions/InsertBuildListScript.php');
+
+					UpdatePlanetBatimentQueueList($planetrow,$CurrentUser);
+					if($CurrentPlanet['b_building'] != 0)
+					{
+						$BuildQueue = explode(";",$CurrentPlanet['b_building_id']);
+						$CurrBuild = explode(",",$BuildQueue[0]);
+						$RestTime = $CurrentPlanet['b_building'] - time();
+						$PlanetID = $CurrentPlanet['id'];
+						$Build = InsertBuildListScript("overview");
+						$Build .= $lang['tech'][$CurrBuild[0]] . ' (' . ($CurrBuild[1]) . ')';
+						$Build .= "<br /><div id=\"blc\" class=\"z\">" . pretty_time($RestTime) . "</div>";
+						$Build .= "\n<script language=\"JavaScript\">";
+						$Build .= "\n	pp = \"" . $RestTime . "\";\n";
+						$Build .= "\n	pk = \"" . 1 . "\";\n";
+						$Build .= "\n	pm = \"cancel\";\n";
+						$Build .= "\n	pl = \"" . $PlanetID . "\";\n";
+						$Build .= "\n	t();\n";
+						$Build .= "\n</script>\n";
+						$parse['building'] = $Build;
+					}
+					else
+					{
+						$parse['building'] = $lang['ov_free'];
+					}
+				}
+				else
+				{
+					$parse['building'] = $lang['ov_free'];
+				}
+
+				$parse['fleet_list'] = $flotten;
+				$parse['Have_new_message'] = $Have_new_message;
+				$parse['planet_image'] = $CurrentPlanet['image'];
+				$parse['anothers_planets'] = $AllPlanets;
+				$parse["dpath"] = DPATH;
+				if(read_config ( 'stat' ) == 0)
+					$parse['user_rank'] = pretty_number($StatRecord['total_points']) . " (" . $lang['ov_place'] . " <a href=\"game.php?page=statistics&range=" . $StatRecord['total_rank'] . "\">" . $StatRecord['total_rank'] . "</a> " . $lang['ov_of'] . " " . read_config ( 'users_amount' ) . ")";
+				elseif(read_config ( 'stat' ) == 1 && $CurrentUser['authlevel'] < read_config ( 'stat_level' ))
+					$parse['user_rank'] = pretty_number($StatRecord['total_points']) . " (" . $lang['ov_place'] . " <a href=\"game.php?page=statistics&range=" . $StatRecord['total_rank'] . "\">" . $StatRecord['total_rank'] . "</a> " . $lang['ov_of'] . " " . read_config ( 'users_amount' ) . ")";
+				else
+					$parse['user_rank'] = "-";
+
+				$parse['date_time'] = date("D M j H:i:s",time());
+
+				return display(parsetemplate(gettemplate('overview/overview_body'),$parse));
+				break;
+		}
+	}
+}
+?>
\ No newline at end of file
diff --git a/includes/pages/class.ShowPhalanxPage.php b/includes/pages/class.ShowPhalanxPage.php
new file mode 100644
index 0000000..257430f
--- /dev/null
+++ b/includes/pages/class.ShowPhalanxPage.php
@@ -0,0 +1,157 @@
+<?php
+
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+if(!defined('INSIDE')){ die(header("location:../../"));}
+
+class ShowPhalanxPage
+{
+	function __construct ( $CurrentUser , $CurrentPlanet )
+	{
+		global $lang;
+
+		include_once(XGP_ROOT . 'includes/functions/InsertJavaScriptChronoApplet.php');
+		include_once(XGP_ROOT . 'includes/classes/class.FlyingFleetsTable.php');
+		include_once(XGP_ROOT . 'includes/classes/class.GalaxyRows.php');
+
+		$FlyingFleetsTable 	= new FlyingFleetsTable();
+		$GalaxyRows 		= new GalaxyRows();
+
+		$parse	= $lang;
+
+		$radar_menzil_min = $CurrentPlanet['system'] - $GalaxyRows->GetPhalanxRange ( $CurrentPlanet['phalanx'] );
+		$radar_menzil_max = $CurrentPlanet['system'] + $GalaxyRows->GetPhalanxRange ( $CurrentPlanet['phalanx'] );
+
+		if ( $radar_menzil_min < 1 )
+			$radar_menzil_min = 1;
+
+		if ( $radar_menzil_max > MAX_SYSTEM_IN_GALAXY )
+			$radar_menzil_max = MAX_SYSTEM_IN_GALAXY;
+
+
+		$DoScan=TRUE;
+
+		if (intval ( $_GET["system"] ) < $radar_menzil_min or intval ( $_GET["system"] ) > $radar_menzil_max or intval ( $_GET["galaxy"] ) != $CurrentPlanet['galaxy'])
+		{
+			$DoScan = FALSE;
+		}
+
+		if ($CurrentPlanet['planet_type'] == 3 && $DoScan)
+		{
+			$parse['phl_pl_galaxy']    = $CurrentPlanet['galaxy'];
+			$parse['phl_pl_system']    = $CurrentPlanet['system'];
+			$parse['phl_pl_place']     = $CurrentPlanet['planet'];
+			$parse['phl_pl_name']      = $CurrentUser['username'];
+
+			if ($CurrentPlanet['deuterium'] > 10000)
+			{
+				doquery ("UPDATE {{table}} SET `deuterium` = `deuterium` - '10000' WHERE `id` = '". $CurrentUser['current_planet'] ."';", 'planets');
+				$parse['phl_er_deuter'] = "";
+				$DoScan                 = TRUE;
+			}
+			else
+			{
+				$parse['phl_er_deuter'] = $lang['px_no_deuterium'];
+				$DoScan                 = FALSE;
+			}
+
+			if ($DoScan == TRUE)
+			{
+				$Galaxy  = intval($_GET["galaxy"]);
+				$System  = intval($_GET["system"]);
+				$Planet  = intval($_GET["planet"]);
+				$PlType  = intval($_GET["planettype"]);
+
+				if ( $PlType == 1 )
+				{
+
+				}
+				else
+				{
+					die(header("Location: game.php?page=galaxy"));
+				}
+
+				$TargetInfo = doquery("SELECT * FROM {{table}} WHERE `galaxy` = '". $Galaxy ."' AND `system` = '". $System ."' AND `planet` = '". $Planet ."' AND `planet_type` = '". $PlType ."';", 'planets', TRUE);
+				$TargetName = $TargetInfo['name'];
+
+				$QryLookFleets  = "SELECT * ";
+				$QryLookFleets .= "FROM {{table}} ";
+				$QryLookFleets .= "WHERE ( ( ";
+				$QryLookFleets .= "`fleet_start_galaxy` = '". $Galaxy ."' AND ";
+				$QryLookFleets .= "`fleet_start_system` = '". $System ."' AND ";
+				$QryLookFleets .= "`fleet_start_planet` = '". $Planet ."' AND ";
+				$QryLookFleets .= "`fleet_start_type` = '". $PlType ."' ";
+				$QryLookFleets .= ") OR ( ";
+				$QryLookFleets .= "`fleet_end_galaxy` = '". $Galaxy ."' AND ";
+				$QryLookFleets .= "`fleet_end_system` = '". $System ."' AND ";
+				$QryLookFleets .= "`fleet_end_planet` = '". $Planet ."' AND ";
+				$QryLookFleets .= "`fleet_end_type` = '". $PlType ."' ";
+				$QryLookFleets .= ") ) ";
+				$QryLookFleets .= "ORDER BY `fleet_start_time`;";
+
+				$FleetToTarget  = doquery( $QryLookFleets, 'fleets' );
+
+				if (mysql_num_rows($FleetToTarget) <> 0 )
+				{
+					while ($FleetRow = mysql_fetch_array($FleetToTarget))
+					{
+						$Record++;
+
+						$StartTime   = $FleetRow['fleet_start_time'];
+						$StayTime    = $FleetRow['fleet_end_stay'];
+						$EndTime     = $FleetRow['fleet_end_time'];
+
+						if ($FleetRow['fleet_owner'] == $TargetInfo['id_owner'])
+							$FleetType = TRUE;
+						else
+							$FleetType = FALSE;
+
+						$FleetRow['fleet_resource_metal']     = 0;
+						$FleetRow['fleet_resource_crystal']   = 0;
+						$FleetRow['fleet_resource_deuterium'] = 0;
+
+						$Label = "fs";
+						if ($StartTime > time())
+							$fpage[$StartTime] = $FlyingFleetsTable->BuildFleetEventTable ( $FleetRow, 0, $FleetType, $Label, $Record );
+
+						if ($FleetRow['fleet_mission'] <> 4)
+						{
+							$Label = "ft";
+							if ($StayTime > time())
+								$fpage[$StayTime] = $FlyingFleetsTable->BuildFleetEventTable ( $FleetRow, 1, $FleetType, $Label, $Record );
+
+							if ($FleetType == TRUE)
+							{
+								$Label = "fe";
+								if ($EndTime > time())
+									$fpage[$EndTime]  = $FlyingFleetsTable->BuildFleetEventTable ( $FleetRow, 2, $FleetType, $Label, $Record );
+							}
+						}
+					}
+				}
+
+				if (count($fpage) > 0)
+				{
+					ksort($fpage);
+					foreach ($fpage as $FleetTime => $FleetContent)
+					{
+						$Fleets .= $FleetContent ."\n";
+					}
+				}
+			}
+
+			$parse['phl_fleets_table'] = $Fleets;
+		}
+		else
+		{
+			header("location:game.php?page=overview");
+		}
+
+		return display(parsetemplate(gettemplate('galaxy/phalanx_body'), $parse), FALSE, '', FALSE, FALSE);
+	}
+}
+?>
\ No newline at end of file
diff --git a/includes/pages/class.ShowResearchPage.php b/includes/pages/class.ShowResearchPage.php
index cfbdc69..22b9ac1 100644
--- a/includes/pages/class.ShowResearchPage.php
+++ b/includes/pages/class.ShowResearchPage.php
@@ -1,23 +1,10 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
@@ -50,84 +37,48 @@ private function CheckLabSettingsInQueue ($CurrentPlanet)
 
 			if ($CurrentBuilding == 31 or $Element == 31) // ADDED (or $Element == 31) BY LUCKY
 			{
-				$return = false;
+				$return = FALSE;
 			}
 			else
 			{
-				$return = true;
+				$return = TRUE;
 			}
 		}
 		else
 		{
-			$return = true;
+			$return = TRUE;
 		}
 
 		return $return;
 	}
 
-	private function GetRestPrice ($user, $planet, $Element, $userfactor = true)
-	{
-		global $pricelist, $resource, $lang;
-
-		if ($userfactor)
-		{
-			$level = ($planet[$resource[$Element]]) ? $planet[$resource[$Element]] : $user[$resource[$Element]];
-		}
-
-		$array = array(
-		'metal'      => $lang['Metal'],
-		'crystal'    => $lang['Crystal'],
-		'deuterium'  => $lang['Deuterium'],
-		'energy_max' => $lang['Energy']
-		);
-
-		$text  = "<br><font color=\"#7f7f7f\">" . $lang['bd_remaining'] . ": ";
-		foreach ($array as $ResType => $ResTitle)
-		{
-			if ($pricelist[$Element][$ResType] != 0)
-			{
-				$text .= $ResTitle . ": ";
-				if ($userfactor)
-				{
-					$cost = floor($pricelist[$Element][$ResType] * pow($pricelist[$Element]['factor'], $level));
-				}
-				else
-				{
-					$cost = floor($pricelist[$Element][$ResType]);
-				}
-				if ($cost > $planet[$ResType])
-				{
-					$text .= "<b style=\"color: rgb(127, 95, 96);\">". pretty_number($planet[$ResType] - $cost) ."</b> ";
-				}
-				else
-				{
-					$text .= "<b style=\"color: rgb(95, 127, 108);\">". pretty_number($planet[$ResType] - $cost) ."</b> ";
-				}
-			}
-		}
-		$text .= "</font>";
-
-		return $text;
-	}
-
 	public function __construct (&$CurrentPlanet, $CurrentUser, $InResearch, $ThePlanet)
 	{
-		global $lang, $resource, $reslist, $phpEx, $dpath, $game_config, $_GET;
+		global $lang, $resource, $reslist, $_GET;
 
-		include_once($xgp_root . 'includes/functions/IsTechnologieAccessible.' . $phpEx);
-		include_once($xgp_root . 'includes/functions/GetElementPrice.' . $phpEx);
+		include_once(XGP_ROOT . 'includes/functions/IsTechnologieAccessible.php');
+		include_once(XGP_ROOT . 'includes/functions/GetElementPrice.php');
 
 		$PageParse			= $lang;
 		$NoResearchMessage 	= "";
-		$bContinue         	= true;
+		$bContinue         	= TRUE;
+		$intergal_lab 		= $CurrentUser[$resource[123]];
+		$limite 			= $intergal_lab+1;
+		$inves 				= doquery("SELECT laboratory FROM {{table}} WHERE id_owner='".intval($CurrentUser['id'])."' ORDER BY laboratory DESC LIMIT ".$limite."", 'planets');
+		$lablevel 			= 0;
+
+		while (	$row = mysql_fetch_array ( $inves ) )
+		{
+			$lablevel 	   += $row['laboratory'];
+		}
 
 		if ($CurrentPlanet[$resource[31]] == 0)
-			message($lang['bd_lab_required'], '', '', true);
+			message($lang['bd_lab_required'], '', '', TRUE);
 
 		if (!$this->CheckLabSettingsInQueue ($CurrentPlanet))
 		{
 			$NoResearchMessage = $lang['bd_building_lab'];
-			$bContinue         = false;
+			$bContinue         = FALSE;
 		}
 
 		if (isset($_GET['cmd']))
@@ -169,8 +120,8 @@ public function __construct (&$CurrentPlanet, $CurrentUser, $InResearch, $ThePla
 									$WorkingPlanet['b_tech_id']   = 0;
 									$WorkingPlanet["b_tech"]      = 0;
 									$CurrentUser['b_tech_planet'] = 0;
-									$UpdateData                   = true;
-									$InResearch                   = false;
+									$UpdateData                   = TRUE;
+									$InResearch                   = FALSE;
 								}
 								break;
 							case 'search':
@@ -181,14 +132,14 @@ public function __construct (&$CurrentPlanet, $CurrentUser, $InResearch, $ThePla
 									$WorkingPlanet['crystal']    -= $costs['crystal'];
 									$WorkingPlanet['deuterium']  -= $costs['deuterium'];
 									$WorkingPlanet["b_tech_id"]   = $Techno;
-									$WorkingPlanet["b_tech"]      = time() + GetBuildingTime($CurrentUser, $WorkingPlanet, $Techno);
+									$WorkingPlanet["b_tech"]      = time() + GetBuildingTime($CurrentUser, $WorkingPlanet, $Techno, FALSE, $lablevel);
 									$CurrentUser["b_tech_planet"] = $WorkingPlanet["id"];
-									$UpdateData                   = true;
-									$InResearch                   = true;
+									$UpdateData                   = TRUE;
+									$InResearch                   = TRUE;
 								}
 								break;
 						}
-						if ($UpdateData == true)
+						if ($UpdateData == TRUE)
 						{
 							$QryUpdatePlanet  = "UPDATE {{table}} SET ";
 							$QryUpdatePlanet .= "`b_tech_id` = '".   $WorkingPlanet['b_tech_id']   ."', ";
@@ -216,6 +167,7 @@ public function __construct (&$CurrentPlanet, $CurrentUser, $InResearch, $ThePla
 						{
 							$CurrentPlanet = $WorkingPlanet;
 							if ($TheCommand == 'search')
+
 							{
 								$ThePlanet = $CurrentPlanet;
 							}
@@ -227,15 +179,15 @@ public function __construct (&$CurrentPlanet, $CurrentUser, $InResearch, $ThePla
 			}
 			else
 			{
-				$bContinue = false;
+				$bContinue = FALSE;
 			}
 
 			header ("Location: game.php?page=buildings&mode=research");
 
 		}
 
-		$TechRowTPL = gettemplate('buildings/buildings_research_row');
-		$TechScrTPL = gettemplate('buildings/buildings_research_script');
+		$TechRowTPL 	= gettemplate('buildings/buildings_research_row');
+		$TechScrTPL 	= gettemplate('buildings/buildings_research_script');
 
 		foreach($lang['tech'] as $Tech => $TechName)
 		{
@@ -243,29 +195,28 @@ public function __construct (&$CurrentPlanet, $CurrentUser, $InResearch, $ThePla
 			{
 				if ( IsTechnologieAccessible($CurrentUser, $CurrentPlanet, $Tech))
 				{
-					$RowParse['dpath']       = $dpath;
+					$RowParse['dpath']       = DPATH;
 					$RowParse['tech_id']     = $Tech;
 					$building_level          = $CurrentUser[$resource[$Tech]];
 
 					if($Tech == 106)
 					{
 						$RowParse['tech_level']  = ($building_level == 0 ) ? "" : "(". $lang['bd_lvl'] . " ".$building_level .")" ;
-						$RowParse['tech_level']  .= ($CurrentUser['rpg_espion'] == 0) ? "" : "<strong><font color=\"lime\"> +" . ($CurrentUser['rpg_espion'] * ESPION) . $lang['bd_spy']	. "</font></strong>";
+						$RowParse['tech_level']  .= ($CurrentUser['rpg_technocrate'] == 0) ? "" : "<strong><font color=\"lime\"> +" . ($CurrentUser['rpg_technocrate'] * TECHNOCRATE_SPY) . $lang['bd_spy']	. "</font></strong>";
 					}
 					elseif($Tech == 108)
 					{
 						$RowParse['tech_level']  = ($building_level == 0) ? "" : "(". $lang['bd_lvl'] . " ".$building_level .")";
-						$RowParse['tech_level']  .= ($CurrentUser['rpg_commandant'] == 0) ? "" : "<strong><font color=\"lime\"> +" . ($CurrentUser['rpg_commandant'] * COMMANDANT) . $lang['bd_commander'] . "</font></strong>";
+						$RowParse['tech_level']  .= ($CurrentUser['rpg_amiral'] == 0) ? "" : "<strong><font color=\"lime\"> +" . ($CurrentUser['rpg_amiral'] * AMIRAL) . $lang['bd_commander'] . "</font></strong>";
 					}
 					else
-						$RowParse['tech_level']  = ($building_level == 0) ? "" : "(". $lang['bd_lvl'] . " ".$building_level." )";
+						$RowParse['tech_level']  = ($building_level == 0) ? "" : "(". $lang['bd_lvl'] . " ".$building_level.")";
 
 					$RowParse['tech_name']   = $TechName;
 					$RowParse['tech_descr']  = $lang['res']['descriptions'][$Tech];
 					$RowParse['tech_price']  = GetElementPrice($CurrentUser, $CurrentPlanet, $Tech);
-					$SearchTime              = GetBuildingTime($CurrentUser, $CurrentPlanet, $Tech);
+					$SearchTime              = GetBuildingTime($CurrentUser, $CurrentPlanet, $Tech, FALSE, $lablevel);
 					$RowParse['search_time'] = ShowBuildTime($SearchTime);
-					$RowParse['tech_restp']  = "". $this->GetRestPrice ($CurrentUser, $CurrentPlanet, $Tech, true);
 					$CanBeDone               = IsElementBuyable($CurrentUser, $CurrentPlanet, $Tech);
 
 					if (!$InResearch)
@@ -308,7 +259,7 @@ public function __construct (&$CurrentPlanet, $CurrentUser, $InResearch, $ThePla
 							if ($ThePlanet['id'] != $CurrentPlanet['id'])
 							{
 								$bloc['tech_time']  = $ThePlanet["b_tech"] - time();
-								$bloc['tech_name']  = "íà<br>". $ThePlanet["name"];
+								$bloc['tech_name']  = "de<br>". $ThePlanet["name"];
 								$bloc['tech_home']  = $ThePlanet["id"];
 								$bloc['tech_id']    = $ThePlanet["b_tech_id"];
 							}
@@ -334,9 +285,9 @@ public function __construct (&$CurrentPlanet, $CurrentUser, $InResearch, $ThePla
 
 		$PageParse['noresearch']  = $NoResearchMessage;
 		$PageParse['technolist']  = $TechnoList;
-		$PageParse['research_lvl']= "<b>".($lang['tech'][31])."</b> (".$lang['in_level'].": <font color='#00FF00'>".$CurrentPlanet[$resource[31]]."</font>)"; // âîò ýòó ñòðî÷êó
 		$Page                    .= parsetemplate(gettemplate('buildings/buildings_research'), $PageParse);
 
 		display($Page);
 	}
-}
\ No newline at end of file
+}
+?>
\ No newline at end of file
diff --git a/includes/pages/class.ShowResourcesPage.php b/includes/pages/class.ShowResourcesPage.php
new file mode 100644
index 0000000..f966a0c
--- /dev/null
+++ b/includes/pages/class.ShowResourcesPage.php
@@ -0,0 +1,245 @@
+<?php
+
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+if(!defined('INSIDE')){ die(header("location:../../"));}
+
+class ShowResourcesPage
+{
+	function __construct ( $CurrentUser , $CurrentPlanet )
+	{
+		global $lang, $ProdGrid, $resource, $reslist;
+
+		$parse 							= 	$lang;
+		$game_metal_basic_income		=	read_config ( 'metal_basic_income' );
+		$game_crystal_basic_income		=	read_config ( 'crystal_basic_income' );
+		$game_deuterium_basic_income	=	read_config ( 'deuterium_basic_income' );
+		$game_energy_basic_income		=	read_config ( 'energy_basic_income' );
+		$game_resource_multiplier		=	read_config ( 'resource_multiplier' );
+
+		if ($CurrentPlanet['planet_type'] == 3)
+		{
+			$game_metal_basic_income    	= 0;
+			$game_crystal_basic_income   	= 0;
+			$game_deuterium_basic_income 	= 0;
+		}
+
+		$ValidList['percent'] = array (  0,  10,  20,  30,  40,  50,  60,  70,  80,  90, 100 );
+		$SubQry               = "";
+
+		if ($_POST)
+		{
+			foreach($_POST as $Field => $Value)
+			{
+				$FieldName = $Field."_porcent";
+				if ( isset( $CurrentPlanet[ $FieldName ] ) )
+				{
+					if ( ! in_array( $Value, $ValidList['percent']) )
+					{
+						header("Location: game.php?page=ressources");
+						exit;
+					}
+
+					$Value                        = $Value / 10;
+					$CurrentPlanet[ $FieldName ]  = $Value;
+					$SubQry                      .= ", `".$FieldName."` = '".$Value."'";
+				}
+			}
+		}
+
+		$parse['production_level'] = 100;
+		if       ($CurrentPlanet['energy_max'] == 0 && $CurrentPlanet['energy_used'] > 0)
+		{
+			$post_porcent = 0;
+		}
+		elseif ($CurrentPlanet['energy_max'] >  0 && ($CurrentPlanet['energy_used'] + $CurrentPlanet['energy_max']) < 0 )
+		{
+			$post_porcent = floor(($CurrentPlanet['energy_max']) / ($CurrentPlanet['energy_used']*-1) * 100);
+		}
+		else
+		{
+			$post_porcent = 100;
+		}
+
+		if ($post_porcent > 100)
+		{
+			$post_porcent = 100;
+		}
+
+		$CurrentPlanet['metal_max']		=	(BASE_STORAGE_SIZE + 50000 * (roundUp(pow(1.6,$CurrentPlanet[ $resource[22] ])) -1));
+		$CurrentPlanet['crystal_max']	=	(BASE_STORAGE_SIZE + 50000 * (roundUp(pow(1.6,$CurrentPlanet[ $resource[23] ])) -1));
+		$CurrentPlanet['deuterium_max']	=	(BASE_STORAGE_SIZE + 50000 * (roundUp(pow(1.6,$CurrentPlanet[ $resource[24] ])) -1));
+
+		$parse['resource_row']               = "";
+		$CurrentPlanet['metal_perhour']      = 0;
+		$CurrentPlanet['crystal_perhour']    = 0;
+		$CurrentPlanet['deuterium_perhour']  = 0;
+		$CurrentPlanet['energy_max']         = 0;
+		$CurrentPlanet['energy_used']        = 0;
+		$BuildTemp                           = $CurrentPlanet[ 'temp_max' ];
+		$ResourcesRowTPL=gettemplate('resources/resources_row');
+		foreach($reslist['prod'] as $ProdID)
+		{
+			if ($CurrentPlanet[$resource[$ProdID]] > 0 && isset($ProdGrid[$ProdID]))
+			{
+				$BuildLevelFactor                    = $CurrentPlanet[ $resource[$ProdID]."_porcent" ];
+				$BuildLevel                          = $CurrentPlanet[ $resource[$ProdID] ];
+				$metal     = floor( eval ( $ProdGrid[$ProdID]['formule']['metal']     ) * ( $game_resource_multiplier ) * ( 1 + ( $CurrentUser['rpg_geologue']  * GEOLOGUE ) ) );
+				$crystal   = floor( eval ( $ProdGrid[$ProdID]['formule']['crystal']   ) * ( $game_resource_multiplier ) * ( 1 + ( $CurrentUser['rpg_geologue']  * GEOLOGUE ) ) );
+				$deuterium = floor( eval ( $ProdGrid[$ProdID]['formule']['deuterium'] ) * ( $game_resource_multiplier ) * ( 1 + ( $CurrentUser['rpg_geologue']  * GEOLOGUE ) ) );
+
+				if( $ProdID >= 4 )
+				{
+					$energy = floor( eval ( $ProdGrid[$ProdID]['formule']['energy']    ) * ( $game_resource_multiplier ) * ( 1 + ( $CurrentUser['rpg_ingenieur'] * ENGINEER_ENERGY ) ) );
+				}
+				else $energy = floor( eval ( $ProdGrid[$ProdID]['formule']['energy']    ) * ( $game_resource_multiplier ) );
+				if ($energy > 0)
+				{
+					$CurrentPlanet['energy_max']    += $energy;
+				}
+				else
+				{
+					$CurrentPlanet['energy_used']   += $energy;
+				}
+
+				$CurrentPlanet['metal_perhour']     += $metal;
+				$CurrentPlanet['crystal_perhour']   += $crystal;
+				$CurrentPlanet['deuterium_perhour'] += $deuterium;
+
+				$metal                               = $metal     * 0.01 * $post_porcent;
+				$crystal                             = $crystal   * 0.01 * $post_porcent;
+				$deuterium                           = $deuterium * 0.01 * $post_porcent;
+				$energy                              = $energy    * 0.01 * $post_porcent;
+				$Field                               = $resource[$ProdID] ."_porcent";
+				$CurrRow                             = array();
+				$CurrRow['name']                     = $resource[$ProdID];
+				$CurrRow['porcent']                  = $CurrentPlanet[$Field];
+
+				for ($Option = 10; $Option >= 0; $Option--)
+				{
+					$OptValue = $Option * 10;
+
+					if ($Option == $CurrRow['porcent'])
+					{
+						$OptSelected    = " selected=selected";
+					}
+					else
+					{
+						$OptSelected    = "";
+					}
+					$CurrRow['option'] .= "<option value=\"".$OptValue."\"".$OptSelected.">".$OptValue."%</option>";
+				}
+
+				$CurrRow['type']                     = $lang['tech'][$ProdID];
+				$CurrRow['level']                    = ($ProdID > 200) ? $lang['rs_amount'] : $lang['rs_lvl'];
+				$CurrRow['level_type']               = $CurrentPlanet[ $resource[$ProdID] ];
+				$CurrRow['metal_type']               = pretty_number ( $metal     );
+				$CurrRow['crystal_type']             = pretty_number ( $crystal   );
+				$CurrRow['deuterium_type']           = pretty_number ( $deuterium );
+				$CurrRow['energy_type']              = pretty_number ( $energy    );
+				$CurrRow['metal_type']               = colorNumber ( $CurrRow['metal_type']     );
+				$CurrRow['crystal_type']             = colorNumber ( $CurrRow['crystal_type']   );
+				$CurrRow['deuterium_type']           = colorNumber ( $CurrRow['deuterium_type'] );
+				$CurrRow['energy_type']              = colorNumber ( $CurrRow['energy_type']    );
+				$parse['resource_row']              .= parsetemplate ($ResourcesRowTPL , $CurrRow );
+			}
+		}
+
+		$parse['Production_of_resources_in_the_planet'] = str_replace('%s', $CurrentPlanet['name'], $lang['rs_production_on_planet']);
+
+		if ($CurrentPlanet['energy_max'] == 0 && $CurrentPlanet['energy_used'] > 0)
+		{
+			$parse['production_level'] = 0;
+		}
+		elseif ($CurrentPlanet['energy_max']  > 0 && abs($CurrentPlanet['energy_used']) > $CurrentPlanet['energy_max'])
+		{
+			$parse['production_level'] = floor(($CurrentPlanet['energy_max']) / ($CurrentPlanet['energy_used']*-1) * 100);
+		}
+		elseif ($CurrentPlanet['energy_max'] == 0 && abs($CurrentPlanet['energy_used']) > $CurrentPlanet['energy_max'])
+		{
+			$parse['production_level'] = 0;
+		}
+		else
+		{
+			$parse['production_level'] = 100;
+		}
+
+		if ($parse['production_level'] > 100)
+		{
+			$parse['production_level'] = 100;
+		}
+
+		$parse['metal_basic_income']     = $game_metal_basic_income;
+		$parse['crystal_basic_income']   = $game_crystal_basic_income;
+		$parse['deuterium_basic_income'] = $game_deuterium_basic_income;
+		$parse['energy_basic_income']    = $game_energy_basic_income;
+
+		if ($CurrentPlanet['metal_max'] < $CurrentPlanet['metal'])
+		{
+			$parse['metal_max']         = "<font color=\"#ff0000\">";
+		}
+		else
+		{
+			$parse['metal_max']         = "<font color=\"#00ff00\">";
+		}
+		$parse['metal_max']            .= pretty_number($CurrentPlanet['metal_max'] / 1000) ."k</font>";
+
+		if ($CurrentPlanet['crystal_max'] < $CurrentPlanet['crystal'])
+		{
+			$parse['crystal_max']       = "<font color=\"#ff0000\">";
+		}
+		else
+		{
+			$parse['crystal_max']       = "<font color=\"#00ff00\">";
+		}
+		$parse['crystal_max']          .= pretty_number($CurrentPlanet['crystal_max'] / 1000) ."k</font>";
+
+		if ($CurrentPlanet['deuterium_max'] < $CurrentPlanet['deuterium'])
+		{
+			$parse['deuterium_max']     = "<font color=\"#ff0000\">";
+		}
+		else
+		{
+			$parse['deuterium_max']     = "<font color=\"#00ff00\">";
+		}
+		$parse['deuterium_max']        .= pretty_number($CurrentPlanet['deuterium_max'] / 1000) ."k</font>";
+
+		$parse['metal_total']           = colorNumber( pretty_number( floor( ( ($CurrentPlanet['metal_perhour']     * 0.01 * $parse['production_level'] ) + $parse['metal_basic_income']))));
+		$parse['crystal_total']         = colorNumber( pretty_number( floor( ( ($CurrentPlanet['crystal_perhour']   * 0.01 * $parse['production_level'] ) + $parse['crystal_basic_income']))));
+		$parse['deuterium_total']       = colorNumber( pretty_number( floor( ( ($CurrentPlanet['deuterium_perhour'] * 0.01 * $parse['production_level'] ) + $parse['deuterium_basic_income']))));
+		$parse['energy_total']          = colorNumber( pretty_number( floor( ( $CurrentPlanet['energy_max'] + $parse['energy_basic_income']    ) + $CurrentPlanet['energy_used'] ) ) );
+
+		$parse['daily_metal']           = floor($CurrentPlanet['metal_perhour']     * 24      * 0.01 * $parse['production_level']  + $parse['metal_basic_income']      * 24      );
+		$parse['weekly_metal']          = floor($CurrentPlanet['metal_perhour']     * 24 * 7  * 0.01 * $parse['production_level']  + $parse['metal_basic_income']      * 24 * 7  );
+
+		$parse['daily_crystal']         = floor($CurrentPlanet['crystal_perhour']   * 24      * 0.01 * $parse['production_level']  + $parse['crystal_basic_income']    * 24      );
+		$parse['weekly_crystal']        = floor($CurrentPlanet['crystal_perhour']   * 24 * 7  * 0.01 * $parse['production_level']  + $parse['crystal_basic_income']    * 24 * 7  );
+
+		$parse['daily_deuterium']       = floor($CurrentPlanet['deuterium_perhour'] * 24      * 0.01 * $parse['production_level']  + $parse['deuterium_basic_income']  * 24      );
+		$parse['weekly_deuterium']      = floor($CurrentPlanet['deuterium_perhour'] * 24 * 7  * 0.01 * $parse['production_level']  + $parse['deuterium_basic_income']  * 24 * 7  );
+
+		$parse['daily_metal']           = colorNumber(pretty_number($parse['daily_metal']));
+		$parse['weekly_metal']          = colorNumber(pretty_number($parse['weekly_metal']));
+
+		$parse['daily_crystal']         = colorNumber(pretty_number($parse['daily_crystal']));
+		$parse['weekly_crystal']        = colorNumber(pretty_number($parse['weekly_crystal']));
+
+		$parse['daily_deuterium']       = colorNumber(pretty_number($parse['daily_deuterium']));
+		$parse['weekly_deuterium']      = colorNumber(pretty_number($parse['weekly_deuterium']));
+
+
+		$QryUpdatePlanet  = "UPDATE {{table}} SET ";
+		$QryUpdatePlanet .= "`id` = '". $CurrentPlanet['id'] ."' ";
+		$QryUpdatePlanet .= $SubQry;
+		$QryUpdatePlanet .= "WHERE ";
+		$QryUpdatePlanet .= "`id` = '". $CurrentPlanet['id'] ."';";
+		doquery( $QryUpdatePlanet, 'planets');
+
+		return display(parsetemplate( gettemplate('resources/resources'), $parse));
+	}
+}
+?>
\ No newline at end of file
diff --git a/includes/pages/class.ShowSearchPage.php b/includes/pages/class.ShowSearchPage.php
new file mode 100644
index 0000000..459772f
--- /dev/null
+++ b/includes/pages/class.ShowSearchPage.php
@@ -0,0 +1,113 @@
+<?php
+
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+if(!defined('INSIDE')){ die(header("location:../../"));}
+
+class ShowSearchPage
+{
+	function __construct ()
+	{
+		global $lang;
+
+		$parse 	= $lang;
+		$type 	= $_POST['type'];
+
+		$searchtext = mysql_escape_string($_POST["searchtext"]);
+		//queries fixed by Jstar
+		if ( $_POST )
+		{
+			switch($type)
+			{
+				case "playername":
+					$table 	= gettemplate('search/search_user_table');
+					$row 	= gettemplate('search/search_user_row');
+					$search	= doquery("SELECT * ,{{table}}statpoints.total_rank as rank FROM {{table}}users , {{table}}statpoints  WHERE {{table}}users.id = {{table}}statpoints.id_owner AND {{table}}users.username LIKE '%".$searchtext."%' LIMIT 25 ; ","");
+				break;
+				case "planetname":
+					$table 	= gettemplate('search/search_user_table');
+					$row 	= gettemplate('search/search_user_row');
+					$search	= doquery("SELECT * ,{{table}}statpoints.total_rank as rank FROM {{table}}planets , {{table}}statpoints  WHERE {{table}}planets.id_owner = {{table}}statpoints.id_owner AND {{table}}planets.name LIKE '%".$searchtext."%' LIMIT 25 ; ","");
+				break;
+				case "allytag":
+					$table 	= gettemplate('search/search_ally_table');
+					$row 	= gettemplate('search/search_ally_row');
+					$search	= doquery("SELECT * ,{{table}}statpoints.total_points as points FROM {{table}}alliance , {{table}}statpoints  WHERE {{table}}alliance.id = {{table}}statpoints.id_owner AND {{table}}alliance.ally_tag LIKE '%".$searchtext."%' LIMIT 25 ; ","");
+				break;
+				case "allyname":
+					$table 	= gettemplate('search/search_ally_table');
+					$row 	= gettemplate('search/search_ally_row');
+					$search = doquery("SELECT * ,{{table}}statpoints.total_points as points FROM {{table}}alliance , {{table}}statpoints  WHERE {{table}}alliance.id = {{table}}statpoints.id_owner AND {{table}}alliance.ally_name LIKE '%".$searchtext."%' LIMIT 25 ; ","");
+				break;
+				default:
+					$table 	= gettemplate('search/search_user_table');
+					$row 	= gettemplate('search/search_user_row');
+					$search = doquery("SELECT * ,{{table}}statpoints.total_rank as rank FROM {{table}}users , {{table}}statpoints  WHERE {{table}}users.id = {{table}}statpoints.id_owner AND {{table}}users.username LIKE '%".$searchtext."%' LIMIT 25 ; ","");
+				break;
+			}
+		}
+
+		if(isset($searchtext) && isset($type))
+		{
+			while($s = mysql_fetch_array($search, MYSQL_BOTH))
+			{
+				if($type == 'playername' or $type == 'planetname')
+				{
+					if($s['ally_id'] != 0 && $s['ally_request'] == 0)
+					{
+						$aquery = doquery("SELECT id,ally_name FROM {{table}} WHERE id = ".intval($s['ally_id'])."","alliance",TRUE);
+					}
+					else
+					{
+						$aquery = array();
+					}
+
+					if ($type == "planetname")
+					{
+						$pquery 			= doquery("SELECT username,ally_id,ally_name FROM {{table}} WHERE id = ".intval($s['id_owner'])."","users",TRUE);
+						$s['planet_name'] 	= $s['name'];
+						$s['username'] 		= $pquery['username'];
+						$s['ally_name'] 	= ($pquery['ally_name']!='')?"<a href=\"game.php?page=alliance&mode=ainfo&a={$pquery['ally_id']}\">{$pquery['ally_name']}</a>":'';
+					}
+					else
+					{
+						$pquery 			= doquery("SELECT name FROM {{table}} WHERE id = ".intval($s['id_planet'])."","planets",TRUE);
+						$s['planet_name']	= $pquery['name'];
+						$s['ally_name'] 	= ($aquery['ally_name']!='')?"<a href=\"game.php?page=alliance&mode=ainfo&a={$aquery['id']}\">{$aquery['ally_name']}</a>":'';
+					}
+
+					$s['position'] 		= "<a href=\"game.php?page=statistics&start=".$s['rank']."\">".$s['rank']."</a>";
+					$s['dpath'] 		= DPATH;
+					$s['coordinated'] 	= "{$s['galaxy']}:{$s['system']}:{$s['planet']}";
+					$result_list 	   .= parsetemplate($row, $s);
+				}
+				elseif($type=='allytag'||$type=='allyname')
+				{
+					$s['ally_points'] = pretty_number($s['ally_points']);
+
+					$s['ally_tag'] = "<a href=\"game.php?page=alliance&mode=ainfo&tag={$s['ally_tag']}\">{$s['ally_tag']}</a>";
+					$result_list .= parsetemplate($row, $s);
+				}
+			}
+			if($result_list!='')
+			{
+				$parse['result_list'] = $result_list;
+				$search_results = parsetemplate($table, $parse);
+			}
+		}
+
+		$parse['type_playername'] 	= ($_POST["type"] == "playername") ? " SELECTED" : "";
+		$parse['type_planetname'] 	= ($_POST["type"] == "planetname") ? " SELECTED" : "";
+		$parse['type_allytag'] 		= ($_POST["type"] == "allytag") ? " SELECTED" : "";
+		$parse['type_allyname'] 	= ($_POST["type"] == "allyname") ? " SELECTED" : "";
+		$parse['searchtext'] 		= $searchtext;
+		$parse['search_results'] 	= $search_results;
+
+		display(parsetemplate(gettemplate('search/search_body'), $parse));
+	}
+}
+?>
\ No newline at end of file
diff --git a/includes/pages/class.ShowShipyardPage.php b/includes/pages/class.ShowShipyardPage.php
index c0fa51a..54206c5 100644
--- a/includes/pages/class.ShowShipyardPage.php
+++ b/includes/pages/class.ShowShipyardPage.php
@@ -1,62 +1,35 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if(!defined('INSIDE')){ die(header("location:../../"));}
 
 class ShowShipyardPage
 {
+	//optimized by alivan & jstar
 	private function GetMaxConstructibleElements ($Element, $Ressources)
-	{
-		global $pricelist;
-
-		if ($pricelist[$Element]['metal'] != 0)
-		{
-			$Buildable        = floor($Ressources["metal"] / $pricelist[$Element]['metal']);
-			$MaxElements      = $Buildable;
-		}
+    {
+        global $pricelist;
 
-		if ($pricelist[$Element]['crystal'] != 0)
-			$Buildable        = floor($Ressources["crystal"] / $pricelist[$Element]['crystal']);
+        $Buildable=array();
+        if ($pricelist[$Element]['metal'] != 0)
+            $Buildable['metal']     = floor($Ressources["metal"] / $pricelist[$Element]['metal']);
 
-		if (!isset($MaxElements))
-			$MaxElements      = $Buildable;
-		elseif($MaxElements > $Buildable)
-			$MaxElements      = $Buildable;
+        if ($pricelist[$Element]['crystal'] != 0)
+            $Buildable['crystal']   = floor($Ressources["crystal"] / $pricelist[$Element]['crystal']);
 
-		if ($pricelist[$Element]['deuterium'] != 0)
-			$Buildable        = floor($Ressources["deuterium"] / $pricelist[$Element]['deuterium']);
+        if ($pricelist[$Element]['deuterium'] != 0)
+            $Buildable['deuterium'] = floor($Ressources["deuterium"] / $pricelist[$Element]['deuterium']);
 
-		if (!isset($MaxElements))
-			$MaxElements      = $Buildable;
-		elseif ($MaxElements > $Buildable)
-			$MaxElements      = $Buildable;
+        if ($pricelist[$Element]['energy'] != 0)
+            $Buildable['energy']    = floor($Ressources["energy_max"] / $pricelist[$Element]['energy']);
 
-		if ($pricelist[$Element]['energy'] != 0)
-			$Buildable        = floor($Ressources["energy_max"] / $pricelist[$Element]['energy']);
-
-		if ($Buildable < 1)
-			$MaxElements      = 0;
-
-		return $MaxElements;
-	}
+        return max(min($Buildable),0);
+    }
 
 	private function GetElementRessources($Element, $Count)
 	{
@@ -104,23 +77,31 @@ private function ElementBuildListBox ( $CurrentUser, $CurrentPlanet )
 
 	public function FleetBuildingPage ( &$CurrentPlanet, $CurrentUser )
 	{
-		global $lang, $resource, $phpEx, $dpath, $xgp_root;
+		global $lang, $resource;
 
-		include_once($xgp_root . 'includes/functions/IsTechnologieAccessible.' . $phpEx);
-		include_once($xgp_root . 'includes/functions/GetElementPrice.' . $phpEx);
+		include_once(XGP_ROOT . 'includes/functions/IsTechnologieAccessible.php');
+		include_once(XGP_ROOT . 'includes/functions/GetElementPrice.php');
 
 		$parse = $lang;
 
 		if (isset($_POST['fmenge']))
 		{
-			$AddedInQueue = false;
+			$AddedInQueue = FALSE;
 
 			foreach($_POST['fmenge'] as $Element => $Count)
 			{
+				if($Element < 200 OR $Element > 300)
+				{
+					continue;
+				}
+
 				$Element = intval($Element);
 				$Count   = intval($Count);
+
 				if ($Count > MAX_FLEET_OR_DEFS_PER_ROW)
+				{
 					$Count = MAX_FLEET_OR_DEFS_PER_ROW;
+				}
 
 				if ($Count != 0)
 				{
@@ -138,10 +119,6 @@ public function FleetBuildingPage ( &$CurrentPlanet, $CurrentUser )
 							$CurrentPlanet['metal']          -= $Ressource['metal'];
 							$CurrentPlanet['crystal']        -= $Ressource['crystal'];
 							$CurrentPlanet['deuterium']      -= $Ressource['deuterium'];
-
-							if ($Element == 214 && $CurrentUser['rpg_destructeur'] == 1)
-								$Count = 2 * $Count;
-
 							$CurrentPlanet['b_hangar_id']    .= "". $Element .",". $Count .";";
 						}
 					}
@@ -153,9 +130,9 @@ public function FleetBuildingPage ( &$CurrentPlanet, $CurrentUser )
 		}
 
 		if ($CurrentPlanet[$resource[21]] == 0)
-			message($lang['bd_shipyard_required'], '', '', true);
+			message($lang['bd_shipyard_required'], '', '', TRUE);
 
-		$NotBuilding = true;
+		$NotBuilding = TRUE;
 
 		if ($CurrentPlanet['b_building_id'] != 0)
 		{
@@ -185,7 +162,7 @@ public function FleetBuildingPage ( &$CurrentPlanet, $CurrentUser )
 			if ( ( ( $CurrentBuilding == 21 ) or ( $CurrentBuilding == 14 ) or ( $CurrentBuilding == 15 ) ) or  (($Element == 21 ) or ( $Element == 14 ) or ( $Element == 15 )) ) // ADDED (or $Element == 21) BY LUCKY
 			{
 				$parse[message] = "<font color=\"red\">".$lang['bd_building_shipyard']."</font>";
-				$NotBuilding = false;
+				$NotBuilding = FALSE;
 			}
 		}
 
@@ -196,39 +173,32 @@ public function FleetBuildingPage ( &$CurrentPlanet, $CurrentUser )
 			{
 				if (IsTechnologieAccessible($CurrentUser, $CurrentPlanet, $Element))
 				{
-					$CanBuildOne         = IsElementBuyable($CurrentUser, $CurrentPlanet, $Element, false);
-					$BuildOneElementTime = GetBuildingTime($CurrentUser, $CurrentPlanet, $Element);
-					$ElementCount        = $CurrentPlanet[$resource[$Element]];
-					$ElementNbre         = ($ElementCount == 0) ? "" : " (". $lang['bd_available'] . pretty_number($ElementCount) . ")";
-
-					$PageTable .= "\n<tr>";
-					$PageTable .= "<th class=l>";
-					$PageTable .= "<a href=game.".$phpEx."?page=infos&gid=".$Element.">";
-					$PageTable .= "<img border=0 src=\"".$dpath."gebaeude/".$Element.".gif\" align=top width=120 height=120></a>";
-					$PageTable .= "</th>";
-					$PageTable .= "<td class=l width=360>";
-					$PageTable .= "<a href=game.".$phpEx."?page=infos&gid=".$Element.">".$ElementName."</a> ".$ElementNbre."<br>";
-					$PageTable .= "".$lang['res']['descriptions'][$Element]."<br>";
-					$PageTable .= GetElementPrice($CurrentUser, $CurrentPlanet, $Element, false);
-					$PageTable .= ShowBuildTime($BuildOneElementTime);
-					$PageTable .= "<br /><font color=\"#ADFF2F\"><b>".$lang['fl_ship_maxbye']." ".$this->GetMaxConstructibleElements ( $Element, $CurrentPlanet );
-					$PageTable .= "</b></td>";
-					$PageTable .= "<th class=k width=120>";
+					$CanBuildOne         			= IsElementBuyable($CurrentUser, $CurrentPlanet, $Element, FALSE);
+					$BuildOneElementTime 			= GetBuildingTime($CurrentUser, $CurrentPlanet, $Element);
+					$ElementCount        			= $CurrentPlanet[$resource[$Element]];
+					$ElementNbre         			= ($ElementCount == 0) ? "" : " (". $lang['bd_available'] . pretty_number($ElementCount) . ")";
+
+					$parse['dpath']					= DPATH;
+					$parse['add_element']			= '';
+					$parse['element']				= $Element;
+					$parse['element_name']			= $ElementName;
+					$parse['element_description']	= $lang['res']['descriptions'][$Element];
+					$parse['element_price']			= GetElementPrice($CurrentUser, $CurrentPlanet, $Element, FALSE);
+					$parse['building_time']			= ShowBuildTime($BuildOneElementTime);
+					$parse['element_nbre']			= $ElementNbre;
 
 					if ($CanBuildOne && $NotBuilding)
 					{
 						$TabIndex++;
-						$PageTable .= "<input type=text name=fmenge[".$Element."] alt='".$lang['tech'][$Element]."' size=6 maxlength=6 value=0 tabindex=".$TabIndex.">";
+						$parse['add_element'] 	= "<input type=text name=fmenge[".$Element."] alt='".$lang['tech'][$Element]."' size=6 maxlength=6 value=0 tabindex=".$TabIndex.">";
 					}
 
 					if($NotBuilding)
 					{
-						$parse[build_fleet] = "<tr><td class=\"c\" colspan=\"3\" align=\"center\"><input type=\"submit\" value=\"".$lang['bd_build_ships']."\"></td></tr>";
+						$parse[build_fleet] 	= "<tr><td class=\"c\" colspan=\"2\" align=\"center\"><input type=\"submit\" value=\"".$lang['bd_build_ships']."\"></td></tr>";
 					}
 
-					$PageTable .= "</th>";
-					$PageTable .= "</tr>";
-
+					$PageTable .= parsetemplate(gettemplate('buildings/buildings_fleet_row'), $parse);
 				}
 			}
 		}
@@ -238,17 +208,15 @@ public function FleetBuildingPage ( &$CurrentPlanet, $CurrentUser )
 
 		$parse['buildlist']    	= $PageTable;
 		$parse['buildinglist'] 	= $BuildQueue;
-		$parse['fleet_lvl']     = "<b>".($lang['tech'][21])."</b> (".$lang['in_level'].": <font color='#00FF00'>".$CurrentPlanet[$resource[21]]."</font>)"; 
-
 		display(parsetemplate(gettemplate('buildings/buildings_fleet'), $parse));
 	}
 
 	public function DefensesBuildingPage ( &$CurrentPlanet, $CurrentUser )
 	{
-		global $lang, $resource, $phpEx, $dpath, $_POST,$xgp_root;
+		global $lang, $resource, $_POST;
 
-		include_once($xgp_root . 'includes/functions/IsTechnologieAccessible.' . $phpEx);
-		include_once($xgp_root . 'includes/functions/GetElementPrice.' . $phpEx);
+		include_once(XGP_ROOT . 'includes/functions/IsTechnologieAccessible.php');
+		include_once(XGP_ROOT . 'includes/functions/GetElementPrice.php');
 
 		$parse = $lang;
 
@@ -274,40 +242,37 @@ public function DefensesBuildingPage ( &$CurrentPlanet, $CurrentUser )
 				}
 			}
 
-
 			foreach($_POST['fmenge'] as $Element => $Count)
 			{
+				if($Element < 300 OR $Element > 550)
+				{
+					continue;
+				}
+
 				$Element = intval($Element);
 				$Count   = intval($Count);
 
 				if ($Count > MAX_FLEET_OR_DEFS_PER_ROW)
+				{
 					$Count = MAX_FLEET_OR_DEFS_PER_ROW;
+				}
 
 				if ($Count != 0)
 				{
 					$InQueue = strpos ( $CurrentPlanet['b_hangar_id'], $Element.",");
 					$IsBuildp = ($CurrentPlanet[$resource[407]] >= 1) ? TRUE : FALSE;
 					$IsBuildg = ($CurrentPlanet[$resource[408]] >= 1) ? TRUE : FALSE;
-					$IsBuildpp = ($CurrentPlanet[$resource[409]] >= 1) ? TRUE : FALSE;
 
 					if ( $Element == 407 && !$IsBuildp && $InQueue === FALSE )
 					{
 						$Count = 1;
 					}
 
-
 					if ( $Element == 408 && !$IsBuildg && $InQueue === FALSE )
 					{
 						$Count = 1;
 					}
 
-
-					if ( $Element == 409 && !$IsBuildpp && $InQueue === FALSE )
-					{
-						$Count = 1;
-					}
-
-
 					if (IsTechnologieAccessible($CurrentUser, $CurrentPlanet, $Element))
 					{
 						$MaxElements = $this->GetMaxConstructibleElements ( $Element, $CurrentPlanet );
@@ -337,6 +302,7 @@ public function DefensesBuildingPage ( &$CurrentPlanet, $CurrentUser )
 								$Count = $MaxElements;
 							}
 
+
 							$Missiles[$Element] += $Count;
 						}
 						else
@@ -366,9 +332,9 @@ public function DefensesBuildingPage ( &$CurrentPlanet, $CurrentUser )
 		}
 
 		if ($CurrentPlanet[$resource[21]] == 0)
-			message($lang['bd_shipyard_required'], '', '', true);
+			message($lang['bd_shipyard_required'], '', '', TRUE);
 
-		$NotBuilding = true;
+		$NotBuilding = TRUE;
 
 		if ($CurrentPlanet['b_building_id'] != 0)
 		{
@@ -398,7 +364,7 @@ public function DefensesBuildingPage ( &$CurrentPlanet, $CurrentUser )
 			if ( ( ( $CurrentBuilding == 21 ) or ( $CurrentBuilding == 14 ) or ( $CurrentBuilding == 15 ) ) or  (($Element == 21 ) or ( $Element == 14 ) or ( $Element == 15 )) ) // ADDED (or $Element == 21) BY LUCKY
 			{
 				$parse[message] = "<font color=\"red\">".$lang['bd_building_shipyard']."</font>";
-				$NotBuilding = false;
+				$NotBuilding = FALSE;
 			}
 
 
@@ -412,36 +378,30 @@ public function DefensesBuildingPage ( &$CurrentPlanet, $CurrentUser )
 			{
 				if (IsTechnologieAccessible($CurrentUser, $CurrentPlanet, $Element))
 				{
-					$CanBuildOne         = IsElementBuyable($CurrentUser, $CurrentPlanet, $Element, false);
-					$BuildOneElementTime = GetBuildingTime($CurrentUser, $CurrentPlanet, $Element);
-					$ElementCount        = $CurrentPlanet[$resource[$Element]];
-					$ElementNbre         = ($ElementCount == 0) ? "" : " (". $lang['bd_available'] . pretty_number($ElementCount) . ")";
-
-					$PageTable .= "\n<tr>";
-					$PageTable .= "<th class=l>";
-					$PageTable .= "<a href=game.".$phpEx."?page=infos&gid=".$Element.">";
-					$PageTable .= "<img border=0 src=\"".$dpath."gebaeude/".$Element.".gif\" align=top width=120 height=120></a>";
-					$PageTable .= "</th>";
-					$PageTable .= "<td class=l width=360>";
-					$PageTable .= "<a href=game.".$phpEx."?page=infos&gid=".$Element.">".$ElementName."</a> ".$ElementNbre."<br>";
-					$PageTable .= "".$lang['res']['descriptions'][$Element]."<br>";
-					$PageTable .= GetElementPrice($CurrentUser, $CurrentPlanet, $Element, false);
-					$PageTable .= ShowBuildTime($BuildOneElementTime);
-                    $PageTable .= "<br /><font color=\"#ADFF2F\"><b>".$lang['fl_ship_maxbye']." ".$this->GetMaxConstructibleElements ( $Element, $CurrentPlanet );
-					$PageTable .= "</b></td>";
-					$PageTable .= "</td>";
-					$PageTable .= "<th class=k width=120>";
+					$CanBuildOne         			= IsElementBuyable($CurrentUser, $CurrentPlanet, $Element, FALSE);
+					$BuildOneElementTime 			= GetBuildingTime($CurrentUser, $CurrentPlanet, $Element);
+					$ElementCount        			= $CurrentPlanet[$resource[$Element]];
+					$ElementNbre         			= ($ElementCount == 0) ? "" : " (". $lang['bd_available'] . pretty_number($ElementCount) . ")";
+
+					$parse['add_element']			= '';
+					$parse['dpath']					= DPATH;
+					$parse['element']				= $Element;
+					$parse['element_name']			= $ElementName;
+					$parse['element_description']	= $lang['res']['descriptions'][$Element];
+					$parse['element_price']			= GetElementPrice($CurrentUser, $CurrentPlanet, $Element, FALSE);
+					$parse['building_time']			= ShowBuildTime($BuildOneElementTime);
+					$parse['element_nbre']			= $ElementNbre;
 
 					if ($CanBuildOne)
 					{
 						$InQueue = strpos ( $CurrentPlanet['b_hangar_id'], $Element.",");
 						$IsBuildp = ($CurrentPlanet[$resource[407]] >= 1) ? TRUE : FALSE;
 						$IsBuildg = ($CurrentPlanet[$resource[408]] >= 1) ? TRUE : FALSE;
-						$IsBuildpp = ($CurrentPlanet[$resource[409]] >= 1) ? TRUE : FALSE;
 						$BuildIt = TRUE;
-						if ($Element == 407 || $Element == 408 || $Element == 409)
+
+						if ($Element == 407 || $Element == 408 )
 						{
-							$BuildIt = false;
+							$BuildIt = FALSE;
 
 							if ( $Element == 407 && !$IsBuildp && $InQueue === FALSE )
 								$BuildIt = TRUE;
@@ -449,31 +409,25 @@ public function DefensesBuildingPage ( &$CurrentPlanet, $CurrentUser )
 							if ( $Element == 408 && !$IsBuildg && $InQueue === FALSE )
 								$BuildIt = TRUE;
 
-							if ( $Element == 409 && !$IsBuildpp && $InQueue === FALSE )
-								$BuildIt = TRUE;
-
 						}
 
 						if (!$BuildIt)
-							$PageTable .= "<font color=\"red\">".$lang['bd_protection_shield_only_one']."</font>";
+						{
+							$parse['add_element'] = "<font color=\"red\">".$lang['bd_protection_shield_only_one']."</font>";
+						}
 						elseif($NotBuilding)
 						{
 							$TabIndex++;
-							$PageTable .= "<input type=text name=fmenge[".$Element."] alt='".$lang['tech'][$Element]."' size=6 maxlength=6 value=0 tabindex=".$TabIndex.">";
-							$PageTable .= "</th>";
+							$parse['add_element'] = "<input type=text name=fmenge[".$Element."] alt='".$lang['tech'][$Element]."' size=6 maxlength=6 value=0 tabindex=".$TabIndex.">";
 						}
 
 						if($NotBuilding)
 						{
-							$parse[build_defenses] = "<tr><td class=\"c\" colspan=\"3\" align=\"center\"><input type=\"submit\" value=\"".$lang['bd_build_defenses']."\"></td></tr>";
+							$parse[build_defenses] = "<tr><td class=\"c\" colspan=\"2\" align=\"center\"><input type=\"submit\" value=\"".$lang['bd_build_defenses']."\"></td></tr>";
 						}
 					}
-					else
-					{
-						$PageTable .= "</th>";
-					}
 
-					$PageTable .= "</tr>";
+					$PageTable .= parsetemplate(gettemplate('buildings/buildings_fleet_row'), $parse);
 				}
 			}
 		}
@@ -483,8 +437,6 @@ public function DefensesBuildingPage ( &$CurrentPlanet, $CurrentUser )
 
 		$parse['buildlist']    	= $PageTable;
 		$parse['buildinglist'] 	= $BuildQueue;
-		$parse['fleet_lvl']     = "<b>".($lang['tech'][21])."</b> (".$lang['in_level'].": <font color='#00FF00'>".$CurrentPlanet[$resource[21]]."</font>)"; 
-
 		display(parsetemplate(gettemplate('buildings/buildings_defense'), $parse));
 	}
 }
diff --git a/includes/pages/class.ShowStatisticsPage.php b/includes/pages/class.ShowStatisticsPage.php
new file mode 100644
index 0000000..f552ee3
--- /dev/null
+++ b/includes/pages/class.ShowStatisticsPage.php
@@ -0,0 +1,249 @@
+<?php
+
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+if(!defined('INSIDE')){ die(header("location:../../"));}
+
+class ShowStatisticsPage
+{
+	function ShowStatisticsPage ( $CurrentUser )
+	{
+		global $lang;
+
+		$parse	= $lang;
+		$who   	= (isset($_POST['who']))   ? $_POST['who']   : $_GET['who'];
+		if (!isset($who))
+			$who   = 1;
+
+		$type  	= (isset($_POST['type']))  ? $_POST['type']  : $_GET['type'];
+		if (!isset($type))
+			$type  = 1;
+
+		$range 	= (isset($_POST['range'])) ? $_POST['range'] : $_GET['range'];
+		if (!isset($range))
+			$range = 1;
+
+		$parse['who']    = "<option value=\"1\"". (($who == "1") ? " SELECTED" : "") .">".$lang['st_player']."</option>";
+		$parse['who']   .= "<option value=\"2\"". (($who == "2") ? " SELECTED" : "") .">".$lang['st_alliance']."</option>";
+
+		$parse['type']   = "<option value=\"1\"". (($type == "1") ? " SELECTED" : "") .">".$lang['st_points']."</option>";
+		$parse['type']  .= "<option value=\"2\"". (($type == "2") ? " SELECTED" : "") .">".$lang['st_fleets']."</option>";
+		$parse['type']  .= "<option value=\"3\"". (($type == "3") ? " SELECTED" : "") .">".$lang['st_researh']."</option>";
+		$parse['type']  .= "<option value=\"4\"". (($type == "4") ? " SELECTED" : "") .">".$lang['st_buildings']."</option>";
+		$parse['type']  .= "<option value=\"5\"". (($type == "5") ? " SELECTED" : "") .">".$lang['st_defenses']."</option>";
+
+		switch ($type)
+		{
+			case 1:
+				$Order   = "total_points";
+				$Points  = "total_points";
+				$Counts  = "total_count";
+				$Rank    = "total_rank";
+				$OldRank = "total_old_rank";
+				break;
+			case 2:
+				$Order   = "fleet_count";
+				$Points  = "fleet_points";
+				$Counts  = "fleet_count";
+				$Rank    = "fleet_rank";
+				$OldRank = "fleet_old_rank";
+				break;
+			case 3:
+				$Order   = "tech_count";
+				$Points  = "tech_points";
+				$Counts  = "tech_count";
+				$Rank    = "tech_rank";
+				$OldRank = "tech_old_rank";
+				break;
+			case 4:
+				$Order   = "build_points";
+				$Points  = "build_points";
+				$Counts  = "build_count";
+				$Rank    = "build_rank";
+				$OldRank = "build_old_rank";
+				break;
+			case 5:
+				$Order   = "defs_points";
+				$Points  = "defs_points";
+				$Counts  = "defs_count";
+				$Rank    = "defs_rank";
+				$OldRank = "defs_old_rank";
+				break;
+			default:
+				$Order   = "total_points";
+				$Points  = "total_points";
+				$Counts  = "total_count";
+				$Rank    = "total_rank";
+				$OldRank = "total_old_rank";
+				break;
+		}
+
+		if ($who == 2)
+		{
+			$MaxAllys = doquery ("SELECT COUNT(*) AS `count` FROM {{table}};", 'alliance', TRUE);
+
+			if ($MaxAllys['count'] > 100)
+			{
+				$LastPage = floor($MaxAllys['count'] / 100);
+			}
+
+			$parse['range'] = "";
+
+			for ($Page = 0; $Page <= $LastPage; $Page++)
+			{
+				$PageValue      = ($Page * 100) + 1;
+				$PageRange      = $PageValue + 99;
+				$parse['range'] .= "<option value=\"". $PageValue ."\"". (($range >= $PageValue && $range <= $PageRange) ? " SELECTED" : "") .">". $PageValue ."-". $PageRange ."</option>";
+			}
+
+			$parse['stat_header'] = parsetemplate(gettemplate('stat/stat_alliancetable_header'), $parse);
+			$start = floor($range / 100 % 100) * 100;
+			$stats_sql	=	'SELECT s.*, a.id, a.ally_members, a.ally_tag, a.ally_name FROM {{table}}statpoints as s
+			INNER JOIN {{table}}alliance as a ON a.id = s.id_owner
+			WHERE `stat_type` = 2 AND `stat_code` = 1
+			ORDER BY `'. $Order .'` DESC LIMIT '. $start .',100;';
+
+			$start++;
+			$parse['stat_date']   = date("Y-m-d, H:i:s",read_config ( 'stat_last_update' ) );
+			$parse['stat_values'] = "";
+			$query = doquery($stats_sql, '');
+			$StatAllianceTableTPL=gettemplate('stat/stat_alliancetable');
+			while ($StatRow = mysql_fetch_assoc($query))
+			{
+				$parse['ally_rank']       = $start;
+				if ( $StatRow[ $OldRank ] == 0 || $StatRow[ $Rank ] == 0)
+				{
+					$rank_old				= $start;
+					$QryUpdRank				= doquery("UPDATE {{table}} SET `".$Rank."` = '".$start."', `".$OldRank."` = '".$start."' WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '". intval($StatRow['id_owner']) ."';" , "statpoints");
+					$StatRow[ $OldRank ]	= $start;
+					$StatRow[ $Rank ]		= $start;
+				}
+
+				$ranking                  = $StatRow[ $OldRank ] - $StatRow[ $Rank ];
+
+				if ($ranking == 0)
+				{
+					$parse['ally_rankplus']   = "<font color=#87CEEB>*</font>";
+				}
+
+				if ($ranking < 0)
+				{
+					$parse['ally_rankplus']   = "<font color=red>-".$ranking."</font>";
+				}
+
+				if ($ranking > 0)
+				{
+					$parse['ally_rankplus']   = "<font color=green>+".$ranking."</font>";
+				}
+
+				$parse['ally_tag']        	  = $StatRow['ally_tag'];
+				$parse['ally_name']       	  = $StatRow['ally_name'];
+				$parse['ally_mes']        	  = '';
+				$parse['ally_members']    	  = $StatRow['ally_members'];
+				$parse['ally_points']     	  = pretty_number( $StatRow[ $Order ] );
+				$parse['ally_members_points'] =  pretty_number( floor($StatRow[ $Order ] / $StatRow['ally_members']) );
+				$parse['stat_values']    	 .= parsetemplate($StatAllianceTableTPL, $parse);
+				$start++;
+			}
+		}
+		else
+		{
+			$MaxUsers = doquery ("SELECT COUNT(*) AS `count` FROM {{table}} WHERE `db_deaktjava` = '0';", 'users', TRUE);
+
+			if ($MaxUsers['count'] > 100)
+			{
+				$LastPage = floor($MaxUsers['count'] / 100);
+			}
+
+			$parse['range'] = "";
+
+			for ($Page = 0; $Page <= $LastPage; $Page++)
+			{
+				$PageValue      = ($Page * 100) + 1;
+				$PageRange      = $PageValue + 99;
+
+				$parse['range'] .= "<option value=\"". $PageValue ."\"". (($range >= $PageValue && $range <= $PageRange) ? " SELECTED" : "") .">". $PageValue ."-". $PageRange ."</option>";
+			}
+
+
+			$parse['stat_header'] = parsetemplate(gettemplate('stat/stat_playertable_header'), $parse);
+
+			$start = floor($range / 100 % 100) * 100;
+
+			$stats_sql	=	'SELECT s.*, u.id, u.username, u.ally_id, u.ally_name FROM {{table}}statpoints as s
+			INNER JOIN {{table}}users as u ON u.id = s.id_owner
+			WHERE `stat_type` = 1 AND `stat_code` = 1
+			ORDER BY `'. $Order .'` DESC LIMIT '. $start .',100;';
+
+			$query = doquery($stats_sql, '');
+
+			$start++;
+
+			$parse['stat_date']   = date("Y-m-d, H:i:s",read_config ( 'stat_last_update' ) );
+			$parse['stat_values'] = "";
+
+			$previusId = 0;
+			$StatPlayerTableTPL=gettemplate('stat/stat_playertable');
+			while ($StatRow = mysql_fetch_assoc($query))
+			{
+				$parse['player_rank']     = $start;
+				if ( $StatRow[ $OldRank ] == 0 || $StatRow[ $Rank ] == 0)
+				{
+					$rank_old				= $start;
+					$QryUpdRank				= doquery("UPDATE {{table}} SET `".$Rank."` = '".$start."', `".$OldRank."` = '".$start."' WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '". intval($StatRow['id_owner']) ."';" , "statpoints");
+					$StatRow[ $OldRank ]	= $start;
+					$StatRow[ $Rank ]		= $start;
+				}
+
+				$ranking                  = $StatRow[ $OldRank ] - $StatRow[ $Rank ];
+
+				if ($StatRow['id'] != $previusId)
+				{
+					$previusId 			= $StatRow['id'];
+
+					if ($ranking == 0)
+					{
+						$parse['player_rankplus'] = "<font color=#87CEEB>*</font>";
+					}
+
+					if ($ranking < 0)
+						$parse['player_rankplus'] = "<font color=red>".$ranking."</font>";
+
+					if ($ranking > 0)
+						$parse['player_rankplus'] = "<font color=green>+".$ranking."</font>";
+
+					if ($StatRow['id'] == $CurrentUser['id'])
+						$parse['player_name']     = "<font color=\"lime\">".$StatRow['username']."</font>";
+					else
+						$parse['player_name']     = $StatRow['username'];
+
+					if ($StatRow['id'] != $CurrentUser['id'])
+						$parse['player_mes']      = "<a href=\"game.php?page=messages&mode=write&id=" . $StatRow['id'] . "\"><img src=\"" . DPATH . "img/m.gif\" border=\"0\" title=\"Escribir un mensaje\" /></a>";
+					else
+						$parse['player_mes']      = "";
+
+					if ($UsrRow['ally_name'] == $CurrentUser['ally_name'])
+					{
+						$parse['player_alliance'] = "<a href=\"game.php?page=alliance&mode=ainfo&a=".$StatRow['ally_id']."\"><font color=\"#33CCFF\">".$StatRow['ally_name']."</font></a>";
+					}
+					else
+					{
+						$parse['player_alliance'] = "<a href=\"game.php?page=alliance&mode=ainfo&a=".$StatRow['ally_id']."\">".$StatRow['ally_name']."</a>";
+					}
+					$parse['player_points']   = pretty_number( $StatRow[ $Order ] );
+					$parse['stat_values']    .= parsetemplate($StatPlayerTableTPL, $parse);
+
+
+					$start++;
+				}
+			}
+		}
+
+		display(parsetemplate( gettemplate('stat/stat_body'), $parse ));
+	}
+}
+?>
\ No newline at end of file
diff --git a/includes/pages/class.ShowTechTreePage.php b/includes/pages/class.ShowTechTreePage.php
new file mode 100644
index 0000000..706bcf4
--- /dev/null
+++ b/includes/pages/class.ShowTechTreePage.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+if(!defined('INSIDE')){ die(header("location:../../"));}
+
+class ShowTechTreePage
+{
+	function __construct ( $CurrentUser , $CurrentPlanet )
+	{
+		global $resource, $requeriments, $lang;
+
+		$parse = $lang;
+
+		$TechTreeHeadTPL=gettemplate('techtree/techtree_head');
+		$TechTreeRowTPL =gettemplate('techtree/techtree_row');
+
+		foreach($lang['tech'] as $Element => $ElementName)
+		{
+			if ( $Element < 600 )
+			{
+				$parse            = array();
+				$parse['tt_name'] = $ElementName;
+
+				if (!isset($resource[$Element]))
+				{
+					$parse['Requirements']  = $lang['tt_requirements'];
+					$page                  .= parsetemplate($TechTreeHeadTPL, $parse);
+				}
+				else
+				{
+					if (isset($requeriments[$Element]))
+					{
+						$parse['required_list'] = "";
+						foreach($requeriments[$Element] as $ResClass => $Level)
+						{
+							if( isset($CurrentUser[$resource[$ResClass]] ) && $CurrentUser[$resource[$ResClass]] >= $Level)
+								$parse['required_list'] .= "<font color=\"#00ff00\">";
+							elseif ( isset($CurrentPlanet[$resource[$ResClass]] ) && $CurrentPlanet[$resource[$ResClass]] >= $Level)
+								$parse['required_list'] .= "<font color=\"#00ff00\">";
+							else
+								$parse['required_list'] .= "<font color=\"#ff0000\">";
+
+							$parse['required_list'] .= $lang['tech'][$ResClass] ." (". $lang['tt_lvl'] . $Level .")";
+							$parse['required_list'] .= "</font><br>";
+						};
+					}
+					else
+					{
+						$parse['required_list'] = "";
+						$parse['tt_detail']     = "";
+					}
+					$parse['tt_info']   = $Element;
+					$page              .= parsetemplate($TechTreeRowTPL, $parse);
+				}
+			}
+		}
+
+		$parse['techtree_list'] = $page;
+
+		return display(parsetemplate(gettemplate('techtree/techtree_body'), $parse));
+	}
+}
+?>
\ No newline at end of file
diff --git a/includes/pages/class.ShowTraderPage.php b/includes/pages/class.ShowTraderPage.php
new file mode 100644
index 0000000..3731ff4
--- /dev/null
+++ b/includes/pages/class.ShowTraderPage.php
@@ -0,0 +1,165 @@
+<?php
+
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+if(!defined('INSIDE')){ die(header("location:../../"));}
+
+class ShowTraderPage
+{
+	function __construct ( $CurrentUser , $CurrentPlanet )
+	{
+		global $lang;
+
+		$parse = $lang;
+
+		if($CurrentUser['darkmatter'] < TR_DARK_MATTER)
+		{
+			message(str_replace('%s',TR_DARK_MATTER,$lang['tr_darkmatter_needed']), '', '', TRUE);
+			die();
+		}
+
+		if (isset($_POST['ress']) && $_POST['ress'] != '')
+		{
+			switch ($_POST['ress'])
+			{
+				case 'metal':
+				{
+					if ($_POST['cristal'] < 0 or $_POST['deut'] < 0)
+					{
+						message($lang['tr_only_positive_numbers'], "game.php?page=trader",1);
+					}
+					else
+					{
+						$necessaire   = (($_POST['cristal'] * 2) + ($_POST['deut'] * 4));
+
+						if ($CurrentPlanet['metal'] > $necessaire)
+						{
+							$QryUpdatePlanet  = "UPDATE {{table}} SET ";
+							$QryUpdatePlanet .= "`metal` = `metal` - ".round($necessaire).", ";
+							$QryUpdatePlanet .= "`crystal` = `crystal` + ".round($_POST['cristal']).", ";
+							$QryUpdatePlanet .= "`deuterium` = `deuterium` + ".round($_POST['deut'])." ";
+							$QryUpdatePlanet .= "WHERE ";
+							$QryUpdatePlanet .= "`id` = '".$CurrentPlanet['id']."';";
+
+							doquery($QryUpdatePlanet , 'planets');
+
+							$planetrow['metal']     -= $necessaire;
+							$CurrentPlanet['cristal']   += $_POST['cristal'];
+							$CurrentPlanet['deuterium'] += $_POST['deut'];
+							doquery("UPDATE `{{table}}` SET `darkmatter` = `darkmatter` - ".TR_DARK_MATTER." WHERE `id` = ".$CurrentUser['id']."", 'users');
+						}
+						else
+						{
+							message($lang['tr_not_enought_metal'], "game.php?page=trader",1);
+						}
+					}
+					break;
+				}
+				case 'cristal':
+				{
+					if ($_POST['metal'] < 0 or $_POST['deut'] < 0)
+					{
+						message($lang['tr_only_positive_numbers'], "game.php?page=trader",1);
+					}
+					else
+					{
+						$necessaire   = ((abs($_POST['metal']) * 0.5) + (abs($_POST['deut']) * 2));
+
+						if ($CurrentPlanet['crystal'] > $necessaire)
+						{
+							$QryUpdatePlanet  = "UPDATE {{table}} SET ";
+							$QryUpdatePlanet .= "`metal` = `metal` + ".round($_POST['metal']).", ";
+							$QryUpdatePlanet .= "`crystal` = `crystal` - ".round($necessaire).", ";
+							$QryUpdatePlanet .= "`deuterium` = `deuterium` + ".round($_POST['deut'])." ";
+							$QryUpdatePlanet .= "WHERE ";
+							$QryUpdatePlanet .= "`id` = '".$CurrentPlanet['id']."';";
+
+							doquery($QryUpdatePlanet , 'planets');
+
+							$CurrentPlanet['metal']     += $_POST['metal'];
+							$CurrentPlanet['cristal']   -= $necessaire;
+							$CurrentPlanet['deuterium'] += $_POST['deut'];
+							doquery("UPDATE `{{table}}` SET `darkmatter` = `darkmatter` - ".TR_DARK_MATTER." WHERE `id` = ".$CurrentUser['id']."", 'users');
+						}
+						else
+						{
+							message($lang['tr_not_enought_crystal'], "game.php?page=trader",1);
+						}
+					}
+					break;
+				}
+				case 'deuterium':
+				{
+					if ($_POST['cristal'] < 0 or $_POST['metal'] < 0)
+					{
+						message($lang['tr_only_positive_numbers'], "game.php?page=trader",1);
+					}
+					else
+					{
+						$necessaire   = ((abs($_POST['metal']) * 0.25) + (abs($_POST['cristal']) * 0.5));
+
+						if ($CurrentPlanet['deuterium'] > $necessaire)
+						{
+							$QryUpdatePlanet  = "UPDATE {{table}} SET ";
+							$QryUpdatePlanet .= "`metal` = `metal` + ".round($_POST['metal']).", ";
+							$QryUpdatePlanet .= "`crystal` = `crystal` + ".round($_POST['cristal']).", ";
+							$QryUpdatePlanet .= "`deuterium` = `deuterium` - ".round($necessaire)." ";
+							$QryUpdatePlanet .= "WHERE ";
+							$QryUpdatePlanet .= "`id` = '".$CurrentPlanet['id']."';";
+
+							doquery($QryUpdatePlanet , 'planets');
+
+							$CurrentPlanet['metal']     += $_POST['metal'];
+							$CurrentPlanet['cristal']   += $_POST['cristal'];
+							$CurrentPlanet['deuterium'] -= $necessaire;
+							doquery("UPDATE `{{table}}` SET `darkmatter` = `darkmatter` - ".TR_DARK_MATTER." WHERE `id` = ".$CurrentUser['id']."", 'users');
+						}
+						else
+						{
+							message($lang['tr_not_enought_deuterium'], "game.php?page=trader",1);
+						}
+					}
+					break;
+				}
+			}
+
+			message($lang['tr_exchange_done'],"game.php?page=trader",1);
+		}
+		else
+		{
+			if ($_POST['action'] != 2)
+			{
+				$template = gettemplate('trader/trader_main');
+			}
+			else
+			{
+				$parse['mod_ma_res'] = '1';
+
+				switch ($_POST['choix'])
+				{
+					case 'metal':
+						$template = gettemplate('trader/trader_metal');
+						$parse['mod_ma_res_a'] = '2';
+						$parse['mod_ma_res_b'] = '4';
+						break;
+					case 'cristal':
+						$template = gettemplate('trader/trader_cristal');
+						$parse['mod_ma_res_a'] = '0.5';
+						$parse['mod_ma_res_b'] = '2';
+						break;
+					case 'deut':
+						$template = gettemplate('trader/trader_deuterium');
+						$parse['mod_ma_res_a'] = '0.25';
+						$parse['mod_ma_res_b'] = '0.5';
+						break;
+				}
+			}
+		}
+		display(parsetemplate($template,$parse));
+	}
+}
+?>
\ No newline at end of file
diff --git a/styles/skins/New-Year!/pic/index.html b/includes/pages/index.html
similarity index 100%
rename from styles/skins/New-Year!/pic/index.html
rename to includes/pages/index.html
diff --git a/includes/plugins.php b/includes/plugins.php
index 8c26c92..2ae18c1 100644
--- a/includes/plugins.php
+++ b/includes/plugins.php
@@ -1,34 +1,23 @@
 <?php
+
 /**
- * Plugins system
- * @author Perberos
- * @modified Adri93
- * @package XNova
- * @version 0.3
- * @copyright (c) 2008,2009 XNova Group
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
  */
 
-if (!defined('INSIDE'))
-{
-	die('Hacking attempt');
-}
-//Ahora el sistema de plugins es compatible con todas las versiones, solo hay que cambiar el root que utiliza el juego desde aqui :D
-$game_root = $xgp_root;
+if (!defined('INSIDE')){die();}
 
-// return the name of php file without extension
 function phpself()
 {
-	global $game_root;
-
 	$file = pathinfo($_SERVER['PHP_SELF']);
-	// fix for PHP PHP 4 > 5.2.0
+
 	if (version_compare(PHP_VERSION, '5.2.0', '<'))
 	{
-		$file['filename'] = substr($file['basename'], 0,
-			strlen($file['basename']) - strlen($file['extension']) - 1);
+		$file['filename'] = substr($file['basename'], 0, strlen($file['basename']) - strlen($file['extension']) - 1);
 	}
-	if (basename($game_root) != '.')
+
+	if (basename(XGP_ROOT) != '.')
 	{
 		return basename($file['dirname']).'/'.$file['filename'];
 	}
@@ -78,7 +67,7 @@ function get_hook($name)
  */
 function PluginAct($name)
 {
-    $Exists = doquery("SELECT status FROM {{table}} WHERE `plugin` = '" . $name . "' LIMIT 1;", "plugins", true);
+    $Exists = doquery("SELECT status FROM {{table}} WHERE `plugin` = '" . $name . "' LIMIT 1;", "plugins", TRUE);
 	if(!$Exists) doquery("INSERT INTO {{table}} SET `plugin` = '" . $name . "';", "plugins");
 
 	return ($Exists[0]);
@@ -92,47 +81,50 @@ function PluginAct($name)
  */
 function AdmPlugin($name, $desc)
 {
-$page   =   $_GET['modo'];
-if(is_phpself('adm/SettingsPage') && $page=='plugins'){
-    $activado          = PluginAct($name);
-    $config_line .= "<tr>";
-    if($activado == "1") { //if the plugin is on
-    $config_line .= "<td class=\"c\" style=\"color:#FFFFFF\">".$name."</td>";
-    $config_line .= "<td align=\"left\" class=\"c\" style=\"color:green\"><b>On</b></td>";
-    $config_line .= "<td align=\"center\" class=\"c\" width=\"20px\" style=\"color:#FFFFFF\"><a href=\"SettingsPage.php?modo=plugins&desactivate=".$name."\">Äåàêòèâèðîâàòü</a></td>";
-    } else { //if the plugin is off
-    $config_line .= "<td class=\"c\" style=\"color:#FFFFFF\"><a href=\"#\" onMouseOver='return overlib(\"".$desc."\", CENTER, OFFSETX, 120, OFFSETY, -40, WIDTH, 250);' onMouseOut='return nd();' class=\"big\">".$name."</a></td>";
-    $config_line .= "<td align=\"left\" class=\"c\" style=\"color:red\"><b>Off</b></td>";
-    $config_line .= "<td align=\"center\" class=\"c\" width=\"20px\" style=\"color:#FFFFFF\"><a href=\"SettingsPage.php?modo=plugins&activate=".$name."\">Àêòèâèðîâàòü</a></td>";
-    }
-    $config_line .= "</tr>";
-    }
-return ($config_line);
+	$page   =   $_GET['modo'];
+	if(is_phpself('adm/SettingsPage') && $page=='plugins')
+	{
+	    $activado		= PluginAct($name);
+	    $config_line	.= "<tr>";
+
+	    if($activado == "1")
+	    { //if the plugin is on
+	    	$config_line .= "<td class=\"c\" style=\"color:#FFFFFF\">".$name."</td>";
+	    	$config_line .= "<td align=\"left\" class=\"c\" style=\"color:green\"><b>On</b></td>";
+	    	$config_line .= "<td align=\"center\" class=\"c\" width=\"20px\" style=\"color:#FFFFFF\"><a href=\"SettingsPage.php?modo=plugins&desactivate=".$name."\">Desactivar</a></td>";
+	    }
+		else
+		{ //if the plugin is off
+	    	$config_line .= "<td class=\"c\" style=\"color:#FFFFFF\"><a href=\"#\" onMouseOver='return overlib(\"".$desc."\", CENTER, OFFSETX, 120, OFFSETY, -40, WIDTH, 250);' onMouseOut='return nd();' class=\"big\">".$name."</a></td>";
+	    	$config_line .= "<td align=\"left\" class=\"c\" style=\"color:red\"><b>Off</b></td>";
+	    	$config_line .= "<td align=\"center\" class=\"c\" width=\"20px\" style=\"color:#FFFFFF\"><a href=\"SettingsPage.php?modo=plugins&activate=".$name."\">Activar</a></td>";
+	    }
+	    $config_line .= "</tr>";
+	}
+	return ($config_line);
 }
 
-$config_line  = "";
-// making a little better the code using one var instead of two.
-$plugins_path = $game_root.'includes/plugins/';
-// this variable is only for compatibility reasons, using version_compare()
-$plugins_version = '0.3';
-// this array is used to store code for actions trigger in some hooks
-$plugins_hooks = array();
+$config_line  		= "";
+$plugins_path 		= XGP_ROOT . 'includes/plugins/';
+$plugins_version 	= '0.3';
+$plugins_hooks 		= array();
 
 // open all files inside plugins folder
+
 $dir = opendir($plugins_path);
 
-while (($file = readdir($dir)) !== false)
+while (($file = readdir($dir)) !== FALSE)
 {
 	// we check if the file is a include file
 	$extension = '.'.substr($file, -3);
 	// and include once the file
-	if ($extension == '.'.$phpEx)
+	if ($extension == '.php')
 	{
 		include $plugins_path . $file;
 	}
-	elseif (file_exists($plugins_path.$file.'/'.$file.'.'.$phpEx))
+	elseif (file_exists($plugins_path.$file.'/'.$file.'.php'))
 	{ // by the way, we check if the plugin is inside of a folder
-		include $plugins_path.$file.'/'.$file.'.'.$phpEx;
+		include $plugins_path.$file.'/'.$file.'.php';
 	}
 }
 
@@ -144,45 +136,49 @@ function AdmPlugin($name, $desc)
 *@author adri93
 */
 if ( defined('IN_ADMIN') )
-    {
-        $lang['mu_settings'] .= '</a></th></tr><tr><th ".$onMouseOverIE." class="ForIE"><a href="SettingsPage.php?modo=plugins" target="Hauptframe">Config. plugins';
-		$dpath     = "../". DEFAULT_SKINPATH  ;
-
-
-
-$page   =   $_GET['modo'];
-if(is_phpself('adm/SettingsPage') && $page=='plugins'){
-
-    //Si existe activar, activamos el plugin, xD
-     if($_GET['activate']) {
-    $plugin = $_GET['activate'];
-    //Verificamos que exista
-    $ex = doquery("SELECT status FROM {{table}} WHERE `plugin`='". $plugin ."' LIMIT 1", 'plugins', true);
-    if(!$ex){}else{
-    doquery("UPDATE {{table}} SET `status` = 1 WHERE `plugin`='".$plugin."' LIMIT 1", "plugins");
-    $info = "<big>Ïëàãèí Àêòèâèðîâàí</big>";}
-    }
-    //Si existe desactivar, lo desactivamos
-    if($_GET['desactivate']) {
-    $plugin = $_GET['desactivate'];
-    //Verificamos que exista
-    $ex = doquery("SELECT status FROM {{table}} WHERE `plugin`='". $plugin ."' LIMIT 1", 'plugins', true);
-    if(!$ex){}else{
-    doquery("UPDATE {{table}} SET `status` = 0 WHERE `plugin`='". $plugin ."' LIMIT 1", "plugins");
-    $info = "<h1>Ïëàãèí Äåàêòèâèðîâàí</h1>";}
-    }
-
-    $settingsplug ='       <br><table width="250"><br>';
-    $settingsplug .=' <td class="c" colspan="3" style="color:#FFFA00"><font size="3">Ïàíåëü Ïëàãèíîâ</font></td>';
-    $settingsplug .= $info;
-    $settingsplug .=' <br>';
-    $settingsplug .=' <tr>';
-    $settingsplug .='     <td class="a" colspan="3" style="color:#FFFFFF"><strong> Ïëàãèíû </strong></td>';
-    $settingsplug .=' </tr>';
-    $settingsplug .= $config_line;
-    $settingsplug .=' </table>';
-
-    display($settingsplug, false, '', true, false);
-        }
-    }
+{
+	$lang['mu_settings'] 	.= '</a></th></tr><tr><th ".$onMouseOverIE." class="ForIE"><a href="SettingsPage.php?modo=plugins" target="Hauptframe">Config. plugins';
+	define('DPATH' , "../". DEFAULT_SKINPATH );
+	//DPATH     				= "../". DEFAULT_SKINPATH  ;
+	$page   				=   $_GET['modo'];
+
+	if(is_phpself('adm/SettingsPage') && $page=='plugins')
+	{
+		//Si existe activar, activamos el plugin, xD
+		if($_GET['activate'])
+		{
+			$plugin = $_GET['activate'];
+			$ex 	= doquery("SELECT status FROM {{table}} WHERE `plugin`='". $plugin ."' LIMIT 1", 'plugins', TRUE);
+
+			if ( $ex )
+			{
+				doquery("UPDATE {{table}} SET `status` = 1 WHERE `plugin`='".$plugin."' LIMIT 1", "plugins");
+				$info = "<big>Plugin Activado</big>";
+			}
+		}
+		//Si existe desactivar, lo desactivamos
+		if($_GET['desactivate'])
+		{
+			$plugin = $_GET['desactivate'];
+			$ex 	= doquery("SELECT status FROM {{table}} WHERE `plugin`='". $plugin ."' LIMIT 1", 'plugins', TRUE);
+			if ( $ex )
+			{
+				doquery("UPDATE {{table}} SET `status` = 0 WHERE `plugin`='". $plugin ."' LIMIT 1", "plugins");
+				$info = "<h1>Plugin Desactivado</h1>";
+			}
+		}
+
+		$settingsplug	='       <br><br>';
+		$settingsplug 	.=' <h2>Plugins Panel</h2>';
+		$settingsplug 	.= $info;
+		$settingsplug 	.=' <br><table width="250">';
+		$settingsplug 	.=' <tr>';
+		$settingsplug 	.='     <td class="a" colspan="3" style="color:#FFFFFF"><strong> Plugins instalados </strong></td>';
+		$settingsplug 	.=' </tr>';
+		$settingsplug 	.= $config_line;
+		$settingsplug 	.=' </table>';
+
+		display ( $settingsplug , FALSE , '' , TRUE , FALSE );
+	}
+}
 ?>
\ No newline at end of file
diff --git a/styles/skins/New-Year!/planeten/index.html b/includes/plugins/index.html
similarity index 100%
rename from styles/skins/New-Year!/planeten/index.html
rename to includes/plugins/index.html
diff --git a/includes/vars.php b/includes/vars.php
index 4ffcefc..d9ab9c7 100644
--- a/includes/vars.php
+++ b/includes/vars.php
@@ -1,23 +1,10 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 if ( defined('INSIDE'))
 {
@@ -57,8 +44,6 @@
 	122 => "buster_tech",
 	123 => "intergalactic_tech",
 	124 => "expedition_tech",
-	125 => "atom_tech",	
-	150 => "colonisation_tech",
 	199 => "graviton_tech",
 
 	202 => "small_ship_cargo",
@@ -75,7 +60,6 @@
 	213 => "destructor",
 	214 => "dearth_star",
 	215 => "battleship",
-	216 => "supernova",
 
 	401 => "misil_launcher",
 	402 => "small_laser",
@@ -85,8 +69,6 @@
 	406 => "buster_canyon",
 	407 => "small_protection_shield",
 	408 => "big_protection_shield",
-	409 => "planet_protector",
-	410 => "atom_protector",	
 	502 => "interceptor_misil",
 	503 => "interplanetary_misil",
 
@@ -94,17 +76,6 @@
 	602 => "rpg_amiral",
 	603 => "rpg_ingenieur",
 	604 => "rpg_technocrate",
-	605 => "rpg_constructeur",
-	606 => "rpg_scientifique",
-	607 => "rpg_stockeur",
-	608 => "rpg_defenseur",
-	609 => "rpg_bunker",
-	610 => "rpg_espion",
-	611 => "rpg_commandant",
-	612 => "rpg_destructeur",
-	613 => "rpg_general",
-	614 => "rpg_raideur",
-	615 => "rpg_empereur",
 	);
 
 	$requeriments = array(
@@ -132,8 +103,6 @@
 		122 => array(  31 =>   5, 113 =>   8, 120 =>  10, 121 =>   5),
 		123 => array(  31 =>  10, 108 =>   8, 114 =>   8),
 		124 => array(  31 =>   3, 108 =>   4, 117 =>   3),
-		125 => array(  31 =>   8, 108 =>   6, 113 =>   6),
-		150 => array(  31 =>   3, 113 =>   5, 111 =>   2),
 		199 => array(  31 =>  12),
 
 		202 => array(  21 =>   2, 115 =>   2),
@@ -150,7 +119,6 @@
 		213 => array(  21 =>   9, 118 =>   6, 114 =>   5),
 		214 => array(  21 =>  12, 118 =>   7, 114 =>   6,  199 =>   1),
 		215 => array( 114 =>   5, 120 =>  12, 118 =>   5,   21 =>   8),
-		216 => array( 614 =>   1),
 
 		401 => array(  21 =>   1),
 		402 => array( 113 =>   1,  21 =>   2, 120 =>   3),
@@ -160,24 +128,8 @@
 		406 => array(  21 =>   8, 122 =>   7),
 		407 => array( 110 =>   2,  21 =>   1),
 		408 => array( 110 =>   6,  21 =>   6),
-		409 => array( 609 =>   1),
-		410 => array(  21 =>   8, 125 =>   4),
 		502 => array(  44 =>   2,  21 =>   1),
 		503 => array(  44 =>   4,  21 =>   1, 117 =>   1),
-
-		603 => array( 601 =>   5),
-		604 => array( 602 =>   5),
-		605 => array( 601 =>  10, 603 =>   2),
-		606 => array( 601 =>  10, 603 =>   2),
-		607 => array( 605 =>   1),
-		608 => array( 606 =>   1),
-		609 => array( 601 =>  20, 603 =>  10, 605 =>   3, 606 =>   3, 607 =>   2, 608 =>   2),
-		610 => array( 602 =>  10, 604 =>   5),
-		611 => array( 602 =>  10, 604 =>   5),
-		612 => array( 610 =>   1),
-		613 => array( 611 =>   1),
-		614 => array( 602 =>  20, 604 =>  10, 610 =>   2, 611 =>   2, 612 =>   1, 613 =>   3),
-		615 => array( 614 =>   1, 609 =>   1),
 	);
 
 	$pricelist = array(
@@ -193,7 +145,8 @@
 		 23 => array ( 'metal' =>    2000, 'crystal' =>    1000, 'deuterium' =>       0, 'energy' =>    0, 'factor' =>   2),
 		 24 => array ( 'metal' =>    2000, 'crystal' =>    2000, 'deuterium' =>       0, 'energy' =>    0, 'factor' =>   2),
 		 31 => array ( 'metal' =>     200, 'crystal' =>     400, 'deuterium' =>     200, 'energy' =>    0, 'factor' =>   2),
-		 33 => array ( 'metal' =>       0, 'crystal' =>   50000, 'deuterium' =>  100000, 'energy' => 1000, 'factor' =>   2),
+		 33 => array ( 'metal' =>       0, 'crystal' =>   50000, 'deuterium' =>  100000, 'energy_max' => 1000, 'factor' =>   2),
+
 		 34 => array ( 'metal' =>   20000, 'crystal' =>   40000, 'deuterium' =>       0, 'energy' =>    0, 'factor' =>   2),
 		 41 => array ( 'metal' =>   20000, 'crystal' =>   40000, 'deuterium' =>   20000, 'energy' =>    0, 'factor' =>   2),
 		 42 => array ( 'metal' =>   20000, 'crystal' =>   40000, 'deuterium' =>   20000, 'energy' =>    0, 'factor' =>   2),
@@ -208,15 +161,13 @@
 		113 => array ( 'metal' =>       0, 'crystal' =>     800, 'deuterium' =>     400, 'energy' =>    0, 'factor' =>   2),
 		114 => array ( 'metal' =>       0, 'crystal' =>    4000, 'deuterium' =>    2000, 'energy' =>    0, 'factor' =>   2),
 		115 => array ( 'metal' =>     400, 'crystal' =>       0, 'deuterium' =>     600, 'energy' =>    0, 'factor' =>   2),
-		117 => array ( 'metal' =>    2000, 'crystal' =>    4000, 'deuterium' =>     600, 'energy' =>    0, 'factor' =>   2),
+		117 => array ( 'metal' =>    2000, 'crystal' =>    4000, 'deuterium' =>    600, 'energy' =>    0, 'factor' =>   2),
 		118 => array ( 'metal' =>   10000, 'crystal' =>   20000, 'deuterium' =>    6000, 'energy' =>    0, 'factor' =>   2),
 		120 => array ( 'metal' =>     200, 'crystal' =>     100, 'deuterium' =>       0, 'energy' =>    0, 'factor' =>   2),
 		121 => array ( 'metal' =>    1000, 'crystal' =>     300, 'deuterium' =>     100, 'energy' =>    0, 'factor' =>   2),
 		122 => array ( 'metal' =>    2000, 'crystal' =>    4000, 'deuterium' =>    1000, 'energy' =>    0, 'factor' =>   2),
 		123 => array ( 'metal' =>  240000, 'crystal' =>  400000, 'deuterium' =>  160000, 'energy' =>    0, 'factor' =>   2),
 		124 => array ( 'metal' =>    4000, 'crystal' =>    8000, 'deuterium' =>    4000, 'energy' =>    0, 'factor' =>   2),
-        125 => array ( 'metal' =>       0, 'crystal' =>       0, 'deuterium' =>  100000, 'energy' =>    0, 'factor' =>   2),
-		150 => array ( 'metal' =>    1000, 'crystal' =>    4000, 'deuterium' =>    1000, 'energy' =>    0, 'factor' =>   2, 'max' =>   10),
 		199 => array ( 'metal' =>       0, 'crystal' =>       0, 'deuterium' =>       0, 'energy_max' => 300000, 'factor' =>   3),
 
 		202 => array ( 'metal' =>     2000, 'crystal' =>     2000, 'deuterium' =>       0, 'energy' => 0, 'factor' => 1, 'consumption' => 10  , 'consumption2' => 10  , 'speed' =>      5000, 'speed2' =>     10000, 'capacity' =>     5000 ),
@@ -231,67 +182,52 @@
 		211 => array ( 'metal' =>    50000, 'crystal' =>    25000, 'deuterium' =>   15000, 'energy' => 0, 'factor' => 1, 'consumption' => 500 , 'consumption2' => 500 , 'speed' =>      4000, 'speed2' =>      5000, 'capacity' =>      500 ),
 		212 => array ( 'metal' =>        0, 'crystal' =>     2000, 'deuterium' =>     500, 'energy' => 0, 'factor' => 1, 'consumption' => 0   , 'consumption2' => 0   , 'speed' =>         0, 'speed2' =>         0, 'capacity' =>        0 ),
 		213 => array ( 'metal' =>    60000, 'crystal' =>    50000, 'deuterium' =>   15000, 'energy' => 0, 'factor' => 1, 'consumption' => 500 , 'consumption2' => 500 , 'speed' =>      5000, 'speed2' =>      5000, 'capacity' =>     2000 ),
-		214 => array ( 'metal' =>  5000000, 'crystal' =>  4000000, 'deuterium' => 1000000, 'energy' => 0, 'factor' => 1, 'consumption' => 1   , 'consumption2' => 1   , 'speed' =>       200, 'speed2' =>       200, 'capacity' =>  1000000 ),
+		214 => array ( 'metal' =>  5000000, 'crystal' =>  4000000, 'deuterium' => 1000000, 'energy' => 0, 'factor' => 1, 'consumption' => 1   , 'consumption2' => 1   , 'speed' =>       100, 'speed2' =>       100, 'capacity' =>  1000000 ),
 		215 => array ( 'metal' =>    30000, 'crystal' =>    40000, 'deuterium' =>   15000, 'energy' => 0, 'factor' => 1, 'consumption' => 125 , 'consumption2' => 125 , 'speed' =>     10000, 'speed2' =>     10000, 'capacity' =>      750 ),
-        216 => array ( 'metal' => 10000000, 'crystal' =>  8000000, 'deuterium' => 4000000, 'energy' => 0, 'factor' => 1, 'consumption' => 3000, 'consumption2' => 3000, 'speed' =>       300, 'speed2' =>       300, 'capacity' =>  2000000 ),
 
-		401 => array ( 'metal' =>       2000, 'crystal' =>         0, 'deuterium' =>        0, 'energy' => 0, 'factor' => 1 ),
-		402 => array ( 'metal' =>       1500, 'crystal' =>       500, 'deuterium' =>        0, 'energy' => 0, 'factor' => 1 ),
-		403 => array ( 'metal' =>       6000, 'crystal' =>      2000, 'deuterium' =>        0, 'energy' => 0, 'factor' => 1 ),
-		404 => array ( 'metal' =>      20000, 'crystal' =>     15000, 'deuterium' =>     2000, 'energy' => 0, 'factor' => 1 ),
-		405 => array ( 'metal' =>       2000, 'crystal' =>      6000, 'deuterium' =>        0, 'energy' => 0, 'factor' => 1 ),
-		406 => array ( 'metal' =>      50000, 'crystal' =>     50000, 'deuterium' =>    30000, 'energy' => 0, 'factor' => 1 ),
-		407 => array ( 'metal' =>      10000, 'crystal' =>     10000, 'deuterium' =>        0, 'energy' => 0, 'factor' => 1 ),
-		408 => array ( 'metal' =>      50000, 'crystal' =>     50000, 'deuterium' =>        0, 'energy' => 0, 'factor' => 1 ),
-        409 => array ( 'metal' =>   10000000, 'crystal' =>   5000000, 'deuterium' =>  2500000, 'energy' => 0, 'factor' => 1 ),
-        410 => array ( 'metal' =>      60000, 'crystal' =>     60000, 'deuterium' =>   100000, 'energy' => 0, 'factor' => 1 ),
-		502 => array ( 'metal' =>       8000, 'crystal' =>         0, 'deuterium' =>     2000, 'energy' => 0, 'factor' => 1 ),
-		503 => array ( 'metal' =>      12500, 'crystal' =>      2500, 'deuterium' =>    10000, 'energy' => 0, 'factor' => 1 ),
+		401 => array ( 'metal' =>    2000, 'crystal' =>       0, 'deuterium' =>       0, 'energy' => 0, 'factor' => 1 ),
+		402 => array ( 'metal' =>    1500, 'crystal' =>     500, 'deuterium' =>       0, 'energy' => 0, 'factor' => 1 ),
+		403 => array ( 'metal' =>    6000, 'crystal' =>    2000, 'deuterium' =>       0, 'energy' => 0, 'factor' => 1 ),
+		404 => array ( 'metal' =>   20000, 'crystal' =>   15000, 'deuterium' =>    2000, 'energy' => 0, 'factor' => 1 ),
+		405 => array ( 'metal' =>    2000, 'crystal' =>    6000, 'deuterium' =>       0, 'energy' => 0, 'factor' => 1 ),
+		406 => array ( 'metal' =>   50000, 'crystal' =>   50000, 'deuterium' =>   30000, 'energy' => 0, 'factor' => 1 ),
+		407 => array ( 'metal' =>   10000, 'crystal' =>   10000, 'deuterium' =>       0, 'energy' => 0, 'factor' => 1 ),
+		408 => array ( 'metal' =>   50000, 'crystal' =>   50000, 'deuterium' =>       0, 'energy' => 0, 'factor' => 1 ),
 
-		601 => array ( 'max' =>  20),
-		602 => array ( 'max' =>  20),
-		603 => array ( 'max' =>  10),
-		604 => array ( 'max' =>  10),
-		605 => array ( 'max' =>   3),
-		606 => array ( 'max' =>   3),
-		607 => array ( 'max' =>   2),
-		608 => array ( 'max' =>   2),
-		609 => array ( 'max' =>   1),
-		610 => array ( 'max' =>   2),
-		611 => array ( 'max' =>   3),
-		612 => array ( 'max' =>   1),
-		613 => array ( 'max' =>   3),
-		614 => array ( 'max' =>   1),
-		615 => array ( 'max' =>   1),
+		502 => array ( 'metal' =>    8000, 'crystal' =>    0, 'deuterium' =>       2000, 'energy' => 0, 'factor' => 1 ),
+		503 => array ( 'metal' =>   12500, 'crystal' =>    2500, 'deuterium' =>   10000, 'energy' => 0, 'factor' => 1 ),
+
+		601 => array ( 'darkmatter' => 	  5000, 'max' =>  1),
+		602 => array ( 'darkmatter' =>    5000, 'max' =>  1),
+		603 => array ( 'darkmatter' =>   12500, 'max' =>  1),
+		604 => array ( 'darkmatter' =>   10000, 'max' =>  1),
 	);
 
 	$CombatCaps = array(
-		202 => array ( 'shield' =>    10, 'attack' =>      5, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1, 216 =>   1, 401 =>   1, 402 =>   1, 403 =>   1, 404 =>   1, 405 =>   1, 406 =>   1, 407 =>   1, 408 =>   1, 409 =>  1 )),
-		203 => array ( 'shield' =>    25, 'attack' =>      5, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1, 216 =>   1, 401 =>   1, 402 =>   1, 403 =>   1, 404 =>   1, 405 =>   1, 406 =>   1, 407 =>   1, 408 =>   1, 409 =>  1 )),
-		204 => array ( 'shield' =>    10, 'attack' =>     50, 'sd' => array (202 =>   2, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1, 216 =>   1, 401 =>   1, 402 =>   1, 403 =>   1, 404 =>   1, 405 =>   1, 406 =>   1, 407 =>   1, 408 =>   1, 409 =>  1 )),
-		205 => array ( 'shield' =>    25, 'attack' =>    150, 'sd' => array (202 =>   3, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1, 216 =>   1, 401 =>   1, 402 =>   1, 403 =>   1, 404 =>   1, 405 =>   1, 406 =>   1, 407 =>   1, 408 =>   1, 409 =>  1 )),
-		206 => array ( 'shield' =>    50, 'attack' =>    400, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   6, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1, 216 =>   1, 401 =>  10, 402 =>   1, 403 =>   1, 404 =>   1, 405 =>   1, 406 =>   1, 407 =>   1, 408 =>   1, 409 =>  1 )),
-		207 => array ( 'shield' =>   200, 'attack' =>   1000, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1, 216 =>   1, 401 =>   8, 402 =>   1, 403 =>   1, 404 =>   1, 405 =>   1, 406 =>   1, 407 =>   1, 408 =>   1, 409 =>  1 )),
-		208 => array ( 'shield' =>   100, 'attack' =>     50, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1, 216 =>   1, 401 =>   1, 402 =>   1, 403 =>   1, 404 =>   1, 405 =>   1, 406 =>   1, 407 =>   1, 408 =>   1, 409 =>  1 )),
-		209 => array ( 'shield' =>    10, 'attack' =>      1, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1, 216 =>   1, 401 =>   1, 402 =>   1, 403 =>   1, 404 =>   1, 405 =>   1, 406 =>   1, 407 =>   1, 408 =>   1, 409 =>  1 )),
-		210 => array ( 'shield' =>     0, 'attack' =>      0, 'sd' => array (202 =>   0, 203 =>   0, 204 =>   0, 205 =>   0, 206 =>   0, 207 =>   0, 208 =>   0, 209 =>   0, 210 =>    0, 211 =>   0, 212 =>    0, 213 =>   0, 214 =>   0, 215 =>   0, 216 =>   0, 401 =>   0, 402 =>   0, 403 =>   0, 404 =>   0, 405 =>   0, 406 =>   0, 407 =>   0, 408 =>   0, 409 =>  0 )),
-		211 => array ( 'shield' =>   500, 'attack' =>   1000, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1, 216 =>   1, 401 =>  20, 402 =>  20, 403 =>  10, 404 =>   1, 405 =>  10, 406 =>   1, 407 =>   1, 408 =>   1, 409 =>  1 )),
-		212 => array ( 'shield' =>    10, 'attack' =>      0, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    1, 211 =>   1, 212 =>    0, 213 =>   1, 214 =>   1, 215 =>   1, 216 =>   1, 401 =>   1, 402 =>   1, 403 =>   1, 404 =>   1, 405 =>   1, 406 =>   1, 407 =>   1, 408 =>   1, 409 =>  1 )),
-		213 => array ( 'shield' =>   500, 'attack' =>   2000, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   2, 216 =>   1, 401 =>   1, 402 =>  10, 403 =>   1, 404 =>   1, 405 =>   1, 406 =>   1, 407 =>   1, 408 =>   1, 409 =>  1 )),
-		214 => array ( 'shield' => 50000, 'attack' => 200000, 'sd' => array (202 => 250, 203 => 250, 204 => 200, 205 => 100, 206 =>  33, 207 =>  30, 208 => 250, 209 => 250, 210 => 1250, 211 =>  25, 212 => 1250, 213 =>   5, 214 =>   1, 215 =>  15, 216 =>   2, 401 => 200, 402 => 200, 403 => 100, 404 =>  50, 405 => 100, 406 =>   1, 407 =>   1, 408 =>   1, 409 =>  1 )),
-		215 => array ( 'shield' =>   400, 'attack' =>    700, 'sd' => array (202 =>   3, 203 =>   3, 204 =>   1, 205 =>   4, 206 =>   4, 207 =>   7, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    5, 213 =>   1, 214 =>   1, 215 =>   1, 216 =>   5, 401 =>   1, 402 =>   1, 403 =>   1, 404 =>   1, 405 =>   1, 406 =>   1, 407 =>   1, 408 =>   1, 409 =>  1 )),
-		216 => array ( 'shield' => 60000, 'attack' => 250000, 'sd' => array (202 => 250, 203 => 250, 204 => 200, 205 => 100, 206 =>  33, 207 =>  30, 208 => 250, 209 => 250, 210 => 1250, 211 =>  25, 212 => 1250, 213 =>   5, 214 =>   2, 215 =>  15, 216 =>   1, 401 => 200, 402 => 200, 403 => 100, 404 =>  50, 405 => 100, 406 =>   1, 407 =>   1, 408 =>   1, 409 =>  1 )),
+		202 => array ( 'shield' =>    10, 'attack' =>      5, 'sd' => array (202 =>   0, 203 =>   0, 204 =>   0, 205 =>   0, 206 =>   0, 207 =>   0, 208 =>   0, 209 =>   0, 210 =>    5, 211 =>   0, 212 =>    5, 213 =>   0, 214 =>   0, 215 =>   0, 401 =>   0, 402 =>   0, 403 =>   0, 404 =>   0, 405 =>   0, 406 =>   0, 407 =>   0, 408 =>   0)),
+		203 => array ( 'shield' =>    25, 'attack' =>      5, 'sd' => array (202 =>   0, 203 =>   0, 204 =>   0, 205 =>   0, 206 =>   0, 207 =>   0, 208 =>   0, 209 =>   0, 210 =>    5, 211 =>   0, 212 =>    5, 213 =>   0, 214 =>   0, 215 =>   0, 401 =>   0, 402 =>   0, 403 =>   0, 404 =>   0, 405 =>   0, 406 =>   0, 407 =>   0, 408 =>   0)),
+		204 => array ( 'shield' =>    10, 'attack' =>     50, 'sd' => array (202 =>   2, 203 =>   0, 204 =>   0, 205 =>   0, 206 =>   0, 207 =>   0, 208 =>   0, 209 =>   0, 210 =>    5, 211 =>   0, 212 =>    5, 213 =>   0, 214 =>   0, 215 =>   0, 401 =>   0, 402 =>   0, 403 =>   0, 404 =>   0, 405 =>   0, 406 =>   0, 407 =>   0, 408 =>   0)),
+		205 => array ( 'shield' =>    25, 'attack' =>    150, 'sd' => array (202 =>   3, 203 =>   0, 204 =>   0, 205 =>   0, 206 =>   0, 207 =>   0, 208 =>   0, 209 =>   0, 210 =>    5, 211 =>   0, 212 =>    5, 213 =>   0, 214 =>   0, 215 =>   0, 401 =>   0, 402 =>   0, 403 =>   0, 404 =>   0, 405 =>   0, 406 =>   0, 407 =>   0, 408 =>   0)),
+		206 => array ( 'shield' =>    50, 'attack' =>    400, 'sd' => array (202 =>   0, 203 =>   0, 204 =>   6, 205 =>   0, 206 =>   0, 207 =>   0, 208 =>   0, 209 =>   0, 210 =>    5, 211 =>   0, 212 =>    5, 213 =>   0, 214 =>   0, 215 =>   0, 401 =>  10, 402 =>   0, 403 =>   0, 404 =>   0, 405 =>   0, 406 =>   0, 407 =>   0, 408 =>   0)),
+		207 => array ( 'shield' =>   200, 'attack' =>   1000, 'sd' => array (202 =>   0, 203 =>   0, 204 =>   0, 205 =>   0, 206 =>   0, 207 =>   0, 208 =>   0, 209 =>   0, 210 =>    5, 211 =>   0, 212 =>    5, 213 =>   0, 214 =>   0, 215 =>   0, 401 =>   8, 402 =>   0, 403 =>   0, 404 =>   0, 405 =>   0, 406 =>   0, 407 =>   0, 408 =>   0)),
+		208 => array ( 'shield' =>   100, 'attack' =>     50, 'sd' => array (202 =>   0, 203 =>   0, 204 =>   0, 205 =>   0, 206 =>   0, 207 =>   0, 208 =>   0, 209 =>   0, 210 =>    5, 211 =>   0, 212 =>    5, 213 =>   0, 214 =>   0, 215 =>   0, 401 =>   0, 402 =>   0, 403 =>   0, 404 =>   0, 405 =>   0, 406 =>   0, 407 =>   0, 408 =>   0)),
+		209 => array ( 'shield' =>    10, 'attack' =>      0, 'sd' => array (202 =>   0, 203 =>   0, 204 =>   0, 205 =>   0, 206 =>   0, 207 =>   0, 208 =>   0, 209 =>   0, 210 =>    5, 211 =>   0, 212 =>    5, 213 =>   0, 214 =>   0, 215 =>   0, 401 =>   0, 402 =>   0, 403 =>   0, 404 =>   0, 405 =>   0, 406 =>   0, 407 =>   0, 408 =>   0)),
+		210 => array ( 'shield' =>     0, 'attack' =>      0, 'sd' => array (202 =>   0, 203 =>   0, 204 =>   0, 205 =>   0, 206 =>   0, 207 =>   0, 208 =>   0, 209 =>   0, 210 =>    0, 211 =>   0, 212 =>    0, 213 =>   0, 214 =>   0, 215 =>   0, 401 =>   0, 402 =>   0, 403 =>   0, 404 =>   0, 405 =>   0, 406 =>   0, 407 =>   0, 408 =>   0)),
+		211 => array ( 'shield' =>   500, 'attack' =>   1000, 'sd' => array (202 =>   0, 203 =>   0, 204 =>   0, 205 =>   0, 206 =>   0, 207 =>   0, 208 =>   0, 209 =>   0, 210 =>    5, 211 =>   0, 212 =>    5, 213 =>   0, 214 =>   0, 215 =>   0, 401 =>  20, 402 =>  20, 403 =>  10, 404 =>   0, 405 =>  10, 406 =>   0, 407 =>   0, 408 =>   0)),
+		212 => array ( 'shield' =>    10, 'attack' =>      0, 'sd' => array (202 =>   0, 203 =>   0, 204 =>   0, 205 =>   0, 206 =>   0, 207 =>   0, 208 =>   0, 209 =>   0, 210 =>    1, 211 =>   0, 212 =>    0, 213 =>   0, 214 =>   0, 215 =>   0, 401 =>   0, 402 =>   0, 403 =>   0, 404 =>   0, 405 =>   0, 406 =>   0, 407 =>   0, 408 =>   0)),
+		213 => array ( 'shield' =>   500, 'attack' =>   2000, 'sd' => array (202 =>   0, 203 =>   0, 204 =>   0, 205 =>   0, 206 =>   0, 207 =>   0, 208 =>   0, 209 =>   0, 210 =>    5, 211 =>   0, 212 =>    5, 213 =>   0, 214 =>   0, 215 =>   2, 401 =>   0, 402 =>  10, 403 =>   0, 404 =>   0, 405 =>   0, 406 =>   0, 407 =>   0, 408 =>   0)),
+		214 => array ( 'shield' => 50000, 'attack' => 200000, 'sd' => array (202 => 250, 203 => 250, 204 => 200, 205 => 100, 206 =>  33, 207 =>  30, 208 => 250, 209 => 250, 210 => 1250, 211 =>  25, 212 => 1250, 213 =>   5, 214 =>   0, 215 =>  15, 401 => 200, 402 => 200, 403 => 100, 404 =>  50, 405 => 100, 406 =>   0, 407 =>   0, 408 =>   0)),
+		215 => array ( 'shield' =>   400, 'attack' =>    700, 'sd' => array (202 =>   3, 203 =>   3, 204 =>   0, 205 =>   4, 206 =>   4, 207 =>   7, 208 =>   0, 209 =>   0, 210 =>    5, 211 =>   0, 212 =>    5, 213 =>   0, 214 =>   0, 215 =>   0, 401 =>   0, 402 =>   0, 403 =>   0, 404 =>   0, 405 =>   0, 406 =>   0, 407 =>   0, 408 =>   0)),
+
+		401 => array ( 'shield' =>      20, 'attack' =>      80, 'sd' => array (202 =>   0, 203 =>   0, 204 =>   0, 205 =>   0, 206 =>   0, 207 =>   0, 208 =>   0, 209 =>   0, 210 =>    5, 211 =>   0, 212 =>    0, 213 =>   0, 214 =>   0, 215 =>   0) ),
+		402 => array ( 'shield' =>      25, 'attack' =>     100, 'sd' => array (202 =>   0, 203 =>   0, 204 =>   0, 205 =>   0, 206 =>   0, 207 =>   0, 208 =>   0, 209 =>   0, 210 =>    5, 211 =>   0, 212 =>    0, 213 =>   0, 214 =>   0, 215 =>   0) ),
+		403 => array ( 'shield' =>     100, 'attack' =>     250, 'sd' => array (202 =>   0, 203 =>   0, 204 =>   0, 205 =>   0, 206 =>   0, 207 =>   0, 208 =>   0, 209 =>   0, 210 =>    5, 211 =>   0, 212 =>    0, 213 =>   0, 214 =>   0, 215 =>   0) ),
+		404 => array ( 'shield' =>     200, 'attack' =>    1100, 'sd' => array (202 =>   0, 203 =>   0, 204 =>   0, 205 =>   0, 206 =>   0, 207 =>   0, 208 =>   0, 209 =>   0, 210 =>    5, 211 =>   0, 212 =>    0, 213 =>   0, 214 =>   0, 215 =>   0) ),
+		405 => array ( 'shield' =>     500, 'attack' =>     150, 'sd' => array (202 =>   0, 203 =>   0, 204 =>   0, 205 =>   0, 206 =>   0, 207 =>   0, 208 =>   0, 209 =>   0, 210 =>    5, 211 =>   0, 212 =>    0, 213 =>   0, 214 =>   0, 215 =>   0) ),
+		406 => array ( 'shield' =>     300, 'attack' =>    3000, 'sd' => array (202 =>   0, 203 =>   0, 204 =>   0, 205 =>   0, 206 =>   0, 207 =>   0, 208 =>   0, 209 =>   0, 210 =>    5, 211 =>   0, 212 =>    0, 213 =>   0, 214 =>   0, 215 =>   0) ),
+		407 => array ( 'shield' =>    2000, 'attack' =>       1, 'sd' => array (202 =>   0, 203 =>   0, 204 =>   0, 205 =>   0, 206 =>   0, 207 =>   0, 208 =>   0, 209 =>   0, 210 =>    5, 211 =>   0, 212 =>    0, 213 =>   0, 214 =>   0, 215 =>   0) ),
+		408 => array ( 'shield' =>   10000, 'attack' =>       1, 'sd' => array (202 =>   0, 203 =>   0, 204 =>   0, 205 =>   0, 206 =>   0, 207 =>   0, 208 =>   0, 209 =>   0, 210 =>    5, 211 =>   0, 212 =>    0, 213 =>   0, 214 =>   0, 215 =>   0) ),
 
-		401 => array ( 'shield' =>    20, 'attack' =>     80, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    0, 213 =>   1, 214 =>   1, 215 =>   1, 216 =>    0) ),
-		402 => array ( 'shield' =>    25, 'attack' =>    100, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    0, 213 =>   1, 214 =>   1, 215 =>   1, 216 =>    0) ),
-		403 => array ( 'shield' =>   100, 'attack' =>    250, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    0, 213 =>   1, 214 =>   1, 215 =>   1, 216 =>    0) ),
-		404 => array ( 'shield' =>   200, 'attack' =>   1100, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    0, 213 =>   1, 214 =>   1, 215 =>   1, 216 =>    0) ),
-		405 => array ( 'shield' =>   500, 'attack' =>    150, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    0, 213 =>   1, 214 =>   1, 215 =>   1, 216 =>    0) ),
-		406 => array ( 'shield' =>   300, 'attack' =>   3000, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    0, 213 =>   1, 214 =>   1, 215 =>   1, 216 =>    0) ),
-		407 => array ( 'shield' =>  2000, 'attack' =>      1, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    0, 213 =>   1, 214 =>   1, 215 =>   1, 216 =>    0) ),
-		408 => array ( 'shield' =>  5000, 'attack' =>      1, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    0, 213 =>   1, 214 =>   1, 215 =>   1, 216 =>    0) ),
-		409 => array ( 'shield' => 10000, 'attack' =>  90000, 'sd' => array (202 =>   1, 203 =>   1, 204 =>   1, 205 =>   1, 206 =>   1, 207 =>   1, 208 =>   1, 209 =>   1, 210 =>    5, 211 =>   1, 212 =>    0, 213 =>   1, 214 =>   1, 215 =>   1, 216 =>    0) ),
-        410 => array ( 'shield' =>  1000, 'attack' =>   6000, 'sd' => array (202 =>  20, 203 =>  20, 204 =>  10, 205 =>   5, 206 =>   2, 207 =>   1, 208 =>   0, 209 =>   0, 210 =>    5, 211 =>   0, 212 =>    0, 213 =>   0, 214 =>   0, 215 =>   0, 216 =>    0) ),	
 		502 => array ( 'shield' =>     1, 'attack' =>      1 ),
 		503 => array ( 'shield' =>     1, 'attack' =>  12000 )
 	);
@@ -319,7 +255,7 @@
 				'metal'     => 'return   "0";',
 				'crystal'   => 'return   "0";',
 				'deuterium' => 'return  ((10 * $BuildLevel * pow((1.1), $BuildLevel)) * (-0.002 * $BuildTemp + 1.28))  * (0.1 * $BuildLevelFactor);',
-				'energy'    => 'return - (30 * $BuildLevel * pow((1.1), $BuildLevel)) * (0.1 * $BuildLevelFactor);')
+				'energy'    => 'return - (20 * $BuildLevel * pow((1.1), $BuildLevel)) * (0.1 * $BuildLevelFactor);')
                 ),
 
 		4   => array( 'metal' =>   50, 'crystal' =>   20, 'deuterium' =>    0, 'energy' => 0, 'factor' => 3/2,
@@ -348,10 +284,10 @@
 	);
 
 	$reslist['build']    = array (   1,   2,   3,   4,  12,  14,  15,  21,  22,  23,  24,  31,  33,  34,  41,  42,  43, 44);
-	$reslist['tech']     = array ( 106, 108, 109, 110, 111, 113, 114, 115, 117, 118, 120, 121, 122, 123, 124, 125, 150, 199);
-	$reslist['fleet']    = array ( 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216 );
-	$reslist['defense']  = array ( 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 502, 503 );
-	$reslist['officier'] = array ( 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 615);
+	$reslist['tech']     = array ( 106, 108, 109, 110, 111, 113, 114, 115, 117, 118, 120, 121, 122, 123, 124, 199);
+	$reslist['fleet']    = array ( 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215 );
+	$reslist['defense']  = array ( 401, 402, 403, 404, 405, 406, 407, 408, 502, 503 );
+	$reslist['officier'] = array ( 601, 602, 603, 604);
 	$reslist['prod']     = array (   1,   2,   3,   4,  12, 212 );
 }
 ?>
\ No newline at end of file
diff --git a/includes/vendor/simplehtmldom/example/example_advanced_selector.php b/includes/vendor/simplehtmldom/example/example_advanced_selector.php
deleted file mode 100644
index 46eec71..0000000
--- a/includes/vendor/simplehtmldom/example/example_advanced_selector.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-// example of how to use advanced selector features
-include('../simple_html_dom.php');
-
-// -----------------------------------------------------------------------------
-// descendant selector
-$str = <<<HTML
-<div>
-    <div>
-        <div class="foo bar">ok</div>
-    </div>
-</div>
-HTML;
-
-$html = str_get_html($str);
-echo $html->find('div div div', 0)->innertext . '<br>'; // result: "ok"
-
-// -----------------------------------------------------------------------------
-// nested selector
-$str = <<<HTML
-<ul id="ul1">
-    <li>item:<span>1</span></li>
-    <li>item:<span>2</span></li>
-</ul>
-<ul id="ul2">
-    <li>item:<span>3</span></li>
-    <li>item:<span>4</span></li>
-</ul>
-HTML;
-
-$html = str_get_html($str);
-foreach($html->find('ul') as $ul) {
-    foreach($ul->find('li') as $li)
-        echo $li->innertext . '<br>';
-}
-
-// -----------------------------------------------------------------------------
-// parsing checkbox
-$str = <<<HTML
-<form name="form1" method="post" action="">
-    <input type="checkbox" name="checkbox1" value="checkbox1" checked>item1<br>
-    <input type="checkbox" name="checkbox2" value="checkbox2">item2<br>
-    <input type="checkbox" name="checkbox3" value="checkbox3" checked>item3<br>
-</form>
-HTML;
-
-$html = str_get_html($str);
-foreach($html->find('input[type=checkbox]') as $checkbox) {
-    if ($checkbox->checked)
-        echo $checkbox->name . ' is checked<br>';
-    else
-        echo $checkbox->name . ' is not checked<br>';
-}
-?>
\ No newline at end of file
diff --git a/includes/vendor/simplehtmldom/example/example_basic_selector.php b/includes/vendor/simplehtmldom/example/example_basic_selector.php
deleted file mode 100644
index e39a733..0000000
--- a/includes/vendor/simplehtmldom/example/example_basic_selector.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-// example of how to use basic selector to retrieve HTML contents
-include('../simple_html_dom.php');
- 
-// get DOM from URL or file
-$html = file_get_html('http://www.google.com/');
-
-// find all link
-foreach($html->find('a') as $e) 
-    echo $e->href . '<br>';
-
-// find all image
-foreach($html->find('img') as $e)
-    echo $e->src . '<br>';
-
-// find all image with full tag
-foreach($html->find('img') as $e)
-    echo $e->outertext . '<br>';
-
-// find all div tags with id=gbar
-foreach($html->find('div#gbar') as $e)
-    echo $e->innertext . '<br>';
-
-// find all span tags with class=gb1
-foreach($html->find('span.gb1') as $e)
-    echo $e->outertext . '<br>';
-
-// find all td tags with attribite align=center
-foreach($html->find('td[align=center]') as $e)
-    echo $e->innertext . '<br>';
-    
-// extract text from table
-echo $html->find('td[align="center"]', 1)->plaintext.'<br><hr>';
-
-// extract text from HTML
-echo $html->plaintext;
-?>
\ No newline at end of file
diff --git a/includes/vendor/simplehtmldom/example/example_callback.php b/includes/vendor/simplehtmldom/example/example_callback.php
deleted file mode 100644
index c7afa9a..0000000
--- a/includes/vendor/simplehtmldom/example/example_callback.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-include_once('../simple_html_dom.php');
-
-
-// 1. Write a function with parameter "$element"
-function my_callback($element) {
-    if ($element->tag=='input')
-        $element->outertext = 'input';
-
-    if ($element->tag=='img')
-        $element->outertext = 'img';
-
-    if ($element->tag=='a')
-        $element->outertext = 'a';
-}
-
-
-// 2. create HTML Dom
-$html = file_get_html('http://www.google.com/');
-
-
-// 3. Register the callback function with it's function name
-$html->set_callback('my_callback');
-
-
-// 4. Callback function will be invoked while dumping
-echo $html;
-?>
\ No newline at end of file
diff --git a/includes/vendor/simplehtmldom/example/example_extract_html.php b/includes/vendor/simplehtmldom/example/example_extract_html.php
deleted file mode 100644
index 029d9aa..0000000
--- a/includes/vendor/simplehtmldom/example/example_extract_html.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-include_once('../simple_html_dom.php');
-
-echo file_get_html('http://www.google.com/')->plaintext;
-?>
\ No newline at end of file
diff --git a/includes/vendor/simplehtmldom/example/example_modify_contents.php b/includes/vendor/simplehtmldom/example/example_modify_contents.php
deleted file mode 100644
index 07bf230..0000000
--- a/includes/vendor/simplehtmldom/example/example_modify_contents.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-// example of how to modify HTML contents
-include('../simple_html_dom.php');
-
-// get DOM from URL or file
-$html = file_get_html('http://www.google.com/');
-
-// remove all image
-foreach($html->find('img') as $e)
-    $e->outertext = '';
-
-// replace all input
-foreach($html->find('input') as $e)
-    $e->outertext = '[INPUT]';
-
-// dump contents
-echo $html;
-?>
\ No newline at end of file
diff --git a/includes/vendor/simplehtmldom/example/scraping/example_scraping_digg.php b/includes/vendor/simplehtmldom/example/scraping/example_scraping_digg.php
deleted file mode 100644
index 4c8cefb..0000000
--- a/includes/vendor/simplehtmldom/example/scraping/example_scraping_digg.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-include_once('../../simple_html_dom.php');
-
-function scraping_digg() {
-    // create HTML DOM
-    $html = file_get_html('http://digg.com/');
-
-    // get news block
-    foreach($html->find('div.news-summary') as $article) {
-        // get title
-        $item['title'] = trim($article->find('h3', 0)->plaintext);
-        // get details
-        $item['details'] = trim($article->find('p', 0)->plaintext);
-        // get intro
-        $item['diggs'] = trim($article->find('li a strong', 0)->plaintext);
-
-        $ret[] = $item;
-    }
-    
-    // clean up memory
-    $html->clear();
-    unset($html);
-
-    return $ret;
-}
-
-
-// -----------------------------------------------------------------------------
-// test it!
-
-// "http://digg.com" will check user_agent header...
-ini_set('user_agent', 'My-Application/2.5');
-
-$ret = scraping_digg();
-
-foreach($ret as $v) {
-    echo $v['title'].'<br>';
-    echo '<ul>';
-    echo '<li>'.$v['details'].'</li>';
-    echo '<li>Diggs: '.$v['diggs'].'</li>';
-    echo '</ul>';
-}
-
-?>
\ No newline at end of file
diff --git a/includes/vendor/simplehtmldom/example/scraping/example_scraping_imdb.php b/includes/vendor/simplehtmldom/example/scraping/example_scraping_imdb.php
deleted file mode 100644
index 14f0d3b..0000000
--- a/includes/vendor/simplehtmldom/example/scraping/example_scraping_imdb.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-include_once('../../simple_html_dom.php');
-
-function scraping_IMDB($url) {
-    // create HTML DOM
-    $html = file_get_html($url);
-
-    // get title
-    $ret['Title'] = $html->find('title', 0)->innertext;
-
-    // get rating
-    $ret['Rating'] = $html->find('div[class="general rating"] b', 0)->innertext;
-
-    // get overview
-    foreach($html->find('div[class="info"]') as $div) {
-        // skip user comments
-        if($div->find('h5', 0)->innertext=='User Comments:')
-            return $ret;
-
-        $key = '';
-        $val = '';
-
-        foreach($div->find('*') as $node) {
-            if ($node->tag=='h5')
-                $key = $node->plaintext;
-
-            if ($node->tag=='a' && $node->plaintext!='more')
-                $val .= trim(str_replace("\n", '', $node->plaintext));
-
-            if ($node->tag=='text')
-                $val .= trim(str_replace("\n", '', $node->plaintext));
-        }
-
-        $ret[$key] = $val;
-    }
-    
-    // clean up memory
-    $html->clear();
-    unset($html);
-
-    return $ret;
-}
-
-
-// -----------------------------------------------------------------------------
-// test it!
-$ret = scraping_IMDB('http://imdb.com/title/tt0335266/');
-
-foreach($ret as $k=>$v)
-    echo '<strong>'.$k.' </strong>'.$v.'<br>';
-?>
\ No newline at end of file
diff --git a/includes/vendor/simplehtmldom/example/scraping/example_scraping_slashdot.php b/includes/vendor/simplehtmldom/example/scraping/example_scraping_slashdot.php
deleted file mode 100644
index 2fb9b27..0000000
--- a/includes/vendor/simplehtmldom/example/scraping/example_scraping_slashdot.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-include_once('../../simple_html_dom.php');
-
-function scraping_slashdot() {
-    // create HTML DOM
-    $html = file_get_html('http://slashdot.org/');
-
-    // get article block
-    foreach($html->find('div[id^=firehose-]') as $article) {
-        // get title
-        $item['title'] = trim($article->find('a.datitle', 0)->plaintext);
-        // get body
-        $item['body'] = trim($article->find('div.body', 0)->plaintext);
-
-        $ret[] = $item;
-    }
-    
-    // clean up memory
-    $html->clear();
-    unset($html);
-
-    return $ret;
-}
-
-// -----------------------------------------------------------------------------
-// test it!
-$ret = scraping_slashdot();
-
-foreach($ret as $v) {
-    echo $v['title'].'<br>';
-    echo '<ul>';
-    echo '<li>'.$v['body'].'</li>';
-    echo '</ul>';
-}
-?>
\ No newline at end of file
diff --git a/includes/vendor/simplehtmldom/example/simple_html_dom_utility.php b/includes/vendor/simplehtmldom/example/simple_html_dom_utility.php
deleted file mode 100644
index 3b44cc1..0000000
--- a/includes/vendor/simplehtmldom/example/simple_html_dom_utility.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-include_once('../simple_html_dom.php');
-
-// -----------------------------------------------------------------------------
-// remove HTML comments
-function html_no_comment($url) {
-    // create HTML DOM
-    $html = file_get_html($url);
-
-    // remove all comment elements
-    foreach($html->find('comment') as $e)
-        $e->outertext = '';
-
-    $ret = $html->save();
-
-    // clean up memory
-    $html->clear();
-    unset($html);
-
-    return $ret;
-}
-
-// -----------------------------------------------------------------------------
-// search elements that contains an specific text
-function find_contains($html, $selector, $keyword, $index=-1) {
-    $ret = array();
-    foreach ($html->find($selector) as $e) {
-        if (strpos($e->innertext, $keyword)!==false)
-            $ret[] = $e;
-    }
-
-    if ($index<0) return $ret;
-    return (isset($ret[$index])) ? $ret[$index] : null;
-}
-?>
\ No newline at end of file
diff --git a/includes/vendor/simplehtmldom/manual/css/default.css b/includes/vendor/simplehtmldom/manual/css/default.css
deleted file mode 100644
index 2ccfc2f..0000000
--- a/includes/vendor/simplehtmldom/manual/css/default.css
+++ /dev/null
@@ -1,113 +0,0 @@
-/*$Rev: 46 $*/
-
-body {
-margin: 0;
-padding: 0;
-font-family: verdana,arial,helvetica,sans-serif;
-font-size: 11px;
-color: #4F5155;
-}
-
-#content {
-margin: 0 20px 0 20px;
-line-height: 16px;
-padding: 0;
-}
-
-h1 {
-font-size: 18px;
-margin: 0;
-padding: 0 0 2px 0;
-background-color: #D0D0D0;
-text-align: center;
-}
-
-h2 {
-background-color: #727EA3;
-border-right: 1px solid #D0D0D0;
-border-bottom: 1px solid #D0D0D0;
-color: #FFFFFF;
-font-size: 14px;
-font-weight: bold;
-margin: 14px 0 4px 0;
-padding: 1px 10px 1px 10px;
-}
-
-ul {
-margin-top: 0;
-margin-bottom: 0;
-line-height:1.5em;
-list-style-image:url(bullet.gif);
-list-style-type:square;
-}
-
-.top {
-font-size: 11px;
-float: right;
-}
-
-.code {
-font-size: 11px;
-font-family: Monaco, Verdana, Sans-serif;
-line-height: 14px;
-background-color: #f6f6f6;
-border-bottom: 1px solid #D0D0D0;
-border-top: 1px solid #A0A0A0;
-border-left: 1px solid #A0A0A0;
-border-right: 1px solid #D0D0D0;
-color: #002166;
-display: block;
-margin: 2px 0 2px 0;
-padding: 2px 10px 2px 10px;
-}
-
-.code A:link {color: #002166; text-decoration: none; font-weight: bold;}
-.code A:visited {color: #002166; text-decoration: none; font-weight: bold;}
-.code A:active {color: #002166; text-decoration: none; font-weight: bold;}
-.code A:hover {color: #0000ff; text-decoration: underline; font-weight: bold;}
-
-.code .keyword {
-color: #007700;
-}
-
-.code .comment {
-font-size: 10px;
-color: #888;
-}
-
-.code .var {
-color: #770000;
-}
-
-th {
-font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
-color: #000000;
-background-color: #CFD4E6;
-margin: 2px 2px 2px 2px;
-padding: 2px 2px 2px 2px;
-font-size: 13px;
-font-weight: normal;
-font-style: normal;
-}
-
-td {
-background-color: #dddddd;
-}
-
-.description {
-font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
-font-size: 11px;
-color: #333;
-text-ident: 30px;
-font-style: normal;
-}
-
-.returns {
-font-family: Monaco, Verdana, Sans-serif;
-font-size: 10px;
-color: #888;
-float: left;
-text-align: right;
-margin: 0 4px 0 0;
-width: 48px;
-}
\ No newline at end of file
diff --git a/includes/vendor/simplehtmldom/manual/css/ui.tabs.css b/includes/vendor/simplehtmldom/manual/css/ui.tabs.css
deleted file mode 100644
index a9dc199..0000000
--- a/includes/vendor/simplehtmldom/manual/css/ui.tabs.css
+++ /dev/null
@@ -1,116 +0,0 @@
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-    .ui-tabs-hide {
-        display: none;
-    }
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-    .ui-tabs-nav {
-        display: none;
-    }
-}
-
-/* Skin */
-.ui-tabs-nav, .ui-tabs-panel {
-    font-family: "Trebuchet MS", Trebuchet, Verdana, Helvetica, Arial, sans-serif;
-    font-size: 12px;
-}
-.ui-tabs-nav {
-    list-style: none;
-    margin: 0;
-    padding: 0 0 0 4px;
-}
-.ui-tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-    display: block;
-    clear: both;
-    content: " ";
-}
-.ui-tabs-nav li {
-    float: left;
-    margin: 0 0 0 1px;
-    min-width: 84px; /* be nice to Opera */
-}
-.ui-tabs-nav a, .ui-tabs-nav a span {
-    display: block;
-    padding: 0 10px;
-    background: url(../img/tab.png) no-repeat;
-}
-.ui-tabs-nav a {
-    margin: 1px 0 0; /* position: relative makes opacity fail for disabled tab in IE */
-    padding-left: 0;
-    color: #27537a;
-    font-weight: bold;
-    line-height: 1.2;
-    text-align: center;
-    text-decoration: none;
-    white-space: nowrap; /* required in IE 6 */    
-    outline: 0; /* prevent dotted border in Firefox */
-}
-.ui-tabs-nav .ui-tabs-selected a {
-    position: relative;
-    top: 1px;
-    z-index: 2;
-    margin-top: 0;
-    color: #000;
-}
-.ui-tabs-nav a span {
-    width: 64px; /* IE 6 treats width as min-width */
-    min-width: 64px;
-    height: 18px; /* IE 6 treats height as min-height */
-    min-height: 18px;
-    padding-top: 6px;
-    padding-right: 0;
-}
-*>.ui-tabs-nav a span { /* hide from IE 6 */
-    width: auto;
-    height: auto;
-}
-.ui-tabs-nav .ui-tabs-selected a span {
-    padding-bottom: 1px;
-}
-.ui-tabs-nav .ui-tabs-selected a, .ui-tabs-nav a:hover, .ui-tabs-nav a:focus, .ui-tabs-nav a:active {
-    background-position: 100% -150px;
-}
-.ui-tabs-nav a, .ui-tabs-nav .ui-tabs-disabled a:hover, .ui-tabs-nav .ui-tabs-disabled a:focus, .ui-tabs-nav .ui-tabs-disabled a:active {
-    background-position: 100% -100px;
-}
-.ui-tabs-nav .ui-tabs-selected a span, .ui-tabs-nav a:hover span, .ui-tabs-nav a:focus span, .ui-tabs-nav a:active span {
-    background-position: 0 -50px;
-}
-.ui-tabs-nav a span, .ui-tabs-nav .ui-tabs-disabled a:hover span, .ui-tabs-nav .ui-tabs-disabled a:focus span, .ui-tabs-nav .ui-tabs-disabled a:active span {
-    background-position: 0 0;
-}
-.ui-tabs-nav .ui-tabs-selected a:link, .ui-tabs-nav .ui-tabs-selected a:visited, .ui-tabs-nav .ui-tabs-disabled a:link, .ui-tabs-nav .ui-tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-    cursor: text;
-}
-.ui-tabs-nav a:hover, .ui-tabs-nav a:focus, .ui-tabs-nav a:active,
-.ui-tabs-nav .ui-tabs-unselect a:hover, .ui-tabs-nav .ui-tabs-unselect a:focus, .ui-tabs-nav .ui-tabs-unselect a:active { /* @ Opera, we need to be explicit again here now... */
-    cursor: pointer;
-}
-.ui-tabs-disabled {
-    opacity: .4;
-    filter: alpha(opacity=40);
-}
-.ui-tabs-panel {
-    border-top: 1px solid #97a5b0;
-    padding: 2px 4px 2px 4px;
-    background: #fff; /* declare background color for container to avoid distorted fonts in IE while fading */
-    border: 1px solid #D0D0D0;
-    border-bottom: 1px solid #A0A0A0;
-    border-right: 1px solid #A0A0A0;
-}
-.ui-tabs-loading em {
-    padding: 0 0 0 20px;
-    background: url(loading.gif) no-repeat 0 50%;
-}
-
-/* Additional IE specific bug fixes... */
-* html .ui-tabs-nav { /* auto clear, @ IE 6 & IE 7 Quirks Mode */
-    display: inline-block;
-}
-*:first-child+html .ui-tabs-nav  { /* @ IE 7 Standards Mode - do not group selectors, otherwise IE 6 will ignore complete rule (because of the unknown + combinator)... */
-    display: inline-block;
-}
-
diff --git a/includes/vendor/simplehtmldom/manual/img/tab.png b/includes/vendor/simplehtmldom/manual/img/tab.png
deleted file mode 100644
index 3d5f156..0000000
Binary files a/includes/vendor/simplehtmldom/manual/img/tab.png and /dev/null differ
diff --git a/includes/vendor/simplehtmldom/manual/js/jquery-1.2.3.pack.js b/includes/vendor/simplehtmldom/manual/js/jquery-1.2.3.pack.js
deleted file mode 100644
index 74cdfee..0000000
--- a/includes/vendor/simplehtmldom/manual/js/jquery-1.2.3.pack.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * jQuery 1.2.3 - New Wave Javascript
- *
- * Copyright (c) 2008 John Resig (jquery.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * $Date: 2008-02-06 00:21:25 -0500 (Wed, 06 Feb 2008) $
- * $Rev: 4663 $
- */
-eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('(J(){7(1e.3N)L w=1e.3N;L E=1e.3N=J(a,b){K 1B E.2l.4T(a,b)};7(1e.$)L D=1e.$;1e.$=E;L u=/^[^<]*(<(.|\\s)+>)[^>]*$|^#(\\w+)$/;L G=/^.[^:#\\[\\.]*$/;E.1n=E.2l={4T:J(d,b){d=d||T;7(d.15){6[0]=d;6.M=1;K 6}N 7(1o d=="25"){L c=u.2O(d);7(c&&(c[1]||!b)){7(c[1])d=E.4a([c[1]],b);N{L a=T.5J(c[3]);7(a)7(a.2w!=c[3])K E().2s(d);N{6[0]=a;6.M=1;K 6}N d=[]}}N K 1B E(b).2s(d)}N 7(E.1q(d))K 1B E(T)[E.1n.21?"21":"3U"](d);K 6.6E(d.1k==1M&&d||(d.5h||d.M&&d!=1e&&!d.15&&d[0]!=10&&d[0].15)&&E.2I(d)||[d])},5h:"1.2.3",87:J(){K 6.M},M:0,22:J(a){K a==10?E.2I(6):6[a]},2F:J(b){L a=E(b);a.54=6;K a},6E:J(a){6.M=0;1M.2l.1g.1i(6,a);K 6},R:J(a,b){K E.R(6,a,b)},4X:J(b){L a=-1;6.R(J(i){7(6==b)a=i});K a},1J:J(c,a,b){L d=c;7(c.1k==4e)7(a==10)K 6.M&&E[b||"1J"](6[0],c)||10;N{d={};d[c]=a}K 6.R(J(i){Q(c 1p d)E.1J(b?6.W:6,c,E.1l(6,d[c],b,i,c))})},1j:J(b,a){7((b==\'27\'||b==\'1R\')&&2M(a)<0)a=10;K 6.1J(b,a,"2o")},1u:J(b){7(1o b!="3V"&&b!=V)K 6.4x().3t((6[0]&&6[0].2i||T).5r(b));L a="";E.R(b||6,J(){E.R(6.3p,J(){7(6.15!=8)a+=6.15!=1?6.6K:E.1n.1u([6])})});K a},5m:J(b){7(6[0])E(b,6[0].2i).5k().3o(6[0]).2c(J(){L a=6;2b(a.1C)a=a.1C;K a}).3t(6);K 6},8w:J(a){K 6.R(J(){E(6).6z().5m(a)})},8p:J(a){K 6.R(J(){E(6).5m(a)})},3t:J(){K 6.3O(18,P,S,J(a){7(6.15==1)6.38(a)})},6q:J(){K 6.3O(18,P,P,J(a){7(6.15==1)6.3o(a,6.1C)})},6o:J(){K 6.3O(18,S,S,J(a){6.1a.3o(a,6)})},5a:J(){K 6.3O(18,S,P,J(a){6.1a.3o(a,6.2B)})},3h:J(){K 6.54||E([])},2s:J(b){L c=E.2c(6,J(a){K E.2s(b,a)});K 6.2F(/[^+>] [^+>]/.17(b)||b.1f("..")>-1?E.57(c):c)},5k:J(e){L f=6.2c(J(){7(E.14.1d&&!E.3E(6)){L a=6.69(P),4Y=T.3s("1x");4Y.38(a);K E.4a([4Y.3d])[0]}N K 6.69(P)});L d=f.2s("*").4R().R(J(){7(6[F]!=10)6[F]=V});7(e===P)6.2s("*").4R().R(J(i){7(6.15==3)K;L c=E.O(6,"2R");Q(L a 1p c)Q(L b 1p c[a])E.16.1b(d[i],a,c[a][b],c[a][b].O)});K f},1E:J(b){K 6.2F(E.1q(b)&&E.3y(6,J(a,i){K b.1P(a,i)})||E.3e(b,6))},56:J(b){7(b.1k==4e)7(G.17(b))K 6.2F(E.3e(b,6,P));N b=E.3e(b,6);L a=b.M&&b[b.M-1]!==10&&!b.15;K 6.1E(J(){K a?E.33(6,b)<0:6!=b})},1b:J(a){K!a?6:6.2F(E.37(6.22(),a.1k==4e?E(a).22():a.M!=10&&(!a.12||E.12(a,"3u"))?a:[a]))},3H:J(a){K a?E.3e(a,6).M>0:S},7j:J(a){K 6.3H("."+a)},5O:J(b){7(b==10){7(6.M){L c=6[0];7(E.12(c,"2k")){L e=c.3T,5I=[],11=c.11,2X=c.U=="2k-2X";7(e<0)K V;Q(L i=2X?e:0,2f=2X?e+1:11.M;i<2f;i++){L d=11[i];7(d.2p){b=E.14.1d&&!d.9J.1A.9y?d.1u:d.1A;7(2X)K b;5I.1g(b)}}K 5I}N K(6[0].1A||"").1r(/\\r/g,"")}K 10}K 6.R(J(){7(6.15!=1)K;7(b.1k==1M&&/5u|5t/.17(6.U))6.3k=(E.33(6.1A,b)>=0||E.33(6.31,b)>=0);N 7(E.12(6,"2k")){L a=b.1k==1M?b:[b];E("98",6).R(J(){6.2p=(E.33(6.1A,a)>=0||E.33(6.1u,a)>=0)});7(!a.M)6.3T=-1}N 6.1A=b})},3q:J(a){K a==10?(6.M?6[0].3d:V):6.4x().3t(a)},6S:J(a){K 6.5a(a).1V()},6Z:J(i){K 6.2K(i,i+1)},2K:J(){K 6.2F(1M.2l.2K.1i(6,18))},2c:J(b){K 6.2F(E.2c(6,J(a,i){K b.1P(a,i,a)}))},4R:J(){K 6.1b(6.54)},O:J(d,b){L a=d.23(".");a[1]=a[1]?"."+a[1]:"";7(b==V){L c=6.5n("8P"+a[1]+"!",[a[0]]);7(c==10&&6.M)c=E.O(6[0],d);K c==V&&a[1]?6.O(a[0]):c}N K 6.1N("8K"+a[1]+"!",[a[0],b]).R(J(){E.O(6,d,b)})},35:J(a){K 6.R(J(){E.35(6,a)})},3O:J(g,f,h,d){L e=6.M>1,3n;K 6.R(J(){7(!3n){3n=E.4a(g,6.2i);7(h)3n.8D()}L b=6;7(f&&E.12(6,"1O")&&E.12(3n[0],"4v"))b=6.3S("1U")[0]||6.38(6.2i.3s("1U"));L c=E([]);E.R(3n,J(){L a=e?E(6).5k(P)[0]:6;7(E.12(a,"1m")){c=c.1b(a)}N{7(a.15==1)c=c.1b(E("1m",a).1V());d.1P(b,a)}});c.R(6A)})}};E.2l.4T.2l=E.2l;J 6A(i,a){7(a.3Q)E.3P({1c:a.3Q,3l:S,1H:"1m"});N E.5g(a.1u||a.6x||a.3d||"");7(a.1a)a.1a.34(a)}E.1s=E.1n.1s=J(){L b=18[0]||{},i=1,M=18.M,5c=S,11;7(b.1k==8d){5c=b;b=18[1]||{};i=2}7(1o b!="3V"&&1o b!="J")b={};7(M==1){b=6;i=0}Q(;i<M;i++)7((11=18[i])!=V)Q(L a 1p 11){7(b===11[a])6w;7(5c&&11[a]&&1o 11[a]=="3V"&&b[a]&&!11[a].15)b[a]=E.1s(b[a],11[a]);N 7(11[a]!=10)b[a]=11[a]}K b};L F="3N"+(1B 3v()).3L(),6t=0,5b={};L H=/z-?4X|86-?84|1w|6k|7Z-?1R/i;E.1s({7Y:J(a){1e.$=D;7(a)1e.3N=w;K E},1q:J(a){K!!a&&1o a!="25"&&!a.12&&a.1k!=1M&&/J/i.17(a+"")},3E:J(a){K a.1F&&!a.1h||a.28&&a.2i&&!a.2i.1h},5g:J(a){a=E.3g(a);7(a){L b=T.3S("6f")[0]||T.1F,1m=T.3s("1m");1m.U="1u/4m";7(E.14.1d)1m.1u=a;N 1m.38(T.5r(a));b.38(1m);b.34(1m)}},12:J(b,a){K b.12&&b.12.2E()==a.2E()},1T:{},O:J(c,d,b){c=c==1e?5b:c;L a=c[F];7(!a)a=c[F]=++6t;7(d&&!E.1T[a])E.1T[a]={};7(b!=10)E.1T[a][d]=b;K d?E.1T[a][d]:a},35:J(c,b){c=c==1e?5b:c;L a=c[F];7(b){7(E.1T[a]){2V E.1T[a][b];b="";Q(b 1p E.1T[a])1Q;7(!b)E.35(c)}}N{1S{2V c[F]}1X(e){7(c.52)c.52(F)}2V E.1T[a]}},R:J(c,a,b){7(b){7(c.M==10){Q(L d 1p c)7(a.1i(c[d],b)===S)1Q}N Q(L i=0,M=c.M;i<M;i++)7(a.1i(c[i],b)===S)1Q}N{7(c.M==10){Q(L d 1p c)7(a.1P(c[d],d,c[d])===S)1Q}N Q(L i=0,M=c.M,1A=c[0];i<M&&a.1P(1A,i,1A)!==S;1A=c[++i]){}}K c},1l:J(b,a,c,i,d){7(E.1q(a))a=a.1P(b,i);K a&&a.1k==51&&c=="2o"&&!H.17(d)?a+"2S":a},1t:{1b:J(c,b){E.R((b||"").23(/\\s+/),J(i,a){7(c.15==1&&!E.1t.3Y(c.1t,a))c.1t+=(c.1t?" ":"")+a})},1V:J(c,b){7(c.15==1)c.1t=b!=10?E.3y(c.1t.23(/\\s+/),J(a){K!E.1t.3Y(b,a)}).6a(" "):""},3Y:J(b,a){K E.33(a,(b.1t||b).3X().23(/\\s+/))>-1}},68:J(b,c,a){L e={};Q(L d 1p c){e[d]=b.W[d];b.W[d]=c[d]}a.1P(b);Q(L d 1p c)b.W[d]=e[d]},1j:J(d,e,c){7(e=="27"||e=="1R"){L b,46={43:"4W",4U:"1Z",19:"3D"},3c=e=="27"?["7O","7M"]:["7J","7I"];J 5E(){b=e=="27"?d.7H:d.7F;L a=0,2N=0;E.R(3c,J(){a+=2M(E.2o(d,"7E"+6,P))||0;2N+=2M(E.2o(d,"2N"+6+"5X",P))||0});b-=24.7C(a+2N)}7(E(d).3H(":4d"))5E();N E.68(d,46,5E);K 24.2f(0,b)}K E.2o(d,e,c)},2o:J(e,k,j){L d;J 3x(b){7(!E.14.2d)K S;L a=T.4c.4K(b,V);K!a||a.4M("3x")==""}7(k=="1w"&&E.14.1d){d=E.1J(e.W,"1w");K d==""?"1":d}7(E.14.2z&&k=="19"){L c=e.W.50;e.W.50="0 7r 7o";e.W.50=c}7(k.1D(/4g/i))k=y;7(!j&&e.W&&e.W[k])d=e.W[k];N 7(T.4c&&T.4c.4K){7(k.1D(/4g/i))k="4g";k=k.1r(/([A-Z])/g,"-$1").2h();L h=T.4c.4K(e,V);7(h&&!3x(e))d=h.4M(k);N{L f=[],2C=[];Q(L a=e;a&&3x(a);a=a.1a)2C.4J(a);Q(L i=0;i<2C.M;i++)7(3x(2C[i])){f[i]=2C[i].W.19;2C[i].W.19="3D"}d=k=="19"&&f[2C.M-1]!=V?"2H":(h&&h.4M(k))||"";Q(L i=0;i<f.M;i++)7(f[i]!=V)2C[i].W.19=f[i]}7(k=="1w"&&d=="")d="1"}N 7(e.4n){L g=k.1r(/\\-(\\w)/g,J(a,b){K b.2E()});d=e.4n[k]||e.4n[g];7(!/^\\d+(2S)?$/i.17(d)&&/^\\d/.17(d)){L l=e.W.26,3K=e.3K.26;e.3K.26=e.4n.26;e.W.26=d||0;d=e.W.7f+"2S";e.W.26=l;e.3K.26=3K}}K d},4a:J(l,h){L k=[];h=h||T;7(1o h.3s==\'10\')h=h.2i||h[0]&&h[0].2i||T;E.R(l,J(i,d){7(!d)K;7(d.1k==51)d=d.3X();7(1o d=="25"){d=d.1r(/(<(\\w+)[^>]*?)\\/>/g,J(b,a,c){K c.1D(/^(aa|a6|7e|a5|4D|7a|a0|3m|9W|9U|9S)$/i)?b:a+"></"+c+">"});L f=E.3g(d).2h(),1x=h.3s("1x");L e=!f.1f("<9P")&&[1,"<2k 74=\'74\'>","</2k>"]||!f.1f("<9M")&&[1,"<73>","</73>"]||f.1D(/^<(9G|1U|9E|9B|9x)/)&&[1,"<1O>","</1O>"]||!f.1f("<4v")&&[2,"<1O><1U>","</1U></1O>"]||(!f.1f("<9w")||!f.1f("<9v"))&&[3,"<1O><1U><4v>","</4v></1U></1O>"]||!f.1f("<7e")&&[2,"<1O><1U></1U><6V>","</6V></1O>"]||E.14.1d&&[1,"1x<1x>","</1x>"]||[0,"",""];1x.3d=e[1]+d+e[2];2b(e[0]--)1x=1x.5o;7(E.14.1d){L g=!f.1f("<1O")&&f.1f("<1U")<0?1x.1C&&1x.1C.3p:e[1]=="<1O>"&&f.1f("<1U")<0?1x.3p:[];Q(L j=g.M-1;j>=0;--j)7(E.12(g[j],"1U")&&!g[j].3p.M)g[j].1a.34(g[j]);7(/^\\s/.17(d))1x.3o(h.5r(d.1D(/^\\s*/)[0]),1x.1C)}d=E.2I(1x.3p)}7(d.M===0&&(!E.12(d,"3u")&&!E.12(d,"2k")))K;7(d[0]==10||E.12(d,"3u")||d.11)k.1g(d);N k=E.37(k,d)});K k},1J:J(d,e,c){7(!d||d.15==3||d.15==8)K 10;L f=E.3E(d)?{}:E.46;7(e=="2p"&&E.14.2d)d.1a.3T;7(f[e]){7(c!=10)d[f[e]]=c;K d[f[e]]}N 7(E.14.1d&&e=="W")K E.1J(d.W,"9u",c);N 7(c==10&&E.14.1d&&E.12(d,"3u")&&(e=="9r"||e=="9o"))K d.9m(e).6K;N 7(d.28){7(c!=10){7(e=="U"&&E.12(d,"4D")&&d.1a)6Q"U 9i 9h\'t 9g 9e";d.9b(e,""+c)}7(E.14.1d&&/6O|3Q/.17(e)&&!E.3E(d))K d.4z(e,2);K d.4z(e)}N{7(e=="1w"&&E.14.1d){7(c!=10){d.6k=1;d.1E=(d.1E||"").1r(/6M\\([^)]*\\)/,"")+(2M(c).3X()=="96"?"":"6M(1w="+c*6L+")")}K d.1E&&d.1E.1f("1w=")>=0?(2M(d.1E.1D(/1w=([^)]*)/)[1])/6L).3X():""}e=e.1r(/-([a-z])/95,J(a,b){K b.2E()});7(c!=10)d[e]=c;K d[e]}},3g:J(a){K(a||"").1r(/^\\s+|\\s+$/g,"")},2I:J(b){L a=[];7(1o b!="93")Q(L i=0,M=b.M;i<M;i++)a.1g(b[i]);N a=b.2K(0);K a},33:J(b,a){Q(L i=0,M=a.M;i<M;i++)7(a[i]==b)K i;K-1},37:J(a,b){7(E.14.1d){Q(L i=0;b[i];i++)7(b[i].15!=8)a.1g(b[i])}N Q(L i=0;b[i];i++)a.1g(b[i]);K a},57:J(a){L c=[],2r={};1S{Q(L i=0,M=a.M;i<M;i++){L b=E.O(a[i]);7(!2r[b]){2r[b]=P;c.1g(a[i])}}}1X(e){c=a}K c},3y:J(c,a,d){L b=[];Q(L i=0,M=c.M;i<M;i++)7(!d&&a(c[i],i)||d&&!a(c[i],i))b.1g(c[i]);K b},2c:J(d,a){L c=[];Q(L i=0,M=d.M;i<M;i++){L b=a(d[i],i);7(b!==V&&b!=10){7(b.1k!=1M)b=[b];c=c.71(b)}}K c}});L v=8Y.8W.2h();E.14={5K:(v.1D(/.+(?:8T|8S|8R|8O)[\\/: ]([\\d.]+)/)||[])[1],2d:/77/.17(v),2z:/2z/.17(v),1d:/1d/.17(v)&&!/2z/.17(v),48:/48/.17(v)&&!/(8L|77)/.17(v)};L y=E.14.1d?"6H":"75";E.1s({8I:!E.14.1d||T.6F=="79",46:{"Q":"8F","8E":"1t","4g":y,75:y,6H:y,3d:"3d",1t:"1t",1A:"1A",2Y:"2Y",3k:"3k",8C:"8B",2p:"2p",8A:"8z",3T:"3T",6C:"6C",28:"28",12:"12"}});E.R({6B:J(a){K a.1a},8y:J(a){K E.4u(a,"1a")},8x:J(a){K E.2Z(a,2,"2B")},8v:J(a){K E.2Z(a,2,"4t")},8u:J(a){K E.4u(a,"2B")},8t:J(a){K E.4u(a,"4t")},8s:J(a){K E.5i(a.1a.1C,a)},8r:J(a){K E.5i(a.1C)},6z:J(a){K E.12(a,"8q")?a.8o||a.8n.T:E.2I(a.3p)}},J(c,d){E.1n[c]=J(b){L a=E.2c(6,d);7(b&&1o b=="25")a=E.3e(b,a);K 6.2F(E.57(a))}});E.R({6y:"3t",8m:"6q",3o:"6o",8l:"5a",8k:"6S"},J(c,b){E.1n[c]=J(){L a=18;K 6.R(J(){Q(L i=0,M=a.M;i<M;i++)E(a[i])[b](6)})}});E.R({8j:J(a){E.1J(6,a,"");7(6.15==1)6.52(a)},8i:J(a){E.1t.1b(6,a)},8h:J(a){E.1t.1V(6,a)},8g:J(a){E.1t[E.1t.3Y(6,a)?"1V":"1b"](6,a)},1V:J(a){7(!a||E.1E(a,[6]).r.M){E("*",6).1b(6).R(J(){E.16.1V(6);E.35(6)});7(6.1a)6.1a.34(6)}},4x:J(){E(">*",6).1V();2b(6.1C)6.34(6.1C)}},J(a,b){E.1n[a]=J(){K 6.R(b,18)}});E.R(["8f","5X"],J(i,c){L b=c.2h();E.1n[b]=J(a){K 6[0]==1e?E.14.2z&&T.1h["5e"+c]||E.14.2d&&1e["8e"+c]||T.6F=="79"&&T.1F["5e"+c]||T.1h["5e"+c]:6[0]==T?24.2f(24.2f(T.1h["5d"+c],T.1F["5d"+c]),24.2f(T.1h["5L"+c],T.1F["5L"+c])):a==10?(6.M?E.1j(6[0],b):V):6.1j(b,a.1k==4e?a:a+"2S")}});L C=E.14.2d&&4s(E.14.5K)<8c?"(?:[\\\\w*4r-]|\\\\\\\\.)":"(?:[\\\\w\\8b-\\8a*4r-]|\\\\\\\\.)",6v=1B 4q("^>\\\\s*("+C+"+)"),6u=1B 4q("^("+C+"+)(#)("+C+"+)"),6s=1B 4q("^([#.]?)("+C+"*)");E.1s({6r:{"":J(a,i,m){K m[2]=="*"||E.12(a,m[2])},"#":J(a,i,m){K a.4z("2w")==m[2]},":":{89:J(a,i,m){K i<m[3]-0},88:J(a,i,m){K i>m[3]-0},2Z:J(a,i,m){K m[3]-0==i},6Z:J(a,i,m){K m[3]-0==i},3j:J(a,i){K i==0},3J:J(a,i,m,r){K i==r.M-1},6n:J(a,i){K i%2==0},6l:J(a,i){K i%2},"3j-4p":J(a){K a.1a.3S("*")[0]==a},"3J-4p":J(a){K E.2Z(a.1a.5o,1,"4t")==a},"83-4p":J(a){K!E.2Z(a.1a.5o,2,"4t")},6B:J(a){K a.1C},4x:J(a){K!a.1C},82:J(a,i,m){K(a.6x||a.81||E(a).1u()||"").1f(m[3])>=0},4d:J(a){K"1Z"!=a.U&&E.1j(a,"19")!="2H"&&E.1j(a,"4U")!="1Z"},1Z:J(a){K"1Z"==a.U||E.1j(a,"19")=="2H"||E.1j(a,"4U")=="1Z"},80:J(a){K!a.2Y},2Y:J(a){K a.2Y},3k:J(a){K a.3k},2p:J(a){K a.2p||E.1J(a,"2p")},1u:J(a){K"1u"==a.U},5u:J(a){K"5u"==a.U},5t:J(a){K"5t"==a.U},59:J(a){K"59"==a.U},3I:J(a){K"3I"==a.U},58:J(a){K"58"==a.U},6j:J(a){K"6j"==a.U},6i:J(a){K"6i"==a.U},2G:J(a){K"2G"==a.U||E.12(a,"2G")},4D:J(a){K/4D|2k|6h|2G/i.17(a.12)},3Y:J(a,i,m){K E.2s(m[3],a).M},7X:J(a){K/h\\d/i.17(a.12)},7W:J(a){K E.3y(E.3G,J(b){K a==b.Y}).M}}},6g:[/^(\\[) *@?([\\w-]+) *([!*$^~=]*) *(\'?"?)(.*?)\\4 *\\]/,/^(:)([\\w-]+)\\("?\'?(.*?(\\(.*?\\))?[^(]*?)"?\'?\\)/,1B 4q("^([:.#]*)("+C+"+)")],3e:J(a,c,b){L d,2m=[];2b(a&&a!=d){d=a;L f=E.1E(a,c,b);a=f.t.1r(/^\\s*,\\s*/,"");2m=b?c=f.r:E.37(2m,f.r)}K 2m},2s:J(t,p){7(1o t!="25")K[t];7(p&&p.15!=1&&p.15!=9)K[];p=p||T;L d=[p],2r=[],3J,12;2b(t&&3J!=t){L r=[];3J=t;t=E.3g(t);L o=S;L g=6v;L m=g.2O(t);7(m){12=m[1].2E();Q(L i=0;d[i];i++)Q(L c=d[i].1C;c;c=c.2B)7(c.15==1&&(12=="*"||c.12.2E()==12))r.1g(c);d=r;t=t.1r(g,"");7(t.1f(" ")==0)6w;o=P}N{g=/^([>+~])\\s*(\\w*)/i;7((m=g.2O(t))!=V){r=[];L l={};12=m[2].2E();m=m[1];Q(L j=0,3f=d.M;j<3f;j++){L n=m=="~"||m=="+"?d[j].2B:d[j].1C;Q(;n;n=n.2B)7(n.15==1){L h=E.O(n);7(m=="~"&&l[h])1Q;7(!12||n.12.2E()==12){7(m=="~")l[h]=P;r.1g(n)}7(m=="+")1Q}}d=r;t=E.3g(t.1r(g,""));o=P}}7(t&&!o){7(!t.1f(",")){7(p==d[0])d.4l();2r=E.37(2r,d);r=d=[p];t=" "+t.6e(1,t.M)}N{L k=6u;L m=k.2O(t);7(m){m=[0,m[2],m[3],m[1]]}N{k=6s;m=k.2O(t)}m[2]=m[2].1r(/\\\\/g,"");L f=d[d.M-1];7(m[1]=="#"&&f&&f.5J&&!E.3E(f)){L q=f.5J(m[2]);7((E.14.1d||E.14.2z)&&q&&1o q.2w=="25"&&q.2w!=m[2])q=E(\'[@2w="\'+m[2]+\'"]\',f)[0];d=r=q&&(!m[3]||E.12(q,m[3]))?[q]:[]}N{Q(L i=0;d[i];i++){L a=m[1]=="#"&&m[3]?m[3]:m[1]!=""||m[0]==""?"*":m[2];7(a=="*"&&d[i].12.2h()=="3V")a="3m";r=E.37(r,d[i].3S(a))}7(m[1]==".")r=E.55(r,m[2]);7(m[1]=="#"){L e=[];Q(L i=0;r[i];i++)7(r[i].4z("2w")==m[2]){e=[r[i]];1Q}r=e}d=r}t=t.1r(k,"")}}7(t){L b=E.1E(t,r);d=r=b.r;t=E.3g(b.t)}}7(t)d=[];7(d&&p==d[0])d.4l();2r=E.37(2r,d);K 2r},55:J(r,m,a){m=" "+m+" ";L c=[];Q(L i=0;r[i];i++){L b=(" "+r[i].1t+" ").1f(m)>=0;7(!a&&b||a&&!b)c.1g(r[i])}K c},1E:J(t,r,h){L d;2b(t&&t!=d){d=t;L p=E.6g,m;Q(L i=0;p[i];i++){m=p[i].2O(t);7(m){t=t.7V(m[0].M);m[2]=m[2].1r(/\\\\/g,"");1Q}}7(!m)1Q;7(m[1]==":"&&m[2]=="56")r=G.17(m[3])?E.1E(m[3],r,P).r:E(r).56(m[3]);N 7(m[1]==".")r=E.55(r,m[2],h);N 7(m[1]=="["){L g=[],U=m[3];Q(L i=0,3f=r.M;i<3f;i++){L a=r[i],z=a[E.46[m[2]]||m[2]];7(z==V||/6O|3Q|2p/.17(m[2]))z=E.1J(a,m[2])||\'\';7((U==""&&!!z||U=="="&&z==m[5]||U=="!="&&z!=m[5]||U=="^="&&z&&!z.1f(m[5])||U=="$="&&z.6e(z.M-m[5].M)==m[5]||(U=="*="||U=="~=")&&z.1f(m[5])>=0)^h)g.1g(a)}r=g}N 7(m[1]==":"&&m[2]=="2Z-4p"){L e={},g=[],17=/(-?)(\\d*)n((?:\\+|-)?\\d*)/.2O(m[3]=="6n"&&"2n"||m[3]=="6l"&&"2n+1"||!/\\D/.17(m[3])&&"7U+"+m[3]||m[3]),3j=(17[1]+(17[2]||1))-0,d=17[3]-0;Q(L i=0,3f=r.M;i<3f;i++){L j=r[i],1a=j.1a,2w=E.O(1a);7(!e[2w]){L c=1;Q(L n=1a.1C;n;n=n.2B)7(n.15==1)n.4k=c++;e[2w]=P}L b=S;7(3j==0){7(j.4k==d)b=P}N 7((j.4k-d)%3j==0&&(j.4k-d)/3j>=0)b=P;7(b^h)g.1g(j)}r=g}N{L f=E.6r[m[1]];7(1o f=="3V")f=f[m[2]];7(1o f=="25")f=6c("S||J(a,i){K "+f+";}");r=E.3y(r,J(a,i){K f(a,i,m,r)},h)}}K{r:r,t:t}},4u:J(b,c){L d=[];L a=b[c];2b(a&&a!=T){7(a.15==1)d.1g(a);a=a[c]}K d},2Z:J(a,e,c,b){e=e||1;L d=0;Q(;a;a=a[c])7(a.15==1&&++d==e)1Q;K a},5i:J(n,a){L r=[];Q(;n;n=n.2B){7(n.15==1&&(!a||n!=a))r.1g(n)}K r}});E.16={1b:J(f,i,g,e){7(f.15==3||f.15==8)K;7(E.14.1d&&f.53!=10)f=1e;7(!g.2D)g.2D=6.2D++;7(e!=10){L h=g;g=J(){K h.1i(6,18)};g.O=e;g.2D=h.2D}L j=E.O(f,"2R")||E.O(f,"2R",{}),1v=E.O(f,"1v")||E.O(f,"1v",J(){L a;7(1o E=="10"||E.16.5f)K a;a=E.16.1v.1i(18.3R.Y,18);K a});1v.Y=f;E.R(i.23(/\\s+/),J(c,b){L a=b.23(".");b=a[0];g.U=a[1];L d=j[b];7(!d){d=j[b]={};7(!E.16.2y[b]||E.16.2y[b].4j.1P(f)===S){7(f.3F)f.3F(b,1v,S);N 7(f.6b)f.6b("4i"+b,1v)}}d[g.2D]=g;E.16.2a[b]=P});f=V},2D:1,2a:{},1V:J(e,h,f){7(e.15==3||e.15==8)K;L i=E.O(e,"2R"),29,4X;7(i){7(h==10||(1o h=="25"&&h.7T(0)=="."))Q(L g 1p i)6.1V(e,g+(h||""));N{7(h.U){f=h.2q;h=h.U}E.R(h.23(/\\s+/),J(b,a){L c=a.23(".");a=c[0];7(i[a]){7(f)2V i[a][f.2D];N Q(f 1p i[a])7(!c[1]||i[a][f].U==c[1])2V i[a][f];Q(29 1p i[a])1Q;7(!29){7(!E.16.2y[a]||E.16.2y[a].4h.1P(e)===S){7(e.67)e.67(a,E.O(e,"1v"),S);N 7(e.66)e.66("4i"+a,E.O(e,"1v"))}29=V;2V i[a]}}})}Q(29 1p i)1Q;7(!29){L d=E.O(e,"1v");7(d)d.Y=V;E.35(e,"2R");E.35(e,"1v")}}},1N:J(g,c,d,f,h){c=E.2I(c||[]);7(g.1f("!")>=0){g=g.2K(0,-1);L a=P}7(!d){7(6.2a[g])E("*").1b([1e,T]).1N(g,c)}N{7(d.15==3||d.15==8)K 10;L b,29,1n=E.1q(d[g]||V),16=!c[0]||!c[0].36;7(16)c.4J(6.4Z({U:g,2L:d}));c[0].U=g;7(a)c[0].65=P;7(E.1q(E.O(d,"1v")))b=E.O(d,"1v").1i(d,c);7(!1n&&d["4i"+g]&&d["4i"+g].1i(d,c)===S)b=S;7(16)c.4l();7(h&&E.1q(h)){29=h.1i(d,b==V?c:c.71(b));7(29!==10)b=29}7(1n&&f!==S&&b!==S&&!(E.12(d,\'a\')&&g=="4V")){6.5f=P;1S{d[g]()}1X(e){}}6.5f=S}K b},1v:J(c){L a;c=E.16.4Z(c||1e.16||{});L b=c.U.23(".");c.U=b[0];L f=E.O(6,"2R")&&E.O(6,"2R")[c.U],42=1M.2l.2K.1P(18,1);42.4J(c);Q(L j 1p f){L d=f[j];42[0].2q=d;42[0].O=d.O;7(!b[1]&&!c.65||d.U==b[1]){L e=d.1i(6,42);7(a!==S)a=e;7(e===S){c.36();c.44()}}}7(E.14.1d)c.2L=c.36=c.44=c.2q=c.O=V;K a},4Z:J(c){L a=c;c=E.1s({},a);c.36=J(){7(a.36)a.36();a.7S=S};c.44=J(){7(a.44)a.44();a.7R=P};7(!c.2L)c.2L=c.7Q||T;7(c.2L.15==3)c.2L=a.2L.1a;7(!c.4S&&c.5w)c.4S=c.5w==c.2L?c.7P:c.5w;7(c.64==V&&c.63!=V){L b=T.1F,1h=T.1h;c.64=c.63+(b&&b.2v||1h&&1h.2v||0)-(b.62||0);c.7N=c.7L+(b&&b.2x||1h&&1h.2x||0)-(b.60||0)}7(!c.3c&&((c.4f||c.4f===0)?c.4f:c.5Z))c.3c=c.4f||c.5Z;7(!c.7b&&c.5Y)c.7b=c.5Y;7(!c.3c&&c.2G)c.3c=(c.2G&1?1:(c.2G&2?3:(c.2G&4?2:0)));K c},2y:{21:{4j:J(){5M();K},4h:J(){K}},3C:{4j:J(){7(E.14.1d)K S;E(6).2j("4P",E.16.2y.3C.2q);K P},4h:J(){7(E.14.1d)K S;E(6).3w("4P",E.16.2y.3C.2q);K P},2q:J(a){7(I(a,6))K P;18[0].U="3C";K E.16.1v.1i(6,18)}},3B:{4j:J(){7(E.14.1d)K S;E(6).2j("4O",E.16.2y.3B.2q);K P},4h:J(){7(E.14.1d)K S;E(6).3w("4O",E.16.2y.3B.2q);K P},2q:J(a){7(I(a,6))K P;18[0].U="3B";K E.16.1v.1i(6,18)}}}};E.1n.1s({2j:J(c,a,b){K c=="4H"?6.2X(c,a,b):6.R(J(){E.16.1b(6,c,b||a,b&&a)})},2X:J(d,b,c){K 6.R(J(){E.16.1b(6,d,J(a){E(6).3w(a);K(c||b).1i(6,18)},c&&b)})},3w:J(a,b){K 6.R(J(){E.16.1V(6,a,b)})},1N:J(c,a,b){K 6.R(J(){E.16.1N(c,a,6,P,b)})},5n:J(c,a,b){7(6[0])K E.16.1N(c,a,6[0],S,b);K 10},2g:J(){L b=18;K 6.4V(J(a){6.4N=0==6.4N?1:0;a.36();K b[6.4N].1i(6,18)||S})},7D:J(a,b){K 6.2j(\'3C\',a).2j(\'3B\',b)},21:J(a){5M();7(E.2Q)a.1P(T,E);N E.3A.1g(J(){K a.1P(6,E)});K 6}});E.1s({2Q:S,3A:[],21:J(){7(!E.2Q){E.2Q=P;7(E.3A){E.R(E.3A,J(){6.1i(T)});E.3A=V}E(T).5n("21")}}});L x=S;J 5M(){7(x)K;x=P;7(T.3F&&!E.14.2z)T.3F("5W",E.21,S);7(E.14.1d&&1e==3b)(J(){7(E.2Q)K;1S{T.1F.7B("26")}1X(3a){3z(18.3R,0);K}E.21()})();7(E.14.2z)T.3F("5W",J(){7(E.2Q)K;Q(L i=0;i<T.4L.M;i++)7(T.4L[i].2Y){3z(18.3R,0);K}E.21()},S);7(E.14.2d){L a;(J(){7(E.2Q)K;7(T.39!="5V"&&T.39!="1y"){3z(18.3R,0);K}7(a===10)a=E("W, 7a[7A=7z]").M;7(T.4L.M!=a){3z(18.3R,0);K}E.21()})()}E.16.1b(1e,"3U",E.21)}E.R(("7y,7x,3U,7w,5d,4H,4V,7v,"+"7G,7u,7t,4P,4O,7s,2k,"+"58,7K,7q,7p,3a").23(","),J(i,b){E.1n[b]=J(a){K a?6.2j(b,a):6.1N(b)}});L I=J(a,c){L b=a.4S;2b(b&&b!=c)1S{b=b.1a}1X(3a){b=c}K b==c};E(1e).2j("4H",J(){E("*").1b(T).3w()});E.1n.1s({3U:J(g,d,c){7(E.1q(g))K 6.2j("3U",g);L e=g.1f(" ");7(e>=0){L i=g.2K(e,g.M);g=g.2K(0,e)}c=c||J(){};L f="4Q";7(d)7(E.1q(d)){c=d;d=V}N{d=E.3m(d);f="61"}L h=6;E.3P({1c:g,U:f,1H:"3q",O:d,1y:J(a,b){7(b=="1W"||b=="5U")h.3q(i?E("<1x/>").3t(a.4b.1r(/<1m(.|\\s)*?\\/1m>/g,"")).2s(i):a.4b);h.R(c,[a.4b,b,a])}});K 6},7n:J(){K E.3m(6.5T())},5T:J(){K 6.2c(J(){K E.12(6,"3u")?E.2I(6.7m):6}).1E(J(){K 6.31&&!6.2Y&&(6.3k||/2k|6h/i.17(6.12)||/1u|1Z|3I/i.17(6.U))}).2c(J(i,c){L b=E(6).5O();K b==V?V:b.1k==1M?E.2c(b,J(a,i){K{31:c.31,1A:a}}):{31:c.31,1A:b}}).22()}});E.R("5S,6d,5R,6D,5Q,6m".23(","),J(i,o){E.1n[o]=J(f){K 6.2j(o,f)}});L B=(1B 3v).3L();E.1s({22:J(d,b,a,c){7(E.1q(b)){a=b;b=V}K E.3P({U:"4Q",1c:d,O:b,1W:a,1H:c})},7l:J(b,a){K E.22(b,V,a,"1m")},7k:J(c,b,a){K E.22(c,b,a,"3i")},7i:J(d,b,a,c){7(E.1q(b)){a=b;b={}}K E.3P({U:"61",1c:d,O:b,1W:a,1H:c})},85:J(a){E.1s(E.4I,a)},4I:{2a:P,U:"4Q",2U:0,5P:"4o/x-7h-3u-7g",5N:P,3l:P,O:V,6p:V,3I:V,49:{3M:"4o/3M, 1u/3M",3q:"1u/3q",1m:"1u/4m, 4o/4m",3i:"4o/3i, 1u/4m",1u:"1u/a7",4G:"*/*"}},4F:{},3P:J(s){L f,2W=/=\\?(&|$)/g,1z,O;s=E.1s(P,s,E.1s(P,{},E.4I,s));7(s.O&&s.5N&&1o s.O!="25")s.O=E.3m(s.O);7(s.1H=="4E"){7(s.U.2h()=="22"){7(!s.1c.1D(2W))s.1c+=(s.1c.1D(/\\?/)?"&":"?")+(s.4E||"7d")+"=?"}N 7(!s.O||!s.O.1D(2W))s.O=(s.O?s.O+"&":"")+(s.4E||"7d")+"=?";s.1H="3i"}7(s.1H=="3i"&&(s.O&&s.O.1D(2W)||s.1c.1D(2W))){f="4E"+B++;7(s.O)s.O=(s.O+"").1r(2W,"="+f+"$1");s.1c=s.1c.1r(2W,"="+f+"$1");s.1H="1m";1e[f]=J(a){O=a;1W();1y();1e[f]=10;1S{2V 1e[f]}1X(e){}7(h)h.34(g)}}7(s.1H=="1m"&&s.1T==V)s.1T=S;7(s.1T===S&&s.U.2h()=="22"){L i=(1B 3v()).3L();L j=s.1c.1r(/(\\?|&)4r=.*?(&|$)/,"$a4="+i+"$2");s.1c=j+((j==s.1c)?(s.1c.1D(/\\?/)?"&":"?")+"4r="+i:"")}7(s.O&&s.U.2h()=="22"){s.1c+=(s.1c.1D(/\\?/)?"&":"?")+s.O;s.O=V}7(s.2a&&!E.5H++)E.16.1N("5S");7((!s.1c.1f("a3")||!s.1c.1f("//"))&&s.1H=="1m"&&s.U.2h()=="22"){L h=T.3S("6f")[0];L g=T.3s("1m");g.3Q=s.1c;7(s.7c)g.a2=s.7c;7(!f){L l=S;g.9Z=g.9Y=J(){7(!l&&(!6.39||6.39=="5V"||6.39=="1y")){l=P;1W();1y();h.34(g)}}}h.38(g);K 10}L m=S;L k=1e.78?1B 78("9X.9V"):1B 76();k.9T(s.U,s.1c,s.3l,s.6p,s.3I);1S{7(s.O)k.4C("9R-9Q",s.5P);7(s.5C)k.4C("9O-5A-9N",E.4F[s.1c]||"9L, 9K 9I 9H 5z:5z:5z 9F");k.4C("X-9C-9A","76");k.4C("9z",s.1H&&s.49[s.1H]?s.49[s.1H]+", */*":s.49.4G)}1X(e){}7(s.6Y)s.6Y(k);7(s.2a)E.16.1N("6m",[k,s]);L c=J(a){7(!m&&k&&(k.39==4||a=="2U")){m=P;7(d){6I(d);d=V}1z=a=="2U"&&"2U"||!E.6X(k)&&"3a"||s.5C&&E.6J(k,s.1c)&&"5U"||"1W";7(1z=="1W"){1S{O=E.6W(k,s.1H)}1X(e){1z="5x"}}7(1z=="1W"){L b;1S{b=k.5q("6U-5A")}1X(e){}7(s.5C&&b)E.4F[s.1c]=b;7(!f)1W()}N E.5v(s,k,1z);1y();7(s.3l)k=V}};7(s.3l){L d=53(c,13);7(s.2U>0)3z(J(){7(k){k.9t();7(!m)c("2U")}},s.2U)}1S{k.9s(s.O)}1X(e){E.5v(s,k,V,e)}7(!s.3l)c();J 1W(){7(s.1W)s.1W(O,1z);7(s.2a)E.16.1N("5Q",[k,s])}J 1y(){7(s.1y)s.1y(k,1z);7(s.2a)E.16.1N("5R",[k,s]);7(s.2a&&!--E.5H)E.16.1N("6d")}K k},5v:J(s,a,b,e){7(s.3a)s.3a(a,b,e);7(s.2a)E.16.1N("6D",[a,s,e])},5H:0,6X:J(r){1S{K!r.1z&&9q.9p=="59:"||(r.1z>=6T&&r.1z<9n)||r.1z==6R||r.1z==9l||E.14.2d&&r.1z==10}1X(e){}K S},6J:J(a,c){1S{L b=a.5q("6U-5A");K a.1z==6R||b==E.4F[c]||E.14.2d&&a.1z==10}1X(e){}K S},6W:J(r,b){L c=r.5q("9k-U");L d=b=="3M"||!b&&c&&c.1f("3M")>=0;L a=d?r.9j:r.4b;7(d&&a.1F.28=="5x")6Q"5x";7(b=="1m")E.5g(a);7(b=="3i")a=6c("("+a+")");K a},3m:J(a){L s=[];7(a.1k==1M||a.5h)E.R(a,J(){s.1g(3r(6.31)+"="+3r(6.1A))});N Q(L j 1p a)7(a[j]&&a[j].1k==1M)E.R(a[j],J(){s.1g(3r(j)+"="+3r(6))});N s.1g(3r(j)+"="+3r(a[j]));K s.6a("&").1r(/%20/g,"+")}});E.1n.1s({1G:J(c,b){K c?6.2e({1R:"1G",27:"1G",1w:"1G"},c,b):6.1E(":1Z").R(J(){6.W.19=6.5s||"";7(E.1j(6,"19")=="2H"){L a=E("<"+6.28+" />").6y("1h");6.W.19=a.1j("19");7(6.W.19=="2H")6.W.19="3D";a.1V()}}).3h()},1I:J(b,a){K b?6.2e({1R:"1I",27:"1I",1w:"1I"},b,a):6.1E(":4d").R(J(){6.5s=6.5s||E.1j(6,"19");6.W.19="2H"}).3h()},6N:E.1n.2g,2g:J(a,b){K E.1q(a)&&E.1q(b)?6.6N(a,b):a?6.2e({1R:"2g",27:"2g",1w:"2g"},a,b):6.R(J(){E(6)[E(6).3H(":1Z")?"1G":"1I"]()})},9f:J(b,a){K 6.2e({1R:"1G"},b,a)},9d:J(b,a){K 6.2e({1R:"1I"},b,a)},9c:J(b,a){K 6.2e({1R:"2g"},b,a)},9a:J(b,a){K 6.2e({1w:"1G"},b,a)},99:J(b,a){K 6.2e({1w:"1I"},b,a)},97:J(c,a,b){K 6.2e({1w:a},c,b)},2e:J(l,k,j,h){L i=E.6P(k,j,h);K 6[i.2P===S?"R":"2P"](J(){7(6.15!=1)K S;L g=E.1s({},i);L f=E(6).3H(":1Z"),4A=6;Q(L p 1p l){7(l[p]=="1I"&&f||l[p]=="1G"&&!f)K E.1q(g.1y)&&g.1y.1i(6);7(p=="1R"||p=="27"){g.19=E.1j(6,"19");g.32=6.W.32}}7(g.32!=V)6.W.32="1Z";g.40=E.1s({},l);E.R(l,J(c,a){L e=1B E.2t(4A,g,c);7(/2g|1G|1I/.17(a))e[a=="2g"?f?"1G":"1I":a](l);N{L b=a.3X().1D(/^([+-]=)?([\\d+-.]+)(.*)$/),1Y=e.2m(P)||0;7(b){L d=2M(b[2]),2A=b[3]||"2S";7(2A!="2S"){4A.W[c]=(d||1)+2A;1Y=((d||1)/e.2m(P))*1Y;4A.W[c]=1Y+2A}7(b[1])d=((b[1]=="-="?-1:1)*d)+1Y;e.45(1Y,d,2A)}N e.45(1Y,a,"")}});K P})},2P:J(a,b){7(E.1q(a)||(a&&a.1k==1M)){b=a;a="2t"}7(!a||(1o a=="25"&&!b))K A(6[0],a);K 6.R(J(){7(b.1k==1M)A(6,a,b);N{A(6,a).1g(b);7(A(6,a).M==1)b.1i(6)}})},94:J(b,c){L a=E.3G;7(b)6.2P([]);6.R(J(){Q(L i=a.M-1;i>=0;i--)7(a[i].Y==6){7(c)a[i](P);a.72(i,1)}});7(!c)6.5p();K 6}});L A=J(b,c,a){7(!b)K 10;c=c||"2t";L q=E.O(b,c+"2P");7(!q||a)q=E.O(b,c+"2P",a?E.2I(a):[]);K q};E.1n.5p=J(a){a=a||"2t";K 6.R(J(){L q=A(6,a);q.4l();7(q.M)q[0].1i(6)})};E.1s({6P:J(b,a,c){L d=b&&b.1k==92?b:{1y:c||!c&&a||E.1q(b)&&b,2u:b,3Z:c&&a||a&&a.1k!=91&&a};d.2u=(d.2u&&d.2u.1k==51?d.2u:{90:8Z,9D:6T}[d.2u])||8X;d.5y=d.1y;d.1y=J(){7(d.2P!==S)E(6).5p();7(E.1q(d.5y))d.5y.1i(6)};K d},3Z:{70:J(p,n,b,a){K b+a*p},5j:J(p,n,b,a){K((-24.8V(p*24.8U)/2)+0.5)*a+b}},3G:[],3W:V,2t:J(b,c,a){6.11=c;6.Y=b;6.1l=a;7(!c.47)c.47={}}});E.2t.2l={4y:J(){7(6.11.30)6.11.30.1i(6.Y,[6.2J,6]);(E.2t.30[6.1l]||E.2t.30.4G)(6);7(6.1l=="1R"||6.1l=="27")6.Y.W.19="3D"},2m:J(a){7(6.Y[6.1l]!=V&&6.Y.W[6.1l]==V)K 6.Y[6.1l];L r=2M(E.1j(6.Y,6.1l,a));K r&&r>-8Q?r:2M(E.2o(6.Y,6.1l))||0},45:J(c,b,d){6.5B=(1B 3v()).3L();6.1Y=c;6.3h=b;6.2A=d||6.2A||"2S";6.2J=6.1Y;6.4B=6.4w=0;6.4y();L e=6;J t(a){K e.30(a)}t.Y=6.Y;E.3G.1g(t);7(E.3W==V){E.3W=53(J(){L a=E.3G;Q(L i=0;i<a.M;i++)7(!a[i]())a.72(i--,1);7(!a.M){6I(E.3W);E.3W=V}},13)}},1G:J(){6.11.47[6.1l]=E.1J(6.Y.W,6.1l);6.11.1G=P;6.45(0,6.2m());7(6.1l=="27"||6.1l=="1R")6.Y.W[6.1l]="8N";E(6.Y).1G()},1I:J(){6.11.47[6.1l]=E.1J(6.Y.W,6.1l);6.11.1I=P;6.45(6.2m(),0)},30:J(a){L t=(1B 3v()).3L();7(a||t>6.11.2u+6.5B){6.2J=6.3h;6.4B=6.4w=1;6.4y();6.11.40[6.1l]=P;L b=P;Q(L i 1p 6.11.40)7(6.11.40[i]!==P)b=S;7(b){7(6.11.19!=V){6.Y.W.32=6.11.32;6.Y.W.19=6.11.19;7(E.1j(6.Y,"19")=="2H")6.Y.W.19="3D"}7(6.11.1I)6.Y.W.19="2H";7(6.11.1I||6.11.1G)Q(L p 1p 6.11.40)E.1J(6.Y.W,p,6.11.47[p])}7(b&&E.1q(6.11.1y))6.11.1y.1i(6.Y);K S}N{L n=t-6.5B;6.4w=n/6.11.2u;6.4B=E.3Z[6.11.3Z||(E.3Z.5j?"5j":"70")](6.4w,n,0,1,6.11.2u);6.2J=6.1Y+((6.3h-6.1Y)*6.4B);6.4y()}K P}};E.2t.30={2v:J(a){a.Y.2v=a.2J},2x:J(a){a.Y.2x=a.2J},1w:J(a){E.1J(a.Y.W,"1w",a.2J)},4G:J(a){a.Y.W[a.1l]=a.2J+a.2A}};E.1n.5L=J(){L b=0,3b=0,Y=6[0],5l;7(Y)8M(E.14){L d=Y.1a,41=Y,1K=Y.1K,1L=Y.2i,5D=2d&&4s(5K)<8J&&!/a1/i.17(v),2T=E.1j(Y,"43")=="2T";7(Y.6G){L c=Y.6G();1b(c.26+24.2f(1L.1F.2v,1L.1h.2v),c.3b+24.2f(1L.1F.2x,1L.1h.2x));1b(-1L.1F.62,-1L.1F.60)}N{1b(Y.5G,Y.5F);2b(1K){1b(1K.5G,1K.5F);7(48&&!/^t(8H|d|h)$/i.17(1K.28)||2d&&!5D)2N(1K);7(!2T&&E.1j(1K,"43")=="2T")2T=P;41=/^1h$/i.17(1K.28)?41:1K;1K=1K.1K}2b(d&&d.28&&!/^1h|3q$/i.17(d.28)){7(!/^8G|1O.*$/i.17(E.1j(d,"19")))1b(-d.2v,-d.2x);7(48&&E.1j(d,"32")!="4d")2N(d);d=d.1a}7((5D&&(2T||E.1j(41,"43")=="4W"))||(48&&E.1j(41,"43")!="4W"))1b(-1L.1h.5G,-1L.1h.5F);7(2T)1b(24.2f(1L.1F.2v,1L.1h.2v),24.2f(1L.1F.2x,1L.1h.2x))}5l={3b:3b,26:b}}J 2N(a){1b(E.2o(a,"a8",P),E.2o(a,"a9",P))}J 1b(l,t){b+=4s(l)||0;3b+=4s(t)||0}K 5l}})();',62,631,'||||||this|if||||||||||||||||||||||||||||||||||||||function|return|var|length|else|data|true|for|each|false|document|type|null|style||elem||undefined|options|nodeName||browser|nodeType|event|test|arguments|display|parentNode|add|url|msie|window|indexOf|push|body|apply|css|constructor|prop|script|fn|typeof|in|isFunction|replace|extend|className|text|handle|opacity|div|complete|status|value|new|firstChild|match|filter|documentElement|show|dataType|hide|attr|offsetParent|doc|Array|trigger|table|call|break|height|try|cache|tbody|remove|success|catch|start|hidden||ready|get|split|Math|string|left|width|tagName|ret|global|while|map|safari|animate|max|toggle|toLowerCase|ownerDocument|bind|select|prototype|cur||curCSS|selected|handler|done|find|fx|duration|scrollLeft|id|scrollTop|special|opera|unit|nextSibling|stack|guid|toUpperCase|pushStack|button|none|makeArray|now|slice|target|parseFloat|border|exec|queue|isReady|events|px|fixed|timeout|delete|jsre|one|disabled|nth|step|name|overflow|inArray|removeChild|removeData|preventDefault|merge|appendChild|readyState|error|top|which|innerHTML|multiFilter|rl|trim|end|json|first|checked|async|param|elems|insertBefore|childNodes|html|encodeURIComponent|createElement|append|form|Date|unbind|color|grep|setTimeout|readyList|mouseleave|mouseenter|block|isXMLDoc|addEventListener|timers|is|password|last|runtimeStyle|getTime|xml|jQuery|domManip|ajax|src|callee|getElementsByTagName|selectedIndex|load|object|timerId|toString|has|easing|curAnim|offsetChild|args|position|stopPropagation|custom|props|orig|mozilla|accepts|clean|responseText|defaultView|visible|String|charCode|float|teardown|on|setup|nodeIndex|shift|javascript|currentStyle|application|child|RegExp|_|parseInt|previousSibling|dir|tr|state|empty|update|getAttribute|self|pos|setRequestHeader|input|jsonp|lastModified|_default|unload|ajaxSettings|unshift|getComputedStyle|styleSheets|getPropertyValue|lastToggle|mouseout|mouseover|GET|andSelf|relatedTarget|init|visibility|click|absolute|index|container|fix|outline|Number|removeAttribute|setInterval|prevObject|classFilter|not|unique|submit|file|after|windowData|deep|scroll|client|triggered|globalEval|jquery|sibling|swing|clone|results|wrapAll|triggerHandler|lastChild|dequeue|getResponseHeader|createTextNode|oldblock|checkbox|radio|handleError|fromElement|parsererror|old|00|Modified|startTime|ifModified|safari2|getWH|offsetTop|offsetLeft|active|values|getElementById|version|offset|bindReady|processData|val|contentType|ajaxSuccess|ajaxComplete|ajaxStart|serializeArray|notmodified|loaded|DOMContentLoaded|Width|ctrlKey|keyCode|clientTop|POST|clientLeft|clientX|pageX|exclusive|detachEvent|removeEventListener|swap|cloneNode|join|attachEvent|eval|ajaxStop|substr|head|parse|textarea|reset|image|zoom|odd|ajaxSend|even|before|username|prepend|expr|quickClass|uuid|quickID|quickChild|continue|textContent|appendTo|contents|evalScript|parent|defaultValue|ajaxError|setArray|compatMode|getBoundingClientRect|styleFloat|clearInterval|httpNotModified|nodeValue|100|alpha|_toggle|href|speed|throw|304|replaceWith|200|Last|colgroup|httpData|httpSuccess|beforeSend|eq|linear|concat|splice|fieldset|multiple|cssFloat|XMLHttpRequest|webkit|ActiveXObject|CSS1Compat|link|metaKey|scriptCharset|callback|col|pixelLeft|urlencoded|www|post|hasClass|getJSON|getScript|elements|serialize|black|keyup|keypress|solid|change|mousemove|mouseup|dblclick|resize|focus|blur|stylesheet|rel|doScroll|round|hover|padding|offsetHeight|mousedown|offsetWidth|Bottom|Top|keydown|clientY|Right|pageY|Left|toElement|srcElement|cancelBubble|returnValue|charAt|0n|substring|animated|header|noConflict|line|enabled|innerText|contains|only|weight|ajaxSetup|font|size|gt|lt|uFFFF|u0128|417|Boolean|inner|Height|toggleClass|removeClass|addClass|removeAttr|replaceAll|insertAfter|prependTo|contentWindow|contentDocument|wrap|iframe|children|siblings|prevAll|nextAll|prev|wrapInner|next|parents|maxLength|maxlength|readOnly|readonly|reverse|class|htmlFor|inline|able|boxModel|522|setData|compatible|with|1px|ie|getData|10000|ra|it|rv|PI|cos|userAgent|400|navigator|600|slow|Function|Object|array|stop|ig|NaN|fadeTo|option|fadeOut|fadeIn|setAttribute|slideToggle|slideUp|changed|slideDown|be|can|property|responseXML|content|1223|getAttributeNode|300|method|protocol|location|action|send|abort|cssText|th|td|cap|specified|Accept|With|colg|Requested|fast|tfoot|GMT|thead|1970|Jan|attributes|01|Thu|leg|Since|If|opt|Type|Content|embed|open|area|XMLHTTP|hr|Microsoft|onreadystatechange|onload|meta|adobeair|charset|http|1_|img|br|plain|borderLeftWidth|borderTopWidth|abbr'.split('|'),0,{}))
\ No newline at end of file
diff --git a/includes/vendor/simplehtmldom/manual/js/ui.tabs.pack.js b/includes/vendor/simplehtmldom/manual/js/ui.tabs.pack.js
deleted file mode 100644
index cfc226a..0000000
--- a/includes/vendor/simplehtmldom/manual/js/ui.tabs.pack.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Tabs 3 - New Wave Tabs
- *
- * Copyright (c) 2007 Klaus Hartl (stilbuero.de)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Tabs
- */
-eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('(6($){$.4=$.4||{};$.2o.3=6(){7 b=1K 1q[0]==\'1X\'&&1q[0];7 c=b&&1P.1N.2g.2c(1q,1)||1q;l b==\'C\'?$.m(2[0],\'4-3\').$3.C:2.I(6(){5(b){7 a=$.m(2,\'4-3\');a[b].2n(a,c)}D 2l $.4.3(2,c[0]||{})})};$.4.3=6(e,f){7 d=2;2.q=e;2.8=$.1H({p:0,S:f.p===L,12:\'1A\',t:[],G:L,1l:\'2B&#2x;\',K:y,1R:\'4-3-\',1j:{},X:L,1Q:\'<E><a x="#{x}"><1h>#{1g}</1h></a></E>\',1v:\'<1L></1L>\',1f:\'4-3-2f\',w:\'4-3-p\',1t:\'4-3-S\',Q:\'4-3-t\',U:\'4-3-1e\',M:\'4-3-Y\',1s:\'4-3-2Y\'},f);5(f.p===L)2.8.p=L;2.8.12+=\'.4-3\';2.8.G=$.G&&$.G.28==2V&&2.8.G;$(e).1b(\'2T.4-3\',6(b,c,a){5((/^p/).27(c))d.1o(a);D{d.8[c]=a;d.11()}}).1b(\'2Q.4-3\',6(a,b){l d.8[b]});$.m(e,\'4-3\',2);2.11(1a)};$.1H($.4.3.1N,{1z:6(a){l a.22&&a.22.V(/\\s/g,\'1Z\').V(/[^A-2A-2y-9\\-1Z:\\.]/g,\'\')||2.8.1R+$.m(a)},4:6(a,b){l{2w:2,8:2.8,2v:a,1e:b}},11:6(f){2.$u=$(\'E:2s(a[x])\',2.q);2.$3=2.$u.1i(6(){l $(\'a\',2)[0]});2.$k=$([]);7 e=2,o=2.8;2.$3.I(6(i,a){5(a.H&&a.H.V(\'#\',\'\'))e.$k=e.$k.17(a.H);D 5($(a).W(\'x\')!=\'#\'){$.m(a,\'x.4-3\',a.x);$.m(a,\'z.4-3\',a.x);7 b=e.1z(a);a.x=\'#\'+b;7 c=$(\'#\'+b);5(!c.C){c=$(o.1v).W(\'16\',b).v(o.U).2m(e.$k[i-1]||e.q);c.m(\'15.4-3\',1a)}e.$k=e.$k.17(c)}D o.t.1O(i+1)});5(f){$(2.q).J(o.1f)||$(2.q).v(o.1f);2.$k.I(6(){7 a=$(2);a.J(o.U)||a.v(o.U)});2.$3.I(6(i,a){5(1w.H){5(a.H==1w.H){o.p=i;5($.O.14||$.O.2k){7 b=$(1w.H),1M=b.W(\'16\');b.W(\'16\',\'\');1u(6(){b.W(\'16\',1M)},2j)}2i(0,0);l y}}D 5(o.G){7 c=2h($.G(\'4-3\'+$.m(e.q)),10);5(c&&e.$3[c]){o.p=c;l y}}D 5(e.$u.F(i).J(o.w)){o.p=i;l y}});2.$k.v(o.M);2.$u.B(o.w);5(!o.S){2.$k.F(o.p).N().B(o.M);2.$u.F(o.p).v(o.w)}7 h=!o.S&&$.m(2.$3[o.p],\'z.4-3\');5(h)2.z(o.p);o.t=$.2e(o.t.2d($.1i(2.$u.T(\'.\'+o.Q),6(n,i){l e.$u.Z(n)}))).1J();$(2b).1b(\'2a\',6(){e.$3.1d(\'.4-3\');e.$u=e.$3=e.$k=L})}29(7 i=0,E;E=2.$u[i];i++)$(E)[$.1I(i,o.t)!=-1&&!$(E).J(o.w)?\'v\':\'B\'](o.Q);5(o.K===y)2.$3.1r(\'K.4-3\');7 j,R,1c={\'2X-2W\':0,1G:1},1F=\'2U\';5(o.X&&o.X.28==1P)j=o.X[0]||1c,R=o.X[1]||1c;D j=R=o.X||1c;7 g={1p:\'\',2S:\'\',2R:\'\'};5(!$.O.14)g.1E=\'\';6 1D(b,c,a){c.26(j,j.1G||1F,6(){c.v(o.M).13(g);5($.O.14&&j.1E)c[0].24.T=\'\';5(a)1C(b,a,c)})}6 1C(b,a,c){5(R===1c)a.13(\'1p\',\'1B\');a.26(R,R.1G||1F,6(){a.B(o.M).13(g);5($.O.14&&R.1E)a[0].24.T=\'\';$(e.q).P(\'N.4-3\',[e.4(b,a[0])])})}6 23(c,a,d,b){a.v(o.w).2P().B(o.w);1D(c,d,b)}2.$3.1d(\'.4-3\').1b(o.12,6(){7 b=$(2).2O(\'E:F(0)\'),$Y=e.$k.T(\':2N\'),$N=$(2.H);5((b.J(o.w)&&!o.S)||b.J(o.Q)||$(e.q).P(\'1o.4-3\',[e.4(2,$N[0])])===y){2.1k();l y}e.8.p=e.$3.Z(2);5(o.S){5(b.J(o.w)){e.8.p=L;b.B(o.w);e.$k.1y();1D(2,$Y);2.1k();l y}D 5(!$Y.C){e.$k.1y();7 a=2;e.z(e.$3.Z(2),6(){b.v(o.w).v(o.1t);1C(a,$N)});2.1k();l y}}5(o.G)$.G(\'4-3\'+$.m(e.q),e.8.p,o.G);e.$k.1y();5($N.C){7 a=2;e.z(e.$3.Z(2),6(){23(a,b,$Y,$N)})}D 2M\'21 2K 2J: 2H 2G 2F.\';5($.O.14)2.1k();l y});5(!(/^1A/).27(o.12))2.$3.1b(\'1A.4-3\',6(){l y})},17:6(d,e,f){5(f==1Y)f=2.$3.C;7 o=2.8;7 a=$(o.1Q.V(/#\\{x\\}/,d).V(/#\\{1g\\}/,e));a.m(\'15.4-3\',1a);7 b=d.2D(\'#\')==0?d.V(\'#\',\'\'):2.1z($(\'a:2C-2z\',a)[0]);7 c=$(\'#\'+b);5(!c.C){c=$(o.1v).W(\'16\',b).v(o.U).v(o.M);c.m(\'15.4-3\',1a)}5(f>=2.$u.C){a.1W(2.q);c.1W(2.q.2E)}D{a.1V(2.$u[f]);c.1V(2.$k[f])}o.t=$.1i(o.t,6(n,i){l n>=f?++n:n});2.11();5(2.$3.C==1){a.v(o.w);c.B(o.M);7 g=$.m(2.$3[0],\'z.4-3\');5(g)2.z(f,g)}$(2.q).P(\'17.4-3\',[2.4(2.$3[f],2.$k[f])])},19:6(a){7 o=2.8,$E=2.$u.F(a).19(),$1e=2.$k.F(a).19();5($E.J(o.w)&&2.$3.C>1)2.1o(a+(a+1<2.$3.C?1:-1));o.t=$.1i($.1U(o.t,6(n,i){l n!=a}),6(n,i){l n>=a?--n:n});2.11();$(2.q).P(\'19.4-3\',[2.4($E.2I(\'a\')[0],$1e[0])])},25:6(a){7 o=2.8;5($.1I(a,o.t)==-1)l;7 b=2.$u.F(a).B(o.Q);5($.O.2u){b.13(\'1p\',\'2L-1B\');1u(6(){b.13(\'1p\',\'1B\')},0)}o.t=$.1U(o.t,6(n,i){l n!=a});$(2.q).P(\'25.4-3\',[2.4(2.$3[a],2.$k[a])])},20:6(a){7 b=2,o=2.8;5(a!=o.p){2.$u.F(a).v(o.Q);o.t.1O(a);o.t.1J();$(2.q).P(\'20.4-3\',[2.4(2.$3[a],2.$k[a])])}},1o:6(a){5(1K a==\'1X\')a=2.$3.Z(2.$3.T(\'[x$=\'+a+\']\')[0]);2.$3.F(a).2t(2.8.12)},z:6(d,b){7 e=2,o=2.8,$a=2.$3.F(d),a=$a[0],1T=b==1Y|| b===y,18=$a.m(\'z.4-3\');b=b|| 6(){};5(!18|| ($.m(a,\'K.4-3\')&&!1T)){b();l}5(o.1l){7 g=$(\'1h\',a),1g=g.1n();g.1n(\'<1S>\'+o.1l+\'</1S>\')}7 c=6(){e.$3.T(\'.\'+o.1s).I(6(){$(2).B(o.1s);5(o.1l)$(\'1h\',2).1n(1g)});e.1m=L};7 f=$.1H({},o.1j,{18:18,1x:6(r,s){$(a.H).1n(r);c();b();5(o.K)$.m(a,\'K.4-3\',1a);$(e.q).P(\'z.4-3\',[e.4(e.$3[d],e.$k[d])]);o.1j.1x&&o.1j.1x(r,s)}});5(2.1m){2.1m.2r();c()}$a.v(o.1s);1u(6(){e.1m=$.2q(f)},0)},18:6(a,b){2.$3.F(a).1r(\'K.4-3\').m(\'z.4-3\',b)},15:6(){7 o=2.8;$(2.q).1d(\'.4-3\').B(o.1f).1r(\'4-3\');2.$3.I(6(){7 b=$.m(2,\'x.4-3\');5(b)2.x=b;7 c=$(2).1d(\'.4-3\');$.I([\'x\',\'z\',\'K\'],6(i,a){c.1r(a+\'.4-3\')})});2.$u.17(2.$k).I(6(){5($.m(2,\'15.4-3\'))$(2).19();D $(2).B([o.w,o.1t,o.Q,o.U,o.M].2p(\' \'))})}})})(21);',62,185,'||this|tabs|ui|if|function|var|options||||||||||||panels|return|data|||selected|element|||disabled|lis|addClass|selectedClass|href|false|load||removeClass|length|else|li|eq|cookie|hash|each|hasClass|cache|null|hideClass|show|browser|triggerHandler|disabledClass|showFx|unselect|filter|panelClass|replace|attr|fx|hide|index||tabify|event|css|msie|destroy|id|add|url|remove|true|bind|baseFx|unbind|panel|navClass|label|span|map|ajaxOptions|blur|spinner|xhr|html|select|display|arguments|removeData|loadingClass|unselectClass|setTimeout|panelTemplate|location|success|stop|tabId|click|block|showTab|hideTab|opacity|baseDuration|duration|extend|inArray|sort|typeof|div|toShowId|prototype|push|Array|tabTemplate|idPrefix|em|bypassCache|grep|insertBefore|appendTo|string|undefined|_|disable|jQuery|title|switchTab|style|enable|animate|test|constructor|for|unload|window|call|concat|unique|nav|slice|parseInt|scrollTo|500|opera|new|insertAfter|apply|fn|join|ajax|abort|has|trigger|safari|tab|instance|8230|z0|child|Za|Loading|first|indexOf|parentNode|identifier|fragment|Mismatching|find|Tabs|UI|inline|throw|visible|parents|siblings|getData|height|overflow|setData|normal|Function|width|min|loading'.split('|'),0,{}))
\ No newline at end of file
diff --git a/includes/vendor/simplehtmldom/manual/manual.htm b/includes/vendor/simplehtmldom/manual/manual.htm
deleted file mode 100644
index ed796e3..0000000
--- a/includes/vendor/simplehtmldom/manual/manual.htm
+++ /dev/null
@@ -1,448 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>PHP Simple HTML DOM Parser: Manual</title>
-<link href="css/default.css" rel="stylesheet" type="text/css">
-<link rel="stylesheet" href="css/ui.tabs.css" type="text/css" media="print, projection, screen">
-<script type="text/javascript" src="js/jquery-1.2.3.pack.js"></script>
-<script type="text/javascript" src="js/ui.tabs.pack.js"></script>
-<script language="JavaScript" type="text/JavaScript">
-	$(document).ready(function(){
-		$(function() {$('#container_quickstart > ul').tabs();});
-		$(function() {$('#container_create > ul').tabs();});
-		$(function() {$('#container_find > ul').tabs();});
-		$(function() {$('#container_access > ul').tabs();});
-		$(function() {$('#container_traverse > ul').tabs();});
-		$(function() {$('#container_dump > ul').tabs();});
-		$(function() {$('#container_callback > ul').tabs();});
-	});
-</script>
-</head>
-<body>
-<h1><a name="top"></a>PHP Simple HTML DOM Parser Manual</h1>
-<div id="content">
-  <h2>Index</h2>
-  <ul>
-		<li><a href="#section_quickstart">Quick Start</a></li>
-    <li><a href="#section_create">How to create HTML DOM object?</a></li>
-    <li><a href="#section_find">How to find HTML elements?</a></li>
-    <li><a href="#section_access">How to access the HTML element's attributes?</a> </li>
-    <li><a href="#section_traverse">How to traverse the DOM tree?</a></li>
-    <li><a href="#section_dump">How to dump contents of DOM object?</a></li>
-		<li><a href="#section_callback">How to customize the parsing behavior?</a></li>
-    <li><a href="manual_api.htm">API Reference</a></li>
-    <li><a href="manual_faq.htm">FAQ</a></li>
-  </ul>
-	
-	<a name="section_quickstart"></a>
-  <h2>Quick Start</h2>
-  <a class="top" href="#top">Top</a>
-	<div id="container_quickstart">
-    <ul>
-      <li><a href="#fragment-11"><span>Get HTML elements</span></a></li>
-      <li><a href="#fragment-12"><span>Modify HTML elements</span></a></li>
-      <li><a href="#fragment-13"><span>Extract contents from HTML</span></a></li>
-      <li><a href="#fragment-14"><span>Scraping Slashdot!</span></a></li>
-    </ul>
-    <div id="fragment-11">
-      <div class="code">
-        <span class="comment">// Create DOM from URL or file</span><br>
-        $html = <strong>file_get_html</strong>(<span class="var">'http://www.google.com/'</span>);<br>
-        <br>
-        <span class="comment">// Find all images </span><br>
-        foreach($html-&gt;<strong>find</strong>(<span class="var">'img'</span>) as $element) <br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; echo $element-&gt;<strong>src</strong> . <span class="var">'&lt;br&gt;'</span>;<br>
-<br>
-<span class="comment">// Find all links </span><br>
-foreach($html-&gt;<strong>find</strong>(<span class="var">'a'</span>) as $element) <br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; echo $element-&gt;<strong>href</strong> . <span class="var">'&lt;br&gt;'</span>;      </div>
-    </div>
-    <div id="fragment-12">
-      <div class="code">
-        <span class="comment">// Create DOM from string</span><br>
-        $html = <strong>str_get_html</strong>(<span class="var">'&lt;div id=&quot;hello&quot;&gt;Hello&lt;/div&gt;&lt;div id=&quot;world&quot;&gt;World&lt;/div&gt;'</span>);<span class="comment"><br>
-        <br>
-        </span>
-        
-$html-&gt;<strong>find</strong>(<span class="var">'div', 1</span>)-&gt;<strong>class</strong> = <span class="var">'bar'</span>;<br>
-<br>
-$html-&gt;<strong>find</strong>(<span class="var">'div[id=hello]', 0</span>)-&gt;<strong>innertext</strong> = <span class="var">'foo'</span>;<br>
-        <br>
-        echo $html; <span class="comment">// Output: &lt;div id=&quot;hello&quot;&gt;<strong>foo</strong>&lt;/div&gt;&lt;div id=&quot;world&quot; <strong>class=&quot;bar&quot;</strong>&gt;World&lt;/div&gt;</span> </div>
-    </div>
-    <div id="fragment-13">
-      <div class="code"><br>
-        <span class="comment">// Dump contents (without tags) from HTML</span><br>
-        echo <strong>file_get_html</strong>(<span class="var">'http://www.google.com/'</span>)-&gt;<strong>plaintext</strong>;
-				<br>
-				<br>
-      </div>
-    </div>
-    <div id="fragment-14">
-      <div class="code">
-        <span class="comment">// Create DOM from URL</span><br>
-        $html = <strong>file_get_html</strong>(<span class="var">'http://slashdot.org/'</span>);<br>
-        <br>
-        <span class="comment">// Find all article blocks</span><br>
-        foreach($html-&gt;<strong>find</strong>(<span class="var">'div.article'</span>) as $article) {<br>
-&nbsp;&nbsp;&nbsp;&nbsp;$item[<span class="var">'title'</span>]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;= $article-&gt;<strong>find</strong>(<span class="var">'div.title'</span>, <span class="var">0</span>)-&gt;<strong>plaintext</strong>;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;$item[<span class="var">'intro'</span>]&nbsp;&nbsp;&nbsp;&nbsp;= $article-&gt;<strong>find</strong>(<span class="var">'div.intro'</span>, <span class="var">0</span>)-&gt;<strong>plaintext</strong>;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;$item[<span class="var">'details'</span>]&nbsp;= $article-&gt;<strong>find</strong>(<span class="var">'div.details'</span>, <span class="var">0</span>)-&gt;<strong>plaintext</strong>;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;$articles[] = $item;<br>
-        }<br>
-        <br>
-        print_r($articles);
-      </div>
-    </div>
-  </div>
-	
-  <a name="section_create"></a>
-  <h2>How to create HTML DOM object?</h2>
-  <a class="top" href="#top">Top</a>
-  <div id="container_create">
-    <ul>
-      <li><a href="#frag_create_quick"><span>Quick way</span></a></li>
-      <li><a href="#frag_create_oo"><span>Object-oriented way</span></a></li>
-    </ul>
-    <div id="frag_create_quick">
-      <div class="code"><span class="comment">// Create a DOM object from a string</span><br>
-        $html = <strong>str_get_html</strong>(<span class="var">'&lt;html&gt;&lt;body&gt;Hello!&lt;/body&gt;&lt;/html&gt;'</span>);<br>
-        <br>
-        <span class="comment">// Create a DOM object from a URL</span><br>
-        $html = <strong>file_get_html</strong>(<span class="var">'http://www.google.com/'</span>);<br>
-        <br>
-        <span class="comment">// Create a DOM object from a HTML file</span><br>
-        $html = <strong>file_get_html</strong>(<span class="var">'test.htm'</span>);<span class="comment"><br>
-        </span></div>
-    </div>
-    <div id="frag_create_oo">
-      <div class="code"><span class="comment">// Create a DOM object</span><br>
-        $html = new <strong>simple_html_dom</strong>();<br>
-        <br>
-        <span class="comment">// Load HTML from a string</span><br>
-        $html-&gt;<strong>load</strong>(<span class="var">'&lt;html&gt;&lt;body&gt;Hello!&lt;/body&gt;&lt;/html&gt;'</span>);<br>
-        <br>
-        <span class="comment">// Load HTML from a URL </span> <br>
-        $html-&gt;<strong>load_file</strong>(<span class="var">'http://www.google.com/'</span>);<br>
-        <br>
-        <span class="comment">// Load HTML from a HTML file</span> <br>
-        $html-&gt;<strong>load_file</strong>(<span class="var">'test.htm'</span>);</div>
-    </div>
-  </div>
-  <a name="section_find"></a>
-  <h2>How to find HTML elements?</h2>
-  <a class="top" href="#top">Top</a>
-  <div id="container_find">
-    <ul>
-      <li><a href="#frag_find_basic"><span>Basics</span></a></li>
-      <li><a href="#frag_find_advanced"><span>Advanced</span></a></li>
-      <li><a href="#frag_find_chain"><span>Descendant selectors</span></a></li>
-      <li><a href="#frag_find_nested"><span>Nested selectors</span></a></li>
-      <li><a href="#frag_find_attr"><span>Attribute Filters</span></a></li>
-      <li><a href="#frag_find_textcomment"><span>Text &amp; Comments</span></a></li>
-    </ul>
-    <div id="frag_find_basic">
-      <div class="code"> <span class="comment">// Find all <strong>anchors</strong>, returns a <strong>array</strong> of element objects</span><br>
-        $ret = $html-&gt;find(<span class="var">'<strong>a</strong>'</span>);<br>
-        <br>
-        <span class="comment">// Find <strong>(N)th</strong>  <strong>anchor</strong>, returns element object or <strong>null</strong> if not found</span> <span class="comment">(zero based)</span><br>
-        $ret = $html-&gt;find(<span class="var">'<strong>a</strong>', <strong>0</strong></span>);<br>
-        <br>
-        <span class="comment">// Find <strong>lastest</strong> <strong>anchor</strong>, returns element object or <strong>null</strong> if not found</span> <span class="comment">(zero based)</span><br>
-$ret = $html-&gt;find(<span class="var">'<strong>a</strong>', <strong>-1</strong></span>);        <br>
-        <br>
-        <span class="comment">// Find all <strong>&lt;div&gt;</strong> with the <strong>id</strong> attribute</span><br>
-$ret = $html-&gt;find(<span class="var">'<strong>div[id]</strong>'</span>);<br>        
-<br>
-        <span class="comment">// Find all <strong>&lt;div&gt;</strong> which attribute <strong>id=foo</strong></span><br>
-$ret = $html-&gt;find(<span class="var">'<strong>div[id=foo]</strong>'</span>);        <br>
-      </div>
-    </div>
-    <div id="frag_find_advanced">
-      <div class="code"><span class="comment">// Find all element which <strong>id</strong>=foo</span><br>
-        $ret = $html-&gt;find(<span class="var">'<strong>#foo</strong>'</span>);<br>
-        <br>
-        <span class=comment>// Find all element which <strong>class</strong>=foo</span><br>
-        $ret = $html-&gt;find(<span class=var>'<strong>.foo</strong>'</span>);<br>
-        <br>
-        <span class="comment">// Find all element has attribute<strong> id</strong></span><br>
-$ret = $html-&gt;find(<span class="var">'<strong>*[id]</strong>'</span>);        <br>
-        <br>
-        <span class="comment">// Find all <strong>anchors</strong> and <strong>images</strong> </span><br>
-$ret = $html-&gt;find(<span class="var">'<strong>a, img</strong>'</span>);        <br>
-        <br>
-        <span class="comment">// Find all <strong>anchors</strong> and <strong>images</strong> with the "title" attribute</span><br>
-				$ret = $html-&gt;find(<span class="var">'<strong>a[title], img[title]</strong>'</span>);<br>
-      </div>
-    </div>
-    <div id="frag_find_attr">
-      <div class="code">
-				Supports these operators in attribute selectors:<br><br>
-        <table cellpadding="1" cellspacing="1">
-          <tr>
-            <th width="25%">Filter</th>
-            <th width="75%">Description</th>
-          </tr>
-          <tr>
-            <td>[attribute]</td>
-            <td>Matches elements that <strong>have</strong> the specified attribute.</td>
-          </tr>
-          <tr>
-              <td>[!attribute]</td>
-              <td>Matches elements that <strong>don't have</strong> the specified attribute.</td>
-          </tr>
-          <tr>
-            <td>[attribute=value]</td>
-            <td>Matches elements that have the specified attribute with a <strong>certain value</strong>.</td>
-          </tr>
-          <tr>
-            <td>[attribute!=value]</td>
-            <td>Matches elements that <strong>don't have</strong> the specified attribute with a certain value.</td>
-          </tr>
-          <tr>
-            <td>[attribute^=value]</td>
-            <td>Matches elements that have the specified attribute and it <strong>starts</strong> with a certain value.</td>
-          </tr>
-          <tr>
-            <td>[attribute$=value]</td>
-            <td>Matches elements that have the specified attribute and it <strong>ends</strong> with a certain value.</td>
-          </tr>
-          <tr>
-            <td>[attribute*=value]</td>
-            <td>Matches elements that have the specified attribute and it <strong>contains</strong> a certain value.</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-    <div id="frag_find_chain">
-      <div class="code"><span class="comment">// Find all &lt;li&gt; in &lt;ul&gt; </span><br>
-        $es = $html-&gt;find(<span class="var">'<strong>ul li</strong>'</span>);<br>
-        <br>
-        <span class="comment">// Find Nested &lt;div&gt; </span><span class="comment">tags</span><br>
-        $es = $html-&gt;find(<span class="var">'<strong>div div div</strong>'</span>); <br>
-        <br>
-        <span class="comment">// Find all &lt;td&gt; in &lt;table&gt; which class=hello </span><br>
-        $es = $html-&gt;find(<span class="var">'<strong>table.hello td</strong>'</span>);<br>
-        <br>
-        <span class="comment">// Find all td tags with attribite align=center in table tags </span><br>
-        $es = $html-&gt;find(<span class="var">''<strong>table</strong><strong> td[align=center]</strong>'</span>);<br>
-      </div>
-    </div>
-    <div id="frag_find_textcomment">
-      <div class="code"><span class="comment"> // Find all text blocks </span><br>
-        $es = $html-&gt;find(<span class="var">'<strong>text</strong>'</span>);<br>
-        <br>
-        <span class="comment">// Find all comment (&lt;!--...--&gt;) blocks </span><br>
-        $es = $html-&gt;find(<span class="var">'<strong>comment</strong>'</span>);<br>
-      </div>
-    </div>
-    <div id="frag_find_nested">
-      <div class="code"> <span class="comment">// Find all &lt;li&gt; in &lt;ul&gt; </span><br>
-        foreach($html-&gt;find(<span class="var">'<strong>ul</strong>'</span>) as $ul) <br>
-        {<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; foreach($ul-&gt;find(<span class="var">'<strong>li</strong>'</span>) as $li) <br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="comment">// do something...</span><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; }<br>
-        }<br>
-        <br>
-        <span class="comment">// Find first &lt;li&gt; in first &lt;ul&gt;</span> <br>
-        $e = $html-&gt;find(<span class="var">'<strong>ul</strong>', <strong>0</strong></span>)-&gt;find(<span class="var">'<strong>li</strong>', <strong>0</strong></span>);<br>
-      </div>
-    </div>
-  </div>
-  <a name="section_access"></a>
-  <h2>How to access the HTML element's attributes?</h2>
-  <a class="top" href="#top">Top</a>
-  <div id="container_access">
-    <ul>
-      <li><a href="#frag_access_attr"><span>Get, Set and Remove attributes</span></a></li>
-      <li><a href="#frag_access_special"><span>Magic attributes</span></a></li>
-      <li><a href="#frag_access_tips"><span>Tips</span></a></li>
-    </ul>
-    <div id="frag_access_attr">
-      <div class="code"> 
-        <span class="comment">// <strong>Get</strong> a attribute ( If the attribute is <strong>non-value</strong> attribute (eg. checked, selected...), it will returns <strong>true</strong> or <strong>false</strong>)</span><br>
-        $value = $e-&gt;<strong>href</strong>;<br>
-        <br>
-        <span class="comment">// <strong>Set</strong> a attribute(If the attribute is <strong>non-value</strong> attribute (eg. checked, selected...), set it's value as <strong>true</strong> or <strong>false</strong>)</span><br>
-        $e-&gt;<strong>href</strong> = <span class="var">'my link'</span>;<br>
-        <br>
-        <span class="comment">// <strong>Remove</strong> a attribute, set it's value as null! </span><br>
-        $e-&gt;<strong>href</strong> = <strong><span class="var">null</span></strong>;<br>
-        <br>
-        <span class="comment">// <strong>Determine</strong> whether a attribute exist?</span> <br>
-if(isset($e-&gt;<strong>href</strong>)) <br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;echo <span class="var">'href exist!'</span>;<br>
-      </div>
-    </div>
-    <div id="frag_access_special">
-      <div class="code"> <span class="comment">// Example</span><br>
-        <span class="hl-var">$</span><span class="hl-code">html = </span>str_get_html<span class="hl-brackets">(</span><span class="var">&quot;&lt;div&gt;foo &lt;b&gt;bar&lt;/b&gt;&lt;/div&gt;&quot;</span><span class="hl-brackets">)</span><span class="hl-code">;</span> <br>
-        $e = $html-&gt;find(<span class="var">&quot;div&quot;</span>, <span class="var">0</span>);<br>
-        <br>
-        echo $e-&gt;<strong>tag</strong>; <span class="comment">// Returns: &quot; <strong>div</strong>&quot;</span><br>
-        echo $e-&gt;<strong>outertext</strong>; <span class="comment">// Returns: &quot; <strong>&lt;div&gt;foo &lt;b&gt;bar&lt;/b&gt;&lt;/div&gt;</strong>&quot;</span><br>
-        echo $e-&gt;<strong>innertext</strong>; <span class="comment">// Returns: &quot; <strong>foo &lt;b&gt;bar&lt;/b&gt;</strong>&quot;</span><br>
-        echo $e-&gt;<strong>plaintext</strong>; <span class="comment">// Returns: &quot; <strong>foo </strong><strong>bar</strong>&quot;<br>
-        <br>
-        </span>
-        <table cellspacing="1" cellpadding="1">
-          <tr bgcolor="#CCCCCC">
-            <th width="25%">Attribute Name</th>
-            <th width="75%">Usage</th>
-          </tr>
-          <tr>
-            <td>$e-&gt;<strong>tag</strong></td>
-            <td>Read or write the <strong>tag name</strong> of element.</td>
-          </tr>
-          <tr>
-            <td>$e-&gt;<strong>outertext</strong></td>
-            <td>Read or write the <strong>outer HTML text </strong> of element.</td>
-          </tr>
-          <tr>
-            <td>$e-&gt;<strong>innertext</strong></td>
-            <td>Read or write the <strong>inner HTML text </strong> of element.</td>
-          </tr>
-          <tr>
-            <td>$e-&gt;<strong>plaintext</strong></td>
-            <td>Read or write the <strong>plain text </strong> of element.</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-    <div id="frag_access_tips">
-      <div class="code"><span class="comment">// <strong>Extract</strong> contents from HTML </span><br>
-echo <strong>$html</strong>-&gt;<strong>plaintext</strong>;<br>
-<br> 
-<span class="comment">
-        // <strong>Wrap</strong> a element</span><br>
-        $e-&gt;<strong>outertext</strong> = <span class="var">'&lt;div class=&quot;wrap&quot;&gt;'</span> . $e-&gt;<strong>outertext</strong> . <span class="var">'&lt;div&gt;</span>';<br>
-        <br>
-        <span class="comment">// <strong>Remove</strong> a element, set it's outertext as an empty string </span><br>
-        $e-&gt;<strong>outertext</strong> = <span class="var">''</span>;<br>
-        <br>
-        <span class="comment">// <strong>Append</strong> a element</span><br>
-$e-&gt;<strong>outertext</strong> = $e-&gt;<strong>outertext</strong> . <span class="var">'&lt;div&gt;foo</span><span class="var">&lt;div&gt;</span>';<br>
-<br>
-<span class="comment">// <strong>Insert</strong> a element</span><br>
-$e-&gt;<strong>outertext</strong> = <span class="var">'&lt;div&gt;foo</span><span class="var">&lt;div&gt;</span>' . $e-&gt;<strong>outertext</strong>;<br>
-      </div>
-    </div>
-  </div>
-  <a name="section_traverse"></a>
-  <h2>How to traverse the DOM tree?</h2>
-  <a class="top" href="#top">Top</a>
-  <div id="container_traverse">
-    <ul>
-      <li><a href="#frag_traverse_background"><span>Background Knowledge</span></a></li>
-      <li><a href="#frag_traverse_traverse"><span>Traverse the DOM tree</span></a></li>
-    </ul>
-    <div id="frag_traverse_background">
-      <div class="code"> <span class="comment">// If you are not so familiar with HTML DOM, check this <a href="http://php.net/manual/en/book.dom.php" target="_blank"><span class="var">link</span></a> to learn more... </span><br>
-        <br>
-        <span class="comment">// Example</span><br>
-        echo $html-&gt;<strong>find</strong>(<span class="var">&quot;#div1&quot;, 0</span>)-&gt;<strong>children</strong>(<span class="var">1</span>)-&gt;<strong>children</strong>(<span class="var">1</span>)-&gt;<strong>children</strong>(<span class="var">2</span>)-&gt;<span class="var">id</span>;<br>
-        <span class="comment">// or</span> <br>
-        echo $html-&gt;<strong>getElementById</strong>(<span class="var">&quot;div1&quot;</span>)-&gt;<strong>childNodes</strong>(<span class="var">1</span>)-&gt;<strong>childNodes</strong>(<span class="var">1</span>)-&gt;<strong>childNodes</strong>(<span class="var">2</span>)-&gt;<strong>getAttribute</strong>(<span class="var">'id'</span>); </div>
-    </div>
-    <div id="frag_traverse_traverse">
-      <div class="code">You can also call methods with <a href="manual_api.htm#camel"><span class="var">Camel naming convertions</span></a>.<br>
-        <table cellspacing="1" cellpadding="1">
-          <tr>
-            <th> Method </th>
-            <th> Description</th>
-          </tr>
-          <tr>
-            <td>
-              <div class="returns">mixed</div>$e-&gt;<strong>children</strong> ( <span class="var">[int $index]</span> ) </td>
-            <td>Returns the Nth <strong>child object</strong> if <strong>index</strong> is set, otherwise return an <strong>array of children</strong>. </td>
-          </tr>
-          <tr>
-            <td>
-              <div class="returns">element</div>$e-&gt;<strong>parent</strong> () </td>
-            <td>Returns the <strong>parent</strong> of element. </td>
-          </tr>
-          <tr>
-            <td>
-              <div class="returns">element</div>$e-&gt;<strong>first_child</strong> () </td>
-            <td>Returns the <strong>first child</strong> of element, or <strong>null</strong> if not found. </td>
-          </tr>
-          <tr>
-            <td>
-              <div class="returns">element</div>$e-&gt;<strong>last_child</strong> () </td>
-            <td>Returns the <strong>last child</strong> of element, or <strong>null</strong> if not found. </td>
-          </tr>
-          <tr>
-            <td>
-              <div class="returns">element</div>$e-&gt;<strong>next_sibling</strong> () </td>
-            <td>Returns the <strong>next sibling</strong> of element, or<strong> null</strong> if not found. </td>
-          </tr>
-          <tr>
-            <td>
-              <div class="returns">element</div>$e-&gt;<strong>prev_sibling</strong> () </td>
-            <td>Returns the <strong>previous sibling</strong> of element, or <strong>null</strong> if not found. </td>
-          </tr>
-        </table>
-      </div>
-    </div>
-    
-  </div>
-  <a name="section_dump"></a>
-  <h2>How to dump contents of DOM object?</h2>
-  <a class="top" href="#top">Top</a>
-  <div id="container_dump">
-    <ul>
-      <li><a href="#frag_dump_quick"><span>Quick way</span></a></li>
-      <li><a href="#frag_dump_oo"><span>Object-oriented way</span></a></li>
-    </ul>
-    <div id="frag_dump_oo">
-      <div class="code"><span class="comment">// </span><span class="comment">Dumps the internal DOM tree back into string </span><br>
-        $str = $html-&gt;<strong>save</strong>();<br>
-        <br>
-        <span class="comment">// Dumps the internal DOM tree back into a file</span> <br>
-        $html-&gt;<strong>save</strong>(<span class="var">'result.htm'</span>);</div>
-    </div>
-    <div id="frag_dump_quick">
-      <div class="code"><span class="comment">// </span><span class="comment">Dumps the internal DOM tree back into string </span><br>
-        $str = $html;<br>
-        <br>
-        <span class="comment">// Print it!</span><br>
-        echo $html; <br>
-      </div>
-    </div>
-  </div>
-	<a name="section_callback"></a>
-  <h2>How to customize the parsing behavior?</h2>
-  <a class="top" href="#top">Top</a>
-  <div id="container_callback">
-    <ul>
-      <li><a href="#frag_callback"><span>Callback function</span></a></li>
-    </ul>
-    <div id="frag_callback">
-      <div class="code"><span class="comment">// Write a function with parameter &quot;<strong>$element</strong>&quot;</span><br>
-        function my_callback(<span class="var">$element</span>) {<br>
-        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="comment">// Hide all &lt;b&gt; tags </span><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if ($element-&gt;tag==<span class="var">'b'</span>)<br> 
-        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$element-&gt;outertext = '';<br>
-        } <br>
-        <br>
-        <span class="comment">// Register the  callback function with it's <strong>function name</strong></span><br>
-        $html-&gt;<strong>set_callback</strong>(<span class="var">'my_callback'</span>);<br>
-        <br>
-        <span class="comment">// Callback function will be invoked while dumping</span><br>
-        echo $html;
-      </div>
-    </div>
-  </div>
-
-  <div><br>
-    Author: S.C. Chen (me578022@gmail.com)<br>
-Original idea is from Jose Solorzano's <a href="http://php-html.sourceforge.net/">HTML Parser for PHP 4</a>. <br>
-Contributions by: Contributions by: Yousuke Kumakura, Vadim Voituk, Antcs<br>
-  </div>
-</div>
-</body>
-</html>
-<!--$Rev: 165 $-->
\ No newline at end of file
diff --git a/includes/vendor/simplehtmldom/manual/manual_api.htm b/includes/vendor/simplehtmldom/manual/manual_api.htm
deleted file mode 100644
index 365870f..0000000
--- a/includes/vendor/simplehtmldom/manual/manual_api.htm
+++ /dev/null
@@ -1,320 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>PHP Simple HTML DOM Parser: API Reference</title>
-<link href="css/default.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-<h1><a name="top"></a>PHP Simple HTML DOM Parser Manual</h1>
-<div id="content">
-  <h2>Index</h2>
-  <ul>
-    <li><a href="manual.htm">Back</a></li>
-    <li><a href="#api">API Reference</a></li>
-    <li><a href="#camel">Camel naming conventions</a></li>
-  </ul>
-  <a name="api"></a>
-  <h2>API Reference</h2>
-  <a class="top" href="#top">Top</a>
-  <div class="code"> <strong>Helper</strong> functions
-    <table width="100%" cellpadding="1" cellspacing="1">
-      <tr>
-        <th width="320">Name</th>
-        <th>Description</th>
-      </tr>
-      <tr>
-        <td><span class="returns">object</span> str_get_html ( <span class="var">string $content</span> )</td>
-        <td class="description">Creates a DOM object from a string.</td>
-      </tr>
-      <tr>
-        <td><span class="returns">object</span> file_get_html ( <span class="var">string $filename</span> )</td>
-        <td class="description">Creates a DOM object from a file or a URL.</td>
-      </tr>
-    </table>
-    <br>
-    <strong>DOM</strong> methods &amp; properties <br>
-    <table width="100%" cellpadding="1" cellspacing="1">
-      <tr>
-        <th width="320"> Name</th>
-        <th> Description</th>
-      </tr>
-      <tr>
-          <td>
-              <div class="returns">void</div>
-              __construct ( <span class="var">[string $filename]</span> )</td>
-          <td class="description">Constructor, set the filename parameter will automatically load the contents, either text or file/url.</td>
-      </tr>
-      <tr>
-        <td>
-          <div class="returns">string</div>
-          plaintext</td>
-        <td class="description">Returns the contents extracted from HTML.</td>
-      </tr>
-      <tr>
-        <td>
-          <div class="returns">void</div>
-          clear ()</td>
-        <td class="description">Clean up memory.</td>
-      </tr>
-      <tr>
-        <td>
-          <div class="returns">void</div>
-          load ( <span class="var">string $content </span>)</td>
-        <td class="description"> Load contents from a <strong>string</strong>. </td>
-      </tr>
-      <tr>
-        <td>
-          <div class="returns">string</div>
-          save ( <span class="var">[string $filename]</span> )</td>
-        <td class="description">Dumps the internal DOM tree back into a <strong>string</strong>. If the $filename is set, result string will save to file. </td>
-      </tr>
-      <tr>
-        <td>
-          <div class="returns">void</div>
-          load_file (<span class="var"> string $filename</span> )</td>
-        <td class="description"> Load contents from a from a file or a URL.</td>
-      </tr>
-      <tr>
-        <td>
-          <div class="returns">void</div>
-          set_callback ( <span class="var">string $function_name </span>)</td>
-        <td class="description">Set a callback function. </td>
-      </tr>
-      <tr>
-        <td>
-          <div class="returns">mixed</div>
-          find (<span class="var"> string $selector [, int $index] </span>)</td>
-        <td class="description">Find elements by the CSS selector. Returns the Nth element <strong>object</strong> if <strong>index</strong> is set, otherwise return an <strong>array</strong> of object. </td>
-      </tr>
-    </table>
-    <br>
-    <strong>Element</strong> methods &amp; properties <br>
-    <table width="100%" cellpadding="1" cellspacing="1">
-      <tr>
-        <th width="320">Name</th>
-        <th>Description</th>
-      </tr>
-      <tr>
-        <td>
-          <div class="returns">string</div>
-          <span class="var">[attribute]</span></td>
-        <td class="description">Read or write element's attribure value. </td>
-      </tr>
-      <tr>
-        <td>
-          <div class="returns">string</div>
-          tag</td>
-        <td class="description">Read or write the tag name of element.</td>
-      </tr>
-      <tr>
-        <td>
-          <div class="returns">string</div>
-          outertext</td>
-        <td class="description">Read or write the outer HTML text of element.</td>
-      </tr>
-      <tr>
-        <td>
-          <div class="returns">string</div>
-          innertext</td>
-        <td class="description">Read or write the inner HTML text of element.</td>
-      </tr>
-      <tr>
-        <td>
-          <div class="returns">string</div>
-          plaintext</td>
-        <td class="description">Read or write the plain text of element.</td>
-      </tr>
-      <tr>
-        <td>
-          <div class="returns">mixed</div>
-          find (<span class="var"> string $selector [, int $index] </span>)</td>
-        <td class="description">Find children by the CSS selector. Returns the Nth element <strong>object</strong> if <strong>index</strong> is set, otherwise, return an <strong>array</strong> of object. </td>
-      </tr>
-    </table>
-    <strong><br>
-    DOM</strong> traversing<br>
-    <table width="100%" cellpadding="1" cellspacing="1">
-      <tr>
-        <th width="320">Name</th>
-        <th>Description</th>
-      </tr>
-      <tr>
-        <td>
-          <div class="returns">mixed</div>
-          $e-&gt;children ( <span class="var">[int $index]</span> ) </td>
-        <td class="description">Returns the Nth child <strong>object</strong> if <strong>index</strong> is set, otherwise return an <strong>array</strong> of children. </td>
-      </tr>
-      <tr>
-        <td>
-          <div class="returns">element</div>
-          $e-&gt;parent () </td>
-        <td class="description">Returns the parent of element. </td>
-      </tr>
-      <tr>
-        <td>
-          <div class="returns">element</div>
-          $e-&gt;first_child () </td>
-        <td class="description">Returns the first child of element, or <strong>null</strong> if not found. </td>
-      </tr>
-      <tr>
-        <td>
-          <div class="returns">element</div>
-          $e-&gt;last_child () </td>
-        <td class="description">Returns the last child of element, or <strong>null</strong> if not found. </td>
-      </tr>
-      <tr>
-        <td>
-          <div class="returns">element</div>
-          $e-&gt;next_sibling () </td>
-        <td class="description">Returns the next sibling of element, or<strong> null</strong> if not found. </td>
-      </tr>
-      <tr>
-        <td>
-          <div class="returns">element</div>
-          $e-&gt;prev_sibling () </td>
-        <td class="description">Returns the previous sibling of element, or <strong>null</strong> if not found. </td>
-      </tr>
-    </table>
-  </div>
-  <a name="camel"></a>
-  <h2>Camel naming convertions</h2>
-  <a class="top" href="#top">Top</a>
-  <div class="code">You can also call methods with W3C STANDARD camel naming convertions.<br>
-    <br>
-    <table width="100%" cellpadding="1" cellspacing="1">
-      <tr>
-        <th width="50%">Method</th>
-        <th>Mapping</th>
-      </tr>
-      <tr bgcolor="#EEEEEE">
-          <td>
-              <div class="returns">array</div>
-              $e-&gt;getAllAttributes () </td>
-          <td>
-              <div class="returns">array</div>
-              $e-&gt;<span class="var">attr</span></td>
-      </tr>
-      <tr bgcolor="#EEEEEE">
-        <td>
-          <div class="returns">string</div>
-          $e-&gt;getAttribute ( <span class="var">$name</span> ) </td>
-        <td>
-          <div class="returns">string</div>
-          $e-&gt;<span class="var">attribute</span></td>
-      </tr>
-      <tr bgcolor="#EEEEEE">
-        <td>
-          <div class="returns">void</div>
-          $e-&gt;setAttribute ( <span class="var">$name, $value</span> ) </td>
-        <td>
-          <div class="returns">void</div>
-          $value = $e-&gt;<span class="var">attribute</span></td>
-      </tr>
-      <tr bgcolor="#EEEEEE">
-        <td>
-          <div class="returns">bool</div>
-          $e-&gt;hasAttribute ( <span class="var">$name</span> ) </td>
-        <td>
-          <div class="returns">bool</div>
-          isset($e-&gt;<span class="var">attribute</span>)</td>
-      </tr>
-      <tr bgcolor="#EEEEEE">
-        <td>
-          <div class="returns">void</div>
-          $e-&gt;removeAttribute ( <span class="var">$name</span> ) </td>
-        <td>
-          <div class="returns">void</div>
-          $e-&gt;<span class="var">attribute</span> = null</td>
-      </tr>
-      <tr bgcolor="#EEEEEE">
-        <td>
-          <div class="returns">element</div>
-          $e-&gt;getElementById ( <span class="var">$id</span> ) </td>
-        <td>
-          <div class="returns">mixed</div>
-          $e-&gt;find (<span class="var"> &quot;#$id&quot;, 0 </span>)</td>
-      </tr>
-      <tr bgcolor="#EEEEEE">
-        <td>
-          <div class="returns">mixed</div>
-          $e-&gt;getElementsById ( <span class="var">$id [,$index] </span> ) </td>
-        <td>
-          <div class="returns">mixed</div>
-          $e-&gt;find (<span class="var"> &quot;#$id&quot; [, int $index] </span>)</td>
-      </tr>
-      <tr bgcolor="#EEEEEE">
-        <td>
-          <div class="returns">element</div>
-          $e-&gt;getElementByTagName (<span class="var">$name</span> ) </td>
-        <td>
-          <div class="returns">mixed</div>
-          $e-&gt;find (<span class="var"> $name, 0 </span>)</td>
-      </tr>
-      <tr bgcolor="#EEEEEE">
-        <td>
-          <div class="returns">mixed</div>
-          $e-&gt;getElementsByTagName ( <span class="var">$name [, $index]</span> ) </td>
-        <td>
-          <div class="returns">mixed</div>
-          $e-&gt;find (<span class="var"> $name [, int $index] </span>)</td>
-      </tr>
-      <tr bgcolor="#EEEEEE">
-        <td>
-          <div class="returns">element</div>
-          $e-&gt;parentNode () </td>
-        <td>
-          <div class="returns">element</div>
-          $e-&gt;parent () </td>
-      </tr>
-      <tr bgcolor="#EEEEEE">
-        <td>
-          <div class="returns">mixed</div>
-          $e-&gt;childNodes ( <span class="var">[$index]</span> ) </td>
-        <td>
-          <div class="returns">mixed</div>
-          $e-&gt;children ( <span class="var">[int $index]</span> ) </td>
-      </tr>
-      <tr bgcolor="#EEEEEE">
-        <td>
-          <div class="returns">element</div>
-          $e-&gt;firstChild () </td>
-        <td>
-          <div class="returns">element</div>
-          $e-&gt;first_child () </td>
-      </tr>
-      <tr bgcolor="#EEEEEE">
-        <td>
-          <div class="returns">element</div>
-          $e-&gt;lastChild () </td>
-        <td>
-          <div class="returns">element</div>
-          $e-&gt;last_child () </td>
-      </tr>
-      <tr bgcolor="#EEEEEE">
-        <td>
-          <div class="returns">element</div>
-          $e-&gt;nextSibling () </td>
-        <td>
-          <div class="returns">element</div>
-          $e-&gt;next_sibling () </td>
-      </tr>
-      <tr bgcolor="#EEEEEE">
-        <td>
-          <div class="returns">element</div>
-          $e-&gt;previousSibling () </td>
-        <td>
-          <div class="returns">element</div>
-          $e-&gt;prev_sibling () </td>
-      </tr>
-    </table>
-  </div>
-  <div><br>
-    Author: S.C. Chen (me578022@gmail.com)<br>
-Original idea is from Jose Solorzano's <a href="http://php-html.sourceforge.net/">HTML Parser for PHP 4</a>. <br>
-Contributions by: Contributions by: Yousuke Kumakura, Vadim Voituk, Antcs<br>
-  </div>
-</div>
-</body>
-</html>
-<!--$Rev: 165 $-->
\ No newline at end of file
diff --git a/includes/vendor/simplehtmldom/manual/manual_faq.htm b/includes/vendor/simplehtmldom/manual/manual_faq.htm
deleted file mode 100644
index 3763eaa..0000000
--- a/includes/vendor/simplehtmldom/manual/manual_faq.htm
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>PHP Simple HTML DOM Parser: FAQ</title>
-<link href="css/default.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-<h1><a name="top"></a>PHP Simple HTML DOM Parser Manual</h1>
-<div id="content">
-  <h2>FAQ</h2>
-  <ul>
-		<li><a href="manual.htm">Back</a></li>
-		<li><a href="#find">Problem with finding</a></li>
-    <li><a href="#hosting">Problem with hosting</a></li>
-    <li><a href="#proxy">Behind a proxy</a></li>
-    <li><a href="#memory_leak">Memory leak!</a></li>
-  </ul>
-	<div>
-		<a name="find"></a>
-    <h2>Problem with finding</h2>
-    <a class="top" href="#top">Top</a>
-	  <div class="code"> <span class="var">Q:</span> Element not found in such case:<br>
-	    $html-&gt;find('div[style=<span class="var">padding: 0px 2px;</span>] span[class=rf]');<br>
-      <br>
-      <span class="var">A:</span> If there is blank in selectors, quote it!  <br>
-      $html-&gt;find('div[style=<strong class="var">&quot;padding: 0px 2px;&quot;</strong>] span[class=rf]');</div>
-		<a name="hosting"></a>
-    <h2>Problem with hosting</h2>
-    <a class="top" href="#top">Top</a>
-    <div class="code"> <span class="var">Q:</span> On my local server everything works fine, but when I put it on my esternal server it doesn't work. <br>
-      <br>
-      <span class="var">A:</span> The "file_get_dom" function is a wrapper of "file_get_contents" function,  you must set "<strong>allow_url_fopen</strong>" as <strong>TRUE</strong> in "php.ini" to allow accessing files via HTTP or FTP. However, some hosting venders disabled PHP's "allow_url_fopen" flag for security issues... PHP provides excellent support for "curl" library to do the same job, Use curl to get the page, then call "str_get_dom" to create DOM object. <br>
-      <br>
-      Example: <br>
-       <br>
-      $curl = curl_init(); <br>
-      curl_setopt(<span class="var">$curl, CURLOPT_URL, 'http://????????'</span>);  <br>
-      curl_setopt(<span class="var">$curl, CURLOPT_RETURNTRANSFER, 1</span>);  <br>
-      curl_setopt(<span class="var">$curl, CURLOPT_CONNECTTIMEOUT, 10</span>);  <br>
-      $str = curl_exec(<span class="var">$curl</span>);  <br>
-      curl_close($curl);  <br>
-       <br>
-      $html= <strong>str_get_html</strong>($str); <br>
-      ...  </div>
-    <a name="proxy"></a>
-    <div>
-      <h2>Behind a proxy</h2>
-      <a class="top" href="#top">Top</a>
-      <div class="code"> <span class="var">Q:</span> My server is behind a Proxy and i can't use file_get_contents b/c it returns a unauthorized error.<br>
-        <br>
-        <span class="var">A:</span> Thanks for Shaggy to provide the solution: <br>
-         <br>
-        <span class="comment">// Define a context for HTTP. </span><br>
-        $context = array<br>
-        ( <br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="var">'http'</span> =&gt; array<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ( <br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="var">'proxy'</span> =&gt; <span class="var">'addresseproxy:portproxy'</span>, <span class="comment">// This needs to be the server and the port of the NTLM Authentication Proxy Server. </span><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="var"> 'request_fulluri'</span> =&gt; true, <br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ), <br>
-        ); <br>
-        <br>
-        $context = <strong>stream_context_create</strong>($context); <br>
-         <br>
-        $html= <strong>file_get_html</strong>(<span class="var">'http://www.php.net'</span>, <span class="var">false</span>, <span class="var">$context</span>); <br>
-        ...<br>
-      </div>
-    </div>
-    <a name="memory_leak"></a>
-    <h2>Memory leak!</h2>
-    <a class="top" href="#top">Top</a>
-    <div class="code"> <span class="var">Q:</span> This script is leaking memory seriously... After it finished running, it's not cleaning up dom object properly from memory.. <br>
-      <br>
-      <span class="var">A:</span> Due to php5 circular references memory leak, after creating DOM object, you must call $dom-&gt;clear() to free memory if call file_get_dom() more then once. <br>
-      <br>
-      Example: <br>
-      <br>
-      $html = file_get_html(...); <br>
-      <span class="comment">// do something... </span><br>
-      $html-&gt;clear(); <br>
-      unset($html);</div>
-    <br>
-    Author: S.C. Chen (me578022@gmail.com)<br>
-Original idea is from Jose Solorzano's <a href="http://php-html.sourceforge.net/">HTML Parser for PHP 4</a>. <br>
-Contributions by: Yousuke Kumakura, Vadim Voituk, Antcs<br>
-  </div>
-</div>
-</body>
-</html>
-<!--$Rev: 165 $-->
diff --git a/includes/xml/config.xml b/includes/xml/config.xml
new file mode 100644
index 0000000..8957e01
--- /dev/null
+++ b/includes/xml/config.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0"?>
+<configurations>
+	<config>
+		<name>version</name>
+		<value>2.10.0</value>
+	</config>
+	<config>
+		<name>users_amount</name>
+		<value>1</value>
+	</config>
+	<config>
+		<name>moderation</name>
+		<value>1,0,0,1,1;1,1,0,1,1;1;</value>
+	</config>
+	<config>
+		<name>game_speed</name>
+		<value>2500</value>
+	</config>
+	<config>
+		<name>fleet_speed</name>
+		<value>2500</value>
+	</config>
+	<config>
+		<name>resource_multiplier</name>
+		<value>1</value>
+	</config>
+	<config>
+		<name>fleet_cdr</name>
+		<value>30</value>
+	</config>
+	<config>
+		<name>defs_cdr</name>
+		<value>30</value>
+	</config>
+	<config>
+		<name>initial_fields</name>
+		<value>163</value>
+	</config>
+	<config>
+		<name>cookie_name</name>
+		<value>XGProyect</value>
+	</config>
+	<config>
+		<name>game_name</name>
+		<value>XG Proyect</value>
+	</config>
+	<config>
+		<name>game_disable</name>
+		<value>1</value>
+	</config>
+	<config>
+		<name>close_reason</name>
+		<value>&#xA1;En este momento el servidor se encuentra cerrado!</value>
+	</config>
+	<config>
+		<name>metal_basic_income</name>
+		<value>20</value>
+	</config>
+	<config>
+		<name>crystal_basic_income</name>
+		<value>10</value>
+	</config>
+	<config>
+		<name>deuterium_basic_income</name>
+		<value>0</value>
+	</config>
+	<config>
+		<name>energy_basic_income</name>
+		<value>0</value>
+	</config>
+	<config>
+		<name>lastsettedgalaxypos</name>
+		<value>1</value>
+	</config>
+	<config>
+		<name>lastsettedsystempos</name>
+		<value>1</value>
+	</config>
+	<config>
+		<name>lastsettedplanetpos</name>
+		<value>1</value>
+	</config>
+	<config>
+		<name>noobprotection</name>
+		<value>1</value>
+	</config>
+	<config>
+		<name>noobprotectiontime</name>
+		<value>5000</value>
+	</config>
+	<config>
+		<name>noobprotectionmulti</name>
+		<value>5</value>
+	</config>
+	<config>
+		<name>forum_url</name>
+		<value>http://www.xgproyect.net/</value>
+	</config>
+	<config>
+		<name>adm_attack</name>
+		<value>0</value>
+	</config>
+	<config>
+		<name>debug</name>
+		<value>0</value>
+	</config>
+	<config>
+		<name>lang</name>
+		<value>spanish</value>
+	</config>
+	<config>
+		<name>stat</name>
+		<value>1</value>
+	</config>
+	<config>
+		<name>stat_level</name>
+		<value>3</value>
+	</config>
+	<config>
+		<name>stat_last_update</name>
+		<value>1325956371</value>
+	</config>
+	<config>
+		<name>stat_settings</name>
+		<value>1000</value>
+	</config>
+	<config>
+		<name>stat_amount</name>
+		<value>25</value>
+	</config>
+	<config>
+		<name>stat_update_time</name>
+		<value>15</value>
+	</config>
+	<config>
+		<name>stat_flying</name>
+		<value>1</value>
+	</config>
+</configurations>
diff --git a/styles/skins/New-Year!/planeten/small/index.html b/includes/xml/index.html
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/index.html
rename to includes/xml/index.html
diff --git a/index.php b/index.php
index 45f6827..04b8fe8 100644
--- a/index.php
+++ b/index.php
@@ -1,48 +1,34 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from Xtreme-gameZ.com.ar	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('LOGIN'   , true);
+define('INSIDE'  , TRUE);
+define('INSTALL' , FALSE);
+define('LOGIN'   , TRUE);
+define('XGP_ROOT',	'./');
 
-$InLogin = true;
+$InLogin = TRUE;
 
-$xgp_root = './';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
+include(XGP_ROOT . 'global.php');
 
-includeLang('PUBLIC');
+includeLang ( 'PUBLIC' );
 $parse = $lang;
-switch($_GET[page])
+switch ( $_GET[page] )
 {
 	case'lostpassword':
 		function sendnewpassword($mail)
 		{
 			global $lang;
 
-			$ExistMail = doquery("SELECT `email` FROM {{table}} WHERE `email` = '". $mail ."' LIMIT 1;", 'users', true);
+			$ExistMail = doquery("SELECT `email` FROM {{table}} WHERE `email` = '". $mail ."' LIMIT 1;", 'users', TRUE);
 
 			if (empty($ExistMail['email']))
 			{
-				message($lang['mail_not_exist'], "index.php?modo=claveperdida",2, false, false);
+				message($lang['mail_not_exist'], "index.php?modo=claveperdida",2, FALSE, FALSE);
 			}
 			else
 			{
@@ -68,21 +54,22 @@ function sendnewpassword($mail)
 			}
 		}
 
-		if($_POST)
+		if ( $_POST )
 		{
-			sendnewpassword($_POST['email']);
-			message($lang['mail_sended'], "./",2, false, false);
+			sendnewpassword ( $_POST['email'] );
+			message ( $lang['mail_sended'] , "./" , 2 , FALSE , FALSE );
 		}
 		else
 		{
-			$parse['forum_url']    = $game_config['forum_url'];
-			display(parsetemplate(gettemplate('public/lostpassword'), $parse), false, '',false, false);
+			$parse['version']	   = VERSION;
+			$parse['forum_url']    = read_config ( 'forum_url' );
+			display ( parsetemplate ( gettemplate ( 'public/lostpassword' ) , $parse ) , FALSE , '' , FALSE , FALSE );
 		}
 	break;
 	default:
 		if ($_POST)
 		{
-			$login = doquery("SELECT `id`,`username`,`password`,`banaday` FROM {{table}} WHERE `username` = '" . mysql_escape_string($_POST['username']) . "' AND `password` = '" . md5($_POST['password']) . "' LIMIT 1", "users", true);
+			$login = doquery("SELECT `id`,`username`,`password`,`banaday` FROM {{table}} WHERE `username` = '" . mysql_escape_string($_POST['username']) . "' AND `password` = '" . md5($_POST['password']) . "' LIMIT 1", "users", TRUE);
 
 			if($login['banaday'] <= time() && $login['banaday'] != '0')
 			{
@@ -105,32 +92,26 @@ function sendnewpassword($mail)
 
 				@include('config.php');
 				$cookie = $login["id"] . "/%/" . $login["username"] . "/%/" . md5($login["password"] . "--" . $dbsettings["secretword"]) . "/%/" . $rememberme;
-				setcookie($game_config['COOKIE_NAME'], $cookie, $expiretime, "/", "", 0);
+				setcookie(read_config ( 'cookie_name' ), $cookie, $expiretime, "/", "", 0);
 
 				doquery("UPDATE `{{table}}` SET `current_planet` = `id_planet` WHERE `id` ='".$login["id"]."'", 'users');
 
-				unset($dbsettings);
-				header("Location: ./game.php?page=overview");
+				unset ( $dbsettings );
+				header ( 'location:game.php?page=overview' );
 				exit;
 			}
 			else
 			{
-				message($lang['login_error'], "./", 2, false, false);
+				message ( $lang['login_error'] , "./" , 2 , FALSE , FALSE );
 			}
 		}
 		else
 		{
-		
-		    $query = doquery('SELECT username FROM {{table}} ORDER BY register_time DESC', 'users', true);
-		    $parse['last_user'] = $query['username'];
-		    $query = doquery("SELECT COUNT(DISTINCT(id)) FROM {{table}} WHERE onlinetime>" . (time()-900), 'users', true);
-		    $parse['online_users'] = $query[0];
-		    $parse['users_amount'] = $game_config['users_amount'];
-			$parse['servername']   = $game_config['game_name'];
-			$parse['forum_url']    = $game_config['forum_url'];
+			$parse['version']	   = VERSION;
+			$parse['servername']   = read_config ( 'game_name' );
+			$parse['forum_url']    = read_config ( 'forum_url' );
 
-
-			display(parsetemplate(gettemplate('public/index_body'), $parse), false, '',false, false);
+			display ( parsetemplate ( gettemplate ( 'public/index_body' ) , $parse ) , FALSE , '' , FALSE , FALSE );
 		}
 }
 ?>
\ No newline at end of file
diff --git a/install/UpdateMoonID.php b/install/UpdateMoonID.php
deleted file mode 100644
index 5803a97..0000000
--- a/install/UpdateMoonID.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-
-if(!defined('INSIDE')){ die(header("location:../../"));}
-
-	function UpdateMoonID()
-	{
-		$Data = doquery(	"SELECT l.id AS idluna,p.id AS idplanets,
-							g.galaxy AS galaxy, g.system AS system,
-							g.planet AS planet
-							FROM {{table}}lunas AS l
-							Left Join {{table}}galaxy AS g ON
-							l.id = g.id_luna AND
-							l.galaxy = g.galaxy AND
-							l.system = g.system AND
-							l.lunapos = g.planet
-							Left Join {{table}}planets AS p ON
-							g.galaxy = p.galaxy AND
-							g.system = p.system AND
-							g.planet = p.planet AND
-							p.planet_type = 3;",'');
-
-		if($Data)
-		{
-			while ( $Moon = mysql_fetch_assoc ( $Data ) )
-			{
-				if($Moon['idplanets']!='')
-				{
-					$salida['planeta'][$Moon['idplanets']]=$Moon['idplanets'];
-					$salida['luna'][$Moon['idluna']]=$Moon['idluna'];
-					doquery ( "UPDATE {{table}} SET `id_luna` = '" . $Moon['idplanets'] . "' WHERE `galaxy` = '" . $Moon['galaxy'] . "' AND `system` = '" . $Moon['system'] . "' AND `planet` = '" . $Moon['planet'] . "';", 'galaxy' );
-				}
-				else
-				{
-					doquery ( "UPDATE {{table}} SET `id_luna` = '0' WHERE `galaxy` = '" . $Moon['galaxy'] . "' AND `system` = '" . $Moon['system'] . "' AND `planet` = '" . $Moon['planet'] . "';", 'galaxy' );
-				}
-			}
-			return $salida;
-		}
-	}
-
-?>
\ No newline at end of file
diff --git a/install/databaseinfos.php b/install/databaseinfos.php
index 8049b8e..1438bd3 100644
--- a/install/databaseinfos.php
+++ b/install/databaseinfos.php
@@ -1,66 +1,53 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
 
 $QryTableAks         = "CREATE TABLE `{{table}}` ( ";
 $QryTableAks        .= "`id` bigint(20) unsigned NOT NULL auto_increment, ";
-$QryTableAks        .= "`name` varchar(50) collate cp1251_general_ci default NULL, ";
-$QryTableAks        .= "`teilnehmer` text collate cp1251_general_ci, ";
-$QryTableAks        .= "`flotten` text collate cp1251_general_ci, ";
+$QryTableAks        .= "`name` varchar(50) collate latin1_general_ci default NULL, ";
+$QryTableAks        .= "`teilnehmer` text collate latin1_general_ci, ";
+$QryTableAks        .= "`flotten` text collate latin1_general_ci, ";
 $QryTableAks        .= "`ankunft` int(32) default NULL, ";
 $QryTableAks        .= "`galaxy` int(2) default NULL, ";
 $QryTableAks        .= "`system` int(4) default NULL, ";
 $QryTableAks        .= "`planet` int(2) default NULL, ";
 $QryTableAks        .= "`planet_type` tinyint(1) default NULL, ";
-$QryTableAks        .= "`eingeladen` text character set cp1251 default NULL, ";
+$QryTableAks        .= "`eingeladen` text character set latin1 default NULL, ";
 $QryTableAks        .= "PRIMARY KEY  (`id`) ";
 $QryTableAks        .= ") ENGINE=MyISAM;";
 
 $QryTableAlliance    = "CREATE TABLE `{{table}}` ( ";
 $QryTableAlliance   .= "`id` bigint(11) NOT NULL auto_increment, ";
-$QryTableAlliance   .= "`ally_name` varchar(32) character set cp1251 default '', ";
-$QryTableAlliance   .= "`ally_tag` varchar(8) character set cp1251 default '', ";
+$QryTableAlliance   .= "`ally_name` varchar(32) character set latin1 default '', ";
+$QryTableAlliance   .= "`ally_tag` varchar(8) character set latin1 default '', ";
 $QryTableAlliance   .= "`ally_owner` int(11) NOT NULL default '0', ";
 $QryTableAlliance   .= "`ally_register_time` int(11) NOT NULL default '0', ";
-$QryTableAlliance   .= "`ally_description` text character set cp1251, ";
-$QryTableAlliance   .= "`ally_web` varchar(255) character set cp1251 default '', ";
-$QryTableAlliance   .= "`ally_text` text character set cp1251, ";
-$QryTableAlliance   .= "`ally_image` varchar(255) character set cp1251 default '', ";
-$QryTableAlliance   .= "`ally_request` text character set cp1251, ";
-$QryTableAlliance   .= "`ally_request_waiting` text character set cp1251, ";
+$QryTableAlliance   .= "`ally_description` text character set latin1, ";
+$QryTableAlliance   .= "`ally_web` varchar(255) character set latin1 default '', ";
+$QryTableAlliance   .= "`ally_text` text character set latin1, ";
+$QryTableAlliance   .= "`ally_image` varchar(255) character set latin1 default '', ";
+$QryTableAlliance   .= "`ally_request` text character set latin1, ";
+$QryTableAlliance   .= "`ally_request_waiting` text character set latin1, ";
 $QryTableAlliance   .= "`ally_request_notallow` tinyint(4) NOT NULL default '0', ";
-$QryTableAlliance   .= "`ally_owner_range` varchar(32) character set cp1251 default '', ";
-$QryTableAlliance   .= "`ally_ranks` text character set cp1251, ";
+$QryTableAlliance   .= "`ally_owner_range` varchar(32) character set latin1 default '', ";
+$QryTableAlliance   .= "`ally_ranks` text character set latin1, ";
 $QryTableAlliance   .= "`ally_members` int(11) NOT NULL default '0', ";
 $QryTableAlliance   .= "PRIMARY KEY  (`id`) ";
 $QryTableAlliance   .= ") ENGINE=MyISAM;";
 
 $QryTableBanned      = "CREATE TABLE `{{table}}` ( ";
 $QryTableBanned     .= "`id` bigint(11) NOT NULL auto_increment, ";
-$QryTableBanned     .= "`who` varchar(64) character set cp1251 NOT NULL default '', ";
-$QryTableBanned     .= "`theme` text character set cp1251 NOT NULL, ";
-$QryTableBanned     .= "`who2` varchar(64) character set cp1251 NOT NULL default '', ";
+$QryTableBanned     .= "`who` varchar(64) character set latin1 NOT NULL default '', ";
+$QryTableBanned     .= "`theme` text character set latin1 NOT NULL, ";
+$QryTableBanned     .= "`who2` varchar(64) character set latin1 NOT NULL default '', ";
 $QryTableBanned     .= "`time` int(11) NOT NULL default '0', ";
 $QryTableBanned     .= "`longer` int(11) NOT NULL default '0', ";
-$QryTableBanned     .= "`author` varchar(64) character set cp1251 NOT NULL default '', ";
-$QryTableBanned     .= "`email` varchar(64) character set cp1251 NOT NULL default '', ";
+$QryTableBanned     .= "`author` varchar(64) character set latin1 NOT NULL default '', ";
+$QryTableBanned     .= "`email` varchar(64) character set latin1 NOT NULL default '', ";
 $QryTableBanned     .= "KEY `ID` (`id`) ";
 $QryTableBanned     .= ") ENGINE=MyISAM;";
 
@@ -69,69 +56,16 @@
 $QryTableBuddy      .= "`sender` int(11) NOT NULL default '0', ";
 $QryTableBuddy      .= "`owner` int(11) NOT NULL default '0', ";
 $QryTableBuddy      .= "`active` tinyint(3) NOT NULL default '0', ";
-$QryTableBuddy      .= "`text` text character set cp1251, ";
+$QryTableBuddy      .= "`text` text character set latin1, ";
 $QryTableBuddy      .= "PRIMARY KEY  (`id`) ";
 $QryTableBuddy      .= ") ENGINE=MyISAM;";
 
-$QryTableChat       = "CREATE TABLE `{{table}}` ( ";
-$QryTableChat      .= "`messageid` int(5) NOT NULL auto_increment, ";
-$QryTableChat      .= "`user` varchar(255) NOT NULL default '', ";
-$QryTableChat      .= "`message` text NOT NULL, ";
-$QryTableChat      .= "`timestamp` int(11) NOT NULL default '0', ";
-$QryTableChat      .= "`ally_id` int(11) NOT NULL default '0', ";
-$QryTableChat      .= "PRIMARY KEY  (`messageid`) ";
-$QryTableChat      .= ") ENGINE=MyISAM;";
-
-$QryTableConfig      = "CREATE TABLE `{{table}}` ( ";
-$QryTableConfig     .= "`config_name` varchar(64) character set cp1251 NOT NULL default '', ";
-$QryTableConfig     .= "`config_value` text character set cp1251 NOT NULL ";
-$QryTableConfig     .= ") ENGINE=MyISAM;";
-
-$QryInsertConfig     = "INSERT INTO `{{table}}` ";
-$QryInsertConfig    .= "(`config_name`           , `config_value`) VALUES ";
-$QryInsertConfig    .= "('VERSION'          	 , '2.9.6'), ";
-$QryInsertConfig    .= "('users_amount'          , '0'), ";
-$QryInsertConfig    .= "('moderation'            , '1,0,0,1,1;1,1,0,1,1;1;'), ";
-$QryInsertConfig    .= "('game_speed'            , '2500'), ";
-$QryInsertConfig    .= "('fleet_speed'           , '2500'), ";
-$QryInsertConfig    .= "('resource_multiplier'   , '1'), ";
-$QryInsertConfig    .= "('Fleet_Cdr'             , '30'), ";
-$QryInsertConfig    .= "('Defs_Cdr'              , '30'), ";
-$QryInsertConfig    .= "('initial_fields'        , '200'), ";
-$QryInsertConfig    .= "('COOKIE_NAME'           , 'XGProyect'), ";
-$QryInsertConfig    .= "('game_name'             , 'XG Proyect'), ";
-$QryInsertConfig    .= "('game_disable'          , '1'), ";
-$QryInsertConfig    .= "('close_reason'          , 'Ïðîåêò âðåìåííî çàêðûò ïî òåõ ïðè÷èíàì!'), ";
-$QryInsertConfig    .= "('metal_basic_income'    , '20'), ";
-$QryInsertConfig    .= "('crystal_basic_income'  , '10'), ";
-$QryInsertConfig    .= "('deuterium_basic_income', '0'), ";
-$QryInsertConfig    .= "('energy_basic_income'   , '0'), ";
-$QryInsertConfig    .= "('BuildLabWhileRun'      , '0'), ";
-$QryInsertConfig    .= "('LastSettedGalaxyPos'   , '1'), ";
-$QryInsertConfig    .= "('LastSettedSystemPos'   , '8'), ";
-$QryInsertConfig    .= "('LastSettedPlanetPos'   , '3'), ";
-$QryInsertConfig    .= "('noobprotection'        , '1'), ";
-$QryInsertConfig    .= "('noobprotectiontime'    , '5000'), ";
-$QryInsertConfig    .= "('noobprotectionmulti'   , '5'), ";
-$QryInsertConfig    .= "('forum_url'             , 'http://Âàø äîìåí/forum' ), ";
-$QryInsertConfig    .= "('adm_attack'         	 , '0' ), ";
-$QryInsertConfig    .= "('debug'                 , '0'), ";
-$QryInsertConfig    .= "('lang'                  , 'russian'), ";
-$QryInsertConfig    .= "('stat'                  , '1'), ";
-$QryInsertConfig    .= "('stat_level'            , '2'), ";
-$QryInsertConfig    .= "('stat_last_update'      , '".time()."'), ";
-$QryInsertConfig    .= "('stat_settings'         , '1000'), ";
-$QryInsertConfig    .= "('stat_amount'           , '25'), ";
-$QryInsertConfig    .= "('stat_update_time'      , '15'), ";
-$QryInsertConfig    .= "('stat_flying'           , '1') ";
-$QryInsertConfig    .= ";";
-
 $QryTableErrors      = "CREATE TABLE `{{table}}` ( ";
 $QryTableErrors     .= "`error_id` bigint(11) NOT NULL auto_increment, ";
-$QryTableErrors     .= "`error_sender` varchar(32) character set cp1251 NOT NULL default '0', ";
+$QryTableErrors     .= "`error_sender` varchar(32) character set latin1 NOT NULL default '0', ";
 $QryTableErrors     .= "`error_time` int(11) NOT NULL default '0', ";
-$QryTableErrors     .= "`error_type` varchar(32) character set cp1251 NOT NULL default 'unknown', ";
-$QryTableErrors     .= "`error_text` text character set cp1251, ";
+$QryTableErrors     .= "`error_type` varchar(32) character set latin1 NOT NULL default 'unknown', ";
+$QryTableErrors     .= "`error_text` text character set latin1, ";
 $QryTableErrors     .= "PRIMARY KEY  (`error_id`) ";
 $QryTableErrors     .= ") ENGINE=MyISAM;";
 
@@ -140,7 +74,7 @@
 $QryTableFleets     .= "`fleet_owner` int(11) NOT NULL default '0', ";
 $QryTableFleets     .= "`fleet_mission` int(11) NOT NULL default '0', ";
 $QryTableFleets     .= "`fleet_amount` bigint(11) NOT NULL default '0', ";
-$QryTableFleets     .= "`fleet_array` text character set cp1251, ";
+$QryTableFleets     .= "`fleet_array` text character set latin1, ";
 $QryTableFleets     .= "`fleet_start_time` int(11) NOT NULL default '0', ";
 $QryTableFleets     .= "`fleet_start_galaxy` int(11) NOT NULL default '0', ";
 $QryTableFleets     .= "`fleet_start_system` int(11) NOT NULL default '0', ";
@@ -171,6 +105,7 @@
 $QryTableGalaxy     .= "`id_planet` int(11) NOT NULL default '0', ";
 $QryTableGalaxy     .= "`metal` bigint(11) NOT NULL default '0', ";
 $QryTableGalaxy     .= "`crystal` bigint(11) NOT NULL default '0', ";
+$QryTableGalaxy     .= "`invisible_start_time` int(11) NOT NULL default '0', ";
 $QryTableGalaxy     .= "`id_luna` int(11) NOT NULL default '0', ";
 $QryTableGalaxy     .= "`luna` int(2) NOT NULL default '0', ";
 $QryTableGalaxy     .= "KEY `galaxy` (`galaxy`), ";
@@ -184,9 +119,9 @@
 $QryTableMessages   .= "`message_sender` int(11) NOT NULL default '0', ";
 $QryTableMessages   .= "`message_time` int(11) NOT NULL default '0', ";
 $QryTableMessages   .= "`message_type` int(11) NOT NULL default '0', ";
-$QryTableMessages   .= "`message_from` varchar(48) character set cp1251 default NULL, ";
-$QryTableMessages   .= "`message_subject` text character set cp1251, ";
-$QryTableMessages   .= "`message_text` text character set cp1251, ";
+$QryTableMessages   .= "`message_from` varchar(48) character set latin1 default NULL, ";
+$QryTableMessages   .= "`message_subject` text character set latin1, ";
+$QryTableMessages   .= "`message_text` text character set latin1, ";
 $QryTableMessages   .= "PRIMARY KEY  (`message_id`) ";
 $QryTableMessages   .= ") ENGINE=MyISAM;";
 
@@ -195,14 +130,14 @@
 $QryTableNotes      .= "`owner` int(11) default NULL, ";
 $QryTableNotes      .= "`time` int(11) default NULL, ";
 $QryTableNotes      .= "`priority` tinyint(1) default NULL, ";
-$QryTableNotes      .= "`title` varchar(32) character set cp1251 default NULL, ";
-$QryTableNotes      .= "`text` text character set cp1251, ";
+$QryTableNotes      .= "`title` varchar(32) character set latin1 default NULL, ";
+$QryTableNotes      .= "`text` text character set latin1, ";
 $QryTableNotes      .= "PRIMARY KEY  (`id`) ";
 $QryTableNotes      .= ") ENGINE=MyISAM;";
 
 $QryTablePlanets     = "CREATE TABLE `{{table}}` ( ";
 $QryTablePlanets    .= "`id` bigint(11) NOT NULL auto_increment, ";
-$QryTablePlanets    .= "`name` varchar(255) character set cp1251 default 'Planeta Principal', ";
+$QryTablePlanets    .= "`name` varchar(255) character set latin1 default 'Planeta Principal', ";
 $QryTablePlanets    .= "`id_owner` int(11) default NULL, ";
 $QryTablePlanets    .= "`id_level` int(11) default NULL, ";
 $QryTablePlanets    .= "`galaxy` int(11) NOT NULL default '0', ";
@@ -212,29 +147,29 @@
 $QryTablePlanets    .= "`planet_type` int(11) NOT NULL default '1', ";
 $QryTablePlanets    .= "`destruyed` int(11) NOT NULL default '0', ";
 $QryTablePlanets    .= "`b_building` int(11) NOT NULL default '0', ";
-$QryTablePlanets    .= "`b_building_id` text character set cp1251 NOT NULL, ";
+$QryTablePlanets    .= "`b_building_id` text character set latin1 NOT NULL, ";
 $QryTablePlanets    .= "`b_tech` int(11) NOT NULL default '0', ";
 $QryTablePlanets    .= "`b_tech_id` int(11) NOT NULL default '0', ";
 $QryTablePlanets    .= "`b_hangar` int(11) NOT NULL default '0', ";
-$QryTablePlanets    .= "`b_hangar_id` text character set cp1251 NOT NULL, ";
+$QryTablePlanets    .= "`b_hangar_id` text character set latin1 NOT NULL, ";
 $QryTablePlanets    .= "`b_hangar_plus` int(11) NOT NULL default '0', ";
-$QryTablePlanets    .= "`image` varchar(32) character set cp1251 NOT NULL default 'normaltempplanet01', ";
+$QryTablePlanets    .= "`image` varchar(32) character set latin1 NOT NULL default 'normaltempplanet01', ";
 $QryTablePlanets    .= "`diameter` int(11) NOT NULL default '12800', ";
 $QryTablePlanets    .= "`points` bigint(20) default '0', ";
 $QryTablePlanets    .= "`ranks` bigint(20) default '0', ";
 $QryTablePlanets    .= "`field_current` int(11) NOT NULL default '0', ";
-$QryTablePlanets    .= "`field_max` int(11) NOT NULL default '200', ";
+$QryTablePlanets    .= "`field_max` int(11) NOT NULL default '163', ";
 $QryTablePlanets    .= "`temp_min` int(3) NOT NULL default '-17', ";
 $QryTablePlanets    .= "`temp_max` int(3) NOT NULL default '23', ";
 $QryTablePlanets    .= "`metal` double(132,8) NOT NULL default '0.00000000', ";
 $QryTablePlanets    .= "`metal_perhour` int(11) NOT NULL default '0', ";
-$QryTablePlanets    .= "`metal_max` bigint(20) default '500000', ";
+$QryTablePlanets    .= "`metal_max` bigint(20) default '100000', ";
 $QryTablePlanets    .= "`crystal` double(132,8) NOT NULL default '0.00000000', ";
 $QryTablePlanets    .= "`crystal_perhour` int(11) NOT NULL default '0', ";
-$QryTablePlanets    .= "`crystal_max` bigint(20) default '500000', ";
+$QryTablePlanets    .= "`crystal_max` bigint(20) default '100000', ";
 $QryTablePlanets    .= "`deuterium` double(132,8) NOT NULL default '0.00000000', ";
 $QryTablePlanets    .= "`deuterium_perhour` int(11) NOT NULL default '0', ";
-$QryTablePlanets    .= "`deuterium_max` bigint(20) default '500000', ";
+$QryTablePlanets    .= "`deuterium_max` bigint(20) default '100000', ";
 $QryTablePlanets    .= "`energy_used` int(11) NOT NULL default '0', ";
 $QryTablePlanets    .= "`energy_max` bigint(20) NOT NULL default '0', ";
 $QryTablePlanets    .= "`metal_mine` int(11) NOT NULL default '0', ";
@@ -266,7 +201,6 @@
 $QryTablePlanets    .= "`destructor` bigint(11) NOT NULL default '0', ";
 $QryTablePlanets    .= "`dearth_star` bigint(11) NOT NULL default '0', ";
 $QryTablePlanets    .= "`battleship` bigint(11) NOT NULL default '0', ";
-$QryTablePlanets    .= "`supernova` bigint(11) NOT NULL default '0', ";
 $QryTablePlanets    .= "`misil_launcher` bigint(11) NOT NULL default '0', ";
 $QryTablePlanets    .= "`small_laser` bigint(11) NOT NULL default '0', ";
 $QryTablePlanets    .= "`big_laser` bigint(11) NOT NULL default '0', ";
@@ -274,8 +208,6 @@
 $QryTablePlanets    .= "`ionic_canyon` bigint(11) NOT NULL default '0', ";
 $QryTablePlanets    .= "`buster_canyon` bigint(11) NOT NULL default '0', ";
 $QryTablePlanets    .= "`small_protection_shield` tinyint(1) NOT NULL default '0', ";
-$QryTablePlanets    .= "`planet_protector` tinyint(1) NOT NULL default '0', ";
-$QryTablePlanets    .= "`atom_protector` tinyint(1) NOT NULL default '0', ";
 $QryTablePlanets    .= "`big_protection_shield` tinyint(1) NOT NULL default '0', ";
 $QryTablePlanets    .= "`interceptor_misil` int(11) NOT NULL default '0', ";
 $QryTablePlanets    .= "`interplanetary_misil` int(11) NOT NULL default '0', ";
@@ -298,11 +230,9 @@
 $QryTablePlugins	.= ") ENGINE=MyISAM;";
 
 $QryTableRw          = "CREATE TABLE `{{table}}` ( ";
-$QryTableRw         .= "`id_owner1` int(11) NOT NULL default '0', ";
-$QryTableRw         .= "`id_owner2` int(11) NOT NULL default '0', ";
-$QryTableRw      	.= "`owners` VARCHAR(255) character set cp1251 NOT NULL, ";
-$QryTableRw         .= "`rid` VARCHAR(72) character set cp1251 NOT NULL, ";
-$QryTableRw         .= "`raport` text character set cp1251 NOT NULL, ";
+$QryTableRw      	.= "`owners` VARCHAR(255) character set latin1 NOT NULL, ";
+$QryTableRw         .= "`rid` VARCHAR(72) character set latin1 NOT NULL, ";
+$QryTableRw         .= "`raport` text character set latin1 NOT NULL, ";
 $QryTableRw         .= "`a_zestrzelona` tinyint(3) unsigned NOT NULL default '0', ";
 $QryTableRw         .= "`time` int(10) unsigned NOT NULL default '0', ";
 $QryTableRw         .= "UNIQUE KEY `rid` (`rid`), ";
@@ -344,23 +274,23 @@
 
 $QryTableUsers       = "CREATE TABLE `{{table}}` ( ";
 $QryTableUsers      .= "`id` bigint(11) unsigned NOT NULL auto_increment PRIMARY KEY, ";
-$QryTableUsers      .= "`username` varchar(64) character set cp1251 NOT NULL default '', ";
-$QryTableUsers      .= "`password` varchar(64) character set cp1251 NOT NULL default '', ";
-$QryTableUsers      .= "`email` varchar(64) character set cp1251 NOT NULL default '', ";
-$QryTableUsers      .= "`email_2` varchar(64) character set cp1251 NOT NULL default '', ";
+$QryTableUsers      .= "`username` varchar(64) character set latin1 NOT NULL default '', ";
+$QryTableUsers      .= "`password` varchar(64) character set latin1 NOT NULL default '', ";
+$QryTableUsers      .= "`email` varchar(64) character set latin1 NOT NULL default '', ";
+$QryTableUsers      .= "`email_2` varchar(64) character set latin1 NOT NULL default '', ";
 $QryTableUsers      .= "`authlevel` tinyint(4) NOT NULL default '0', ";
 $QryTableUsers      .= "`id_planet` int(11) NOT NULL default '0', ";
 $QryTableUsers      .= "`galaxy` int(11) NOT NULL default '0', ";
 $QryTableUsers      .= "`system` int(11) NOT NULL default '0', ";
 $QryTableUsers      .= "`planet` int(11) NOT NULL default '0', ";
 $QryTableUsers      .= "`current_planet` int(11) NOT NULL default '0', ";
-$QryTableUsers      .= "`user_lastip` varchar(16) character set cp1251 NOT NULL default '', ";
-$QryTableUsers      .= "`ip_at_reg` varchar(16) character set cp1251 NOT NULL default '', ";
-$QryTableUsers      .= "`user_agent` text character set cp1251 NOT NULL, ";
-$QryTableUsers      .= "`current_page` text character set cp1251 NOT NULL, ";
+$QryTableUsers      .= "`user_lastip` varchar(16) character set latin1 NOT NULL default '', ";
+$QryTableUsers      .= "`ip_at_reg` varchar(16) character set latin1 NOT NULL default '', ";
+$QryTableUsers      .= "`user_agent` text character set latin1 NOT NULL, ";
+$QryTableUsers      .= "`current_page` text character set latin1 NOT NULL, ";
 $QryTableUsers      .= "`register_time` int(11) NOT NULL default '0', ";
 $QryTableUsers      .= "`onlinetime` int(11) NOT NULL default '0', ";
-$QryTableUsers      .= "`dpath` varchar(255) character set cp1251 NOT NULL default '', ";
+$QryTableUsers      .= "`dpath` varchar(255) character set latin1 NOT NULL default '', ";
 $QryTableUsers      .= "`design` tinyint(4) NOT NULL default '1', ";
 $QryTableUsers      .= "`noipcheck` tinyint(4) NOT NULL default '1', ";
 $QryTableUsers      .= "`planet_sort` tinyint(1) NOT NULL default '0', ";
@@ -378,7 +308,7 @@
 $QryTableUsers      .= "`urlaubs_until` int(11) NOT NULL default '0', ";
 $QryTableUsers      .= "`db_deaktjava` bigint(19) NOT NULL default '0', ";
 $QryTableUsers      .= "`new_message` int(11) NOT NULL default '0', ";
-$QryTableUsers      .= "`fleet_shortcut` text character set cp1251, ";
+$QryTableUsers      .= "`fleet_shortcut` text character set latin1, ";
 $QryTableUsers      .= "`b_tech_planet` int(11) NOT NULL default '0', ";
 $QryTableUsers      .= "`spy_tech` int(11) NOT NULL default '0', ";
 $QryTableUsers      .= "`computer_tech` int(11) NOT NULL default '0', ";
@@ -395,13 +325,11 @@
 $QryTableUsers      .= "`buster_tech` int(11) NOT NULL default '0', ";
 $QryTableUsers      .= "`intergalactic_tech` int(11) NOT NULL default '0', ";
 $QryTableUsers      .= "`expedition_tech` int(11) NOT NULL default '0', ";
-$QryTableUsers      .= "`colonisation_tech` int(11) NOT NULL default '0', ";
 $QryTableUsers      .= "`graviton_tech` int(11) NOT NULL default '0', ";
-$QryTableUsers      .= "`atom_tech` int(11) NOT NULL default '0', ";
 $QryTableUsers      .= "`ally_id` int(11) NOT NULL default '0', ";
-$QryTableUsers      .= "`ally_name` varchar(32) character set cp1251 default '', ";
+$QryTableUsers      .= "`ally_name` varchar(32) character set latin1 default '', ";
 $QryTableUsers      .= "`ally_request` int(11) NOT NULL default '0', ";
-$QryTableUsers      .= "`ally_request_text` text character set cp1251, ";
+$QryTableUsers      .= "`ally_request_text` text character set latin1, ";
 $QryTableUsers      .= "`ally_register_time` int(11) NOT NULL default '0', ";
 $QryTableUsers      .= "`ally_rank_id` int(11) NOT NULL default '0', ";
 $QryTableUsers      .= "`current_luna` int(11) NOT NULL default '0', ";
@@ -409,18 +337,7 @@
 $QryTableUsers      .= "`rpg_amiral` int(11) NOT NULL default '0', ";
 $QryTableUsers      .= "`rpg_ingenieur` int(11) NOT NULL default '0', ";
 $QryTableUsers      .= "`rpg_technocrate` int(11) NOT NULL default '0', ";
-$QryTableUsers      .= "`rpg_espion` int(11) NOT NULL default '0', ";
-$QryTableUsers      .= "`rpg_constructeur` int(11) NOT NULL default '0', ";
-$QryTableUsers      .= "`rpg_scientifique` int(11) NOT NULL default '0', ";
-$QryTableUsers      .= "`rpg_commandant` int(11) NOT NULL default '0', ";
-$QryTableUsers      .= "`rpg_stockeur` int(11) NOT NULL default '0', ";
 $QryTableUsers      .= "`darkmatter` int(11) NOT NULL default '0', ";
-$QryTableUsers      .= "`rpg_defenseur` int(11) NOT NULL default '0', ";
-$QryTableUsers      .= "`rpg_destructeur` int(11) NOT NULL default '0', ";
-$QryTableUsers      .= "`rpg_general` int(11) NOT NULL default '0', ";
-$QryTableUsers      .= "`rpg_bunker` int(11) NOT NULL default '0', ";
-$QryTableUsers      .= "`rpg_raideur` int(11) NOT NULL default '0', ";
-$QryTableUsers      .= "`rpg_empereur` int(11) NOT NULL default '0', ";
 $QryTableUsers      .= "`bana` int(11) default NULL , ";
 $QryTableUsers      .= "`banaday` int(11) NOT NULL default '0' ";
 $QryTableUsers      .= ") ENGINE=MyISAM;";
diff --git a/install/index.php b/install/index.php
index 894232b..b84add6 100644
--- a/install/index.php
+++ b/install/index.php
@@ -1,63 +1,52 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE'  , true);
-define('INSTALL' , true);
-
-$xgp_root = './../';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.'.$phpEx);
-include_once('databaseinfos.'.$phpEx);
-include_once('UpdateMoonID.'.$phpEx);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2012
+ */
+
+define('INSIDE'  		,   	 TRUE);
+define('XGP_ROOT'		, 	  './../');
+
+include_once(XGP_ROOT . 'global.php');
+include_once('databaseinfos.php');
+include_once('migration.php');
 
 $Mode     = $_GET['mode'];
 $Page     = $_GET['page'];
 $phpself  = $_SERVER['PHP_SELF'];
 $nextpage = $Page + 1;
 
-if(version_compare(PHP_VERSION, "5.1.0", "<"))
-	die("Error! Tu servidor debe tener al menos php 5.1.0");
+if(version_compare(PHP_VERSION, "5.2.0", "<"))
+	die("&iexcl;Error! Tu servidor debe tener al menos php 5.2.0");
 
 if (empty($Mode)) { $Mode = 'intro'; }
 if (empty($Page)) { $Page = 1;       }
 
-switch ($Mode) {
+switch ($Mode)
+{
 	case'license':
-		$frame  = parsetemplate(gettemplate('install/ins_license'), false);
-		break;
+		$frame  = parsetemplate(gettemplate('install/ins_license'), FALSE);
+	break;
 	case 'intro':
-		$frame  = parsetemplate(gettemplate('install/ins_intro'), false);
-		break;
+		$frame  = parsetemplate(gettemplate('install/ins_intro'), FALSE);
+	break;
 	case 'ins':
 		if ($Page == 1) {
-			if ($_GET['error'] == 1) {
-				message ("La conexi&oacute;n a la base de datos a fallado","?mode=ins&page=1", 3, false, false);
+			if ($_GET['error'] == 1)
+			{
+				message ("La conexi&oacute;n a la base de datos a fallado","?mode=ins&page=1", 3, FALSE, FALSE);
 			}
-			elseif ($_GET['error'] == 2) {
-				message ("El fichero config.php no puede ser sustituido, no tenia acceso chmod 777","?mode=ins&page=1", 3, false, false);
+			elseif ($_GET['error'] == 2)
+			{
+				message ("El fichero config.php no puede ser sustituido, no tenia acceso chmod 777","?mode=ins&page=1", 3, FALSE, FALSE);
 			}
 
-			$frame  = parsetemplate ( gettemplate ('install/ins_form'), false);
+			$frame  = parsetemplate ( gettemplate ('install/ins_form'), FALSE);
 		}
-		elseif ($Page == 2) {
+		elseif ($Page == 2)
+		{
 			$host   = $_POST['host'];
 			$user   = $_POST['user'];
 			$pass   = $_POST['passwort'];
@@ -65,14 +54,16 @@
 			$db     = $_POST['db'];
 
 			$connection = @mysql_connect($host, $user, $pass);
-			if (!$connection) {
-				header("Location: ?mode=ins&page=1&error=1");
+			if (!$connection)
+			{
+				header ( 'location:?mode=ins&page=1&error=1' );
 				exit();
 			}
 
 			$dbselect = @mysql_select_db($db);
-			if (!$dbselect) {
-				header("Location: ?mode=ins&page=1&error=1");
+			if (!$dbselect)
+			{
+				header ( 'location:?mode=ins&page=1&error=1' );
 				exit();
 			}
 
@@ -80,14 +71,14 @@
 			$dz = fopen("../config.php", "w");
 			if (!$dz)
 			{
-				header("Location: ?mode=ins&page=1&error=2");
+				header ( 'location:?mode=ins&page=1&error=2' );
 				exit();
 			}
 
-			$parse[first]	= "Ñâÿçü ñ áàçîé äàííûõ óñòàíîâëåíà óñïåøíî...";
+			$parse[first]	= "Conexi&oacute;n establecida con éxito...";
 
 			fwrite($dz, "<?php\n");
-			fwrite($dz, "if(!defined(\"INSIDE\")){ header(\"location:".$xgp_root."\"); }\n");
+			fwrite($dz, "if(!defined(\"INSIDE\")){ header(\"location:".XGP_ROOT."\"); }\n");
 			fwrite($dz, "\$dbsettings = Array(\n");
 			fwrite($dz, "\"server\"     => \"".$host."\", // MySQL server name.\n");
 			fwrite($dz, "\"user\"       => \"".$user."\", // MySQL username.\n");
@@ -98,15 +89,12 @@
 			fwrite($dz, "?>");
 			fclose($dz);
 
-			$parse[second]	= "Èçìåíåíèå â config.php áûëè âíåñåíû è ñîõðàíåíû...";
+			$parse[second]	= "Archivo config.php creado con éxito...";
 
 			doquery ($QryTableAks        , 'aks'    	);
 			doquery ($QryTableAlliance   , 'alliance'   );
 			doquery ($QryTableBanned     , 'banned'     );
 			doquery ($QryTableBuddy      , 'buddy'      );
-			doquery ($QryTableChat       , 'chat'       );		
-			doquery ($QryTableConfig     , 'config'     );
-			doquery ($QryInsertConfig    , 'config'     );
 			doquery ($QryTableErrors     , 'errors'     );
 			doquery ($QryTableFleets     , 'fleets'     );
 			doquery ($QryTableGalaxy     , 'galaxy'     );
@@ -118,16 +106,16 @@
 			doquery ($QryTableStatPoints , 'statpoints'	);
 			doquery ($QryTableUsers      , 'users'  	);
 
-			$parse[third]	= "Òàáëèöû â áàçå äûííûõ ñîçäàíû óñïåøíî...";
+			$parse[third]	= "Tablas creadas con &eaute;xito...";
 
 			$frame  = parsetemplate(gettemplate('install/ins_form_done'), $parse);
 		}
 		elseif ($Page == 3)
 		{
 			if ($_GET['error'] == 3)
-				message ("¡Debes completar todos los campos!","?mode=ins&page=3", 2, false, false);
+				message ("&iexcl;Debes completar todos los campos!","?mode=ins&page=3", 2, FALSE, FALSE);
 
-			$frame  = parsetemplate(gettemplate('install/ins_acc'), false);
+			$frame  = parsetemplate(gettemplate('install/ins_acc'), FALSE);
 		}
 		elseif ($Page == 4)
 		{
@@ -178,18 +166,18 @@
 			$QryAddAdmPlt .= "`planet_type`       = '1', ";
 			$QryAddAdmPlt .= "`image`             = 'normaltempplanet02', ";
 			$QryAddAdmPlt .= "`diameter`          = '12750', ";
-			$QryAddAdmPlt .= "`field_max`         = '200', ";
+			$QryAddAdmPlt .= "`field_max`         = '163', ";
 			$QryAddAdmPlt .= "`temp_min`          = '47', ";
 			$QryAddAdmPlt .= "`temp_max`          = '87', ";
-			$QryAddAdmPlt .= "`metal`             = '1000', ";
+			$QryAddAdmPlt .= "`metal`             = '500', ";
 			$QryAddAdmPlt .= "`metal_perhour`     = '0', ";
-			$QryAddAdmPlt .= "`metal_max`         = '5000000', ";
-			$QryAddAdmPlt .= "`crystal`           = '1000', ";
+			$QryAddAdmPlt .= "`metal_max`         = '1000000', ";
+			$QryAddAdmPlt .= "`crystal`           = '500', ";
 			$QryAddAdmPlt .= "`crystal_perhour`   = '0', ";
-			$QryAddAdmPlt .= "`crystal_max`       = '5000000', ";
-			$QryAddAdmPlt .= "`deuterium`         = '1000', ";
+			$QryAddAdmPlt .= "`crystal_max`       = '1000000', ";
+			$QryAddAdmPlt .= "`deuterium`         = '500', ";
 			$QryAddAdmPlt .= "`deuterium_perhour` = '0', ";
-			$QryAddAdmPlt .= "`deuterium_max`     = '5000000';";
+			$QryAddAdmPlt .= "`deuterium_max`     = '1000000';";
 			doquery($QryAddAdmPlt, 'planets');
 
 			$QryAddAdmGlx  = "INSERT INTO {{table}} SET ";
@@ -199,184 +187,107 @@
 			$QryAddAdmGlx .= "`id_planet`         = '1'; ";
 			doquery($QryAddAdmGlx, 'galaxy');
 
-			doquery("UPDATE {{table}} SET `config_value` = '1' WHERE `config_name` = 'LastSettedGalaxyPos';", 'config');
-			doquery("UPDATE {{table}} SET `config_value` = '1' WHERE `config_name` = 'LastSettedSystemPos';", 'config');
-			doquery("UPDATE {{table}} SET `config_value` = '1' WHERE `config_name` = 'LastSettedPlanetPos';", 'config');
-			doquery("UPDATE {{table}} SET `config_value` = `config_value` + '1' WHERE `config_name` = 'users_amount' LIMIT 1;", 'config');
+			update_config ( 'stat_last_update' , time() );
 
 			$frame  = parsetemplate(gettemplate('install/ins_acc_done'), $parse);
 		}
 		break;
 	case'upgrade':
+
 		if ($_POST)
 		{
-			$conexion = mysql_connect($_POST[servidor], $_POST[usuario], $_POST[clave])
-			or die ('<font color=red><strong>Problemas en la conexión con el servidor, es probable que el <u>nombre del servidor, usuario o clave sean incorrectas o que mysql no esta funcionando.</u></strong></font>');
-			@mysql_select_db($_POST[base],$conexion)
-			or die ('<font color=red><strong>Problemas en la conexión con la base de datos. Este error puede deberse a que <u>la base de datos no existe o escribiste mal el nombre de la misma.</u></strong></font>');
+			$administrator	=	doquery("SELECT id
+											FROM {{table}}
+											WHERE password = '" . md5 ( $_POST['adm_pass'] ) . "' AND
+													email = '" . mysql_real_escape_string ( $_POST['adm_email'] ) . "' AND
+													authlevel = 3" , 'users' , TRUE );
 
-			if ($_POST[continuar] && (empty($_POST[modo]) or empty($_POST[servidor]) or empty($_POST[usuario]) or empty($_POST[clave]) or empty($_POST[base]) or empty($_POST[prefix])))
+			if ( !$administrator )
 			{
-				message("Error!, debes rellenar todos los campos<br><a href=\"./index.php\">Volver</a>","", "", false, false);
+				die(message("&iexcl;Error! - &iexcl;El administrador ingresado no existe o el usuario no tiene permisos administrativos!","index.php?mode=upgrade", "3", FALSE, FALSE));
+			}
+
+			if(filesize('../config.php') == 0)
+			{
+				die(message("&iexcl;Error! - Tu archivo config.php se encuentra vaci&oacute; o no configurado. En caso de no ser as&iacute; verifica que su chmod sea de 777","", "", FALSE, FALSE));
 			}
 			else
 			{
-				if(filesize('../config.php') == 0)
-				{
-					die(message("Error!, tu archivo config.php se encuentra vació o no configurado. En caso de no ser así verifica que su chmod sea de 777","", "", false, false));
-				}
-				else
-				{
-					include_once("../config.php");
+				include("../config.php");
 
-					if($_POST[prefix] != $dbsettings["prefix"])
-					{
-						die(message("Error!, el prefix seleccionado (<font color=\"red\"><strong>".$_POST[prefix]."</strong></font>) no coincide con el de la base de datos.","", "", false, false));
-					}
-				}
+				$system_version	=	str_replace ( 'v' , '' , VERSION );
 
 				// ALL QUERYS NEEDED
-
-				$Qry1 = "ALTER TABLE `$_POST[prefix]users`
-					  DROP `new_message`,
-					  DROP `raids`,
-					  DROP `p_infligees`,
-					  DROP `mnl_alliance`,
-					  DROP `mnl_joueur`,
-					  DROP `mnl_attaque`,
-					  DROP `mnl_spy`,
-					  DROP `mnl_exploit`,
-					  DROP `mnl_transport`,
-					  DROP `mnl_expedition`,
-					  DROP `mnl_general`,
-					  DROP `mnl_buildlist`,
-					  DROP `multi_validated`;";
-
-				$Qry2 = "DELETE FROM `$_POST[prefix]config` WHERE CONVERT(`$_POST[prefix]config`.`config_name` USING cp1251) = 'urlaubs_modus_erz' AND CONVERT(`$_POST[prefix]config`.`config_value` USING cp1251) = '1' LIMIT 1;";
-				$Qry3 = "DELETE FROM `$_POST[prefix]config` WHERE CONVERT(`$_POST[prefix]config`.`config_name` USING cp1251) = 'enable_bbcode' AND CONVERT(`$_POST[prefix]config`.`config_value` USING cp1251) = '1' LIMIT 1;";
-				$Qry4 = "DELETE FROM `$_POST[prefix]config` WHERE CONVERT(`$_POST[prefix]config`.`config_name` USING cp1251) = 'enable_bbcode' AND CONVERT(`$_POST[prefix]config`.`config_value` USING cp1251) = '0' LIMIT 1;";
-				$Qry5 = "ALTER TABLE `$_POST[prefix]users` DROP `lvl_minier`, DROP `lvl_raid`, DROP `xpraid`, DROP `xpminier`;";
-				$Qry6 = "INSERT INTO `$_POST[prefix]config` (`config_name`, `config_value`) VALUES ('adm_attack', '0');";
-				$Qry7 = "INSERT INTO `$_POST[prefix]config` (`config_name`, `config_value`) VALUES ('stat', '1');";
-				$Qry8 = "ALTER TABLE `$_POST[prefix]users` DROP `lang`;";
-				$Qry9 = "INSERT INTO `$_POST[prefix]config` (`config_name` ,`config_value`)VALUES ('lang', 'russian');";
-				$Qry10 = "ALTER TABLE `$_POST[prefix]users` ADD `new_message` INT( 11 ) NOT NULL DEFAULT '0' AFTER `db_deaktjava` ;";
-				$Qry11 = "ALTER TABLE `$_POST[prefix]messages` DROP `leido`";
-				$Qry12 = "DELETE FROM `$_POST[prefix]config` WHERE CONVERT(`$_POST[prefix]config`.`config_name` USING cp1251) = 'stat_level' LIMIT 1;";
-				$Qry13 = "DELETE FROM `$_POST[prefix]config` WHERE CONVERT(`$_POST[prefix]config`.`config_name` USING cp1251) = 'stat' LIMIT 1;";
-				$Qry14 = "INSERT INTO `$_POST[prefix]config` (`config_name`, `config_value`) VALUES
-								('stat', 1),
-								('stat_level', 2),
-								('stat_last_update', 1),
-								('stat_settings', 1000),
-								('stat_amount', 25),
-								('stat_update_time', 15),
-								('stat_flying', 1);";
-				$Qry15 = "DELETE FROM `$_POST[prefix]config` WHERE CONVERT(`$_POST[prefix]config`.`config_name` USING cp1251) = 'actualizar_puntos' LIMIT 1;";
-				$Qry16 = "DELETE FROM `$_POST[prefix]config` WHERE CONVERT(`$_POST[prefix]config`.`config_name` USING cp1251) = 'OverviewNewsFrame' LIMIT 1;";
-				$Qry17 = "DELETE FROM `$_POST[prefix]config` WHERE CONVERT(`$_POST[prefix]config`.`config_name` USING cp1251) = 'OverviewNewsText' LIMIT 1;";
-				$Qry18 = "DELETE FROM `$_POST[prefix]config` WHERE `config_name` = 'VERSION'";
-				$Qry19 = "INSERT INTO `$_POST[prefix]config` (`config_name`, `config_value`) VALUES ('VERSION', '2.9.6');";
-				$Qry20 = "ALTER TABLE `$_POST[prefix]rw` ADD `owners` VARCHAR( 255 ) CHARACTER SET cp1251 COLLATE cp1251_general_ci NOT NULL DEFAULT '0';";
-				$Qry21 = "ALTER TABLE `$_POST[prefix]fleets` CHANGE `fleet_group` `fleet_group` VARCHAR( 15 ) CHARACTER SET cp1251 COLLATE cp1251_general_ci NOT NULL DEFAULT '0' ;";
-				$Qry22 = "ALTER TABLE `$_POST[prefix]aks` ADD `planet_type` TINYINT( 1 ) NOT NULL DEFAULT '1' AFTER `planet` ;";
-				$Qry23 = "ALTER TABLE `$_POST[prefix]aks` CHANGE `eingeladen` `eingeladen` TEXT CHARACTER SET cp1251 COLLATE cp1251_general_ci NULL";
-				$Qry24 = "ALTER TABLE `$_POST[prefix]rw` ADD `id_owner1` INT( 11 ) NOT NULL FIRST , ADD `id_owner2` INT( 11 ) NOT NULL AFTER `id_owner1` ";
-				$Qry25 = "ALTER TABLE `$_POST[prefix]users` CHANGE `db_deaktjava` `db_deaktjava` BIGINT( 19 ) NOT NULL DEFAULT '0'";
-				$Qry26 = "ALTER TABLE `$_POST[prefix]statpoints`
-												CHANGE `id_owner` `id_owner` INT(11) NOT NULL DEFAULT '0',
-												CHANGE `id_ally` `id_ally` INT(11) NOT NULL DEFAULT '0',
-												CHANGE `stat_type` `stat_type` INT(2) NOT NULL DEFAULT '0',
-												CHANGE `stat_code` `stat_code` INT(11) NOT NULL DEFAULT '0',
-												CHANGE `tech_rank` `tech_rank` INT(11) NOT NULL DEFAULT '0',
-												CHANGE `tech_old_rank` `tech_old_rank` INT(11) NOT NULL DEFAULT '0',
-												CHANGE `tech_points` `tech_points` BIGINT(20) NOT NULL DEFAULT '0',
-												CHANGE `tech_count` `tech_count` INT(11) NOT NULL DEFAULT '0',
-												CHANGE `build_rank` `build_rank` INT(11) NOT NULL DEFAULT '0',
-												CHANGE `build_old_rank` `build_old_rank` INT(11) NOT NULL DEFAULT '0',
-												CHANGE `build_points` `build_points` BIGINT(20) NOT NULL DEFAULT '0',
-												CHANGE `build_count` `build_count` INT(11) NOT NULL DEFAULT '0',
-												CHANGE `defs_rank` `defs_rank` INT(11) NOT NULL DEFAULT '0',
-												CHANGE `defs_old_rank` `defs_old_rank` INT(11) NOT NULL DEFAULT '0',
-												CHANGE `defs_points` `defs_points` BIGINT(20) NOT NULL DEFAULT '0',
-												CHANGE `defs_count` `defs_count` INT(11) NOT NULL DEFAULT '0',
-												CHANGE `fleet_rank` `fleet_rank` INT(11) NOT NULL DEFAULT '0',
-												CHANGE `fleet_old_rank` `fleet_old_rank` INT(11) NOT NULL DEFAULT '0',
-												CHANGE `fleet_points` `fleet_points` BIGINT(20) NOT NULL DEFAULT '0',
-												CHANGE `fleet_count` `fleet_count` INT(11) NOT NULL DEFAULT '0',
-												CHANGE `total_rank` `total_rank` INT(11) NOT NULL DEFAULT '0',
-												CHANGE `total_old_rank` `total_old_rank` INT(11) NOT NULL DEFAULT '0',
-												CHANGE `total_points` `total_points` BIGINT(20) NOT NULL DEFAULT '0',
-												CHANGE `total_count` `total_count` INT(11) NOT NULL DEFAULT '0',
-												CHANGE `stat_date` `stat_date` INT(11) NOT NULL DEFAULT '0'";
-				$Qry27 = "ALTER TABLE `$_POST[prefix]messages` CHANGE `message_subject` `message_subject` TEXT CHARACTER SET cp1251 COLLATE cp1251_general_ci NULL DEFAULT NULL";
-				$Qry28 = "DROP TABLE `$_POST[prefix]lunas`";
-				$Qry29 = "ALTER TABLE `$_POST[prefix]users` ADD `current_luna` INT( 11 ) NOT NULL DEFAULT '0' AFTER `ally_rank_id` ";
-				$Qry30 = "INSERT INTO `$_POST[prefix]config` (`config_name`, `config_value`) VALUES ('moderation', '1,0,0,1;1,1,0,1;');";
-				$Qry31 = " ALTER TABLE `$_POST[prefix]banned` CHANGE `who` `who` VARCHAR( 64 ) CHARACTER SET cp1251 COLLATE cp1251_general_ci NOT NULL ,
-							CHANGE `who2` `who2` VARCHAR( 64 ) CHARACTER SET cp1251 COLLATE cp1251_general_ci NOT NULL ,
-							CHANGE `author` `author` VARCHAR( 64 ) CHARACTER SET cp1251 COLLATE cp1251_general_ci NOT NULL ,
-							CHANGE `email` `email` VARCHAR( 64 ) CHARACTER SET cp1251 COLLATE cp1251_general_ci NOT NULL ";
-				$Qry32 = "UPDATE `$_POST[prefix]config` SET `config_value` = '1,0,0,1,1;1,1,0,1,1;1;' WHERE `xgp_config`.`config_name` = 'moderation';";
-				$Qry33 = "ALTER TABLE `$_POST[prefix]planets` CHANGE `small_protection_shield` `small_protection_shield` TINYINT( 1 ) NOT NULL DEFAULT '0', CHANGE `planet_protector` `planet_protector` TINYINT( 1 ) NOT NULL DEFAULT '0', CHANGE `atom_protector` `atom_protector` TINYINT( 1 ) NOT NULL DEFAULT '0', CHANGE `big_protection_shield` `big_protection_shield` TINYINT( 1 ) NOT NULL DEFAULT '0'";
-
-				switch($_POST[modo])
+				$Qry1 = "DELETE FROM `$dbsettings[prefix]config` WHERE `config_name` = 'VERSION'";
+				$Qry2 = "INSERT INTO `$dbsettings[prefix]config` (`config_name`, `config_value`) VALUES ('VERSION', '".SYSTEM_VERSION."');";
+				$Qry3 = "INSERT INTO `$dbsettings[prefix]config` (`config_name`, `config_value`) VALUES ('moderation', '1,0,0,1;1,1,0,1;');";
+				$Qry4 = " ALTER TABLE `$dbsettings[prefix]banned` CHANGE `who` `who` VARCHAR( 64 ) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL ,
+							CHANGE `who2` `who2` VARCHAR( 64 ) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL ,
+							CHANGE `author` `author` VARCHAR( 64 ) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL ,
+							CHANGE `email` `email` VARCHAR( 64 ) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL ";
+				$Qry5 = "UPDATE `$dbsettings[prefix]config` SET `config_value` = '1,0,0,1,1;1,1,0,1,1;1;' WHERE `$dbsettings[prefix]config`.`config_name` = 'moderation';";
+				$Qry6 = "ALTER TABLE `$dbsettings[prefix]planets` CHANGE `small_protection_shield` `small_protection_shield` TINYINT( 1 ) NOT NULL DEFAULT '0', CHANGE `big_protection_shield` `big_protection_shield` TINYINT( 1 ) NOT NULL DEFAULT '0'";
+				$Qry7 = "UPDATE `$dbsettings[prefix]rw` SET `$dbsettings[prefix]rw`.`owners` = CONCAT(id_owner1,\",\",id_owner2)";
+				$Qry8 = "ALTER TABLE `$dbsettings[prefix]rw`
+  							DROP `id_owner1`,
+  							DROP `id_owner2`;";
+				$Qry9 = "ALTER TABLE $dbsettings[prefix]galaxy ADD `invisible_start_time` int(11) NOT NULL default '0'; ";
+				$Qry10 = "ALTER TABLE `$dbsettings[prefix]users` DROP `rpg_espion`,DROP `rpg_constructeur`,DROP `rpg_scientifique`,DROP `rpg_commandant`,DROP `rpg_stockeur`,DROP `rpg_defenseur`,DROP `rpg_destructeur`,DROP `rpg_general`,DROP `rpg_empereur`;";
+				$Qry11 = "DROP TABLE `$dbsettings[prefix]config`";
+
+				switch($system_version)
 				{
-					case'2.3':
-						UpdateMoonID();
-						$QrysArray	= array($Qry1, $Qry2, $Qry3, $Qry4, $Qry5, $Qry6, $Qry7, $Qry8, $Qry9, $Qry10, $Qry11, $Qry12, $Qry13,
-											$Qry14, $Qry15, $Qry16, $Qry17, $Qry18, $Qry19, $Qry20, $Qry21, $Qry22, $Qry23, $Qry25, $Qry26,
-											$Qry27, $Qry28, $Qry29, $Qry30, $Qry31, $Qry32, $Qry33);
+					case '2.9.0':
+					case '2.9.1':
+					case '2.9.2':
+						$QrysArray	= array($Qry1, $Qry2, $Qry3, $Qry4, $Qry5, $Qry6, $Qry7, $Qry8, $Qry9, $Qry10, $Qry11);
+						migrate_to_xml();
 					break;
-					case'2.4':
-						UpdateMoonID();
-						$QrysArray	= array($Qry3, $Qry4, $Qry5, $Qry6, $Qry7, $Qry8, $Qry9, $Qry10, $Qry11, $Qry12, $Qry13,
-											$Qry14, $Qry15, $Qry16, $Qry17, $Qry18, $Qry19, $Qry20, $Qry21, $Qry22, $Qry23,
-											$Qry25, $Qry26, $Qry27, $Qry28, $Qry29, $Qry30, $Qry31, $Qry32, $Qry33);
+					case '2.9.3':
+						$QrysArray	= array($Qry1, $Qry2, $Qry6, $Qry7, $Qry8, $Qry9, $Qry10, $Qry11);
+						migrate_to_xml();
 					break;
-					case'2.5':
-						UpdateMoonID();
-						$QrysArray	= array($Qry16, $Qry17, $Qry18, $Qry19, $Qry20, $Qry21, $Qry22, $Qry23, $Qry25, $Qry26,$Qry27, $Qry28,
-											$Qry29, $Qry30, $Qry31, $Qry32, $Qry33);
+					case '2.9.4':
+					case '2.9.5':
+					case '2.9.6':
+					case '2.9.7':
+					case '2.9.8':
+						$QrysArray	= array($Qry1, $Qry2, $Qry7, $Qry8, $Qry9, $Qry10, $Qry11);
+						migrate_to_xml();
 					break;
-					case( ( $_POST[modo] == '2.6' ) or ( $_POST[modo] == '2.7' ) ):
-						UpdateMoonID();
-						$QrysArray	= array($Qry18, $Qry19, $Qry20, $Qry21, $Qry22, $Qry23, $Qry25, $Qry26, $Qry27, $Qry28, $Qry29, $Qry30, $Qry31, $Qry32, $Qry33);
+					case '2.9.9':
+						$QrysArray	= array($Qry1, $Qry2, $Qry9, $Qry10, $Qry11 );
+						migrate_to_xml();
 					break;
-					case'2.8':
-						UpdateMoonID();
-						$QrysArray	= array($Qry18, $Qry19, $Qry20, $Qry21, $Qry22, $Qry23, $Qry24, $Qry25, $Qry26, $Qry27, $Qry28, $Qry29, $Qry30, $Qry31, $Qry32, $Qry33);
+					case '2.9.10':
+					case '2.9.11':
+					case '2.10.0':
+						$QrysArray	= array($Qry1, $Qry2 , $Qry10, $Qry11);
+						migrate_to_xml();
 					break;
-					case'2.9':
-						UpdateMoonID();
-						$QrysArray	= array($Qry18, $Qry19, $Qry28, $Qry29, $Qry30, $Qry31, $Qry32, $Qry33);
-					break;
-					case( ( $_POST[modo] == '2.9.1' ) or ( $_POST[modo] == '2.9.2' ) or ( $_POST[modo] == '2.9.3' ) ):
-						$QrysArray	= array($Qry18, $Qry19, $Qry30, $Qry31, $Qry32, $Qry33);
-					break;
-					case'2.9.4':
-						$QrysArray	= array($Qry18, $Qry19, $Qry33);
-					break;
-					case( ( $_POST[modo] == '2.9.5' ) or ( $_POST[modo] == '2.9.6' ) ):
-						$QrysArray	= array($Qry18, $Qry19);
+					default:
+						message("&iexcl;La versi&oacute;n de tu proyecto no es compatible con XG Proyect, o estas intentando actualizar desde una versi&oacute;n m&aacute;s nueva!", "", "", FALSE, FALSE);
 					break;
 				}
 
-				foreach ( $QrysArray as $DoQuery)
+				foreach ( $QrysArray as $DoQuery )
 				{
 					mysql_query($DoQuery);
 				}
 
-				message("XG Proyect finalizó la actualización con éxito, para finalizar borra el directorio install y luego haz <a href=\"./../\">click aqui</a>", "", "", false, false);
+				message("XG Proyect finaliz&oacute; la actualizaci&oacute;n con &eacute;xito, para finalizar borra el directorio install y luego haz <a href=\"./../\">click aqui</a>", "", "", FALSE, FALSE);
 			}
 		}
 		else
-			$frame  = parsetemplate(gettemplate('install/ins_update'), false);
+		{
+			$parse['version']	=	SYSTEM_VERSION;
+			$frame  = parsetemplate(gettemplate('install/ins_update'), $parse);
+		}
 		break;
 	default:
 }
 $parse['ins_state']    = $Page;
 $parse['ins_page']     = $frame;
 $parse['dis_ins_btn']  = "?mode=$Mode&page=$nextpage";
-display (parsetemplate (gettemplate('install/ins_body'), $parse), false, '', true, false);
+display (parsetemplate (gettemplate('install/ins_body'), $parse), FALSE, '', TRUE, FALSE);
 ?>
\ No newline at end of file
diff --git a/install/migration.php b/install/migration.php
new file mode 100644
index 0000000..40dedba
--- /dev/null
+++ b/install/migration.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2012
+ */
+
+function migrate_to_xml ()
+{
+	$query = doquery("SELECT * FROM {{table}}",'config');
+
+	$search		=	array	(
+								'¡',
+								'¿',
+								'º',
+								'ª',
+								'"',
+								'#',
+								'$',
+								'%',
+								'(',
+								')',
+								'¬',
+								'€',
+								'|',
+								'~'
+							);
+	$replace	=	array	(
+								'&#161;',
+								'&#191;',
+								'&#176;',
+								'&#170;',
+								'&#34;',
+								'&#35;',
+								'&#36;',
+								'&#37;',
+								'&#40;',
+								'&#41;',
+								'&#172;',
+								'&#8364;',
+								'&#124;',
+								'&#126;'
+							);
+
+	while ($row = mysql_fetch_assoc($query))
+	{
+		if ( $row['config_name'] != 'BuildLabWhileRun' )
+		{
+			update_config ( strtolower ( $row['config_name'] ) , str_replace ( $search , $replacement , $row['config_value'] )  );
+		}
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/js/animatedcollapse-min.js b/js/animatedcollapse-min.js
new file mode 100644
index 0000000..a1a7ca2
--- /dev/null
+++ b/js/animatedcollapse-min.js
@@ -0,0 +1 @@
+var animatedcollapse={divholders:{},divgroups:{},lastactiveingroup:{},preloadimages:[],show:function(b){if(typeof b=="object"){for(var a=0;a<b.length;a++){this.showhide(b[a],"show")}}else{this.showhide(b,"show")}},hide:function(b){if(typeof b=="object"){for(var a=0;a<b.length;a++){this.showhide(b[a],"hide")}}else{this.showhide(b,"hide")}},toggle:function(a){if(typeof a=="object"){a=a[0]}this.showhide(a,"toggle")},addDiv:function(b,a){this.divholders[b]=({id:b,$divref:null,attrs:a});this.divholders[b].getAttr=function(d){var c=new RegExp(d+"=([^,]+)","i");return(c.test(this.attrs)&&parseInt(RegExp.$1)!=0)?RegExp.$1:null};this.currentid=b;return this},showhide:function(d,c){var a=this.divholders[d].$divref;if(this.divholders[d]&&a.length==1){var b=this.divgroups[a.attr("groupname")];if(a.attr("groupname")&&b.count>1&&(c=="show"||c=="toggle"&&a.css("display")=="none")){if(b.lastactivedivid&&b.lastactivedivid!=d){this.slideengine(b.lastactivedivid,"hide")}this.slideengine(d,"show");b.lastactivedivid=d}else{this.slideengine(d,c)}}},slideengine:function(e,d){var a=this.divholders[e].$divref;var b=this.divholders[e].$togglerimage;if(this.divholders[e]&&a.length==1){var c={height:d};if(a.attr("fade")){c.opacity=d}a.animate(c,a.attr("speed")?parseInt(a.attr("speed")):500,function(){if(b){b.attr("src",(a.css("display")=="none")?b.data("srcs").closed:b.data("srcs").open)}if(animatedcollapse.ontoggle){try{animatedcollapse.ontoggle(jQuery,a.get(0),a.css("display"))}catch(f){alert('An error exists inside your "ontoggle" function:\n\n'+f+"\n\nAborting execution of function.")}}});return false}},generatemap:function(){var b={};for(var a=0;a<arguments.length;a++){if(arguments[a][1]!=null){b[arguments[a][0]]=arguments[a][1]}}return b},init:function(){var a=this;jQuery(document).ready(function(e){animatedcollapse.ontoggle=animatedcollapse.ontoggle||null;var f=animatedcollapse.urlparamselect();var b=a.getCookie("acopendivids");var d=a.getCookie("acgroupswithpersist");if(b!=null){b=(b=="nada")?[]:b.split(",")}d=(d==null||d=="nada")?[]:d.split(",");jQuery.each(a.divholders,function(){this.$divref=e("#"+this.id);if((this.getAttr("persist")||jQuery.inArray(this.getAttr("group"),d)!=-1)&&b!=null){var h=(jQuery.inArray(this.id,b)!=-1)?"block":"none"}else{var h=this.getAttr("hide")?"none":null}if(f[0]=="all"||jQuery.inArray(this.id,f)!=-1){h="block"}else{if(f[0]=="none"){h="none"}}this.$divref.css(a.generatemap(["height",this.getAttr("height")],["display",h]));this.$divref.attr(a.generatemap(["groupname",this.getAttr("group")],["fade",this.getAttr("fade")],["speed",this.getAttr("speed")]));if(this.getAttr("group")){var g=a.divgroups[this.getAttr("group")]||(a.divgroups[this.getAttr("group")]={});g.count=(g.count||0)+1;if(jQuery.inArray(this.id,f)!=-1){g.lastactivedivid=this.id;g.overridepersist=1}if(!g.lastactivedivid&&this.$divref.css("display")!="none"||h=="block"&&typeof g.overridepersist=="undefined"){g.lastactivedivid=this.id}this.$divref.css({display:"none"})}});jQuery.each(a.divgroups,function(){if(this.lastactivedivid&&f[0]!="none"){a.divholders[this.lastactivedivid].$divref.show()}});if(animatedcollapse.ontoggle){jQuery.each(a.divholders,function(){animatedcollapse.ontoggle(jQuery,this.$divref.get(0),this.$divref.css("display"))})}var c=e("a[rel]").filter('[rel^="collapse["], [rel^="expand["], [rel^="toggle["]');c.each(function(){this._divids=this.getAttribute("rel").replace(/(^\w+)|(\s+)/g,"").replace(/[\[\]']/g,"");if(this.getElementsByTagName("img").length==1&&a.divholders[this._divids]){animatedcollapse.preloadimage(this.getAttribute("data-openimage"),this.getAttribute("data-closedimage"));$togglerimage=e(this).find("img").eq(0).data("srcs",{open:this.getAttribute("data-openimage"),closed:this.getAttribute("data-closedimage")});a.divholders[this._divids].$togglerimage=e(this).find("img").eq(0);a.divholders[this._divids].$togglerimage.attr("src",(a.divholders[this._divids].$divref.css("display")=="none")?$togglerimage.data("srcs").closed:$togglerimage.data("srcs").open)}e(this).click(function(){var g=this.getAttribute("rel");var h=(this._divids=="")?[]:this._divids.split(",");if(h.length>0){animatedcollapse[/expand/i.test(g)?"show":/collapse/i.test(g)?"hide":"toggle"](h);return false}})});e(window).bind("unload",function(){a.uninit()})})},uninit:function(){var b="",a="";jQuery.each(this.divholders,function(){if(this.$divref.css("display")!="none"){b+=this.id+","}if(this.getAttr("group")&&this.getAttr("persist")){a+=this.getAttr("group")+","}});b=(b=="")?"nada":b.replace(/,$/,"");a=(a=="")?"nada":a.replace(/,$/,"");this.setCookie("acopendivids",b);this.setCookie("acgroupswithpersist",a)},getCookie:function(a){var b=new RegExp(a+"=[^;]*","i");if(document.cookie.match(b)){return document.cookie.match(b)[0].split("=")[1]}return null},setCookie:function(b,c,d){if(typeof d!="undefined"){var a=new Date();a.setDate(a.getDate()+d);document.cookie=b+"="+c+"; path=/; expires="+a.toGMTString()}else{document.cookie=b+"="+c+"; path=/"}},urlparamselect:function(){window.location.search.match(/expanddiv=([\w\-_,]+)/i);return(RegExp.$1!="")?RegExp.$1.split(","):[]},preloadimage:function(){var a=this.preloadimages;for(var b=0;b<arguments.length;b++){if(arguments[b]&&arguments[b].length>0){a[a.length]=new Image();a[a.length-1].src=arguments[b]}}}};
\ No newline at end of file
diff --git a/scripts/animatedcollapse.js b/js/animatedcollapse.js
similarity index 100%
rename from scripts/animatedcollapse.js
rename to js/animatedcollapse.js
diff --git a/js/cntchar-min.js b/js/cntchar-min.js
new file mode 100644
index 0000000..3eedbbf
--- /dev/null
+++ b/js/cntchar-min.js
@@ -0,0 +1 @@
+function contar(b,a){n=document.forms[b][a].value.length;t=5000;if(n>t){document.forms[b][a].value=document.forms[b][a].value.substring(0,t)}else{document.forms[b]["result"].value=t-n}}var x="";var e=null;function cntchar(a){if(window.document.forms[0].text.value.length>a){window.document.forms[0].text.value=x}else{x=window.document.forms[0].text.value}if(e==null){e=document.getElementById("cntChars")}else{e.childNodes[0].data=window.document.forms[0].text.value.length}};
\ No newline at end of file
diff --git a/scripts/cntchar.js b/js/cntchar.js
similarity index 100%
rename from scripts/cntchar.js
rename to js/cntchar.js
diff --git a/js/filterlist-min.js b/js/filterlist-min.js
new file mode 100644
index 0000000..cf39f1f
--- /dev/null
+++ b/js/filterlist-min.js
@@ -0,0 +1 @@
+function filterlist(a){this.selectobj=a;this.flags="i";this.match_text=true;this.match_value=false;this.show_debug=false;this.init=function(){if(!this.selectobj){return this.debug("selectobj not defined")}if(!this.selectobj.options){return this.debug("selectobj.options not defined")}this.optionscopy=new Array();if(this.selectobj&&this.selectobj.options){for(var b=0;b<this.selectobj.options.length;b++){this.optionscopy[b]=new Option();this.optionscopy[b].text=a.options[b].text;if(a.options[b].value){this.optionscopy[b].value=a.options[b].value}else{this.optionscopy[b].value=a.options[b].text}}}};this.reset=function(){this.set("")};this.set=function(g){var b=0,c=0,f,h;if(!this.selectobj){return this.debug("selectobj not defined")}if(!this.selectobj.options){return this.debug("selectobj.options not defined")}this.selectobj.options.length=0;try{f=new RegExp(g,this.flags)}catch(h){if(typeof this.hook=="function"){this.hook()}return}for(b=0;b<this.optionscopy.length;b++){var d=this.optionscopy[b];if((this.match_text&&f.test(d.text))||(this.match_value&&f.test(d.value))){this.selectobj.options[c++]=new Option(d.text,d.value,false)}}if(typeof this.hook=="function"){this.hook()}};this.set_ignore_case=function(b){if(b){this.flags="i"}else{this.flags=""}};this.debug=function(b){if(this.show_debug){alert("FilterList: "+b)}};this.init()};
\ No newline at end of file
diff --git a/scripts/filterlist.js b/js/filterlist.js
similarity index 100%
rename from scripts/filterlist.js
rename to js/filterlist.js
diff --git a/js/flotten-min.js b/js/flotten-min.js
new file mode 100644
index 0000000..0928304
--- /dev/null
+++ b/js/flotten-min.js
@@ -0,0 +1 @@
+function speed(){var a;a=document.getElementsByName("speed")[0].value;return(a)}function target(){var c;var b;var a;c=document.getElementsByName("galaxy")[0].value;b=document.getElementsByName("system")[0].value;a=document.getElementsByName("planet")[0].value;return("["+c+":"+b+":"+a+"]")}function setACS(a){document.getElementsByName("fleet_group")[0].value=a;return}function setACS_target(a){document.getElementsByName("acs_target_mr")[0].value=a;return}function setTarget(c,d,a,b){document.getElementsByName("galaxy")[0].value=c;document.getElementsByName("system")[0].value=d;document.getElementsByName("planet")[0].value=a;document.getElementsByName("planettype")[0].value=b}function setMission(a){document.getElementsByName("order")[0].selectedIndex=a;return}function setUnion(a){document.getElementsByName("union2")[0].selectedIndex=a}function setTargetLong(d,f,a,b,e,c){setTarget(d,f,a,b);setMission(e);setUnions(c)}function min(d,c){d=d*1;c=c*1;if(d>c){return c}else{return d}}function maxspeed(){var a=1000000000;for(i=200;i<220;i++){if(document.getElementsByName("ship"+i)[0]){if((document.getElementsByName("speed"+i)[0].value*1)>=1&&(document.getElementsByName("ship"+i)[0].value*1)>=1){a=min(a,document.getElementsByName("speed"+i)[0].value)}}}return(a)}function distance(){var e;var c;var a;var f;var d;var b;var g;e=document.getElementsByName("thisgalaxy")[0].value;c=document.getElementsByName("thissystem")[0].value;a=document.getElementsByName("thisplanet")[0].value;f=document.getElementsByName("galaxy")[0].value;d=document.getElementsByName("system")[0].value;b=document.getElementsByName("planet")[0].value;g=0;if((f-e)!=0){g=Math.abs(f-e)*20000}else{if((d-c)!=0){g=Math.abs(d-c)*5*19+2700}else{if((b-a)!=0){g=Math.abs(b-a)*5+1000}else{g=5}}}return(g)}function duration(){var a;a=document.getElementsByName("speedfactor")[0].value;msp=maxspeed();sp=speed();dist=distance();ret=Math.round(((35000/sp*Math.sqrt(dist*10/msp)+10)/a));return ret}function consumption2(){var a;var b=0;for(i=200;i<220;i++){if(document.getElementsByName("ship"+i)[0]){b=b+document.getElementsByName("consumption"+i)[0].value*document.getElementsByName("ship"+i)[0].value}}speedfactor=document.getElementsByName("speedfactor")[0].value;msp=maxspeed();sp=speed();dist=distance();a=Math.round(b*dist/35000*((sp/10)+1)*((sp/10)+1))+1;return(a)}function consumption(){var a=0;var d=0;var b;var c;msp=maxspeed();sp=speed();dist=distance();dur=duration();speedfactor=document.getElementsByName("speedfactor")[0].value;for(c=200;c<220;c++){if(document.getElementsByName("ship"+c)[0]){shipspeed=document.getElementsByName("speed"+c)[0].value;spd=35000/(dur*speedfactor-10)*Math.sqrt(dist*10/shipspeed);d=document.getElementsByName("consumption"+c)[0].value*document.getElementsByName("ship"+c)[0].value;a+=d*dist/35000*((spd/10)+1)*((spd/10)+1)}}a=Math.round(a)+1;return(a)}function probeConsumption(){var a=0;var d=0;var b;var c;msp=maxspeed();sp=speed();dist=distance();dur=duration();speedfactor=document.getElementsByName("speedfactor")[0].value;if(document.getElementsByName("ship210")[0]){shipspeed=document.getElementsByName("speed210")[0].value;spd=35000/(dur*speedfactor-10)*Math.sqrt(dist*10/shipspeed);d=document.getElementsByName("consumption210")[0].value*document.getElementsByName("ship210")[0].value;a+=d*dist/35000*((spd/10)+1)*((spd/10)+1)}a=Math.round(a)+1;return(a)}function unusedProbeStorage(){var b=document.getElementsByName("capacity210")[0].value*document.getElementsByName("ship210")[0].value;var a=b-probeConsumption();return(a>0)?a:0}function storage(){var a=0;for(i=200;i<300;i++){if(document.getElementsByName("ship"+i)[0]){if((document.getElementsByName("ship"+i)[0].value*1)>=1){a+=document.getElementsByName("ship"+i)[0].value*document.getElementsByName("capacity"+i)[0].value}}}a=a*getStorageFaktor();a-=consumption();if(document.getElementsByName("ship210")[0]){a-=unusedProbeStorage()}return(a)}function fleetInfo(){document.getElementById("speed").innerHTML=speed()*10+"%";document.getElementById("target").innerHTML=target();document.getElementById("distance").innerHTML=distance();var e=duration();var b=Math.floor(e/3600);e-=b*3600;var d=Math.floor(e/60);e-=d*60;if(d<10){d="0"+d}if(e<10){e="0"+e}document.getElementById("duration").innerHTML=b+":"+d+":"+e+" h";var c=storage();var a=consumption();document.getElementById("maxspeed").innerHTML=tsdpkt(maxspeed());if(c>=0){document.getElementById("consumption").innerHTML='<font color="lime">'+a+"</font>";document.getElementById("storage").innerHTML='<font color="lime">'+c+"</font>"}else{document.getElementById("consumption").innerHTML='<font color="red">'+a+"</font>";document.getElementById("storage").innerHTML='<font color="red">'+c+"</font>"}calculateTransportCapacity()}function shortInfo(){document.getElementById("distance").innerHTML=tsdpkt(distance());var e=duration();var b=Math.floor(e/3600);e-=b*3600;var d=Math.floor(e/60);e-=d*60;if(d<10){d="0"+d}if(e<10){e="0"+e}document.getElementById("duration").innerHTML=b+":"+d+":"+e+" h";var c=storage();var a=consumption();document.getElementById("maxspeed").innerHTML=tsdpkt(maxspeed());if(c>=0){document.getElementById("consumption").innerHTML='<font color="lime">'+tsdpkt(a)+"</font>";document.getElementById("storage").innerHTML='<font color="lime">'+tsdpkt(c)+"</font>"}else{document.getElementById("consumption").innerHTML='<font color="red">'+tsdpkt(a)+"</font>";document.getElementById("storage").innerHTML='<font color="red">'+tsdpkt(c)+"</font>"}}function setResource(b,a){if(document.getElementsByName(b)[0]){document.getElementsByName("resource"+b)[0].value=a}}function maxResource(b){var j=parseInt(document.getElementsByName("thisresource"+b)[0].value);var c=parseInt(document.getElementsByName("resource"+b)[0].value);if(isNaN(c)){c=0}if(isNaN(j)){j=0}var g=storage();if(b==3){if((j-consumption())<0){j=0}else{j-=consumption()}}var h=document.getElementsByName("resource1")[0].value;var e=document.getElementsByName("resource2")[0].value;var a=document.getElementsByName("resource3")[0].value;if(isNaN(h)){h=0}if(isNaN(e)){e=0}if(isNaN(a)){a=0}var f=Math.max(g-h-e-a,0);var d=Math.min(f+c,j);if(document.getElementsByName("resource"+b)[0]){document.getElementsByName("resource"+b)[0].value=d}calculateTransportCapacity()}function maxResources(){var f;var e=storage();var c=Math.round(document.getElementsByName("thisresource1")[0].value);var a=Math.round(document.getElementsByName("thisresource2")[0].value);var d=Math.round(document.getElementsByName("thisresource3")[0].value-consumption());var b=e-c-a-d;if(b<0){c=Math.min(c,e);a=Math.min(a,e-c);d=Math.min(d,e-c-a)}document.getElementsByName("resource1")[0].value=Math.max(c,0);document.getElementsByName("resource2")[0].value=Math.max(a,0);document.getElementsByName("resource3")[0].value=Math.max(d,0);calculateTransportCapacity()}function maxShip(a){if(document.getElementsByName(a)[0]){document.getElementsByName(a)[0].value=document.getElementsByName("max"+a)[0].value}}function maxShips(){var a;for(i=200;i<220;i++){a="ship"+i;maxShip(a)}}function noShip(a){if(document.getElementsByName(a)[0]){document.getElementsByName(a)[0].value=0}}function noShips(){var a;for(i=200;i<220;i++){a="ship"+i;noShip(a)}}function calculateTransportCapacity(){var c=Math.round(Math.abs(document.getElementsByName("resource1")[0].value));var b=Math.round(Math.abs(document.getElementsByName("resource2")[0].value));var a=Math.round(Math.abs(document.getElementsByName("resource3")[0].value));transportCapacity=storage()-c-b-a;if(transportCapacity<0){document.getElementById("remainingresources").innerHTML="<font color=red>"+transportCapacity+"</font>"}else{document.getElementById("remainingresources").innerHTML="<font color=lime>"+transportCapacity+"</font>"}return transportCapacity}function getLayerRef(d,b){if(!b){b=window.document}if(b.layers){for(var c=0;c<b.layers.length;c++){if(b.layers[c].id==d){return b.layers[c]}}for(var c=0;c<b.layers.length;c++){var a=getLayerRef(d,b.layers[c].document);if(a){return a}}return null}else{if(b.all){return b.all[d]}else{if(b.getElementById){return b.getElementById(d)}}}}function setVisibility(b,a){if(document.layers){b.visibility=(a==true)?"show":"hide"}else{b.style.visibility=(a==true)?"visible":"hidden"}}function setVisibilityForDivByPrefix(b,f,e){if(!e){e=window.document}if(document.layers){for(var a=0;a<e.layers.length;a++){if(e.layers[a].id.substr(0,b.length)==b){setVisibility(e.layers[l],f)}setVisibilityForDivByPrefix(b,f,e.layers[a].document)}}else{if(document.all){var c=document.all.tags("div");for(a=0;a<c.length;a++){if(c[a].id.substr(0,b.length)==b){setVisibility(document.all.tags("div")[a].visible)}}}else{if(document.getElementsByTagName){var c=document.getElementsByTagName("div");for(a=0;a<c.length;a++){if(c[a].id.substr(0,b.length)==b){setVisibility(c[a].visible)}}}}}}function setPlanet(a){var b=a.split(":");document.getElementsByName("galaxy")[0].value=b[0];document.getElementsByName("system")[0].value=b[1];document.getElementsByName("planet")[0].value=b[2];document.getElementsByName("planettype")[0].value=b[3];setMission(b[4])}function setUnions(b){galaxy=document.getElementsByName("galaxy")[0].value;system=document.getElementsByName("system")[0].value;planet=document.getElementsByName("planet")[0].value;planettype=document.getElementsByName("planettype")[0].value;thisgalaxy=document.getElementsByName("thisgalaxy")[0].value;thissystem=document.getElementsByName("thissystem")[0].value;thisplanet=document.getElementsByName("thisplanet")[0].value;thisplanettype=document.getElementsByName("thisplanettype")[0].value;spd=document.getElementsByName("speed")[0].value;speedfactor=document.getElementsByName("speedfactor")[0].value;for(i=0;i<b;i++){var a=document.getElementById("union"+i).innerHTML;time=document.getElementsByName("union"+i+"time")[0].value;targetgalaxy=document.getElementsByName("union"+i+"galaxy")[0].value;targetsystem=document.getElementsByName("union"+i+"system")[0].value;targetplanet=document.getElementsByName("union"+i+"planet")[0].value;targetplanettype=document.getElementsByName("union"+i+"planettype")[0].value;if(targetgalaxy==galaxy&&targetsystem==system&&targetplanet==planet&&targetplanettype==planettype){inSpeedLimit=isInSpeedLimit(flightTime(thisgalaxy,thissystem,thisplanet,targetgalaxy,targetsystem,targetplanet,spd,speedfactor),time);if(inSpeedLimit==2){document.getElementById("union"+i).innerHTML='<font color="lime">'+a+"</font>"}else{if(inSpeedLimit==1){document.getElementById("union"+i).innerHTML='<font color="orange">'+a+"</font>"}else{document.getElementById("union"+i).innerHTML='<font color="red">'+a+"</font>"}}}else{document.getElementById("union"+i).innerHTML='<font color="#00a0ff">'+a+"</font>"}}}function isInSpeedLimit(a,c){var b=new Date();b=Math.round(b/1000);if(a<((c-b)*(1+0.5))){return 2}else{if(a<((c-b)*1)){return 1}else{return 0}}}function flightTime(a,b,d,h,f,j,g,c,e){if((a-h)!=0){dist=Math.abs(a-h)*20000}else{if((b-f)!=0){dist=Math.abs(b-f)*5*19+2700}else{if((d-j)!=0){dist=Math.abs(d-j)*5+1000}else{dist=5}}}return Math.round(((35000/g*Math.sqrt(dist*10/c)+10)/e))}function showCoords(){document.getElementsByName("speed")[0].disabled=false;document.getElementsByName("galaxy")[0].disabled=false;document.getElementsByName("system")[0].disabled=false;document.getElementsByName("planet")[0].disabled=false;document.getElementsByName("planettype")[0].disabled=false;document.getElementsByName("shortlinks")[0].disabled=false}function hideCoords(){document.getElementsByName("speed")[0].disabled=true;document.getElementsByName("galaxy")[0].disabled=true;document.getElementsByName("system")[0].disabled=true;document.getElementsByName("planet")[0].disabled=true;document.getElementsByName("planettype")[0].disabled=true;document.getElementsByName("shortlinks")[0].disabled=true}function showOrders(){document.getElementsByName("order")[0].disabled=false;return}function hideOrders(){document.getElementsByName("order")[0].disabled=true}function showResources(){document.getElementsByName("resource1")[0].disabled=false;document.getElementsByName("resource2")[0].disabled=false;document.getElementsByName("resource3")[0].disabled=false;document.getElementsByName("holdingtime")[0].disabled=false}function hideResources(){document.getElementsByName("resource1")[0].disabled=true;document.getElementsByName("resource2")[0].disabled=true;document.getElementsByName("resource3")[0].disabled=true;document.getElementsByName("holdingtime")[0].disabled=true}function setShips(t,s,p,n,q,o,m,k,j,h,g,f,d,e,c,b,a){setNumber("202",t);setNumber("203",s);setNumber("204",p);setNumber("205",n);setNumber("206",q);setNumber("207",o);setNumber("208",m);setNumber("209",k);setNumber("210",j);setNumber("211",h);setNumber("213",g);setNumber("214",f);setNumber("215",d);setNumber("216",e);setNumber("217",c);setNumber("218",b);setNumber("219",a)}function setNumber(a,b){if(typeof document.getElementsByName("ship"+a)[0]!="undefined"){document.getElementsByName("ship"+a)[0].value=b}}function tsdpkt(a){r="";vz="";if(a<0){vz="-"}a=abs(a);r=a%1000;while(a>=1000){k1="";if((a%1000)<100){k1="0"}if((a%1000)<10){k1="00"}if((a%1000)==0){k1="00"}a=abs((a-(a%1000))/1000);r=a%1000+"."+k1+r}r=vz+r;return r}function abs(b){if(b<0){return -b}return b};
\ No newline at end of file
diff --git a/scripts/flotten.js b/js/flotten.js
similarity index 99%
rename from scripts/flotten.js
rename to js/flotten.js
index 64175e2..4fc8c29 100644
--- a/scripts/flotten.js
+++ b/js/flotten.js
@@ -25,7 +25,7 @@ function setACS(id) {
 function setACS_target(tacs) {
     document.getElementsByName('acs_target_mr')[0].value = tacs;
 	return;
-} 
+}
 
 function setTarget(galaxy, solarsystem, planet, planettype) {
 	document.getElementsByName('galaxy')[0].value = galaxy;
@@ -314,7 +314,7 @@ function maxResource(id) {
 	}
 
 var storCap = storage();
-    if (id==3){        
+    if (id==3){
         if ((thisresource - consumption()) < 0)
             thisresource = 0;
         else
@@ -619,11 +619,6 @@ function setShips(s16,s17,s18,s19,s20,s21,s22,s23,s24,s25,s27,s28,s29,s30,s31,s3
 	setNumber('213',s27);
 	setNumber('214',s28);
 	setNumber('215',s29);
-	setNumber('216',s30);
-	setNumber('217',s31);
-	setNumber('218',s32);
-	setNumber('219',s33);
-
 }
 
 function setNumber(name,number){
diff --git a/styles/skins/NewSkins/img/index.html b/js/index.html
similarity index 100%
rename from styles/skins/NewSkins/img/index.html
rename to js/index.html
diff --git a/js/ocnt-min.js b/js/ocnt-min.js
new file mode 100644
index 0000000..2dc2a99
--- /dev/null
+++ b/js/ocnt-min.js
@@ -0,0 +1 @@
+function t(){v=new Date();n=new Date();o=new Date();for(cn=1;cn<=anz;cn++){bxx=document.getElementById("bxx"+cn);ss=bxx.title;s=ss-Math.round((n.getTime()-v.getTime())/1000);m=0;h=0;if(s<0){bxx.innerHTML="-"}else{if(s>59){m=Math.floor(s/60);s=s-m*60}if(m>59){h=Math.floor(m/60);m=m-h*60}if(s<10){s="0"+s}if(m<10){m="0"+m}bxx.innerHTML=h+":"+m+":"+s+""}bxx.title=bxx.title-1}window.setTimeout("t();",999)};
\ No newline at end of file
diff --git a/scripts/ocnt.js b/js/ocnt.js
similarity index 100%
rename from scripts/ocnt.js
rename to js/ocnt.js
diff --git a/js/overlib-min.js b/js/overlib-min.js
new file mode 100644
index 0000000..b95a0c4
--- /dev/null
+++ b/js/overlib-min.js
@@ -0,0 +1 @@
+var olLoaded=0;var pmStart=10000000;var pmUpper=10001000;var pmCount=pmStart+1;var pmt="";var pms=new Array();var olInfo=new Info("4.21",1);var FREPLACE=0;var FBEFORE=1;var FAFTER=2;var FALTERNATE=3;var FCHAIN=4;var olHideForm=0;var olHautoFlag=0;var olVautoFlag=0;var hookPts=new Array(),postParse=new Array(),cmdLine=new Array(),runTime=new Array();registerCommands("donothing,inarray,caparray,sticky,background,noclose,caption,left,right,center,offsetx,offsety,fgcolor,bgcolor,textcolor,capcolor,closecolor,width,border,cellpad,status,autostatus,autostatuscap,height,closetext,snapx,snapy,fixx,fixy,relx,rely,fgbackground,bgbackground,padx,pady,fullhtml,above,below,capicon,textfont,captionfont,closefont,textsize,captionsize,closesize,timeout,function,delay,hauto,vauto,closeclick,wrap,followmouse,mouseoff,closetitle,cssoff,compatmode,cssclass,fgclass,bgclass,textfontclass,captionfontclass,closefontclass");if(typeof ol_fgcolor=="undefined"){var ol_fgcolor="#202427"}if(typeof ol_bgcolor=="undefined"){var ol_bgcolor="#202427"}if(typeof ol_textcolor=="undefined"){var ol_textcolor="#FFFFFF"}if(typeof ol_capcolor=="undefined"){var ol_capcolor="#FFFFFF"}if(typeof ol_closecolor=="undefined"){var ol_closecolor="#9999FF"}if(typeof ol_textfont=="undefined"){var ol_textfont="Verdana,Arial,Helvetica"}if(typeof ol_captionfont=="undefined"){var ol_captionfont="Verdana,Arial,Helvetica"}if(typeof ol_closefont=="undefined"){var ol_closefont="Verdana,Arial,Helvetica"}if(typeof ol_textsize=="undefined"){var ol_textsize="1"}if(typeof ol_captionsize=="undefined"){var ol_captionsize="1"}if(typeof ol_closesize=="undefined"){var ol_closesize="1"}if(typeof ol_width=="undefined"){var ol_width="100"}if(typeof ol_border=="undefined"){var ol_border="1"}if(typeof ol_cellpad=="undefined"){var ol_cellpad=1}if(typeof ol_offsetx=="undefined"){var ol_offsetx=10}if(typeof ol_offsety=="undefined"){var ol_offsety=10}if(typeof ol_text=="undefined"){var ol_text="Default Text"}if(typeof ol_cap=="undefined"){var ol_cap=""}if(typeof ol_sticky=="undefined"){var ol_sticky=0}if(typeof ol_background=="undefined"){var ol_background=""}if(typeof ol_close=="undefined"){var ol_close="Close"}if(typeof ol_hpos=="undefined"){var ol_hpos=RIGHT}if(typeof ol_status=="undefined"){var ol_status=""}if(typeof ol_autostatus=="undefined"){var ol_autostatus=0}if(typeof ol_height=="undefined"){var ol_height=-1}if(typeof ol_snapx=="undefined"){var ol_snapx=0}if(typeof ol_snapy=="undefined"){var ol_snapy=0}if(typeof ol_fixx=="undefined"){var ol_fixx=-1}if(typeof ol_fixy=="undefined"){var ol_fixy=-1}if(typeof ol_relx=="undefined"){var ol_relx=null}if(typeof ol_rely=="undefined"){var ol_rely=null}if(typeof ol_fgbackground=="undefined"){var ol_fgbackground=""}if(typeof ol_bgbackground=="undefined"){var ol_bgbackground=""}if(typeof ol_padxl=="undefined"){var ol_padxl=1}if(typeof ol_padxr=="undefined"){var ol_padxr=1}if(typeof ol_padyt=="undefined"){var ol_padyt=1}if(typeof ol_padyb=="undefined"){var ol_padyb=1}if(typeof ol_fullhtml=="undefined"){var ol_fullhtml=0}if(typeof ol_vpos=="undefined"){var ol_vpos=BELOW}if(typeof ol_aboveheight=="undefined"){var ol_aboveheight=0}if(typeof ol_capicon=="undefined"){var ol_capicon=""}if(typeof ol_frame=="undefined"){var ol_frame=self}if(typeof ol_timeout=="undefined"){var ol_timeout=0}if(typeof ol_function=="undefined"){var ol_function=null}if(typeof ol_delay=="undefined"){var ol_delay=0}if(typeof ol_hauto=="undefined"){var ol_hauto=0}if(typeof ol_vauto=="undefined"){var ol_vauto=0}if(typeof ol_closeclick=="undefined"){var ol_closeclick=0}if(typeof ol_wrap=="undefined"){var ol_wrap=0}if(typeof ol_followmouse=="undefined"){var ol_followmouse=1}if(typeof ol_mouseoff=="undefined"){var ol_mouseoff=0}if(typeof ol_closetitle=="undefined"){var ol_closetitle="Close"}if(typeof ol_compatmode=="undefined"){var ol_compatmode=0}if(typeof ol_css=="undefined"){var ol_css=CSSOFF}if(typeof ol_fgclass=="undefined"){var ol_fgclass=""}if(typeof ol_bgclass=="undefined"){var ol_bgclass=""}if(typeof ol_textfontclass=="undefined"){var ol_textfontclass=""}if(typeof ol_captionfontclass=="undefined"){var ol_captionfontclass=""}if(typeof ol_closefontclass=="undefined"){var ol_closefontclass=""}if(typeof ol_texts=="undefined"){var ol_texts=new Array("Text 0","Text 1")}if(typeof ol_caps=="undefined"){var ol_caps=new Array("Caption 0","Caption 1")}var o3_text="";var o3_cap="";var o3_sticky=0;var o3_background="";var o3_close="Close";var o3_hpos=RIGHT;var o3_offsetx=2;var o3_offsety=2;var o3_fgcolor="";var o3_bgcolor="";var o3_textcolor="";var o3_capcolor="";var o3_closecolor="";var o3_width=100;var o3_border=1;var o3_cellpad=2;var o3_status="";var o3_autostatus=0;var o3_height=-1;var o3_snapx=0;var o3_snapy=0;var o3_fixx=-1;var o3_fixy=-1;var o3_relx=null;var o3_rely=null;var o3_fgbackground="";var o3_bgbackground="";var o3_padxl=0;var o3_padxr=0;var o3_padyt=0;var o3_padyb=0;var o3_fullhtml=0;var o3_vpos=BELOW;var o3_aboveheight=0;var o3_capicon="";var o3_textfont="Verdana,Arial,Helvetica";var o3_captionfont="Verdana,Arial,Helvetica";var o3_closefont="Verdana,Arial,Helvetica";var o3_textsize="1";var o3_captionsize="1";var o3_closesize="1";var o3_frame=self;var o3_timeout=0;var o3_timerid=0;var o3_allowmove=0;var o3_function=null;var o3_delay=0;var o3_delayid=0;var o3_hauto=0;var o3_vauto=0;var o3_closeclick=0;var o3_wrap=0;var o3_followmouse=1;var o3_mouseoff=0;var o3_closetitle="";var o3_compatmode=0;var o3_css=CSSOFF;var o3_fgclass="";var o3_bgclass="";var o3_textfontclass="";var o3_captionfontclass="";var o3_closefontclass="";var o3_x=0;var o3_y=0;var o3_showingsticky=0;var o3_removecounter=0;var over=null;var fnRef,hoveringSwitch=false;var olHideDelay;var isMac=(navigator.userAgent.indexOf("Mac")!=-1);var olOp=(navigator.userAgent.toLowerCase().indexOf("opera")>-1&&document.createTextNode);var olNs4=(navigator.appName=="Netscape"&&parseInt(navigator.appVersion)==4);var olNs6=(document.getElementById)?true:false;var olKq=(olNs6&&/konqueror/i.test(navigator.userAgent));var olIe4=(document.all)?true:false;var olIe5=false;var olIe55=false;var docRoot="document.body";if(olNs4){var oW=window.innerWidth;var oH=window.innerHeight;window.onresize=function(){if(oW!=window.innerWidth||oH!=window.innerHeight){location.reload()}}}if(olIe4){var agent=navigator.userAgent;if(/MSIE/.test(agent)){var versNum=parseFloat(agent.match(/MSIE[ ](\d\.\d+)\.*/i)[1]);if(versNum>=5){olIe5=true;olIe55=(versNum>=5.5&&!olOp)?true:false;if(olNs6){olNs6=false}}}if(olNs6){olIe4=false}}if(document.compatMode&&document.compatMode=="CSS1Compat"){docRoot=((olIe4&&!olOp)?"document.documentElement":docRoot)}if(window.addEventListener){window.addEventListener("load",OLonLoad_handler,false)}else{if(window.attachEvent){window.attachEvent("onload",OLonLoad_handler)}}var capExtent;function overlib(){if(!olLoaded||isExclusive(overlib.arguments)){return true}if(olCheckMouseCapture){olMouseCapture()}if(over){over=(typeof over.id!="string")?o3_frame.document.all.overDiv:over;cClick()}olHideDelay=0;o3_text=ol_text;o3_cap=ol_cap;o3_sticky=ol_sticky;o3_background=ol_background;o3_close=ol_close;o3_hpos=ol_hpos;o3_offsetx=ol_offsetx;o3_offsety=ol_offsety;o3_fgcolor=ol_fgcolor;o3_bgcolor=ol_bgcolor;o3_textcolor=ol_textcolor;o3_capcolor=ol_capcolor;o3_closecolor=ol_closecolor;o3_width=ol_width;o3_border=ol_border;o3_cellpad=ol_cellpad;o3_status=ol_status;o3_autostatus=ol_autostatus;o3_height=ol_height;o3_snapx=ol_snapx;o3_snapy=ol_snapy;o3_fixx=ol_fixx;o3_fixy=ol_fixy;o3_relx=ol_relx;o3_rely=ol_rely;o3_fgbackground=ol_fgbackground;o3_bgbackground=ol_bgbackground;o3_padxl=ol_padxl;o3_padxr=ol_padxr;o3_padyt=ol_padyt;o3_padyb=ol_padyb;o3_fullhtml=ol_fullhtml;o3_vpos=ol_vpos;o3_aboveheight=ol_aboveheight;o3_capicon=ol_capicon;o3_textfont=ol_textfont;o3_captionfont=ol_captionfont;o3_closefont=ol_closefont;o3_textsize=ol_textsize;o3_captionsize=ol_captionsize;o3_closesize=ol_closesize;o3_timeout=ol_timeout;o3_function=ol_function;o3_delay=ol_delay;o3_hauto=ol_hauto;o3_vauto=ol_vauto;o3_closeclick=ol_closeclick;o3_wrap=ol_wrap;o3_followmouse=ol_followmouse;o3_mouseoff=ol_mouseoff;o3_closetitle=ol_closetitle;o3_css=ol_css;o3_compatmode=ol_compatmode;o3_fgclass=ol_fgclass;o3_bgclass=ol_bgclass;o3_textfontclass=ol_textfontclass;o3_captionfontclass=ol_captionfontclass;o3_closefontclass=ol_closefontclass;setRunTimeVariables();fnRef="";o3_frame=ol_frame;if(!(over=createDivContainer())){return false}parseTokens("o3_",overlib.arguments);if(!postParseChecks()){return false}if(o3_delay==0){return runHook("olMain",FREPLACE)}else{o3_delayid=setTimeout("runHook('olMain', FREPLACE)",o3_delay);return false}}function nd(a){if(olLoaded&&!isExclusive()){hideDelay(a);if(o3_removecounter>=1){o3_showingsticky=0}if(o3_showingsticky==0){o3_allowmove=0;if(over!=null&&o3_timerid==0){runHook("hideObject",FREPLACE,over)}}else{o3_removecounter++}}return true}function cClick(){if(olLoaded){runHook("hideObject",FREPLACE,over);o3_showingsticky=0}return false}function overlib_pagedefaults(){parseTokens("ol_",overlib_pagedefaults.arguments)}function olMain(){var b,a;runHook("olMain",FBEFORE);if(o3_background!=""||o3_fullhtml){b=runHook("ol_content_background",FALTERNATE,o3_css,o3_text,o3_background,o3_fullhtml)}else{a=(pms[o3_css-1-pmStart]=="cssoff"||pms[o3_css-1-pmStart]=="cssclass");if(o3_fgbackground!=""){o3_fgbackground='background="'+o3_fgbackground+'"'}if(o3_bgbackground!=""){o3_bgbackground=(a?'background="'+o3_bgbackground+'"':o3_bgbackground)}if(o3_fgcolor!=""){o3_fgcolor=(a?'bgcolor="'+o3_fgcolor+'"':o3_fgcolor)}if(o3_bgcolor!=""){o3_bgcolor=(a?'bgcolor="'+o3_bgcolor+'"':o3_bgcolor)}if(o3_height>0){o3_height=(a?'height="'+o3_height+'"':o3_height)}else{o3_height=""}if(o3_cap==""){b=runHook("ol_content_simple",FALTERNATE,o3_css,o3_text)}else{if(o3_sticky){b=runHook("ol_content_caption",FALTERNATE,o3_css,o3_text,o3_cap,o3_close)}else{b=runHook("ol_content_caption",FALTERNATE,o3_css,o3_text,o3_cap,"")}}}if(o3_sticky){if(o3_timerid>0){clearTimeout(o3_timerid);o3_timerid=0}o3_showingsticky=1;o3_removecounter=0}if(!runHook("createPopup",FREPLACE,b)){return false}if(o3_autostatus>0){o3_status=o3_text;if(o3_autostatus>1){o3_status=o3_cap}}o3_allowmove=0;if(o3_timeout>0){if(o3_timerid>0){clearTimeout(o3_timerid)}o3_timerid=setTimeout("cClick()",o3_timeout)}runHook("disp",FREPLACE,o3_status);runHook("olMain",FAFTER);return(olOp&&event&&event.type=="mouseover"&&!o3_status)?"":(o3_status!="")}function ol_content_simple(c){var b=/,/.test(o3_cellpad);var a='<table width="'+o3_width+'" border="0" cellpadding="'+o3_border+'" cellspacing="0" '+(o3_bgclass?'class="'+o3_bgclass+'"':o3_bgcolor+" "+o3_height)+'><tr><td><table width="100%" border="0" '+((olNs4||!b)?'cellpadding="'+o3_cellpad+'" ':"")+'cellspacing="0" '+(o3_fgclass?'class="'+o3_fgclass+'"':o3_fgcolor+" "+o3_fgbackground+" "+o3_height)+'><tr><td valign="TOP"'+(o3_textfontclass?' class="'+o3_textfontclass+'">':((!olNs4&&b)?' style="'+setCellPadStr(o3_cellpad)+'">':">"))+(o3_textfontclass?"":wrapStr(0,o3_textsize,"text"))+c+(o3_textfontclass?"":wrapStr(1,o3_textsize))+"</td></tr></table></td></tr></table>";set_background("");return a}function ol_content_caption(h,g,f){var e,b,d=/,/.test(o3_cellpad);var c,a;c="";a="onmouseover";if(o3_closeclick==1){a=(o3_closetitle?"title='"+o3_closetitle+"'":"")+" onclick"}if(o3_capicon!=""){e=' hspace = "5" align = "middle" alt = ""';if(typeof o3_dragimg!="undefined"&&o3_dragimg){e=' hspace="5" name="'+o3_dragimg+'" id="'+o3_dragimg+'" align="middle" alt="Drag Enabled" title="Drag Enabled"'}o3_capicon='<img src="'+o3_capicon+'"'+e+" />"}if(f!=""){c="<td "+(!o3_compatmode&&o3_closefontclass?'class="'+o3_closefontclass:'align="RIGHT')+'"><a href="javascript:return '+fnRef+'cClick();"'+((o3_compatmode&&o3_closefontclass)?' class="'+o3_closefontclass+'" ':" ")+a+'="return '+fnRef+'cClick();">'+(o3_closefontclass?"":wrapStr(0,o3_closesize,"close"))+f+(o3_closefontclass?"":wrapStr(1,o3_closesize,"close"))+"</a></td>"}b='<table width="'+o3_width+'" border="0" cellpadding="'+o3_border+'" cellspacing="0" '+(o3_bgclass?'class="'+o3_bgclass+'"':o3_bgcolor+" "+o3_bgbackground+" "+o3_height)+'><tr><td><table width="100%" border="0" cellpadding="2" cellspacing="0"><tr><td'+(o3_captionfontclass?' class="'+o3_captionfontclass+'">':">")+(o3_captionfontclass?"":"<b>"+wrapStr(0,o3_captionsize,"caption"))+o3_capicon+g+(o3_captionfontclass?"":wrapStr(1,o3_captionsize)+"</b>")+"</td>"+c+'</tr></table><table width="100%" border="0" '+((olNs4||!d)?'cellpadding="'+o3_cellpad+'" ':"")+'cellspacing="0" '+(o3_fgclass?'class="'+o3_fgclass+'"':o3_fgcolor+" "+o3_fgbackground+" "+o3_height)+'><tr><td valign="TOP"'+(o3_textfontclass?' class="'+o3_textfontclass+'">':((!olNs4&&d)?' style="'+setCellPadStr(o3_cellpad)+'">':">"))+(o3_textfontclass?"":wrapStr(0,o3_textsize,"text"))+h+(o3_textfontclass?"":wrapStr(1,o3_textsize))+"</td></tr></table></td></tr></table>";set_background("");return b}function ol_content_background(c,b,a){if(a){txt=c}else{txt='<table width="'+o3_width+'" border="0" cellpadding="0" cellspacing="0" height="'+o3_height+'"><tr><td colspan="3" height="'+o3_padyt+'"></td></tr><tr><td width="'+o3_padxl+'"></td><td valign="TOP" width="'+(o3_width-o3_padxl-o3_padxr)+(o3_textfontclass?'" class="'+o3_textfontclass:"")+'">'+(o3_textfontclass?"":wrapStr(0,o3_textsize,"text"))+c+(o3_textfontclass?"":wrapStr(1,o3_textsize))+'</td><td width="'+o3_padxr+'"></td></tr><tr><td colspan="3" height="'+o3_padyb+'"></td></tr></table>'}set_background(b);return txt}function set_background(a){if(a==""){if(olNs4){over.background.src=null}else{if(over.style){over.style.backgroundImage="none"}}}else{if(olNs4){over.background.src=a}else{if(over.style){over.style.width=o3_width+"px";over.style.backgroundImage="url("+a+")"}}}}var olShowId=-1;function disp(a){runHook("disp",FBEFORE);if(o3_allowmove==0){runHook("placeLayer",FREPLACE);(olNs6&&olShowId<0)?olShowId=setTimeout("runHook('showObject', FREPLACE, over)",1):runHook("showObject",FREPLACE,over);o3_allowmove=(o3_sticky||o3_followmouse==0)?0:1}runHook("disp",FAFTER);if(a!=""){self.status=a}}function createPopup(a){runHook("createPopup",FBEFORE);if(o3_wrap){var c,d,b=(olNs4?over:over.style);b.top=b.left=((olIe4&&!olOp)?0:-10000)+(!olNs4?"px":0);layerWrite(a);c=(olNs4?over.clip.width:over.offsetWidth);if(c>(d=windowWidth())){a=a.replace(/\&nbsp;/g," ");o3_width=d;o3_wrap=0}}layerWrite(a);if(o3_wrap){o3_width=(olNs4?over.clip.width:over.offsetWidth)}runHook("createPopup",FAFTER,a);return true}function placeLayer(){var placeX,placeY,widthFix=0;if(o3_frame.innerWidth){widthFix=18}iwidth=windowWidth();winoffset=(olIe4)?eval("o3_frame."+docRoot+".scrollLeft"):o3_frame.pageXOffset;placeX=runHook("horizontalPlacement",FCHAIN,iwidth,winoffset,widthFix);if(o3_frame.innerHeight){iheight=o3_frame.innerHeight}else{if(eval("o3_frame."+docRoot)&&eval("typeof o3_frame."+docRoot+".clientHeight=='number'")&&eval("o3_frame."+docRoot+".clientHeight")){iheight=eval("o3_frame."+docRoot+".clientHeight")}}scrolloffset=(olIe4)?eval("o3_frame."+docRoot+".scrollTop"):o3_frame.pageYOffset;placeY=runHook("verticalPlacement",FCHAIN,iheight,scrolloffset);repositionTo(over,placeX,placeY)}function olMouseMove(e){var e=(e)?e:event;if(e.pageX){o3_x=e.pageX;o3_y=e.pageY}else{if(e.clientX){o3_x=eval("e.clientX+o3_frame."+docRoot+".scrollLeft");o3_y=eval("e.clientY+o3_frame."+docRoot+".scrollTop")}}if(o3_allowmove==1){runHook("placeLayer",FREPLACE)}if(hoveringSwitch&&!olNs4&&runHook("cursorOff",FREPLACE)){(olHideDelay?hideDelay(olHideDelay):cClick());hoveringSwitch=!hoveringSwitch}}function no_overlib(){return ver3fix}function olMouseCapture(){capExtent=document;var fN,str="",l,k,f,wMv,sS,mseHandler=olMouseMove;var re=/function[ ]*(\w*)\(/;wMv=(!olIe4&&window.onmousemove);if(document.onmousemove||wMv){if(wMv){capExtent=window}f=capExtent.onmousemove.toString();fN=f.match(re);if(fN==null){str=f+"(e); "}else{if(fN[1]=="anonymous"||fN[1]=="olMouseMove"||(wMv&&fN[1]=="onmousemove")){if(!olOp&&wMv){l=f.indexOf("{")+1;k=f.lastIndexOf("}");sS=f.substring(l,k);if((l=sS.indexOf("("))!=-1){sS=sS.substring(0,l).replace(/^\s+/,"").replace(/\s+$/,"");if(eval("typeof "+sS+" == 'undefined'")){window.onmousemove=null}else{str=sS+"(e);"}}}if(!str){olCheckMouseCapture=false;return}}else{if(fN[1]){str=fN[1]+"(e); "}else{l=f.indexOf("{")+1;k=f.lastIndexOf("}");str=f.substring(l,k)+"\n"}}}str+="olMouseMove(e); ";mseHandler=new Function("e",str)}capExtent.onmousemove=mseHandler;if(olNs4){capExtent.captureEvents(Event.MOUSEMOVE)}}function parseTokens(pf,ar){var v,i,mode=-1,par=(pf!="ol_");var fnMark=(par&&!ar.length?1:0);for(i=0;i<ar.length;i++){if(mode<0){if(typeof ar[i]=="number"&&ar[i]>pmStart&&ar[i]<pmUpper){fnMark=(par?1:0);i--}else{switch(pf){case"ol_":ol_text=ar[i].toString();break;default:o3_text=ar[i].toString()}}mode=0}else{if(ar[i]>=pmCount||ar[i]==DONOTHING){continue}if(ar[i]==INARRAY){fnMark=0;eval(pf+"text=ol_texts["+ar[++i]+"].toString()");continue}if(ar[i]==CAPARRAY){eval(pf+"cap=ol_caps["+ar[++i]+"].toString()");continue}if(ar[i]==STICKY){if(pf!="ol_"){eval(pf+"sticky=1")}continue}if(ar[i]==BACKGROUND){eval(pf+'background="'+ar[++i]+'"');continue}if(ar[i]==NOCLOSE){if(pf!="ol_"){opt_NOCLOSE()}continue}if(ar[i]==CAPTION){eval(pf+"cap='"+escSglQuote(ar[++i])+"'");continue}if(ar[i]==CENTER||ar[i]==LEFT||ar[i]==RIGHT){eval(pf+"hpos="+ar[i]);if(pf!="ol_"){olHautoFlag=1}continue}if(ar[i]==OFFSETX){eval(pf+"offsetx="+ar[++i]);continue}if(ar[i]==OFFSETY){eval(pf+"offsety="+ar[++i]);continue}if(ar[i]==FGCOLOR){eval(pf+'fgcolor="'+ar[++i]+'"');continue}if(ar[i]==BGCOLOR){eval(pf+'bgcolor="'+ar[++i]+'"');continue}if(ar[i]==TEXTCOLOR){eval(pf+'textcolor="'+ar[++i]+'"');continue}if(ar[i]==CAPCOLOR){eval(pf+'capcolor="'+ar[++i]+'"');continue}if(ar[i]==CLOSECOLOR){eval(pf+'closecolor="'+ar[++i]+'"');continue}if(ar[i]==WIDTH){eval(pf+"width="+ar[++i]);continue}if(ar[i]==BORDER){eval(pf+"border="+ar[++i]);continue}if(ar[i]==CELLPAD){i=opt_MULTIPLEARGS(++i,ar,(pf+"cellpad"));continue}if(ar[i]==STATUS){eval(pf+"status='"+escSglQuote(ar[++i])+"'");continue}if(ar[i]==AUTOSTATUS){eval(pf+"autostatus=("+pf+"autostatus == 1) ? 0 : 1");continue}if(ar[i]==AUTOSTATUSCAP){eval(pf+"autostatus=("+pf+"autostatus == 2) ? 0 : 2");continue}if(ar[i]==HEIGHT){eval(pf+"height="+pf+"aboveheight="+ar[++i]);continue}if(ar[i]==CLOSETEXT){eval(pf+"close='"+escSglQuote(ar[++i])+"'");continue}if(ar[i]==SNAPX){eval(pf+"snapx="+ar[++i]);continue}if(ar[i]==SNAPY){eval(pf+"snapy="+ar[++i]);continue}if(ar[i]==FIXX){eval(pf+"fixx="+ar[++i]);continue}if(ar[i]==FIXY){eval(pf+"fixy="+ar[++i]);continue}if(ar[i]==RELX){eval(pf+"relx="+ar[++i]);continue}if(ar[i]==RELY){eval(pf+"rely="+ar[++i]);continue}if(ar[i]==FGBACKGROUND){eval(pf+'fgbackground="'+ar[++i]+'"');continue}if(ar[i]==BGBACKGROUND){eval(pf+'bgbackground="'+ar[++i]+'"');continue}if(ar[i]==PADX){eval(pf+"padxl="+ar[++i]);eval(pf+"padxr="+ar[++i]);continue}if(ar[i]==PADY){eval(pf+"padyt="+ar[++i]);eval(pf+"padyb="+ar[++i]);continue}if(ar[i]==FULLHTML){if(pf!="ol_"){eval(pf+"fullhtml=1")}continue}if(ar[i]==BELOW||ar[i]==ABOVE){eval(pf+"vpos="+ar[i]);if(pf!="ol_"){olVautoFlag=1}continue}if(ar[i]==CAPICON){eval(pf+'capicon="'+ar[++i]+'"');continue}if(ar[i]==TEXTFONT){eval(pf+"textfont='"+escSglQuote(ar[++i])+"'");continue}if(ar[i]==CAPTIONFONT){eval(pf+"captionfont='"+escSglQuote(ar[++i])+"'");continue}if(ar[i]==CLOSEFONT){eval(pf+"closefont='"+escSglQuote(ar[++i])+"'");continue}if(ar[i]==TEXTSIZE){eval(pf+'textsize="'+ar[++i]+'"');continue}if(ar[i]==CAPTIONSIZE){eval(pf+'captionsize="'+ar[++i]+'"');continue}if(ar[i]==CLOSESIZE){eval(pf+'closesize="'+ar[++i]+'"');continue}if(ar[i]==TIMEOUT){eval(pf+"timeout="+ar[++i]);continue}if(ar[i]==FUNCTION){if(pf=="ol_"){if(typeof ar[i+1]!="number"){v=ar[++i];ol_function=(typeof v=="function"?v:null)}}else{fnMark=0;v=null;if(typeof ar[i+1]!="number"){v=ar[++i]}opt_FUNCTION(v)}continue}if(ar[i]==DELAY){eval(pf+"delay="+ar[++i]);continue}if(ar[i]==HAUTO){eval(pf+"hauto=("+pf+"hauto == 0) ? 1 : 0");continue}if(ar[i]==VAUTO){eval(pf+"vauto=("+pf+"vauto == 0) ? 1 : 0");continue}if(ar[i]==CLOSECLICK){eval(pf+"closeclick=("+pf+"closeclick == 0) ? 1 : 0");continue}if(ar[i]==WRAP){eval(pf+"wrap=("+pf+"wrap == 0) ? 1 : 0");continue}if(ar[i]==FOLLOWMOUSE){eval(pf+"followmouse=("+pf+"followmouse == 1) ? 0 : 1");continue}if(ar[i]==MOUSEOFF){eval(pf+"mouseoff=("+pf+"mouseoff==0) ? 1 : 0");v=ar[i+1];if(pf!="ol_"&&eval(pf+"mouseoff")&&typeof v=="number"&&(v<pmStart||v>pmUpper)){olHideDelay=ar[++i]}continue}if(ar[i]==CLOSETITLE){eval(pf+"closetitle='"+escSglQuote(ar[++i])+"'");continue}if(ar[i]==CSSOFF||ar[i]==CSSCLASS){eval(pf+"css="+ar[i]);continue}if(ar[i]==COMPATMODE){eval(pf+"compatmode=("+pf+"compatmode==0) ? 1 : 0");continue}if(ar[i]==FGCLASS){eval(pf+'fgclass="'+ar[++i]+'"');continue}if(ar[i]==BGCLASS){eval(pf+'bgclass="'+ar[++i]+'"');continue}if(ar[i]==TEXTFONTCLASS){eval(pf+'textfontclass="'+ar[++i]+'"');continue}if(ar[i]==CAPTIONFONTCLASS){eval(pf+'captionfontclass="'+ar[++i]+'"');continue}if(ar[i]==CLOSEFONTCLASS){eval(pf+'closefontclass="'+ar[++i]+'"');continue}i=parseCmdLine(pf,i,ar)}}if(fnMark&&o3_function){o3_text=o3_function()}if((pf=="o3_")&&o3_wrap){o3_width=0;var tReg=/<.*\n*>/ig;if(!tReg.test(o3_text)){o3_text=o3_text.replace(/[ ]+/g,"&nbsp;")}if(!tReg.test(o3_cap)){o3_cap=o3_cap.replace(/[ ]+/g,"&nbsp;")}}if((pf=="o3_")&&o3_sticky){if(!o3_close&&(o3_frame!=ol_frame)){o3_close=ol_close}if(o3_mouseoff&&(o3_frame==ol_frame)){opt_NOCLOSE(" ")}}}function layerWrite(a){a+="\n";if(olNs4){var b=o3_frame.document.layers.overDiv.document;b.write(a);b.close()}else{if(typeof over.innerHTML!="undefined"){if(olIe5&&isMac){over.innerHTML=""}over.innerHTML=a}else{range=o3_frame.document.createRange();range.setStartAfter(over);domfrag=range.createContextualFragment(a);while(over.hasChildNodes()){over.removeChild(over.lastChild)}over.appendChild(domfrag)}}}function showObject(b){runHook("showObject",FBEFORE);var a=(olNs4?b:b.style);a.visibility="visible";runHook("showObject",FAFTER)}function hideObject(b){runHook("hideObject",FBEFORE);var a=(olNs4?b:b.style);if(olNs6&&olShowId>0){clearTimeout(olShowId);olShowId=0}a.visibility="hidden";a.top=a.left=((olIe4&&!olOp)?0:-10000)+(!olNs4?"px":0);if(o3_timerid>0){clearTimeout(o3_timerid)}if(o3_delayid>0){clearTimeout(o3_delayid)}o3_timerid=0;o3_delayid=0;self.status="";if(b.onmouseout||b.onmouseover){if(olNs4){b.releaseEvents(Event.MOUSEOUT||Event.MOUSEOVER)}b.onmouseout=b.onmouseover=null}runHook("hideObject",FAFTER)}function repositionTo(c,d,a){var b=(olNs4?c:c.style);b.left=d+(!olNs4?"px":0);b.top=a+(!olNs4?"px":0)}function cursorOff(){var d=parseInt(over.style.left);var c=parseInt(over.style.top);var b=d+(over.offsetWidth>=parseInt(o3_width)?over.offsetWidth:parseInt(o3_width));var a=c+(over.offsetHeight>=o3_aboveheight?over.offsetHeight:o3_aboveheight);if(o3_x<d||o3_x>b||o3_y<c||o3_y>a){return true}return false}function opt_FUNCTION(callme){o3_text=(callme?(typeof callme=="string"?(/.+\(.*\)/.test(callme)?eval(callme):callme):callme()):(o3_function?o3_function():"No Function"));return 0}function opt_NOCLOSE(a){if(!a){o3_close=""}if(olNs4){over.captureEvents(Event.MOUSEOUT||Event.MOUSEOVER);over.onmouseover=function(){if(o3_timerid>0){clearTimeout(o3_timerid);o3_timerid=0}};over.onmouseout=function(b){if(olHideDelay){hideDelay(olHideDelay)}else{cClick(b)}}}else{over.onmouseover=function(){hoveringSwitch=true;if(o3_timerid>0){clearTimeout(o3_timerid);o3_timerid=0}}}return 0}function opt_MULTIPLEARGS(i,args,parameter){var k=i,re,pV,str="";for(k=i;k<args.length;k++){if(typeof args[k]=="number"&&args[k]>pmStart){break}str+=args[k]+","}if(str){str=str.substring(0,--str.length)}k--;pV=(olNs4&&/cellpad/i.test(parameter))?str.split(",")[0]:str;eval(parameter+'="'+pV+'"');return k}function nbspCleanup(){if(o3_wrap){o3_text=o3_text.replace(/\&nbsp;/g," ");o3_cap=o3_cap.replace(/\&nbsp;/g," ")}}function escSglQuote(a){return a.toString().replace(/'/g,"\\'")}function OLonLoad_handler(e){var re=/\w+\(.*\)[;\s]+/g,olre=/overlib\(|nd\(|cClick\(/,fn,l,i;if(!olLoaded){olLoaded=1}if(window.removeEventListener&&e.eventPhase==3){window.removeEventListener("load",OLonLoad_handler,false)}else{if(window.detachEvent){window.detachEvent("onload",OLonLoad_handler);var fN=document.body.getAttribute("onload");if(fN){fN=fN.toString().match(re);if(fN&&fN.length){for(i=0;i<fN.length;i++){if(/anonymous/.test(fN[i])){continue}while((l=fN[i].search(/\)[;\s]+/))!=-1){fn=fN[i].substring(0,l+1);fN[i]=fN[i].substring(l+2);if(olre.test(fn)){eval(fn)}}}}}}}}function wrapStr(endWrap,fontSizeStr,whichString){var fontStr,fontColor,isClose=((whichString=="close")?1:0),hasDims=/[%\-a-z]+$/.test(fontSizeStr);fontSizeStr=(olNs4)?(!hasDims?fontSizeStr:"1"):fontSizeStr;if(endWrap){return(hasDims&&!olNs4)?(isClose?"</span>":"</div>"):"</font>"}else{fontStr="o3_"+whichString+"font";fontColor="o3_"+((whichString=="caption")?"cap":whichString)+"color";return(hasDims&&!olNs4)?(isClose?'<span style="font-family: '+quoteMultiNameFonts(eval(fontStr))+"; color: "+eval(fontColor)+"; font-size: "+fontSizeStr+';">':'<div style="font-family: '+quoteMultiNameFonts(eval(fontStr))+"; color: "+eval(fontColor)+"; font-size: "+fontSizeStr+';">'):'<font face="'+eval(fontStr)+'" color="'+eval(fontColor)+'" size="'+(parseInt(fontSizeStr)>7?"7":fontSizeStr)+'">'}}function quoteMultiNameFonts(d){var a,b=d.split(",");for(var c=0;c<b.length;c++){a=b[c];a=a.replace(/^\s+/,"").replace(/\s+$/,"");if(/\s/.test(a)&&!/['"]/.test(a)){a="'"+a+"'";b[c]=a}}return b.join()}function isExclusive(a){return false}function setCellPadStr(h){var e="",b=0,d=new Array(),g,a,f,c;e+="padding: ";d=h.replace(/\s+/g,"").split(",");switch(d.length){case 2:g=a=d[b];f=c=d[++b];break;case 3:g=d[b];f=c=d[++b];a=d[++b];break;case 4:g=d[b];c=d[++b];a=d[++b];f=d[++b];break}e+=((d.length==1)?d[0]+"px;":g+"px "+c+"px "+a+"px "+f+"px;");return e}function hideDelay(a){if(a&&!o3_delay){if(o3_timerid>0){clearTimeout(o3_timerid)}o3_timerid=setTimeout("cClick()",(o3_timeout=a))}}function horizontalPlacement(g,h,d){var f,b=g,c=h;var a=parseInt(o3_width);if(o3_fixx>-1||o3_relx!=null){f=(o3_relx!=null?(o3_relx<0?c+o3_relx+b-a-d:c+o3_relx):o3_fixx)}else{if(o3_hauto==1){if((o3_x-c)>(b/2)){o3_hpos=LEFT}else{o3_hpos=RIGHT}}if(o3_hpos==CENTER){f=o3_x+o3_offsetx-(a/2);if(f<c){f=c}}if(o3_hpos==RIGHT){f=o3_x+o3_offsetx;if((f+a)>(c+b-d)){f=b+c-a-d;if(f<0){f=0}}}if(o3_hpos==LEFT){f=o3_x-o3_offsetx-a;if(f<c){f=c}}if(o3_snapx>1){var e=f%o3_snapx;if(o3_hpos==LEFT){f=f-(o3_snapx+e)}else{f=f+(o3_snapx-e)}if(f<c){f=c}}}return f}function verticalPlacement(b,a){var f,g=b,c=a;var e=(o3_aboveheight?parseInt(o3_aboveheight):(olNs4?over.clip.height:over.offsetHeight));if(o3_fixy>-1||o3_rely!=null){f=(o3_rely!=null?(o3_rely<0?c+o3_rely+g-e:c+o3_rely):o3_fixy)}else{if(o3_vauto==1){if((o3_y-c)>(g/2)&&o3_vpos==BELOW&&(o3_y+e+o3_offsety-(c+g)>0)){o3_vpos=ABOVE}else{if(o3_vpos==ABOVE&&(o3_y-(e+o3_offsety)-c<0)){o3_vpos=BELOW}}}if(o3_vpos==ABOVE){if(o3_aboveheight==0){o3_aboveheight=e}f=o3_y-(o3_aboveheight+o3_offsety);if(f<c){f=c}}else{f=o3_y+o3_offsety}if(o3_snapy>1){var d=f%o3_snapy;if(o3_aboveheight>0&&o3_vpos==ABOVE){f=f-(o3_snapy+d)}else{f=f+(o3_snapy-d)}if(f<c){f=c}}}return f}function checkPositionFlags(){if(olHautoFlag){olHautoFlag=o3_hauto=0}if(olVautoFlag){olVautoFlag=o3_vauto=0}return true}function windowWidth(){var w;if(o3_frame.innerWidth){w=o3_frame.innerWidth}else{if(eval("o3_frame."+docRoot)&&eval("typeof o3_frame."+docRoot+".clientWidth=='number'")&&eval("o3_frame."+docRoot+".clientWidth")){w=eval("o3_frame."+docRoot+".clientWidth")}}return w}function createDivContainer(f,d,c){f=(f||"overDiv"),d=(d||o3_frame),c=(c||1000);var e,b=layerReference(f);if(b==null){if(olNs4){b=d.document.layers[f]=new Layer(window.innerWidth,d);e=b}else{var a=(olIe4?d.document.all.tags("BODY")[0]:d.document.getElementsByTagName("BODY")[0]);if(olIe4&&!document.getElementById){a.insertAdjacentHTML("beforeEnd",'<div id="'+f+'"></div>');b=layerReference(f)}else{b=d.document.createElement("DIV");b.id=f;a.appendChild(b)}e=b.style}e.position="absolute";e.visibility="hidden";e.zIndex=c;if(olIe4&&!olOp){e.left=e.top="0px"}else{e.left=e.top=-10000+(!olNs4?"px":0)}}return b}function layerReference(a){return(olNs4?o3_frame.document.layers[a]:(document.all?o3_frame.document.all[a]:o3_frame.document.getElementById(a)))}function isFunction(c){var b=true;if(typeof c=="object"){for(var a=0;a<c.length;a++){if(typeof c[a]=="function"){continue}b=false;break}}else{if(typeof c!="function"){b=false}}return b}function argToString(g,b,f){var e=b,a="",d=g;f=(f?f:"ar");if(d.length>e){for(var c=e;c<d.length;c++){a+=f+"["+c+"], "}a=a.substring(0,a.length-2)}return a}function reOrder(b,g,a){var c=new Array(),e,f,d;if(!a||typeof a=="undefined"||typeof a=="number"){return b}if(typeof a=="function"){if(typeof g=="object"){c=c.concat(g)}else{c[c.length++]=g}for(f=0;f<b.length;f++){e=false;if(typeof g=="function"&&b[f]==g){continue}else{for(d=0;d<g.length;d++){if(b[f]==g[d]){e=true;break}}}if(!e){c[c.length++]=b[f]}}c[c.length++]=a}else{if(typeof a=="object"){if(typeof g=="object"){c=c.concat(g)}else{c[c.length++]=g}for(d=0;d<b.length;d++){e=false;if(typeof g=="function"&&b[d]==g){continue}else{for(f=0;f<g.length;f++){if(b[d]==g[f]){e=true;break}}}if(!e){c[c.length++]=b[d]}}for(f=0;f<c.length;f++){b[f]=c[f]}c.length=0;for(d=0;d<b.length;d++){e=false;for(f=0;f<a.length;f++){if(b[d]==a[f]){e=true;break}}if(!e){c[c.length++]=b[d]}}c=c.concat(a)}}b=c;return b}function setRunTimeVariables(){if(typeof runTime!="undefined"&&runTime.length){for(var a=0;a<runTime.length;a++){runTime[a]()}}}function parseCmdLine(a,e,d){if(typeof cmdLine!="undefined"&&cmdLine.length){for(var b=0;b<cmdLine.length;b++){var c=cmdLine[b](a,e,d);if(c>-1){e=c;break}}}return e}function postParseChecks(a,c){if(typeof postParse!="undefined"&&postParse.length){for(var b=0;b<postParse.length;b++){if(postParse[b](a,c)){continue}return false}}return true}function registerCommands(cmdStr){if(typeof cmdStr!="string"){return}var pM=cmdStr.split(",");pms=pms.concat(pM);for(var i=0;i<pM.length;i++){eval(pM[i].toUpperCase()+"="+pmCount++)}}function registerNoParameterCommands(a){if(!a&&typeof a!="string"){return}pmt=(!pmt)?a:pmt+","+a}function registerHook(f,e,d,b){var a,c=typeof b;if(f=="plgIn"||f=="postParse"){return}if(typeof hookPts[f]=="undefined"){hookPts[f]=new FunctionReference()}a=hookPts[f];if(d!=null){if(d==FREPLACE){a.ovload=e;if(f.indexOf("ol_content_")>-1){a.alt[pms[CSSOFF-1-pmStart]]=e}}else{if(d==FBEFORE||d==FAFTER){var a=(d==1?a.before:a.after);if(typeof e=="object"){a=a.concat(e)}else{a[a.length++]=e}if(b){a=reOrder(a,e,b)}}else{if(d==FALTERNATE){if(c=="number"){a.alt[pms[b-1-pmStart]]=e}}else{if(d==FCHAIN){a=a.chain;if(typeof e=="object"){a=a.concat(e)}else{a[a.length++]=e}}}}}return}}function registerRunTimeFunction(a){if(isFunction(a)){if(typeof a=="object"){runTime=runTime.concat(a)}else{runTime[runTime.length++]=a}}}function registerCmdLineFunction(a){if(isFunction(a)){if(typeof a=="object"){cmdLine=cmdLine.concat(a)}else{cmdLine[cmdLine.length++]=a}}}function registerPostParseFunction(a){if(isFunction(a)){if(typeof a=="object"){postParse=postParse.concat(a)}else{postParse[postParse.length++]=a}}}function runHook(fnHookTo,hookType){var l=hookPts[fnHookTo],k,rtnVal=null,optPm,arS,ar=runHook.arguments;if(hookType==FREPLACE){arS=argToString(ar,2);if(typeof l=="undefined"||!(l=l.ovload)){rtnVal=eval(fnHookTo+"("+arS+")")}else{rtnVal=eval("l("+arS+")")}}else{if(hookType==FBEFORE||hookType==FAFTER){if(typeof l!="undefined"){l=(hookType==1?l.before:l.after);if(l.length){arS=argToString(ar,2);for(var k=0;k<l.length;k++){eval("l[k]("+arS+")")}}}}else{if(hookType==FALTERNATE){optPm=ar[2];arS=argToString(ar,3);if(typeof l=="undefined"||(l=l.alt[pms[optPm-1-pmStart]])=="undefined"){rtnVal=eval(fnHookTo+"("+arS+")")}else{rtnVal=eval("l("+arS+")")}}else{if(hookType==FCHAIN){arS=argToString(ar,2);l=l.chain;for(k=l.length;k>0;k--){if((rtnVal=eval("l[k-1]("+arS+")"))!=void (0)){break}}}}}}return rtnVal}function FunctionReference(){this.ovload=null;this.before=new Array();this.after=new Array();this.alt=new Array();this.chain=new Array()}function Info(a,b){this.version=a;this.prerelease=b;this.simpleversion=Math.round(this.version*100);this.major=parseInt(this.simpleversion/100);this.minor=parseInt(this.simpleversion/10)-this.major*10;this.revision=parseInt(this.simpleversion)-this.major*100-this.minor*10;this.meets=meets}function meets(a){return(!a)?false:this.simpleversion>=Math.round(100*parseFloat(a))}registerHook("ol_content_simple",ol_content_simple,FALTERNATE,CSSOFF);registerHook("ol_content_caption",ol_content_caption,FALTERNATE,CSSOFF);registerHook("ol_content_background",ol_content_background,FALTERNATE,CSSOFF);registerHook("ol_content_simple",ol_content_simple,FALTERNATE,CSSCLASS);registerHook("ol_content_caption",ol_content_caption,FALTERNATE,CSSCLASS);registerHook("ol_content_background",ol_content_background,FALTERNATE,CSSCLASS);registerPostParseFunction(checkPositionFlags);registerHook("hideObject",nbspCleanup,FAFTER);registerHook("horizontalPlacement",horizontalPlacement,FCHAIN);registerHook("verticalPlacement",verticalPlacement,FCHAIN);if(olNs4||(olIe5&&isMac)||olKq){olLoaded=1}registerNoParameterCommands("sticky,autostatus,autostatuscap,fullhtml,hauto,vauto,closeclick,wrap,followmouse,mouseoff,compatmode");var olCheckMouseCapture=true;if((olNs4||olNs6||olIe4)){olMouseCapture()}else{overlib=no_overlib;nd=no_overlib;ver3fix=true};
\ No newline at end of file
diff --git a/scripts/overlib.js b/js/overlib.js
similarity index 100%
rename from scripts/overlib.js
rename to js/overlib.js
diff --git a/js/tw-sack-min.js b/js/tw-sack-min.js
new file mode 100644
index 0000000..5275993
--- /dev/null
+++ b/js/tw-sack-min.js
@@ -0,0 +1 @@
+function sack(file){this.AjaxFailedAlert="Su navegador no soporta la funcionalidad mejorada de este sitio web, y por lo tanto, usted tendr� una experiencia que difiere de la una.\n";this.requestFile=file;this.method="POST";this.URLString="";this.encodeURIString=true;this.execute=false;this.onLoading=function(){};this.onLoaded=function(){};this.onInteractive=function(){};this.onCompletion=function(){};this.createAJAX=function(){try{this.xmlhttp=new ActiveXObject("Msxml2.XMLHTTP")}catch(e){try{this.xmlhttp=new ActiveXObject("Microsoft.XMLHTTP")}catch(err){this.xmlhttp=null}}if(!this.xmlhttp&&typeof XMLHttpRequest!="undefined"){this.xmlhttp=new XMLHttpRequest()}if(!this.xmlhttp){this.failed=true}};this.setVar=function(name,value){if(this.URLString.length<3){this.URLString=name+"="+value}else{this.URLString+="&"+name+"="+value}};this.encVar=function(name,value){var varString=encodeURIComponent(name)+"="+encodeURIComponent(value);return varString};this.encodeURLString=function(string){varArray=string.split("&");for(i=0;i<varArray.length;i++){urlVars=varArray[i].split("=");if(urlVars[0].indexOf("amp;")!=-1){urlVars[0]=urlVars[0].substring(4)}varArray[i]=this.encVar(urlVars[0],urlVars[1])}return varArray.join("&")};this.runResponse=function(){eval(this.response)};this.runAJAX=function(urlstring){this.responseStatus=new Array(2);if(this.failed&&this.AjaxFailedAlert){alert(this.AjaxFailedAlert)}else{if(urlstring){if(this.URLString.length){this.URLString=this.URLString+"&"+urlstring}else{this.URLString=urlstring}}if(this.encodeURIString){var timeval=new Date().getTime();this.URLString=this.encodeURLString(this.URLString);this.setVar("rndval",timeval)}if(this.element){this.elementObj=document.getElementById(this.element)}if(this.xmlhttp){var self=this;if(this.method=="GET"){var totalurlstring=this.requestFile+"?"+this.URLString;this.xmlhttp.open(this.method,totalurlstring,true)}else{this.xmlhttp.open(this.method,this.requestFile,true)}if(this.method=="POST"){try{this.xmlhttp.setRequestHeader("Content-Type","application/x-www-form-urlencoded")}catch(e){}}this.xmlhttp.send(this.URLString);this.xmlhttp.onreadystatechange=function(){switch(self.xmlhttp.readyState){case 1:self.onLoading();break;case 2:self.onLoaded();break;case 3:self.onInteractive();break;case 4:self.response=self.xmlhttp.responseText;self.responseXML=self.xmlhttp.responseXML;self.responseStatus[0]=self.xmlhttp.status;self.responseStatus[1]=self.xmlhttp.statusText;self.onCompletion();if(self.execute){self.runResponse()}if(self.elementObj){var elemNodeName=self.elementObj.nodeName;elemNodeName.toLowerCase();if(elemNodeName=="input"||elemNodeName=="select"||elemNodeName=="option"||elemNodeName=="textarea"){self.elementObj.value=self.response}else{self.elementObj.innerHTML=self.response}}self.URLString="";break}}}}};this.createAJAX()};
\ No newline at end of file
diff --git a/scripts/tw-sack.js b/js/tw-sack.js
similarity index 100%
rename from scripts/tw-sack.js
rename to js/tw-sack.js
diff --git a/language/.htaccess b/language/.htaccess
index 8dd8d5a..2cd89da 100644
--- a/language/.htaccess
+++ b/language/.htaccess
@@ -1 +1 @@
-<Files ~ "\.mo$">
\ No newline at end of file
+<Files ~ "\.php$">
\ No newline at end of file
diff --git a/language/english/ADMIN.php b/language/english/ADMIN.php
index 808d173..1a52baa 100644
--- a/language/english/ADMIN.php
+++ b/language/english/ADMIN.php
@@ -235,7 +235,7 @@
 $lang['ad_personal_email2']		= 'E-mail permanent';
 $lang['ad_personal_pass']		= 'Password';
 $lang['ad_personal_succes']		= 'Settings changed  successfully';
-$lang['ad_personal_vacat']		= 'Vacations?';
+$lang['ad_personal_vacat']		= '¿Vacations?';
 
 //	ALIANZA - ALLIANCES
 $lang['ad_ally_title']		= 'Edit Alliances';
@@ -286,7 +286,7 @@
 $lang['bo_banned']				= ' Was stopped successfully.';
 $lang['bo_unbanned']			= ' He has lifted the suspension correctly.';
 $lang['bo_username']			= 'User name';
-$lang['bo_vacaations']			= 'Vacations?';
+$lang['bo_vacaations']			= '¿Vacations?';
 $lang['bo_reason']				= 'Reason for Suspension';
 $lang['bo_time']				= 'Suspension time';
 
@@ -331,7 +331,7 @@
 $lang['cs_fleets_on_block']				= 'Update fleets in block?';
 $lang['cs_time_between_updates']		= 'Time between updates of statistics';
 $lang['cs_minutes']						= 'minutes';
-$lang['cs_points_to_zero']				= 'The administration can appear at the ranking?';
+$lang['cs_points_to_zero']				= '¿The administration can appear at the ranking?';
 $lang['cs_access_lvl']					= 'Until what rank can appear at the ranking?';
 $lang['cs_save_changes']				= 'Save the changes';
 $lang['cs_timeact_1']					= 'The last update was on: ';
@@ -530,7 +530,7 @@
 $lang['mu_active_planets']			= 'Active Planets';
 $lang['mu_tools']					= 'Tools';
 $lang['mu_md5_encripter']			= 'MD5 Encrypter';
-$lang['mu_optimize_db']				= 'Database';
+$lang['mu_optimize_db']				= 'DataBase';
 $lang['mu_manual_points_update']	= 'Manual Update Points';
 $lang['mu_mpu_confirmation']		= 'The points update is automatic, anyway you can do it manually if you wish by clicking Continue...';
 $lang['mu_search_page']				= 'Advanced Search';
@@ -546,7 +546,7 @@
 $lang['re_defenses_and_ships']				= 'Hangar Defenses';
 $lang['re_defenses']						= 'Reset defenses';
 $lang['re_ships']							= 'Reset ships';
-$lang['re_reset_hangar']					= 'Reset shipyard and defense queue';
+$lang['re_reset_hangar']					= 'Reset queue hangar ande defense';
 $lang['re_buldings']						= 'Buildings';
 $lang['re_buildings_pl']					= 'Reset planetary buildings';
 $lang['re_buildings_lu']					= 'Reset lunar buildings';
@@ -858,8 +858,6 @@
 
 
 //---------------	HISTORIAL - LOG	------------------------//
-$lang['log_viewmod'][0] 			= 'No';
-$lang['log_viewmod'][1] 			= 'Yes';
 $lang['log_log_body_build']			= 'Buildings log';
 $lang['log_log_body_resou']			= 'Resources log';
 $lang['log_log_body_def']			= 'Defenses log';
diff --git a/language/english/CHANGELOG.php b/language/english/CHANGELOG.php
index 2115293..1490d28 100644
--- a/language/english/CHANGELOG.php
+++ b/language/english/CHANGELOG.php
@@ -4,74 +4,6 @@
 $lang['Description'] = 'Descripci&oacute;n';
 $lang['changelog']   = array(
 
-'2.10.3' => ' 06/07/2012
--[Mejoras]
-- Mejorado el paquete de idioma en ingl&eacute;s, se tradujeron varios textos faltantes (By cyberghoser1).-
-- Varias mejoras internas de c&oacute;digo.-
-
--[Bugs]
-#10056: Corregido un bug que mostraba la producci&oacute;n en rojo a pesar de tener capacidad para producir.-
-#10050: Corregido un bug que permit&iacute;a utilizar el mercader incluso cuando los almacenes estaban llenos (By zebulonbof).-
-#10046: Corregido un bug que no permit&iacute;a enviar expediciones.-
-#10039: Corregido un bug que provocaba sobre carga (By jstar).-
-#10035: Corregido un bug que permit&iacute;a actualizar el juego bajo cualquier circunstancia (By Razican).-
-#10034: Corregido un bug en el que no se pod&iacute;a leer la licencia (By Razican).-
-#10033: Corregido un bug que no guardaba el id del usuario al registrar un cambio en la p&aacute;gina de configuraciones (By Razican).-
-#10032: Corregido un bug que no informaba cuando hab&iacute;a una nueva versi&oacute;n disponible (By Razican).-
-#10031: Corregido un bug en la importaci&oacute;n (By Razican).-
-#10025: Corregido un bug que mostraba mal los caracteres en la cola de flota y defensas (By jtsamper) .-
-#10004: Corregida la formula del calculo de las expediciones (By jstar).-
-',
-
-'2.10.2' => ' 06/05/2012
--[Mejoras]
-- Mejorado el paquete de idioma en ingl&eacute;s, se tradujeron varios textos faltantes (By cyberghoser1).-
-- Mejorado el sistema para determinar si un jugador es fuerte o d&eacute;bil.-
-- Mejorado el sistema de producci&oacute;n.-
-- El a&ntilde;o final del copyright se muestra din&aacute;micamente en el index.-
-- Mejoras internas globales.-
-- Mejoras en la validaci&oacute;n del modo vacaciones. Antes realizaba una query + una query por cada planeta, ahora realiza s&oacute;lo una.-
-- Mejorada la velocidad de procesamiento al determinar si un usuario puede o no entrar en modo vacaciones.- 
-- De 2 a 1 query para determinar si un jugador puede o no entrar en modo vacaciones.-
-
--[Bugs]
-#9854: Corregido un bug que no permit&iacute;a enviar sondas desde galaxia.-
-#0000: Corregido un bug en el que el sistema de jugadores d&eacute;biles no funcionaba correctamente al enviar flotas desde galaxia.-
-#0000: Corregido un bug que mostraba mal el texto de error de enviar una sonda desde galaxia.-
-#0000: Corregido un bug que al cliquear en el nombre de un oficial de redirig&iacute;a a una p&aacute;gina vac&iacute;a.-
-
-- [Cambios]
-- Eliminada plantilla "/infos/info_officiers_general.php".-
-- Opci&oacute;n de overflow de los almacenes removida.-
-- Modificado el link en el admin cp que redirig&iacute;a al tracker.-
-
--[Seguridad]
-- Bloqueada la lectura de los archivos .xml (By Neko).-
-',
-
-'2.10.1' => ' 06/04/2012
--[Mejoras]
-- Mejora menor en el informe de actualizaci&oacute;n que te informa de que versi&oacute;n a cual otra pasaste.-
-
--[Bugs]
-
-#9943: Corregido el bug de los permisos de la alianza.-
-#9934: Ahora es posible enviar naves con la misi&oacute;n de mantener posici&oacute;n a una Luna.-
-#9903: Bug al cambiar los permisos de administradores/moderadores/operadores en el panel administrativo (By PowerMaster).-
-#9913: Varios problemas con el phalanx (By jstar).-
-#9864: Problemas con los atajos.-
-#9857: Error que produc&iacute;a problemas en las estad&iacute;sticas y en varias otras p&aacute;ginas del juego (By Jstar).-
-#9852: Calculo erroneo en los d&iacute;as de inactividad de un usuario en el panel administrativo.-
-#9850: No se pueden enviar sondas a atacar, producen un error.-
-#9837: L&iacute;mite en la cantidad de naves que se pueden enviar durante el salto cu&aacute;ntico (By Gmir17).-
-#0000: Corregido un bug menor en el actualizador.-
-#0000: Corregido un bug que no mostraba la imagen de eliminar rango en el panel administrativo.-
-#0000: Correcciones a caracteres err&oacute;neos en algunos textos.-
-#0000: Corregido un bug que imped&iacute;a enviar una flota a mantener posici&oacute;n si no ten&iacute;a deposito de la alianza.-
-#0000: Corregido un bug que no informaba correctamente si hab&iacute;a una nueva versi&oacute;n disponible.-
-#0000: Corregido un bug que mostraba &uacute;nicamente la primer flota en el phalanx (By jstar).-
-',
-
 '2.10.0' => ' 06/01/12
 
 -[Mejoras]
diff --git a/language/english/INGAME.php b/language/english/INGAME.php
index c435126..df76e8b 100644
--- a/language/english/INGAME.php
+++ b/language/english/INGAME.php
@@ -61,7 +61,6 @@
 //----------------------------------------------------------------------------//
 //TOPNAV
 $lang['tn_vacation_mode']					= 'Vacation mode active until ';
-$lang['tn_vacation_mode_active'] 			= "Vacation mode active"; 
 $lang['tn_delete_mode']						= 'Your account is in erase mode. The same will be deleted the ';
 
 //----------------------------------------------------------------------------//
@@ -89,7 +88,7 @@
 $lang['lm_contact']							= 'Contact';
 $lang['lm_forums']							= 'Forum';
 $lang['lm_logout']							= 'Logout';
-$lang['lm_administration']					= 'Administration';
+$lang['lm_administration']					= 'Administation';
 $lang['lm_game_speed']						= 'Game';
 $lang['lm_fleet_speed']						= 'Fleets';
 $lang['lm_resources_speed']					= 'Resources';
@@ -114,7 +113,7 @@
 $lang['ov_distance_unit']					= 'km';
 $lang['ov_temperature']						= 'Temperature';
 $lang['ov_aprox']							= 'approx.';
-$lang['ov_temp_unit']						= '&#186;C';
+$lang['ov_temp_unit']						= '°C';
 $lang['ov_to']								= 'to';
 $lang['ov_position']						= 'Position';
 $lang['ov_points']							= 'Points';
@@ -214,7 +213,7 @@
 //----------------------------------------------------------------------------//
 //FLEET - FLEET1 - FLEET2 - FLEET3 - FLEETACS - FLEETSHORTCUTS
 $lang['fl_returning']						= 'Returning';
-$lang['fl_onway']							= 'On the road';
+$lang['fl_onway']							= 'En camino';
 $lang['fl_r']								= '(R)';
 $lang['fl_a']								= '(A)';
 $lang['fl_send_back']						= 'Back';
@@ -282,7 +281,7 @@
 $lang['fl_expedition_fleets_limit']			= 'Expedition flying fleets limite reached!';
 $lang['fl_week_player']						= 'The player is very weak!';
 $lang['fl_strong_player']					= 'The player is very strong!';
-$lang['fl_in_vacation_player']				= 'The player is in vacation mode!';
+$lang['fl_in_vacation_player']				= '¡El jugador esta en modo vacaciones!';
 $lang['fl_no_slots']						= 'No more slots available';
 $lang['fl_empty_transport']					= 'You can not transport 0 resources';
 $lang['fl_planet_populed']					= 'This planet is occupied!';
@@ -310,8 +309,8 @@
 
 //----------------------------------------------------------------------------//
 //BUILDINGS - RESEARCH - SHIPYARD - DEFENSES
-$lang['bd_dismantle']						= 'Dismantle';
-$lang['bd_interrupt']						= 'Interrupt';
+$lang['bd_dismantle']						= 'Deconstruct';
+$lang['bd_interrupt']						= 'Interrumpir';
 $lang['bd_cancel']							= 'cancel';
 $lang['bd_working']							= 'Working';
 $lang['bd_build']							= 'build';
@@ -320,13 +319,13 @@
 $lang['bd_no_more_fields']					= 'No more room on the planet';
 $lang['bd_remaining']						= 'Remaining';
 $lang['bd_lab_required']					= 'You need to build a research laboratory on this planet first!';
-$lang['bd_building_lab']					= 'Can not research when the laboratory is expanding';
+$lang['bd_building_lab']					= 'No se puede investigar cuando se esta ampliando el laboratorio';
 $lang['bd_lvl']								= 'level';
 $lang['bd_spy']								= ' spy';
 $lang['bd_commander']						= ' commander';
 $lang['bd_research']						= 'research';
 $lang['bd_shipyard_required']				= 'You need to build a shipyard on this planet first!';
-$lang['bd_building_shipyard']				= 'You can not build ships when the shipyard is upgrading';
+$lang['bd_building_shipyard']				= 'No puedes fabricar naves durante la ampliación del hangar';
 $lang['bd_available']						= 'Available: ';
 $lang['bd_build_ships']						= 'Build';
 $lang['bd_protection_shield_only_one']		= 'The shield can be built only once!';
@@ -349,21 +348,13 @@
 $lang['rs_sum']								= 'Total:';
 $lang['rs_daily']							= 'Res per day:';
 $lang['rs_weekly']							= 'Res per week:';
-$lang['rs_annually']						= 'Res per year';
-$lang['rs_monthly']							= 'Res per month';
-$lang['rs_hour']							= 'Res per hour';
 
 //----------------------------------------------------------------------------//
 //OFFICIERS
-$lang['of_title']							= 'Officers';
-$lang['of_recruit']							= 'Recruit';
-$lang['of_active']							= '<strong><font color="lime">Active</font></strong>';
-$lang['of_inactive']						= '<strong><font color="red">Inactive</font></strong>';
-$lang['of_recruit']							= 'Recruit';
-$lang['of_max_lvl']							= 'Max. level';
-$lang['of_available_points']				= 'Accessible to dark matter:';
-$lang['of_points_per_thousand_darkmatter']	= '';
-$lang['of_lvl']								= 'Level';
+$lang['of_title']							= 'Oficiales';
+$lang['of_recruit']							= 'Reclutar';
+$lang['of_active']							= '<strong><font color="lime">Activo</font></strong>';
+$lang['of_inactive']						= '<strong><font color="red">Inactivo</font></strong>';
 
 //----------------------------------------------------------------------------//
 //TRADER
@@ -384,7 +375,6 @@
 $lang['tr_quota_exchange']					= 'Exchange rate';
 $lang['tr_exchange']						= 'Swap';
 $lang['tr_darkmatter_needed']				= 'You need at least <font color="#FF8900">%s of dark matter</font> too visit the dealer.';
-$lang['tr_full_storage']					= 'The %s is full';
 
 //----------------------------------------------------------------------------//
 //TECHTREE
@@ -471,69 +461,69 @@
 2 => "Crystals are the main resource used to build electronic circuits and form certain alloy compounds.",
 3 => "Deuterium is used as fuel for spaceships and is harvested in the deep sea. Deuterium is a rare substance and is thus relatively expensive.",
 4 => "Solar power plants absorb energy from solar radiation. All mines need energy to operate.",
-12 => "A nuclear fusion reactor which produces a helium atom from two deuterium atoms using an extremely high pressure and a very high temperature.",
+12 => "Un reactor de fusión nuclear que produce un átomo de helio a partir de dos átomos de deuterio usando una presión extremadamente alta y una elevadísima temperatura.",
 14 => "Robotic factories provide construction robots to aid in the construction of buildings. Each level increases the speed of the upgrade of buildings.",
-15 => "nanobots factory is the latest evolution of robotics. Each enhancement provides more and more efficient nanobots that speed of construction.",
-21 => "The hangar is where structures are built ships and planetary defense.",
+15 => "La fábrica de nanobots es la última evolución de la robótica. Cada mejora proporciona nanobots más y más eficientes que incrementan la velocidad de construcción.",
+21 => "El hangar es el lugar donde se construyen naves y estructuras de defensa planetaria.",
 22 => "Provides storage for excess metal.",
 23 => "Provides storage for excess crystal.",
 24 => "Giant tanks for storing newly-extracted deuterium.",
 31 => "A research lab is required in order to conduct research into new technologies.",
-33 => "The Terraformer is required to enable inaccessible areas of your planet to build infrastructure.",
-34 => "The alliance depot supplies fuel to friendly Fleets in orbit helping with defense.",
-41 => "Because the moon has no atmosphere, you need a moon base to generate living space.",
-42 => "Using the sensor phalanx, the fleets of other empires can be discovered and observed. The larger the sensor chain phalanx, the greater the range to scan.",
-43 => "The huge quantum leaps are transmitters that are capable of sending large fleets throughout the universe without loss of time.",
-44 => "The silo is a storage and planetary missile launch.",
+33 => "El Terraformer es necesario para habilitar áreas inaccesibles de tu planeta para edificar infraestructuras.",
+34 => "The alliance depot supplies fuel to friendly fleets in orbit helping with defense.",
+41 => "Dado que la luna no tiene atmósfera, se necesita una base lunar para generar espacio habitable.",
+42 => "Usando el sensor phalanx, las flotas de otros imperios pueden ser descubiertas y observadas. Cuanto mayor sea la cadena de sensores phalanx, mayor el rango que pueda escanear.",
+43 => "El saltos cuánticos son transmisores enormes que son capaces de enviar grandes flotas a través del universo sin perdida de tiempo.",
+44 => "El silo es un lugar de almacenamiento y lanzamiento de misiles planetarios.",
 
-106 => "Using this technology, information can be obtained on other planets.",
-108 => "The higher the level of computer technology, more fleets you can control simultaneously. Each additional level of this technology increases the number of fleets to 1.",
-109 => "This technology increases the efficiency of your weapon systems. Each improvement of military technology adds 10% power to the base damage of any weapon available.",
-110 => "The defense technology is used to generate a protective shield around your particle structures.
-Each level of this technology increases the effective shield by 10% (based on the level of a given structure).",
-111 => "highly sophisticated alloys help to increase the armor of a ship by adding 10% of its strength at each level to the base strength.",
-113 => "Understanding the technology of different types of energy, many new and advanced research can be adapted. Energy technology is of great importance for a modern research laboratory.",
-114 => "Incorporating the fourth and fifth dimension in propulsion technology, you can have a new type of motor is more efficient and uses less fuel than conventional ones.",
-115 => "Run research in this technology provides combustion engines always faster, although each level only increases the speed by 10% of base speed of a given ship.",
-117 => "The pulse motor system is based on the principle of repulsion of particles. Matter is repelled waste generated by the fusion reactor used to provide the energy necessary for this type of propulsion engine.",
-118 => "hyperspace engines allow you to enter it through a hyperspace window to dramatically reduce travel time. Hyperspace is an alternative space with more than 3 dimensions.",
-120 => "The laser technology is an important knowledge, leads to monochromatic light tightly focused on a target. The damage can be mild or moderate depending on the power of lightning ...",
-121 => "The Ionic technology focuses a beam of accelerated ions in a target, which can cause great damage because of the nature of energized electrons.",
-122 => "plasma weapons are even more dangerous than any known weapon system due to the aggressive nature of plasma.",
-123 => "Scientists of your planets can communicate with each other through this network.",
-124 => "The ships are equipped with scientific equipment to collect data on long expeditions.",
-199 => "Through the firing of graviton particles concentrated gravitational field is generated artificially with enough power and attractiveness to destroy not only ships but entire moons.",
+106 => "Usando esta tecnolog&iacute;a, puede obtenerse informaci&oacute;n sobre otros planetas.",
+108 => "Cuanto m&aacute;s elevado sea el nivel de tecnolog&iacute;a de computaci&oacute;n, m&aacute;s flotas podr&aacute;s controlar simultaneamente. Cada nivel adicional de esta tecnologia, aumenta el numero de flotas en 1.",
+109 => "Este tipo de tecnolog&iacute;a incrementa la eficiencia de tus sistemas de armamento. Cada mejora de la tecnolog&iacute;a militar a&ntilde;ade un 10% de potencia a la base de da&ntilde;o de cualquier arma disponible.",
+110 => "La tecnolog&iacute;a de defensa se usa para generar un escudo de part&iacute;culas protectoras alrededor de tus estructuras.
+Cada nivel de esta tecnolog&iacute;a aumenta el escudo efectivo en un 10% (basado en el nivel de una estructura dada).",
+111 => "Las aleaciones altamente sofisticadas ayudan a incrementar el blindaje de una nave a&ntilde;adiendo el 10% de su fuerza en cada nivel a la fuerza base.",
+113 => "Entendiendo la tecnolog&iacute;a de diferentes tipos de energ&iacute;a, muchas investigaciones nuevas y avanzadas pueden ser adaptadas. La tecnolog&iacute;a de energ&iacute;a es de gran importancia para un laboratorio de investigaci&oacute;n moderno.",
+114 => "Incorporando la cuarta y quinta dimensi&oacute;n en la tecnolog&iacute;a de propulsi&oacute;n, se puede disponer de un nuevo tipo de motor; que es m&aacute;s eficiente y usa menos combustible que los convencionales.",
+115 => "Ejecutar investigaciones en esta tecnolog&iacute;a proporciona motores de combusti&oacute;n siempre m&aacute;s rapido, aunque cada nivel aumenta solamente la velocidad en un 10% de la velocidad base de una nave dada.",
+117 => "El sistema del motor de impulso se basa en el principio de la repulsi&oacute;n de part&iacute;culas. La materia repelida es basura generada por el reactor de fusi&oacute;n usado para proporcionar la energ&iacute;a necesaria para este tipo de motor de propulsi&oacute;n.",
+118 => "Los motores de hiperespacio permiten entrar al mismo a trav&eacute;s de una ventana hiperespacial para reducir dr&aacute;sticamente el tiempo de viaje. El hiperespacio es un espacio alternativo con m&aacute;s de 3 dimensiones.",
+120 => "La Tecnolog&iacute;a l&aacute;ser es un importante conocimiento; conduce a la luz monocrom&aacute;tica firmemente enfocada sobre un objetivo. El da&ntilde;o puede ser ligero o moderado dependiendo de la potencia del rayo...",
+121 => "La Tecnolog&iacute;a i&oacute;nica enfoca un rayo de iones acelerados en un objetivo, lo que puede provocar un gran da&ntilde;o debido a su naturaleza de electrones cargados de energ&iacute;a.",
+122 => "Las armas de plasma son incluso m&aacute;s peligrosas que cualquier otro sistema de armamento conocido, debido a la naturaleza agresiva del plasma.",
+123 => "Los cient&iacute;ficos de tus planetas pueden comunicarse entre ellos a trav&eacute;s de esta red.",
+124 => "Las naves son equipadas con equipo cientifico para tomar datos en largas expediciones.",
+199 => "A trav&eacute;s del disparo de part&iacute;culas concentradas de gravit&oacute;n se genera un campo gravitacional artificial con suficiente potencia y poder de atracci&oacute;n para destruir no solo naves, sino lunas enteras.",
 
-202 => "The small ships are cargo ships used to transport very agile resources from one planet to another.",
-203 => "The big ship loading is an advanced version of the small cargo ships, allowing for greater storage capacity and higher speeds through improved propulsion system.",
-204 => "The hunter is a lightweight maneuverable craft that you can find in almost any planet. The cost is not particularly high, but also the shield and carrying capacity are very low.",
-205 => "The Hunter heavy is the logical evolution of lightweight shields provide reinforced and increased attack power.",
-206 => "The battle cruisers have a shield nearly three times stronger than the heavier and more hunters double attack power. Its travel speed is also among the more rational ; ask for ever.",
-207 => "The battleships are the backbone of any military fleet. Heavy armor, powerful weapons systems and high travel speed and a high load capacity makes this ship a tough opponent to fight against.",
-208 => "This ship provides a facility to go where no man has gone before and colonize new worlds.",
-209 => "The recyclers are used to collect debris floating in space to recycle them into useful resources.",
-210 => "espionage probes are small unmanned droids with an exceptionally fast propulsion system used to spy on enemy planets.",
-211 => "The Bomber is a special purpose ship, developed to cut through heavier planetary defenses.",
-212 => "Are simple solar satellites orbiting satellites equipped with photovoltaic panels and transmitters to bring energy to the planet. Hereby is transmitted to the ground using a special laser.",
-213 => "The destroyer is the heaviest spacecraft ever seen and has an unprecedented attack potential.",
-214 => "There is nothing as big and dangerous as an approaching Death Star.",
-215 => "Battleship is a highly specialized craft to intercept hostile fleets.",
+202 => "Las naves peque&ntilde;as de carga son naves muy &aacute;giles usadas para transportar recursos desde un planeta a otro",
+203 => "La nave grande de carga es una versi&oacute;n avanzada de las naves peque&ntilde;as de carga, permitiendo as&iacute; una mayor capacidad de almacenamiento y velocidades m&aacute;s altas gracias a un mejor sistema de propulsi&oacute;n.",
+204 => "El cazador ligero es una nave maniobrable que puedes encontrar en casi cualquier planeta. El coste no es particularmente alto, pero asimismo el escudo y la capacidad de carga son muy bajas.",
+205 => "El cazador pesado es la evoluci&oacute;n logica del ligero, ofreciendo escudos reforzados y una mayor potencia de ataque.",
+206 => "Los cruceros de combate tienen un escudo casi tres veces m&aacute;s fuerte que el de los cazadores pesados y m&aacute;s del doble de potencia de ataque. Su velocidad de desplazamiento est&aacute; tambi&eacute;n entre las m&aacute;s r&aacute;pidas jam&aacute;s vista. ",
+207 => "Las naves de batalla son la espina dorsal de cualquier flota militar. Blindaje pesado, potentes sistemas de armamento y una alta velocidad de viaje, as&iacute; como una gran capacidad de carga hace de esta nave un duro rival contra el que luchar.",
+208 => "Esta nave proporciona lo necesario para ir a donde ning&uacute;n hombre ha llegado antes y colonizar nuevos mundos.",
+209 => "Los recicladores se usan para recolectar escombros flotando en el espacio para reciclarlos en recursos &uacute;tiles.",
+210 => "Las sondas de espionaje son peque&ntilde;os droides no tripulados con un sistema de propulsi&oacute;n excepcionalmente r&aacute;pido usado para espiar en planetas enemigos.",
+211 => "El Bombardero es una nave de prop&oacute;sito especial, desarrollado para atravesar las defensas planetarias m&aacute;s pesadas.",
+212 => "Los sat&eacute;lites solares son simples sat&eacute;lites en &oacute;rbita equipados con c&eacute;lulas fotovoltaicas y transmisores para llevar la energ&iacute;a al planeta. Se transmite por este medio a la tierra usando un rayo l&aacute;ser especial.",
+213 => "El destructor es la nave m&aacute;s pesada jam&aacute;s vista y posee un potencial de ataque sin precedentes.",
+214 => "No hay nada tan grande y peligroso como una estrella de la muerte aproxim&aacute;ndose.",
+215 => "El Acorazado es una nave altamente especializada en la intercepci&oacute;n de flotas hostiles.",
 
-401 => "The missile defense system is a simple but cheap.",
-402 => "Through a focused laser beam, it can cause more damage than normal ballistic weapons.",
-403 => "large lasers have an output better energi'ay greater structural integrity than the small lasers.",
-404 => "Using a vast electromagnetic acceleration, gauss cannons accelerate heavy projectiles.",
-405 => "The ion cannons fired high-energy ion beams its target, destabilizing and destroying shields the electronics.",
-406 => "The Guns of plasma free energy of a small solar flare in a ball of plasma. Destructive energy is even higher than that of the Destroyer.",
-407 => "Small Shield Dome covers the planet with a thin protective shield that can absorb huge amounts of energy.",
-408 => "The great dome of protection comes from an enhanced defense technology that absorbs even more energy before collapsing.",
-502 => "Destroy interceptor missiles interplanetary missiles.",
-503 => "The interplanetary missile defense systems destroy the enemy.",
+401 => "El lanzamisiles es un sistema de defensa sencillo, pero barato.",
+402 => "Por medio de un rayo l&aacute;ser concentrado, se puede provocar m&aacute;s da&ntilde;o que con las armas bal&iacute;sticas normales.",
+403 => "Los l&aacute;sers grandes posee una mejor salida de energ&iacute;a y una mayor integridad estructural que los l&aacute;sers peque&ntilde;os.",
+404 => "Usando una inmensa aceleraci&oacute;n electromagn&eacute;tica, los ca&ntilde;ones gauss aceleran proyectiles pesados.",
+405 => "Los ca&ntilde;ones i&oacute;nicos disparan rayos de iones altamente energ&eacute;ticos contra su objetivo, desestabilizando los escudos y destruyendo los componentes electr&oacute;nicos.",
+406 => "Los ca&ntilde;ones de plasma liberan la energ&iacute;a de una peque&ntilde;a erupci&oacute;n solar en una bala de plasma. La energ&iacute;a destructiva es incluso superior a la del Destructor.",
+407 => "La c&uacute;pula peque&ntilde;a de protecci&oacute;n cubre el planeta con un delgado campo protector que puede absorber inmensas cantidades de energ&iacute;a.",
+408 => "La c&uacute;pula grande de protecci&oacute;n proviene de una tecnolog&iacute;a de defensa mejorada que absorbe incluso m&aacute;s energ&iacute;a antes de colapsarse.",
+502 => "Los misiles de intercepci&oacute;n destruyen los misiles interplanetarios.",
+503 => "Los misiles interplanetarios destruyen los sistemas de defensa del enemigo.",
 
 601 => 'Geologist is an expert in mining and astro crystallography. Attend their equipment in metallurgy and chemistry and is also responsible for interplanetary communications to optimize the use and refinement of raw material throughout the empire.<br><br><strong><font color="lime">+10% mine production</font></strong>',
 602 => 'The Admiral is an experienced veteran and a skillful strategist. The hardest battle is able to get an idea of the situation and contact their admirals subordinates. A wise emperor could rely on their help during the fighting.<br><br><strong><font color="lime">+2 max. fleet slots</font></strong>',
-603 => 'The Engineer is a specialist in energy management. In peacetime, it increases the energy of all the colonies. In case of attack, ensuring the supply of energy to the cannons, and avoid a possible overload, leading to a reduction in defense lost battle.<br><br><strong><font color="lime">Minimizes losses in half defenses<br />+10% energy production</font></strong>',
-604 => 'The guild is composed of technocrats authentic genius, and always find that dangerous edge where it all explode into a thousand pieces before they could find an explanation and technology rational. No normal human being ever try to decode the code of a technocrat, with its presence, the researchers modeled the rule.<br><br><strong><font color="lime">+2 Espionage level<br/>-25% Less time for research</font></strong>',
+603 => 'The Engineer is a specialist in energy management. In peacetime, it increases the energy of all the colonies. In case of attack, ensuring the supply of energy to the cannons, and avoid a possible overload, leading to a reduction in defense lost battle.<br><br><strong><font color="lime">Minimizes losses in half defenses,<br />+10% energy production</font></strong>',
+604 => 'The guild is composed of technocrats authentic genius, and always find that dangerous edge where it all explode into a thousand pieces before they could find an explanation and technology rational. No normal human being ever try to decode the code of a technocrat, with its presence, the researchers modeled the rule.<br><br><strong><font color="lime">+2 Espionage level,<br/>-25% Less time for research</font></strong>',
 );
 
 //----------------------------------------------------------------------------//
@@ -678,7 +668,6 @@
 $lang['info'][215]['name']        			= "Battlecruiser";
 $lang['info'][215]['description'] 			= "This ship is one of the most advanced fighting ships ever to be developed, and is particularly deadly when it comes to destroying attacking fleets. With its improved laser cannons on board and advanced Hyperspace engine, the Battlecruiser is a serious force to be dealt with in any attack.<br><br> Due to the ships design and its large weapons system, the cargo holds had to be cut, but this is compensated for by the lowered fuel consumption.";
 
-
 // -------------------------- DEFENSES ----------------------------------------------------------------------------------------------------//
 $lang['info'][401]['name']        			= "Rocket Launcher";
 $lang['info'][401]['description'] 			= "Your first basic line of defense. These are simple ground based launch facilities that fire conventional warhead tipped missiles at attacking enemy targets. As they are cheap to construct and no research is required, they are well suited for defending raids, but lose effectiveness defending from larger scale attacks. Once you begin construction on more advanced defense weapons systems, Rocket Launchers become simple fodder to allow your more damaging weapons to inflict greater damage for a longer period of time.<br><br>After a battle, there is up to a 70 % chance that failed defensive facilities can be returned to use.";
@@ -701,16 +690,6 @@
 $lang['info'][503]['name']        			= "Interplanetary Missiles";
 $lang['info'][503]['description'] 			= "Interplanetary Missiles (IPM) are your offensive weapon to destroy the defenses of your target. Using state of the art tracking technology, each missile targets a certain number of defenses for destruction. Tipped with an anti-matter bomb, they deliver a destructive force so severe that destroyed shields and defenses cannot be repaired. The only way to counter these missiles is with APMs.<br><br> Each level of your missile silo developed can store 10 ABMs, 5 IPMs, or a combination of both missile types.";
 
-$lang['info'][601]['name']        			= "Geologist";
-$lang['info'][601]['description'] 			= 'Geologist is an expert in mining and astro crystallography. Attend their equipment in metallurgy and chemistry and is also responsible for interplanetary communications to optimize the use and refinement of raw material throughout the empire.';
-$lang['info'][602]['name']        			= "Admiral";
-$lang['info'][602]['description'] 			= "The Admiral is an experienced veteran and a skillful strategist. The hardest battle is able to get an idea of the situation and contact their admirals subordinates. A wise emperor could rely on their help during the fighting.";
-$lang['info'][603]['name']        			= "Engineer";
-$lang['info'][603]['description'] 			= "The Engineer is a specialist in energy management. In peacetime, it increases the energy of all the colonies. In case of attack, ensuring the supply of energy to the cannons, and avoid a possible overload, leading to a reduction in defense lost battle.";
-$lang['info'][604]['name']        			= "Technocrat";
-$lang['info'][604]['description'] 			= "The guild is composed of technocrats authentic genius, and always find that dangerous edge where it all explode into a thousand pieces before they could find an explanation and technology rational. No normal human being ever try to decode the code of a technocrat, with its presence, the researchers modeled the rule.";
-
-
 //----------------------------------------------------------------------------//
 //MESSAGES
 $lang['mg_type'][0]    						= 'Spy reports';
@@ -1171,7 +1150,7 @@
 $lang['cff_toward']							= ' toward ';
 $lang['cff_with_the_mission_of']			= '. With the mission of: ';
 $lang['cff_to_explore']						= ' to explore ';
-$lang['cff_comming_back']					= ' comes back from ';
+$lang['cff_comming_back']					= ' back ';
 $lang['cff_back']							= 'Comming back';
 $lang['cff_to_destination']					= 'Heading to destination';
 
@@ -1240,17 +1219,4 @@
 $lang['ma_some_destroyed']   				=' has been destroyed by interceptor missiles.';
 $lang['ma_missile_attack']					="";
 $lang['ma_missile_string']					='Missiles attack (%1%) from %2% arrive to planet %3% <br><br>';
-
-// chat.php
-$lang['chat_title']                         = 'Chat';
-$lang['chat_ally_title']                    = 'Chat Alliance';  
-$lang['Chat']                               = "Chat";
-$lang['chat_loading']                       = "Loading...";
-$lang['chat_disc']                          = "Chat disc";
-$lang['chat_message']                       = "Message";
-$lang['chat_short']                         = "Short";
-$lang['chat_text']                          = "Text";
-$lang['chat_send']                          = "Send";
-$lang['chat_history']                       = "History";
-
 ?>
\ No newline at end of file
diff --git a/adm/AdminFunctions/index.htm b/language/index.html
similarity index 100%
rename from adm/AdminFunctions/index.htm
rename to language/index.html
diff --git a/language/russian/ADMIN.mo b/language/russian/ADMIN.mo
deleted file mode 100644
index 1d8e136..0000000
--- a/language/russian/ADMIN.mo
+++ /dev/null
@@ -1,1024 +0,0 @@
-<?php
-//---------------	GENERAL	------------------------// 
-$lang['404_page']			= 'У Ва� нет до�таточных прав';
-$lang['adm_cp_title']		= '�дмини�тратор�ка� Панель';
-$lang['adm_cp_index']		= 'Главна�';
-$lang['mu_moderation_page']	= 'Права пользователей';
-$lang['adm_cp_logout']		= 'Выход';
-
-//	MISCELБNEO - MISCELLANEOUS
-$lang['ad_number']			= 'â„–';
-$lang['only_numbers']		= 'Вы можете только войти в чи�ла!';
-$lang['select_option']		= 'Выбрать...';
-
-// 	RANGO - RANK
-$lang['rank'][0]	= 'Пользователь';
-$lang['rank'][1]	= 'Модератор';
-$lang['rank'][2]	= 'Оператор';
-$lang['rank'][3]	= '�дмини�тратор';
-
-// 	TIEMPO - TIME
-$lang['time_days']		= 'День';
-$lang['time_hours']		= 'Ча�ы';
-$lang['time_minutes']	= 'Минут';
-$lang['time_seconds']	= 'Секунд';
-//###########################################################//
-
-
-//---------------	Ñ—SI O NO? - YES OR NO?	------------------------// 
-$lang['one_is_yes'][1]	= 'Да';
-$lang['one_is_yes'][0]	= '�ет';
-
-$lang['one_is_no'][1]	= '�ет';
-$lang['one_is_no'][0]	= 'Да';
-//###########################################################//
-
-
-//---------------	BOTONES - BUTTONS	------------------------// 
-$lang['button_submit']		= 'Отправить';
-$lang['button_add']			= 'Дабавить';
-$lang['button_delete']		= 'Удалить';
-$lang['button_filter']		= 'Фильтр';
-$lang['button_deselect']	= 'От�е�ть';
-$lang['button_reset']		= 'Обнулить';
-$lang['button_des_se']		= 'Выбрать/От�ейте в�е';
-//###########################################################//
-
-
-//---------------	ID's	------------------------//
-$lang['input_id']			= 'ID';
-$lang['input_id_user']		= 'ID Пользовател�';
-$lang['input_id_planet']	= 'ID Планеты';
-$lang['input_id_moon']		= 'ID Луны';
-$lang['input_id_p_m']		= 'ID Планеты или Луны';
-$lang['input_id_ally']		= 'ID �ль�н�а';
-//###########################################################//
-
-
-//---------------	RECURSOS - Ре�ур�ы	------------------------// 
-$lang['resources_title']	= 'Ре�ур�ы';
-$lang['count_res']			= 'Count Resources';
-$lang['metal']				= 'Метал';
-$lang['crystal']			= 'Кри�талы';
-$lang['deuterium']			= 'Дейтерий';
-$lang['energy']				= 'Энерги�';
-$lang['darkmatter']			= 'Темна� матери�';
-//###########################################################//
-
-
-//---------------	NAVES - Карабли	------------------------// 
-$lang['ships_title']		= 'Карабли';
-$lang['ships_count']		= 'Количе�тво Караблей';
-$lang['small_ship_cargo']	= 'Малый тран�порт';
-$lang['big_ship_cargo']		= 'Большой тран�порт';
-$lang['light_hunter']		= 'Лёгкий и�требитель';
-$lang['heavy_hunter']		= 'Т�жёлый и�требитель';
-$lang['crusher']			= 'Крей�ер';
-$lang['battle_ship']		= 'Линкор';
-$lang['colonizer']			= 'Колонизатор';
-$lang['recycler']			= 'Переработчик';
-$lang['spy_sonde']			= 'Шпион�кий зонд';
-$lang['bomber_ship']		= 'Бомбардировщик';
-$lang['solar_satelit']		= 'Солнечный �путник';
-$lang['destructor']			= 'Уничтожитель';
-$lang['dearth_star']		= 'Звезда �мерти';
-$lang['battleship']			= 'Линейный крей�ер';
-$lang['ac_supernova']		= 'Сверхнова';
-//###########################################################//
-
-
-//---------------	DEFENSAS - ОБОРО��	------------------------// 
-$lang['defenses_title']				= 'Оборона';
-$lang['defenses_count']				= 'Количе�тво По�троек';
-$lang['misil_launcher']				= 'Ракетна� у�тановка';
-$lang['small_laser']				= 'Легкий лазер';
-$lang['big_laser']					= 'Т�жёлый лазер';
-$lang['gauss_canyon']				= 'Пушка Гау��а';
-$lang['ionic_canyon']				= 'Ионное орудие';
-$lang['buster_canyon']				= 'Плазменное орудие';
-$lang['small_protection_shield']	= 'Малый щитовой купол';
-$lang['big_protection_shield']		= 'Большой щитовой купол';
-$lang['planet_protector']			= '�ейтронный купол';
-$lang['interceptor_misil']			= 'Ракета-перехватчик';
-$lang['interplanetary_misil']		= 'Межпланетна� ракета';
-$lang['atom_protector']		        = '�томное орудие';
-//###########################################################//
-
-
-//---------------	EDIFICIOS - По�тройки	------------------------// 
-$lang['buildings_title']		= 'По�тройки';
-$lang['moon_build']				= 'Созданые Луны';
-$lang['buildings_count']		= 'Количе�тво По�троек';
-$lang['metal_mine']				= 'Рудник по добыче металла';
-$lang['crystal_mine']			= 'Рудник по добыче кри�талла';
-$lang['deuterium_sintetizer']	= 'Синтезатор дейтери�';
-$lang['solar_plant']			= 'Солнечна� �лектро�танци�';
-$lang['fusion_plant']			= 'Термо�дерный реактор';
-$lang['robot_factory']			= 'Фабрика роботов';
-$lang['nano_factory']			= 'Фабрика нанитов';
-$lang['shipyard']				= 'Верфь';
-$lang['metal_store']			= 'Хранилище металов';
-$lang['crystal_store']			= 'Хранилище кре�талов';
-$lang['deuterium_store']		= 'Емко�ть дл� дейтери�';
-$lang['laboratory']				= 'И��ледователь�ка� лаборатори�';
-$lang['terraformer']			= 'Тераформеры';
-$lang['ally_deposit']			= 'Склад �ль�н�а';
-$lang['silo']					= 'Ракетна� шахта';
-$lang['moonbases']				= 'Луна� база';
-$lang['phalanx']				= 'Сен�орна� фаланга';
-$lang['cuantic']				= 'Прышковые врата';
-//###########################################################//
-
-
-//---------------	INVESTIGACIONES - И�ледование	------------------------// 
-$lang['researchs_title']		= 'И�ледовани�';
-$lang['researchs_count']		= 'Количе�тво И�ледований';
-$lang['spy_tech']				= 'Шпион�ка� Технологи�';
-$lang['computer_tech']			= 'Компьютерна� технологи�';
-$lang['military_tech']			= 'Оружейна� технологи�';
-$lang['defence_tech']			= 'Щитова� технологи�';
-$lang['shield_tech']			= 'Технологи� защиты ко�миче�ких аппаратов';
-$lang['energy_tech']			= 'Энергетиче�ка� технологи�';
-$lang['hyperspace_tech']		= 'Гиперпро�тран�твенна� технологи�';
-$lang['combustion_tech']		= 'Ракетный двигатель';
-$lang['impulse_motor_tech']		= 'Импуль�ный двигатель';
-$lang['hyperspace_motor_tech']	= 'Гиперпро�тран�твенный двигатель';
-$lang['laser_tech']				= 'Лазерна� технологи�';
-$lang['ionic_tech']				= 'Ионна� технологи�';
-$lang['buster_tech']			= 'Плазменна� технологи�';
-$lang['intergalactic_tech']		= 'Межгалактиче�ка� научно-и��ледователь�ка� �еть';
-$lang['expedition_tech']	 	= 'Эк�педиционна� технологи�';
-$lang['colonisation_tech']      = 'Колонизационна� технологи�';
-$lang['graviton_tech']			= 'Гравитационна� технологи�';
-$lang['atom_tech']			    = '�томна� технологи�';
-//###########################################################//
-
-
-//---------------	OFICIALES - Офицеры	------------------------// 
-$lang['officiers_title']		= 'Офицеры';
-$lang['officiers_count']		= 'Офицер�кий уровень';
-$lang['geologist']				= 'Геолог';
-$lang['admiral']				= '�дмирал';
-$lang['engineer']				= 'Инженер';
-$lang['technocrat']				= 'Технократ';
-$lang['spy']					= 'Шпион';
-$lang['constructor']			= 'Кон�труктор';
-$lang['scientific']				= 'Доктор �аук';
-$lang['commander']				= 'Камандир';
-$lang['storer']					= 'Кладовщик';
-$lang['defender']				= 'Ма�тер Обороны';
-$lang['destroyer']				= 'Генерали��иму�';
-$lang['general']				= 'Генерал';
-$lang['protector']				= 'Оборонитель-ма�кировщик';
-$lang['conqueror']				= 'Рейдер';
-$lang['emperor']				= 'Император';
-//###########################################################//
-
-
-//---------------	CONSULTAS SQL - SQL QUERIES	------------------------//
-$lang['qe_title_menu']	= 'SQL вопро�ы';
-$lang['qe_execute']		= 'SQL Вопро�ы выполн�ют';
-$lang['qe_succes']		= 'Дей�твие, выполненное У�пешно';
-$lang['qe_note']		= 'Внимание: В�тавте только одно врем�';
-//###########################################################//
-
-
-//---------------	EDITOR	------------------------//
-// GLOBAL - MENU
-$lang['ad_forgiven_id']			= 'Ведите Ваш ID!';
-$lang['ad_back_to_menu']		= '�азад к выбору меню';
-$lang['ad_editor_title']		= 'Редактор �каунтов';
-$lang['ad_editor_buildings']	= 'По�тройки';
-$lang['ad_editor_ships']		= 'Карабли';
-$lang['ad_editor_defenses']		= 'Оборона';
-$lang['ad_editor_researchs']	= 'И�ледование';
-$lang['ad_editor_officiers']	= 'Офицеры';
-$lang['ad_editor_personal']		= 'Пер�ональные данные';
-$lang['ad_editor_planets']		= 'Планеты и Луны';
-$lang['ad_editor_resources']	= 'Ре�ур�ы';
-$lang['ad_editor_alliances']	= '�ль�н�';
-$lang['ad_editor_authlevels']	= 'Управление до�тупом';
-
-//	INVESTIGACIONES - RESEARCHS
-$lang['ad_add_succes'] 		 = ' И��ледование, добавленное у�пешно ';
-$lang['ad_delete_succes'] 	 = ' И��ледование, удаленно у�пешно ';
-$lang['ad_research_title'] 	 = ' Редактирование И��ледовани� ';
-
-//	OFICIALES - OFFICIERS
-$lang['ad_offi_title'] 			 = ' Редактируют Офицеров';
-$lang['ad_offi_succes_add'] 	 = ' Офицеры добавлен у�пешно ';
-$lang['ad_offi_succes_delete'] 	 = ' Офицер удален полно�тью ';
-
-//	RECURSOS - RESOURCES
-$lang['ad_add_sucess'] 		 = ' Ре�ур�ы, добавленны у�пешно ';
-$lang['ad_delete_sucess'] 	 = ' Ре�ур�ы, удаленны у�пешно ';
-$lang['ad_main_title'] 		 = ' Управление ре�ур�ами и технологи�ми ';
-
-//	NAVES - SHIPS
-$lang['ad_ships_title'] 		 = ' Редактирование караблей ';
-$lang['ad_add_sucess_ships'] 	 = ' Карабль, добавлен у�пешно ';
-$lang['ad_delete_sucess_ships']  = ' Карабль, удален у�пешно ';
-
-//	DEFENSAS - DEFENSES
-$lang['ad_defenses_title'] 			 = ' Редактор Обороны ';
-$lang['ad_add_defenses_succes'] 	 = ' Оборона, добавленна у�пешно ';
-$lang['ad_delete_defenses_succes'] 	 = ' Оборона удалена у�пешно ';
-
-//	EDIFICIOS - 
-$lang['ad_buildings_title']  = ' Редактируют Здани� ';
-$lang['ad_planet_id'] 		 = ' ID Планеты или Луны ';
-$lang['ad_levels'] 			 = ' Уровень ';
-$lang['ad_add_succes'] 		 = ' Здани�, добавленно у�пешно ';
-$lang['ad_delete_succes'] 	 = ' Здани�, удаленно у�пешно ';
-$lang['ad_error_moon_only']  = ' Лунные здани� можна дабавить только в лунах! ';
-
-// DATOS PERSONALES - PERSONAL DATA
-$lang['ad_personal_title']		= 'Редоктирование пер�ональных данных';
-$lang['ad_personal_name']		= 'Им�';
-$lang['ad_personal_email']		= 'E-mail';
-$lang['ad_personal_email2']		= 'E-mail по�то�нный';
-$lang['ad_personal_pass']		= 'Пароль';
-$lang['ad_personal_succes']		= 'Параметры на�тройки изменили�ь у�пешно.';
-$lang['ad_personal_vacat']		= 'Отправить в отпу�к?';
-
-//	ALIANZA - ALLIANCES
-$lang['ad_ally_title']		= 'Редактор �ль�н�а';
-$lang['ad_ally_change_id']	= 'Изменить лидера аль�н�а';
-$lang['ad_ally_name']		= 'Изменить имени';
-$lang['ad_ally_tag']		= 'Изменить TAG';
-$lang['ad_ally_text1']		= 'Внешний тек�т';
-$lang['ad_ally_text2']		= 'Внутренний тек�т';
-$lang['ad_ally_text3']		= 'Прикладной тек�т';
-$lang['ad_ally_delete']		= 'Удалить �ль�н�';
-$lang['ad_ally_delete_u']	= 'Удалить игрока';
-$lang['ad_ally_user_id']	= '(ID игрока)';
-$lang['ad_ally_succes']		= 'Операци� выполнина у�пешно.';
-$lang['ad_ally_not_exist3']	= 'Пользователь не �уще�твует или не �вл�ет�� членом �того аль�н�а!';
-$lang['ad_ally_not_exist']	= '�ль�н� не �уще�твует!';
-$lang['ad_ally_not_exist2']	= 'Пользователь не �уще�твует!';
-
-//	PLANETAS Y LUNAS - PLANETS AND MOONS
-$lang['ad_pla_title']			= 'Редактор Планет /Лун';
-$lang['ad_pla_edit_name']		= 'Изменить название';
-$lang['ad_pla_change_id']		= 'Изменить владельца (ID Игрока)';
-$lang['ad_pla_edit_diameter']	= 'Изменить размер';
-$lang['ad_pla_edit_fields']		= 'Изменить обла�ть';
-$lang['ad_pla_delete_b']		= 'Удалите в�е здани�';
-$lang['ad_pla_delete_s']		= 'Удалить в�е карабли';
-$lang['ad_pla_delete_d']		= 'Удалить в�ю оборону';
-$lang['ad_pla_delete_hd']		= 'Удалите в верфи очередь по�тройки и защиты';
-$lang['ad_pla_delete_cb']		= 'Удалить очередь по�троек';
-$lang['ad_pla_delete_planet']	= 'Удалить планету';
-$lang['ad_pla_title_a']			= 'Е�ли у Ва� е�ть луна, то она тоже перейдет к другому владельцу.';
-$lang['ad_pla_title_l']			= 'Е�ли у Ва� е�ть луна, то её положение тоже измененит��.';
-$lang['ad_pla_change_p']		= 'Изменить кординаты планеты';
-$lang['ad_pla_change_pp']		= 'accent mark to make the change of position';
-$lang['ad_pla_succes']			= 'Изменени�, произведенны у�пешно.';
-$lang['ad_pla_error_planets']	= 'луны не может быть измененна владельцем!';
-$lang['ad_pla_error_user']		= 'Пользователь не �уще�твует!';
-$lang['ad_pla_error_planets2']	= 'Планета не �уще�твует!';
-$lang['ad_pla_error_planets3']	= 'Требуемые координаты уже наход�т�� в и�пользовании!';
-$lang['ad_pla_error_planets4']	= '�ельз� перемещать луну в планету, у которой уже е�ть луна!';
-$lang['ad_pla_error_planets5']	= 'У выбронных координат должна быть планета!';
-$lang['ad_pla_delete_planet_s']	= 'Планета, удаленна у�пешно.';
-//###########################################################//
-
-
-//---------------	PANEL DE SUSPENSIУN - BAN PANEL	------------------------//
-$lang['bo_the_player']			= 'Игрок ';
-$lang['bo_the_player2']			= 'Игрок ';
-$lang['bo_banned']				= ' Был О�тановлен у�пешно.';
-$lang['bo_unbanned']			= ' Сн�л прио�тановку �н�та у�пешно.';
-$lang['bo_username']			= 'Им� игрока';
-$lang['bo_vacaations']			= 'Отпу�к?';
-$lang['bo_reason']				= 'Причина дл� Прио�тановки';
-$lang['bo_time']				= 'Прио�тановка врем�';
-$lang['bo_vacation_mode']		= 'Спо�об отпу�ка';
-$lang['bo_ban_player']			= 'Забанить/Редоктировать Бан';
-$lang['bo_unban_player']		= 'Спи�ок Забаненых';
-$lang['bo_user_doesnt_exist']	= 'Игрок не �уще�твует!';
-$lang['bo_user_select']			= 'Выбор...';
-$lang['bo_select_title']		= 'Ведите им� что начинало�ь �';
-$lang['bo_suspended_panel']		= 'Панель прио�тоновки';
-$lang['bo_bbb_go_back']			= '[ �азад ]';
-$lang['bo_bbb_go_act']			= '[ Сбро�ить ]';
-$lang['bo_bbb_title_1']			= 'Си�тема Прио�тановки';
-$lang['bo_bbb_title_2']			= 'Дата когда закончит�� прио�тановка';
-$lang['bo_bbb_title_3']			= 'Си�тема Прио�тановки <br> <font color=red > Примечание: �тот пользователь уже временно от�транен';
-$lang['bo_bbb_title_4']			= 'Чтобы уменьшить дни, ча�ы, и т.д. добавте мину� перед чи�лом, Пример: -5 ';
-$lang['bo_bbb_title_5']			= 'Прео�тановлен до';
-$lang['bo_bbb_title_6']			= 'Дата изменени�';
-$lang['bo_characters_1']		= 'Характери�тики: ';
-$lang['bo_characters_suus']		= '&nbsp; (Прио�тоновленный)';
-$lang['bo_order_username']		= '[Пор�док имени]';
-$lang['bo_order_id']			= '[Пор�док ID]';
-$lang['bo_order_banned']		= '[Пор�док временного прио�тановленни�]';
-$lang['bo_total_users']			= 'В�его игроков: ';
-$lang['bo_total_banneds']		= 'Временно заблокированые пользователи: ';
-//###########################################################//
-
-
-//---------------	ENCRIPTADOR MD5 - ENCRIPTER MD5	------------------------//
-$lang['et_md5_encripter']				= 'Кодирование парол� (MD5)';
-$lang['et_pass']						= 'Пароль';
-$lang['et_result']						= 'Результат';
-$lang['et_encript']						= 'Кодировать';
-//###########################################################//
-
-
-//---------------	CONFIGURACIУN DE ESTAD�STICAS - STATS CONFIG	------------------------//
-$lang['cs_title']						= '�а�тройка параметров �тати�тики';
-$lang['cs_point_per_resources_used']	= 'Стоимо�ть 1 пункта �тати�тики';
-$lang['cs_resources']					= 'ре�ур�ы';
-$lang['cs_users_per_block']				= 'Кол-во обновл�емых игроков (min. 10)';
-$lang['cs_fleets_on_block']				= 'Обновление флотов в полете';
-$lang['cs_time_between_updates']		= 'Врем� между обновлением �тати�тики';
-$lang['cs_minutes']						= 'Минут';
-$lang['cs_points_to_zero']				= 'Обновление игроков � нулевыми очками';
-$lang['cs_access_lvl']					= 'Уровень до�тупа';
-$lang['cs_save_changes']				= 'Сохранить изменени�';
-$lang['cs_timeact_1']					= 'По�леднее обновление включено: ';
-//###########################################################//
-
-
-//---------------	LISTA DE ERRORES - ERROR LIST	------------------------//
-$lang['er_errors']				= ' ошибка/ок';
-$lang['er_error_list']			= 'Спи�ок ошибок';
-$lang['er_dlte_all']			= 'Удалить в�е';
-$lang['er_type']				= 'Тип';
-$lang['er_data']				= 'Дата';
-//###########################################################//
-
-
-//---------------	LISTA DE MENSAJES - MESSAGES LIST	------------------------//
-$lang['ml_message_list']		= 'Спи�ок �ообщений';
-$lang['ml_page']				= 'Страница';
-$lang['ml_type']				= 'Тип';
-$lang['ml_dlte_selection']		= 'Удалить выбранные';
-$lang['ml_dlte_since']			= 'Удалить начина� � ';
-$lang['ml_dlte_since_button']	= 'Удалить';
-$lang['ml_date']				= 'Дата';
-$lang['ml_from']				= 'От';
-$lang['ml_to']					= 'Кому';
-$lang['ml_subject']				= 'Обьект';
-$lang['ml_content']				= 'Содержание';
-$lang['ml_see_all_messages']	= 'См. в�е �ообщени�';
-//###########################################################//
-
-
-//---------------	MENSAJE GLOBAL - GLOBAL MESSAGE	------------------------//
-$lang['ma_message_sended']		= 'Ваше �ообщение отправлено!!';
-$lang['ma_subject_needed']		= 'Вы должны ве�ти название темы!';
-$lang['ma_send_global_message']	= 'Ото�лать В�ем Сообщение';
-$lang['ma_subject']				= 'Тема';
-$lang['ma_characters']			= 'Чи�ло �имволов';
-$lang['ma_none']				= 'От �дмини�трации.';
-//###########################################################//
-
-
-//---------------	BASE DE DATOS - DATA BASES	------------------------//
-$lang['od_not_opt']			= '�Е ОПТИМИЗИРОВ��О';
-$lang['od_not_check']		= 'Ошибка!';
-$lang['od_opt']				= 'ОПТИМИЗИРОВ��О';
-$lang['od_rep']				= 'Fix!';
-$lang['od_check_ok']		= 'Хорошо!';
-$lang['od_opt_db']			= 'Оптимизаци� БД';
-$lang['od_optimize']		= 'Оптимизировать';
-$lang['od_repair']			= 'Отладка';
-$lang['od_check']			= 'Проверить';
-$lang['od_select_action']	= 'Выбор';
-//###########################################################//
-
-
-//---------------	PБGINA DE INICIO - OVERVIEW	------------------------//
-$lang['ow_title']				    = 'Привет�твие от XG Proyect';
-$lang['ow_welcome_text']			= 'Благодарим за выбор XG Proyect.';
-$lang['ow_overview']			    = 'Контрольна� панель';
-$lang['ow_support']					= 'Поддержка';
-$lang['ow_credits']					= 'Благодарно�ть';
-$lang['ow_forum']				    = 'Форум';
-$lang['ow_proyect_leader']		    = 'Лидер проекта';
-$lang['ow_principal_contributors']	= 'О�обые благодарно�ти';
-$lang['ow_special_thanks']			= 'О�обые благодарно�ти';
-$lang['ow_install_file_detected']	= 'Удалите папку install/';
-$lang['ow_config_file_writable']	= 'Файл config.php открыт дл� запи�и, у�тановите атрибут chmod 440 (read only).';
-$lang['ow_database_errors']			= 'Имеют�� ошибки в БД. Рекомендуем <a href="errors.php">про�мотреть ошибки</a>';
-$lang['ow_old_version']				= 'До�тупна нова� вер�и�. �ажмите <a href="http://xtreme-gamez.com.ar/forum/showthread.php?t=2126" target="_blanck"><b>З�ГРУЗИТЬ</b></a> новую вер�ию.';
-$lang['ow_none']							= '�ет замечаний';
-//###########################################################//
-
-
-//---------------	CONFIGURACIУN DEL JUEGO - GAME CONFIG	------------------------//
-$lang['se_server_parameters']				= 'Параметры �ервера';
-$lang['se_name']							= '�азвание игры';
-$lang['se_lang']							= 'Язык';
-$lang['se_general_speed']					= 'О�новна� �коро�ть';
-$lang['se_normal_speed']					= '�ормальна� �коро�ть игры: 1 <br> Мак�имум, рекомендуема� �коро�ть: 5';
-$lang['se_normal_speed_resoruces']			= '�ормальна� �коро�ть производ�тва: 1 <br> Мак�имум, рекомендуема� �коро�ть: 5';
-$lang['se_normal_speed_fleett']				= '�ормальна� �коро�ть флотов: 1 <br> Мак�имум, рекомендуема� �коро�ть: 5';
-$lang['se_fleet_speed']						= 'Скоро�ть флота';
-$lang['se_resources_producion_speed']		= 'Скоро�ть производ�тва';
-$lang['se_forum_link']						= 'С�ылка форума';
-$lang['se_server_op_close']					= 'Стату� �ервера (on/off)';
-$lang['se_server_status_message']			= 'Сообщение, е�ли �ервер выключен';
-$lang['se_server_planet_parameters']		= 'Параметры новых планет';
-$lang['se_initial_fields']					= 'Кол-во полей';
-$lang['se_fields']							= 'полей';
-$lang['se_per_hour']						= 'в ча�';
-$lang['se_metal_production']				= 'Производ�тво металла';
-$lang['se_crystal_production']				= 'Производ�тво кри�талла';
-$lang['se_deuterium_production']			= 'Производ�тво дейтери�';
-$lang['se_energy_production']				= 'Производ�тво �нергии';
-$lang['se_several_parameters']				= 'Другие параметры';
-$lang['se_title_admins_protection']			= 'Отметьте, е�ли требует�� избежать нападение на планеты админи�траторов и модеров.';
-$lang['se_admin_protection']				= 'Защита �дминов';
-$lang['se_debug_mode']						= 'Режим отладки';
-$lang['se_save_parameters']					= 'Сохранить параметры';
-$lang['se_configuration_title']				= 'Конфигураци�';
-$lang['se_server_naame']					= '�азвание(им�) вашей игры';
-$lang['se_cookie_name']						= 'Cookie name';
-$lang['se_cookie_advert']					= 'Е�ли Вы решили переименовать Cookie, то Вам и вашим пользователи должны разлогинит�� � �айта. <Br> Переименовывать Cookie Рекомендуем только, е�ли Вы получили не�колько в�еленных.';
-$lang['se_debug_message']					= 'Спо�об Отладки показывает древно вопро�ов, проводимых во врем� отладки';
-$lang['se_def_cdr']							= 'Оборона в обломки';
-$lang['se_ships_cdr']						= 'Карабли в обломки';
-$lang['se_def_cdr_message']					= 'У�танавливает процент обломков от обороны по�ле нападени�';
-$lang['se_ships_cdr_message']				= 'У�танавливает процент обломков от караблей по�ле нападени�';
-$lang['se_noob_protect']					= 'Защита от новичков';
-$lang['se_noob_protect2']					= 'Защита № очков(точки)';
-$lang['se_noob_protect3']					= 'Защита № ограничивают очков(точки)';
-$lang['se_noob_protect_e2']					= 'Чи�ло 5000 �то количе�тво очков по�ле которого отключает�� защита новичков.';
-$lang['se_noob_protect_e3']					= 'Чи�ло 5 �то разно�ть в значени�х �тати�тики определ�ющие �лабого и �ильного игрока, например, е�ть игрок � он на 1 ме�те, он может атаковать первые 5 ме�т, игрока на 6 ме�те он атаковать не может.';
-//###########################################################//
-
-
-//---------------	MODERACIУN - MODERATION	------------------------//
-//	PERMISOS - PERMISSIONS
-$lang['mod_title']				= 'Права до�тупа';
-$lang['mod_range']				= 'Ранг';
-$lang['mod_power_view']			= 'Владение наблюдением';
-$lang['mod_power_edit']			= 'Редоктирование прав';
-$lang['mod_power_config']		= 'У�тановка игрового проце�а';
-$lang['mod_power_tools']		= 'Управление на�тройками';
-$lang['mod_power_loog']			= 'Имеют до�туп к панели �охронени� и�тории';
-
-//	NIVELES DE AUTORIDAD - AUTHLEVELS
-$lang['ad_authlevel_title']		= 'Ранги';
-$lang['ad_authlevel_name']		= '�азвание';
-$lang['ad_authlevel_auth']		= 'Про�мотр Рангов';
-$lang['ad_authlevel_succes']	= 'Стату� изменен полно�тью!';
-$lang['ad_authlevel_error']		= 'Вы уже имеете �тот уровень!!';
-$lang['ad_authlevel_error_2']	= 'Вход только  пользовател�м!';
-$lang['ad_authlevel_error_3']	= 'Вы не можете измен�ть на�тройки �аме �ебе, как �оздателю игры игры!';
-$lang['ad_authlevel_insert_id']	= 'Ведите ID вручную (�еоб�зательно';
-$lang['ad_authlevel_aa']		= '[�дмини�траторы]';
-$lang['ad_authlevel_oo']		= '[Операторы]';
-$lang['ad_authlevel_mm']		= '[Модераторы]';
-$lang['ad_authlevel_jj']		= '[Игроки]';
-$lang['ad_authlevel_tt']		= '[В�ех]';
-//###########################################################//
-
-
-//---------------	FLOTAS EN VUELO - FLYING FLEETS	------------------------//
-$lang['ff_flying_fleets']		= 'Флоты в полете';
-$lang['ff_ammount']				= 'Флот';
-$lang['ff_mission']				= 'Ми��и�';
-$lang['ff_beginning']			= 'Игрок';
-$lang['ff_departure']			= 'С планеты';
-$lang['ff_departure_hour']		= 'Врем� вылета';
-$lang['ff_objective']			= 'Цель-игрок';
-$lang['ff_arrival']				= 'Цель-планета';
-$lang['ff_hold_position']		= 'Удержание';
-$lang['ff_arrival_hour']		= 'Врем� прибыти�';
-$lang['ff_go_back_now']			= '�азад';
-$lang['ff_delete_succes']		= 'Полет �того влота, удален у�пешно';
-$lang['ff_goback_succes']		= "Рей� �того флота теперь возвращает�� к - первоначальной планете";
-//###########################################################//
-
-
-//---------------	ACTUALIZACIУN DE ESTADISTICAS - UPDATE STATS	------------------------//
-$lang['sb_top_memory']				= 'Пик и�пользованной пам�ти: %p KB / max. %m KB <br>';
-$lang['sb_final_memory']			= 'И�пользование пам�ти в конце: %e KB / max. %m KB<br>';
-$lang['sb_start_memory']			= 'И�пользованна� пам�ть �начала: %i KB / max. %m KB<br>';
-$lang['sb_stats_update']			= 'Стати�тика обновлена за %t �екунд<br>';
-$lang['sb_users_per_block']			= 'Количе�тво обновленных блоков игроков: %n<br>';
-$lang['sb_using_fleet_array']		= 'Про�читан ма��ив Лет�щих флотов<br>';
-$lang['sb_using_fleet_query']		= 'Ведет�� под�чет в базе<br> данных, что б получить кол-во очков от лет�щих флотов<br>';
-$lang['sb_stats_updated']			= 'Стати�тика обновлена. <br>Инфо:<br>';
-//###########################################################//
-
-
-//---------------	LISTA DE USUARIOS - USERS LIST	------------------------//
-$lang['ul_sure_you_want_dlte']		= 'Уверены что хотите удалить';
-//###########################################################//
-
-
-//---------------	MENU	------------------------//
-$lang['mu_general']					= 'О�новное';
-$lang['mu_connected']				= 'Обзор';
-$lang['mu_settings']				= '�а�тройки';
-$lang['mu_global_message']			= 'Глобальное �ообщение';
-$lang['mu_users_settings']			= 'Пользователи';
-$lang['mu_add_delete_resources']	= 'Добавить/удалить ре�ур�ы';
-$lang['mu_stats_options']			= '�а�тройки �тати�тики';
-$lang['mu_manage_users']			= 'Управление игроками';
-$lang['mu_ban_options']				= 'Опции Б��а';
-$lang['mu_moon_options']			= 'Опции лун';
-$lang['mu_observation']				= 'Об�ерватори�';
-$lang['mu_flying_fleets']			= 'Флоты в полете';
-$lang['mu_user_list']				= 'Спи�ок игроков';
-$lang['mu_moon_list']				= 'Спи�ок лун';
-$lang['mu_mess_list']				= 'Спи�ок �ообщений';
-$lang['mu_planet_list']				= 'Спи�ок планет';
-$lang['mu_error_list']				= 'Спи�ок ошибок';
-$lang['mu_active_planets']			= '�ктивные планеты';
-$lang['mu_tools']					= 'Ин�трументы';
-$lang['mu_md5_encripter']			= 'Шифровальщик паролей MD5';
-$lang['mu_optimize_db']				= 'Оптимизаци� БД';
-$lang['mu_manual_points_update']	= 'Обновление �тати�тики в РУЧ�УЮ';
-$lang['mu_mpu_confirmation']	    = 'Обновление �тати�тики автоматиче�кое, в любом �лучае ты можешь реализовывать �то вручную, е�ли Вы �того хотите - кликните зде�ь. Хотите продолжить?';
-$lang['mu_search_page']			    = 'Раширеный Пои�к';
-$lang['mu_info_account_page']		= 'Информаци� об �каунте';
-$lang['mu_planets_options']			= '�а�тройки Планет';
-$lang['mu_user_logs']				= 'Лог';
-//###########################################################//
-
-
-//---------------	REINICIO DE UNIVERSO - RESET UNIVERSE	------------------------//
-$lang['re_reset_universe']					= 'Сбро� в�еленной';
-$lang['re_reset_universe_confirmation']		= 'By clicking OK, resume at the requested options to zero. This operation can not be reversed, and it is your responsibility to make a backup database. If you restart the entire universe accounts will not be deleted.';
-
-$lang['re_defenses_and_ships']				= 'Меню Сбро�а';
-$lang['re_defenses']						= 'Сбро� обороны';
-$lang['re_ships']							= 'Сбро� караблей';
-$lang['re_reset_hangar']					= 'Сбро� очереди караблей �то�щих на по�тройку';
-$lang['re_buldings']						= 'По�тройки';
-$lang['re_buildings_pl']					= 'Сбро� планетарнных зданий';
-$lang['re_buildings_lu']					= 'Сбро� зданий на лунах';
-$lang['re_reset_buldings']					= 'Сбро� очереди зданий �то�щиих на по�тройку';
-$lang['re_inve_ofis']						= 'И�ледование и Офицеры';
-$lang['re_ofici']							= 'Сбро� офицеров';
-$lang['re_investigations']					= 'Сбро� и�ледованний';
-$lang['re_reset_invest']					= 'Сбро� очередь зданий �то�щих на и�ледованний';
-$lang['re_resources']						= 'Ре�ур�ы';
-$lang['re_resources_dark']					= 'Сбро� черной материи';
-$lang['re_resources_met_cry']				= 'Сбро� метала, кри�таллов и дейтери�';
-$lang['re_general']							= 'Общие';
-$lang['re_reset_moons']						= 'Сбро� лун';
-$lang['re_reset_notes']						= 'Сбро� примечаний';
-$lang['re_reset_rw']						= 'Сбро� �ообщени� об �ражени�х';
-$lang['re_reset_buddies']					= 'Сбро� �пи�ок друзей';
-$lang['re_reset_allys']						= 'Сбро� аль�н�ов';
-$lang['re_reset_fleets']					= 'Сбро� флотов';
-$lang['re_reset_errors']					= 'Сбро� ли�т ошибок';
-$lang['re_reset_banned']					= 'Сбро� забаненых';
-$lang['re_reset_messages']					= 'Сбро� �ообщений';
-$lang['re_reset_statpoints']				= 'Сбро� �тати�тики';
-$lang['re_reset_all']						= 'Сбро� в�ей в�еленной';
-$lang['re_reset_h1']						= 'Сбро� на�троек';
-$lang['re_reset_excess']					= '�атройки Сброшены У�пешно.';
-//###########################################################//
-
-
-//---------------	INFORMACIУN DE CUENTAS - DATA ACCOUNTS	------------------------//
-$lang['ac_user_id_required']				= 'Должно быть введено �уще�твующее ID игрока!';
-$lang['ac_select_one_id']					= 'Пожалуй�та выберите только одного пользовател�!';
-$lang['ac_no_character']					= 'Мы не принимаем пи�ьма, такого чи�ла!';
-$lang['ac_select_id_num']					= 'Ведите ID (Дополнительно)';
-$lang['ac_select_username']					= 'Выберите пользовател�';
-$lang['ac_username_doesnt']					= '�ет такого пользовател�!';
-$lang['ac_title']							= 'Детали �каунта';
-$lang['ac_title_entry']						= 'Подробно ';
-$lang['ac_more']							= '(More)';
-$lang['ac_no_ally']							= '�ет аль�н�а';
-$lang['ac_moon']							= 'Луна';
-$lang['ac_enter_user_id']					= 'Выберите пользовател�';
-$lang['ac_minimize_maximize']				= 'Минимизировать / мак�имизировать';
-$lang['ac_account_data']					= 'Даные об �каунте';
-$lang['ac_name']							= 'Им�';
-$lang['ac_checkip_title']					= 'IP Проверка';
-$lang['ac_checkip'][1]						= '<font color=aqua>�ктивизированный</font>';
-$lang['ac_checkip'][0]						= '<font color=#FF6600>�е �ктивированный</font>';
-$lang['ac_mail']							= 'Email';
-$lang['ac_perm_mail']						= 'Email По�то�нный';
-$lang['ac_auth_level']						= 'Ранг';
-$lang['ac_on_vacation']						= 'В Отпу�ке?';
-$lang['ac_banned']							= 'Прио�тановлен?';
-$lang['ac_alliance']						= '�ль�н�';
-$lang['ac_reg_ip']							= 'IP при реге�трации';
-$lang['ac_last_ip']							= 'По�ледний IP';
-$lang['ac_home_planet_id']					= 'ID Главной Планеты';
-$lang['ac_home_planet_coord']				= 'Координаты Главной Планеты';
-$lang['ac_user_system']						= 'Си�темные данные Пользовател�';
-$lang['ac_detailed_planet_moon_info']		= 'Детальна� инф. о планетах и лунах';
-$lang['ac_id_names_coords']					= 'ID, Им� и Координаты';
-$lang['ac_coords']							= 'Кординаты';
-$lang['ac_diameter']						= 'Диаметр';
-$lang['ac_fields']							= 'Пол�';
-$lang['ac_temperature']						= 'Температура';
-$lang['ac_officier_research']				= 'И��ледовани� и офицеры';
-$lang['ac_recent_destroyed_planets']		= '�едавно разрушенные планеты';
-$lang['ac_no_moons']						= 'Игрок не имеет никаких лун';
-$lang['ac_total_points']					= 'В�его: ';
-$lang['ac_points_count']					= 'Счет | Индек�';
-$lang['ac_ranking']							= 'Ранг';
-$lang['ac_see_ranking']						= 'Показать Стати�тику';
-$lang['ac_ally_ranking']					= 'Стати�тика �ль�н�а';
-$lang['ac_user_ranking']					= 'Стати�тика Пользовател�';
-$lang['ac_register_time']					= 'реге�траци�';
-$lang['ac_register_ally_time']				= 'Date crated';
-$lang['ac_act_time']						= 'По�ледн�� дата �ктивно�ти';
-$lang['ac_info_ally']						= 'Информаци� об �ль�н�е ';
-$lang['ac_leader']							= 'Лидер';
-$lang['ac_tag']								= 'TAG';
-$lang['ac_name_ali'] 						= ' Ful называют ';
-$lang['ac_ext_text'] 						= ' Внешний тек�т ';
-$lang['ac_int_text'] 						= ' Внутренний тек�т ';
-$lang['ac_sol_text'] 						= ' Тек�т за�влени� ';
-$lang['ac_image'] 					        = ' Древо �ль�н�а ';
-$lang['ac_ally_web'] 						= ' Сеть Соглашений ';
-$lang['ac_total_members'] 					= ' �омер членов ';
-$lang['ac_no_text_ext'] 					= ' �ль�н� не имеет никакого внешнего тек�та ';
-$lang['ac_no_text_int'] 					= ' �ль�н� не имеет никакого внутреннего тек�та ';
-$lang['ac_no_text_sol'] 					= ' �ль�н� не имеет никакого прикладного тек�та ';
-$lang['ac_no_img'] 							= ' �ль�н� не имеет �мблемы ';
-$lang['ac_no_web'] 							= ' �ль�н� не имеет web site ';
-$lang['ac_view_image'] 						= ' Пред�тавление отображают в другом окне ';
-$lang['ac_view_image2'] 					= ' Пред�тавление отображают ';
-$lang['ac_view_text_ext'] 					= ' Показывать внешний тек�т ';
-$lang['ac_view_text_int'] 					= ' Показывать внутренний тек�т ';
-$lang['ac_view_text_sol'] 					= ' Показывают aplication тек�т ';
-$lang['ac_moons_no']						= '<font color=red>(�ет Луны)</font>';
-$lang['ac_urlnow']							= 'URL: ';
-$lang['ac_time_destruyed']					= 'Дата полного разрушени�';
-$lang['ac_isnodestruyed']					= '<font color=red>(�ет никаких планет, разрушенных недавно)</font>';
-$lang['ac_no_alliance']						= '<font color=red>(�ет аль�н�а)</font>';
-$lang['ac_ali_text_11'] 					= ' Внешний тек�т ';
-$lang['ac_ali_text_22'] 					= ' Внутренний тек�т ';
-$lang['ac_ali_text_33'] 					= ' Прикладной тек�т ';
-$lang['ac_ali_logo_11'] 					= ' Древо �ль�н�а ';
-$lang['ac_ali_idid'] 						= ' ID: ';
-$lang['ac_suspended_title'] 				= ' Щит прио�тановки ';
-$lang['ac_suspended_time'] 			    	= 'Временно от�траненный';
-$lang['ac_suspended_longer'] 				= 'До';
-$lang['ac_suspended_reason'] 				= 'Причина';
-$lang['ac_suspended_autor'] 				= ' Временно от�траненный(прио�тановленный) дл� ';
-$lang['ac_note_k']							.= '<table><tr><th width=10%><font color=lime>T+</font></th><th>Overcome the trillon</th></tr>';
-$lang['ac_note_k']							.= '<tr><th width=10%><font color=lime>T</font></th><th>Преодоленным или тот же �амый как триллион</th></tr>';
-$lang['ac_note_k']							.= '<tr><th width=10%><font color=lime>B</font></th><th>Преодоленным или тот же �амый как миллиард</th></tr>';
-$lang['ac_note_k']							.= '<tr><th width=10%><font color=lime>M</font></th><th>Преодоленным или тот же �амый как миллион</th></tr>';
-$lang['ac_note_k']							.= '<tr><th width=10%><font color=lime>K</font></th><th>Преодоленным или тот же �амый как ты��ча</th></tr></table>';
-$lang['ac_leyend']							= '[ Leyend ]';
-$lang['ac_no_rank_level']					= 'Вы не имеете до�таточных разрешений, что бы про�матривать информацию отно�ительно �того пользовател�!';
-//###########################################################//
-
-
-//---------------	BUSCADOR AVANZADO - ADVANCED SEARCH	------------------------//
-$lang['se_no_data']		=	"�е имеет�� никаких данных";
-$lang['se_intro']		=	'Ключевое им�';
-$lang['se_users']		=	'Пользовател�';
-$lang['se_planets']		=	'Планету';
-$lang['se_moons']		=	'Луну';
-$lang['se_allys']		=	'�ль�н�';
-$lang['se_suspended']	=	'Временно от�траненный';
-$lang['se_vacations']	=	'Отпу�к';
-$lang['se_authlevels']	=	'�дмини�тратор';
-$lang['se_inactives']	=	'Бездей�твующий';
-$lang['se_planets_act']	=	'�ктив. Планет';
-$lang['se_type_typee']	=	'Тип';
-$lang['se_type_all']	=	'�ормальный пои�к';
-$lang['se_type_exact']	=	'Подробный пои�к';
-$lang['se_type_last']	=	'�ачало пи�ьма � любым �ловом.';
-$lang['se_type_first']	=	'Конец пи�ьма� любым �ловом';
-$lang['se_search']		=	'Пои�к';
-$lang['se_name']		=	'�азвание';
-$lang['se_id_owner']	=	'ID Владелец';
-$lang['se_galaxy']		=	'Галактика';
-$lang['se_system']		=	'Си�тема';
-$lang['se_planet']		=	'Планета';
-$lang['se_tag']			=	'TAG';
-$lang['se_email']		=	'E-mail';
-$lang['se_auth']		=	'Ранг';
-$lang['se_activity']	=	'По�л. Де�тельно�ть';
-$lang['se_ban']			=	'Прио�тановленный';
-$lang['se_vacat']		=	'В отпу�ке';
-$lang['se_ban_reason']	=	'Причина';
-$lang['se_ban_time']	=	'Прио�тановленный';
-$lang['se_ban_limit']	=	'До';
-$lang['se_ban_author']	=	'Прио�тановленный за';
-$lang['se_search_title']	=	'Ра�ширеный Пои�к';
-$lang['se_order_list_now']	=	'Пои�к по запро�у';
-$lang['se_input_name']		=	'�азвание';
-$lang['se_input_g']			=	'Галактика';
-$lang['se_input_s']			=	'Си�тема';
-$lang['se_input_p']			=	'Планета';
-$lang['se_input_inacti'] 	= 	'Бездей�твие';
-$lang['se_input_submit'] 	= 	'Заказ';
-$lang['se_input_authlevel']	=	'Права'; 
-$lang['se_input_email'] 	= 	'Электронна� почта';
-$lang['se_input_time'] 	    = 	'Врем�';
-$lang['se_input_longer']    = 	'Продолжительно�ть';
-$lang['se_input_authlevel']	=	'Права'; 
-$lang['se_input_prop'] 		= 	'Владелец';
-$lang['se_input_asc'] 		= 	'Вли�ние';
-$lang['se_input_desc'] 		= 	'Descendent';
-$lang['se_input_activity'] 	= 	'Де�тельно�ть';
-$lang['se_input_register'] 	= 	'Реги�траци�';
-$lang['se_input_members'] 	= 	' Чи�ло членов ';
-$lang['se_input_members2'] 	= 	' Члены ';
-$lang['se_input_have_moon'] = 	' Имеет луну? ';
-$lang['se_input_ip']		=	'IP';
-$lang['se_input_a']			=	'A';
-$lang['se_input_d']			=	'D';
-$lang['se_input_hay']		=	'Имеет�� ';
-$lang['se_input_inact']		=	' не активен/s';
-$lang['se_input_susss']		=	' временно от�траненный';
-$lang['se_input_admm']		=	' �дмини�тратор/s';
-$lang['se_input_allyy']		=	' аль�н�/s';
-$lang['se_input_planett']	=	' планет/s';
-$lang['se_input_moonn']		=	' лун/s';
-$lang['se_input_userss']	=	' игрок/s';
-$lang['se_input_vacatii']	=	' игрок/s on vacations';
-$lang['se_input_connect']	=	' игрок/s online';
-$lang['se_input_act_pla']	=	' активные планеты/s';
-$lang['se_filter_title']	=	'Фильтр';
-$lang['se_search_in']		=	'Дл�';
-$lang['online_users']		=	'Онлайн';
-$lang['se_limit']			=	'Лимит';
-$lang['se_pagees']			=	'Страницы';
-$lang['se_time_of_page']	=	'Страница, �озданна� на ';
-$lang['se_expand']			=	'Ра�ширить��';
-$lang['se_contrac']			=	'Collapse';
-$lang['se__next']			=	'Продолжить';
-$lang['se__before']			=	'�азад';
-$lang['se_search_info']		=	'Пои�к';
-$lang['se_asc_desc']		=	'ASC / DESC';
-$lang['se_search_order']	=	'Order';
-$lang['se_search_edit']		=	'Изменить';
-$lang['se_delete_succes_p']	=	'Удаленние у�пешно';
-$lang['se_confirm_planet']	=	'Выброна� Вами планета будет удалена полно�тью, главный или колонии, Вы желаете продолжить��?. Им� планеты:';
-
-$SE_ID		=	"ID";
-$SE_NAME	=	"Им�";
-
-// BЪSQUEDA EN TABLA DE USUARIOS
-$lang['se_search_users'][0]	=	$SE_ID;
-$lang['se_search_users'][1]	=	$SE_NAME;
-$lang['se_search_users'][2]	=	'E-mail';
-$lang['se_search_users'][3]	=	'По�. �ктивно�ть';
-$lang['se_search_users'][4]	=	'Дата реге�трации';
-$lang['se_search_users'][5]	=	'По�ледний IP';
-$lang['se_search_users'][6]	=	'Группа';
-$lang['se_search_users'][7]	=	'Прио�тановлен?';
-$lang['se_search_users'][8]	=	'В отпу�ке?';
-
-// BЪSQUEDA EN TABLA DE PLANETAS
-$lang['se_search_planets'][0]	=	$SE_ID;
-$lang['se_search_planets'][1]	=	$SE_NAME;
-$lang['se_search_planets'][2]	=	"Owner";
-$lang['se_search_planets'][3]	=	"По�. �ктивно�ть";
-$lang['se_search_planets'][4]	=	"Галактика";
-$lang['se_search_planets'][5]	=	"Си�тема";
-$lang['se_search_planets'][6]	=	"Планета";
-
-// BЪSQUEDA EN TABLA DE SUSPENDIDOS
-$lang['se_search_banned'][0]	=	$SE_ID;
-$lang['se_search_banned'][1]	=	$SE_NAME;
-$lang['se_search_banned'][2]	=	"Date of suspended";
-$lang['se_search_banned'][3]	=	"Date of reactivation";
-$lang['se_search_banned'][4]	=	"Причина";
-$lang['se_search_banned'][5]	=	"�втор";
-
-// BЪSQUEDA EN TABLA DE LA ALIANZA
-$lang['se_search_alliance'][0]	=	$SE_ID;
-$lang['se_search_alliance'][1]	=	$SE_NAME;
-$lang['se_search_alliance'][2]	=	"TAG";
-$lang['se_search_alliance'][3]	=	"Leader";
-$lang['se_search_alliance'][4]	=	"Дата �оздани";
-$lang['se_search_alliance'][5]	=	"�омер членов";
-//###########################################################//
-
-
-
-//---------------	CREADOR - MAKER	------------------------//
-$lang['new_creator_title']		= 'Создать';
-$lang['new_creator_title_u']	= 'Создать/Удалить игрока';
-$lang['new_creator_title_p']	= 'Создать/Удалить планету';
-$lang['new_creator_title_l']	= 'Создать/Удалить луну';
-$lang['new_creator_coor']		= 'Координаты';
-$lang['new_creator_go_back']	= '[ Вернут�� в меню ]';
-$lang['new_creator_refresh']	= '[ Обнулить ]';
-
-//	CREADOR DE USUARIOS - USERS MAKER
-$lang['new_title']				= 'Добавить нового пользовател�';
-$lang['new_only_numbers']		= 'Координаты должны только быть чи�лами!';
-$lang['new_error_coord']		= "Координаты не �оответ�твуют!";
-$lang['new_complete_all']		= 'В�тавьте в�е данные';
-$lang['new_error_name']			= 'Им� игрока уже и�пользует��!';
-$lang['new_error_email']		= 'Email уже и�пользует��!';
-$lang['new_error_email2']		= 'Email не де�твителен';
-$lang['new_error_passw']		= 'Пароль должен �одержать как минимум 4 чи�ла!';
-$lang['new_error_galaxy']		= 'Указанные координаты уже наход�т�� в и�пользовании!';
-$lang['new_user_success']		= 'Пользователь �оздал у�пешно.';
-$lang['new_add_user']			= 'Добавить';
-$lang['new_range']				= 'Ранг';
-$lang['new_coord']				= 'Кординаты';
-$lang['new_email']				= 'E-mail';
-$lang['new_pass']				= 'Пароль';
-$lang['new_name']				= 'Им�';
-
-//	CREADOR DE PLANETAS - PLANETS MAKER
-$lang['po_galaxy']				=	'Галактика';
-$lang['po_system']				=	'Солнечна� �и�тема';
-$lang['po_planet']				=	'Планету';
-$lang['po_colony']				=	'Колони�';
-$lang['po_fields_max']			=	'Пол�';
-$lang['po_coor_1']				=	'Координаты';
-$lang['po_add_planet']			=	'Дабавить Планету';
-$lang['po_delete_planet']		=	'Удалить Планету';
-$lang['po_name_planet']			=	'�азвание Планеты';
-$lang['po_complete_all']		=	'�едей�твительные данные или координаты уже в и�пользуют��!';
-$lang['po_complete_all2']		=	'Ошибка координат!';
-$lang['po_complete_succes']		=	'Планета, �озданна� у�пешно! | <a href="AccountEditorPage.php">Редоктировать планету</a>';
-$lang['po_complete_invalid']	=	'�едей�твительные данные!';
-$lang['po_complete_invalid2']	=	'Планета не �уще�твует!';
-$lang['po_complete_invalid3']	=	'Планеты могут только быть удалены!';
-$lang['po_complete_succes2']	=	'Планета, удаленна� у�пешно!';
-
-//	CREADOR DE LUNAS - MOON MAKER
-$lang['mo_moon_added']				= 'Луна добавлена у�пешно.';
-$lang['mo_moon_deleted']			= 'Луна, удаленна у�пешно.';
-$lang['mo_moon_doesnt_exist']		= 'Луна не �уще�твует!';
-$lang['mo_moon_only']				= 'Вы может только удалить луну!';
-$lang['mo_moon_unavaible']			= 'У планеты уже е�ть луна!';
-$lang['mo_planet_doesnt_exist']		= 'Планета не �уще�твует!';
-$lang['mo_moon_name']				= '�азвание Луны';
-$lang['mo_moon']					= 'Луна';
-$lang['mo_diameter']				= 'Диаметр';
-$lang['mo_temperature']				= 'Температура';
-$lang['mo_fields_avaibles']			= 'До�тупные пол�';
-$lang['po_add_moon']				= 'Добавить Луну';
-$lang['po_delete_moon']				= 'Удалить Луну';
-//###########################################################//
-
-
-//---------------	HISTORIAL - LOG	------------------------//
-$lang['log_log_body_build']			= 'Лог П�троек';
-$lang['log_log_body_resou']			= 'Лог Ре�ур�ов';
-$lang['log_log_body_def']			= 'Лог Обороны';
-$lang['log_log_body_ships']			= 'Лог Караблей';
-$lang['log_log_body_techs']			= 'Research log';
-$lang['log_log_body_offi']			= 'Лог Офицеров';
-$lang['log_log_body_personal']		= 'Лог Пер�ональных данных';
-$lang['log_log_body_ally']			= 'Лог �ль�н�ов';
-$lang['log_log_body_p_m']			= 'Лог Планет и Лун';
-$lang['log_log_body_reset']			= 'Лог Си�темных Сбро�ов';
-$lang['log_log_body_mod']			= 'Лог Си�темных ограничений';
-$lang['log_log_body_gen']			= 'Общий лог';
-$lang['log_log_body_config']		= 'Лог Конфигурации';
-$lang['log_log_title_22']			= 'Лог';
-$lang['log_alert']					= 'Е�ли Вы нажмете ОК, то  удалите в�е �одержимое тек�товых файлов, Вы желаете продолжить��?';
-$lang['log_input_value']			= 'Редактировать';
-$lang['log_go_back']				= '[&nbsp; Возвратить &nbsp;]';
-$lang['log_edit_succes']			= 'Редактирование У�пешно';
-$lang['log_delete_succes']			= 'Выбраный файл был удален у�пешно:&nbsp;';
-$lang['log_edit_link']				= '[&nbsp; Редактировать и�торию &nbsp;]';
-$lang['log_delete_link']			= '[&nbsp; Пу�та� и�тори� &nbsp;]';
-$lang['log_filesize_0']				= '<font color=yellow>Лог и�торий пу�т</font>';
-$lang['log_the_user']				= 'Игрок ';
-$lang['log_to_planet']				= 'к планете � ID: ';
-$lang['log_and']					= 'and ';
-$lang['log_to_user']				= 'к игроку � ID: ';
-$lang['log_moree']					= 'дабавить';
-$lang['log_nomoree']				= 'удалить';
-$lang['log_modify_personal']		= 'измениние �о �ледующими данными';
-$lang['log_title']					= 'Панель �дмини�тратор�ких И�торий';
-$lang['log_name_of_ally']			= '�азвание �ль�н�а';
-$lang['log_tag_of_ally']			= 'TAG из �ль�н�а';
-$lang['log_idnewleader']			= 'ID нового Лидера';
-$lang['log_text_ext']				= 'Внешний тек�т';
-$lang['log_text_int']				= 'Внутренний тек�т';
-$lang['log_text_sol']				= 'Прикладной тек�т';
-$lang['log_ally_delete']			= '�ЛЬЯ�С БЫЛ УД�ЛЕ�';
-$lang['log_id_user_expu']			= 'ID Пользовател� был и�ключен из аль�н�а';
-$lang['log_to_ally_whosid']			= 'к аль�н�у � ID: ';
-$lang['log_change_name_pla']		= 'Изменить название';
-$lang['log_delete_all_edi']			= 'Удалите в�е здани�';
-$lang['log_delete_all_ships']		= 'Удалить в�е карабли';
-$lang['log_delete_all_def']			= 'Удалить в�е оборону';
-$lang['log_delete_all_c_han']		= 'Удалить очередб верфи';
-$lang['log_delete_all_c_edi']		= 'Удалить не�колько зданий';
-$lang['log_change_diameter']		= 'Изменить диаметр дл�';
-$lang['log_change_fields']			= 'Изменить пол� дл�';
-$lang['log_change_pla_pos']			= 'Изменить координаты ';
-$lang['log_planet_pos']				= 'из планеты';
-$lang['log_moon_pos']				= 'из луны';
-$lang['log_reseteo']				= '�бро�';
-$lang['log_defenses']				= 'ОБОРО��';
-$lang['log_ships']					= 'КОР�БЛИ';
-$lang['log_c_hangar']				= 'HANGARES TAIL';
-$lang['log_buildings_planet']		= 'ЗД��ИЯ ПЛ��ЕТЫ';
-$lang['log_buildings_moon']			= 'ЛУ�ЫЕ ЗД��ИЯ';
-$lang['log_c_buildings']			= 'ROW OF BUILDINGS';
-$lang['log_researchs']				= 'RESEARCH';
-$lang['log_officiers']				= 'OFFICERS';
-$lang['log_c_researchs']			= 'INVESTIGATIONS OF COURSE';
-$lang['log_darkmatter']				= 'DARK MATTER';
-$lang['log_resources']				= 'RESOURCES';
-$lang['log_notes']					= 'NOTES';
-$lang['log_rw']						= 'BATTLE REPORTS';
-$lang['log_friends']				= 'FRIEND LIST';
-$lang['log_alliances']				= 'ALLIANCES';
-$lang['log_fleets']					= 'FLEET IN FLIGHT';
-$lang['log_errors']					= 'LIST OF ERRORS';
-$lang['log_banneds']				= 'SUSPENDED USER';
-$lang['log_messages']				= 'MESSAGES';
-$lang['log_statpoints']				= 'STATISTICS';
-$lang['log_moons']					= 'MOONS';
-$lang['log_all_uni']				= 'ALL THE UNIVERSE';
-$lang['log_change_auth_1']			= 'Change the range of the user with the ID ';
-$lang['log_change_auth_2']			= 'The correct range now is: ';
-$lang['log_can_view_mod']			= 'The moderators may see... ';
-$lang['log_can_view_ope']			= 'The operators may see... ';
-$lang['log_tools']					= 'Tools?';
-$lang['log_edit']					= 'Edit?';
-$lang['log_view']					= 'View observation menu?';
-$lang['log_config']					= 'Configure playing options?';
-$lang['log_system_mod_title']		= '<font color=lime>||| SYSTEM MODERATION |||</font>';
-$lang['log_system_auth_title']		= '<font color=lime>||| CHANGE RANK |||</font>';
-$lang['log_errores_title']			= '<font color=lime>||| LIST OF ERRORS |||</font>';
-$lang['log_delete_all_errors']		= 'has removed all the error messages';
-$lang['log_delete_errors']			= 'has removed an error';
-$lang['log_queries_title']			= '<font color=lime>||| CONSULT SQL |||</font>';
-$lang['log_queries_succes']			= 'has implemented the following statement SQL:';
-$lang['log_suspended_title']		= '<font color=lime>||| SYSTEM OF SUSPENSIONS |||</font>';
-$lang['log_suspended_1']			= 'the user has been suspended ';
-$lang['log_suspended_2']			= 'With the following specifications:';
-$lang['log_suspended_3']			= 'has removed the suspension ';
-$lang['log_reason']					= 'Reason: ';
-$lang['log_time']					= 'the: ';
-$lang['log_longer']					= 'to the: ';
-$lang['log_vacations']				= 'Vacation mode? ';
-$lang['log_info_detail_title']		= '<font color=lime>||| DETAILED INFORMATION |||</font>';
-$lang['log_searchto_1']				= ' seek user information ';
-$lang['log_attempt_1']				= ' has tried to enter the administrative panel';
-$lang['log_new_user']				= ' has created a new user with the following specifications';
-$lang['log_new_user_title']			= '<font color=lime>||| CREATION OF USERS |||</font>';
-$lang['log_new_user_name']			= 'Name';
-$lang['log_new_user_coor']			= 'Coordinates';
-$lang['log_new_user_auth']			= 'Rank';
-$lang['log_new_user_email']			= 'e-mail';
-$lang['log_circular_message']		= '<font color=lime>||| CIRCULAR MESSAGE |||</font>';
-$lang['log_message_specify']		= ' circular sent a message to these specifications';
-$lang['log_mes_subject']			= 'Subject';
-$lang['log_mes_text']				= 'Message';
-$lang['log_operation_succes']		= 'Operation on: ';
-$lang['log_database_view']			= ' use the database which made the following operation ';
-$lang['log_database_title']			= '<font color=lime>||| DATA BASE |||</font>';
-$lang['log_data_optimize']			= 'OPTIMIZE';
-$lang['log_data_repair']			= 'REPAIR';
-$lang['log_data_check']				= 'CHECK';
-$lang['log_change_stats']			= ' has changed the parameters of statistics';
-$lang['log_stats_value']			= 'Value of statistical 1 point';
-$lang['log_stats_value_2']			= 'Time of statistics update (minutes)';
-$lang['log_stats_value_3']			= 'Block User';
-$lang['log_stats_value_4']			= 'Fleet update block?';
-$lang['log_stats_value_5']			= 'The administration may be in the ranking?';
-$lang['log_stats_value_6']			= 'Until the rank can be included in the ranking?';
-$lang['log_sett_no1']				= ' change the following configuration';
-$lang['log_sett_close']				= 'Server closed? ';
-$lang['log_sett_close_rea']			= 'Reason? ';
-$lang['log_sett_debug']				= 'DEBUG mode activated? ';
-$lang['log_sett_name_game']			= 'Name of the  game ';
-$lang['log_sett_forum_url']			= 'Forum URL ';
-$lang['log_sett_velo_game']			= 'Speed of game ';
-$lang['log_sett_velo_flottes']		= 'Speed Fleet ';
-$lang['log_sett_velo_prod']			= 'Speed of production';
-$lang['log_sett_fields']			= 'Initial fields ';
-$lang['log_sett_basic_m']			= 'Basic metal per hour ';
-$lang['log_sett_basic_c']			= 'Basic glass per hour ';
-$lang['log_sett_basic_d']			= 'Basic deuterium per hour ';
-$lang['log_sett_adm_protection']	= 'Protection against active administrators? ';
-$lang['log_sett_language']			= 'Language ';
-$lang['log_sett_debris_def']		= 'Defenses to rubble ';
-$lang['log_sett_debris_flot']		= 'Ships to rubble ';
-$lang['log_sett_act_noobs']			= 'Protection against activated rookie? ';
-$lang['log_sett_noob_time']			= 'Time to protect against rookie ';
-$lang['log_sett_noob_multi']		= 'Limit points for the protection of rookie ';
-$lang['log_sett_name_cookie']		= 'Cookie name ';
-$lang['log_searchindb_del1']		= 'The user with the ID ';
-$lang['log_searchindb_del3']		= 'The planet with the ID ';
-$lang['log_searchindb_del2']		= ' has been eliminated from the game for';
-$lang['log_searchindb_users']		= 'Игроки';
-$lang['log_searchindb_planets']		= 'Планеты';
-$lang['log_searchindb_moons']		= 'Луны';
-$lang['log_searchindb_allys']		= '�ль�н�ы';
-$lang['log_searchindb_vacat']		= 'Vacations';
-$lang['log_searchindb_susp']		= 'Suspended';
-$lang['log_searchindb_admin']		= '�дмини�тратор';
-$lang['log_searchindb_inac']		= 'Inactive';
-$lang['log_search_advert_popup']	= 'To activate / deactivate history do so from the Permissions section. Click to go to the permissions panel.';
-//###########################################################//
-
-//-----------------------------chat.php------------------------------//
-$lang['ch_title']                         = 'Чат';
-?>
\ No newline at end of file
diff --git a/language/russian/CHANGELOG.mo b/language/russian/CHANGELOG.mo
deleted file mode 100644
index bb871bf..0000000
--- a/language/russian/CHANGELOG.mo
+++ /dev/null
@@ -1,934 +0,0 @@
-<?php
-
-$lang['Version']     = 'Versiуn';
-$lang['Description'] = 'Descripciуn';
-$lang['changelog']   = array(
-
-'2.9.5' => ' 29/07/10
-
-- [Seguridad] Corregidos varios bugs de seguridad (By slave7).-
-- [Seguridad] Corregidos varios bugs de seguridad (By jtsamper).-
-
-- [Cambio] Adaptado para que sea compatible con PHP 5.3.3.-
-- [Cambio] Aparecen todas las personas que aportaron algo en los crйditos del panel administrativo.-
-
-
-- Vieja numeraciуn
-- [Fix][Bug #5] Los sacs no coordinan los tiempos (By slave7).-
-
-- Numeraciуn del viejo Bug Tracker (http://sourceforge.net/apps/mantisbt/xgproyect/view_all_bug_page.php)
-- [Fix][Bug #0000011] Los Sacs reparten los recursos (By slave7).-
-- [Fix][Bug #0000065] Todas las rondas aparecen como ganadas y a eventualmente empatan (By Nickolay).-
-- [Fix][Bug #-------] La planta de fusiуn funcionaba al 100% cuando el planeta no tenнa deuterio (By slaver7)
-
-- Nueva numeraciуn (Arctic Tracker)
-- [Fix][Bug #0000002] Corregido el link que da mбs informaciуn sobre la protecciуn de novatos.-
-- [Fix][Bug #0000003] Corregido el bug en la alianza que causaba problemas para redirigir al sitio de la alianza.-
-- [Fix][Bug #0000004] Bug en la producciуn, produce mбs de lo que debe (By Calzon).-
-- [Fix][Bug #0000005] Bug en el incremento de puntos de las tecnologнas (By Think).-
-- [Fix][Bug #0000006] Bug en el Debug Log (By Green).-
-
-',
-
-'2.9.4' => ' 02/03/10
-- [Novedad] Ahora el mercader requiere materia oscura (2500), configurable desde constants.php.-
-
-- [Seguridad] Limitado desde la base de datos la cantidad de cupulas que pueden ser contruidas (Gracias a medel).-
-- [Seguridad] Mejora de seguridad en el formulario de los misiles.-
-
-- [Fix][Bug #0000031] Misiуn expediciуn da escuadron fantasma.-
-- [Fix][Bug #0000035] Se pueden enviar misiles interplanetarios a usuarios en vacaciones (By Neurus).- 
-- [Fix][Bug #0000036] Se pueden enviar misiles interplanetarios en negativo.-
-- [Fix][Bug #0000037] Se puede atacar con misiles interplanetarios a usuarios fuertes y debiles (By Neurus).-
-- [Fix][Bug #0000038] Luego de un error o advertencia en el envio de misiles no se vuelve a galaxia.-
-- [Fix][Bug #0000039] Al colonizar con recursos estos desaparecen.-
-- [Fix][Bug #0000043] En INGAME.mo hay 2 entradas iguales.-
-- [Fix][Bug #0000044] Varias cupulas de protecciуn (By Neko).-
-- [Fix][Bug #0000047] Error en template estadisticas.-
-- [Fix][Bug #0000048] Recursos negativos.-
-- [Fix][Bug #0000050] Ataques con sondas de espionaje.-
-- [Fix][Bug #0000056] Error al editar usuario en el panel administrativo (By Neko).-
-- [Fix][Bug #0000059] Solucionado el error que mostraba registros dobles en las estadнsticas.-
-- [Fix][Bug #-------] Fallo producido al recargar la pбgina de los edificios, defensas, tecnologias y naves (By Neko).-
-- [Fix][Bug #-------] Corregido un bug que no instalaba la tabla para los plugins.-
-- [Fix][Bug #-------] Corregido un bug que no tenнa en cuenta a la supernova en las expediciones.-
-- [Fix][Bug #-------] Corregido un bug que ocurria por tener menos deuterio que combustible a gastar (By Neko).-
-- [Fix][Bug #-------] No se mostraba correctamente el mensaje de modo vacaciones (By Neko).-
-- [Fix][Bug #-------] Si la cuenta estб en modo borrar y en modo vacaciones, en el overview se le da prioridad al mensaje de borrado de la cuenta.-
-- [Fix][Bug #-------] Corregido un bug menor en la creaciуn de planetas (By Kloud).-
-- [Fix][Bug #-------] Corregido un bug menor en el js que maneja los recursos al enviar una flota (By Neko).-
-
-- [Cambio] Actualizados los links de soporte y reporte de bugs del overview en el panel administrativo.-
-- [Cambio] Mejoras en los reportes.-
------------ Ahora en la primer ronda siempre se listan las flotas completas.-
------------ Ahora las sondas son destruidas en la primer ronda; al atacante le sale destrucciуn en la primer ronda, al defensor el reporte completo.-
------------ Ya no se duplica la primer ronda en las batallas de 2 rondas; en la primera se muestran las flotas completas y en la segunda el mensaje destruido.-
-- [Cambio] Modificada la licencia para el 2010.-
-',
-
-'2.9.3' => ' 12/02/10
-- [Seguridad] Mejoras de seguridad en el movimiento de recursos (By calzon).-
-
-- [Fix][Bug #0000040] Multiplicaciуn de recicladores (By tomtom).-
-- [Fix][Bug #-------] Bug que permitнa el incremento de naves en el salto cuбntico (By war4head).-
-
-- [Cambio] Nuevamente se volvio al viejo reloj en la visiуn general.-
-
-# Version 0.2 del panel administrativo
-
-.- Los moderadores y operadores ya no podran:
- || Suspender administradores.
- || Crear usuarios con rango mayor al de un jugador.
- || Reiniciar universo.
- || Ejecutar consultas SQL.
- || Editar datos personales.
- || Editar/Vaciar el historial.
-.- [MINOR ADD] Adherida la ID en el sistema de suspensiуn.
-.- Agregado un historial en el panel administrativo, la cual custodiara los movimientos de los siguientes archivos:
- || BanPage.php
- || ErrorPage.php
- || AccountEditorPage.php
- || Moderation.php
- || QueriesPage.php
- || ResetPage.php
- || AccountDataPage.php
- || CreateNewUserPage.php
- || GlobalMessagePage.php
- || DataBaseViewPage.php
- || ConfigStatsPage.php
- || SettingsPage.php
- || SearchInDBPage.php
-.- Logs protegidos con .htaccess para que nadie pueda leerlos.
-.- Agregada opciуn de modo vacaciones en Datos Personales.
-.- Agregado de vuelta el scrolling en el frame (No funciona en IE).
-.- Peque�o fix en la lista de mensajes.
-.- Las siguientes funciones han sido reemplazadas por una redirecciуn al buscador avanzado:
- || Lista de jugadores.
- || Lista de lunas.
- || Lista de planetas.
- || Lista de usuarios conectados.
- || Lista de planetas activos.
-.- Agregado al buscador avanzado:
- || Expandir / contraer.
- || Paginaciуn.
- || Nuevos filtros y tipos de bÑŠsqueda.
-.- [FIX] borrar usuarios (No borraba las colonias de la tabla xgp_planets).
-.- [FIX] bugs peque�os en el ejecutador de consultas SQL.
-.- Cambios en el ADMIN.mo y traduccion completa al inglйs. (Gracias Arali)
-.- Agregada nueva funciуn -> DeleteSelectedPlanet.
-',
-
-'2.9.2' => ' 01/12/09
-- [Seguridad] Cerrado un agujero en la alianza que permitнa sql injection (Gracias a privatethedawn).-
-
-- [Novedad] Implementado un nuevo sistema de Plugins v0.3 (Gracias adri93).-
-- [Novedad] Ahora cuando hay muchos recursos en la cuenta de un usuario se muestra K,M,B,T,T+ en la informaciуn de cuentas del panel del admin.-
-- [Novedad] Hora y fecha del servidor, en el overview, en Castellano. (Sustituir en la linea 402 el (es_ES), por el idioma deseado.).-
-
-- [Fix][Bug varios] Fueron corregidos varios bugs menores.-
-- [Fix][Bug #0000019] Famoso error en las estadнsticas provocado por una query que no era finalizada.-
-- [Fix][Bug #0000020] Informaciуn de cuentas en el panel del admin.
-- [Fix][Bug #-------] No se muestra bien el tiempo de estacionar en aliado en el panel del admin.-
-- [Fix][Bug #-------] Corregidos varios textos (espa�ol,inglйs) en el panel de administraciуn.-
-- [Fix][Bug #-------] Arreglado peque�o error en los datos mostrados en la seccion de recursos.-
-- [Fix][Bug #-------] Ahora muestra correctamente la inactividad de los jugadores de tu alianza desde.-
-- [Fix][Bug #-------] Al borrar un usuario se borraran todos sus planetas.-
-
-
-- [Cambio] Algunas mejoras de optimizaciуn en la informaciуn de cuentas en el panel administrativo.
-- [Otros]  Mejoras en el sistema de envio de flotas del FleetAjax.php
-',
-
-'2.9.1' => ' 01/11/09
-
-- [Fix][Menor] Corregido un bug menor en el texto de los informes de espionaje que permitнa bashing.-
-- [Fix][Menor] Corregido un bug menor en el texto de los reportes de combates.-
-- [Fix][Menor] Corregido un bug menor que mostraba carбcteres raros en la alianza luego de editar un texto (By Neko).-
-- [Fix][Menor] Corregido un bug menor que deformaba la pбgina de los mensajes al enviar mensajes muy largos (By Neko).- 
-- [Fix][Menor] Correciones en algunos textos.-
-
-Nueva numeraciуn (bug tracker)
-- [Fix][Bug #0000010] No direcciona bien el ataque.-
-
-Vieja numeraciуn
-- [Fix][Bug #5] Los sacs no coordinan los tiempos.-
-- [Fix][Bug #6] Los sacs no aparecen en el mismo mensajes en la visiуn general (By privatethedawn).-
-
-
-- [Cambio] Ahora cuando se estan moviendo flotas no es posible abandonar un planeta (By privatethedawn).-
-- [Cambio] Ahora al explorar la galaxia, si es tu propio sistema solar, no perderбs deuterio.-
-- [Cambio] Nuevo panel administrativo (By Neko)
-.- Nuevo skin
-.- Agregado el sistema de moderaciуn.
-.- FIX suspender usuario (Si el jugador ya estaba suspendido y lo suspendias de vuelta creaba 
-otra tabla con los mismos datos (duplicacion)). Mejoras.
-.- Reset de universo mejorado, con poder de reiniciar distintas cosas.
-.- [FIX] Al resetear todo el universo: 
- || no introducia el "id_level" en la tabla de planetas.
- || dejaba al usuario como inactivo (al reiniciar nuevamente se borraban las cuentas por inactividad).
-.- Opciones de lunas mejorado.
-.- Agregada la creaciуn de planetas.
-.- Contador de caracteres para mensajes (cntchar.js) nuevo y mejorado.
-.- Agregada la opcion de "ver todos los mensajes" y un "seleccionar todo" en la lista de mensajes.
-.- Agregado sistema para crear cuentas.
-.- Reestructuraciуn del adminresources.php (ahora AccountEditorPage.php)
- || Agregada la ediciуn de datos personales.
- || Agregada varias opciones mбs para la ediciуn de planetas y lunas.
- || Agregada la ediciуn de oficiales.
-.- Agregado un buscador avanzado.
-.- Eliminado el borrado de reportes cuando se borraba un usuario, sino cuando el otro atacante o defensor queria ver
-la batalla no le figuraba.
-',
-
-
-'2.9.0' => ' 21/10/09
-
-- [Seguridad] Ahora es encriptada la contrase�a que se ingresa durante la actualizaciуn.- 
-
-- [Cambio] Optimizaciуn y mejora general en el manejo de las lunas (By angelus_ira).-
-- [Cambio] Mejora en el rendimiento de algunas pбginas.-
-- [Cambio] Ahora al explorar la galaxia, si es tu propio sistema solar, no perderбs deuterio.-
-
-- [Fix][Bug #122] Problemas en la actualizaciуn de los puntos.-
-- [Fix][Bug #123] Bug en los reportes mostrando que se produjo un empate cuando no fue asi.-
-- [Fix][Bug #124] Problemas con el phalanx.-
-- [Fix][Bug #125] Bug en la lista de amigos no permite aceptar/rechazar.-
-- [Fix][Bug #126] No le aparecen los reportes de ataque al defensor.-
-- [Fix][Bug #127] Problema con el title de los recursos maximo en las flotas.-
-',
-
-'2.8' => ' 10/10/09
-
-- [Seguridad] Mejora de seguridad en varias funciones y archivos.-
-- [Seguridad] Mejora de seguridad y prevenciуn de nъmeros y caracteres no permitidos en el salto cuбntico (Gracias a Trojan).-
-
-- [Novedad] El pack en inglйs se encuentra 100% traducido (Gracias war4head).-
-- [Novedad] Se definieron constantes para los oficiales, asi es mбs fбcil editarlos (no lo recomiendo).-
-
-- [cambio] Mejoras varias en el script que calcula los ataques.-
-- [Cambio] Corregido un bug de seguridad al agregar recursos al envio de una flota (Gracias a MSW).-
-- [Cambio] Los reportes de combate de la secciуn mensajes ahora solo muestran un link al reporte y no un resumen.-
-- [Cambio] Peque�o fix y mejora de seguridad para el phalanx y el alcance (Gracias a Trojan).-
-- [Cambio] Optimizado el alcance del phalanx, reducida la carga de procesamiento (Gracias a Trojan).-
-- [Cambio] Optimizados los movimientos de flotas (Gracias a Trojan).-
-- [Cambio] Los recicladores valen ahora 10.000 de metal - 6.000 de cristal - 2.000 de deuterio como corresponde.-
-
-- [Fix][Varios] Correcciуn de varios bugs menores globales.-
-- [Fix][Varios] Corregidos varios bugs menores en el armado de las estadнsticas.-
-- [Fix][Varios] Corregidos varios bugs menores en los movimientos de flotas y misiones.-
-- [Fix][Bug #108] Coordenadas erroneas en el mensaje de reciclaje.-
-- [Fix][Bug #109] Los jugadores de la lista de compa�eros aparecen siempre como desconectados.-
-- [Fix][Bug #110] Duplicaciуn de recicladores al hacer multiple clicks en la galaxia.-
-- [Fix][Bug #111] Jugadores inactivos y borrados no son eliminados fisicamente.-
-- [Fix][Bug #112] No son actualizados los recursos del planeta de un jugador al ser atacado.-
-- [Fix][Bug #113] Peque�o bug que muestra un mensaje de error en la pagina de los sacs.-
-- [Fix][Bug #114] Bug al intentar eliminar un jugador.-
-- [Fix][Bug #115] Diferencia de estados entre (debil, fuerte) al enviar una flota y la galaxia.-
-- [Fix][Bug #116] Bug en la misiуn de destrucciуn.-
-- [Fix][Bug #117] Bug en la alianza que no descuenta los jugadores que salen de ella.-
-- [Fix][Bug #118] Bug que permite ignorar las naves e investigaciones, permitiendo edificar robots, nanos y laboratorio.-
-- [Fix][Bug #119] Bug en los textos de transportes.-
-- [Fix][Bug #120] Bug en las batallas de una sola ronda.-
-- [Fix][Bug #121] Bug en las solicitudes de la alianza.-
-',
-
-'2.7' => ' 17/09/09
-
-- [Novedad] Sistema para ver toda la informaciуn de la cuenta de un usuario. By Neko.-
-- [Novedad] SACs implementeados [BETA].-
------------ Cуdigo: MadnessRed
------------ Testeos y funcionamiento, como la adapaciуn a la 0.9a: cyberrichy
------------ Adaptaciуn a la 2.7: lucky
-
-- [Fix][Varios] Varios bugs menores de estilo, plantillas y lenguaje reparados.-
-- [Fix][Bug #93] Bug al eliminar un jugador.-
-- [Fix][Bug #94] No se muestra la cantidad de flotas en el panel de administraciуn.-
-- [Fix][Bug #95] Deuterio en negativo a causa de la planta de fusiуn.-
-- [Fix][Bug #96] Plantillas para solicitud de amigos descolocada.-
-- [Fix][Bug #97] No se muestra el estado de baneo y vacaciones en los jugadores dentro del panel de administraciуn.-
-- [Fix][Bug #99] Problemas con la pбgina de busqueda mostrando demsiados resultados o no permitiendo descender en la pбgina.-
-- [Fix][Bug #100] Al mandar naves de distintos tipos a colonizar vuelve el colonizador y se pierden las otras naves.-
-- [Fix][Bug #101] No se generan lunas cuando sale un 20% de probabilidad.-
-- [Fix][Bug #102] Al salir de una alianza el nъmero de miembros no disminuye como deberнa.-
-- [Fix][Bug #103] Problemas al actualizar las estadнsticas.-
-- [Fix][Bug #104] Cuando construis nanobots o robots te permite hacer naves y defensas.-
-- [Fix][Bug #105] Bug menor en la alianza la querer editar el rango de un usuario cuando no existen rangos.-
-- [Fix][Bug #106] Se encuentran invertidas las temperaturas de las lunas.-
-- [Fix][Bug #107] Los planetas destruidos son contados como planetas activos.-
-',
-
-'2.6' => ' 24/08/09
-
-- [Fix][Varios] Varios bugs menores de estilo, plantillas y lenguaje reparados.-
-- [Fix][Bug #28] Bug en la cola de produccion del hangar.-
-- [Fix][Bug #73] Problemas con el reporte de porcetaje de luna.-
-- [Fix][Bug #78] Problemas con la lista de construcciуn.-
-- [Fix][Bug #82] Se pueden mover flotas desde la galaxia cuando un jugador esta en modo vacaciones.-
-- [Fix][Bug #83] Los reportes de ataque muy largos no se pueden ver completos.-
-- [Fix][Bug #85] La cantidad de recursos para construir siempre se queda en rojo.-
-- [Fix][Bug #84] Si la luna esta llena, no te permite desmontar edificios.-
-- [Fix][Bug #86] Bug que provoca errores en las alianzas.-
-- [Fix][Bug #87] Bug en el estilo del panel de administraciуn, mostrando imagenes del juego.-
-- [Fix][Bug #88] Bug menor que muestra un texto que fue utilizado para debug.-
-- [Fix][Bug #89] Bug que permite la ampliacion del hangar cuando se estan construyendo flotas y defensas.-
-- [Fix][Bug #90] Problemas con la misiуn de destrucciуn.-
-- [Fix][Bug #91] No funciona correctamente el almirante.-
-- [Fix][Bug #92] No funciona correctamente el almacenista.-
-
-- [Cambio] Ahora la lista de planetas se muestra en el panel de admnistraciуn por id de menor a mayor.-
-',
-
-'2.5' => ' 18/08/09
-
-- [Novedad] Sistema de advertencias y errores en el panel de administraciуn (tambiйn informa la existencia de una nueva versiуn).-
-- [Novedad] Ahora puedes determinar si al banear un jugador este debe entrar o no en modo vacaciones.-
-- [Novedad] Gracias a 3R1K que tradujo el panel de administraciуn en su totalidad al idioma inglйs.-
-- [Novedad] Redise�ado el panel de administraciуn.-
-- [Novedad] Ahora la pбgina de mensajes respeta el formato del OGame original, mostrando a los operadores del juego.- 
-- [Novedad] Ahora cuando borras un planeta aparece planeta destruido como en el OGame original.-
-- [Novedad] El misil interplanetario ahora requiere el hangar en nivel 1 y el motor de impulso en 1 como en el OGame original.-
-- [Novedad] El misil de intercepciуn ahora requiere el hangar en nivel 1 como en el OGame original.-
-- [Novedad] El silo ahora requiere el hangar en nivel 1 como en el OGame original.-
-
-- [Fix][Varios] Varios bugs menores de estilo, plantillas y lenguaje reparados.-
-- [Fix][Bug #14] No se pueden usar skins externos.-
-- [Fix][Bug #47] Bug que provoca en IE que no se vea el menu y quede desplazado hacia arriba al bajar demasiado en una pбgina.-
-- [Fix][Bug #61] Problemas en el conteo de los jugadores en la visiуn general.-
-- [Fix][Bug #62] Peque�o bug que no muestra los stats correctamente en el overview.-
-- [Fix][Bug #63] Bug en la funciуn del manejo de las sesiones.-
-- [Fix][Bug #64] Bug con los permisos y con las lunas, evitando que sean atacadas.-
-- [Fix][Bug #65] Bug que no permite espiar desde flota pero si desde la galaxia.-
-- [Fix][Bug #66] Problemas en los niveles del phalanx.-
-- [Fix][Bug #67] Producciуn ilimitada de misiles.-
-- [Fix][Bug #68] Bug en el link para Continuar/Volver luego de enviar un mensaje circular en la alianza.-
-- [Fix][Bug #69] Bug que muestra mal los mensajes de error cuando un usuario no esta logueado.-
-- [Fix][Bug #70] Problemas con el salto de lнnea en los mensajes circulares.-
-- [Fix][Bug #71] Problemas con la misiуn estacionar aliado, muestra un mensaje de que el jugador es muy fuerte.-
-- [Fix][Bug #72] Bug en la diferencia de energнa consumida actual, anterior y posterior.-
-- [Fix][Bug #74] No se puede abandonar la alianza.-
-- [Fix][Bug #75] Problemas en la actualizaciуn de puntos de algunos jugadores.-
-- [Fix][Bug #76] La misiуn de espionaje ignora el estado de vacaciones desde la visiуn de galaxia.-
-- [Fix][Bug #77] Al hacer regresar una flota con misiуn mantener posiciуn no descuenta los tiempos correctamente.-
-- [Fix][Bug #79] Bug que permite incrementar las tecnologнas (Gracias a mikey302 y death).-
-- [Fix][Bug #80] Bug en el limite de envio mбximo de expediciones.-
-- [Fix][Bug #81] Bug en la visiуn general de la alianza, mantiene el nombre "Fundador" del fundador de la alianza.-
-
-- [Cambio] Ahora el nъmero de la versiуn se obtiene de la base de datos.-
-- [Cambio] Mejoras de seguridad en la pбgina de la alianza.-
-- [Cambio] Noticias removidas.-
-- [Cambio] Mejorada la velocidad en que se genera la pбgina de estadнsticas y algunos cambios menores.-
-- [Cambio] Nuevas alertas de presencia del directorio install y de escritura del archivo config.php.-
-- [Cambio] Los recicladores ahora sуlo pueden transportar 20.000 unidades de recursos como en el OGame original.-
-- [Cambio] Removida la pбgina de contacto, ahora puedes encontrar a los adms/mods/oper en el panel de mensajes como en el OGame.-
-- [Cambio] Ahora a la derecha del nombre de la luna aparece la referencia (Luna) como en el OGame original.-
-- [Cambio] Ahora si en la visiуn general tienes seleccionada la luna no se mostrarб esta otra vez a la izquierda.-
-- [Cambio] Reformas en la galaxia en cуdigo y organizaciуn de las clases y plantillas.-
-- [Cambio] Juego adaptado al skin original del OGame, ahora el juego serб a su vez compatible con cualquier skin.-
-',
-
-
-'2.4' => ' 25/07/09
-
-- [Seguridad] Protecciуn con .htaccess de la carpeta includes, language y templates.-
-- [Seguridad] Protecciуn con .htaccess de common.php, config.php y extension.inc.php.-
-- [Seguridad] Cambio en el protecciуn de carpetas.-
-- [Seguridad] Mejoras de seguridad en diversos archivos.-
-
-- [Novedad] Nuevo sistema de estadнsticas, mбs rбpido, mбs simple, menos querys, menos carga, y nuevo panel para administrarlas; (By angelus_ira) Muchas gracias =) .-
-- [Novedad] Nuevo sistema de idioma, ahora el idioma es configurable desde el panel de administraciуn, seleccionando un lenguaje a la vez.-
-- [Novedad] La tecnologнa de espionaje funciona como en el ogame original:
--------- Nivel 0 a 1 -> Sin datos de la flota.-
--------- Nivel 2 a 3 -> NÑŠmero total de naves.-
--------- Nivel 4 a 7 -> NÑŠmero total de naves y el tipo de las naves.-
--------- Nivel 8 -> NÑŠmero total de naves, tipo de nave y cantidad de cada tipo.-
-
-- [Novedad] Ahora el administrador puede decidir si los administradores y/o moderadores se les actualizarбn o no los puntos.-
-- [Novedad] Ahora el administrador puede decidir si los administradores y/o moderadores pueden o no recibir ataques de otros jugadores.-
-- [Novedad] Ahora en las investigaciones te muestra el nivel de espionaje y computaciуn que te dan los comandantes.-
-- [Novedad] Cuando un usuario es baneado, ahora le muestra la fecha en que finaliza su ban.-
-
-- [Fix][Varios] Corregidos varios bugs menores de redirecciуn, visuales, textos y configuraciones.-
-- [Fix][Bug #1] Al achicar la pantalla se superpone el menu de recursos con el resto del cuerpo.-
-- [Fix][Bug #2] Ahora cuando una cuenta es baneada, el jugador baneado no podrб acceder a la cuenta de ningun forma.-
-- [Fix][Bug #3]	Al borrar una luna, ya no borrarб el planeta.-
-- [Fix][Bug #4] Reparados algunos bugs en el phalanx.-
-- [Fix][Bug #8] Corregida la visiуn del imperio, ahora muestra las investigaciones.-
-- [Fix][Bug #9] Ahora al cerrar el servidor un usuario comъn no podrб ingresar.-
-- [Fix][Bug #10] Problemas en los permisos de las alianzas.-
-- [Fix][Bug #11] Ahora al cerrar el servidor no desaparece mбs el mensaje con el motivo para cerrarlo.-
-- [Fix][Bug #12] Ahora la misiуn desplegar funciona correctamente.-
-- [Fix][Bug #13] La misiуn estacionar en aliado funciona correctamente, no se repiten mбs mensajes, ni tampoco produce tiempos negativos cuando se selecciona como tiempo de estacionamiento 0 horas.-
-- [Fix][Bug #15] Problemas con la misiуn de recoleccion o reciclaje, no entrega los recursos a quien corresponde.-
-- [Fix][Bug #16] Problemas con los tiempos del hangar al cambiar de planeta, volviendo el tiempo a su estado incial.-
-- [Fix][Bug #17] Los oficiales almirante y general funcionan correctamente [oficiales al 100%].-
-- [Fix][Bug #18] Problemas con la planta en nivel 1 permitiendo la produccion de recursos (Fixed by zorro2666).-
-- [Fix][Bug #19] Ahora si un jugador es fuerte o dйbil y al mismo tiempo estб inactivo podrб ser atacado de todas formas.-
-- [Fix][Bug #20] Problemas de caracteres en los textos de registro.-
-- [Fix][Bug #21] No funciona el enviar mensaje cuando recibes un ataque.-
-- [Fix][Bug #22] Problemas con los mensajes al redactar un mensaje privado en la parte visual.-
-- [Fix][Bug #23] Fallan los links que redirigen a la galaxia durante los movimientos de flotas.-
-- [Fix][Bug #24] El hangar permite producir igual durante su ampliaciуn (Fixed by zorro2666).-
-- [Fix][Bug #25] Se puede ampliar el hangar mientras de produce (Fixed by zorro2666).-
-- [Fix][Bug #26] No sale el nombre del jugador en color verde en las estadнsticas.-
-- [Fix][Bug #27] Bug que permite ampliar el laboratorio e investigar al mismo tiempo.-
-- [Fix][Bug #29] Bug en el select de las estadнsticas al cambiar la pбgina mostrando la primer pбgina siempre.-
-- [Fix][Bug #30] Problemas con los campos del planeta y las colas de contrucciуn.-
-- [Fix][Bug #32] Bug para ver el reporte de combate desde el panel de administraciуn.-
-- [Fix][Bug #33] Bugs diversos menores en los misiles interplanetarios (Fixed by lordz).-
-- [Fix][Bug #34] Bugs menores que no muestran correctamente los textos.-
-- [Fix][Bug #35] Posible bug en los almacenes, incrementan menos de lo que deben.-
-- [Fix][Bug #36] No aparece el icono para lanzar misiles en la galaxia.-
-- [Fix][Bug #37] Bug que provoca que las colonias en la visiуn general se vean en filas de 5 y no de 2.-
-- [Fix][Bug #38] Bug en la misiуn colonizar, si se alcanzу el limite de planetas entonces regresa instantaneamente sin respetar los tiempos.-
-- [Fix][Bug #39] Bug en las expediciones que provoca la perdida de la materia oscura.-
-- [Fix][Bug #40] Bug que no muestra la materia oscura recolectada en las expediciones.-
-- [Fix][Bug #41] Peque�o bug que provoca un error en el update de puntos (Fixed by angelus_ira).-
-- [Fix][Bug #42] Problemas con los textos, se pierden las frases y la cantidad de recursos en algunos reportes.-
-- [Fix][Bug #43] Problemas con la proteccion de novatos al enviar sondas desde la galaxia y desde flota.-
-- [Fix][Bug #44] Problemas con el js que actualiza los recursos, no teniendo en cuenta la velocidad del servidor.-
-- [Fix][Bug #45] Los almacenes funcionan mal, debido a un bug en la relaciуn de incremento por nivel.-
-- [Fix][Bug #46] bbCode ni HTML funcionan en los textos de la alianza.-
-- [Fix][Bug #48] Se perdiу el texto de advertencia en las expediciones.-
-- [Fix][Bug #49] Problemas con la actualizaciуn de puntos de la alianza.-
-- [Fix][Bug #50] Problemas con los atajos.-
-- [Fix][Bug #51] No aparece el icono de los mensajes para responder.-
-- [Fix][Bug #52] Bug en la alianza que probaca un error en la base de datos.-
-- [Fix][Bug #53] Problemas de duplicaciуn en la misiуn transportar.-
-- [Fix][Bug #54] Bug que no permite generar las estadнsticas (Fixed by angelus_ira).-
-- [Fix][Bug #55] Bug que mostraba la luna luego de que fuera destruida.-
-- [Fix][Bug #56] Bug que no muestra el porcentaje de creaciуn de las lunas.-
-- [Fix][Bug #57] Bug que provoca que no se muestren los mensajes en las expediciones.-
-- [Fix][Bug #58] No se muestran los informes de construcciуn en el panel del admin.-
-- [Fix][Bug #59] Los reportes de construcciуn no figuran en ninguna categorнa.-
-- [Fix][Bug #60] Bug que permitia obtener tecnologнas sin ningъn costo.-
-
-- [Cambio] Optimizaciуn del manejo de flotas (By shoghicp).-
-- [Cambio] Optimizaciуn del overview del admin (By jtsamper).-
-- [Cambio] Reorganizadas algunas carpetas.-
-- [Cambio] Ahora los administradores no podrбn borrarse a si mismos.-
-- [Cambio] Ahora sуlo los administradores podrбn borrar jugadores.-
-- [Cambio] Reducciуn de lнneas y simplificaciуn en el panel de admnistraciуn.-
-- [Cambio] Finalmente el directorio includes queda definido con 3 carpetas (classes, functions y pages).-
-- [Cambio] Integrado el auto-update a index.php en la carpeta install.-
-- [Cambio] Cuando se registra un usuario ahora es redirigido directamente dentro del juego.-
-- [Cambio] Se volvio al viejo sistema de mensajes.-
-- [Cambio] El pack de idioma de divide en 4 archivos:
-
--------- ADMIN.mo -> TODO LO DEL PANEL DE ADMINISTRACIУN.-
--------- CHANGELOG.mo -> CHANGELOG TAL Y CUAL COMO ES CONOCIDO.-
--------- INGAME.mo -> TODO EL CONTENIDO INTERNO DEL JUEGO Y NO ACCESIBLE SIN TENER UNA CUENTA.-
--------- PUBLIC.mo -> TODO EL CONTENIDO PЪBLICO DEL JUEGO (index.php, reg.php, clave perdida y contacto).-
-
-- [Cambio] Ahora en la pбgina de la flota se muestra correctamente la velocidad de las naves al posicionar el mouse sobre el nombre de las mismas.-
-- [Cambio] Ahora al realizar cualquier movimiento de flota desde la galaxia, tambiйn se pasa el valor de la misiуn por lo que si por ejemplo seleccionas atacar ya aparecerб marcado en el envнo de las flotas.-
-- [Cambio] Ahora si el jugador esta inactivo podrб ser atacado, funcionando de la misma forma que en el ogame original.-
-- [Cambio] Los archivos ShowFleetPage.php, floten1.php, floten2.php, y floten3.php ahora utilizan plantillas.-
-- [Cambio] Finaliza el soporte a las siguientes versiones v1.4a/v1.4b/1.4c,por lo tanto no habrб mбs auto-update.php.-
-- [Cambio] class.FlyingFleetHandler.php maneja todo lo que sea flotas, misiones y funciones especificas de las mismas.-
-- [Cambio] Eliminada la experiencia de guerrero y minero.-
-- [Cambio] Las funciones CreateFleetPopupedMissionLink, CreateFleetPopupedFleetLink y BuildHostileFleetPlayerLink fueron hubicadas en class.FlyingFleetsTable.php.-
-- [Cambio] Dentro de la clase class.FlyingFleetsTable.php, encontramos las funciones BuildFleetEventTable y BuildFlyingFleetTable y todas las funciones que estas necesitan para funcionar.-
-- [Cambio] rw.php ahora se llama CombatReport.php.-
-- [Cambio] raketenangriff.php del root cambiado a MissilesAjax.php; y flottenajax.php cambiado a FleetAjax.php.-
-- [Cambio] La funciуn GetNextJumpWaitTime fue movida de GeneralFunctions.php a class.ShOWInfosPage.php.-
-- [Cambio] infos.php y jumpgate.php se encuentran en class.ShOWInfosPage.php.-
-- [Cambio] Eliminado quickfleet.php no tenнa utilidad.-
-- [Cambio] Home reprogramado y simplificado.-
-- [Cambio] Ahora los oficiales espнa y comandante son obtenidos desde la base de datos directamente y no suman espionaje y computaciуn, asi es mбs fбcil de administrar.-
-- [Cambio] constantes.php nuevamente se llama constants.php y funciones.php se llama ahora GeneralFunctions.php.-
-- [Cambio] class.ShowShipyardPage.php maneja la construcciуn de defensas y naves.-
-- [Cambio] Implementado el dise�o del OGame original para el overview.-
-- [Cambio] Adaptado el dise�o de la pбgina de los oficiales al resto del juego.-
-- [Cambio] En la visiуn de la galaxia no se realizan mas revisiones de los campos de los planetas.-
-- [Cambio] La funciуn sendnewpassword fue integrada al lostpassword en el archivo index.php.-
-- [Cambio] Limitada la query que traia los datos en la visiуn del imperio, reducida un poco la carga.-
-- [Cambio] Las funciones de Strings.php fueron movidas a funciones.php.-
-- [Cambio] Ahora si no tenes materia oscura para reclutar oficiales aparecerб el reclutar en rojo y bloqueado.-
-- [Cambio] Notar que el manejo de las pбginas esta en game.php.-
-- [Cambio] Todas las pбginas del juego ahora se manejan con funciones y/u objetos.-
-- [Cambio] Inicio de la exportaciуn del cуdigo a objetos.-
-- [Cambio] Eliminados los title de las pбginas, ahora sуlo se muestra el nombre del servidor.-
-- [Cambio] Ahora la base lunar sуlo da 3 campos por nivel, tal cual y como es en el ogame original.-
-- [Cambio] Ahora para mostrar que un usuario fue baneado, se imprime un texto y no se recurre a una plantilla.-
-- [Cambio] Ahora no aparecen mбs mensajes de confirmaciуn al editar, crear o borrar una nota.-
-- [Cambio] Ahora las notas nuevamente se abren en un pop-up.-
-',
-
-'2.3' => ' 30/05/09
-
-- Corregido un bug que no permitнa cambiar el rango a los miembros dentro de las alianzas.-
-- Varios cambios en el panel del admin:
-
--------- Integrados todos los archivos de lenguaje.-
--------- Renombrado el archivo para el reset del universo.-
--------- Unos cuantos cambios en mats.php, tanto de estilos como limpieza de cуdigo.-
--------- Cambios en el left-menu del panel de administraciуn.-
--------- Renombrados algunos archivos y realizadas algunas correciones menores.-
--------- Unos cuantos ajustes en los textos y plantillas de varios archivos.-
--------- Mensaje de confirmaciуn al intentar eliminar a un jugador del servidor.-
--------- El archivo mats.php ahora se llama adminresources.php, ademas se le integro todos los archivos que manejaban las tecnologнas y recursos.-
--------- Solucionado el bug de la actualizaciуn de puntos.-
--------- Nueva funciуn (optimizar tablas) (By Saint).-
--------- Corregido un bug que al crear una luna no le asignaba el nombre seleccionado.-
--------- Nueva funciуn (eliminar luna) (By tonique).-
--------- Corregido un bug que en la lista de lunas no mostraba el id real de la luna.-
--------- Si el usuario no tiene nivel 1 al menos no podrб ver nada del panel de administraciуn.-
--------- Optimizadas algunas querys en messall.php
--------- Eliminado el QueryExecuter.php
-
-- Se finalizб el soporte a las versiones v1.4d/v1.4e/v1.4f y tambiйn el auto-update de las mismas.-
-- Eliminadas algunas querys innecesarias de MissionCaseMIP.php.-
-- Se elimino una query innecesario de MissionCaseRecycling.php.-
-- Limpieza de la base de datos de campos innecesarios dentro de la tabla users.-
-- Algunos cambios y mejoras en el update.php.-
-- Ahora sуlo sumarбn puntos de guerrero los jugadores que realicen batallas y no ambos.-
-- Reparado un bug que mostraba el mensaje de la flota al finalizar la misiуn.-
-- La experiencia del minero ya no se muestra mбs con decimales.-
-- Se volviу al antiguo dise�o de la construcciуn de edificios.-
-- Corregido un bug que en al finalizar una construcciуn en el overview aparecнa Construcciуn() en vez de Libre.-
-- Algunas modificaciones en los crйditos.-
-- Modificados algunos aspectos en el aspecto interno del juego.-
-- Cambiada la imagen dentro del juego.-
-- Redise�ado el index, espero que les guste.-
-- Agregado un favicon, cada uno podrб cambiarlo por el que quiera.-
-- Eliminados algunos residuos provenientes de otras versiones.-
-- Eliminados los frames, ahora el menu se muestra con la funciуn ShowLeftMenu.php y algo de estilos css para ajustar todo.-
-- Cambiados todos los $xnova_root_path por $xgp_root.-
-',
-
-'2.2' => ' 06/05/09
-
-- Se reemplazo el menъ derecho e izquierdo por el original, y la imagen del fondo tambiйn.-
-- Revisado todo messages.php,se eliminaron querys innecesarias, se organizo el cуdigo, se restringieron algunas querys para optimizar la pбgina, se elimiaron elementos sin utilidad y se integro el lenguaje.-
-- Toda la galaxia fue revisada, se hicieron algunas correciones en los textos y algunas mejoras visuales.-
-- Corregido un bug que impedia cambiar la cantidad de planetas, sistemas y galaxias que se podнan utilizar en el universo (modificable desde constantes.php), recomiendo dejarlo en 9-499-15, asi no saturan mucho el juego.-
-- Renombrado functions.php a funciones.php
-- Limpieza y revisado de constants.php, renombrado a constantes.php.-
-- Corregido un bug en la pбgina de tecnologнas.-
-- Eliminadas las vars de los mensajes, no tenнan utilidad.-
-- Se revisaron nuevamente todas las funciones y fueron nuevamente reasignadas utilizando el sistema de funciones_A y funciones_B.-
-- Solucionado el bug de las pбginas en blanco, dejando la versiуn bastante estable [BETA].-
-- Nueva forma de distribuir las funciones, en A y B. Para mas detalles lean la informaciуn que deje comentada en commons.php, esto es provisorio, aunque creo que es la mejor forma de agilizar el juego, y tenerlo mбs estable.-
-- Peque�o cambio en el ingreso, eliminando algunas lineas.-
-- Algunos cambios en el commons.php y eliminadas algunas cosas innecesarias.-
-- Corregido un peque�o bug en las listas de lunas.-
-- Corregido un bug en la opciуn de crear lunas.-
-',
-
-'2.1' => ' 02/05/09
-
-- Peque�o cambio en el index y la selecciуn de la pбgina.-
-- Incluido reg.mo directamente a reg_form.tpl y reg.php.-
-- Modificado el dise�o del registro y de la pбgina de clave perdida.-
-- Correcciones grбficas en el index.-
-- SACS funcionando al 50% [problemas en la coordinaciуn de los tiempos y en la visiуn de los movimientos de flotas].-
-- Cambio visual en las estadнsticas, ahora el *, +1 y -1 (rankplus), se muestra con js(overlib).-
-- Limpieza en commons.php con lo que durante el movimiento de flotas reducira la carga del juego.-
-- Ahora al realizar un espionaje ya no aparecerб la pбgina en blanco ni tampoco tirara error.-
-- Corregidos unos cuantos bugs provocados por la distribuciуn de las funciones.-
-- Nuevas imбgenes de planetas, mucho mбs vistosas.-
-- Corregido un peque�o bug que no permitнa ver las pбginas publicas(contact.php, reg.php, credit.php y la secciуn de clave perdida).-
-',
-
-'2.0' => ' 23/04/09
-
-- Visiуn general del panel del admin mejorada, ajustada mejor la tabla e integrado el lenguaje a las plantillas.-
-- Simplificaciуn del sistema de crйditos, e integraciуn del lenguaje.-
-- Integrado el idioma a resources.php y a las respectivas plantillas.-
-- Cambios en las tablas de las estadнsticas, incluciуn del lenguaje a las plantillas, revisiуn del cуdigo y algunas mejoras en la carga.-
-- Algunos cambios visuales en fleet.php.-
-- Eliminada la funciуn AdminMessage, cumplia la misma funciуn que message.-
-- Optimizaciуn e integraciуn del lenguaje a admin/settings.php
-- Algunas correcciones que previenen que por la actualizaciуn de puntos se provoque un bug en el panel de administraciуn.-
-- Optimizadas algunas querys de las flotas en commons.php.-
-- Correciones en algunos textos en los mensajes de movimientos de flotas.-
-- Mejora de seguridad, no podrбs ver las pбginas internas del juego sino te logueaste.-
-- Ahora se pueden ver bien los mensajes de error e informes de los mensajes.-
-- Corregido un bug que al abandonar un planeta no borraba la luna, y esta podнa ser utilizada.-
-- Simplificaciуn y reorganizaciуn de BatimentBuildingPage.php.-
-- Correcciones visuales en los edificios, y correciones de algunas tablas para ajustarlas mejor.-
-- Nueva imagen de materia oscura en el menъ superior, tambiйn se ampliaron los tama�os de las imбgenes.-
-- Reparado un bug que permitнa mover flotas en modo vacaciones.-
-- Traducido el mensaje del modo vacaciones, y corregido un bug que no mostraba el tiempo real de vacaciones.-
-- Cambiados algunos $ugamela por $xnova.-
-- Implementaciуn de seguridad, fue renombrado el archivo extension.inc a extension.inc.php, no estaba protegido y podнa leerse su contenido.-
-- Algunas correcciones y simplificaciуn del cуdigo en buddy.php.-
-- Revisado todo el notes.php:
-
---------- Plantillas agregadas a su carpeta correspondiente "notes".-
---------- Algunas correciones visuales.-
---------- Integraciуn del idioma a las plantillas.-
---------- Reparados algunos bugs.-
---------- Ahora al editar el mensaje, se muestra el asunto y el mensaje.-
---------- Conteo de caracteres en js aplicado.-
-
-- Eliminadas algunas funciones de administraciуn.-
-- Reparado un bug que no mostraba el lнmite real de las flotas posibles a enviar.-
-- Oficiales:
-
---------- Algunas correciones visuales.-
---------- Oficiales pendientes por reparar: Almirante y General.-
---------- Oficiales funcionando: Geуlogo, Ingeniero, Tecnуcrata, Constructor, Cientнfico, Almacenista, Defensor, Bunker, Espнa, Comandante, Destructor, Raider y Emperador.-
---------- Reparados los oficiales espнa y Comandante.-
---------- Reparado el oficial empeador(By thyphoon) y destructor(By angelus_ira).-
---------- Integraciуn del idioma a las plantillas y cуdigo.-
-
-- Limpieza de scripts.-
-- Re-organizadas todas las funciones del juego (optimizandolo increнblemente)(cada funciуn se asigno a su archivo correspondiente).-
-- Eliminado CombatEngine.php.-
-- Algunas correciones en commons.php para agilizar el juego en general.-
-- Limpieza y optimizaciуn del instalador.-
-- La funciуn doquery fue unificada tambiйn dentro de functions.php.-
-- Las funciones de unlocalised.php fueron integradas a functions.php
-- Limpieza de funciones inutiles en includes/functions:
-
---------- Eliminado RevisionTime.php.-
---------- Eliminado SecureArrayFunction.php.-
---------- Eliminado ResetThisFuckingCheater.php.-
---------- Eliminado ElementBuildListQueue.php, el archivo ElementBuildListBox.php cumple la misma funciуn y se encuentra en uso.-
-
-- Limpieza en functions.php,se borraron algunas funciones sin utilidad alguna.-
-- Limpieza en unlocalised.php,se borraron algunas funciones sin utilidad alguna o vacнas.-
-- Se reorganizaron casi todas las plantillas y se borraron algunas mбs sin utilidad (algunas pedientes a organizar).-
-- Se borraron todas las plantillas de la galaxia que no tenнan utilidad(la galaxia la genera el cуdigo php dinбmicamente).-
-- Revisado todo el search.php:
-
---------- Borradas algunas lineas.-
---------- Reorganizado el cуdigo.-
---------- Reorganizadas las plantillas en una carpeta en templates.-
---------- Se integro search.mo a las plantillas.-
---------- Se corrigiу un bug que no mostraba la alianza en la bъsqueda por usuarios.-
---------- Se corrigiу un bug que no redirigнa correctamente a la vista de la alianza.-
---------- Se corrigiу un bug dentro de la alianza para poder verla desde search.php
-
-- Revisado todo el mercader:
-
---------- Adherido marchand.mo a sus respectivas plantillas.-
---------- Corregidas todas las plantillas y bugs en la muestra de los recursos(no aparecen mбs en eltop).-
---------- Simplificaciуn del cуdigo php, reorganizado y reprogramado lo que no funcionaba bien.-
---------- Corregidas las validaciones, admiten ceros, pero no nÑŠmeros negativos.-
---------- A�adidas las plantillas respectivas a una carpeta en templates(para una mejor organizaciуn).-
-
-- Cookies.mo integrado a su archivo correspondiente.-
-- Algunos textos fueron colocados en system.mo, ya que hacen al caracter general del juego, y no de un sector en especifico.-
-- Optimizado MissionCaseAttack.php.-
-- Optimizado el overview, se elimino cуdigo innecesario, se reorganizу, se eliminaron querys que no tenнan utilidad y se integro el idioma a las plantillas.-
-- Reubicados algunos archivos.-
-- Limpieza de la base de datos, de cosas que no se utilizaban.-
-- Reorganizado el menъ de opciones, integraciуn del idioma a la plantilla y se eliminaron querys innecesarias.-
-- Algunos archivos de texto fueron integrados directamente a los archivos para agilizar el juego y su velocidad.-
-- Se reorganizaron algunas plantillas y se eliminaron algunas otras inÑŠtiles.-
-- Eliminados los emoticones.-
-- Como siempre actualizados el auto-update y el instalador para que todo sea mбs facil.-
-- Cambios en el instalador.-
-- Optimizadas unas cuantas pбginas.-
-- login.php, lostpassword.php y logout.php unificados en el index.php mejorando un poco el rendimiento y organizaciуn.-
-- Algunas correcciones visuales en la visiуn del imperio.-
-
-- Revisada toda la alianza:
-
---------- Mejoras varias.-
---------- Mejoras en lenguajes.-
---------- Mejoras en plantillas.-
---------- Se agregaron validaciones.-
---------- Se reorganizу el cуdigo.-
---------- Se reparo el texto de las solicitudes, ahora podrбs editarla.-
---------- Todos los mensajes ahora te redirigiran.-
---------- Se corrigiу un bug en los rangos.-
---------- Se optimizу un poco, se eliminaron lineas inъtiles y se fixearon algunos bugs.-
---------- Se repararon todos los errores encontrados en los textos y plantillas que no se mostraban, asi como cosas que no se realizaban.-
-
-- Cuando un usuario falla al intentar el login ahora es redirigido al inicio.-
-- Mejorado el index ahora funciona mucho mбs rбpido.-
-- Mejorados algunos textos en general, y corregidos algunos detalles.-
-- Redise�ado el sistema de ingreso al panel del admin y regreso al juego.-
-- Limpieza de archivos y residuos.-
-- Eliminado el chat, loteria, razas, simulador, tutoria, records y todo aquello que no consideraba necesario.-
-- Reprogramados los menÑŠs derechos e izquierdos.-
-
-- Un resumen de las figuras mбs destacadas de este proyecto:
-
---------- Tomo las riendas sobre la 1.5b saltando a la 2.0 para trerles todas las mejoras enunciadas a continuaciуn [By lucky].-
---------- Partiendo de la version 0.9a llegando hasta la 1.5b del XG Proyect por lucky, PowerMaster, Calzon, Tarta, Tonique y muchas personas mбs.-
---------- Continuado por UGamela Britania con varias mejoras, seguido por el equipo francйs Raito, Chlorel, e-Zobar y Flousedid.-
---------- Proyecto ogame para todos y con todas las funciones iniciado por Perberos.-
-',
-
-'1.5b' => ' 03/04/09
-
-- Cambios y correcciones en templates y textos.-
-- Loteria reparada (By lucky).-
-- Correciones en el instalador, soportando correctamente las razas, y tambiйn en el auto-update.-
-- Razas corregidas (By Tonique).-
-- Corregido un bug en el instalador.-
-',
-
-'1.5a' => ' 26/03/09
-
-- Corregido el link de administraciуn.-
-- Mejoras en el instalador.-
-- Fix corregido bug que mostraba mal la leyenda en la galaxia.-
-- Actualizado el auto-update para poder pasar fбcilmente de la versiуn 1.4f o de la 1.4c a la 1.5a.-
-- Ahora la instalacion incluye la loterнa y el chat, no deberбs hacer nada manualmente.-
-- Arreglada la pбgina de amigos ahora deberнa mostrar bien a tus amigos y no a vos (By lucky).-
-- Mejorado el auto-update de puntos, ahora podrбs instalar sin realizar modificaciones en los archivos.-
-- Unificamos la versiуn de XG Proyect con la de calzon.-
-',
-
-'1.4f' => ' 18/03/09
-
-- Fix peque�as correciones en la base de datos.-
-- Fix peque�as correcciones en traducciones generales.-
-- Fix Corregidas variables en alianza, nueva estructuracion, mejor optimizada.-
-- Mod Agregado terraformer y super terraformer a constants.php, (personalizable campos que dara cada uno).-
-- Mod Administradores u operadores no aparecen mas Estadisticas.-
-- Mod Completadas algunas imagenes faltantes en el skin, cambiada la de la supernova por una de mejor calidad.-
-- Mod Optimizacion de consultas y variables generales (sistema mas limpio).-
-- Mod Nuevo edificio, Super Terraformer, aumenta 10 campos por nivel (winjet).-
-<font color="red">- Tecnologias y naves unicas de razas. 70% completado.-</font>
-<font color="red">- Formas de Gobierno (democracia, socialismo y pirateria) 30% completado.-</font>
-<font color="red">- Fix a bug destruccion de luna.-</font>
-',
-
-'1.4e' => ' 12/03/09
-
-- Fix a textos e imagenes de naves y defensas nuevas asi como a razas.-
-- Fix Enviar mutiples flotas, expediciones, misiones, al ir atras (modo test por ahora).-
-- Fix Corregido bug en consumo de deuterio (flotenajax.php).-
-- Fix corregido bug al abandonar colonias por fallo seguridad (overview.php).-
-- Fix En Estadisticas aparecias en una alianza aunque ya hubieras salido (alliance.php).-
-- Mod 4 Nuevas naves: Interceptor, Cazador Crucero, Transportador y Titan.-
-- Mod 2 Nuevas defensas: Ca�on de Fotones y Base Espacial.-
-- Mod Nueva Tecnologia de Desarrollo, aumenta colas posibles a edificios.
-<font color="green">- Mod Razas: Humanos, Aliens, Predators y Darks, con cada nivel aumenta:.-</font>
-<font color="green">- Humanos: Mina Metal +3% produccion, +2% Ataque y Escudos.-</font>
-<font color="green">- Aliens: Mina Cristal +3% produccion, +3% Blindaje.-</font>
-<font color="green">- Predators: +10% Ataque.-</font>
-<font color="green">- Darks: Sintetizador Deuterio +3% produccion, +4% Blindaje y Escudos.-</font>
-',
-
-'1.4d' => ' 09/03/09
-
-- Fix algunas traducciones.-
-- Fix Ajustado a resolucion 1024x768, reacomodo en columnas de edificios y frames.php-
-- Fix multiplicacion/Duplicacion de ligeros y estrellas de la muerte (flotten1.php).-
-- Fix Seguridad de carpetas, una mas, aparte de la que ya existia.-
-- Fix en Mercader, devolvia recursos al meter numeros negativos (marchand.php).-
-- Fix Misiles (projectxnova) adaptado y corregido a esta version (MissionCaseMIP.php).-
-- Fix agregado entero en funcion investigaciones (ResearchBuildingPage.php).-
-- Fix, peque�a correccion en alianzas rangos y administracion(alliance.php).-
-- Fix, Correccion en Galaxia (galaxy.php).-
-- Mod/Fix Arreglo a mensajes(project xnova) adaptado, corregido y aumentado para esta version.-
-- Mod actualizacion automatica (ahora si es automatica) y no consume recursos.-
-- Mod Edificios en columnas de 5.-
-- Mod Menu Derecho agregada compatibilidad, reordenadas las funciones.-
-- Mod Agregado Records (Records.php).-
-- Mod Agregado Chat.-
-- Mod Agregado Simulador de Batallas.-
-- Mod Agregado Loteria (project xnova), adaptado y corregido a esta version.-
-- Mod Reacomodo vision general (projectxnova), corregida compatilidad (overview.php).-
-- Mod Recursos en tiempo real (tonique) modo test por ahora.-
-- Borrado actualizacion automatica, consume muchos recursos (todos haciendo click a vision general).-
-',
-
-'1.4c' => ' 08/02/09
-
-- Eliminados los recursos en tiempo real debido a que se quedaban congelados.-
-- Reparados los oficiales espнa y comandante.- (By jtsamper foro project.xnova.es)
-- En la galaxia ya no puedes reciclar o espiar sin deuterio.-
-- Prevenir nъmeros negativos y carбcteres no numйricos en la galaxia (By neurus foro Xproject.xnova.es).-
-- Ahora para ver la galaxia necesitas deuterio (Original project.xnova.es fixeado por lucky).-
-- Al disolver una alianza esta ya no aparece en las estadнsticas (By xesar foro project.xnova.es).-
-- Corregida una redirecciуn que funcionaba mal en la alianza.-
-- Corregido un peque�o error de sintaxis en la flota que tiraba severos reportes de errores (Gracias edering).-
-- Agregado un mensaje recordatorio de como se debe incrementar o eliminar la materia oscura (Gracias edering).-
-- Anuncios eliminados (Por votaciуn de los usuarios de XG).-
-- El auto-update no soporta mбs las siguientes versiones:  v0.9a/v1.0a/v1.0b/v1.1a/v1.1b/v1.1c/v1.2a/v1.2b/v1.2c/v1.3a (Si tienes alguna des estas versiones deberбs usar un update anterior).-
-- Ahora en la busqueda al hacer click en el link te redirecciona al sistema del jugador y no al tuyo (By Anghelito).-
-',
-
-'1.4b' => ' 06/12/08
-
-- Desbaneo reparado.-
-- Oficiales reparados.-
-- Ahora al iniciar sesiуn con tu cuenta, iniciarб siempre desde el planeta principal y no desde una colonia.-
-- Un moderador u operador ya no podrб cambiarse los permisos a Administrador.-
-- Galaxia optimizada.-
-- Ahora cuando colonizas tu planeta se llamarб "Colonia" y no "Planeta Principal" (By lucky).-
-- El auto-update no soporta mбs las siguientes versiones:  v1.0a/v1.0b/v1.1a/v1.1b/v1.1c/v1.2a/v1.2b/v1.2c/v1.3a (Si tienes alguna des estas versiones deberбs usar un update anterior).-
-- Corregidas algunas redirecciones y mejoradas otras.-
-- Ahora puedes usar espacios en blanco en el nombre de tu planeta (By lucky).-
-- Borrado de archivos innecesarios (esto no termina mбs).-
-- Reparada la tabla que muestra las flotas en vuelo en el panel del admin.-
-- Mejoras, organizaciуn, limpieza y optimizaciуn del lenguaje (No pongo mбs que cambie en los lenguajes porque ya es detallar mucho, para nada).-
-',
-
-'1.4a' => ' 06/12/08
-
-- Reparado el reset del universo.-
-- El auto-update no soporta mбs las siguientes versiones: v1.0a/v1.0b/v1.1a/v1.1b/v1.1c/v1.2a (Si tienes alguna des estas versiones deberбs usar un update anterior).-
-- Mбs limpieza de archivos innecesarios.-
-- Limpieza y pulido del panel de admin (lenguaje).-
-- Lista de planetas <-> Lista de usuarios cambiado (lenguaje - Gracias Alberto14).-
-- Ahora puedes agregar y remover materia oscura desde el panel de administraciуn (By lucky).-
-- Actualizaciуn en tiempo real de los recursos (By Alberto14).-
-- Cambidas las imбgenes del XNova, por las imбgenes del OGame original.-
-- Borradas imбgenes innecesarias.-
-- Optimizadas las imбgenes de los oficiales.-
-- Eliminado el multi totalmente (A pedido del pÑŠblico).-
-- Eliminados los records totalmente (A pedido del pÑŠblico).-
-- Eliminado el chat totalmente (A pedido del pÑŠblico).-
-- Traducidos algunos textos en el formulario de envнo de mensajes (lenguaje).-
-- Complementado el infos.mo con los datos del verdadero OGame (lenguaje).-
-- Pulido y limpieza del search (lenguaje).-
-- Pulido y limpieza del overview (lenguaje).-
-- Pulido y limpieza del leftmenu (lenguaje).-
-- Pulido y limpieza del registro (lenguaje).-
-- Pulido y limpieza del login (lenguaje).-
-- Cambios de lenguaje en notes.-
-- Cambios en el login Contact -> Contacto y Forum -> Foros.-
-- Eliminado player.mo - no tenнa ninguna utilidad.-
-- Limpieza del archivo de lenguaje login.-
-- Reemplazados todos los "Titanio", "Silicio" y "Gashofa" por "Metal", "Cristal" y "Deuterio".-
-- Correciones de lenguaje en el install y limpieza de dicho archivo (Gracias Alberto14).-
-',
-
-'1.3c DMV' => ' 30/11/08 "DMV = Dark Matter Version Exclusivo Xtreme-gameZ.com.ar"
-
-- Correciones en los lenguajes de la supernova o super nave de batalla y el protector planetario (algo siempre me olvido).-
-- Modificaciуn de la ubicaciуn de algunos arhcivos.-
-- Eliminada una carpeta llamada .svn a la cual no le encontre utilidad.-
-- Limpieza de archivos innecesarios y duplicados.-
-- Implementada la materia oscura (Cуdigo 100% x lucky) (Gracias Reyndio por la idea).-
------ Los oficiales ahora se manejan por la materia oscura 1 punto oficial = 1000 materia oscura.-
------ En las expediciones se obtiene la materia oscura necesaria.-
------ No existen mбs los puntos de oficiales, aun asi se sube el nivel de minero y flota.-
------ Se siguen mostrando los registros de ataque.-
------ Auto-Update actualizado especialmente para soportar la materia oscura.-
-
-- Ya no se pueden atacar lunas + fuerte o + debiles que uno (By Neurus).-
-- Panel del admin, "Utilisateur?" -> "їUsuario?", modificaciуn en el lenguaje.-
-- Por razones de seguridad elimine el phpinfo.-
-- Panel del admin, "Lista de Usuarios" -> "Lista de Planetas", modificaciуn en el lenguaje (Gracias Alberto14).-
-- Solucionado el error en el orden por id de la alianza (By tarta).-
-',
-
-
-'1.3b EU' => ' 30/11/08
-
-- No hace falta mбs ingresar el nombre del planeta, por defecto es "Planeta Principal".-
-- Eliminadas imagenes del "sexo".-
-- Optimizada la imagen del inicio, ahora carga mбs rбpido.-
-- Compatibilidad del auto-update con todas las versiones.-
-- Nueva versiуn del auto update, mбs comprensible(creo).-
-- Reparado el problema con la instalaciуn (Gracias Anghelito).-
-',
-
-'1.3a' => ' 29/11/08
-
-- XNova 100% TRADUCIDO AL ESPAСOL [PUDE HABERME SALTEADO ALGO POR FAVOR AVISAR](By lucky).-
-- Limpieza de scripts, eliminamos varios archivos de la carpeta scrips que notamos no necesarios.-
-- Reparada la validaciуn del index, ahora si la carpeta install existe no podras acceder al juego (By lucky).-
-- Arreglado el modo vacaciones, ya no puedes entrar en vacaciones cuando estas atacando (By lucky).-
-- No se muestran mбs los recursos negativos.-
-- Redirecciуn luego de enviar una flota (By tarta).-
-- Ahora los dнas se muestran con una "d" y no con una "j" (By tarta).-
-- Nuevamente agregamos los emoticons.-
-- Ahora puedes cambiar el nombre en el juego, por fin solucionamos esto.-
-- Nuevo dise�o del auto-update, mucho mas vistoso y atractivo.-
-- Reparada la instalaciуn, ahora funcionan los misiles al instalar el juego.-
-',
-
-'1.2c EU' => ' 26/11/08
-
-- Reparada la instalaciуn.-
-',
-
-'1.2b' => ' 26/11/08
-
-- Misiles finalmente funcionando (By lucky).-
-- Desbaneo automбtico (By Anghelito).-
-- Reparado el modo vacaciones.-
-- Traducciones en varios archivos (By edering).-
-- Reparado el modo debug (By tarta).-
-- Reparado el link de las notas (By lucky).-
-- Eliminada la carpeta emoticones.-
-- Fix ranking de flotas en vuelo (By Pada).-
-- Mejoras en archivos de lenguaje.-
-- Cambios en el mensaje de bienvenida.-
-- Records reparados.- (By tarta).-
-- Actualizado el auto-update para poder actualizar: 0.9a -> 1.2a / 1.1b -> 1.2a / 1.2a -> 1.2b (By lucky).-
-- Cambios en el instalador.-
-- Se elimino una tabla que no hacia falta.-
-',
-
-'1.2a' => ' 19/11/08
-
-- Actualizado el auto-update para poder actualizar: 0.9a -> 1.2a y 1.1b -> 1.2a .-
-- Reorganizaciуn, recodificaciуn y reestructuraciуn de los misiles interplanetarios, ademas de solucionar seberos bugs.-
-- Solo se permiten caracteres alfanumericos en el nombre de los planetas, evita serios bugs y filtros de seguridad.-
-- Arreglado el orden por puntos en la alianza.-
-- Tutorial funcionando.-
-- Correcciones en el mensaje de bienvenida pos-registro.-
-- Solucionado el bug que no permitнa la transferencia de la alianza.-
-- Solucionado el bug que hace que salga el rango equivocado al usuario en la lista de miembros de la ally.-
-- Solucionado el bug que permitнa que se envien solicitudes una vez que la alianza habia sido borrada.-
-- Reparada la red de investigaciуn intergalбctica.-
-- Cupula y protector planetario funcionando, y cada una solo puede ser edificada una vez.-
-',
-
-'1.1c' => ' 19/11/08
-
-- Cambios en la organizaciуn de la carpeta templates.-
-- Algunos fixes en el leftmenu del admin.-
-- Nuevamente reparada la seccion de de Annonces (sirve para comerciar).-
-- Volvimos a implementar el leftmenu antigьo, funciona mбs rбpido.-
-- Mejoras en algunas traducciones, y a�adidas otras.-
-- A�adida la hora al chat. [Aъn no funciona en hostings].-
-- Limpieza de archivos inecesarios y/o sin ninguna utilidad.-
-- A�adido el auto-update.-
-- Eliminado el upgrade desde ugamela.-
-- Mejoras en la instalaciуn.-
-',
-
-'1.1b' => ' 30/10/08
-
-- A�adido un tutorial, desarrollado por PowerMaster para el XNova de Xtreme-gameZ.com.ar.-
-- Cambios de nombre del archivo de instalacion "Installeur" a "Instalacion de XNova".-
-- Cambios en el leftmenu para usuarios.-
-- Actualizacion de Puntos Automaticamente, ahora si anda.-
-- Introduccion del Release de Xtreme-GameZ en "credit.php" e "install.php".-
-- Cambios de idioma de carpeta "fr" a carpeta "es" (requiere instalacion).-
-',
-
-'1.1a' => ' 28/10/08
-
-- Antes, si mandaban una flota y cambian de planeta, tiraba error.-
-- Antes, cuando estaban leyendo mensajes y cambian de planeta, tiraba error.-
-- Ahora al cancelar una investigaciуn te devuelve los recursos.-
-- Cambio en el texto del primer mensaje recibido al registrarse en el juego.-
-- Agregadas las estadнsticas de batalla.-
-- Fueron agregadas las defensas al ranking de la Visiуn General.-
-',
-
-
-'1.0b' => ' 26/10/08
-
-- Primer release disponible para los usuarios.-
-- Eliminado el warning que aparecнa en la instalaciуn del sistema.-
-- El instalador ahora incluye la actualizaciуn de puntos automбtica, por ende el usuario ya no debera tocar nada en el cуdigo.-
-- Aplicada la actualizaciуn automбtica de puntos.-
-',
-
-
-'1.0a' => ' 24/10/08 "Versiуn Inicial"
-
-- Cambios de lenguaje en el changelog (100% traducido).-
-- Mejora del menÑŠ de la izquierda se "visualiza" algo mejor.-
-- Correciones de lenguaje en el install (install.mo).-
-- Correciones en el Marchand (Mercader), ya esta funcionando correctamente, no tira mбs ese error del lenguaje.-
-- Fixes en el link de Annonces, ahora esta funcionando, ya puedes publicar lo que desees comercias.-
-- Inicio del proyecto XG (XG Proyect) basandonos en el pack hecho por XNova versiуn 0.9a.-
-',
-);
-?>
\ No newline at end of file
diff --git a/language/russian/INGAME.mo b/language/russian/INGAME.mo
deleted file mode 100644
index 2909fa3..0000000
--- a/language/russian/INGAME.mo
+++ /dev/null
@@ -1,1294 +0,0 @@
-<?php
-
-//SERVER GENERALS
-$lang['Metal']								= 'Металл';
-$lang['Crystal']							= 'Кри�талл';
-$lang['Deuterium']							= 'Дейтерий';
-$lang['Darkmatter']							= 'Темна� матари�';
-$lang['Energy']								= 'Энерги�';
-$lang['Messages']							= 'Сообщени�';
-$lang['write_message']						= '�апи�ать �ообщение';
-$lang['o/o']					            = '%';
-
-$lang['type_mission'][1]  					= '�така';
-$lang['type_mission'][2]  					= 'С�Б';
-$lang['type_mission'][3]  					= 'Тран�порт';
-$lang['type_mission'][4]  					= 'О�тавить';
-$lang['type_mission'][5]  					= 'Удержание';
-$lang['type_mission'][6]  					= 'Шпионаж';
-$lang['type_mission'][7]  					= 'Колонизовать';
-$lang['type_mission'][8]  					= 'Переработать';
-$lang['type_mission'][9]  					= 'Уничтожить';
-$lang['type_mission'][15] 					= 'Эк�педици�';
-
-$lang['user_level'] = array (
-	'0' => 'Игрок',
-	'1' => 'Модератор',
-	'2' => 'Оператор',
-	'3' => '�дмини�тратор',
-);
-
-// GAME.PHP
-$lang['see_you_soon']						= 'До �корых в�треч!';
-$lang['page_doesnt_exist']					= 'Запрашиваема� вами �траница не �уще�твует';
-
-//SHORT NAMES FOR COMBAT REPORTS
-$lang['tech_rc'] = array (
-202 => "М. тран�порт",
-203 => "Б. тран�тпорт",
-204 => "Л. и�требитель",
-205 => "Т. и�требитель",
-206 => "Крей�ер",
-207 => "Линкор",
-208 => "Колониз.",
-209 => "Перераб.",
-210 => "Шпион",
-211 => "Бомбард.",
-212 => "Солн. �путник",
-213 => "Уничтожитель",
-214 => "Звезда �мерти",
-215 => "Линейный крей�ер",
-216 => "Сверхнова",
-
-401 => "РУ",
-402 => "Л.лазер",
-403 => "Т.лазер",
-404 => "П.Гау��а",
-405 => "П.Ионна�",
-406 => "О.Плазменное",
-407 => "М.купол",
-408 => "Б.купол",
-409 => 'Планетарна� защита',
-);
-
-//----------------------------------------------------------------------------//
-//TOPNAV
-$lang['tn_vacation_mode']					= 'Режим отпу�ка активен до ';
-
-//----------------------------------------------------------------------------//
-//LEFT MENU
-$lang['lm_overview']						= 'Обзор';
-$lang['lm_galaxy']							= 'Галактика';
-$lang['lm_empire']							= 'Импери�';
-$lang['lm_fleet']							= 'Флот';
-$lang['lm_buildings']						= 'По�тройки';
-$lang['lm_research']						= 'И��ледовани�';
-$lang['lm_shipshard']						= 'Верьф';
-$lang['lm_defenses']						= 'Оборона';
-$lang['lm_resources']						= 'Ре�ур�ы';
-$lang['lm_officiers']						= 'Офицеры';
-$lang['lm_trader']							= 'Торговец';
-$lang['lm_technology']						= 'Технологии';
-$lang['lm_messages']						= 'Сообщени�';
-$lang['lm_alliance']						= '�ль�н�';
-$lang['lm_buddylist']						= 'Друзь�';
-$lang['lm_notes']							= 'Заметки';
-$lang['lm_statistics']						= 'Стати�тика';
-$lang['lm_search']							= 'Пои�к';
-$lang['lm_options']							= '�а�тройки';
-$lang['lm_banned']							= 'Забанены';
-$lang['lm_contact']							= 'Контакты';
-$lang['lm_forums']							= 'Форум';
-$lang['lm_logout']							= 'Выход';
-$lang['lm_administration']					= '�дминпанель';
-$lang['lm_game_speed']						= 'Игра';
-$lang['lm_fleet_speed']						= 'Флоты';
-$lang['lm_resources_speed']					= 'Ре�ур�ы';
-$lang['lm_queues']							= 'Очередь';
-
-//----------------------------------------------------------------------------//
-//OVERVIEW
-$lang['ov_newname_error']					= 'Вы ввели недопу�тимые �имволы. Можно вводить только цифры и буквы.';
-$lang['ov_planet_abandoned']				= 'Вы у�пешно покинули планету';
-$lang['ov_principal_planet_cant_abanone']	= 'Вы не можете покинуть главную планету!';
-$lang['ov_wrong_pass']						= '�еверный пароль, попробуйте еще раз.';
-$lang['ov_have_new_message']				= 'У ва� одно новое �ообщение';
-$lang['ov_have_new_messages']				= '�овых �ообщений: %m';
-$lang['ov_free']							= 'Очередь по�троек пу�та! ';
-$lang['ov_tfree']                           = '�е ведет�� никаких и��ледований. ';
-$lang['ov_hree']                            = 'Корабли/оборона не производ�т�� в данный момент.';
-$lang['ov_news']							= '�ово�ти';
-$lang['ov_place']							= 'Ранг';
-$lang['ov_of']								= 'из';
-$lang['ov_planet']							= 'Планета';
-$lang['ov_server_time']						= 'Врем� �ервера ';
-$lang['ov_events']							= 'Событи�';
-$lang['ov_diameter']						= 'Диаметр';
-$lang['ov_distance_unit']					= 'км';
-$lang['ov_temperature']						= 'Температура';
-$lang['ov_aprox']							= 'От';
-$lang['ov_temp_unit']						= '°C';
-$lang['ov_to']								= 'до';
-$lang['ov_position']						= 'Координаты';
-$lang['ov_points']							= 'Очки';
-$lang['ov_security_request']				= 'Вопро� безопа�но�ти';
-$lang['ov_security_confirm']				= 'Пожалуй�та подтвердите уничтожение планеты';
-$lang['ov_with_pass']						= ' паролем логина';
-$lang['ov_password']						= 'Пароль';
-$lang['ov_delete_planet']					= 'Покинуть!';
-$lang['ov_your_planet']						= 'Ваша планета';
-$lang['ov_coords']							= 'Координаты';
-$lang['ov_abandon_planet']					= 'Покинуть колонию';
-$lang['ov_planet_name']						= '�азвание';
-$lang['ov_actions']							= 'Дей�тви�';
-$lang['ov_planet_rename']					= 'Переименовать в';
-$lang['ov_planet_rename_action']			= 'Переименовать';
-
-//----------------------------------------------------------------------------//
-//GALAXY
-$lang['gl_no_deuterium_to_view_galaxy']		= '�едо�таточно дейтери� дл� про�мотра галактики!';
-$lang['gl_legend']							= 'Легенда';
-$lang['gl_strong_player']					= '�ильный игрок';
-$lang['gl_week_player']						= 'новичек';
-$lang['gl_vacation']						= 'Режим отпу�ка';
-$lang['gl_banned']							= 'Забанен';
-$lang['gl_inactive_seven']					= '7 неактивен';
-$lang['gl_inactive_twentyeight']			= '28 неактивен';
-$lang['gl_s']								= 's';
-$lang['gl_w']								= 'n';
-$lang['gl_v']								= 'v';
-$lang['gl_b']								= 'b';
-$lang['gl_i']								= 'i';
-$lang['gl_I']								= 'I';
-$lang['gl_populed_planets']					= 'колонизованых планет';
-$lang['gl_out_space']						= 'Эк�педици�';
-$lang['gl_avaible_missiles']				= ' ракет';
-$lang['gl_fleets']							= 'флоты';
-$lang['gl_avaible_recyclers']				= ' переработчиков';
-$lang['gl_avaible_spyprobes']				= ' шпионов';
-$lang['gl_missil_launch']					= '�така ракетами';
-$lang['gl_missil_to_launch']				= 'Кол-во ракет (<b>%d</b> в�его):';
-$lang['gl_all_defenses']					= 'В�е';
-$lang['gl_objective']						= 'Цель';
-$lang['gl_missil_launch_action']			= 'OK';
-$lang['gl_galaxy']							= 'Галактика';
-$lang['gl_solar_system']					= 'Си�тема';
-$lang['gl_show']							= 'Перейти';
-$lang['gl_pos']								= 'â„–';
-$lang['gl_planet']							= 'Планета';
-$lang['gl_name_activity']					= '�азвание (активно�ть)';
-$lang['gl_moon']							= 'Луна';
-$lang['gl_debris']							= 'Обломки';
-$lang['gl_player_estate']					= 'Игрок (�тату�)';
-$lang['gl_alliance']						= '�ль�н�';
-$lang['gl_actions']							= 'Дей�твие';
-$lang['gl_spy']								= 'Шпионить';
-$lang['gl_buddy_request']					= 'Добавить в друзь�';
-$lang['gl_missile_attack']					= '�таковать ракетами';
-$lang['gl_with']							= ' �о�тоит из ';
-$lang['gl_member']							= ' человек';
-$lang['gl_member_add']						= '';
-$lang['gl_alliance_page']					= 'Страница аль�н�а';
-$lang['gl_see_on_stats']					= 'Стати�тика';
-$lang['gl_alliance_web_page']				= 'Веб �траница';
-$lang['gl_debris_field']					= 'Поле обломков';
-$lang['gl_collect']							= 'Переработать';
-$lang['gl_resources']						= 'Ре�ур�ы';
-$lang['gl_features']						= 'О�обенно�ти';
-$lang['gl_diameter']						= 'Диаметр';
-$lang['gl_temperature']						= 'Температура';
-$lang['gl_phalanx']							= 'Сканировать фалангой';
-$lang['gl_planet_destroyed']				= 'Планета уничтожена';
-$lang['gl_player']							= '';
-$lang['gl_in_the_rank']						= ' в �тати�тике ';
-$lang['gl_stat']							= 'Стати�тика';
-
-//----------------------------------------------------------------------------//
-//PHALANX
-$lang['px_no_deuterium']					= '�едо�таточно дейтери�!';
-$lang['px_scan_position']					= 'Сканировать координаты';
-$lang['px_fleet_movement']					= 'Передвижение флотов';
-
-//----------------------------------------------------------------------------//
-//IMPERIUM
-$lang['iv_imperium_title']					= 'Обзор империи';
-$lang['iv_planet']							= 'Планета';
-$lang['iv_name']							= '�азвание';
-$lang['iv_coords']							= 'Коорд.';
-$lang['iv_fields']							= 'Пол�';
-$lang['iv_resources']						= 'Ре�ур�ы';
-$lang['iv_buildings']						= 'По�тройки';
-$lang['iv_technology']						= 'Технологии';
-$lang['iv_ships']							= 'Корабли';
-$lang['iv_defenses']						= 'Оборона';
-
-//----------------------------------------------------------------------------//
-//FLEET - FLEET1 - FLEET2 - FLEET3 - FLEETACS - FLEETSHORTCUTS
-$lang['fl_returning']						= 'Возврат';
-$lang['fl_onway']							= 'В пути';
-$lang['fl_r']								= '(R)';
-$lang['fl_a']								= '(A)';
-$lang['fl_send_back']						= '�азад';
-$lang['fl_acs']								= 'С�Б';
-$lang['fl_no_more_slots']					= 'В�е �лоты дл� полетов и�пользованы';
-$lang['fl_speed_title']						= 'Скоро�ть: ';
-$lang['fl_continue']						= 'Продолжить';
-$lang['fl_no_ships']						= '�ет кораблей';
-$lang['fl_remove_all_ships']				= 'Убрать в�е';
-$lang['fl_select_all_ships']				= 'Выбрать в�е';
-$lang['fl_fleets']							= 'Флоты';
-$lang['fl_expeditions']						= 'Эк�педици�';
-$lang['fl_number']							= 'ID';
-$lang['fl_mission']							= 'Ми��и�';
-$lang['fl_ammount']							= 'Флот (в�его)';
-$lang['fl_beginning']						= '�ачало';
-$lang['fl_departure']						= 'Отправлен';
-$lang['fl_destiny']							= 'Пункт назначени�';
-$lang['fl_objective']						= 'Цель';
-$lang['fl_arrival']							= 'Прибытие';
-$lang['fl_order']							= 'Приказ';
-$lang['fl_new_mission_title']				= 'Выберите флот дл� �той ми��ии:';
-$lang['fl_ship_type']						= 'Тип флота';
-$lang['fl_ship_available']					= 'До�тупно';
-$lang['fl_planet']							= 'Планета';
-$lang['fl_debris']							= 'Обломки';
-$lang['fl_moon']							= 'Луна';
-$lang['fl_planet_shortcut']					= '(П)';
-$lang['fl_debris_shortcut']					= '(О)';
-$lang['fl_moon_shortcut']					= '(Л)';
-$lang['fl_no_shortcuts']					= 'С�ылок нет';
-$lang['fl_anonymous']						= '�ноним';
-$lang['fl_shortcut_add_title']				= '�азвание [Галактика/Си�тема/Планета]';
-$lang['fl_shortcut_name']					= '�азвание';
-$lang['fl_shortcut_galaxy']					= 'Галактика';
-$lang['fl_shortcut_solar_system']			= 'Солнечна� �и�тема';
-$lang['fl_clean']							= 'Очи�тить';
-$lang['fl_register_shorcut']				= 'Реги�трировать';
-$lang['fl_shortcuts']						= 'Пр�мые ��ылки';
-$lang['fl_reset_shortcut']					= 'Повторить';
-$lang['fl_dlte_shortcut']					= 'У�транить';
-$lang['fl_back']							= '�азад';
-$lang['fl_shortcut_add']					= 'Добавить';
-$lang['fl_shortcut_edition']				= 'Редактировать: ';
-$lang['fl_no_colony']						= '�ет колоний';
-$lang['fl_send_fleet']						= 'По�лать флот';
-$lang['fl_fleet_speed']						= 'Скоро�ть';
-$lang['fl_distance']						= 'Ра��то�ние';
-$lang['fl_flying_time']						= 'Врем� полета';
-$lang['fl_fuel_consumption']				= 'Потребление топлива';
-$lang['fl_max_speed']						= 'Мак�имальна� �коро�ть.';
-$lang['fl_cargo_capacity']					= 'Грузоподъемно�ть';
-$lang['fl_shortcut']						= 'С�ылка';
-$lang['fl_shortcut_add_edit']				= '(Добавить/Редактировать)';
-$lang['fl_my_planets']						= 'Мои планеты';
-$lang['fl_acs_title']						= 'Групповые атаки (С�Б)';
-$lang['fl_hold_time']						= 'Врем� удержани�';
-$lang['fl_resources']						= 'Ре�ур�ы';
-$lang['fl_max']								= 'мак�';
-$lang['fl_resources_left']					= 'О�таток';
-$lang['fl_all_resources']					= 'В�е ре�ур�ы';
-$lang['fl_expedition_alert_message']		= 'Внимание ! В �к�педиции можно потер�ть ве�ь отправленый флот!';
-$lang['fl_vacation_mode_active']			= 'Включен Режим Отпу�ка';
-$lang['fl_expedition_tech_required']		= 'И��ледуйте Эк�педиционную технологию!';
-$lang['fl_expedition_fleets_limit']			= 'До�тигнут лимит �к�педиций!';
-$lang['fl_week_player']						= 'Игрок �лаб дл� ва�!';
-$lang['fl_strong_player']					= 'Игрок �лишком �илен дл� ва�!';
-$lang['fl_in_vacation_player']				= 'Игрок находит�� в Режиме Отпу�ка!';
-$lang['fl_no_slots']						= 'В�е �лоты дл� полетов уже и�пользованы';
-$lang['fl_empty_transport']					= 'Вы не можете тран�портировать 0 ру�ер�ов';
-$lang['fl_planet_populed']					= 'Планета уже зан�та!';
-$lang['fl_stay_not_on_enemy']				= 'Вы не можете о�тавить флот у врага!';
-$lang['fl_not_ally_deposit']				= '�ету �клада аль�н�а!';
-$lang['fl_deploy_only_your_planets']		= 'Вы можете вернуть флот только на �вои планеты!';
-$lang['fl_no_enought_deuterium']			= '�едо�таточно дейтери�. До�тупно: ';
-$lang['fl_no_enought_cargo_capacity']		= '�едо�таточно ме�та на корабл�х! До�тупно:';
-$lang['fl_admins_cannot_be_attacked']		= '�дмини�тратор не может быть атакован.';
-$lang['fl_fleet_sended']					= 'Флот отправлен';
-$lang['fl_from']							= '�';
-$lang['fl_arrival_time']					= 'Врем� прибыти�';
-$lang['fl_return_time']						= 'Врем� возвращени�';
-$lang['fl_fleet']							= 'Флот';
-$lang['fl_player']							= 'Игрок ';
-$lang['fl_add_to_attack']					= ' добавлен к атаке.';
-$lang['fl_dont_exist']						= ' не добавлен к атаке.';
-$lang['fl_acs_invitation_message']			= ' приглашает Ва� поуча�твовать в С�Бе.';
-$lang['fl_acs_invitation_title']			= 'Приглашение в С�Б';
-$lang['fl_sac_of_fleet']					= 'С�Б � флота';
-$lang['fl_modify_sac_name']					= 'Изменить название С�Ба';
-$lang['fl_members_invited']					= 'Приглашенные уча�тники';
-$lang['fl_invite_members']					= 'Пригла�ить уча�тников';
-$lang['fl_ship_maxbye']                     = 'Мак�. заказ:';
-
-//----------------------------------------------------------------------------//
-//BUILDINGS - RESEARCH - SHIPYARD - DEFENSES
-$lang['bd_dismantle']						= 'Уничтожить';
-$lang['bd_interrupt']						= 'отменить';
-$lang['bd_cancel']					        = 'Отменить';
-$lang['bd_working']							= 'Зан�т';
-$lang['bd_build']							= 'Строить';
-$lang['bd_build_next_level']				= 'Строить';
-$lang['bd_add_to_list']						= 'Строить';
-$lang['bd_no_more_fields']					= '�ет �вободных полей';
-$lang['bd_remaining']						= 'О�танет��';
-$lang['bd_lab_required']					= 'Может �начала по�троим И��ледователь�кую лабораторию!';
-$lang['bd_building_lab']					= '<div class="err"><p><b>И��ледование невозможно пока у�овершен�твует�� лаборатори�</b></p></div>';
-$lang['bd_lvl']								= 'уровень';
-$lang['bd_spy']								= ' шпион';
-$lang['bd_commander']						= ' командир';
-$lang['bd_research']						= 'И��ледовать';
-$lang['bd_shipyard_required']				= 'Может �начала по�троим Верфь!';
-$lang['bd_building_shipyard']				= '<div class="err"><p><b>Строитель�тво невозможно пока идет модернизаци� верфи</b></p></div>';
-$lang['bd_available']						= 'До�тупно: ';
-$lang['bd_build_ships']						= 'По�троить';
-$lang['bd_protection_shield_only_one']		= 'Строить можно только один щит!';
-$lang['bd_build_defenses']					= 'По�троить';
-$lang['bd_actual_production']				= 'Производ�тво:';
-$lang['bd_completed']						= 'Завершено';
-$lang['bd_operating']						= '(в проце��е)';
-$lang['bd_continue']						= 'продолжить';
-$lang['bd_ready']							= 'Готово';
-$lang['bd_finished']						= '-';
-
-//----------------------------------------------------------------------------//
-//RESOURCES
-$lang['rs_amount']							= 'Количе�тво';
-$lang['rs_lvl']								= 'Уровень';
-$lang['rs_production_on_planet']			= 'Производ�тво на планете "%s"';
-$lang['rs_basic_income']					= 'Е�те�твенное производ�тво';
-$lang['rs_storage_capacity']				= 'Вме�тимо�ть �кладов';
-$lang['rs_calculate']						= 'Ра�чет';
-$lang['rs_sum']								= 'В�его';
-$lang['rs_hour']							= 'В ча�';
-$lang['rs_daily']							= 'В день';
-$lang['rs_weekly']							= 'В неделю';
-$lang['rs_monthly']							= 'В ме��ц';
-$lang['rs_annually']						= 'В год';
-
-//----------------------------------------------------------------------------//
-//OFFICIERS
-$lang['of_recruit']							= '�ан�ть';
-$lang['of_max_lvl']							= 'Мак�. уровень';
-$lang['of_available_points']				= 'До�тупно Темной материи:';
-$lang['of_points_per_thousand_darkmatter']	= '';
-$lang['of_lvl']								= 'уровень';
-
-//----------------------------------------------------------------------------//
-//TRADER
-$lang['tr_only_positive_numbers']			= 'Вводить нужно только положительные чи�ла!';
-$lang['tr_not_enought_metal']				= '�едо�таточно металла.';
-$lang['tr_not_enought_crystal']				= '�едо�таточно кри�талла.';
-$lang['tr_not_enought_deuterium']			= '�едо�таточно дейтери�.';
-$lang['tr_exchange_done']					= 'Обмен произведен';
-$lang['tr_call_trader']						= 'Вызвать торговца';
-$lang['tr_call_trader_who_buys']			= 'Торговец ';
-$lang['tr_call_trader_submit']				= 'Вызвать';
-$lang['tr_exchange_quota']					= 'Обмен произойдет по кур�у 2/1/0.5';
-$lang['tr_sell_metal']						= 'Торговец металла';
-$lang['tr_sell_crystal']					= 'Торговец кри�талла';
-$lang['tr_sell_deuterium']					= 'Торговец дейтери�';
-$lang['tr_resource']						= 'Ре�ур�ы';
-$lang['tr_amount']							= 'Количе�тво';
-$lang['tr_quota_exchange']					= 'Обменный кур�';
-$lang['tr_exchange']						= 'Обмен�ть';
-$lang['tr_darkmatter_needed']               = '<font color="red">У Ва� нет в наличии </font><font color="#FF8900">%s ед. Темной материи</font><font color="red"> дл� �овершени� операции.</font>';
-//----------------------------------------------------------------------------//
-//TECHTREE
-$lang['tt_requirements']					= 'Требует��';
-$lang['tt_lvl']								= 'уровень ';
-
-$lang['tech'] = array(
-0 => "По�тройки",
-1 => "Рудник металла",
-2 => "Рудник кри�талла",
-3 => "Синтезатор дейтери�",
-4 => "Солнечна� �лектро�танци�",
-12 => "Термо�дерный реактор",
-14 => "Фабрика роботов",
-15 => "�анофабрика",
-21 => "Верфь",
-22 => "Хранилище металла",
-23 => "Хранилище кри�талла",
-24 => "Емко�ть дл� дейтери�",
-31 => "И��ледователь�ка� лаборатори�",
-33 => "Терраформер",
-34 => "Склад аль�н�а",
-40 => "О�обые по�тройки",
-41 => "Лунна� база",
-42 => "Сен�орна� фаланга",
-43 => "Телепорт",
-44 => "Ракетна� шахта",
-
-100 => "И��ледовани�",
-106 => "Технологи� шпионажа",
-108 => "Компьютерна� технологи�",
-109 => "Оружейна� технологи�",
-110 => "Технологи� обороны",
-111 => "Технологи� защиты кораблей",
-113 => "Энергетиче�ка� технологи�",
-114 => "Гиперпро�тран�твенна� технологи�",
-115 => "Технологи� ракетных двигателей",
-117 => "Технологи� импуль�ных двигателей",
-118 => "Технологи� гиперпро�тран�твенных двигателей",
-120 => "Лазерна� технологи�",
-121 => "Ионна� технологи�",
-122 => "Плазменна� технологи�",
-123 => "Межгалактиче�ка� и��ледователь�ка� �еть",
-124 => "Эк�педиционна� технологи�",
-125 => "�томна� технологи�",
-150 => "Колонизационна� технологи�",
-199 => "Гравитационна� технологи�",
-
-200 => "Флот",
-202 => "Малый тран�порт",
-203 => "Большой тран�порт",
-204 => "Легкий и�требитель",
-205 => "Т�желый и�требитель",
-206 => "Крей�ер",
-207 => "Линкор",
-208 => "Колонизатор",
-209 => "Переработчик",
-210 => "Шпион�кий зонд",
-211 => "Бомбардировщик",
-212 => "Солнечный �путник",
-213 => "Уничтожитель",
-214 => "Звезда �мерти",
-215 => "Линейный крей�ер",
-216 => 'Сверхнова',
-
-400 => "Си�тема обороны",
-401 => "Ракетна� у�тановка",
-402 => "Легкий лазер",
-403 => "Т�желый лазер",
-404 => "Пушка Гау��а",
-405 => "Ионное орудие",
-406 => "Плазменное орудие",
-407 => "Малый купол",
-408 => "Большой купол",
-409 => 'Планетарный купол',
-410 => "�томное орудие",
-502 => "Ракета-перехватчик",
-503 => "Межпланетна� ракета",
-
-600 => "Офицеры",
-601 => "Геолог",
-602 => "�дмирал",
-603 => "Инженер",
-604 => "Технократ",
-605 => "Кон�труктор",
-606 => "Ученый",
-607 => "Хранитель",
-608 => "Мини�тр обороны",
-609 => "Защитник",
-610 => "Разведчик",
-611 => "Командир",
-612 => "Уничтожитель",
-613 => "Генерал",
-614 => "Рейдер",
-615 => "Император",
-);
-
-$lang['res']['descriptions'] = array(
-1 => "О�новной по�тавщик �ырь� дл� �троитель�тва не�ущих �труктур по�троек и кораблей.",
-2 => "О�новной по�тавщик �ырь� дл� �лектронных �троительных �лементов и �плавов.",
-3 => "Извлекает из воды на планете незначительную долю дейтери�.",
-4 => "Производит �нергию из �олнечных лучей. Энерги� требует�� дл� работы большин�тва по�троек.",
-12 => "Добывает �нергию из проце��а образовани� атома гели� двум� атомами т�жёлого водорода.",
-14 => "Предо�тавл�ет про�тую рабочую �илу, которую можно примен�ть при �троитель�тве планетарной инфра�труктуры. Каждый уровень развити� фабрики повышает �коро�ть �троитель�тва зданий.",
-15 => "Фабрика нанитов производит �пециальных �волюционированных роботов - нанитов. �аниты - �то роботы, которые путём объединени� в �о�то�нии выполн�ть �к�траординарные задани�.",
-21 => "В �троительной верфи производ�т�� в�е виды кораблей и оборонительных �ооружений.",
-22 => "Хранилище дл� необработанных руд металлов до их дальнейшей переработки.",
-23 => "Хранилище дл� необработанного кри�талла до его дальнейшей переработки.",
-24 => "Огромные ёмко�ти дл� �берегани� добытого дейтери�.",
-31 => "�еобходима дл� и��ледовани� новых технологий.",
-33 => "Терраформер может преобразовывать огромные территории дела� их пригодными дл� за�тройки.",
-34 => "Склад аль�н�а предо�тавл�ет возможно�ть обе�печени� топливом друже�твенных флотов, которые помогают при обороне и наход�т�� на орбите.",
-41 => "Луна не ра�полагает атмо�ферой, по�тому перед за�елением требует�� �оорудить лунную базу.",
-42 => "Вы�окоча�тотные �ен�оры полно�тью про�матривают �пектр ча�тот в�ех попадающих на фалангу излучений.",
-43 => "Телепорт - �то огромные врата, которые могут пере�ылать между �обой флоты любых размеров без временных затрат.",
-44 => "Служит дл� хранени� ракет.",
-
-106 => "С помощью �той технологии добывают�� данные о других планетах.",
-108 => "С увеличением мощно�ти компьютеров можно командовать в�ё большим количе�твом флотов. Каждый уровень компьютерной технологии увеличивает мак�имальное количе�тво флотов на один.",
-109 => "Оружейна� технологи� делает �и�темы вооружени� �ффективней. Каждый уровень увеличивает мощно�ть вооружени� вой�ковых ча�тей на 10% от о�новной мощно�ти.",
-110 => "Эта технологи� занимает�� изучением более новых возможно�тей большего �нерго�набжени� щитов, что делает их �ффективней и у�тойчивей. Благодар� �тому � каждым изученным уровнем �ффективно�ть щитов повышает�� на 10%.",
-111 => "Специальные �плавы улучшают броню ко�миче�ких кораблей. Так, у�тойчиво�ть брони может увеличивать�� � каждым уровнем на 10%.",
-113 => "Энергетиче�ка� технологи� занимает�� дальнейшим развитием �и�тем передачи и хранени� �нергии, которые необходимы дл� многих новых технологий.",
-114 => "Путём �плетени� 4-го и 5-го измерени� �тало возможным и��ледовать новый более �кономный и �ффективный двигатель.",
-115 => "Дальнейшее развитие �тих двигателей делает некоторые корабли бы�трее, однако каждый уровень повышает �коро�ть лишь на 10%.",
-117 => "Импуль�ный двигатель о�новывает�� на принципе отдачи. Дальнейшее развитие �тих двигателей делает некоторые корабли бы�трее, однако � каждым уровнем повышает �коро�ть лишь на 20%.",
-118 => "Благодар� про�тран�твенно-временному изгибу в непо�ред�твенном окружении корабл� про�тран�тво �жимает��, чем бы�трее преодолевают�� далёкие ра��то�ни�. Чем выше развит гиперпро�тра�твенный привод, тем выше �жатие про�тран�тва, благодар� чему � каждым уровнем �коро�ть кораблей повышает�� на 30%.",
-120 => "Благодар� фоку�ированию �вета возникает луч, который при попадании на объект нано�ит ему повреждени�.",
-121 => "Пои�тине �мертоно�ный наводимый луч из у�коренных ионов. При попадании на какой-либо объект они нано��т огромный ущерб.",
-122 => "Дальнейшее развитие ионной технологии, котора� у�кор�ет не ионы, а вы�око�нергетиче�кую плазму. Она оказывает опу�тошительное дей�твие при попадании на какой-либо объект.",
-123 => "Эта �еть делает возможным общение учёных, работающих в и��ледователь�ких лаборатори�х разных планет. Каждый новый уровень позвол�ет при�оединить к �ети дополнительную лабораторию.",
-124 => "Теперь корабли можно о�нащать и��ледователь�ким модулем, обе�печивающим обработку �обранных данных в у�лови�х длительных полётов.",
-125 => "И��ледование �вой�тв атома, атомного �интеза и реакций.",
-150 => "Эта технологи� очень важна, чтобы ты мог о�новать империю � множе�твом колоний.",
-199 => "Гравитон - �то ча�тица, котора� не обладает ни ма��ой ни зар�дом и определ�ет �илу прит�жени�. Путём запу�ка концентрированного зар�да гравитонов можно �оздавать и�ку��твенное гравитационное поле, которое, подобно чёрной дыре, вт�гивает в �еб� ма��у, благодар� чему можно уничтожать корабли или даже луны.",
-
-202 => "Малый тран�порт - �то манёвренный корабль, который может бы�тро тран�портировать �ырьё на другие планеты.",
-203 => "Дальнейшее развитие малых тран�портов позволило �оздать корабли, обладающие большей вме�тительно�тью и, благодар� более развитому двигателю, �по�обными передвигать�� бы�трее, чем малый тран�порт, до тех пор, пока на малых тран�портах не у�танавливают�� импуль�ные двигатели 5-го уровн�",
-204 => "Лёгкий и�требитель - �то манёвренный корабль, который можно найти почти на каждой планете. Затраты на него не о�обо велики, однако щитова� мощно�ть и вме�тимо�ть очень малы.",
-205 => "Дальнейшее развитие лёгкого и�требител�, он лучше защищён и обладает большей �илой атаки.",
-206 => "Крей�еры почти втрое �ильней защищены, чем т�жёлые и�требители, а по огневой мощи они прево�ход�т т�жёлые и�требители почти в два раза. К тому же они очень бы�тры.",
-207 => "Линкоры как правило �о�тавл�ют о�нову флота. Их т�жёлые оруди�, вы�ока� �коро�ть и большой грузовой тоннаж делают их �ерьёзными противниками.",
-208 => "При помощи �того корабл� можно о�ваивать неза�елённые планеты.",
-209 => "С помощью переработчика добывает�� �ырьё из обломков.",
-210 => "Шпион�кие зонды - �то маленькие манёвренные корабли, которые до�тавл�ют � больших ра��то�ний данные о флотах и планетах.",
-211 => "Бомбардировщик был разработан �пециально дл� того, чтобы уничтожать планетарную защиту.",
-212 => "Солнечные �путники - �то про�тые платформы из �олнечных батарей, которые наход�т�� на вы�окой орбите. Они �обирают �олнечный �вет и передают его � помощью лазера на наземную �танцию.",
-213 => "Уничтожитель - король �реди военных кораблей.",
-214 => "Звезда �мерти о�нащена гигант�кой гравитонной пушкой, котора� может уничтожать корабли и даже луны. ",
-215 => "Линейный крей�ер �пециализирует�� на перехвате враже�ких флотов.",
-216 => "Сверхнова - Самый мощный Император�кий боевой корабль",
-
-401 => "Ракетна� у�тановка - про�тое и дешёвое �ред�тво обороны.",
-402 => "При помощи концентрированного об�трела цели фотонами можно до�тичь значительно бoльших разрушений, чем при применении обычного балли�тиче�кого вооружени�.",
-403 => "Т�жёлый лазер пред�тавл�ет �обой дальнейшее развитие лёгкого лазера.",
-404 => "Пушка Гау��а у�кор�ет многотонные зар�ды � гигант�кими затратами �нергии.",
-405 => "Ионное орудие направл�ет на цель волну ионов, котора� де�табилизирует щиты и повреждает �лектронику.",
-406 => "Лазерна� технологи� была доведена до �овершен�тва, ионна� техника до�тигла конечной �тадии.",
-407 => "Малый щитовой защищает планету и поглощает удары атаки.",
-408 => "Дальнейшее развитие малого щитового купола. Он может �держивать ещё более �ильные атаки на планету, поглоща� значительно большее количе�тво �нергии.",
-409 => "Сама� мощна� защита дл� ваших планет от враже�кого флота",
-410 => "Большое �убатомное лучевое орудие.",
-502 => "Ракеты-перехватчики уничтожают атакующие межпланетные ракеты",
-503 => "Межпланетные ракеты уничтожают враже�кую оборону",
-
-601 => 'Геолог - �к�перт в а�троминералогии и а�трокри�талографии. Он окажет помощь вашей команде в металлургии и химии, а также возьмет�� за межпланетные коммуникации, чтобы оптимизировать и�пользование и утонченно�ть грубой материи на прот�жении в�ей империи.<br><br><strong><font color="lime">+5% производ�тва. Мак�имальный уровень: 20</font></strong>',
-602 => '�дмирал флота - опытный ветеран войны и умелый �тратег. В �амых же�тких �ражени�х, он �по�обен найти выход из �итуации и контактировать � его подчиненными адмиралами. Мудрый император может пологать�� на его помощь во врем� �ражений.<br><br><strong><font color="lime">+5% к характери�тикам кораблей. Мак�имальный уровень: 20</font></strong>',
-603 => 'Инженер - �пециали�т по управлению �нергией. В мирное врем�, инженер увеличивает �нергию на в�ех колони�х империи. В �лучае атаки, он гарантирует подачу �нергии в пушки, предотвраща� возможно�ть дополнительной нагрузки, что приводит к �окращению потер�нных в �ражении единиц орудий защиты.
-<br><br><strong><font color="lime">+5% к �нергии. Мак�имальный уровень: 10</font></strong>',
-604 => 'Проф�оюз Технократов �о�тоит из на�то�щих гениев, Вы в�егда найдете их в �том не�табильном мире, где в�е было бы уничтожено на ты��чи о�колков перед тем, как Вы �могли бы найти технологиче�кое и рациональное решение. �икакое нормальное человече�кое �уще�тво не �умеет ра�шифровывать код технократа. С при�ут�твием технократа в Вашей империи Вы можете забыть о медленном �удо�троении.
-<br><br><strong><font color="lime">+5% к �коро�ти �троитель�тва кораблей. Мак�имальный уровень: 10</font></strong>',
-605 => 'Кон�труктор один из лучших �троителей. Он �по�обен по�троить целый город в кратчайшие �роки.<br><br><strong><font color="lime">+10% к �коро�ти по�троек. Мак�имальный уровень: 3</font></strong>',
-606 => 'Специали�т так же входит в проф�оюз технократов. Он �пециализируют�� в �окращении времени и��ледований технологий.<br><br><strong><font color="lime">+10% к �коро�ти и��ледований. Мак�имальный уровень: 3</font></strong>',
-607 => 'Работа хранител� заключает�� в том, чтобы доверенные ему ре�ур�ы не пропадали даром. Его разум позволил придумать выход, он �оздал новую технику хранени� ре�ур�ов. 
-<br><br><strong><font color="lime">+10% к вме�тимо�ти хранилищ . Мак�имальный уровень: 2</font></strong>',
-608 => 'Мини�тр обороны - член император�кой армии. Его за�луга в его работе, котора� позвол�ет ему �троить огромную защиту от враже�ких флотов в кратчайшие �роки.<br><br><strong><font color="lime">+10% к �коро�ти по�тройки обороны. Мак�имальный уровень: 2</font></strong>',
-609 => 'Император впечатлен вашей работой, которую Вы предо�тавл�ете империи. В каче�тве благодарно�ти он позволит Вам пользовать�� �амой мощной защитой.<br><br><strong><font color="lime">Открывает возможно�ть �троить Планетарный щитовой купол. Мак�имальный уровень: 1</font></strong>',
-610 => 'Разведчик - загадочный человек. �икто никогда не видел его и�тинное лицо, и не увидит, пока он не умрет.<br><br><strong><font color="lime">+1 уровень к шпионажу. Мак�имальный уровень: 2</font></strong>',
-611 => 'Ранг командира неоднократно оправдал �еб� в �овременном ведении бо�. Благодар� упрощённой �труктуре Ваши приказы могут и�полн�ть�� бы�трее, что позволит Вам �охран�ть контроль над в�ей Вашей империей. Вы �можете развивать �тратегии, позвол�ющие в�егда быть на шаг впереди противника.<br><br><strong><font color="lime">+3 к �лотам флота. Мак�имальный уровень: 3</font></strong>',
-612 => 'Уничтожитель - �лужащий без мило�ерди�. Он и�требл�ет в�е на планетах только из-за того, что ему �то нравит��. При управлении Звездой Смерти можно уничтожать целые луны.<br><br><strong><font color="lime">Открывает ми��ию уничтожени�. Мак�имальный уровень: 1</font></strong>',
-613 => 'Генерал - �то почтенное лицо, которое �лужит много лет в армии. Бе�чи�ленными маневрами генерал разработал �тратегии, чтобы оптимизировать �коро�ть любых типов кораблей при �амых неожиданных об�то�тель�твах.<br><br><strong><font color="lime">+5% к �коро�ти кораблей. Мак�имальный уровень: 3</font></strong>',
-614 => 'Император обнаружил в Ва� бе��порные каче�тва завоевател�. Он предлагает Вам �тать Рейдером. Рейдер - �амый вы�окий ранг император�кой армии.<br><br><strong><font color="lime">Открывает возможно�ть �троить легендарный корабль "Сверх�ова". Мак�имальный уровень: 1</font></strong>',
-615 => 'Как вы��нило�ь, Вы - великий завоеватель в�еленной. �а�тал момент дл� того, чтобы Вы вз�ли ме�то, которое Вы за�луживаете.<br><br><strong><font color="lime">-. Мак�имальный уровень: 1</font></strong>',
-);
-
-//----------------------------------------------------------------------------//
-//INFOS
-$lang['in_jump_gate_done']					= 'Телепортаци� недавно прошла, �ледующий прыжок будет как минимум в: ';
-$lang['in_jump_gate_error_data']			= 'Ошибка, неверные данные дл� прыжка!';
-$lang['in_jump_gate_not_ready_target']		= 'Врата еще не готовы, полна� готовно�ть ожижает�� в: ';
-$lang['in_jump_gate_doesnt_have_one']		= 'У Ва� не по�троены врата на �той луне!';
-$lang['in_jump_gate_already_used']			= 'Телепорт был и�пользован, врем�, требуемое дл� во��тановлени� �нергии: ';
-$lang['in_jump_gate_available']				= 'До�тупно';
-$lang['in_rf_again']    					= 'Одним залпом поражает';
-$lang['in_rf_from']     					= 'Погибает от одного залпа';
-$lang['in_level']       					= 'Уровень';
-$lang['in_prod_p_hour'] 					= 'Производ�тво в ча�';
-$lang['in_difference']  					= 'Разница';
-$lang['in_used_energy'] 					= 'Потребление �нергии';
-$lang['in_prod_energy'] 					= 'Производ�тво �нергии';
-$lang['in_used_deuter']						= 'Потребление дейтери�';
-$lang['in_range']       					= 'Дально�ть �ен�ора';
-$lang['in_title_head']  					= 'Информаци�';
-$lang['in_name']        					= '�азвание';
-$lang['in_struct_pt']   					= 'Очки Структуры';
-$lang['in_shield_pt']   					= 'Мощно�ть щитов';
-$lang['in_attack_pt']   					= 'Мощно�ть атаки';
-$lang['in_capacity']    					= 'Грузоподъемно�ть';
-$lang['in_units']       					= 'единиц';
-$lang['in_base_speed'] 						= 'Базова� �коро�ть';
-$lang['in_consumption'] 					= 'Ра�ход топлива (Дейтери�)';
-$lang['in_jump_gate_start_moon']			= 'Старт � Луны';
-$lang['in_jump_gate_finish_moon']			= 'Конечна� луна';
-$lang['in_jump_gate_select_ships']			= 'Прыжок: выбрать флот';
-$lang['in_jump_gate_jump']					= 'Прыгнуть';
-$lang['in_destroy']     					= 'Уничтожить:';
-$lang['in_needed']      					= 'Требует��';
-$lang['in_dest_durati'] 					= 'Врем� уничтожени�';
-
-// -------------------------- MINES ------------------------------------------------------------------------------------------------------//
-$lang['info'][1]['name']          			= "Рудник металла";
-$lang['info'][1]['description']   			= "О�новной по�тавщик �ырь� дл� �троитель�тва не�ущих �труктур по�троек и кораблей. Металл - �амое дешёвое �ырьё, но зато его требует�� больше, чем в�его о�тального. Дл� производ�тва металла требует�� меньше в�его �нергии. Чем рудники больше, тем они глубже. �а большин�тве планет металл находит�� на больших глубинах, при помощи �тих более глубоких рудников можно добывать больше металлов, производ�тво ра�тёт. В то же врем� более крупные рудники требуют больше �нергии.";
-$lang['info'][2]['name']          			= "Рудник кри�талла";
-$lang['info'][2]['description']   			= "О�новной по�тавщик �ырь� дл� �лектронных �троительных �лементов и �плавов. Дл� добычи кри�талла требует�� примерно вдвое больше �нергии, чем дл� добычи металла, по�тому он, �оответ�твенно, ценит�� больше. Кри�талл требует�� дл� в�ех кораблей и зданий. К �ожалению, большин�тво необходимых дл� �троитель�тва кораблей кри�таллов очень редки и, как и большин�тво металлов, залегают на больших глубинах. По�тому при у�овершен�твовании рудника также повышает�� производ�тво, так как о�ваивают�� более крупные и чи�тые залежи кри�таллов.";
-$lang['info'][3]['name']          			= "Синтезатор дейтери�";
-$lang['info'][3]['description']   			= "Из-за того, что рудники более крупных запа�ов наход�т�� на дне мор�. У�овершен�твование �интезатора также �по�об�твует о�воению �тих глубинных залежей дйетери�. Дейтерий необходим в каче�тве топлива дл� кораблей, почти дл� в�ех и��ледований, про�мотра галактик, а также дл� и�пользовани� �ен�орной фаланги.";
-
-// -------------------------- ENERGY ----------------------------------------------------------------------------------------------------//
-$lang['info'][4]['name']          			= "Солнечна� �лектро�танци�";
-$lang['info'][4]['description']   			= "Дл� обе�печени� �нергией рудников и �интезаторов необходимы огромные �олнечные �лектро�танции. Чем больше по�троено �танций, тем больше поверхно�ти покрыто кварцевыми пла�тинами, которые перерабатывают �ветовую �нергию в �лектро�нергию. Солнечные �лектро�танции пред�тавл�ют �обой о�нову �нергообе�печени� планеты.";
-$lang['info'][12]['name']         			= "Термо�дерна� шахта";
-$lang['info'][12]['description']  			= "�а термо�дерных �лектро�танци�х при помощи холодного термо�дерного �интеза под огромным давлением и при большой температуре 2 атома т�жёлого водорода объедин�ют�� в один атом гели�. При �том, при образовании �дра гели�, вырабатывает�� �нерги� в 41,32*10^-13 джоулей в виде излучени� (т.о. при �горании 1 г водорода вырабатывает�� 172 мВт/ч �нергии). Чем больше термо�дерный реактор, тем �ложнее проце��ы �интезировани�, реактор производит больше �нергии";
-
-// -------------------------- BUILDINGS ----------------------------------------------------------------------------------------------------//
-$lang['info'][14]['name']         			= "Фабрика роботов";
-$lang['info'][14]['description']  			= "Предо�тавл�ет про�тую рабочую �илу, которую можно примен�ть при �троитель�тве планетарной инфра�труктуры. Каждый уровень развити� фабрики повышает �коро�ть �троитель�тва зданий.";
-$lang['info'][15]['name']         			= "�анофабрика";
-$lang['info'][15]['description']  			= "Фабрика нанитов пред�тавл�ет �обой венец робототехники. �аниты - �то роботы размером в нанометр, которые путём объединени� в �еть в �о�то�нии выполн�ть �к�траординарные задани�. Сразу же по�ле и��ледовани� они увеличивают производительно�ть почти во в�ех обла�т�х. С каждым уровнем фабрика нанитов �окращает врем� �троитель�тва зданий, кораблей и оборонительных �ооружений вдвое.";
-$lang['info'][21]['name']         			= "Верфь";
-$lang['info'][21]['description']  			= "В �троительной верфи производ�т�� в�е виды кораблей и оборонительных �ооружений. Чем она больше, тем бы�трее можно �троить более �ложные и более крупные корабли и оборонительные �ооружени�. По�ред�твом �троитель�тва фабрики нанитов производ�т�� миниатюрные роботы, которые помогают работникам работать бы�трее.";
-$lang['info'][22]['name']         			= "Хранилище металла";
-$lang['info'][22]['description']  			= "Огромное хранилище дл� добытых руд. Чем оно больше, тем больше металла можно в нём хранить. Е�ли оно заполнено, то добыча металла прекращает��.";
-$lang['info'][23]['name']         			= "Хранилище кри�талла";
-$lang['info'][23]['description']  			= "В �том огромном хранилище �кладирует�� ещё не обработанный кри�талл. Чем хранилище больше, тем больше кри�талла там можно хранить. Е�ли оно заполнено, то добыча �его ре�ур�а прекращает��.";
-$lang['info'][24]['name']         			= "Емко�ть дл� дейтери�";
-$lang['info'][24]['description']  			= "Огромные ёмко�ти дл� хранени� добытого водорода. Они обычно наход�т�� вблизи ко�миче�ких портов. Чем они больше, тем больше водорода в них может �берегать��. Е�ли они заполнены, то добыча водорода прекращает��.";
-$lang['info'][31]['name']         			= "И��ледователь�ка� лаборатори�";
-$lang['info'][31]['description']  			= "Дл� и��ледовани� новых технологий необходима работа и��ледователь�кой �танции. Уровень развити� и��ледователь�кой �танции �вл�ет�� решающим фактором того, как бы�тро могут быть о�воены новые технологии. Чем выше уровень развити� и��ледователь�кой лаборатории, тем больше может быть и��ледовано новых технологий. Дл� того, чтобы как можно бы�трее завершить и��ледователь�кие работы на одной планете, на неё по�ылают�� в�е имеющие�� в наличии учёные и, таким образом, покидают �вои планеты. Как только технологи� и��ледована, учёные возвращают�� на �вои родные планеты и перено��т � �обой знани� о ней. Так новые технологии можно примен�ть и на других планетах.";
-$lang['info'][33]['name']         			= "Терраформер";
-$lang['info'][33]['description']  			= "По мере за�тройки планет в�ё более важным �тановил�� вопро� об ограниченно�ти пригодных дл� и�пользовани� площадей. Такие традиционные методы, как �троитель�тво ввы�ь и вглубь, оказали�ь недо�таточными. Маленька� группа физиков и нанотехников нашла решение - терраформер. 
-Затрачива� огромное количе�тво �нергии терраформер может преобразовывать огромные территории и даже целые континенты, дела� их пригодными дл� за�тройки.
-В �том �троении бе�прерывно производ�т�� �пециальные наниты, отвечающие за по�то�нное каче�тво почвы.";
-$lang['info'][34]['name']         			= "Склад аль�н�а";
-$lang['info'][34]['description']  			= "Склад аль�н�а предо�тавл�ет возможно�ть обе�печени� топливом друже�твенных флотов, которые помогают при обороне и наход�т�� на орбите. С каждым уровнем развити� можно по�ылать флотам на орбите дополнительно 10 000 единиц водорода в ча�.";
-$lang['info'][41]['name']         			= "Лунна� база";
-$lang['info'][41]['description']  			= "Луна не ра�полагает атмо�ферой, по�тому перед за�елением требует�� �оорудить лунную базу. Она обе�печивает необходимые воздух, гравитацию и тепло. Чем выше уровень развити� лунной базы, тем больше обе�печенна� био�ферой площадь. Каждый уровень лунной базы может за�троить 3 пол�, мак�имум до площади в�ей луны. Она �о�тавл�ет 2 (диаметр луны/1000), причём каждый уровень лунной базы �ам занимает одно поле.";
-$lang['info'][42]['name']         			= "Сен�орна� фаланга";
-$lang['info'][42]['description']  			= "Вы�окоча�тотные �ен�оры полно�тью про�матривают �пектр ча�тот в�ех попадающих на фалангу излучений. Мощные компьютеры комбинируют мельчайшие колебани� �нергии и таким образом получают информацию о передвижени�х кораблей на отдалённых планетах. Дл� про�мотра на луне должна быть предо�тавлена �нерги� в форме водорода (5 000 за про�мотр). Про�мотр о�уще�твл�ет�� переходом � луны в меню Галактика и на название враже�кой планеты, наход�щей�� в радиу�е дей�тви� �ен�оров (формула: (уровень фаланги)^2-1 �и�тем).";
-$lang['info'][43]['name']         			= "Телепорт";
-$lang['info'][43]['description']                        = "Телепорт - �то огромные врата, которые могут пере�ылать между �обой флоты любых размеров без временных затрат. Эти телепортеры не требуют дейтери�, однако между двум� прыжками должен пройти один ча�, иначе ворота перегреют��. �евозможна также пере�ылка ре�ур�ов. Ве�ь проце�� требует крайне вы�око развитой технологии.";
-$lang['info'][44]['name']                               = "Ракетна� шахта";
-$lang['info'][44]['description']                        = "Ракетные шахты �лужат дл� хранени� ракет. С каждым уровнем можно хранить на п�ть межпланетных или де��ть ракет-перехватчиков больше. Одна межпланетна� ракета требует ме�та в два раза больше, чем ракета-перехватчик. Возможно любое комбинирование различных типов ракет.";
-
-// -------------------------- TECHNOLOGY ----------------------------------------------------------------------------------------------------//
-$lang['info'][106]['name']                              = "Технологи� шпионажа";
-$lang['info'][106]['description'] = "Шпионаж предназначен дл� и��ледовани� новых и более �ффективных �ен�оров. Чем выше развита �та технологи�, тем больше информации имеет игрок о �обыти�х в �воём окружении. Разница в уровн�х шпионажа � противником играет решающую роль - чем больше и��ледована �об�твенна� шпион�ка� технологи�, тем больше информации �одержит�� в разведданных и тем меньше шан� быть обнаруженным. Чем больше по�лано зондов, тем больше �обирает�� подробно�тей о противнике, но при �том ра�тёт опа�но�ть быть обнаруженным. Также шпионаж �овершен�твует определение ме�тонахождени� чужих флотов. При �том также важен уровень развити� �об�твенного шпионажа.";
-$lang['info'][108]['name']        = "Компьютерна� технологи�";
-$lang['info'][108]['description'] = "Компьютерна� технологи� предназначена дл� ра�ширени� имеющих�� в наличии компьютерных мощно�тей. В результате на планете развивают�� более продуктивные и �ффективные компьютерные �и�темы, возра�тает вычи�лительна� мощно�ть и �коро�ть протекани� вычи�лительных проце��ов. С повышением мощно�ти компьютеров можно одновременно командовать в�ё бoльшим количе�твом флотов. Каждый уровень развити� компьютерной технологии даёт возможно�ть командовать +1 флотом. Чем больше ра��ылает�� флотов, тем больше можно �овершать налётов и тем �амым захватывать больше �ырь�. Е�те�твенно, что �та технологи� полезна и торговцам, так как она позвол�ет им одновременно ра��ылать больше торговых флотов. По �той причине �ледует по�то�нно развивать компьютерную технологию на прот�жении в�ей игры..";
-$lang['info'][109]['name']        = "Оружейна� технологи�";
-$lang['info'][109]['description'] = "Оружейна� технологи� занимает�� прежде в�его дальнейшим развитием имеющих�� в наличии �и�тем вооружени�. При �том о�обое значение придаёт�� тому, чтобы �набжать имеющие�� в наличии �и�темы большей �нергией и более точно �ту �нергию направл�ть. Благодар� �тому �и�темы вооружени� �танов�т�� �ффективней, а оружие вызывает больше разрушений. Каждый уровень оружейной технологии увеличивает мощно�ть вооружени� вой�ковых ча�тей на 10%. Оружейна� технологи� важна дл� конкуренто�по�обного �одержани� ча�тей. По�тому �ледовало бы её по�то�нно развивать в течение в�ей игры.";
-$lang['info'][110]['name']        = "Технологи� обороны";
-$lang['info'][110]['description'] = "Эта технологи� занимает�� изучением более новых возможно�тей большего �нерго�набжени� щитов, что делает их �ффективней и у�тойчивей. Благодар� �тому � каждым изученным уровнем �ффективно�ть щитов повышает�� на 10%.";
-$lang['info'][111]['name']        = "Технологи� защиты кораблей";
-$lang['info'][111]['description'] = "Специальные �плавы улучшают броню ко�миче�ких кораблей. Как только найден очень �тойкий �плав, �пециальные лучи измен�ют молекул�рную �труктуру ко�миче�кого корабл�, и доводит её до �о�то�ни� изученного �плава. Так, у�тойчиво�ть брони может увеличивать�� � каждым уровнем на 10%.";
-$lang['info'][113]['name']        = "Энергетиче�ка� технологи�";
-$lang['info'][113]['description'] = "Энергетиче�ка� технологи� занимает�� дальнейшим развитием �и�тем передачи и хранени� �нергии, которые необходимы дл� многих новых технологий.";
-$lang['info'][114]['name']        = "Гиперпро�тран�твенна� технологи�";
-$lang['info'][114]['description'] = "Путём �плетени� 4-го и 5-го измерени� �тало возможным и��ледовать новый более �кономный и �ффективный двигатель.";
-$lang['info'][115]['name']        = "Технологи� реактивных двигателей";
-$lang['info'][115]['description'] = "В о�нове реактивного двигател� лежит закон �охранени� импуль�а. Разогретый до вы�оких температур Темна� матери�, выбра�ывает�� в направлении, противоположном движению и даёт у�корение кораблю. Эффективно�ть �тих двигателей до�таточно мала, но они до�таточно надёжны, дёшевы в производ�тве и об�луживании. Кроме того они занимают гораздо меньше ме�та на корабле по �равнению � о�тальными двигател�ми, по�тому их в�ё ещё до�таточно ча�то можно в�третить на маленьких корабл�х. Так как реактивные двигатели �вл�ют�� о�новой любого полёта в ко�мо�, �ледует и��ледовать их как можно раньше. Дальнейшее развитие �тих двигателей делает �ледующие корабли � каждым уровнем на 10% бы�трее: малые и большие тран�порты, лёгкие и�требители и шпион�кие зонды.";
-$lang['info'][117]['name']        = "Технологи� импуль�ных двигателей";
-$lang['info'][117]['description'] = "Импуль�ный двигатель о�новывает�� на принципе отдачи, при котором возникает ма��а лучей, по большей ча�ти в виде побочного продукта �дерного �интеза, и�пользованного дл� получени� �нергии. Также можно впры�нуть дополнительную ма��у. Дальнейшее развитие �тих двигателей делает �ледующие корабли � каждым уровнем на 20% бы�трее: бомбардировщики, крей�еры, т�жёлые и�требители и колонизаторы. Каждый уровень развити� увеличивает радиу� дей�тви� межпланетных ракет.";
-$lang['info'][118]['name']        = "Технологи� гиперпро�тран�твенных двигателей";
-$lang['info'][118]['description'] = "Благодар� про�тран�твенно-временному изгибу в непо�ред�твенном окружении корабл� про�тран�тво �жимает��, чем бы�трее преодолевают�� далёкие ра��то�ни�. Чем выше развит гиперпро�тран�твенный привод, тем выше �жатие про�тран�тва, благодар� чему � каждым уровнем �коро�ть кораблей повышает�� на 30%.";
-$lang['info'][120]['name']        = "Лазерна� технологи�";
-$lang['info'][120]['description'] = "Лазеры (у�иление �вета при помощи индуцированного выбро�а излучени�) производ�т на�ыщенный �нергетиче�кий луч когерентного �вета. Эти приборы наход�т применение во в�евозможных обла�т�х, от оптиче�ких компьютеров до т�жёлых лазеров, которые �вободно режут броню ко�миче�ких кораблей. Лазерна� технологи� �вл�ет�� важным �лементом дл� и��ледовани� дальнейших оружейных технологий.";
-$lang['info'][121]['name']        = "Ионна� технологи�";
-$lang['info'][121]['description'] = "Пои�тине �мертоно�ный наводимый луч из у�коренных ионов. При попадании на какой-либо объект они нано��т огромный ущерб.";
-$lang['info'][122]['name']        = "Плазменна� технологи�";
-$lang['info'][122]['description'] = "Дальнейшее развитие ионной технологии, котора� у�кор�ет не ионы, а вы�око�нергетиче�кую плазму. Она оказывает опу�тошительное дей�твие при попадании на какой-либо объект.";
-$lang['info'][123]['name']        = "Межгалактиче�ка� и��ледователь�ка� �еть";
-$lang['info'][123]['description'] = "Эта �еть делает возможным общение учёных, работающих в и��ледователь�ких лаборатори�х разных планет. Каждый новый уровень позвол�ет при�оединить к �ети дополнительную лабораторию (в первую очередь при�оедин�ют�� лаборатории �тарших уровней). Из в�ех объединённых в �еть лабораторий, в каждом и��ледовании принимают уча�тие только те, которые имеют до�таточный дл� проведени� данного и��ледовани� уровень. Скоро�ть и��ледовани� �оответ�твует �умме уровней уча�твующих в нём лабораторий.";
-$lang['info'][124]['name']        = "Эк�педиционна� технологи�";
-$lang['info'][124]['description'] = "Эк�педиционна� технологи� охватывает различные технологии �канировани� и даёт возможно�ть о�нащать корабли различных кла��ов и��ледователь�ким модулем. Он �одержит базу данных, маленькую передвижную лабораторию, а также различные биоклетки и �о�уды дл� проб. Дл� безопа�но�ти корабл� при и��ледовании опа�ных объектов и��ледователь�кий модуль о�нащён автономным �нергообе�печением и генератором �нергетиче�кого пол�, который в �к�тремальных �итуаци�х может окружать и��ледователь�кий модуль мощным �нергетиче�ким полем.";
-$lang['info'][125]['name']        = "�томна� технологи�";
-$lang['info'][125]['description'] = "И��ледование �вой�тв атома, атомного �интеза и реакций. <br><br><font color=lime>+10% Ущерба вооружени� на о�нове технологии<br>+5% Сопротивлени� вооружени�м на о�нове технологии<br>Вооружение и�пользуют: Дредноут, �томное орудие</font>";
-$lang['info'][150]['name']        = "Колонизационна� технологи�";
-$lang['info'][150]['description'] = "Вла�титель, имеющий много колоний во в�еленой, имеет больше преимуще�тва перед другими.";
-$lang['info'][199]['name']        = "Гравитационна� технологи�";
-$lang['info'][199]['description'] = "Гравитон - �то ча�тица, котора� не обладает ни ма��ой ни зар�дом и определ�ет �илу прит�жени�. Путём запу�ка концентрированного зар�да гравитонов можно �оздавать и�ку��твенное гравитационное поле, которое, подобно чёрной дыре, вт�гивает в �еб� ма��у, благодар� чему можно уничтожать корабли или даже луны. Чтобы произве�ти до�таточное количе�тво гравитонов, требуют�� огромные количе�тва �нергии.";
-
-// -------------------------- SHIPS ----------------------------------------------------------------------------------------------------//
-$lang['info'][202]['name']        = "Малый тран�порт";
-$lang['info'][202]['description'] = "Тран�порты имеют примерно такой же размер, что и и�требители, но они не обладают мощными двигател�ми и бортовым вооружением ради �кономии ме�та. Малый тран�порт вмещает 5000 единиц �ырь�. По причине малой огневой мощи малые тран�порты ча�то �опровождают�� другими корабл�ми.";
-$lang['info'][203]['name']        = "Большой тран�порт";
-$lang['info'][203]['description'] = "У �того корабл� нет ни вооружени�, ни каких-либо других технологий на борту. По �той причине никогда не �ледует запу�кать их без �провождени�. Благодар� �воему вы�окоразвитому двигателю внутреннего �горани� большой тран�порт �лужит в каче�тве бы�трого межпланетного до�тавщика ре�ур�ов, также он �опровождает флоты при нападени�х на 
-враже�кие планеты, чтобы захватить как можно больше ре�ур�ов.";
-$lang['info'][204]['name']        = "Лёгкий и�требитель";
-$lang['info'][204]['description'] = "Лёгкий и�требитель - �то манёвренный корабль, который можно найти почти на каждой планете. Затраты на нем не о�обо велики, однако щитова� мощно�ть и вме�тимо�ть очень малы.";
-$lang['info'][205]['name']        = "Т�жёлый и�требитель";
-$lang['info'][205]['description'] = "При дальнейшем развитии лёгкого и�требител� учёные дошли до момента, когда �тало ��но, что обыкновенный двигатель не обладает необходимой мощью. Дл� того, чтобы оптимально передвигать корабль был впервые и�пользован импуль�ный двигатель. Хоть он и повы�ил �тоимо�ть, однако он также открыл новые возможно�ти. Благодар� применению �того двигател� о�тало�ь больше �нергии дл� вооружени� и щитов, кроме того, дл� �того вида и�требителей также и�пользовали�ь ценные материалы. Это привело к улучшенной �труктурной цело�тно�ти и более �ильной огневой мощи, благодар� чему в бою он пред�тавл�ет бoльшую угрозу, чем его предше�твенник. По�ле �тих изменений т�жёлый и�требитель пред�тавл�ет �обой новую �ру технологии корабле�троени�, о�нову технологии крей�еро�троени�.";
-$lang['info'][206]['name']        = "Крей�ер";
-$lang['info'][206]['description'] = "С развитием т�жёлых лазеров и ионных пушек т�жёлые и�требители в�ё больше выте�н�ли�ь. �е�мотр� на многочи�ленные у�овершен�твовани� огнева� мощь и бронирование не могли быть на�только изменены, чтобы дей�твенно противо�то�ть �тим оборонительным оруди�м. По�тому было решено по�троить новый кла�� кораблей, который объедин�л бы в �ебе больше бронировани� и огневой мощи. Так по�вил�� крей�ер. Крей�еры почти втрое �ильней защищены, чем т�жёлые и�требители и обладают более чем удвоенной огневой мощью. К тому же они очень бы�тры. �ет лучшего оружи� против �редней защиты. Почти �толетие крей�еры неограниченно го�под�твовали во в�еленной. С по�влением орудий Гау��а и плазменных орудий их го�под�тво закончило�ь. Однако и �егодн� их охотно примен�ют против групп и�требителей.
-У крей�ера е�ть �коро�трел (10) против реактивного гранатомёта и (3) против лёгких и�требителей, т.е. один крей�ер уничтожает одним вы�трелом не�колько реактивных гранатомётов и, �оответ�твенно, лёгких и�требителей.";
-$lang['info'][207]['name']        = "Линкор";
-$lang['info'][207]['description'] = "Линкоры как правило �о�тавл�ют о�нову флота. Их т�жёлые оруди�, вы�ока� �коро�ть и большой грузовой тоннаж делают их �ерьёзными противниками.";
-$lang['info'][208]['name']        = "Колонизатор";
-$lang['info'][208]['description'] = "Этот хорошо защищённый корабль �лужит покорению новых планет, что необходимо развивающей�� империи. Он и�пользует�� в новой колонии в каче�тве по�тавщика �ырь� - его разбирают и и�пользуют ве�ь полезный материал дл� о�воени� нового �вета. Кажда� импери�, включа� главную планету, может колонизировать мак�имум 9 планет.";
-$lang['info'][209]['name']        = "Переработчик";
-$lang['info'][209]['description'] = "Ко�миче�кие бои принимали в�ё бoльшие ма�штабы. Уничтожали�ь ты��чи кораблей и возникавшие при �том обломки казали�ь нав�егда потер�нными. �ормальные тран�порты не могли близко к ним приблизить��, не будучи �ильно повреждёнными маленькими обломками. С новым открытием в обла�ти щитовой технологии �тало возможно �ффективно у�тран�ть �ту проблему, возник новый кла�� корабл�, подобный большому тран�порту - переработчик. С его помощью можно было заново и�пользовать казавшие�� потер�нными ре�ур�ы. Из-за новых щитов маленькие обломки больше не пред�тавл�ли �обой опа�но�ти. К �ожалению, �ти у�трой�тва требуют про�тран�тва, по�тому его грузовой тоннаж ограничен до 20 000.";
-$lang['info'][210]['name']        = "Шпион�кий зонд";
-$lang['info'][210]['description'] = "Шпион�кие зонды - �то маленькие манёвренные корабли, которые до�тавл�ют � больших ра��то�ний данные о флотах и планетах. Их вы�окомощный двигатель позвол�ет им преодолевать большие ра��то�ни� за не�колько �екунд. Однажды попав на орбиту какой-нибудь планеты, они пребывают там некоторое врем� дл� �борки данных. В �то врем� враг может их отно�ительно легко обнаружить и атаковать. Дл� �кономии ме�та не было у�тановлено ни брони, ни щитов, ни орудий, что делает зонды в �лучае обнаружени� лёгкими цел�ми.";
-$lang['info'][211]['name']        = "Бомбардировщик";
-$lang['info'][211]['description'] = "Бомбардировщик был разработан �пециально дл� того, чтобы уничтожать планетарную защиту. С помощью лазерного прицела он точно �бра�ывает плазменные бомбы на поверхно�ть планеты и таким образом нано�ит огромные повреждени� оборонительным �ооружени�м. Скоро�трел против реактивного гранатомёта(10), лёгких (10) и 
-т�жёлых лазерных орудий (5), а также против ионных орудий (5).";
-$lang['info'][212]['name']        = "Солнечный �путник";
-$lang['info'][212]['description'] = "Солнечные �путники запу�кают�� на орбиту планеты. Они фоку�ируют �олнечную �нергию и передают её на наземную �танцию. Эффективно�ть �олнечных �путников зави�ит от мощи �олнечного излучени�. В принципе, добыча �нергии на орбитах, более приближённых к �олнцу, выше, чем на планетах, удалённых от �олнца. Из-за �воего �оотношени� цены и каче�тва �олнечные �путники решают �нергетиче�кие проблемы многих миров. �о внимание: �олнечные �путники могут быть уничтожены в бою.";
-$lang['info'][213]['name']        = "Уничтожитель";
-$lang['info'][213]['description'] = "Уничтожитель - король �реди военных кораблей. Его мультифланговые ионные, плазменные и гау��овые орудийные башни могут благодар� �воим у�овершен�твованным пеленгационным �ен�орам поражать � точно�тью до 99% даже �коро�тные манёвренные и�требители. Так как уничтожители очень велики, их манёвренно�ть очень ограничена, и в бою они подобны �корее боевой �танции, чем боевому кораблю. Потребление дейтери� у них так же вы�око, как и их боева� мощь. У разрушител� е�ть �коро�трел (10) против лёгкого лазера, т.е. один уничтожитель уничтожает не�колько лёгких лазеров одним вы�трелом.";
-$lang['info'][214]['name']        = "Звезда �мерти";
-$lang['info'][214]['description'] = "Звезда �мерти о�нащена гравитонной пушкой, котора� может уничтожать такие корабли, как уничтожитель, и даже луны. Так как дл� �того требует�� большое количе�тво �нергии, она �о�тоит почти лишь из генераторов. Только огромные звёздные империи могут вообще предо�тавить ре�ур�ы и работников, чтобы по�троить �тот размером � луну корабль.";
-$lang['info'][215]['name']        = "Линейный крей�ер";
-$lang['info'][215]['description'] = "Этот вы�окотехнологичный корабль не�ёт �мерть атакующим флотам. Его у�овершен�твованные лазерные оруди� удерживают т�жёлые корабли противника на ра��то�нии и могут уничтожать не�колько единиц одним залпом. За �чёт его малых размеров и неверо�тно мощного вооружени�, грузоподъёмно�ть линейного крей�ера очень мала, но за �чёт гиперпро�тран�твенного двигател� также мало потребление топлива.";
-$lang['info'][216]['name']        = "Сверхнова";
-$lang['info'][216]['description'] = "Вам предо�тавл�ет�� вознаграждение �о �тороны императора за ваши навыки же�токо�ти.";
-
-// -------------------------- DEFENSES ----------------------------------------------------------------------------------------------------//
-$lang['info'][401]['name']        = "Ракетна� у�тановка";
-$lang['info'][401]['description'] = "Ракетна� у�тановка - про�тое и дешёвое �ред�тво обороны. Так как �то развитие обычных балли�тиче�ких орудий, то ему не требует�� дальнейшей модернизации. Малые затраты на его производ�тво оправдывают его применение против более маленьких флотов, но �о временем он тер�ет значение. Позднее его и�пользуют лишь дл� отвода враже�ких вы�трелов. Оборонительные �ооружени� деактивируют�� �ами по �ебе, как только они �ильно повреждают��. Возможно�ть во��тановлени� оборонительных �ооружений по�ле бо� �о�тавл�ет до 70%.";
-$lang['info'][402]['name']        = "Лёгкий лазер";
-$lang['info'][402]['description'] = "Дл� компен�ации чрезмерных у�пехов в обла�ти технологии ко�миче�ких кораблей учёные должны были �оздать оборонительное �ооружение, �правл�ющее�� � более крупными и лучше вооружёнными флотами. Это привело к по�влению рождение лёгкого лазера. При помощи концентрированного об�трела цели фотонами можно до�тичь значительно бoльших разрушений, чем при применении обычного балли�тиче�кого вооружени�. Дл� противо�то�ни� более �ильной огневой мощи новых типов кораблей он также о�нащён у�овершен�твованными щитами. Однако, чтобы �тоимо�ть производ�тва о�тавала�ь низкой, �труктура дальше не у�иливала�ь. Лёгкий лазер обладает наилучшим �оотношением цены и каче�тва, по�тому он также интере�ен и дл� более развитых цивилизаций. Оборонительные �ооружени� деактивируют�� �ами по �ебе, как только они �ильно повреждают��. Возможно�ть во��тановлени� оборонительных �ооружений по�ле бо� �о�тавл�ет до 70%.";
-$lang['info'][403]['name']        = "Т�жёлый лазер";
-$lang['info'][403]['description'] = "Т�жёлый лазер пред�тавл�ет �обой дальнейшее развитие лёгкого лазера. Структура была у�илена и у�овершен�твована новыми материалами. Оболочку �могли �делать значительно более �тойкой. Одновременно была улучшена и �нергетиче�ка� �и�тема и целевой компьютер, так что т�жёлый лазер может концентрировать значительно больше �нергии на цели. Оборонительные �ооружени� деактивируют�� �ами по �ебе, как только они �ильно повреждают��. Возможно�ть во��тановлени� оборонительных �ооружений по�ле бо� �о�тавл�ет до 70%.";
-$lang['info'][404]['name']        = "Пушка Гау��а";
-$lang['info'][404]['description'] = "Долгое врем� артиллерий�кие оруди� �читали�ь у�таревшими по �равнению � �овременной �дерной и �нергетиче�кой техникой, развитием гиперпро�тран�твенного привода и по�то�нно улучшающими�� бронировками, пока именно �нергетиче�ка� техника, котора� их когда-то отте�н�ла, не помогла им зан�ть их и�конное ме�то. Вообще-то принцип у�корител� ча�тиц был изве�тен на Земле уже � 20-го и 21-го �толетий. Пушка Гау��а - �то ничто иное, как значительно бoльша� вер�и� �той кон�трукции. Многотонные зар�ды магнетиче�ки у�кор�ют�� при огромных затратах �нергии и имеют такую выходную �коро�ть, что ча�тички гр�зи в воздухе вокруг зар�да �горают, а отдача �отр��ает землю. Даже �овременные бронировки и щиты могут � трудом противо�то�ть �той пробивной �иле, и нередко �лучает�� так, что цель про�то про�треливает�� на�квозь. Оборонительные �ооружени� деактивируют�� �ами по �ебе, как только они �ильно повреждают��. Возможно�ть во��тановлени� оборонительных �ооружений по�ле бо� �о�тавл�ет до 70%.";
-$lang['info'][405]['name']        = "Ионное орудие";
-$lang['info'][405]['description'] = "В 21-м �толетии на Земле уже �уще�твовало то, что общеизве�тно как ЭМИ. ЭМИ означает �лектромагнитный импуль�, который обладает �по�обно�тью индуцировать дополнительные напр�жени� в �хемы и тем �амым причин�ть ма��овые помехи, которые могут уничтожить в�е чув�твительные приборы. Тогда ЭМИ-оруди� были в о�новном на базе ракет и бомб, также в комбинации � �дерными оруди�ми. Между тем ЭМИ по�то�нно развивал��, так как в нём видели большой потенциал не уничтожать цели, а делать их не�по�обными к бою и манёвренно�ти и, тем �амым, упрощать их захват. Пока что наивы�ша� форма ЭМИ-орудий пред�тавлена ионным орудием. Оно направл�ет на цель волну ионов (�лектриче�ки зар�женных ча�тиц), котора� де�табилизирует щиты и повреждает �лектронику, только е�ли она не очень хорошо защищена, что иногда подобно полному уничтожению. Кинетиче�кой пробивной �илой можно пренебречь. Ионна� техника и�пользует�� только на крей�ерах, так как потребление �нергии ионными оруди�ми огромно, и в бою ча�то приходит�� уничтожить, а не парализовать цель. Оборонительные �ооружени� деактивируют�� �ами по �ебе, как только они �ильно повреждают��. Возможно�ть во��тановлени� оборонительных �ооружений по�ле бо� �о�тавл�ет до 70%.";
-$lang['info'][406]['name']        = "Плазменное орудие";
-$lang['info'][406]['description'] = "Лазерна� технологи� была доведена до �овершен�тва, ионна� техника до�тигла конечной �тадии и �читало�ь, что практиче�ки невозможно, даже � каче�твенной точки зрени� орудийной �и�темы, до�тичь ещё больше �ффективно�ти. �о в�ё должно было изменить��, когда по�вила�ь иде� объединить обе �и�темы. Из термо�дерной технологии изве�тно, что лазеры нагревают ча�тицы (обычно дейтери�) до крайне вы�оких температур, и�чи�л�емых в миллионах граду�ов. Ионна� техника обогащает их �лектриче�ким зар�дом, �табилизационными пол�ми и у�корител�ми. Как только зар�д до�таточно нагрет, ионизирован и находит�� под давлением, то его выпу�кают по�ред�твом у�корителей во в�елен�кие дали в направлении цели. Свет�щий�� голубоватым цветом плазменный шар выгл�дит внушительно, только �прашивает��, долго ли им будет на�лаждать�� команда корабл�-цели, е�ли через не�колько �екунд брон� разорвёт�� на ку�ки, а �лектроника �горит... Плазменное орудие �читает�� вообще �амым �трашным оружием, и у �той техники е�ть �во� цена. Оборонительные �ооружени� деактивируют�� �ами по �ебе, как только они �ильно повреждают��. Возможно�ть во��тановлени� оборонительных �ооружений по�ле бо� �о�тавл�ет до 70%.";
-$lang['info'][407]['name']        = "Малый купол";
-$lang['info'][407]['description'] = "Задолго до того, как щитовые генераторы были до�таточно малы, чтобы найти применение на корабл�х, уже �уще�твовали огромные генераторы на поверхно�ти планет. Они обволакивали целую планету �иловым полем, которое могло поглощать удары атаки. Малые атакующие флоты по�то�нно разбивают�� об �ти купола. Благодар� ра�тущему технологиче�кому развитию �ти щиты можно ещё у�илить. Позже можно �троить более �ильный большой купол. �а каждой планете можно по�троить только один малый купол.";
-$lang['info'][408]['name']        = "Большой купол";
-$lang['info'][408]['description'] = "Дальнейшее развитие малого купола. Он может �держивать ещё более �ильные атаки на планету, поглоща� значительно большее количе�тво �нергии.";
-$lang['info'][409]['name']        = "Планетарный купол";
-$lang['info'][409]['description'] = "Сама� мощна� защита дл� ваших планет от враже�ких кораблей.";
-
-$lang['info'][410]['name']        = "�томное орудие";
-$lang['info'][410]['description'] = "Большое �убатомное орудие. Изобретение �убатомного лучевого оружи� �тал революционным �ред�твом уничтожени�. Дальнобойное и чрезвычайно мощное, но как �уще�твенный недо�таток �ложное в прицеливании. �иодин из �уще�вующих кораблей во в�еленной не �по�обен пережить второго попадени� из �той пушки. Возможно�ть во��тановлени� оборонительных �ооружений по�ле бо� �о�тавл�ет до 70%.<br><br><font color=lime>Вооружение: �томна� технологи�</font>";
-
-
-$lang['info'][502]['name']        = "Ракета-перехватчик";
-$lang['info'][502]['description'] = "Ракеты-перехватчики уничтожают атакующие межпланетные ракеты. Одна ракета-перехватчик уничтожает одну межпланетную ракету.";
-$lang['info'][503]['name']        = "Межпланетна� ракета";
-$lang['info'][503]['description'] = "Межпланетные ракеты уничтожают защиту противника. Уничтоженные межпланетными ракетами оборонительные �ооружени� больше не во��танавливают��.";
-
-// -------------------------- OFFICIERS ----------------------------------------------------------------------------------------------------//
-$lang['info'][601]['name']        = "Геолог";
-$lang['info'][601]['description'] = "Геолог - �к�перт в а�троминералогии и а�трокри�талографии. Он окажет помощь вашей команде в металлургии и химии, а также возьмет�� за межпланетные коммуникации, чтобы оптимизировать и�пользование и утонченно�ть грубой материи на прот�жении в�ей империи.<br><br>+5% производ�тва. Мак�имальный уровень: 20";
-$lang['info'][602]['name']        = "�дмирал";
-$lang['info'][602]['description'] = "�дмирал флота - опытный ветеран войны и умелый �тратег. В �амых же�тких �ражени�х, он �по�обен найти выход из �итуации и контактировать � его подчиненными адмиралами. Мудрый император может пологать�� на его помощь во врем� �ражений.<br><br>+5% к характери�тикам кораблей. Мак�имальный уровень: 20";
-$lang['info'][603]['name']        = "Инженер";
-$lang['info'][603]['description'] = "Инженер - �пециали�т по управлению �нергией. В мирное врем�, инженер увеличивает �нергию на в�ех колони�х империи. В �лучае атаки, он гарантирует подачу �нергии в пушки, предотвраща� возможно�ть дополнительной нагрузки, что приводит к �окращению потер�нных в �ражении единиц орудий защиты.
-<br><br>+5% к �нергии. Мак�имальный уровень: 10";
-$lang['info'][604]['name']        = "Технократ";
-$lang['info'][604]['description'] = "Проф�оюз Технократов �о�тоит из на�то�щих гениев, Вы в�егда найдете их в �том не�табильном мире, где в�е было бы уничтожено на ты��чи о�колков перед тем, как Вы �могли бы найти технологиче�кое и рациональное решение. �икакое нормальное человече�кое �уще�тво не �умеет ра�шифровывать код технократа. С при�ут�твием технократа в Вашей империи Вы можете забыть о медленном �удо�троении.
-<br><br>+5% к �коро�ти �троитель�тва кораблей. Мак�имальный уровень: 10";
-$lang['info'][605]['name']        = "Кон�труктор";
-$lang['info'][605]['description'] = "Кон�труктор один из лучших �троителей. Он �по�обен по�троить целый город в кратчайшие �роки.<br><br>+10% к �коро�ти по�троек. Мак�имальный уровень: 3";
-$lang['info'][606]['name']        = "Ученый";
-$lang['info'][606]['description'] = "Ученый так же входит в проф�оюз технократов. Он �пециализируют�� в �окращении времени и��ледований технологий.<br><br>+10% к �коро�ти и��ледований. Мак�имальный уровень: 3";
-$lang['info'][607]['name']        = "Хранитель";
-$lang['info'][607]['description'] = "Хранитель - из бывшего �ообще�тва планеты Hsac. Его работа заключает�� в том, чтобы доверенные ему ре�ур�ы не пропадали даром. Его разум позволил придумать выход, он �оздал новую технику хранени� ре�ур�ов.
-<br><br>+50% к хранилищам. Мак�имальный уровень: 2";
-$lang['info'][608]['name']        = "Мини�тр обороны";
-$lang['info'][608]['description'] = "Мини�тр обороны - член император�кой армии. Его за�луга в его работе, котора� позвол�ет ему �троить огромную защиту от враже�ких флотов в кратчайшие �роки.<br><br>+50% к �коро�ти �троитель�тва обороны. Мак�имальный уровень: 2";
-$lang['info'][609]['name']        = "Защитник";
-$lang['info'][609]['description'] = "Император впечатлен вашей работой, которую Вы предо�тавл�ете империи. В каче�тве благодарно�ти он позволит вам пользовать�� �амой мощной защитой.<br><br>Возможно�ть �троить Планетарный купол.";
-$lang['info'][610]['name']        = "Разведчик";
-$lang['info'][610]['description'] = "Разведчик - загадочный человек. �икто никогда не видел его и�тинное лицо, е�ли только он не умрет.<br><br>+5 к уровню шпионажа. Мак�имальный уровень: 2";
-$lang['info'][611]['name']        = "Командир";
-$lang['info'][611]['description'] = "Командор император�кой армии вла�твовал над и�ку��твом управлени� флотов. Его мозг может вычи�л�ть траектории многих флотов, гораздо бы�трее, чем мозг обычного человека.<br><br>+3 дополнительных �лота к флотам. Nivel Max. : 3";
-$lang['info'][612]['name']        = "Уничтожитель";
-$lang['info'][612]['description'] = "Уничтожитель - �лужащий без мило�ерди�. Он и�требл�ет в�е на планетах, только из-за того, что ему �то нравит��. В на�то�щее врем� он разрабатывает новый метод производ�тва Звезд Смерти.<br><br>2 Estrellas al hacer 1. Nivel Max. : 1";
-$lang['info'][613]['name']        = "Генерал";
-$lang['info'][613]['description'] = "Генерал - �то почтенное лицо, которое �лужит много лет в армии. Бе�чи�ленными маневрами генерал разработал �тратегии, чтобы оптимизировать �коро�ть любых типов кораблей при �амых неожиданных об�то�тель�твах. <br><br>+5% �коро�ти производ�тва кораблей. Мак�имальный уровень: 3";
-$lang['info'][614]['name']        = "Рейдер";
-$lang['info'][614]['description'] = "Император обнаружил в Ва� бе��порные каче�тва завоевател�. Он предлагает Вам �тать в Рейдером. Рейдер - �амый вы�окий ранг император�кой армии.<br><br>Возможно�ть �троить Сверхновую звезду.";
-$lang['info'][615]['name']        = "Император";
-$lang['info'][615]['description'] = "Как вы��нило�ь, Вы - великий завоеватель в�еленной. �а�тал момент дл� того, чтобы Вы вз�ли ме�то, которое Вы за�луживаете.<br><br>Возможно�ть разрушени� планет.";
-
-//----------------------------------------------------------------------------//
-//MESSAGES
-$lang['mg_type'][0]    						= 'Доклады шпионов и колонизаторов';
-$lang['mg_type'][1]    						= 'Сообщени� от игроков';
-$lang['mg_type'][2]    						= 'Сообщени� от аль�н�а';
-$lang['mg_type'][3]    						= 'Боевые доклады';
-$lang['mg_type'][4]    						= 'Доклады операций';
-$lang['mg_type'][5]    						= 'Доклады тран�портов';
-$lang['mg_type'][15]   						= 'Доклады �к�педиций';
-$lang['mg_type'][99]   						= 'Доклады �троителей';
-$lang['mg_type'][100]  						= 'Про�мотр в�ех �ообщений';
-$lang['mg_no_subject']						= '...';
-$lang['mg_no_text']							= 'Без �ообщени�';
-$lang['mg_msg_sended']						= 'Сообщение отправлено';
-$lang['mg_no_subject']						= '...';
-$lang['mg_delete_marked']					= 'Удалить отмеченные';
-$lang['mg_delete_unmarked']					= 'Удалить неотмеченные';
-$lang['mg_delete_all']						= 'Удалить в�е �ообщени�';
-$lang['mg_show_only_header_spy_reports']	= 'показать только доклады шпионов ';
-$lang['mg_action']							= 'Дей�твие';
-$lang['mg_date']							= 'Дата';
-$lang['mg_from']							= 'От';
-$lang['mg_subject']							= 'Тема';
-$lang['mg_confirm_delete']					= 'Подтвердить';
-$lang['mg_message_title']					= 'Сообщени�';
-$lang['mg_message_type']					= 'Тип �ообщени�';
-$lang['mg_count']						    = '�епрочитанные';
-$lang['mg_total']							= 'В�его';
-$lang['mg_game_operators']					= 'Операторы игры';
-
-//----------------------------------------------------------------------------//
-//ALLIANCE
-$lang['al_description_message']				= 'Опи�ание аль�н�а.';
-$lang['al_web_text']						= 'Веб-�траница аль�н�а';
-$lang['al_request']							= 'За�вка';
-$lang['al_click_to_send_request']			= 'Кликнуть зде�ь что б отправить за�вку в аль�н�';
-$lang['al_tag_required']					= '�ет ТЕГа аль�н�а.';
-$lang['al_name_required']					= '�ет названи� аль�н�а.';
-$lang['al_already_exists']					= '�ль�н� %s уже �уще�твует.';
-$lang['al_created']							= '�ль�н� %s у�пешно �оздан';
-$lang['al_continue']						= 'продолжить';
-$lang['al_alliance_closed']					= 'Этот аль�н� закрытый, он больше не принимает игроков.';
-$lang['al_request_confirmation_message']	= 'За�вка зареги�трирована. Вы получите уведомление о решении главы аль�н�а. <br><a href="game.php?page=alliance">Вернуть��</a>';
-$lang['al_default_request_text']			= '�ль�н� не �оздал пример подачи за�вки, видимо они не нуждают�� в пополнении.';
-$lang['al_write_request']					= 'Отправить за�вку в аль�н� %s';
-$lang['al_request_deleted']					= 'Ваша за�вка в аль�н� %s была отклонена. <br/>Теперь вы можете отправить еще за�вки либо �оздать �вой аль�н�.';
-$lang['al_request_wait_message']			= 'Вы уже отправл�ли за�вку в аль�н� %s. <br/>Пожалуй�та, дождите�ь решени�.';
-$lang['al_delete_request']					= 'Удалить за�вку';
-$lang['al_founder_cant_leave_alliance']		= 'О�нователь не может покинуть аль�н�.';
-$lang['al_leave_sucess']					= 'Вы у�пешно покинули аль�н� %s.';
-$lang['al_do_you_really_want_to_go_out']	= 'Вы уверены что хотите покинуть аль�н� %s?';
-$lang['al_go_out_yes']						= 'Да';
-$lang['al_circular_sended']					= 'В�еобщее �ообщение, �ледущие игроки получили ваше �ообщение:';
-$lang['al_all_players']						= 'В�е игроки';
-$lang['al_no_ranks_defined']				= 'Ранги не определены.';
-$lang['al_request_text']					= 'Прикладной тек�т';
-$lang['al_inside_text']						= 'Внутренний тек�т';
-$lang['al_outside_text']					= 'Внешний тек�т';
-$lang['al_transfer_alliance']				= 'Передача аль�н�а';
-$lang['al_disolve_alliance']				= 'Ра�формировать аль�н�';
-$lang['al_founder_rank_text']				= 'О�нователь';
-$lang['al_new_member_rank_text']			= '�овичек';
-$lang['al_acept_request']					= 'Прин�ть';
-$lang['al_you_was_acceted']					= 'Вы прин�ты';
-$lang['al_hi_the_alliance']					= 'Добро пожаловать!<br>�ль�н� <b>';
-$lang['al_has_accepted']					= '</b> ваша за�вка одобрена.<br>Сообщение о�новател�: <br>';
-$lang['al_decline_request']					= 'Отказать';
-$lang['al_you_was_declined']				= 'Вам отказано';
-$lang['al_has_declined']					= '</b> ваша за�вка отклонена.<br>Сообщение о�новател�: <br>';
-$lang['al_no_requests']						= '�ет за�вок';
-$lang['al_request_from']					= 'За�вка от "%s"';
-$lang['al_no_request_pending']				= 'Еще е�ть %n не ра��мотреных за�вок';
-$lang['al_name']							= 'им�';
-$lang['al_new_name']						= '�овое им�';
-$lang['al_tag']								= 'ТЕГ';
-$lang['al_new_tag']							= '�овый ТЕГ';
-$lang['al_user_list']						= 'Спи�ок �оаловцев';
-$lang['al_manage_alliance']					= 'Управление аль�н�ом';
-$lang['al_send_circular_message']			= 'Отправить �ообщение в�ем';
-$lang['al_new_requests']					= 'новых за�вок';
-$lang['al_save']							= 'Сохранить';
-$lang['al_dlte']							= 'Удалить';
-$lang['al_rank_name']						= '�азвание ранга';
-$lang['al_ok']								= 'OK';
-$lang['al_number_of_records']				= 'В�его';
-$lang['al_num']								= 'ID';
-$lang['al_member']							= 'Им�';
-$lang['al_message']							= 'Сообщение';
-$lang['al_position']						= 'Ранг';
-$lang['al_points']							= 'Очки';
-$lang['al_coords']							= 'Координаты';
-$lang['al_member_since']					= 'В�тупил';
-$lang['al_estate']							= 'В �ети';
-$lang['al_back']							= '�азад';
-$lang['al_actions']							= 'Дей�тви�';
-$lang['al_change_title']					= 'Изменить';
-$lang['al_the_alliance']					= 'аль�н�';
-$lang['al_change_submit']					= 'Изменить';
-$lang['al_reply_to_request']				= 'Ответ на за�вку';
-$lang['al_reason']							= 'Обо�нование';
-$lang['al_characters']						= '�имволов';
-$lang['al_request_list']					= 'Спи�ок за�вок';
-$lang['al_candidate']						= 'Кондидат';
-$lang['al_request_date']					= 'Дата за�вки';
-$lang['al_transfer_alliance']				= 'Передать �тот аль�н�?';
-$lang['al_transfer_to']						= 'Передать';
-$lang['al_transfer_submit']					= 'Передать';
-$lang['al_ally_information']				= 'Информаци� о аль�н�е';
-$lang['al_ally_info_tag']					= 'ТЕГ';
-$lang['al_ally_info_name']					= '�азвание';
-$lang['al_ally_info_members']				= 'Членов';
-$lang['al_your_request_title']				= 'Ваша за�вка';
-$lang['al_applyform_send']					= 'Отправить';
-$lang['al_applyform_reload']				= 'Перегрузить';
-$lang['al_circular_send_ciruclar']			= 'Отправить в�еобщее �ообщение';
-$lang['al_receiver']						= '�дре�ат';
-$lang['al_circular_send_submit']			= 'Отправить';
-$lang['al_circular_reset']					= 'Очи�тить';
-$lang['al_alliance']						= '�ль�н�';
-$lang['al_alliance_make']					= 'Создать �вой аль�н�';
-$lang['al_alliance_search']					= 'Пои�к аль�н�а';
-$lang['al_your_ally']						= 'Ваш аль�н�';
-$lang['al_rank']							= 'Ваш ранг';
-$lang['al_web_site']						= 'Веб-�траница';
-$lang['al_inside_section']					= 'Внутренний тек�т';
-$lang['al_make_alliance']					= 'Создать аль�н�';
-$lang['al_make_ally_tag_required']			= 'Тег (3-8 �имволов)';
-$lang['al_make_ally_name_required']			= '�азвание (3-30 �имволов)';
-$lang['al_make_submit']						= 'Создать';
-$lang['al_find_alliances']					= 'Пои�к аль�н�ов';
-$lang['al_find_text']						= 'Пои�к по';
-$lang['al_find_submit']						= '�айти';
-$lang['al_the_nexts_allys_was_founded']		= 'Следующие аль�н�ы были найдены:';
-$lang['al_manage_ranks']					= '�а�тройка рангов';
-$lang['al_manage_members']					= 'Управление уча�тниками';
-$lang['al_manage_change_tag']				= 'Сменить Тег аль�н�а';
-$lang['al_manage_change_name']				= 'Сменить название аль�н�а';
-$lang['al_texts']							= 'Тек�т';
-$lang['al_manage_options']					= 'Опции';
-$lang['al_manage_image']					= 'Логотип аль�н�а';
-$lang['al_manage_requests']					= 'За�вки';
-$lang['al_requests_not_allowed']			= 'не принимать (закрытый аль�н�)';
-$lang['al_requests_allowed']				= 'принимать (открытый аль�н�)';
-$lang['al_manage_founder_rank']				= 'Ранг о�новател�';
-$lang['al_configura_ranks']					= '�а�тройка рангов';
-$lang['al_create_new_rank']					= 'Создать ранг';
-$lang['al_rank_name']						= '�азвание ранга';
-$lang['al_create']							= 'Создать';
-$lang['al_legend']							= 'Опи�ание ранга';
-$lang['al_legend_disolve_alliance']			= 'Ра�формировать аль�н�';
-$lang['al_legend_kick_users']				= 'Изгнать игрока';
-$lang['al_legend_see_requests']				= 'Показать за�вки';
-$lang['al_legend_see_users_list']			= 'Показать �пи�ок игроков';
-$lang['al_legend_check_requests']			= 'Проце�� за�вок';
-$lang['al_legend_admin_alliance']			= '�дмини�трирование аль�н�а';
-$lang['al_legend_see_connected_users']		= 'Показать игроков в онлайне';
-$lang['al_legend_create_circular']			= '�апи�ать в�еобщее �ообщение';
-$lang['al_legend_right_hand']				= '"Права� рука" (об�зателен дл� передачи аль�н�а)';
-$lang['al_requests']						= 'За�вки';
-$lang['al_circular_message']				= 'Сообщение аль�н�у';
-$lang['al_leave_alliance']					= 'Покинуть �тот аль�н�';
-
-//----------------------------------------------------------------------------//
-//BUDDY
-$lang['bu_request_exists']					= 'Про�ьба у �того игрока уже е�ть!';
-$lang['bu_cannot_request_yourself']			= 'Ты не можешь отправить про�ьбу �амому �ебе!';
-$lang['bu_request_message']					= 'Сообщение про�ьбы';
-$lang['bu_player']							= 'Игрок';
-$lang['bu_request_text']					= 'Тек�т про�ьбы';
-$lang['bu_characters']						= '�имволов';
-$lang['bu_back']							= '�азад';
-$lang['bu_send']							= 'Отправить';
-$lang['bu_cancel_request']					= 'Отменить про�ьбу';
-$lang['bu_accept']							= 'Прин�ть';
-$lang['bu_decline']							= 'Отказать';
-$lang['bu_connected']						= 'В �ети';
-$lang['bu_fifteen_minutes']					= '15 минут';
-$lang['bu_disconnected']					= '�е в �ети';
-$lang['bu_delete']							= 'Удалить';
-$lang['bu_buddy_list']						= 'Спи�ок друзей';
-$lang['bu_requests']						= 'Про�ьбы';
-$lang['bu_alliance']						= '�ль�н�';
-$lang['bu_coords']							= 'Координаты';
-$lang['bu_text']							= 'Тек�т';
-$lang['bu_action']							= 'Дей�твие';
-$lang['bu_my_requests']						= 'Мой про�ьбы';
-$lang['bu_partners']						= 'Друзь�';
-$lang['bu_estate']							= 'Со�то�ние';
-
-//----------------------------------------------------------------------------//
-//NOTES
-$lang['nt_important']						= 'Вы�окий';
-$lang['nt_normal']							= '�ормальный';
-$lang['nt_unimportant']						= '�изкий';
-$lang['nt_create_note']						= 'Создать заметку';
-$lang['nt_edit_note']						= 'Редактировать заметку';
-$lang['nt_you_dont_have_notes']				= 'у Ва� нет заметок';
-$lang['nt_notes']							= 'Заметки';
-$lang['nt_create_new_note']					= 'Создать заметку';
-$lang['nt_date_note']						= 'Дата';
-$lang['nt_subject_note']					= 'Тема';
-$lang['nt_size_note']						= 'Размер';
-$lang['nt_dlte_note']						= 'Удалить';
-$lang['nt_priority']						= 'Приоритет';
-$lang['nt_note']							= 'Заметка';
-$lang['nt_characters']						= '�имволов';
-$lang['nt_back']							= '�азад';
-$lang['nt_reset']							= 'Обновить';
-$lang['nt_save']							= 'Сохранить';
-
-//----------------------------------------------------------------------------//
-//STATISTICS
-$lang['st_player']							= 'Игроков';
-$lang['st_alliance']						= '�ль�н�ы';
-$lang['st_points']							= 'Очкам';
-$lang['st_fleets']							= 'Флоту';
-$lang['st_researh']							= 'И��ледовани�м';
-$lang['st_buildings']						= 'По�тройкам';
-$lang['st_defenses']						= 'Обороне';
-$lang['st_position']						= 'Ранг';
-$lang['st_members']							= 'Игрок(ов)';
-$lang['st_per_member']						= '�а игрока';
-$lang['st_statistics']						= 'Стати�тика ';
-$lang['st_updated']							= 'Обновлено';
-$lang['st_show']							= 'Сортировать';
-$lang['st_per']								= 'по';
-$lang['st_in_the_positions']				= 'в ТОП';
-
-//----------------------------------------------------------------------------//
-//SEARCH
-$lang['sh_tag']								= 'ТЕГ';
-$lang['sh_name']							= 'Им�';
-$lang['sh_members']							= 'Игрок(ов)';
-$lang['sh_points']							= 'Очков';
-$lang['sh_searcg_in_the_universe']			= 'Пои�к во в�еленной';
-$lang['sh_player_name']						= 'Им� игрока';
-$lang['sh_planet_name']						= '�азвание планеты';
-$lang['sh_alliance_tag']					= 'ТЕГ аль�н�а';
-$lang['sh_alliance_name']					= '�азвание аль�н�а';
-$lang['sh_search']							= 'Пои�к';
-$lang['sh_buddy_request']					= 'Предложить дружить';
-$lang['sh_alliance']						= '�ль�н�';
-$lang['sh_planet']							= 'Планета';
-$lang['sh_coords']							= 'Координаты';
-$lang['sh_position']						= 'Ранг';
-
-//----------------------------------------------------------------------------//
-//OPTIONS
-$lang['op_cant_activate_vacation_mode']		= 'Е�ли у ва� идет по�тройка или летит флот - Вы не �можете уйти в РО.';
-$lang['op_password_changed']				= 'Пароль изменен<br /><a href="index.php" target="_top">Вернуть��</a>';
-$lang['op_username_changed']				= 'Им� изменено<br /><a href="index.php" target="_top">Вернуть��</a>';
-$lang['op_options_changed']					= 'Изменени� �охранены.<br /><a href="game.php?page=options">Вернуть��</a>';
-$lang['op_vacation_mode_active_message']	= 'Режим отпу�ка активен. В РО вы будете находит�� как минимум до: ';
-$lang['op_end_vacation_mode']				= 'Режим отпу�ка закончен';
-$lang['op_save_changes']					= 'Сохранить изменени�';
-$lang['op_admin_title_options']				= 'До�тупные опции';
-$lang['op_admin_planets_protection']		= 'Защита планет';
-$lang['op_user_data']						= 'Данные игрока';
-$lang['op_username']						= 'Им�';
-$lang['op_old_pass']						= 'Старый пароль';
-$lang['op_new_pass']						= '�овый пароль (мин. 8 �имволов)';
-$lang['op_repeat_new_pass']					= '�овый пароль (повторить)';
-$lang['op_email_adress']					= 'E-mail';
-$lang['op_permanent_email_adress']			= 'По�то�нный E-mail';
-$lang['op_general_settings']				= 'О�новные опции';
-$lang['op_sort_planets_by']					= 'Сортировать планеты по:';
-$lang['op_sort_kind']						= 'Упор�дочить по:';
-$lang['op_skin_example']					= 'путь к �кину (C:/ogame/skin/)<br> <a href="https://vk.com/war.space" target="_blank">�апример �кин: styles/skins/New-Year!/</a>';
-$lang['op_show_skin']						= 'И�пользовать �кин';
-$lang['op_deactivate_ipcheck']				= 'Проверка IP';
-$lang['op_galaxy_settings']					= 'Опции Галактики';
-$lang['op_spy_probes_number']				= 'Чи�ло отправл�емых зондов';
-$lang['op_toolt_data']						= 'Врем� показа под�казок';
-$lang['op_seconds']							= '�екунд';
-$lang['op_max_fleets_messages']				= 'Мак�имальное количе�тво �ообщений флота';
-$lang['op_show_ally_logo']					= 'Показывать логотип аль�н�а';
-$lang['op_shortcut']						= 'Обозначени�';
-$lang['op_show']							= 'Выбрать';
-$lang['op_spy']								= 'Шпионаж';
-$lang['op_write_message']					= 'Отправить �ообщение';
-$lang['op_add_to_buddy_list']				= 'Добавить в друзь�';
-$lang['op_missile_attack']					= '�така ракетами';
-$lang['op_send_report']						= 'Про�мотреть отчет';
-$lang['op_vacation_delete_mode']			= 'Режим Отпу�ка (РО) / Удаление аккаунта';
-$lang['op_activate_vacation_mode']			= '�ктивировать Режим отпу�ка';
-$lang['op_dlte_account']					= 'Удалить аккаунт';
-$lang['op_email_adress_descrip']			= 'В любое врем� Вы можете изменить �тот адре� �лектронной почты. �дре� будет введен как по�то�нный по�ле 7 дней без изменений.';
-$lang['op_deactivate_ipcheck_descrip']		= 'Отключение проверки IP пред�тавл�ет ри�к безопа�но�ти!';
-$lang['op_spy_probes_number_descrip']		= 'Чи�ло шпион�ких зондов, которое можно по�лать непо�ред�твенно по�ле каждого про�мотра в меню Галактика.';
-$lang['op_activate_vacation_mode_descrip']	= 'Режим РО защитит Ва� на врем� долгих от�ут�твий. РО может быть активирован, е�ли ничто не �троит�� (флот, здание, или защита), ничто не и��ледует��, и ни один из Ваших флотов не в полете. Как только РО активирован, Вы защищены от нападений. Будут выполнены нападени�, которые уже начали�ь. Во врем� РО производ�тво у�танавливает�� на ноль и должно быть вручную возвращено к 100 % по�ле окончани� РО. РО длит�� минимум два дн� и может быть деактивирован только по и�течению двух �уток.';
-$lang['op_dlte_account_descrip']			= 'Е�ли Вы у�тановите галочку, то Ваш аккаунт будет удален автоматиче�ки через 7 дней.';
-
-//----------------------------------------------------------------------------//
-//BANNED
-$lang['bn_no_players_banned']				= '�ет забаненых игроков';
-$lang['bn_exists']							= 'В�его ';
-$lang['bn_players_banned']					= ' забанен(о) игрок(ов)';
-$lang['bn_players_banned_list']				= 'Спи�ок забаненых игроков';
-$lang['bn_player']							= 'Игрок';
-$lang['bn_reason']							= 'Причина';
-$lang['bn_from']							= 'От';
-$lang['bn_until']							= 'До';
-$lang['bn_by']								= 'Кем';
-
-//----------------------------------------------------------------------------//
-//SYSTEM
-$lang['sys_attacker_lostunits'] 			= " �такующий потер�л %s единиц.";
-$lang['sys_defender_lostunits'] 			= " Оборон�ющий�� потер�л %s единиц.";
-$lang['sys_units']							= "единицы";
-$lang['debree_field_1'] 					= "Поле обломков";
-$lang['debree_field_2']						= "на орбите планеты.";
-$lang['sys_moonproba'] 						= "Веро�тно�ть возникновени� луны:";
-$lang['sys_moonbuilt'] 						= "Из-за большого количе�тва обломков образовала�ь луна %s [%d:%d:%d] !";
-$lang['sys_attack_title']    				= "Столкновение флотов ";
-$lang['sys_attack_round']					= "Раунд";
-$lang['sys_attack_attacker_pos'] 			= "�такующий";
-$lang['sys_attack_techologies'] 			= "Вооружение: %d %% Защита: %d %% Брон�: %d %% ";
-$lang['sys_attack_defender_pos'] 			= "Оборон�ющий��";
-$lang['sys_ship_type'] 					      = " Тип";
-$lang['sys_ship_count'] 				      = " Кол-во";
-$lang['sys_ship_weapon'] 				      = " Вооружение";
-$lang['sys_ship_shield'] 				      = " Защита";
-$lang['sys_ship_armour'] 				      = " Брон�";
-$lang['sys_destroyed'] 					      = " Уничтожен!";
-$lang['fleet_attack_1'] 					= "Флот атакующего делает вы�трелы общей мощно�тью";
-$lang['fleet_attack_2']						= "по оборон�ющему��. Щиты оборон�ющего�� поглощают";
-$lang['fleet_defs_1'] 						= "Флот оборон�ющего�� делает вы�трелы общей мощно�тью";
-$lang['fleet_defs_2']						= "по атакующему. Щиты атакующего поглащают";
-$lang['damage']								= "нане�ено урона.";
-$lang['sys_attacker_won'] 					= "�такующий одержал победу";
-$lang['sys_defender_won'] 					= "Оборон�ющий�� одержал победу";
-$lang['sys_both_won'] 						= "Бой закончил�� ничьей";
-$lang['sys_stealed_ressources'] 			= "Он получает";
-$lang['sys_and']							= "и";
-$lang['sys_mess_tower'] 					= "Контрольна� вышка";
-$lang['sys_mess_attack_report'] 			= "Боевой доклад";
-$lang['sys_spy_maretials'] 					= "Шпион�кий доклад от";
-$lang['sys_spy_fleet'] 						= "Флот";
-$lang['sys_spy_defenses'] 					= "Оборона";
-$lang['sys_mess_qg'] 						= "Командование флотом";
-$lang['sys_mess_spy_report'] 				= "Шпион�кий доклад";
-$lang['sys_mess_spy_lostproba'] 			= "Погрешно�ть полученной информации: %d %% ";
-$lang['sys_mess_spy_control'] 				= "Контроль шпион�кой активно�ти";
-$lang['sys_mess_spy_activity'] 				= "Шпион�ка� активно�ть";
-$lang['sys_mess_spy_ennemyfleet'] 			= "Враже�кий шпион�кий зонд � планеты";
-$lang['sys_mess_spy_seen_at'] 				= "был обнаружен возле планеты";
-$lang['sys_mess_spy_destroyed'] 			= "Враже�кий зонд был уничтожен";
-$lang['sys_stay_mess_stay'] 				= "Флот о�тановлен";
-$lang['sys_stay_mess_start'] 				= "Флот, отправленный � планеты";
-$lang['sys_stay_mess_end'] 					= " привез ре�ур�ы, в количе�тве: ";
-$lang['sys_adress_planet'] 					= "[%s:%s:%s]";
-$lang['sys_stay_mess_goods'] 				= "%s : %s, %s : %s, %s : %s";
-$lang['sys_colo_mess_from'] 				= "Колонизаци�";
-$lang['sys_colo_mess_report'] 				= "Отчет о колонизации";
-$lang['sys_colo_defaultname'] 				= "Колони�";
-$lang['sys_colo_arrival'] 					= "Колонизатор до�тиг координат ";
-$lang['sys_colo_maxcolo'] 				    = ", но колонизовать планету невозможно, до�тигнуто мак�имальное чи�ло колоний";
-$lang['sys_colo_allisok']                   = ", команда, обноружив ве�ьма пригодную планету дл� человека, решила о�воить ее про�торы и выгрузила вз�тые � �обой ре�ур�ы: %s %s, %s %s, %s %s.";
-$lang['sys_colo_badpos']  				    = ", 	и прибыв в точку назначени�, колони�ты напроч отказали�ь о�тавать�� на �той планете.";
-$lang['sys_colo_notfree'] 				    = ", 	колони�ты отказали�ь колонизировать планету из-за ее неблагородно�ти.";
-$lang['sys_colo_planet']  				    = " Планета колонизирована! ";
-$lang['sys_expe_report'] 				    = " Отчет о �к�педиции";
-$lang['sys_recy_report'] 				    = " Отчет от переработчиков";
-$lang['sys_expe_blackholl_1'] 				= " Ваш флот ча�тично пропал в черной дыре.";
-$lang['sys_expe_blackholl_2'] 				= " Вы потер�ли �вой флот, он попал в черную дыру!";
-$lang['sys_expe_nothing_1'] 				= " К �ожалению и��ледователи не нашли ничего о�обенного";
-$lang['sys_expe_nothing_2'] 				= " И��ледователи ничего не обнаружили.";
-$lang['sys_expe_found_goods'] 				= " Ваши и��ледователи �лучайным образом обнаружили богатую ре�ур�ами планету! <br> По прибытию вы �танете богаче на %s  %s, %s  %s, %s  %s и %s  %s.";
-$lang['sys_expe_found_ships'] 				= " Ваши и��ледователи нашли брошенный целый флот. <br> Вы �тали обладателем еще:";
-$lang['sys_expe_back_home'] 				= " Эк�педици� возвращает�� назад на планету.";
-$lang['sys_mess_transport'] 				= " Тран�порт";
-$lang['sys_tran_mess_owner'] 				= " Один из ваших флотов до�тиг планеты %s %s и до�тавил %s  %s %s  %s и %s  %s.";
-$lang['sys_tran_mess_user']  				= " Флот, отправленный � планеты s% s% прибыл на s% s% и до�тавил %s %s, %s  %s и %s %s.";
-$lang['sys_mess_fleetback'] 				= " Возвращение";
-$lang['sys_tran_mess_back'] 				= " Один из ваших флотов возвращает�� на планету %s %s.";
-$lang['sys_recy_gotten'] 				    = " Один из Ваших флотов добыл %s %s и %s %s Возвращаеть�� на планету.";
-$lang['sys_notenough_money'] 				= " Вам не хватает ре�ур�ов, чтобы по�троить: %s. У Ва� �ейча�: %s %s , %s %s и %s %s. Дл� �троитель�тва необходимо: %s %s , %s %s и %s %s.";
-$lang['sys_nomore_level'] 				    = " Попытка уничтожени� здани� ( %s ).";
-$lang['sys_buildlist'] 					    = " Спи�ок по�троек";
-$lang['sys_buildlist_fail'] 				= " �ет по�троек";
-$lang['sys_gain'] 					        = " Добыча";
-$lang['sys_perte_attaquant'] 				= " �такующий потер�л";
-$lang['sys_perte_defenseur'] 				= " Оборон�ющий�� потер�л";
-$lang['sys_debris'] 					    = " Обломки";
-$lang['sys_destruc_title']    				= " Веро�тно�ть разрушени� луны %s :";
-$lang['sys_mess_destruc_report'] 			= " Отчет о уничтожении";
-$lang['sys_destruc_lune'] 				    = " Веро�тно�ть разрушени� луны �о�тавл�ет %d %% ";
-$lang['sys_destruc_rip'] 				    = " Веро�тно�ть того, что будут разрушены Звезды Смерти: %d %%";
-$lang['sys_destruc_stop'] 				    = " Защита �могла о�тановить разрушение луны";
-$lang['sys_destruc_mess1'] 				    = " Звезды �мерти �трел�ют гравитонами по орбите луны";
-$lang['sys_destruc_mess'] 				    = " Флот � планеты %s [%d: % d: % d] направл�ет�� к луне  у планеты [%d: % d: % d]";
-$lang['sys_destruc_echec'] 				    = ". Мощнейшие взрывы начинают в�тр�хивать поверхно�ть луны, но что-то пошло не так, и гравитоны  провоцируют дрожание  звезд �мерт, и ЗС разлетают�� в ты��чи ку�ков.";
-$lang['sys_destruc_reussi'] 				= ", Мощнейшие взрывы гравитонов �делали �вое дело, поверхно�ть луны не выдержала и разлетела�ь на ты��чи обломков, неповрежденные ЗС возвращают�� на планету.";
-$lang['sys_destruc_null'] 				    = ", Звезды Смерти не произвели требуюмую мощно�ть дл� уничтожени�, ми��и� не удала�ь, флот возвращает��.";
-
-//----------------------------------------------------------------------------//
-//class.CheckSession.php
-$lang['ccs_multiple_users']					= 'Ошибка Cookie! Е�ть не�колько подключенных пользователей � �тим именем! Вы должны удалить �вои Cookie. В �лучае проблемы �в�жите�ь � админи�тратором.';
-$lang['ccs_other_user']						= 'Ошибка ! Ваши Cookie не �оответ�твует пользователю! Вы должны удалить �вои Cookie. В �лучае проблемы �в�жите�ь � админи�тратором';
-$lang['css_different_password']				= 'Ошибка Cookie! Ошибка �е��ии, попробуйте �оединить�� �нова! Вы должны удалить �вои Cookie. В �лучае проблемы �в�жите�ь � админи�тратором.';
-$lang['css_account_banned_message']			= 'В�Ш �КК�У�Т З�Б��Е�';
-$lang['css_account_banned_expire']			= 'Причина:';
-
-//----------------------------------------------------------------------------//
-//class.debug.php
-$lang['cdg_mysql_not_available']			= 'mySQL не до�тупен в на�то�щее врем�...';
-$lang['cdg_error_message']					= 'Ошибка, пожалуй�та �в�жите�ь � админи�тратором. Error n°:';
-$lang['cdg_fatal_error']					= 'Ф�Т�ЛЬ��Я ОШИБК�';
-
-//----------------------------------------------------------------------------//
-//class.FlyingFleetsTable.php
-$lang['cff_no_fleet_data']					= '�ет данных о флоте';
-$lang['cff_aproaching']						= 'Приближают�� ';
-$lang['cff_ships']							= ' корабли';
-$lang['cff_from_the_planet']				= '� планеты ';
-$lang['cff_from_the_moon']					= '� луны ';
-$lang['cff_the_planet']						= 'планете ';
-$lang['cff_debris_field']					= 'полю обломков ';
-$lang['cff_to_the_moon']					= 'на луну ';
-$lang['cff_the_position']					= 'на позиции ';
-$lang['cff_to_the_planet']					= ' на планету ';
-$lang['cff_the_moon']						= ' луна ';
-$lang['cff_from_planet']					= '� планеты ';
-$lang['cff_from_debris_field']				= '� пол� обломков ';
-$lang['cff_from_the_moon']					= '� луны ';
-$lang['cff_from_position']					= '� позиций ';
-$lang['cff_missile_attack']					= '�така ракетами';
-$lang['cff_from']							= ' � ';
-$lang['cff_to']								= ' на ';
-$lang['cff_one_of_your']					= 'Один из ваших ';
-$lang['cff_a']								= 'Один ';
-$lang['cff_of']								= ' из ';
-$lang['cff_goes']							= ' направл�ет�� ';
-$lang['cff_toward']							= '  ';
-$lang['cff_with_the_mission_of']			= '. С ми��ией: ';
-$lang['cff_to_explore']						= ' �к�педици� ';
-$lang['cff_comming_back']					= ' вернет�� ';
-
-//----------------------------------------------------------------------------//
-// EXTRA LANGUAGE FUNCTIONS
-$lang['fcm_moon']							= 'Луна';
-$lang['fcp_colony']							= 'Колони�';
-$lang['fgp_require']						= 'Требует��: ';
-$lang['fgf_time']							= 'Врем� �троитель�тва: ';
-$lang['Rest_ress']							= 'О�танет��: ';
-
-//----------------------------------------------------------------------------//
-// CombatReport.php
-$lang['cr_lost_contact']					= 'Св�зь � нападающим флотом была потер�на.';
-$lang['cr_first_round']						= '(Предположительно флот был уничтожен при первых же вы�трелах)';
-$lang['cr_type']							= 'Тип';
-$lang['cr_total']							= 'В�его';
-$lang['cr_weapons']							= 'Вооружение';
-$lang['cr_shields']							= 'Щиты';
-$lang['cr_armor']							= 'Брон�';
-$lang['cr_destroyed']						= 'Уничтожен!';
-
-//----------------------------------------------------------------------------//
-// FleetAjax.php
-$lang['fa_not_enough_probes']				= 'Ошибка, не хватает зондов';
-$lang['fa_galaxy_not_exist']				= 'Ошибка, галактики не �уще�твует';
-$lang['fa_system_not_exist']				= 'Ошибка, �и�темы не �уще�твует';
-$lang['fa_planet_not_exist']				= 'Ошибка, планеты не �уще�твует';
-$lang['fa_not_enough_fuel']					= 'Ошибка, недо�таточно топлива';
-$lang['fa_no_more_slots']					= 'Ошибка, нет �вободных �лотов дл� полетов';
-$lang['fa_no_recyclers']					= 'Ошибка, нет переработчиков';
-$lang['fa_mission_not_available']			= 'Ошибка, задание невозможно пока выполнить';
-$lang['fa_no_ships']						= 'Ошибка, нет флота';
-$lang['fa_vacation_mode']					= 'Ошибка, игрок находит�� в Режиме Отпу�ка';
-$lang['fa_week_player']						= 'Ошибка, игрок �лишком �лаб дл� Ва�';
-$lang['fa_strong_player']					= 'Ошибка, игрок �лишком �илен дл� Ва�';
-$lang['fa_not_spy_yourself']				= 'Ошибка, невозможно шпионить �амого �еб�';
-$lang['fa_not_attack_yourself']				= 'Ошибка, невозможно атаковать �амого �еб�';
-$lang['fa_action_not_allowed']				= 'Ошибка, дей�твие невозможно';
-$lang['fa_vacation_mode_current']			= 'Ошибка, игрок в режиме отпу�ка';
-$lang['fa_sending']							= 'Отправить';
-
-//----------------------------------------------------------------------------//
-// MissilesAjax.php
-$lang['ma_silo_level']						= 'Ракетна� шахта должна быть как минимум 4 уровн�';
-$lang['ma_impulse_drive_required']			= 'И��ледуйте Импуль�ный двигатель.';
-$lang['ma_not_send_other_galaxy']			= 'Вы не можете по�ылать ракеты в другую галактику.';
-$lang['ma_planet_doesnt_exists']			= 'Цель не �уще�твует.';
-$lang['ma_cant_send']						= 'Вы не можете по�лать ';
-$lang['ma_missile']							= ' ракеты, у ва� ';
-$lang['ma_wrong_target']					= '�еверна� цель';
-$lang['ma_no_missiles']						= '�ет до�тупных межпланетных ракет';
-$lang['ma_add_missile_number']				= 'Введите кол-фо отправл�емых ракет';
-$lang['ma_misil_launcher']					= 'Ракетна� У�тановка';
-$lang['ma_small_laser']						= 'Легкий лазер';
-$lang['ma_big_laser']						= 'Т�желый лазер';
-$lang['ma_gauss_canyon']					= 'Пушка Гау��а';
-$lang['ma_ionic_canyon']					= 'Ионовое орудие';
-$lang['ma_buster_canyon']					= 'Плазменна� пушка';
-$lang['ma_small_protection_shield']			= 'Малый купол';
-$lang['ma_big_protection_shield']			= 'Большой купол';
-$lang['ma_all']								= 'В�е';
-$lang['ma_missiles_sended']					= ' межпланетные ракеты отправлены. О�новна� цель: ';
-
-// chat.php
-$lang['chat_title']                         = 'Чат';
-$lang['chat_ally_title']                    = 'Чат �ль�н�а';  
-$lang['Chat']                               = "Tchat";
-$lang['chat_loading']                       = "Загрузка...";
-$lang['chat_disc']                          = "Окно чата";
-$lang['chat_message']                       = "Сообщени�";
-$lang['chat_short']                         = "Ра�ширени�";
-$lang['chat_text']                          = "Тек�т";
-$lang['chat_send']                          = "По�лать";
-$lang['chat_history']                       = "И�тори�";
-
-?>
\ No newline at end of file
diff --git a/language/russian/PUBLIC.mo b/language/russian/PUBLIC.mo
deleted file mode 100644
index c1cef47..0000000
--- a/language/russian/PUBLIC.mo
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-//general
-$lang['index']				    = 'Главна�';
-$lang['register']		    	= 'Реги�траци�';
-$lang['forum']			    	= 'Форум';
-
-/* ------------------------------------------------------------------------------------------ */
-
-//index.php
-//case lostpassword
-$lang['mail_not_exist'] 		= '�е�уще�твующий email!';
-$lang['mail_title']		    	= '�овый пароль';
-$lang['mail_text']			    = 'Ваш новый пароль: ';
-$lang['mail_sended']			= '�овый пароль был у�пешно вы�лан!';
-
-//case default
-$lang['login_error']			= 'Введены неверные данные! <br /><a href="index.php" target="_top">Вернуть�� на главную</a>';
-
-$lang['login_online']			= 'Игроков Онлайн';
-$lang['login_lastreg']			= '�овичок';
-$lang['login_numbreg']			= 'В�его аккаунтов';
-
-/* ------------------------------------------------------------------------------------------ */
-
-//lostpassword.tpl
-$lang['lost_pass_title']		= 'Во��тановление парол�';
-$lang['lost_pass_text'] 		= 'Дл� во��тановлени� парол�, введите email и�пользованный при реги�трации. Вы получите новый пароль в ближайшие �роки.';
-$lang['retrieve_pass']			= 'Во��тановить';
-$lang['email']				    = 'Email';
-
-//index_body.tpl
-$lang['user']				    = 'Логин';
-$lang['pass']				    = 'Пароль';
-$lang['remember_pass']			= 'Запомнить мен�';
-$lang['lostpassword']			= 'Забыли пароль?';
-$lang['welcome_to']			    = 'Привет�твуем на';
-$lang['server_description']		= '</strong> �то <strong>�тратегиче�кий ко�миче�кий �имул�тор,</strong> где <strong>ты��чи игроков</strong> �о в�его мира <strong>�ражают��</strong> что б �тать лучшим. В�е что Вам потребует�� дл� игры - �то браузер Mozilla Fire Fox.';
-$lang['server_register']		= 'Реги�траци�';
-$lang['server_message']			= 'И �тань ча�тью нашего мира';
-$lang['login']				    = 'Вход';
-
-/* ------------------------------------------------------------------------------------------ */
-
-//reg.php
-$lang['reg_mail_text_part1']		= 'Благодарим за реги�трацию на нашем �ервере. \n Ваш пароль: ';
-$lang['reg_mail_text_part2']		= ' \n\n Войти в игру! \n ';
-$lang['register_at']			    = 'Реги�траци� на ';
-$lang['reg_mail_message_pass']		= 'Благодарим за реги�трацию!';
-$lang['invalid_mail_adress']		= '�еверный Email!<br />';
-$lang['empty_user_field']		    = 'Строка логина не должна быть пу�той!<br />';
-$lang['password_lenght_error']		= 'Пароль должен �одержать как минимум 4 �имвола!<br />';
-$lang['user_field_no_alphanumeric']	= 'Вы ввели недопу�тимые �имволы!<br />';
-$lang['terms_and_conditions']		= 'Вы должны прин�ть наши у�лови�!<br />';
-$lang['user_already_exists']		= 'Выбранный вами логин уже �уще�твует!<br />';
-$lang['mail_already_exists']		= 'Такой email уже кем-то зан�т!<br />';
-$lang['welcome_message_from']		= '�дмини�траци�';
-$lang['welcome_message_sender']		= '�дмини�траци�';
-$lang['welcome_message_subject']	= 'Привет�твуем Ва� в WarSpace!';
-$lang['welcome_message_content']	= 'Добро пожаловать в WarSpace!<p>Дл� начала игры, по�тройте Рудник по дабыче метала.<br />Дл� �того, перейдите в "По�тройки" в левом меню, и нажмите "По�троить" �права от опи�аний.<br />Сейча� у ва� е�ть немного времени узнать побольше о игре.<p>�айти интере�ующую Ва� информацию можно у на� на:<a href=\"/forum\" target=\"_blank\"> <font color="lime"> ФОРУМЕ</font></a><br /><br />Рудник по добыче металла уже наверн�ка по�троен.<br />Какое может быть производ�тво без �нергии? Что б до�тич мак�имального производ�тва, Вам надо по�троить Солнечную �лектро�танцию по тому же принципу.<p>Чтоб про�мотреть информацию о корабл�х, оборонительных �ооружени�х, по�тройках и и��ледовани�х - про�мотрите технологиче�кое древо, оно находит�� в левом меню под названием "Технологии".<p>Теперь, Вы можете продолжить �вое развитие в нашей в�еленной ... Желаем удачи!';
-$lang['newpass_smtp_email_error']	= '<br><br>Ошибка при отправке e-mail. Ваш пароль: ';
-$lang['reg_completed']			    = 'Реги�траци� закончена!';
-
-//registry_form.tpl
-$lang['server_message_reg']		        = 'Зайди �ейча� и �тань ча�тью неверо�тного мира';
-$lang['register_at_reg']	        	= 'Реги�траци� на';
-$lang['user_reg']			            = 'Логин';
-$lang['pass_reg']			            = 'Пароль';
-$lang['email_reg']			            = 'Email';
-$lang['register_now']		         	= 'Реги�трировать��!';
-$lang['accept_terms_and_conditions']	= 'Принимаю общие положени� и правила';
-
-?>
\ No newline at end of file
diff --git a/language/spanish/ADMIN.mo b/language/spanish/ADMIN.php
similarity index 63%
rename from language/spanish/ADMIN.mo
rename to language/spanish/ADMIN.php
index b8d2c4a..f4c345e 100644
--- a/language/spanish/ADMIN.mo
+++ b/language/spanish/ADMIN.php
@@ -1,14 +1,14 @@
 <?php
 //---------------	GENERAL	------------------------//
-$lang['404_page']			= 'Necesitas permisos especiales para ver ésta página';
-$lang['adm_cp_title']		= 'Panel de control de administración';
+$lang['404_page']			= 'Necesitas permisos especiales para ver &eacute;sta p&aacute;gina';
+$lang['adm_cp_title']		= 'Panel de control de administraci&oacute;n';
 $lang['adm_cp_index']		= 'Inicio';
 $lang['mu_moderation_page']	= 'Permisos';
 $lang['adm_cp_logout']		= 'Salir';
 
-//	MISCELÁNEO - MISCELLANEOUS
-$lang['ad_number']			= 'Nº';
-$lang['only_numbers']		= '¡Solo podes ingresar números!';
+//	MISCELANEO - MISCELLANEOUS
+$lang['ad_number']			= 'N&ordm;';
+$lang['only_numbers']		= '&iexcl;Solo podes ingresar n&uacute;meros!';
 $lang['select_option']		= 'Seleccionar...';
 
 // 	RANGO - RANK
@@ -61,7 +61,7 @@
 $lang['metal']				= 'Metal';
 $lang['crystal']			= 'Cristal';
 $lang['deuterium']			= 'Deuterio';
-$lang['energy']				= 'Energía';
+$lang['energy']				= 'Energ&iacute;a';
 $lang['darkmatter']			= 'Materia oscura';
 //###########################################################//
 
@@ -69,7 +69,7 @@
 //---------------	NAVES - SHIPS	------------------------//
 $lang['ships_title']		= 'Naves';
 $lang['ships_count']		= 'Cantidad de naves';
-$lang['small_ship_cargo']	= 'Nave pequeña de carga';
+$lang['small_ship_cargo']	= 'Nave peque&ntilde;a de carga';
 $lang['big_ship_cargo']		= 'Nave grande de carga';
 $lang['light_hunter']		= 'Cazador ligero';
 $lang['heavy_hunter']		= 'Cazador pesado';
@@ -79,11 +79,10 @@
 $lang['recycler']			= 'Reciclador';
 $lang['spy_sonde']			= 'Sonda de espionaje';
 $lang['bomber_ship']		= 'Bombardero';
-$lang['solar_satelit']		= 'Satélite solar';
+$lang['solar_satelit']		= 'Sat&eacute;lite solar';
 $lang['destructor']			= 'Destructor';
 $lang['dearth_star']		= 'Estrella de la muerte';
 $lang['battleship']			= 'Acorazado';
-$lang['supernova']			= 'Supernova';
 //###########################################################//
 
 
@@ -91,15 +90,14 @@
 $lang['defenses_title']				= 'Defensas';
 $lang['defenses_count']				= 'Cantidad de defensas';
 $lang['misil_launcher']				= 'Lanzamisiles';
-$lang['small_laser']				= 'Láser pequeño';
-$lang['big_laser']					= 'Láser grande';
-$lang['gauss_canyon']				= 'Cañón Gauss';
-$lang['ionic_canyon']				= 'Cañón iónico';
-$lang['buster_canyon']				= 'Cañón de plasma';
-$lang['small_protection_shield']	= 'Cúpula pequeña de protección';
-$lang['big_protection_shield']		= 'Cúpula grande de protección';
-$lang['planet_protector']			= 'Protector planetario';
-$lang['interceptor_misil']			= 'Misil de intercepción';
+$lang['small_laser']				= 'L&aacute;ser peque&ntilde;o';
+$lang['big_laser']					= 'L&aacute;ser grande';
+$lang['gauss_canyon']				= 'Ca&ntilde;&oacute;n Gauss';
+$lang['ionic_canyon']				= 'Ca&ntilde;&oacute;n i&oacute;nico';
+$lang['buster_canyon']				= 'Ca&ntilde;&oacute;n de plasma';
+$lang['small_protection_shield']	= 'C&uacute;pula peque&ntilde;a de protecci&oacute;n';
+$lang['big_protection_shield']		= 'C&uacute;pula grande de protecci&oacute;n';
+$lang['interceptor_misil']			= 'Misil de intercepci&oacute;n';
 $lang['interplanetary_misil']		= 'Misil interplanetario';
 //###########################################################//
 
@@ -111,56 +109,56 @@
 $lang['metal_mine']				= 'Mina de metal';
 $lang['crystal_mine']			= 'Mina de cristal';
 $lang['deuterium_sintetizer']	= 'Sintetizador de deuterio';
-$lang['solar_plant']			= 'Planta de energía solar';
-$lang['fusion_plant']			= 'Planta de fusión';
-$lang['robot_factory']			= 'Fábrica de Robots';
-$lang['nano_factory']			= 'Fábrica de Nanobots';
+$lang['solar_plant']			= 'Planta de energ&iacute;a solar';
+$lang['fusion_plant']			= 'Planta de fusi&oacute;n';
+$lang['robot_factory']			= 'F&aacute;brica de Robots';
+$lang['nano_factory']			= 'F&aacute;brica de Nanobots';
 $lang['shipyard']				= 'Hangar';
-$lang['metal_store']			= 'Almacén de Metal';
-$lang['crystal_store']			= 'Almacén de Cristal';
+$lang['metal_store']			= 'Almac&eacute;n de Metal';
+$lang['crystal_store']			= 'Almac&eacute;n de Cristal';
 $lang['deuterium_store']		= 'Contenedor de deuterio';
-$lang['laboratory']				= 'Laboratorio de investigación';
+$lang['laboratory']				= 'Laboratorio de investigaci&oacute;n';
 $lang['terraformer']			= 'Terraformer';
-$lang['ally_deposit']			= 'Depósito de la Alianza';
+$lang['ally_deposit']			= 'Dep&oacute;sito de la Alianza';
 $lang['silo']					= 'Silo';
 $lang['moonbases']				= 'Base lunar';
 $lang['phalanx']				= 'Phalanx';
-$lang['cuantic']				= 'Salto cuántico';
+$lang['cuantic']				= 'Salto cu&aacute;ntico';
 //###########################################################//
 
 
 //---------------	INVESTIGACIONES - RESEARCHS	------------------------//
 $lang['researchs_title']		= 'Investigaciones';
 $lang['researchs_count']		= 'Cantidad de investigaciones';
-$lang['spy_tech']				= 'Tecnología de espionaje';
-$lang['computer_tech']			= 'Tecnología de computación';
-$lang['military_tech']			= 'Tecnología militar';
-$lang['defence_tech']			= 'Tecnología de defensa';
-$lang['shield_tech']			= 'Tecnología de blindaje';
-$lang['energy_tech']			= 'Tecnología de energía';
-$lang['hyperspace_tech']		= 'Tecnología de hiperespacio';
-$lang['combustion_tech']		= 'Motor de combustión';
+$lang['spy_tech']				= 'Tecnolog&iacute;a de espionaje';
+$lang['computer_tech']			= 'Tecnolog&iacute;a de computaci&oacute;n';
+$lang['military_tech']			= 'Tecnolog&iacute;a militar';
+$lang['defence_tech']			= 'Tecnolog&iacute;a de defensa';
+$lang['shield_tech']			= 'Tecnolog&iacute;a de blindaje';
+$lang['energy_tech']			= 'Tecnolog&iacute;a de energ&iacute;a';
+$lang['hyperspace_tech']		= 'Tecnolog&iacute;a de hiperespacio';
+$lang['combustion_tech']		= 'Motor de combusti&oacute;n';
 $lang['impulse_motor_tech']		= 'Motor de impulso';
 $lang['hyperspace_motor_tech']	= 'Propulsor hiperespacial';
-$lang['laser_tech']				= 'Tecnología láser';
-$lang['ionic_tech']				= 'Tecnología iónica';
-$lang['buster_tech']			= 'Tecnología de plasma';
-$lang['intergalactic_tech']		= 'Red de investigación intergaláctica';
-$lang['expedition_tech']		= 'Tecnología de expedicion';
-$lang['graviton_tech']			= 'Tecnología de gravitón';
+$lang['laser_tech']				= 'Tecnolog&iacute;a l&aacute;ser';
+$lang['ionic_tech']				= 'Tecnolog&iacute;a i&oacute;nica';
+$lang['buster_tech']			= 'Tecnolog&iacute;a de plasma';
+$lang['intergalactic_tech']		= 'Red de investigaci&oacute;n intergal&aacute;ctica';
+$lang['expedition_tech']		= 'Tecnolog&iacute;a de expedicion';
+$lang['graviton_tech']			= 'Tecnolog&iacute;a de gravit&oacute;n';
 //###########################################################//
 
 
 //---------------	OFICIALES - OFFICIERS	------------------------//
 $lang['officiers_title']		= 'Oficiales';
 $lang['officiers_count']		= 'Cantidad de oficiales';
-$lang['geologist']				= 'Geólogo';
+$lang['geologist']				= 'Ge&oacute;logo';
 $lang['admiral']				= 'Almirante';
 $lang['engineer']				= 'Ingeniero';
-$lang['technocrat']				= 'Tecnócrata';
-$lang['spy']					= 'Espía';
+$lang['technocrat']				= 'Tecn&oacute;crata';
+$lang['spy']					= 'Esp&iacute;a';
 $lang['constructor']			= 'Constructor';
-$lang['scientific']				= 'Científico';
+$lang['scientific']				= 'Cient&iacute;fico';
 $lang['commander']				= 'Comandante';
 $lang['storer']					= 'Almacenista';
 $lang['defender']				= 'Defensor';
@@ -175,15 +173,15 @@
 //---------------	CONSULTAS SQL - SQL QUERIES	------------------------//
 $lang['qe_title_menu']	= 'Consultas SQL';
 $lang['qe_execute']		= 'Ejecutar consulta SQL';
-$lang['qe_succes']		= 'Operación realizada con éxito';
-$lang['qe_note']		= 'Nota: Ingresá de a una consulta a la vez';
+$lang['qe_succes']		= 'Operaci&oacute;n realizada con &eacute;xito';
+$lang['qe_note']		= 'Nota: Ingres&aacute; de a una consulta a la vez';
 //###########################################################//
 
 
 //---------------	EDITOR	------------------------//
 // GLOBAL - MENU
-$lang['ad_forgiven_id']			= '¡Debes ingresar una ID!';
-$lang['ad_back_to_menu']		= 'Volver al menú principal';
+$lang['ad_forgiven_id']			= '&iexcl;Debes ingresar una ID!';
+$lang['ad_back_to_menu']		= 'Volver al men&uacute; principal';
 $lang['ad_editor_title']		= 'Editor de cuentas';
 $lang['ad_editor_buildings']	= 'Edificios';
 $lang['ad_editor_ships']		= 'Naves';
@@ -197,46 +195,46 @@
 $lang['ad_editor_authlevels']	= 'Gestionar permisos';
 
 //	INVESTIGACIONES - RESEARCHS
-$lang['ad_add_succes']		= 'Investigaciones agregadas con éxito';
-$lang['ad_delete_succes']	= 'Investigaciones borradas con éxito';
+$lang['ad_add_succes']		= 'Investigaciones agregadas con &eacute;xito';
+$lang['ad_delete_succes']	= 'Investigaciones borradas con &eacute;xito';
 $lang['ad_research_title']	= 'Editar investigaciones';
 
 //	OFICIALES - OFFICIERS
 $lang['ad_offi_title']			= 'Editar oficiales';
-$lang['ad_offi_succes_add']		= 'Oficiales agregados con éxito';
-$lang['ad_offi_succes_delete']	= 'Oficiales borrados con éxito';
+$lang['ad_offi_succes_add']		= 'Oficiales agregados con &eacute;xito';
+$lang['ad_offi_succes_delete']	= 'Oficiales borrados con &eacute;xito';
 
 //	RECURSOS - RESOURCES
-$lang['ad_add_sucess']		= 'Recursos agregados con éxito';
-$lang['ad_delete_sucess']	= 'Recursos borrados con éxito';
-$lang['ad_main_title']		= 'Administración de recursos y tecnologías';
+$lang['ad_add_sucess']		= 'Recursos agregados con &eacute;xito';
+$lang['ad_delete_sucess']	= 'Recursos borrados con &eacute;xito';
+$lang['ad_main_title']		= 'Administraci&oacute;n de recursos y tecnolog&iacute;as';
 
 //	NAVES - SHIPS
 $lang['ad_ships_title']			= 'Editar naves';
-$lang['ad_add_sucess_ships']	= 'Naves agregadas con éxito';
-$lang['ad_delete_sucess_ships']	= 'Naves borradas con éxito';
+$lang['ad_add_sucess_ships']	= 'Naves agregadas con &eacute;xito';
+$lang['ad_delete_sucess_ships']	= 'Naves borradas con &eacute;xito';
 
 //	DEFENSAS - DEFENSES
 $lang['ad_defenses_title']			= 'Editar defensas';
-$lang['ad_add_defenses_succes']		= 'Defensas agregadas con éxito';
-$lang['ad_delete_defenses_succes']	= 'Defensas borradas con éxito';
+$lang['ad_add_defenses_succes']		= 'Defensas agregadas con &eacute;xito';
+$lang['ad_delete_defenses_succes']	= 'Defensas borradas con &eacute;xito';
 
 //	EDIFICIOS - BUILDINGS
 $lang['ad_buildings_title']	= 'Editar edificios';
 $lang['ad_planet_id']		= 'ID del planeta o luna';
 $lang['ad_levels']			= 'Cantidad de niveles';
-$lang['ad_add_succes']		= 'Edificios agregados con éxito';
-$lang['ad_delete_succes']	= 'Edificios borrados con éxito';
-$lang['ad_error_moon_only']	= '¡Los edificios lunares solo pueden ser agregados en lunas!';
+$lang['ad_add_succes']		= 'Edificios agregados con &eacute;xito';
+$lang['ad_delete_succes']	= 'Edificios borrados con &eacute;xito';
+$lang['ad_error_moon_only']	= '&iexcl;Los edificios lunares solo pueden ser agregados en lunas!';
 
 // DATOS PERSONALES - PERSONAL DATA
 $lang['ad_personal_title']		= 'Editar datos personales';
 $lang['ad_personal_name']		= 'Nombre';
-$lang['ad_personal_email']		= 'Correo electrónico';
-$lang['ad_personal_email2']		= 'Correo electrónico permanente';
-$lang['ad_personal_pass']		= 'Contraseña';
-$lang['ad_personal_succes']		= 'Opciones cambiadas con éxito';
-$lang['ad_personal_vacat']		= '¿Vacaciones?';
+$lang['ad_personal_email']		= 'Correo electr&oacute;nico';
+$lang['ad_personal_email2']		= 'Correo electr&oacute;nico permanente';
+$lang['ad_personal_pass']		= 'Contrase&ntilde;a';
+$lang['ad_personal_succes']		= 'Opciones cambiadas con &eacute;xito';
+$lang['ad_personal_vacat']		= '&iquest;Vacaciones?';
 
 //	ALIANZA - ALLIANCES
 $lang['ad_ally_title']		= 'Editar alianzas';
@@ -249,16 +247,16 @@
 $lang['ad_ally_delete']		= 'Borrar alianza';
 $lang['ad_ally_delete_u']	= 'Borrar usuario';
 $lang['ad_ally_user_id']	= '(Ingresar ID del Usuario)';
-$lang['ad_ally_succes']		= 'Operación realizada con éxito';
-$lang['ad_ally_not_exist3']	= '¡El usuario no existe o no es miembro de esa alianza!';
-$lang['ad_ally_not_exist']	= '¡La alianza no existe!';
-$lang['ad_ally_not_exist2']	= '¡El usuario no existe!';
+$lang['ad_ally_succes']		= 'Operaci&oacute;n realizada con &eacute;xito';
+$lang['ad_ally_not_exist3']	= '&iexcl;El usuario no existe o no es miembro de esa alianza!';
+$lang['ad_ally_not_exist']	= '&iexcl;La alianza no existe!';
+$lang['ad_ally_not_exist2']	= '&iexcl;El usuario no existe!';
 
 //	PLANETAS Y LUNAS - PLANETS AND MOONS
 $lang['ad_pla_title']			= 'Editar planetas y/o lunas';
 $lang['ad_pla_edit_name']		= 'Editar nombre';
-$lang['ad_pla_change_id']		= 'Cambiarle el dueño (Ingresar ID del usuario)';
-$lang['ad_pla_edit_diameter']	= 'Editar tamaño';
+$lang['ad_pla_change_id']		= 'Cambiarle el due&ntilde;o (Ingresar ID del usuario)';
+$lang['ad_pla_edit_diameter']	= 'Editar tama&ntilde;o';
 $lang['ad_pla_edit_fields']		= 'Editar campos';
 $lang['ad_pla_delete_b']		= 'Borrarle todos los edificios';
 $lang['ad_pla_delete_s']		= 'Borrarle todas las naves';
@@ -266,43 +264,43 @@
 $lang['ad_pla_delete_hd']		= 'Borrar la cola de hangar y defensa';
 $lang['ad_pla_delete_cb']		= 'Borrar la cola de edificios';
 $lang['ad_pla_delete_planet']	= 'Borrar planeta';
-$lang['ad_pla_title_a']			= 'En caso de tener una luna también ésta sera cambiada de dueño';
-$lang['ad_pla_title_l']			= 'En caso de tener una luna también ésta sera cambiada de posición';
-$lang['ad_pla_change_p']		= 'Cambiar posición del planeta';
-$lang['ad_pla_change_pp']		= 'Tildar para efectuar el cambio de posición';
-$lang['ad_pla_succes']			= 'Cambios efectuados con éxito';
-$lang['ad_pla_error_planets']	= '¡Las lunas no pueden cambiarse de dueño!';
-$lang['ad_pla_error_user']		= '¡El usuario no existe!';
-$lang['ad_pla_error_planets2']	= '¡El planeta no existe!';
-$lang['ad_pla_error_planets3']	= '¡Las coordenadas solicitadas ya estan en uso!';
-$lang['ad_pla_error_planets4']	= '¡No podes mover la luna a un planeta que ya tiene una!';
-$lang['ad_pla_error_planets5']	= '¡Las coordenadas seleccionadas deben tener un planeta!';
-$lang['ad_pla_delete_planet_s']	= 'Planeta borrado con éxito';
+$lang['ad_pla_title_a']			= 'En caso de tener una luna tambi&eacute;n &eacute;sta sera cambiada de due&ntilde;o';
+$lang['ad_pla_title_l']			= 'En caso de tener una luna tambi&eacute;n &eacute;sta sera cambiada de posici&oacute;n';
+$lang['ad_pla_change_p']		= 'Cambiar posici&oacute;n del planeta';
+$lang['ad_pla_change_pp']		= 'Tildar para efectuar el cambio de posici&oacute;n';
+$lang['ad_pla_succes']			= 'Cambios efectuados con &eacute;xito';
+$lang['ad_pla_error_planets']	= '&iexcl;Las lunas no pueden cambiarse de due&ntilde;o!';
+$lang['ad_pla_error_user']		= '&iexcl;El usuario no existe!';
+$lang['ad_pla_error_planets2']	= '&iexcl;El planeta no existe!';
+$lang['ad_pla_error_planets3']	= '&iexcl;Las coordenadas solicitadas ya estan en uso!';
+$lang['ad_pla_error_planets4']	= '&iexcl;No podes mover la luna a un planeta que ya tiene una!';
+$lang['ad_pla_error_planets5']	= '&iexcl;Las coordenadas seleccionadas deben tener un planeta!';
+$lang['ad_pla_delete_planet_s']	= 'Planeta borrado con &eacute;xito';
 //###########################################################//
 
 
-//---------------	PANEL DE SUSPENSIÓN - BAN PANEL	------------------------//
+//---------------	PANEL DE SUSPENSI&oacute;N - BAN PANEL	------------------------//
 $lang['bo_the_player']			= 'El jugador ';
 $lang['bo_the_player2']			= 'Al jugador ';
 $lang['bo_banned']				= ' fue suspendido correctamente.';
-$lang['bo_unbanned']			= ' se le ha levantado la suspensión correctamente.';
+$lang['bo_unbanned']			= ' se le ha levantado la suspensi&oacute;n correctamente.';
 $lang['bo_username']			= 'Nombre de jugador';
-$lang['bo_vacaations']			= '¿Vacaciones?';
-$lang['bo_reason']				= 'Razón de la suspensión';
-$lang['bo_time']				= 'Tiempo de suspensión';
+$lang['bo_vacaations']			= '&iquest;Vacaciones?';
+$lang['bo_reason']				= 'Raz&oacute;n de la suspensi&oacute;n';
+$lang['bo_time']				= 'Tiempo de suspensi&oacute;n';
 $lang['bo_vacation_mode']		= 'Modo vacaciones';
-$lang['bo_ban_player']			= 'Suspender/Editar suspensión';
-$lang['bo_unban_player']		= 'Levantar suspensión';
-$lang['bo_user_doesnt_exist']	= '¡El jugador no existe!';
+$lang['bo_ban_player']			= 'Suspender/Editar suspensi&oacute;n';
+$lang['bo_unban_player']		= 'Levantar suspensi&oacute;n';
+$lang['bo_user_doesnt_exist']	= '&iexcl;El jugador no existe!';
 $lang['bo_user_select']			= 'Seleccionar...';
 $lang['bo_select_title']		= 'Mostrar nombres que empiezen con';
-$lang['bo_suspended_panel']		= 'Panel de suspensión';
+$lang['bo_suspended_panel']		= 'Panel de suspensi&oacute;n';
 $lang['bo_bbb_go_back']			= '[ Volver ]';
 $lang['bo_bbb_go_act']			= '[ Recargar ]';
-$lang['bo_bbb_title_1']			= 'Sistema de suspensión';
-$lang['bo_bbb_title_2']			= 'Establecer fecha en la que perdera la suspensión';
-$lang['bo_bbb_title_3']			= 'Sistema de suspensión<br><font color=red>Atención, este usuario ya esta suspendido';
-$lang['bo_bbb_title_4']			= 'Para restar dias, horas, etc agrega un signo menos ( - ) delante del número, Ejemplo: -5';
+$lang['bo_bbb_title_1']			= 'Sistema de suspensi&oacute;n';
+$lang['bo_bbb_title_2']			= 'Establecer fecha en la que perdera la suspensi&oacute;n';
+$lang['bo_bbb_title_3']			= 'Sistema de suspensi&oacute;n<br><font color=red>Atenci&oacute;n, este usuario ya esta suspendido';
+$lang['bo_bbb_title_4']			= 'Para restar dias, horas, etc agrega un signo menos ( - ) delante del n&uacute;mero, Ejemplo: -5';
 $lang['bo_bbb_title_5']			= 'Suspendido hasta el';
 $lang['bo_bbb_title_6']			= 'Cambiar fecha';
 $lang['bo_characters_1']		= 'Caracteres disponibles: ';
@@ -317,24 +315,24 @@
 
 //---------------	ENCRIPTADOR MD5 - ENCRIPTER MD5	------------------------//
 $lang['et_md5_encripter']	= 'Encriptador de claves (MD5)';
-$lang['et_pass']			= 'Contraseña';
+$lang['et_pass']			= 'Contrase&ntilde;a';
 $lang['et_result']			= 'Resultado';
 $lang['et_encript']			= 'Encriptar';
 //###########################################################//
 
 
-//---------------	CONFIGURACIÓN DE ESTADÍSTICAS - STATS CONFIG	------------------------//
-$lang['cs_title']						= 'Parámetros de las estadísticas';
-$lang['cs_point_per_resources_used']	= 'Valor de 1 punto de estadística';
+//---------------	CONFIGURACION DE ESTADISTICAS - STATS CONFIG	------------------------//
+$lang['cs_title']						= 'Par&aacute;metros de las estad&iacute;sticas';
+$lang['cs_point_per_resources_used']	= 'Valor de 1 punto de estad&iacute;stica';
 $lang['cs_resources']					= 'recursos';
 $lang['cs_users_per_block']				= 'Usuarios por bloque (min. 10)';
-$lang['cs_fleets_on_block']				= '¿Actualizar flotas en bloque?';
-$lang['cs_time_between_updates']		= 'Tiempo entre actualización de estadísticas';
+$lang['cs_fleets_on_block']				= '&iquest;Actualizar flotas en bloque?';
+$lang['cs_time_between_updates']		= 'Tiempo entre actualizaci&oacute;n de estad&iacute;sticas';
 $lang['cs_minutes']						= 'minutos';
-$lang['cs_points_to_zero']				= '¿La administración puede figurar en el ranking?';
-$lang['cs_access_lvl']					= '¿Hasta que rango pueden figurar en el ranking?';
+$lang['cs_points_to_zero']				= '&iquest;La administraci&oacute;n puede figurar en el ranking?';
+$lang['cs_access_lvl']					= '&iquest;Hasta que rango pueden figurar en el ranking?';
 $lang['cs_save_changes']				= 'Guardar cambios';
-$lang['cs_timeact_1']					= 'La última actualización se efectuó el: ';
+$lang['cs_timeact_1']					= 'La &uacute;ltima actualizaci&oacute;n se efectu&oacute; el: ';
 //###########################################################//
 
 
@@ -349,9 +347,9 @@
 
 //---------------	LISTA DE MENSAJES - MESSAGES LIST	------------------------//
 $lang['ml_message_list']		= 'Lista de mensajes';
-$lang['ml_page']				= 'Página';
+$lang['ml_page']				= 'P&aacute;gina';
 $lang['ml_type']				= 'Tipo';
-$lang['ml_dlte_selection']		= 'Borrar selección';
+$lang['ml_dlte_selection']		= 'Borrar selecci&oacute;n';
 $lang['ml_dlte_since']			= 'Borrar desde';
 $lang['ml_dlte_since_button']	= 'Borrar desde';
 $lang['ml_date']				= 'Fecha';
@@ -365,8 +363,8 @@
 
 
 //---------------	MENSAJE GLOBAL - GLOBAL MESSAGE	------------------------//
-$lang['ma_message_sended']		= '¡Su mensaje ha sido enviado!';
-$lang['ma_subject_needed']		= '¡Debes escribir un asunto!';
+$lang['ma_message_sended']		= '&iexcl;Su mensaje ha sido enviado!';
+$lang['ma_subject_needed']		= '&iexcl;Debes escribir un asunto!';
 $lang['ma_send_global_message']	= 'Mensaje global';
 $lang['ma_subject']				= 'Asunto';
 $lang['ma_characters']			= 'Caracteres disponibles';
@@ -375,85 +373,85 @@
 
 
 //---------------	BASE DE DATOS - DATA BASES	------------------------//
-$lang['od_not_opt']			= '¡Error!';
-$lang['od_not_check']		= '¡Hay errores!';
-$lang['od_opt']				= '¡Optimizado!';
-$lang['od_rep']				= '¡Reparado!';
-$lang['od_check_ok']		= '¡Todo en orden!';
+$lang['od_not_opt']			= '&iexcl;Error!';
+$lang['od_not_check']		= '&iexcl;Hay errores!';
+$lang['od_opt']				= '&iexcl;Optimizado!';
+$lang['od_rep']				= '&iexcl;Reparado!';
+$lang['od_check_ok']		= '&iexcl;Todo en orden!';
 $lang['od_opt_db']			= 'Base de datos';
 $lang['od_optimize']		= 'Optimizar';
 $lang['od_repair']			= 'Reparar';
 $lang['od_check']			= 'Revisar';
-$lang['od_select_action']	= 'Seleccionar acción';
+$lang['od_select_action']	= 'Seleccionar acci&oacute;n';
 //###########################################################//
 
 
-//---------------	PÁGINA DE INICIO - OVERVIEW	------------------------//
+//---------------	PAGINA DE INICIO - OVERVIEW	------------------------//
 $lang['ow_title']				= 'Bienvenido a XG Proyect';
-$lang['ow_welcome_text']		= 'Gracias por elegir XG Proyect. Día a día trabajamos por ser el OGame OpenSource Nº1 de la red. A continuación tienes un "vistazo" general del juego. Podrás realizar todos los cambios que desees navegando por el menú de la izquierda.';
+$lang['ow_welcome_text']		= 'Gracias por elegir XG Proyect. D&iacute;a a d&iacute;a trabajamos por ser el OGame OpenSource N&ordm;1 de la red. A continuaci&oacute;n tienes un "vistazo" general del juego. Podr&aacute;s realizar todos los cambios que desees navegando por el men&uacute; de la izquierda.';
 $lang['ow_overview']			= 'Panel de control';
 $lang['ow_support']				= 'Soporte';
-$lang['ow_credits']				= 'Créditos';
+$lang['ow_credits']				= 'Cr&eacute;ditos';
 $lang['ow_forum']				= 'Forum';
 $lang['ow_proyect_leader']		= 'Proyect Leader';
 $lang['ow_principal_contributors']	= 'Principal contributors';
 $lang['ow_special_thanks']			= 'Special Thanks';
 $lang['ow_install_file_detected']	= 'Se detecto el directorio install/. Por razones se seguridad recomendamos eliminarlo.';
-$lang['ow_config_file_writable']	= 'El archivo config.php puede ser escrito, es recomendable que sea colocado en chmod 440 (sólo lectura).';
-$lang['ow_database_errors']			= 'Hay errores en tu base de datos. Puedes verlos haciendo <a href="ErrorPage.php">click aquí</a>';
-$lang['ow_old_version']				= 'Hay una nueva versión disponible. Haz click <a href="http://www.xgproyect.net/downloads.php" target="_blank">aquí</a> para descargarla';
+$lang['ow_config_file_writable']	= 'El archivo config.php puede ser escrito, es recomendable que sea colocado en chmod 440 (s&oacute;lo lectura).';
+$lang['ow_database_errors']			= 'Hay errores en tu base de datos. Puedes verlos haciendo <a href="ErrorPage.php">click aqu&iacute;</a>';
+$lang['ow_old_version']				= 'Hay una nueva versi&oacute;n disponible. Haz click <a href="http://www.xgproyect.net/downloads.php" target="_blank">aqu&iacute;</a> para descargarla';
 $lang['ow_none']					= 'No hay actualizaciones ni advertencias';
 //###########################################################//
 
 
-//---------------	CONFIGURACIÓN DEL JUEGO - GAME CONFIG	------------------------//
-$lang['se_server_parameters']				= 'Parámetros del servidor';
+//---------------	CONFIGURACION DEL JUEGO - GAME CONFIG	------------------------//
+$lang['se_server_parameters']				= 'Par&aacute;metros del servidor';
 $lang['se_name']							= 'Nombre';
 $lang['se_lang']							= 'Idioma';
 $lang['se_general_speed']					= 'Velocidad general';
-$lang['se_normal_speed']					= 'Velocidad normal del juego: 1<br>Velocidad máxima recomendada: 5';
-$lang['se_normal_speed_resoruces']			= 'Velocidad normal de producción: 1<br>Velocidad máxima recomendada: 5';
-$lang['se_normal_speed_fleett']				= 'Velocidad normal de las flotas: 1<br>Velocidad máxima recomendada: 5';
+$lang['se_normal_speed']					= 'Velocidad normal del juego: 1<br>Velocidad m&aacute;xima recomendada: 5';
+$lang['se_normal_speed_resoruces']			= 'Velocidad normal de producci&oacute;n: 1<br>Velocidad m&aacute;xima recomendada: 5';
+$lang['se_normal_speed_fleett']				= 'Velocidad normal de las flotas: 1<br>Velocidad m&aacute;xima recomendada: 5';
 $lang['se_fleet_speed']						= 'Velocidad de las flotas';
-$lang['se_resources_producion_speed']		= 'Velocidad de producción';
+$lang['se_resources_producion_speed']		= 'Velocidad de producci&oacute;n';
 $lang['se_forum_link']						= 'Enlace del foro';
-$lang['se_server_op_close']					= '¿Servidor online?';
+$lang['se_server_op_close']					= '&iquest;Servidor online?';
 $lang['se_server_status_message']			= 'Mensaje del estado off-line';
-$lang['se_server_planet_parameters']		= 'Parámetros de los planetas nuevos';
+$lang['se_server_planet_parameters']		= 'Par&aacute;metros de los planetas nuevos';
 $lang['se_initial_fields']					= 'Campos iniciales';
 $lang['se_fields']							= 'campos';
 $lang['se_per_hour']						= 'por hora';
-$lang['se_metal_production']				= 'Producción de metal';
-$lang['se_crystal_production']				= 'Producción de cristal';
-$lang['se_deuterium_production']			= 'Producción de deuterio';
-$lang['se_energy_production']				= 'Producción de energía';
-$lang['se_several_parameters']				= 'Parámetros varios';
-$lang['se_title_admins_protection']			= 'Marcá la casilla para activar la protección y evitar que los administradores y moderadores reciban ataques o cualquier otro tipo de acción de las flotas.';
-$lang['se_admin_protection']				= 'Protección';
+$lang['se_metal_production']				= 'Producci&oacute;n de metal';
+$lang['se_crystal_production']				= 'Producci&oacute;n de cristal';
+$lang['se_deuterium_production']			= 'Producci&oacute;n de deuterio';
+$lang['se_energy_production']				= 'Producci&oacute;n de energ&iacute;a';
+$lang['se_several_parameters']				= 'Par&aacute;metros varios';
+$lang['se_title_admins_protection']			= 'Marc&aacute; la casilla para activar la protecci&oacute;n y evitar que los administradores y moderadores reciban ataques o cualquier otro tipo de acci&oacute;n de las flotas.';
+$lang['se_admin_protection']				= 'Protecci&oacute;n';
 $lang['se_debug_mode']						= 'Modo debug';
-$lang['se_save_parameters']					= 'Guardar parámetros';
-$lang['se_configuration_title']				= 'Configuración';
+$lang['se_save_parameters']					= 'Guardar par&aacute;metros';
+$lang['se_configuration_title']				= 'Configuraci&oacute;n';
 $lang['se_server_naame']					= 'Nombre de tu juego';
 $lang['se_cookie_name']						= 'Nombre de la cookie';
 $lang['se_cookie_advert']					= 'Al cambiar el nombre a la cookie usted y sus usuarios deberan loguearse de vuelta.<br>Recomendado cambiar el nombre solamente si tenes varios universos.';
 $lang['se_debug_message']					= 'El modo debug muestra un log de las queries realizadas en el momento';
 $lang['se_def_cdr']							= 'Defensas a escombros';
 $lang['se_ships_cdr']						= 'Naves a escombros';
-$lang['se_def_cdr_message']					= 'Establece el porcentaje de escombros que generarian las defensas después de un ataque';
-$lang['se_ships_cdr_message']				= 'Establece el porcentaje de escombros que generarian las naves después de un ataque';
-$lang['se_noob_protect']					= 'Protección novatos';
-$lang['se_noob_protect2']					= 'Protección N. puntos';
-$lang['se_noob_protect3']					= 'Protección N. puntos limite';
-$lang['se_noob_protect_e2']					= 'Límite de puntos en el que dejas de ser novato';
-$lang['se_noob_protect_e3']					= 'Click para más información';
+$lang['se_def_cdr_message']					= 'Establece el porcentaje de escombros que generarian las defensas despu&eacute;s de un ataque';
+$lang['se_ships_cdr_message']				= 'Establece el porcentaje de escombros que generarian las naves despu&eacute;s de un ataque';
+$lang['se_noob_protect']					= 'Protecci&oacute;n novatos';
+$lang['se_noob_protect2']					= 'Protecci&oacute;n N. puntos';
+$lang['se_noob_protect3']					= 'Protecci&oacute;n N. puntos limite';
+$lang['se_noob_protect_e2']					= 'L&iacute;mite de puntos en el que dejas de ser novato';
+$lang['se_noob_protect_e3']					= 'Click para m&aacute;s informaci&oacute;n';
 //###########################################################//
 
 
-//---------------	MODERACIÓN - MODERATION	------------------------//
+//---------------	MODERACION - MODERATION	------------------------//
 //	PERMISOS - PERMISSIONS
 $lang['mod_title']				= 'Administrar poderes';
 $lang['mod_range']				= 'Rango';
-$lang['mod_power_view']			= 'Poder de observación';
+$lang['mod_power_view']			= 'Poder de observaci&oacute;n';
 $lang['mod_power_edit']			= 'Poder de editaje';
 $lang['mod_power_config']		= 'Poder de configurar el juego';
 $lang['mod_power_tools']		= 'Poder de manipular herramientas';
@@ -463,10 +461,10 @@
 $lang['ad_authlevel_title']		= 'Rangos';
 $lang['ad_authlevel_name']		= 'Nombre';
 $lang['ad_authlevel_auth']		= 'Rango';
-$lang['ad_authlevel_succes']	= 'Rango modificado con éxito';
-$lang['ad_authlevel_error']		= '¡El usuario ya tiene ese rango!';
-$lang['ad_authlevel_error_2']	= '¡Ingresa solo un usuario!';
-$lang['ad_authlevel_error_3']	= '¡No se le puede cambiar el rango al creador del juego!';
+$lang['ad_authlevel_succes']	= 'Rango modificado con &eacute;xito';
+$lang['ad_authlevel_error']		= '&iexcl;El usuario ya tiene ese rango!';
+$lang['ad_authlevel_error_2']	= '&iexcl;Ingresa solo un usuario!';
+$lang['ad_authlevel_error_3']	= '&iexcl;No se le puede cambiar el rango al creador del juego!';
 $lang['ad_authlevel_insert_id']	= 'Ingresar ID manualmente (Opcional)';
 $lang['ad_authlevel_aa']		= '[Ver Administradores]';
 $lang['ad_authlevel_oo']		= '[Ver Operadores]';
@@ -479,51 +477,51 @@
 //---------------	FLOTAS EN VUELO - FLYING FLEETS	------------------------//
 $lang['ff_flying_fleets']		= 'Flotas en vuelo';
 $lang['ff_ammount']				= 'Cantidad';
-$lang['ff_mission']				= 'Misión';
+$lang['ff_mission']				= 'Misi&oacute;n';
 $lang['ff_beginning']			= 'Comienzo';
 $lang['ff_departure']			= 'Salida';
 $lang['ff_departure_hour']		= 'H. de salida';
 $lang['ff_objective']			= 'Destino';
 $lang['ff_arrival']				= 'Objetivo';
-$lang['ff_hold_position']		= 'Mantener posición';
+$lang['ff_hold_position']		= 'Mantener posici&oacute;n';
 $lang['ff_arrival_hour']		= 'H. de llegada';
 $lang['ff_go_back_now']			= 'Regresar';
-$lang['ff_delete_succes']		= 'Vuelo borrado con éxito';
-$lang['ff_goback_succes']		= 'El vuelo ahora está regresando a su planeta de origen';
-$lang['ff_confirm_dele_fleet']	= '¿Estás seguro que querés borrar el vuelo seleccionado?';
-$lang['ff_confirm_back_fleet']	= '¿Estás seguro que querés enviar de regreso al vuelo seleccionado?';
+$lang['ff_delete_succes']		= 'Vuelo borrado con &eacute;xito';
+$lang['ff_goback_succes']		= 'El vuelo ahora est&aacute; regresando a su planeta de origen';
+$lang['ff_confirm_dele_fleet']	= '&iquest;Est&aacute;s seguro que quer&eacute;s borrar el vuelo seleccionado?';
+$lang['ff_confirm_back_fleet']	= '&iquest;Est&aacute;s seguro que quer&eacute;s enviar de regreso al vuelo seleccionado?';
 //###########################################################//
 
 
-//---------------	ACTUALIZACIÓN DE ESTADISTICAS - UPDATE STATS	------------------------//
-$lang['sb_top_memory']			= 'Pico de memoria consumida: %p KB / máx. %m KB <br>';
-$lang['sb_final_memory']		= 'Memoria consumida al final: %e KB / máx. %m KB<br>';
-$lang['sb_start_memory']		= 'Memoria consumida al inicio: %i KB / máx. %m KB<br>';
-$lang['sb_stats_update']		= 'Estadísticas actualizadas en: %t segundos<br>';
-$lang['sb_users_per_block']		= 'Número de usuarios por bloque: %n<br>';
+//---------------	ACTUALIZACION DE ESTADISTICAS - UPDATE STATS	------------------------//
+$lang['sb_top_memory']			= 'Pico de memoria consumida: %p KB / m&aacute;x. %m KB <br>';
+$lang['sb_final_memory']		= 'Memoria consumida al final: %e KB / m&aacute;x. %m KB<br>';
+$lang['sb_start_memory']		= 'Memoria consumida al inicio: %i KB / m&aacute;x. %m KB<br>';
+$lang['sb_stats_update']		= 'Estad&iacute;sticas actualizadas en: %t segundos<br>';
+$lang['sb_users_per_block']		= 'N&uacute;mero de usuarios por bloque: %n<br>';
 $lang['sb_using_fleet_array']	= 'Utilizando array de flotas en vuelo<br>';
 $lang['sb_using_fleet_query']	= 'Utilizando una consulta a la base de<br> datos para obtener las flotas por usuario<br>';
-$lang['sb_stats_updated']		= 'Estadísticas actualizadas. <br>Resumen:<br>';
+$lang['sb_stats_updated']		= 'Estad&iacute;sticas actualizadas. <br>Resumen:<br>';
 //###########################################################//
 
 
 //---------------	LISTA DE USUARIOS - USERS LIST	------------------------//
-$lang['ul_sure_you_want_dlte']	= '¿Estás seguro de que deseas eliminar a';
+$lang['ul_sure_you_want_dlte']	= '&iquest;Est&aacute;s seguro de que deseas eliminar a';
 //###########################################################//
 
 
 //---------------	MENU	------------------------//
 $lang['mu_general']					= 'Generales';
 $lang['mu_connected']				= 'Conectados';
-$lang['mu_settings']				= 'Configuración';
+$lang['mu_settings']				= 'Configuraci&oacute;n';
 $lang['mu_global_message']			= 'Mensaje Global';
-$lang['mu_users_settings']			= 'Menu de edición';
+$lang['mu_users_settings']			= 'Menu de edici&oacute;n';
 $lang['mu_add_delete_resources']	= 'Editor de cuentas';
-$lang['mu_stats_options']			= 'Opciones de estadísticas';
+$lang['mu_stats_options']			= 'Opciones de estad&iacute;sticas';
 $lang['mu_manage_users']			= 'Gestionar usuarios';
 $lang['mu_ban_options']				= 'Suspensiones';
 $lang['mu_moon_options']			= 'Opciones de lunas';
-$lang['mu_observation']				= 'Observación';
+$lang['mu_observation']				= 'Observaci&oacute;n';
 $lang['mu_flying_fleets']			= 'Flotas en vuelo';
 $lang['mu_user_list']				= 'Lista de jugadores';
 $lang['mu_moon_list']				= 'Lista de lunas';
@@ -535,9 +533,9 @@
 $lang['mu_md5_encripter']			= 'Encriptador MD5';
 $lang['mu_optimize_db']				= 'Base de datos';
 $lang['mu_manual_points_update']	= 'Update manual de puntos';
-$lang['mu_mpu_confirmation']		= 'El update de puntos es automático, de todas formas puedes realizarlo manualmente si lo deseas haciendo click aqui ¿Deseas continuar?';
+$lang['mu_mpu_confirmation']		= 'El update de puntos es autom&aacute;tico, de todas formas puedes realizarlo manualmente si lo deseas haciendo click aqui &iquest;Deseas continuar?';
 $lang['mu_search_page']				= 'Buscador avanzado';
-$lang['mu_info_account_page']		= 'Información de cuentas';
+$lang['mu_info_account_page']		= 'Informaci&oacute;n de cuentas';
 $lang['mu_planets_options']			= 'Opciones de planetas';
 $lang['mu_user_logs']				= 'Historial';
 $lang['mu_user_faq']				= 'F.A.Q.';
@@ -546,7 +544,7 @@
 
 //---------------	REINICIO DE UNIVERSO - RESET UNIVERSE	------------------------//
 $lang['re_reset_universe']					= 'Reiniciar Universo';
-$lang['re_reset_universe_confirmation']		= 'Al pulsar Aceptar, se reiniciaran las opciones solicitadas a cero. Esta operación no puede ser revertida, y es tu responsabilidad hacerle un backup a la base de datos. En caso de reiniciar todo el universo las cuentas no seran borradas.';
+$lang['re_reset_universe_confirmation']		= 'Al pulsar Aceptar, se reiniciaran las opciones solicitadas a cero. Esta operaci&oacute;n no puede ser revertida, y es tu responsabilidad hacerle un backup a la base de datos. En caso de reiniciar todo el universo las cuentas no seran borradas.';
 $lang['re_defenses_and_ships']				= 'Hangar y Defensas';
 $lang['re_defenses']						= 'Reiniciar defensas';
 $lang['re_ships']							= 'Reiniciar naves';
@@ -566,43 +564,43 @@
 $lang['re_reset_moons']						= 'Reiniciar lunas';
 $lang['re_reset_notes']						= 'Reiniciar notas';
 $lang['re_reset_rw']						= 'Reiniciar reportes de batalla';
-$lang['re_reset_buddies']					= 'Reiniciar lista de compañeros';
+$lang['re_reset_buddies']					= 'Reiniciar lista de compa&ntilde;eros';
 $lang['re_reset_allys']						= 'Reiniciar alianzas';
 $lang['re_reset_fleets']					= 'Reiniciar fleets';
 $lang['re_reset_errors']					= 'Reiniciar lista de errores';
 $lang['re_reset_banned']					= 'Reiniciar suspendidos';
 $lang['re_reset_messages']					= 'Reiniciar mensajes';
-$lang['re_reset_statpoints']				= 'Reiniciar estadísticas';
+$lang['re_reset_statpoints']				= 'Reiniciar estad&iacute;sticas';
 $lang['re_reset_all']						= 'Reiniciar todo el universo';
 $lang['re_reset_h1']						= 'Opciones de reseteo';
-$lang['re_reset_excess']					= 'Opciones reiniciadas con éxito';
+$lang['re_reset_excess']					= 'Opciones reiniciadas con &eacute;xito';
 //###########################################################//
 
 
-//---------------	INFORMACIÓN DE CUENTAS - DATA ACCOUNTS	------------------------//
-$lang['ac_user_id_required']				= '¡Debes seleccionar algun usuario!';
-$lang['ac_select_one_id']					= '¡Por favor, elegí solo un usuario!';
-$lang['ac_no_character']					= '¡No se aceptan letras, solo numeros!';
+//---------------	INFORMACION DE CUENTAS - DATA ACCOUNTS	------------------------//
+$lang['ac_user_id_required']				= '&iexcl;Debes seleccionar algun usuario!';
+$lang['ac_select_one_id']					= '&iexcl;Por favor, eleg&iacute; solo un usuario!';
+$lang['ac_no_character']					= '&iexcl;No se aceptan letras, solo numeros!';
 $lang['ac_select_id_num']					= 'Escribir el ID manualmente (Opcional)';
 $lang['ac_select_username']					= 'Seleccionar usuario';
-$lang['ac_username_doesnt']					= '¡No existe ese usuario!';
-$lang['ac_title']							= 'Información detallada de cuentas';
-$lang['ac_title_entry']						= 'Información detallada de ';
-$lang['ac_more']							= '(Más)';
+$lang['ac_username_doesnt']					= '&iexcl;No existe ese usuario!';
+$lang['ac_title']							= 'Informaci&oacute;n detallada de cuentas';
+$lang['ac_title_entry']						= 'Informaci&oacute;n detallada de ';
+$lang['ac_more']							= '(M&aacute;s)';
 $lang['ac_no_ally']							= 'No tiene alianza';
 $lang['ac_moon']							= 'Luna';
 $lang['ac_enter_user_id']					= 'Seleccionar usuario';
 $lang['ac_minimize_maximize']				= 'Minimizar/Maximizar';
 $lang['ac_account_data']					= 'Datos de la cuenta';
 $lang['ac_name']							= 'Nombre';
-$lang['ac_checkip_title']					= 'Comprobación de IP';
+$lang['ac_checkip_title']					= 'Comprobaci&oacute;n de IP';
 $lang['ac_checkip'][1]						= '<font color=aqua>Activado</font>';
 $lang['ac_checkip'][0]						= '<font color=#FF6600>Desactivado</font>';
 $lang['ac_mail']							= 'Email';
 $lang['ac_perm_mail']						= 'Email Permanente';
 $lang['ac_auth_level']						= 'Rango';
-$lang['ac_on_vacation']						= '¿En vacaciones?';
-$lang['ac_banned']							= '¿Suspendido?';
+$lang['ac_on_vacation']						= '&iquest;En vacaciones?';
+$lang['ac_banned']							= '&iquest;Suspendido?';
 $lang['ac_alliance']						= 'Alianza';
 $lang['ac_reg_ip']							= 'IP del Registro';
 $lang['ac_last_ip']							= 'Ultimo IP';
@@ -612,7 +610,7 @@
 $lang['ac_detailed_planet_moon_info']		= 'Informacion detallada de planetas y lunas';
 $lang['ac_id_names_coords']					= 'ID, Nombres y Coordenadas';
 $lang['ac_coords']							= 'Coordenada';
-$lang['ac_diameter']						= 'Diámetro';
+$lang['ac_diameter']						= 'Di&aacute;metro';
 $lang['ac_fields']							= 'Campos';
 $lang['ac_temperature']						= 'Temp.';
 $lang['ac_officier_research']				= 'Investigaciones y Oficiales';
@@ -627,7 +625,7 @@
 $lang['ac_register_time']					= 'Fecha de registro';
 $lang['ac_register_ally_time']				= 'Fecha de creado';
 $lang['ac_act_time']						= 'Fecha de la ultima actividad';
-$lang['ac_info_ally']						= 'Información de la alianza ';
+$lang['ac_info_ally']						= 'Informaci&oacute;n de la alianza ';
 $lang['ac_leader']							= 'Lider';
 $lang['ac_tag']								= 'TAG';
 $lang['ac_name_ali']						= 'Nombre completo';
@@ -641,7 +639,7 @@
 $lang['ac_no_text_int']						= 'La alianza no tiene texto interno';
 $lang['ac_no_text_sol']						= 'La alianza no tiene texto de solicitud';
 $lang['ac_no_img']							= 'La alianza no tiene logo';
-$lang['ac_no_web']							= 'La alianza no tiene página web';
+$lang['ac_no_web']							= 'La alianza no tiene p&aacute;gina web';
 $lang['ac_view_image']						= 'Ver imagen en otra ventana';
 $lang['ac_view_image2']						= 'Ver imagen';
 $lang['ac_view_text_ext']					= 'Ver texto externo';
@@ -649,7 +647,7 @@
 $lang['ac_view_text_sol']					= 'Ver texto de solicitud';
 $lang['ac_moons_no']						= '<font color=red>(No tiene lunas)</font>';
 $lang['ac_urlnow']							= 'URL: ';
-$lang['ac_time_destruyed']					= 'Fecha de destrucción total';
+$lang['ac_time_destruyed']					= 'Fecha de destrucci&oacute;n total';
 $lang['ac_isnodestruyed']					= '<font color=red>(No hay planetas destruidos recientemente)</font>';
 $lang['ac_no_alliance']						= '<font color=red>(No tiene alianza)</font>';
 $lang['ac_ali_text_11']						= 'Texto externo';
@@ -657,18 +655,18 @@
 $lang['ac_ali_text_33']						= 'Texto de solicitud';
 $lang['ac_ali_logo_11']						= 'Logo de la alianza';
 $lang['ac_ali_idid']						= 'ID:';
-$lang['ac_suspended_title']					= 'Visor de suspensión';
+$lang['ac_suspended_title']					= 'Visor de suspensi&oacute;n';
 $lang['ac_suspended_time']					= 'Suspendido el';
 $lang['ac_suspended_longer']				= 'Hasta el';
-$lang['ac_suspended_reason']				= 'Razón';
+$lang['ac_suspended_reason']				= 'Raz&oacute;n';
 $lang['ac_suspended_autor']					= 'Suspendido por';
-$lang['ac_note_k']							.= '<table><tr><th width=10%><font color=lime>T+</font></th><th>Supera el trillon</th></tr>';
+$lang['ac_note_k']							= '<table><tr><th width=10%><font color=lime>T+</font></th><th>Supera el trillon</th></tr>';
 $lang['ac_note_k']							.= '<tr><th width=10%><font color=lime>T</font></th><th>Supera o iguala el trillon</th></tr>';
 $lang['ac_note_k']							.= '<tr><th width=10%><font color=lime>B</font></th><th>Supera o iguala el billon</th></tr>';
 $lang['ac_note_k']							.= '<tr><th width=10%><font color=lime>M</font></th><th>Supera o iguala el millon</th></tr>';
 $lang['ac_note_k']							.= '<tr><th width=10%><font color=lime>K</font></th><th>Supera o iguala los mil</th></tr></table>';
 $lang['ac_leyend']							= '[ Leyenda ]';
-$lang['ac_no_rank_level']					= '¡No tenés permiso suficiente para ver información sobre ese usuario!';
+$lang['ac_no_rank_level']					= '&iexcl;No ten&eacute;s permiso suficiente para ver informaci&oacute;n sobre ese usuario!';
 //###########################################################//
 
 
@@ -696,17 +694,17 @@
 $lang['se_system']		=	'Sistema';
 $lang['se_planet']		=	'Planeta';
 $lang['se_tag']			=	'TAG';
-$lang['se_email']		=	'Correo electrónico';
+$lang['se_email']		=	'Correo electr&oacute;nico';
 $lang['se_auth']		=	'Rango';
 $lang['se_activity']	=	'Ultima actividad';
 $lang['se_ban']			=	'Suspendido';
 $lang['se_vacat']		=	'Vacaciones';
-$lang['se_ban_reason']	=	'Razón';
+$lang['se_ban_reason']	=	'Raz&oacute;n';
 $lang['se_ban_time']	=	'Suspendido el';
 $lang['se_ban_limit']	=	'Hasta el';
 $lang['se_ban_author']	=	'Suspendido por';
 $lang['se_search_title']	=	'Buscador avanzado';
-$lang['se_order_list_now']	=	'Ordenar búsqueda';
+$lang['se_order_list_now']	=	'Ordenar b&uacute;squeda';
 $lang['se_input_name']		=	'Nombre';
 $lang['se_input_g']			=	'Galaxia';
 $lang['se_input_s']			=	'Sistema';
@@ -716,16 +714,16 @@
 $lang['se_input_authlevel']	=	'Autoridad';
 $lang['se_input_email']		=	'E-Mail';
 $lang['se_input_time']		=	'Tiempo';
-$lang['se_input_longer']	=	'Duración';
+$lang['se_input_longer']	=	'Duraci&oacute;n';
 $lang['se_input_authlevel']	=	'Autoridad';
 $lang['se_input_prop']		=	'Propietario';
 $lang['se_input_asc']		=	'Ascendiente';
 $lang['se_input_desc']		=	'Descendiente';
 $lang['se_input_activity']	=	'Actividad';
 $lang['se_input_register']	=	'Registro';
-$lang['se_input_members']	=	'Nº Miembros';
+$lang['se_input_members']	=	'N&ordm; Miembros';
 $lang['se_input_members2']	=	'Miembros';
-$lang['se_input_have_moon']	=	'¿Tiene luna?';
+$lang['se_input_have_moon']	=	'&iquest;Tiene luna?';
 $lang['se_input_ip']		=	'IP';
 $lang['se_input_a']			=	'A';
 $lang['se_input_d']			=	'D';
@@ -743,9 +741,9 @@
 $lang['se_filter_title']	=	'Filtro';
 $lang['se_search_in']		=	'Por';
 $lang['online_users']		=	'Conectados';
-$lang['se_limit']			=	'Límite';
-$lang['se_pagees']			=	'Páginas';
-$lang['se_time_of_page']	=	'Página creada en ';
+$lang['se_limit']			=	'L&iacute;mite';
+$lang['se_pagees']			=	'P&aacute;ginas';
+$lang['se_time_of_page']	=	'P&aacute;gina creada en ';
 $lang['se_expand']			=	'Expander';
 $lang['se_contrac']			=	'Contraer';
 $lang['se__next']			=	'Siguiente';
@@ -754,46 +752,46 @@
 $lang['se_asc_desc']		=	'ASC / DESC';
 $lang['se_search_order']	=	'Orden';
 $lang['se_search_edit']		=	'Editar';
-$lang['se_delete_succes_p']	=	'Borrado con éxito';
-$lang['se_confirm_planet']	=	'El planeta seleccionado sera borrado completamente, ya sea planeta principal o una colonia, ¿deseas continuar?. Nombre del planeta: ';
+$lang['se_delete_succes_p']	=	'Borrado con &eacute;xito';
+$lang['se_confirm_planet']	=	'El planeta seleccionado sera borrado completamente, ya sea planeta principal o una colonia, &iquest;deseas continuar?. Nombre del planeta: ';
 
 $SE_ID		=	"ID";
 $SE_NAME	=	"Nombre";
 
-// BÚSQUEDA EN TABLA DE USUARIOS
+// B&uacute;SQUEDA EN TABLA DE USUARIOS
 $lang['se_search_users'][0]	=	$SE_ID;
 $lang['se_search_users'][1]	=	$SE_NAME;
-$lang['se_search_users'][2]	=	'Correo electrónico';
-$lang['se_search_users'][3]	=	'Última actividad';
+$lang['se_search_users'][2]	=	'Correo electr&oacute;nico';
+$lang['se_search_users'][3]	=	'&uacute;ltima actividad';
 $lang['se_search_users'][4]	=	'Fecha de registro';
-$lang['se_search_users'][5]	=	'Última IP';
+$lang['se_search_users'][5]	=	'&uacute;ltima IP';
 $lang['se_search_users'][6]	=	'Autoridad';
-$lang['se_search_users'][7]	=	'¿Suspendido?';
-$lang['se_search_users'][8]	=	'¿Vacaciones?';
+$lang['se_search_users'][7]	=	'&iquest;Suspendido?';
+$lang['se_search_users'][8]	=	'&iquest;Vacaciones?';
 
-// BÚSQUEDA EN TABLA DE PLANETAS
+// B&uacute;SQUEDA EN TABLA DE PLANETAS
 $lang['se_search_planets'][0]	=	$SE_ID;
 $lang['se_search_planets'][1]	=	$SE_NAME;
 $lang['se_search_planets'][2]	=	"Propietario";
-$lang['se_search_planets'][3]	=	"Última actividad";
+$lang['se_search_planets'][3]	=	"&uacute;ltima actividad";
 $lang['se_search_planets'][4]	=	"Galaxia";
 $lang['se_search_planets'][5]	=	"Sistema";
 $lang['se_search_planets'][6]	=	"Planeta";
 
-// BÚSQUEDA EN TABLA DE SUSPENDIDOS
+// B&uacute;SQUEDA EN TABLA DE SUSPENDIDOS
 $lang['se_search_banned'][0]	=	$SE_ID;
 $lang['se_search_banned'][1]	=	$SE_NAME;
-$lang['se_search_banned'][2]	=	"Fecha de suspensión";
-$lang['se_search_banned'][3]	=	"Fecha de reactivación";
-$lang['se_search_banned'][4]	=	"Razón";
+$lang['se_search_banned'][2]	=	"Fecha de suspensi&oacute;n";
+$lang['se_search_banned'][3]	=	"Fecha de reactivaci&oacute;n";
+$lang['se_search_banned'][4]	=	"Raz&oacute;n";
 $lang['se_search_banned'][5]	=	"Autor";
 
-// BÚSQUEDA EN TABLA DE LA ALIANZA
+// B&uacute;SQUEDA EN TABLA DE LA ALIANZA
 $lang['se_search_alliance'][0]	=	$SE_ID;
 $lang['se_search_alliance'][1]	=	$SE_NAME;
 $lang['se_search_alliance'][2]	=	"TAG";
 $lang['se_search_alliance'][3]	=	"Lider";
-$lang['se_search_alliance'][4]	=	"Fecha de creación";
+$lang['se_search_alliance'][4]	=	"Fecha de creaci&oacute;n";
 $lang['se_search_alliance'][5]	=	"Cantidad de miembros";
 //###########################################################//
 
@@ -805,25 +803,25 @@
 $lang['new_creator_title_p']	= 'Crear/Borrar planetas';
 $lang['new_creator_title_l']	= 'Crear/Borrar lunas';
 $lang['new_creator_coor']		= 'Coordenadas';
-$lang['new_creator_go_back']	= '[ Volver al menú ]';
+$lang['new_creator_go_back']	= '[ Volver al men&uacute; ]';
 $lang['new_creator_refresh']	= '[ Recargar ]';
 
 //	CREADOR DE USUARIOS - USERS MAKER
 $lang['new_title']				= 'Crear nuevo usuario';
-$lang['new_only_numbers']		= '¡Las coordenadas solo deben tener números!';
-$lang['new_error_coord']		= '¡Coordenadas erroreas o desconocidas!';
-$lang['new_complete_all']		= '¡Ingresa todos los datos!';
-$lang['new_error_name']			= '¡El nombre de usuario ya esta en uso!';
-$lang['new_error_email']		= '¡El correo electronico ya esta en uso!';
-$lang['new_error_email2']		= '¡El correo electrónico no es válido!';
-$lang['new_error_passw']		= '¡La contraseña debe tener al menos 4 letras o digitos!';
-$lang['new_error_galaxy']		= '¡Las coordenadas especificadas ya estan siendo utilizadas!';
-$lang['new_user_success']		= 'Usuario creado con éxito';
+$lang['new_only_numbers']		= '&iexcl;Las coordenadas solo deben tener n&uacute;meros!';
+$lang['new_error_coord']		= '&iexcl;Coordenadas erroreas o desconocidas!';
+$lang['new_complete_all']		= '&iexcl;Ingresa todos los datos!';
+$lang['new_error_name']			= '&iexcl;El nombre de usuario ya esta en uso!';
+$lang['new_error_email']		= '&iexcl;El correo electronico ya esta en uso!';
+$lang['new_error_email2']		= '&iexcl;El correo electr&oacute;nico no es v&aacute;lido!';
+$lang['new_error_passw']		= '&iexcl;La contrase&ntilde;a debe tener al menos 4 letras o digitos!';
+$lang['new_error_galaxy']		= '&iexcl;Las coordenadas especificadas ya estan siendo utilizadas!';
+$lang['new_user_success']		= 'Usuario creado con &eacute;xito';
 $lang['new_add_user']			= 'Crear usuario';
 $lang['new_range']				= 'Rango';
 $lang['new_coord']				= 'Coordenadas';
-$lang['new_email']				= 'Correo electrónico';
-$lang['new_pass']				= 'Contraseña';
+$lang['new_email']				= 'Correo electr&oacute;nico';
+$lang['new_pass']				= 'Contrase&ntilde;a';
 $lang['new_name']				= 'Nombre';
 
 //	CREADOR DE PLANETAS - PLANETS MAKER
@@ -833,30 +831,30 @@
 $lang['po_colony']				=	'Colonia';
 $lang['po_fields_max']			=	'Campos';
 $lang['po_coor_1']				=	'Coordenadas';
-$lang['po_add_planet']			=	'Añadir planeta';
+$lang['po_add_planet']			=	'A&ntilde;adir planeta';
 $lang['po_delete_planet']		=	'Borrar planeta';
 $lang['po_name_planet']			=	'Nombre del planeta';
-$lang['po_complete_all']		=	'¡Datos invalidos o coordenadas ya ocupadas!';
-$lang['po_complete_all2']		=	'¡Coordenadas erroneas!';
-$lang['po_complete_succes']		=	'¡Planeta creado con éxito! | <a href="AccountEditorPage.php">Editar Planeta</a>';
-$lang['po_complete_invalid']	=	'¡Datos inválidos!';
-$lang['po_complete_invalid2']	=	'¡Planeta inexistente!';
-$lang['po_complete_invalid3']	=	'¡Solo se pueden borrar planetas!';
-$lang['po_complete_succes2']	=	'¡Planeta borrado con éxito!';
+$lang['po_complete_all']		=	'&iexcl;Datos invalidos o coordenadas ya ocupadas!';
+$lang['po_complete_all2']		=	'&iexcl;Coordenadas erroneas!';
+$lang['po_complete_succes']		=	'&iexcl;Planeta creado con &eacute;xito! | <a href="AccountEditorPage.php">Editar Planeta</a>';
+$lang['po_complete_invalid']	=	'&iexcl;Datos inv&aacute;lidos!';
+$lang['po_complete_invalid2']	=	'&iexcl;Planeta inexistente!';
+$lang['po_complete_invalid3']	=	'&iexcl;Solo se pueden borrar planetas!';
+$lang['po_complete_succes2']	=	'&iexcl;Planeta borrado con &eacute;xito!';
 
 //	CREADOR DE LUNAS - MOON MAKER
-$lang['mo_moon_added']				= 'Luna agregada con éxito.';
-$lang['mo_moon_deleted']			= 'Luna eliminada con éxito.';
-$lang['mo_moon_doesnt_exist']		= '¡La luna no existe!';
-$lang['mo_moon_only']				= '¡Solo podes borrar lunas!';
-$lang['mo_moon_unavaible']			= '¡El planeta ya tiene luna!';
-$lang['mo_planet_doesnt_exist']		= '¡El planeta no existe!';
+$lang['mo_moon_added']				= 'Luna agregada con &eacute;xito.';
+$lang['mo_moon_deleted']			= 'Luna eliminada con &eacute;xito.';
+$lang['mo_moon_doesnt_exist']		= '&iexcl;La luna no existe!';
+$lang['mo_moon_only']				= '&iexcl;Solo podes borrar lunas!';
+$lang['mo_moon_unavaible']			= '&iexcl;El planeta ya tiene luna!';
+$lang['mo_planet_doesnt_exist']		= '&iexcl;El planeta no existe!';
 $lang['mo_moon_name']				= 'Nombre de la luna';
 $lang['mo_moon']					= 'Luna';
-$lang['mo_diameter']				= 'Diámetro';
+$lang['mo_diameter']				= 'Di&aacute;metro';
 $lang['mo_temperature']				= 'Temperatura';
 $lang['mo_fields_avaibles']			= 'Campos disponibles';
-$lang['po_add_moon']				= 'Añadir luna';
+$lang['po_add_moon']				= 'A&ntilde;adir luna';
 $lang['po_delete_moon']				= 'Borrar luna';
 //###########################################################//
 
@@ -872,15 +870,15 @@
 $lang['log_log_body_ally']			= 'Log de alianza';
 $lang['log_log_body_p_m']			= 'Log de planetas y lunas';
 $lang['log_log_body_reset']			= 'Log del sistema de reseteo';
-$lang['log_log_body_mod']			= 'Log del sistema de moderación';
+$lang['log_log_body_mod']			= 'Log del sistema de moderaci&oacute;n';
 $lang['log_log_body_gen']			= 'Log general';
-$lang['log_log_body_config']		= 'Log de configuración';
+$lang['log_log_body_config']		= 'Log de configuraci&oacute;n';
 $lang['log_log_title_22']			= 'Historial';
-$lang['log_alert']					= 'Al presionar aceptar borraras todo el contenido del archivo de texto, ¿deseas continuar?';
+$lang['log_alert']					= 'Al presionar aceptar borraras todo el contenido del archivo de texto, &iquest;deseas continuar?';
 $lang['log_input_value']			= 'Editar';
 $lang['log_go_back']				= '[&nbsp; Volver &nbsp;]';
-$lang['log_edit_succes']			= 'Editado con éxito';
-$lang['log_delete_succes']			= 'El siguiente archivo ha sido vaciado con éxito:&nbsp;';
+$lang['log_edit_succes']			= 'Editado con &eacute;xito';
+$lang['log_delete_succes']			= 'El siguiente archivo ha sido vaciado con &eacute;xito:&nbsp;';
 $lang['log_edit_link']				= '[&nbsp; Editar historial &nbsp;]';
 $lang['log_delete_link']			= '[&nbsp; Vaciar historial &nbsp;]';
 $lang['log_filesize_0']				= '<font color=yellow>El historial esta vacio</font>';
@@ -909,7 +907,7 @@
 $lang['log_delete_all_c_edi']		= 'Borro la cola de edificios';
 $lang['log_change_diameter']		= 'Cambio el diametro por';
 $lang['log_change_fields']			= 'Cambio los campos por';
-$lang['log_change_pla_pos']			= 'Cambio la posición ';
+$lang['log_change_pla_pos']			= 'Cambio la posici&oacute;n ';
 $lang['log_planet_pos']				= 'del planeta';
 $lang['log_moon_pos']				= 'de la luna';
 $lang['log_reseteo']				= 'reseteo';
@@ -926,7 +924,7 @@
 $lang['log_resources']				= 'RECURSOS';
 $lang['log_notes']					= 'NOTAS';
 $lang['log_rw']						= 'REPORTES DE BATALLA';
-$lang['log_friends']				= 'LISTA DE COMPAÑEROS';
+$lang['log_friends']				= 'LISTA DE COMPA&ntilde;EROS';
 $lang['log_alliances']				= 'ALIANZAS';
 $lang['log_fleets']					= 'FLOTAS EN VUELO';
 $lang['log_errors']					= 'LISTA DE ERRORES';
@@ -939,11 +937,11 @@
 $lang['log_change_auth_2']			= 'el rango actual ahora es: ';
 $lang['log_can_view_mod']			= 'Los moderadores podran ver... ';
 $lang['log_can_view_ope']			= 'Los operadores podran ver... ';
-$lang['log_tools']					= '¿Herramientas?';
-$lang['log_edit']					= '¿Editar?';
-$lang['log_view']					= '¿Ver menu de Observación?';
-$lang['log_config']					= '¿Configurar opciones de juego?';
-$lang['log_system_mod_title']		= '<font color=lime>||| SISTEMA DE MODERACIÓN |||</font>';
+$lang['log_tools']					= '&iquest;Herramientas?';
+$lang['log_edit']					= '&iquest;Editar?';
+$lang['log_view']					= '&iquest;Ver menu de Observaci&oacute;n?';
+$lang['log_config']					= '&iquest;Configurar opciones de juego?';
+$lang['log_system_mod_title']		= '<font color=lime>||| SISTEMA DE MODERACI&oacute;N |||</font>';
 $lang['log_system_auth_title']		= '<font color=lime>||| CAMBIO DE RANGO |||</font>';
 $lang['log_errores_title']			= '<font color=lime>||| LISTA DE ERRORES |||</font>';
 $lang['log_delete_all_errors']		= 'ha borrado todos los mensajes de error';
@@ -954,12 +952,12 @@
 $lang['log_suspended_1']			= 'ha suspendido al usuario ';
 $lang['log_suspended_2']			= ' con las siguientes especificaciones:';
 $lang['log_suspended_3']			= 'le ha quitado la suspension a ';
-$lang['log_reason']					= 'Razón: ';
+$lang['log_reason']					= 'Raz&oacute;n: ';
 $lang['log_time']					= 'el: ';
 $lang['log_longer']					= 'hasta el: ';
-$lang['log_vacations']				= '¿En modo vacaciones? ';
+$lang['log_vacations']				= '&iquest;En modo vacaciones? ';
 $lang['log_info_detail_title']		= '<font color=lime>||| INFORMACION DETALLADA |||</font>';
-$lang['log_searchto_1']				= ' busco información del usuario ';
+$lang['log_searchto_1']				= ' busco informaci&oacute;n del usuario ';
 $lang['log_attempt_1']				= ' ha intentado ingresar al panel administrativo';
 $lang['log_new_user']				= ' ha creado un nuevo usuario con las siguientes especificaciones';
 $lang['log_new_user_title']			= '<font color=lime>||| CREACION DE USUARIOS |||</font>';
@@ -971,39 +969,39 @@
 $lang['log_message_specify']		= ' ha enviado un mensaje circular con estas especificaciones';
 $lang['log_mes_subject']			= 'Sujeto';
 $lang['log_mes_text']				= 'Mensaje';
-$lang['log_operation_succes']		= 'Operación realizada el: ';
-$lang['log_database_view']			= ' utilizo la base de datos la cual hizo la siguiente operación ';
+$lang['log_operation_succes']		= 'Operaci&oacute;n realizada el: ';
+$lang['log_database_view']			= ' utilizo la base de datos la cual hizo la siguiente operaci&oacute;n ';
 $lang['log_database_title']			= '<font color=lime>||| BASE DE DATOS |||</font>';
 $lang['log_data_optimize']			= 'OPTIMIZAR';
 $lang['log_data_repair']			= 'REPARAR';
 $lang['log_data_check']				= 'REVISAR';
 $lang['log_change_stats']			= ' ha cambiado los parametros de estadisticas';
-$lang['log_stats_value']			= 'Valor de 1 punto de estadística';
-$lang['log_stats_value_2']			= 'Tiempo entre actualización de estadísticas (minutos)';
+$lang['log_stats_value']			= 'Valor de 1 punto de estad&iacute;stica';
+$lang['log_stats_value_2']			= 'Tiempo entre actualizaci&oacute;n de estad&iacute;sticas (minutos)';
 $lang['log_stats_value_3']			= 'Usuarios por bloque';
-$lang['log_stats_value_4']			= '¿Actualizar flotas en bloque?';
-$lang['log_stats_value_5']			= '¿La administración puede figurar en el ranking?';
-$lang['log_stats_value_6']			= '¿Hasta que rango pueden figurar en el ranking?';
-$lang['log_sett_no1']				= ' cambio la siguiente configuración';
-$lang['log_sett_close']				= '¿Servidor cerrado? ';
-$lang['log_sett_close_rea']			= '¿Razón? ';
-$lang['log_sett_debug']				= '¿Modo DEBUG activado? ';
+$lang['log_stats_value_4']			= '&iquest;Actualizar flotas en bloque?';
+$lang['log_stats_value_5']			= '&iquest;La administraci&oacute;n puede figurar en el ranking?';
+$lang['log_stats_value_6']			= '&iquest;Hasta que rango pueden figurar en el ranking?';
+$lang['log_sett_no1']				= ' cambio la siguiente configuraci&oacute;n';
+$lang['log_sett_close']				= '&iquest;Servidor cerrado? ';
+$lang['log_sett_close_rea']			= '&iquest;Raz&oacute;n? ';
+$lang['log_sett_debug']				= '&iquest;Modo DEBUG activado? ';
 $lang['log_sett_name_game']			= 'Nombre del juego ';
 $lang['log_sett_forum_url']			= 'URL del foro ';
 $lang['log_sett_velo_game']			= 'Velocidad del juego ';
 $lang['log_sett_velo_flottes']		= 'Velocidad de flota ';
-$lang['log_sett_velo_prod']			= 'Velocidad de producción ';
+$lang['log_sett_velo_prod']			= 'Velocidad de producci&oacute;n ';
 $lang['log_sett_fields']			= 'Campos iniciales ';
-$lang['log_sett_basic_m']			= 'Básico de metal por hora ';
-$lang['log_sett_basic_c']			= 'Básico de cristal por hora ';
-$lang['log_sett_basic_d']			= 'Básico de deuterio por hora ';
-$lang['log_sett_adm_protection']	= '¿Protección contra administradores activado? ';
+$lang['log_sett_basic_m']			= 'B&aacute;sico de metal por hora ';
+$lang['log_sett_basic_c']			= 'B&aacute;sico de cristal por hora ';
+$lang['log_sett_basic_d']			= 'B&aacute;sico de deuterio por hora ';
+$lang['log_sett_adm_protection']	= '&iquest;Protecci&oacute;n contra administradores activado? ';
 $lang['log_sett_language']			= 'Lenguaje ';
 $lang['log_sett_debris_def']		= 'Defensas a escombros ';
 $lang['log_sett_debris_flot']		= 'Naves a escombros ';
-$lang['log_sett_act_noobs']			= '¿Protección contra novatos activado? ';
-$lang['log_sett_noob_time']			= 'Tiempo de protección contra novato ';
-$lang['log_sett_noob_multi']		= 'Limite de puntos para la protección de novato ';
+$lang['log_sett_act_noobs']			= '&iquest;Protecci&oacute;n contra novatos activado? ';
+$lang['log_sett_noob_time']			= 'Tiempo de protecci&oacute;n contra novato ';
+$lang['log_sett_noob_multi']		= 'Limite de puntos para la protecci&oacute;n de novato ';
 $lang['log_sett_name_cookie']		= 'Nombre de la cookie ';
 $lang['log_searchindb_del1']		= 'El jugador con la ID ';
 $lang['log_searchindb_del3']		= 'El planeta con la ID ';
@@ -1016,6 +1014,6 @@
 $lang['log_searchindb_susp']		= 'Suspendidos';
 $lang['log_searchindb_admin']		= 'Administradores';
 $lang['log_searchindb_inac']		= 'Inactivos';
-$lang['log_search_advert_popup']	= 'Para Activar/Desactivar el historial podes hacerlo desde la sección de Permisos. Click para ir al panel de permisos.';
+$lang['log_search_advert_popup']	= 'Para Activar/Desactivar el historial podes hacerlo desde la secci&oacute;n de Permisos. Click para ir al panel de permisos.';
 //###########################################################//
 ?>
\ No newline at end of file
diff --git a/language/spanish/CHANGELOG.mo b/language/spanish/CHANGELOG.mo
deleted file mode 100644
index 790f0eb..0000000
--- a/language/spanish/CHANGELOG.mo
+++ /dev/null
@@ -1,960 +0,0 @@
-<?php
-
-$lang['Version']     = 'Versión';
-$lang['Description'] = 'Descripción';
-$lang['changelog']   = array(
-
-'2.9.6' => ' 00/00/10
-
-- [Seguridad] Validaciones globales para prevenir SQL Injections.-
-- [Seguridad] Cerrados varios agujeros de seguridad que permitian SQL Injection.-
-- [Seguridad] Corregido un bug de seguridad en los bbcode de la alianza (By slave7).-
-- [Seguridad] Corregidos varios bugs de seguridad en las páginas de la alianza y opciones.-
-
-- [Fixs]
-#0009: Alianza Contador de caracteres
-#0010: Contador de caracteres mensaje
-#0011: Texto de la solicitud de alianza
-#0013: Cancelar construcciones
-#0014: Problemas con nuevas versiones
-#0015: Link roto en actualización
-#4485: El Administrador desaparece por inactivo
-#4534: Fuego rápido no se calcula
-#4535: Mantener posicion
-#4536: Problemas con el phalanx
-#4537: Error en el lenguaje
-#4538: Bug en misión de expedicion
-#4539: Pequeño bug visual en vista de mensajes
-#4540: Saltos en la galaxia
-#4558: Bug de seguridad
-#4719: Problemas nanobots
-',
-
-'2.9.5' => ' 29/07/10
-
-- [Seguridad] Corregidos varios bugs de seguridad (By slave7).-
-- [Seguridad] Corregidos varios bugs de seguridad (By jtsamper).-
-
-- [Cambio] Adaptado para que sea compatible con PHP 5.3.3.-
-- [Cambio] Aparecen todas las personas que aportaron algo en los créditos del panel administrativo.-
-
-
-- Vieja numeración
-- [Fix][Bug #5] Los sacs no coordinan los tiempos (By slave7).-
-
-- Numeración del viejo Bug Tracker (http://sourceforge.net/apps/mantisbt/xgproyect/view_all_bug_page.php)
-- [Fix][Bug #0000011] Los Sacs reparten los recursos (By slave7).-
-- [Fix][Bug #0000065] Todas las rondas aparecen como ganadas y a eventualmente empatan (By Nickolay).-
-- [Fix][Bug #-------] La planta de fusión funcionaba al 100% cuando el planeta no tenía deuterio (By slaver7)
-
-- Nueva numeración (Arctic Tracker)
-- [Fix][Bug #0000002] Corregido el link que da más información sobre la protección de novatos.-
-- [Fix][Bug #0000003] Corregido el bug en la alianza que causaba problemas para redirigir al sitio de la alianza.-
-- [Fix][Bug #0000004] Bug en la producción, produce más de lo que debe (By Calzon).-
-- [Fix][Bug #0000005] Bug en el incremento de puntos de las tecnologías (By Think).-
-- [Fix][Bug #0000006] Bug en el Debug Log (By Green).-
-
-',
-
-'2.9.4' => ' 02/03/10
-- [Novedad] Ahora el mercader requiere materia oscura (2500), configurable desde constants.php.-
-
-- [Seguridad] Limitado desde la base de datos la cantidad de cupulas que pueden ser contruidas (Gracias a medel).-
-- [Seguridad] Mejora de seguridad en el formulario de los misiles.-
-
-- [Fix][Bug #0000031] Misión expedición da escuadron fantasma.-
-- [Fix][Bug #0000035] Se pueden enviar misiles interplanetarios a usuarios en vacaciones (By Neurus).- 
-- [Fix][Bug #0000036] Se pueden enviar misiles interplanetarios en negativo.-
-- [Fix][Bug #0000037] Se puede atacar con misiles interplanetarios a usuarios fuertes y debiles (By Neurus).-
-- [Fix][Bug #0000038] Luego de un error o advertencia en el envio de misiles no se vuelve a galaxia.-
-- [Fix][Bug #0000039] Al colonizar con recursos estos desaparecen.-
-- [Fix][Bug #0000043] En INGAME.mo hay 2 entradas iguales.-
-- [Fix][Bug #0000044] Varias cupulas de protección (By Neko).-
-- [Fix][Bug #0000047] Error en template estadisticas.-
-- [Fix][Bug #0000048] Recursos negativos.-
-- [Fix][Bug #0000050] Ataques con sondas de espionaje.-
-- [Fix][Bug #0000056] Error al editar usuario en el panel administrativo (By Neko).-
-- [Fix][Bug #0000059] Solucionado el error que mostraba registros dobles en las estadísticas.-
-- [Fix][Bug #-------] Fallo producido al recargar la página de los edificios, defensas, tecnologias y naves (By Neko).-
-- [Fix][Bug #-------] Corregido un bug que no instalaba la tabla para los plugins.-
-- [Fix][Bug #-------] Corregido un bug que no tenía en cuenta a la supernova en las expediciones.-
-- [Fix][Bug #-------] Corregido un bug que ocurria por tener menos deuterio que combustible a gastar (By Neko).-
-- [Fix][Bug #-------] No se mostraba correctamente el mensaje de modo vacaciones (By Neko).-
-- [Fix][Bug #-------] Si la cuenta está en modo borrar y en modo vacaciones, en el overview se le da prioridad al mensaje de borrado de la cuenta.-
-- [Fix][Bug #-------] Corregido un bug menor en la creación de planetas (By Kloud).-
-- [Fix][Bug #-------] Corregido un bug menor en el js que maneja los recursos al enviar una flota (By Neko).-
-
-- [Cambio] Actualizados los links de soporte y reporte de bugs del overview en el panel administrativo.-
-- [Cambio] Mejoras en los reportes.-
------------ Ahora en la primer ronda siempre se listan las flotas completas.-
------------ Ahora las sondas son destruidas en la primer ronda; al atacante le sale destrucción en la primer ronda, al defensor el reporte completo.-
------------ Ya no se duplica la primer ronda en las batallas de 2 rondas; en la primera se muestran las flotas completas y en la segunda el mensaje destruido.-
-- [Cambio] Modificada la licencia para el 2010.-
-',
-
-'2.9.3' => ' 12/02/10
-- [Seguridad] Mejoras de seguridad en el movimiento de recursos (By calzon).-
-
-- [Fix][Bug #0000040] Multiplicación de recicladores (By tomtom).-
-- [Fix][Bug #-------] Bug que permitía el incremento de naves en el salto cuántico (By war4head).-
-
-- [Cambio] Nuevamente se volvio al viejo reloj en la visión general.-
-
-# Version 0.2 del panel administrativo
-
-.- Los moderadores y operadores ya no podran:
- || Suspender administradores.
- || Crear usuarios con rango mayor al de un jugador.
- || Reiniciar universo.
- || Ejecutar consultas SQL.
- || Editar datos personales.
- || Editar/Vaciar el historial.
-.- [MINOR ADD] Adherida la ID en el sistema de suspensión.
-.- Agregado un historial en el panel administrativo, la cual custodiara los movimientos de los siguientes archivos:
- || BanPage.php
- || ErrorPage.php
- || AccountEditorPage.php
- || Moderation.php
- || QueriesPage.php
- || ResetPage.php
- || AccountDataPage.php
- || CreateNewUserPage.php
- || GlobalMessagePage.php
- || DataBaseViewPage.php
- || ConfigStatsPage.php
- || SettingsPage.php
- || SearchInDBPage.php
-.- Logs protegidos con .htaccess para que nadie pueda leerlos.
-.- Agregada opción de modo vacaciones en Datos Personales.
-.- Agregado de vuelta el scrolling en el frame (No funciona en IE).
-.- Pequeño fix en la lista de mensajes.
-.- Las siguientes funciones han sido reemplazadas por una redirección al buscador avanzado:
- || Lista de jugadores.
- || Lista de lunas.
- || Lista de planetas.
- || Lista de usuarios conectados.
- || Lista de planetas activos.
-.- Agregado al buscador avanzado:
- || Expandir / contraer.
- || Paginación.
- || Nuevos filtros y tipos de búsqueda.
-.- [FIX] borrar usuarios (No borraba las colonias de la tabla xgp_planets).
-.- [FIX] bugs pequeños en el ejecutador de consultas SQL.
-.- Cambios en el ADMIN.mo y traduccion completa al inglés. (Gracias Arali)
-.- Agregada nueva función -> DeleteSelectedPlanet.
-',
-
-'2.9.2' => ' 01/12/09
-- [Seguridad] Cerrado un agujero en la alianza que permitía sql injection (Gracias a privatethedawn).-
-
-- [Novedad] Implementado un nuevo sistema de Plugins v0.3 (Gracias adri93).-
-- [Novedad] Ahora cuando hay muchos recursos en la cuenta de un usuario se muestra K,M,B,T,T+ en la información de cuentas del panel del admin.-
-- [Novedad] Hora y fecha del servidor, en el overview, en Castellano. (Sustituir en la linea 402 el (es_ES), por el idioma deseado.).-
-
-- [Fix][Bug varios] Fueron corregidos varios bugs menores.-
-- [Fix][Bug #0000019] Famoso error en las estadísticas provocado por una query que no era finalizada.-
-- [Fix][Bug #0000020] Información de cuentas en el panel del admin.
-- [Fix][Bug #-------] No se muestra bien el tiempo de estacionar en aliado en el panel del admin.-
-- [Fix][Bug #-------] Corregidos varios textos (español,inglés) en el panel de administración.-
-- [Fix][Bug #-------] Arreglado pequeño error en los datos mostrados en la seccion de recursos.-
-- [Fix][Bug #-------] Ahora muestra correctamente la inactividad de los jugadores de tu alianza desde.-
-- [Fix][Bug #-------] Al borrar un usuario se borraran todos sus planetas.-
-
-
-- [Cambio] Algunas mejoras de optimización en la información de cuentas en el panel administrativo.
-- [Otros]  Mejoras en el sistema de envio de flotas del FleetAjax.php
-',
-
-'2.9.1' => ' 01/11/09
-
-- [Fix][Menor] Corregido un bug menor en el texto de los informes de espionaje que permitía bashing.-
-- [Fix][Menor] Corregido un bug menor en el texto de los reportes de combates.-
-- [Fix][Menor] Corregido un bug menor que mostraba carácteres raros en la alianza luego de editar un texto (By Neko).-
-- [Fix][Menor] Corregido un bug menor que deformaba la página de los mensajes al enviar mensajes muy largos (By Neko).- 
-- [Fix][Menor] Correciones en algunos textos.-
-
-Nueva numeración (bug tracker)
-- [Fix][Bug #0000010] No direcciona bien el ataque.-
-
-Vieja numeración
-- [Fix][Bug #5] Los sacs no coordinan los tiempos.-
-- [Fix][Bug #6] Los sacs no aparecen en el mismo mensajes en la visión general (By privatethedawn).-
-
-
-- [Cambio] Ahora cuando se estan moviendo flotas no es posible abandonar un planeta (By privatethedawn).-
-- [Cambio] Ahora al explorar la galaxia, si es tu propio sistema solar, no perderás deuterio.-
-- [Cambio] Nuevo panel administrativo (By Neko)
-.- Nuevo skin
-.- Agregado el sistema de moderación.
-.- FIX suspender usuario (Si el jugador ya estaba suspendido y lo suspendias de vuelta creaba 
-otra tabla con los mismos datos (duplicacion)). Mejoras.
-.- Reset de universo mejorado, con poder de reiniciar distintas cosas.
-.- [FIX] Al resetear todo el universo: 
- || no introducia el "id_level" en la tabla de planetas.
- || dejaba al usuario como inactivo (al reiniciar nuevamente se borraban las cuentas por inactividad).
-.- Opciones de lunas mejorado.
-.- Agregada la creación de planetas.
-.- Contador de caracteres para mensajes (cntchar.js) nuevo y mejorado.
-.- Agregada la opcion de "ver todos los mensajes" y un "seleccionar todo" en la lista de mensajes.
-.- Agregado sistema para crear cuentas.
-.- Reestructuración del adminresources.php (ahora AccountEditorPage.php)
- || Agregada la edición de datos personales.
- || Agregada varias opciones más para la edición de planetas y lunas.
- || Agregada la edición de oficiales.
-.- Agregado un buscador avanzado.
-.- Eliminado el borrado de reportes cuando se borraba un usuario, sino cuando el otro atacante o defensor queria ver
-la batalla no le figuraba.
-',
-
-
-'2.9.0' => ' 21/10/09
-
-- [Seguridad] Ahora es encriptada la contraseña que se ingresa durante la actualización.- 
-
-- [Cambio] Optimización y mejora general en el manejo de las lunas (By angelus_ira).-
-- [Cambio] Mejora en el rendimiento de algunas páginas.-
-- [Cambio] Ahora al explorar la galaxia, si es tu propio sistema solar, no perderás deuterio.-
-
-- [Fix][Bug #122] Problemas en la actualización de los puntos.-
-- [Fix][Bug #123] Bug en los reportes mostrando que se produjo un empate cuando no fue asi.-
-- [Fix][Bug #124] Problemas con el phalanx.-
-- [Fix][Bug #125] Bug en la lista de amigos no permite aceptar/rechazar.-
-- [Fix][Bug #126] No le aparecen los reportes de ataque al defensor.-
-- [Fix][Bug #127] Problema con el title de los recursos maximo en las flotas.-
-',
-
-'2.8' => ' 10/10/09
-
-- [Seguridad] Mejora de seguridad en varias funciones y archivos.-
-- [Seguridad] Mejora de seguridad y prevención de números y caracteres no permitidos en el salto cuántico (Gracias a Trojan).-
-
-- [Novedad] El pack en inglés se encuentra 100% traducido (Gracias war4head).-
-- [Novedad] Se definieron constantes para los oficiales, asi es más fácil editarlos (no lo recomiendo).-
-
-- [cambio] Mejoras varias en el script que calcula los ataques.-
-- [Cambio] Corregido un bug de seguridad al agregar recursos al envio de una flota (Gracias a MSW).-
-- [Cambio] Los reportes de combate de la sección mensajes ahora solo muestran un link al reporte y no un resumen.-
-- [Cambio] Pequeño fix y mejora de seguridad para el phalanx y el alcance (Gracias a Trojan).-
-- [Cambio] Optimizado el alcance del phalanx, reducida la carga de procesamiento (Gracias a Trojan).-
-- [Cambio] Optimizados los movimientos de flotas (Gracias a Trojan).-
-- [Cambio] Los recicladores valen ahora 10.000 de metal - 6.000 de cristal - 2.000 de deuterio como corresponde.-
-
-- [Fix][Varios] Corrección de varios bugs menores globales.-
-- [Fix][Varios] Corregidos varios bugs menores en el armado de las estadísticas.-
-- [Fix][Varios] Corregidos varios bugs menores en los movimientos de flotas y misiones.-
-- [Fix][Bug #108] Coordenadas erroneas en el mensaje de reciclaje.-
-- [Fix][Bug #109] Los jugadores de la lista de compañeros aparecen siempre como desconectados.-
-- [Fix][Bug #110] Duplicación de recicladores al hacer multiple clicks en la galaxia.-
-- [Fix][Bug #111] Jugadores inactivos y borrados no son eliminados fisicamente.-
-- [Fix][Bug #112] No son actualizados los recursos del planeta de un jugador al ser atacado.-
-- [Fix][Bug #113] Pequeño bug que muestra un mensaje de error en la pagina de los sacs.-
-- [Fix][Bug #114] Bug al intentar eliminar un jugador.-
-- [Fix][Bug #115] Diferencia de estados entre (debil, fuerte) al enviar una flota y la galaxia.-
-- [Fix][Bug #116] Bug en la misión de destrucción.-
-- [Fix][Bug #117] Bug en la alianza que no descuenta los jugadores que salen de ella.-
-- [Fix][Bug #118] Bug que permite ignorar las naves e investigaciones, permitiendo edificar robots, nanos y laboratorio.-
-- [Fix][Bug #119] Bug en los textos de transportes.-
-- [Fix][Bug #120] Bug en las batallas de una sola ronda.-
-- [Fix][Bug #121] Bug en las solicitudes de la alianza.-
-',
-
-'2.7' => ' 17/09/09
-
-- [Novedad] Sistema para ver toda la información de la cuenta de un usuario. By Neko.-
-- [Novedad] SACs implementeados [BETA].-
------------ Código: MadnessRed
------------ Testeos y funcionamiento, como la adapación a la 0.9a: cyberrichy
------------ Adaptación a la 2.7: lucky
-
-- [Fix][Varios] Varios bugs menores de estilo, plantillas y lenguaje reparados.-
-- [Fix][Bug #93] Bug al eliminar un jugador.-
-- [Fix][Bug #94] No se muestra la cantidad de flotas en el panel de administración.-
-- [Fix][Bug #95] Deuterio en negativo a causa de la planta de fusión.-
-- [Fix][Bug #96] Plantillas para solicitud de amigos descolocada.-
-- [Fix][Bug #97] No se muestra el estado de baneo y vacaciones en los jugadores dentro del panel de administración.-
-- [Fix][Bug #99] Problemas con la página de busqueda mostrando demsiados resultados o no permitiendo descender en la página.-
-- [Fix][Bug #100] Al mandar naves de distintos tipos a colonizar vuelve el colonizador y se pierden las otras naves.-
-- [Fix][Bug #101] No se generan lunas cuando sale un 20% de probabilidad.-
-- [Fix][Bug #102] Al salir de una alianza el número de miembros no disminuye como debería.-
-- [Fix][Bug #103] Problemas al actualizar las estadísticas.-
-- [Fix][Bug #104] Cuando construis nanobots o robots te permite hacer naves y defensas.-
-- [Fix][Bug #105] Bug menor en la alianza la querer editar el rango de un usuario cuando no existen rangos.-
-- [Fix][Bug #106] Se encuentran invertidas las temperaturas de las lunas.-
-- [Fix][Bug #107] Los planetas destruidos son contados como planetas activos.-
-',
-
-'2.6' => ' 24/08/09
-
-- [Fix][Varios] Varios bugs menores de estilo, plantillas y lenguaje reparados.-
-- [Fix][Bug #28] Bug en la cola de produccion del hangar.-
-- [Fix][Bug #73] Problemas con el reporte de porcetaje de luna.-
-- [Fix][Bug #78] Problemas con la lista de construcción.-
-- [Fix][Bug #82] Se pueden mover flotas desde la galaxia cuando un jugador esta en modo vacaciones.-
-- [Fix][Bug #83] Los reportes de ataque muy largos no se pueden ver completos.-
-- [Fix][Bug #85] La cantidad de recursos para construir siempre se queda en rojo.-
-- [Fix][Bug #84] Si la luna esta llena, no te permite desmontar edificios.-
-- [Fix][Bug #86] Bug que provoca errores en las alianzas.-
-- [Fix][Bug #87] Bug en el estilo del panel de administración, mostrando imagenes del juego.-
-- [Fix][Bug #88] Bug menor que muestra un texto que fue utilizado para debug.-
-- [Fix][Bug #89] Bug que permite la ampliacion del hangar cuando se estan construyendo flotas y defensas.-
-- [Fix][Bug #90] Problemas con la misión de destrucción.-
-- [Fix][Bug #91] No funciona correctamente el almirante.-
-- [Fix][Bug #92] No funciona correctamente el almacenista.-
-
-- [Cambio] Ahora la lista de planetas se muestra en el panel de admnistración por id de menor a mayor.-
-',
-
-'2.5' => ' 18/08/09
-
-- [Novedad] Sistema de advertencias y errores en el panel de administración (también informa la existencia de una nueva versión).-
-- [Novedad] Ahora puedes determinar si al banear un jugador este debe entrar o no en modo vacaciones.-
-- [Novedad] Gracias a 3R1K que tradujo el panel de administración en su totalidad al idioma inglés.-
-- [Novedad] Rediseñado el panel de administración.-
-- [Novedad] Ahora la página de mensajes respeta el formato del OGame original, mostrando a los operadores del juego.- 
-- [Novedad] Ahora cuando borras un planeta aparece planeta destruido como en el OGame original.-
-- [Novedad] El misil interplanetario ahora requiere el hangar en nivel 1 y el motor de impulso en 1 como en el OGame original.-
-- [Novedad] El misil de intercepción ahora requiere el hangar en nivel 1 como en el OGame original.-
-- [Novedad] El silo ahora requiere el hangar en nivel 1 como en el OGame original.-
-
-- [Fix][Varios] Varios bugs menores de estilo, plantillas y lenguaje reparados.-
-- [Fix][Bug #14] No se pueden usar skins externos.-
-- [Fix][Bug #47] Bug que provoca en IE que no se vea el menu y quede desplazado hacia arriba al bajar demasiado en una página.-
-- [Fix][Bug #61] Problemas en el conteo de los jugadores en la visión general.-
-- [Fix][Bug #62] Pequeño bug que no muestra los stats correctamente en el overview.-
-- [Fix][Bug #63] Bug en la función del manejo de las sesiones.-
-- [Fix][Bug #64] Bug con los permisos y con las lunas, evitando que sean atacadas.-
-- [Fix][Bug #65] Bug que no permite espiar desde flota pero si desde la galaxia.-
-- [Fix][Bug #66] Problemas en los niveles del phalanx.-
-- [Fix][Bug #67] Producción ilimitada de misiles.-
-- [Fix][Bug #68] Bug en el link para Continuar/Volver luego de enviar un mensaje circular en la alianza.-
-- [Fix][Bug #69] Bug que muestra mal los mensajes de error cuando un usuario no esta logueado.-
-- [Fix][Bug #70] Problemas con el salto de línea en los mensajes circulares.-
-- [Fix][Bug #71] Problemas con la misión estacionar aliado, muestra un mensaje de que el jugador es muy fuerte.-
-- [Fix][Bug #72] Bug en la diferencia de energía consumida actual, anterior y posterior.-
-- [Fix][Bug #74] No se puede abandonar la alianza.-
-- [Fix][Bug #75] Problemas en la actualización de puntos de algunos jugadores.-
-- [Fix][Bug #76] La misión de espionaje ignora el estado de vacaciones desde la visión de galaxia.-
-- [Fix][Bug #77] Al hacer regresar una flota con misión mantener posición no descuenta los tiempos correctamente.-
-- [Fix][Bug #79] Bug que permite incrementar las tecnologías (Gracias a mikey302 y death).-
-- [Fix][Bug #80] Bug en el limite de envio máximo de expediciones.-
-- [Fix][Bug #81] Bug en la visión general de la alianza, mantiene el nombre "Fundador" del fundador de la alianza.-
-
-- [Cambio] Ahora el número de la versión se obtiene de la base de datos.-
-- [Cambio] Mejoras de seguridad en la página de la alianza.-
-- [Cambio] Noticias removidas.-
-- [Cambio] Mejorada la velocidad en que se genera la página de estadísticas y algunos cambios menores.-
-- [Cambio] Nuevas alertas de presencia del directorio install y de escritura del archivo config.php.-
-- [Cambio] Los recicladores ahora sólo pueden transportar 20.000 unidades de recursos como en el OGame original.-
-- [Cambio] Removida la página de contacto, ahora puedes encontrar a los adms/mods/oper en el panel de mensajes como en el OGame.-
-- [Cambio] Ahora a la derecha del nombre de la luna aparece la referencia (Luna) como en el OGame original.-
-- [Cambio] Ahora si en la visión general tienes seleccionada la luna no se mostrará esta otra vez a la izquierda.-
-- [Cambio] Reformas en la galaxia en código y organización de las clases y plantillas.-
-- [Cambio] Juego adaptado al skin original del OGame, ahora el juego será a su vez compatible con cualquier skin.-
-',
-
-
-'2.4' => ' 25/07/09
-
-- [Seguridad] Protección con .htaccess de la carpeta includes, language y templates.-
-- [Seguridad] Protección con .htaccess de common.php, config.php y extension.inc.php.-
-- [Seguridad] Cambio en el protección de carpetas.-
-- [Seguridad] Mejoras de seguridad en diversos archivos.-
-
-- [Novedad] Nuevo sistema de estadísticas, más rápido, más simple, menos querys, menos carga, y nuevo panel para administrarlas; (By angelus_ira) Muchas gracias =) .-
-- [Novedad] Nuevo sistema de idioma, ahora el idioma es configurable desde el panel de administración, seleccionando un lenguaje a la vez.-
-- [Novedad] La tecnología de espionaje funciona como en el ogame original:
--------- Nivel 0 a 1 -> Sin datos de la flota.-
--------- Nivel 2 a 3 -> Número total de naves.-
--------- Nivel 4 a 7 -> Número total de naves y el tipo de las naves.-
--------- Nivel 8 -> Número total de naves, tipo de nave y cantidad de cada tipo.-
-
-- [Novedad] Ahora el administrador puede decidir si los administradores y/o moderadores se les actualizarán o no los puntos.-
-- [Novedad] Ahora el administrador puede decidir si los administradores y/o moderadores pueden o no recibir ataques de otros jugadores.-
-- [Novedad] Ahora en las investigaciones te muestra el nivel de espionaje y computación que te dan los comandantes.-
-- [Novedad] Cuando un usuario es baneado, ahora le muestra la fecha en que finaliza su ban.-
-
-- [Fix][Varios] Corregidos varios bugs menores de redirección, visuales, textos y configuraciones.-
-- [Fix][Bug #1] Al achicar la pantalla se superpone el menu de recursos con el resto del cuerpo.-
-- [Fix][Bug #2] Ahora cuando una cuenta es baneada, el jugador baneado no podrá acceder a la cuenta de ningun forma.-
-- [Fix][Bug #3]	Al borrar una luna, ya no borrará el planeta.-
-- [Fix][Bug #4] Reparados algunos bugs en el phalanx.-
-- [Fix][Bug #8] Corregida la visión del imperio, ahora muestra las investigaciones.-
-- [Fix][Bug #9] Ahora al cerrar el servidor un usuario común no podrá ingresar.-
-- [Fix][Bug #10] Problemas en los permisos de las alianzas.-
-- [Fix][Bug #11] Ahora al cerrar el servidor no desaparece más el mensaje con el motivo para cerrarlo.-
-- [Fix][Bug #12] Ahora la misión desplegar funciona correctamente.-
-- [Fix][Bug #13] La misión estacionar en aliado funciona correctamente, no se repiten más mensajes, ni tampoco produce tiempos negativos cuando se selecciona como tiempo de estacionamiento 0 horas.-
-- [Fix][Bug #15] Problemas con la misión de recoleccion o reciclaje, no entrega los recursos a quien corresponde.-
-- [Fix][Bug #16] Problemas con los tiempos del hangar al cambiar de planeta, volviendo el tiempo a su estado incial.-
-- [Fix][Bug #17] Los oficiales almirante y general funcionan correctamente [oficiales al 100%].-
-- [Fix][Bug #18] Problemas con la planta en nivel 1 permitiendo la produccion de recursos (Fixed by zorro2666).-
-- [Fix][Bug #19] Ahora si un jugador es fuerte o débil y al mismo tiempo está inactivo podrá ser atacado de todas formas.-
-- [Fix][Bug #20] Problemas de caracteres en los textos de registro.-
-- [Fix][Bug #21] No funciona el enviar mensaje cuando recibes un ataque.-
-- [Fix][Bug #22] Problemas con los mensajes al redactar un mensaje privado en la parte visual.-
-- [Fix][Bug #23] Fallan los links que redirigen a la galaxia durante los movimientos de flotas.-
-- [Fix][Bug #24] El hangar permite producir igual durante su ampliación (Fixed by zorro2666).-
-- [Fix][Bug #25] Se puede ampliar el hangar mientras de produce (Fixed by zorro2666).-
-- [Fix][Bug #26] No sale el nombre del jugador en color verde en las estadísticas.-
-- [Fix][Bug #27] Bug que permite ampliar el laboratorio e investigar al mismo tiempo.-
-- [Fix][Bug #29] Bug en el select de las estadísticas al cambiar la página mostrando la primer página siempre.-
-- [Fix][Bug #30] Problemas con los campos del planeta y las colas de contrucción.-
-- [Fix][Bug #32] Bug para ver el reporte de combate desde el panel de administración.-
-- [Fix][Bug #33] Bugs diversos menores en los misiles interplanetarios (Fixed by lordz).-
-- [Fix][Bug #34] Bugs menores que no muestran correctamente los textos.-
-- [Fix][Bug #35] Posible bug en los almacenes, incrementan menos de lo que deben.-
-- [Fix][Bug #36] No aparece el icono para lanzar misiles en la galaxia.-
-- [Fix][Bug #37] Bug que provoca que las colonias en la visión general se vean en filas de 5 y no de 2.-
-- [Fix][Bug #38] Bug en la misión colonizar, si se alcanzó el limite de planetas entonces regresa instantaneamente sin respetar los tiempos.-
-- [Fix][Bug #39] Bug en las expediciones que provoca la perdida de la materia oscura.-
-- [Fix][Bug #40] Bug que no muestra la materia oscura recolectada en las expediciones.-
-- [Fix][Bug #41] Pequeño bug que provoca un error en el update de puntos (Fixed by angelus_ira).-
-- [Fix][Bug #42] Problemas con los textos, se pierden las frases y la cantidad de recursos en algunos reportes.-
-- [Fix][Bug #43] Problemas con la proteccion de novatos al enviar sondas desde la galaxia y desde flota.-
-- [Fix][Bug #44] Problemas con el js que actualiza los recursos, no teniendo en cuenta la velocidad del servidor.-
-- [Fix][Bug #45] Los almacenes funcionan mal, debido a un bug en la relación de incremento por nivel.-
-- [Fix][Bug #46] bbCode ni HTML funcionan en los textos de la alianza.-
-- [Fix][Bug #48] Se perdió el texto de advertencia en las expediciones.-
-- [Fix][Bug #49] Problemas con la actualización de puntos de la alianza.-
-- [Fix][Bug #50] Problemas con los atajos.-
-- [Fix][Bug #51] No aparece el icono de los mensajes para responder.-
-- [Fix][Bug #52] Bug en la alianza que probaca un error en la base de datos.-
-- [Fix][Bug #53] Problemas de duplicación en la misión transportar.-
-- [Fix][Bug #54] Bug que no permite generar las estadísticas (Fixed by angelus_ira).-
-- [Fix][Bug #55] Bug que mostraba la luna luego de que fuera destruida.-
-- [Fix][Bug #56] Bug que no muestra el porcentaje de creación de las lunas.-
-- [Fix][Bug #57] Bug que provoca que no se muestren los mensajes en las expediciones.-
-- [Fix][Bug #58] No se muestran los informes de construcción en el panel del admin.-
-- [Fix][Bug #59] Los reportes de construcción no figuran en ninguna categoría.-
-- [Fix][Bug #60] Bug que permitia obtener tecnologías sin ningún costo.-
-
-- [Cambio] Optimización del manejo de flotas (By shoghicp).-
-- [Cambio] Optimización del overview del admin (By jtsamper).-
-- [Cambio] Reorganizadas algunas carpetas.-
-- [Cambio] Ahora los administradores no podrán borrarse a si mismos.-
-- [Cambio] Ahora sólo los administradores podrán borrar jugadores.-
-- [Cambio] Reducción de líneas y simplificación en el panel de admnistración.-
-- [Cambio] Finalmente el directorio includes queda definido con 3 carpetas (classes, functions y pages).-
-- [Cambio] Integrado el auto-update a index.php en la carpeta install.-
-- [Cambio] Cuando se registra un usuario ahora es redirigido directamente dentro del juego.-
-- [Cambio] Se volvio al viejo sistema de mensajes.-
-- [Cambio] El pack de idioma de divide en 4 archivos:
-
--------- ADMIN.mo -> TODO LO DEL PANEL DE ADMINISTRACIÓN.-
--------- CHANGELOG.mo -> CHANGELOG TAL Y CUAL COMO ES CONOCIDO.-
--------- INGAME.mo -> TODO EL CONTENIDO INTERNO DEL JUEGO Y NO ACCESIBLE SIN TENER UNA CUENTA.-
--------- PUBLIC.mo -> TODO EL CONTENIDO PÚBLICO DEL JUEGO (index.php, reg.php, clave perdida y contacto).-
-
-- [Cambio] Ahora en la página de la flota se muestra correctamente la velocidad de las naves al posicionar el mouse sobre el nombre de las mismas.-
-- [Cambio] Ahora al realizar cualquier movimiento de flota desde la galaxia, también se pasa el valor de la misión por lo que si por ejemplo seleccionas atacar ya aparecerá marcado en el envío de las flotas.-
-- [Cambio] Ahora si el jugador esta inactivo podrá ser atacado, funcionando de la misma forma que en el ogame original.-
-- [Cambio] Los archivos ShowFleetPage.php, floten1.php, floten2.php, y floten3.php ahora utilizan plantillas.-
-- [Cambio] Finaliza el soporte a las siguientes versiones v1.4a/v1.4b/1.4c,por lo tanto no habrá más auto-update.php.-
-- [Cambio] class.FlyingFleetHandler.php maneja todo lo que sea flotas, misiones y funciones especificas de las mismas.-
-- [Cambio] Eliminada la experiencia de guerrero y minero.-
-- [Cambio] Las funciones CreateFleetPopupedMissionLink, CreateFleetPopupedFleetLink y BuildHostileFleetPlayerLink fueron hubicadas en class.FlyingFleetsTable.php.-
-- [Cambio] Dentro de la clase class.FlyingFleetsTable.php, encontramos las funciones BuildFleetEventTable y BuildFlyingFleetTable y todas las funciones que estas necesitan para funcionar.-
-- [Cambio] rw.php ahora se llama CombatReport.php.-
-- [Cambio] raketenangriff.php del root cambiado a MissilesAjax.php; y flottenajax.php cambiado a FleetAjax.php.-
-- [Cambio] La función GetNextJumpWaitTime fue movida de GeneralFunctions.php a class.ShOWInfosPage.php.-
-- [Cambio] infos.php y jumpgate.php se encuentran en class.ShOWInfosPage.php.-
-- [Cambio] Eliminado quickfleet.php no tenía utilidad.-
-- [Cambio] Home reprogramado y simplificado.-
-- [Cambio] Ahora los oficiales espía y comandante son obtenidos desde la base de datos directamente y no suman espionaje y computación, asi es más fácil de administrar.-
-- [Cambio] constantes.php nuevamente se llama constants.php y funciones.php se llama ahora GeneralFunctions.php.-
-- [Cambio] class.ShowShipyardPage.php maneja la construcción de defensas y naves.-
-- [Cambio] Implementado el diseño del OGame original para el overview.-
-- [Cambio] Adaptado el diseño de la página de los oficiales al resto del juego.-
-- [Cambio] En la visión de la galaxia no se realizan mas revisiones de los campos de los planetas.-
-- [Cambio] La función sendnewpassword fue integrada al lostpassword en el archivo index.php.-
-- [Cambio] Limitada la query que traia los datos en la visión del imperio, reducida un poco la carga.-
-- [Cambio] Las funciones de Strings.php fueron movidas a funciones.php.-
-- [Cambio] Ahora si no tenes materia oscura para reclutar oficiales aparecerá el reclutar en rojo y bloqueado.-
-- [Cambio] Notar que el manejo de las páginas esta en game.php.-
-- [Cambio] Todas las páginas del juego ahora se manejan con funciones y/u objetos.-
-- [Cambio] Inicio de la exportación del código a objetos.-
-- [Cambio] Eliminados los title de las páginas, ahora sólo se muestra el nombre del servidor.-
-- [Cambio] Ahora la base lunar sólo da 3 campos por nivel, tal cual y como es en el ogame original.-
-- [Cambio] Ahora para mostrar que un usuario fue baneado, se imprime un texto y no se recurre a una plantilla.-
-- [Cambio] Ahora no aparecen más mensajes de confirmación al editar, crear o borrar una nota.-
-- [Cambio] Ahora las notas nuevamente se abren en un pop-up.-
-',
-
-'2.3' => ' 30/05/09
-
-- Corregido un bug que no permitía cambiar el rango a los miembros dentro de las alianzas.-
-- Varios cambios en el panel del admin:
-
--------- Integrados todos los archivos de lenguaje.-
--------- Renombrado el archivo para el reset del universo.-
--------- Unos cuantos cambios en mats.php, tanto de estilos como limpieza de código.-
--------- Cambios en el left-menu del panel de administración.-
--------- Renombrados algunos archivos y realizadas algunas correciones menores.-
--------- Unos cuantos ajustes en los textos y plantillas de varios archivos.-
--------- Mensaje de confirmación al intentar eliminar a un jugador del servidor.-
--------- El archivo mats.php ahora se llama adminresources.php, ademas se le integro todos los archivos que manejaban las tecnologías y recursos.-
--------- Solucionado el bug de la actualización de puntos.-
--------- Nueva función (optimizar tablas) (By Saint).-
--------- Corregido un bug que al crear una luna no le asignaba el nombre seleccionado.-
--------- Nueva función (eliminar luna) (By tonique).-
--------- Corregido un bug que en la lista de lunas no mostraba el id real de la luna.-
--------- Si el usuario no tiene nivel 1 al menos no podrá ver nada del panel de administración.-
--------- Optimizadas algunas querys en messall.php
--------- Eliminado el QueryExecuter.php
-
-- Se finalizá el soporte a las versiones v1.4d/v1.4e/v1.4f y también el auto-update de las mismas.-
-- Eliminadas algunas querys innecesarias de MissionCaseMIP.php.-
-- Se elimino una query innecesario de MissionCaseRecycling.php.-
-- Limpieza de la base de datos de campos innecesarios dentro de la tabla users.-
-- Algunos cambios y mejoras en el update.php.-
-- Ahora sólo sumarán puntos de guerrero los jugadores que realicen batallas y no ambos.-
-- Reparado un bug que mostraba el mensaje de la flota al finalizar la misión.-
-- La experiencia del minero ya no se muestra más con decimales.-
-- Se volvió al antiguo diseño de la construcción de edificios.-
-- Corregido un bug que en al finalizar una construcción en el overview aparecía Construcción() en vez de Libre.-
-- Algunas modificaciones en los créditos.-
-- Modificados algunos aspectos en el aspecto interno del juego.-
-- Cambiada la imagen dentro del juego.-
-- Rediseñado el index, espero que les guste.-
-- Agregado un favicon, cada uno podrá cambiarlo por el que quiera.-
-- Eliminados algunos residuos provenientes de otras versiones.-
-- Eliminados los frames, ahora el menu se muestra con la función ShowLeftMenu.php y algo de estilos css para ajustar todo.-
-- Cambiados todos los $xnova_root_path por $xgp_root.-
-',
-
-'2.2' => ' 06/05/09
-
-- Se reemplazo el menú derecho e izquierdo por el original, y la imagen del fondo también.-
-- Revisado todo messages.php,se eliminaron querys innecesarias, se organizo el código, se restringieron algunas querys para optimizar la página, se elimiaron elementos sin utilidad y se integro el lenguaje.-
-- Toda la galaxia fue revisada, se hicieron algunas correciones en los textos y algunas mejoras visuales.-
-- Corregido un bug que impedia cambiar la cantidad de planetas, sistemas y galaxias que se podían utilizar en el universo (modificable desde constantes.php), recomiendo dejarlo en 9-499-15, asi no saturan mucho el juego.-
-- Renombrado functions.php a funciones.php
-- Limpieza y revisado de constants.php, renombrado a constantes.php.-
-- Corregido un bug en la página de tecnologías.-
-- Eliminadas las vars de los mensajes, no tenían utilidad.-
-- Se revisaron nuevamente todas las funciones y fueron nuevamente reasignadas utilizando el sistema de funciones_A y funciones_B.-
-- Solucionado el bug de las páginas en blanco, dejando la versión bastante estable [BETA].-
-- Nueva forma de distribuir las funciones, en A y B. Para mas detalles lean la información que deje comentada en commons.php, esto es provisorio, aunque creo que es la mejor forma de agilizar el juego, y tenerlo más estable.-
-- Pequeño cambio en el ingreso, eliminando algunas lineas.-
-- Algunos cambios en el commons.php y eliminadas algunas cosas innecesarias.-
-- Corregido un pequeño bug en las listas de lunas.-
-- Corregido un bug en la opción de crear lunas.-
-',
-
-'2.1' => ' 02/05/09
-
-- Pequeño cambio en el index y la selección de la página.-
-- Incluido reg.mo directamente a reg_form.tpl y reg.php.-
-- Modificado el diseño del registro y de la página de clave perdida.-
-- Correcciones gráficas en el index.-
-- SACS funcionando al 50% [problemas en la coordinación de los tiempos y en la visión de los movimientos de flotas].-
-- Cambio visual en las estadísticas, ahora el *, +1 y -1 (rankplus), se muestra con js(overlib).-
-- Limpieza en commons.php con lo que durante el movimiento de flotas reducira la carga del juego.-
-- Ahora al realizar un espionaje ya no aparecerá la página en blanco ni tampoco tirara error.-
-- Corregidos unos cuantos bugs provocados por la distribución de las funciones.-
-- Nuevas imágenes de planetas, mucho más vistosas.-
-- Corregido un pequeño bug que no permitía ver las páginas publicas(contact.php, reg.php, credit.php y la sección de clave perdida).-
-',
-
-'2.0' => ' 23/04/09
-
-- Visión general del panel del admin mejorada, ajustada mejor la tabla e integrado el lenguaje a las plantillas.-
-- Simplificación del sistema de créditos, e integración del lenguaje.-
-- Integrado el idioma a resources.php y a las respectivas plantillas.-
-- Cambios en las tablas de las estadísticas, inclución del lenguaje a las plantillas, revisión del código y algunas mejoras en la carga.-
-- Algunos cambios visuales en fleet.php.-
-- Eliminada la función AdminMessage, cumplia la misma función que message.-
-- Optimización e integración del lenguaje a admin/settings.php
-- Algunas correcciones que previenen que por la actualización de puntos se provoque un bug en el panel de administración.-
-- Optimizadas algunas querys de las flotas en commons.php.-
-- Correciones en algunos textos en los mensajes de movimientos de flotas.-
-- Mejora de seguridad, no podrás ver las páginas internas del juego sino te logueaste.-
-- Ahora se pueden ver bien los mensajes de error e informes de los mensajes.-
-- Corregido un bug que al abandonar un planeta no borraba la luna, y esta podía ser utilizada.-
-- Simplificación y reorganización de BatimentBuildingPage.php.-
-- Correcciones visuales en los edificios, y correciones de algunas tablas para ajustarlas mejor.-
-- Nueva imagen de materia oscura en el menú superior, también se ampliaron los tamaños de las imágenes.-
-- Reparado un bug que permitía mover flotas en modo vacaciones.-
-- Traducido el mensaje del modo vacaciones, y corregido un bug que no mostraba el tiempo real de vacaciones.-
-- Cambiados algunos $ugamela por $xnova.-
-- Implementación de seguridad, fue renombrado el archivo extension.inc a extension.inc.php, no estaba protegido y podía leerse su contenido.-
-- Algunas correcciones y simplificación del código en buddy.php.-
-- Revisado todo el notes.php:
-
---------- Plantillas agregadas a su carpeta correspondiente "notes".-
---------- Algunas correciones visuales.-
---------- Integración del idioma a las plantillas.-
---------- Reparados algunos bugs.-
---------- Ahora al editar el mensaje, se muestra el asunto y el mensaje.-
---------- Conteo de caracteres en js aplicado.-
-
-- Eliminadas algunas funciones de administración.-
-- Reparado un bug que no mostraba el límite real de las flotas posibles a enviar.-
-- Oficiales:
-
---------- Algunas correciones visuales.-
---------- Oficiales pendientes por reparar: Almirante y General.-
---------- Oficiales funcionando: Geólogo, Ingeniero, Tecnócrata, Constructor, Científico, Almacenista, Defensor, Bunker, Espía, Comandante, Destructor, Raider y Emperador.-
---------- Reparados los oficiales espía y Comandante.-
---------- Reparado el oficial empeador(By thyphoon) y destructor(By angelus_ira).-
---------- Integración del idioma a las plantillas y código.-
-
-- Limpieza de scripts.-
-- Re-organizadas todas las funciones del juego (optimizandolo increíblemente)(cada función se asigno a su archivo correspondiente).-
-- Eliminado CombatEngine.php.-
-- Algunas correciones en commons.php para agilizar el juego en general.-
-- Limpieza y optimización del instalador.-
-- La función doquery fue unificada también dentro de functions.php.-
-- Las funciones de unlocalised.php fueron integradas a functions.php
-- Limpieza de funciones inutiles en includes/functions:
-
---------- Eliminado RevisionTime.php.-
---------- Eliminado SecureArrayFunction.php.-
---------- Eliminado ResetThisFuckingCheater.php.-
---------- Eliminado ElementBuildListQueue.php, el archivo ElementBuildListBox.php cumple la misma función y se encuentra en uso.-
-
-- Limpieza en functions.php,se borraron algunas funciones sin utilidad alguna.-
-- Limpieza en unlocalised.php,se borraron algunas funciones sin utilidad alguna o vacías.-
-- Se reorganizaron casi todas las plantillas y se borraron algunas más sin utilidad (algunas pedientes a organizar).-
-- Se borraron todas las plantillas de la galaxia que no tenían utilidad(la galaxia la genera el código php dinámicamente).-
-- Revisado todo el search.php:
-
---------- Borradas algunas lineas.-
---------- Reorganizado el código.-
---------- Reorganizadas las plantillas en una carpeta en templates.-
---------- Se integro search.mo a las plantillas.-
---------- Se corrigió un bug que no mostraba la alianza en la búsqueda por usuarios.-
---------- Se corrigió un bug que no redirigía correctamente a la vista de la alianza.-
---------- Se corrigió un bug dentro de la alianza para poder verla desde search.php
-
-- Revisado todo el mercader:
-
---------- Adherido marchand.mo a sus respectivas plantillas.-
---------- Corregidas todas las plantillas y bugs en la muestra de los recursos(no aparecen más en eltop).-
---------- Simplificación del código php, reorganizado y reprogramado lo que no funcionaba bien.-
---------- Corregidas las validaciones, admiten ceros, pero no números negativos.-
---------- Añadidas las plantillas respectivas a una carpeta en templates(para una mejor organización).-
-
-- Cookies.mo integrado a su archivo correspondiente.-
-- Algunos textos fueron colocados en system.mo, ya que hacen al caracter general del juego, y no de un sector en especifico.-
-- Optimizado MissionCaseAttack.php.-
-- Optimizado el overview, se elimino código innecesario, se reorganizó, se eliminaron querys que no tenían utilidad y se integro el idioma a las plantillas.-
-- Reubicados algunos archivos.-
-- Limpieza de la base de datos, de cosas que no se utilizaban.-
-- Reorganizado el menú de opciones, integración del idioma a la plantilla y se eliminaron querys innecesarias.-
-- Algunos archivos de texto fueron integrados directamente a los archivos para agilizar el juego y su velocidad.-
-- Se reorganizaron algunas plantillas y se eliminaron algunas otras inútiles.-
-- Eliminados los emoticones.-
-- Como siempre actualizados el auto-update y el instalador para que todo sea más facil.-
-- Cambios en el instalador.-
-- Optimizadas unas cuantas páginas.-
-- login.php, lostpassword.php y logout.php unificados en el index.php mejorando un poco el rendimiento y organización.-
-- Algunas correcciones visuales en la visión del imperio.-
-
-- Revisada toda la alianza:
-
---------- Mejoras varias.-
---------- Mejoras en lenguajes.-
---------- Mejoras en plantillas.-
---------- Se agregaron validaciones.-
---------- Se reorganizó el código.-
---------- Se reparo el texto de las solicitudes, ahora podrás editarla.-
---------- Todos los mensajes ahora te redirigiran.-
---------- Se corrigió un bug en los rangos.-
---------- Se optimizó un poco, se eliminaron lineas inútiles y se fixearon algunos bugs.-
---------- Se repararon todos los errores encontrados en los textos y plantillas que no se mostraban, asi como cosas que no se realizaban.-
-
-- Cuando un usuario falla al intentar el login ahora es redirigido al inicio.-
-- Mejorado el index ahora funciona mucho más rápido.-
-- Mejorados algunos textos en general, y corregidos algunos detalles.-
-- Rediseñado el sistema de ingreso al panel del admin y regreso al juego.-
-- Limpieza de archivos y residuos.-
-- Eliminado el chat, loteria, razas, simulador, tutoria, records y todo aquello que no consideraba necesario.-
-- Reprogramados los menús derechos e izquierdos.-
-
-- Un resumen de las figuras más destacadas de este proyecto:
-
---------- Tomo las riendas sobre la 1.5b saltando a la 2.0 para trerles todas las mejoras enunciadas a continuación [By lucky].-
---------- Partiendo de la version 0.9a llegando hasta la 1.5b del XG Proyect por lucky, PowerMaster, Calzon, Tarta, Tonique y muchas personas más.-
---------- Continuado por UGamela Britania con varias mejoras, seguido por el equipo francés Raito, Chlorel, e-Zobar y Flousedid.-
---------- Proyecto ogame para todos y con todas las funciones iniciado por Perberos.-
-',
-
-'1.5b' => ' 03/04/09
-
-- Cambios y correcciones en templates y textos.-
-- Loteria reparada (By lucky).-
-- Correciones en el instalador, soportando correctamente las razas, y también en el auto-update.-
-- Razas corregidas (By Tonique).-
-- Corregido un bug en el instalador.-
-',
-
-'1.5a' => ' 26/03/09
-
-- Corregido el link de administración.-
-- Mejoras en el instalador.-
-- Fix corregido bug que mostraba mal la leyenda en la galaxia.-
-- Actualizado el auto-update para poder pasar fácilmente de la versión 1.4f o de la 1.4c a la 1.5a.-
-- Ahora la instalacion incluye la lotería y el chat, no deberás hacer nada manualmente.-
-- Arreglada la página de amigos ahora debería mostrar bien a tus amigos y no a vos (By lucky).-
-- Mejorado el auto-update de puntos, ahora podrás instalar sin realizar modificaciones en los archivos.-
-- Unificamos la versión de XG Proyect con la de calzon.-
-',
-
-'1.4f' => ' 18/03/09
-
-- Fix pequeñas correciones en la base de datos.-
-- Fix pequeñas correcciones en traducciones generales.-
-- Fix Corregidas variables en alianza, nueva estructuracion, mejor optimizada.-
-- Mod Agregado terraformer y super terraformer a constants.php, (personalizable campos que dara cada uno).-
-- Mod Administradores u operadores no aparecen mas Estadisticas.-
-- Mod Completadas algunas imagenes faltantes en el skin, cambiada la de la supernova por una de mejor calidad.-
-- Mod Optimizacion de consultas y variables generales (sistema mas limpio).-
-- Mod Nuevo edificio, Super Terraformer, aumenta 10 campos por nivel (winjet).-
-<font color="red">- Tecnologias y naves unicas de razas. 70% completado.-</font>
-<font color="red">- Formas de Gobierno (democracia, socialismo y pirateria) 30% completado.-</font>
-<font color="red">- Fix a bug destruccion de luna.-</font>
-',
-
-'1.4e' => ' 12/03/09
-
-- Fix a textos e imagenes de naves y defensas nuevas asi como a razas.-
-- Fix Enviar mutiples flotas, expediciones, misiones, al ir atras (modo test por ahora).-
-- Fix Corregido bug en consumo de deuterio (flotenajax.php).-
-- Fix corregido bug al abandonar colonias por fallo seguridad (overview.php).-
-- Fix En Estadisticas aparecias en una alianza aunque ya hubieras salido (alliance.php).-
-- Mod 4 Nuevas naves: Interceptor, Cazador Crucero, Transportador y Titan.-
-- Mod 2 Nuevas defensas: Cañon de Fotones y Base Espacial.-
-- Mod Nueva Tecnologia de Desarrollo, aumenta colas posibles a edificios.
-<font color="green">- Mod Razas: Humanos, Aliens, Predators y Darks, con cada nivel aumenta:.-</font>
-<font color="green">- Humanos: Mina Metal +3% produccion, +2% Ataque y Escudos.-</font>
-<font color="green">- Aliens: Mina Cristal +3% produccion, +3% Blindaje.-</font>
-<font color="green">- Predators: +10% Ataque.-</font>
-<font color="green">- Darks: Sintetizador Deuterio +3% produccion, +4% Blindaje y Escudos.-</font>
-',
-
-'1.4d' => ' 09/03/09
-
-- Fix algunas traducciones.-
-- Fix Ajustado a resolucion 1024x768, reacomodo en columnas de edificios y frames.php-
-- Fix multiplicacion/Duplicacion de ligeros y estrellas de la muerte (flotten1.php).-
-- Fix Seguridad de carpetas, una mas, aparte de la que ya existia.-
-- Fix en Mercader, devolvia recursos al meter numeros negativos (marchand.php).-
-- Fix Misiles (projectxnova) adaptado y corregido a esta version (MissionCaseMIP.php).-
-- Fix agregado entero en funcion investigaciones (ResearchBuildingPage.php).-
-- Fix, pequeña correccion en alianzas rangos y administracion(alliance.php).-
-- Fix, Correccion en Galaxia (galaxy.php).-
-- Mod/Fix Arreglo a mensajes(project xnova) adaptado, corregido y aumentado para esta version.-
-- Mod actualizacion automatica (ahora si es automatica) y no consume recursos.-
-- Mod Edificios en columnas de 5.-
-- Mod Menu Derecho agregada compatibilidad, reordenadas las funciones.-
-- Mod Agregado Records (Records.php).-
-- Mod Agregado Chat.-
-- Mod Agregado Simulador de Batallas.-
-- Mod Agregado Loteria (project xnova), adaptado y corregido a esta version.-
-- Mod Reacomodo vision general (projectxnova), corregida compatilidad (overview.php).-
-- Mod Recursos en tiempo real (tonique) modo test por ahora.-
-- Borrado actualizacion automatica, consume muchos recursos (todos haciendo click a vision general).-
-',
-
-'1.4c' => ' 08/02/09
-
-- Eliminados los recursos en tiempo real debido a que se quedaban congelados.-
-- Reparados los oficiales espía y comandante.- (By jtsamper foro project.xnova.es)
-- En la galaxia ya no puedes reciclar o espiar sin deuterio.-
-- Prevenir números negativos y carácteres no numéricos en la galaxia (By neurus foro Xproject.xnova.es).-
-- Ahora para ver la galaxia necesitas deuterio (Original project.xnova.es fixeado por lucky).-
-- Al disolver una alianza esta ya no aparece en las estadísticas (By xesar foro project.xnova.es).-
-- Corregida una redirección que funcionaba mal en la alianza.-
-- Corregido un pequeño error de sintaxis en la flota que tiraba severos reportes de errores (Gracias edering).-
-- Agregado un mensaje recordatorio de como se debe incrementar o eliminar la materia oscura (Gracias edering).-
-- Anuncios eliminados (Por votación de los usuarios de XG).-
-- El auto-update no soporta más las siguientes versiones:  v0.9a/v1.0a/v1.0b/v1.1a/v1.1b/v1.1c/v1.2a/v1.2b/v1.2c/v1.3a (Si tienes alguna des estas versiones deberás usar un update anterior).-
-- Ahora en la busqueda al hacer click en el link te redirecciona al sistema del jugador y no al tuyo (By Anghelito).-
-',
-
-'1.4b' => ' 06/12/08
-
-- Desbaneo reparado.-
-- Oficiales reparados.-
-- Ahora al iniciar sesión con tu cuenta, iniciará siempre desde el planeta principal y no desde una colonia.-
-- Un moderador u operador ya no podrá cambiarse los permisos a Administrador.-
-- Galaxia optimizada.-
-- Ahora cuando colonizas tu planeta se llamará "Colonia" y no "Planeta Principal" (By lucky).-
-- El auto-update no soporta más las siguientes versiones:  v1.0a/v1.0b/v1.1a/v1.1b/v1.1c/v1.2a/v1.2b/v1.2c/v1.3a (Si tienes alguna des estas versiones deberás usar un update anterior).-
-- Corregidas algunas redirecciones y mejoradas otras.-
-- Ahora puedes usar espacios en blanco en el nombre de tu planeta (By lucky).-
-- Borrado de archivos innecesarios (esto no termina más).-
-- Reparada la tabla que muestra las flotas en vuelo en el panel del admin.-
-- Mejoras, organización, limpieza y optimización del lenguaje (No pongo más que cambie en los lenguajes porque ya es detallar mucho, para nada).-
-',
-
-'1.4a' => ' 06/12/08
-
-- Reparado el reset del universo.-
-- El auto-update no soporta más las siguientes versiones: v1.0a/v1.0b/v1.1a/v1.1b/v1.1c/v1.2a (Si tienes alguna des estas versiones deberás usar un update anterior).-
-- Más limpieza de archivos innecesarios.-
-- Limpieza y pulido del panel de admin (lenguaje).-
-- Lista de planetas <-> Lista de usuarios cambiado (lenguaje - Gracias Alberto14).-
-- Ahora puedes agregar y remover materia oscura desde el panel de administración (By lucky).-
-- Actualización en tiempo real de los recursos (By Alberto14).-
-- Cambidas las imágenes del XNova, por las imágenes del OGame original.-
-- Borradas imágenes innecesarias.-
-- Optimizadas las imágenes de los oficiales.-
-- Eliminado el multi totalmente (A pedido del público).-
-- Eliminados los records totalmente (A pedido del público).-
-- Eliminado el chat totalmente (A pedido del público).-
-- Traducidos algunos textos en el formulario de envío de mensajes (lenguaje).-
-- Complementado el infos.mo con los datos del verdadero OGame (lenguaje).-
-- Pulido y limpieza del search (lenguaje).-
-- Pulido y limpieza del overview (lenguaje).-
-- Pulido y limpieza del leftmenu (lenguaje).-
-- Pulido y limpieza del registro (lenguaje).-
-- Pulido y limpieza del login (lenguaje).-
-- Cambios de lenguaje en notes.-
-- Cambios en el login Contact -> Contacto y Forum -> Foros.-
-- Eliminado player.mo - no tenía ninguna utilidad.-
-- Limpieza del archivo de lenguaje login.-
-- Reemplazados todos los "Titanio", "Silicio" y "Gashofa" por "Metal", "Cristal" y "Deuterio".-
-- Correciones de lenguaje en el install y limpieza de dicho archivo (Gracias Alberto14).-
-',
-
-'1.3c DMV' => ' 30/11/08 "DMV = Dark Matter Version Exclusivo Xtreme-gameZ.com.ar"
-
-- Correciones en los lenguajes de la supernova o super nave de batalla y el protector planetario (algo siempre me olvido).-
-- Modificación de la ubicación de algunos arhcivos.-
-- Eliminada una carpeta llamada .svn a la cual no le encontre utilidad.-
-- Limpieza de archivos innecesarios y duplicados.-
-- Implementada la materia oscura (Código 100% x lucky) (Gracias Reyndio por la idea).-
------ Los oficiales ahora se manejan por la materia oscura 1 punto oficial = 1000 materia oscura.-
------ En las expediciones se obtiene la materia oscura necesaria.-
------ No existen más los puntos de oficiales, aun asi se sube el nivel de minero y flota.-
------ Se siguen mostrando los registros de ataque.-
------ Auto-Update actualizado especialmente para soportar la materia oscura.-
-
-- Ya no se pueden atacar lunas + fuerte o + debiles que uno (By Neurus).-
-- Panel del admin, "Utilisateur?" -> "¿Usuario?", modificación en el lenguaje.-
-- Por razones de seguridad elimine el phpinfo.-
-- Panel del admin, "Lista de Usuarios" -> "Lista de Planetas", modificación en el lenguaje (Gracias Alberto14).-
-- Solucionado el error en el orden por id de la alianza (By tarta).-
-',
-
-
-'1.3b EU' => ' 30/11/08
-
-- No hace falta más ingresar el nombre del planeta, por defecto es "Planeta Principal".-
-- Eliminadas imagenes del "sexo".-
-- Optimizada la imagen del inicio, ahora carga más rápido.-
-- Compatibilidad del auto-update con todas las versiones.-
-- Nueva versión del auto update, más comprensible(creo).-
-- Reparado el problema con la instalación (Gracias Anghelito).-
-',
-
-'1.3a' => ' 29/11/08
-
-- XNova 100% TRADUCIDO AL ESPAÑOL [PUDE HABERME SALTEADO ALGO POR FAVOR AVISAR](By lucky).-
-- Limpieza de scripts, eliminamos varios archivos de la carpeta scrips que notamos no necesarios.-
-- Reparada la validación del index, ahora si la carpeta install existe no podras acceder al juego (By lucky).-
-- Arreglado el modo vacaciones, ya no puedes entrar en vacaciones cuando estas atacando (By lucky).-
-- No se muestran más los recursos negativos.-
-- Redirección luego de enviar una flota (By tarta).-
-- Ahora los días se muestran con una "d" y no con una "j" (By tarta).-
-- Nuevamente agregamos los emoticons.-
-- Ahora puedes cambiar el nombre en el juego, por fin solucionamos esto.-
-- Nuevo diseño del auto-update, mucho mas vistoso y atractivo.-
-- Reparada la instalación, ahora funcionan los misiles al instalar el juego.-
-',
-
-'1.2c EU' => ' 26/11/08
-
-- Reparada la instalación.-
-',
-
-'1.2b' => ' 26/11/08
-
-- Misiles finalmente funcionando (By lucky).-
-- Desbaneo automático (By Anghelito).-
-- Reparado el modo vacaciones.-
-- Traducciones en varios archivos (By edering).-
-- Reparado el modo debug (By tarta).-
-- Reparado el link de las notas (By lucky).-
-- Eliminada la carpeta emoticones.-
-- Fix ranking de flotas en vuelo (By Pada).-
-- Mejoras en archivos de lenguaje.-
-- Cambios en el mensaje de bienvenida.-
-- Records reparados.- (By tarta).-
-- Actualizado el auto-update para poder actualizar: 0.9a -> 1.2a / 1.1b -> 1.2a / 1.2a -> 1.2b (By lucky).-
-- Cambios en el instalador.-
-- Se elimino una tabla que no hacia falta.-
-',
-
-'1.2a' => ' 19/11/08
-
-- Actualizado el auto-update para poder actualizar: 0.9a -> 1.2a y 1.1b -> 1.2a .-
-- Reorganización, recodificación y reestructuración de los misiles interplanetarios, ademas de solucionar seberos bugs.-
-- Solo se permiten caracteres alfanumericos en el nombre de los planetas, evita serios bugs y filtros de seguridad.-
-- Arreglado el orden por puntos en la alianza.-
-- Tutorial funcionando.-
-- Correcciones en el mensaje de bienvenida pos-registro.-
-- Solucionado el bug que no permitía la transferencia de la alianza.-
-- Solucionado el bug que hace que salga el rango equivocado al usuario en la lista de miembros de la ally.-
-- Solucionado el bug que permitía que se envien solicitudes una vez que la alianza habia sido borrada.-
-- Reparada la red de investigación intergaláctica.-
-- Cupula y protector planetario funcionando, y cada una solo puede ser edificada una vez.-
-',
-
-'1.1c' => ' 19/11/08
-
-- Cambios en la organización de la carpeta templates.-
-- Algunos fixes en el leftmenu del admin.-
-- Nuevamente reparada la seccion de de Annonces (sirve para comerciar).-
-- Volvimos a implementar el leftmenu antigüo, funciona más rápido.-
-- Mejoras en algunas traducciones, y añadidas otras.-
-- Añadida la hora al chat. [Aún no funciona en hostings].-
-- Limpieza de archivos inecesarios y/o sin ninguna utilidad.-
-- Añadido el auto-update.-
-- Eliminado el upgrade desde ugamela.-
-- Mejoras en la instalación.-
-',
-
-'1.1b' => ' 30/10/08
-
-- Añadido un tutorial, desarrollado por PowerMaster para el XNova de Xtreme-gameZ.com.ar.-
-- Cambios de nombre del archivo de instalacion "Installeur" a "Instalacion de XNova".-
-- Cambios en el leftmenu para usuarios.-
-- Actualizacion de Puntos Automaticamente, ahora si anda.-
-- Introduccion del Release de Xtreme-GameZ en "credit.php" e "install.php".-
-- Cambios de idioma de carpeta "fr" a carpeta "es" (requiere instalacion).-
-',
-
-'1.1a' => ' 28/10/08
-
-- Antes, si mandaban una flota y cambian de planeta, tiraba error.-
-- Antes, cuando estaban leyendo mensajes y cambian de planeta, tiraba error.-
-- Ahora al cancelar una investigación te devuelve los recursos.-
-- Cambio en el texto del primer mensaje recibido al registrarse en el juego.-
-- Agregadas las estadísticas de batalla.-
-- Fueron agregadas las defensas al ranking de la Visión General.-
-',
-
-
-'1.0b' => ' 26/10/08
-
-- Primer release disponible para los usuarios.-
-- Eliminado el warning que aparecía en la instalación del sistema.-
-- El instalador ahora incluye la actualización de puntos automática, por ende el usuario ya no debera tocar nada en el código.-
-- Aplicada la actualización automática de puntos.-
-',
-
-
-'1.0a' => ' 24/10/08 "Versión Inicial"
-
-- Cambios de lenguaje en el changelog (100% traducido).-
-- Mejora del menú de la izquierda se "visualiza" algo mejor.-
-- Correciones de lenguaje en el install (install.mo).-
-- Correciones en el Marchand (Mercader), ya esta funcionando correctamente, no tira más ese error del lenguaje.-
-- Fixes en el link de Annonces, ahora esta funcionando, ya puedes publicar lo que desees comercias.-
-- Inicio del proyecto XG (XG Proyect) basandonos en el pack hecho por XNova versión 0.9a.-
-',
-);
-?>
\ No newline at end of file
diff --git a/language/spanish/CHANGELOG.php b/language/spanish/CHANGELOG.php
new file mode 100644
index 0000000..1490d28
--- /dev/null
+++ b/language/spanish/CHANGELOG.php
@@ -0,0 +1,1180 @@
+<?php
+
+$lang['Version']     = 'Versi&oacute;n';
+$lang['Description'] = 'Descripci&oacute;n';
+$lang['changelog']   = array(
+
+'2.10.0' => ' 06/01/12
+
+-[Mejoras]
+-- PLANTILLAS
+--- Organizadas las plantillas restantes en carpetas.-
+--- Aplicada una proteccion extra a las carpetas de las plantillas para evitar que se listen los archivos dentro de ellas.-
+--- Las plantillas .tpl ahora requieren extensi&oacute;n .php, esto es para mayor protecci&oacute;n y para que sea m&aacute;s simple trabajarlo.-
+--- Creadas las plantillas correspondientes para la p&aacute;gina de amigos/compa&ntilde;eros.-
+--- Creadas las plantillas correspondientes para la p&aacute;gina de mensajes.-
+--- Creadas las plantillas faltantes para la p&aacute;gina de la galaxia.-
+--- Pulida la p&aacute;gina de baneos y agregada la plantilla faltante.-
+--- Mejorada la muestra de errores al enviar un mensaje.-
+--- Creadas las plantillas faltantes para la p&aacute;gina class.ShowFleetPage.php.-
+--- Creadas las plantillas faltantes para la p&aacute;gina class.ShowFleetPage1.php.-
+--- Creadas las plantillas faltantes para la p&aacute;gina class.ShowFleetPage2.php.-
+--- Creadas las plantillas faltantes para la p&aacute;gina class.ShowFleetPage3.php.-
+--- Creadas las plantillas faltantes para la p&aacute;gina class.ShowFleetACSPage.php.-
+--- Creadas las plantillas faltantes para la p&aacute;gina class.ShowAlliancePage.php.-
+--- La plantilla fleetACS_table.php fue reorganizada. La misma contiene &uacute;nicamente la tabla de agregar miembros y cambiar nombre; para el resto se reutiliza la plantilla fleet_table.php.-
+--- Directorio templates renombrado a views.-
+
+-- IDIOMA
+--- Los archivos de lenguaje ahora requieren extensi&oacute;n .php, esto es para mayor protecci&oacute;n y para que sea m&aacute;s simple trabajarlo.-
+--- La p&aacute;gina de mensajes privados ahora podr&aacute; estar en varios idiomas.-
+--- Se completo las descripciones cortas del idioma espa&ntilde;ol para los edificios lunares y terraformer.-
+--- Correci&oacute;n menor de idioma en la p&aacute;gina de SACs.-
+--- No se le da m&aacute;s soporte al paquete de idioma franc&eacute;s, s&oacute;lo espa&ntilde;ol e ingl&eacute;s.-
+
+-- CORE
+--- Codificaci&oacute;n de caracteres cambiada de iso-8859-1 a UTF-8.-
+--- Copyrights actualizados, reducido el peso de los archivos en un 45%.-
+--- Eliminados los $phpEx.-
+--- C&oacute;digo pulido y estandarizado bajo un mismo formato.-
+--- Se reemplazo la variable global $xgp_root por la constante XGP_ROOT.-
+--- Se reemplazo la variable global $dpath por la constante DPATH.-
+--- Eliminada la variable global $game_config, fue reemplazada por la funci&oacute;n read_config().-
+--- Nueva funci&oacute;n read_config (lee la configuraci&oacute;n requerida y retorna su valor).-
+--- Archivos js comprimidos, la carga por el lado del cliente ser&aacute; mucho m&aacute;s r&aacute;pida.-
+--- P&aacute;ginas seteadas dentro de una clase.-
+--- El js overlib ya no se carga m&aacute;s en el login.-
+--- Optimizaci&oacute;n de querys en la p&aacute;gina de investigaci&oacute;n (sobrecarga de querys cuando estaba desarrollada la red de invetigaci&oacute;n).-
+--- common.php renombrado a global.php.-
+--- Directorio scripts renombrado a js.-
+--- Se reemplazo la tabla config por un archivo xml (se redujo 1 query en todo el juego).-
+--- Removida la variable de configuraci&oacute;n BuildLabWhileRun, no era utilizada.-
+
+-- ALLIANCE
+--- Se quito el bbCode de class.ShowAlliancePage.php y se movi&oacute; a class.BBCode.php.-
+--- El m&eacute;todo MessageForm fue renombrado a message_box.-
+--- Nuevo m&eacute;todo return_rank, retorna el rango del usuario.-
+--- Nuevo m&eacute;todo return_sort, retorna el orden seleccionado por el usuario.-
+--- Mejorado el borrado de la alianza, antes realizaba 1 query por cada usuario a borrar, ahora realiza &uacute;nicamente una.-
+
+-- FLEET
+--- Tiempo de expedici&oacute;n reducido de 10 a 5 horas.-
+--- Tiempo de mantener posici&oacute;n establecido por defecto en 1 y no en 0.-
+--- Optimizaciones en class.ShowFleet1Page.php.-
+--- Optimizaciones en class.ShowFleetACSPage.php.-
+--- Nuevo selector de atajos / shortcuts en la p&aacute;gina 1 del env&iacute;o de flotas (class.ShowFleet1Page.php).-
+--- Emprolijado el c&oacute;digo y mejoras en la p&aacute;gina 1 del env&iacute;o de flotas (class.ShowFleet1Page.php).-
+--- Emprolijado el c&oacute;digo y mejoras en la p&aacute;gina 2 del env&iacute;o de flotas (class.ShowFleet2Page.php).-
+--- Emprolijado el c&oacute;digo y mejoras en la p&aacute;gina 3 del env&iacute;o de flotas (class.ShowFleet3Page.php).-
+--- Emprolijado el c&oacute;digo y mejoras en la p&aacute;gina SAC del env&iacute;o de flotas (class.ShowFleetACSPage.php).-
+--- Corregido un bug menor que no mostraba el nombre del SAC en el t&iacute;tulo de la p&aacute;gina de SACs (antes mostraba un c&oacute;digo extra&ntilde;o).-
+
+-- MENSAJES
+--- P&aacute;gina de mensajes revisada y emprolijada.-
+--- Mejorada la velocidad de carga en la p&aacute;gina de mensajes.-
+
+-- OFICIALES
+--- Eliminados todos los oficiales secundarios, se dejaron los del OGame original.-
+--- Los oficiales producen los mismos efectos que el OGame original.-
+--- Los costes tambi&eacute;n fueron copiados (Editable desde vars).-
+--- Imagenes de los oficiales movidas al directorio del skin xgproyect.-
+--- Cantidad de materia oscura requerida por el mercader actualizada de 2500 a 3500.-
+
+-- INSTALADOR / ACTUALIZADOR
+--- Al instalar por primera vez el juego se hacen 7 querys menos durante todo el proceso.-
+--- Requiere email y clave del administrador para validar la actualizaci&oacute;n.-
+--- El sistema de encarga autom&aacute;ticamente de determinar los datos del servidor.-
+--- El usuario ya no debe seleccionar m&aacute;s la versi&oacute;n que tiene, se determina autom&aacute;ticamente.-
+--- El sistema de actualizaci&oacute;n no funciona con versiones no compatibles ni con versiones no oficiales, ya que es autom&aacute;tico.-
+
+-- PAGINAS VARIAS
+--- Ahora en las opciones de usuarios se puede elegir el directorio del skin que se desea usar (siempre y cuando el administrador haya creado otros skins).-
+--- P&aacute;gina de amigos/compa&ntilde;eros reprogramada.-
+--- Mejoras menores en la p&aacute;gina de la galaxia.-
+--- class.ShowFleetPage.php optimizado de 2 consultas a 1.-
+--- Reducci&oacute;n de querys global en el panel administrativo al cargar y realizar acciones.-
+
+-[Fixs]
+#----: Corregido un bug que no mostrar&iacute;a correctamente un skin seleccionado por un usuario.-
+#7676: No crea destructores y error en estrella de la muerte.-
+',
+
+'2.9.10' => ' 29/09/11
+*** foundation of the development team(Lucky,Green,Think,Jstar) ***
+
+-[Mejoras]
+Incluido un class.ShowInfosPage.php optimizado (by Think).-
+Optimizada importantemente la 2&ordf; p&aacute;gina de lanzamiento de flota (by jtsamper/Think)
+
+Inclu&iacute;do idioma franc&eacute;s (by Mizur).-
+C&oacute;digo repetido en class.ShowShipyardPage.php (by Alivan).-
+Rewritten ShowShortcutsPages.php with new 3 templates (by Jstar).-
+Less tpl-loads from HDD in some files (by Jstar).-
+Deleted unnecessary and heavy protection system in generalFunction.php (by Jstar).-
+Invisible debris like ogame (by Jstar).-
+
+-[Fixs]
+Arreglado un error con el nivel de edificio construyendo al cancelar en la cola de construcci&oacute;n (by Think)
+Se pueden hacer saltar sat&eacute;lites solares por el salto cu&aacute;ntico (by Think)
+Agujero de seguridad en flotas (by Think).-
+Formula de energ&iacute;a del sint. de deuterio (by Think).-
+Un SAC diferentes destinos (by Tomtom).-
+FIX expedicion nunca es destruida completamente (by Tomtom,Think).-
+No llega el informe de batalla (by Lucky,Think).-
+Deathstar speed (by Jstar).-
+Ships disappeared in spy mission (by Jstar).-
+Rapid fire of small cargo (by Jstar).-
+Old code not deleted (by Jstar).-
+Edit moon in ACP (by Jstar).-
+Buildings for free (by Jstar).-
+Planets destroyed don\'t disappear (by Jstar).-
+Planet size (by Jstar).-
+Player position and alliance total points in search page.-
+Hyperspace Portal redirect (by Quaua).-
+Varios fix time (by Quaua).-
+Send Fleet Back after AKS (youhou35).-
+
+',
+
+'2.9.9' => ' 07/04/11
+
+-[Seguridad]
+- Cerrados algunos agujeros de seguridad (By shoghicp).-
+
+-[Mejoras]
+- Se eliminaron los campos id_owner1 y id_owner2 definitivamente de la tabla rw y se reemplazo por owners (Gracias akademik).-
+
+-[Fixs]
+#1: Lanzamiento de misiles (By Think, alivan, tomtom).-
+#5167: En el mensaje global se ven todos los c&oacute;digo HTML (By tomtom).-
+#7628: La columna Acciones no aparece en galaxia.-
+#7629: Diferencia Planta de Fusi&oacute;n (By alivan).-
+#7630: La administraci&oacute;n se puede banear a si misma (By Think).-
+#7631: Diversos bugs misiles (By Think, alivan, tomtom).-
+#7632: Tiempos negativos en construcciones (By alivan).-
+#7633: No se muestra el &uacute;ltimo mensaje en el panel de administraci&oacute;n (By alivan).-
+#7634: hack: ships to colonization (By jstar).-
+#7635: Hack phalanx (By jstar).-
+#7636: hack destruction mission (By jstar).-
+#7637: Recycling without debris (By jstar).-
+#7640: CSRF attack (By jstar).-
+#7641: xss desde panel administrativo (By jstar).-
+#7643: Spy probos capacity (By jstar).-
+#7644: mantener la posici&oacute;n de amigos (By jstar).-
+#7646: Mandar naves a espiar (By Think).-
+#7649: Terraformer no cuesta energ&iacute;a (By Think).-
+#7651: resources no update before fleet arrive (By jstar).-
+#7655: overflow (By jstar).-
+
+',
+
+'2.9.8' => ' 09/01/11
+
+-[Seguridad]
+- Cerrado un agujero de seguridad (By jstar).-
+
+-[Velocidad] (By lucky)
+- Algunas mejoras globales en el c&oacute;digo.-
+- Algunas mejoras en el c&oacute;digo de la galaxia.-
+- Reducci&oacute;n de Querys Gloabales (11 a 9).
+- Reducci&oacute;n de Querys en la Galaxia (45 a 9).
+
+-[Mejoras]
+- Mejoras en las expediciones (By jstar).-
+- Mejora en el calculo de materia oscura (By h2swider).-
+
+- [Fixs]
+#4547: No se le puede cambiar el nombre a los sacs (By Lugii) (Gracias Kalax).-
+#7617: bug maintaining position (By jstar).-
+#7622: sql injection (By jstar).-
+#7624: buddy message (By jstar - Think).-
+#7625: Fallo en accesos directos (By Think).-
+#7626: Falla de seguridad en el hangar (By Think).-
+#7627: Bug en la cola de construcci&oacute;n (By jstar).-
+',
+
+'2.9.7' => ' 09/12/10
+
+- [Fixs]
+#4546: Problemas con los tiempos en los edificios (By jstar).-
+#4869: Error al intentar construir algunos edificios inexistentes (By alivan).-
+#5018: Calculo err&oacute;neo del l&iacute;mite de la p. novatos (By alivan).-
+#5168: errores en la seccion de alianzas y en msjs (By lucky).-
+#5169: Error env&iacute;o de misiles sin deuterio y error en &mode=3 en tu propio sistema (By alivan).-
+#6017: Fuegos r&aacute;pidos (By lucky).-
+#7610: minifix showFleetAcsPage.php (By jstar).-
+#7612: Mas campos en el planeta agregando una base lunar a su luna(ACP) (By alivan).-
+#7613: Buildings time and price (By jstar).-
+#7616: Bug in buildings tail (By jstar).-
+#7618: Proteccion de Novatos en los misiles (By tomtom).-
+#7619: solicitudes alianza (By jstar).-
+#7620: Call back fleet in placement mission (By jstar).-
+',
+
+'2.9.6' => ' 16/08/10
+
+- [Seguridad] Validaciones globales para prevenir SQL Injections.-
+- [Seguridad] Cerrados varios agujeros de seguridad que permitian SQL Injection.-
+- [Seguridad] Corregido un bug de seguridad en los bbcode de la alianza (By slave7).-
+- [Seguridad] Corregidos varios bugs de seguridad en las p&aacute;ginas de la alianza y opciones.-
+
+- [Fixs]
+#0009: Alianza Contador de caracteres
+#0010: Contador de caracteres mensaje
+#0011: Texto de la solicitud de alianza
+#0013: Cancelar construcciones
+#0014: Problemas con nuevas versiones
+#0015: Link roto en actualizaci&oacute;n
+#4485: El Administrador desaparece por inactivo
+#4534: Fuego r&aacute;pido no se calcula
+#4535: Mantener posicion
+#4536: Problemas con el phalanx
+#4537: Error en el lenguaje
+#4538: Bug en misi&oacute;n de expedicion
+#4539: Peque&ntilde;o bug visual en vista de mensajes
+#4540: Saltos en la galaxia
+#4558: Bug de seguridad
+#4719: Problemas nanobots
+',
+
+'2.9.5' => ' 29/07/10
+
+- [Seguridad] Corregidos varios bugs de seguridad (By slave7).-
+- [Seguridad] Corregidos varios bugs de seguridad (By jtsamper).-
+
+- [Cambio] Adaptado para que sea compatible con PHP 5.3.3.-
+- [Cambio] Aparecen todas las personas que aportaron algo en los cr&eacute;ditos del panel administrativo.-
+
+
+- Vieja numeraci&oacute;n
+- [Fix][Bug #5] Los sacs no coordinan los tiempos (By slave7).-
+
+- Numeraci&oacute;n del viejo Bug Tracker (http://sourceforge.net/apps/mantisbt/xgproyect/view_all_bug_page.php)
+- [Fix][Bug #0000011] Los Sacs reparten los recursos (By slave7).-
+- [Fix][Bug #0000065] Todas las rondas aparecen como ganadas y a eventualmente empatan (By Nickolay).-
+- [Fix][Bug #-------] La planta de fusi&oacute;n funcionaba al 100% cuando el planeta no ten&iacute;a deuterio (By slaver7)
+
+- Nueva numeraci&oacute;n (Arctic Tracker)
+- [Fix][Bug #0000002] Corregido el link que da m&aacute;s informaci&oacute;n sobre la protecci&oacute;n de novatos.-
+- [Fix][Bug #0000003] Corregido el bug en la alianza que causaba problemas para redirigir al sitio de la alianza.-
+- [Fix][Bug #0000004] Bug en la producci&oacute;n, produce m&aacute;s de lo que debe (By Calzon).-
+- [Fix][Bug #0000005] Bug en el incremento de puntos de las tecnolog&iacute;as (By Think).-
+- [Fix][Bug #0000006] Bug en el Debug Log (By Green).-
+
+',
+
+'2.9.4' => ' 02/03/10
+- [Novedad] Ahora el mercader requiere materia oscura (2500), configurable desde constants.php.-
+
+- [Seguridad] Limitado desde la base de datos la cantidad de cupulas que pueden ser contruidas (Gracias a medel).-
+- [Seguridad] Mejora de seguridad en el formulario de los misiles.-
+
+- [Fix][Bug #0000031] Misi&oacute;n expedici&oacute;n da escuadron fantasma.-
+- [Fix][Bug #0000035] Se pueden enviar misiles interplanetarios a usuarios en vacaciones (By Neurus).-
+- [Fix][Bug #0000036] Se pueden enviar misiles interplanetarios en negativo.-
+- [Fix][Bug #0000037] Se puede atacar con misiles interplanetarios a usuarios fuertes y debiles (By Neurus).-
+- [Fix][Bug #0000038] Luego de un error o advertencia en el envio de misiles no se vuelve a galaxia.-
+- [Fix][Bug #0000039] Al colonizar con recursos estos desaparecen.-
+- [Fix][Bug #0000043] En INGAME.mo hay 2 entradas iguales.-
+- [Fix][Bug #0000044] Varias cupulas de protecci&oacute;n (By Neko).-
+- [Fix][Bug #0000047] Error en template estadisticas.-
+- [Fix][Bug #0000048] Recursos negativos.-
+- [Fix][Bug #0000050] Ataques con sondas de espionaje.-
+- [Fix][Bug #0000056] Error al editar usuario en el panel administrativo (By Neko).-
+- [Fix][Bug #0000059] Solucionado el error que mostraba registros dobles en las estad&iacute;sticas.-
+- [Fix][Bug #-------] Fallo producido al recargar la p&aacute;gina de los edificios, defensas, tecnologias y naves (By Neko).-
+- [Fix][Bug #-------] Corregido un bug que no instalaba la tabla para los plugins.-
+
+- [Fix][Bug #-------] Corregido un bug que no ten&iacute;a en cuenta a la supernova en las expediciones.-
+- [Fix][Bug #-------] Corregido un bug que ocurria por tener menos deuterio que combustible a gastar (By Neko).-
+- [Fix][Bug #-------] No se mostraba correctamente el mensaje de modo vacaciones (By Neko).-
+- [Fix][Bug #-------] Si la cuenta est&aacute; en modo borrar y en modo vacaciones, en el overview se le da prioridad al mensaje de borrado de la cuenta.-
+- [Fix][Bug #-------] Corregido un bug menor en la creaci&oacute;n de planetas (By Kloud).-
+- [Fix][Bug #-------] Corregido un bug menor en el js que maneja los recursos al enviar una flota (By Neko).-
+
+- [Cambio] Actualizados los links de soporte y reporte de bugs del overview en el panel administrativo.-
+- [Cambio] Mejoras en los reportes.-
+----------- Ahora en la primer ronda siempre se listan las flotas completas.-
+----------- Ahora las sondas son destruidas en la primer ronda; al atacante le sale destrucci&oacute;n en la primer ronda, al defensor el reporte completo.-
+----------- Ya no se duplica la primer ronda en las batallas de 2 rondas; en la primera se muestran las flotas completas y en la segunda el mensaje destruido.-
+- [Cambio] Modificada la licencia para el 2010.-
+',
+
+'2.9.3' => ' 12/02/10
+- [Seguridad] Mejoras de seguridad en el movimiento de recursos (By calzon).-
+
+- [Fix][Bug #0000040] Multiplicaci&oacute;n de recicladores (By tomtom).-
+- [Fix][Bug #-------] Bug que permit&iacute;a el incremento de naves en el salto cu&aacute;ntico (By war4head).-
+
+- [Cambio] Nuevamente se volvio al viejo reloj en la visi&oacute;n general.-
+
+# Version 0.2 del panel administrativo
+
+.- Los moderadores y operadores ya no podran:
+ || Suspender administradores.
+ || Crear usuarios con rango mayor al de un jugador.
+ || Reiniciar universo.
+ || Ejecutar consultas SQL.
+ || Editar datos personales.
+ || Editar/Vaciar el historial.
+.- [MINOR ADD] Adherida la ID en el sistema de suspensi&oacute;n.
+.- Agregado un historial en el panel administrativo, la cual custodiara los movimientos de los siguientes archivos:
+ || BanPage.php
+ || ErrorPage.php
+ || AccountEditorPage.php
+ || Moderation.php
+ || QueriesPage.php
+ || ResetPage.php
+ || AccountDataPage.php
+ || CreateNewUserPage.php
+ || GlobalMessagePage.php
+ || DataBaseViewPage.php
+ || ConfigStatsPage.php
+ || SettingsPage.php
+ || SearchInDBPage.php
+.- Logs protegidos con .htaccess para que nadie pueda leerlos.
+.- Agregada opci&oacute;n de modo vacaciones en Datos Personales.
+.- Agregado de vuelta el scrolling en el frame (No funciona en IE).
+.- Peque&ntilde;o fix en la lista de mensajes.
+.- Las siguientes funciones han sido reemplazadas por una redirecci&oacute;n al buscador avanzado:
+ || Lista de jugadores.
+ || Lista de lunas.
+ || Lista de planetas.
+ || Lista de usuarios conectados.
+ || Lista de planetas activos.
+.- Agregado al buscador avanzado:
+ || Expandir / contraer.
+ || Paginaci&oacute;n.
+ || Nuevos filtros y tipos de b&uacute;squeda.
+.- [FIX] borrar usuarios (No borraba las colonias de la tabla xgp_planets).
+.- [FIX] bugs peque&ntilde;os en el ejecutador de consultas SQL.
+.- Cambios en el ADMIN.mo y traduccion completa al ingl&eacute;s. (Gracias Arali)
+.- Agregada nueva funci&oacute;n -> DeleteSelectedPlanet.
+',
+
+'2.9.2' => ' 01/12/09
+- [Seguridad] Cerrado un agujero en la alianza que permit&iacute;a sql injection (Gracias a privatethedawn).-
+
+- [Novedad] Implementado un nuevo sistema de Plugins v0.3 (Gracias adri93).-
+- [Novedad] Ahora cuando hay muchos recursos en la cuenta de un usuario se muestra K,M,B,T,T+ en la informaci&oacute;n de cuentas del panel del admin.-
+- [Novedad] Hora y fecha del servidor, en el overview, en Castellano. (Sustituir en la linea 402 el (es_ES), por el idioma deseado.).-
+
+- [Fix][Bug varios] Fueron corregidos varios bugs menores.-
+- [Fix][Bug #0000019] Famoso error en las estad&iacute;sticas provocado por una query que no era finalizada.-
+- [Fix][Bug #0000020] Informaci&oacute;n de cuentas en el panel del admin.
+- [Fix][Bug #-------] No se muestra bien el tiempo de estacionar en aliado en el panel del admin.-
+- [Fix][Bug #-------] Corregidos varios textos (espa&ntilde;ol,ingl&eacute;s) en el panel de administraci&oacute;n.-
+- [Fix][Bug #-------] Arreglado peque&ntilde;o error en los datos mostrados en la seccion de recursos.-
+- [Fix][Bug #-------] Ahora muestra correctamente la inactividad de los jugadores de tu alianza desde.-
+
+- [Fix][Bug #-------] Al borrar un usuario se borraran todos sus planetas.-
+
+
+- [Cambio] Algunas mejoras de optimizaci&oacute;n en la informaci&oacute;n de cuentas en el panel administrativo.
+- [Otros]  Mejoras en el sistema de envio de flotas del FleetAjax.php
+',
+
+'2.9.1' => ' 01/11/09
+
+- [Fix][Menor] Corregido un bug menor en el texto de los informes de espionaje que permit&iacute;a bashing.-
+- [Fix][Menor] Corregido un bug menor en el texto de los reportes de combates.-
+- [Fix][Menor] Corregido un bug menor que mostraba car&aacute;cteres raros en la alianza luego de editar un texto (By Neko).-
+- [Fix][Menor] Corregido un bug menor que deformaba la p&aacute;gina de los mensajes al enviar mensajes muy largos (By Neko).-
+- [Fix][Menor] Correciones en algunos textos.-
+
+Nueva numeraci&oacute;n (bug tracker)
+- [Fix][Bug #0000010] No direcciona bien el ataque.-
+
+
+Vieja numeraci&oacute;n
+- [Fix][Bug #5] Los sacs no coordinan los tiempos.-
+- [Fix][Bug #6] Los sacs no aparecen en el mismo mensajes en la visi&oacute;n general (By privatethedawn).-
+
+
+
+- [Cambio] Ahora cuando se estan moviendo flotas no es posible abandonar un planeta (By privatethedawn).-
+- [Cambio] Ahora al explorar la galaxia, si es tu propio sistema solar, no perder&aacute;s deuterio.-
+- [Cambio] Nuevo panel administrativo (By Neko)
+.- Nuevo skin
+.- Agregado el sistema de moderaci&oacute;n.
+.- FIX suspender usuario (Si el jugador ya estaba suspendido y lo suspendias de vuelta creaba
+otra tabla con los mismos datos (duplicacion)). Mejoras.
+.- Reset de universo mejorado, con poder de reiniciar distintas cosas.
+.- [FIX] Al resetear todo el universo:
+ || no introducia el "id_level" en la tabla de planetas.
+ || dejaba al usuario como inactivo (al reiniciar nuevamente se borraban las cuentas por inactividad).
+.- Opciones de lunas mejorado.
+.- Agregada la creaci&oacute;n de planetas.
+.- Contador de caracteres para mensajes (cntchar.js) nuevo y mejorado.
+.- Agregada la opcion de "ver todos los mensajes" y un "seleccionar todo" en la lista de mensajes.
+.- Agregado sistema para crear cuentas.
+.- Reestructuraci&oacute;n del adminresources.php (ahora AccountEditorPage.php)
+ || Agregada la edici&oacute;n de datos personales.
+ || Agregada varias opciones m&aacute;s para la edici&oacute;n de planetas y lunas.
+ || Agregada la edici&oacute;n de oficiales.
+.- Agregado un buscador avanzado.
+.- Eliminado el borrado de reportes cuando se borraba un usuario, sino cuando el otro atacante o defensor queria ver
+la batalla no le figuraba.
+',
+
+
+'2.9.0' => ' 21/10/09
+
+- [Seguridad] Ahora es encriptada la contrase&ntilde;a que se ingresa durante la actualizaci&oacute;n.-
+
+- [Cambio] Optimizaci&oacute;n y mejora general en el manejo de las lunas (By angelus_ira).-
+- [Cambio] Mejora en el rendimiento de algunas p&aacute;ginas.-
+- [Cambio] Ahora al explorar la galaxia, si es tu propio sistema solar, no perder&aacute;s deuterio.-
+
+- [Fix][Bug #122] Problemas en la actualizaci&oacute;n de los puntos.-
+- [Fix][Bug #123] Bug en los reportes mostrando que se produjo un empate cuando no fue asi.-
+- [Fix][Bug #124] Problemas con el phalanx.-
+- [Fix][Bug #125] Bug en la lista de amigos no permite aceptar/rechazar.-
+- [Fix][Bug #126] No le aparecen los reportes de ataque al defensor.-
+- [Fix][Bug #127] Problema con el title de los recursos maximo en las flotas.-
+',
+
+'2.8' => ' 10/10/09
+
+- [Seguridad] Mejora de seguridad en varias funciones y archivos.-
+- [Seguridad] Mejora de seguridad y prevenci&oacute;n de n&uacute;meros y caracteres no permitidos en el salto cu&aacute;ntico (Gracias a Trojan).-
+
+- [Novedad] El pack en ingl&eacute;s se encuentra 100% traducido (Gracias war4head).-
+- [Novedad] Se definieron constantes para los oficiales, asi es m&aacute;s f&aacute;cil editarlos (no lo recomiendo).-
+
+- [cambio] Mejoras varias en el script que calcula los ataques.-
+- [Cambio] Corregido un bug de seguridad al agregar recursos al envio de una flota (Gracias a MSW).-
+- [Cambio] Los reportes de combate de la secci&oacute;n mensajes ahora solo muestran un link al reporte y no un resumen.-
+- [Cambio] Peque&ntilde;o fix y mejora de seguridad para el phalanx y el alcance (Gracias a Trojan).-
+- [Cambio] Optimizado el alcance del phalanx, reducida la carga de procesamiento (Gracias a Trojan).-
+- [Cambio] Optimizados los movimientos de flotas (Gracias a Trojan).-
+- [Cambio] Los recicladores valen ahora 10.000 de metal - 6.000 de cristal - 2.000 de deuterio como corresponde.-
+
+- [Fix][Varios] Correcci&oacute;n de varios bugs menores globales.-
+- [Fix][Varios] Corregidos varios bugs menores en el armado de las estad&iacute;sticas.-
+- [Fix][Varios] Corregidos varios bugs menores en los movimientos de flotas y misiones.-
+- [Fix][Bug #108] Coordenadas erroneas en el mensaje de reciclaje.-
+- [Fix][Bug #109] Los jugadores de la lista de compa&ntilde;eros aparecen siempre como desconectados.-
+- [Fix][Bug #110] Duplicaci&oacute;n de recicladores al hacer multiple clicks en la galaxia.-
+- [Fix][Bug #111] Jugadores inactivos y borrados no son eliminados fisicamente.-
+- [Fix][Bug #112] No son actualizados los recursos del planeta de un jugador al ser atacado.-
+- [Fix][Bug #113] Peque&ntilde;o bug que muestra un mensaje de error en la pagina de los sacs.-
+- [Fix][Bug #114] Bug al intentar eliminar un jugador.-
+- [Fix][Bug #115] Diferencia de estados entre (debil, fuerte) al enviar una flota y la galaxia.-
+- [Fix][Bug #116] Bug en la misi&oacute;n de destrucci&oacute;n.-
+- [Fix][Bug #117] Bug en la alianza que no descuenta los jugadores que salen de ella.-
+- [Fix][Bug #118] Bug que permite ignorar las naves e investigaciones, permitiendo edificar robots, nanos y laboratorio.-
+- [Fix][Bug #119] Bug en los textos de transportes.-
+- [Fix][Bug #120] Bug en las batallas de una sola ronda.-
+- [Fix][Bug #121] Bug en las solicitudes de la alianza.-
+',
+
+'2.7' => ' 17/09/09
+
+- [Novedad] Sistema para ver toda la informaci&oacute;n de la cuenta de un usuario. By Neko.-
+- [Novedad] SACs implementeados [BETA].-
+----------- C&oacute;digo: MadnessRed
+----------- Testeos y funcionamiento, como la adapaci&oacute;n a la 0.9a: cyberrichy
+----------- Adaptaci&oacute;n a la 2.7: lucky
+
+- [Fix][Varios] Varios bugs menores de estilo, plantillas y lenguaje reparados.-
+- [Fix][Bug #93] Bug al eliminar un jugador.-
+- [Fix][Bug #94] No se muestra la cantidad de flotas en el panel de administraci&oacute;n.-
+- [Fix][Bug #95] Deuterio en negativo a causa de la planta de fusi&oacute;n.-
+- [Fix][Bug #96] Plantillas para solicitud de amigos descolocada.-
+- [Fix][Bug #97] No se muestra el estado de baneo y vacaciones en los jugadores dentro del panel de administraci&oacute;n.-
+- [Fix][Bug #99] Problemas con la p&aacute;gina de busqueda mostrando demsiados resultados o no permitiendo descender en la p&aacute;gina.-
+- [Fix][Bug #100] Al mandar naves de distintos tipos a colonizar vuelve el colonizador y se pierden las otras naves.-
+- [Fix][Bug #101] No se generan lunas cuando sale un 20% de probabilidad.-
+- [Fix][Bug #102] Al salir de una alianza el n&uacute;mero de miembros no disminuye como deber&iacute;a.-
+- [Fix][Bug #103] Problemas al actualizar las estad&iacute;sticas.-
+- [Fix][Bug #104] Cuando construis nanobots o robots te permite hacer naves y defensas.-
+- [Fix][Bug #105] Bug menor en la alianza la querer editar el rango de un usuario cuando no existen rangos.-
+- [Fix][Bug #106] Se encuentran invertidas las temperaturas de las lunas.-
+- [Fix][Bug #107] Los planetas destruidos son contados como planetas activos.-
+',
+
+'2.6' => ' 24/08/09
+
+- [Fix][Varios] Varios bugs menores de estilo, plantillas y lenguaje reparados.-
+- [Fix][Bug #28] Bug en la cola de produccion del hangar.-
+- [Fix][Bug #73] Problemas con el reporte de porcetaje de luna.-
+- [Fix][Bug #78] Problemas con la lista de construcci&oacute;n.-
+- [Fix][Bug #82] Se pueden mover flotas desde la galaxia cuando un jugador esta en modo vacaciones.-
+- [Fix][Bug #83] Los reportes de ataque muy largos no se pueden ver completos.-
+- [Fix][Bug #85] La cantidad de recursos para construir siempre se queda en rojo.-
+- [Fix][Bug #84] Si la luna esta llena, no te permite desmontar edificios.-
+- [Fix][Bug #86] Bug que provoca errores en las alianzas.-
+- [Fix][Bug #87] Bug en el estilo del panel de administraci&oacute;n, mostrando imagenes del juego.-
+- [Fix][Bug #88] Bug menor que muestra un texto que fue utilizado para debug.-
+- [Fix][Bug #89] Bug que permite la ampliacion del hangar cuando se estan construyendo flotas y defensas.-
+- [Fix][Bug #90] Problemas con la misi&oacute;n de destrucci&oacute;n.-
+- [Fix][Bug #91] No funciona correctamente el almirante.-
+- [Fix][Bug #92] No funciona correctamente el almacenista.-
+
+- [Cambio] Ahora la lista de planetas se muestra en el panel de admnistraci&oacute;n por id de menor a mayor.-
+',
+
+'2.5' => ' 18/08/09
+
+- [Novedad] Sistema de advertencias y errores en el panel de administraci&oacute;n (tambi&eacute;n informa la existencia de una nueva versi&oacute;n).-
+- [Novedad] Ahora puedes determinar si al banear un jugador este debe entrar o no en modo vacaciones.-
+- [Novedad] Gracias a 3R1K que tradujo el panel de administraci&oacute;n en su totalidad al idioma ingl&eacute;s.-
+- [Novedad] Redise&ntilde;ado el panel de administraci&oacute;n.-
+- [Novedad] Ahora la p&aacute;gina de mensajes respeta el formato del OGame original, mostrando a los operadores del juego.-
+- [Novedad] Ahora cuando borras un planeta aparece planeta destruido como en el OGame original.-
+- [Novedad] El misil interplanetario ahora requiere el hangar en nivel 1 y el motor de impulso en 1 como en el OGame original.-
+- [Novedad] El misil de intercepci&oacute;n ahora requiere el hangar en nivel 1 como en el OGame original.-
+- [Novedad] El silo ahora requiere el hangar en nivel 1 como en el OGame original.-
+
+- [Fix][Varios] Varios bugs menores de estilo, plantillas y lenguaje reparados.-
+- [Fix][Bug #14] No se pueden usar skins externos.-
+- [Fix][Bug #47] Bug que provoca en IE que no se vea el menu y quede desplazado hacia arriba al bajar demasiado en una p&aacute;gina.-
+- [Fix][Bug #61] Problemas en el conteo de los jugadores en la visi&oacute;n general.-
+- [Fix][Bug #62] Peque&ntilde;o bug que no muestra los stats correctamente en el overview.-
+- [Fix][Bug #63] Bug en la funci&oacute;n del manejo de las sesiones.-
+- [Fix][Bug #64] Bug con los permisos y con las lunas, evitando que sean atacadas.-
+- [Fix][Bug #65] Bug que no permite espiar desde flota pero si desde la galaxia.-
+- [Fix][Bug #66] Problemas en los niveles del phalanx.-
+- [Fix][Bug #67] Producci&oacute;n ilimitada de misiles.-
+- [Fix][Bug #68] Bug en el link para Continuar/Volver luego de enviar un mensaje circular en la alianza.-
+- [Fix][Bug #69] Bug que muestra mal los mensajes de error cuando un usuario no esta logueado.-
+- [Fix][Bug #70] Problemas con el salto de l&iacute;nea en los mensajes circulares.-
+- [Fix][Bug #71] Problemas con la misi&oacute;n estacionar aliado, muestra un mensaje de que el jugador es muy fuerte.-
+- [Fix][Bug #72] Bug en la diferencia de energ&iacute;a consumida actual, anterior y posterior.-
+- [Fix][Bug #74] No se puede abandonar la alianza.-
+- [Fix][Bug #75] Problemas en la actualizaci&oacute;n de puntos de algunos jugadores.-
+- [Fix][Bug #76] La misi&oacute;n de espionaje ignora el estado de vacaciones desde la visi&oacute;n de galaxia.-
+- [Fix][Bug #77] Al hacer regresar una flota con misi&oacute;n mantener posici&oacute;n no descuenta los tiempos correctamente.-
+- [Fix][Bug #79] Bug que permite incrementar las tecnolog&iacute;as (Gracias a mikey302 y death).-
+- [Fix][Bug #80] Bug en el limite de envio m&aacute;ximo de expediciones.-
+- [Fix][Bug #81] Bug en la visi&oacute;n general de la alianza, mantiene el nombre "Fundador" del fundador de la alianza.-
+
+- [Cambio] Ahora el n&uacute;mero de la versi&oacute;n se obtiene de la base de datos.-
+- [Cambio] Mejoras de seguridad en la p&aacute;gina de la alianza.-
+- [Cambio] Noticias removidas.-
+- [Cambio] Mejorada la velocidad en que se genera la p&aacute;gina de estad&iacute;sticas y algunos cambios menores.-
+- [Cambio] Nuevas alertas de presencia del directorio install y de escritura del archivo config.php.-
+- [Cambio] Los recicladores ahora s&oacute;lo pueden transportar 20.000 unidades de recursos como en el OGame original.-
+- [Cambio] Removida la p&aacute;gina de contacto, ahora puedes encontrar a los adms/mods/oper en el panel de mensajes como en el OGame.-
+
+- [Cambio] Ahora a la derecha del nombre de la luna aparece la referencia (Luna) como en el OGame original.-
+- [Cambio] Ahora si en la visi&oacute;n general tienes seleccionada la luna no se mostrar&aacute; esta otra vez a la izquierda.-
+- [Cambio] Reformas en la galaxia en c&oacute;digo y organizaci&oacute;n de las clases y plantillas.-
+- [Cambio] Juego adaptado al skin original del OGame, ahora el juego ser&aacute; a su vez compatible con cualquier skin.-
+',
+
+
+'2.4' => ' 25/07/09
+
+- [Seguridad] Protecci&oacute;n con .htaccess de la carpeta includes, language y templates.-
+- [Seguridad] Protecci&oacute;n con .htaccess de global.php, config.php y extension.inc.php.-
+- [Seguridad] Cambio en el protecci&oacute;n de carpetas.-
+- [Seguridad] Mejoras de seguridad en diversos archivos.-
+
+- [Novedad] Nuevo sistema de estad&iacute;sticas, m&aacute;s r&aacute;pido, m&aacute;s simple, menos querys, menos carga, y nuevo panel para administrarlas; (By angelus_ira) Muchas gracias =) .-
+- [Novedad] Nuevo sistema de idioma, ahora el idioma es configurable desde el panel de administraci&oacute;n, seleccionando un lenguaje a la vez.-
+- [Novedad] La tecnolog&iacute;a de espionaje funciona como en el ogame original:
+-------- Nivel 0 a 1 -> Sin datos de la flota.-
+-------- Nivel 2 a 3 -> N&uacute;mero total de naves.-
+-------- Nivel 4 a 7 -> N&uacute;mero total de naves y el tipo de las naves.-
+-------- Nivel 8 -> N&uacute;mero total de naves, tipo de nave y cantidad de cada tipo.-
+
+- [Novedad] Ahora el administrador puede decidir si los administradores y/o moderadores se les actualizar&aacute;n o no los puntos.-
+- [Novedad] Ahora el administrador puede decidir si los administradores y/o moderadores pueden o no recibir ataques de otros jugadores.-
+- [Novedad] Ahora en las investigaciones te muestra el nivel de espionaje y computaci&oacute;n que te dan los comandantes.-
+- [Novedad] Cuando un usuario es baneado, ahora le muestra la fecha en que finaliza su ban.-
+
+- [Fix][Varios] Corregidos varios bugs menores de redirecci&oacute;n, visuales, textos y configuraciones.-
+- [Fix][Bug #1] Al achicar la pantalla se superpone el menu de recursos con el resto del cuerpo.-
+- [Fix][Bug #2] Ahora cuando una cuenta es baneada, el jugador baneado no podr&aacute; acceder a la cuenta de ningun forma.-
+- [Fix][Bug #3]	Al borrar una luna, ya no borrar&aacute; el planeta.-
+- [Fix][Bug #4] Reparados algunos bugs en el phalanx.-
+- [Fix][Bug #8] Corregida la visi&oacute;n del imperio, ahora muestra las investigaciones.-
+- [Fix][Bug #9] Ahora al cerrar el servidor un usuario com&uacute;n no podr&aacute; ingresar.-
+- [Fix][Bug #10] Problemas en los permisos de las alianzas.-
+- [Fix][Bug #11] Ahora al cerrar el servidor no desaparece m&aacute;s el mensaje con el motivo para cerrarlo.-
+- [Fix][Bug #12] Ahora la misi&oacute;n desplegar funciona correctamente.-
+- [Fix][Bug #13] La misi&oacute;n estacionar en aliado funciona correctamente, no se repiten m&aacute;s mensajes, ni tampoco produce tiempos negativos cuando se selecciona como tiempo de estacionamiento 0 horas.-
+- [Fix][Bug #15] Problemas con la misi&oacute;n de recoleccion o reciclaje, no entrega los recursos a quien corresponde.-
+- [Fix][Bug #16] Problemas con los tiempos del hangar al cambiar de planeta, volviendo el tiempo a su estado incial.-
+- [Fix][Bug #17] Los oficiales almirante y general funcionan correctamente [oficiales al 100%].-
+- [Fix][Bug #18] Problemas con la planta en nivel 1 permitiendo la produccion de recursos (Fixed by zorro2666).-
+- [Fix][Bug #19] Ahora si un jugador es fuerte o d&eacute;bil y al mismo tiempo est&aacute; inactivo podr&aacute; ser atacado de todas formas.-
+- [Fix][Bug #20] Problemas de caracteres en los textos de registro.-
+- [Fix][Bug #21] No funciona el enviar mensaje cuando recibes un ataque.-
+- [Fix][Bug #22] Problemas con los mensajes al redactar un mensaje privado en la parte visual.-
+- [Fix][Bug #23] Fallan los links que redirigen a la galaxia durante los movimientos de flotas.-
+- [Fix][Bug #24] El hangar permite producir igual durante su ampliaci&oacute;n (Fixed by zorro2666).-
+- [Fix][Bug #25] Se puede ampliar el hangar mientras de produce (Fixed by zorro2666).-
+- [Fix][Bug #26] No sale el nombre del jugador en color verde en las estad&iacute;sticas.-
+- [Fix][Bug #27] Bug que permite ampliar el laboratorio e investigar al mismo tiempo.-
+- [Fix][Bug #29] Bug en el select de las estad&iacute;sticas al cambiar la p&aacute;gina mostrando la primer p&aacute;gina siempre.-
+- [Fix][Bug #30] Problemas con los campos del planeta y las colas de contrucci&oacute;n.-
+- [Fix][Bug #32] Bug para ver el reporte de combate desde el panel de administraci&oacute;n.-
+- [Fix][Bug #33] Bugs diversos menores en los misiles interplanetarios (Fixed by lordz).-
+- [Fix][Bug #34] Bugs menores que no muestran correctamente los textos.-
+- [Fix][Bug #35] Posible bug en los almacenes, incrementan menos de lo que deben.-
+- [Fix][Bug #36] No aparece el icono para lanzar misiles en la galaxia.-
+- [Fix][Bug #37] Bug que provoca que las colonias en la visi&oacute;n general se vean en filas de 5 y no de 2.-
+- [Fix][Bug #38] Bug en la misi&oacute;n colonizar, si se alcanz&oacute; el limite de planetas entonces regresa instantaneamente sin respetar los tiempos.-
+- [Fix][Bug #39] Bug en las expediciones que provoca la perdida de la materia oscura.-
+- [Fix][Bug #40] Bug que no muestra la materia oscura recolectada en las expediciones.-
+- [Fix][Bug #41] Peque&ntilde;o bug que provoca un error en el update de puntos (Fixed by angelus_ira).-
+- [Fix][Bug #42] Problemas con los textos, se pierden las frases y la cantidad de recursos en algunos reportes.-
+- [Fix][Bug #43] Problemas con la proteccion de novatos al enviar sondas desde la galaxia y desde flota.-
+- [Fix][Bug #44] Problemas con el js que actualiza los recursos, no teniendo en cuenta la velocidad del servidor.-
+- [Fix][Bug #45] Los almacenes funcionan mal, debido a un bug en la relaci&oacute;n de incremento por nivel.-
+- [Fix][Bug #46] bbCode ni HTML funcionan en los textos de la alianza.-
+- [Fix][Bug #48] Se perdi&oacute; el texto de advertencia en las expediciones.-
+- [Fix][Bug #49] Problemas con la actualizaci&oacute;n de puntos de la alianza.-
+- [Fix][Bug #50] Problemas con los atajos.-
+- [Fix][Bug #51] No aparece el icono de los mensajes para responder.-
+- [Fix][Bug #52] Bug en la alianza que probaca un error en la base de datos.-
+- [Fix][Bug #53] Problemas de duplicaci&oacute;n en la misi&oacute;n transportar.-
+- [Fix][Bug #54] Bug que no permite generar las estad&iacute;sticas (Fixed by angelus_ira).-
+- [Fix][Bug #55] Bug que mostraba la luna luego de que fuera destruida.-
+- [Fix][Bug #56] Bug que no muestra el porcentaje de creaci&oacute;n de las lunas.-
+- [Fix][Bug #57] Bug que provoca que no se muestren los mensajes en las expediciones.-
+- [Fix][Bug #58] No se muestran los informes de construcci&oacute;n en el panel del admin.-
+- [Fix][Bug #59] Los reportes de construcci&oacute;n no figuran en ninguna categor&iacute;a.-
+- [Fix][Bug #60] Bug que permitia obtener tecnolog&iacute;as sin ning&uacute;n costo.-
+
+- [Cambio] Optimizaci&oacute;n del manejo de flotas (By shoghicp).-
+- [Cambio] Optimizaci&oacute;n del overview del admin (By jtsamper).-
+- [Cambio] Reorganizadas algunas carpetas.-
+- [Cambio] Ahora los administradores no podr&aacute;n borrarse a si mismos.-
+- [Cambio] Ahora s&oacute;lo los administradores podr&aacute;n borrar jugadores.-
+- [Cambio] Reducci&oacute;n de l&iacute;neas y simplificaci&oacute;n en el panel de admnistraci&oacute;n.-
+- [Cambio] Finalmente el directorio includes queda definido con 3 carpetas (classes, functions y pages).-
+
+- [Cambio] Integrado el auto-update a index.php en la carpeta install.-
+- [Cambio] Cuando se registra un usuario ahora es redirigido directamente dentro del juego.-
+- [Cambio] Se volvio al viejo sistema de mensajes.-
+- [Cambio] El pack de idioma de divide en 4 archivos:
+
+-------- ADMIN.mo -> TODO LO DEL PANEL DE ADMINISTRACI&oacute;N.-
+-------- CHANGELOG.mo -> CHANGELOG TAL Y CUAL COMO ES CONOCIDO.-
+-------- INGAME.mo -> TODO EL CONTENIDO INTERNO DEL JUEGO Y NO ACCESIBLE SIN TENER UNA CUENTA.-
+-------- PUBLIC.mo -> TODO EL CONTENIDO P&uacute;BLICO DEL JUEGO (index.php, reg.php, clave perdida y contacto).-
+
+- [Cambio] Ahora en la p&aacute;gina de la flota se muestra correctamente la velocidad de las naves al posicionar el mouse sobre el nombre de las mismas.-
+- [Cambio] Ahora al realizar cualquier movimiento de flota desde la galaxia, tambi&eacute;n se pasa el valor de la misi&oacute;n por lo que si por ejemplo seleccionas atacar ya aparecer&aacute; marcado en el env&iacute;o de las flotas.-
+- [Cambio] Ahora si el jugador esta inactivo podr&aacute; ser atacado, funcionando de la misma forma que en el ogame original.-
+- [Cambio] Los archivos ShowFleetPage.php, floten1.php, floten2.php, y floten3.php ahora utilizan plantillas.-
+- [Cambio] Finaliza el soporte a las siguientes versiones v1.4a/v1.4b/1.4c,por lo tanto no habr&aacute; m&aacute;s auto-update.php.-
+- [Cambio] class.FlyingFleetHandler.php maneja todo lo que sea flotas, misiones y funciones especificas de las mismas.-
+- [Cambio] Eliminada la experiencia de guerrero y minero.-
+- [Cambio] Las funciones CreateFleetPopupedMissionLink, CreateFleetPopupedFleetLink y BuildHostileFleetPlayerLink fueron hubicadas en class.FlyingFleetsTable.php.-
+- [Cambio] Dentro de la clase class.FlyingFleetsTable.php, encontramos las funciones BuildFleetEventTable y BuildFlyingFleetTable y todas las funciones que estas necesitan para funcionar.-
+- [Cambio] rw.php ahora se llama CombatReport.php.-
+- [Cambio] raketenangriff.php del root cambiado a MissilesAjax.php; y flottenajax.php cambiado a FleetAjax.php.-
+- [Cambio] La funci&oacute;n GetNextJumpWaitTime fue movida de GeneralFunctions.php a class.ShOWInfosPage.php.-
+- [Cambio] infos.php y jumpgate.php se encuentran en class.ShOWInfosPage.php.-
+- [Cambio] Eliminado quickfleet.php no ten&iacute;a utilidad.-
+- [Cambio] Home reprogramado y simplificado.-
+- [Cambio] Ahora los oficiales esp&iacute;a y comandante son obtenidos desde la base de datos directamente y no suman espionaje y computaci&oacute;n, asi es m&aacute;s f&aacute;cil de administrar.-
+- [Cambio] constantes.php nuevamente se llama constants.php y funciones.php se llama ahora GeneralFunctions.php.-
+- [Cambio] class.ShowShipyardPage.php maneja la construcci&oacute;n de defensas y naves.-
+- [Cambio] Implementado el dise&ntilde;o del OGame original para el overview.-
+- [Cambio] Adaptado el dise&ntilde;o de la p&aacute;gina de los oficiales al resto del juego.-
+
+- [Cambio] En la visi&oacute;n de la galaxia no se realizan mas revisiones de los campos de los planetas.-
+- [Cambio] La funci&oacute;n sendnewpassword fue integrada al lostpassword en el archivo index.php.-
+- [Cambio] Limitada la query que traia los datos en la visi&oacute;n del imperio, reducida un poco la carga.-
+- [Cambio] Las funciones de Strings.php fueron movidas a funciones.php.-
+- [Cambio] Ahora si no tenes materia oscura para reclutar oficiales aparecer&aacute; el reclutar en rojo y bloqueado.-
+- [Cambio] Notar que el manejo de las p&aacute;ginas esta en game.php.-
+- [Cambio] Todas las p&aacute;ginas del juego ahora se manejan con funciones y/u objetos.-
+- [Cambio] Inicio de la exportaci&oacute;n del c&oacute;digo a objetos.-
+- [Cambio] Eliminados los title de las p&aacute;ginas, ahora s&oacute;lo se muestra el nombre del servidor.-
+- [Cambio] Ahora la base lunar s&oacute;lo da 3 campos por nivel, tal cual y como es en el ogame original.-
+- [Cambio] Ahora para mostrar que un usuario fue baneado, se imprime un texto y no se recurre a una plantilla.-
+- [Cambio] Ahora no aparecen m&aacute;s mensajes de confirmaci&oacute;n al editar, crear o borrar una nota.-
+- [Cambio] Ahora las notas nuevamente se abren en un pop-up.-
+',
+
+'2.3' => ' 30/05/09
+
+- Corregido un bug que no permit&iacute;a cambiar el rango a los miembros dentro de las alianzas.-
+- Varios cambios en el panel del admin:
+
+-------- Integrados todos los archivos de lenguaje.-
+-------- Renombrado el archivo para el reset del universo.-
+-------- Unos cuantos cambios en mats.php, tanto de estilos como limpieza de c&oacute;digo.-
+-------- Cambios en el left-menu del panel de administraci&oacute;n.-
+-------- Renombrados algunos archivos y realizadas algunas correciones menores.-
+-------- Unos cuantos ajustes en los textos y plantillas de varios archivos.-
+-------- Mensaje de confirmaci&oacute;n al intentar eliminar a un jugador del servidor.-
+-------- El archivo mats.php ahora se llama adminresources.php, ademas se le integro todos los archivos que manejaban las tecnolog&iacute;as y recursos.-
+-------- Solucionado el bug de la actualizaci&oacute;n de puntos.-
+-------- Nueva funci&oacute;n (optimizar tablas) (By Saint).-
+-------- Corregido un bug que al crear una luna no le asignaba el nombre seleccionado.-
+-------- Nueva funci&oacute;n (eliminar luna) (By tonique).-
+-------- Corregido un bug que en la lista de lunas no mostraba el id real de la luna.-
+-------- Si el usuario no tiene nivel 1 al menos no podr&aacute; ver nada del panel de administraci&oacute;n.-
+-------- Optimizadas algunas querys en messall.php
+-------- Eliminado el QueryExecuter.php
+
+- Se finaliz&aacute; el soporte a las versiones v1.4d/v1.4e/v1.4f y tambi&eacute;n el auto-update de las mismas.-
+- Eliminadas algunas querys innecesarias de MissionCaseMIP.php.-
+- Se elimino una query innecesario de MissionCaseRecycling.php.-
+- Limpieza de la base de datos de campos innecesarios dentro de la tabla users.-
+- Algunos cambios y mejoras en el update.php.-
+- Ahora s&oacute;lo sumar&aacute;n puntos de guerrero los jugadores que realicen batallas y no ambos.-
+- Reparado un bug que mostraba el mensaje de la flota al finalizar la misi&oacute;n.-
+- La experiencia del minero ya no se muestra m&aacute;s con decimales.-
+- Se volvi&oacute; al antiguo dise&ntilde;o de la construcci&oacute;n de edificios.-
+- Corregido un bug que en al finalizar una construcci&oacute;n en el overview aparec&iacute;a Construcci&oacute;n() en vez de Libre.-
+- Algunas modificaciones en los cr&eacute;ditos.-
+- Modificados algunos aspectos en el aspecto interno del juego.-
+- Cambiada la imagen dentro del juego.-
+- Redise&ntilde;ado el index, espero que les guste.-
+- Agregado un favicon, cada uno podr&aacute; cambiarlo por el que quiera.-
+- Eliminados algunos residuos provenientes de otras versiones.-
+- Eliminados los frames, ahora el menu se muestra con la funci&oacute;n ShowLeftMenu.php y algo de estilos css para ajustar todo.-
+- Cambiados todos los $xnova_root_path por $xgp_root.-
+',
+
+'2.2' => ' 06/05/09
+
+- Se reemplazo el men&uacute; derecho e izquierdo por el original, y la imagen del fondo tambi&eacute;n.-
+- Revisado todo messages.php,se eliminaron querys innecesarias, se organizo el c&oacute;digo, se restringieron algunas querys para optimizar la p&aacute;gina, se elimiaron elementos sin utilidad y se integro el lenguaje.-
+- Toda la galaxia fue revisada, se hicieron algunas correciones en los textos y algunas mejoras visuales.-
+- Corregido un bug que impedia cambiar la cantidad de planetas, sistemas y galaxias que se pod&iacute;an utilizar en el universo (modificable desde constantes.php), recomiendo dejarlo en 9-499-15, asi no saturan mucho el juego.-
+- Renombrado functions.php a funciones.php
+- Limpieza y revisado de constants.php, renombrado a constantes.php.-
+- Corregido un bug en la p&aacute;gina de tecnolog&iacute;as.-
+
+- Eliminadas las vars de los mensajes, no ten&iacute;an utilidad.-
+- Se revisaron nuevamente todas las funciones y fueron nuevamente reasignadas utilizando el sistema de funciones_A y funciones_B.-
+- Solucionado el bug de las p&aacute;ginas en blanco, dejando la versi&oacute;n bastante estable [BETA].-
+- Nueva forma de distribuir las funciones, en A y B. Para mas detalles lean la informaci&oacute;n que deje comentada en commons.php, esto es provisorio, aunque creo que es la mejor forma de agilizar el juego, y tenerlo m&aacute;s estable.-
+- Peque&ntilde;o cambio en el ingreso, eliminando algunas lineas.-
+- Algunos cambios en el commons.php y eliminadas algunas cosas innecesarias.-
+- Corregido un peque&ntilde;o bug en las listas de lunas.-
+- Corregido un bug en la opci&oacute;n de crear lunas.-
+',
+
+'2.1' => ' 02/05/09
+
+- Peque&ntilde;o cambio en el index y la selecci&oacute;n de la p&aacute;gina.-
+- Incluido reg.mo directamente a reg_form.tpl y reg.php.-
+- Modificado el dise&ntilde;o del registro y de la p&aacute;gina de clave perdida.-
+- Correcciones gr&aacute;ficas en el index.-
+- SACS funcionando al 50% [problemas en la coordinaci&oacute;n de los tiempos y en la visi&oacute;n de los movimientos de flotas].-
+- Cambio visual en las estad&iacute;sticas, ahora el *, +1 y -1 (rankplus), se muestra con js(overlib).-
+- Limpieza en commons.php con lo que durante el movimiento de flotas reducira la carga del juego.-
+- Ahora al realizar un espionaje ya no aparecer&aacute; la p&aacute;gina en blanco ni tampoco tirara error.-
+- Corregidos unos cuantos bugs provocados por la distribuci&oacute;n de las funciones.-
+- Nuevas im&aacute;genes de planetas, mucho m&aacute;s vistosas.-
+- Corregido un peque&ntilde;o bug que no permit&iacute;a ver las p&aacute;ginas publicas(contact.php, reg.php, credit.php y la secci&oacute;n de clave perdida).-
+',
+
+'2.0' => ' 23/04/09
+
+- Visi&oacute;n general del panel del admin mejorada, ajustada mejor la tabla e integrado el lenguaje a las plantillas.-
+- Simplificaci&oacute;n del sistema de cr&eacute;ditos, e integraci&oacute;n del lenguaje.-
+- Integrado el idioma a resources.php y a las respectivas plantillas.-
+- Cambios en las tablas de las estad&iacute;sticas, incluci&oacute;n del lenguaje a las plantillas, revisi&oacute;n del c&oacute;digo y algunas mejoras en la carga.-
+- Algunos cambios visuales en fleet.php.-
+- Eliminada la funci&oacute;n AdminMessage, cumplia la misma funci&oacute;n que message.-
+- Optimizaci&oacute;n e integraci&oacute;n del lenguaje a admin/settings.php
+- Algunas correcciones que previenen que por la actualizaci&oacute;n de puntos se provoque un bug en el panel de administraci&oacute;n.-
+- Optimizadas algunas querys de las flotas en commons.php.-
+- Correciones en algunos textos en los mensajes de movimientos de flotas.-
+- Mejora de seguridad, no podr&aacute;s ver las p&aacute;ginas internas del juego sino te logueaste.-
+- Ahora se pueden ver bien los mensajes de error e informes de los mensajes.-
+- Corregido un bug que al abandonar un planeta no borraba la luna, y esta pod&iacute;a ser utilizada.-
+- Simplificaci&oacute;n y reorganizaci&oacute;n de BatimentBuildingPage.php.-
+- Correcciones visuales en los edificios, y correciones de algunas tablas para ajustarlas mejor.-
+- Nueva imagen de materia oscura en el men&uacute; superior, tambi&eacute;n se ampliaron los tama&ntilde;os de las im&aacute;genes.-
+- Reparado un bug que permit&iacute;a mover flotas en modo vacaciones.-
+- Traducido el mensaje del modo vacaciones, y corregido un bug que no mostraba el tiempo real de vacaciones.-
+- Cambiados algunos $ugamela por $xnova.-
+- Implementaci&oacute;n de seguridad, fue renombrado el archivo extension.inc a extension.inc.php, no estaba protegido y pod&iacute;a leerse su contenido.-
+- Algunas correcciones y simplificaci&oacute;n del c&oacute;digo en buddy.php.-
+- Revisado todo el notes.php:
+
+--------- Plantillas agregadas a su carpeta correspondiente "notes".-
+--------- Algunas correciones visuales.-
+--------- Integraci&oacute;n del idioma a las plantillas.-
+--------- Reparados algunos bugs.-
+--------- Ahora al editar el mensaje, se muestra el asunto y el mensaje.-
+--------- Conteo de caracteres en js aplicado.-
+
+- Eliminadas algunas funciones de administraci&oacute;n.-
+- Reparado un bug que no mostraba el l&iacute;mite real de las flotas posibles a enviar.-
+- Oficiales:
+
+--------- Algunas correciones visuales.-
+--------- Oficiales pendientes por reparar: Almirante y General.-
+--------- Oficiales funcionando: Ge&oacute;logo, Ingeniero, Tecn&oacute;crata, Constructor, Cient&iacute;fico, Almacenista, Defensor, Bunker, Esp&iacute;a, Comandante, Destructor, Raider y Emperador.-
+--------- Reparados los oficiales esp&iacute;a y Comandante.-
+--------- Reparado el oficial empeador(By thyphoon) y destructor(By angelus_ira).-
+--------- Integraci&oacute;n del idioma a las plantillas y c&oacute;digo.-
+
+- Limpieza de scripts.-
+- Re-organizadas todas las funciones del juego (optimizandolo incre&iacute;blemente)(cada funci&oacute;n se asigno a su archivo correspondiente).-
+- Eliminado CombatEngine.php.-
+- Algunas correciones en commons.php para agilizar el juego en general.-
+- Limpieza y optimizaci&oacute;n del instalador.-
+- La funci&oacute;n doquery fue unificada tambi&eacute;n dentro de functions.php.-
+- Las funciones de unlocalised.php fueron integradas a functions.php
+- Limpieza de funciones inutiles en includes/functions:
+
+--------- Eliminado RevisionTime.php.-
+--------- Eliminado SecureArrayFunction.php.-
+--------- Eliminado ResetThisFuckingCheater.php.-
+--------- Eliminado ElementBuildListQueue.php, el archivo ElementBuildListBox.php cumple la misma funci&oacute;n y se encuentra en uso.-
+
+- Limpieza en functions.php,se borraron algunas funciones sin utilidad alguna.-
+- Limpieza en unlocalised.php,se borraron algunas funciones sin utilidad alguna o vac&iacute;as.-
+- Se reorganizaron casi todas las plantillas y se borraron algunas m&aacute;s sin utilidad (algunas pedientes a organizar).-
+- Se borraron todas las plantillas de la galaxia que no ten&iacute;an utilidad(la galaxia la genera el c&oacute;digo php din&aacute;micamente).-
+- Revisado todo el search.php:
+
+--------- Borradas algunas lineas.-
+--------- Reorganizado el c&oacute;digo.-
+--------- Reorganizadas las plantillas en una carpeta en templates.-
+--------- Se integro search.mo a las plantillas.-
+--------- Se corrigi&oacute; un bug que no mostraba la alianza en la b&uacute;squeda por usuarios.-
+--------- Se corrigi&oacute; un bug que no redirig&iacute;a correctamente a la vista de la alianza.-
+--------- Se corrigi&oacute; un bug dentro de la alianza para poder verla desde search.php
+
+- Revisado todo el mercader:
+
+--------- Adherido marchand.mo a sus respectivas plantillas.-
+--------- Corregidas todas las plantillas y bugs en la muestra de los recursos(no aparecen m&aacute;s en eltop).-
+--------- Simplificaci&oacute;n del c&oacute;digo php, reorganizado y reprogramado lo que no funcionaba bien.-
+--------- Corregidas las validaciones, admiten ceros, pero no n&uacute;meros negativos.-
+--------- A&ntilde;adidas las plantillas respectivas a una carpeta en templates(para una mejor organizaci&oacute;n).-
+
+- Cookies.mo integrado a su archivo correspondiente.-
+- Algunos textos fueron colocados en system.mo, ya que hacen al caracter general del juego, y no de un sector en especifico.-
+- Optimizado MissionCaseAttack.php.-
+- Optimizado el overview, se elimino c&oacute;digo innecesario, se reorganiz&oacute;, se eliminaron querys que no ten&iacute;an utilidad y se integro el idioma a las plantillas.-
+- Reubicados algunos archivos.-
+- Limpieza de la base de datos, de cosas que no se utilizaban.-
+- Reorganizado el men&uacute; de opciones, integraci&oacute;n del idioma a la plantilla y se eliminaron querys innecesarias.-
+- Algunos archivos de texto fueron integrados directamente a los archivos para agilizar el juego y su velocidad.-
+- Se reorganizaron algunas plantillas y se eliminaron algunas otras in&uacute;tiles.-
+- Eliminados los emoticones.-
+- Como siempre actualizados el auto-update y el instalador para que todo sea m&aacute;s facil.-
+- Cambios en el instalador.-
+- Optimizadas unas cuantas p&aacute;ginas.-
+- login.php, lostpassword.php y logout.php unificados en el index.php mejorando un poco el rendimiento y organizaci&oacute;n.-
+- Algunas correcciones visuales en la visi&oacute;n del imperio.-
+
+- Revisada toda la alianza:
+
+--------- Mejoras varias.-
+--------- Mejoras en lenguajes.-
+
+--------- Mejoras en plantillas.-
+--------- Se agregaron validaciones.-
+--------- Se reorganiz&oacute; el c&oacute;digo.-
+--------- Se reparo el texto de las solicitudes, ahora podr&aacute;s editarla.-
+--------- Todos los mensajes ahora te redirigiran.-
+--------- Se corrigi&oacute; un bug en los rangos.-
+--------- Se optimiz&oacute; un poco, se eliminaron lineas in&uacute;tiles y se fixearon algunos bugs.-
+--------- Se repararon todos los errores encontrados en los textos y plantillas que no se mostraban, asi como cosas que no se realizaban.-
+
+- Cuando un usuario falla al intentar el login ahora es redirigido al inicio.-
+- Mejorado el index ahora funciona mucho m&aacute;s r&aacute;pido.-
+- Mejorados algunos textos en general, y corregidos algunos detalles.-
+- Redise&ntilde;ado el sistema de ingreso al panel del admin y regreso al juego.-
+- Limpieza de archivos y residuos.-
+- Eliminado el chat, loteria, razas, simulador, tutoria, records y todo aquello que no consideraba necesario.-
+- Reprogramados los men&uacute;s derechos e izquierdos.-
+
+- Un resumen de las figuras m&aacute;s destacadas de este proyecto:
+
+--------- Tomo las riendas sobre la 1.5b saltando a la 2.0 para trerles todas las mejoras enunciadas a continuaci&oacute;n [By lucky].-
+--------- Partiendo de la version 0.9a llegando hasta la 1.5b del XG Proyect por lucky, PowerMaster, Calzon, Tarta, Tonique y muchas personas m&aacute;s.-
+--------- Continuado por UGamela Britania con varias mejoras, seguido por el equipo franc&eacute;s Raito, Chlorel, e-Zobar y Flousedid.-
+--------- Proyecto ogame para todos y con todas las funciones iniciado por Perberos.-
+',
+
+'1.5b' => ' 03/04/09
+
+- Cambios y correcciones en templates y textos.-
+- Loteria reparada (By lucky).-
+- Correciones en el instalador, soportando correctamente las razas, y tambi&eacute;n en el auto-update.-
+- Razas corregidas (By Tonique).-
+
+- Corregido un bug en el instalador.-
+',
+
+'1.5a' => ' 26/03/09
+
+
+- Corregido el link de administraci&oacute;n.-
+- Mejoras en el instalador.-
+- Fix corregido bug que mostraba mal la leyenda en la galaxia.-
+- Actualizado el auto-update para poder pasar f&aacute;cilmente de la versi&oacute;n 1.4f o de la 1.4c a la 1.5a.-
+- Ahora la instalacion incluye la loter&iacute;a y el chat, no deber&aacute;s hacer nada manualmente.-
+- Arreglada la p&aacute;gina de amigos ahora deber&iacute;a mostrar bien a tus amigos y no a vos (By lucky).-
+- Mejorado el auto-update de puntos, ahora podr&aacute;s instalar sin realizar modificaciones en los archivos.-
+- Unificamos la versi&oacute;n de XG Proyect con la de calzon.-
+',
+
+'1.4f' => ' 18/03/09
+
+- Fix peque&ntilde;as correciones en la base de datos.-
+- Fix peque&ntilde;as correcciones en traducciones generales.-
+- Fix Corregidas variables en alianza, nueva estructuracion, mejor optimizada.-
+- Mod Agregado terraformer y super terraformer a constants.php, (personalizable campos que dara cada uno).-
+- Mod Administradores u operadores no aparecen mas Estadisticas.-
+- Mod Completadas algunas imagenes faltantes en el skin, cambiada la de la supernova por una de mejor calidad.-
+- Mod Optimizacion de consultas y variables generales (sistema mas limpio).-
+- Mod Nuevo edificio, Super Terraformer, aumenta 10 campos por nivel (winjet).-
+<font color="red">- Tecnologias y naves unicas de razas. 70% completado.-</font>
+<font color="red">- Formas de Gobierno (democracia, socialismo y pirateria) 30% completado.-</font>
+<font color="red">- Fix a bug destruccion de luna.-</font>
+',
+
+'1.4e' => ' 12/03/09
+
+- Fix a textos e imagenes de naves y defensas nuevas asi como a razas.-
+- Fix Enviar mutiples flotas, expediciones, misiones, al ir atras (modo test por ahora).-
+- Fix Corregido bug en consumo de deuterio (flotenajax.php).-
+- Fix corregido bug al abandonar colonias por fallo seguridad (overview.php).-
+- Fix En Estadisticas aparecias en una alianza aunque ya hubieras salido (alliance.php).-
+- Mod 4 Nuevas naves: Interceptor, Cazador Crucero, Transportador y Titan.-
+- Mod 2 Nuevas defensas: Ca&ntilde;on de Fotones y Base Espacial.-
+- Mod Nueva Tecnologia de Desarrollo, aumenta colas posibles a edificios.
+<font color="green">- Mod Razas: Humanos, Aliens, Predators y Darks, con cada nivel aumenta:.-</font>
+<font color="green">- Humanos: Mina Metal +3% produccion, +2% Ataque y Escudos.-</font>
+<font color="green">- Aliens: Mina Cristal +3% produccion, +3% Blindaje.-</font>
+<font color="green">- Predators: +10% Ataque.-</font>
+<font color="green">- Darks: Sintetizador Deuterio +3% produccion, +4% Blindaje y Escudos.-</font>
+',
+
+'1.4d' => ' 09/03/09
+
+- Fix algunas traducciones.-
+- Fix Ajustado a resolucion 1024x768, reacomodo en columnas de edificios y frames.php-
+- Fix multiplicacion/Duplicacion de ligeros y estrellas de la muerte (flotten1.php).-
+- Fix Seguridad de carpetas, una mas, aparte de la que ya existia.-
+- Fix en Mercader, devolvia recursos al meter numeros negativos (marchand.php).-
+- Fix Misiles (projectxnova) adaptado y corregido a esta version (MissionCaseMIP.php).-
+- Fix agregado entero en funcion investigaciones (ResearchBuildingPage.php).-
+- Fix, peque&ntilde;a correccion en alianzas rangos y administracion(alliance.php).-
+- Fix, Correccion en Galaxia (galaxy.php).-
+- Mod/Fix Arreglo a mensajes(project xnova) adaptado, corregido y aumentado para esta version.-
+- Mod actualizacion automatica (ahora si es automatica) y no consume recursos.-
+- Mod Edificios en columnas de 5.-
+- Mod Menu Derecho agregada compatibilidad, reordenadas las funciones.-
+- Mod Agregado Records (Records.php).-
+- Mod Agregado Chat.-
+- Mod Agregado Simulador de Batallas.-
+- Mod Agregado Loteria (project xnova), adaptado y corregido a esta version.-
+- Mod Reacomodo vision general (projectxnova), corregida compatilidad (overview.php).-
+- Mod Recursos en tiempo real (tonique) modo test por ahora.-
+- Borrado actualizacion automatica, consume muchos recursos (todos haciendo click a vision general).-
+',
+
+'1.4c' => ' 08/02/09
+
+- Eliminados los recursos en tiempo real debido a que se quedaban congelados.-
+- Reparados los oficiales esp&iacute;a y comandante.- (By jtsamper foro project.xnova.es)
+- En la galaxia ya no puedes reciclar o espiar sin deuterio.-
+- Prevenir n&uacute;meros negativos y car&aacute;cteres no num&eacute;ricos en la galaxia (By neurus foro Xproject.xnova.es).-
+- Ahora para ver la galaxia necesitas deuterio (Original project.xnova.es fixeado por lucky).-
+- Al disolver una alianza esta ya no aparece en las estad&iacute;sticas (By xesar foro project.xnova.es).-
+- Corregida una redirecci&oacute;n que funcionaba mal en la alianza.-
+- Corregido un peque&ntilde;o error de sintaxis en la flota que tiraba severos reportes de errores (Gracias edering).-
+- Agregado un mensaje recordatorio de como se debe incrementar o eliminar la materia oscura (Gracias edering).-
+- Anuncios eliminados (Por votaci&oacute;n de los usuarios de XG).-
+- El auto-update no soporta m&aacute;s las siguientes versiones:  v0.9a/v1.0a/v1.0b/v1.1a/v1.1b/v1.1c/v1.2a/v1.2b/v1.2c/v1.3a (Si tienes alguna des estas versiones deber&aacute;s usar un update anterior).-
+- Ahora en la busqueda al hacer click en el link te redirecciona al sistema del jugador y no al tuyo (By Anghelito).-
+',
+
+'1.4b' => ' 06/12/08
+
+- Desbaneo reparado.-
+- Oficiales reparados.-
+- Ahora al iniciar sesi&oacute;n con tu cuenta, iniciar&aacute; siempre desde el planeta principal y no desde una colonia.-
+- Un moderador u operador ya no podr&aacute; cambiarse los permisos a Administrador.-
+- Galaxia optimizada.-
+- Ahora cuando colonizas tu planeta se llamar&aacute; "Colonia" y no "Planeta Principal" (By lucky).-
+- El auto-update no soporta m&aacute;s las siguientes versiones:  v1.0a/v1.0b/v1.1a/v1.1b/v1.1c/v1.2a/v1.2b/v1.2c/v1.3a (Si tienes alguna des estas versiones deber&aacute;s usar un update anterior).-
+- Corregidas algunas redirecciones y mejoradas otras.-
+- Ahora puedes usar espacios en blanco en el nombre de tu planeta (By lucky).-
+- Borrado de archivos innecesarios (esto no termina m&aacute;s).-
+- Reparada la tabla que muestra las flotas en vuelo en el panel del admin.-
+- Mejoras, organizaci&oacute;n, limpieza y optimizaci&oacute;n del lenguaje (No pongo m&aacute;s que cambie en los lenguajes porque ya es detallar mucho, para nada).-
+',
+
+'1.4a' => ' 06/12/08
+
+- Reparado el reset del universo.-
+- El auto-update no soporta m&aacute;s las siguientes versiones: v1.0a/v1.0b/v1.1a/v1.1b/v1.1c/v1.2a (Si tienes alguna des estas versiones deber&aacute;s usar un update anterior).-
+- M&aacute;s limpieza de archivos innecesarios.-
+- Limpieza y pulido del panel de admin (lenguaje).-
+- Lista de planetas <-> Lista de usuarios cambiado (lenguaje - Gracias Alberto14).-
+- Ahora puedes agregar y remover materia oscura desde el panel de administraci&oacute;n (By lucky).-
+- Actualizaci&oacute;n en tiempo real de los recursos (By Alberto14).-
+- Cambidas las im&aacute;genes del XNova, por las im&aacute;genes del OGame original.-
+- Borradas im&aacute;genes innecesarias.-
+- Optimizadas las im&aacute;genes de los oficiales.-
+- Eliminado el multi totalmente (A pedido del p&uacute;blico).-
+- Eliminados los records totalmente (A pedido del p&uacute;blico).-
+- Eliminado el chat totalmente (A pedido del p&uacute;blico).-
+- Traducidos algunos textos en el formulario de env&iacute;o de mensajes (lenguaje).-
+- Complementado el infos.mo con los datos del verdadero OGame (lenguaje).-
+- Pulido y limpieza del search (lenguaje).-
+- Pulido y limpieza del overview (lenguaje).-
+- Pulido y limpieza del leftmenu (lenguaje).-
+- Pulido y limpieza del registro (lenguaje).-
+- Pulido y limpieza del login (lenguaje).-
+- Cambios de lenguaje en notes.-
+- Cambios en el login Contact -> Contacto y Forum -> Foros.-
+- Eliminado player.mo - no ten&iacute;a ninguna utilidad.-
+- Limpieza del archivo de lenguaje login.-
+- Reemplazados todos los "Titanio", "Silicio" y "Gashofa" por "Metal", "Cristal" y "Deuterio".-
+- Correciones de lenguaje en el install y limpieza de dicho archivo (Gracias Alberto14).-
+',
+
+'1.3c DMV' => ' 30/11/08 "DMV = Dark Matter Version Exclusivo Xtreme-gameZ.com.ar"
+
+- Correciones en los lenguajes de la supernova o super nave de batalla y el protector planetario (algo siempre me olvido).-
+- Modificaci&oacute;n de la ubicaci&oacute;n de algunos arhcivos.-
+- Eliminada una carpeta llamada .svn a la cual no le encontre utilidad.-
+- Limpieza de archivos innecesarios y duplicados.-
+- Implementada la materia oscura (C&oacute;digo 100% x lucky) (Gracias Reyndio por la idea).-
+----- Los oficiales ahora se manejan por la materia oscura 1 punto oficial = 1000 materia oscura.-
+----- En las expediciones se obtiene la materia oscura necesaria.-
+----- No existen m&aacute;s los puntos de oficiales, aun asi se sube el nivel de minero y flota.-
+----- Se siguen mostrando los registros de ataque.-
+----- Auto-Update actualizado especialmente para soportar la materia oscura.-
+
+- Ya no se pueden atacar lunas + fuerte o + debiles que uno (By Neurus).-
+- Panel del admin, "Utilisateur?" -> "&iquest;Usuario?", modificaci&oacute;n en el lenguaje.-
+- Por razones de seguridad elimine el phpinfo.-
+- Panel del admin, "Lista de Usuarios" -> "Lista de Planetas", modificaci&oacute;n en el lenguaje (Gracias Alberto14).-
+- Solucionado el error en el orden por id de la alianza (By tarta).-
+',
+
+
+'1.3b EU' => ' 30/11/08
+
+- No hace falta m&aacute;s ingresar el nombre del planeta, por defecto es "Planeta Principal".-
+- Eliminadas imagenes del "sexo".-
+- Optimizada la imagen del inicio, ahora carga m&aacute;s r&aacute;pido.-
+- Compatibilidad del auto-update con todas las versiones.-
+- Nueva versi&oacute;n del auto update, m&aacute;s comprensible(creo).-
+- Reparado el problema con la instalaci&oacute;n (Gracias Anghelito).-
+',
+
+'1.3a' => ' 29/11/08
+
+- XNova 100% TRADUCIDO AL ESPA&ntilde;OL [PUDE HABERME SALTEADO ALGO POR FAVOR AVISAR](By lucky).-
+- Limpieza de scripts, eliminamos varios archivos de la carpeta scrips que notamos no necesarios.-
+- Reparada la validaci&oacute;n del index, ahora si la carpeta install existe no podras acceder al juego (By lucky).-
+- Arreglado el modo vacaciones, ya no puedes entrar en vacaciones cuando estas atacando (By lucky).-
+- No se muestran m&aacute;s los recursos negativos.-
+- Redirecci&oacute;n luego de enviar una flota (By tarta).-
+- Ahora los d&iacute;as se muestran con una "d" y no con una "j" (By tarta).-
+- Nuevamente agregamos los emoticons.-
+- Ahora puedes cambiar el nombre en el juego, por fin solucionamos esto.-
+- Nuevo dise&ntilde;o del auto-update, mucho mas vistoso y atractivo.-
+- Reparada la instalaci&oacute;n, ahora funcionan los misiles al instalar el juego.-
+',
+
+'1.2c EU' => ' 26/11/08
+
+
+- Reparada la instalaci&oacute;n.-
+',
+
+'1.2b' => ' 26/11/08
+
+- Misiles finalmente funcionando (By lucky).-
+- Desbaneo autom&aacute;tico (By Anghelito).-
+- Reparado el modo vacaciones.-
+- Traducciones en varios archivos (By edering).-
+- Reparado el modo debug (By tarta).-
+- Reparado el link de las notas (By lucky).-
+- Eliminada la carpeta emoticones.-
+- Fix ranking de flotas en vuelo (By Pada).-
+- Mejoras en archivos de lenguaje.-
+- Cambios en el mensaje de bienvenida.-
+- Records reparados.- (By tarta).-
+- Actualizado el auto-update para poder actualizar: 0.9a -> 1.2a / 1.1b -> 1.2a / 1.2a -> 1.2b (By lucky).-
+- Cambios en el instalador.-
+- Se elimino una tabla que no hacia falta.-
+',
+
+'1.2a' => ' 19/11/08
+
+- Actualizado el auto-update para poder actualizar: 0.9a -> 1.2a y 1.1b -> 1.2a .-
+- Reorganizaci&oacute;n, recodificaci&oacute;n y reestructuraci&oacute;n de los misiles interplanetarios, ademas de solucionar seberos bugs.-
+- Solo se permiten caracteres alfanumericos en el nombre de los planetas, evita serios bugs y filtros de seguridad.-
+- Arreglado el orden por puntos en la alianza.-
+- Tutorial funcionando.-
+- Correcciones en el mensaje de bienvenida pos-registro.-
+- Solucionado el bug que no permit&iacute;a la transferencia de la alianza.-
+- Solucionado el bug que hace que salga el rango equivocado al usuario en la lista de miembros de la ally.-
+- Solucionado el bug que permit&iacute;a que se envien solicitudes una vez que la alianza habia sido borrada.-
+- Reparada la red de investigaci&oacute;n intergal&aacute;ctica.-
+- Cupula y protector planetario funcionando, y cada una solo puede ser edificada una vez.-
+',
+
+'1.1c' => ' 19/11/08
+
+- Cambios en la organizaci&oacute;n de la carpeta templates.-
+- Algunos fixes en el leftmenu del admin.-
+- Nuevamente reparada la seccion de de Annonces (sirve para comerciar).-
+- Volvimos a implementar el leftmenu antigüo, funciona m&aacute;s r&aacute;pido.-
+- Mejoras en algunas traducciones, y a&ntilde;adidas otras.-
+- A&ntilde;adida la hora al chat. [A&uacute;n no funciona en hostings].-
+- Limpieza de archivos inecesarios y/o sin ninguna utilidad.-
+- A&ntilde;adido el auto-update.-
+- Eliminado el upgrade desde ugamela.-
+- Mejoras en la instalaci&oacute;n.-
+',
+
+
+'1.1b' => ' 30/10/08
+
+- A&ntilde;adido un tutorial, desarrollado por PowerMaster para el XNova de Xtreme-gameZ.com.ar.-
+- Cambios de nombre del archivo de instalacion "Installeur" a "Instalacion de XNova".-
+- Cambios en el leftmenu para usuarios.-
+- Actualizacion de Puntos Automaticamente, ahora si anda.-
+- Introduccion del Release de Xtreme-GameZ en "credit.php" e "install.php".-
+- Cambios de idioma de carpeta "fr" a carpeta "es" (requiere instalacion).-
+',
+
+'1.1a' => ' 28/10/08
+
+- Antes, si mandaban una flota y cambian de planeta, tiraba error.-
+- Antes, cuando estaban leyendo mensajes y cambian de planeta, tiraba error.-
+- Ahora al cancelar una investigaci&oacute;n te devuelve los recursos.-
+- Cambio en el texto del primer mensaje recibido al registrarse en el juego.-
+- Agregadas las estad&iacute;sticas de batalla.-
+- Fueron agregadas las defensas al ranking de la Visi&oacute;n General.-
+',
+
+
+'1.0b' => ' 26/10/08
+
+- Primer release disponible para los usuarios.-
+- Eliminado el warning que aparec&iacute;a en la instalaci&oacute;n del sistema.-
+- El instalador ahora incluye la actualizaci&oacute;n de puntos autom&aacute;tica, por ende el usuario ya no debera tocar nada en el c&oacute;digo.-
+- Aplicada la actualizaci&oacute;n autom&aacute;tica de puntos.-
+',
+
+
+'1.0a' => ' 24/10/08 "Versi&oacute;n Inicial"
+
+- Cambios de lenguaje en el changelog (100% traducido).-
+- Mejora del men&uacute; de la izquierda se "visualiza" algo mejor.-
+- Correciones de lenguaje en el install (install.mo).-
+- Correciones en el Marchand (Mercader), ya esta funcionando correctamente, no tira m&aacute;s ese error del lenguaje.-
+- Fixes en el link de Annonces, ahora esta funcionando, ya puedes publicar lo que desees comercias.-
+- Inicio del proyecto XG (XG Proyect) basandonos en el pack hecho por XNova versi&oacute;n 0.9a.-
+',
+);
+?>
\ No newline at end of file
diff --git a/language/spanish/INGAME.mo b/language/spanish/INGAME.php
similarity index 70%
rename from language/spanish/INGAME.mo
rename to language/spanish/INGAME.php
index 40cab40..ef83ca1 100644
--- a/language/spanish/INGAME.mo
+++ b/language/spanish/INGAME.php
@@ -5,7 +5,7 @@
 $lang['Crystal']							= 'Cristal';
 $lang['Deuterium']							= 'Deuterio';
 $lang['Darkmatter']							= 'Materia Oscura';
-$lang['Energy']								= 'Energía';
+$lang['Energy']								= 'Energ&iacute;a';
 $lang['Messages']							= 'Mensajes';
 $lang['write_message']						= 'Escribir mensaje';
 
@@ -28,8 +28,8 @@
 );
 
 // GAME.PHP
-$lang['see_you_soon']						= '¡Hasta la próxima!';
-$lang['page_doesnt_exist']					= 'La página solicitada no existe';
+$lang['see_you_soon']						= '&iexcl;Hasta la pr&oacute;xima!';
+$lang['page_doesnt_exist']					= 'La p&aacute;gina solicitada no existe';
 
 //SHORT NAMES FOR COMBAT REPORTS
 $lang['tech_rc'] = array (
@@ -43,11 +43,10 @@
 209 => "Recic.",
 210 => "Sondas",
 211 => "Bombarderos",
-212 => "Satélites",
+212 => "Sat&eacute;lites",
 213 => "Destructor",
 214 => "E. Muerte",
 215 => "Acorazado",
-216 => "Supernova",
 
 401 => "L. misiles",
 402 => "L. peque&ntilde;o",
@@ -55,42 +54,41 @@
 404 => "C. Gauss",
 405 => "C. i&oacute;nico",
 406 => "C. de plasma",
-407 => "C. pequeña",
+407 => "C. peque&ntilde;a",
 408 => "C. grande",
-409 => 'P. planetaria',
 );
 
 //----------------------------------------------------------------------------//
 //TOPNAV
 $lang['tn_vacation_mode']					= 'Modo vacaciones activo hasta el ';
-$lang['tn_delete_mode']						= 'Tu cuenta se encuentra en modo borrar. La misma será borrada el ';
+$lang['tn_delete_mode']						= 'Tu cuenta se encuentra en modo borrar. La misma ser&aacute; borrada el ';
 
 //----------------------------------------------------------------------------//
 //LEFT MENU
-$lang['lm_overview']						= 'Visión general';
+$lang['lm_overview']						= 'Visi&oacute;n general';
 $lang['lm_galaxy']							= 'Galaxia';
 $lang['lm_empire']							= 'Imperio';
 $lang['lm_fleet']							= 'Flota';
 $lang['lm_buildings']						= 'Edificios';
-$lang['lm_research']						= 'Investigación';
+$lang['lm_research']						= 'Investigaci&oacute;n';
 $lang['lm_shipshard']						= 'Hangar';
 $lang['lm_defenses']						= 'Defensa';
 $lang['lm_resources']						= 'Recursos';
 $lang['lm_officiers']						= 'Oficiales';
 $lang['lm_trader']							= 'Mercader';
-$lang['lm_technology']						= 'Tecnología';
+$lang['lm_technology']						= 'Tecnolog&iacute;a';
 $lang['lm_messages']						= 'Mensajes';
 $lang['lm_alliance']						= 'Alianzas';
-$lang['lm_buddylist']						= 'Lista de compañeros';
+$lang['lm_buddylist']						= 'Lista de compa&ntilde;eros';
 $lang['lm_notes']							= 'Notas';
-$lang['lm_statistics']						= 'Estadísticas';
+$lang['lm_statistics']						= 'Estad&iacute;sticas';
 $lang['lm_search']							= 'Buscar';
 $lang['lm_options']							= 'Opciones';
 $lang['lm_banned']							= 'Baneados';
 $lang['lm_contact']							= 'Contacto';
 $lang['lm_forums']							= 'Foro';
 $lang['lm_logout']							= 'Salir';
-$lang['lm_administration']					= 'Administración';
+$lang['lm_administration']					= 'Administraci&oacute;n';
 $lang['lm_game_speed']						= 'Juego';
 $lang['lm_fleet_speed']						= 'Flotas';
 $lang['lm_resources_speed']					= 'Recursos';
@@ -98,10 +96,10 @@
 
 //----------------------------------------------------------------------------//
 //OVERVIEW
-$lang['ov_newname_error']					= 'Has introducido algún caracter ilegal. Sólo puedes introducir caracteres alfanuméricos.';
-$lang['ov_planet_abandoned']				= 'Planeta abandonado con éxito.';
+$lang['ov_newname_error']					= 'Has introducido alg&uacute;n caracter ilegal. S&oacute;lo puedes introducir caracteres alfanum&eacute;ricos.';
+$lang['ov_planet_abandoned']				= 'Planeta abandonado con &eacute;xito.';
 $lang['ov_principal_planet_cant_abanone']	= 'El planeta principal no puede ser abandonado.';
-$lang['ov_wrong_pass']						= 'Contraseña incorrecta, vuelve a ingresarla.';
+$lang['ov_wrong_pass']						= 'Contrase&ntilde;a incorrecta, vuelve a ingresarla.';
 $lang['ov_have_new_message']				= 'Tienes 1 mensaje nuevo';
 $lang['ov_have_new_messages']				= 'Tienes %m mensajes nuevos';
 $lang['ov_free']							= 'Libre';
@@ -111,19 +109,19 @@
 $lang['ov_planet']							= 'Planeta';
 $lang['ov_server_time']						= 'Hora del servidor';
 $lang['ov_events']							= 'Eventos';
-$lang['ov_diameter']						= 'Diámetro';
+$lang['ov_diameter']						= 'Di&aacute;metro';
 $lang['ov_distance_unit']					= 'km';
 $lang['ov_temperature']						= 'Temperatura';
 $lang['ov_aprox']							= 'aprox.';
-$lang['ov_temp_unit']						= '°C';
+$lang['ov_temp_unit']						= '&ordm;C';
 $lang['ov_to']								= 'hasta';
-$lang['ov_position']						= 'Posición';
+$lang['ov_position']						= 'Posici&oacute;n';
 $lang['ov_points']							= 'Puntos';
-$lang['ov_security_request']				= 'Petición de seguridad';
+$lang['ov_security_request']				= 'Petici&oacute;n de seguridad';
 $lang['ov_security_confirm']				= 'Confirmar borrado de planeta';
-$lang['ov_with_pass']						= 'con contraseña';
-$lang['ov_password']						= 'Contraseña';
-$lang['ov_delete_planet']					= '¡Borrar planeta!';
+$lang['ov_with_pass']						= 'con contrase&ntilde;a';
+$lang['ov_password']						= 'Contrase&ntilde;a';
+$lang['ov_delete_planet']					= '&iexcl;Borrar planeta!';
 $lang['ov_your_planet']						= 'Tu planeta';
 $lang['ov_coords']							= 'Coordenadas';
 $lang['ov_abandon_planet']					= 'Abandonar colonia';
@@ -135,14 +133,14 @@
 
 //----------------------------------------------------------------------------//
 //GALAXY
-$lang['gl_no_deuterium_to_view_galaxy']		= '¡No hay suficiente deuterio!';
+$lang['gl_no_deuterium_to_view_galaxy']		= '&iexcl;No hay suficiente deuterio!';
 $lang['gl_legend']							= 'Leyenda';
 $lang['gl_strong_player']					= 'Jugador fuerte';
-$lang['gl_week_player']						= 'Jugador débil';
+$lang['gl_week_player']						= 'Jugador d&eacute;bil';
 $lang['gl_vacation']						= 'Modo vacaciones';
 $lang['gl_banned']							= 'Usuario suspendido';
-$lang['gl_inactive_seven']					= 'Inactivo 7 días';
-$lang['gl_inactive_twentyeight']			= 'Inactivo 28 días';
+$lang['gl_inactive_seven']					= 'Inactivo 7 d&iacute;as';
+$lang['gl_inactive_twentyeight']			= 'Inactivo 28 d&iacute;as';
 $lang['gl_s']								= 'f';
 $lang['gl_w']								= 'd';
 $lang['gl_v']								= 'v';
@@ -156,7 +154,7 @@
 $lang['gl_avaible_recyclers']				= 'recicladores disponibles';
 $lang['gl_avaible_spyprobes']				= 'sondas disponibles';
 $lang['gl_missil_launch']					= 'Lanzamiento de Misiles';
-$lang['gl_missil_to_launch']				= 'Número de misiles (<b>%d</b> restantes):';
+$lang['gl_missil_to_launch']				= 'N&uacute;mero de misiles (<b>%d</b> restantes):';
 $lang['gl_objective']						= 'Objetivo';
 $lang['gl_all_defenses']					= 'Todo';
 $lang['gl_missil_launch_action']			= 'OK';
@@ -172,42 +170,42 @@
 $lang['gl_alliance']						= 'Alianza';
 $lang['gl_actions']							= 'Acciones';
 $lang['gl_spy']								= 'Espiar';
-$lang['gl_buddy_request']					= 'Solicitud de compañeros';
+$lang['gl_buddy_request']					= 'Solicitud de compa&ntilde;eros';
 $lang['gl_missile_attack']					= 'Ataque con misiles';
 $lang['gl_with']							= ' con ';
 $lang['gl_member']							= ' miembro';
 $lang['gl_member_add']						= 's';
-$lang['gl_alliance_page']					= 'Ver página de la alianza';
-$lang['gl_see_on_stats']					= 'Ver en estadísticas';
-$lang['gl_alliance_web_page']				= 'Página principal de la alianza';
+$lang['gl_alliance_page']					= 'Ver p&aacute;gina de la alianza';
+$lang['gl_see_on_stats']					= 'Ver en estad&iacute;sticas';
+$lang['gl_alliance_web_page']				= 'P&aacute;gina principal de la alianza';
 $lang['gl_debris_field']					= 'Campo de escombros';
 $lang['gl_collect']							= 'Recolectar';
 $lang['gl_resources']						= 'Recursos';
-$lang['gl_features']						= 'Características';
-$lang['gl_diameter']						= 'Diámetro';
+$lang['gl_features']						= 'Caracter&iacute;sticas';
+$lang['gl_diameter']						= 'Di&aacute;metro';
 $lang['gl_temperature']						= 'Temperatura';
 $lang['gl_phalanx']							= 'Phalanx';
 $lang['gl_planet_destroyed']				= 'Planeta destruido';
 $lang['gl_player']							= 'Jugador ';
 $lang['gl_in_the_rank']						= ' en el ranking ';
-$lang['gl_stat']							= 'Estadísticas';
+$lang['gl_stat']							= 'Estad&iacute;sticas';
 
 //----------------------------------------------------------------------------//
 //PHALANX
-$lang['px_no_deuterium']					= '¡No tienes deuterio!';
-$lang['px_scan_position']					= 'Escanear posición';
+$lang['px_no_deuterium']					= '&iexcl;No tienes deuterio!';
+$lang['px_scan_position']					= 'Escanear posici&oacute;n';
 $lang['px_fleet_movement']					= 'Movimiento actual de flotas';
 
 //----------------------------------------------------------------------------//
 //IMPERIUM
-$lang['iv_imperium_title']					= 'Visión del Imperio';
+$lang['iv_imperium_title']					= 'Visi&oacute;n del Imperio';
 $lang['iv_planet']							= 'Planeta';
 $lang['iv_name']							= 'Nombre';
 $lang['iv_coords']							= 'Coordenadas';
 $lang['iv_fields']							= 'Campos';
 $lang['iv_resources']						= 'Recursos';
 $lang['iv_buildings']						= 'Edificios';
-$lang['iv_technology']						= 'Tecnologías';
+$lang['iv_technology']						= 'Tecnolog&iacute;as';
 $lang['iv_ships']							= 'Naves';
 $lang['iv_defenses']						= 'Defensas';
 
@@ -228,7 +226,7 @@
 $lang['fl_fleets']							= 'Flotas';
 $lang['fl_expeditions']						= 'expediciones';
 $lang['fl_number']							= 'Num';
-$lang['fl_mission']							= 'Misión';
+$lang['fl_mission']							= 'Misi&oacute;n';
 $lang['fl_ammount']							= 'Cantidad';
 $lang['fl_beginning']						= 'Comienzo';
 $lang['fl_departure']						= 'Salida';
@@ -246,7 +244,7 @@
 $lang['fl_debris_shortcut']					= '(E)';
 $lang['fl_moon_shortcut']					= '(L)';
 $lang['fl_no_shortcuts']					= 'No hay accesos directos';
-$lang['fl_anonymous']						= 'Anónimo';
+$lang['fl_anonymous']						= 'An&oacute;nimo';
 $lang['fl_shortcut_add_title']				= 'Nombre [Galaxia/Sistema/Planeta]';
 $lang['fl_shortcut_name']					= 'Nombre';
 $lang['fl_shortcut_galaxy']					= 'Galaxia';
@@ -258,7 +256,7 @@
 $lang['fl_dlte_shortcut']					= 'Suprimir';
 $lang['fl_back']							= 'Volver';
 $lang['fl_shortcut_add']					= 'Agregar';
-$lang['fl_shortcut_edition']				= 'Edición: ';
+$lang['fl_shortcut_edition']				= 'Edici&oacute;n: ';
 $lang['fl_no_colony']						= 'No hay colonias';
 $lang['fl_send_fleet']						= 'Enviar flota';
 $lang['fl_fleet_speed']						= 'Velocidad';
@@ -276,19 +274,19 @@
 $lang['fl_max']								= 'max';
 $lang['fl_resources_left']					= 'Restante';
 $lang['fl_all_resources']					= 'Todos los recursos';
-$lang['fl_expedition_alert_message']		= 'Atención ! Las expediciones son misiones arriesgadas, puedes perder tus naves !';
+$lang['fl_expedition_alert_message']		= 'Atenci&oacute;n ! Las expediciones son misiones arriesgadas, puedes perder tus naves !';
 $lang['fl_vacation_mode_active']			= 'El modo vacaciones se encuentra activo';
-$lang['fl_expedition_tech_required']		= '¡Investiga la Tecnologia de Expedicion!';
-$lang['fl_expedition_fleets_limit']			= '¡Limite de flotas de Expedicion!';
-$lang['fl_week_player']						= '¡El jugador es muy débil!';
-$lang['fl_strong_player']					= '¡El jugador es muy fuerte!';
-$lang['fl_in_vacation_player']				= '¡El jugador esta en modo vacaciones!';
-$lang['fl_no_slots']						= 'No hay más slots disponibles';
+$lang['fl_expedition_tech_required']		= '&iexcl;Investiga la Tecnologia de Expedicion!';
+$lang['fl_expedition_fleets_limit']			= '&iexcl;Limite de flotas de Expedicion!';
+$lang['fl_week_player']						= '&iexcl;El jugador es muy d&eacute;bil!';
+$lang['fl_strong_player']					= '&iexcl;El jugador es muy fuerte!';
+$lang['fl_in_vacation_player']				= '&iexcl;El jugador esta en modo vacaciones!';
+$lang['fl_no_slots']						= 'No hay m&aacute;s slots disponibles';
 $lang['fl_empty_transport']					= 'No puedes transportar 0 recursos';
-$lang['fl_planet_populed']					= '¡Este planeta esta ocupado!';
-$lang['fl_stay_not_on_enemy']				= '¡No puedes estacionar flotas en el enemigo!';
-$lang['fl_not_ally_deposit']				= '¡No hay deposito de la alianza!';
-$lang['fl_deploy_only_your_planets']		= '¡Sólo puedes desplegar flotas en tus planetas!';
+$lang['fl_planet_populed']					= '&iexcl;Este planeta esta ocupado!';
+$lang['fl_stay_not_on_enemy']				= '&iexcl;No puedes estacionar flotas en el enemigo!';
+$lang['fl_not_ally_deposit']				= '&iexcl;No hay deposito de la alianza!';
+$lang['fl_deploy_only_your_planets']		= '&iexcl;S&oacute;lo puedes desplegar flotas en tus planetas!';
 $lang['fl_no_enought_deuterium']			= 'No tienes deuterio suficiente. Consumo de Deuterio: ';
 $lang['fl_no_enought_cargo_capacity']		= 'No tienes suficiente espacio de carga! Disponible:';
 $lang['fl_admins_cannot_be_attacked']		= 'Los administradores y moderadores del juego no pueden recibir ataques.';
@@ -301,11 +299,12 @@
 $lang['fl_add_to_attack']					= ' fue agregado al ataque.';
 $lang['fl_dont_exist']						= ' no fue agregado al ataque.';
 $lang['fl_acs_invitation_message']			= ' te invita a participar en un SAC.';
-$lang['fl_acs_invitation_title']			= 'Invitación a SAC';
-$lang['fl_sac_of_fleet']					= 'SAC de flota';
+$lang['fl_acs_invitation_title']			= 'Invitaci&oacute;n a SAC';
+$lang['fl_sac_of_fleet']					= 'SAC de la flota';
 $lang['fl_modify_sac_name']					= 'Modificar el nombre del SAC';
 $lang['fl_members_invited']					= 'Participantes invitados';
-$lang['fl_invite_members']					= 'Invitar a los participantes';
+$lang['fl_invite_members']					= 'Invitar participantes';
+$lang['fl_hours']							= 'hora(s)';
 
 //----------------------------------------------------------------------------//
 //BUILDINGS - RESEARCH - SHIPYARD - DEFENSES
@@ -318,19 +317,19 @@
 $lang['bd_add_to_list']						= 'Agregar a la lista';
 $lang['bd_no_more_fields']					= 'No hay espacio en el planeta';
 $lang['bd_remaining']						= 'Restantes';
-$lang['bd_lab_required']					= '¡Es necesario construir primero un laboratorio de investigación en este planeta!';
+$lang['bd_lab_required']					= '&iexcl;Es necesario construir primero un laboratorio de investigaci&oacute;n en este planeta!';
 $lang['bd_building_lab']					= 'No se puede investigar cuando se esta ampliando el laboratorio';
 $lang['bd_lvl']								= 'Nivel';
 $lang['bd_spy']								= ' espia';
 $lang['bd_commander']						= ' comandante';
 $lang['bd_research']						= 'Investigar';
-$lang['bd_shipyard_required']				= '¡Debes construir un hangar en este planeta para continuar!';
-$lang['bd_building_shipyard']				= 'No puedes fabricar durante la ampliación del hangar, fábrica de robots o nanobots';
+$lang['bd_shipyard_required']				= '&iexcl;Debes construir un hangar en este planeta para continuar!';
+$lang['bd_building_shipyard']				= 'No puedes fabricar durante la ampliaci&oacute;n del hangar, f&aacute;brica de robots o nanobots';
 $lang['bd_available']						= 'Disponible: ';
 $lang['bd_build_ships']						= 'Construir';
-$lang['bd_protection_shield_only_one']		= '¡El escudo de protección sólo se puede construir una vez!';
+$lang['bd_protection_shield_only_one']		= '&iexcl;El escudo de protecci&oacute;n s&oacute;lo se puede construir una vez!';
 $lang['bd_build_defenses']					= 'Construir';
-$lang['bd_actual_production']				= 'Producción actual:';
+$lang['bd_actual_production']				= 'Producci&oacute;n actual:';
 $lang['bd_completed']						= 'Completado';
 $lang['bd_operating']						= '(En funcionamiento)';
 $lang['bd_continue']						= 'Continuar';
@@ -341,8 +340,8 @@
 //RESOURCES
 $lang['rs_amount']							= 'cantidad';
 $lang['rs_lvl']								= 'nivel';
-$lang['rs_production_on_planet']			= 'Producción de recursos en el planeta "%s"';
-$lang['rs_basic_income']					= 'Ingresos básicos';
+$lang['rs_production_on_planet']			= 'Producci&oacute;n de recursos en el planeta "%s"';
+$lang['rs_basic_income']					= 'Ingresos b&aacute;sicos';
 $lang['rs_storage_capacity']				= 'Capacidad de los almacenes';
 $lang['rs_calculate']						= 'Calcular';
 $lang['rs_sum']								= 'Suma';
@@ -351,19 +350,18 @@
 
 //----------------------------------------------------------------------------//
 //OFFICIERS
+$lang['of_title']							= 'Oficiales';
 $lang['of_recruit']							= 'Reclutar';
-$lang['of_max_lvl']							= 'Nivel máximo';
-$lang['of_available_points']				= 'Puntos disponibles:';
-$lang['of_points_per_thousand_darkmatter']	= '(1 punto por cada 1000 de materia oscura)';
-$lang['of_lvl']								= 'Nivel';
+$lang['of_active']							= '<strong><font color="lime">Activo</font></strong>';
+$lang['of_inactive']						= '<strong><font color="red">Inactivo</font></strong>';
 
 //----------------------------------------------------------------------------//
 //TRADER
-$lang['tr_only_positive_numbers']			= '¡Solo se pueden usar números positivos!';
+$lang['tr_only_positive_numbers']			= '&iexcl;Solo se pueden usar n&uacute;meros positivos!';
 $lang['tr_not_enought_metal']				= 'No tienes suficiente metal.';
 $lang['tr_not_enought_crystal']				= 'No tienes suficiente cristal.';
 $lang['tr_not_enought_deuterium']			= 'No tienes suficiente deuterio.';
-$lang['tr_exchange_done']					= 'Intercambio realizado con éxito';
+$lang['tr_exchange_done']					= 'Intercambio realizado con &eacute;xito';
 $lang['tr_call_trader']						= 'Llamar a un negociante';
 $lang['tr_call_trader_who_buys']			= 'Llamar a un negociante que compra ';
 $lang['tr_call_trader_submit']				= 'Llamar al comerciante';
@@ -437,7 +435,6 @@
 213 => "Destructor",
 214 => "Estrella de la muerte",
 215 => "Acorazado",
-216 => 'SuperNova',
 
 400 => "Sistemas de defensa",
 401 => "Lanzamisiles",
@@ -448,48 +445,35 @@
 406 => "Ca&ntilde;&oacute;n de plasma",
 407 => "C&uacute;pula peque&ntilde;a de protecci&oacute;n",
 408 => "C&uacute;pula grande de protecci&oacute;n",
-409 => 'Proteccion Planetaria',
-502 => "Misil de intercepci&oacute;n",
+502 => "Misiles antibal&iacute;sticos",
 503 => "Misil interplanetario",
 
 600 => "Oficial",
-601 => "Geólogo",
+601 => "Ge&oacute;logo",
 602 => "Almirante",
 603 => "Ingeniero",
-604 => "Tecnócrata",
-605 => "Constructor",
-606 => "Científico",
-607 => "Almacenista",
-608 => "Defensor",
-609 => "Protector",
-610 => "Espía",
-611 => "Comandante",
-612 => "Destructor",
-613 => "General",
-614 => "Conquistador",
-615 => "Emperador",
+604 => "Tecn&oacute;crata",
 );
 
 $lang['res']['descriptions'] = array(
-1 => "Las minas de metal proveen los recursos básicos de un imperio emergente, y permiten la construcción de edificios y naves.",
-2 => "Los cristales son el recurso principal usado para construir circuitos electrónicos y ciertas aleaciones.",
+1 => "Las minas de metal proveen los recursos b&aacute;sicos de un imperio emergente, y permiten la construcci&oacute;n de edificios y naves.",
+2 => "Los cristales son el recurso principal usado para construir circuitos electr&oacute;nicos y ciertas aleaciones.",
 3 => "El deuterio se usa como combustible para naves, y se recolecta en el mar profundo. Es una sustancia muy escasa, y por ello, relativamente cara.",
-4 => "Las plantas de energía solar convierten energía fotónica en energía eléctrica, para su uso en casi todos los edificios y estructuras.",
-12 => "Un reactor de fusión nuclear que produce un átomo de helio a partir de dos átomos de deuterio usando una presión extremadamente alta y una elevadísima temperatura.",
-14 => "Las fábricas de robots proporcionan unidades baratas y de fácil construcción que pueden ser usadas para mejorar o construir cualquier estructura planetaria. Cada nivel de mejora de la fábrica aumenta la eficiencia y el numero de unidades robóticas que ayudan en la construcción.",
-15 => "",
+4 => "Las plantas de energ&iacute;a solar convierten energ&iacute;a fot&oacute;nica en energ&iacute;a el&eacute;ctrica, para su uso en casi todos los edificios y estructuras.",
+12 => "Un reactor de fusi&oacute;n nuclear que produce un &aacute;tomo de helio a partir de dos &aacute;tomos de deuterio usando una presi&oacute;n extremadamente alta y una elevad&iacute;sima temperatura.",
+14 => "Las f&aacute;bricas de robots proporcionan unidades baratas y de f&aacute;cil construcci&oacute;n que pueden ser usadas para mejorar o construir cualquier estructura planetaria. Cada nivel de mejora de la f&aacute;brica aumenta la eficiencia y el numero de unidades rob&oacute;ticas que ayudan en la construcci&oacute;n.",
+15 => "La f&aacute;brica de nanobots es la &uacute;ltima evoluci&oacute;n de la rob&oacute;tica. Cada mejora proporciona nanobots m&aacute;s y m&aacute;s eficientes que incrementan la velocidad de construcci&oacute;n.",
 21 => "El hangar es el lugar donde se construyen naves y estructuras de defensa planetaria.",
-22 => "Almacén de metal sin procesar.",
-23 => "Almacén de cristal sin procesar.",
+22 => "Almac&eacute;n de metal sin procesar.",
+23 => "Almac&eacute;n de cristal sin procesar.",
 24 => "Contenedores enormes para almacenar deuterio.",
-31 => "Se necesita un laboratorio de investigación para conducir la investigación en nuevas tecnologías.",
-33 => "",
-34 => "El depósito de la alianza ofrece la posibilidad de repostar a las flotas aliadas que estén estacionadas en la órbita ayudando a defender.",
-41 => "",
-42 => "",
-43 => "",
+31 => "Se necesita un laboratorio de investigaci&oacute;n para conducir la investigaci&oacute;n en nuevas tecnolog&iacute;as.",
+33 => "El Terraformer es necesario para habilitar &aacute;reas inaccesibles de tu planeta para edificar infraestructuras.",
+34 => "El dep&oacute;sito de la alianza ofrece la posibilidad de repostar a las flotas aliadas que est&eacute;n estacionadas en la &oacute;rbita ayudando a defender.",
+41 => "Dado que la luna no tiene atm&oacute;sfera, se necesita una base lunar para generar espacio habitable.",
+42 => "Usando el sensor phalanx, las flotas de otros imperios pueden ser descubiertas y observadas. Cuanto mayor sea la cadena de sensores phalanx, mayor el rango que pueda escanear.",
+43 => "El saltos cu&aacute;nticos son transmisores enormes que son capaces de enviar grandes flotas a trav&eacute;s del universo sin perdida de tiempo.",
 44 => "El silo es un lugar de almacenamiento y lanzamiento de misiles planetarios.",
-
 106 => "Usando esta tecnolog&iacute;a, puede obtenerse informaci&oacute;n sobre otros planetas.",
 108 => "Cuanto m&aacute;s elevado sea el nivel de tecnolog&iacute;a de computaci&oacute;n, m&aacute;s flotas podr&aacute;s controlar simultaneamente. Cada nivel adicional de esta tecnologia, aumenta el numero de flotas en 1.",
 109 => "Este tipo de tecnolog&iacute;a incrementa la eficiencia de tus sistemas de armamento. Cada mejora de la tecnolog&iacute;a militar a&ntilde;ade un 10% de potencia a la base de da&ntilde;o de cualquier arma disponible.",
@@ -507,7 +491,6 @@
 123 => "Los cient&iacute;ficos de tus planetas pueden comunicarse entre ellos a trav&eacute;s de esta red.",
 124 => "Las naves son equipadas con equipo cientifico para tomar datos en largas expediciones.",
 199 => "A trav&eacute;s del disparo de part&iacute;culas concentradas de gravit&oacute;n se genera un campo gravitacional artificial con suficiente potencia y poder de atracci&oacute;n para destruir no solo naves, sino lunas enteras.",
-
 202 => "Las naves peque&ntilde;as de carga son naves muy &aacute;giles usadas para transportar recursos desde un planeta a otro",
 203 => "La nave grande de carga es una versi&oacute;n avanzada de las naves peque&ntilde;as de carga, permitiendo as&iacute; una mayor capacidad de almacenamiento y velocidades m&aacute;s altas gracias a un mejor sistema de propulsi&oacute;n.",
 204 => "El cazador ligero es una nave maniobrable que puedes encontrar en casi cualquier planeta. El coste no es particularmente alto, pero asimismo el escudo y la capacidad de carga son muy bajas.",
@@ -522,8 +505,6 @@
 213 => "El destructor es la nave m&aacute;s pesada jam&aacute;s vista y posee un potencial de ataque sin precedentes.",
 214 => "No hay nada tan grande y peligroso como una estrella de la muerte aproxim&aacute;ndose.",
 215 => "El Acorazado es una nave altamente especializada en la intercepci&oacute;n de flotas hostiles.",
-216 => "La SuperNova es la nave más poderosa nunca antes creada, con un gran poder ofensivo que ninguna nave podra resistir a su ataque.",
-
 401 => "El lanzamisiles es un sistema de defensa sencillo, pero barato.",
 402 => "Por medio de un rayo l&aacute;ser concentrado, se puede provocar m&aacute;s da&ntilde;o que con las armas bal&iacute;sticas normales.",
 403 => "Los l&aacute;sers grandes posee una mejor salida de energ&iacute;a y una mayor integridad estructural que los l&aacute;sers peque&ntilde;os.",
@@ -532,45 +513,32 @@
 406 => "Los ca&ntilde;ones de plasma liberan la energ&iacute;a de una peque&ntilde;a erupci&oacute;n solar en una bala de plasma. La energ&iacute;a destructiva es incluso superior a la del Destructor.",
 407 => "La c&uacute;pula peque&ntilde;a de protecci&oacute;n cubre el planeta con un delgado campo protector que puede absorber inmensas cantidades de energ&iacute;a.",
 408 => "La c&uacute;pula grande de protecci&oacute;n proviene de una tecnolog&iacute;a de defensa mejorada que absorbe incluso m&aacute;s energ&iacute;a antes de colapsarse.",
-409 => "La maxima proteccion para los planetas",
-502 => "Los misiles de intercepci&oacute;n destruyen los misiles interplanetarios.",
+502 => "Los misiles antibal&iacute;sticos destruyen los misiles interplanetarios.",
 503 => "Los misiles interplanetarios destruyen los sistemas de defensa del enemigo.",
-
-601 => 'El geólogo es un experto en astrominerolog&iacute;a y astrocristalograf&iacute;a. Asiste a sus equipos en la metalurgia y qu&iacute;mica y tambi&eacute;n se encarga de las comunicaciones interplanetarias para optimizar el uso y refinamiento de la materia bruta a lo largo de todo el imperio.<br><br><strong><font color="lime">+5% de producción. Nivel Máx. 20</font></strong>',
-602 => 'El almirante es un veterano de guerra experimentado y un habilidoso estratega. En las batallas mas duras, es capaz de hacerse una idea de la situación y contactar a sus almirantes subordinados. Un emperador sabio puede apoyarse en su ayuda durante los combates.<br><br><strong><font color="lime">+5% escudo en naves. Nivel Máx. 20</font></strong>',
-603 => 'El Ingeniero es un especialista en la gestión de energía. En tiempos de paz, aumenta la energía de todas las colonias. En caso de ataque, garantiza el abastecimiento de energía a los cañones, evitando una posible sobrecarga, lo que conduce a una reducción de defensas perdidas en batalla.<br><br><strong><font color="lime">+5% de energia. Nivel Máx. 10</font></strong>',
-604 => 'El gremio de los tecnócratas está compuesto de auténticos genios, y siempre los encontrarás en ese peligroso borde donde todo explotaría en mil pedazos antes de poder encontrar una explicación tecnológica y racional. Ningún ser humano normal trataría jamás descifrar el código de un tecnócrata, con su presencia, inspira a los investigadores del imperio.<br><br><strong><font color="lime">+5% velocidad de construcción de naves. Nivel Máx. 10</font></strong>',
-605 => 'El Constructor tiene alterado su ADN, uno solo de estos hombres puede construir una ciudad entera en poco tiempo.<br><br><strong><font color="lime">+10% de rapidez en la construcción de edificios. Nivel Máx. 3</font></strong>',
-606 => 'Los científicos forman parte de un gremio concurrente al de los tecnócratas. Ellos se especializan en la mejora de las tecnologías.<br><br><strong><font color="lime">+10% de rapidez en la investigacion. Nivel Máx. 3</font></strong>',
-607 => 'El almacenista es parte de la antigua hermandad del planeta Hsac. Su lema es ganar el máximo, es por ello que necesita espacios de almacenamiento enormes. Por ese motivo ha desarrollado una nueva técnica de almacenamiento.<br><br><strong><font color="lime">+50% de almacenamiento. Nivel Máx.2</font></strong>',
-608 => 'El defensor es un miembro del ejército imperial. Abocarse en su trabajo le permite construir una formidable defensa en un breve periodo de tiempo.<br><br><strong><font color="lime">+25% de rapidez en la construccion de defensas. Nivel Máx. 2</font></strong>',
-609 => 'El protector forma parte del ejercito imperial y su objetivo es desarrollar tecnologías que mejoren las defensas planetarias.<br><br><strong><font color="lime">Desbloquea la protección planetaria. Nivel Máx. 1</font></strong>',
-610 => 'El espía es una persona enigmática. Nadie nunca vio su verdadero rostro, la única forma sería asesinandoló.<br><br><strong><font color="lime">+5 niveles de espionaje. Nivel Máx. 2</font></strong>',
-611 => 'El comandante forma parte del ejército imperial ha dominado el arte del manejo de flotas. Su cerebro puede calcular las trayectorias de una gran cantidad de flotas.<br><br><strong><font color="lime">+3 slots para flotas. Nivel Máx. 3</font></strong>',
-612 => 'El destructor es un miembro del ejército imperial sin misericordia. Masacra todo lo que está a su paso sólo por placer. Actualmente está desarrollando un nuevo método de producción de las estrellas de la muerte.<br><br><strong><font color="lime">2 estrellas al hacer 1. Nivel Máx. 1</font></strong>',
-613 => 'El general es una persona que ha servido desde hace muchos años al ejército imperial. Los fabricantes de naves producen más rápido en su presencia.<br><br><strong><font color="lime">+10% de rapidez en los hangares. Nivel Máx. 3</font></strong>',
-614 => 'El Conquistador es un miembro más del ejercito, este tiene la habilidad de navegar un tipo de nave que nadie más podría ni hacer despegar.<br><br><strong><font color="lime">Desbloquea la SuperNova. Nivel Máx. 1</font></strong>',
-615 => 'El emperador pone bajo su mando a todos los oficiales disponibles en el imperio, combinar sus habilidades para dominar el universo y lograr ser un oponente casi invensile.<br><br><strong><font color="lime">Desbloquea la destrucción planetaria. Nivel Máx. 1</font></strong>',
+601 => 'El ge&oacute;logo es un experto en astrominerolog&iacute;a y astrocristalograf&iacute;a. Apoyado por su equipo de metal&uacute;rgicos e ingenieros en qu&iacute;mica apoya a gobiernos interplanetarias a la explotaci&oacute;n de fuentes de recursos y a la optimazaci&oacute;n del refinamiento de estos recursos.<br><br><strong><font color="lime">+10% producci&oacute;n de minas</font></strong>',
+602 => 'El almirante de flota es un veterano de guerra experimentado y un habilidoso estratega. En las batallas m&aacute;s duras, es capaz de hacerse una idea de la situaci&oacute;n y contactar a sus almirantes subordinados. Un emperador sabio puede confiar en su ayuda durante los combates y guiar m&aacute;s flotas al mismo tiempo.<br><br><strong><font color="lime">+2 huecos de flota m&aacute;ximos</font></strong>',
+603 => 'El Ingeniero es un especialista en gesti&oacute;n de energ&iacute;a. En tiempos de paz aumenta la energ&iacute;a de todas las colonias. En caso de ataque, garantiza el abastecimiento de energ&iacute;a a los ca&ntilde;ones, evitando una posible sobrecarga, lo que conduce a una reducci&oacute;n de defensas perdidas en batalla.<br><br><strong><font color="lime">Minimiza las perdidas de las defensas a la mitad,<br />+10% de producci&oacute;n de energ&iacute;a</font></strong>',
+604 => 'El gremio de los Tecn&oacute;cratas est&aacute; compuesto de aut&eacute;nticos genios y siempre los encontrar&aacute;s en un mundo donde la l&oacute;gica humana ser&iacute;a descartada. Desde hace miles de a&ntilde;os, ning&uacute;n ser humano normal ha podido descifrar el c&oacute;digo de un tecn&oacute;crata. El tecn&oacute;crata inspira a los investigadores del imperio con tan s&oacute;lo su presencia.<br><br><strong><font color="lime">+2 al nivel de espionaje,<br />-25% menos tiempo de investigaci&oacute;n</font></strong>',
 );
 
 //----------------------------------------------------------------------------//
 //INFOS
-$lang['in_jump_gate_done']					= 'El salto cuántico fue realizado, el próximo salto podrá ser realizado en: ';
-$lang['in_jump_gate_error_data']			= '¡Error, los datos para el salto son incorrectos!';
-$lang['in_jump_gate_not_ready_target']		= 'El salto cuántico no está listo en la Luna de destino, estará listo en: ';
-$lang['in_jump_gate_doesnt_have_one']		= '¡No tienes Salto cuántico en esa luna!';
-$lang['in_jump_gate_already_used']			= 'El Salto cuántico fue usado, tiempo para recargar su energia: ';
+$lang['in_jump_gate_done']					= 'El salto cu&aacute;ntico fue realizado, el pr&oacute;ximo salto podr&aacute; ser realizado en: ';
+$lang['in_jump_gate_error_data']			= '&iexcl;Error, los datos para el salto son incorrectos!';
+$lang['in_jump_gate_not_ready_target']		= 'El salto cu&aacute;ntico no est&aacute; listo en la Luna de destino, estar&aacute; listo en: ';
+$lang['in_jump_gate_doesnt_have_one']		= '&iexcl;No tienes Salto cu&aacute;ntico en esa luna!';
+$lang['in_jump_gate_already_used']			= 'El Salto cu&aacute;ntico fue usado, tiempo para recargar su energia: ';
 $lang['in_jump_gate_available']				= 'disponible';
 $lang['in_rf_again']    					= 'Fuego rapido contra';
 $lang['in_rf_from']     					= 'Fuego rapido de';
 $lang['in_level']       					= 'Nivel';
 $lang['in_prod_p_hour'] 					= 'Producion/hora';
 $lang['in_difference']  					= 'Diferencia';
-$lang['in_used_energy'] 					= 'Consumo de energía';
-$lang['in_prod_energy'] 					= 'Produción de energía';
+$lang['in_used_energy'] 					= 'Consumo de energ&iacute;a';
+$lang['in_prod_energy'] 					= 'Produci&oacute;n de energ&iacute;a';
 $lang['in_used_deuter']						= 'Consumo de deuterio';
 $lang['in_range']       					= 'Rango de sensores';
-$lang['in_title_head']  					= 'Información de';
+$lang['in_title_head']  					= 'Informaci&oacute;n de';
 $lang['in_name']        					= 'Nombre';
 $lang['in_struct_pt']   					= 'Puntos de Estructura';
 $lang['in_shield_pt']   					= 'Integridad del Escudo';
@@ -581,69 +549,70 @@
 $lang['in_consumption'] 					= 'Consumo de combustible (Deuterio)';
 $lang['in_jump_gate_start_moon']			= 'Luna de partida';
 $lang['in_jump_gate_finish_moon']			= 'Luna de destino';
-$lang['in_jump_gate_select_ships']			= 'Usar Salto Cuántico: número de naves';
+$lang['in_jump_gate_select_ships']			= 'Usar Salto Cu&aacute;ntico: n&uacute;mero de naves';
 $lang['in_jump_gate_jump']					= 'Saltar';
 $lang['in_destroy']     					= 'Destruir:';
 $lang['in_needed']      					= 'Necesita';
-$lang['in_dest_durati'] 					= 'Duración de destrucción';
+$lang['in_dest_durati'] 					= 'Duraci&oacute;n de destrucci&oacute;n';
 
 // -------------------------- MINES ------------------------------------------------------------------------------------------------------//
 $lang['info'][1]['name']          			= "Mina de Metal";
-$lang['info'][1]['description']   			= "Las minas de metal proveen los recursos básicos de un imperio emergente, y permiten la construcción de edificios y naves. El metal es el material más barato disponible y requiere poca energía para su recolección, pero se usa mucho más frecuentemente que el resto de los recursos. Se encuentra en profundidad, debajo de la superficie, lo que conduce a minas cada vez más profundas que necesitan más energía para funcionar.";
+$lang['info'][1]['description']   			= "Las minas de metal proveen los recursos b&aacute;sicos de un imperio emergente, y permiten la construcci&oacute;n de edificios y naves. El metal es el material m&aacute;s barato disponible y requiere poca energ&iacute;a para su recolecci&oacute;n, pero se usa mucho m&aacute;s frecuentemente que el resto de los recursos. Se encuentra en profundidad, debajo de la superficie, lo que conduce a minas cada vez m&aacute;s profundas que necesitan m&aacute;s energ&iacute;a para funcionar.";
 $lang['info'][2]['name']          			= "Mina de Cristal";
-$lang['info'][2]['description']   			= "Los cristales son el recurso principal usado para construir circuitos electrónicos y ciertas aleaciones. Comparado con el proceso de producción del metal, el proceso de conversión de estructuras cristalinas en cristales industriales, requiere aproximadamente el doble de energía; por lo que los cristales son más caros al comerciar. Cada nave y edificio necesita una cierta cantidad de cristales, pero los apropiados son muy escasos y se encuentran en grandes profundidades. Las minas necesarias para recolectarlos, por ello, se vuelven más caras al alcanzar mayores profundidades, pero, ciertamente, proveen de más cristales que minas menos profundas.";
+$lang['info'][2]['description']   			= "Los cristales son el recurso principal usado para construir circuitos electr&oacute;nicos y ciertas aleaciones. Comparado con el proceso de producci&oacute;n del metal, el proceso de conversi&oacute;n de estructuras cristalinas en cristales industriales, requiere aproximadamente el doble de energ&iacute;a; por lo que los cristales son m&aacute;s caros al comerciar. Cada nave y edificio necesita una cierta cantidad de cristales, pero los apropiados son muy escasos y se encuentran en grandes profundidades. Las minas necesarias para recolectarlos, por ello, se vuelven m&aacute;s caras al alcanzar mayores profundidades, pero, ciertamente, proveen de m&aacute;s cristales que minas menos profundas.";
 $lang['info'][3]['name']          			= "Sintetizador de deuterio";
-$lang['info'][3]['description']   			= "El deuterio es agua pesada: los núcleos de hidrogeno contienen un neutrón adicional y es muy útil como combustible para las naves por la gran cantidad de energía liberada de la reacción entre deuterio y tritio (reacción DT). El deuterio puede ser encontrado frecuentemente en el mar profundo, debido a su peso molecular, y mejorar el sintetizador de deuterio, permite la recolección de este recurso.";
+$lang['info'][3]['description']   			= "El deuterio es agua pesada: los n&uacute;cleos de hidrogeno contienen un neutr&oacute;n adicional y es muy &uacute;til como combustible para las naves por la gran cantidad de energ&iacute;a liberada de la reacci&oacute;n entre deuterio y tritio (reacci&oacute;n DT). El deuterio puede ser encontrado frecuentemente en el mar profundo, debido a su peso molecular, y mejorar el sintetizador de deuterio, permite la recolecci&oacute;n de este recurso.";
 
 // -------------------------- ENERGY ----------------------------------------------------------------------------------------------------//
 $lang['info'][4]['name']          			= "Planta de Energ&iacute;a solar";
-$lang['info'][4]['description']   			= "Para proporcionar la energía necesaria para el funcionamiento de los edificios, se requieren enormes plantas de energía. Una planta solar es una forma de crear energía, puesto que utiliza semiconductores de células fotovoltaicas, que convierten los fotones en corriente eléctrica. Cuanto más se mejore la planta solar, mayor será el area para convertir la luz solar en energía y por tanto mayor será la generada. Las plantas de energía solar son la espina dorsal de cualquier infraestructura planetaria.";
+$lang['info'][4]['description']   			= "Para proporcionar la energ&iacute;a necesaria para el funcionamiento de los edificios, se requieren enormes plantas de energ&iacute;a. Una planta solar es una forma de crear energ&iacute;a, puesto que utiliza semiconductores de c&eacute;lulas fotovoltaicas, que convierten los fotones en corriente el&eacute;ctrica. Cuanto m&aacute;s se mejore la planta solar, mayor ser&aacute; el area para convertir la luz solar en energ&iacute;a y por tanto mayor ser&aacute; la generada. Las plantas de energ&iacute;a solar son la espina dorsal de cualquier infraestructura planetaria.";
 $lang['info'][12]['name']         			= "Planta de Fusion";
-$lang['info'][12]['description']  			= "En una planta de energía de fusión, los núcleos de hidrógeno son fusionados en núcleos de helio bajo una enorme temperatura y presión, despidiendo tremendas cantidades de energía. Por cada gramo de Deuterio consumido se pueden producir hasta 41,32*10^-13 Julios de energía; con 1 gramo eres capaz de producir 172MWh de energía.
+$lang['info'][12]['description']  			= "En una planta de energ&iacute;a de fusi&oacute;n, los n&uacute;cleos de hidr&oacute;geno son fusionados en n&uacute;cleos de helio bajo una enorme temperatura y presi&oacute;n, despidiendo tremendas cantidades de energ&iacute;a. Por cada gramo de Deuterio consumido se pueden producir hasta 41,32*10^-13 Julios de energ&iacute;a; con 1 gramo eres capaz de producir 172MWh de energ&iacute;a.
 <br><br>
-Mayores complejos de reactores usan más deuterio y pueden producir más energía por hora. El efecto de energía puede ser aumentado investigando la tecnología de energía.
+Mayores complejos de reactores usan m&aacute;s deuterio y pueden producir m&aacute;s energ&iacute;a por hora. El efecto de energ&iacute;a puede ser aumentado investigando la tecnolog&iacute;a de energ&iacute;a.
 <br><br>
-La producción de energía de las plantas de fusión se calcula de la siguiente forma:<br><br>
-30 * [Nivel de la Planta de Fusión] * (1,05 + [Nivel de la Tecnología de Energía] * 0,01) ^ [Nivel de la Planta de Fusión]";
+
+La producci&oacute;n de energ&iacute;a de las plantas de fusi&oacute;n se calcula de la siguiente forma:<br><br>
+30 * [Nivel de la Planta de Fusi&oacute;n] * (1,05 + [Nivel de la Tecnolog&iacute;a de Energ&iacute;a] * 0,01) ^ [Nivel de la Planta de Fusi&oacute;n]";
 
 // -------------------------- BUILDINGS ----------------------------------------------------------------------------------------------------//
 $lang['info'][14]['name']         			= "F&aacute;brica de Robots";
-$lang['info'][14]['description']  			= "Las fábricas de robots proporcionan unidades baratas y de fácil construcción que pueden ser usadas para mejorar o construir cualquier estructura planetaria. Cada nivel de mejora de la fábrica aumenta la eficiencia y el numero de unidades robóticas que ayudan en la construcción.";
+$lang['info'][14]['description']  			= "Las f&aacute;bricas de robots proporcionan unidades baratas y de f&aacute;cil construcci&oacute;n que pueden ser usadas para mejorar o construir cualquier estructura planetaria. Cada nivel de mejora de la f&aacute;brica aumenta la eficiencia y el numero de unidades rob&oacute;ticas que ayudan en la construcci&oacute;n.";
 $lang['info'][15]['name']         			= "F&aacute;brica de Nanobots";
-$lang['info'][15]['description']  			= "Los nanobots son realmente unidades robóticas minúsculas, con un tamaño medio de apenas unos pocos nanómetros. Estos microbios mecánicos son conectados en red y programados para una tarea de construcción, ofrecen una velocidad de producción anteriormente desconocida. Los nanobots operan en niveles moleculares, y son inmensamente útiles para construir naves, puesto que permanecen como parte de su estructura y de esta forma sus capacidades de reparación pueden ser usadas para el control de daño y reparar lo que fuera necesario si consiguen suficiente energía y recursos.";
+$lang['info'][15]['description']  			= "Los nanobots son realmente unidades rob&oacute;ticas min&uacute;sculas, con un tama&ntilde;o medio de apenas unos pocos nan&oacute;metros. Estos microbios mec&aacute;nicos son conectados en red y programados para una tarea de construcci&oacute;n, ofrecen una velocidad de producci&oacute;n anteriormente desconocida. Los nanobots operan en niveles moleculares, y son inmensamente &uacute;tiles para construir naves, puesto que permanecen como parte de su estructura y de esta forma sus capacidades de reparaci&oacute;n pueden ser usadas para el control de da&ntilde;o y reparar lo que fuera necesario si consiguen suficiente energ&iacute;a y recursos.";
 $lang['info'][21]['name']         			= "Hangar";
-$lang['info'][21]['description']  			= "El hangar planetario es responsable de la construcción de naves espaciales y sistemas de defensa. Según va aumentando, puede producir una mayor variedad de naves a velocidades más altas. Si además existe una fábrica de nanobots en el planeta, la velocidad a la que se completan las unidades, aumenta considerablemente.";
+$lang['info'][21]['description']  			= "El hangar planetario es responsable de la construcci&oacute;n de naves espaciales y sistemas de defensa. Seg&uacute;n va aumentando, puede producir una mayor variedad de naves a velocidades m&aacute;s altas. Si adem&aacute;s existe una f&aacute;brica de nanobots en el planeta, la velocidad a la que se completan las unidades, aumenta considerablemente.";
 $lang['info'][22]['name']         			= "Almac&eacute;n de metal";
-$lang['info'][22]['description']  			= "Bodegas enormes para almacenar metal sin procesar. Mientras más grande sea el almacén, más aumentará la capacidad de almacenaje del planeta. La recolección de metal se detendrá cuando el almacén esté lleno.";
+$lang['info'][22]['description']  			= "Bodegas enormes para almacenar metal sin procesar. Mientras m&aacute;s grande sea el almac&eacute;n, m&aacute;s aumentar&aacute; la capacidad de almacenaje del planeta. La recolecci&oacute;n de metal se detendr&aacute; cuando el almac&eacute;n est&eacute; lleno.";
 $lang['info'][23]['name']         			= "Almac&eacute;n de cristal";
-$lang['info'][23]['description']  			= "Bodegas enormes para almacenar cristal sin procesar. Mientras más grande sea el almacén, más aumentará la capacidad de almacenaje. La recolección de cristal se detendrá cuando el almacén esté lleno.";
+$lang['info'][23]['description']  			= "Bodegas enormes para almacenar cristal sin procesar. Mientras m&aacute;s grande sea el almac&eacute;n, m&aacute;s aumentar&aacute; la capacidad de almacenaje. La recolecci&oacute;n de cristal se detendr&aacute; cuando el almac&eacute;n est&eacute; lleno.";
 $lang['info'][24]['name']         			= "Contenedor de deuterio";
-$lang['info'][24]['description']  			= "Contenedores enormes para almacenar deuterio. Los contenedores se encuentran a menudo cerca del hangar. Los contenedores grandes son capaces de almacenar más deuterio. La recolección de deuterio se detendrá cuando el contenedor esté lleno.";
+$lang['info'][24]['description']  			= "Contenedores enormes para almacenar deuterio. Los contenedores se encuentran a menudo cerca del hangar. Los contenedores grandes son capaces de almacenar m&aacute;s deuterio. La recolecci&oacute;n de deuterio se detendr&aacute; cuando el contenedor est&eacute; lleno.";
 $lang['info'][31]['name']         			= "Laboratorio de investigaci&oacute;n";
-$lang['info'][31]['description']  			= "Para poder investigar en nuevas áreas de una tecnología, se necesita un laboratorio de investigación planetario. El nivel de mejoras de ese laboratorio, no solo incrementa la velocidad a la que se descubren nuevas tecnologías, sino que también abre nuevos campos para investigar. Para conducir una investigación en el menor tiempo posible, todos los científicos del imperio son enviados al planeta donde se inició el trabajo de investigación. En cuanto el trabajo se haya completado, volverán a sus planetas y llevarán con ellos la nueva tecnología descubierta. De este modo, el conocimiento sobre nuevas tecnologías puede ser fácilmente divulgado a través del imperio.";
+$lang['info'][31]['description']  			= "Para poder investigar en nuevas &aacute;reas de una tecnolog&iacute;a, se necesita un laboratorio de investigaci&oacute;n planetario. El nivel de mejoras de ese laboratorio, no solo incrementa la velocidad a la que se descubren nuevas tecnolog&iacute;as, sino que tambi&eacute;n abre nuevos campos para investigar. Para conducir una investigaci&oacute;n en el menor tiempo posible, todos los cient&iacute;ficos del imperio son enviados al planeta donde se inici&oacute; el trabajo de investigaci&oacute;n. En cuanto el trabajo se haya completado, volver&aacute;n a sus planetas y llevar&aacute;n con ellos la nueva tecnolog&iacute;a descubierta. De este modo, el conocimiento sobre nuevas tecnolog&iacute;as puede ser f&aacute;cilmente divulgado a trav&eacute;s del imperio.";
 $lang['info'][33]['name']         			= "Terraformer";
-$lang['info'][33]['description']  			= "La pregunta sobre cómo disponer de más espacio para las estructuras en los planetas surgió durante el proceso de crecimiento de las infraestructuras de los mismos a través de las galaxias. Los métodos de construcción e ingenería tradicional eran insuficientes debido a la enorme necesidad de espacio edificable.
-Un pequeño grupo de físicos de alta energía y nanotécnicos finalmente encontraron una solución: el Terraforming.<br>
-Usando grandes cantidades de energía se pueden hacer incluso continentes enteros. En este edificio se producen nanobots diseñados especialmente para asegurar la calidad y usabilidad de las areas formadas.
+$lang['info'][33]['description']  			= "La pregunta sobre c&oacute;mo disponer de m&aacute;s espacio para las estructuras en los planetas surgi&oacute; durante el proceso de crecimiento de las infraestructuras de los mismos a trav&eacute;s de las galaxias. Los m&eacute;todos de construcci&oacute;n e ingener&iacute;a tradicional eran insuficientes debido a la enorme necesidad de espacio edificable.
+Un peque&ntilde;o grupo de f&iacute;sicos de alta energ&iacute;a y nanot&eacute;cnicos finalmente encontraron una soluci&oacute;n: el Terraforming.<br>
+Usando grandes cantidades de energ&iacute;a se pueden hacer incluso continentes enteros. En este edificio se producen nanobots dise&ntilde;ados especialmente para asegurar la calidad y usabilidad de las areas formadas.
 <br><br>
 Una vez construido, el terraformer no puede ser desmontado.";
 $lang['info'][34]['name']         			= "Dep&oacute;sito de la Alianza";
-$lang['info'][34]['description']  			= "El depósito de la alianza ofrece la posibilidad de repostar a las flotas aliadas que estén estacionadas en la órbita ayudando a defender. Cada mejora del depósito de alianza permite proveer de 10.000 unidades adicionales de deuterio, por hora, a las flotas estacionadas en la órbita.";
+$lang['info'][34]['description']  			= "El dep&oacute;sito de la alianza ofrece la posibilidad de repostar a las flotas aliadas que est&eacute;n estacionadas en la &oacute;rbita ayudando a defender. Cada mejora del dep&oacute;sito de alianza permite proveer de 10.000 unidades adicionales de deuterio, por hora, a las flotas estacionadas en la &oacute;rbita.";
 $lang['info'][41]['name']         			= "Base Lunar";
-$lang['info'][41]['description']  			= "Dado que la luna no tiene atmósfera, se necesita una base lunar para generar espacio habitable. La base lunar no solo provee el oxígeno necesario, también la gravedad artificial, temperatura y protección necesarias. Cuanto más se mejore la base lunar, mayor es el área para construir estructuras. Cada nivel de la base lunar proporciona 3 campos lunares , hasta que la luna esté totalmente llena.
+$lang['info'][41]['description']  			= "Dado que la luna no tiene atm&oacute;sfera, se necesita una base lunar para generar espacio habitable. La base lunar no solo provee el ox&iacute;geno necesario, tambi&eacute;n la gravedad artificial, temperatura y protecci&oacute;n necesarias. Cuanto m&aacute;s se mejore la base lunar, mayor es el &aacute;rea para construir estructuras. Cada nivel de la base lunar proporciona 3 campos lunares , hasta que la luna est&eacute; totalmente llena.
 <br><br>
 Una vez construida, la base lunar no puede ser desmontada.";
 $lang['info'][42]['name']         			= "Sensor Phalanx";
-$lang['info'][42]['description']  			= "Una cadena de sensores de alta resolución se usa para escanear un enorme espectro de frecuencia. Las unidades de proceso paralelo masivo analizan entonces las señales recibidas para detectar incluso la más mínima anomalía en la frecuencia o fortalecimiento, para detectar maniobras de flotas en imperios distantes. Debido a la complejidad del sistema, cada escaneo necesita una cantidad moderada de deuterio para proporcionar la energía necesaria.";
+$lang['info'][42]['description']  			= "Una cadena de sensores de alta resoluci&oacute;n se usa para escanear un enorme espectro de frecuencia. Las unidades de proceso paralelo masivo analizan entonces las se&ntilde;ales recibidas para detectar incluso la m&aacute;s m&iacute;nima anomal&iacute;a en la frecuencia o fortalecimiento, para detectar maniobras de flotas en imperios distantes. Debido a la complejidad del sistema, cada escaneo necesita una cantidad moderada de deuterio para proporcionar la energ&iacute;a necesaria.";
 $lang['info'][43]['name']         			= "Salto Cuantico";
-$lang['info'][43]['description']  			= "El Salto cuántico es un sistema de transceptores gigante capaz de enviar incluso las flotas más grandes a otro Salto cuántico en cualquier lugar del universo sin pérdida de tiempo. Este transmisor no necesita Deuterio, pero ha de pasar 1 hora entre dos saltos, de lo contrario se sobrecalentaría. Transportar recursos a través del salto no es posible. Toda la acción requiere tecnología muy desarrollada.";
+$lang['info'][43]['description']  			= "El Salto cu&aacute;ntico es un sistema de transceptores gigante capaz de enviar incluso las flotas m&aacute;s grandes a otro Salto cu&aacute;ntico en cualquier lugar del universo sin p&eacute;rdida de tiempo. Este transmisor no necesita Deuterio, pero ha de pasar 1 hora entre dos saltos, de lo contrario se sobrecalentar&iacute;a. Transportar recursos a trav&eacute;s del salto no es posible. Toda la acci&oacute;n requiere tecnolog&iacute;a muy desarrollada.";
 $lang['info'][44]['name']         			= "Silo";
-$lang['info'][44]['description']  			= "El silo es un lugar de almacenamiento y lanzamiento de misiles planetarios. Por cada nivel de tu silo, tienes espacio para 5 misiles interplanetarios o 10 misiles de intercepción. Es posible mezclar los tipos de misil; 1 interplanetario usa el espacio equivalente a 2 de intercepción.";
+$lang['info'][44]['description']  			= "El silo es un lugar de almacenamiento y lanzamiento de misiles planetarios. Por cada nivel de tu silo, tienes espacio para 5 misiles interplanetarios o 10 misiles de intercepci&oacute;n. Es posible mezclar los tipos de misil; 1 interplanetario usa el espacio equivalente a 2 de intercepci&oacute;n.";
 
 // -------------------------- TECHNOLOGY ----------------------------------------------------------------------------------------------------//
-$lang['info'][106]['name']        			= "Tecnología de espionaje";
+$lang['info'][106]['name']        			= "Tecnolog&iacute;a de espionaje";
 $lang['info'][106]['description'] 			= "Usando esta tecnolog&iacute;a, puede obtenerse informaci&oacute;n sobre otros planetas.";
-$lang['info'][108]['name']        			= "Tecnología de computación";
+$lang['info'][108]['name']        			= "Tecnolog&iacute;a de computaci&oacute;n";
 $lang['info'][108]['description'] 			= "Cuanto m&aacute;s elevado sea el nivel de tecnolog&iacute;a de computaci&oacute;n, m&aacute;s flotas podr&aacute;s controlar simultaneamente. Cada nivel adicional de esta tecnologia, aumenta el numero de flotas en 1.";
 $lang['info'][109]['name']        			= "Tecnolog&iacute;a militar";
 $lang['info'][109]['description'] 			= "Este tipo de tecnolog&iacute;a incrementa la eficiencia de tus sistemas de armamento. Cada mejora de la tecnolog&iacute;a militar a&ntilde;ade un 10% de potencia a la base de da&ntilde;o de cualquier arma disponible.";
@@ -705,7 +674,6 @@
 $lang['info'][214]['description'] 			= "Las estrellas de la muerte estan equipadas con grandes cantidades de ca&ntilde;&oacute;nes gauss, capaces de destruir cualquier cosa con un s&oacute;lo disparo, sean destructores o lunas. Para proveer la energ&iacute;a necesaria a este arma, se utilizan grandes &aacute;reas de las estrellas de la muerte para generadores de energ&iacute;a. El tama&ntilde;o de la nave tambi&eacute;n limita su velocidad de viaje, que es realmente baja. Se dice que el capit&aacute;n ayuda frecuentemente a aumentar su velocidad.";
 $lang['info'][215]['name']        			= "Acorazado";
 $lang['info'][215]['description'] 			= "Esta nave, toda una filigrana tecnol&oacute;gica, es incre&iacute;blemente eficaz a la hora de destruir flotas atacantes. Con sus ca&ntilde;ones l&aacute;ser altamente desarrollados, ocupa una posici&oacute;n de privilegio en las batallas a gran escala, donde puede tumbar a varias naves con bastante facilidad. Dado su dise&ntilde;o peque&ntilde;o y su enorme armamento, la capacidad de carga es reducida, pero esto se ve equilibrado gracias al bajo consumo de su propulsor hiperespacial.";
-$lang['info'][216]['name']        			= "Supernova";
 
 // -------------------------- DEFENSES ----------------------------------------------------------------------------------------------------//
 $lang['info'][401]['name']        			= "Lanzamisiles";
@@ -725,55 +693,21 @@
 $lang['info'][407]['description'] 			= "Mucho antes de que los generadores de escudos fueran integrados y port&aacute;tiles, hab&iacute;a grandes y viejos generadores en la superficie de los planetas. Estos eran capaces de crear un enorme escudo alrdedor de la superficie del planeta, capaz de absorber grandes cantidades de energ&iacute;a cuando eran atacados.";
 $lang['info'][408]['name']        			= "C&uacute;pula grande de protecci&oacute;n";
 $lang['info'][408]['description'] 			= "Esta es una versi&oacute;n avanzada de la c&uacute;pula de protecci&oacute;n, y su caracter&iacute;stica principal es el aumento de su capacidad para absorber energia. Est&aacute; basado en el mismo conocimiento tecnol&oacute;gico que la c&uacute;pula peque&ntilde;a. Pero, los generadores son menos ruidosos al estar en funcionamiento.";
-$lang['info'][409]['name']        			= "Protector Planetario";
-$lang['info'][409]['description'] 			= "La mejor protección más avanzada para tu planeta.";
-$lang['info'][502]['name']        			= "Misil de intercepci&oacute;n";
-$lang['info'][502]['description'] 			= "Los misiles de intercepci&oacute;n destruyen los misiles interplanetarios. Cada mis&iacute;l de intercepci&oacute;n destruye un mis&iacute;l interplanetario.";
+$lang['info'][502]['name']        			= "Misiles antibal&iacute;sticos";
+$lang['info'][502]['description'] 			= "Un misil antibal&iacute;stico puede proteger a tu planeta de un mis&iacute;l interplanetario que se est&aacute; aproximando.";
 $lang['info'][503]['name']        			= "Misil interplanetario";
 $lang['info'][503]['description'] 			= "Los misiles interplanetarios destruyen los sistemas de defensa del enemigo. Los sistemas de defensa destruidos por los misiles interplanetarios no ser&aacute;n reparados.";
 
-// -------------------------- OFFICIERS ----------------------------------------------------------------------------------------------------//
-$lang['info'][601]['name']        			= "Geólogo";
-$lang['info'][601]['description'] 			= "El geólogo es un experto en astrominerolog&iacute;a y astrocristalograf&iacute;a. Asiste a sus equipos en la metalurgia y qu&iacute;mica y tambi&eacute;n se encarga de las comunicaciones interplanetarias para optimizar el uso y refinamiento de la materia bruta a lo largo de todo el imperio.";
-$lang['info'][602]['name']        			= "Almirante";
-$lang['info'][602]['description'] 			= "El almirante es un veterano de guerra experimentado y un habilidoso estratega. En las batallas mas duras, es capaz de hacerse una idea de la situación y contactar a sus almirantes subordinados. Un emperador sabio puede apoyarse en su ayuda durante los combates.";
-$lang['info'][603]['name']        			= "Ingeniero";
-$lang['info'][603]['description'] 			= "El Ingeniero es un especialista en la gestión de energía. En tiempos de paz, aumenta la energía de todas las colonias. En caso de ataque, garantiza el abastecimiento de energía a los cañones, evitando una posible sobrecarga, lo que conduce a una reducción de defensas perdidas en batalla.";
-$lang['info'][604]['name']        			= "Tecnócrata";
-$lang['info'][604]['description'] 			= "El gremio de los tecnócratas está compuesto de auténticos genios, y siempre los encontrarás en ese peligroso borde donde todo explotaría en mil pedazos antes de poder encontrar una explicación tecnológica y racional. Ningún ser humano normal trataría jamás descifrar el código de un tecnócrata, con su presencia, inspira a los investigadores del imperio.";
-$lang['info'][605]['name']        			= "Constructor";
-$lang['info'][605]['description'] 			= "El Constructor tiene alterado su ADN, uno solo de estos hombres puede construir una ciudad entera en poco tiempo.";
-$lang['info'][606]['name']        			= "Científico";
-$lang['info'][606]['description'] 			= "Los científicos forman parte de un gremio concurrente al de los tecnócratas. Ellos se especializan en la mejora de las tecnologías.";
-$lang['info'][607]['name']        			= "Almacenista";
-$lang['info'][607]['description'] 			= "El almacenista es parte de la antigua hermandad del planeta Hsac. Su lema es ganar el máximo, es por ello que necesita espacios de almacenamiento enormes. Por ese motivo ha desarrollado una nueva técnica de almacenamiento.";
-$lang['info'][608]['name']        			= "Defensor";
-$lang['info'][608]['description'] 			= "El defensor es un miembro del ejército imperial. Abocarse en su trabajo le permite construir una formidable defensa en un breve periodo de tiempo.";
-$lang['info'][609]['name']        			= "Protector";
-$lang['info'][609]['description'] 			= "El protector forma parte del ejercito imperial y su objetivo es desarrollar tecnologías que mejoren las defensas planetarias.";
-$lang['info'][610]['name']        			= "Espía";
-$lang['info'][610]['description'] 			= "El espía es una persona enigmática. Nadie nunca vio su verdadero rostro, la única forma sería asesinandoló.";
-$lang['info'][611]['name']        			= "Comandante";
-$lang['info'][611]['description'] 			= "El comandante forma parte del ejército imperial ha dominado el arte del manejo de flotas. Su cerebro puede calcular las trayectorias de una gran cantidad de flotas.";
-$lang['info'][612]['name']        			= "Destructor";
-$lang['info'][612]['description'] 			= "El destructor es un miembro del ejército imperial sin misericordia. Masacra todo lo que está a su paso sólo por placer. Actualmente está desarrollando un nuevo método de producción de las estrellas de la muerte.";
-$lang['info'][613]['name']        			= "General";
-$lang['info'][613]['description'] 			= "El general es una persona que ha servido desde hace muchos años al ejército imperial. Los fabricantes de naves producen más rápido en su presencia.";
-$lang['info'][614]['name']        			= "Conquistador";
-$lang['info'][614]['description'] 			= "El Conquistador es un miembro más del ejercito, este tiene la habilidad de navegar un tipo de nave que nadie más podría ni hacer despegar.";
-$lang['info'][615]['name']        			= "Emperador";
-$lang['info'][615]['description'] 			= "El emperador pone bajo su mando a todos los oficiales disponibles en el imperio, combinar sus habilidades para dominar el universo y lograr ser un oponente casi invensile.";
-
 //----------------------------------------------------------------------------//
 //MESSAGES
 $lang['mg_type'][0]    						= 'Informes de espionaje';
 $lang['mg_type'][1]    						= 'Mensajes de jugadores';
 $lang['mg_type'][2]    						= 'Mensajes de la alianza';
 $lang['mg_type'][3]    						= 'Informes de batalla';
-$lang['mg_type'][4]    						= 'Informes de recolección';
+$lang['mg_type'][4]    						= 'Informes de recolecci&oacute;n';
 $lang['mg_type'][5]    						= 'Informes de tranporte';
-$lang['mg_type'][15]   						= 'Informes de expedición';
-$lang['mg_type'][99]   						= 'Informes de construcción';
+$lang['mg_type'][15]   						= 'Informes de expedici&oacute;n';
+$lang['mg_type'][99]   						= 'Informes de construcci&oacute;n';
 $lang['mg_type'][100]  						= 'Ver todos los Mensajes';
 $lang['mg_no_text']							= 'Falta el mensaje';
 $lang['mg_msg_sended']						= 'Mensaje enviado';
@@ -782,7 +716,7 @@
 $lang['mg_delete_unmarked']					= 'Borrar todos los mensajes sin marcar';
 $lang['mg_delete_all']						= 'Borrar todos los mensajes';
 $lang['mg_show_only_header_spy_reports']	= 'Mostrar unicamente encabezado de los informes de espionaje';
-$lang['mg_action']							= 'Acción';
+$lang['mg_action']							= 'Acci&oacute;n';
 $lang['mg_date']							= 'Fecha';
 $lang['mg_from']							= 'De';
 $lang['mg_subject']							= 'Asunto';
@@ -791,6 +725,11 @@
 $lang['mg_message_type']					= 'Tipo del mensaje';
 $lang['mg_total']							= 'Total';
 $lang['mg_game_operators']					= 'Operadores del juego';
+$lang['mg_to']								= 'Destinatario';
+$lang['mg_send_message']					= 'Enviar mensaje';
+$lang['mg_message']							= 'Mensaje';
+$lang['mg_chars']							= 'caracteres';
+$lang['mg_send']							= 'Enviar';
 
 //----------------------------------------------------------------------------//
 //ALLIANCE
@@ -803,17 +742,17 @@
 $lang['al_already_exists']					= 'La alianza %s ya existe.';
 $lang['al_created']							= 'La alianza %s ha sido creada';
 $lang['al_continue']						= 'Continuar';
-$lang['al_alliance_closed']					= 'Esta alianza no admite más miembros';
+$lang['al_alliance_closed']					= 'Esta alianza no admite m&aacute;s miembros';
 $lang['al_request_confirmation_message']	= 'Solicitud registrada. Recibiras un mensaje cuando tu solicitud sea aceptada / rechazada. <br><a href="game.php?page=alliance">Volver</a>';
-$lang['al_default_request_text']			= 'Los líderes de la alianza no han creado un ejemplo de solicitud, o no tienen pretenciones.';
+$lang['al_default_request_text']			= 'Los l&iacute;deres de la alianza no han creado un ejemplo de solicitud, o no tienen pretenciones.';
 $lang['al_write_request']					= 'Escribir solicitud a la alianza %s';
 $lang['al_request_deleted']					= 'Tu solicitud a la alianza %s ha sido borrada. <br/>Ahora puedes escribir una nueva solicitud o crear tu propia alianza.';
 $lang['al_request_wait_message']			= 'Ya has enviado una solicitud a la alianza %s. <br/>Por favor, espera hasta que recibas una respuesta o borra la solicitud.';
 $lang['al_delete_request']					= 'Borrar solicitud';
 $lang['al_founder_cant_leave_alliance']		= 'El fundador no puede abandonar la alianza.';
-$lang['al_leave_sucess']					= 'Abandonaste la alianza %s con éxito.';
-$lang['al_do_you_really_want_to_go_out']	= '¿Realmente deseas salir de la alianza %s?';
-$lang['al_go_out_yes']						= 'Si';
+$lang['al_leave_sucess']					= 'Abandonaste la alianza %s con &eacute;xito.';
+$lang['al_do_you_really_want_to_go_out']	= '&iquest;Realmente deseas salir de la alianza %s?';
+$lang['al_go_out_yes']						= 'SI';
 $lang['al_circular_sended']					= 'Mensaje circular enviado, Los siguiente(s) miembro(s) recibieron tu mensaje:';
 $lang['al_all_players']						= 'Todos los jugadores';
 $lang['al_no_ranks_defined']				= 'No se definieron rangos.';
@@ -826,7 +765,7 @@
 $lang['al_new_member_rank_text']			= 'Nuevo miembro';
 $lang['al_acept_request']					= 'Aceptar';
 $lang['al_you_was_acceted']					= 'Fuiste aceptado en ';
-$lang['al_hi_the_alliance']					= '¡Hola!<br>La alianza <b>';
+$lang['al_hi_the_alliance']					= '&iexcl;Hola!<br>La alianza <b>';
 $lang['al_has_accepted']					= '</b> a aceptado tu solicitud.<br>Mensaje del fundador: <br>';
 $lang['al_decline_request']					= 'Rechazar';
 $lang['al_you_was_declined']				= 'Fuiste rechazado en ';
@@ -847,10 +786,10 @@
 $lang['al_rank_name']						= 'Nombre del Rango';
 $lang['al_ok']								= 'OK';
 $lang['al_number_of_records']				= 'Cantidad de registros';
-$lang['al_num']								= 'Nº';
+$lang['al_num']								= 'N&ordm;';
 $lang['al_member']							= 'Miembro';
 $lang['al_message']							= 'Mensaje';
-$lang['al_position']						= 'Posición';
+$lang['al_position']						= 'Posici&oacute;n';
 $lang['al_points']							= 'Puntos';
 $lang['al_coords']							= 'Coordenadas';
 $lang['al_member_since']					= 'Miembro desde';
@@ -869,7 +808,7 @@
 $lang['al_transfer_alliance']				= 'Transferir alianza';
 $lang['al_transfer_to']						= 'Transferir a';
 $lang['al_transfer_submit']					= 'Transferir';
-$lang['al_ally_information']				= 'Información de la alianza';
+$lang['al_ally_information']				= 'Informaci&oacute;n de la alianza';
 $lang['al_ally_info_tag']					= 'Etiqueta';
 $lang['al_ally_info_name']					= 'Nombre';
 $lang['al_ally_info_members']				= 'Miembros';
@@ -886,10 +825,10 @@
 $lang['al_your_ally']						= 'Tu alianza';
 $lang['al_rank']							= 'Rango';
 $lang['al_web_site']						= 'Sitio web';
-$lang['al_inside_section']					= 'Sección interna';
+$lang['al_inside_section']					= 'Secci&oacute;n interna';
 $lang['al_make_alliance']					= 'Fundar alianza';
 $lang['al_make_ally_tag_required']			= 'Etiqueta de la alianza (De 3-8 caracteres)';
-$lang['al_make_ally_name_required']			= 'Nombre de la alianza (Máx. 35 caracteres)';
+$lang['al_make_ally_name_required']			= 'Nombre de la alianza (M&aacute;x. 35 caracteres)';
 $lang['al_make_submit']						= 'Fundar';
 $lang['al_find_alliances']					= 'Buscar alianzas';
 $lang['al_find_text']						= 'Buscar';
@@ -901,7 +840,7 @@
 $lang['al_manage_change_name']				= 'Cambiar el nombre de la alianza';
 $lang['al_texts']							= 'Textos';
 $lang['al_manage_options']					= 'Opciones';
-$lang['al_manage_image']					= 'Imágen de la alianza';
+$lang['al_manage_image']					= 'Im&aacute;gen de la alianza';
 $lang['al_manage_requests']					= 'Solicitudes';
 $lang['al_requests_not_allowed']			= 'No permitidas(alianza cerrada)';
 $lang['al_requests_allowed']				= 'Permitidas(alianza abierta)';
@@ -926,8 +865,8 @@
 
 //----------------------------------------------------------------------------//
 //BUDDY
-$lang['bu_request_exists']					= '¡Ya existe una solicitud a ese jugador!';
-$lang['bu_cannot_request_yourself']			= '¡No puedes solicitarte como compañero a ti mismo!';
+$lang['bu_request_exists']					= '&iexcl;Ya existe una solicitud a ese jugador!';
+$lang['bu_cannot_request_yourself']			= '&iexcl;No puedes solicitarte como compa&ntilde;ero a ti mismo!';
 $lang['bu_request_message']					= 'Mensaje de solicitud';
 $lang['bu_player']							= 'Jugador';
 $lang['bu_request_text']					= 'Texto de solicitud';
@@ -941,15 +880,24 @@
 $lang['bu_fifteen_minutes']					= '15 minutos';
 $lang['bu_disconnected']					= 'Desconectado';
 $lang['bu_delete']							= 'Eliminar';
-$lang['bu_buddy_list']						= 'Lista de compañeros';
+$lang['bu_buddy_list']						= 'Lista de compa&ntilde;eros';
 $lang['bu_requests']						= 'Solicitudes';
 $lang['bu_alliance']						= 'Alianza';
 $lang['bu_coords']							= 'Coordenadas';
-$lang['bu_text']							= 'Texto';
-$lang['bu_action']							= 'Acción';
+$lang['bu_text']							= 'Texto / Estado';
+$lang['bu_action']							= 'Acci&oacute;n';
 $lang['bu_my_requests']						= 'Mis solicitudes';
-$lang['bu_partners']						= 'Compañeros';
+$lang['bu_partners']						= 'Compa&ntilde;eros';
 $lang['bu_estate']							= 'Estado';
+$lang['bu_deleted_title']					= 'Amigo perdido';
+$lang['bu_deleted_text']					= 'El jugador %u te ha eliminado de su lista de amigos.';
+$lang['bu_accepted_title']					= 'Solicitud aceptada';
+$lang['bu_accepted_text']					= 'El jugador %u ha aceptado tu solicitud de amistad.';
+$lang['bu_rejected_title']					= 'Solicitud rechazada';
+$lang['bu_rejected_text']					= 'El jugador %u ha rechazado tu solicitud de amistad.';
+$lang['bu_to_accept_title']					= 'Nueva solicitud de amistad';
+$lang['bu_to_accept_text']					= 'El jugador %u te ha enviado una solicitud de amistad.';
+
 
 //----------------------------------------------------------------------------//
 //NOTES
@@ -963,7 +911,7 @@
 $lang['nt_create_new_note']					= 'Crear nueva nota';
 $lang['nt_date_note']						= 'Fecha';
 $lang['nt_subject_note']					= 'Asunto';
-$lang['nt_size_note']						= 'Tamaño';
+$lang['nt_size_note']						= 'Tama&ntilde;o';
 $lang['nt_dlte_note']						= 'Borrar';
 $lang['nt_priority']						= 'Prioridad';
 $lang['nt_note']							= 'Nota';
@@ -978,13 +926,13 @@
 $lang['st_alliance']						= 'Alianza';
 $lang['st_points']							= 'Puntos';
 $lang['st_fleets']							= 'Flotas';
-$lang['st_researh']							= 'Investigación';
+$lang['st_researh']							= 'Investigaci&oacute;n';
 $lang['st_buildings']						= 'Edificios';
 $lang['st_defenses']						= 'Defensas';
-$lang['st_position']						= 'Posición';
+$lang['st_position']						= 'Posici&oacute;n';
 $lang['st_members']							= 'Miembros';
 $lang['st_per_member']						= 'Por Miembro';
-$lang['st_statistics']						= 'Estadísticas';
+$lang['st_statistics']						= 'Estad&iacute;sticas';
 $lang['st_updated']							= 'Actualizadas';
 $lang['st_show']							= 'Mostrar';
 $lang['st_per']								= 'por';
@@ -1002,41 +950,41 @@
 $lang['sh_alliance_tag']					= 'Etiqueta de la alianza';
 $lang['sh_alliance_name']					= 'Nombre de la alianza';
 $lang['sh_search']							= 'Buscar';
-$lang['sh_buddy_request']					= 'Solicitud de compañeros';
+$lang['sh_buddy_request']					= 'Solicitud de compa&ntilde;eros';
 $lang['sh_alliance']						= 'Alianza';
 $lang['sh_planet']							= 'Planeta';
 $lang['sh_coords']							= 'Coordenadas';
-$lang['sh_position']						= 'Posición';
+$lang['sh_position']						= 'Posici&oacute;n';
 
 //----------------------------------------------------------------------------//
 //OPTIONS
-$lang['op_cant_activate_vacation_mode']		= 'Si estás construyendo o moviendo flotas no podrás entrar al modo vaciones.';
-$lang['op_password_changed']				= 'La contraseña ha sido cambiada.<br /><a href="index.php" target="_top">Volver</a>';
+$lang['op_cant_activate_vacation_mode']		= 'Si est&aacute;s construyendo o moviendo flotas no podr&aacute;s entrar al modo vaciones.';
+$lang['op_password_changed']				= 'La contrase&ntilde;a ha sido cambiada.<br /><a href="index.php" target="_top">Volver</a>';
 $lang['op_username_changed']				= 'El nombre de usuario ha sido cambiado.<br /><a href="index.php" target="_top">Volver</a>';
 $lang['op_options_changed']					= 'Los cambios se han guardado.<br /><a href="game.php?page=options">Volver</a>';
-$lang['op_vacation_mode_active_message']	= 'El modo vacaciones se ha encendido. Tendra que estar de vacaciones como mínimo hasta el: ';
+$lang['op_vacation_mode_active_message']	= 'El modo vacaciones se ha encendido. Tendra que estar de vacaciones como m&iacute;nimo hasta el: ';
 $lang['op_end_vacation_mode']				= 'Finalizar modo vacaciones';
 $lang['op_save_changes']					= 'Guardar cambios';
-$lang['op_admin_title_options']				= 'Opciones reservadas para la administración';
-$lang['op_admin_planets_protection']		= 'Protección de planetas';
+$lang['op_admin_title_options']				= 'Opciones reservadas para la administraci&oacute;n';
+$lang['op_admin_planets_protection']		= 'Protecci&oacute;n de planetas';
 $lang['op_user_data']						= 'Datos de usuario';
 $lang['op_username']						= 'Nombre de usuario';
-$lang['op_old_pass']						= 'Contraseña anterior';
-$lang['op_new_pass']						= 'Nueva contraseña (min. 8 Caracteres)';
-$lang['op_repeat_new_pass']					= 'Nueva contraseña (repetir)';
-$lang['op_email_adress']					= 'Dirección de correo electrónico';
-$lang['op_permanent_email_adress']			= 'Dirección pemanente de correo electrónico';
+$lang['op_old_pass']						= 'Contrase&ntilde;a anterior';
+$lang['op_new_pass']						= 'Nueva contrase&ntilde;a (min. 8 Caracteres)';
+$lang['op_repeat_new_pass']					= 'Nueva contrase&ntilde;a (repetir)';
+$lang['op_email_adress']					= 'Direcci&oacute;n de correo electr&oacute;nico';
+$lang['op_permanent_email_adress']			= 'Direcci&oacute;n pemanente de correo electr&oacute;nico';
 $lang['op_general_settings']				= 'Ajustes generales';
 $lang['op_sort_planets_by']					= 'Ordenar planetas por:';
-$lang['op_sort_kind']						= 'Tipo de ordenación:';
-$lang['op_skin_example']					= 'Skins (p.e. /css/)<br> <a href="http://80.237.203.201/download/" target="_blank">Descargar</a>';
+$lang['op_sort_kind']						= 'Tipo de ordenaci&oacute;n:';
+$lang['op_skin_example']					= 'Skin';
 $lang['op_show_skin']						= 'Mostrar skin';
-$lang['op_deactivate_ipcheck']				= 'Desactivar comprobación de IP';
-$lang['op_galaxy_settings']					= 'Opciones de visión de Galaxia';
+$lang['op_deactivate_ipcheck']				= 'Desactivar comprobaci&oacute;n de IP';
+$lang['op_galaxy_settings']					= 'Opciones de visi&oacute;n de Galaxia';
 $lang['op_spy_probes_number']				= 'Cantidad de sondas de espionaje';
-$lang['op_toolt_data']						= 'Información sobre herramientas';
+$lang['op_toolt_data']						= 'Informaci&oacute;n sobre herramientas';
 $lang['op_seconds']							= 'segundos';
-$lang['op_max_fleets_messages']				= 'Máximo mensajes de flotas';
+$lang['op_max_fleets_messages']				= 'M&aacute;ximo mensajes de flotas';
 $lang['op_show_ally_logo']					= 'Mostrar el logo de las alianzas';
 $lang['op_shortcut']						= 'Acceso directo';
 $lang['op_show']							= 'Mostrar';
@@ -1052,7 +1000,12 @@
 $lang['op_deactivate_ipcheck_descrip']		= 'La comprobaci&oacute;n de IP significa que se realizar&aacute; un logout de seguridad autom&aacute;ticamente cuando cambie la IP o cuando 2 personas entren en la misma cuenta usando diferentes IPs.  Desactivar la comprobaci&oacute;n de IP puede ser un agujero de seguridad!';
 $lang['op_spy_probes_number_descrip']		= 'Cantidad de sondas de espionaje que ser&aacute;n enviadas en cada espionaje desde el men&uacute; de galaxia';
 $lang['op_activate_vacation_mode_descrip']	= 'El modo vacaciones protege tu cuenta durante tu ausencia';
-$lang['op_dlte_account_descrip']			= 'Seleccionando esta opciones borrarás tu cuenta dentro de 7 días';
+$lang['op_dlte_account_descrip']			= 'Seleccionando esta opciones borrar&aacute;s tu cuenta dentro de 7 d&iacute;as';
+$lang['op_sort_colonization']				= 'Fecha de colonizaci&oacute;n';
+$lang['op_sort_coords']						= 'Coordenadas';
+$lang['op_sort_alpha']						= 'Orden alfab&eacute;tico';
+$lang['op_sort_asc']						= 'Creciente';
+$lang['op_sort_desc']						= 'Decreciente';
 
 //----------------------------------------------------------------------------//
 //BANNED
@@ -1074,7 +1027,7 @@
 $lang['debree_field_1'] 					= "Un campo de escombros de";
 $lang['debree_field_2']						= "flotan en la orbita del planeta.";
 $lang['sys_moonproba'] 						= "La probabilidad de que surja una luna de los escombros es de:";
-$lang['sys_moonbuilt'] 						= "Las enormes cantidad de metal y cristal se fucionan y forman un satélite lunar en la orbita del planeta %s [%d:%d:%d] !";
+$lang['sys_moonbuilt'] 						= "Las enormes cantidad de metal y cristal se fucionan y forman un sat&eacute;lite lunar en la orbita del planeta %s [%d:%d:%d] !";
 $lang['sys_attack_title']    				= "Las flotas se enfrentan en ";
 $lang['sys_attack_round']					= "Ronda";
 $lang['sys_attack_attacker_pos'] 			= "Atacante";
@@ -1090,7 +1043,7 @@
 $lang['fleet_attack_2']						= "sobre el defensor. Los escudos del defensor absorven";
 $lang['fleet_defs_1'] 						= "La flota defensora dispara con una fuerza total de";
 $lang['fleet_defs_2']						= "sobre el atacante. Los escudos del atacante absorven";
-$lang['damage']								= "puntos de daño.";
+$lang['damage']								= "puntos de da&ntilde;o.";
 $lang['sys_attacker_won'] 					= "El atacante ha ganado la batalla";
 $lang['sys_defender_won'] 					= "El defensor ha ganado la batalla";
 $lang['sys_both_won'] 						= "La batalla termino en empate";
@@ -1104,7 +1057,7 @@
 $lang['sys_mess_qg'] 						= "Cuartel General";
 $lang['sys_mess_spy_report_moon']			= "(Luna)";
 $lang['sys_mess_spy_report'] 				= "Reporte de espionaje";
-$lang['sys_mess_spy_lostproba'] 			= "Probabilidad de detección de la flota de espionaje : %d %% ";
+$lang['sys_mess_spy_lostproba'] 			= "Probabilidad de detecci&oacute;n de la flota de espionaje : %d %% ";
 $lang['sys_mess_spy_control'] 				= "Control Espacial";
 $lang['sys_mess_spy_activity'] 				= "Actividad de espionaje";
 $lang['sys_mess_spy_ennemyfleet'] 			= "Una flota enemiga del planeta";
@@ -1115,31 +1068,31 @@
 $lang['sys_stay_mess_end'] 					= " y ofrece los siguientes recursos : ";
 $lang['sys_adress_planet'] 					= "[%s:%s:%s]";
 $lang['sys_stay_mess_goods'] 				= "%s : %s, %s : %s, %s : %s";
-$lang['sys_colo_mess_from'] 				= "Colonización";
-$lang['sys_colo_mess_report'] 				= "Reporte de colonización";
+$lang['sys_colo_mess_from'] 				= "Colonizaci&oacute;n";
+$lang['sys_colo_mess_report'] 				= "Reporte de colonizaci&oacute;n";
 $lang['sys_colo_defaultname'] 				= "Colonia";
 $lang['sys_colo_arrival'] 					= "El colonizador llega a las cordenadas ";
-$lang['sys_colo_maxcolo'] 					= ", pero, por desgracia, es imposible colonizar, no puede tener más ";
-$lang['sys_colo_allisok'] 					= ", 	los colonos están comenzando a construir una nueva colonia.";
-$lang['sys_colo_badpos']  					= ", 	los colonos han encontrado un entorno propicio para la extensión de su imperio. Decidieron dar marcha atrás totalmente asqueado...";
-$lang['sys_colo_notfree'] 					= ", 	los colonos no han encontrado un planeta con estos detalles. Ellos se ven obligados a dar marcha atrás completamente desmoralizados...";
+$lang['sys_colo_maxcolo'] 					= ", pero, por desgracia, es imposible colonizar, no puede tener m&aacute;s ";
+$lang['sys_colo_allisok'] 					= ", 	los colonos est&aacute;n comenzando a construir una nueva colonia.";
+$lang['sys_colo_badpos']  					= ", 	los colonos han encontrado un entorno propicio para la extensi&oacute;n de su imperio. Decidieron dar marcha atr&aacute;s totalmente asqueado...";
+$lang['sys_colo_notfree'] 					= ", 	los colonos no han encontrado un planeta con estos detalles. Ellos se ven obligados a dar marcha atr&aacute;s completamente desmoralizados...";
 $lang['sys_colo_planet']  					= " planeta ";
 $lang['sys_expe_report'] 					= "Reporte de expedicion";
 $lang['sys_recy_report'] 					= "Reporte de reciclaje";
 $lang['sys_expe_blackholl_1'] 				= "La flota fue arrastrada hacia un agujero negro, esta parcialmente destruida.";
 $lang['sys_expe_blackholl_2'] 				= "La flota fue arrastrada hacia un agujero negro, y fue completamente destruida!";
 $lang['sys_expe_nothing_1'] 				= "Tus exploradores tomaron grandes fotos. Pero no han encontrado recursos";
-$lang['sys_expe_nothing_2'] 				= "Tus exploradores han pasado todo el tiempo en el área seleccionada. Pero no han encontrado nada.";
+$lang['sys_expe_nothing_2'] 				= "Tus exploradores han pasado todo el tiempo en el &aacute;rea seleccionada. Pero no han encontrado nada.";
 $lang['sys_expe_found_goods'] 				= "La flota ha descubierto una nave no tripulada! <br> Su exploradores se han recuperado %s de %s, %s de %s, %s de %s y %s de %s.";
 $lang['sys_expe_found_ships'] 				= "Tus exploradores han encontrado un escuadron abandonados, lo dominaron y vienen de regreso. <br> Escuadron:";
-$lang['sys_expe_back_home'] 				= "Tu expedición regresó al hangar.";
+$lang['sys_expe_back_home'] 				= "Tu expedici&oacute;n regres&oacute; al hangar.";
 $lang['sys_mess_transport'] 				= "Flota de Transporte";
-$lang['sys_tran_mess_owner'] 				= "Una de tus flota llega a %s %s y entrega su mercancía: %s de %s, %s de %s y %s de %s.";
-$lang['sys_tran_mess_user']  				= "Una flota proveniente de %s %s llega a tu planeta y entrega su mercancía: %s de %s, %s de %s y %s de %s.";
+$lang['sys_tran_mess_owner'] 				= "Una de tus flota llega a %s %s y entrega su mercanc&iacute;a: %s de %s, %s de %s y %s de %s.";
+$lang['sys_tran_mess_user']  				= "Una flota proveniente de %s %s llega a tu planeta y entrega su mercanc&iacute;a: %s de %s, %s de %s y %s de %s.";
 $lang['sys_mess_fleetback'] 				= "Vuelta de la flota";
 $lang['sys_tran_mess_back'] 				= "Una flota regreso al planeta % s% s. La flota no entrego recursos.";
 $lang['sys_recy_gotten'] 					= "Tu flota llego a las coordenadas indicadas y recolecto %s unidades de %s y %s unidades de %s.";
-$lang['sys_notenough_money'] 				= "No tienes suficientes recursos para contruir una % s. Tienes %s de %s, %s de %s y %s de %s y el costo de la construcción era %s de %s, %s de %s y %s de %s";
+$lang['sys_notenough_money'] 				= "No tienes suficientes recursos para contruir una % s. Tienes %s de %s, %s de %s y %s de %s y el costo de la construcci&oacute;n era %s de %s, %s de %s y %s de %s";
 $lang['sys_nomore_level'] 					= "Intentas destruir un edificio ( %s ).";
 $lang['sys_buildlist'] 						= "Lista de construcion";
 $lang['sys_buildlist_fail'] 				= "Construcion imposible";
@@ -1152,21 +1105,23 @@
 $lang['sys_mess_destruc_report'] 			= "Reporte de Destruccion";
 $lang['sys_destruc_lune'] 					= "La probabilidad de destruir la luna es de: %d %% ";
 $lang['sys_destruc_rip'] 					= "La probabilidad de que sean destruidas las estrellas de la muerte es de: %d %% ";
-$lang['sys_destruc_stop'] 					= "El defensor ha conseguido detener la destrucción de la luna";
+$lang['sys_destruc_stop'] 					= "El defensor ha conseguido detener la destrucci&oacute;n de la luna";
 $lang['sys_destruc_mess1'] 					= "Las estrellas de la muerte disparan el graviton a la orbita de la luna";
 $lang['sys_destruc_mess'] 					= "Una flota del planeta %s [%d:%d:%d] se dirige a la luna del planeta [%d:%d:%d]";
 $lang['sys_destruc_echec'] 					= ". Los temblores empiezan a sacudir la superficie de la luna, pero algo sale mal, el graviton en las estrellas de la muerte tambien provoca temblores y las estrellas de la muerte vuelan en mil pedazos.";
 $lang['sys_destruc_reussi'] 				= ", Los temblores empiezan a sacudir la superficie de la luna, despues de unos instantes la luna no soporta mas y vuela en mil pedazos, mision cumplida, la flota vuelve al planeta de origen.";
 $lang['sys_destruc_null'] 					= ", Las estrellas de la muerten no generan el poder necesario, la mision falla y las naves vuelven de regreso.";
 $lang['sys_the']							= " el ";
+$lang['sys_stay_mess_back']        			= "Una de sus flotas vuelve de ";
+$lang['sys_stay_mess_bend']        			= " y entrega su mercanc&iacute;a ";
 
 //----------------------------------------------------------------------------//
 //class.CheckSession.php
-$lang['ccs_multiple_users']					= '¡Error de cookies! ¡Hay varios usuarios con este nombre! Debe eliminar sus cookies. En caso de problemas contacte al administrador.';
-$lang['ccs_other_user']						= '¡Error de cookies! ¡Su cookie no corresponde con el usuario! Debe eliminar sus cookies. En caso de problemas contacte al administrador.';
-$lang['css_different_password']				= '¡Error de cookies! ¡Error de sesión, debe conectarse de nuevo! Debe eliminar sus cookies. En caso de problemas contacte al administrador.';
+$lang['ccs_multiple_users']					= '&iexcl;Error de cookies! &iexcl;Hay varios usuarios con este nombre! Debe eliminar sus cookies. En caso de problemas contacte al administrador.';
+$lang['ccs_other_user']						= '&iexcl;Error de cookies! &iexcl;Su cookie no corresponde con el usuario! Debe eliminar sus cookies. En caso de problemas contacte al administrador.';
+$lang['css_different_password']				= '&iexcl;Error de cookies! &iexcl;Error de sesi&oacute;n, debe conectarse de nuevo! Debe eliminar sus cookies. En caso de problemas contacte al administrador.';
 $lang['css_account_banned_message']			= 'SU CUENTA HA SIDO SUSPENDIDA';
-$lang['css_account_banned_expire']			= 'Expiración:';
+$lang['css_account_banned_expire']			= 'Expiraci&oacute;n:';
 
 //----------------------------------------------------------------------------//
 //class.debug.php
@@ -1184,13 +1139,13 @@
 $lang['cff_the_planet']						= 'el planeta ';
 $lang['cff_debris_field']					= 'campo de escombros ';
 $lang['cff_to_the_moon']					= 'a la luna ';
-$lang['cff_the_position']					= 'la posición ';
+$lang['cff_the_position']					= 'la posici&oacute;n ';
 $lang['cff_to_the_planet']					= ' a el planeta ';
 $lang['cff_the_moon']						= ' la luna ';
 $lang['cff_from_planet']					= 'del planeta ';
 $lang['cff_from_debris_field']				= 'del campo de escombros ';
 $lang['cff_from_the_moon']					= 'de la luna ';
-$lang['cff_from_position']					= 'de la posición ';
+$lang['cff_from_position']					= 'de la posici&oacute;n ';
 $lang['cff_missile_attack']					= 'Ataque con misiles';
 $lang['cff_from']							= ' desde ';
 $lang['cff_to']								= ' a ';
@@ -1199,7 +1154,7 @@
 $lang['cff_of']								= ' de ';
 $lang['cff_goes']							= ' se dirige ';
 $lang['cff_toward']							= ' hacia ';
-$lang['cff_with_the_mission_of']			= '. Con la misión de: ';
+$lang['cff_with_the_mission_of']			= '. Con la misi&oacute;n de: ';
 $lang['cff_to_explore']						= ' a explorar ';
 $lang['cff_comming_back']					= ' vuelve ';
 $lang['cff_back']							= 'Regresando';
@@ -1214,14 +1169,14 @@
 
 //----------------------------------------------------------------------------//
 // CombatReport.php
-$lang['cr_lost_contact']					= 'Se perdió el contacto con la flota atacante.';
+$lang['cr_lost_contact']					= 'Se perdi&oacute; el contacto con la flota atacante.';
 $lang['cr_first_round']						= '(La flota fue destruida en la primer ronda)';
 $lang['cr_type']							= 'Tipo';
 $lang['cr_total']							= 'Total';
 $lang['cr_weapons']							= 'Armas';
 $lang['cr_shields']							= 'Escudos';
 $lang['cr_armor']							= 'Blindaje';
-$lang['cr_destroyed']						= '¡Destruida!';
+$lang['cr_destroyed']						= '&iexcl;Destruida!';
 
 //----------------------------------------------------------------------------//
 // FleetAjax.php
@@ -1232,10 +1187,10 @@
 $lang['fa_not_enough_fuel']					= 'Error, no tienes combustible suficiente';
 $lang['fa_no_more_slots']					= 'Error, no tienes mas slots de flotas disponibles';
 $lang['fa_no_recyclers']					= 'Error, no hay recicladores disponibles';
-$lang['fa_mission_not_available']			= 'Error, la misión no esta disponible';
+$lang['fa_mission_not_available']			= 'Error, la misi&oacute;n no esta disponible';
 $lang['fa_no_ships']						= 'Error, no hay naves disponibles';
 $lang['fa_vacation_mode']					= 'Error, el jugador se encuentra en modo vacaciones';
-$lang['fa_week_player']						= 'Error, el jugador es demasiado débil';
+$lang['fa_week_player']						= 'Error, el jugador es demasiado d&eacute;bil';
 $lang['fa_strong_player']					= 'Error, el jugador es demasiado fuerte';
 $lang['fa_not_spy_yourself']				= 'Error, no puedes espiarte a ti mismo';
 $lang['fa_not_attack_yourself']				= 'Error, no puedes atacarte a ti mismo';
@@ -1250,18 +1205,23 @@
 $lang['ma_not_send_other_galaxy']			= 'No puedes enviar misiles a otra galaxia.';
 $lang['ma_planet_doesnt_exists']			= 'El planeta objetivo no existe.';
 $lang['ma_cant_send']						= 'No puedes enviar ';
-$lang['ma_missile']							= ' misiles, sólo dispones de ';
+$lang['ma_missile']							= ' misiles, s&oacute;lo dispones de ';
 $lang['ma_wrong_target']					= 'Objetivo Incorrecto';
 $lang['ma_no_missiles']						= 'No hay misiles interplanetarios disponibles';
-$lang['ma_add_missile_number']				= 'Ingresar el número de misiles que deseas enviar';
+$lang['ma_add_missile_number']				= 'Ingresar el n&uacute;mero de misiles que deseas enviar';
 $lang['ma_misil_launcher']					= 'Lanzamisiles';
-$lang['ma_small_laser']						= 'Láser pequeño';
-$lang['ma_big_laser']						= 'Láser grande';
-$lang['ma_gauss_canyon']					= 'Cañón Gauss';
-$lang['ma_ionic_canyon']					= 'Cañón iónico';
-$lang['ma_buster_canyon']					= 'Cañón de plasma';
-$lang['ma_small_protection_shield']			= 'Cúpula pequeña de protección';
-$lang['ma_big_protection_shield']			= 'Cúpula grande de protección';
+$lang['ma_small_laser']						= 'L&aacute;ser peque&ntilde;o';
+$lang['ma_big_laser']						= 'L&aacute;ser grande';
+$lang['ma_gauss_canyon']					= 'Ca&ntilde;&oacute;n Gauss';
+$lang['ma_ionic_canyon']					= 'Ca&ntilde;&oacute;n i&oacute;nico';
+$lang['ma_buster_canyon']					= 'Ca&ntilde;&oacute;n de plasma';
+$lang['ma_small_protection_shield']			= 'C&uacute;pula peque&ntilde;a de protecci&oacute;n';
+$lang['ma_big_protection_shield']			= 'C&uacute;pula grande de protecci&oacute;n';
 $lang['ma_all']								= 'Todo';
 $lang['ma_missiles_sended']					= ' misiles interplanetarios se enviaron. objetivo principal: ';
+$lang["ma_all_destroyed"]  					='Todos los misiles interplanetarios han sido destruidos por los misiles de intercepci&oacute;n.';
+$lang['ma_planet_without_defens']  			='Planeta sin defensa.';
+$lang['ma_some_destroyed']   				=' han sido destruidos por los misiles de intercepci&oacute;n.';
+$lang['ma_missile_attack']					="";
+$lang['ma_missile_string']					='Un ataque con misiles (%1%) de %2% llega al planeta %3% <br><br>';
 ?>
\ No newline at end of file
diff --git a/language/spanish/PUBLIC.mo b/language/spanish/PUBLIC.mo
deleted file mode 100644
index 2580b33..0000000
--- a/language/spanish/PUBLIC.mo
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-//general
-$lang['index']				= 'Inicio';
-$lang['register']			= 'Registrarse';
-$lang['forum']				= 'Foros';
-
-/* ------------------------------------------------------------------------------------------ */
-
-//index.php
-//case lostpassword
-$lang['mail_not_exist'] 		= '¡La dirección de correo eléctronico no existe!';
-$lang['mail_title']			= 'Nueva contraseña';
-$lang['mail_text']			= 'Esta es tu nueva contraseña: ';
-$lang['mail_sended']			= '¡La nueva contraseña ha sido enviado con éxito!';
-
-//case default
-$lang['login_error']			= '¡Datos ingresados incorrectos! <br /><a href="index.php" target="_top">Volver al inicio</a>';
-
-/* ------------------------------------------------------------------------------------------ */
-
-//lostpassword.tpl
-$lang['lost_pass_title']		= 'Recuperar clave perdida';
-$lang['lost_pass_text'] 		= 'Para recuperar tu contraseña, ingresa el email utilizado en el registro. Recibirás una nueva clave a la brevedad.';
-$lang['retrieve_pass']			= 'Recuperar clave';
-$lang['email']				= 'Correo electrónico';
-
-//index_body.tpl
-$lang['user']				= 'Usuario';
-$lang['pass']				= 'Contraseña';
-$lang['remember_pass']			= 'Recordar Contraseña';
-$lang['lostpassword']			= '¿Olvidaste tu Contraseña?';
-$lang['welcome_to']			= 'Bienvenido a';
-$lang['server_description']		= '</strong> es un <strong>juego de simulacion estratégica espacial</strong> con <strong>miles de jugadores</strong> a lo largo del mundo compitiendo por ser el mejor <strong>simultáneamente</strong>. Todo lo que necesitas para jugar, es un navegador web estándar.';
-$lang['server_register']		= '¡Registrate!';
-$lang['server_message']			= '¡Únete ya y forma parte del fantástico mundo de';
-$lang['login']				= 'Ingresar';
-
-/* ------------------------------------------------------------------------------------------ */
-
-//reg.php
-$lang['reg_mail_text_part1']		= 'Muchas gracias por registrarte en nuestro juego. \n Tu contraseña es: ';
-$lang['reg_mail_text_part2']		= ' \n\n ¡Disfrutá del juego! \n ';
-$lang['register_at']			= 'Registro en ';
-$lang['invalid_mail_adress']		= '¡Correo electrónico inválido!<br />';
-$lang['empty_user_field']		= '¡El campo del usuario no puedo estar vacío!<br />';
-$lang['password_lenght_error']		= '¡La contraseña debe tener al menos 4 caracteres!<br />';
-$lang['user_field_no_alphanumeric']	= '¡El campo de usuario sólo puede contener caracteres alfanuméricos!<br />';
-$lang['terms_and_conditions']		= '¡Debes aceptar nuestros términos y condiciones de uso!<br />';
-$lang['user_already_exists']		= '¡El nombre de usuario elegido ya existe!<br />';
-$lang['mail_already_exists']		= '¡El email ingresado ya existe!<br />';
-$lang['welcome_message_from']		= 'Admin';
-$lang['welcome_message_sender']		= 'Admin';
-$lang['welcome_message_subject']	= '¡Bienvenido!';
-$lang['welcome_message_content']	= '¡Bienvenido a XG Proyect!<p>Al comenzar, construye una mina de Metal.<br />Para hacerlo, haz click en el enlace \"Edificios\" en la izquierda, y dale a \"construir\" a la derecha de la mina de metal.<br />Ahora tienes algo de tiempo para conocer más cosas del juego.<p>Podrás encontrar ayuda:<br />En el <a href=\"http://www.xtreme-gamez.com.ar/foros\" target=\"_blank\">Foro</a><br />Ahora, tu mina debería estar acabada.<br />Como no producen nada sin energía, deberías construir una Planta de energía solar, vuelve a Edificios, y elige construir la Planta de energía solar.<p>Para ver todas las naves, estructuras defensivas, edificios e investigaciones que puedes investigar, puedes echarle un vistazo al árbol de tecnología en \"Tecnología\" en el menú izquierdo.<p>Ahora ya puedes empezar la conquista del universo... ¡Buena suerte!';
-$lang['reg_completed']			= '¡Registro completo!';
-
-//registry_form.tpl
-$lang['server_message_reg']		= '¡Únete ya y forma parte del fantástico mundo de';
-$lang['register_at_reg']		= 'Registro en';
-$lang['user_reg']			= 'Usuario';
-$lang['pass_reg']			= 'Contraseña';
-$lang['email_reg']			= 'Correo electrónico';
-$lang['register_now']			= '¡Registrate!';
-$lang['accept_terms_and_conditions']	= 'Aceptar terminos y condiciones de uso';
-
-?>
\ No newline at end of file
diff --git a/language/spanish/PUBLIC.php b/language/spanish/PUBLIC.php
new file mode 100644
index 0000000..6973275
--- /dev/null
+++ b/language/spanish/PUBLIC.php
@@ -0,0 +1,67 @@
+<?php
+
+//general
+$lang['index']						= 'Inicio';
+$lang['register']					= 'Registrarse';
+$lang['forum']						= 'Foros';
+
+/* ------------------------------------------------------------------------------------------ */
+
+//index.php
+//case lostpassword
+$lang['mail_not_exist'] 			= '&iexcl;La direcci&oacute;n de correo el&eacute;ctronico no existe!';
+$lang['mail_title']					= 'Nueva contrase&ntilde;a';
+$lang['mail_text']					= 'Esta es tu nueva contrase&ntilde;a: ';
+$lang['mail_sended']				= '&iexcl;La nueva contrase&ntilde;a ha sido enviado con &eacute;xito!';
+
+//case default
+$lang['login_error']				= '&iexcl;Datos ingresados incorrectos! <br /><a href="index.php" target="_top">Volver al inicio</a>';
+
+/* ------------------------------------------------------------------------------------------ */
+
+//lostpassword.tpl
+$lang['lost_pass_title']			= 'Recuperar clave perdida';
+$lang['lost_pass_text'] 			= 'Para recuperar tu contrase&ntilde;a, ingresa el email utilizado en el registro. Recibir&aacute;s una nueva clave a la brevedad.';
+$lang['retrieve_pass']				= 'Recuperar clave';
+$lang['email']						= 'Correo electr&oacute;nico';
+
+//index_body.tpl
+$lang['user']						= 'Usuario';
+$lang['pass']						= 'Contrase&ntilde;a';
+$lang['remember_pass']				= 'Recordar Contrase&ntilde;a';
+$lang['lostpassword']				= '&iquest;Olvidaste tu Contrase&ntilde;a?';
+$lang['welcome_to']					= 'Bienvenido a';
+$lang['server_description']			= '</strong> es un <strong>juego de simulacion estrat&eacute;gica espacial</strong> con <strong>miles de jugadores</strong> a lo largo del mundo compitiendo por ser el mejor <strong>simult&aacute;neamente</strong>. Todo lo que necesitas para jugar, es un navegador web est&aacute;ndar.';
+$lang['server_register']			= '&iexcl;Registrate!';
+$lang['server_message']				= '&iexcl;&uacute;nete ya y forma parte del fant&aacute;stico mundo de';
+$lang['login']						= 'Ingresar';
+
+/* ------------------------------------------------------------------------------------------ */
+
+//reg.php
+$lang['reg_mail_text_part1']		= 'Muchas gracias por registrarte en nuestro juego. \n Tu contrase&ntilde;a es: ';
+$lang['reg_mail_text_part2']		= ' \n\n &iexcl;Disfrut&aacute; del juego! \n ';
+$lang['register_at']				= 'Registro en ';
+$lang['invalid_mail_adress']		= '&iexcl;Correo electr&oacute;nico inv&aacute;lido!<br />';
+$lang['empty_user_field']			= '&iexcl;El campo del usuario no puedo estar vac&iacute;o!<br />';
+$lang['password_lenght_error']		= '&iexcl;La contrase&ntilde;a debe tener al menos 4 caracteres!<br />';
+$lang['user_field_no_alphanumeric']	= '&iexcl;El campo de usuario s&oacute;lo puede contener caracteres alfanum&eacute;ricos!<br />';
+$lang['terms_and_conditions']		= '&iexcl;Debes aceptar nuestros t&eacute;rminos y condiciones de uso!<br />';
+$lang['user_already_exists']		= '&iexcl;El nombre de usuario elegido ya existe!<br />';
+$lang['mail_already_exists']		= '&iexcl;El email ingresado ya existe!<br />';
+$lang['welcome_message_from']		= 'Admin';
+$lang['welcome_message_sender']		= 'Admin';
+$lang['welcome_message_subject']	= '&iexcl;Bienvenido!';
+$lang['welcome_message_content']	= '&iexcl;Bienvenido a XG Proyect!<p>Al comenzar, construye una mina de Metal.<br />Para hacerlo, haz click en el enlace \"Edificios\" en la izquierda, y dale a \"construir\" a la derecha de la mina de metal.<br />Ahora tienes algo de tiempo para conocer m&aacute;s cosas del juego.<p>Podr&aacute;s encontrar ayuda:<br />En el <a href=\"http://www.xtreme-gamez.com.ar/foros\" target=\"_blank\">Foro</a><br />Ahora, tu mina deber&iacute;a estar acabada.<br />Como no producen nada sin energ&iacute;a, deber&iacute;as construir una Planta de energ&iacute;a solar, vuelve a Edificios, y elige construir la Planta de energ&iacute;a solar.<p>Para ver todas las naves, estructuras defensivas, edificios e investigaciones que puedes investigar, puedes echarle un vistazo al &aacute;rbol de tecnolog&iacute;a en \"Tecnolog&iacute;a\" en el men&uacute; izquierdo.<p>Ahora ya puedes empezar la conquista del universo... &iexcl;Buena suerte!';
+$lang['reg_completed']				= '&iexcl;Registro completo!';
+
+//registry_form.tpl
+$lang['server_message_reg']			= '&iexcl;&uacute;nete ya y forma parte del fant&aacute;stico mundo de';
+$lang['register_at_reg']			= 'Registro en';
+$lang['user_reg']					= 'Usuario';
+$lang['pass_reg']					= 'Contrase&ntilde;a';
+$lang['email_reg']					= 'Correo electr&oacute;nico';
+$lang['register_now']				= '&iexcl;Registrate!';
+$lang['accept_terms_and_conditions']= 'Aceptar terminos y condiciones de uso';
+
+?>
\ No newline at end of file
diff --git a/adm/Log/AllianceLog.php b/language/spanish/index.html
similarity index 100%
rename from adm/Log/AllianceLog.php
rename to language/spanish/index.html
diff --git a/reg.php b/reg.php
index e9f0748..d59ae8e 100644
--- a/reg.php
+++ b/reg.php
@@ -1,60 +1,48 @@
 <?php
 
-##############################################################################
-# *																			 #
-# * XG PROYECT																 #
-# *  																		 #
-# * @copyright Copyright (C) 2008 - 2009 By lucky from xgproyect.net      	 #
-# *																			 #
-# *																			 #
-# *  This program is free software: you can redistribute it and/or modify    #
-# *  it under the terms of the GNU General Public License as published by    #
-# *  the Free Software Foundation, either version 3 of the License, or       #
-# *  (at your option) any later version.									 #
-# *																			 #
-# *  This program is distributed in the hope that it will be useful,		 #
-# *  but WITHOUT ANY WARRANTY; without even the implied warranty of			 #
-# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the			 #
-# *  GNU General Public License for more details.							 #
-# *																			 #
-##############################################################################
-
-define('INSIDE' , true);
-define('INSTALL' , false);
-define('LOGIN'   , true);
-
-$InLogin = true;
-
-$xgp_root = './';
-include($xgp_root . 'extension.inc.php');
-include($xgp_root . 'common.' . $phpEx);
+/**
+ * @project XG Proyect
+ * @version 2.10.x build 0000
+ * @copyright Copyright (C) 2008 - 2016
+ */
+
+define('INSIDE'  ,  TRUE);
+define('INSTALL' , FALSE);
+define('LOGIN'   ,  TRUE);
+define('XGP_ROOT',	'./');
+
+$InLogin = TRUE;
+
+include(XGP_ROOT . 'global.php');
 
 includeLang('PUBLIC');
 
 $parse = $lang;
 
-function sendpassemail($emailaddress, $password)
+function sendpassemail ( $emailaddress , $password )
 {
-	global $game_config, $lang;
+	global $lang;
 
-	$email 				= parsetemplate($lang['reg_mail_text_part1'] . $password . $lang['reg_mail_text_part2'] . GAMEURL, $parse);
-	$status 			= mymail($emailaddress, $lang['register_at'] . $game_config['game_name'], $email);
+	$email 				= parsetemplate ( $lang['reg_mail_text_part1'] . $password . $lang['reg_mail_text_part2'] . GAMEURL , $parse );
+	$status 			= mymail ( $emailaddress , $lang['register_at'] . read_config ( 'game_name' ) , $email );
 
 	return $status;
 }
 
-function mymail($to, $title, $body, $from = '')
+function mymail ( $to , $title , $body , $from = '' )
 {
-	$from = trim($from);
+	$from = trim ( $from );
 
-	if (!$from)
+	if ( !$from )
+	{
 		$from = ADMINEMAIL;
+	}
 
 	$rp = ADMINEMAIL;
 
 	$head = '';
 	$head .= "Content-Type: text/html \r\n";
-	$head  .= "charset: cp1251 \r\n";
+	$head  .= "charset: UTF-8 \r\n";
 	$head .= "Date: " . date('r') . " \r\n";
 	$head .= "Return-Path: $rp \r\n";
 	$head .= "From: $from \r\n";
@@ -63,10 +51,10 @@ function mymail($to, $title, $body, $from = '')
 	$head .= "Organization: $org \r\n";
 	$head .= "X-Sender: $from \r\n";
 	$head .= "X-Priority: 3 \r\n";
-	$body = str_replace("\r\n", "\n", $body);
-	$body = str_replace("\n", "\r\n", $body);
+	$body = str_replace ( "\r\n" , "\n" , $body );
+	$body = str_replace ( "\n" , "\r\n" , $body );
 
-	return mail($to, $title, $body, $head);
+	return mail ( $to , $title , $body , $head );
 }
 
 if ($_POST)
@@ -75,6 +63,7 @@ function mymail($to, $title, $body, $from = '')
 	$errorlist = "";
 
 	$_POST['email'] = strip_tags($_POST['email']);
+
 	if (!is_email($_POST['email']))
 	{
 		$errorlist .= $lang['invalid_mail_adress'];
@@ -93,7 +82,7 @@ function mymail($to, $title, $body, $from = '')
 		$errors++;
 	}
 
-	if (preg_match("/[^A-zÀ-ÿ0-9_\-]/", $_POST['character']) == 1)
+	if (preg_match("/[^A-z0-9_\-]/", $_POST['character']) == 1)
 	{
 		$errorlist .= $lang['user_field_no_alphanumeric'];
 		$errors++;
@@ -105,14 +94,14 @@ function mymail($to, $title, $body, $from = '')
 		$errors++;
 	}
 
-	$ExistUser = doquery("SELECT `username` FROM {{table}} WHERE `username` = '" . mysql_escape_string($_POST['character']) . "' LIMIT 1;", 'users', true);
+	$ExistUser = doquery("SELECT `username` FROM {{table}} WHERE `username` = '" . mysql_escape_string($_POST['character']) . "' LIMIT 1;", 'users', TRUE);
 	if ($ExistUser)
 	{
 		$errorlist .= $lang['user_already_exists'];
 		$errors++;
 	}
 
-	$ExistMail = doquery("SELECT `email` FROM {{table}} WHERE `email` = '" . mysql_escape_string($_POST['email']) . "' LIMIT 1;", 'users', true);
+	$ExistMail = doquery("SELECT `email` FROM {{table}} WHERE `email` = '" . mysql_escape_string($_POST['email']) . "' LIMIT 1;", 'users', TRUE);
 	if ($ExistMail)
 	{
 		$errorlist .= $lang['mail_already_exists'];
@@ -121,7 +110,7 @@ function mymail($to, $title, $body, $from = '')
 
 	if ($errors != 0)
 	{
-		message ($errorlist, "reg.php", "3", false, false);
+		message ($errorlist, "reg.php", "3", FALSE, FALSE);
 	}
 	else
 	{
@@ -138,14 +127,15 @@ function mymail($to, $title, $body, $from = '')
 		$QryInsertAdm  .= "`user_agent` = '', ";
 		$QryInsertUser .= "`id_planet` = '0', ";
 		$QryInsertUser .= "`register_time` = '" . time() . "', ";
+
 		$QryInsertUser .= "`password`='" . $md5newpass . "';";
 		doquery($QryInsertUser, 'users');
 
-		$NewUser = doquery("SELECT `id` FROM {{table}} WHERE `username` = '" . mysql_escape_string($_POST['character']) . "' LIMIT 1;", 'users', true);
+		$NewUser = doquery("SELECT `id` FROM {{table}} WHERE `username` = '" . mysql_escape_string($_POST['character']) . "' LIMIT 1;", 'users', TRUE);
 
-		$LastSettedGalaxyPos = $game_config['LastSettedGalaxyPos'];
-		$LastSettedSystemPos = $game_config['LastSettedSystemPos'];
-		$LastSettedPlanetPos = $game_config['LastSettedPlanetPos'];
+		$LastSettedGalaxyPos = read_config ( 'lastsettedgalaxypos' );
+		$LastSettedSystemPos = read_config ( 'lastsettedsystempos' );
+		$LastSettedPlanetPos = read_config ( 'lastsettedplanetpos' );
 
 		while (!isset($newpos_checked))
 		{
@@ -195,24 +185,24 @@ function mymail($to, $title, $body, $from = '')
 			$QrySelectGalaxy .= "`system` = '" . $System . "' AND ";
 			$QrySelectGalaxy .= "`planet` = '" . $Planet . "' ";
 			$QrySelectGalaxy .= "LIMIT 1;";
-			$GalaxyRow = doquery($QrySelectGalaxy, 'galaxy', true);
+			$GalaxyRow = doquery($QrySelectGalaxy, 'galaxy', TRUE);
 
 			if ($GalaxyRow["id_planet"] == "0")
-				$newpos_checked = true;
+				$newpos_checked = TRUE;
 
 			if (!$GalaxyRow)
 			{
-				CreateOnePlanetRecord ($Galaxy, $System, $Planet, $NewUser['id'], $UserPlanet, true);
-				$newpos_checked = true;
+				CreateOnePlanetRecord ($Galaxy, $System, $Planet, $NewUser['id'], $UserPlanet, TRUE);
+				$newpos_checked = TRUE;
 			}
 			if ($newpos_checked)
 			{
-				doquery("UPDATE {{table}} SET `config_value` = '" . $LastSettedGalaxyPos . "' WHERE `config_name` = 'LastSettedGalaxyPos';", 'config');
-				doquery("UPDATE {{table}} SET `config_value` = '" . $LastSettedSystemPos . "' WHERE `config_name` = 'LastSettedSystemPos';", 'config');
-				doquery("UPDATE {{table}} SET `config_value` = '" . $LastSettedPlanetPos . "' WHERE `config_name` = 'LastSettedPlanetPos';", 'config');
+				update_config ( 'lastsettedgalaxypos' , $LastSettedGalaxyPos );
+				update_config ( 'lastsettedsystempos' , $LastSettedSystemPos );
+				update_config ( 'lastsettedplanetpos' , $LastSettedPlanetPos );
 			}
 		}
-		$PlanetID = doquery("SELECT `id` FROM {{table}} WHERE `id_owner` = '". $NewUser['id'] ."' LIMIT 1;" , 'planets', true);
+		$PlanetID = doquery("SELECT `id` FROM {{table}} WHERE `id_owner` = '". $NewUser['id'] ."' LIMIT 1;" , 'planets', TRUE);
 
 		$QryUpdateUser = "UPDATE {{table}} SET ";
 		$QryUpdateUser .= "`id_planet` = '" . $PlanetID['id'] . "', ";
@@ -231,11 +221,11 @@ function mymail($to, $title, $body, $from = '')
 		$message 	= $lang['welcome_message_content'];
 		SendSimpleMessage($NewUser['id'], $sender, $Time, 1, $from, $Subject, $message);
 
-		doquery("UPDATE {{table}} SET `config_value` = `config_value` + '1' WHERE `config_name` = 'users_amount' LIMIT 1;", 'config');
+		update_config ( 'users_amount' , read_config ( 'users_amount' ) + 1 );
 
 		@include('config.php');
 		$cookie = $NewUser['id'] . "/%/" . $UserName . "/%/" . md5($md5newpass . "--" . $dbsettings["secretword"]) . "/%/" . 0;
-		setcookie($game_config['COOKIE_NAME'], $cookie, 0, "/", "", 0);
+		setcookie(read_config ( 'cookie_name' ), $cookie, 0, "/", "", 0);
 
 		unset($dbsettings);
 
@@ -244,8 +234,9 @@ function mymail($to, $title, $body, $from = '')
 }
 else
 {
-	$parse['servername']   = $game_config['game_name'];
-	$parse['forum_url']    = $game_config['forum_url'];
-	display (parsetemplate(gettemplate('public/registry_form'), $parse), false, '',false, false);
+	$parse['version']	   = VERSION;
+	$parse['servername']   = read_config ( 'game_name' );
+	$parse['forum_url']    = read_config ( 'forum_url' );
+	display (parsetemplate(gettemplate('public/registry_form'), $parse), FALSE, '',FALSE, FALSE);
 }
 ?>
\ No newline at end of file
diff --git a/scripts/chat.js b/scripts/chat.js
deleted file mode 100644
index ef9f273..0000000
--- a/scripts/chat.js
+++ /dev/null
@@ -1,86 +0,0 @@
-// * chat.js
-// *
-// * @version 1.0
-// * @version 1.2 by Ihor
-// * @copyright 2008 by e-Zobar for XNova
-
-// Définition du pseudo
-var nick="<?php print $nick; ?>";
-var nick=nick.replace(/\+/,"plus");
-
-// Scrolling automatique
-function descendreTchat(){
- 	var elDiv =document.getElementById('shoutbox');
- 	elDiv.scrollTop = elDiv.scrollHeight-elDiv.offsetHeight;
-}
-
-// Ajout de message
-function addMessage(){
-	if(msg.value>""){
-		var x_object = null;
-		var cc_obj = document.getElementById("chat_color");
-		var color = cc_obj.options[cc_obj.selectedIndex].value;
-		if(window.XMLHttpRequest){
-			x_object = new XMLHttpRequest();
-		}else if(window.ActiveXObject){
-			x_object = new ActiveXObject("Microsoft.XMLHTTP");
-		}else{
-			alert('AJAX Error');
-			return;
-		}
-		
-		x_object.open("POST","chat_add.php",true); 
-		x_object.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
-		msg.value=msg.value.replace(/\+/g,"plus");
-		if(color>""){
-			msg.value = "[c="+color+"]"+msg.value+"[/c]";
-		}
-		x_object.send("chat_type="+chat_type+"&ally_id="+ally_id+"&nick="+nick+"&msg="+msg.value);
-		msg.value = "";
-		showMessage();
-	}
-}
-function MessageHistory(){
-	var WinH = window.open("chat_msg.php?chat_type="+chat_type+"&ally_id="+ally_id+"&show=history","ChatHistory","");
-}
-
-// Affichage des messages
-function showMessage(){
-var x_object2 = null;
-	if(window.XMLHttpRequest){
-		x_object2 = new XMLHttpRequest();
-	}else if(window.ActiveXObject){
-		x_object2 = new ActiveXObject("Microsoft.XMLHTTP");
-	}else{
-		alert('AJAX Error');
-	return;
-	}
-	x_object2.open("POST","chat_msg.php",true);
-	x_object2.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
-	x_object2.send("chat_type="+chat_type+"&ally_id="+ally_id+"");
-	
-	x_object2.onreadystatechange = function(){
-		if(x_object2.readyState==4){
-			if(x_object2.status==200){
-			document.getElementById('shoutbox').innerHTML = x_object2.responseText;
-			descendreTchat();
-			}
-		}
-	}
-	
-}
-
-// Raccourcis des smileys
-function addSmiley(smiley){
-	msg.value=msg.value+smiley;
-	msg.focus();
-}
-
-// Intervalle entre les messages
-setInterval(showMessage,3000);
-
-// Add Nick by Click
-function addNick(obj){
- msg.value=msg.value+' ['+obj.innerText+'] ';
- msg.focus();
-}
\ No newline at end of file
diff --git a/scripts/time.js b/scripts/time.js
deleted file mode 100644
index d51e877..0000000
--- a/scripts/time.js
+++ /dev/null
@@ -1,27 +0,0 @@
-function showClock() {
-var obj = document.getElementById('clock');
-var req;
-
-if (window.XMLHttpRequest)	req = new XMLHttpRequest();
-else if(window.ActiveXObject) {
-    try {
-        req = new ActiveXObject('Msxml2.XMLHTTP');  
-    } catch (e){}									
-    try {											
-        req = new ActiveXObject('Microsoft.XMLHTTP');
-    } catch (e){}
-}
-
-if (req) {
-    req.onreadystatechange = function() {
-    	if (req.readyState == 4 && req.status == 200)  
-		{ obj.innerHTML = '' +req.responseText; }        
-    };  
-    req.open("POST", 'clock.php', true);
-    req.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
-    req.send('clock=1&ajax=1');
-} 
-else alert("Áðàóçåð íå ïîääåðæèâàåò AJAX");
-}
-
-setInterval(showClock, 1000); 
\ No newline at end of file
diff --git a/styles/css/formate.css b/styles/css/formate.css
index 244e94d..86a4be7 100644
--- a/styles/css/formate.css
+++ b/styles/css/formate.css
@@ -1,22 +1,5 @@
 @charset "utf8";
-/*
-                                 ���������������������������������������������������������
-                                 ��۱����������������������������������������������������۱
-                                 ��۱                                                  ��۱
-                                 ��۱                OGAME: EPIC BLUE                  ��۱
-                                 ��۱                                                  ��۱
-                                 ��۱                      V 1.0                       ��۱
-                                 ��۱                                                  ��۱
-                                 ��۱    Skin fuer "OGame" www.ogame.de V 1.2          ��۱
-                                 ��۱                                                  ��۱
-                                 ��۱    Asiatische Version                            ��۱
-                                 ��۱                                                  ��۱
-                                 ��۱    Viel Spass                                    ��۱
-                                 ��۱                                                  ��۱
-                                 ��۱                    bei Problemen: etapred@gmx.de ��۱
-                                 ��������������������������������������������������������۱
-                                  ���������������������������������������������������������
-*/
+
 ., #, td, th, textarea, body, table
 {
   font-family	: Tahoma,sans-serif;
@@ -279,7 +262,7 @@ a:hover
 .style td
 {
   color                : #E6EBFB;
-  border-top           : 0px; 
+  border-top           : 0px;
   font-size            : 14px;
   font-family          : Tahoma,sans-serif;
 }
@@ -338,13 +321,13 @@ h1
 
 #darkmatter{
 	font-family: verdana;
-	color:#FF8900; 
+	color:#FF8900;
 	filter: glow(color=#000000, strength=6);
 }
-	
+
 #darkmatter2{
 	font-family: verdana;
-	color:#FF8900; 
+	color:#FF8900;
 	filter: glow(color=#000000, strength=6);
 }
 
@@ -413,7 +396,7 @@ td {
 	background-color	 :#344566;
 border-top           : 0px solid #415680 ;
 font-size            : 11px;
-font-family          : Tahoma,sans-serif; 
+font-family          : Tahoma,sans-serif;
 padding				 : 1px;
 vertical-align		 : middle;
 }
diff --git a/adm/Log/ModerationLog.php b/styles/css/index.html
similarity index 100%
rename from adm/Log/ModerationLog.php
rename to styles/css/index.html
diff --git a/styles/css/styles.css b/styles/css/styles.css
index bd0cd77..b3d9637 100644
--- a/styles/css/styles.css
+++ b/styles/css/styles.css
@@ -181,12 +181,12 @@ a:hover {
 
 #copyright {
     position: absolute;
-    top: 110px;
-    left: -100px;
+    top: 170px;
+    left: 0px;
     font-size: 10px;
     color:#666666;
     text-align: left;
-    width: 370px;
+    width: 200px;
 }
 
 .image {
diff --git a/styles/skins/New-Year!/gebaeude/.DS_Store b/styles/images/.DS_Store
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/.DS_Store
rename to styles/images/.DS_Store
diff --git a/styles/skins/New-Year!/gfx/.DS_Store b/styles/images/Adm/.DS_Store
similarity index 100%
rename from styles/skins/New-Year!/gfx/.DS_Store
rename to styles/images/Adm/.DS_Store
diff --git a/styles/images/Adm/Thumbs.db b/styles/images/Adm/Thumbs.db
deleted file mode 100644
index 30f8a46..0000000
Binary files a/styles/images/Adm/Thumbs.db and /dev/null differ
diff --git a/adm/Log/PlanetsAndMoonsLog.php b/styles/images/Adm/index.html
similarity index 100%
rename from adm/Log/PlanetsAndMoonsLog.php
rename to styles/images/Adm/index.html
diff --git a/styles/images/Thumbs.db b/styles/images/Thumbs.db
deleted file mode 100644
index 17dd6ca..0000000
Binary files a/styles/images/Thumbs.db and /dev/null differ
diff --git a/adm/Log/ResetLog.php b/styles/images/index.html
similarity index 100%
rename from adm/Log/ResetLog.php
rename to styles/images/index.html
diff --git a/styles/images/officiers/605.jpg b/styles/images/officiers/605.jpg
deleted file mode 100644
index b3a2280..0000000
Binary files a/styles/images/officiers/605.jpg and /dev/null differ
diff --git a/styles/images/officiers/606.jpg b/styles/images/officiers/606.jpg
deleted file mode 100644
index 64aef7c..0000000
Binary files a/styles/images/officiers/606.jpg and /dev/null differ
diff --git a/styles/images/officiers/607.jpg b/styles/images/officiers/607.jpg
deleted file mode 100644
index 0f979c7..0000000
Binary files a/styles/images/officiers/607.jpg and /dev/null differ
diff --git a/styles/images/officiers/608.jpg b/styles/images/officiers/608.jpg
deleted file mode 100644
index f11f910..0000000
Binary files a/styles/images/officiers/608.jpg and /dev/null differ
diff --git a/styles/images/officiers/609.jpg b/styles/images/officiers/609.jpg
deleted file mode 100644
index 34d8eee..0000000
Binary files a/styles/images/officiers/609.jpg and /dev/null differ
diff --git a/styles/images/officiers/610.jpg b/styles/images/officiers/610.jpg
deleted file mode 100644
index b6ec727..0000000
Binary files a/styles/images/officiers/610.jpg and /dev/null differ
diff --git a/styles/images/officiers/611.jpg b/styles/images/officiers/611.jpg
deleted file mode 100644
index 5ed60a1..0000000
Binary files a/styles/images/officiers/611.jpg and /dev/null differ
diff --git a/styles/images/officiers/612.jpg b/styles/images/officiers/612.jpg
deleted file mode 100644
index 4b896dd..0000000
Binary files a/styles/images/officiers/612.jpg and /dev/null differ
diff --git a/styles/images/officiers/613.jpg b/styles/images/officiers/613.jpg
deleted file mode 100644
index c0c3514..0000000
Binary files a/styles/images/officiers/613.jpg and /dev/null differ
diff --git a/styles/images/officiers/614.jpg b/styles/images/officiers/614.jpg
deleted file mode 100644
index 7089f90..0000000
Binary files a/styles/images/officiers/614.jpg and /dev/null differ
diff --git a/styles/images/officiers/615.jpg b/styles/images/officiers/615.jpg
deleted file mode 100644
index d3d34f8..0000000
Binary files a/styles/images/officiers/615.jpg and /dev/null differ
diff --git a/styles/images/smileys/aggressive.gif b/styles/images/smileys/aggressive.gif
deleted file mode 100644
index 47b9149..0000000
Binary files a/styles/images/smileys/aggressive.gif and /dev/null differ
diff --git a/styles/images/smileys/angel.gif b/styles/images/smileys/angel.gif
deleted file mode 100644
index 040799d..0000000
Binary files a/styles/images/smileys/angel.gif and /dev/null differ
diff --git a/styles/images/smileys/bad.gif b/styles/images/smileys/bad.gif
deleted file mode 100644
index bd41ce6..0000000
Binary files a/styles/images/smileys/bad.gif and /dev/null differ
diff --git a/styles/images/smileys/bc.gif b/styles/images/smileys/bc.gif
deleted file mode 100644
index 083af3f..0000000
Binary files a/styles/images/smileys/bc.gif and /dev/null differ
diff --git a/styles/images/smileys/be.gif b/styles/images/smileys/be.gif
deleted file mode 100644
index 4835b15..0000000
Binary files a/styles/images/smileys/be.gif and /dev/null differ
diff --git a/styles/images/smileys/beee.gif b/styles/images/smileys/beee.gif
deleted file mode 100644
index 21e6f11..0000000
Binary files a/styles/images/smileys/beee.gif and /dev/null differ
diff --git a/styles/images/smileys/bh.gif b/styles/images/smileys/bh.gif
deleted file mode 100644
index 4d67957..0000000
Binary files a/styles/images/smileys/bh.gif and /dev/null differ
diff --git a/styles/images/smileys/bi.gif b/styles/images/smileys/bi.gif
deleted file mode 100644
index 7b887f0..0000000
Binary files a/styles/images/smileys/bi.gif and /dev/null differ
diff --git a/styles/images/smileys/bk.gif b/styles/images/smileys/bk.gif
deleted file mode 100644
index 16fbe8e..0000000
Binary files a/styles/images/smileys/bk.gif and /dev/null differ
diff --git a/styles/images/smileys/bl.gif b/styles/images/smileys/bl.gif
deleted file mode 100644
index a559084..0000000
Binary files a/styles/images/smileys/bl.gif and /dev/null differ
diff --git a/styles/images/smileys/blackeye.gif b/styles/images/smileys/blackeye.gif
deleted file mode 100644
index b83c9cd..0000000
Binary files a/styles/images/smileys/blackeye.gif and /dev/null differ
diff --git a/styles/images/smileys/blink.gif b/styles/images/smileys/blink.gif
deleted file mode 100644
index 3f6195d..0000000
Binary files a/styles/images/smileys/blink.gif and /dev/null differ
diff --git a/styles/images/smileys/blush.gif b/styles/images/smileys/blush.gif
deleted file mode 100644
index 9384358..0000000
Binary files a/styles/images/smileys/blush.gif and /dev/null differ
diff --git a/styles/images/smileys/bomb.gif b/styles/images/smileys/bomb.gif
deleted file mode 100644
index 9807466..0000000
Binary files a/styles/images/smileys/bomb.gif and /dev/null differ
diff --git a/styles/images/smileys/br.gif b/styles/images/smileys/br.gif
deleted file mode 100644
index 3618ebe..0000000
Binary files a/styles/images/smileys/br.gif and /dev/null differ
diff --git a/styles/images/smileys/bx.gif b/styles/images/smileys/bx.gif
deleted file mode 100644
index fe153f6..0000000
Binary files a/styles/images/smileys/bx.gif and /dev/null differ
diff --git a/styles/images/smileys/cc.gif b/styles/images/smileys/cc.gif
deleted file mode 100644
index 930da67..0000000
Binary files a/styles/images/smileys/cc.gif and /dev/null differ
diff --git a/styles/images/smileys/cg.gif b/styles/images/smileys/cg.gif
deleted file mode 100644
index 18a2b13..0000000
Binary files a/styles/images/smileys/cg.gif and /dev/null differ
diff --git a/styles/images/smileys/ci.gif b/styles/images/smileys/ci.gif
deleted file mode 100644
index b0c064d..0000000
Binary files a/styles/images/smileys/ci.gif and /dev/null differ
diff --git a/styles/images/smileys/clapping.gif b/styles/images/smileys/clapping.gif
deleted file mode 100644
index 5eac82f..0000000
Binary files a/styles/images/smileys/clapping.gif and /dev/null differ
diff --git a/styles/images/smileys/co.gif b/styles/images/smileys/co.gif
deleted file mode 100644
index e9000bb..0000000
Binary files a/styles/images/smileys/co.gif and /dev/null differ
diff --git a/styles/images/smileys/cool.gif b/styles/images/smileys/cool.gif
deleted file mode 100644
index e72e0b1..0000000
Binary files a/styles/images/smileys/cool.gif and /dev/null differ
diff --git a/styles/images/smileys/cr.gif b/styles/images/smileys/cr.gif
deleted file mode 100644
index 7ac123e..0000000
Binary files a/styles/images/smileys/cr.gif and /dev/null differ
diff --git a/styles/images/smileys/cray.gif b/styles/images/smileys/cray.gif
deleted file mode 100644
index 33fec3c..0000000
Binary files a/styles/images/smileys/cray.gif and /dev/null differ
diff --git a/styles/images/smileys/crazy.gif b/styles/images/smileys/crazy.gif
deleted file mode 100644
index 133d7f2..0000000
Binary files a/styles/images/smileys/crazy.gif and /dev/null differ
diff --git a/styles/images/smileys/diablo.gif b/styles/images/smileys/diablo.gif
deleted file mode 100644
index 1f858ba..0000000
Binary files a/styles/images/smileys/diablo.gif and /dev/null differ
diff --git a/styles/images/smileys/dirol.gif b/styles/images/smileys/dirol.gif
deleted file mode 100644
index a06ca00..0000000
Binary files a/styles/images/smileys/dirol.gif and /dev/null differ
diff --git a/styles/images/smileys/drinks.gif b/styles/images/smileys/drinks.gif
deleted file mode 100644
index 9d5eb53..0000000
Binary files a/styles/images/smileys/drinks.gif and /dev/null differ
diff --git a/styles/images/smileys/fool.gif b/styles/images/smileys/fool.gif
deleted file mode 100644
index e9a4b1f..0000000
Binary files a/styles/images/smileys/fool.gif and /dev/null differ
diff --git a/styles/images/smileys/friends.gif b/styles/images/smileys/friends.gif
deleted file mode 100644
index 528e1db..0000000
Binary files a/styles/images/smileys/friends.gif and /dev/null differ
diff --git a/styles/images/smileys/give_rose.gif b/styles/images/smileys/give_rose.gif
deleted file mode 100644
index 8130923..0000000
Binary files a/styles/images/smileys/give_rose.gif and /dev/null differ
diff --git a/styles/images/smileys/good.gif b/styles/images/smileys/good.gif
deleted file mode 100644
index c2626e3..0000000
Binary files a/styles/images/smileys/good.gif and /dev/null differ
diff --git a/styles/images/smileys/huh.gif b/styles/images/smileys/huh.gif
deleted file mode 100644
index 75149ad..0000000
Binary files a/styles/images/smileys/huh.gif and /dev/null differ
diff --git a/styles/images/smileys/lol.gif b/styles/images/smileys/lol.gif
deleted file mode 100644
index 127ee84..0000000
Binary files a/styles/images/smileys/lol.gif and /dev/null differ
diff --git a/styles/images/smileys/mail1.gif b/styles/images/smileys/mail1.gif
deleted file mode 100644
index 2b5fafa..0000000
Binary files a/styles/images/smileys/mail1.gif and /dev/null differ
diff --git a/styles/images/smileys/mellow.gif b/styles/images/smileys/mellow.gif
deleted file mode 100644
index 3f2b556..0000000
Binary files a/styles/images/smileys/mellow.gif and /dev/null differ
diff --git a/styles/images/smileys/mill.gif b/styles/images/smileys/mill.gif
deleted file mode 100644
index 12de8c3..0000000
Binary files a/styles/images/smileys/mill.gif and /dev/null differ
diff --git a/styles/images/smileys/nea.gif b/styles/images/smileys/nea.gif
deleted file mode 100644
index a559084..0000000
Binary files a/styles/images/smileys/nea.gif and /dev/null differ
diff --git a/styles/images/smileys/nono.gif b/styles/images/smileys/nono.gif
deleted file mode 100644
index 60dae5b..0000000
Binary files a/styles/images/smileys/nono.gif and /dev/null differ
diff --git a/styles/images/smileys/pardon.gif b/styles/images/smileys/pardon.gif
deleted file mode 100644
index 16fbe8e..0000000
Binary files a/styles/images/smileys/pardon.gif and /dev/null differ
diff --git a/styles/images/smileys/pleasantry.gif b/styles/images/smileys/pleasantry.gif
deleted file mode 100644
index 4b37e8d..0000000
Binary files a/styles/images/smileys/pleasantry.gif and /dev/null differ
diff --git a/styles/images/smileys/posle.gif b/styles/images/smileys/posle.gif
deleted file mode 100644
index 13b1455..0000000
Binary files a/styles/images/smileys/posle.gif and /dev/null differ
diff --git a/styles/images/smileys/preved.gif b/styles/images/smileys/preved.gif
deleted file mode 100644
index 07aadbd..0000000
Binary files a/styles/images/smileys/preved.gif and /dev/null differ
diff --git a/styles/images/smileys/rofl.gif b/styles/images/smileys/rofl.gif
deleted file mode 100644
index e0182c8..0000000
Binary files a/styles/images/smileys/rofl.gif and /dev/null differ
diff --git a/styles/images/smileys/sad.gif b/styles/images/smileys/sad.gif
deleted file mode 100644
index 3ea921f..0000000
Binary files a/styles/images/smileys/sad.gif and /dev/null differ
diff --git a/styles/images/smileys/scratch.gif b/styles/images/smileys/scratch.gif
deleted file mode 100644
index d995f02..0000000
Binary files a/styles/images/smileys/scratch.gif and /dev/null differ
diff --git a/styles/images/smileys/shok.gif b/styles/images/smileys/shok.gif
deleted file mode 100644
index 92fbaa7..0000000
Binary files a/styles/images/smileys/shok.gif and /dev/null differ
diff --git a/styles/images/smileys/shout.gif b/styles/images/smileys/shout.gif
deleted file mode 100644
index 223d8b2..0000000
Binary files a/styles/images/smileys/shout.gif and /dev/null differ
diff --git a/styles/images/smileys/smile.gif b/styles/images/smileys/smile.gif
deleted file mode 100644
index 2dd9bd9..0000000
Binary files a/styles/images/smileys/smile.gif and /dev/null differ
diff --git a/styles/images/smileys/sorry.gif b/styles/images/smileys/sorry.gif
deleted file mode 100644
index 7577f72..0000000
Binary files a/styles/images/smileys/sorry.gif and /dev/null differ
diff --git a/styles/images/smileys/spiteful.gif b/styles/images/smileys/spiteful.gif
deleted file mode 100644
index e094792..0000000
Binary files a/styles/images/smileys/spiteful.gif and /dev/null differ
diff --git a/styles/images/smileys/tease.gif b/styles/images/smileys/tease.gif
deleted file mode 100644
index 4d7484b..0000000
Binary files a/styles/images/smileys/tease.gif and /dev/null differ
diff --git a/styles/images/smileys/tongue.gif b/styles/images/smileys/tongue.gif
deleted file mode 100644
index 51341a1..0000000
Binary files a/styles/images/smileys/tongue.gif and /dev/null differ
diff --git a/styles/images/smileys/unknw.gif b/styles/images/smileys/unknw.gif
deleted file mode 100644
index 42fe346..0000000
Binary files a/styles/images/smileys/unknw.gif and /dev/null differ
diff --git a/styles/images/smileys/wink.gif b/styles/images/smileys/wink.gif
deleted file mode 100644
index 48caf22..0000000
Binary files a/styles/images/smileys/wink.gif and /dev/null differ
diff --git a/styles/images/smileys/yahoo.gif b/styles/images/smileys/yahoo.gif
deleted file mode 100644
index 933d96e..0000000
Binary files a/styles/images/smileys/yahoo.gif and /dev/null differ
diff --git a/styles/images/smileys/yu.gif b/styles/images/smileys/yu.gif
deleted file mode 100644
index afa92cf..0000000
Binary files a/styles/images/smileys/yu.gif and /dev/null differ
diff --git a/adm/Log/index.htm b/styles/index.html
similarity index 100%
rename from adm/Log/index.htm
rename to styles/index.html
diff --git a/styles/skins/New-Year!/gebaeude/125.gif b/styles/skins/New-Year!/gebaeude/125.gif
deleted file mode 100644
index 9229115..0000000
Binary files a/styles/skins/New-Year!/gebaeude/125.gif and /dev/null differ
diff --git a/styles/skins/New-Year!/gebaeude/150.gif b/styles/skins/New-Year!/gebaeude/150.gif
deleted file mode 100644
index ec3cfeb..0000000
Binary files a/styles/skins/New-Year!/gebaeude/150.gif and /dev/null differ
diff --git a/styles/skins/New-Year!/gebaeude/216.gif b/styles/skins/New-Year!/gebaeude/216.gif
deleted file mode 100644
index d2d279f..0000000
Binary files a/styles/skins/New-Year!/gebaeude/216.gif and /dev/null differ
diff --git a/styles/skins/New-Year!/gebaeude/409.gif b/styles/skins/New-Year!/gebaeude/409.gif
deleted file mode 100644
index 390bcc4..0000000
Binary files a/styles/skins/New-Year!/gebaeude/409.gif and /dev/null differ
diff --git a/styles/skins/New-Year!/gebaeude/410.gif b/styles/skins/New-Year!/gebaeude/410.gif
deleted file mode 100644
index f9c8024..0000000
Binary files a/styles/skins/New-Year!/gebaeude/410.gif and /dev/null differ
diff --git a/styles/skins/New-Year!/gebaeude/601.jpg b/styles/skins/New-Year!/gebaeude/601.jpg
deleted file mode 100644
index 404fbeb..0000000
Binary files a/styles/skins/New-Year!/gebaeude/601.jpg and /dev/null differ
diff --git a/styles/skins/New-Year!/gebaeude/602.jpg b/styles/skins/New-Year!/gebaeude/602.jpg
deleted file mode 100644
index 7ebf8f3..0000000
Binary files a/styles/skins/New-Year!/gebaeude/602.jpg and /dev/null differ
diff --git a/styles/skins/New-Year!/gebaeude/603.jpg b/styles/skins/New-Year!/gebaeude/603.jpg
deleted file mode 100644
index 2bb9b7f..0000000
Binary files a/styles/skins/New-Year!/gebaeude/603.jpg and /dev/null differ
diff --git a/styles/skins/New-Year!/gebaeude/604.jpg b/styles/skins/New-Year!/gebaeude/604.jpg
deleted file mode 100644
index e04c0b0..0000000
Binary files a/styles/skins/New-Year!/gebaeude/604.jpg and /dev/null differ
diff --git a/styles/skins/New-Year!/images/darkmatter.jpg b/styles/skins/New-Year!/images/darkmatter.jpg
deleted file mode 100644
index a4ccc5b..0000000
Binary files a/styles/skins/New-Year!/images/darkmatter.jpg and /dev/null differ
diff --git a/styles/skins/New-Year!/images/deuterium.gif b/styles/skins/New-Year!/images/deuterium.gif
deleted file mode 100644
index 380282d..0000000
Binary files a/styles/skins/New-Year!/images/deuterium.gif and /dev/null differ
diff --git a/styles/skins/New-Year!/images/energie.gif b/styles/skins/New-Year!/images/energie.gif
deleted file mode 100644
index 5690300..0000000
Binary files a/styles/skins/New-Year!/images/energie.gif and /dev/null differ
diff --git a/styles/skins/New-Year!/images/kristall.gif b/styles/skins/New-Year!/images/kristall.gif
deleted file mode 100644
index c777f04..0000000
Binary files a/styles/skins/New-Year!/images/kristall.gif and /dev/null differ
diff --git a/styles/skins/New-Year!/images/message.gif b/styles/skins/New-Year!/images/message.gif
deleted file mode 100644
index 6aaa698..0000000
Binary files a/styles/skins/New-Year!/images/message.gif and /dev/null differ
diff --git a/styles/skins/New-Year!/images/metall.gif b/styles/skins/New-Year!/images/metall.gif
deleted file mode 100644
index 900fcd8..0000000
Binary files a/styles/skins/New-Year!/images/metall.gif and /dev/null differ
diff --git a/styles/skins/New-Year!/img/background.jpg b/styles/skins/New-Year!/img/background.jpg
deleted file mode 100644
index 016753a..0000000
Binary files a/styles/skins/New-Year!/img/background.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/formate.css b/styles/skins/NewGame/formate.css
deleted file mode 100644
index c9965fa..0000000
--- a/styles/skins/NewGame/formate.css
+++ /dev/null
@@ -1,318 +0,0 @@
-., #, td, th, textarea, body, table
-{
-  font-family	: Tahoma,sans-serif;
-  font-size	: 11px;
-}
-
-img
-{
-  border               : 0px;
-}
-
-p table
-{
-  border               : 0px;
-}
-
-p td
-{
-  text-align           : center;
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-}
-
-table table
-{
-  border               : 0px;
-}
-
-table table td
-{
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-}
-
-body
-{
-  color                : #E6EBFB;
-  margin-top           : 1px;
-  margin-left          : 1px;
-  background-color     : #040e1e;
-  background-image     : url(img/background.jpg);
-  background-attachment: fixed;
-  background-repeat    : no-repeat;
-  background-position  : top right;
-  scrollbar-arrow-color: #E6EBFB;
-  scrollbar-base-color: #344566;
-  scrollbar-track-color: #344566;
-  scrollbar-face-color: #344566;
-  scrollbar-highlight-color: #344566;
-  scrollbar-3dlight-color: #465673;
-  scrollbar-darkshadow-color: #344566;
-  scrollbar-shadow-color: #465673;
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-}
-
-body.style{
-	background-image: none;
-}
-
-body.style table {
-	margin:0px;
-}
-
-body form table th table input
-{
-  width: 60px;
-}
-
-th, td.a, td.b, td.c, td.f, input, select,
-td.g, td.h, td.i, td.j, td.k, td.l, td.m,
-td.n, td.o, td.q, td.r, td.v, .style td,
-textarea, p td, table.s th img
-{
-  border               : 1px #415680 solid;
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-}
-
-th, td.a, td.b, td.c, td.f, input, select, td.g,
-td.h, td.i, td.j, td.k, td.m, td.o, td.q, td.r,
-td.v, td.s, .style td, p td
-{
-  background-color     : #344566;
-}
-
-th
-{
-  text-align           : center;
-  padding-left         : 3px;
-  padding-right        : 3px;
-}
-
-td.a
-{
-  height               : 39px;
-  text-align           : center;
-}
-
-td.b
-{
-  padding              : 3px;
-}
-
-td.c
-{
-  font-weight          : bold;
-  color                : #E6EBFB;
-  padding-left         : 3px;
-  background-image     : url(img/bg1.gif);
-}
-
-td.f, input, select, textarea
-{
-  color                : #E6EBFB;
-  background-color     : #344566;
-}
-
-textarea
-{
-  width                : 100%;
-}
-
-td.k input
-{
-  text-align           : left;
-}
-
-td.g
-{
-  font-weight          : bold;
-  text-align           : right;
-  color                : #E6EBFB;
-}
-
-td.h
-{
-  text-align           : center;
-  color                : #E6EBFB;
-}
-
-td.i
-{
-  text-align           : center;
-  color                : #E6EBFB;
-}
-
-td.j
-{
-  text-align           : center;
-  color                : #E6EBFB;
-}
-
-td.k, td.k input
-{
-  text-align           : center;
-  color                : #E6EBFB;
-}
-
-td.l
-{
-  background-color     : #344566;
-  color                : #E6EBFB;
-  vertical-align       : top;
-  padding              : 3px;
-  background-image     : url(img/bg2.gif);
-}
-
-td.m
-{
-  font-weight          : bold;
-  text-align           : right;
-  width                : 86px;
-  color                : #E6EBFB;
-}
-
-td.n
-{
-  font-weight          : bold;
-  text-align           : right;
-  width                : 89px;
-  text-align           : center;
-  color                : #E6EBFB;
-}
-
-td.o
-{
-  text-align           : center;
-  color                : #E6EBFB;
-}
-
-td.q
-{
-  font-weight          : bold;
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-  text-align           : center;
-  vertical-align       : middle;
-  color                : #E6EBFB;
-}
-
-td.r
-{
-  text-align           : right;
-  color                : #E6EBFB;
-}
-
-td.v
-{
-  font-weight          : bold;
-  text-align           : right;
-  color                : #f7f7f7;
-}
-
-td.s
-{
-  color                : #E6EBFB;
-}
-
-table.s th
-{
-  border               : 0px;
-}
-
-table.s th img
-{
-  width                : 89px;
-  height               : 89px;
-}
-
-div.z
-{
-  font-weight          : bold;
-  color                : #E6EBFB;
-}
-
-a
-{
-  color                : #E6EBFB;
-  text-decoration      : none;
-  font-weight          : bold;
-}
-
-a.s
-{
-  color                : #E6EBFB;
-}
-
-a.t
-{
-  color                : #E6EBFB;
-}
-
-a:hover
-{
-  color                : #CDD7F8;
-  text-decoration      : underline;
-}
-
-.style td
-{
-  color                : #E6EBFB;
-  border-top           : 0px;
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-}
-
-.style div a
-{
-  height               : 100%;
-  width                : 100%;
-  color                : #f2f2f2;
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-}
-
-.style div a:link
-{
-  height               : 100%;
-  width                : 100%;
-  color                : #f2f2f2;
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-}
-
-.style div a:visited
-{
-  height               : 100%;
-  width                : 100%;
-  color                : #f2f2f2;
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-}
-
-.style div a:hover
-{
-  background-color     : #415680;
-  height               : 100%;
-  width                : 100%;
-  text-decoration      : none;
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-  color                : #E6EBFB;
-}
-
-.style
-{
-  margin-top           : 15px;
-}
-
-h1
-{
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-  border-bottom        : 0px #344566 solid;
-  width                : 98%;
-  text-align           : center;
-}
\ No newline at end of file
diff --git a/styles/skins/NewGame/gebaeude/1.gif b/styles/skins/NewGame/gebaeude/1.gif
deleted file mode 100644
index 287ca5f..0000000
Binary files a/styles/skins/NewGame/gebaeude/1.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/106.gif b/styles/skins/NewGame/gebaeude/106.gif
deleted file mode 100644
index 43ed910..0000000
Binary files a/styles/skins/NewGame/gebaeude/106.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/108.gif b/styles/skins/NewGame/gebaeude/108.gif
deleted file mode 100644
index d3d4181..0000000
Binary files a/styles/skins/NewGame/gebaeude/108.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/109.gif b/styles/skins/NewGame/gebaeude/109.gif
deleted file mode 100644
index e7ab62f..0000000
Binary files a/styles/skins/NewGame/gebaeude/109.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/110.gif b/styles/skins/NewGame/gebaeude/110.gif
deleted file mode 100644
index d8271b2..0000000
Binary files a/styles/skins/NewGame/gebaeude/110.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/111.gif b/styles/skins/NewGame/gebaeude/111.gif
deleted file mode 100644
index da7c1a1..0000000
Binary files a/styles/skins/NewGame/gebaeude/111.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/113.gif b/styles/skins/NewGame/gebaeude/113.gif
deleted file mode 100644
index 04914b4..0000000
Binary files a/styles/skins/NewGame/gebaeude/113.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/114.gif b/styles/skins/NewGame/gebaeude/114.gif
deleted file mode 100644
index 556f16f..0000000
Binary files a/styles/skins/NewGame/gebaeude/114.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/115.gif b/styles/skins/NewGame/gebaeude/115.gif
deleted file mode 100644
index 3925b74..0000000
Binary files a/styles/skins/NewGame/gebaeude/115.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/117.gif b/styles/skins/NewGame/gebaeude/117.gif
deleted file mode 100644
index 482673d..0000000
Binary files a/styles/skins/NewGame/gebaeude/117.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/118.gif b/styles/skins/NewGame/gebaeude/118.gif
deleted file mode 100644
index 5adac98..0000000
Binary files a/styles/skins/NewGame/gebaeude/118.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/12.gif b/styles/skins/NewGame/gebaeude/12.gif
deleted file mode 100644
index 1a9499a..0000000
Binary files a/styles/skins/NewGame/gebaeude/12.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/120.gif b/styles/skins/NewGame/gebaeude/120.gif
deleted file mode 100644
index 4fc9fd5..0000000
Binary files a/styles/skins/NewGame/gebaeude/120.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/121.gif b/styles/skins/NewGame/gebaeude/121.gif
deleted file mode 100644
index 4a380c4..0000000
Binary files a/styles/skins/NewGame/gebaeude/121.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/122.gif b/styles/skins/NewGame/gebaeude/122.gif
deleted file mode 100644
index 44d723f..0000000
Binary files a/styles/skins/NewGame/gebaeude/122.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/123.gif b/styles/skins/NewGame/gebaeude/123.gif
deleted file mode 100644
index 0ea7934..0000000
Binary files a/styles/skins/NewGame/gebaeude/123.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/124.gif b/styles/skins/NewGame/gebaeude/124.gif
deleted file mode 100644
index 5d497a3..0000000
Binary files a/styles/skins/NewGame/gebaeude/124.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/125.gif b/styles/skins/NewGame/gebaeude/125.gif
deleted file mode 100644
index 9229115..0000000
Binary files a/styles/skins/NewGame/gebaeude/125.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/14.gif b/styles/skins/NewGame/gebaeude/14.gif
deleted file mode 100644
index 957bd12..0000000
Binary files a/styles/skins/NewGame/gebaeude/14.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/15.gif b/styles/skins/NewGame/gebaeude/15.gif
deleted file mode 100644
index 821f3af..0000000
Binary files a/styles/skins/NewGame/gebaeude/15.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/150.gif b/styles/skins/NewGame/gebaeude/150.gif
deleted file mode 100644
index ec3cfeb..0000000
Binary files a/styles/skins/NewGame/gebaeude/150.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/199.gif b/styles/skins/NewGame/gebaeude/199.gif
deleted file mode 100644
index bd1005d..0000000
Binary files a/styles/skins/NewGame/gebaeude/199.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/2.gif b/styles/skins/NewGame/gebaeude/2.gif
deleted file mode 100644
index 010805e..0000000
Binary files a/styles/skins/NewGame/gebaeude/2.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/202.gif b/styles/skins/NewGame/gebaeude/202.gif
deleted file mode 100644
index 3a6307a..0000000
Binary files a/styles/skins/NewGame/gebaeude/202.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/203.gif b/styles/skins/NewGame/gebaeude/203.gif
deleted file mode 100644
index 968aa5c..0000000
Binary files a/styles/skins/NewGame/gebaeude/203.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/204.gif b/styles/skins/NewGame/gebaeude/204.gif
deleted file mode 100644
index 453add0..0000000
Binary files a/styles/skins/NewGame/gebaeude/204.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/205.gif b/styles/skins/NewGame/gebaeude/205.gif
deleted file mode 100644
index 177a845..0000000
Binary files a/styles/skins/NewGame/gebaeude/205.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/206.gif b/styles/skins/NewGame/gebaeude/206.gif
deleted file mode 100644
index 481b5c7..0000000
Binary files a/styles/skins/NewGame/gebaeude/206.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/207.gif b/styles/skins/NewGame/gebaeude/207.gif
deleted file mode 100644
index 1164aef..0000000
Binary files a/styles/skins/NewGame/gebaeude/207.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/208.gif b/styles/skins/NewGame/gebaeude/208.gif
deleted file mode 100644
index e5bda54..0000000
Binary files a/styles/skins/NewGame/gebaeude/208.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/209.gif b/styles/skins/NewGame/gebaeude/209.gif
deleted file mode 100644
index e9d2e25..0000000
Binary files a/styles/skins/NewGame/gebaeude/209.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/21.gif b/styles/skins/NewGame/gebaeude/21.gif
deleted file mode 100644
index a9cfda7..0000000
Binary files a/styles/skins/NewGame/gebaeude/21.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/210.gif b/styles/skins/NewGame/gebaeude/210.gif
deleted file mode 100644
index 5d4e8ea..0000000
Binary files a/styles/skins/NewGame/gebaeude/210.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/211.gif b/styles/skins/NewGame/gebaeude/211.gif
deleted file mode 100644
index 1febf67..0000000
Binary files a/styles/skins/NewGame/gebaeude/211.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/212.gif b/styles/skins/NewGame/gebaeude/212.gif
deleted file mode 100644
index 8be6909..0000000
Binary files a/styles/skins/NewGame/gebaeude/212.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/213.gif b/styles/skins/NewGame/gebaeude/213.gif
deleted file mode 100644
index 33e7a9f..0000000
Binary files a/styles/skins/NewGame/gebaeude/213.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/214.gif b/styles/skins/NewGame/gebaeude/214.gif
deleted file mode 100644
index 5999c74..0000000
Binary files a/styles/skins/NewGame/gebaeude/214.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/215.gif b/styles/skins/NewGame/gebaeude/215.gif
deleted file mode 100644
index a1e14a2..0000000
Binary files a/styles/skins/NewGame/gebaeude/215.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/216.gif b/styles/skins/NewGame/gebaeude/216.gif
deleted file mode 100644
index d2d279f..0000000
Binary files a/styles/skins/NewGame/gebaeude/216.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/22.gif b/styles/skins/NewGame/gebaeude/22.gif
deleted file mode 100644
index a16e234..0000000
Binary files a/styles/skins/NewGame/gebaeude/22.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/23.gif b/styles/skins/NewGame/gebaeude/23.gif
deleted file mode 100644
index aa28a99..0000000
Binary files a/styles/skins/NewGame/gebaeude/23.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/24.gif b/styles/skins/NewGame/gebaeude/24.gif
deleted file mode 100644
index 845d2f4..0000000
Binary files a/styles/skins/NewGame/gebaeude/24.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/3.gif b/styles/skins/NewGame/gebaeude/3.gif
deleted file mode 100644
index 1e0549f..0000000
Binary files a/styles/skins/NewGame/gebaeude/3.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/31.gif b/styles/skins/NewGame/gebaeude/31.gif
deleted file mode 100644
index 3604f5c..0000000
Binary files a/styles/skins/NewGame/gebaeude/31.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/33.gif b/styles/skins/NewGame/gebaeude/33.gif
deleted file mode 100644
index 8b27fe2..0000000
Binary files a/styles/skins/NewGame/gebaeude/33.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/34.gif b/styles/skins/NewGame/gebaeude/34.gif
deleted file mode 100644
index 330353f..0000000
Binary files a/styles/skins/NewGame/gebaeude/34.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/4.gif b/styles/skins/NewGame/gebaeude/4.gif
deleted file mode 100644
index 71e8bfa..0000000
Binary files a/styles/skins/NewGame/gebaeude/4.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/401.gif b/styles/skins/NewGame/gebaeude/401.gif
deleted file mode 100644
index a6fa907..0000000
Binary files a/styles/skins/NewGame/gebaeude/401.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/402.gif b/styles/skins/NewGame/gebaeude/402.gif
deleted file mode 100644
index 2152c76..0000000
Binary files a/styles/skins/NewGame/gebaeude/402.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/403.gif b/styles/skins/NewGame/gebaeude/403.gif
deleted file mode 100644
index 464f62d..0000000
Binary files a/styles/skins/NewGame/gebaeude/403.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/404.gif b/styles/skins/NewGame/gebaeude/404.gif
deleted file mode 100644
index 61c1273..0000000
Binary files a/styles/skins/NewGame/gebaeude/404.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/405.gif b/styles/skins/NewGame/gebaeude/405.gif
deleted file mode 100644
index 373a731..0000000
Binary files a/styles/skins/NewGame/gebaeude/405.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/406.gif b/styles/skins/NewGame/gebaeude/406.gif
deleted file mode 100644
index 26e1da2..0000000
Binary files a/styles/skins/NewGame/gebaeude/406.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/407.gif b/styles/skins/NewGame/gebaeude/407.gif
deleted file mode 100644
index c3c1840..0000000
Binary files a/styles/skins/NewGame/gebaeude/407.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/408.gif b/styles/skins/NewGame/gebaeude/408.gif
deleted file mode 100644
index 80649b1..0000000
Binary files a/styles/skins/NewGame/gebaeude/408.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/409.gif b/styles/skins/NewGame/gebaeude/409.gif
deleted file mode 100644
index abb7dae..0000000
Binary files a/styles/skins/NewGame/gebaeude/409.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/41.gif b/styles/skins/NewGame/gebaeude/41.gif
deleted file mode 100644
index 79845d3..0000000
Binary files a/styles/skins/NewGame/gebaeude/41.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/410.gif b/styles/skins/NewGame/gebaeude/410.gif
deleted file mode 100644
index 1d4a117..0000000
Binary files a/styles/skins/NewGame/gebaeude/410.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/42.gif b/styles/skins/NewGame/gebaeude/42.gif
deleted file mode 100644
index 64cced2..0000000
Binary files a/styles/skins/NewGame/gebaeude/42.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/43.gif b/styles/skins/NewGame/gebaeude/43.gif
deleted file mode 100644
index 1957f8e..0000000
Binary files a/styles/skins/NewGame/gebaeude/43.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/44.gif b/styles/skins/NewGame/gebaeude/44.gif
deleted file mode 100644
index ed14f26..0000000
Binary files a/styles/skins/NewGame/gebaeude/44.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/501.gif b/styles/skins/NewGame/gebaeude/501.gif
deleted file mode 100644
index 12c3b45..0000000
Binary files a/styles/skins/NewGame/gebaeude/501.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/502.gif b/styles/skins/NewGame/gebaeude/502.gif
deleted file mode 100644
index 4a68819..0000000
Binary files a/styles/skins/NewGame/gebaeude/502.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gebaeude/503.gif b/styles/skins/NewGame/gebaeude/503.gif
deleted file mode 100644
index df98e53..0000000
Binary files a/styles/skins/NewGame/gebaeude/503.gif and /dev/null differ
diff --git a/styles/skins/NewGame/gfx/info-help.jpg b/styles/skins/NewGame/gfx/info-help.jpg
deleted file mode 100644
index c1d0d65..0000000
Binary files a/styles/skins/NewGame/gfx/info-help.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/gfx/ogame-produktion.jpg b/styles/skins/NewGame/gfx/ogame-produktion.jpg
deleted file mode 100644
index d26436b..0000000
Binary files a/styles/skins/NewGame/gfx/ogame-produktion.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/gfx/stinger-me.jpg b/styles/skins/NewGame/gfx/stinger-me.jpg
deleted file mode 100644
index 7d04d2f..0000000
Binary files a/styles/skins/NewGame/gfx/stinger-me.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/gfx/user-menu.jpg b/styles/skins/NewGame/gfx/user-menu.jpg
deleted file mode 100644
index fa78f89..0000000
Binary files a/styles/skins/NewGame/gfx/user-menu.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/images/deuterium.gif b/styles/skins/NewGame/images/deuterium.gif
deleted file mode 100644
index 221d382..0000000
Binary files a/styles/skins/NewGame/images/deuterium.gif and /dev/null differ
diff --git a/styles/skins/NewGame/images/energie.gif b/styles/skins/NewGame/images/energie.gif
deleted file mode 100644
index 7d128c9..0000000
Binary files a/styles/skins/NewGame/images/energie.gif and /dev/null differ
diff --git a/styles/skins/NewGame/images/kristall.gif b/styles/skins/NewGame/images/kristall.gif
deleted file mode 100644
index ecf4e08..0000000
Binary files a/styles/skins/NewGame/images/kristall.gif and /dev/null differ
diff --git a/styles/skins/NewGame/images/message.gif b/styles/skins/NewGame/images/message.gif
deleted file mode 100644
index 6aaa698..0000000
Binary files a/styles/skins/NewGame/images/message.gif and /dev/null differ
diff --git a/styles/skins/NewGame/images/metall.gif b/styles/skins/NewGame/images/metall.gif
deleted file mode 100644
index bf449b6..0000000
Binary files a/styles/skins/NewGame/images/metall.gif and /dev/null differ
diff --git a/styles/skins/NewGame/img/b.gif b/styles/skins/NewGame/img/b.gif
deleted file mode 100644
index cef0f2a..0000000
Binary files a/styles/skins/NewGame/img/b.gif and /dev/null differ
diff --git a/styles/skins/NewGame/img/background.png b/styles/skins/NewGame/img/background.png
deleted file mode 100644
index 4e859f7..0000000
Binary files a/styles/skins/NewGame/img/background.png and /dev/null differ
diff --git a/styles/skins/NewGame/img/bg1.gif b/styles/skins/NewGame/img/bg1.gif
deleted file mode 100644
index 3e04458..0000000
Binary files a/styles/skins/NewGame/img/bg1.gif and /dev/null differ
diff --git a/styles/skins/NewGame/img/e.gif b/styles/skins/NewGame/img/e.gif
deleted file mode 100644
index d966d7a..0000000
Binary files a/styles/skins/NewGame/img/e.gif and /dev/null differ
diff --git a/styles/skins/NewGame/img/m.gif b/styles/skins/NewGame/img/m.gif
deleted file mode 100644
index 53780d4..0000000
Binary files a/styles/skins/NewGame/img/m.gif and /dev/null differ
diff --git a/styles/skins/NewGame/img/r.gif b/styles/skins/NewGame/img/r.gif
deleted file mode 100644
index af34366..0000000
Binary files a/styles/skins/NewGame/img/r.gif and /dev/null differ
diff --git a/styles/skins/NewGame/img/s.gif b/styles/skins/NewGame/img/s.gif
deleted file mode 100644
index 481bede..0000000
Binary files a/styles/skins/NewGame/img/s.gif and /dev/null differ
diff --git a/styles/skins/NewGame/pic/abort.gif b/styles/skins/NewGame/pic/abort.gif
deleted file mode 100644
index 494d0a0..0000000
Binary files a/styles/skins/NewGame/pic/abort.gif and /dev/null differ
diff --git a/styles/skins/NewGame/pic/appwiz.gif b/styles/skins/NewGame/pic/appwiz.gif
deleted file mode 100644
index 689ff7c..0000000
Binary files a/styles/skins/NewGame/pic/appwiz.gif and /dev/null differ
diff --git a/styles/skins/NewGame/pic/key.gif b/styles/skins/NewGame/pic/key.gif
deleted file mode 100644
index e556ff4..0000000
Binary files a/styles/skins/NewGame/pic/key.gif and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/debris.jpg b/styles/skins/NewGame/planeten/debris.jpg
deleted file mode 100644
index ec90784..0000000
Binary files a/styles/skins/NewGame/planeten/debris.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/dschjungelplanet01.jpg b/styles/skins/NewGame/planeten/dschjungelplanet01.jpg
deleted file mode 100644
index 411a5cd..0000000
Binary files a/styles/skins/NewGame/planeten/dschjungelplanet01.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/dschjungelplanet02.jpg b/styles/skins/NewGame/planeten/dschjungelplanet02.jpg
deleted file mode 100644
index d89eb83..0000000
Binary files a/styles/skins/NewGame/planeten/dschjungelplanet02.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/dschjungelplanet03.jpg b/styles/skins/NewGame/planeten/dschjungelplanet03.jpg
deleted file mode 100644
index 661ebd8..0000000
Binary files a/styles/skins/NewGame/planeten/dschjungelplanet03.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/dschjungelplanet04.jpg b/styles/skins/NewGame/planeten/dschjungelplanet04.jpg
deleted file mode 100644
index 69a41f5..0000000
Binary files a/styles/skins/NewGame/planeten/dschjungelplanet04.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/dschjungelplanet05.jpg b/styles/skins/NewGame/planeten/dschjungelplanet05.jpg
deleted file mode 100644
index 6d773c5..0000000
Binary files a/styles/skins/NewGame/planeten/dschjungelplanet05.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/dschjungelplanet06.jpg b/styles/skins/NewGame/planeten/dschjungelplanet06.jpg
deleted file mode 100644
index 5501161..0000000
Binary files a/styles/skins/NewGame/planeten/dschjungelplanet06.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/dschjungelplanet07.jpg b/styles/skins/NewGame/planeten/dschjungelplanet07.jpg
deleted file mode 100644
index 437d988..0000000
Binary files a/styles/skins/NewGame/planeten/dschjungelplanet07.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/dschjungelplanet08.jpg b/styles/skins/NewGame/planeten/dschjungelplanet08.jpg
deleted file mode 100644
index fb7a2b0..0000000
Binary files a/styles/skins/NewGame/planeten/dschjungelplanet08.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/dschjungelplanet09.jpg b/styles/skins/NewGame/planeten/dschjungelplanet09.jpg
deleted file mode 100644
index 16527f2..0000000
Binary files a/styles/skins/NewGame/planeten/dschjungelplanet09.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/dschjungelplanet10.jpg b/styles/skins/NewGame/planeten/dschjungelplanet10.jpg
deleted file mode 100644
index 3fe0de9..0000000
Binary files a/styles/skins/NewGame/planeten/dschjungelplanet10.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/eisplanet01.jpg b/styles/skins/NewGame/planeten/eisplanet01.jpg
deleted file mode 100644
index 988d088..0000000
Binary files a/styles/skins/NewGame/planeten/eisplanet01.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/eisplanet02.jpg b/styles/skins/NewGame/planeten/eisplanet02.jpg
deleted file mode 100644
index 373bb36..0000000
Binary files a/styles/skins/NewGame/planeten/eisplanet02.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/eisplanet03.jpg b/styles/skins/NewGame/planeten/eisplanet03.jpg
deleted file mode 100644
index 2ba01d1..0000000
Binary files a/styles/skins/NewGame/planeten/eisplanet03.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/eisplanet04.jpg b/styles/skins/NewGame/planeten/eisplanet04.jpg
deleted file mode 100644
index 56ddb10..0000000
Binary files a/styles/skins/NewGame/planeten/eisplanet04.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/eisplanet05.jpg b/styles/skins/NewGame/planeten/eisplanet05.jpg
deleted file mode 100644
index 52e3156..0000000
Binary files a/styles/skins/NewGame/planeten/eisplanet05.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/eisplanet06.jpg b/styles/skins/NewGame/planeten/eisplanet06.jpg
deleted file mode 100644
index 563258c..0000000
Binary files a/styles/skins/NewGame/planeten/eisplanet06.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/eisplanet07.jpg b/styles/skins/NewGame/planeten/eisplanet07.jpg
deleted file mode 100644
index ce39d05..0000000
Binary files a/styles/skins/NewGame/planeten/eisplanet07.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/eisplanet08.jpg b/styles/skins/NewGame/planeten/eisplanet08.jpg
deleted file mode 100644
index 5bae771..0000000
Binary files a/styles/skins/NewGame/planeten/eisplanet08.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/eisplanet09.jpg b/styles/skins/NewGame/planeten/eisplanet09.jpg
deleted file mode 100644
index df19084..0000000
Binary files a/styles/skins/NewGame/planeten/eisplanet09.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/eisplanet10.jpg b/styles/skins/NewGame/planeten/eisplanet10.jpg
deleted file mode 100644
index 92139e4..0000000
Binary files a/styles/skins/NewGame/planeten/eisplanet10.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/gasplanet01.jpg b/styles/skins/NewGame/planeten/gasplanet01.jpg
deleted file mode 100644
index 9f8ee5f..0000000
Binary files a/styles/skins/NewGame/planeten/gasplanet01.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/gasplanet02.jpg b/styles/skins/NewGame/planeten/gasplanet02.jpg
deleted file mode 100644
index 2d16b16..0000000
Binary files a/styles/skins/NewGame/planeten/gasplanet02.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/gasplanet03.jpg b/styles/skins/NewGame/planeten/gasplanet03.jpg
deleted file mode 100644
index 0f99c64..0000000
Binary files a/styles/skins/NewGame/planeten/gasplanet03.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/gasplanet04.jpg b/styles/skins/NewGame/planeten/gasplanet04.jpg
deleted file mode 100644
index 0f2c713..0000000
Binary files a/styles/skins/NewGame/planeten/gasplanet04.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/gasplanet05.jpg b/styles/skins/NewGame/planeten/gasplanet05.jpg
deleted file mode 100644
index 48d4a04..0000000
Binary files a/styles/skins/NewGame/planeten/gasplanet05.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/gasplanet06.jpg b/styles/skins/NewGame/planeten/gasplanet06.jpg
deleted file mode 100644
index b4d0f4f..0000000
Binary files a/styles/skins/NewGame/planeten/gasplanet06.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/gasplanet07.jpg b/styles/skins/NewGame/planeten/gasplanet07.jpg
deleted file mode 100644
index 792bc5d..0000000
Binary files a/styles/skins/NewGame/planeten/gasplanet07.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/gasplanet08.jpg b/styles/skins/NewGame/planeten/gasplanet08.jpg
deleted file mode 100644
index e5cb403..0000000
Binary files a/styles/skins/NewGame/planeten/gasplanet08.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/mond.jpg b/styles/skins/NewGame/planeten/mond.jpg
deleted file mode 100644
index b570334..0000000
Binary files a/styles/skins/NewGame/planeten/mond.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/normaltempplanet01.jpg b/styles/skins/NewGame/planeten/normaltempplanet01.jpg
deleted file mode 100644
index 32d11f3..0000000
Binary files a/styles/skins/NewGame/planeten/normaltempplanet01.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/normaltempplanet02.jpg b/styles/skins/NewGame/planeten/normaltempplanet02.jpg
deleted file mode 100644
index 4ecdbeb..0000000
Binary files a/styles/skins/NewGame/planeten/normaltempplanet02.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/normaltempplanet03.jpg b/styles/skins/NewGame/planeten/normaltempplanet03.jpg
deleted file mode 100644
index e1333fa..0000000
Binary files a/styles/skins/NewGame/planeten/normaltempplanet03.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/normaltempplanet04.jpg b/styles/skins/NewGame/planeten/normaltempplanet04.jpg
deleted file mode 100644
index 8e464a7..0000000
Binary files a/styles/skins/NewGame/planeten/normaltempplanet04.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/normaltempplanet05.jpg b/styles/skins/NewGame/planeten/normaltempplanet05.jpg
deleted file mode 100644
index bfaf231..0000000
Binary files a/styles/skins/NewGame/planeten/normaltempplanet05.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/normaltempplanet06.jpg b/styles/skins/NewGame/planeten/normaltempplanet06.jpg
deleted file mode 100644
index 605b221..0000000
Binary files a/styles/skins/NewGame/planeten/normaltempplanet06.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/normaltempplanet07.jpg b/styles/skins/NewGame/planeten/normaltempplanet07.jpg
deleted file mode 100644
index ffa4755..0000000
Binary files a/styles/skins/NewGame/planeten/normaltempplanet07.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_dschjungelplanet01.jpg b/styles/skins/NewGame/planeten/small/s_dschjungelplanet01.jpg
deleted file mode 100644
index 9d60e49..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_dschjungelplanet01.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_dschjungelplanet02.jpg b/styles/skins/NewGame/planeten/small/s_dschjungelplanet02.jpg
deleted file mode 100644
index 7f9dc4d..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_dschjungelplanet02.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_dschjungelplanet03.jpg b/styles/skins/NewGame/planeten/small/s_dschjungelplanet03.jpg
deleted file mode 100644
index 9127fc5..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_dschjungelplanet03.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_dschjungelplanet04.jpg b/styles/skins/NewGame/planeten/small/s_dschjungelplanet04.jpg
deleted file mode 100644
index cd83f0f..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_dschjungelplanet04.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_dschjungelplanet05.jpg b/styles/skins/NewGame/planeten/small/s_dschjungelplanet05.jpg
deleted file mode 100644
index 0a762ad..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_dschjungelplanet05.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_dschjungelplanet06.jpg b/styles/skins/NewGame/planeten/small/s_dschjungelplanet06.jpg
deleted file mode 100644
index 41234d4..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_dschjungelplanet06.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_dschjungelplanet07.jpg b/styles/skins/NewGame/planeten/small/s_dschjungelplanet07.jpg
deleted file mode 100644
index dfac980..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_dschjungelplanet07.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_dschjungelplanet08.jpg b/styles/skins/NewGame/planeten/small/s_dschjungelplanet08.jpg
deleted file mode 100644
index 2194ced..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_dschjungelplanet08.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_eisplanet01.jpg b/styles/skins/NewGame/planeten/small/s_eisplanet01.jpg
deleted file mode 100644
index a71d088..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_eisplanet01.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_eisplanet02.jpg b/styles/skins/NewGame/planeten/small/s_eisplanet02.jpg
deleted file mode 100644
index 9263a02..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_eisplanet02.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_eisplanet03.jpg b/styles/skins/NewGame/planeten/small/s_eisplanet03.jpg
deleted file mode 100644
index ccb23b1..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_eisplanet03.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_eisplanet04.jpg b/styles/skins/NewGame/planeten/small/s_eisplanet04.jpg
deleted file mode 100644
index eb15389..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_eisplanet04.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_eisplanet05.jpg b/styles/skins/NewGame/planeten/small/s_eisplanet05.jpg
deleted file mode 100644
index e358361..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_eisplanet05.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_eisplanet06.jpg b/styles/skins/NewGame/planeten/small/s_eisplanet06.jpg
deleted file mode 100644
index adcc646..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_eisplanet06.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_eisplanet07.jpg b/styles/skins/NewGame/planeten/small/s_eisplanet07.jpg
deleted file mode 100644
index 91ca728..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_eisplanet07.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_eisplanet08.jpg b/styles/skins/NewGame/planeten/small/s_eisplanet08.jpg
deleted file mode 100644
index fe87e1d..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_eisplanet08.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_eisplanet09.jpg b/styles/skins/NewGame/planeten/small/s_eisplanet09.jpg
deleted file mode 100644
index 857ea29..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_eisplanet09.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_eisplanet10.jpg b/styles/skins/NewGame/planeten/small/s_eisplanet10.jpg
deleted file mode 100644
index 095e6b4..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_eisplanet10.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_gasplanet01.jpg b/styles/skins/NewGame/planeten/small/s_gasplanet01.jpg
deleted file mode 100644
index 521caaa..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_gasplanet01.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_gasplanet02.jpg b/styles/skins/NewGame/planeten/small/s_gasplanet02.jpg
deleted file mode 100644
index 8c5476b..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_gasplanet02.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_gasplanet03.jpg b/styles/skins/NewGame/planeten/small/s_gasplanet03.jpg
deleted file mode 100644
index eae3e2c..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_gasplanet03.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_gasplanet04.jpg b/styles/skins/NewGame/planeten/small/s_gasplanet04.jpg
deleted file mode 100644
index 938b8db..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_gasplanet04.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_gasplanet05.jpg b/styles/skins/NewGame/planeten/small/s_gasplanet05.jpg
deleted file mode 100644
index 2a6ad81..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_gasplanet05.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_gasplanet06.jpg b/styles/skins/NewGame/planeten/small/s_gasplanet06.jpg
deleted file mode 100644
index f81f25f..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_gasplanet06.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_gasplanet07.jpg b/styles/skins/NewGame/planeten/small/s_gasplanet07.jpg
deleted file mode 100644
index 5cd5213..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_gasplanet07.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_gasplanet08.jpg b/styles/skins/NewGame/planeten/small/s_gasplanet08.jpg
deleted file mode 100644
index 53d56bf..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_gasplanet08.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_mond.jpg b/styles/skins/NewGame/planeten/small/s_mond.jpg
deleted file mode 100644
index b570334..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_mond.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_normaltempplanet01.jpg b/styles/skins/NewGame/planeten/small/s_normaltempplanet01.jpg
deleted file mode 100644
index 39093bf..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_normaltempplanet01.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_normaltempplanet02.jpg b/styles/skins/NewGame/planeten/small/s_normaltempplanet02.jpg
deleted file mode 100644
index 2deab40..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_normaltempplanet02.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_normaltempplanet03.jpg b/styles/skins/NewGame/planeten/small/s_normaltempplanet03.jpg
deleted file mode 100644
index 063736c..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_normaltempplanet03.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_normaltempplanet04.jpg b/styles/skins/NewGame/planeten/small/s_normaltempplanet04.jpg
deleted file mode 100644
index 00faa89..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_normaltempplanet04.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_normaltempplanet05.jpg b/styles/skins/NewGame/planeten/small/s_normaltempplanet05.jpg
deleted file mode 100644
index 035b476..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_normaltempplanet05.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_normaltempplanet06.jpg b/styles/skins/NewGame/planeten/small/s_normaltempplanet06.jpg
deleted file mode 100644
index 97d863d..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_normaltempplanet06.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_normaltempplanet07.jpg b/styles/skins/NewGame/planeten/small/s_normaltempplanet07.jpg
deleted file mode 100644
index ee7ae10..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_normaltempplanet07.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_trockenplanet01.jpg b/styles/skins/NewGame/planeten/small/s_trockenplanet01.jpg
deleted file mode 100644
index b1fbeee..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_trockenplanet01.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_trockenplanet02.jpg b/styles/skins/NewGame/planeten/small/s_trockenplanet02.jpg
deleted file mode 100644
index 5cfa784..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_trockenplanet02.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_trockenplanet03.jpg b/styles/skins/NewGame/planeten/small/s_trockenplanet03.jpg
deleted file mode 100644
index 6a19880..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_trockenplanet03.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_trockenplanet04.jpg b/styles/skins/NewGame/planeten/small/s_trockenplanet04.jpg
deleted file mode 100644
index 1979466..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_trockenplanet04.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_trockenplanet05.jpg b/styles/skins/NewGame/planeten/small/s_trockenplanet05.jpg
deleted file mode 100644
index f333371..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_trockenplanet05.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_trockenplanet06.jpg b/styles/skins/NewGame/planeten/small/s_trockenplanet06.jpg
deleted file mode 100644
index a2e0fe7..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_trockenplanet06.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_trockenplanet07.jpg b/styles/skins/NewGame/planeten/small/s_trockenplanet07.jpg
deleted file mode 100644
index ff342c1..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_trockenplanet07.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_trockenplanet08.jpg b/styles/skins/NewGame/planeten/small/s_trockenplanet08.jpg
deleted file mode 100644
index 4f3b138..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_trockenplanet08.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_trockenplanet09.jpg b/styles/skins/NewGame/planeten/small/s_trockenplanet09.jpg
deleted file mode 100644
index 9dd42c6..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_trockenplanet09.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_trockenplanet10.jpg b/styles/skins/NewGame/planeten/small/s_trockenplanet10.jpg
deleted file mode 100644
index cbb59e8..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_trockenplanet10.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_wasserplanet01.jpg b/styles/skins/NewGame/planeten/small/s_wasserplanet01.jpg
deleted file mode 100644
index 0ecc8f2..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_wasserplanet01.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_wasserplanet02.jpg b/styles/skins/NewGame/planeten/small/s_wasserplanet02.jpg
deleted file mode 100644
index 9a8403f..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_wasserplanet02.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_wasserplanet03.jpg b/styles/skins/NewGame/planeten/small/s_wasserplanet03.jpg
deleted file mode 100644
index 70eb8bb..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_wasserplanet03.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_wasserplanet04.jpg b/styles/skins/NewGame/planeten/small/s_wasserplanet04.jpg
deleted file mode 100644
index 1149774..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_wasserplanet04.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_wasserplanet05.jpg b/styles/skins/NewGame/planeten/small/s_wasserplanet05.jpg
deleted file mode 100644
index 52e94e7..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_wasserplanet05.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_wasserplanet06.jpg b/styles/skins/NewGame/planeten/small/s_wasserplanet06.jpg
deleted file mode 100644
index f254fac..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_wasserplanet06.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_wasserplanet07.jpg b/styles/skins/NewGame/planeten/small/s_wasserplanet07.jpg
deleted file mode 100644
index 5e5e27e..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_wasserplanet07.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_wasserplanet08.jpg b/styles/skins/NewGame/planeten/small/s_wasserplanet08.jpg
deleted file mode 100644
index 7ff6e47..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_wasserplanet08.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/small/s_wasserplanet09.jpg b/styles/skins/NewGame/planeten/small/s_wasserplanet09.jpg
deleted file mode 100644
index c1908dd..0000000
Binary files a/styles/skins/NewGame/planeten/small/s_wasserplanet09.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/trockenplanet01.jpg b/styles/skins/NewGame/planeten/trockenplanet01.jpg
deleted file mode 100644
index 32a1164..0000000
Binary files a/styles/skins/NewGame/planeten/trockenplanet01.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/trockenplanet02.jpg b/styles/skins/NewGame/planeten/trockenplanet02.jpg
deleted file mode 100644
index f40ad4c..0000000
Binary files a/styles/skins/NewGame/planeten/trockenplanet02.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/trockenplanet03.jpg b/styles/skins/NewGame/planeten/trockenplanet03.jpg
deleted file mode 100644
index 71d6ee6..0000000
Binary files a/styles/skins/NewGame/planeten/trockenplanet03.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/trockenplanet04.jpg b/styles/skins/NewGame/planeten/trockenplanet04.jpg
deleted file mode 100644
index 5970612..0000000
Binary files a/styles/skins/NewGame/planeten/trockenplanet04.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/trockenplanet05.jpg b/styles/skins/NewGame/planeten/trockenplanet05.jpg
deleted file mode 100644
index 436db13..0000000
Binary files a/styles/skins/NewGame/planeten/trockenplanet05.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/trockenplanet06.jpg b/styles/skins/NewGame/planeten/trockenplanet06.jpg
deleted file mode 100644
index 84afd76..0000000
Binary files a/styles/skins/NewGame/planeten/trockenplanet06.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/trockenplanet07.jpg b/styles/skins/NewGame/planeten/trockenplanet07.jpg
deleted file mode 100644
index 8df40c9..0000000
Binary files a/styles/skins/NewGame/planeten/trockenplanet07.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/trockenplanet08.jpg b/styles/skins/NewGame/planeten/trockenplanet08.jpg
deleted file mode 100644
index 13e4aef..0000000
Binary files a/styles/skins/NewGame/planeten/trockenplanet08.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/trockenplanet09.jpg b/styles/skins/NewGame/planeten/trockenplanet09.jpg
deleted file mode 100644
index 59ce21d..0000000
Binary files a/styles/skins/NewGame/planeten/trockenplanet09.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/trockenplanet10.jpg b/styles/skins/NewGame/planeten/trockenplanet10.jpg
deleted file mode 100644
index c4b0ca3..0000000
Binary files a/styles/skins/NewGame/planeten/trockenplanet10.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/wasserplanet01.jpg b/styles/skins/NewGame/planeten/wasserplanet01.jpg
deleted file mode 100644
index f2beab9..0000000
Binary files a/styles/skins/NewGame/planeten/wasserplanet01.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/wasserplanet02.jpg b/styles/skins/NewGame/planeten/wasserplanet02.jpg
deleted file mode 100644
index 8b1c0dc..0000000
Binary files a/styles/skins/NewGame/planeten/wasserplanet02.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/wasserplanet03.jpg b/styles/skins/NewGame/planeten/wasserplanet03.jpg
deleted file mode 100644
index c449d5a..0000000
Binary files a/styles/skins/NewGame/planeten/wasserplanet03.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/wasserplanet04.jpg b/styles/skins/NewGame/planeten/wasserplanet04.jpg
deleted file mode 100644
index ea08af1..0000000
Binary files a/styles/skins/NewGame/planeten/wasserplanet04.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/wasserplanet05.jpg b/styles/skins/NewGame/planeten/wasserplanet05.jpg
deleted file mode 100644
index c94bc2a..0000000
Binary files a/styles/skins/NewGame/planeten/wasserplanet05.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/wasserplanet06.jpg b/styles/skins/NewGame/planeten/wasserplanet06.jpg
deleted file mode 100644
index 53f5c9c..0000000
Binary files a/styles/skins/NewGame/planeten/wasserplanet06.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/wasserplanet07.jpg b/styles/skins/NewGame/planeten/wasserplanet07.jpg
deleted file mode 100644
index 53f1e58..0000000
Binary files a/styles/skins/NewGame/planeten/wasserplanet07.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/wasserplanet08.jpg b/styles/skins/NewGame/planeten/wasserplanet08.jpg
deleted file mode 100644
index 35baa1a..0000000
Binary files a/styles/skins/NewGame/planeten/wasserplanet08.jpg and /dev/null differ
diff --git a/styles/skins/NewGame/planeten/wasserplanet09.jpg b/styles/skins/NewGame/planeten/wasserplanet09.jpg
deleted file mode 100644
index 78065c6..0000000
Binary files a/styles/skins/NewGame/planeten/wasserplanet09.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/formate.css b/styles/skins/NewSkins/formate.css
deleted file mode 100644
index c9965fa..0000000
--- a/styles/skins/NewSkins/formate.css
+++ /dev/null
@@ -1,318 +0,0 @@
-., #, td, th, textarea, body, table
-{
-  font-family	: Tahoma,sans-serif;
-  font-size	: 11px;
-}
-
-img
-{
-  border               : 0px;
-}
-
-p table
-{
-  border               : 0px;
-}
-
-p td
-{
-  text-align           : center;
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-}
-
-table table
-{
-  border               : 0px;
-}
-
-table table td
-{
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-}
-
-body
-{
-  color                : #E6EBFB;
-  margin-top           : 1px;
-  margin-left          : 1px;
-  background-color     : #040e1e;
-  background-image     : url(img/background.jpg);
-  background-attachment: fixed;
-  background-repeat    : no-repeat;
-  background-position  : top right;
-  scrollbar-arrow-color: #E6EBFB;
-  scrollbar-base-color: #344566;
-  scrollbar-track-color: #344566;
-  scrollbar-face-color: #344566;
-  scrollbar-highlight-color: #344566;
-  scrollbar-3dlight-color: #465673;
-  scrollbar-darkshadow-color: #344566;
-  scrollbar-shadow-color: #465673;
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-}
-
-body.style{
-	background-image: none;
-}
-
-body.style table {
-	margin:0px;
-}
-
-body form table th table input
-{
-  width: 60px;
-}
-
-th, td.a, td.b, td.c, td.f, input, select,
-td.g, td.h, td.i, td.j, td.k, td.l, td.m,
-td.n, td.o, td.q, td.r, td.v, .style td,
-textarea, p td, table.s th img
-{
-  border               : 1px #415680 solid;
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-}
-
-th, td.a, td.b, td.c, td.f, input, select, td.g,
-td.h, td.i, td.j, td.k, td.m, td.o, td.q, td.r,
-td.v, td.s, .style td, p td
-{
-  background-color     : #344566;
-}
-
-th
-{
-  text-align           : center;
-  padding-left         : 3px;
-  padding-right        : 3px;
-}
-
-td.a
-{
-  height               : 39px;
-  text-align           : center;
-}
-
-td.b
-{
-  padding              : 3px;
-}
-
-td.c
-{
-  font-weight          : bold;
-  color                : #E6EBFB;
-  padding-left         : 3px;
-  background-image     : url(img/bg1.gif);
-}
-
-td.f, input, select, textarea
-{
-  color                : #E6EBFB;
-  background-color     : #344566;
-}
-
-textarea
-{
-  width                : 100%;
-}
-
-td.k input
-{
-  text-align           : left;
-}
-
-td.g
-{
-  font-weight          : bold;
-  text-align           : right;
-  color                : #E6EBFB;
-}
-
-td.h
-{
-  text-align           : center;
-  color                : #E6EBFB;
-}
-
-td.i
-{
-  text-align           : center;
-  color                : #E6EBFB;
-}
-
-td.j
-{
-  text-align           : center;
-  color                : #E6EBFB;
-}
-
-td.k, td.k input
-{
-  text-align           : center;
-  color                : #E6EBFB;
-}
-
-td.l
-{
-  background-color     : #344566;
-  color                : #E6EBFB;
-  vertical-align       : top;
-  padding              : 3px;
-  background-image     : url(img/bg2.gif);
-}
-
-td.m
-{
-  font-weight          : bold;
-  text-align           : right;
-  width                : 86px;
-  color                : #E6EBFB;
-}
-
-td.n
-{
-  font-weight          : bold;
-  text-align           : right;
-  width                : 89px;
-  text-align           : center;
-  color                : #E6EBFB;
-}
-
-td.o
-{
-  text-align           : center;
-  color                : #E6EBFB;
-}
-
-td.q
-{
-  font-weight          : bold;
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-  text-align           : center;
-  vertical-align       : middle;
-  color                : #E6EBFB;
-}
-
-td.r
-{
-  text-align           : right;
-  color                : #E6EBFB;
-}
-
-td.v
-{
-  font-weight          : bold;
-  text-align           : right;
-  color                : #f7f7f7;
-}
-
-td.s
-{
-  color                : #E6EBFB;
-}
-
-table.s th
-{
-  border               : 0px;
-}
-
-table.s th img
-{
-  width                : 89px;
-  height               : 89px;
-}
-
-div.z
-{
-  font-weight          : bold;
-  color                : #E6EBFB;
-}
-
-a
-{
-  color                : #E6EBFB;
-  text-decoration      : none;
-  font-weight          : bold;
-}
-
-a.s
-{
-  color                : #E6EBFB;
-}
-
-a.t
-{
-  color                : #E6EBFB;
-}
-
-a:hover
-{
-  color                : #CDD7F8;
-  text-decoration      : underline;
-}
-
-.style td
-{
-  color                : #E6EBFB;
-  border-top           : 0px;
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-}
-
-.style div a
-{
-  height               : 100%;
-  width                : 100%;
-  color                : #f2f2f2;
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-}
-
-.style div a:link
-{
-  height               : 100%;
-  width                : 100%;
-  color                : #f2f2f2;
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-}
-
-.style div a:visited
-{
-  height               : 100%;
-  width                : 100%;
-  color                : #f2f2f2;
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-}
-
-.style div a:hover
-{
-  background-color     : #415680;
-  height               : 100%;
-  width                : 100%;
-  text-decoration      : none;
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-  color                : #E6EBFB;
-}
-
-.style
-{
-  margin-top           : 15px;
-}
-
-h1
-{
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-  border-bottom        : 0px #344566 solid;
-  width                : 98%;
-  text-align           : center;
-}
\ No newline at end of file
diff --git a/styles/skins/NewSkins/gebaeude/1.gif b/styles/skins/NewSkins/gebaeude/1.gif
deleted file mode 100644
index 0324f63..0000000
Binary files a/styles/skins/NewSkins/gebaeude/1.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/106.gif b/styles/skins/NewSkins/gebaeude/106.gif
deleted file mode 100644
index 99eab6e..0000000
Binary files a/styles/skins/NewSkins/gebaeude/106.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/108.gif b/styles/skins/NewSkins/gebaeude/108.gif
deleted file mode 100644
index 61ebe46..0000000
Binary files a/styles/skins/NewSkins/gebaeude/108.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/109.gif b/styles/skins/NewSkins/gebaeude/109.gif
deleted file mode 100644
index a97f99b..0000000
Binary files a/styles/skins/NewSkins/gebaeude/109.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/110.gif b/styles/skins/NewSkins/gebaeude/110.gif
deleted file mode 100644
index 3105e2d..0000000
Binary files a/styles/skins/NewSkins/gebaeude/110.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/111.gif b/styles/skins/NewSkins/gebaeude/111.gif
deleted file mode 100644
index 386ef76..0000000
Binary files a/styles/skins/NewSkins/gebaeude/111.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/113.gif b/styles/skins/NewSkins/gebaeude/113.gif
deleted file mode 100644
index 7abfd90..0000000
Binary files a/styles/skins/NewSkins/gebaeude/113.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/114.gif b/styles/skins/NewSkins/gebaeude/114.gif
deleted file mode 100644
index 43c54e2..0000000
Binary files a/styles/skins/NewSkins/gebaeude/114.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/115.gif b/styles/skins/NewSkins/gebaeude/115.gif
deleted file mode 100644
index 48f48c6..0000000
Binary files a/styles/skins/NewSkins/gebaeude/115.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/117.gif b/styles/skins/NewSkins/gebaeude/117.gif
deleted file mode 100644
index 4c67b7e..0000000
Binary files a/styles/skins/NewSkins/gebaeude/117.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/118.gif b/styles/skins/NewSkins/gebaeude/118.gif
deleted file mode 100644
index 93436c8..0000000
Binary files a/styles/skins/NewSkins/gebaeude/118.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/12.gif b/styles/skins/NewSkins/gebaeude/12.gif
deleted file mode 100644
index b9f9fbb..0000000
Binary files a/styles/skins/NewSkins/gebaeude/12.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/120.gif b/styles/skins/NewSkins/gebaeude/120.gif
deleted file mode 100644
index bb903ba..0000000
Binary files a/styles/skins/NewSkins/gebaeude/120.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/121.gif b/styles/skins/NewSkins/gebaeude/121.gif
deleted file mode 100644
index 5a52746..0000000
Binary files a/styles/skins/NewSkins/gebaeude/121.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/122.gif b/styles/skins/NewSkins/gebaeude/122.gif
deleted file mode 100644
index a1973b4..0000000
Binary files a/styles/skins/NewSkins/gebaeude/122.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/123.gif b/styles/skins/NewSkins/gebaeude/123.gif
deleted file mode 100644
index 71b5f8c..0000000
Binary files a/styles/skins/NewSkins/gebaeude/123.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/124.gif b/styles/skins/NewSkins/gebaeude/124.gif
deleted file mode 100644
index 446148b..0000000
Binary files a/styles/skins/NewSkins/gebaeude/124.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/125.gif b/styles/skins/NewSkins/gebaeude/125.gif
deleted file mode 100644
index 9229115..0000000
Binary files a/styles/skins/NewSkins/gebaeude/125.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/14.gif b/styles/skins/NewSkins/gebaeude/14.gif
deleted file mode 100644
index 219a13d..0000000
Binary files a/styles/skins/NewSkins/gebaeude/14.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/15.gif b/styles/skins/NewSkins/gebaeude/15.gif
deleted file mode 100644
index b23074c..0000000
Binary files a/styles/skins/NewSkins/gebaeude/15.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/150.gif b/styles/skins/NewSkins/gebaeude/150.gif
deleted file mode 100644
index ec3cfeb..0000000
Binary files a/styles/skins/NewSkins/gebaeude/150.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/199.gif b/styles/skins/NewSkins/gebaeude/199.gif
deleted file mode 100644
index d30feb5..0000000
Binary files a/styles/skins/NewSkins/gebaeude/199.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/2.gif b/styles/skins/NewSkins/gebaeude/2.gif
deleted file mode 100644
index fb4f308..0000000
Binary files a/styles/skins/NewSkins/gebaeude/2.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/202.gif b/styles/skins/NewSkins/gebaeude/202.gif
deleted file mode 100644
index 8989c45..0000000
Binary files a/styles/skins/NewSkins/gebaeude/202.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/203.gif b/styles/skins/NewSkins/gebaeude/203.gif
deleted file mode 100644
index 46286f1..0000000
Binary files a/styles/skins/NewSkins/gebaeude/203.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/204.gif b/styles/skins/NewSkins/gebaeude/204.gif
deleted file mode 100644
index 31a1a1b..0000000
Binary files a/styles/skins/NewSkins/gebaeude/204.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/205.gif b/styles/skins/NewSkins/gebaeude/205.gif
deleted file mode 100644
index 19aaabf..0000000
Binary files a/styles/skins/NewSkins/gebaeude/205.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/206.gif b/styles/skins/NewSkins/gebaeude/206.gif
deleted file mode 100644
index 7cfe48b..0000000
Binary files a/styles/skins/NewSkins/gebaeude/206.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/207.gif b/styles/skins/NewSkins/gebaeude/207.gif
deleted file mode 100644
index 7a17a38..0000000
Binary files a/styles/skins/NewSkins/gebaeude/207.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/208.gif b/styles/skins/NewSkins/gebaeude/208.gif
deleted file mode 100644
index 8ad5a43..0000000
Binary files a/styles/skins/NewSkins/gebaeude/208.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/209.gif b/styles/skins/NewSkins/gebaeude/209.gif
deleted file mode 100644
index 31e7b67..0000000
Binary files a/styles/skins/NewSkins/gebaeude/209.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/21.gif b/styles/skins/NewSkins/gebaeude/21.gif
deleted file mode 100644
index 8edaf79..0000000
Binary files a/styles/skins/NewSkins/gebaeude/21.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/210.gif b/styles/skins/NewSkins/gebaeude/210.gif
deleted file mode 100644
index 9bbaa28..0000000
Binary files a/styles/skins/NewSkins/gebaeude/210.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/211.gif b/styles/skins/NewSkins/gebaeude/211.gif
deleted file mode 100644
index e453396..0000000
Binary files a/styles/skins/NewSkins/gebaeude/211.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/212.gif b/styles/skins/NewSkins/gebaeude/212.gif
deleted file mode 100644
index eeb160d..0000000
Binary files a/styles/skins/NewSkins/gebaeude/212.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/213.gif b/styles/skins/NewSkins/gebaeude/213.gif
deleted file mode 100644
index 4c6353d..0000000
Binary files a/styles/skins/NewSkins/gebaeude/213.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/214.gif b/styles/skins/NewSkins/gebaeude/214.gif
deleted file mode 100644
index abc4206..0000000
Binary files a/styles/skins/NewSkins/gebaeude/214.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/215.gif b/styles/skins/NewSkins/gebaeude/215.gif
deleted file mode 100644
index 4a334a1..0000000
Binary files a/styles/skins/NewSkins/gebaeude/215.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/216.gif b/styles/skins/NewSkins/gebaeude/216.gif
deleted file mode 100644
index d2d279f..0000000
Binary files a/styles/skins/NewSkins/gebaeude/216.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/22.gif b/styles/skins/NewSkins/gebaeude/22.gif
deleted file mode 100644
index a05b6d4..0000000
Binary files a/styles/skins/NewSkins/gebaeude/22.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/23.gif b/styles/skins/NewSkins/gebaeude/23.gif
deleted file mode 100644
index ecc046d..0000000
Binary files a/styles/skins/NewSkins/gebaeude/23.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/24.gif b/styles/skins/NewSkins/gebaeude/24.gif
deleted file mode 100644
index a159d21..0000000
Binary files a/styles/skins/NewSkins/gebaeude/24.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/3.gif b/styles/skins/NewSkins/gebaeude/3.gif
deleted file mode 100644
index b2dffb1..0000000
Binary files a/styles/skins/NewSkins/gebaeude/3.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/31.gif b/styles/skins/NewSkins/gebaeude/31.gif
deleted file mode 100644
index 85861d1..0000000
Binary files a/styles/skins/NewSkins/gebaeude/31.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/33.gif b/styles/skins/NewSkins/gebaeude/33.gif
deleted file mode 100644
index 21511db..0000000
Binary files a/styles/skins/NewSkins/gebaeude/33.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/34.gif b/styles/skins/NewSkins/gebaeude/34.gif
deleted file mode 100644
index d26a549..0000000
Binary files a/styles/skins/NewSkins/gebaeude/34.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/4.gif b/styles/skins/NewSkins/gebaeude/4.gif
deleted file mode 100644
index b35389e..0000000
Binary files a/styles/skins/NewSkins/gebaeude/4.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/401.gif b/styles/skins/NewSkins/gebaeude/401.gif
deleted file mode 100644
index 6533040..0000000
Binary files a/styles/skins/NewSkins/gebaeude/401.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/402.gif b/styles/skins/NewSkins/gebaeude/402.gif
deleted file mode 100644
index 5ba30c3..0000000
Binary files a/styles/skins/NewSkins/gebaeude/402.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/403.gif b/styles/skins/NewSkins/gebaeude/403.gif
deleted file mode 100644
index d7b96f5..0000000
Binary files a/styles/skins/NewSkins/gebaeude/403.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/404.gif b/styles/skins/NewSkins/gebaeude/404.gif
deleted file mode 100644
index f54a8dd..0000000
Binary files a/styles/skins/NewSkins/gebaeude/404.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/405.gif b/styles/skins/NewSkins/gebaeude/405.gif
deleted file mode 100644
index 9ef915c..0000000
Binary files a/styles/skins/NewSkins/gebaeude/405.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/406.gif b/styles/skins/NewSkins/gebaeude/406.gif
deleted file mode 100644
index d16fcd5..0000000
Binary files a/styles/skins/NewSkins/gebaeude/406.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/407.gif b/styles/skins/NewSkins/gebaeude/407.gif
deleted file mode 100644
index 258de7f..0000000
Binary files a/styles/skins/NewSkins/gebaeude/407.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/408.gif b/styles/skins/NewSkins/gebaeude/408.gif
deleted file mode 100644
index f4f2feb..0000000
Binary files a/styles/skins/NewSkins/gebaeude/408.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/409.gif b/styles/skins/NewSkins/gebaeude/409.gif
deleted file mode 100644
index 390bcc4..0000000
Binary files a/styles/skins/NewSkins/gebaeude/409.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/41.gif b/styles/skins/NewSkins/gebaeude/41.gif
deleted file mode 100644
index 3aa60da..0000000
Binary files a/styles/skins/NewSkins/gebaeude/41.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/410.gif b/styles/skins/NewSkins/gebaeude/410.gif
deleted file mode 100644
index f9c8024..0000000
Binary files a/styles/skins/NewSkins/gebaeude/410.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/42.gif b/styles/skins/NewSkins/gebaeude/42.gif
deleted file mode 100644
index 19e2752..0000000
Binary files a/styles/skins/NewSkins/gebaeude/42.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/43.gif b/styles/skins/NewSkins/gebaeude/43.gif
deleted file mode 100644
index 7eb438f..0000000
Binary files a/styles/skins/NewSkins/gebaeude/43.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/44.gif b/styles/skins/NewSkins/gebaeude/44.gif
deleted file mode 100644
index 9ba1870..0000000
Binary files a/styles/skins/NewSkins/gebaeude/44.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/502.gif b/styles/skins/NewSkins/gebaeude/502.gif
deleted file mode 100644
index 7a6bf5b..0000000
Binary files a/styles/skins/NewSkins/gebaeude/502.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/503.gif b/styles/skins/NewSkins/gebaeude/503.gif
deleted file mode 100644
index ab174b6..0000000
Binary files a/styles/skins/NewSkins/gebaeude/503.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/601.jpg b/styles/skins/NewSkins/gebaeude/601.jpg
deleted file mode 100644
index 404fbeb..0000000
Binary files a/styles/skins/NewSkins/gebaeude/601.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/602.jpg b/styles/skins/NewSkins/gebaeude/602.jpg
deleted file mode 100644
index 7ebf8f3..0000000
Binary files a/styles/skins/NewSkins/gebaeude/602.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/gebaeude/Thumbs.db b/styles/skins/NewSkins/gebaeude/Thumbs.db
deleted file mode 100644
index dbd3528..0000000
Binary files a/styles/skins/NewSkins/gebaeude/Thumbs.db and /dev/null differ
diff --git a/styles/skins/NewSkins/gfx/Thumbs.db b/styles/skins/NewSkins/gfx/Thumbs.db
deleted file mode 100644
index 4cfd56a..0000000
Binary files a/styles/skins/NewSkins/gfx/Thumbs.db and /dev/null differ
diff --git a/styles/skins/NewSkins/gfx/info-help.jpg b/styles/skins/NewSkins/gfx/info-help.jpg
deleted file mode 100644
index d5ed27c..0000000
Binary files a/styles/skins/NewSkins/gfx/info-help.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/gfx/ogame-produktion.jpg b/styles/skins/NewSkins/gfx/ogame-produktion.jpg
deleted file mode 100644
index 7fc9f0a..0000000
Binary files a/styles/skins/NewSkins/gfx/ogame-produktion.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/gfx/user-menu.jpg b/styles/skins/NewSkins/gfx/user-menu.jpg
deleted file mode 100644
index 93f00fc..0000000
Binary files a/styles/skins/NewSkins/gfx/user-menu.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/images/Thumbs.db b/styles/skins/NewSkins/images/Thumbs.db
deleted file mode 100644
index 6a8ea69..0000000
Binary files a/styles/skins/NewSkins/images/Thumbs.db and /dev/null differ
diff --git a/styles/skins/NewSkins/images/darkmatter.jpg b/styles/skins/NewSkins/images/darkmatter.jpg
deleted file mode 100644
index d29573f..0000000
Binary files a/styles/skins/NewSkins/images/darkmatter.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/images/deuterium.gif b/styles/skins/NewSkins/images/deuterium.gif
deleted file mode 100644
index 434ebb5..0000000
Binary files a/styles/skins/NewSkins/images/deuterium.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/images/energie.gif b/styles/skins/NewSkins/images/energie.gif
deleted file mode 100644
index 820a75c..0000000
Binary files a/styles/skins/NewSkins/images/energie.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/images/kristall.gif b/styles/skins/NewSkins/images/kristall.gif
deleted file mode 100644
index 4d31a98..0000000
Binary files a/styles/skins/NewSkins/images/kristall.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/images/message.gif b/styles/skins/NewSkins/images/message.gif
deleted file mode 100644
index 6aaa698..0000000
Binary files a/styles/skins/NewSkins/images/message.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/images/metall.gif b/styles/skins/NewSkins/images/metall.gif
deleted file mode 100644
index 8368377..0000000
Binary files a/styles/skins/NewSkins/images/metall.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/img/Thumbs.db b/styles/skins/NewSkins/img/Thumbs.db
deleted file mode 100644
index af14336..0000000
Binary files a/styles/skins/NewSkins/img/Thumbs.db and /dev/null differ
diff --git a/styles/skins/NewSkins/img/animspace.gif b/styles/skins/NewSkins/img/animspace.gif
deleted file mode 100644
index 8c2f84f..0000000
Binary files a/styles/skins/NewSkins/img/animspace.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/img/b.gif b/styles/skins/NewSkins/img/b.gif
deleted file mode 100644
index ee94781..0000000
Binary files a/styles/skins/NewSkins/img/b.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/img/background.jpg b/styles/skins/NewSkins/img/background.jpg
deleted file mode 100644
index 16ba3ac..0000000
Binary files a/styles/skins/NewSkins/img/background.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/img/blank.gif b/styles/skins/NewSkins/img/blank.gif
deleted file mode 100644
index 2f005be..0000000
Binary files a/styles/skins/NewSkins/img/blank.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/img/e.gif b/styles/skins/NewSkins/img/e.gif
deleted file mode 100644
index d966d7a..0000000
Binary files a/styles/skins/NewSkins/img/e.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/img/m.gif b/styles/skins/NewSkins/img/m.gif
deleted file mode 100644
index 8c3dc1f..0000000
Binary files a/styles/skins/NewSkins/img/m.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/img/r.gif b/styles/skins/NewSkins/img/r.gif
deleted file mode 100644
index af34366..0000000
Binary files a/styles/skins/NewSkins/img/r.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/img/s.gif b/styles/skins/NewSkins/img/s.gif
deleted file mode 100644
index 481bede..0000000
Binary files a/styles/skins/NewSkins/img/s.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/abort.gif b/styles/skins/NewSkins/pic/abort.gif
deleted file mode 100644
index 494d0a0..0000000
Binary files a/styles/skins/NewSkins/pic/abort.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/achtung.gif b/styles/skins/NewSkins/pic/achtung.gif
deleted file mode 100644
index 13e83c9..0000000
Binary files a/styles/skins/NewSkins/pic/achtung.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/achtung2.gif b/styles/skins/NewSkins/pic/achtung2.gif
deleted file mode 100644
index cc98f9d..0000000
Binary files a/styles/skins/NewSkins/pic/achtung2.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/appwiz.gif b/styles/skins/NewSkins/pic/appwiz.gif
deleted file mode 100644
index 689ff7c..0000000
Binary files a/styles/skins/NewSkins/pic/appwiz.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/blitz.gif b/styles/skins/NewSkins/pic/blitz.gif
deleted file mode 100644
index b45a3d4..0000000
Binary files a/styles/skins/NewSkins/pic/blitz.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/disc1.gif b/styles/skins/NewSkins/pic/disc1.gif
deleted file mode 100644
index 0dbcd65..0000000
Binary files a/styles/skins/NewSkins/pic/disc1.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/disc2.gif b/styles/skins/NewSkins/pic/disc2.gif
deleted file mode 100644
index 1d285b6..0000000
Binary files a/styles/skins/NewSkins/pic/disc2.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/disc3.gif b/styles/skins/NewSkins/pic/disc3.gif
deleted file mode 100644
index e7d3502..0000000
Binary files a/styles/skins/NewSkins/pic/disc3.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/email.gif b/styles/skins/NewSkins/pic/email.gif
deleted file mode 100644
index 39ec51e..0000000
Binary files a/styles/skins/NewSkins/pic/email.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/face1.gif b/styles/skins/NewSkins/pic/face1.gif
deleted file mode 100644
index 6477598..0000000
Binary files a/styles/skins/NewSkins/pic/face1.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/face2.gif b/styles/skins/NewSkins/pic/face2.gif
deleted file mode 100644
index a0457b7..0000000
Binary files a/styles/skins/NewSkins/pic/face2.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/face3.gif b/styles/skins/NewSkins/pic/face3.gif
deleted file mode 100644
index fde1914..0000000
Binary files a/styles/skins/NewSkins/pic/face3.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/folder0.gif b/styles/skins/NewSkins/pic/folder0.gif
deleted file mode 100644
index 96489d0..0000000
Binary files a/styles/skins/NewSkins/pic/folder0.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/folder1.gif b/styles/skins/NewSkins/pic/folder1.gif
deleted file mode 100644
index 7e69434..0000000
Binary files a/styles/skins/NewSkins/pic/folder1.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/frage.gif b/styles/skins/NewSkins/pic/frage.gif
deleted file mode 100644
index 497722f..0000000
Binary files a/styles/skins/NewSkins/pic/frage.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/frage2.gif b/styles/skins/NewSkins/pic/frage2.gif
deleted file mode 100644
index 76ef274..0000000
Binary files a/styles/skins/NewSkins/pic/frage2.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/haken.gif b/styles/skins/NewSkins/pic/haken.gif
deleted file mode 100644
index 3ca73c9..0000000
Binary files a/styles/skins/NewSkins/pic/haken.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/haken2.gif b/styles/skins/NewSkins/pic/haken2.gif
deleted file mode 100644
index 07c2179..0000000
Binary files a/styles/skins/NewSkins/pic/haken2.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/info.gif b/styles/skins/NewSkins/pic/info.gif
deleted file mode 100644
index 19e0c09..0000000
Binary files a/styles/skins/NewSkins/pic/info.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/key.gif b/styles/skins/NewSkins/pic/key.gif
deleted file mode 100644
index e556ff4..0000000
Binary files a/styles/skins/NewSkins/pic/key.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/mouse.gif b/styles/skins/NewSkins/pic/mouse.gif
deleted file mode 100644
index 2ec34f7..0000000
Binary files a/styles/skins/NewSkins/pic/mouse.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/notiz.gif b/styles/skins/NewSkins/pic/notiz.gif
deleted file mode 100644
index 9187bd3..0000000
Binary files a/styles/skins/NewSkins/pic/notiz.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/rain.gif b/styles/skins/NewSkins/pic/rain.gif
deleted file mode 100644
index c1d3572..0000000
Binary files a/styles/skins/NewSkins/pic/rain.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/search.gif b/styles/skins/NewSkins/pic/search.gif
deleted file mode 100644
index 059a282..0000000
Binary files a/styles/skins/NewSkins/pic/search.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/snow.gif b/styles/skins/NewSkins/pic/snow.gif
deleted file mode 100644
index c050dd0..0000000
Binary files a/styles/skins/NewSkins/pic/snow.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/stop.gif b/styles/skins/NewSkins/pic/stop.gif
deleted file mode 100644
index 86959a6..0000000
Binary files a/styles/skins/NewSkins/pic/stop.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/sun.gif b/styles/skins/NewSkins/pic/sun.gif
deleted file mode 100644
index 8d1722f..0000000
Binary files a/styles/skins/NewSkins/pic/sun.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/userdel.gif b/styles/skins/NewSkins/pic/userdel.gif
deleted file mode 100644
index 8021a2e..0000000
Binary files a/styles/skins/NewSkins/pic/userdel.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/usermail.gif b/styles/skins/NewSkins/pic/usermail.gif
deleted file mode 100644
index c604382..0000000
Binary files a/styles/skins/NewSkins/pic/usermail.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/pic/zuenden.gif b/styles/skins/NewSkins/pic/zuenden.gif
deleted file mode 100644
index c41b548..0000000
Binary files a/styles/skins/NewSkins/pic/zuenden.gif and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/dschjungelplanet01.jpg b/styles/skins/NewSkins/planeten/dschjungelplanet01.jpg
deleted file mode 100644
index cae7bee..0000000
Binary files a/styles/skins/NewSkins/planeten/dschjungelplanet01.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/dschjungelplanet02.jpg b/styles/skins/NewSkins/planeten/dschjungelplanet02.jpg
deleted file mode 100644
index 0c0e9a5..0000000
Binary files a/styles/skins/NewSkins/planeten/dschjungelplanet02.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/dschjungelplanet03.jpg b/styles/skins/NewSkins/planeten/dschjungelplanet03.jpg
deleted file mode 100644
index 57857a7..0000000
Binary files a/styles/skins/NewSkins/planeten/dschjungelplanet03.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/dschjungelplanet04.jpg b/styles/skins/NewSkins/planeten/dschjungelplanet04.jpg
deleted file mode 100644
index 7c79d7a..0000000
Binary files a/styles/skins/NewSkins/planeten/dschjungelplanet04.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/dschjungelplanet05.jpg b/styles/skins/NewSkins/planeten/dschjungelplanet05.jpg
deleted file mode 100644
index abdc0a4..0000000
Binary files a/styles/skins/NewSkins/planeten/dschjungelplanet05.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/dschjungelplanet06.jpg b/styles/skins/NewSkins/planeten/dschjungelplanet06.jpg
deleted file mode 100644
index 275dd56..0000000
Binary files a/styles/skins/NewSkins/planeten/dschjungelplanet06.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/dschjungelplanet07.jpg b/styles/skins/NewSkins/planeten/dschjungelplanet07.jpg
deleted file mode 100644
index faa3bf0..0000000
Binary files a/styles/skins/NewSkins/planeten/dschjungelplanet07.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/dschjungelplanet08.jpg b/styles/skins/NewSkins/planeten/dschjungelplanet08.jpg
deleted file mode 100644
index ddf0897..0000000
Binary files a/styles/skins/NewSkins/planeten/dschjungelplanet08.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/dschjungelplanet09.jpg b/styles/skins/NewSkins/planeten/dschjungelplanet09.jpg
deleted file mode 100644
index 8ce481c..0000000
Binary files a/styles/skins/NewSkins/planeten/dschjungelplanet09.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/dschjungelplanet10.jpg b/styles/skins/NewSkins/planeten/dschjungelplanet10.jpg
deleted file mode 100644
index 5c11e1b..0000000
Binary files a/styles/skins/NewSkins/planeten/dschjungelplanet10.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/eisplanet01.jpg b/styles/skins/NewSkins/planeten/eisplanet01.jpg
deleted file mode 100644
index 448ccd4..0000000
Binary files a/styles/skins/NewSkins/planeten/eisplanet01.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/eisplanet02.jpg b/styles/skins/NewSkins/planeten/eisplanet02.jpg
deleted file mode 100644
index bcd663f..0000000
Binary files a/styles/skins/NewSkins/planeten/eisplanet02.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/eisplanet03.jpg b/styles/skins/NewSkins/planeten/eisplanet03.jpg
deleted file mode 100644
index 5aa60e8..0000000
Binary files a/styles/skins/NewSkins/planeten/eisplanet03.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/eisplanet04.jpg b/styles/skins/NewSkins/planeten/eisplanet04.jpg
deleted file mode 100644
index 4628117..0000000
Binary files a/styles/skins/NewSkins/planeten/eisplanet04.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/eisplanet05.jpg b/styles/skins/NewSkins/planeten/eisplanet05.jpg
deleted file mode 100644
index cea3c85..0000000
Binary files a/styles/skins/NewSkins/planeten/eisplanet05.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/eisplanet06.jpg b/styles/skins/NewSkins/planeten/eisplanet06.jpg
deleted file mode 100644
index 7a460c9..0000000
Binary files a/styles/skins/NewSkins/planeten/eisplanet06.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/eisplanet07.jpg b/styles/skins/NewSkins/planeten/eisplanet07.jpg
deleted file mode 100644
index f9e8f07..0000000
Binary files a/styles/skins/NewSkins/planeten/eisplanet07.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/eisplanet08.jpg b/styles/skins/NewSkins/planeten/eisplanet08.jpg
deleted file mode 100644
index 26a47f2..0000000
Binary files a/styles/skins/NewSkins/planeten/eisplanet08.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/eisplanet09.jpg b/styles/skins/NewSkins/planeten/eisplanet09.jpg
deleted file mode 100644
index 0613a3c..0000000
Binary files a/styles/skins/NewSkins/planeten/eisplanet09.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/eisplanet10.jpg b/styles/skins/NewSkins/planeten/eisplanet10.jpg
deleted file mode 100644
index 4b8dfe7..0000000
Binary files a/styles/skins/NewSkins/planeten/eisplanet10.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/gasplanet01.jpg b/styles/skins/NewSkins/planeten/gasplanet01.jpg
deleted file mode 100644
index 3da8cf9..0000000
Binary files a/styles/skins/NewSkins/planeten/gasplanet01.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/gasplanet02.jpg b/styles/skins/NewSkins/planeten/gasplanet02.jpg
deleted file mode 100644
index 6c78356..0000000
Binary files a/styles/skins/NewSkins/planeten/gasplanet02.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/gasplanet03.jpg b/styles/skins/NewSkins/planeten/gasplanet03.jpg
deleted file mode 100644
index 85108ad..0000000
Binary files a/styles/skins/NewSkins/planeten/gasplanet03.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/gasplanet04.jpg b/styles/skins/NewSkins/planeten/gasplanet04.jpg
deleted file mode 100644
index 14bbe47..0000000
Binary files a/styles/skins/NewSkins/planeten/gasplanet04.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/gasplanet05.jpg b/styles/skins/NewSkins/planeten/gasplanet05.jpg
deleted file mode 100644
index c5eadb0..0000000
Binary files a/styles/skins/NewSkins/planeten/gasplanet05.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/gasplanet06.jpg b/styles/skins/NewSkins/planeten/gasplanet06.jpg
deleted file mode 100644
index 1662b73..0000000
Binary files a/styles/skins/NewSkins/planeten/gasplanet06.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/gasplanet07.jpg b/styles/skins/NewSkins/planeten/gasplanet07.jpg
deleted file mode 100644
index 71dcdd1..0000000
Binary files a/styles/skins/NewSkins/planeten/gasplanet07.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/gasplanet08.jpg b/styles/skins/NewSkins/planeten/gasplanet08.jpg
deleted file mode 100644
index 9616f37..0000000
Binary files a/styles/skins/NewSkins/planeten/gasplanet08.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/mond.jpg b/styles/skins/NewSkins/planeten/mond.jpg
deleted file mode 100644
index a2adc40..0000000
Binary files a/styles/skins/NewSkins/planeten/mond.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/normaltempplanet01.jpg b/styles/skins/NewSkins/planeten/normaltempplanet01.jpg
deleted file mode 100644
index fe5be35..0000000
Binary files a/styles/skins/NewSkins/planeten/normaltempplanet01.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/normaltempplanet02.jpg b/styles/skins/NewSkins/planeten/normaltempplanet02.jpg
deleted file mode 100644
index f44ef21..0000000
Binary files a/styles/skins/NewSkins/planeten/normaltempplanet02.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/normaltempplanet03.jpg b/styles/skins/NewSkins/planeten/normaltempplanet03.jpg
deleted file mode 100644
index 962ef12..0000000
Binary files a/styles/skins/NewSkins/planeten/normaltempplanet03.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/normaltempplanet04.jpg b/styles/skins/NewSkins/planeten/normaltempplanet04.jpg
deleted file mode 100644
index 422ad35..0000000
Binary files a/styles/skins/NewSkins/planeten/normaltempplanet04.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/normaltempplanet05.jpg b/styles/skins/NewSkins/planeten/normaltempplanet05.jpg
deleted file mode 100644
index 577d5b7..0000000
Binary files a/styles/skins/NewSkins/planeten/normaltempplanet05.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/normaltempplanet06.jpg b/styles/skins/NewSkins/planeten/normaltempplanet06.jpg
deleted file mode 100644
index 553cd31..0000000
Binary files a/styles/skins/NewSkins/planeten/normaltempplanet06.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/normaltempplanet07.jpg b/styles/skins/NewSkins/planeten/normaltempplanet07.jpg
deleted file mode 100644
index f4ade43..0000000
Binary files a/styles/skins/NewSkins/planeten/normaltempplanet07.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_dschjungelplanet01.jpg b/styles/skins/NewSkins/planeten/small/s_dschjungelplanet01.jpg
deleted file mode 100644
index f7d9765..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_dschjungelplanet01.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_dschjungelplanet02.jpg b/styles/skins/NewSkins/planeten/small/s_dschjungelplanet02.jpg
deleted file mode 100644
index 0bba1d7..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_dschjungelplanet02.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_dschjungelplanet03.jpg b/styles/skins/NewSkins/planeten/small/s_dschjungelplanet03.jpg
deleted file mode 100644
index 61d3d85..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_dschjungelplanet03.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_dschjungelplanet04.jpg b/styles/skins/NewSkins/planeten/small/s_dschjungelplanet04.jpg
deleted file mode 100644
index cc6bbb6..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_dschjungelplanet04.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_dschjungelplanet05.jpg b/styles/skins/NewSkins/planeten/small/s_dschjungelplanet05.jpg
deleted file mode 100644
index 03ad816..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_dschjungelplanet05.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_dschjungelplanet06.jpg b/styles/skins/NewSkins/planeten/small/s_dschjungelplanet06.jpg
deleted file mode 100644
index b24821f..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_dschjungelplanet06.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_dschjungelplanet07.jpg b/styles/skins/NewSkins/planeten/small/s_dschjungelplanet07.jpg
deleted file mode 100644
index 5e8eeae..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_dschjungelplanet07.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_dschjungelplanet08.jpg b/styles/skins/NewSkins/planeten/small/s_dschjungelplanet08.jpg
deleted file mode 100644
index 1f251a5..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_dschjungelplanet08.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_dschjungelplanet09.jpg b/styles/skins/NewSkins/planeten/small/s_dschjungelplanet09.jpg
deleted file mode 100644
index ad4068b..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_dschjungelplanet09.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_dschjungelplanet10.jpg b/styles/skins/NewSkins/planeten/small/s_dschjungelplanet10.jpg
deleted file mode 100644
index 731e28c..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_dschjungelplanet10.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_eisplanet01.jpg b/styles/skins/NewSkins/planeten/small/s_eisplanet01.jpg
deleted file mode 100644
index 5e8e2cd..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_eisplanet01.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_eisplanet02.jpg b/styles/skins/NewSkins/planeten/small/s_eisplanet02.jpg
deleted file mode 100644
index b02194f..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_eisplanet02.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_eisplanet03.jpg b/styles/skins/NewSkins/planeten/small/s_eisplanet03.jpg
deleted file mode 100644
index b5d86eb..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_eisplanet03.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_eisplanet04.jpg b/styles/skins/NewSkins/planeten/small/s_eisplanet04.jpg
deleted file mode 100644
index 8830d1d..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_eisplanet04.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_eisplanet05.jpg b/styles/skins/NewSkins/planeten/small/s_eisplanet05.jpg
deleted file mode 100644
index d072b55..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_eisplanet05.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_eisplanet06.jpg b/styles/skins/NewSkins/planeten/small/s_eisplanet06.jpg
deleted file mode 100644
index 43f8615..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_eisplanet06.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_eisplanet07.jpg b/styles/skins/NewSkins/planeten/small/s_eisplanet07.jpg
deleted file mode 100644
index 3d8ae0a..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_eisplanet07.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_eisplanet08.jpg b/styles/skins/NewSkins/planeten/small/s_eisplanet08.jpg
deleted file mode 100644
index b6ca7cb..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_eisplanet08.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_eisplanet09.jpg b/styles/skins/NewSkins/planeten/small/s_eisplanet09.jpg
deleted file mode 100644
index 32afeda..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_eisplanet09.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_eisplanet10.jpg b/styles/skins/NewSkins/planeten/small/s_eisplanet10.jpg
deleted file mode 100644
index 2fcd1e6..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_eisplanet10.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_gasplanet01.jpg b/styles/skins/NewSkins/planeten/small/s_gasplanet01.jpg
deleted file mode 100644
index 34df3f1..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_gasplanet01.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_gasplanet02.jpg b/styles/skins/NewSkins/planeten/small/s_gasplanet02.jpg
deleted file mode 100644
index 08d39fe..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_gasplanet02.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_gasplanet03.jpg b/styles/skins/NewSkins/planeten/small/s_gasplanet03.jpg
deleted file mode 100644
index 5c5f99b..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_gasplanet03.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_gasplanet04.jpg b/styles/skins/NewSkins/planeten/small/s_gasplanet04.jpg
deleted file mode 100644
index 6c2a997..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_gasplanet04.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_gasplanet05.jpg b/styles/skins/NewSkins/planeten/small/s_gasplanet05.jpg
deleted file mode 100644
index f23f006..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_gasplanet05.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_gasplanet06.jpg b/styles/skins/NewSkins/planeten/small/s_gasplanet06.jpg
deleted file mode 100644
index ec1049f..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_gasplanet06.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_gasplanet07.jpg b/styles/skins/NewSkins/planeten/small/s_gasplanet07.jpg
deleted file mode 100644
index b414ad1..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_gasplanet07.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_gasplanet08.jpg b/styles/skins/NewSkins/planeten/small/s_gasplanet08.jpg
deleted file mode 100644
index 00416ea..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_gasplanet08.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_mond.jpg b/styles/skins/NewSkins/planeten/small/s_mond.jpg
deleted file mode 100644
index 9dbf5d9..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_mond.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_normaltempplanet01.jpg b/styles/skins/NewSkins/planeten/small/s_normaltempplanet01.jpg
deleted file mode 100644
index f6fd30c..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_normaltempplanet01.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_normaltempplanet02.jpg b/styles/skins/NewSkins/planeten/small/s_normaltempplanet02.jpg
deleted file mode 100644
index b2bd00d..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_normaltempplanet02.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_normaltempplanet03.jpg b/styles/skins/NewSkins/planeten/small/s_normaltempplanet03.jpg
deleted file mode 100644
index 9ec2114..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_normaltempplanet03.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_normaltempplanet04.jpg b/styles/skins/NewSkins/planeten/small/s_normaltempplanet04.jpg
deleted file mode 100644
index 3e9a243..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_normaltempplanet04.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_normaltempplanet05.jpg b/styles/skins/NewSkins/planeten/small/s_normaltempplanet05.jpg
deleted file mode 100644
index 72543c6..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_normaltempplanet05.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_normaltempplanet06.jpg b/styles/skins/NewSkins/planeten/small/s_normaltempplanet06.jpg
deleted file mode 100644
index c1156ee..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_normaltempplanet06.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_normaltempplanet07.jpg b/styles/skins/NewSkins/planeten/small/s_normaltempplanet07.jpg
deleted file mode 100644
index dc465bd..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_normaltempplanet07.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_trockenplanet01.jpg b/styles/skins/NewSkins/planeten/small/s_trockenplanet01.jpg
deleted file mode 100644
index 93711e2..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_trockenplanet01.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_trockenplanet02.jpg b/styles/skins/NewSkins/planeten/small/s_trockenplanet02.jpg
deleted file mode 100644
index 96021da..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_trockenplanet02.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_trockenplanet03.jpg b/styles/skins/NewSkins/planeten/small/s_trockenplanet03.jpg
deleted file mode 100644
index bb20ba8..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_trockenplanet03.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_trockenplanet04.jpg b/styles/skins/NewSkins/planeten/small/s_trockenplanet04.jpg
deleted file mode 100644
index 4f6d248..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_trockenplanet04.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_trockenplanet05.jpg b/styles/skins/NewSkins/planeten/small/s_trockenplanet05.jpg
deleted file mode 100644
index ffc98a5..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_trockenplanet05.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_trockenplanet06.jpg b/styles/skins/NewSkins/planeten/small/s_trockenplanet06.jpg
deleted file mode 100644
index d8b63ae..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_trockenplanet06.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_trockenplanet07.jpg b/styles/skins/NewSkins/planeten/small/s_trockenplanet07.jpg
deleted file mode 100644
index 3ec2190..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_trockenplanet07.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_trockenplanet08.jpg b/styles/skins/NewSkins/planeten/small/s_trockenplanet08.jpg
deleted file mode 100644
index 1105edb..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_trockenplanet08.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_trockenplanet09.jpg b/styles/skins/NewSkins/planeten/small/s_trockenplanet09.jpg
deleted file mode 100644
index bbf34db..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_trockenplanet09.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_trockenplanet10.jpg b/styles/skins/NewSkins/planeten/small/s_trockenplanet10.jpg
deleted file mode 100644
index eb7a66b..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_trockenplanet10.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_wasserplanet01.jpg b/styles/skins/NewSkins/planeten/small/s_wasserplanet01.jpg
deleted file mode 100644
index 6280ca4..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_wasserplanet01.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_wasserplanet02.jpg b/styles/skins/NewSkins/planeten/small/s_wasserplanet02.jpg
deleted file mode 100644
index 3a78c0b..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_wasserplanet02.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_wasserplanet03.jpg b/styles/skins/NewSkins/planeten/small/s_wasserplanet03.jpg
deleted file mode 100644
index b97bc23..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_wasserplanet03.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_wasserplanet04.jpg b/styles/skins/NewSkins/planeten/small/s_wasserplanet04.jpg
deleted file mode 100644
index bd3a891..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_wasserplanet04.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_wasserplanet05.jpg b/styles/skins/NewSkins/planeten/small/s_wasserplanet05.jpg
deleted file mode 100644
index 4b3959e..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_wasserplanet05.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_wasserplanet06.jpg b/styles/skins/NewSkins/planeten/small/s_wasserplanet06.jpg
deleted file mode 100644
index 8ad01eb..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_wasserplanet06.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_wasserplanet07.jpg b/styles/skins/NewSkins/planeten/small/s_wasserplanet07.jpg
deleted file mode 100644
index de69c87..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_wasserplanet07.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_wasserplanet08.jpg b/styles/skins/NewSkins/planeten/small/s_wasserplanet08.jpg
deleted file mode 100644
index 2cc64e1..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_wasserplanet08.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_wasserplanet09.jpg b/styles/skins/NewSkins/planeten/small/s_wasserplanet09.jpg
deleted file mode 100644
index b6fd0c9..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_wasserplanet09.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_wuestenplanet01.jpg b/styles/skins/NewSkins/planeten/small/s_wuestenplanet01.jpg
deleted file mode 100644
index 926753d..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_wuestenplanet01.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_wuestenplanet02.jpg b/styles/skins/NewSkins/planeten/small/s_wuestenplanet02.jpg
deleted file mode 100644
index 987f033..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_wuestenplanet02.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_wuestenplanet03.jpg b/styles/skins/NewSkins/planeten/small/s_wuestenplanet03.jpg
deleted file mode 100644
index aca2b9c..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_wuestenplanet03.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/small/s_wuestenplanet04.jpg b/styles/skins/NewSkins/planeten/small/s_wuestenplanet04.jpg
deleted file mode 100644
index c32cc52..0000000
Binary files a/styles/skins/NewSkins/planeten/small/s_wuestenplanet04.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/trockenplanet01.jpg b/styles/skins/NewSkins/planeten/trockenplanet01.jpg
deleted file mode 100644
index 3e8cee7..0000000
Binary files a/styles/skins/NewSkins/planeten/trockenplanet01.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/trockenplanet02.jpg b/styles/skins/NewSkins/planeten/trockenplanet02.jpg
deleted file mode 100644
index 1d8961d..0000000
Binary files a/styles/skins/NewSkins/planeten/trockenplanet02.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/trockenplanet03.jpg b/styles/skins/NewSkins/planeten/trockenplanet03.jpg
deleted file mode 100644
index c9b592e..0000000
Binary files a/styles/skins/NewSkins/planeten/trockenplanet03.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/trockenplanet04.jpg b/styles/skins/NewSkins/planeten/trockenplanet04.jpg
deleted file mode 100644
index 6472ed3..0000000
Binary files a/styles/skins/NewSkins/planeten/trockenplanet04.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/trockenplanet05.jpg b/styles/skins/NewSkins/planeten/trockenplanet05.jpg
deleted file mode 100644
index cb838c8..0000000
Binary files a/styles/skins/NewSkins/planeten/trockenplanet05.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/trockenplanet06.jpg b/styles/skins/NewSkins/planeten/trockenplanet06.jpg
deleted file mode 100644
index 5fdd97c..0000000
Binary files a/styles/skins/NewSkins/planeten/trockenplanet06.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/trockenplanet07.jpg b/styles/skins/NewSkins/planeten/trockenplanet07.jpg
deleted file mode 100644
index f05a5f0..0000000
Binary files a/styles/skins/NewSkins/planeten/trockenplanet07.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/trockenplanet08.jpg b/styles/skins/NewSkins/planeten/trockenplanet08.jpg
deleted file mode 100644
index 605680f..0000000
Binary files a/styles/skins/NewSkins/planeten/trockenplanet08.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/trockenplanet09.jpg b/styles/skins/NewSkins/planeten/trockenplanet09.jpg
deleted file mode 100644
index aaef381..0000000
Binary files a/styles/skins/NewSkins/planeten/trockenplanet09.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/trockenplanet10.jpg b/styles/skins/NewSkins/planeten/trockenplanet10.jpg
deleted file mode 100644
index 0ebb2ed..0000000
Binary files a/styles/skins/NewSkins/planeten/trockenplanet10.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/wasserplanet01.jpg b/styles/skins/NewSkins/planeten/wasserplanet01.jpg
deleted file mode 100644
index 4b2ad00..0000000
Binary files a/styles/skins/NewSkins/planeten/wasserplanet01.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/wasserplanet02.jpg b/styles/skins/NewSkins/planeten/wasserplanet02.jpg
deleted file mode 100644
index b07afd7..0000000
Binary files a/styles/skins/NewSkins/planeten/wasserplanet02.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/wasserplanet03.jpg b/styles/skins/NewSkins/planeten/wasserplanet03.jpg
deleted file mode 100644
index 50c4733..0000000
Binary files a/styles/skins/NewSkins/planeten/wasserplanet03.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/wasserplanet04.jpg b/styles/skins/NewSkins/planeten/wasserplanet04.jpg
deleted file mode 100644
index c974ea3..0000000
Binary files a/styles/skins/NewSkins/planeten/wasserplanet04.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/wasserplanet05.jpg b/styles/skins/NewSkins/planeten/wasserplanet05.jpg
deleted file mode 100644
index e4316f5..0000000
Binary files a/styles/skins/NewSkins/planeten/wasserplanet05.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/wasserplanet06.jpg b/styles/skins/NewSkins/planeten/wasserplanet06.jpg
deleted file mode 100644
index 6fb3a10..0000000
Binary files a/styles/skins/NewSkins/planeten/wasserplanet06.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/wasserplanet07.jpg b/styles/skins/NewSkins/planeten/wasserplanet07.jpg
deleted file mode 100644
index 0b95c4b..0000000
Binary files a/styles/skins/NewSkins/planeten/wasserplanet07.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/wasserplanet08.jpg b/styles/skins/NewSkins/planeten/wasserplanet08.jpg
deleted file mode 100644
index e259880..0000000
Binary files a/styles/skins/NewSkins/planeten/wasserplanet08.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/wasserplanet09.jpg b/styles/skins/NewSkins/planeten/wasserplanet09.jpg
deleted file mode 100644
index 5974935..0000000
Binary files a/styles/skins/NewSkins/planeten/wasserplanet09.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/wuestenplanet01.jpg b/styles/skins/NewSkins/planeten/wuestenplanet01.jpg
deleted file mode 100644
index d064024..0000000
Binary files a/styles/skins/NewSkins/planeten/wuestenplanet01.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/wuestenplanet02.jpg b/styles/skins/NewSkins/planeten/wuestenplanet02.jpg
deleted file mode 100644
index 2d28126..0000000
Binary files a/styles/skins/NewSkins/planeten/wuestenplanet02.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/wuestenplanet03.jpg b/styles/skins/NewSkins/planeten/wuestenplanet03.jpg
deleted file mode 100644
index fe8b727..0000000
Binary files a/styles/skins/NewSkins/planeten/wuestenplanet03.jpg and /dev/null differ
diff --git a/styles/skins/NewSkins/planeten/wuestenplanet04.jpg b/styles/skins/NewSkins/planeten/wuestenplanet04.jpg
deleted file mode 100644
index fe533a9..0000000
Binary files a/styles/skins/NewSkins/planeten/wuestenplanet04.jpg and /dev/null differ
diff --git a/styles/skins/evolution/formate.css b/styles/skins/evolution/formate.css
deleted file mode 100644
index eea7822..0000000
--- a/styles/skins/evolution/formate.css
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
-                                 ÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛ
-                                 ÛÛÛ±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±ÛÛÛ±
-                                 ÛÛÛ±                                                  ÛÛÛ±
-                                 ÛÛÛ±                OGAME: EPIC BLUE                  ÛÛÛ±
-                                 ÛÛÛ±                                                  ÛÛÛ±
-                                 ÛÛÛ±                      V 1.0                       ÛÛÛ±
-                                 ÛÛÛ±                                                  ÛÛÛ±
-                                 ÛÛÛ±    Skin fuer "OGame" www.ogame.de V 1.2          ÛÛÛ±
-                                 ÛÛÛ±                                                  ÛÛÛ±
-                                 ÛÛÛ±                                                  ÛÛÛ±
-                                 ÛÛÛ±    Viel Spass                                    ÛÛÛ±
-                                 ÛÛÛ±                                                  ÛÛÛ±
-                                 ÛÛÛ±                    bei Problemen: etapred@gmx.de ÛÛÛ±
-                                 ÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛ±
-                                  ±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±
-*/
-., #, td, th, textarea, body, table
-{
-  font-family	: Tahoma,sans-serif;
-  font-size	: 11px;
-}
-
-img
-{
-  border               : 0px;
-}
-
-p table
-{
-  border               : 0px;
-}
-
-p td
-{
-  text-align           : center;
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-}
-
-table table
-{
-  border               : 0px;
-}
-
-table table td
-{
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-}
-
-body
-{
-  color                : #E6EBFB;
-  margin-top           : 1px;
-  margin-left          : 1px;
-  background-color     : #040e1e;
-  background-image     : url(img/background.jpg);
-  background-attachment: fixed;
-  background-repeat    : no-repeat;
-  background-position  : top right;
-  scrollbar-arrow-color: #E6EBFB;
-  scrollbar-base-color: #344566;
-  scrollbar-track-color: #344566;
-  scrollbar-face-color: #344566;
-  scrollbar-highlight-color: #344566;
-  scrollbar-3dlight-color: #465673;
-  scrollbar-darkshadow-color: #344566;
-  scrollbar-shadow-color: #465673;
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-}
-
-body.style{
-	background-image: none;
-}
-
-body.style table {
-	margin:0px;
-}
-
-body form table th table input
-{
-  width: 60px;
-}
-
-th, td.a, td.b, td.c, td.f, input, select,
-td.g, td.h, td.i, td.j, td.k, td.l, td.m,
-td.n, td.o, td.q, td.r, td.v, .style td,
-textarea, p td, table.s th img
-{
-  border               : 1px #415680 solid;
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-}
-
-th, td.a, td.b, td.c, td.f, input, select, td.g,
-td.h, td.i, td.j, td.k, td.m, td.o, td.q, td.r,
-td.v, td.s, .style td, p td
-{
-  background-color     : #344566;
-}
-
-th
-{
-  text-align           : center;
-  padding-left         : 3px;
-  padding-right        : 3px;
-}
-
-td.a
-{
-  height               : 39px;
-  text-align           : center;
-}
-
-td.b
-{
-  padding              : 3px;
-}
-
-td.c
-{
-  font-weight          : bold;
-  color                : #E6EBFB;
-  padding-left         : 3px;
-  background-image     : url(img/bg1.gif);
-}
-
-td.f, input, select, textarea
-{
-  color                : #E6EBFB;
-  background-color     : #344566;
-}
-
-textarea
-{
-  width                : 100%;
-}
-
-td.k input
-{
-  text-align           : left;
-}
-
-td.g
-{
-  font-weight          : bold;
-  text-align           : right;
-  color                : #E6EBFB;
-}
-
-td.h
-{
-  text-align           : center;
-  color                : #E6EBFB;
-}
-
-td.i
-{
-  text-align           : center;
-  color                : #E6EBFB;
-}
-
-td.j
-{
-  text-align           : center;
-  color                : #E6EBFB;
-}
-
-td.k, td.k input
-{
-  text-align           : center;
-  color                : #E6EBFB;
-}
-
-td.l
-{
-  background-color     : #344566;
-  color                : #E6EBFB;
-  vertical-align       : top;
-  padding              : 3px;
-  background-image     : url(img/bg2.gif);
-}
-
-td.m
-{
-  font-weight          : bold;
-  text-align           : right;
-  width                : 86px;
-  color                : #E6EBFB;
-}
-
-td.n
-{
-  font-weight          : bold;
-  text-align           : right;
-  width                : 89px;
-  text-align           : center;
-  color                : #E6EBFB;
-}
-
-td.o
-{
-  text-align           : center;
-  color                : #E6EBFB;
-}
-
-td.q
-{
-  font-weight          : bold;
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-  text-align           : center;
-  vertical-align       : middle;
-  color                : #E6EBFB;
-}
-
-td.r
-{
-  text-align           : right;
-  color                : #E6EBFB;
-}
-
-td.v
-{
-  font-weight          : bold;
-  text-align           : right;
-  color                : #f7f7f7;
-}
-
-td.s
-{
-  color                : #E6EBFB;
-}
-
-table.s th
-{
-  border               : 0px;
-}
-
-table.s th img
-{
-  width                : 89px;
-  height               : 89px;
-}
-
-div.z
-{
-  font-weight          : bold;
-  color                : #E6EBFB;
-}
-
-a
-{
-  color                : #E6EBFB;
-  text-decoration      : none;
-  font-weight          : bold;
-}
-
-a.s
-{
-  color                : #E6EBFB;
-}
-
-a.t
-{
-  color                : #E6EBFB;
-}
-
-a:hover
-{
-  color                : #CDD7F8;
-  text-decoration      : underline;
-}
-
-.style td
-{
-  color                : #E6EBFB;
-  border-top           : 0px; 
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-}
-
-.style div a
-{
-  height               : 100%;
-  width                : 100%;
-  color                : #f2f2f2;
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-}
-
-.style div a:link
-{
-  height               : 100%;
-  width                : 100%;
-  color                : #f2f2f2;
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-}
-
-.style div a:visited
-{
-  height               : 100%;
-  width                : 100%;
-  color                : #f2f2f2;
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-}
-
-.style div a:hover
-{
-  background-color     : #415680;
-  height               : 100%;
-  width                : 100%;
-  text-decoration      : none;
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-  color                : #E6EBFB;
-}
-
-.style
-{
-  margin-top           : 15px;
-}
-
-h1
-{
-  font-size            : 11px;
-  font-family          : Tahoma,sans-serif;
-  border-bottom        : 0px #344566 solid;
-  width                : 98%;
-  text-align           : center;
-}
\ No newline at end of file
diff --git a/styles/skins/evolution/gebaeude/1.gif b/styles/skins/evolution/gebaeude/1.gif
deleted file mode 100644
index 0f26149..0000000
Binary files a/styles/skins/evolution/gebaeude/1.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/106.gif b/styles/skins/evolution/gebaeude/106.gif
deleted file mode 100644
index 228df64..0000000
Binary files a/styles/skins/evolution/gebaeude/106.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/108.gif b/styles/skins/evolution/gebaeude/108.gif
deleted file mode 100644
index dc2163e..0000000
Binary files a/styles/skins/evolution/gebaeude/108.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/109.gif b/styles/skins/evolution/gebaeude/109.gif
deleted file mode 100644
index 7e886b3..0000000
Binary files a/styles/skins/evolution/gebaeude/109.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/110.gif b/styles/skins/evolution/gebaeude/110.gif
deleted file mode 100644
index 4a71642..0000000
Binary files a/styles/skins/evolution/gebaeude/110.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/111.gif b/styles/skins/evolution/gebaeude/111.gif
deleted file mode 100644
index 0690394..0000000
Binary files a/styles/skins/evolution/gebaeude/111.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/113.gif b/styles/skins/evolution/gebaeude/113.gif
deleted file mode 100644
index 9e40581..0000000
Binary files a/styles/skins/evolution/gebaeude/113.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/114.gif b/styles/skins/evolution/gebaeude/114.gif
deleted file mode 100644
index ce61d8c..0000000
Binary files a/styles/skins/evolution/gebaeude/114.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/115.gif b/styles/skins/evolution/gebaeude/115.gif
deleted file mode 100644
index 0fbd7a3..0000000
Binary files a/styles/skins/evolution/gebaeude/115.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/117.gif b/styles/skins/evolution/gebaeude/117.gif
deleted file mode 100644
index 3b7c8e1..0000000
Binary files a/styles/skins/evolution/gebaeude/117.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/118.gif b/styles/skins/evolution/gebaeude/118.gif
deleted file mode 100644
index 0397533..0000000
Binary files a/styles/skins/evolution/gebaeude/118.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/12.gif b/styles/skins/evolution/gebaeude/12.gif
deleted file mode 100644
index 868feff..0000000
Binary files a/styles/skins/evolution/gebaeude/12.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/120.gif b/styles/skins/evolution/gebaeude/120.gif
deleted file mode 100644
index ee8d276..0000000
Binary files a/styles/skins/evolution/gebaeude/120.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/121.gif b/styles/skins/evolution/gebaeude/121.gif
deleted file mode 100644
index 48cbdf5..0000000
Binary files a/styles/skins/evolution/gebaeude/121.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/122.gif b/styles/skins/evolution/gebaeude/122.gif
deleted file mode 100644
index 451d2b5..0000000
Binary files a/styles/skins/evolution/gebaeude/122.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/123.gif b/styles/skins/evolution/gebaeude/123.gif
deleted file mode 100644
index 0ea7934..0000000
Binary files a/styles/skins/evolution/gebaeude/123.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/124.gif b/styles/skins/evolution/gebaeude/124.gif
deleted file mode 100644
index 5d497a3..0000000
Binary files a/styles/skins/evolution/gebaeude/124.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/125.gif b/styles/skins/evolution/gebaeude/125.gif
deleted file mode 100644
index 9229115..0000000
Binary files a/styles/skins/evolution/gebaeude/125.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/14.gif b/styles/skins/evolution/gebaeude/14.gif
deleted file mode 100644
index f9e0406..0000000
Binary files a/styles/skins/evolution/gebaeude/14.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/15.gif b/styles/skins/evolution/gebaeude/15.gif
deleted file mode 100644
index f4e7579..0000000
Binary files a/styles/skins/evolution/gebaeude/15.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/150.gif b/styles/skins/evolution/gebaeude/150.gif
deleted file mode 100644
index ec3cfeb..0000000
Binary files a/styles/skins/evolution/gebaeude/150.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/199.gif b/styles/skins/evolution/gebaeude/199.gif
deleted file mode 100644
index 315e275..0000000
Binary files a/styles/skins/evolution/gebaeude/199.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/2.gif b/styles/skins/evolution/gebaeude/2.gif
deleted file mode 100644
index 7b68011..0000000
Binary files a/styles/skins/evolution/gebaeude/2.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/202.gif b/styles/skins/evolution/gebaeude/202.gif
deleted file mode 100644
index 189e61a..0000000
Binary files a/styles/skins/evolution/gebaeude/202.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/203.gif b/styles/skins/evolution/gebaeude/203.gif
deleted file mode 100644
index 4163258..0000000
Binary files a/styles/skins/evolution/gebaeude/203.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/204.gif b/styles/skins/evolution/gebaeude/204.gif
deleted file mode 100644
index 2abb39c..0000000
Binary files a/styles/skins/evolution/gebaeude/204.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/205.gif b/styles/skins/evolution/gebaeude/205.gif
deleted file mode 100644
index 427cd28..0000000
Binary files a/styles/skins/evolution/gebaeude/205.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/206.gif b/styles/skins/evolution/gebaeude/206.gif
deleted file mode 100644
index 6bdbcb2..0000000
Binary files a/styles/skins/evolution/gebaeude/206.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/207.gif b/styles/skins/evolution/gebaeude/207.gif
deleted file mode 100644
index 6835ad2..0000000
Binary files a/styles/skins/evolution/gebaeude/207.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/208.gif b/styles/skins/evolution/gebaeude/208.gif
deleted file mode 100644
index 7cf0db2..0000000
Binary files a/styles/skins/evolution/gebaeude/208.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/209.gif b/styles/skins/evolution/gebaeude/209.gif
deleted file mode 100644
index 28c5bb7..0000000
Binary files a/styles/skins/evolution/gebaeude/209.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/21.gif b/styles/skins/evolution/gebaeude/21.gif
deleted file mode 100644
index bf9c086..0000000
Binary files a/styles/skins/evolution/gebaeude/21.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/210.gif b/styles/skins/evolution/gebaeude/210.gif
deleted file mode 100644
index ea7662b..0000000
Binary files a/styles/skins/evolution/gebaeude/210.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/211.gif b/styles/skins/evolution/gebaeude/211.gif
deleted file mode 100644
index 1febf67..0000000
Binary files a/styles/skins/evolution/gebaeude/211.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/212.gif b/styles/skins/evolution/gebaeude/212.gif
deleted file mode 100644
index e081064..0000000
Binary files a/styles/skins/evolution/gebaeude/212.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/213.gif b/styles/skins/evolution/gebaeude/213.gif
deleted file mode 100644
index d59e62d..0000000
Binary files a/styles/skins/evolution/gebaeude/213.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/214.gif b/styles/skins/evolution/gebaeude/214.gif
deleted file mode 100644
index 2725996..0000000
Binary files a/styles/skins/evolution/gebaeude/214.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/215.gif b/styles/skins/evolution/gebaeude/215.gif
deleted file mode 100644
index a1e14a2..0000000
Binary files a/styles/skins/evolution/gebaeude/215.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/216.gif b/styles/skins/evolution/gebaeude/216.gif
deleted file mode 100644
index d2d279f..0000000
Binary files a/styles/skins/evolution/gebaeude/216.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/22.gif b/styles/skins/evolution/gebaeude/22.gif
deleted file mode 100644
index 83a725c..0000000
Binary files a/styles/skins/evolution/gebaeude/22.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/23.gif b/styles/skins/evolution/gebaeude/23.gif
deleted file mode 100644
index 7454951..0000000
Binary files a/styles/skins/evolution/gebaeude/23.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/24.gif b/styles/skins/evolution/gebaeude/24.gif
deleted file mode 100644
index ca64fc9..0000000
Binary files a/styles/skins/evolution/gebaeude/24.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/3.gif b/styles/skins/evolution/gebaeude/3.gif
deleted file mode 100644
index edbc473..0000000
Binary files a/styles/skins/evolution/gebaeude/3.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/31.gif b/styles/skins/evolution/gebaeude/31.gif
deleted file mode 100644
index 928ad38..0000000
Binary files a/styles/skins/evolution/gebaeude/31.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/33.gif b/styles/skins/evolution/gebaeude/33.gif
deleted file mode 100644
index 8b27fe2..0000000
Binary files a/styles/skins/evolution/gebaeude/33.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/34.gif b/styles/skins/evolution/gebaeude/34.gif
deleted file mode 100644
index 330353f..0000000
Binary files a/styles/skins/evolution/gebaeude/34.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/4.gif b/styles/skins/evolution/gebaeude/4.gif
deleted file mode 100644
index 6bb26a4..0000000
Binary files a/styles/skins/evolution/gebaeude/4.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/401.gif b/styles/skins/evolution/gebaeude/401.gif
deleted file mode 100644
index f2c3ea2..0000000
Binary files a/styles/skins/evolution/gebaeude/401.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/402.gif b/styles/skins/evolution/gebaeude/402.gif
deleted file mode 100644
index dd0b07d..0000000
Binary files a/styles/skins/evolution/gebaeude/402.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/403.gif b/styles/skins/evolution/gebaeude/403.gif
deleted file mode 100644
index 3bce5d9..0000000
Binary files a/styles/skins/evolution/gebaeude/403.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/404.gif b/styles/skins/evolution/gebaeude/404.gif
deleted file mode 100644
index f5d7e59..0000000
Binary files a/styles/skins/evolution/gebaeude/404.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/405.gif b/styles/skins/evolution/gebaeude/405.gif
deleted file mode 100644
index f9c8024..0000000
Binary files a/styles/skins/evolution/gebaeude/405.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/406.gif b/styles/skins/evolution/gebaeude/406.gif
deleted file mode 100644
index 8c25a9b..0000000
Binary files a/styles/skins/evolution/gebaeude/406.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/407.gif b/styles/skins/evolution/gebaeude/407.gif
deleted file mode 100644
index 390bcc4..0000000
Binary files a/styles/skins/evolution/gebaeude/407.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/408.gif b/styles/skins/evolution/gebaeude/408.gif
deleted file mode 100644
index 29e042a..0000000
Binary files a/styles/skins/evolution/gebaeude/408.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/409.gif b/styles/skins/evolution/gebaeude/409.gif
deleted file mode 100644
index abb7dae..0000000
Binary files a/styles/skins/evolution/gebaeude/409.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/41.gif b/styles/skins/evolution/gebaeude/41.gif
deleted file mode 100644
index 82da4f5..0000000
Binary files a/styles/skins/evolution/gebaeude/41.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/410.gif b/styles/skins/evolution/gebaeude/410.gif
deleted file mode 100644
index 1d4a117..0000000
Binary files a/styles/skins/evolution/gebaeude/410.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/42.gif b/styles/skins/evolution/gebaeude/42.gif
deleted file mode 100644
index 49e557c..0000000
Binary files a/styles/skins/evolution/gebaeude/42.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/43.gif b/styles/skins/evolution/gebaeude/43.gif
deleted file mode 100644
index 1957f8e..0000000
Binary files a/styles/skins/evolution/gebaeude/43.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/44.gif b/styles/skins/evolution/gebaeude/44.gif
deleted file mode 100644
index 0ee507c..0000000
Binary files a/styles/skins/evolution/gebaeude/44.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/502.gif b/styles/skins/evolution/gebaeude/502.gif
deleted file mode 100644
index 9a764f4..0000000
Binary files a/styles/skins/evolution/gebaeude/502.gif and /dev/null differ
diff --git a/styles/skins/evolution/gebaeude/503.gif b/styles/skins/evolution/gebaeude/503.gif
deleted file mode 100644
index 9510f6f..0000000
Binary files a/styles/skins/evolution/gebaeude/503.gif and /dev/null differ
diff --git a/styles/skins/evolution/gfx/info-help.jpg b/styles/skins/evolution/gfx/info-help.jpg
deleted file mode 100644
index c65c785..0000000
Binary files a/styles/skins/evolution/gfx/info-help.jpg and /dev/null differ
diff --git a/styles/skins/evolution/gfx/ogame-produktion.jpg b/styles/skins/evolution/gfx/ogame-produktion.jpg
deleted file mode 100644
index 78ae072..0000000
Binary files a/styles/skins/evolution/gfx/ogame-produktion.jpg and /dev/null differ
diff --git a/styles/skins/evolution/gfx/user-menu.jpg b/styles/skins/evolution/gfx/user-menu.jpg
deleted file mode 100644
index fc1088a..0000000
Binary files a/styles/skins/evolution/gfx/user-menu.jpg and /dev/null differ
diff --git a/styles/skins/evolution/images/darkmatter.jpg b/styles/skins/evolution/images/darkmatter.jpg
deleted file mode 100644
index d29573f..0000000
Binary files a/styles/skins/evolution/images/darkmatter.jpg and /dev/null differ
diff --git a/styles/skins/evolution/images/message.gif b/styles/skins/evolution/images/message.gif
deleted file mode 100644
index 6aaa698..0000000
Binary files a/styles/skins/evolution/images/message.gif and /dev/null differ
diff --git a/styles/skins/evolution/img/b.gif b/styles/skins/evolution/img/b.gif
deleted file mode 100644
index ee94781..0000000
Binary files a/styles/skins/evolution/img/b.gif and /dev/null differ
diff --git a/styles/skins/evolution/img/bg1.gif b/styles/skins/evolution/img/bg1.gif
deleted file mode 100644
index 73b1805..0000000
Binary files a/styles/skins/evolution/img/bg1.gif and /dev/null differ
diff --git a/styles/skins/evolution/img/blank.gif b/styles/skins/evolution/img/blank.gif
deleted file mode 100644
index 2f005be..0000000
Binary files a/styles/skins/evolution/img/blank.gif and /dev/null differ
diff --git a/styles/skins/evolution/img/e.gif b/styles/skins/evolution/img/e.gif
deleted file mode 100644
index d966d7a..0000000
Binary files a/styles/skins/evolution/img/e.gif and /dev/null differ
diff --git a/styles/skins/evolution/img/m.gif b/styles/skins/evolution/img/m.gif
deleted file mode 100644
index 8c3dc1f..0000000
Binary files a/styles/skins/evolution/img/m.gif and /dev/null differ
diff --git a/styles/skins/evolution/img/r.gif b/styles/skins/evolution/img/r.gif
deleted file mode 100644
index af34366..0000000
Binary files a/styles/skins/evolution/img/r.gif and /dev/null differ
diff --git a/styles/skins/evolution/img/s.gif b/styles/skins/evolution/img/s.gif
deleted file mode 100644
index 481bede..0000000
Binary files a/styles/skins/evolution/img/s.gif and /dev/null differ
diff --git a/styles/skins/evolution/pic/abort.gif b/styles/skins/evolution/pic/abort.gif
deleted file mode 100644
index f9cebe1..0000000
Binary files a/styles/skins/evolution/pic/abort.gif and /dev/null differ
diff --git a/styles/skins/evolution/pic/appwiz.gif b/styles/skins/evolution/pic/appwiz.gif
deleted file mode 100644
index b99ff46..0000000
Binary files a/styles/skins/evolution/pic/appwiz.gif and /dev/null differ
diff --git a/styles/skins/evolution/pic/key.gif b/styles/skins/evolution/pic/key.gif
deleted file mode 100644
index 3e0ea6c..0000000
Binary files a/styles/skins/evolution/pic/key.gif and /dev/null differ
diff --git a/styles/skins/evolution/planeten/debris.jpg b/styles/skins/evolution/planeten/debris.jpg
deleted file mode 100644
index 9ca12f6..0000000
Binary files a/styles/skins/evolution/planeten/debris.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/dschjungelplanet01.jpg b/styles/skins/evolution/planeten/dschjungelplanet01.jpg
deleted file mode 100644
index 8db9114..0000000
Binary files a/styles/skins/evolution/planeten/dschjungelplanet01.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/dschjungelplanet02.jpg b/styles/skins/evolution/planeten/dschjungelplanet02.jpg
deleted file mode 100644
index dc349ba..0000000
Binary files a/styles/skins/evolution/planeten/dschjungelplanet02.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/dschjungelplanet03.jpg b/styles/skins/evolution/planeten/dschjungelplanet03.jpg
deleted file mode 100644
index df984db..0000000
Binary files a/styles/skins/evolution/planeten/dschjungelplanet03.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/dschjungelplanet04.jpg b/styles/skins/evolution/planeten/dschjungelplanet04.jpg
deleted file mode 100644
index b052bcf..0000000
Binary files a/styles/skins/evolution/planeten/dschjungelplanet04.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/dschjungelplanet05.jpg b/styles/skins/evolution/planeten/dschjungelplanet05.jpg
deleted file mode 100644
index c8748d0..0000000
Binary files a/styles/skins/evolution/planeten/dschjungelplanet05.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/dschjungelplanet06.jpg b/styles/skins/evolution/planeten/dschjungelplanet06.jpg
deleted file mode 100644
index fa7989d..0000000
Binary files a/styles/skins/evolution/planeten/dschjungelplanet06.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/dschjungelplanet07.jpg b/styles/skins/evolution/planeten/dschjungelplanet07.jpg
deleted file mode 100644
index bf8eef5..0000000
Binary files a/styles/skins/evolution/planeten/dschjungelplanet07.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/dschjungelplanet08.jpg b/styles/skins/evolution/planeten/dschjungelplanet08.jpg
deleted file mode 100644
index 94c35bd..0000000
Binary files a/styles/skins/evolution/planeten/dschjungelplanet08.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/dschjungelplanet09.jpg b/styles/skins/evolution/planeten/dschjungelplanet09.jpg
deleted file mode 100644
index 44e2acf..0000000
Binary files a/styles/skins/evolution/planeten/dschjungelplanet09.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/dschjungelplanet10.jpg b/styles/skins/evolution/planeten/dschjungelplanet10.jpg
deleted file mode 100644
index ccb4d6a..0000000
Binary files a/styles/skins/evolution/planeten/dschjungelplanet10.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/eisplanet01.jpg b/styles/skins/evolution/planeten/eisplanet01.jpg
deleted file mode 100644
index 4ae6fa0..0000000
Binary files a/styles/skins/evolution/planeten/eisplanet01.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/eisplanet02.jpg b/styles/skins/evolution/planeten/eisplanet02.jpg
deleted file mode 100644
index 20ccbc2..0000000
Binary files a/styles/skins/evolution/planeten/eisplanet02.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/eisplanet03.jpg b/styles/skins/evolution/planeten/eisplanet03.jpg
deleted file mode 100644
index f506e75..0000000
Binary files a/styles/skins/evolution/planeten/eisplanet03.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/eisplanet04.jpg b/styles/skins/evolution/planeten/eisplanet04.jpg
deleted file mode 100644
index 2f1dcbc..0000000
Binary files a/styles/skins/evolution/planeten/eisplanet04.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/eisplanet05.jpg b/styles/skins/evolution/planeten/eisplanet05.jpg
deleted file mode 100644
index 3f2b398..0000000
Binary files a/styles/skins/evolution/planeten/eisplanet05.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/eisplanet06.jpg b/styles/skins/evolution/planeten/eisplanet06.jpg
deleted file mode 100644
index 7b6280a..0000000
Binary files a/styles/skins/evolution/planeten/eisplanet06.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/eisplanet07.jpg b/styles/skins/evolution/planeten/eisplanet07.jpg
deleted file mode 100644
index 36a3489..0000000
Binary files a/styles/skins/evolution/planeten/eisplanet07.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/eisplanet08.jpg b/styles/skins/evolution/planeten/eisplanet08.jpg
deleted file mode 100644
index 4720edd..0000000
Binary files a/styles/skins/evolution/planeten/eisplanet08.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/eisplanet09.jpg b/styles/skins/evolution/planeten/eisplanet09.jpg
deleted file mode 100644
index 71ee665..0000000
Binary files a/styles/skins/evolution/planeten/eisplanet09.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/eisplanet10.jpg b/styles/skins/evolution/planeten/eisplanet10.jpg
deleted file mode 100644
index 59093bd..0000000
Binary files a/styles/skins/evolution/planeten/eisplanet10.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/gasplanet01.jpg b/styles/skins/evolution/planeten/gasplanet01.jpg
deleted file mode 100644
index 416314b..0000000
Binary files a/styles/skins/evolution/planeten/gasplanet01.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/gasplanet02.jpg b/styles/skins/evolution/planeten/gasplanet02.jpg
deleted file mode 100644
index 2de1b59..0000000
Binary files a/styles/skins/evolution/planeten/gasplanet02.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/gasplanet03.jpg b/styles/skins/evolution/planeten/gasplanet03.jpg
deleted file mode 100644
index c8e7e74..0000000
Binary files a/styles/skins/evolution/planeten/gasplanet03.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/gasplanet04.jpg b/styles/skins/evolution/planeten/gasplanet04.jpg
deleted file mode 100644
index afee881..0000000
Binary files a/styles/skins/evolution/planeten/gasplanet04.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/gasplanet05.jpg b/styles/skins/evolution/planeten/gasplanet05.jpg
deleted file mode 100644
index 0ba3a19..0000000
Binary files a/styles/skins/evolution/planeten/gasplanet05.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/gasplanet06.jpg b/styles/skins/evolution/planeten/gasplanet06.jpg
deleted file mode 100644
index 1914f4d..0000000
Binary files a/styles/skins/evolution/planeten/gasplanet06.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/gasplanet07.jpg b/styles/skins/evolution/planeten/gasplanet07.jpg
deleted file mode 100644
index 14f8d8a..0000000
Binary files a/styles/skins/evolution/planeten/gasplanet07.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/gasplanet08.jpg b/styles/skins/evolution/planeten/gasplanet08.jpg
deleted file mode 100644
index 492159c..0000000
Binary files a/styles/skins/evolution/planeten/gasplanet08.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/mond.jpg b/styles/skins/evolution/planeten/mond.jpg
deleted file mode 100644
index 991ba37..0000000
Binary files a/styles/skins/evolution/planeten/mond.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/normaltempplanet01.jpg b/styles/skins/evolution/planeten/normaltempplanet01.jpg
deleted file mode 100644
index b320593..0000000
Binary files a/styles/skins/evolution/planeten/normaltempplanet01.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/normaltempplanet02.jpg b/styles/skins/evolution/planeten/normaltempplanet02.jpg
deleted file mode 100644
index f48293c..0000000
Binary files a/styles/skins/evolution/planeten/normaltempplanet02.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/normaltempplanet03.jpg b/styles/skins/evolution/planeten/normaltempplanet03.jpg
deleted file mode 100644
index 489a6ed..0000000
Binary files a/styles/skins/evolution/planeten/normaltempplanet03.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/normaltempplanet04.jpg b/styles/skins/evolution/planeten/normaltempplanet04.jpg
deleted file mode 100644
index c7cb57c..0000000
Binary files a/styles/skins/evolution/planeten/normaltempplanet04.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/normaltempplanet05.jpg b/styles/skins/evolution/planeten/normaltempplanet05.jpg
deleted file mode 100644
index 024c454..0000000
Binary files a/styles/skins/evolution/planeten/normaltempplanet05.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/normaltempplanet06.jpg b/styles/skins/evolution/planeten/normaltempplanet06.jpg
deleted file mode 100644
index 107aad9..0000000
Binary files a/styles/skins/evolution/planeten/normaltempplanet06.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/normaltempplanet07.jpg b/styles/skins/evolution/planeten/normaltempplanet07.jpg
deleted file mode 100644
index 16554c7..0000000
Binary files a/styles/skins/evolution/planeten/normaltempplanet07.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_dschjungelplanet01.jpg b/styles/skins/evolution/planeten/small/s_dschjungelplanet01.jpg
deleted file mode 100644
index 33a5641..0000000
Binary files a/styles/skins/evolution/planeten/small/s_dschjungelplanet01.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_dschjungelplanet02.jpg b/styles/skins/evolution/planeten/small/s_dschjungelplanet02.jpg
deleted file mode 100644
index 010dc58..0000000
Binary files a/styles/skins/evolution/planeten/small/s_dschjungelplanet02.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_dschjungelplanet03.jpg b/styles/skins/evolution/planeten/small/s_dschjungelplanet03.jpg
deleted file mode 100644
index a07c67f..0000000
Binary files a/styles/skins/evolution/planeten/small/s_dschjungelplanet03.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_dschjungelplanet04.jpg b/styles/skins/evolution/planeten/small/s_dschjungelplanet04.jpg
deleted file mode 100644
index 957a5b4..0000000
Binary files a/styles/skins/evolution/planeten/small/s_dschjungelplanet04.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_dschjungelplanet05.jpg b/styles/skins/evolution/planeten/small/s_dschjungelplanet05.jpg
deleted file mode 100644
index a470cc2..0000000
Binary files a/styles/skins/evolution/planeten/small/s_dschjungelplanet05.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_dschjungelplanet06.jpg b/styles/skins/evolution/planeten/small/s_dschjungelplanet06.jpg
deleted file mode 100644
index 19183ad..0000000
Binary files a/styles/skins/evolution/planeten/small/s_dschjungelplanet06.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_dschjungelplanet07.jpg b/styles/skins/evolution/planeten/small/s_dschjungelplanet07.jpg
deleted file mode 100644
index 56bc369..0000000
Binary files a/styles/skins/evolution/planeten/small/s_dschjungelplanet07.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_dschjungelplanet08.jpg b/styles/skins/evolution/planeten/small/s_dschjungelplanet08.jpg
deleted file mode 100644
index 83c3b8a..0000000
Binary files a/styles/skins/evolution/planeten/small/s_dschjungelplanet08.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_dschjungelplanet09.jpg b/styles/skins/evolution/planeten/small/s_dschjungelplanet09.jpg
deleted file mode 100644
index d9b3fff..0000000
Binary files a/styles/skins/evolution/planeten/small/s_dschjungelplanet09.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_dschjungelplanet10.jpg b/styles/skins/evolution/planeten/small/s_dschjungelplanet10.jpg
deleted file mode 100644
index a7522c2..0000000
Binary files a/styles/skins/evolution/planeten/small/s_dschjungelplanet10.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_eisplanet01.jpg b/styles/skins/evolution/planeten/small/s_eisplanet01.jpg
deleted file mode 100644
index aeebfe1..0000000
Binary files a/styles/skins/evolution/planeten/small/s_eisplanet01.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_eisplanet02.jpg b/styles/skins/evolution/planeten/small/s_eisplanet02.jpg
deleted file mode 100644
index 0b8240b..0000000
Binary files a/styles/skins/evolution/planeten/small/s_eisplanet02.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_eisplanet03.jpg b/styles/skins/evolution/planeten/small/s_eisplanet03.jpg
deleted file mode 100644
index 072132d..0000000
Binary files a/styles/skins/evolution/planeten/small/s_eisplanet03.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_eisplanet04.jpg b/styles/skins/evolution/planeten/small/s_eisplanet04.jpg
deleted file mode 100644
index 315b26e..0000000
Binary files a/styles/skins/evolution/planeten/small/s_eisplanet04.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_eisplanet05.jpg b/styles/skins/evolution/planeten/small/s_eisplanet05.jpg
deleted file mode 100644
index a8985b7..0000000
Binary files a/styles/skins/evolution/planeten/small/s_eisplanet05.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_eisplanet06.jpg b/styles/skins/evolution/planeten/small/s_eisplanet06.jpg
deleted file mode 100644
index bd24674..0000000
Binary files a/styles/skins/evolution/planeten/small/s_eisplanet06.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_eisplanet07.jpg b/styles/skins/evolution/planeten/small/s_eisplanet07.jpg
deleted file mode 100644
index 70d20ad..0000000
Binary files a/styles/skins/evolution/planeten/small/s_eisplanet07.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_eisplanet08.jpg b/styles/skins/evolution/planeten/small/s_eisplanet08.jpg
deleted file mode 100644
index 13c6196..0000000
Binary files a/styles/skins/evolution/planeten/small/s_eisplanet08.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_eisplanet09.jpg b/styles/skins/evolution/planeten/small/s_eisplanet09.jpg
deleted file mode 100644
index c68d90c..0000000
Binary files a/styles/skins/evolution/planeten/small/s_eisplanet09.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_eisplanet10.jpg b/styles/skins/evolution/planeten/small/s_eisplanet10.jpg
deleted file mode 100644
index 9f799b8..0000000
Binary files a/styles/skins/evolution/planeten/small/s_eisplanet10.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_gasplanet01.jpg b/styles/skins/evolution/planeten/small/s_gasplanet01.jpg
deleted file mode 100644
index ecdbafc..0000000
Binary files a/styles/skins/evolution/planeten/small/s_gasplanet01.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_gasplanet02.jpg b/styles/skins/evolution/planeten/small/s_gasplanet02.jpg
deleted file mode 100644
index 89a3890..0000000
Binary files a/styles/skins/evolution/planeten/small/s_gasplanet02.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_gasplanet03.jpg b/styles/skins/evolution/planeten/small/s_gasplanet03.jpg
deleted file mode 100644
index f4ccbec..0000000
Binary files a/styles/skins/evolution/planeten/small/s_gasplanet03.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_gasplanet04.jpg b/styles/skins/evolution/planeten/small/s_gasplanet04.jpg
deleted file mode 100644
index 025d363..0000000
Binary files a/styles/skins/evolution/planeten/small/s_gasplanet04.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_gasplanet05.jpg b/styles/skins/evolution/planeten/small/s_gasplanet05.jpg
deleted file mode 100644
index ce1ec8c..0000000
Binary files a/styles/skins/evolution/planeten/small/s_gasplanet05.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_gasplanet06.jpg b/styles/skins/evolution/planeten/small/s_gasplanet06.jpg
deleted file mode 100644
index f1fef98..0000000
Binary files a/styles/skins/evolution/planeten/small/s_gasplanet06.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_gasplanet07.jpg b/styles/skins/evolution/planeten/small/s_gasplanet07.jpg
deleted file mode 100644
index 1c84bbb..0000000
Binary files a/styles/skins/evolution/planeten/small/s_gasplanet07.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_gasplanet08.jpg b/styles/skins/evolution/planeten/small/s_gasplanet08.jpg
deleted file mode 100644
index 4112bdf..0000000
Binary files a/styles/skins/evolution/planeten/small/s_gasplanet08.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_mond.jpg b/styles/skins/evolution/planeten/small/s_mond.jpg
deleted file mode 100644
index 2b5b5d1..0000000
Binary files a/styles/skins/evolution/planeten/small/s_mond.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_normaltempplanet01.jpg b/styles/skins/evolution/planeten/small/s_normaltempplanet01.jpg
deleted file mode 100644
index ad028e4..0000000
Binary files a/styles/skins/evolution/planeten/small/s_normaltempplanet01.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_normaltempplanet02.jpg b/styles/skins/evolution/planeten/small/s_normaltempplanet02.jpg
deleted file mode 100644
index 1de2b4d..0000000
Binary files a/styles/skins/evolution/planeten/small/s_normaltempplanet02.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_normaltempplanet03.jpg b/styles/skins/evolution/planeten/small/s_normaltempplanet03.jpg
deleted file mode 100644
index eab547e..0000000
Binary files a/styles/skins/evolution/planeten/small/s_normaltempplanet03.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_normaltempplanet04.jpg b/styles/skins/evolution/planeten/small/s_normaltempplanet04.jpg
deleted file mode 100644
index 3f4168b..0000000
Binary files a/styles/skins/evolution/planeten/small/s_normaltempplanet04.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_normaltempplanet05.jpg b/styles/skins/evolution/planeten/small/s_normaltempplanet05.jpg
deleted file mode 100644
index dc7dc68..0000000
Binary files a/styles/skins/evolution/planeten/small/s_normaltempplanet05.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_normaltempplanet06.jpg b/styles/skins/evolution/planeten/small/s_normaltempplanet06.jpg
deleted file mode 100644
index 2ede635..0000000
Binary files a/styles/skins/evolution/planeten/small/s_normaltempplanet06.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_normaltempplanet07.jpg b/styles/skins/evolution/planeten/small/s_normaltempplanet07.jpg
deleted file mode 100644
index cbdc6d6..0000000
Binary files a/styles/skins/evolution/planeten/small/s_normaltempplanet07.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_trockenplanet01.jpg b/styles/skins/evolution/planeten/small/s_trockenplanet01.jpg
deleted file mode 100644
index 4c30496..0000000
Binary files a/styles/skins/evolution/planeten/small/s_trockenplanet01.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_trockenplanet02.jpg b/styles/skins/evolution/planeten/small/s_trockenplanet02.jpg
deleted file mode 100644
index 3825229..0000000
Binary files a/styles/skins/evolution/planeten/small/s_trockenplanet02.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_trockenplanet03.jpg b/styles/skins/evolution/planeten/small/s_trockenplanet03.jpg
deleted file mode 100644
index 1f313fc..0000000
Binary files a/styles/skins/evolution/planeten/small/s_trockenplanet03.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_trockenplanet04.jpg b/styles/skins/evolution/planeten/small/s_trockenplanet04.jpg
deleted file mode 100644
index 0a3739b..0000000
Binary files a/styles/skins/evolution/planeten/small/s_trockenplanet04.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_trockenplanet05.jpg b/styles/skins/evolution/planeten/small/s_trockenplanet05.jpg
deleted file mode 100644
index d54af35..0000000
Binary files a/styles/skins/evolution/planeten/small/s_trockenplanet05.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_trockenplanet06.jpg b/styles/skins/evolution/planeten/small/s_trockenplanet06.jpg
deleted file mode 100644
index ccab26b..0000000
Binary files a/styles/skins/evolution/planeten/small/s_trockenplanet06.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_trockenplanet07.jpg b/styles/skins/evolution/planeten/small/s_trockenplanet07.jpg
deleted file mode 100644
index 21bcc11..0000000
Binary files a/styles/skins/evolution/planeten/small/s_trockenplanet07.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_trockenplanet08.jpg b/styles/skins/evolution/planeten/small/s_trockenplanet08.jpg
deleted file mode 100644
index 77ab1ba..0000000
Binary files a/styles/skins/evolution/planeten/small/s_trockenplanet08.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_trockenplanet09.jpg b/styles/skins/evolution/planeten/small/s_trockenplanet09.jpg
deleted file mode 100644
index 45dbb57..0000000
Binary files a/styles/skins/evolution/planeten/small/s_trockenplanet09.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_trockenplanet10.jpg b/styles/skins/evolution/planeten/small/s_trockenplanet10.jpg
deleted file mode 100644
index bf89a7a..0000000
Binary files a/styles/skins/evolution/planeten/small/s_trockenplanet10.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_wasserplanet01.jpg b/styles/skins/evolution/planeten/small/s_wasserplanet01.jpg
deleted file mode 100644
index aeb925a..0000000
Binary files a/styles/skins/evolution/planeten/small/s_wasserplanet01.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_wasserplanet02.jpg b/styles/skins/evolution/planeten/small/s_wasserplanet02.jpg
deleted file mode 100644
index 26b207e..0000000
Binary files a/styles/skins/evolution/planeten/small/s_wasserplanet02.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_wasserplanet03.jpg b/styles/skins/evolution/planeten/small/s_wasserplanet03.jpg
deleted file mode 100644
index e003e6b..0000000
Binary files a/styles/skins/evolution/planeten/small/s_wasserplanet03.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_wasserplanet04.jpg b/styles/skins/evolution/planeten/small/s_wasserplanet04.jpg
deleted file mode 100644
index 0224fbc..0000000
Binary files a/styles/skins/evolution/planeten/small/s_wasserplanet04.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_wasserplanet05.jpg b/styles/skins/evolution/planeten/small/s_wasserplanet05.jpg
deleted file mode 100644
index 47354f9..0000000
Binary files a/styles/skins/evolution/planeten/small/s_wasserplanet05.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_wasserplanet06.jpg b/styles/skins/evolution/planeten/small/s_wasserplanet06.jpg
deleted file mode 100644
index fdfc6a9..0000000
Binary files a/styles/skins/evolution/planeten/small/s_wasserplanet06.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_wasserplanet07.jpg b/styles/skins/evolution/planeten/small/s_wasserplanet07.jpg
deleted file mode 100644
index a56d03c..0000000
Binary files a/styles/skins/evolution/planeten/small/s_wasserplanet07.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_wasserplanet08.jpg b/styles/skins/evolution/planeten/small/s_wasserplanet08.jpg
deleted file mode 100644
index 7d7b828..0000000
Binary files a/styles/skins/evolution/planeten/small/s_wasserplanet08.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_wasserplanet09.jpg b/styles/skins/evolution/planeten/small/s_wasserplanet09.jpg
deleted file mode 100644
index 7b051b2..0000000
Binary files a/styles/skins/evolution/planeten/small/s_wasserplanet09.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_wuestenplanet01.jpg b/styles/skins/evolution/planeten/small/s_wuestenplanet01.jpg
deleted file mode 100644
index 917d886..0000000
Binary files a/styles/skins/evolution/planeten/small/s_wuestenplanet01.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_wuestenplanet02.jpg b/styles/skins/evolution/planeten/small/s_wuestenplanet02.jpg
deleted file mode 100644
index e8735e7..0000000
Binary files a/styles/skins/evolution/planeten/small/s_wuestenplanet02.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_wuestenplanet03.jpg b/styles/skins/evolution/planeten/small/s_wuestenplanet03.jpg
deleted file mode 100644
index 5742564..0000000
Binary files a/styles/skins/evolution/planeten/small/s_wuestenplanet03.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/small/s_wuestenplanet04.jpg b/styles/skins/evolution/planeten/small/s_wuestenplanet04.jpg
deleted file mode 100644
index 41a5991..0000000
Binary files a/styles/skins/evolution/planeten/small/s_wuestenplanet04.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/trockenplanet01.jpg b/styles/skins/evolution/planeten/trockenplanet01.jpg
deleted file mode 100644
index 7eb2a4d..0000000
Binary files a/styles/skins/evolution/planeten/trockenplanet01.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/trockenplanet02.jpg b/styles/skins/evolution/planeten/trockenplanet02.jpg
deleted file mode 100644
index 91fb297..0000000
Binary files a/styles/skins/evolution/planeten/trockenplanet02.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/trockenplanet03.jpg b/styles/skins/evolution/planeten/trockenplanet03.jpg
deleted file mode 100644
index d34b03a..0000000
Binary files a/styles/skins/evolution/planeten/trockenplanet03.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/trockenplanet04.jpg b/styles/skins/evolution/planeten/trockenplanet04.jpg
deleted file mode 100644
index 77d5895..0000000
Binary files a/styles/skins/evolution/planeten/trockenplanet04.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/trockenplanet05.jpg b/styles/skins/evolution/planeten/trockenplanet05.jpg
deleted file mode 100644
index 4b77193..0000000
Binary files a/styles/skins/evolution/planeten/trockenplanet05.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/trockenplanet06.jpg b/styles/skins/evolution/planeten/trockenplanet06.jpg
deleted file mode 100644
index 0137d65..0000000
Binary files a/styles/skins/evolution/planeten/trockenplanet06.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/trockenplanet07.jpg b/styles/skins/evolution/planeten/trockenplanet07.jpg
deleted file mode 100644
index 138ac6e..0000000
Binary files a/styles/skins/evolution/planeten/trockenplanet07.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/trockenplanet08.jpg b/styles/skins/evolution/planeten/trockenplanet08.jpg
deleted file mode 100644
index b7863c0..0000000
Binary files a/styles/skins/evolution/planeten/trockenplanet08.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/trockenplanet09.jpg b/styles/skins/evolution/planeten/trockenplanet09.jpg
deleted file mode 100644
index 3ef799f..0000000
Binary files a/styles/skins/evolution/planeten/trockenplanet09.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/trockenplanet10.jpg b/styles/skins/evolution/planeten/trockenplanet10.jpg
deleted file mode 100644
index 5d3032e..0000000
Binary files a/styles/skins/evolution/planeten/trockenplanet10.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/wasserplanet01.jpg b/styles/skins/evolution/planeten/wasserplanet01.jpg
deleted file mode 100644
index eebf55a..0000000
Binary files a/styles/skins/evolution/planeten/wasserplanet01.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/wasserplanet02.jpg b/styles/skins/evolution/planeten/wasserplanet02.jpg
deleted file mode 100644
index 8dc9b2f..0000000
Binary files a/styles/skins/evolution/planeten/wasserplanet02.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/wasserplanet03.jpg b/styles/skins/evolution/planeten/wasserplanet03.jpg
deleted file mode 100644
index add4b76..0000000
Binary files a/styles/skins/evolution/planeten/wasserplanet03.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/wasserplanet04.jpg b/styles/skins/evolution/planeten/wasserplanet04.jpg
deleted file mode 100644
index 2fdbcaa..0000000
Binary files a/styles/skins/evolution/planeten/wasserplanet04.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/wasserplanet05.jpg b/styles/skins/evolution/planeten/wasserplanet05.jpg
deleted file mode 100644
index 2743733..0000000
Binary files a/styles/skins/evolution/planeten/wasserplanet05.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/wasserplanet06.jpg b/styles/skins/evolution/planeten/wasserplanet06.jpg
deleted file mode 100644
index ae24a12..0000000
Binary files a/styles/skins/evolution/planeten/wasserplanet06.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/wasserplanet07.jpg b/styles/skins/evolution/planeten/wasserplanet07.jpg
deleted file mode 100644
index a4f6d35..0000000
Binary files a/styles/skins/evolution/planeten/wasserplanet07.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/wasserplanet08.jpg b/styles/skins/evolution/planeten/wasserplanet08.jpg
deleted file mode 100644
index 0f8872c..0000000
Binary files a/styles/skins/evolution/planeten/wasserplanet08.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/wasserplanet09.jpg b/styles/skins/evolution/planeten/wasserplanet09.jpg
deleted file mode 100644
index 374be3a..0000000
Binary files a/styles/skins/evolution/planeten/wasserplanet09.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/wuestenplanet01.jpg b/styles/skins/evolution/planeten/wuestenplanet01.jpg
deleted file mode 100644
index 29266f4..0000000
Binary files a/styles/skins/evolution/planeten/wuestenplanet01.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/wuestenplanet02.jpg b/styles/skins/evolution/planeten/wuestenplanet02.jpg
deleted file mode 100644
index efad539..0000000
Binary files a/styles/skins/evolution/planeten/wuestenplanet02.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/wuestenplanet03.jpg b/styles/skins/evolution/planeten/wuestenplanet03.jpg
deleted file mode 100644
index 3de3f8e..0000000
Binary files a/styles/skins/evolution/planeten/wuestenplanet03.jpg and /dev/null differ
diff --git a/styles/skins/evolution/planeten/wuestenplanet04.jpg b/styles/skins/evolution/planeten/wuestenplanet04.jpg
deleted file mode 100644
index aa76e8f..0000000
Binary files a/styles/skins/evolution/planeten/wuestenplanet04.jpg and /dev/null differ
diff --git a/scripts/index.htm b/styles/skins/index.html
similarity index 100%
rename from scripts/index.htm
rename to styles/skins/index.html
diff --git a/styles/skins/New-Year!/formate.css b/styles/skins/xgproyect/formate.css
similarity index 100%
rename from styles/skins/New-Year!/formate.css
rename to styles/skins/xgproyect/formate.css
diff --git a/styles/skins/New-Year!/images/.DS_Store b/styles/skins/xgproyect/gebaeude/.DS_Store
similarity index 100%
rename from styles/skins/New-Year!/images/.DS_Store
rename to styles/skins/xgproyect/gebaeude/.DS_Store
diff --git a/styles/skins/New-Year!/gebaeude/1.gif b/styles/skins/xgproyect/gebaeude/1.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/1.gif
rename to styles/skins/xgproyect/gebaeude/1.gif
diff --git a/styles/skins/New-Year!/gebaeude/106.gif b/styles/skins/xgproyect/gebaeude/106.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/106.gif
rename to styles/skins/xgproyect/gebaeude/106.gif
diff --git a/styles/skins/New-Year!/gebaeude/108.gif b/styles/skins/xgproyect/gebaeude/108.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/108.gif
rename to styles/skins/xgproyect/gebaeude/108.gif
diff --git a/styles/skins/New-Year!/gebaeude/109.gif b/styles/skins/xgproyect/gebaeude/109.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/109.gif
rename to styles/skins/xgproyect/gebaeude/109.gif
diff --git a/styles/skins/New-Year!/gebaeude/110.gif b/styles/skins/xgproyect/gebaeude/110.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/110.gif
rename to styles/skins/xgproyect/gebaeude/110.gif
diff --git a/styles/skins/New-Year!/gebaeude/111.gif b/styles/skins/xgproyect/gebaeude/111.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/111.gif
rename to styles/skins/xgproyect/gebaeude/111.gif
diff --git a/styles/skins/New-Year!/gebaeude/113.gif b/styles/skins/xgproyect/gebaeude/113.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/113.gif
rename to styles/skins/xgproyect/gebaeude/113.gif
diff --git a/styles/skins/New-Year!/gebaeude/114.gif b/styles/skins/xgproyect/gebaeude/114.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/114.gif
rename to styles/skins/xgproyect/gebaeude/114.gif
diff --git a/styles/skins/New-Year!/gebaeude/115.gif b/styles/skins/xgproyect/gebaeude/115.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/115.gif
rename to styles/skins/xgproyect/gebaeude/115.gif
diff --git a/styles/skins/New-Year!/gebaeude/117.gif b/styles/skins/xgproyect/gebaeude/117.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/117.gif
rename to styles/skins/xgproyect/gebaeude/117.gif
diff --git a/styles/skins/New-Year!/gebaeude/118.gif b/styles/skins/xgproyect/gebaeude/118.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/118.gif
rename to styles/skins/xgproyect/gebaeude/118.gif
diff --git a/styles/skins/New-Year!/gebaeude/12.gif b/styles/skins/xgproyect/gebaeude/12.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/12.gif
rename to styles/skins/xgproyect/gebaeude/12.gif
diff --git a/styles/skins/New-Year!/gebaeude/120.gif b/styles/skins/xgproyect/gebaeude/120.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/120.gif
rename to styles/skins/xgproyect/gebaeude/120.gif
diff --git a/styles/skins/New-Year!/gebaeude/121.gif b/styles/skins/xgproyect/gebaeude/121.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/121.gif
rename to styles/skins/xgproyect/gebaeude/121.gif
diff --git a/styles/skins/New-Year!/gebaeude/122.gif b/styles/skins/xgproyect/gebaeude/122.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/122.gif
rename to styles/skins/xgproyect/gebaeude/122.gif
diff --git a/styles/skins/New-Year!/gebaeude/123.gif b/styles/skins/xgproyect/gebaeude/123.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/123.gif
rename to styles/skins/xgproyect/gebaeude/123.gif
diff --git a/styles/skins/New-Year!/gebaeude/124.gif b/styles/skins/xgproyect/gebaeude/124.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/124.gif
rename to styles/skins/xgproyect/gebaeude/124.gif
diff --git a/styles/skins/New-Year!/gebaeude/14.gif b/styles/skins/xgproyect/gebaeude/14.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/14.gif
rename to styles/skins/xgproyect/gebaeude/14.gif
diff --git a/styles/skins/New-Year!/gebaeude/15.gif b/styles/skins/xgproyect/gebaeude/15.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/15.gif
rename to styles/skins/xgproyect/gebaeude/15.gif
diff --git a/styles/skins/New-Year!/gebaeude/199.gif b/styles/skins/xgproyect/gebaeude/199.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/199.gif
rename to styles/skins/xgproyect/gebaeude/199.gif
diff --git a/styles/skins/New-Year!/gebaeude/2.gif b/styles/skins/xgproyect/gebaeude/2.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/2.gif
rename to styles/skins/xgproyect/gebaeude/2.gif
diff --git a/styles/skins/New-Year!/gebaeude/202.gif b/styles/skins/xgproyect/gebaeude/202.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/202.gif
rename to styles/skins/xgproyect/gebaeude/202.gif
diff --git a/styles/skins/New-Year!/gebaeude/203.gif b/styles/skins/xgproyect/gebaeude/203.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/203.gif
rename to styles/skins/xgproyect/gebaeude/203.gif
diff --git a/styles/skins/New-Year!/gebaeude/204.gif b/styles/skins/xgproyect/gebaeude/204.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/204.gif
rename to styles/skins/xgproyect/gebaeude/204.gif
diff --git a/styles/skins/New-Year!/gebaeude/205.gif b/styles/skins/xgproyect/gebaeude/205.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/205.gif
rename to styles/skins/xgproyect/gebaeude/205.gif
diff --git a/styles/skins/New-Year!/gebaeude/206.gif b/styles/skins/xgproyect/gebaeude/206.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/206.gif
rename to styles/skins/xgproyect/gebaeude/206.gif
diff --git a/styles/skins/New-Year!/gebaeude/207.gif b/styles/skins/xgproyect/gebaeude/207.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/207.gif
rename to styles/skins/xgproyect/gebaeude/207.gif
diff --git a/styles/skins/New-Year!/gebaeude/208.gif b/styles/skins/xgproyect/gebaeude/208.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/208.gif
rename to styles/skins/xgproyect/gebaeude/208.gif
diff --git a/styles/skins/New-Year!/gebaeude/209.gif b/styles/skins/xgproyect/gebaeude/209.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/209.gif
rename to styles/skins/xgproyect/gebaeude/209.gif
diff --git a/styles/skins/New-Year!/gebaeude/21.gif b/styles/skins/xgproyect/gebaeude/21.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/21.gif
rename to styles/skins/xgproyect/gebaeude/21.gif
diff --git a/styles/skins/New-Year!/gebaeude/210.gif b/styles/skins/xgproyect/gebaeude/210.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/210.gif
rename to styles/skins/xgproyect/gebaeude/210.gif
diff --git a/styles/skins/New-Year!/gebaeude/211.gif b/styles/skins/xgproyect/gebaeude/211.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/211.gif
rename to styles/skins/xgproyect/gebaeude/211.gif
diff --git a/styles/skins/New-Year!/gebaeude/212.gif b/styles/skins/xgproyect/gebaeude/212.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/212.gif
rename to styles/skins/xgproyect/gebaeude/212.gif
diff --git a/styles/skins/New-Year!/gebaeude/213.gif b/styles/skins/xgproyect/gebaeude/213.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/213.gif
rename to styles/skins/xgproyect/gebaeude/213.gif
diff --git a/styles/skins/New-Year!/gebaeude/214.gif b/styles/skins/xgproyect/gebaeude/214.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/214.gif
rename to styles/skins/xgproyect/gebaeude/214.gif
diff --git a/styles/skins/New-Year!/gebaeude/215.gif b/styles/skins/xgproyect/gebaeude/215.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/215.gif
rename to styles/skins/xgproyect/gebaeude/215.gif
diff --git a/styles/skins/New-Year!/gebaeude/22.gif b/styles/skins/xgproyect/gebaeude/22.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/22.gif
rename to styles/skins/xgproyect/gebaeude/22.gif
diff --git a/styles/skins/New-Year!/gebaeude/23.gif b/styles/skins/xgproyect/gebaeude/23.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/23.gif
rename to styles/skins/xgproyect/gebaeude/23.gif
diff --git a/styles/skins/New-Year!/gebaeude/24.gif b/styles/skins/xgproyect/gebaeude/24.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/24.gif
rename to styles/skins/xgproyect/gebaeude/24.gif
diff --git a/styles/skins/New-Year!/gebaeude/3.gif b/styles/skins/xgproyect/gebaeude/3.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/3.gif
rename to styles/skins/xgproyect/gebaeude/3.gif
diff --git a/styles/skins/New-Year!/gebaeude/31.gif b/styles/skins/xgproyect/gebaeude/31.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/31.gif
rename to styles/skins/xgproyect/gebaeude/31.gif
diff --git a/styles/skins/New-Year!/gebaeude/33.gif b/styles/skins/xgproyect/gebaeude/33.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/33.gif
rename to styles/skins/xgproyect/gebaeude/33.gif
diff --git a/styles/skins/New-Year!/gebaeude/34.gif b/styles/skins/xgproyect/gebaeude/34.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/34.gif
rename to styles/skins/xgproyect/gebaeude/34.gif
diff --git a/styles/skins/New-Year!/gebaeude/4.gif b/styles/skins/xgproyect/gebaeude/4.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/4.gif
rename to styles/skins/xgproyect/gebaeude/4.gif
diff --git a/styles/skins/New-Year!/gebaeude/401.gif b/styles/skins/xgproyect/gebaeude/401.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/401.gif
rename to styles/skins/xgproyect/gebaeude/401.gif
diff --git a/styles/skins/New-Year!/gebaeude/402.gif b/styles/skins/xgproyect/gebaeude/402.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/402.gif
rename to styles/skins/xgproyect/gebaeude/402.gif
diff --git a/styles/skins/New-Year!/gebaeude/403.gif b/styles/skins/xgproyect/gebaeude/403.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/403.gif
rename to styles/skins/xgproyect/gebaeude/403.gif
diff --git a/styles/skins/New-Year!/gebaeude/404.gif b/styles/skins/xgproyect/gebaeude/404.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/404.gif
rename to styles/skins/xgproyect/gebaeude/404.gif
diff --git a/styles/skins/New-Year!/gebaeude/405.gif b/styles/skins/xgproyect/gebaeude/405.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/405.gif
rename to styles/skins/xgproyect/gebaeude/405.gif
diff --git a/styles/skins/New-Year!/gebaeude/406.gif b/styles/skins/xgproyect/gebaeude/406.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/406.gif
rename to styles/skins/xgproyect/gebaeude/406.gif
diff --git a/styles/skins/New-Year!/gebaeude/407.gif b/styles/skins/xgproyect/gebaeude/407.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/407.gif
rename to styles/skins/xgproyect/gebaeude/407.gif
diff --git a/styles/skins/New-Year!/gebaeude/408.gif b/styles/skins/xgproyect/gebaeude/408.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/408.gif
rename to styles/skins/xgproyect/gebaeude/408.gif
diff --git a/styles/skins/New-Year!/gebaeude/41.gif b/styles/skins/xgproyect/gebaeude/41.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/41.gif
rename to styles/skins/xgproyect/gebaeude/41.gif
diff --git a/styles/skins/New-Year!/gebaeude/42.gif b/styles/skins/xgproyect/gebaeude/42.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/42.gif
rename to styles/skins/xgproyect/gebaeude/42.gif
diff --git a/styles/skins/New-Year!/gebaeude/43.gif b/styles/skins/xgproyect/gebaeude/43.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/43.gif
rename to styles/skins/xgproyect/gebaeude/43.gif
diff --git a/styles/skins/New-Year!/gebaeude/44.gif b/styles/skins/xgproyect/gebaeude/44.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/44.gif
rename to styles/skins/xgproyect/gebaeude/44.gif
diff --git a/styles/skins/New-Year!/gebaeude/502.gif b/styles/skins/xgproyect/gebaeude/502.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/502.gif
rename to styles/skins/xgproyect/gebaeude/502.gif
diff --git a/styles/skins/New-Year!/gebaeude/503.gif b/styles/skins/xgproyect/gebaeude/503.gif
similarity index 100%
rename from styles/skins/New-Year!/gebaeude/503.gif
rename to styles/skins/xgproyect/gebaeude/503.gif
diff --git a/styles/images/officiers/601.jpg b/styles/skins/xgproyect/gebaeude/601.jpg
similarity index 100%
rename from styles/images/officiers/601.jpg
rename to styles/skins/xgproyect/gebaeude/601.jpg
diff --git a/styles/images/officiers/602.jpg b/styles/skins/xgproyect/gebaeude/602.jpg
similarity index 100%
rename from styles/images/officiers/602.jpg
rename to styles/skins/xgproyect/gebaeude/602.jpg
diff --git a/styles/images/officiers/603.jpg b/styles/skins/xgproyect/gebaeude/603.jpg
similarity index 100%
rename from styles/images/officiers/603.jpg
rename to styles/skins/xgproyect/gebaeude/603.jpg
diff --git a/styles/images/officiers/604.jpg b/styles/skins/xgproyect/gebaeude/604.jpg
similarity index 100%
rename from styles/images/officiers/604.jpg
rename to styles/skins/xgproyect/gebaeude/604.jpg
diff --git a/styles/css/index.htm b/styles/skins/xgproyect/gebaeude/index.html
similarity index 100%
rename from styles/css/index.htm
rename to styles/skins/xgproyect/gebaeude/index.html
diff --git a/styles/skins/New-Year!/img/.DS_Store b/styles/skins/xgproyect/gfx/.DS_Store
similarity index 100%
rename from styles/skins/New-Year!/img/.DS_Store
rename to styles/skins/xgproyect/gfx/.DS_Store
diff --git a/styles/images/Adm/index.htm b/styles/skins/xgproyect/gfx/index.html
similarity index 100%
rename from styles/images/Adm/index.htm
rename to styles/skins/xgproyect/gfx/index.html
diff --git a/styles/skins/New-Year!/gfx/info-help.jpg b/styles/skins/xgproyect/gfx/info-help.jpg
similarity index 100%
rename from styles/skins/New-Year!/gfx/info-help.jpg
rename to styles/skins/xgproyect/gfx/info-help.jpg
diff --git a/styles/skins/New-Year!/gfx/ogame-produktion.jpg b/styles/skins/xgproyect/gfx/ogame-produktion.jpg
similarity index 100%
rename from styles/skins/New-Year!/gfx/ogame-produktion.jpg
rename to styles/skins/xgproyect/gfx/ogame-produktion.jpg
diff --git a/styles/skins/New-Year!/gfx/user-menu.jpg b/styles/skins/xgproyect/gfx/user-menu.jpg
similarity index 100%
rename from styles/skins/New-Year!/gfx/user-menu.jpg
rename to styles/skins/xgproyect/gfx/user-menu.jpg
diff --git a/styles/skins/New-Year!/pic/.DS_Store b/styles/skins/xgproyect/images/.DS_Store
similarity index 100%
rename from styles/skins/New-Year!/pic/.DS_Store
rename to styles/skins/xgproyect/images/.DS_Store
diff --git a/styles/skins/NewGame/images/darkmatter.jpg b/styles/skins/xgproyect/images/darkmatter.jpg
similarity index 100%
rename from styles/skins/NewGame/images/darkmatter.jpg
rename to styles/skins/xgproyect/images/darkmatter.jpg
diff --git a/styles/skins/evolution/images/deuterium.gif b/styles/skins/xgproyect/images/deuterium.gif
similarity index 100%
rename from styles/skins/evolution/images/deuterium.gif
rename to styles/skins/xgproyect/images/deuterium.gif
diff --git a/styles/skins/evolution/images/energie.gif b/styles/skins/xgproyect/images/energie.gif
similarity index 100%
rename from styles/skins/evolution/images/energie.gif
rename to styles/skins/xgproyect/images/energie.gif
diff --git a/styles/images/index.htm b/styles/skins/xgproyect/images/index.html
similarity index 100%
rename from styles/images/index.htm
rename to styles/skins/xgproyect/images/index.html
diff --git a/styles/skins/evolution/images/kristall.gif b/styles/skins/xgproyect/images/kristall.gif
similarity index 100%
rename from styles/skins/evolution/images/kristall.gif
rename to styles/skins/xgproyect/images/kristall.gif
diff --git a/styles/skins/evolution/images/metall.gif b/styles/skins/xgproyect/images/metall.gif
similarity index 100%
rename from styles/skins/evolution/images/metall.gif
rename to styles/skins/xgproyect/images/metall.gif
diff --git a/styles/skins/New-Year!/planeten/.DS_Store b/styles/skins/xgproyect/img/.DS_Store
similarity index 100%
rename from styles/skins/New-Year!/planeten/.DS_Store
rename to styles/skins/xgproyect/img/.DS_Store
diff --git a/styles/skins/New-Year!/img/b.gif b/styles/skins/xgproyect/img/b.gif
similarity index 100%
rename from styles/skins/New-Year!/img/b.gif
rename to styles/skins/xgproyect/img/b.gif
diff --git a/styles/skins/evolution/img/background.jpg b/styles/skins/xgproyect/img/background.jpg
similarity index 100%
rename from styles/skins/evolution/img/background.jpg
rename to styles/skins/xgproyect/img/background.jpg
diff --git a/styles/skins/New-Year!/img/bg1.gif b/styles/skins/xgproyect/img/bg1.gif
similarity index 100%
rename from styles/skins/New-Year!/img/bg1.gif
rename to styles/skins/xgproyect/img/bg1.gif
diff --git a/styles/skins/New-Year!/img/blank.gif b/styles/skins/xgproyect/img/blank.gif
similarity index 100%
rename from styles/skins/New-Year!/img/blank.gif
rename to styles/skins/xgproyect/img/blank.gif
diff --git a/styles/skins/New-Year!/img/e.gif b/styles/skins/xgproyect/img/e.gif
similarity index 100%
rename from styles/skins/New-Year!/img/e.gif
rename to styles/skins/xgproyect/img/e.gif
diff --git a/styles/images/officiers/index.htm b/styles/skins/xgproyect/img/index.html
similarity index 100%
rename from styles/images/officiers/index.htm
rename to styles/skins/xgproyect/img/index.html
diff --git a/styles/skins/New-Year!/img/m.gif b/styles/skins/xgproyect/img/m.gif
similarity index 100%
rename from styles/skins/New-Year!/img/m.gif
rename to styles/skins/xgproyect/img/m.gif
diff --git a/styles/skins/New-Year!/img/r.gif b/styles/skins/xgproyect/img/r.gif
similarity index 100%
rename from styles/skins/New-Year!/img/r.gif
rename to styles/skins/xgproyect/img/r.gif
diff --git a/styles/skins/New-Year!/img/s.gif b/styles/skins/xgproyect/img/s.gif
similarity index 100%
rename from styles/skins/New-Year!/img/s.gif
rename to styles/skins/xgproyect/img/s.gif
diff --git a/styles/index.htm b/styles/skins/xgproyect/index.html
similarity index 100%
rename from styles/index.htm
rename to styles/skins/xgproyect/index.html
diff --git a/styles/skins/New-Year!/planeten/small/.DS_Store b/styles/skins/xgproyect/pic/.DS_Store
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/.DS_Store
rename to styles/skins/xgproyect/pic/.DS_Store
diff --git a/styles/skins/New-Year!/pic/abort.gif b/styles/skins/xgproyect/pic/abort.gif
similarity index 100%
rename from styles/skins/New-Year!/pic/abort.gif
rename to styles/skins/xgproyect/pic/abort.gif
diff --git a/styles/skins/New-Year!/pic/appwiz.gif b/styles/skins/xgproyect/pic/appwiz.gif
similarity index 100%
rename from styles/skins/New-Year!/pic/appwiz.gif
rename to styles/skins/xgproyect/pic/appwiz.gif
diff --git a/styles/skins/index.htm b/styles/skins/xgproyect/pic/index.html
similarity index 100%
rename from styles/skins/index.htm
rename to styles/skins/xgproyect/pic/index.html
diff --git a/styles/skins/New-Year!/pic/key.gif b/styles/skins/xgproyect/pic/key.gif
similarity index 100%
rename from styles/skins/New-Year!/pic/key.gif
rename to styles/skins/xgproyect/pic/key.gif
diff --git a/styles/skins/NewSkins/gebaeude/.DS_Store b/styles/skins/xgproyect/planeten/.DS_Store
similarity index 100%
rename from styles/skins/NewSkins/gebaeude/.DS_Store
rename to styles/skins/xgproyect/planeten/.DS_Store
diff --git a/styles/skins/New-Year!/planeten/debris.jpg b/styles/skins/xgproyect/planeten/debris.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/debris.jpg
rename to styles/skins/xgproyect/planeten/debris.jpg
diff --git a/styles/skins/New-Year!/planeten/dschjungelplanet01.jpg b/styles/skins/xgproyect/planeten/dschjungelplanet01.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/dschjungelplanet01.jpg
rename to styles/skins/xgproyect/planeten/dschjungelplanet01.jpg
diff --git a/styles/skins/New-Year!/planeten/dschjungelplanet02.jpg b/styles/skins/xgproyect/planeten/dschjungelplanet02.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/dschjungelplanet02.jpg
rename to styles/skins/xgproyect/planeten/dschjungelplanet02.jpg
diff --git a/styles/skins/New-Year!/planeten/dschjungelplanet03.jpg b/styles/skins/xgproyect/planeten/dschjungelplanet03.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/dschjungelplanet03.jpg
rename to styles/skins/xgproyect/planeten/dschjungelplanet03.jpg
diff --git a/styles/skins/New-Year!/planeten/dschjungelplanet04.jpg b/styles/skins/xgproyect/planeten/dschjungelplanet04.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/dschjungelplanet04.jpg
rename to styles/skins/xgproyect/planeten/dschjungelplanet04.jpg
diff --git a/styles/skins/New-Year!/planeten/dschjungelplanet05.jpg b/styles/skins/xgproyect/planeten/dschjungelplanet05.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/dschjungelplanet05.jpg
rename to styles/skins/xgproyect/planeten/dschjungelplanet05.jpg
diff --git a/styles/skins/New-Year!/planeten/dschjungelplanet06.jpg b/styles/skins/xgproyect/planeten/dschjungelplanet06.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/dschjungelplanet06.jpg
rename to styles/skins/xgproyect/planeten/dschjungelplanet06.jpg
diff --git a/styles/skins/New-Year!/planeten/dschjungelplanet07.jpg b/styles/skins/xgproyect/planeten/dschjungelplanet07.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/dschjungelplanet07.jpg
rename to styles/skins/xgproyect/planeten/dschjungelplanet07.jpg
diff --git a/styles/skins/New-Year!/planeten/dschjungelplanet08.jpg b/styles/skins/xgproyect/planeten/dschjungelplanet08.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/dschjungelplanet08.jpg
rename to styles/skins/xgproyect/planeten/dschjungelplanet08.jpg
diff --git a/styles/skins/New-Year!/planeten/dschjungelplanet09.jpg b/styles/skins/xgproyect/planeten/dschjungelplanet09.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/dschjungelplanet09.jpg
rename to styles/skins/xgproyect/planeten/dschjungelplanet09.jpg
diff --git a/styles/skins/New-Year!/planeten/dschjungelplanet10.jpg b/styles/skins/xgproyect/planeten/dschjungelplanet10.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/dschjungelplanet10.jpg
rename to styles/skins/xgproyect/planeten/dschjungelplanet10.jpg
diff --git a/styles/skins/New-Year!/planeten/eisplanet01.jpg b/styles/skins/xgproyect/planeten/eisplanet01.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/eisplanet01.jpg
rename to styles/skins/xgproyect/planeten/eisplanet01.jpg
diff --git a/styles/skins/New-Year!/planeten/eisplanet02.jpg b/styles/skins/xgproyect/planeten/eisplanet02.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/eisplanet02.jpg
rename to styles/skins/xgproyect/planeten/eisplanet02.jpg
diff --git a/styles/skins/New-Year!/planeten/eisplanet03.jpg b/styles/skins/xgproyect/planeten/eisplanet03.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/eisplanet03.jpg
rename to styles/skins/xgproyect/planeten/eisplanet03.jpg
diff --git a/styles/skins/New-Year!/planeten/eisplanet04.jpg b/styles/skins/xgproyect/planeten/eisplanet04.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/eisplanet04.jpg
rename to styles/skins/xgproyect/planeten/eisplanet04.jpg
diff --git a/styles/skins/New-Year!/planeten/eisplanet05.jpg b/styles/skins/xgproyect/planeten/eisplanet05.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/eisplanet05.jpg
rename to styles/skins/xgproyect/planeten/eisplanet05.jpg
diff --git a/styles/skins/New-Year!/planeten/eisplanet06.jpg b/styles/skins/xgproyect/planeten/eisplanet06.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/eisplanet06.jpg
rename to styles/skins/xgproyect/planeten/eisplanet06.jpg
diff --git a/styles/skins/New-Year!/planeten/eisplanet07.jpg b/styles/skins/xgproyect/planeten/eisplanet07.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/eisplanet07.jpg
rename to styles/skins/xgproyect/planeten/eisplanet07.jpg
diff --git a/styles/skins/New-Year!/planeten/eisplanet08.jpg b/styles/skins/xgproyect/planeten/eisplanet08.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/eisplanet08.jpg
rename to styles/skins/xgproyect/planeten/eisplanet08.jpg
diff --git a/styles/skins/New-Year!/planeten/eisplanet09.jpg b/styles/skins/xgproyect/planeten/eisplanet09.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/eisplanet09.jpg
rename to styles/skins/xgproyect/planeten/eisplanet09.jpg
diff --git a/styles/skins/New-Year!/planeten/eisplanet10.jpg b/styles/skins/xgproyect/planeten/eisplanet10.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/eisplanet10.jpg
rename to styles/skins/xgproyect/planeten/eisplanet10.jpg
diff --git a/styles/skins/New-Year!/planeten/gasplanet01.jpg b/styles/skins/xgproyect/planeten/gasplanet01.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/gasplanet01.jpg
rename to styles/skins/xgproyect/planeten/gasplanet01.jpg
diff --git a/styles/skins/New-Year!/planeten/gasplanet02.jpg b/styles/skins/xgproyect/planeten/gasplanet02.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/gasplanet02.jpg
rename to styles/skins/xgproyect/planeten/gasplanet02.jpg
diff --git a/styles/skins/New-Year!/planeten/gasplanet03.jpg b/styles/skins/xgproyect/planeten/gasplanet03.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/gasplanet03.jpg
rename to styles/skins/xgproyect/planeten/gasplanet03.jpg
diff --git a/styles/skins/New-Year!/planeten/gasplanet04.jpg b/styles/skins/xgproyect/planeten/gasplanet04.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/gasplanet04.jpg
rename to styles/skins/xgproyect/planeten/gasplanet04.jpg
diff --git a/styles/skins/New-Year!/planeten/gasplanet05.jpg b/styles/skins/xgproyect/planeten/gasplanet05.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/gasplanet05.jpg
rename to styles/skins/xgproyect/planeten/gasplanet05.jpg
diff --git a/styles/skins/New-Year!/planeten/gasplanet06.jpg b/styles/skins/xgproyect/planeten/gasplanet06.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/gasplanet06.jpg
rename to styles/skins/xgproyect/planeten/gasplanet06.jpg
diff --git a/styles/skins/New-Year!/planeten/gasplanet07.jpg b/styles/skins/xgproyect/planeten/gasplanet07.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/gasplanet07.jpg
rename to styles/skins/xgproyect/planeten/gasplanet07.jpg
diff --git a/styles/skins/New-Year!/planeten/gasplanet08.jpg b/styles/skins/xgproyect/planeten/gasplanet08.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/gasplanet08.jpg
rename to styles/skins/xgproyect/planeten/gasplanet08.jpg
diff --git a/styles/templates/adm/EditorTPL/index.htm b/styles/skins/xgproyect/planeten/index.html
similarity index 100%
rename from styles/templates/adm/EditorTPL/index.htm
rename to styles/skins/xgproyect/planeten/index.html
diff --git a/styles/skins/New-Year!/planeten/mond.jpg b/styles/skins/xgproyect/planeten/mond.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/mond.jpg
rename to styles/skins/xgproyect/planeten/mond.jpg
diff --git a/styles/skins/New-Year!/planeten/normaltempplanet01.jpg b/styles/skins/xgproyect/planeten/normaltempplanet01.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/normaltempplanet01.jpg
rename to styles/skins/xgproyect/planeten/normaltempplanet01.jpg
diff --git a/styles/skins/New-Year!/planeten/normaltempplanet02.jpg b/styles/skins/xgproyect/planeten/normaltempplanet02.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/normaltempplanet02.jpg
rename to styles/skins/xgproyect/planeten/normaltempplanet02.jpg
diff --git a/styles/skins/New-Year!/planeten/normaltempplanet03.jpg b/styles/skins/xgproyect/planeten/normaltempplanet03.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/normaltempplanet03.jpg
rename to styles/skins/xgproyect/planeten/normaltempplanet03.jpg
diff --git a/styles/skins/New-Year!/planeten/normaltempplanet04.jpg b/styles/skins/xgproyect/planeten/normaltempplanet04.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/normaltempplanet04.jpg
rename to styles/skins/xgproyect/planeten/normaltempplanet04.jpg
diff --git a/styles/skins/New-Year!/planeten/normaltempplanet05.jpg b/styles/skins/xgproyect/planeten/normaltempplanet05.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/normaltempplanet05.jpg
rename to styles/skins/xgproyect/planeten/normaltempplanet05.jpg
diff --git a/styles/skins/New-Year!/planeten/normaltempplanet06.jpg b/styles/skins/xgproyect/planeten/normaltempplanet06.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/normaltempplanet06.jpg
rename to styles/skins/xgproyect/planeten/normaltempplanet06.jpg
diff --git a/styles/skins/New-Year!/planeten/normaltempplanet07.jpg b/styles/skins/xgproyect/planeten/normaltempplanet07.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/normaltempplanet07.jpg
rename to styles/skins/xgproyect/planeten/normaltempplanet07.jpg
diff --git a/styles/skins/xgproyect/planeten/small/.DS_Store b/styles/skins/xgproyect/planeten/small/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/styles/skins/xgproyect/planeten/small/.DS_Store differ
diff --git a/styles/templates/adm/index.htm b/styles/skins/xgproyect/planeten/small/index.html
similarity index 100%
rename from styles/templates/adm/index.htm
rename to styles/skins/xgproyect/planeten/small/index.html
diff --git a/styles/skins/New-Year!/planeten/small/s_dschjungelplanet01.jpg b/styles/skins/xgproyect/planeten/small/s_dschjungelplanet01.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_dschjungelplanet01.jpg
rename to styles/skins/xgproyect/planeten/small/s_dschjungelplanet01.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_dschjungelplanet02.jpg b/styles/skins/xgproyect/planeten/small/s_dschjungelplanet02.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_dschjungelplanet02.jpg
rename to styles/skins/xgproyect/planeten/small/s_dschjungelplanet02.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_dschjungelplanet03.jpg b/styles/skins/xgproyect/planeten/small/s_dschjungelplanet03.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_dschjungelplanet03.jpg
rename to styles/skins/xgproyect/planeten/small/s_dschjungelplanet03.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_dschjungelplanet04.jpg b/styles/skins/xgproyect/planeten/small/s_dschjungelplanet04.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_dschjungelplanet04.jpg
rename to styles/skins/xgproyect/planeten/small/s_dschjungelplanet04.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_dschjungelplanet05.jpg b/styles/skins/xgproyect/planeten/small/s_dschjungelplanet05.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_dschjungelplanet05.jpg
rename to styles/skins/xgproyect/planeten/small/s_dschjungelplanet05.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_dschjungelplanet06.jpg b/styles/skins/xgproyect/planeten/small/s_dschjungelplanet06.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_dschjungelplanet06.jpg
rename to styles/skins/xgproyect/planeten/small/s_dschjungelplanet06.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_dschjungelplanet07.jpg b/styles/skins/xgproyect/planeten/small/s_dschjungelplanet07.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_dschjungelplanet07.jpg
rename to styles/skins/xgproyect/planeten/small/s_dschjungelplanet07.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_dschjungelplanet08.jpg b/styles/skins/xgproyect/planeten/small/s_dschjungelplanet08.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_dschjungelplanet08.jpg
rename to styles/skins/xgproyect/planeten/small/s_dschjungelplanet08.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_dschjungelplanet09.jpg b/styles/skins/xgproyect/planeten/small/s_dschjungelplanet09.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_dschjungelplanet09.jpg
rename to styles/skins/xgproyect/planeten/small/s_dschjungelplanet09.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_dschjungelplanet10.jpg b/styles/skins/xgproyect/planeten/small/s_dschjungelplanet10.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_dschjungelplanet10.jpg
rename to styles/skins/xgproyect/planeten/small/s_dschjungelplanet10.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_eisplanet01.jpg b/styles/skins/xgproyect/planeten/small/s_eisplanet01.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_eisplanet01.jpg
rename to styles/skins/xgproyect/planeten/small/s_eisplanet01.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_eisplanet02.jpg b/styles/skins/xgproyect/planeten/small/s_eisplanet02.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_eisplanet02.jpg
rename to styles/skins/xgproyect/planeten/small/s_eisplanet02.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_eisplanet03.jpg b/styles/skins/xgproyect/planeten/small/s_eisplanet03.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_eisplanet03.jpg
rename to styles/skins/xgproyect/planeten/small/s_eisplanet03.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_eisplanet04.jpg b/styles/skins/xgproyect/planeten/small/s_eisplanet04.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_eisplanet04.jpg
rename to styles/skins/xgproyect/planeten/small/s_eisplanet04.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_eisplanet05.jpg b/styles/skins/xgproyect/planeten/small/s_eisplanet05.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_eisplanet05.jpg
rename to styles/skins/xgproyect/planeten/small/s_eisplanet05.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_eisplanet06.jpg b/styles/skins/xgproyect/planeten/small/s_eisplanet06.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_eisplanet06.jpg
rename to styles/skins/xgproyect/planeten/small/s_eisplanet06.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_eisplanet07.jpg b/styles/skins/xgproyect/planeten/small/s_eisplanet07.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_eisplanet07.jpg
rename to styles/skins/xgproyect/planeten/small/s_eisplanet07.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_eisplanet08.jpg b/styles/skins/xgproyect/planeten/small/s_eisplanet08.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_eisplanet08.jpg
rename to styles/skins/xgproyect/planeten/small/s_eisplanet08.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_eisplanet09.jpg b/styles/skins/xgproyect/planeten/small/s_eisplanet09.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_eisplanet09.jpg
rename to styles/skins/xgproyect/planeten/small/s_eisplanet09.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_eisplanet10.jpg b/styles/skins/xgproyect/planeten/small/s_eisplanet10.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_eisplanet10.jpg
rename to styles/skins/xgproyect/planeten/small/s_eisplanet10.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_gasplanet01.jpg b/styles/skins/xgproyect/planeten/small/s_gasplanet01.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_gasplanet01.jpg
rename to styles/skins/xgproyect/planeten/small/s_gasplanet01.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_gasplanet02.jpg b/styles/skins/xgproyect/planeten/small/s_gasplanet02.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_gasplanet02.jpg
rename to styles/skins/xgproyect/planeten/small/s_gasplanet02.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_gasplanet03.jpg b/styles/skins/xgproyect/planeten/small/s_gasplanet03.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_gasplanet03.jpg
rename to styles/skins/xgproyect/planeten/small/s_gasplanet03.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_gasplanet04.jpg b/styles/skins/xgproyect/planeten/small/s_gasplanet04.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_gasplanet04.jpg
rename to styles/skins/xgproyect/planeten/small/s_gasplanet04.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_gasplanet05.jpg b/styles/skins/xgproyect/planeten/small/s_gasplanet05.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_gasplanet05.jpg
rename to styles/skins/xgproyect/planeten/small/s_gasplanet05.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_gasplanet06.jpg b/styles/skins/xgproyect/planeten/small/s_gasplanet06.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_gasplanet06.jpg
rename to styles/skins/xgproyect/planeten/small/s_gasplanet06.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_gasplanet07.jpg b/styles/skins/xgproyect/planeten/small/s_gasplanet07.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_gasplanet07.jpg
rename to styles/skins/xgproyect/planeten/small/s_gasplanet07.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_gasplanet08.jpg b/styles/skins/xgproyect/planeten/small/s_gasplanet08.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_gasplanet08.jpg
rename to styles/skins/xgproyect/planeten/small/s_gasplanet08.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_mond.jpg b/styles/skins/xgproyect/planeten/small/s_mond.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_mond.jpg
rename to styles/skins/xgproyect/planeten/small/s_mond.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_normaltempplanet01.jpg b/styles/skins/xgproyect/planeten/small/s_normaltempplanet01.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_normaltempplanet01.jpg
rename to styles/skins/xgproyect/planeten/small/s_normaltempplanet01.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_normaltempplanet02.jpg b/styles/skins/xgproyect/planeten/small/s_normaltempplanet02.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_normaltempplanet02.jpg
rename to styles/skins/xgproyect/planeten/small/s_normaltempplanet02.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_normaltempplanet03.jpg b/styles/skins/xgproyect/planeten/small/s_normaltempplanet03.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_normaltempplanet03.jpg
rename to styles/skins/xgproyect/planeten/small/s_normaltempplanet03.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_normaltempplanet04.jpg b/styles/skins/xgproyect/planeten/small/s_normaltempplanet04.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_normaltempplanet04.jpg
rename to styles/skins/xgproyect/planeten/small/s_normaltempplanet04.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_normaltempplanet05.jpg b/styles/skins/xgproyect/planeten/small/s_normaltempplanet05.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_normaltempplanet05.jpg
rename to styles/skins/xgproyect/planeten/small/s_normaltempplanet05.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_normaltempplanet06.jpg b/styles/skins/xgproyect/planeten/small/s_normaltempplanet06.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_normaltempplanet06.jpg
rename to styles/skins/xgproyect/planeten/small/s_normaltempplanet06.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_normaltempplanet07.jpg b/styles/skins/xgproyect/planeten/small/s_normaltempplanet07.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_normaltempplanet07.jpg
rename to styles/skins/xgproyect/planeten/small/s_normaltempplanet07.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_trockenplanet01.jpg b/styles/skins/xgproyect/planeten/small/s_trockenplanet01.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_trockenplanet01.jpg
rename to styles/skins/xgproyect/planeten/small/s_trockenplanet01.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_trockenplanet02.jpg b/styles/skins/xgproyect/planeten/small/s_trockenplanet02.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_trockenplanet02.jpg
rename to styles/skins/xgproyect/planeten/small/s_trockenplanet02.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_trockenplanet03.jpg b/styles/skins/xgproyect/planeten/small/s_trockenplanet03.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_trockenplanet03.jpg
rename to styles/skins/xgproyect/planeten/small/s_trockenplanet03.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_trockenplanet04.jpg b/styles/skins/xgproyect/planeten/small/s_trockenplanet04.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_trockenplanet04.jpg
rename to styles/skins/xgproyect/planeten/small/s_trockenplanet04.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_trockenplanet05.jpg b/styles/skins/xgproyect/planeten/small/s_trockenplanet05.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_trockenplanet05.jpg
rename to styles/skins/xgproyect/planeten/small/s_trockenplanet05.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_trockenplanet06.jpg b/styles/skins/xgproyect/planeten/small/s_trockenplanet06.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_trockenplanet06.jpg
rename to styles/skins/xgproyect/planeten/small/s_trockenplanet06.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_trockenplanet07.jpg b/styles/skins/xgproyect/planeten/small/s_trockenplanet07.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_trockenplanet07.jpg
rename to styles/skins/xgproyect/planeten/small/s_trockenplanet07.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_trockenplanet08.jpg b/styles/skins/xgproyect/planeten/small/s_trockenplanet08.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_trockenplanet08.jpg
rename to styles/skins/xgproyect/planeten/small/s_trockenplanet08.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_trockenplanet09.jpg b/styles/skins/xgproyect/planeten/small/s_trockenplanet09.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_trockenplanet09.jpg
rename to styles/skins/xgproyect/planeten/small/s_trockenplanet09.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_trockenplanet10.jpg b/styles/skins/xgproyect/planeten/small/s_trockenplanet10.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_trockenplanet10.jpg
rename to styles/skins/xgproyect/planeten/small/s_trockenplanet10.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_wasserplanet01.jpg b/styles/skins/xgproyect/planeten/small/s_wasserplanet01.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_wasserplanet01.jpg
rename to styles/skins/xgproyect/planeten/small/s_wasserplanet01.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_wasserplanet02.jpg b/styles/skins/xgproyect/planeten/small/s_wasserplanet02.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_wasserplanet02.jpg
rename to styles/skins/xgproyect/planeten/small/s_wasserplanet02.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_wasserplanet03.jpg b/styles/skins/xgproyect/planeten/small/s_wasserplanet03.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_wasserplanet03.jpg
rename to styles/skins/xgproyect/planeten/small/s_wasserplanet03.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_wasserplanet04.jpg b/styles/skins/xgproyect/planeten/small/s_wasserplanet04.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_wasserplanet04.jpg
rename to styles/skins/xgproyect/planeten/small/s_wasserplanet04.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_wasserplanet05.jpg b/styles/skins/xgproyect/planeten/small/s_wasserplanet05.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_wasserplanet05.jpg
rename to styles/skins/xgproyect/planeten/small/s_wasserplanet05.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_wasserplanet06.jpg b/styles/skins/xgproyect/planeten/small/s_wasserplanet06.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_wasserplanet06.jpg
rename to styles/skins/xgproyect/planeten/small/s_wasserplanet06.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_wasserplanet07.jpg b/styles/skins/xgproyect/planeten/small/s_wasserplanet07.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_wasserplanet07.jpg
rename to styles/skins/xgproyect/planeten/small/s_wasserplanet07.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_wasserplanet08.jpg b/styles/skins/xgproyect/planeten/small/s_wasserplanet08.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_wasserplanet08.jpg
rename to styles/skins/xgproyect/planeten/small/s_wasserplanet08.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_wasserplanet09.jpg b/styles/skins/xgproyect/planeten/small/s_wasserplanet09.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_wasserplanet09.jpg
rename to styles/skins/xgproyect/planeten/small/s_wasserplanet09.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_wuestenplanet01.jpg b/styles/skins/xgproyect/planeten/small/s_wuestenplanet01.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_wuestenplanet01.jpg
rename to styles/skins/xgproyect/planeten/small/s_wuestenplanet01.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_wuestenplanet02.jpg b/styles/skins/xgproyect/planeten/small/s_wuestenplanet02.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_wuestenplanet02.jpg
rename to styles/skins/xgproyect/planeten/small/s_wuestenplanet02.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_wuestenplanet03.jpg b/styles/skins/xgproyect/planeten/small/s_wuestenplanet03.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_wuestenplanet03.jpg
rename to styles/skins/xgproyect/planeten/small/s_wuestenplanet03.jpg
diff --git a/styles/skins/New-Year!/planeten/small/s_wuestenplanet04.jpg b/styles/skins/xgproyect/planeten/small/s_wuestenplanet04.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/small/s_wuestenplanet04.jpg
rename to styles/skins/xgproyect/planeten/small/s_wuestenplanet04.jpg
diff --git a/styles/skins/New-Year!/planeten/trockenplanet01.jpg b/styles/skins/xgproyect/planeten/trockenplanet01.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/trockenplanet01.jpg
rename to styles/skins/xgproyect/planeten/trockenplanet01.jpg
diff --git a/styles/skins/New-Year!/planeten/trockenplanet02.jpg b/styles/skins/xgproyect/planeten/trockenplanet02.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/trockenplanet02.jpg
rename to styles/skins/xgproyect/planeten/trockenplanet02.jpg
diff --git a/styles/skins/New-Year!/planeten/trockenplanet03.jpg b/styles/skins/xgproyect/planeten/trockenplanet03.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/trockenplanet03.jpg
rename to styles/skins/xgproyect/planeten/trockenplanet03.jpg
diff --git a/styles/skins/New-Year!/planeten/trockenplanet04.jpg b/styles/skins/xgproyect/planeten/trockenplanet04.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/trockenplanet04.jpg
rename to styles/skins/xgproyect/planeten/trockenplanet04.jpg
diff --git a/styles/skins/New-Year!/planeten/trockenplanet05.jpg b/styles/skins/xgproyect/planeten/trockenplanet05.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/trockenplanet05.jpg
rename to styles/skins/xgproyect/planeten/trockenplanet05.jpg
diff --git a/styles/skins/New-Year!/planeten/trockenplanet06.jpg b/styles/skins/xgproyect/planeten/trockenplanet06.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/trockenplanet06.jpg
rename to styles/skins/xgproyect/planeten/trockenplanet06.jpg
diff --git a/styles/skins/New-Year!/planeten/trockenplanet07.jpg b/styles/skins/xgproyect/planeten/trockenplanet07.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/trockenplanet07.jpg
rename to styles/skins/xgproyect/planeten/trockenplanet07.jpg
diff --git a/styles/skins/New-Year!/planeten/trockenplanet08.jpg b/styles/skins/xgproyect/planeten/trockenplanet08.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/trockenplanet08.jpg
rename to styles/skins/xgproyect/planeten/trockenplanet08.jpg
diff --git a/styles/skins/New-Year!/planeten/trockenplanet09.jpg b/styles/skins/xgproyect/planeten/trockenplanet09.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/trockenplanet09.jpg
rename to styles/skins/xgproyect/planeten/trockenplanet09.jpg
diff --git a/styles/skins/New-Year!/planeten/trockenplanet10.jpg b/styles/skins/xgproyect/planeten/trockenplanet10.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/trockenplanet10.jpg
rename to styles/skins/xgproyect/planeten/trockenplanet10.jpg
diff --git a/styles/skins/New-Year!/planeten/wasserplanet01.jpg b/styles/skins/xgproyect/planeten/wasserplanet01.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/wasserplanet01.jpg
rename to styles/skins/xgproyect/planeten/wasserplanet01.jpg
diff --git a/styles/skins/New-Year!/planeten/wasserplanet02.jpg b/styles/skins/xgproyect/planeten/wasserplanet02.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/wasserplanet02.jpg
rename to styles/skins/xgproyect/planeten/wasserplanet02.jpg
diff --git a/styles/skins/New-Year!/planeten/wasserplanet03.jpg b/styles/skins/xgproyect/planeten/wasserplanet03.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/wasserplanet03.jpg
rename to styles/skins/xgproyect/planeten/wasserplanet03.jpg
diff --git a/styles/skins/New-Year!/planeten/wasserplanet04.jpg b/styles/skins/xgproyect/planeten/wasserplanet04.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/wasserplanet04.jpg
rename to styles/skins/xgproyect/planeten/wasserplanet04.jpg
diff --git a/styles/skins/New-Year!/planeten/wasserplanet05.jpg b/styles/skins/xgproyect/planeten/wasserplanet05.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/wasserplanet05.jpg
rename to styles/skins/xgproyect/planeten/wasserplanet05.jpg
diff --git a/styles/skins/New-Year!/planeten/wasserplanet06.jpg b/styles/skins/xgproyect/planeten/wasserplanet06.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/wasserplanet06.jpg
rename to styles/skins/xgproyect/planeten/wasserplanet06.jpg
diff --git a/styles/skins/New-Year!/planeten/wasserplanet07.jpg b/styles/skins/xgproyect/planeten/wasserplanet07.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/wasserplanet07.jpg
rename to styles/skins/xgproyect/planeten/wasserplanet07.jpg
diff --git a/styles/skins/New-Year!/planeten/wasserplanet08.jpg b/styles/skins/xgproyect/planeten/wasserplanet08.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/wasserplanet08.jpg
rename to styles/skins/xgproyect/planeten/wasserplanet08.jpg
diff --git a/styles/skins/New-Year!/planeten/wasserplanet09.jpg b/styles/skins/xgproyect/planeten/wasserplanet09.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/wasserplanet09.jpg
rename to styles/skins/xgproyect/planeten/wasserplanet09.jpg
diff --git a/styles/skins/New-Year!/planeten/wuestenplanet01.jpg b/styles/skins/xgproyect/planeten/wuestenplanet01.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/wuestenplanet01.jpg
rename to styles/skins/xgproyect/planeten/wuestenplanet01.jpg
diff --git a/styles/skins/New-Year!/planeten/wuestenplanet02.jpg b/styles/skins/xgproyect/planeten/wuestenplanet02.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/wuestenplanet02.jpg
rename to styles/skins/xgproyect/planeten/wuestenplanet02.jpg
diff --git a/styles/skins/New-Year!/planeten/wuestenplanet03.jpg b/styles/skins/xgproyect/planeten/wuestenplanet03.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/wuestenplanet03.jpg
rename to styles/skins/xgproyect/planeten/wuestenplanet03.jpg
diff --git a/styles/skins/New-Year!/planeten/wuestenplanet04.jpg b/styles/skins/xgproyect/planeten/wuestenplanet04.jpg
similarity index 100%
rename from styles/skins/New-Year!/planeten/wuestenplanet04.jpg
rename to styles/skins/xgproyect/planeten/wuestenplanet04.jpg
diff --git a/styles/templates/.htaccess b/styles/templates/.htaccess
deleted file mode 100644
index 6c73423..0000000
--- a/styles/templates/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-<Files ~ "\.tpl$">
\ No newline at end of file
diff --git a/styles/templates/adm/OverviewBody.tpl b/styles/templates/adm/OverviewBody.tpl
deleted file mode 100644
index d1065fd..0000000
--- a/styles/templates/adm/OverviewBody.tpl
+++ /dev/null
@@ -1,87 +0,0 @@
-<script>document.body.style.overflow = "auto";</script>
-<style>table.lic{background:url(../styles/images/Adm/blank.gif);border:2px {color} solid;}
-th.lic{border:0px;}</style>
-<body>
-<h1>{ow_title}</h1>
-<table width="90%" class="lic">
-<tr>
-    <th class="lic">{error_message}</th>
-</tr>
-</table>
-
-<br>
-<table width="80%">
-	<tr>
-    	<td class="c">{ow_overview}</td>
-    </tr>
-	<tr>
-    	<th height="50px"><div align="justify">{ow_welcome_text}</div></th>
-    </tr>
-    <tr>
-        <td class="c">{ow_support}</td>
-    </tr>
-    <tr>
-        <th>
-        	<br />
-            <a href="http://tracker.xgproyect.net/" target="_blank">Bug Report</a>
-        	<br />
-        	<a href="http://www.xgproyect.net/" target="_blank">Xtreme-gameZ {ow_forum}</a>
-        	<br />
-            <br />
-        </th>
-    </tr>   
-    <tr>
-    	<td class="c">{ow_credits}</td>
-    </tr>
-    <tr>
-    	<th align="center">
-            <table width="475">
-                <tr>
-                  <th class="lic"><h3>{ow_proyect_leader}</h3></th>
-                </tr>
-                <tr>
-                  <th class="lic"><h3><font color="red">lucky</font></h3></th>
-                </tr>
-                <tr>
-                  <th class="lic"><h3>{ow_principal_contributors}</h3></th>
-                </tr>
-                <tr>
-                  <th class="lic" align="center">
-                  	<table width="100%" border="0">
-                      <tr>
-                        <td>angelus_ira</td>
-                        <td>Estad&iacute;sticas / Optimizaci&oacute;n general</td>
-                      </tr>
-                      <tr>
-                        <td>Calzon</td>
-                        <td>Fixs varios</td>
-                      </tr>
-                      <tr>
-                        <td>cyberrichy</td>
-                        <td>SACs</td>
-                      </tr>
-                      <tr>
-                        <td>Neko</td>
-                        <td>Panel Administrativo / Fixs varios</td>
-                      </tr>
-                      <tr>
-                        <td>PowerMaster</td>
-                        <td>Fixs varios</td>
-                      </tr>
-                      <tr>
-                        <td>zorro2666</td>
-                        <td>Fixs varios</td>
-                      </tr>
-                    </table>
-                  </th>
-                </tr>
-            </table>
-        <table width="100%">
-		<tr>
-        <td class="k"><h3>Ïåðåâîä íà ðóññêèé ÿçûê è äîðîáîòêà îñóùåñòâëåíû Àäìèíèñòðàöèåé ñàéòà<br><a href="http://portal-soft.net.ru" target="_blank"><font size="4" color="lime"><b>Portal-Soft.Net.Ru</b></font</h3></td>
-        </tr>
-		</table>
-        </th>
-    </tr>
-</table>
-</body>
\ No newline at end of file
diff --git a/styles/templates/adm/chat_body.tpl b/styles/templates/adm/chat_body.tpl
deleted file mode 100644
index 238007f..0000000
--- a/styles/templates/adm/chat_body.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<br><br>
-<h2>{adm_ch_ttle}</h2>
-<table width="700">
-<tr>
-<td class="c" colspan="4">{adm_ch_list} [<a href="?deleteall=yes"><font color="red">Óäàëèòü âñå ñîîáùåíèÿ</font></a>]</td>
-</tr>
-<tr>
-<th width="5%">{adm_ch_idmsg}</th>
-<th width="30%">{adm_ch_delet}</th>
-<th width="30%">{adm_ch_play}</th>
-<th width="34%">{adm_ch_time}</th>
-</tr>
-{msg_list}
-</table>
\ No newline at end of file
diff --git a/styles/templates/buildings/buildings_builds.tpl b/styles/templates/buildings/buildings_builds.tpl
deleted file mode 100644
index 857ed8c..0000000
--- a/styles/templates/buildings/buildings_builds.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<br />
-<div id="content">
-{BuildListScript}
-    <table width=600>
-        {BuildList}
-<tr align="center">
-	<th class="c" colspan="3">
-	<font color="#00FF00">{planet_field_current}</font> / <font color="#FF0000">{planet_field_max}</font> îñòàëîñü {field_libre} íåçàíÿòûõ ïîëåé
-		</th >
-</tr>
-        {BuildingsList}
-    </table>
-</div>
\ No newline at end of file
diff --git a/styles/templates/buildings/buildings_defense.tpl b/styles/templates/buildings/buildings_defense.tpl
deleted file mode 100644
index b71faa0..0000000
--- a/styles/templates/buildings/buildings_defense.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<style>
-    div.err {width:590px;align:center;text-align:center;border:2px solid red;color:red;background-color:#800000;padding:0px;}
-</style>
-<br />
-<div id="content">
-
-    {message}
-        <form action="" method="post">
-            <table align="top" width="600">
-			
-	<tr>
-		<td colspan="3" class="c" align="center">{fleet_lvl}</td>
-	</tr>
-			
-			
-                {buildlist}
-                {build_defenses}
-            </table>
-        </form>
-    {buildinglist}
-</div>
\ No newline at end of file
diff --git a/styles/templates/buildings/buildings_fleet.tpl b/styles/templates/buildings/buildings_fleet.tpl
deleted file mode 100644
index 4c20b27..0000000
--- a/styles/templates/buildings/buildings_fleet.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<style>
-    div.err {width:590px;align:center;text-align:center;border:2px solid red;color:red;background-color:#800000;padding:0px;}
-</style>
-<br />
-<div id="content">
-    {message}
-        <form action="" method="post">
-            <table align="top" width="600">
-
-	<tr>
-		<td colspan="3" class="c" align="center">{fleet_lvl}</td>
-	</tr>
-			
-                {buildlist}
-                {build_fleet}
-            </table>
-        </form>
-    {buildinglist}
-</div>
\ No newline at end of file
diff --git a/styles/templates/buildings/buildings_research.tpl b/styles/templates/buildings/buildings_research.tpl
deleted file mode 100644
index 4e4e51c..0000000
--- a/styles/templates/buildings/buildings_research.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<style>
-    div.err {width:590px;align:center;text-align:center;border:2px solid red;color:red;background-color:#800000;padding:0px;}
-</style>
-<br />
-<div id="content">
-    {noresearch}
-        <table align="top" width="600">
-	<tr>
-		<td colspan="3" class="c" align="center">{research_lvl}</td>
-	</tr>
-            <tr>
-                {technolist}
-            </tr>
-        </table>
-</div>
\ No newline at end of file
diff --git a/styles/templates/chat/chat_body.tpl b/styles/templates/chat/chat_body.tpl
deleted file mode 100644
index 67abcd3..0000000
--- a/styles/templates/chat/chat_body.tpl
+++ /dev/null
@@ -1,116 +0,0 @@
-<script language="JavaScript" type="text/javascript">
-var chat_type = "{chat_type}";
-var ally_id = "{ally_id}";
-</script>
-<script language="JavaScript" type="text/javascript" src="scripts/chat.js"></script>
-
-<br><br>
-
-<table align="center" width='60%'><tbody>
-
-<tr><td class="c"><b>{chat_disc}</b></td></tr>
-
-<tr><th><div id="shoutbox" style="margin: 5px; vertical-align: text-top; height: 360px; overflow:auto;"></div></th></tr>
-
-<tr><th nowrap>
-{chat_message}: <input name="msg" type="text" id="msg" style="width:80%" maxlength="120" onKeyPress="if(event.keyCode == 13){ addMessage(); } if (event.keyCode==60 || event.keyCode==62) event.returnValue = false; if (event.which==60 || event.which==62) return false;"> 
-<div nowrap>
-&nbsp;&nbsp;
-<select name="color" id="chat_color">
-	<option value="white">Áåëûé</option>
-	<option value="Blue" style=color:Blue;>Ñèíèé</option>
-	<option value="yellow" style=color:yellow;>Æåëòûé</option>
-	<option value="green" style=color:green;>Çåë¸íûé</option>
-	<option value="pink" style=color:pink;>Ðîçîâûé</option>
-	<option value="red" style=color:red;>Êðàñíûé - Öâåò Àäìèíèñòðàöèè</option>
-	<option value="orange" style=color:orange;>Îðàíæåâûé</option>
-	
-	<option value="lime" style=color:lime;>Ëàéì</option>
-	<option value="BlueViolet" style=color:BlueViolet;>Ôèîëåòîâûé</option>
-	<option value="cyan" style=color:cyan;>Öèàí</option>
-	
-	
-</select>
-&nbsp;&nbsp;
-<input type="button" name="send" value="{chat_send}" id="send" onClick="addMessage()">
-&nbsp;&nbsp;
-&nbsp;&nbsp;
-<input type="button" name="send" value="{chat_history}" id="send" onClick="MessageHistory()">
-</div>
-</th>
-<tr>
-   <td>
-&nbsp;&nbsp;<font color="Yellow"><b>Îíëàéí:</b></font>{OnlineAdmins}
-    </td>
-</tr>
-<tr>
-<th nowrap>
-<div nowrap>  
-<img src="styles/images/smileys/aggressive.gif" align="absmiddle" title=":agr:" alt=":agr:" onClick="addSmiley(':agr:')">
-<img src="styles/images/smileys/angel.gif" align="absmiddle" title=":angel:" alt=":angel:" onClick="addSmiley(':angel:')">
-<img src="styles/images/smileys/bad.gif" align="absmiddle" title=":bad:" alt=":bad:" onClick="addSmiley(':bad:')">
-<img src="styles/images/smileys/blink.gif" align="absmiddle" title="o0" alt="o0" onClick="addSmiley(':blink:')">
-<img src="styles/images/smileys/blush.gif" align="absmiddle" title=":blush:" alt=":blush:" onClick="addSmiley(':blush:')">
-<img src="styles/images/smileys/bomb.gif" align="absmiddle" title=":bomb:" alt=":blush:" onClick="addSmiley(':bomb:')">
-<img src="styles/images/smileys/clapping.gif" align="absmiddle" title=":clap:" alt=":clap:" onClick="addSmiley(':clap:')">
-<img src="styles/images/smileys/cool.gif" align="absmiddle" title=":cool:" alt=":cool:" onClick="addSmiley(':cool:')">
-<img src="styles/images/smileys/cray.gif" align="absmiddle" title=":c:" alt=":c:" onClick="addSmiley(':c:')">
-<img src="styles/images/smileys/crazy.gif" align="absmiddle" title=":crz:" alt=":crz:" onClick="addSmiley(':crz:')">
-<img src="styles/images/smileys/diablo.gif" align="absmiddle" title=":diablo:" alt=":diablo:" onClick="addSmiley(':diablo:')">
-<img src="styles/images/smileys/dirol.gif" align="absmiddle" title=":cool2:" alt=":cool2:" onClick="addSmiley(':cool2:')">
-<img src="styles/images/smileys/fool.gif" align="absmiddle" title=":s:" alt=":s:" onClick="addSmiley(':fool:')">
-<img src="styles/images/smileys/give_rose.gif" align="absmiddle" title=":rose:" alt=":rose:" onClick="addSmiley(':rose:')">
-<img src="styles/images/smileys/good.gif" align="absmiddle" title=":good:" alt=":good:" onClick="addSmiley(':good:')">
-<img src="styles/images/smileys/huh.gif" align="absmiddle" title=":huh:" alt=":huh:" onClick="addSmiley(':huh:')">
-<img src="styles/images/smileys/lol.gif" align="absmiddle" title=":D" alt=":D" onClick="addSmiley(':D:')">
-<img src="styles/images/smileys/mellow.gif" align="absmiddle" title=":/" alt=":/" onClick="addSmiley(':/')"> 
-<img src="styles/images/smileys/yu.gif" align="absmiddle" title=":yu" alt=":yu" onClick="addSmiley(':yu')">
-<img src="styles/images/smileys/unknw.gif" align="absmiddle" title=":unknw:" alt=":unknw:" onClick="addSmiley(':unknw:')">
-<img src="styles/images/smileys/sad.gif" align="absmiddle" title=":(" alt=":(" onClick="addSmiley(':sad')">
-<img src="styles/images/smileys/smile.gif" align="absmiddle" title=":)" alt=":)" onClick="addSmiley(':smile')">
-<img src="styles/images/smileys/shok.gif" align="absmiddle" title=":o" alt=":o" onClick="addSmiley(':shok:')"> 
-<img src="styles/images/smileys/rofl.gif" align="absmiddle" title=":rofl" alt=":rofl" onClick="addSmiley(':rofl')">
-<img src="styles/images/smileys/blackeye.gif" align="absmiddle" title=":eye" alt=":eye" onClick="addSmiley(':eye')">
-<img src="styles/images/smileys/tongue.gif" align="absmiddle" title=":p" alt=":p" onClick="addSmiley(':p')">
-<img src="styles/images/smileys/wink.gif" align="absmiddle" title=";)" alt=";)" onClick="addSmiley(';)')">                
-<img src="styles/images/smileys/yahoo.gif" align="absmiddle" title=":yahoo:" alt=":yahoo:" onClick="addSmiley(':yahoo:')">
-<img src="styles/images/smileys/mill.gif" align="absmiddle" title=":tratata:" alt=":tratata:" onClick="addSmiley(':tratata:')">
-<br>
-
-
-<img src="styles/images/smileys/friends.gif" align="absmiddle" title=":fr:" alt=":fr:" onClick="addSmiley(':fr')">
-<img src="styles/images/smileys/drinks.gif" align="absmiddle" title=":dr:" alt=":dr:" onClick="addSmiley(':dr')">
-<img src="styles/images/smileys/tease.gif" align="absmiddle" title=":tease:" alt=":tease:" onClick="addSmiley(':tease:')">
-<img src="styles/images/smileys/mail1.gif" align="absmiddle" title=":mail1:" alt=":mail1:" onClick="addSmiley(':mail1:')">
-<img src="styles/images/smileys/beee.gif" align="absmiddle" title=":beee:" alt=":beee:" onClick="addSmiley(':beee:')">
-<img src="styles/images/smileys/preved.gif" align="absmiddle" title=":preved:" alt=":preved:" onClick="addSmiley(':preved:')">
-<img src="styles/images/smileys/posle.gif" align="absmiddle" title=":posle:" alt=":posle:" onClick="addSmiley(':posle:')">
-<img src="styles/images/smileys/nono.gif" align="absmiddle" title=":nono:" alt=":nono:" onClick="addSmiley(':nono:')">
-
-<img src="styles/images/smileys/bc.gif" align="absmiddle" title=":bc:" alt=":bc:" onClick="addSmiley(':bc:')">
-<img src="styles/images/smileys/be.gif" align="absmiddle" title=":be:" alt=":be:" onClick="addSmiley(':be:')">
-<img src="styles/images/smileys/bh.gif" align="absmiddle" title=":bh:" alt=":bh:" onClick="addSmiley(':bh:')">
-<img src="styles/images/smileys/bi.gif" align="absmiddle" title=":bi:" alt=":bi:" onClick="addSmiley(':bi:')">
-<img src="styles/images/smileys/bk.gif" align="absmiddle" title=":bk:" alt=":bk:" onClick="addSmiley(':bk:')">
-<img src="styles/images/smileys/bl.gif" align="absmiddle" title=":bl:" alt=":bl:" onClick="addSmiley(':bl:')">
-<img src="styles/images/smileys/br.gif" align="absmiddle" title=":br:" alt=":br:" onClick="addSmiley(':br:')">
-<img src="styles/images/smileys/bx.gif" align="absmiddle" title=":bx:" alt=":bx:" onClick="addSmiley(':bx:')">
-<img src="styles/images/smileys/cc.gif" align="absmiddle" title=":cc:" alt=":cc:" onClick="addSmiley(':cc:')">
-<img src="styles/images/smileys/cr.gif" align="absmiddle" title=":cr:" alt=":cr:" onClick="addSmiley(':cr:')">
-<img src="styles/images/smileys/cg.gif" align="absmiddle" title=":cg:" alt=":cg:" onClick="addSmiley(':cg:')">
-<img src="styles/images/smileys/ci.gif" align="absmiddle" title=":ci:" alt=":ci:" onClick="addSmiley(':ci:')">
-<img src="styles/images/smileys/co.gif" align="absmiddle" title=":co:" alt=":co:" onClick="addSmiley(':co:')">
-
-
-
-</div>
-</th>
-</tr>
-
-
-
-<tr>
-<td class="c"><center>{ExternalTchatFrame}&nbsp;&nbsp;&nbsp;&nbsp;{ClickBanner}</center></td>
-</tr>
-</table>
-</center>
\ No newline at end of file
diff --git a/styles/templates/fleet/fleetACS_table.tpl b/styles/templates/fleet/fleetACS_table.tpl
deleted file mode 100644
index c8482e7..0000000
--- a/styles/templates/fleet/fleetACS_table.tpl
+++ /dev/null
@@ -1,74 +0,0 @@
-<script language="JavaScript" src="scripts/flotten.js"></script>
-<script language="JavaScript" src="scripts/ocnt.js"></script>
-<div id="content">
-	<table width="519" border="0" cellpadding="0" cellspacing="1">
-		<tr height="20">
-			<td colspan="9" class="c">{fl_fleet} ({fl_max}. {ile})</td>
-		</tr>
-		<tr height="20">
-            <th>{fl_number}</th>
-            <th>{fl_mission}</th>
-            <th>{fl_ammount}</th>
-            <th>{fl_beginning}</th>
-            <th>{fl_departure}</th>
-            <th>{fl_destiny}</th>
-            <th>{fl_objective}</th>
-            <th>{fl_arrival}</th>
-            <th>{fl_order}</th>
-        </tr>
-            {page1}
-            {maxflot}
-    </table>
-	<table width="519" border="0" cellpadding="0" cellspacing="1">
-		<tr height="20">
-			<td class="c" colspan="2">{fl_sac_of_fleet} KV50502025</td>
-		</tr>
-		<tr height="20">
-			<td class="c" colspan="2">{fl_modify_sac_name}</td>
-		</tr>
-		<tr>
-			<th colspan="2">{aks_code_mr}<br /> </th>
-		</tr>
-		<tr>
-			<th>
-				<table width="100%" border="0" cellpadding="0" cellspacing="1">
-					<tr height="20">
-                        <td class="c">{fl_members_invited}</td>
-                        <td class="c">{fl_invite_members}</td>
-					</tr>
-					<tr>
-                        <th width="50%">
-                            <select size="5">
-                            {page2}
-                            </select>
-						</th>
-                        <form action="game.php?page=fleetACS" method="POST">
-                        <input type="hidden" name="add_member_to_aks" value="madnessred" />
-                        <input name="fleetid" value="{fleetid}" type="hidden">
-                        <input name="aks_invited_mr" value="{aks_invited_mr}" type="hidden">
-						<td>
-							<input name="addtogroup" type="text" /> <br /><input type="submit" value="{fl_continue}" />
-						</td>
-						</form>
-                        <br />
-                        {add_user_message_mr}
-					</tr>
-				</table>
-			</th>
-		</tr>
-		<tr>
-		</tr>
-	</table>
-	<form action="game.php?page=fleet1" method="post">
-	<table width="519" border="0" cellpadding="0" cellspacing="1">
-		<tr height="20">
-			<td colspan="4" class="c">{fl_new_mission_title}</td>
-		</tr>
-		<tr height="20">
-            <th>{fl_ship_type}</th>
-            <th>{fl_ship_available}</th>
-			<th>-</th>
-            <th>-</th>
-		</tr>
-{page3}
-</div>
\ No newline at end of file
diff --git a/styles/templates/install/ins_acc_done.tpl b/styles/templates/install/ins_acc_done.tpl
deleted file mode 100644
index 7bfd679..0000000
--- a/styles/templates/install/ins_acc_done.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<tr>
-  <th colspan="2">
-<br>Àäìèíèñòðàòîð ñîçäàí.<br>
-Óäàëèòå ïàïêó <i>install</i> ÷òîòû îáåçîïàñèòü ñåáÿ îò ïîâòîðíîé óñòàíîâêè!<br><br>
-<font color="red">È èçìåíèòå ïðàâà íà ôàéë config.php íà "CHMOD 644"</font> <br><br>
-</th>
-</tr>
-<tr>
-  <th colspan="2"><input type="button" name="next" onclick="self.location.href='../'" value="Çàêîí÷èòü óñòàíîâêó" ></th>
-</tr>
\ No newline at end of file
diff --git a/styles/templates/install/ins_body.tpl b/styles/templates/install/ins_body.tpl
deleted file mode 100644
index 3f69d4a..0000000
--- a/styles/templates/install/ins_body.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<br><br>
-<table width="700">
-<tr>
-	<td width="120px" colspan="3" class="c" align="left">
-	<font size="2px">Ìåíþ óñòàíîâêè [<a href="index.php?mode=intro">Ãëàâíàÿ</a> - <a href="index.php?mode=ins&page=1">Óñòàíîâèòü</a> - <a href="index.php?mode=license">Ëèöåíöèÿ</a> - <a href="index.php?mode=upgrade">Îáíîâèòü</a>]</font></td>
-</tr>
-<form action="{dis_ins_btn}" method="post">
-{ins_page}
-</form>
-</table>
\ No newline at end of file
diff --git a/styles/templates/install/ins_intro.tpl b/styles/templates/install/ins_intro.tpl
deleted file mode 100644
index b7d0534..0000000
--- a/styles/templates/install/ins_intro.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<tr>
-	<th colspan="2" align="left"><div id="main" align="left">
-      <h1>Èíñòðóêöèÿ</h1>
-	  <p>Æåëàííûé XG Proyect!<br />
-	      <br />
-	    XG Proyect - îäèí èç ëó÷øèõ êëîóíîâ ñóùåñòâóþùèõ OGame äî ñèõ ïîð. XG Proyect 2 íå ïîñëåäíèé è ñàìûé ñòàáèëüíûé êîãäà áû òî íèáûëî. Òàêîé ïðîåêò  êîòîðûé êàê äðóãèå âåðñèè, XG Proyect ïîëó÷àåò îïîðó êîìàíäû Xtreme-gameZ, óáåæäàÿñü â òîì, ÷òî äîáèâàÿñü âñåãäà ëó÷øåãî êà÷åñòâà âî âíèìàíèè è ñòàáèëüíîñòè âåðñèè. XG Proyect 2 êàæäûé äåíü èùåò  ðîñò, ñòàáèëüíîñòü, ãèáêîñòü, äèíàìèçì, êà÷åñòâî è âåðó ïîëüçîâàòåëÿ, ÷òî ÿâëÿåòñÿ åãî ëó÷øèì âûáîðîì.  Ìû âñåãäà íàäååìñÿ, ÷òî XG Proyect2  ëó÷øå.<br />
-	    <br />
-	    Ñèñòåìà óñòàíîâêè  ïîìîæåò Âàì óñòàíîâèòü èëè îáíîâèòü èãðó, îò áîëåå ñòàðûõ âåðñèé äî ñàìîé ïîñëåäíåé âåðñèè.<br />
-	    XG Proyect – Äëÿ òîãî ÷òîáû íà÷àòü óñòàíîâêó èëè îáíîâëåíèå  êëèêíåòå â âåðõíåì ìåíþ ïî ñîîòâåòñòâóþùåé ññûëêå.</p>
-		<tr>
-        <td class="k"><h3>Ïåðåâîä íà ðóññêèé ÿçûê è äîðîáîòêà<br> îñóùåñòâëåíû Àäìèíèñòðàöèåé ñàéòà<br><a href="http://portal-soft.net.ru" target="_blank"><font size="3" color="lime"><b>Portal-Soft.Net.Ru</b></font</h3></td>
-        </tr>
-    </div></th>
-</tr>
\ No newline at end of file
diff --git a/styles/templates/install/ins_update.tpl b/styles/templates/install/ins_update.tpl
deleted file mode 100644
index a7a8315..0000000
--- a/styles/templates/install/ins_update.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-		<tr>
-			<th align="center">Ñåðâåð SQL <font color="red">(Íà ïðèìåð: localhost)</font></th>
-			<th align="left"><input type="text" name="servidor"/></th>
-		</tr>
-		<tr>
-			<th align="center">Ïîëüçîâàòåëü SQL <font color="red">(Íà ïðèìåð: root)</font></th>
-			<th align="left"><input type="text" name="usuario"/></th>
-		</tr>
-		<tr>
-			<th align="center">Ïàðîëü SQL <font color="red">(Íà ïðèìåð: abc12345)</font></th>
-			<th align="left"><input type="password" name="clave"/></th>
-		</tr>
-		<tr>
-			<th align="center">Èìÿ áàçû äàííûõ SQL <font color="red">(Íà ïðèìåð: ogame)</font></th>
-			<th align="left"><input type="text" name="base"/></th>
-		</tr>
-		<tr>
-			<th align="center">Ïðåâèêñ áàçû äàííûõ<font color="red">(Íà ïðèìåð: game_)</font></th>
-			<th align="left"><input type="text" name="prefix"/></th>
-		</tr>
-		<tr>
-			<th align="center">Âûáåðèòå Âàøó âåðñèþ:<font color="red">(Íà ïðèìåð: 2.4)</font></th>
-			<th align="left">
-                <select name="modo">
-                    <option value="2.3">XG Proyect 2.0 / 2.1 / 2.2</option>
-                    <option value="2.4">XG Proyect 2.3</option>
-                    <option value="2.5">XG Proyect 2.4</option>
-                    <option value="2.6">XG Proyect 2.5</option>
-                    <option value="2.7">XG Proyect 2.6</option>
-                    <option value="2.8">XG Proyect 2.7</option>
-                    <option value="2.9">XG Proyect 2.8</option>
-                    <option value="2.9.1">XG Proyect 2.9.0</option>
-                    <option value="2.9.2">XG Proyect 2.9.1</option>
-                    <option value="2.9.3">XG Proyect 2.9.2</option>
-                    <option value="2.9.4">XG Proyect 2.9.3</option>
-                    <option value="2.9.5">XG Proyect 2.9.4</option>
-                    <option value="2.9.6">XG Proyect 2.9.5</option>
-                </select>
-            </th>
-		</tr>
-		<tr>
-			<th align="center" colspan="2"><input type="submit" name="continuar" value="Îáíîâèòü äî âåðñèè 2.9.4"/></th>
-		</tr>
\ No newline at end of file
diff --git a/styles/templates/messages_pm_form.tpl b/styles/templates/messages_pm_form.tpl
deleted file mode 100644
index 7e2e068..0000000
--- a/styles/templates/messages_pm_form.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<script src="scripts/cntchar.js" type="text/javascript"></script>
-<br />
-    <form action="game.php?page=messages&mode=write&id={id}" method="post">
-    <table width="519">
-    <tr>
-        <td class="c" colspan="2">Îòïðàâêà ñîîáùåíèÿ</td>
-    </tr><tr>
-        <th>Ïîëó÷àòåëü</th>
-        <th><input type="text" name="to" size="40" value="{to}" /></th>
-    </tr><tr>
-        <th>Òåìà ñîîáùåíèÿ</th>
-        <th><input type="text" name="subject" size="40" maxlength="40" value="{subject}" /></th>
-    </tr><tr>
-        <th>Òåêñò ñîîáùåíèÿ (<span id="cntChars">0</span> / 5000 )</th>
-        <th><textarea name="text" cols="40" rows="10" size="100" onkeyup="javascript:cntchar(5000)">{text}</textarea></th>
-    </tr><tr>
-        <th colspan="2"><input type="submit" value="Îòïðàâèòü" /></th>
-    </tr>
-    </table>
-    </form>
diff --git a/styles/templates/officier/officier_table.tpl b/styles/templates/officier/officier_table.tpl
deleted file mode 100644
index a5e2fe7..0000000
--- a/styles/templates/officier/officier_table.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<br />
-<div id="content">
-    <table width="569">
-    <tr>
-        <td class="c" colspan="3">{of_available_points} {alv_points} {of_points_per_thousand_darkmatter}</td>
-    </tr>
-    {disp_off_tbl}
-    </table>
-</div>
\ No newline at end of file
diff --git a/styles/templates/topnav.tpl b/styles/templates/topnav.tpl
deleted file mode 100644
index a4e4717..0000000
--- a/styles/templates/topnav.tpl
+++ /dev/null
@@ -1,128 +0,0 @@
-<div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
-<div id='header_top'><center>
-<table class='header'>
-<tr class='header' >
-<td class='header' style='width:5;' >
-	  <table class='header'>
-    <tr class='header'>
-     <td class='header'><img src="{dpath}planeten/small/s_{image}.jpg" height="50" width="50"></td>
-     <td class='header'>
-	  <table class='header'>
-
-                    <select size="1" onChange="eval('location=\''+this.options[this.selectedIndex].value+'\'');">
-                    {planetlist}
-                    </select>
-	  </table>
-     </td>
-    </tr>
-  </table></td>
-<td class='header'>   <table class='header' id='resources' border="0" cellspacing="0" cellpadding="0" padding-right='30' >
-
-	    <tr class='header'>
-	    
-		     <td align="center" width="85" class='header'>
-		      <img border="0" src="{dpath}images/metall.gif" width="42" height="22">
-		     </td>
-		     
-		     <td align="center" width="85" class='header'>
-		      <img border="0" src="{dpath}images/kristall.gif" width="42" height="22">
-		     </td>
-		     
-		     <td align="center" width="85" class='header'>
-		      <img border="0" src="{dpath}images/deuterium.gif" width="42" height="22">
-		     </td>
-			 
-		     <td align="center" width="85" class='header'>
-		      <img border="0" src="{dpath}images/energie.gif" width="42" height="22">
-		     </td>
-	     		     
-		     <td align="center" width="85" class='header'>
-		      <img border="0" src="{dpath}images/darkmatter.jpg" width="42" height="22" title="Dark Matter">
-		     </td>	     
-	        		     
-		     <td align="center" width="85" class='header'>
-		      <img border="0" src="{dpath}images/message.gif" width="42" height="22">
-		     </td>
-
-	    </tr>
-        
-	    <tr class='header'>
-	     <td align="center" class='header' width="85"><i><b><font color="#ffffff">{Metal}</font></b></i></td>
-	     <td align="center" class='header' width="85"><i><b><font color="#ffffff">{Crystal}</font></b></i></td>
-	     <td align="center" class='header' width="85"><i><b><font color="#ffffff">{Deuterium}</font></b></i></td>
-	     <td align="center" class='header' width="85"><i><b><font color="#ffffff">{Energy}</font></b></i></td>
-	     <td align="center" class='header' width="85"><i><b><font color="#ffffff">{Darkmatter}</font></b></i></td>		
-	     <td align="center" class='header' width="85"><i><b><font color="#ffffff">{Messages}</font></b></i></td>			 
-	    </tr>
-		
-	    <tr class='header'>
-	     <td align="center" class='header' width="90"><font ><div id="metal"></div></font></td>
-	     <td align="center" class='header' width="90"><div id="crystal"></td>
-	     <td align="center" class='header' width="90"><font ><div id="deut"></div></font></td>
-	     <td align="center" class='header' width="90">{energy}</td>
-	     <td align="center" class='header' width="90"><font color="#FFFFFF">{darkmatter}</font></td>	        
-         <td align="center" class='header' width="90">{message}</td>
-
-
-	    </tr>
-   </table></td>
-</tr>
-</table>
-{show_umod_notice}
-</div>
-
-<script LANGUAGE='JavaScript'>
-<!--
-var now = new Date();
-var event = new Date();
-var seconds = (Date.parse(now) - Date.parse(event)) / 1000;
-var val = 0;
-var val2 = 0;
-var val3 = 0;
-
-update();
-
-function update() {
-  now = new Date();
-  seconds = (Date.parse(now) - Date.parse(event)) / 1000;
-
-  val = (( {metal_perhour} / 3600) * seconds) + {metalh};
-  if( val >= {metal_mmax} ) val = {metalh};
-  document.getElementById('metal').innerHTML = number_format( val ,0);
-
-  val = ( {crystal_perhour} / 3600) * seconds + {crystalh};
-  if( val >= {crystal_mmax} ) val = {crystalh};
-  document.getElementById('crystal').innerHTML = number_format( val ,0);
-
-  val = ( {deuterium_perhour} / 3600) * seconds + {deuteriumh};
-  if( val >= {deuterium_mmax} ) val = {deuteriumh};
-  document.getElementById('deut').innerHTML = number_format( val ,0);
-
-
-  ID=window.setTimeout('update();',1000);
-}
-
-function number_format(number,laenge) {
-  number = Math.round( number * Math.pow(10, laenge) ) / Math.pow(10, laenge);
-  str_number = number+'';
-  arr_int = str_number.split('.');
-  if(!arr_int[0]) arr_int[0] = '0';
-  if(!arr_int[1]) arr_int[1] = '';
-  if(arr_int[1].length < laenge){
-        nachkomma = arr_int[1];
-        for(i=arr_int[1].length+1; i <= laenge; i++){  nachkomma += '0';  }
-        arr_int[1] = nachkomma;
-  }
-  if(arr_int[0].length > 3){
-        Begriff = arr_int[0];
-        arr_int[0] = '';
-        for(j = 3; j < Begriff.length; j+=3){
-          Extrakt = Begriff.slice(Begriff.length - j, Begriff.length - j + 3);
-          arr_int[0] = '.' + Extrakt +  arr_int[0] + '';
-        }
-        str_first = Begriff.substr(0, (Begriff.length % 3 == 0)?3:(Begriff.length % 3));
-        arr_int[0] = str_first + arr_int[0];
-  }
-  return arr_int[0]+''+arr_int[1];
-}
-// --></script>
\ No newline at end of file
diff --git a/includes/.htaccess b/styles/views/.htaccess
similarity index 100%
rename from includes/.htaccess
rename to styles/views/.htaccess
diff --git a/styles/templates/adm/AccountDataBody.tpl b/styles/views/adm/AccountDataBody.php
similarity index 98%
rename from styles/templates/adm/AccountDataBody.tpl
rename to styles/views/adm/AccountDataBody.php
index b5786b6..f732e0b 100644
--- a/styles/templates/adm/AccountDataBody.tpl
+++ b/styles/views/adm/AccountDataBody.php
@@ -1,8 +1,8 @@
-<script>document.body.style.overflow = "auto";</script> 
+<script>document.body.style.overflow = "auto";</script>
 <body>
 <!DOCTYPE HTML>
 <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
-<script type="text/javascript" src="../scripts/animatedcollapse.js"></script>
+<script type="text/javascript" src="../js/animatedcollapse.js"></script>
 <script type="text/javascript">
 animatedcollapse.addDiv('pla', 'fade=1,height=auto')
 animatedcollapse.addDiv('inves', 'fade=1,height=auto')
@@ -73,7 +73,7 @@
 			<tr><th height="22px">{ac_ranking}</th><th><a href="javascript:animatedcollapse.toggle('puntaje')">{ac_see_ranking}</a></th></tr>
 			</table>
 			<br>
-			
+
 			<!-- PUNTAJE DEL USUARIO -->
 			<div id="puntaje" style="display:none">
 			<table cellspacing="0" style="border-collapse: collapse" align="center" width="60%">
@@ -87,8 +87,8 @@
 			</table>
 			<br>
 			</div>
-			
-			
+
+
 			<div id="banned" style="display:none">
 			<table cellspacing="0" style="border-collapse: collapse" align="center" width="60%">
 			<tr><td class="c" colspan="4">{ac_suspended_title}</td></tr>
@@ -211,7 +211,7 @@
 			</tr>
 			</table>
 			<br />
-			</div>	
+			</div>
 		</th>
 	</tr><tr>
 		<th class="unico"><a href="javascript:animatedcollapse.toggle('edificios')" class="link">
@@ -285,7 +285,6 @@
 				<td width="10%">{destructor}</td>
 				<td width="10%">{dearth_star}</td>
 				<td width="10%">{battleship}</td>
-				<td width="10%">{supernova}</td>
 			</tr>
 				{ships}
 			</table>
@@ -310,7 +309,6 @@
 				<td width="10%">{buster_canyon}</td>
 				<td width="10%">{small_protection_shield}</td>
 				<td width="10%">{big_protection_shield}</td>
-				<td width="10%">{planet_protector}</td>
 				<td width="10%">{interceptor_misil}</td>
 				<td width="10%">{interplanetary_misil}</td>
 			</tr>
diff --git a/styles/templates/adm/AccountDataIntro.tpl b/styles/views/adm/AccountDataIntro.php
similarity index 97%
rename from styles/templates/adm/AccountDataIntro.tpl
rename to styles/views/adm/AccountDataIntro.php
index e8c8123..9b44285 100644
--- a/styles/templates/adm/AccountDataIntro.tpl
+++ b/styles/views/adm/AccountDataIntro.php
@@ -1,5 +1,5 @@
 <script>document.body.style.overflow = "auto";</script>
-<SCRIPT TYPE="text/javascript" SRC="../scripts/filterlist.js"></SCRIPT> 
+<SCRIPT TYPE="text/javascript" SRC="../js/filterlist.js"></SCRIPT>
 <body>
 <form action="" method="GET" name="users">
 <table border="0px" style="background:url(images/Adm/blank.gif);" width="60%">
@@ -13,11 +13,11 @@
 	<select name="id_u" size="20" style="width:80%;">
 		{lista}
 	</select>
-	
+
 	<SCRIPT TYPE="text/javascript">
 		var UserList = new filterlist(document.users.id_u);
 	</SCRIPT>
-	
+
 	<BR><BR>
 	<A HREF="javascript:UserList.set('^A')" TITLE="{bo_select_title} A">A</A>
 	<A HREF="javascript:UserList.set('^B')" TITLE="{bo_select_title} B">B</A>
diff --git a/styles/templates/adm/ActivePlanetsBody.tpl b/styles/views/adm/ActivePlanetsBody.php
similarity index 100%
rename from styles/templates/adm/ActivePlanetsBody.tpl
rename to styles/views/adm/ActivePlanetsBody.php
diff --git a/styles/templates/adm/AuthlevelBody.tpl b/styles/views/adm/AuthlevelBody.php
similarity index 97%
rename from styles/templates/adm/AuthlevelBody.tpl
rename to styles/views/adm/AuthlevelBody.php
index 3ced75f..a7339d3 100644
--- a/styles/templates/adm/AuthlevelBody.tpl
+++ b/styles/views/adm/AuthlevelBody.php
@@ -1,5 +1,5 @@
 <script>document.body.style.overflow = "auto";</script>
-<SCRIPT TYPE="text/javascript" SRC="../scripts/filterlist.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="../js/filterlist-min.js"></SCRIPT>
 <body>
 <br />
 </table>
@@ -13,7 +13,7 @@
 	<select name="id_1" size="20" style="width:80%;">
 		{List}
 	</select>
-	
+
 	<SCRIPT TYPE="text/javascript">
 		var UserList = new filterlist(document.users.id_1);
 	</SCRIPT>
diff --git a/styles/templates/adm/BanOptions.tpl b/styles/views/adm/BanOptions.php
similarity index 98%
rename from styles/templates/adm/BanOptions.tpl
rename to styles/views/adm/BanOptions.php
index 8322059..3026f1b 100644
--- a/styles/templates/adm/BanOptions.tpl
+++ b/styles/views/adm/BanOptions.php
@@ -1,5 +1,5 @@
 <script>document.body.style.overflow = "auto";</script>
-<SCRIPT TYPE="text/javascript" SRC="../scripts/filterlist.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="../js/filterlist-min.js"></SCRIPT>
 <body>
 <form action="" method="get" name="users">
 <table width="100%" style="background:url(images/Adm/blank.gif);" border="0px">
@@ -15,14 +15,14 @@
 	{List}
 	</select>
 	<BR>
-	<a href="BanPage.php">{bo_order_username}</a> &nbsp; <a href="BanPage.php?order=id">{bo_order_id}</a> &nbsp; 
+	<a href="BanPage.php">{bo_order_username}</a> &nbsp; <a href="BanPage.php?order=id">{bo_order_id}</a> &nbsp;
 	<a href="BanPage.php?view=bana">{bo_order_banned}</a>
 	<SCRIPT TYPE="text/javascript">
 	<!--
 		var UserList = new filterlist(document.users.ban_name);
 	//-->
 	</SCRIPT>
-	
+
 	<BR><BR>
 	<A HREF="javascript:UserList.set('^A')" TITLE="{bo_select_title} A">A</A>
 	<A HREF="javascript:UserList.set('^B')" TITLE="{bo_select_title} B">B</A>
@@ -59,6 +59,7 @@
 	<INPUT TYPE="button" onClick="UserList.reset();this.form.regexp.value=''" value="{button_deselect}">
 </th>
 </tr><tr>
+
 	<th colspan="2">
 	<input type="submit" value="{button_submit}" name="panel" style="width:20%;"/>&nbsp;
 	<INPUT TYPE="button" onClick="UserList.reset();this.form.regexp.value=''" value="{button_reset}">
@@ -91,7 +92,7 @@
 		var UsersBan = new filterlist(document.userban.unban_name);
 	//-->
 	</SCRIPT>
-	
+
 	<BR><BR>
 	<A HREF="javascript:UsersBan.set('^A')" TITLE="{bo_select_title} A">A</A>
 	<A HREF="javascript:UsersBan.set('^B')" TITLE="{bo_select_title} B">B</A>
diff --git a/styles/templates/adm/BanOptionsResultBody.tpl b/styles/views/adm/BanOptionsResultBody.php
similarity index 92%
rename from styles/templates/adm/BanOptionsResultBody.tpl
rename to styles/views/adm/BanOptionsResultBody.php
index 311cccd..9959f3d 100644
--- a/styles/templates/adm/BanOptionsResultBody.tpl
+++ b/styles/views/adm/BanOptionsResultBody.php
@@ -1,5 +1,5 @@
 <script>document.body.style.overflow = "auto";</script>
-<script src="../scripts/cntchar.js" type="text/javascript"></script>
+<script src="../js/cntchar-min.js" type="text/javascript"></script>
 <style>
 .center{text-align:center;}
 .character{background-color:#344566;color:lime;text-align:center;border:0px;font-weight:bold;font-size:10px;}
@@ -14,7 +14,7 @@
 	<th>{bo_username}</th>
 	<th colspan="2"><input name="ban_name" type="text" value="{name}" readonly="true" class="character"/></th>
 </tr><tr>
-	<th>{bo_reason} <br><br>{bo_characters_1}<input name="result2" value=50 size="2" readonly="true" class="character"></th> 
+	<th>{bo_reason} <br><br>{bo_characters_1}<input name="result2" value=50 size="2" readonly="true" class="character"></th>
 	<th colspan="2"><textarea name="why" maxlength="50" cols="20" rows="5" onKeyDown="contar2('countt','why')" onKeyUp="contar2('countt','why')">{reas}</textarea></th>
 </tr>
 	{timesus}
diff --git a/styles/templates/adm/ChangePassBody.tpl b/styles/views/adm/ChangePassBody.php
similarity index 100%
rename from styles/templates/adm/ChangePassBody.tpl
rename to styles/views/adm/ChangePassBody.php
diff --git a/styles/templates/adm/ConfigStatsBody.tpl b/styles/views/adm/ConfigStatsBody.php
similarity index 100%
rename from styles/templates/adm/ConfigStatsBody.tpl
rename to styles/views/adm/ConfigStatsBody.php
diff --git a/styles/templates/adm/CreateNewUserBody.tpl b/styles/views/adm/CreateNewUserBody.php
similarity index 100%
rename from styles/templates/adm/CreateNewUserBody.tpl
rename to styles/views/adm/CreateNewUserBody.php
diff --git a/styles/templates/adm/CreatorBody.tpl b/styles/views/adm/CreatorBody.php
similarity index 100%
rename from styles/templates/adm/CreatorBody.tpl
rename to styles/views/adm/CreatorBody.php
diff --git a/styles/templates/adm/DataBaseViewBody.tpl b/styles/views/adm/DataBaseViewBody.php
similarity index 100%
rename from styles/templates/adm/DataBaseViewBody.tpl
rename to styles/views/adm/DataBaseViewBody.php
diff --git a/styles/templates/adm/EditorBody.tpl b/styles/views/adm/EditorBody.php
similarity index 100%
rename from styles/templates/adm/EditorBody.tpl
rename to styles/views/adm/EditorBody.php
diff --git a/styles/templates/adm/EditorTPL/AllianceBody.tpl b/styles/views/adm/EditorTPL/AllianceBody.php
similarity index 95%
rename from styles/templates/adm/EditorTPL/AllianceBody.tpl
rename to styles/views/adm/EditorTPL/AllianceBody.php
index 1b25c6b..1c6d133 100644
--- a/styles/templates/adm/EditorTPL/AllianceBody.tpl
+++ b/styles/views/adm/EditorTPL/AllianceBody.php
@@ -1,5 +1,5 @@
 <script>document.body.style.overflow = "auto";</script>
-<script src="../scripts/cntchar.js" type="text/javascript"></script>
+<script src="../js/cntchar-min.js" type="text/javascript"></script>
 <body>
 <br />
 </table>
diff --git a/styles/templates/adm/EditorTPL/BuildingsBody.tpl b/styles/views/adm/EditorTPL/BuildingsBody.php
similarity index 100%
rename from styles/templates/adm/EditorTPL/BuildingsBody.tpl
rename to styles/views/adm/EditorTPL/BuildingsBody.php
diff --git a/styles/templates/adm/EditorTPL/DefensesBody.tpl b/styles/views/adm/EditorTPL/DefensesBody.php
similarity index 89%
rename from styles/templates/adm/EditorTPL/DefensesBody.tpl
rename to styles/views/adm/EditorTPL/DefensesBody.php
index 1a519fd..fd52228 100644
--- a/styles/templates/adm/EditorTPL/DefensesBody.tpl
+++ b/styles/views/adm/EditorTPL/DefensesBody.php
@@ -50,20 +50,12 @@
 	<th><input name="big_protection_shield" type="text" value="0" /></th>
 </tr><tr>
 	<th>9</th>
-	<th>{planet_protector}</th>
-	<th><input name="planet_protector" type="text" value="0" /></th>
-</tr><tr>
-	<th>10</th>
 	<th>{interceptor_misil}</th>
 	<th><input name="interceptor_misil" type="text" value="0" /></th>
 </tr><tr>
-	<th>11</th>
+	<th>10</th>
 	<th>{interplanetary_misil}</th>
 	<th><input name="interplanetary_misil" type="text" value="0" /></th>
-</tr><tr>
-   <th>12</th>
-   <th>{atom_protector}</th>
-   <th><input name="atom_protector" type="text" value="0" /></th>
 </tr><tr>
 	<th colspan="3">
 	<input type="reset" value="{button_reset}"/><br /><br />
diff --git a/styles/templates/adm/EditorTPL/EditorBody.tpl b/styles/views/adm/EditorTPL/EditorBody.php
similarity index 100%
rename from styles/templates/adm/EditorTPL/EditorBody.tpl
rename to styles/views/adm/EditorTPL/EditorBody.php
diff --git a/styles/templates/adm/EditorTPL/OfficiersBody.tpl b/styles/views/adm/EditorTPL/OfficiersBody.php
similarity index 51%
rename from styles/templates/adm/EditorTPL/OfficiersBody.tpl
rename to styles/views/adm/EditorTPL/OfficiersBody.php
index 0674883..b224f13 100644
--- a/styles/templates/adm/EditorTPL/OfficiersBody.tpl
+++ b/styles/views/adm/EditorTPL/OfficiersBody.php
@@ -33,50 +33,6 @@
 	<th>4</th>
 	<th>{technocrat}</th>
 	<th><input name="rpg_technocrate" type="text" value="0" /></th>
-</tr><tr>
-	<th>5</th>
-	<th>{spy}</th>
-	<th><input name="rpg_espion" type="text" value="0" /></th>
-</tr><tr>
-	<th>6</th>
-	<th>{constructor}</th>
-	<th><input name="rpg_constructeur" type="text" value="0" /></th>
-</tr><tr>
-	<th>7</th>
-	<th>{scientific}</th>
-	<th><input name="rpg_scientifique" type="text" value="0" /></th>
-</tr><tr>
-	<th>8</th>
-	<th>{commander}</th>
-	<th><input name="rpg_commandant" type="text" value="0" /></th>
-</tr><tr>
-	<th>9</th>
-	<th>{storer}</th>
-	<th><input name="rpg_stockeur" type="text" value="0" /></th>
-</tr><tr>
-	<th>10</th>
-	<th>{defender}</th>
-	<th><input name="rpg_defenseur" type="text" value="0" /></th>
-</tr><tr>
-	<th>11</th>
-	<th>{destroyer}</th>
-	<th><input name="rpg_destructeur" type="text" value="0" /></th>
-</tr><tr>
-	<th>12</th>
-	<th>{general}</th>
-	<th><input name="rpg_general" type="text" value="0" /></th>
-</tr><tr>
-	<th>13</th>
-	<th>{protector}</th>
-	<th><input name="rpg_bunker" type="text" value="0" /></th>
-</tr><tr>
-	<th>14</th>
-	<th>{conqueror}</th>
-	<th><input name="rpg_raideur" type="text" value="0" /></th>
-</tr><tr>
-	<th>15</th>
-	<th>{emperor}</th>
-	<th><input name="rpg_empereur" type="text" value="0" /></th>
 </tr><tr>
 	<th colspan="3">
 	<input type="reset" value="{button_reset}"/><br /><br />
diff --git a/styles/templates/adm/EditorTPL/PersonalBody.tpl b/styles/views/adm/EditorTPL/PersonalBody.php
similarity index 100%
rename from styles/templates/adm/EditorTPL/PersonalBody.tpl
rename to styles/views/adm/EditorTPL/PersonalBody.php
diff --git a/styles/templates/adm/EditorTPL/PlanetsMoonsBody.tpl b/styles/views/adm/EditorTPL/PlanetsMoonsBody.php
similarity index 100%
rename from styles/templates/adm/EditorTPL/PlanetsMoonsBody.tpl
rename to styles/views/adm/EditorTPL/PlanetsMoonsBody.php
diff --git a/styles/templates/adm/EditorTPL/ResearchBody.tpl b/styles/views/adm/EditorTPL/ResearchBody.php
similarity index 91%
rename from styles/templates/adm/EditorTPL/ResearchBody.tpl
rename to styles/views/adm/EditorTPL/ResearchBody.php
index 42a4020..31222cd 100644
--- a/styles/templates/adm/EditorTPL/ResearchBody.tpl
+++ b/styles/views/adm/EditorTPL/ResearchBody.php
@@ -81,14 +81,6 @@
 	<th>16</th>
 	<th>{graviton_tech}</th>
 	<th><input name="graviton_tech" type="text" value="0" /></th>
-</tr><tr>
-    <th>17</th>
-    <th>{colonisation_tech}</th>
-    <th><input name="colonisation_tech" type="text" value="0" /></th>
-</tr><tr>
-    <th>18</th>
-    <th>{atom_tech}</th>
-    <th><input name="atom_tech" type="text" value="0" /></th>
 </tr><tr>
 	<th colspan="3">
 	<input type="reset" value="{button_reset}"/><br /><br />
diff --git a/styles/templates/adm/EditorTPL/ResourcesBody.tpl b/styles/views/adm/EditorTPL/ResourcesBody.php
similarity index 94%
rename from styles/templates/adm/EditorTPL/ResourcesBody.tpl
rename to styles/views/adm/EditorTPL/ResourcesBody.php
index 158c4e8..e6e0c3d 100644
--- a/styles/templates/adm/EditorTPL/ResourcesBody.tpl
+++ b/styles/views/adm/EditorTPL/ResourcesBody.php
@@ -1,5 +1,5 @@
 <script>document.body.style.overflow = "auto";</script>
-<SCRIPT TYPE="text/javascript" SRC="../scripts/filterlist.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="../js/filterlist-min.js"></SCRIPT>
 <body>
 <br />
 <form action="" method="post">
diff --git a/styles/templates/adm/EditorTPL/ShipsBody.tpl b/styles/views/adm/EditorTPL/ShipsBody.php
similarity index 95%
rename from styles/templates/adm/EditorTPL/ShipsBody.tpl
rename to styles/views/adm/EditorTPL/ShipsBody.php
index 400e484..ab40745 100644
--- a/styles/templates/adm/EditorTPL/ShipsBody.tpl
+++ b/styles/views/adm/EditorTPL/ShipsBody.php
@@ -72,10 +72,6 @@
 	<th>14</th>
 	<th>{battleship}</th>
 	<th><input name="battleship" type="text" value="0" /></th>
-</tr><tr>
-	<th>15</th>
-	<th>{supernova}</th>
-	<th><input name="supernova" type="text" value="0" /></th>
 </tr><tr>
 	<th colspan="3">
 	<input type="reset" value="{button_reset}"/><br /><br />
diff --git a/styles/templates/index.htm b/styles/views/adm/EditorTPL/index.html
similarity index 100%
rename from styles/templates/index.htm
rename to styles/views/adm/EditorTPL/index.html
diff --git a/styles/templates/adm/ErrorMessagesBody.tpl b/styles/views/adm/ErrorMessagesBody.php
similarity index 100%
rename from styles/templates/adm/ErrorMessagesBody.tpl
rename to styles/views/adm/ErrorMessagesBody.php
diff --git a/styles/templates/adm/FAQPage.tpl b/styles/views/adm/FAQPage.php
similarity index 100%
rename from styles/templates/adm/FAQPage.tpl
rename to styles/views/adm/FAQPage.php
diff --git a/styles/templates/adm/GlobalMessageBody.tpl b/styles/views/adm/GlobalMessageBody.php
similarity index 76%
rename from styles/templates/adm/GlobalMessageBody.tpl
rename to styles/views/adm/GlobalMessageBody.php
index b19516f..0f8c96f 100644
--- a/styles/templates/adm/GlobalMessageBody.tpl
+++ b/styles/views/adm/GlobalMessageBody.php
@@ -1,21 +1,17 @@
-<script src="../scripts/cntchar.js" type="text/javascript"></script>
+<script src="../js/cntchar-min.js" type="text/javascript"></script>
 <style>.character{background-color:#344566;color:lime;text-align:center;border:0px;font-weight:bolder;}</style>
 <body>
 <form action="?mode=change" method="post" name="nameform">
     <table width="550">
-                {display}
-            <tr>
+				{display}
+			<tr>
                 <td class="c" colspan="2">{ma_send_global_message}</th>
             </tr>
             <tr>
                 <th>{ma_subject}</th>
                 <th><input name="temat" maxlength="100" size="20" value="{ma_none}" type="text"></th>
             </tr>
-                        <tr>
-                <th>Òåìíàÿ ìàòåðèÿ</th>
-                <th><input name="still" maxlength="100" size="20" value="0" ></th>
-            </tr>
-            <tr>
+			<tr>
                 <th>{ma_characters}</th>
                 <th><input name="result" value=5000 size="4" readonly="true" class="character"></th>
             </tr>
diff --git a/styles/templates/adm/LogBody.tpl b/styles/views/adm/LogBody.php
similarity index 100%
rename from styles/templates/adm/LogBody.tpl
rename to styles/views/adm/LogBody.php
diff --git a/styles/templates/adm/LogEditBody.tpl b/styles/views/adm/LogEditBody.php
similarity index 100%
rename from styles/templates/adm/LogEditBody.tpl
rename to styles/views/adm/LogEditBody.php
diff --git a/styles/templates/adm/MessageListBody.tpl b/styles/views/adm/MessageListBody.php
similarity index 100%
rename from styles/templates/adm/MessageListBody.tpl
rename to styles/views/adm/MessageListBody.php
diff --git a/styles/templates/adm/MessageListRows.tpl b/styles/views/adm/MessageListRows.php
similarity index 100%
rename from styles/templates/adm/MessageListRows.tpl
rename to styles/views/adm/MessageListRows.php
diff --git a/styles/templates/adm/ModerationBody.tpl b/styles/views/adm/ModerationBody.php
similarity index 100%
rename from styles/templates/adm/ModerationBody.tpl
rename to styles/views/adm/ModerationBody.php
diff --git a/styles/templates/adm/MoonListBody.tpl b/styles/views/adm/MoonListBody.php
similarity index 100%
rename from styles/templates/adm/MoonListBody.tpl
rename to styles/views/adm/MoonListBody.php
diff --git a/styles/templates/adm/MoonOptionsBody.tpl b/styles/views/adm/MoonOptionsBody.php
similarity index 100%
rename from styles/templates/adm/MoonOptionsBody.tpl
rename to styles/views/adm/MoonOptionsBody.php
diff --git a/styles/templates/adm/OnlineUsersBody.tpl b/styles/views/adm/OnlineUsersBody.php
similarity index 100%
rename from styles/templates/adm/OnlineUsersBody.tpl
rename to styles/views/adm/OnlineUsersBody.php
diff --git a/styles/templates/adm/OnlineUsersRow.tpl b/styles/views/adm/OnlineUsersRow.php
similarity index 100%
rename from styles/templates/adm/OnlineUsersRow.tpl
rename to styles/views/adm/OnlineUsersRow.php
diff --git a/styles/views/adm/OverviewBody.php b/styles/views/adm/OverviewBody.php
new file mode 100644
index 0000000..a319fcd
--- /dev/null
+++ b/styles/views/adm/OverviewBody.php
@@ -0,0 +1,86 @@
+<script>document.body.style.overflow = "auto";</script>
+<style>table.lic{background:url(../styles/images/Adm/blank.gif);border:2px {color} solid;}
+th.lic{border:0px;}</style>
+<body>
+<h1>{ow_title}</h1>
+<table width="90%" class="lic">
+<tr>
+    <th class="lic">{error_message}</th>
+</tr>
+</table>
+
+<br>
+<table width="80%">
+	<tr>
+    	<td class="c">{ow_overview}</td>
+    </tr>
+	<tr>
+    	<th height="50px"><div align="justify">{ow_welcome_text}</div></th>
+    </tr>
+    <tr>
+        <td class="c">{ow_support}</td>
+    </tr>
+    <tr>
+        <th>
+        	<br />
+            <a href="http://tracker.xgproyect.net/" target="_blank">Reporte de bugs (Bug Report)</a>
+        	<br />
+        	<a href="http://www.xgproyect.net/" target="_blank">XG Proyect {ow_forum}</a>
+        	<br />
+            <br />
+        </th>
+    </tr>
+    <tr>
+    	<td class="c">{ow_credits}</td>
+    </tr>
+    <tr>
+    	<th align="center">
+            <table width="100%">
+                <tr>
+                  <th class="lic"><h3>{ow_proyect_leader}</h3></th>
+                </tr>
+                <tr>
+                  <th class="lic"><h3><font color="red">lucky</font></h3></th>
+                </tr>
+                <tr>
+                  <th class="lic"><h3>{ow_principal_contributors}</h3></th>
+                </tr>
+                <tr>
+                  <th class="lic" align="center">
+                  	<table width="100%" border="0">
+                      <tr>
+                        <td>
+                        	angelus_ira (Estad&iacute;sticas - optimizaci&oacute;n general)<br />
+                        	Calzon (Fixs varios)<br />
+                        	cyberrichy (SAC's)<br />
+                        	jstar (Fixs varios - optimizaci&oacute;n general)<br />
+                        	Neko (Panel administrativo - Fixs varios)<br />
+                        	PowerMaster (Fixs varios)<br />
+                        	Think (Fixs varios)<br />
+                        	zorro2666 (Fixs varios)
+                        </td>
+                      </tr>
+                    </table>
+                  </th>
+                </tr>
+                <tr>
+                	<th class="lic"><h3>Other contributors</h3></th>
+                </tr>
+                <tr>
+                  <th class="lic" align="center">
+                  	<div align="justify">
+					adri93, Alberto14, Anghelito, Arali, edering, Green, jtsamper, Kloud, medel, MSW, Neurus, Nickolay, Pada, privatethedawn, Tarta, thyphoon, tomtom, Tonique, Trojan, Saint, shoghicp, slaver7, war4head, zorro2666
+					</div>
+                  </th>
+                </tr>
+                <tr>
+                  <th class="lic"><h3>{ow_special_thanks}</h3></th>
+                </tr>
+                <tr>
+                    <th class="lic">Raito<br />Chlorel<br />e-Zobar<br />Flousedid<br /><br /></th>
+                </tr>
+            </table>
+        </th>
+    </tr>
+</table>
+</body>
\ No newline at end of file
diff --git a/styles/templates/adm/PassEncripterBody.tpl b/styles/views/adm/PassEncripterBody.php
similarity index 100%
rename from styles/templates/adm/PassEncripterBody.tpl
rename to styles/views/adm/PassEncripterBody.php
diff --git a/styles/templates/adm/PlanetListBody.tpl b/styles/views/adm/PlanetListBody.php
similarity index 100%
rename from styles/templates/adm/PlanetListBody.tpl
rename to styles/views/adm/PlanetListBody.php
diff --git a/styles/templates/adm/PlanetOptionsBody.tpl b/styles/views/adm/PlanetOptionsBody.php
similarity index 100%
rename from styles/templates/adm/PlanetOptionsBody.tpl
rename to styles/views/adm/PlanetOptionsBody.php
diff --git a/styles/templates/adm/QueriesBody.tpl b/styles/views/adm/QueriesBody.php
similarity index 100%
rename from styles/templates/adm/QueriesBody.tpl
rename to styles/views/adm/QueriesBody.php
diff --git a/styles/templates/adm/ResetBody.tpl b/styles/views/adm/ResetBody.php
similarity index 100%
rename from styles/templates/adm/ResetBody.tpl
rename to styles/views/adm/ResetBody.php
diff --git a/styles/templates/adm/SearchInDBBody.tpl b/styles/views/adm/SearchInDBBody.php
similarity index 96%
rename from styles/templates/adm/SearchInDBBody.tpl
rename to styles/views/adm/SearchInDBBody.php
index 9e43dd3..8d0eebb 100644
--- a/styles/templates/adm/SearchInDBBody.tpl
+++ b/styles/views/adm/SearchInDBBody.php
@@ -2,7 +2,7 @@
 <body>
 <!DOCTYPE HTML>
 <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
-<script type="text/javascript" src="../scripts/animatedcollapse.js"></script>
+<script type="text/javascript" src="../js/animatedcollapse-min.js"></script>
 <script type="text/javascript">
 animatedcollapse.addDiv('search', 'fade=1,height=auto')
 animatedcollapse.ontoggle=function($, divobj, state){
diff --git a/styles/templates/adm/SearchInDBRow.tpl b/styles/views/adm/SearchInDBRow.php
similarity index 100%
rename from styles/templates/adm/SearchInDBRow.tpl
rename to styles/views/adm/SearchInDBRow.php
diff --git a/styles/templates/adm/SettingsBody.tpl b/styles/views/adm/SettingsBody.php
similarity index 100%
rename from styles/templates/adm/SettingsBody.tpl
rename to styles/views/adm/SettingsBody.php
diff --git a/styles/templates/adm/Topnav.tpl b/styles/views/adm/Topnav.php
similarity index 100%
rename from styles/templates/adm/Topnav.tpl
rename to styles/views/adm/Topnav.php
diff --git a/styles/templates/adm/UserListBody.tpl b/styles/views/adm/UserListBody.php
similarity index 100%
rename from styles/templates/adm/UserListBody.tpl
rename to styles/views/adm/UserListBody.php
diff --git a/styles/templates/adm/UserListRows.tpl b/styles/views/adm/UserListRows.php
similarity index 100%
rename from styles/templates/adm/UserListRows.tpl
rename to styles/views/adm/UserListRows.php
diff --git a/styles/templates/adm/fleet_body.tpl b/styles/views/adm/fleet_body.php
similarity index 100%
rename from styles/templates/adm/fleet_body.tpl
rename to styles/views/adm/fleet_body.php
diff --git a/styles/templates/adm/fleet_rows.tpl b/styles/views/adm/fleet_rows.php
similarity index 100%
rename from styles/templates/adm/fleet_rows.tpl
rename to styles/views/adm/fleet_rows.php
diff --git a/styles/views/adm/index.html b/styles/views/adm/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/styles/templates/adm/menu.tpl b/styles/views/adm/menu.php
similarity index 100%
rename from styles/templates/adm/menu.tpl
rename to styles/views/adm/menu.php
diff --git a/styles/templates/adm/simple_header.tpl b/styles/views/adm/simple_header.php
similarity index 100%
rename from styles/templates/adm/simple_header.tpl
rename to styles/views/adm/simple_header.php
diff --git a/styles/views/alliance/alliance_abandon_alliance.php b/styles/views/alliance/alliance_abandon_alliance.php
new file mode 100644
index 0000000..1c28ce0
--- /dev/null
+++ b/styles/views/alliance/alliance_abandon_alliance.php
@@ -0,0 +1,10 @@
+<table width="519">
+	<tr>
+		<td class="c">{al_leave_alliance}</td>
+	</tr>
+	<tr>
+		<th>
+			<input type="button" onclick="javascript:location.href='game.php?page=alliance&mode=exit';" value="{al_continue}"/>
+		</th>
+	</tr>
+</table>
\ No newline at end of file
diff --git a/styles/templates/alliance/alliance_admin.tpl b/styles/views/alliance/alliance_admin.php
similarity index 96%
rename from styles/templates/alliance/alliance_admin.tpl
rename to styles/views/alliance/alliance_admin.php
index b0fb773..f053d11 100644
--- a/styles/templates/alliance/alliance_admin.tpl
+++ b/styles/views/alliance/alliance_admin.php
@@ -1,4 +1,4 @@
-<script src="scripts/cntchar.js" type="text/javascript"></script>
+<script src="js/cntchar-min.js" type="text/javascript"></script>
 <br />
 <div id="content">
     <table width=519>
@@ -39,7 +39,7 @@
         </tr>
         <tr>
           <th colspan=3>
-          <input type="hidden" name=t value={t}><input type="reset" value="{al_circular_reset}"> 
+          <input type="hidden" name=t value={t}><input type="reset" value="{al_circular_reset}">
           <input type="submit" value="{al_save}">
           </th>
         </tr>
@@ -80,7 +80,7 @@
         </tr>
         <tr>
           <th><input type="button" onclick="javascript:location.href='game.php?page=alliance&mode=admin&edit=exit';" value="{al_continue}"/></th>
-        </tr>  
+        </tr>
      </table>
      <table width=519>
      	<tr>
@@ -88,6 +88,6 @@
         </tr>
         <tr>
           <th><input type="button" onclick="javascript:location.href='game.php?page=alliance&mode=admin&edit=transfer';" value="{al_continue}"/></th>
-        </tr>  
+        </tr>
      </table>
 </div>
\ No newline at end of file
diff --git a/styles/templates/alliance/alliance_admin_laws.tpl b/styles/views/alliance/alliance_admin_laws.php
similarity index 100%
rename from styles/templates/alliance/alliance_admin_laws.tpl
rename to styles/views/alliance/alliance_admin_laws.php
diff --git a/styles/templates/alliance/alliance_admin_laws_feet.tpl b/styles/views/alliance/alliance_admin_laws_feet.php
similarity index 100%
rename from styles/templates/alliance/alliance_admin_laws_feet.tpl
rename to styles/views/alliance/alliance_admin_laws_feet.php
diff --git a/styles/templates/alliance/alliance_admin_laws_head.tpl b/styles/views/alliance/alliance_admin_laws_head.php
similarity index 100%
rename from styles/templates/alliance/alliance_admin_laws_head.tpl
rename to styles/views/alliance/alliance_admin_laws_head.php
diff --git a/styles/templates/alliance/alliance_admin_laws_row.tpl b/styles/views/alliance/alliance_admin_laws_row.php
similarity index 100%
rename from styles/templates/alliance/alliance_admin_laws_row.tpl
rename to styles/views/alliance/alliance_admin_laws_row.php
diff --git a/styles/templates/alliance/alliance_admin_members_row.tpl b/styles/views/alliance/alliance_admin_members_row.php
similarity index 100%
rename from styles/templates/alliance/alliance_admin_members_row.tpl
rename to styles/views/alliance/alliance_admin_members_row.php
diff --git a/styles/templates/alliance/alliance_admin_members_row_edit.tpl b/styles/views/alliance/alliance_admin_members_row_edit.php
similarity index 100%
rename from styles/templates/alliance/alliance_admin_members_row_edit.tpl
rename to styles/views/alliance/alliance_admin_members_row_edit.php
diff --git a/styles/templates/alliance/alliance_admin_members_table.tpl b/styles/views/alliance/alliance_admin_members_table.php
similarity index 100%
rename from styles/templates/alliance/alliance_admin_members_table.tpl
rename to styles/views/alliance/alliance_admin_members_table.php
diff --git a/styles/templates/alliance/alliance_admin_rename.tpl b/styles/views/alliance/alliance_admin_rename.php
similarity index 100%
rename from styles/templates/alliance/alliance_admin_rename.tpl
rename to styles/views/alliance/alliance_admin_rename.php
diff --git a/styles/templates/alliance/alliance_admin_request_form.tpl b/styles/views/alliance/alliance_admin_request_form.php
similarity index 90%
rename from styles/templates/alliance/alliance_admin_request_form.tpl
rename to styles/views/alliance/alliance_admin_request_form.php
index e5b5921..b75fed9 100644
--- a/styles/templates/alliance/alliance_admin_request_form.tpl
+++ b/styles/views/alliance/alliance_admin_request_form.php
@@ -1,4 +1,4 @@
-<script src="scripts/cntchar.js" type="text/javascript"></script>
+<script src="js/cntchar-min.js" type="text/javascript"></script>
 <form action="game.php?page=alliance&mode=admin&edit=requests&show={id}&sort=0" method="POST">
    <tr>
 	 <th colspan="2">{Request_from}</th>
diff --git a/styles/templates/alliance/alliance_admin_request_row.tpl b/styles/views/alliance/alliance_admin_request_row.php
similarity index 100%
rename from styles/templates/alliance/alliance_admin_request_row.tpl
rename to styles/views/alliance/alliance_admin_request_row.php
diff --git a/styles/templates/alliance/alliance_admin_request_table.tpl b/styles/views/alliance/alliance_admin_request_table.php
similarity index 100%
rename from styles/templates/alliance/alliance_admin_request_table.tpl
rename to styles/views/alliance/alliance_admin_request_table.php
diff --git a/styles/templates/alliance/alliance_admin_transfer.tpl b/styles/views/alliance/alliance_admin_transfer.php
similarity index 100%
rename from styles/templates/alliance/alliance_admin_transfer.tpl
rename to styles/views/alliance/alliance_admin_transfer.php
diff --git a/styles/templates/alliance/alliance_admin_transfer_row.tpl b/styles/views/alliance/alliance_admin_transfer_row.php
similarity index 100%
rename from styles/templates/alliance/alliance_admin_transfer_row.tpl
rename to styles/views/alliance/alliance_admin_transfer_row.php
diff --git a/styles/templates/alliance/alliance_ainfo.tpl b/styles/views/alliance/alliance_ainfo.php
similarity index 100%
rename from styles/templates/alliance/alliance_ainfo.tpl
rename to styles/views/alliance/alliance_ainfo.php
diff --git a/styles/templates/alliance/alliance_apply_waitform.tpl b/styles/views/alliance/alliance_apply_waitform.php
similarity index 100%
rename from styles/templates/alliance/alliance_apply_waitform.tpl
rename to styles/views/alliance/alliance_apply_waitform.php
diff --git a/styles/templates/alliance/alliance_applyform.tpl b/styles/views/alliance/alliance_applyform.php
similarity index 91%
rename from styles/templates/alliance/alliance_applyform.tpl
rename to styles/views/alliance/alliance_applyform.php
index 7f8d2af..84b6068 100644
--- a/styles/templates/alliance/alliance_applyform.tpl
+++ b/styles/views/alliance/alliance_applyform.php
@@ -1,4 +1,4 @@
-<script src="scripts/cntchar.js" type="text/javascript"></script>
+<script src="js/cntchar-min.js" type="text/javascript"></script>
 <br />
 <div id="content">
     <form action="game.php?page=alliance&mode=apply&allyid={allyid}" method=POST>
diff --git a/styles/templates/alliance/alliance_circular.tpl b/styles/views/alliance/alliance_circular.php
similarity index 93%
rename from styles/templates/alliance/alliance_circular.tpl
rename to styles/views/alliance/alliance_circular.php
index 9dddd19..2a84431 100644
--- a/styles/templates/alliance/alliance_circular.tpl
+++ b/styles/views/alliance/alliance_circular.php
@@ -1,4 +1,4 @@
-<script src="scripts/cntchar.js" type="text/javascript"></script>
+<script src="js/cntchar-min.js" type="text/javascript"></script>
 <br />
 <div id="content">
     <form action="game.php?page=alliance&mode=circular&sendmail=1" method="POST">
diff --git a/styles/views/alliance/alliance_circular_row.php b/styles/views/alliance/alliance_circular_row.php
new file mode 100644
index 0000000..7fa3781
--- /dev/null
+++ b/styles/views/alliance/alliance_circular_row.php
@@ -0,0 +1,10 @@
+<tr>
+	<th>
+		{al_circular_message}
+	</th>
+	<th>
+		<a href="game.php?page=alliance&mode=circular">
+			{al_send_circular_message}
+		</a>
+	</th>
+</tr>
\ No newline at end of file
diff --git a/styles/templates/alliance/alliance_defaultmenu.tpl b/styles/views/alliance/alliance_defaultmenu.php
similarity index 100%
rename from styles/templates/alliance/alliance_defaultmenu.tpl
rename to styles/views/alliance/alliance_defaultmenu.php
diff --git a/styles/templates/alliance/alliance_frontpage.tpl b/styles/views/alliance/alliance_frontpage.php
similarity index 100%
rename from styles/templates/alliance/alliance_frontpage.tpl
rename to styles/views/alliance/alliance_frontpage.php
diff --git a/styles/views/alliance/alliance_image_row.php b/styles/views/alliance/alliance_image_row.php
new file mode 100644
index 0000000..9d57ab5
--- /dev/null
+++ b/styles/views/alliance/alliance_image_row.php
@@ -0,0 +1,5 @@
+<tr>
+	<td colspan="2">
+		<img src="{ally_image}">
+	</td>
+</tr>
\ No newline at end of file
diff --git a/styles/templates/alliance/alliance_make.tpl b/styles/views/alliance/alliance_make.php
similarity index 100%
rename from styles/templates/alliance/alliance_make.tpl
rename to styles/views/alliance/alliance_make.php
diff --git a/styles/templates/alliance/alliance_memberslist_row.tpl b/styles/views/alliance/alliance_memberslist_row.php
similarity index 100%
rename from styles/templates/alliance/alliance_memberslist_row.tpl
rename to styles/views/alliance/alliance_memberslist_row.php
diff --git a/styles/templates/alliance/alliance_memberslist_table.tpl b/styles/views/alliance/alliance_memberslist_table.php
similarity index 100%
rename from styles/templates/alliance/alliance_memberslist_table.tpl
rename to styles/views/alliance/alliance_memberslist_table.php
diff --git a/styles/views/alliance/alliance_message_box.php b/styles/views/alliance/alliance_message_box.php
new file mode 100644
index 0000000..7c2ebbd
--- /dev/null
+++ b/styles/views/alliance/alliance_message_box.php
@@ -0,0 +1,10 @@
+<div id="content">
+	<form action="{goto}" method="post">
+		<table width="519">
+			<tr>
+				<td class="c" colspan="2">{title}</td>
+			</tr>
+			{message_box_row}
+		</table>
+	</form>
+</div>
\ No newline at end of file
diff --git a/styles/views/alliance/alliance_message_box_row_one.php b/styles/views/alliance/alliance_message_box_row_one.php
new file mode 100644
index 0000000..e6592d4
--- /dev/null
+++ b/styles/views/alliance/alliance_message_box_row_one.php
@@ -0,0 +1,6 @@
+<tr>
+	<th>
+		{message}
+		<input type="submit" value="{button}">
+	</th>
+</tr>
\ No newline at end of file
diff --git a/styles/views/alliance/alliance_message_box_row_two.php b/styles/views/alliance/alliance_message_box_row_two.php
new file mode 100644
index 0000000..d467ae8
--- /dev/null
+++ b/styles/views/alliance/alliance_message_box_row_two.php
@@ -0,0 +1,10 @@
+<tr>
+	<th colspan="2">
+		{message}
+	</th>
+</tr>
+<tr>
+	<th colspan="2" align="center">
+		<input type="submit" value="{button}">
+	</th>
+</tr>
\ No newline at end of file
diff --git a/styles/views/alliance/alliance_requests_row.php b/styles/views/alliance/alliance_requests_row.php
new file mode 100644
index 0000000..8d2f052
--- /dev/null
+++ b/styles/views/alliance/alliance_requests_row.php
@@ -0,0 +1,10 @@
+<tr>
+	<th>
+		{al_requests}
+	</th>
+	<th>
+		<a href="game.php?page=alliance&mode=admin&edit=requests">
+			{request_count} {al_new_requests}
+		</a>
+	</th>
+</tr>
\ No newline at end of file
diff --git a/styles/templates/alliance/alliance_searchform.tpl b/styles/views/alliance/alliance_searchform.php
similarity index 100%
rename from styles/templates/alliance/alliance_searchform.tpl
rename to styles/views/alliance/alliance_searchform.php
diff --git a/styles/templates/alliance/alliance_searchresult_row.tpl b/styles/views/alliance/alliance_searchresult_row.php
similarity index 100%
rename from styles/templates/alliance/alliance_searchresult_row.tpl
rename to styles/views/alliance/alliance_searchresult_row.php
diff --git a/styles/templates/alliance/alliance_searchresult_table.tpl b/styles/views/alliance/alliance_searchresult_table.php
similarity index 100%
rename from styles/templates/alliance/alliance_searchresult_table.tpl
rename to styles/views/alliance/alliance_searchresult_table.php
diff --git a/styles/views/alliance/index.html b/styles/views/alliance/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/styles/templates/banned_body.tpl b/styles/views/banned/banned_body.php
similarity index 60%
rename from styles/templates/banned_body.tpl
rename to styles/views/banned/banned_body.php
index 4d5b7bc..594a4d8 100644
--- a/styles/templates/banned_body.tpl
+++ b/styles/views/banned/banned_body.php
@@ -2,7 +2,7 @@
 <div id="content">
     <table width="600">
     <tr>
-        <td class="c" colspan="6">{bn_players_banned_list}</td>
+        <td class="c" colspan="5">{bn_players_banned_list}</td>
     </tr><tr>
         <th>{bn_player}</th>
         <th>{bn_reason}</th>
@@ -10,6 +10,9 @@
         <th>{bn_until}</th>
         <th>{bn_by}</th>
     </tr>
-    {banned}
+    {banned_players}
+    <tr>
+    	<th class="5" colspan="5">{banned_msg}</th>
+    </tr>
     </table>
 </div>
\ No newline at end of file
diff --git a/styles/views/banned/banned_row.php b/styles/views/banned/banned_row.php
new file mode 100644
index 0000000..be01a45
--- /dev/null
+++ b/styles/views/banned/banned_row.php
@@ -0,0 +1,7 @@
+<tr>
+	<th class="b">{player}</td>
+	<th class="b">{reason}</td>
+	<th class="b">{since}</td>
+	<th class="b">{until}</td>
+	<th class="b">{by}</td>
+</tr>
\ No newline at end of file
diff --git a/styles/views/banned/index.html b/styles/views/banned/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/styles/views/buddy/buddy_body.php b/styles/views/buddy/buddy_body.php
new file mode 100644
index 0000000..69afa80
--- /dev/null
+++ b/styles/views/buddy/buddy_body.php
@@ -0,0 +1,29 @@
+<center>
+<br/>
+<div id="content">
+	<table width="520">
+		<tr>
+			<td class="c" colspan="5">{bu_buddy_list}</td>
+		</tr>
+		<tr>
+			<td class="c">{bu_player}</td>
+			<td class="c">{bu_alliance}</td>
+			<td class="c">{bu_coords}</td>
+			<td class="c">{bu_text}</td>
+			<td class="c">{bu_action}</td>
+		</tr>
+		<tr>
+			<th class="c" colspan="5">{bu_requests}</a></th>
+		</tr>
+			{request_received}
+		<tr>
+			<th class="c" colspan="5">{bu_my_requests}</a></th>
+		</tr>
+			{request_sended}
+		<tr>
+			<th class="c" colspan="5">{bu_partners}</a></th>
+		</tr>
+			{buddys}
+	</table>
+</div>
+</center>
\ No newline at end of file
diff --git a/styles/views/buddy/buddy_request.php b/styles/views/buddy/buddy_request.php
new file mode 100644
index 0000000..eff179c
--- /dev/null
+++ b/styles/views/buddy/buddy_request.php
@@ -0,0 +1,31 @@
+<script src=js/cntchar-min.js type=text/javascript></script>
+<div id="content">
+	<form action="game.php?page=buddy&mode=1&sm=3" method="post">
+		<input type="hidden" name="user" value="{user}">
+		<table width="520">
+			<tr>
+				<td class="c" colspan="2">{bu_request_message}</td>
+			</tr>
+			<tr>
+				<th>{bu_player}</th>
+				<th>{player}</th>
+			</tr>
+			<tr>
+				<th>
+					{bu_request_text} (<span id="cntChars">0</span> / 5000 {bu_characters})
+				</th>
+				<th>
+					<textarea name="text" cols="60" rows="10" onKeyUp="javascript:cntchar(5000)"></textarea>
+				</th>
+			</tr>
+			<tr>
+				<td class="c">
+					<a href="javascript:back();">{bu_back}</a>
+				</td>
+				<td class="c">
+					<input type="submit" value="{bu_send}">
+				</td>
+			</tr>
+		</table>
+	</form>
+</div>
\ No newline at end of file
diff --git a/styles/views/buddy/buddy_row.php b/styles/views/buddy/buddy_row.php
new file mode 100644
index 0000000..122f7a9
--- /dev/null
+++ b/styles/views/buddy/buddy_row.php
@@ -0,0 +1,17 @@
+<tr>
+	<th>
+		<a href="game.php?page=messages&mode=write&id={id}">{username}</a>
+	</th>
+	<th>
+		<a href="game.php?page=alliance&mode=ainfo&a={ally_id}">{ally_name}</a>
+	</th>
+	<th>
+		<a href="game.php?page=galaxy&mode=3&galaxy={galaxy}&system={system}">{galaxy}:{system}:{planet}</a>
+	</th>
+	<th>
+		{text}
+	</th>
+	<th>
+		{action}
+	</th>
+</tr>
\ No newline at end of file
diff --git a/styles/views/buddy/index.html b/styles/views/buddy/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/styles/views/buildings/buildings_builds.php b/styles/views/buildings/buildings_builds.php
new file mode 100644
index 0000000..f4e0b46
--- /dev/null
+++ b/styles/views/buildings/buildings_builds.php
@@ -0,0 +1,8 @@
+<br />
+<div id="content">
+{BuildListScript}
+    <table width=530>
+        {BuildList}
+        {BuildingsList}
+    </table>
+</div>
\ No newline at end of file
diff --git a/styles/templates/buildings/buildings_builds_row.tpl b/styles/views/buildings/buildings_builds_row.php
similarity index 75%
rename from styles/templates/buildings/buildings_builds_row.tpl
rename to styles/views/buildings/buildings_builds_row.php
index 18e00ae..943758e 100644
--- a/styles/templates/buildings/buildings_builds_row.tpl
+++ b/styles/views/buildings/buildings_builds_row.php
@@ -5,11 +5,10 @@
 		</a>
 	</td>
 	<td class="l">
-		<a href="game.php?page=infos&gid={i}">{n}</a>{nivel}{energia}<br>
+		<a href="game.php?page=infos&gid={i}">{n}</a>{nivel}<br>
 		{descriptions}<br>
 		{price}
 		{time}
-		{rest_price}
 	</td>
 	<td class="k">{click}</td>
 </tr>
\ No newline at end of file
diff --git a/styles/views/buildings/buildings_defense.php b/styles/views/buildings/buildings_defense.php
new file mode 100644
index 0000000..69c07a4
--- /dev/null
+++ b/styles/views/buildings/buildings_defense.php
@@ -0,0 +1,11 @@
+<br />
+<div id="content">
+    {message}
+        <form action="" method="post">
+            <table align="top" width="530">
+                {buildlist}
+                {build_defenses}
+            </table>
+        </form>
+    {buildinglist}
+</div>
\ No newline at end of file
diff --git a/styles/views/buildings/buildings_fleet.php b/styles/views/buildings/buildings_fleet.php
new file mode 100644
index 0000000..b9ffff6
--- /dev/null
+++ b/styles/views/buildings/buildings_fleet.php
@@ -0,0 +1,11 @@
+<br />
+<div id="content">
+    {message}
+        <form action="" method="post">
+            <table align="top" width="530">
+                {buildlist}
+                {build_fleet}
+            </table>
+        </form>
+    {buildinglist}
+</div>
\ No newline at end of file
diff --git a/styles/views/buildings/buildings_fleet_row.php b/styles/views/buildings/buildings_fleet_row.php
new file mode 100644
index 0000000..ebe85f0
--- /dev/null
+++ b/styles/views/buildings/buildings_fleet_row.php
@@ -0,0 +1,16 @@
+<tr>
+	<th class="l">
+		<a href="game.php?page=infos&gid={element}">
+			<img border="0" src="{dpath}gebaeude/{element}.gif" align="top" width="120" height="120" />
+		</a>
+	</th>
+	<td class="l">
+		<a href=game.php?page=infos&gid={element}>{element_name}</a> {element_nbre}<br>
+		{element_description}<br>
+		{element_price}
+		{building_time}
+	</td>
+	<th class="k">
+		{add_element}
+	</th>
+</tr>
\ No newline at end of file
diff --git a/styles/views/buildings/buildings_research.php b/styles/views/buildings/buildings_research.php
new file mode 100644
index 0000000..3a54540
--- /dev/null
+++ b/styles/views/buildings/buildings_research.php
@@ -0,0 +1,9 @@
+<br />
+<div id="content">
+    <font color="#ff0000">{noresearch}</font>
+        <table align="top" width="530">
+            <tr>
+                {technolist}
+            </tr>
+        </table>
+</div>
\ No newline at end of file
diff --git a/styles/templates/buildings/buildings_research_row.tpl b/styles/views/buildings/buildings_research_row.php
similarity index 59%
rename from styles/templates/buildings/buildings_research_row.tpl
rename to styles/views/buildings/buildings_research_row.php
index c58a23c..d6cbbaf 100644
--- a/styles/templates/buildings/buildings_research_row.tpl
+++ b/styles/views/buildings/buildings_research_row.php
@@ -1,15 +1,15 @@
 <tr>
 	<th class="l">
 		<a href="game.php?page=infos&gid={tech_id}">
-		<img border=0 src="{dpath}gebaeude/{tech_id}.gif" align="top" width=120 height=120></a>
+			<img border=0 src="{dpath}gebaeude/{tech_id}.gif" align="top" width=120 height=120>
+		</a>
 	</th>
-	<td class="l" width=360>
+	<td class="l">
 		<a href="game.php?page=infos&gid={tech_id}">{tech_name}</a> {tech_level}<br>{tech_descr}<br>
 		{tech_price}
 		{search_time}
-		{tech_restp}
 	</td>
-	<th class="l" width=120>
+	<th class="l">
 		{tech_link}
 	</th>
 </tr>
\ No newline at end of file
diff --git a/styles/templates/buildings/buildings_research_script.tpl b/styles/views/buildings/buildings_research_script.php
similarity index 100%
rename from styles/templates/buildings/buildings_research_script.tpl
rename to styles/views/buildings/buildings_research_script.php
diff --git a/styles/templates/buildings/buildings_script.tpl b/styles/views/buildings/buildings_script.php
similarity index 98%
rename from styles/templates/buildings/buildings_script.tpl
rename to styles/views/buildings/buildings_script.php
index 042c7af..916bf19 100644
--- a/styles/templates/buildings/buildings_script.tpl
+++ b/styles/views/buildings/buildings_script.php
@@ -83,7 +83,7 @@ function xd() {
 <br />
 <form name="Atr" method="get" action="game.php?page=buildings">
 <input type="hidden" name="mode" value="fleet">
-<table width="650">
+<table width="530">
 <tr>
 	<td class="c" >{work_todo}</td>
 </tr>
diff --git a/styles/views/buildings/index.html b/styles/views/buildings/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/styles/templates/changelog_body.tpl b/styles/views/changelog/changelog_body.php
similarity index 100%
rename from styles/templates/changelog_body.tpl
rename to styles/views/changelog/changelog_body.php
diff --git a/styles/templates/changelog_table.tpl b/styles/views/changelog/changelog_table.php
similarity index 100%
rename from styles/templates/changelog_table.tpl
rename to styles/views/changelog/changelog_table.php
diff --git a/styles/views/changelog/index.html b/styles/views/changelog/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/styles/templates/empire/empire_row.tpl b/styles/views/empire/empire_row.php
similarity index 100%
rename from styles/templates/empire/empire_row.tpl
rename to styles/views/empire/empire_row.php
diff --git a/styles/templates/empire/empire_table.tpl b/styles/views/empire/empire_table.php
similarity index 100%
rename from styles/templates/empire/empire_table.tpl
rename to styles/views/empire/empire_table.php
diff --git a/styles/views/empire/index.html b/styles/views/empire/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/styles/views/fleet/fleet1_inputs.php b/styles/views/fleet/fleet1_inputs.php
new file mode 100644
index 0000000..0cb1abb
--- /dev/null
+++ b/styles/views/fleet/fleet1_inputs.php
@@ -0,0 +1,4 @@
+<input type="hidden" name="consumption{i}" value="{consumption}" />
+<input type="hidden" name="speed{i}" value="{speed}" />
+<input type="hidden" name="capacity{i}" value="{capacity}" />
+<input type="hidden" name="ship{i}"value="{ship}" />
diff --git a/styles/views/fleet/fleet1_shortcut_acs_row.php b/styles/views/fleet/fleet1_shortcut_acs_row.php
new file mode 100644
index 0000000..6ba6531
--- /dev/null
+++ b/styles/views/fleet/fleet1_shortcut_acs_row.php
@@ -0,0 +1,7 @@
+<tr height="20">
+	<th colspan="2">
+		<a href="javascript:setTarget({galaxy},{system},{planet}); shortInfo(); setACS({id}); setACS_target('g{galaxy}s{system}p{planet}t{planet_type}');">
+			({name})
+		</a>
+	</th>
+</tr>
\ No newline at end of file
diff --git a/styles/views/fleet/fleet1_shortcuts_noshortcuts_row.php b/styles/views/fleet/fleet1_shortcuts_noshortcuts_row.php
new file mode 100644
index 0000000..d425345
--- /dev/null
+++ b/styles/views/fleet/fleet1_shortcuts_noshortcuts_row.php
@@ -0,0 +1,5 @@
+<tr height="20">
+	<th colspan="2">
+		{fl_shorcut_message}
+	</th>
+</tr>
\ No newline at end of file
diff --git a/styles/views/fleet/fleet1_shortcuts_row.php b/styles/views/fleet/fleet1_shortcuts_row.php
new file mode 100644
index 0000000..ab6bb33
--- /dev/null
+++ b/styles/views/fleet/fleet1_shortcuts_row.php
@@ -0,0 +1,8 @@
+<tr height="20">
+	<th colspan="2">
+		<select name="shortcuts" id="shortcuts" onChange="javascript:setTarget(returnValue(0),returnValue(1),returnValue(2),returnValue(3)); shortInfo();">
+			<option value="0"></option>
+			{shortcut_options}
+		</select>
+	</th>
+</tr>
\ No newline at end of file
diff --git a/styles/templates/fleet/fleet1_table.tpl b/styles/views/fleet/fleet1_table.php
similarity index 93%
rename from styles/templates/fleet/fleet1_table.tpl
rename to styles/views/fleet/fleet1_table.php
index 6caa9d6..fa52ed2 100644
--- a/styles/templates/fleet/fleet1_table.tpl
+++ b/styles/views/fleet/fleet1_table.php
@@ -1,8 +1,18 @@
-<script type="text/javascript" src="scripts/flotten.js"></script>
+<script type="text/javascript" src="js/flotten-min.js"></script>
 <script type="text/javascript">
 function getStorageFaktor() {
 	return 1
 }
+function returnValue(param) {
+/* By lucky - required for the new select box */
+var string = shortcuts.options[shortcuts.selectedIndex].value;
+	if(string!=0){
+		var array=string.split(";");
+		return array[param];
+	}else{
+		return null;
+	}
+}
 </script>
 <form action="game.php?page=fleet2" method="post" onsubmit='this.submit.disabled = true;'>
     {fleetblock}
diff --git a/styles/views/fleet/fleet2_inputs.php b/styles/views/fleet/fleet2_inputs.php
new file mode 100644
index 0000000..552ad2f
--- /dev/null
+++ b/styles/views/fleet/fleet2_inputs.php
@@ -0,0 +1,4 @@
+<input type="hidden" name="ship{ship}" value="{amount}" />
+<input type="hidden" name="capacity{ship}" value="{capacity}" />
+<input type="hidden" name="consumption{ship}" value="{consumption}" />
+<input type="hidden" name="speed{ship}" value="{speed}" />
diff --git a/styles/views/fleet/fleet2_mission_row.php b/styles/views/fleet/fleet2_mission_row.php
new file mode 100644
index 0000000..7fce00e
--- /dev/null
+++ b/styles/views/fleet/fleet2_mission_row.php
@@ -0,0 +1,8 @@
+<tr height="20">
+	<th>
+		<input{id}type="radio" name="mission" value="{value}"{checked}/>
+		<label for="inpuT_{input}">{mission}</label>
+		<br />
+		{expedition_message}
+	</th>
+</tr>
diff --git a/styles/views/fleet/fleet2_stay_row.php b/styles/views/fleet/fleet2_stay_row.php
new file mode 100644
index 0000000..a5cfaf7
--- /dev/null
+++ b/styles/views/fleet/fleet2_stay_row.php
@@ -0,0 +1,12 @@
+<tr height="20">
+	<td class="c" colspan="3">
+		{fl_hold_time}
+	</td>
+</tr>
+<tr height="20">
+	<th colspan="3">
+		<select name="{stay_type}">
+			{options}
+		</select>{fl_hours}
+	</th>
+</tr>
diff --git a/styles/templates/fleet/fleet2_table.tpl b/styles/views/fleet/fleet2_table.php
similarity index 98%
rename from styles/templates/fleet/fleet2_table.tpl
rename to styles/views/fleet/fleet2_table.php
index 49f37d9..6a91ad1 100644
--- a/styles/templates/fleet/fleet2_table.tpl
+++ b/styles/views/fleet/fleet2_table.php
@@ -1,4 +1,4 @@
-<script type="text/javascript" src="scripts/flotten.js"></script>
+<script type="text/javascript" src="js/flotten-min.js"></script>
 <script type="text/javascript">
 function getStorageFaktor() {
 	return 1
diff --git a/styles/views/fleet/fleet3_ships_row.php b/styles/views/fleet/fleet3_ships_row.php
new file mode 100644
index 0000000..050bcc8
--- /dev/null
+++ b/styles/views/fleet/fleet3_ships_row.php
@@ -0,0 +1,4 @@
+<tr height="20">
+	<th>{ship}</th>
+	<th>{amount}</th>
+</tr>
\ No newline at end of file
diff --git a/styles/templates/fleet/fleet3_table.tpl b/styles/views/fleet/fleet3_table.php
similarity index 100%
rename from styles/templates/fleet/fleet3_table.tpl
rename to styles/views/fleet/fleet3_table.php
diff --git a/styles/views/fleet/fleetACS_table.php b/styles/views/fleet/fleetACS_table.php
new file mode 100644
index 0000000..6b452a1
--- /dev/null
+++ b/styles/views/fleet/fleetACS_table.php
@@ -0,0 +1,45 @@
+		<table width="519" border="0" cellpadding="0" cellspacing="1">
+			<tr height="20">
+				<td class="c" colspan="2">{fl_sac_of_fleet} "{acs_code}"</td>
+			</tr>
+			<tr height="20">
+				<td class="c" colspan="2">{fl_modify_sac_name}</td>
+			</tr>
+			<tr>
+				<th colspan="2">
+					<form action="game.php?page=fleetACS" method="POST">
+						<input name="fleetid" value="{fleetid}" type="hidden">
+						<input name="txt_name_acs" type="text" id="txt_name_acs" value="{acs_code}" />
+						<br />
+						<input type="submit" value="{fl_continue}" />
+					</form>
+				</th>
+			</tr>
+			<tr>
+				<th>
+					<table width="100%" border="0" cellpadding="0" cellspacing="1">
+						<tr height="20">
+							<td class="c">{fl_members_invited}</td>
+							<td class="c">{fl_invite_members}</td>
+						</tr>
+						<tr>
+							<th width="50%">
+								<select size="5">
+									{invited_members}
+								</select>
+							</th>
+							<form action="game.php?page=fleetACS" method="POST">
+								<input type="hidden" name="add_member_to_acs" value="madnessred" />
+								<input name="fleetid" value="{fleetid}" type="hidden">
+								<input name="acs_invited" value="{acs_invited}" type="hidden">
+							<td>
+								<input name="addtogroup" type="text" /> <br /><input type="submit" value="{fl_continue}" />
+							</td>
+							</form>
+							<br />
+							{add_user_message}
+						</tr>
+					</table>
+				</th>
+			</tr>
+        </table>
\ No newline at end of file
diff --git a/styles/views/fleet/fleet_button.php b/styles/views/fleet/fleet_button.php
new file mode 100644
index 0000000..6eeb980
--- /dev/null
+++ b/styles/views/fleet/fleet_button.php
@@ -0,0 +1,5 @@
+<tr>
+	<th colspan="4">
+		<input type="submit" value="{fl_continue}" />
+	</th>
+</tr>
\ No newline at end of file
diff --git a/styles/views/fleet/fleet_inputs.php b/styles/views/fleet/fleet_inputs.php
new file mode 100644
index 0000000..3554104
--- /dev/null
+++ b/styles/views/fleet/fleet_inputs.php
@@ -0,0 +1,4 @@
+<input type="hidden" name="maxship{i}" value="{maxship}" />
+<input type="hidden" name="consumption{i}" value="{consumption}" />
+<input type="hidden" name="speed{i}" value="{speed}" />
+<input type="hidden" name="capacity{i}" value="{capacity}" />
\ No newline at end of file
diff --git a/styles/views/fleet/fleet_noships_row.php b/styles/views/fleet/fleet_noships_row.php
new file mode 100644
index 0000000..8163d3e
--- /dev/null
+++ b/styles/views/fleet/fleet_noships_row.php
@@ -0,0 +1,6 @@
+<tr height="20px">
+	<th colspan="4">
+		{fl_no_ships}
+	</th>
+</tr>
+
diff --git a/styles/views/fleet/fleet_noslots_row.php b/styles/views/fleet/fleet_noslots_row.php
new file mode 100644
index 0000000..c6c2b82
--- /dev/null
+++ b/styles/views/fleet/fleet_noslots_row.php
@@ -0,0 +1,5 @@
+<tr height="20px">
+	<th colspan="9">
+		<font color="red">{fl_no_more_slots}</font>
+	</th>
+</tr>
\ No newline at end of file
diff --git a/styles/views/fleet/fleet_options.php b/styles/views/fleet/fleet_options.php
new file mode 100644
index 0000000..3f52073
--- /dev/null
+++ b/styles/views/fleet/fleet_options.php
@@ -0,0 +1 @@
+<option value="{value}"{selected}>{title}</option>
diff --git a/styles/views/fleet/fleet_row_fleets.php b/styles/views/fleet/fleet_row_fleets.php
new file mode 100644
index 0000000..8508b57
--- /dev/null
+++ b/styles/views/fleet/fleet_row_fleets.php
@@ -0,0 +1,28 @@
+<tr height="20px">
+	<th>{num}</th>
+	<th>
+		<a>{fleet_mission}</a>
+		<a title="{tooltip}">{title}</a>
+	</th>
+	<th>
+		<a title="{fleet}">{fleet_amount}</a>
+	</th>
+	<th>
+		{fleet_start}
+	</th>
+	<th>
+		{fleet_start_time}
+	</th>
+	<th>
+		{fleet_end}
+	</th>
+	<th>
+		{fleet_end_time}
+	</th>
+	<th>
+		{fleet_end_time}
+	</th>
+	<th>
+		{inputs}
+	</th>
+</tr>
\ No newline at end of file
diff --git a/styles/views/fleet/fleet_row_ships.php b/styles/views/fleet/fleet_row_ships.php
new file mode 100644
index 0000000..bd644b0
--- /dev/null
+++ b/styles/views/fleet/fleet_row_ships.php
@@ -0,0 +1,16 @@
+<tr height="20px">
+	<th>
+		<a title="{fl_speed_title}{fleet_max_speed}">
+			{ship}
+		</a>
+	</th>
+	<th>
+		{amount}
+	</th>
+	<th>
+		{max_ships}
+	</th>
+	<th>
+		{set_ships}
+	</th>
+</tr>
\ No newline at end of file
diff --git a/styles/views/fleet/fleet_selectors.php b/styles/views/fleet/fleet_selectors.php
new file mode 100644
index 0000000..556da73
--- /dev/null
+++ b/styles/views/fleet/fleet_selectors.php
@@ -0,0 +1,12 @@
+<tr>
+	<th colspan="2">
+		<a href="javascript:noShips();shortInfo();noResources();">
+			{fl_remove_all_ships}
+		</a>
+	</th>
+	<th colspan="2">
+		<a href="javascript:maxShips();shortInfo();">
+			{fl_select_all_ships}
+		</a>
+	</th>
+</tr>
\ No newline at end of file
diff --git a/styles/templates/fleet/fleet_table.tpl b/styles/views/fleet/fleet_table.php
similarity index 89%
rename from styles/templates/fleet/fleet_table.tpl
rename to styles/views/fleet/fleet_table.php
index 63f24ad..6cec415 100644
--- a/styles/templates/fleet/fleet_table.tpl
+++ b/styles/views/fleet/fleet_table.php
@@ -1,5 +1,5 @@
-<script language="JavaScript" src="scripts/flotten.js"></script>
-<script language="JavaScript" src="scripts/ocnt.js"></script>
+<script language="JavaScript" src="js/flotten-min.js"></script>
+<script language="JavaScript" src="js/ocnt-min.js"></script>
 <br />
 <div id="content">
     <table width="519" border="0" cellpadding="0" cellspacing="1">
@@ -27,6 +27,7 @@
             {fleetpagerow}
             {message_nofreeslot}
         </table>
+        {acs_members}
         <form action="game.php?page=fleet1" method="POST">
         <table width="519" border="0" cellpadding="0" cellspacing="1">
             <tr height="20">
@@ -40,6 +41,9 @@
             </tr>
             	{body}
             </tr>
+            {none_max_selector}
+			{noships_row}
+			{continue_button}
     	</table>
         	{shipdata}
             <input type="hidden" name="galaxy" value="{galaxy}" />
@@ -49,6 +53,6 @@
             <input type="hidden" name="mission" value="{target_mission}" />
             <input type="hidden" name="maxepedition" value="{envoimaxexpedition}" />
             <input type="hidden" name="curepedition" value="{expeditionencours}" />
-            <input type="hidden" name="target_mission" value="{target_mission}" />	
+            <input type="hidden" name="target_mission" value="{target_mission}" />
         </form>
 </div>
\ No newline at end of file
diff --git a/styles/views/fleet/index.html b/styles/views/fleet/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/styles/views/galaxy/galaxy_alliance_block.php b/styles/views/galaxy/galaxy_alliance_block.php
new file mode 100644
index 0000000..93a0215
--- /dev/null
+++ b/styles/views/galaxy/galaxy_alliance_block.php
@@ -0,0 +1,3 @@
+<a style="cursor: pointer;" onmouseover='return overlib("<table width=240><tr><td class=c>{gl_alliance}{ally_name}{gl_with}{ally_members}{gl_member}{add}</td></tr><th><table><tr><td><a href=game.php?page=alliance&mode=ainfo&a={ally_id}>{gl_alliance_page}</a></td></tr><tr><td><a href=game.php?page=statistics&start=101&who=ally>{gl_see_on_stats}</a></td>{web}</tr></table></th></table>", STICKY, MOUSEOFF, DELAY, 750, CENTER, OFFSETX, -40, OFFSETY, -40 );' onmouseout='return nd();'>
+	{tag}
+</a>
\ No newline at end of file
diff --git a/styles/templates/galaxy/galaxy_body.tpl b/styles/views/galaxy/galaxy_body.php
similarity index 100%
rename from styles/templates/galaxy/galaxy_body.tpl
rename to styles/views/galaxy/galaxy_body.php
diff --git a/styles/views/galaxy/galaxy_debris_block.php b/styles/views/galaxy/galaxy_debris_block.php
new file mode 100644
index 0000000..e19f8fc
--- /dev/null
+++ b/styles/views/galaxy/galaxy_debris_block.php
@@ -0,0 +1,3 @@
+<a style="cursor: pointer;" onmouseover='return overlib("<table width=240><tr><td class=c colspan=2>{gl_debris_field} [{galaxy}:{system}:{planet}]</td></tr><tr><th width=80><img src={dpath}planeten/debris.jpg height=75 width=75 /></th><th><table><tr><td class=c colspan=2>{gl_resources}:</td></tr><tr><th>{Metal}: </th><th>{debris_metal}</th></tr><tr><th>{Crystal}: </th><th>{debris_crystal}</th></tr><tr><td class=c colspan=2>{gl_actions}:</td></tr><tr><th colspan=2 align=left><a href= # onclick=&#039javascript:doit (8, {galaxy}, {system}, {planet}, {planettype}, {recsended}); return nd();&#039 >{gl_collect}</a></tr></table></th></tr></table>", STICKY, MOUSEOFF, DELAY, 750, CENTER, OFFSETX, -40, OFFSETY, -40 );' onmouseout='return nd();'>
+	<img src={dpath}planeten/debris.jpg height="22px" width="22px">
+</a>
\ No newline at end of file
diff --git a/styles/templates/galaxy/galaxy_footer.tpl b/styles/views/galaxy/galaxy_footer.php
similarity index 100%
rename from styles/templates/galaxy/galaxy_footer.tpl
rename to styles/views/galaxy/galaxy_footer.php
diff --git a/styles/templates/galaxy/galaxy_missile_selector.tpl b/styles/views/galaxy/galaxy_missile_selector.php
similarity index 97%
rename from styles/templates/galaxy/galaxy_missile_selector.tpl
rename to styles/views/galaxy/galaxy_missile_selector.php
index a8e3291..6fa6432 100644
--- a/styles/templates/galaxy/galaxy_missile_selector.tpl
+++ b/styles/views/galaxy/galaxy_missile_selector.php
@@ -7,7 +7,7 @@
 			<tr>
 
 				<td class="c">{missile_count} <input type="text" name="SendMI" size="2" maxlength="3" /></td>
-				<td class="c">{gl_objective}: 
+				<td class="c">{gl_objective}:
                 	<select name="Target">
                         <option value="all" selected>{gl_all_defenses}</option>
                         <option value="0">{ma_misil_launcher}</option>
diff --git a/styles/views/galaxy/galaxy_moon_block.php b/styles/views/galaxy/galaxy_moon_block.php
new file mode 100644
index 0000000..3c31c7d
--- /dev/null
+++ b/styles/views/galaxy/galaxy_moon_block.php
@@ -0,0 +1,3 @@
+<a style="cursor: pointer;" onmouseover='return overlib("<table width=240><tr><td class=c colspan=2>{gl_moon} {name_moon} [{galaxy}:{system}:{planet}]</td></tr><tr><th width=80><img src={dpath}planeten/mond.jpg height=75 width=75 /></th><th><table><tr><td class=c colspan=2>{gl_features}</td></tr><tr><th>{gl_diameter}</th><th>{diameter}</th></tr><tr><th>{gl_temperature}</th><th>{temperature}</th></tr><tr><td class=c colspan=2>{gl_actions}</td></tr><tr><th colspan=2 align=center>{links}</tr></table></th></tr></table>", STICKY, MOUSEOFF, DELAY, 750, CENTER, OFFSETX, -40, OFFSETY, -40 );' onmouseout='return nd();'>
+	<img src={dpath}planeten/small/s_mond.jpg height=22 width=22>
+</a>
\ No newline at end of file
diff --git a/styles/views/galaxy/galaxy_planet_block.php b/styles/views/galaxy/galaxy_planet_block.php
new file mode 100644
index 0000000..bf2fc5d
--- /dev/null
+++ b/styles/views/galaxy/galaxy_planet_block.php
@@ -0,0 +1,3 @@
+<a style="cursor: pointer;" onmouseover='return overlib("<table width=240><tr><td class=c colspan=2>{gl_planet} {name} [{galaxy}:{system}:{planet}]</td></tr><tr><th width=80><img src={dpath}planeten/small/s_{image}.jpg height=75 width=75 /></th><th align=left>{links}</th></tr></table>", STICKY, MOUSEOFF, DELAY, 750, CENTER, OFFSETX, -40, OFFSETY, -40 );' onmouseout='return nd();'>
+	<img src={dpath}planeten/small/s_{image}.jpg height="30px" width="30px">
+</a>
\ No newline at end of file
diff --git a/styles/views/galaxy/galaxy_row.php b/styles/views/galaxy/galaxy_row.php
new file mode 100644
index 0000000..d8d404a
--- /dev/null
+++ b/styles/views/galaxy/galaxy_row.php
@@ -0,0 +1,10 @@
+<tr>
+	<th width="30">{pos}</th>
+    <th width="30">{planet}</th>
+    <th style="white-space: nowrap;" width="130">{planetname}</th>
+    <th style="white-space: nowrap;" width="30">{moon}</th>
+    <th style="white-space: nowrap;" width="30">{debris}</th>
+    <th width="150">{username}</th>
+    <th width="80">{alliance}</th>
+	<th style="white-space: nowrap;" width="125">{actions}</th>
+</tr>
\ No newline at end of file
diff --git a/styles/views/galaxy/galaxy_row_container.php b/styles/views/galaxy/galaxy_row_container.php
new file mode 100644
index 0000000..664ad12
--- /dev/null
+++ b/styles/views/galaxy/galaxy_row_container.php
@@ -0,0 +1,3 @@
+<tr>
+	{columns}
+</tr>
\ No newline at end of file
diff --git a/styles/views/galaxy/galaxy_script.php b/styles/views/galaxy/galaxy_script.php
new file mode 100644
index 0000000..8a00043
--- /dev/null
+++ b/styles/views/galaxy/galaxy_script.php
@@ -0,0 +1,87 @@
+<div style="top: 10px;" id="content">
+<script language="JavaScript">
+function galaxy_submit(value) {
+	document.getElementById('auto').name = value;
+	document.getElementById('galaxy_form').submit();
+}
+function fenster(target_url,win_name) {
+	var new_win = window.open(target_url,win_name,'resizable=yes,scrollbars=yes,menubar=no,toolbar=no,width=640,height=480,top=0,left=0');
+	new_win.focus();
+}
+</script>
+<script language="JavaScript" src="js/tw-sack-min.js"></script>
+<script type="text/javascript">
+var ajax = new sack();
+var strInfo = ""
+function whenResponse () {
+	retVals   = this.response.split("|");
+	Message   = retVals[0];
+	Infos     = retVals[1];
+	retVals   = Infos.split(" ");
+	UsedSlots = retVals[0];
+	SpyProbes = retVals[1];
+	Recyclers = retVals[2];
+	Missiles  = retVals[3];
+	retVals   = Message.split(";");
+	CmdCode   = retVals[0];
+	strInfo   = retVals[1];
+	addToTable("done", "success");
+	changeSlots( UsedSlots );
+	setShips("probes", SpyProbes );
+	setShips("recyclers", Recyclers );
+	setShips("missiles", Missiles );
+}
+function doit (order, galaxy, system, planet, planettype, shipcount) {
+	ajax.requestFile = "FleetAjax.php?action=send";
+	ajax.runResponse = whenResponse;
+	ajax.execute = true;
+	ajax.setVar("thisgalaxy", {current_galaxy});
+    ajax.setVar("thissystem", {current_system});
+    ajax.setVar("thisplanet", {current_planet});
+	ajax.setVar("thisplanettype", {planet_type});
+	ajax.setVar("mission", order);
+	ajax.setVar("galaxy", galaxy);
+	ajax.setVar("system", system);
+	ajax.setVar("planet", planet);
+	ajax.setVar("planettype", planettype);
+	if (order == 6)
+		ajax.setVar("ship210", shipcount);
+	if (order == 7) {
+		ajax.setVar("ship208", 1);
+		ajax.setVar("ship203", 2);
+	}
+	if (order == 8)
+		ajax.setVar("ship209", shipcount);
+	ajax.runAJAX();
+}
+function addToTable(strDataResult, strClass) {
+	var e = document.getElementById('fleetstatusrow');
+	var e2 = document.getElementById('fleetstatustable');
+	e.style.display = '';
+	if(e2.rows.length > 2) {
+		e2.deleteRow(2);
+	}
+	var row = e2.insertRow(0);
+	var td1 = document.createElement("td");
+	var td1text = document.createTextNode(strInfo);
+	td1.appendChild(td1text);
+	var td2 = document.createElement("td");
+	var span = document.createElement("span");
+	var spantext = document.createTextNode(strDataResult);
+	var spanclass = document.createAttribute("class");
+	spanclass.nodeValue = strClass;
+	span.setAttributeNode(spanclass);
+	span.appendChild(spantext);
+	td2.appendChild(span);
+	row.appendChild(td1);
+	row.appendChild(td2);
+}
+function changeSlots(slotsInUse) {
+	var e = document.getElementById('slots');
+	e.innerHTML = slotsInUse;
+}
+function setShips(ship, count) {
+	var e = document.getElementById(ship);
+	e.innerHTML = count;
+}
+</script>
\ No newline at end of file
diff --git a/styles/templates/galaxy/galaxy_selector.tpl b/styles/views/galaxy/galaxy_selector.php
similarity index 100%
rename from styles/templates/galaxy/galaxy_selector.tpl
rename to styles/views/galaxy/galaxy_selector.php
diff --git a/styles/templates/galaxy/galaxy_titles.tpl b/styles/views/galaxy/galaxy_titles.php
similarity index 100%
rename from styles/templates/galaxy/galaxy_titles.tpl
rename to styles/views/galaxy/galaxy_titles.php
diff --git a/styles/views/galaxy/galaxy_username_block.php b/styles/views/galaxy/galaxy_username_block.php
new file mode 100644
index 0000000..738e260
--- /dev/null
+++ b/styles/views/galaxy/galaxy_username_block.php
@@ -0,0 +1,3 @@
+<a style="cursor: pointer;" onmouseover='return overlib("<table width=190><tr><td class=c colspan=2>{gl_player}{username}{gl_in_the_rank}{systemtatus4}</td></tr><tr>{actions}<td><a href=game.php?page=statistics&who=player&start={systemtart}>{gl_stat}</a></td></tr></table>", STICKY, MOUSEOFF, DELAY, 750, CENTER, OFFSETX, -40, OFFSETY, -40 );' onmouseout='return nd();'>
+	{status}</span>
+</a>
\ No newline at end of file
diff --git a/styles/views/galaxy/index.html b/styles/views/galaxy/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/styles/templates/galaxy/phalanx_body.tpl b/styles/views/galaxy/phalanx_body.php
similarity index 100%
rename from styles/templates/galaxy/phalanx_body.tpl
rename to styles/views/galaxy/phalanx_body.php
diff --git a/styles/templates/footer.tpl b/styles/views/general/footer.php
similarity index 100%
rename from styles/templates/footer.tpl
rename to styles/views/general/footer.php
diff --git a/styles/views/general/index.html b/styles/views/general/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/styles/templates/left_menu.tpl b/styles/views/general/left_menu.php
similarity index 90%
rename from styles/templates/left_menu.tpl
rename to styles/views/general/left_menu.php
index 30d9be6..c76d803 100644
--- a/styles/templates/left_menu.tpl
+++ b/styles/views/general/left_menu.php
@@ -1,5 +1,5 @@
 <div id='leftmenu'>
-	
+
 <script language="JavaScript">
 function f(target_url,win_name) {
   var new_win = window.open(target_url,win_name,'resizable=yes,scrollbars=yes,menubar=no,toolbar=no,width=550,height=280,top=0,left=0');
@@ -18,7 +18,7 @@ function f(target_url,win_name) {
   <td><img src="{dpath}gfx/ogame-produktion.jpg" width="110" height="40" /></td>
  </tr>
 
-    
+
  <tr>
   <td>
 
@@ -37,7 +37,7 @@ function f(target_url,win_name) {
     </font></div>
   </td>
  </tr>
- 
+
  <tr>
   <td>
    <div align="center"><font color="#FFFFFF">
@@ -59,13 +59,13 @@ function f(target_url,win_name) {
   <tr>
   <td>
    <div align="center" ><font color="#FFFFFF">
-     <a href='game.php?page=trader'><font color='FF8900'>{lm_trader}</font></a> 
+     <a href='game.php?page=trader'><font color='FF8900'>{lm_trader}</font></a>
 
     </font></div>
   </td>
  </tr>
- 
-  
+
+
  <tr>
   <td>
    <div align="center"><font color="#FFFFFF">
@@ -137,7 +137,7 @@ function f(target_url,win_name) {
    </font></div>
   </td>
  </tr>
- 
+
 
  	<tr>
 
@@ -147,7 +147,7 @@ function f(target_url,win_name) {
 	   </font></div>
 	  </td>
 	 </tr>
- 
+
  <tr>
   <td>
    <div align="center"><font color="#FFFFFF">
@@ -165,23 +165,11 @@ function f(target_url,win_name) {
     </font></div>
   </td>
  </tr>
- 
+
  <tr>
   <td><img src="{dpath}/gfx/user-menu.jpg" width="110" height="35"></td>
  </tr>
 
- 
-
-<tr>
-  <td><div align="center"><font color="#FFFFFF"><a href='chat.php'>{chat_title}</a></font></div></td>
-</tr> <tr>
-  <td><div align="center"><font color="#FFFFFF"><a href='chat.php?chat_type=ally'><font color='FF8900'>{chat_ally_title}</font></a></font></div></td>
-</tr>
-
- 
- 
- 
- 
  <tr>
   <td>
    <div align="center"><font color="#FFFFFF">
@@ -218,7 +206,7 @@ function f(target_url,win_name) {
 
  </tr>
 
- 
+
  <tr>
   <td>
    <div align="center"><font color="#FFFFFF">
@@ -226,17 +214,17 @@ function f(target_url,win_name) {
     </font></div>
   </td>
  </tr>
-	
+
 {admin_link}
-    
+
  <tr>
   <td>
    <div align="center"><font color="#FFFFFF">
-     <a href="#" title="Copyright (C) 2008 - 2010 GNU General Public License">&copy; 2008 - 2010</a>
+     <a href="#" title="Powered by XG Proyect {version} &copy; 2008 - 2012 GNU General Public License">&copy; 2008 - 2012</a>
     </font></div>
   </td>
  </tr>
- 
+
  </table>
  </center>
 
diff --git a/styles/templates/message_body.tpl b/styles/views/general/message_body.php
similarity index 100%
rename from styles/templates/message_body.tpl
rename to styles/views/general/message_body.php
diff --git a/styles/templates/simple_header.tpl b/styles/views/general/simple_header.php
similarity index 100%
rename from styles/templates/simple_header.tpl
rename to styles/views/general/simple_header.php
diff --git a/styles/views/general/topnav.php b/styles/views/general/topnav.php
new file mode 100644
index 0000000..9fb6201
--- /dev/null
+++ b/styles/views/general/topnav.php
@@ -0,0 +1,66 @@
+<div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
+<div id='header_top'><center>
+<table class='header'>
+<tr class='header' >
+<td class='header' style='width:5;' >
+	  <table class='header'>
+    <tr class='header'>
+     <td class='header'><img src="{dpath}planeten/small/s_{image}.jpg" height="50" width="50"></td>
+     <td class='header'>
+	  <table class='header'>
+
+                    <select size="1" onChange="eval('location=\''+this.options[this.selectedIndex].value+'\'');">
+                    {planetlist}
+                    </select>
+	  </table>
+     </td>
+    </tr>
+  </table></td>
+<td class='header'>   <table class='header' id='resources' border="0" cellspacing="0" cellpadding="0" padding-right='30' >
+
+	    <tr class='header'>
+
+		     <td align="center" width="85" class='header'>
+		      <img border="0" src="{dpath}images/metall.gif" width="42" height="22">
+		     </td>
+
+		     <td align="center" width="85" class='header'>
+		      <img border="0" src="{dpath}images/kristall.gif" width="42" height="22">
+		     </td>
+
+		     <td align="center" width="85" class='header'>
+		      <img border="0" src="{dpath}images/deuterium.gif" width="42" height="22">
+		     </td>
+
+		     <td align="center" width="85" class='header'>
+		      <img border="0" src="{dpath}images/darkmatter.jpg" width="42" height="22" title="Dark Matter">
+		     </td>
+
+		     <td align="center" width="85" class='header'>
+		      <img border="0" src="{dpath}images/energie.gif" width="42" height="22">
+		     </td>
+	    </tr>
+
+	    <tr class='header'>
+	     <td align="center" class='header' width="85"><i><b><font color="#ffffff">{Metal}</font></b></i></td>
+	     <td align="center" class='header' width="85"><i><b><font color="#ffffff">{Crystal}</font></b></i></td>
+	     <td align="center" class='header' width="85"><i><b><font color="#ffffff">{Deuterium}</font></b></i></td>
+	     	     	<td align="center" class='header' width="85"><i><b><font color="#ffffff">{Darkmatter}</font></b></i></td>
+
+	     <td align="center" class='header' width="85"><i><b><font color="#ffffff">{Energy}</font></b></i></td>
+
+	    </tr>
+	    <tr class='header'>
+	     <td align="center" class='header' width="90"><font >{metal}</font></td>
+	     <td align="center" class='header' width="90"><font >{crystal}</font></td>
+	     <td align="center" class='header' width="90"><font >{deuterium}</font></td>
+	     			 <td align="center" class='header' width="90"><font color="#FFFFFF">{darkmatter}</font></DIV></td>
+
+	     <td align="center" class='header' width="90">{energy}</td>
+
+	    </tr>
+   </table></td>
+</tr>
+</table>
+{show_umod_notice}
+</div>
\ No newline at end of file
diff --git a/styles/views/index.html b/styles/views/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/styles/views/infos/index.html b/styles/views/infos/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/styles/templates/infos/info_buildings_defense.tpl b/styles/views/infos/info_buildings_defense.php
similarity index 100%
rename from styles/templates/infos/info_buildings_defense.tpl
rename to styles/views/infos/info_buildings_defense.php
diff --git a/styles/templates/infos/info_buildings_destroy.tpl b/styles/views/infos/info_buildings_destroy.php
similarity index 100%
rename from styles/templates/infos/info_buildings_destroy.tpl
rename to styles/views/infos/info_buildings_destroy.php
diff --git a/styles/templates/infos/info_buildings_fleet.tpl b/styles/views/infos/info_buildings_fleet.php
similarity index 100%
rename from styles/templates/infos/info_buildings_fleet.tpl
rename to styles/views/infos/info_buildings_fleet.php
diff --git a/styles/templates/infos/info_buildings_general.tpl b/styles/views/infos/info_buildings_general.php
similarity index 100%
rename from styles/templates/infos/info_buildings_general.tpl
rename to styles/views/infos/info_buildings_general.php
diff --git a/styles/templates/infos/info_buildings_table.tpl b/styles/views/infos/info_buildings_table.php
similarity index 100%
rename from styles/templates/infos/info_buildings_table.tpl
rename to styles/views/infos/info_buildings_table.php
diff --git a/styles/views/infos/info_energy_body.php b/styles/views/infos/info_energy_body.php
new file mode 100644
index 0000000..fa8cd63
--- /dev/null
+++ b/styles/views/infos/info_energy_body.php
@@ -0,0 +1,7 @@
+<tr>
+	<th>{build_lvl}</th>
+	<th>{build_prod} {build_gain}</th>
+	<th>{build_prod_diff}</th>
+	<th>{build_need}</th>
+	<th>{build_need_diff}</th>
+</tr>
\ No newline at end of file
diff --git a/styles/views/infos/info_energy_header.php b/styles/views/infos/info_energy_header.php
new file mode 100644
index 0000000..e8b163a
--- /dev/null
+++ b/styles/views/infos/info_energy_header.php
@@ -0,0 +1,7 @@
+<tr>
+	<td class="c">{in_level}</td>
+	<td class="c">{in_prod_energy}</td>
+	<td class="c">{in_difference}</td>
+	<td class="c">{in_used_deuter}</td>
+	<td class="c">{in_difference}</td>
+</tr>
\ No newline at end of file
diff --git a/styles/templates/infos/info_gate_rows.tpl b/styles/views/infos/info_gate_rows.php
similarity index 100%
rename from styles/templates/infos/info_gate_rows.tpl
rename to styles/views/infos/info_gate_rows.php
diff --git a/styles/templates/infos/info_gate_table.tpl b/styles/views/infos/info_gate_table.php
similarity index 100%
rename from styles/templates/infos/info_gate_table.tpl
rename to styles/views/infos/info_gate_table.php
diff --git a/styles/templates/infos/info_officiers_general.tpl b/styles/views/infos/info_officiers_general.php
similarity index 100%
rename from styles/templates/infos/info_officiers_general.tpl
rename to styles/views/infos/info_officiers_general.php
diff --git a/styles/views/infos/info_production_body.php b/styles/views/infos/info_production_body.php
new file mode 100644
index 0000000..fa8cd63
--- /dev/null
+++ b/styles/views/infos/info_production_body.php
@@ -0,0 +1,7 @@
+<tr>
+	<th>{build_lvl}</th>
+	<th>{build_prod} {build_gain}</th>
+	<th>{build_prod_diff}</th>
+	<th>{build_need}</th>
+	<th>{build_need_diff}</th>
+</tr>
\ No newline at end of file
diff --git a/styles/views/infos/info_production_header.php b/styles/views/infos/info_production_header.php
new file mode 100644
index 0000000..ec679f8
--- /dev/null
+++ b/styles/views/infos/info_production_header.php
@@ -0,0 +1,7 @@
+<tr>
+	<td class="c">{in_level}</td>
+	<td class="c">{in_prod_p_hour}</td>
+	<td class="c">{in_difference}</td>
+	<td class="c">{in_used_energy}</td>
+	<td class="c">{in_difference}</td>
+</tr>
\ No newline at end of file
diff --git a/styles/views/infos/info_production_simple_body.php b/styles/views/infos/info_production_simple_body.php
new file mode 100644
index 0000000..387f6ae
--- /dev/null
+++ b/styles/views/infos/info_production_simple_body.php
@@ -0,0 +1,5 @@
+<tr>
+	<th>{build_lvl}</th>
+	<th>{build_prod} {build_gain}</th>
+	<th>{build_prod_diff}</th>
+</tr>
\ No newline at end of file
diff --git a/styles/views/infos/info_production_simple_header.php b/styles/views/infos/info_production_simple_header.php
new file mode 100644
index 0000000..83b1872
--- /dev/null
+++ b/styles/views/infos/info_production_simple_header.php
@@ -0,0 +1,5 @@
+<tr>
+	<td class="c">{in_level}</td>
+	<td class="c">{in_prod_energy}</td>
+	<td class="c">{in_difference}</td>
+</tr>
\ No newline at end of file
diff --git a/styles/views/infos/info_range_body.php b/styles/views/infos/info_range_body.php
new file mode 100644
index 0000000..40f8e93
--- /dev/null
+++ b/styles/views/infos/info_range_body.php
@@ -0,0 +1,4 @@
+<tr>
+	<th>{build_lvl}</th>
+	<th>{build_range}</th>
+</tr>
\ No newline at end of file
diff --git a/styles/views/infos/info_range_header.php b/styles/views/infos/info_range_header.php
new file mode 100644
index 0000000..455c6d7
--- /dev/null
+++ b/styles/views/infos/info_range_header.php
@@ -0,0 +1,4 @@
+<tr>
+	<td class="c">{in_level}</td>
+	<td class="c">{in_range}</td>
+</tr>
\ No newline at end of file
diff --git a/styles/views/install/index.html b/styles/views/install/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/styles/templates/install/ins_acc.tpl b/styles/views/install/ins_acc.php
similarity index 76%
rename from styles/templates/install/ins_acc.tpl
rename to styles/views/install/ins_acc.php
index 6f82327..d699205 100644
--- a/styles/templates/install/ins_acc.tpl
+++ b/styles/views/install/ins_acc.php
@@ -1,17 +1,17 @@
 <tr>
 	<th colspan="2">
-    	<h1>Ðåãåñòðàöèÿ Àäìèíèñòðàòîðà</h1>
+    	<h1>Establecer cuenta de administración</h1>
         <table width="270" border="0" align="center" cellpadding="0" cellspacing="0">
             <tr>
-            	<td>Èìÿ:</td>
+            	<td>Usuario:</td>
             	<td><input name="adm_user" size="20" maxlength="20" type="text"></td>
             </tr>
             <tr>
-            	<td>Ïàðîëü:</td>
+            	<td>Contraseña:</td>
             	<td><input name="adm_pass" size="20" maxlength="20" type="password"></td>
             </tr>
             <tr>
-            	<td>E-mail àäðåñ:</td>
+            	<td>Correo electrónico:</td>
             	<td><input name="adm_email" size="20" maxlength="40" type="text"></td>
             </tr>
         </table>
@@ -19,5 +19,5 @@
     </th>
 </tr>
 <tr>
-	<th colspan="2"><input type="button" name="next" onclick="submit();" value="Ðåãåñòðàöèÿ" ></th>
+	<th colspan="2"><input type="button" name="next" onclick="submit();" value="Crear" ></th>
 </tr>
\ No newline at end of file
diff --git a/styles/views/install/ins_acc_done.php b/styles/views/install/ins_acc_done.php
new file mode 100644
index 0000000..938ec7d
--- /dev/null
+++ b/styles/views/install/ins_acc_done.php
@@ -0,0 +1,10 @@
+<tr>
+  <th colspan="2">
+<br>El Administrador ha sido creado correctamente.<br>
+¡Ahora debes borrar la carpeta <i>install</i> asi evitaras problemas graves de seguridad!<br><br>
+<font color="red">Antes de continuar cambie los permisos del archivo config.php a "CHMOD 440"</font> <br><br>
+</th>
+</tr>
+<tr>
+  <th colspan="2"><input type="button" name="next" onclick="self.location.href='../'" value="Finalizar" ></th>
+</tr>
\ No newline at end of file
diff --git a/styles/views/install/ins_body.php b/styles/views/install/ins_body.php
new file mode 100644
index 0000000..d487fc2
--- /dev/null
+++ b/styles/views/install/ins_body.php
@@ -0,0 +1,9 @@
+<br><br>
+<table width="700">
+<tr>
+	<td width="120px" colspan="3" class="c" align="left"><font size="2px">Menú de instalación [<a href="index.php?mode=intro">Inicio</a> - <a href="index.php?mode=ins&page=1">Instalar</a> - <a href="index.php?mode=license">Licencia</a> - <a href="index.php?mode=upgrade">Actualizar</a>]</font></td>
+</tr>
+<form action="{dis_ins_btn}" method="post">
+{ins_page}
+</form>
+</table>
\ No newline at end of file
diff --git a/styles/templates/install/ins_form.tpl b/styles/views/install/ins_form.php
similarity index 52%
rename from styles/templates/install/ins_form.tpl
rename to styles/views/install/ins_form.php
index 3380a38..65f86b4 100644
--- a/styles/templates/install/ins_form.tpl
+++ b/styles/views/install/ins_form.php
@@ -1,26 +1,26 @@
 <tr>
-	<th colspan="3"><font color="red">Ïåðåä òåì êàê íà ÷àòü óñòàíîâêó ïîñòàâüòå ïðàâà íà ôàéë config.php  "CHMOD 777"</font></th>
+	<th colspan="3"><font color="red">Antes de instalar cambie los permisos del archivo config.php a "CHMOD 777"</font></th>
 </tr>
 <tr>
-	<th>Ñåðâåð SQL: <br />Íà ïðèìåò: localhost</th>
+	<th>Servidor SQL: <br /> Ej: localhost</th>
 	<th><input type="text" name="host" value="" size="30" /></th>
 </tr>
 <tr>
-	<th>Èìÿ áàçû äàííûõ: <br />Íà ïðèìåð: ogame</th>
+	<th>Base de datos: <br /> Ej: ogame</th>
 	<th><input type="text" name="db" value="" size="30" /></th>
 </tr>
 <tr>
-	<th>Ïîëüçîâàòåëü áûçû äàííûõ: <br />Íà ïðèìåð: root</th>
+	<th>Usuario: <br /> Ej: root</th>
 	<th><input type="text" name="user" value="" size="30" /></th>
 </tr>
 <tr>
-	<th>Ïàðîëü îò áàçû äàííûõ: <br />Íà ïðèìåðó: 12345 </th>
+	<th>Contraseña: <br /> Ej: 12345 </th>
 	<th><input type="password" name="passwort" value="" size="30" /></th>
 </tr>
 <tr>
-	<th>Ïðåôèêñ: <br />Íà ïðèìåðó: xgp_ </th>
+	<th>Prefix de las tablas: <br /> Ej: xgp_ </th>
 	<th><input type="text" name="prefix" value="xgp_" size="30" /></th>
 </tr>
 <tr>
-	<th colspan="3"><input type="button" name="next" onclick="submit();" value="Óñòàíîâèòü" ></th>
+	<th colspan="3"><input type="button" name="next" onclick="submit();" value="Instalar" ></th>
 </tr>
\ No newline at end of file
diff --git a/styles/templates/install/ins_form_done.tpl b/styles/views/install/ins_form_done.php
similarity index 83%
rename from styles/templates/install/ins_form_done.tpl
rename to styles/views/install/ins_form_done.php
index 90437b2..d6d3a46 100644
--- a/styles/templates/install/ins_form_done.tpl
+++ b/styles/views/install/ins_form_done.php
@@ -11,5 +11,6 @@
     </th>
 </tr>
 <tr>
-  <th colspan="2"><input type="button" name="next" onclick="submit();" value="Ïðîäîëæèòü" ></th>
-</tr>
\ No newline at end of file
+  <th colspan="2"><input type="button" name="next" onclick="submit();" value="Continuar" ></th>
+</tr>
+
diff --git a/styles/views/install/ins_intro.php b/styles/views/install/ins_intro.php
new file mode 100644
index 0000000..8a56bca
--- /dev/null
+++ b/styles/views/install/ins_intro.php
@@ -0,0 +1,12 @@
+<tr>
+	<th colspan="2" align="left"><div id="main" align="left">
+      <h1>Introducción</h1>
+	  <p>¡Bienvenido a XG Proyect!<br />
+	      <br />
+	    XG Proyect es uno de los mejores clones de OGame existentes hasta el momento. XG Proyect 2 es el &uacute;ltimo y m&aacute;s estable paquete nunca antes desarrollado. Tal cual como las otras versiones, XG Proyect recibe soporte del equipo antes conocido como Xtreme-gameZ, asegur&aacute;ndonos siempre de lograr la mejor calidad en atenci&oacute;n y la estabilidad de la versi&oacute;n. XG Proyect 2 d&iacute;a a d&iacute;a busca; crecimiento, estabilidad, flexibilidad, dinamismo, calidad y la confianza del usuario en que es su mejor opci&oacute;n y elecci&oacute;n. Siempre esperamos que XG Proyect sea mejor que sus expectativas.<br />
+	    <br />
+	    El sistema de instalaci&oacute;n te guiar&aacute; a trav&eacute;s de la instalaci&oacute;n del mismo, o la actualizaci&oacute;n de una versi&oacute;n anterior a la m&aacute;s reciente. Cualquier duda, problema o consulta no dudes en consulta nuestra <a href="http://www.xgproyect.net/"><em>comunidad de desarrollo y soporte</em></a>. <br />
+	    <br />
+	    XG Proyect es un proyecto OpenSource (código abierto), para ver las especificaciones de la licencia haz click en licencia en la barra superior. Para comenzar la instalación haz click en el botón instalar o para actualizar a la versión más nueva haz click en el botón actualizar.</p>
+    </div></th>
+</tr>
\ No newline at end of file
diff --git a/styles/templates/install/ins_license.tpl b/styles/views/install/ins_license.php
similarity index 100%
rename from styles/templates/install/ins_license.tpl
rename to styles/views/install/ins_license.php
diff --git a/styles/views/install/ins_update.php b/styles/views/install/ins_update.php
new file mode 100644
index 0000000..1930865
--- /dev/null
+++ b/styles/views/install/ins_update.php
@@ -0,0 +1,11 @@
+		<tr>
+			<td>Correo electrónico:</td>
+			<td><input name="adm_email" size="20" maxlength="40" type="text"></td>
+		</tr>
+		<tr>
+			<td>Contraseña:</td>
+			<td><input name="adm_pass" size="20" maxlength="20" type="password"></td>
+		</tr>
+		<tr>
+			<th align="center" colspan="2"><input type="submit" name="continuar" value="Actualizar a la versi&oacute;n {version}"/></th>
+		</tr>
\ No newline at end of file
diff --git a/styles/views/messages/messages_adm_row.php b/styles/views/messages/messages_adm_row.php
new file mode 100644
index 0000000..deee401
--- /dev/null
+++ b/styles/views/messages/messages_adm_row.php
@@ -0,0 +1,3 @@
+<tr>
+	<th>{username} <a href="mailto:{mail}"><img src="{dpath}/img/m.gif" /></a></th>
+</tr>
\ No newline at end of file
diff --git a/styles/views/messages/messages_body.php b/styles/views/messages/messages_body.php
new file mode 100644
index 0000000..06f1c04
--- /dev/null
+++ b/styles/views/messages/messages_body.php
@@ -0,0 +1,54 @@
+<script language="JavaScript">
+function f(target_url, win_name) {
+var new_win = window.open(target_url,win_name,'resizable=yes,scrollbars=yes,menubar=no,toolbar=no,width=800,height=600,top=0,left=0');
+new_win.focus();
+}
+</script>
+<br />
+<div id="content">
+	<form action="game.php?page=messages" method="post">
+		<table width="519">
+			<table>
+				<tr>
+					<td>
+						<input name="messages" value="1" type="hidden">
+						<table width="519">
+							<tr>
+								<td class="c" colspan="4">{mg_message_title}</td></tr><tr>
+								<th>{mg_action}</th>
+								<th>{mg_date}</th>
+								<th>{mg_from}</th>
+								<th>{mg_subject}</th>
+							</tr>
+								{show_messages}
+							<tr>
+								<th colspan="4">
+									<input id="fullreports" name="fullreports" type="checkbox" />{mg_show_only_header_spy_reports}
+								</th>
+							</tr>
+							<tr>
+								<th colspan="4">
+									<select id="deletemessages" name="deletemessages">
+										<option value="deletemarked">{mg_delete_marked}</option>
+										<option value="deleteunmarked">{mg_delete_unmarked}</option>
+										<option value="deleteall">{mg_delete_all}</option>
+									</select>
+									<input value="OK" type="submit">
+								</th>
+							</tr>
+							<tr>
+								<td colspan="4"></td>
+							</tr>
+						</table>
+						<table width="100%">
+							<tr>
+								<td class="c">{mg_game_operators}</td>
+							</tr>
+								{show_operators}
+						</table>
+					</td>
+				</tr>
+			</table>
+		</table>
+	</form>
+</div>
\ No newline at end of file
diff --git a/styles/views/messages/messages_error_table.php b/styles/views/messages/messages_error_table.php
new file mode 100644
index 0000000..3c08de6
--- /dev/null
+++ b/styles/views/messages/messages_error_table.php
@@ -0,0 +1,6 @@
+<table width="519px" style="border: 2px solid {error_color}; text-align:center;background:transparent;">
+	<tr style="background:transparent;">
+		<td style="background:transparent;"><font color="{error_color}"><strong>{error_text}</strong></font></td>
+	</tr>
+</table>
+<br />
\ No newline at end of file
diff --git a/styles/views/messages/messages_menu_body.php b/styles/views/messages/messages_menu_body.php
new file mode 100644
index 0000000..00d94b2
--- /dev/null
+++ b/styles/views/messages/messages_menu_body.php
@@ -0,0 +1,23 @@
+<br />
+<div id="content">
+	<table width="569">
+		<tr>
+			<td class="c" colspan="3">{mg_message_title}</td>
+		</tr>
+		<tr>
+			<th colspan="2">{mg_message_type}</th>
+			<th>{mg_total}</th>
+		</tr>
+		<tr>
+			<th colspan="2">
+				<a href="game.php?page=messages&mode=show&amp;messcat=100">
+					<font color="{all_color}">{all_lang}</font>
+				</a>
+			</th>
+			<th>
+				<font color="{all_color}">{all_total}</font>
+			</th>
+		</tr>
+		{messages_menu_row}
+	</table>
+</div>
\ No newline at end of file
diff --git a/styles/views/messages/messages_menu_row.php b/styles/views/messages/messages_menu_row.php
new file mode 100644
index 0000000..b9d53d0
--- /dev/null
+++ b/styles/views/messages/messages_menu_row.php
@@ -0,0 +1,10 @@
+<tr>
+	<th colspan="2">
+		<a href="game.php?page=messages&mode=show&amp;messcat={type}">
+			<font color="{color}">{lang}</font>
+		</a>
+	</th>
+	<th>
+		<font color="{color}">{total}</font>
+	</th>
+</tr>
\ No newline at end of file
diff --git a/styles/views/messages/messages_pm_form.php b/styles/views/messages/messages_pm_form.php
new file mode 100644
index 0000000..bae9cfe
--- /dev/null
+++ b/styles/views/messages/messages_pm_form.php
@@ -0,0 +1,27 @@
+<script src="js/cntchar-min.js" type="text/javascript"></script>
+<br />
+<div id="content">
+	{status_message}
+    <form action="game.php?page=messages&mode=write&id={id}" method="post">
+    <table width="519px">
+    <tr>
+        <td class="c" colspan="2">{mg_send_message}</td>
+    </tr>
+    <tr>
+        <th>{mg_to}</th>
+        <th><input type="text" name="to" size="40" value="{to}" /></th>
+    </tr>
+    <tr>
+        <th>{mg_subject}</th>
+        <th><input type="text" name="subject" size="40" maxlength="40" value="{subject}" /></th>
+    </tr>
+    <tr>
+        <th>{mg_message} (<span id="cntChars">0</span> / 5000 {mg_chars})</th>
+        <th><textarea name="text" cols="40" rows="10" size="100" onkeyup="javascript:cntchar(5000)">{text}</textarea></th>
+    </tr>
+    <tr>
+        <th colspan="2"><input type="submit" value="{mg_send}" /></th>
+    </tr>
+    </table>
+    </form>
+</div>
\ No newline at end of file
diff --git a/styles/views/messages/messages_row.php b/styles/views/messages/messages_row.php
new file mode 100644
index 0000000..6829aec
--- /dev/null
+++ b/styles/views/messages/messages_row.php
@@ -0,0 +1,11 @@
+<tr>
+	<input name="showmes{message_id}" type="hidden" value="1">
+	<th><input name="delmes{message_id}" type="checkbox"></th>
+	<th>{message_date}</th>
+	<th>{message_from}</th>
+	<th>{message_subject}</th>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+	<td colspan="3" class="b">{message_text}</td>
+</tr>
\ No newline at end of file
diff --git a/styles/views/notes/index.html b/styles/views/notes/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/styles/templates/notes/notes_body.tpl b/styles/views/notes/notes_body.php
similarity index 100%
rename from styles/templates/notes/notes_body.tpl
rename to styles/views/notes/notes_body.php
diff --git a/styles/templates/notes/notes_body_entry.tpl b/styles/views/notes/notes_body_entry.php
similarity index 100%
rename from styles/templates/notes/notes_body_entry.tpl
rename to styles/views/notes/notes_body_entry.php
diff --git a/styles/templates/notes/notes_form.tpl b/styles/views/notes/notes_form.php
similarity index 93%
rename from styles/templates/notes/notes_form.tpl
rename to styles/views/notes/notes_form.php
index e3cfeae..8dc5fa2 100644
--- a/styles/templates/notes/notes_form.tpl
+++ b/styles/views/notes/notes_form.php
@@ -1,4 +1,4 @@
-<script src="scripts/cntchar.js" type="text/javascript"></script>
+<script src="js/cntchar-min.js" type="text/javascript"></script>
 <form action="" method="POST">
   {inputs}
   <table width="519">
diff --git a/styles/views/officier/index.html b/styles/views/officier/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/styles/templates/officier/officier_row.tpl b/styles/views/officier/officier_row.php
similarity index 50%
rename from styles/templates/officier/officier_row.tpl
rename to styles/views/officier/officier_row.php
index c81256c..73972cd 100644
--- a/styles/templates/officier/officier_row.tpl
+++ b/styles/views/officier/officier_row.php
@@ -1,9 +1,9 @@
 <tr>
 	<td class="l">
-		<a href="game.php?page=infos&gid={off_id}"><img border="0" src="styles/images/officiers/{off_id}.jpg" align="top" width="120" height="120"></a>
+		<img border="0" src="{dpath}gebaeude/{off_id}.jpg" align="top" width=120 height=120>
 	</td>
 	<td class="l">
-		<a href="game.php?page=infos&gid={off_id}">{off_name}</a> ({of_lvl} {off_lvl})<br>
+		<a href="game.php?page=infos&gid={off_id}">{off_name}</a> ({off_status})<br>
 		{off_desc}<br>
 	</td>
 	<td class="k">{off_link}</td>
diff --git a/styles/views/officier/officier_table.php b/styles/views/officier/officier_table.php
new file mode 100644
index 0000000..67ba003
--- /dev/null
+++ b/styles/views/officier/officier_table.php
@@ -0,0 +1,9 @@
+<br />
+<div id="content">
+    <table width="569">
+    <tr>
+        <td class="c" colspan="3">{of_title}</td>
+    </tr>
+    {disp_off_tbl}
+    </table>
+</div>
\ No newline at end of file
diff --git a/styles/views/options/index.html b/styles/views/options/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/styles/templates/options/options_admadd.tpl b/styles/views/options/options_admadd.php
similarity index 100%
rename from styles/templates/options/options_admadd.tpl
rename to styles/views/options/options_admadd.php
diff --git a/styles/templates/options/options_body.tpl b/styles/views/options/options_body.php
similarity index 97%
rename from styles/templates/options/options_body.tpl
rename to styles/views/options/options_body.php
index 42f4149..9a566e5 100644
--- a/styles/templates/options/options_body.tpl
+++ b/styles/views/options/options_body.php
@@ -42,7 +42,11 @@
         </th>
     </tr><tr>
         <th>{op_skin_example}</th>
-        <th><input name="dpath" maxlength="80" size="40" value="{opt_dpath_data}" type="text"></th>
+        <th>
+            <select name="dpath">
+            {opt_skin_data}
+            </select>
+        </th>
     </tr><tr>
         <th>{op_show_skin}</th>
         <th><input name="design"{opt_sskin_data} type="checkbox"></th>
diff --git a/styles/templates/options/options_body_vmode.tpl b/styles/views/options/options_body_vmode.php
similarity index 100%
rename from styles/templates/options/options_body_vmode.tpl
rename to styles/views/options/options_body_vmode.php
diff --git a/styles/views/overview/index.html b/styles/views/overview/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/styles/templates/overview/overview_body.tpl b/styles/views/overview/overview_body.php
similarity index 81%
rename from styles/templates/overview/overview_body.tpl
rename to styles/views/overview/overview_body.php
index 51dbcde..720293c 100644
--- a/styles/templates/overview/overview_body.tpl
+++ b/styles/views/overview/overview_body.php
@@ -1,4 +1,3 @@
-<script language="JavaScript" type="text/javascript" src="scripts/time.js"></script>
 <br />
 <div id="content">
     <table width="519">
@@ -8,7 +7,7 @@
             {Have_new_message}
         <tr>
         	<th>{ov_server_time}</th>
-			<th colspan="3"><div id="clock"></div></th>
+        	<th colspan="3">{date_time}</th>
         </tr>
         <tr>
         	<td colspan="4" class="c">{ov_events}</td>
@@ -38,11 +37,6 @@
         <tr>
             <th>{ov_points}</th>
             <th colspan="3">{user_rank}</td>
-        </tr>
-		<tr>
-            <th colspan="4"><center><a href="chat.php" style=color:Yellow;>Ïîñëåäíèõ 5 ñîîáùåíèé èç ÷àòà</a></center></th>
-        </tr><tr>
-           <th colspan="4"><center>{LastChat}</center></th>
         </tr>
     </table>
 </div>
\ No newline at end of file
diff --git a/styles/templates/overview/overview_deleteplanet.tpl b/styles/views/overview/overview_deleteplanet.php
similarity index 100%
rename from styles/templates/overview/overview_deleteplanet.tpl
rename to styles/views/overview/overview_deleteplanet.php
diff --git a/styles/templates/overview/overview_fleet_event.tpl b/styles/views/overview/overview_fleet_event.php
similarity index 100%
rename from styles/templates/overview/overview_fleet_event.tpl
rename to styles/views/overview/overview_fleet_event.php
diff --git a/styles/templates/overview/overview_renameplanet.tpl b/styles/views/overview/overview_renameplanet.php
similarity index 100%
rename from styles/templates/overview/overview_renameplanet.tpl
rename to styles/views/overview/overview_renameplanet.php
diff --git a/styles/views/plugins/index.html b/styles/views/plugins/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/styles/views/public/index.html b/styles/views/public/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/styles/templates/public/index_body.tpl b/styles/views/public/index_body.php
similarity index 71%
rename from styles/templates/public/index_body.tpl
rename to styles/views/public/index_body.php
index 3783cc8..7ea303a 100644
--- a/styles/templates/public/index_body.tpl
+++ b/styles/views/public/index_body.php
@@ -1,3 +1,4 @@
+<!-- Main div starts here | XG Proyect - www.xgproyect.net -->
 <div id="main">
     <div id="login">
         <div id="login_input">
@@ -7,7 +8,7 @@
             <tr style="vertical-align: top;">
                 <td style="padding-right: 4px;">
                     {user} <input name="username" value="" type="text">
-                    {pass} <input name="password" value="" type="password">
+                    {pass} <input name="password" value="" type="password" autocomplete="off">
                 </td>
             </tr><tr>
                 <td style="padding-right: 4px;">
@@ -26,7 +27,7 @@
         <a href="reg.php">{register}</a>
         <a href="{forum_url}" target="_blank">{forum}</a>
 	</div>
-	    <div id="rightmenu" class="rightmenu">
+    <div id="rightmenu" class="rightmenu">
         <div id="title">{welcome_to} {servername}</div>
         <div id="content">
         	<center>
@@ -37,15 +38,16 @@
         		<div id="register" class="bigbutton" onclick="document.location.href='reg.php';">{server_register}</div>
                 <div id="text2">
                     <div id="text3">
-                        <center><b>{server_message} {servername}!</b></center><br>	
+                        <center><b>{server_message} {servername}!</b></center>
                     </div>
-				<center><b>	
-				<font color="FFFF00">{login_online}&nbsp;: </font><font color="lime">{online_users}</font>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-				<font color="FFFF00">{login_lastreg}&nbsp;: </font><font color="lime">{last_user}</font>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-				<font color="FFFF00">{login_numbreg}&nbsp;: </font><font color="lime">{users_amount}</font></b></center>
-					
+                    <!-- PLEASE DO NOT REMOVE THE COPYRGHT LINE // POR FAVOR NO BORRES LA LINEA DE COPYRIGHTS -->
+                    <div id="copyright">
+                    	Powered by <a href="http://www.xgproyect.net/" target="_blanck" title="XG Proyect {version}">XG Proyect</a> &#169; 2008 - 2011.
+                    </div>
+                    <!-- PLEASE DO NOT REMOVE THE COPYRGHT LINE // POR FAVOR NO BORRES LA LINEA DE COPYRIGHTS -->
                 </div>
         	</center>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
+<!-- Main div ends here | XG Proyect - www.xgproyect.net -->
\ No newline at end of file
diff --git a/styles/templates/public/lostpassword.tpl b/styles/views/public/lostpassword.php
similarity index 68%
rename from styles/templates/public/lostpassword.tpl
rename to styles/views/public/lostpassword.php
index 78fb6d4..29a617d 100644
--- a/styles/templates/public/lostpassword.tpl
+++ b/styles/views/public/lostpassword.php
@@ -19,6 +19,11 @@
                         <div id="text3">
                             <center><b>{email}: <input type="text" name="email" /></b></center>
                         </div>
+                        <!-- PLEASE DO NOT REMOVE THE COPYRGHT LINE // POR FAVOR NO BORRES LA LINEA DE COPYRIGHTS -->
+                        <div id="copyright">
+                    	Powered by <a href="http://www.xgproyect.net/" target="_blanck" title="XG Proyect {version}">XG Proyect</a> &#169; 2008 - 2011.
+                    	</div>
+                        <!-- PLEASE DO NOT REMOVE THE COPYRGHT LINE // POR FAVOR NO BORRES LA LINEA DE COPYRIGHTS -->
                     </div>
                 </center>
 			</div>
diff --git a/styles/templates/public/registry_form.tpl b/styles/views/public/registry_form.php
similarity index 77%
rename from styles/templates/public/registry_form.tpl
rename to styles/views/public/registry_form.php
index 2aa067a..aa566ff 100644
--- a/styles/templates/public/registry_form.tpl
+++ b/styles/views/public/registry_form.php
@@ -22,7 +22,7 @@
                             </tr>
                         	<tr>
                             	<td>{pass_reg}:</td>
-                                <td><input name="passwrd" size="20" maxlength="20" type="password"></td>
+                                <td><input name="passwrd" size="20" maxlength="20" type="password" autocomplete="off"></td>
                             </tr>
                         	<tr>
                             	<td>{email_reg}:</td>
@@ -35,6 +35,11 @@
                 		<div id="text3">
 							<center><b>{accept_terms_and_conditions} <input name="rgt" type="checkbox"></b></center>
                			 </div>
+                         <!-- PLEASE DO NOT REMOVE THE COPYRGHT LINE // POR FAVOR NO BORRES LA LINEA DE COPYRIGHTS -->
+                         <div id="copyright">
+                    	Powered by <a href="http://www.xgproyect.net/" target="_blanck" title="XG Proyect {version}">XG Proyect</a> &#169; 2008 - 2011.
+                    	</div>
+                        <!-- PLEASE DO NOT REMOVE THE COPYRGHT LINE // POR FAVOR NO BORRES LA LINEA DE COPYRIGHTS -->
             		</div>
                 </center>
 			</div>
diff --git a/styles/views/resources/index.html b/styles/views/resources/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/styles/templates/resources/resources.tpl b/styles/views/resources/resources.php
similarity index 100%
rename from styles/templates/resources/resources.tpl
rename to styles/views/resources/resources.php
diff --git a/styles/templates/resources/resources_row.tpl b/styles/views/resources/resources_row.php
similarity index 100%
rename from styles/templates/resources/resources_row.tpl
rename to styles/views/resources/resources_row.php
diff --git a/styles/views/search/index.html b/styles/views/search/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/styles/templates/search/search_ally_row.tpl b/styles/views/search/search_ally_row.php
similarity index 100%
rename from styles/templates/search/search_ally_row.tpl
rename to styles/views/search/search_ally_row.php
diff --git a/styles/templates/search/search_ally_table.tpl b/styles/views/search/search_ally_table.php
similarity index 100%
rename from styles/templates/search/search_ally_table.tpl
rename to styles/views/search/search_ally_table.php
diff --git a/styles/templates/search/search_body.tpl b/styles/views/search/search_body.php
similarity index 100%
rename from styles/templates/search/search_body.tpl
rename to styles/views/search/search_body.php
diff --git a/styles/templates/search/search_user_row.tpl b/styles/views/search/search_user_row.php
similarity index 100%
rename from styles/templates/search/search_user_row.tpl
rename to styles/views/search/search_user_row.php
diff --git a/styles/templates/search/search_user_table.tpl b/styles/views/search/search_user_table.php
similarity index 100%
rename from styles/templates/search/search_user_table.tpl
rename to styles/views/search/search_user_table.php
diff --git a/styles/views/shortcuts/index.html b/styles/views/shortcuts/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/styles/views/shortcuts/shortcuts_editPanel.php b/styles/views/shortcuts/shortcuts_editPanel.php
new file mode 100644
index 0000000..6abea72
--- /dev/null
+++ b/styles/views/shortcuts/shortcuts_editPanel.php
@@ -0,0 +1,33 @@
+<div id="content">
+	<form name="short_panel" method=POST  action="game.php?page=shortcuts{shortcut_id}">
+		<table border=0 cellpadding=0 cellspacing=1 width=519>
+			<tr height=20>
+				<td colspan=2 class=c>{fl_shortcut_add_title}</td>
+			</tr>
+			<tr height="20">
+				<th>
+					<input type="text" name="name" value="{name}"     size=32 maxlength=32 title="{fl_shortcut_name}" \>
+					<input type="text" name="galaxy" value="{galaxy}" size=3  maxlength=1  title="{fl_shortcut_galaxy}" \>
+					<input type="text" name="system" value="{system}" size=3  maxlength=3  title="{fl_shortcut_solar_system}" \>
+					<input type="text" name="planet" value="{planet}" size=3  maxlength=3  title="{fl_planet}" \>
+					<select name="moon">
+		 				<option {moon1} value="1" >{fl_planet}</option>
+						<option {moon2} value="2" >{fl_debris}</option>
+						<option {moon3} value="3" >{fl_moon}</option>
+					</select>
+				</th>
+			</tr>
+			<tr>
+				<th>
+					 <input type="button" value="{fl_register_shorcut}" onclick="document.short_panel.action += '&mode={mode}';submit(); " >
+                <input type="{visibility}" value="{fl_dlte_shortcut}" onclick="document.short_panel.action += '&mode=delete';submit();">
+				</th>
+			</tr>
+			<tr>
+				<td colspan=2 class=c>
+					<a href="game.php?page=shortcuts">{fl_shortcuts}</a>
+				</td>
+			</tr>
+		</table>
+	</form>
+</div>
\ No newline at end of file
diff --git a/styles/views/shortcuts/shortcuts_row.php b/styles/views/shortcuts/shortcuts_row.php
new file mode 100644
index 0000000..2a95566
--- /dev/null
+++ b/styles/views/shortcuts/shortcuts_row.php
@@ -0,0 +1,5 @@
+<th>
+	<a href="game.php?page=shortcuts&mode=edit&a={shortcut_id}" >
+		{shortcut_name} {shortcut_galaxy}:{shortcut_system}:{shortcut_planet} {shortcut_moon}
+	</a>
+</th>
\ No newline at end of file
diff --git a/styles/views/shortcuts/shortcuts_table.php b/styles/views/shortcuts/shortcuts_table.php
new file mode 100644
index 0000000..89a349c
--- /dev/null
+++ b/styles/views/shortcuts/shortcuts_table.php
@@ -0,0 +1,15 @@
+<div id="content">
+	<table border="0" cellpadding="0" cellspacing="1" width="519">
+		<tr height="20">
+			<td class="c" colspan="2">
+				{fl_shortcuts} (<a href="game.php?page=shortcuts&mode=add">{fl_shortcut_add}</a>)
+			</td>
+		</tr>
+		{block_rows}
+		<tr>
+			<td class="c" colspan="2">
+				<a href="game.php?page=fleet">{fl_back}</a>
+			</td>
+		</tr>
+	</table>
+</div>
\ No newline at end of file
diff --git a/styles/views/stat/index.html b/styles/views/stat/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/styles/templates/stat/stat_alliancetable.tpl b/styles/views/stat/stat_alliancetable.php
similarity index 100%
rename from styles/templates/stat/stat_alliancetable.tpl
rename to styles/views/stat/stat_alliancetable.php
diff --git a/styles/templates/stat/stat_alliancetable_header.tpl b/styles/views/stat/stat_alliancetable_header.php
similarity index 100%
rename from styles/templates/stat/stat_alliancetable_header.tpl
rename to styles/views/stat/stat_alliancetable_header.php
diff --git a/styles/templates/stat/stat_body.tpl b/styles/views/stat/stat_body.php
similarity index 100%
rename from styles/templates/stat/stat_body.tpl
rename to styles/views/stat/stat_body.php
diff --git a/styles/templates/stat/stat_playertable.tpl b/styles/views/stat/stat_playertable.php
similarity index 100%
rename from styles/templates/stat/stat_playertable.tpl
rename to styles/views/stat/stat_playertable.php
diff --git a/styles/templates/stat/stat_playertable_header.tpl b/styles/views/stat/stat_playertable_header.php
similarity index 100%
rename from styles/templates/stat/stat_playertable_header.tpl
rename to styles/views/stat/stat_playertable_header.php
diff --git a/styles/views/techtree/index.html b/styles/views/techtree/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/styles/templates/techtree/techtree_body.tpl b/styles/views/techtree/techtree_body.php
similarity index 100%
rename from styles/templates/techtree/techtree_body.tpl
rename to styles/views/techtree/techtree_body.php
diff --git a/styles/templates/techtree/techtree_head.tpl b/styles/views/techtree/techtree_head.php
similarity index 100%
rename from styles/templates/techtree/techtree_head.tpl
rename to styles/views/techtree/techtree_head.php
diff --git a/styles/templates/techtree/techtree_row.tpl b/styles/views/techtree/techtree_row.php
similarity index 100%
rename from styles/templates/techtree/techtree_row.tpl
rename to styles/views/techtree/techtree_row.php
diff --git a/styles/views/trader/index.html b/styles/views/trader/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/styles/templates/trader/trader_cristal.tpl b/styles/views/trader/trader_cristal.php
similarity index 100%
rename from styles/templates/trader/trader_cristal.tpl
rename to styles/views/trader/trader_cristal.php
diff --git a/styles/templates/trader/trader_deuterium.tpl b/styles/views/trader/trader_deuterium.php
similarity index 100%
rename from styles/templates/trader/trader_deuterium.tpl
rename to styles/views/trader/trader_deuterium.php
diff --git a/styles/templates/trader/trader_main.tpl b/styles/views/trader/trader_main.php
similarity index 100%
rename from styles/templates/trader/trader_main.tpl
rename to styles/views/trader/trader_main.php
diff --git a/styles/templates/trader/trader_metal.tpl b/styles/views/trader/trader_metal.php
similarity index 100%
rename from styles/templates/trader/trader_metal.tpl
rename to styles/views/trader/trader_metal.php