diff --git a/admin/admin.php b/admin/admin.php
index a57d65c..12828d8 100644
--- a/admin/admin.php
+++ b/admin/admin.php
@@ -11,10 +11,8 @@ if(!defined('entry')) define('entry',true);
 
   =========================== */
 
-include("../classes/user.class.php");
-include("../classes/functions.php");
-require_once("../classes/configuration.class.php");
 require_once('../entry.php');
+global $user, $conf, $tumble;
 
 if ($user->isAdmin()) {
 	
diff --git a/admin/ajax.php b/admin/ajax.php
index 34b76f0..e8c90fd 100644
--- a/admin/ajax.php
+++ b/admin/ajax.php
@@ -11,9 +11,10 @@ if(!defined('entry'))define('entry', true);
 
   =========================== */
 ?>
-<?php	
-	include("../classes/user.class.php");
-	require_once('../entry.php');	
+<?php
+	require_once('../entry.php');
+	global $user;
+	
 	if ($user->isAdmin()) {
 		if ($_GET["action"]) {
 			
diff --git a/admin/comments.php b/admin/comments.php
index 601ab41..8e12f83 100644
--- a/admin/comments.php
+++ b/admin/comments.php
@@ -13,6 +13,7 @@ if(!defined('entry')) define('entry',true);
 ?>
 <?php
 require_once('../entry.php');
+global $user, $conf, $tumble;
 
 $comment = new comments();
 $template = new plantillas("admin");
diff --git a/admin/feeds.php b/admin/feeds.php
index 7e870ce..e80ba62 100644
--- a/admin/feeds.php
+++ b/admin/feeds.php
@@ -14,8 +14,6 @@ if(!defined('entry')) define('entry', true);
 <?php
 require('../entry.php');
 global $user, $conf, $tumble;
-$template = new plantillas("admin");
-
 
 $user= new User();
 if ($user->isAdmin()) {
diff --git a/admin/options.php b/admin/options.php
index 9be28dc..16a56ca 100644
--- a/admin/options.php
+++ b/admin/options.php
@@ -12,11 +12,8 @@ if(!defined('entry')) define('entry',true);
   =========================== */
 ?>
 <?php
-include("../classes/functions.php");
-include("../classes/user.class.php");
-include("../classes/gelato.class.php");
-require_once("../classes/configuration.class.php");
 require_once('../entry.php');
+global $user, $conf, $tumble;
 
 if ($user->isAdmin()) {
 	
diff --git a/admin/settings.php b/admin/settings.php
index 16e7165..91a6abc 100644
--- a/admin/settings.php
+++ b/admin/settings.php
@@ -11,11 +11,8 @@ if(!defined('entry')) define('entry',true);
 
   =========================== */
 
-include("../classes/functions.php");
-include("../classes/user.class.php");
-include("../classes/gelato.class.php");
-require_once("../classes/configuration.class.php");
 require_once('../entry.php');
+global $user, $conf, $tumble;
 
 if ($user->isAdmin()) {
 	
diff --git a/admin/user.php b/admin/user.php
index dd0d2ba..82931b8 100644
--- a/admin/user.php
+++ b/admin/user.php
@@ -14,7 +14,6 @@ if(!defined('entry')) define('entry', true);
 <?php
 require('../entry.php');
 global $user, $conf, $tumble;
-$template = new plantillas("admin");
 
 $user = new user();
 $conf = new configuration();
diff --git a/entry.php b/entry.php
index 1d609ee..275c0c0 100644
--- a/entry.php
+++ b/entry.php
@@ -11,6 +11,7 @@
  * login.php
  * update.php
  * rss.php
+ * admin/bm.php
  * admin/index.php
  * admin/close.php
  * admin/ajax.php
@@ -18,9 +19,9 @@
  * admin/options.php
  * admin/admin.php
  * admin/comments.php
- * admin/users.php
- * classes/imgsize.php 
- * admin/feeds.php
+ * admin/user.php
+ * admin/feeds.php 
+ * classes/imgsize.php
  */
 
  
@@ -48,10 +49,12 @@ require_once(Absolute_Path.'classes'.DIRECTORY_SEPARATOR.'mysql_connection.class
 require_once(Absolute_Path.'classes'.DIRECTORY_SEPARATOR.'streams.class.php');
 require_once(Absolute_Path.'classes'.DIRECTORY_SEPARATOR.'gettext.class.php');
 require_once(Absolute_Path.'classes'.DIRECTORY_SEPARATOR.'lang.functions.php');
-        
+
+// Globals to be used throughout the application
 $user = new user();
-$conf = new configuration();
 $tumble = new gelato();
+$conf = new configuration();
+$db = new Conexion_Mysql(DB_name, DB_Server, DB_User, DB_Password);
 
 
 session_start();
diff --git a/index.php b/index.php
index f7a7525..8b6b958 100644
--- a/index.php
+++ b/index.php
@@ -15,7 +15,7 @@ if(!defined('entry'))define('entry', true);
 
 // Received a valid request, better start setting globals we'll need throughout the app in entry.php
 require_once('entry.php');
-global $user, $tumble, $conf, $db;
+global $user, $tumble, $conf;
 
 $template = new plantillas($conf->template);
         // My approach to MVC
diff --git a/install.php b/install.php
index dd904d8..5c9b2ce 100644
--- a/install.php
+++ b/install.php
@@ -11,12 +11,12 @@ if(!defined('entry'))define('entry', true);
 
   =========================== */
 
-$configFile = dirname(__FILE__).DIRECTORY_SEPARATOR."config.php";
+require('entry.php');
+global $user, $conf, $tumble;
 
-include('classes/functions.php');
-include('classes/install.class.php');
- 
+include('classes/install.class.php'); 
 $install = new Install(); 
+
 $install->data = $_POST;
 $install->check_form();
 
@@ -200,4 +200,4 @@ $install->check_form();
 	
 </div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/rss.php b/rss.php
index ed9a9ea..5782344 100644
--- a/rss.php
+++ b/rss.php
@@ -12,12 +12,12 @@ if(!defined('entry')) define('entry',true);
   =========================== */
 ?>
 <?php
-	header("Content-type: text/xml; charset=utf-8");	
-	
-	require(dirname(__FILE__)."/config.php");
-	include("classes/configuration.class.php");
+	header("Content-type: text/xml; charset=utf-8");
 	$isFeed = true;
-	$conf = new configuration();
+	
+	require('entry.php');
+	global $conf, $tumble;
+	
 	
 	echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
 ?>
@@ -36,8 +36,6 @@ if(!defined('entry')) define('entry',true);
 
 
 <?php
-	include("classes/gelato.class.php");
-	$tumble = new gelato();
 	$rs = $tumble->getPosts("20");
 	if ($tumble->contarRegistros()>0) {		
 
diff --git a/update.php b/update.php
index cbd6d12..79c7299 100644
--- a/update.php
+++ b/update.php
@@ -13,7 +13,8 @@ if(!defined('entry')) define('entry',true);
 ?>
 <?php
 
-$configFile = dirname(__FILE__).DIRECTORY_SEPARATOR."config.php";
+require('entry.php');
+global $configFile, $db;
 	
 if (!file_exists($configFile)) {
 	$mensaje = "
@@ -23,11 +24,7 @@ if (!file_exists($configFile)) {
 	die($mensaje);
 } else {
 	require($configFile);
-} 
-
-require_once('classes/mysql_connection.class.php'); 
-
-$db = new Conexion_Mysql(DB_name, DB_Server, DB_User, DB_Password);
+}
 
 $sqlStr = "INSERT INTO `".Table_prefix."options` VALUES ('shorten_links', '0');";