diff --git a/system/login.php b/system/login.php
index 758e4aa6..6dbca049 100644
--- a/system/login.php
+++ b/system/login.php
@@ -13,7 +13,9 @@ $logged = false;
 $logged_flags = 0;
 
 $action = isset($_REQUEST['action']) ? strtolower($_REQUEST['action']) : '';
-if($action == 'logout' && !isset($_REQUEST['account_login']))
+define('ACTION', $action);
+
+if(ACTION == 'logout' && !isset($_REQUEST['account_login']))
 {
 	unsetSession('account');
 	unsetSession('password');
diff --git a/templates/kathrine/config.php b/templates/kathrine/config.php
index 8a0cda2a..93e037e1 100644
--- a/templates/kathrine/config.php
+++ b/templates/kathrine/config.php
@@ -2,7 +2,6 @@
 $config['darkborder'] = "#d0cdb4";
 $config['lightborder'] = "#e5e3d7";
 $config['vdarkborder'] = "#afab89";
-$config['news_title_color'] = "white";
 $config['menu_categories'] = array(
 	MENU_CATEGORY_NEWS => array('id' => 'news', 'name' => 'Latest News'),
 	MENU_CATEGORY_ACCOUNT => array('id' => 'account', 'name' => 'Account'),
diff --git a/templates/tibiacom/config.php b/templates/tibiacom/config.php
index 5e88f678..f96798b4 100644
--- a/templates/tibiacom/config.php
+++ b/templates/tibiacom/config.php
@@ -2,7 +2,6 @@
 $config['darkborder'] = "#D4C0A1";
 $config['lightborder'] = "#F1E0C6";
 $config['vdarkborder'] = "#505050";
-$config['news_title_color'] = "white";
 $config['logo_monster'] = "Elder Beholder";
 // separated by comma
 // sequence is important! they will be shown in same order that you add them to the list
diff --git a/templates/tibiacom/index.php b/templates/tibiacom/index.php
index 3133155e..70f14d20 100644
--- a/templates/tibiacom/index.php
+++ b/templates/tibiacom/index.php
@@ -315,7 +315,11 @@ if(isset($config['boxes']))
 <?php
 $menus = get_template_menus();
 
-foreach($config['menu_categories'] as $id => $cat) { ?>
+foreach($config['menu_categories'] as $id => $cat) {
+	if(!isset($menus[$id])) {
+		continue;
+	}
+	?>
 <div id='<?php echo $cat['id']; ?>' class='menuitem'>
 	<span onClick="MenuItemAction('<?php echo $cat['id']; ?>')">
 		<div class='MenuButton' style='background-image:url(<?php echo $template_path; ?>/images/menu/button-background.gif);'>
@@ -333,7 +337,6 @@ foreach($config['menu_categories'] as $id => $cat) { ?>
 	</span>
 	<div id='<?php echo $cat['id']; ?>_Submenu' class='Submenu'>
 	<?php
-	if(isset($menus[$id])) {
 		foreach($menus[$id] as $category => $menu) {
 				$is_external = strpos(trim($menu['link']), 'http') === 0;
 			?>
@@ -347,7 +350,6 @@ foreach($config['menu_categories'] as $id => $cat) { ?>
 			</a>
 			<?php
 		}
-	}
 	?>
 	</div>
 	<?php