diff --git a/e107_themes/templates/banner_template.php b/e107_themes/templates/banner_template.php
index b0bcc148e..137e1da94 100644
--- a/e107_themes/templates/banner_template.php
+++ b/e107_themes/templates/banner_template.php
@@ -1,10 +1,12 @@
 <?php
+// $Id: banner_template.php,v 1.2 2007-12-06 21:35:55 e107steved Exp $
 
 if (!defined('e107_INIT')) { exit; }
 if (!defined("USER_WIDTH")){ define("USER_WIDTH","width:98%"); }
 
 // ##### LOGIN TABLE -------------------------------------------------------------------------------
-if(!$BANNER_LOGIN_TABLE){
+if(!isset($BANNER_LOGIN_TABLE))
+{
 		$BANNER_LOGIN_TABLE = "
 		<div style='align:center'>\n
 		<form method='post' action='".e_SELF."'>\n
@@ -29,7 +31,8 @@ if(!$BANNER_LOGIN_TABLE){
 // ##### ------------------------------------------------------------------------------------------
 
 // ##### BANNER TABLE -----------------------------------------------------------------------------
-if(!$BANNER_TABLE_START){
+if(!isset($BANNER_TABLE_START))
+{
 		$BANNER_TABLE_START = "
 		<table class='fborder' style='".USER_WIDTH."; border:1px solid #000' border='1'>
 		<tr><td colspan='7' style='text-align:center' class='fcaption'>".BANNERLAN_21."</td></tr>
@@ -43,7 +46,8 @@ if(!$BANNER_TABLE_START){
 			<td class='forumheader' style='text-align:center'>".BANNERLAN_28."</td>
 		</tr>";
 }
-if(!$BANNER_TABLE){
+if(!isset($BANNER_TABLE))
+{
 		$BANNER_TABLE = "
 		<tr>
 			<td class='forumheader3' style='text-align:center'>{BANNER_TABLE_CLIENTNAME}</td>
@@ -71,20 +75,24 @@ if(!$BANNER_TABLE){
 		</tr>
 		<tr><td colspan='7'>&nbsp;</td></tr>";
 }
-if(!$BANNER_TABLE_END){
+if(!isset($BANNER_TABLE_END))
+{
 		$BANNER_TABLE_END = "
 		</table>";
 }
 // ##### ------------------------------------------------------------------------------------------
 
 // ##### BANNER MENU -----------------------------------------------------------------------------
-if(!isset($BANNER_MENU_START)){
+if(!isset($BANNER_MENU_START))
+{
 	$BANNER_MENU_START = "<div style='text-align:center;'>";
 }
-if(!isset($BANNER_MENU)){
+if(!isset($BANNER_MENU))
+{
 	$BANNER_MENU = "{BANNER}<br /><br />";
 }
-if(!isset($BANNER_MENU_END)){
+if(!isset($BANNER_MENU_END))
+{
 	$BANNER_MENU_END = "</div>";
 }
 // ##### ------------------------------------------------------------------------------------------
diff --git a/e107_themes/templates/contact_template.php b/e107_themes/templates/contact_template.php
index 6372db91d..facf6bed6 100644
--- a/e107_themes/templates/contact_template.php
+++ b/e107_themes/templates/contact_template.php
@@ -1,10 +1,11 @@
 <?php
-// $Id: contact_template.php,v 1.2 2007-04-12 19:18:24 e107steved Exp $
+// $Id: contact_template.php,v 1.3 2007-12-06 21:35:55 e107steved Exp $
 
 if (!defined('e107_INIT')) { exit; }
 if (!defined("USER_WIDTH")){ define("USER_WIDTH","width:97%"); }
 
-if(!$CONTACT_INFO){
+if(!isset($CONTACT_INFO))
+{
   $CONTACT_INFO = "
 	<table style='".USER_WIDTH."' cellpadding='1' cellspacing='7'>
 	<tr>
@@ -28,7 +29,8 @@ $sc_style['CONTACT_IMAGECODE_INPUT']['pre'] = "";
 $sc_style['CONTACT_IMAGECODE_INPUT']['post'] = "</td></tr>";
 
 
-if(!$CONTACT_FORM){
+if(!isset($CONTACT_FORM))
+{
   $CONTACT_FORM = "
 	<form action='".e_SELF."' method='post' id='contactForm' >
 	<table style='".USER_WIDTH."' cellpadding='1' cellspacing='7'>
diff --git a/e107_themes/templates/fpw_template.php b/e107_themes/templates/fpw_template.php
index 3725491bb..dbd957d38 100644
--- a/e107_themes/templates/fpw_template.php
+++ b/e107_themes/templates/fpw_template.php
@@ -1,11 +1,13 @@
 <?php
+// $Id: fpw_template.php,v 1.2 2007-12-06 21:35:55 e107steved Exp $
 
 
 if (!defined('e107_INIT')) { exit; }
 if (!defined("USER_WIDTH")){ define("USER_WIDTH","width:70%"); }
 
 // ##### FPW TABLE -----------------------------------------------------------------------------
-if(!$FPW_TABLE){
+if(!isset($FPW_TABLE))
+{
 		$FPW_TABLE = "
 		<div style='text-align:center'>
 		<form method='post' action='".e_SELF."'>
@@ -52,7 +54,8 @@ if(!$FPW_TABLE){
 // ##### ------------------------------------------------------------------------------------------
 
 // ##### FPW HEADER TABLE -------------------------------------------------------------------------
-if(!$FPW_TABLE_HEADER){
+if(!isset($FPW_TABLE_HEADER))
+{
 		$FPW_TABLE_HEADER = "
 		<div style='width:100%;text-align:center;margin-left:auto;margin-right:auto'>
 			<div style='width:70%;margin-left:auto;margin-right:auto;text-align:center;'><br />
@@ -62,7 +65,8 @@ if(!$FPW_TABLE_HEADER){
 // ##### ------------------------------------------------------------------------------------------
 
 // ##### FPW FOOTER TABLE -------------------------------------------------------------------------
-if(!$FPW_TABLE_FOOTER){
+if(!isset($FPW_TABLE_FOOTER))
+{
 		$FPW_TABLE_FOOTER = "</div></div>";
 }
 // ##### ------------------------------------------------------------------------------------------
diff --git a/e107_themes/templates/login_template.php b/e107_themes/templates/login_template.php
index e9f099aea..2b954c0ea 100644
--- a/e107_themes/templates/login_template.php
+++ b/e107_themes/templates/login_template.php
@@ -1,9 +1,11 @@
 <?php
+// $Id: login_template.php,v 1.4 2007-12-06 21:35:55 e107steved Exp $
 
 if (!defined('e107_INIT')) { exit; }
 
 // ##### LOGIN HEADER TABLE -----------------------------------------------------------------------
-if(!$LOGIN_TABLE_HEADER){
+if(!isset($LOGIN_TABLE_HEADER))
+{
 	$LOGIN_TABLE_HEADER .= "
 	<div style='width:100%;text-align:center; margin-left: auto;margin-right: auto'><br />
 		<div style='text-align:center;width:70%;margin-left: auto;margin-right: auto'>
@@ -11,7 +13,8 @@ if(!$LOGIN_TABLE_HEADER){
 }
 
 // ##### LOGIN TABLE -----------------------------------------------------------------------------
-if(!$LOGIN_TABLE){
+if(!isset($LOGIN_TABLE))
+{
 		$LOGIN_TABLE = "";
 		if($LOGIN_TABLE_LOGINMESSAGE != ""){
 				$LOGIN_TABLE .= "<div style='text-align:center'>{LOGIN_TABLE_LOGINMESSAGE}</div>";
@@ -29,7 +32,8 @@ if(!$LOGIN_TABLE){
 // ##### ------------------------------------------------------------------------------------------
 
 // ##### LOGIN TABLE FOOTER -----------------------------------------------------------------------
-if(!$LOGIN_TABLE_FOOTER){
+if(!isset($LOGIN_TABLE_FOOTER))
+{
 			$LOGIN_TABLE_FOOTER = "
 			<div style='width:70%;margin-right:auto;margin-left:auto'>
 				<div style='text-align:center'><br />
diff --git a/e107_themes/templates/online_template.php b/e107_themes/templates/online_template.php
index 876c4f797..e69f53100 100644
--- a/e107_themes/templates/online_template.php
+++ b/e107_themes/templates/online_template.php
@@ -1,10 +1,12 @@
 <?php
+// $Id: online_template.php,v 1.2 2007-12-06 21:35:55 e107steved Exp $
 
 if (!defined('e107_INIT')) { exit; }
 if (!defined("USER_WIDTH")){ define("USER_WIDTH","width:96%"); }
 
 // ##### ONLINE TABLE -----------------------------------------------------------------------------
-if(!$ONLINE_TABLE_START){
+if(!isset($ONLINE_TABLE_START))
+{
 		$ONLINE_TABLE_START = "
 		<div style='text-align:center'>
 		<table class='fborder' style='".USER_WIDTH."'>
@@ -14,7 +16,8 @@ if(!$ONLINE_TABLE_START){
 			<td class='forumheader' style='width:50%'>".ONLINE_EL11."</td>
 		</tr>";
 }
-if(!$ONLINE_TABLE){
+if(!isset($ONLINE_TABLE))
+{
 		$ONLINE_TABLE = "
 		<tr>
 			<td class='forumheader3' style='width:3%;text-align:center'>{ONLINE_TABLE_ICON}</td>
@@ -22,7 +25,8 @@ if(!$ONLINE_TABLE){
 			<td class='forumheader3' style='width:50%'>{ONLINE_TABLE_LOCATION}<br /></td>
 		</tr>";
 }
-if(!$ONLINE_TABLE_END){
+if(!isset($ONLINE_TABLE_END))
+{
 		$ONLINE_TABLE_END = "
 		</table>
 		</div>
diff --git a/e107_themes/templates/sitedown_template.php b/e107_themes/templates/sitedown_template.php
index a4338c2bd..f294633d3 100644
--- a/e107_themes/templates/sitedown_template.php
+++ b/e107_themes/templates/sitedown_template.php
@@ -11,16 +11,17 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_themes/templates/sitedown_template.php,v $
-|     $Revision: 1.4 $
-|     $Date: 2007-01-20 15:49:21 $
-|     $Author: mrpete $
+|     $Revision: 1.5 $
+|     $Date: 2007-12-06 21:35:55 $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
 
 // ##### SITEDOWN TABLE -----------------------------------------------------------------
-if(!$SITEDOWN_TABLE){
+if(!isset($SITEDOWN_TABLE))
+{
 	$SITEDOWN_TABLE = (defined("STANDARDS_MODE") ? "" : "<?xml version='1.0' encoding='".CHARSET."' "."?".">")."<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
 	";
 	$SITEDOWN_TABLE .= "
diff --git a/e107_themes/templates/userposts_template.php b/e107_themes/templates/userposts_template.php
index 92c5bb10b..a0ec62020 100644
--- a/e107_themes/templates/userposts_template.php
+++ b/e107_themes/templates/userposts_template.php
@@ -11,25 +11,28 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_themes/templates/userposts_template.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:36:13 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2007-12-06 21:35:55 $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
 if (!defined("USER_WIDTH")){ define("USER_WIDTH","width:95%"); }
 
-if(!isset($USERPOSTS_NP_TABLE)){
+if(!isset($USERPOSTS_NP_TABLE))
+{
 	$USERPOSTS_NP_TABLE = "<div class='nextprev'>{USERPOSTS_NEXTPREV}</div>";
 }
 
 // ##### USERPOSTS_COMMENTS TABLE -----------------------------------------------------------------
-if(!$USERPOSTS_COMMENTS_TABLE_START){
+if(!isset($USERPOSTS_COMMENTS_TABLE_START))
+{
 	$USERPOSTS_COMMENTS_TABLE_START = "
 	<div style='text-align:center'>
 	<table class='fborder' style='".USER_WIDTH."'>\n";
 }
-if(!$USERPOSTS_COMMENTS_TABLE){
+if(!isset($USERPOSTS_COMMENTS_TABLE))
+{
 	$USERPOSTS_COMMENTS_TABLE = "
 	<tr>
 	<td class='fcaption'>
@@ -44,7 +47,8 @@ if(!$USERPOSTS_COMMENTS_TABLE){
 	</tr>
 	";
 }
-if(!$USERPOSTS_COMMENTS_TABLE_END){
+if(!isset($USERPOSTS_COMMENTS_TABLE_END))
+{
 	 $USERPOSTS_COMMENTS_TABLE_END = "
 	</table>
 	</div>";
@@ -52,13 +56,15 @@ if(!$USERPOSTS_COMMENTS_TABLE_END){
 // ##### ------------------------------------------------------------------------------------------
 
 // ##### USERPOSTS FORUM TABLE --------------------------------------------------------------------
-if(!$USERPOSTS_FORUM_TABLE_START){
+if(!isset($USERPOSTS_FORUM_TABLE_START))
+{
 	$USERPOSTS_FORUM_TABLE_START = "
 	<div style='text-align:center'>
 	<form method='post' action='".e_SELF."?".e_QUERY."'>
 	<table class='fborder' style='".USER_WIDTH."'>";
 }
-if(!$USERPOSTS_FORUM_TABLE){
+if(!isset($USERPOSTS_FORUM_TABLE))
+{
 	$USERPOSTS_FORUM_TABLE .= "
 	<tr>
 	<td class='fcaption'>
@@ -74,7 +80,8 @@ if(!$USERPOSTS_FORUM_TABLE){
 	</tr>
 	";
 }
-if(!$USERPOSTS_FORUM_TABLE_END){
+if(!isset($USERPOSTS_FORUM_TABLE_END))
+{
 	$USERPOSTS_FORUM_TABLE_END = "
 	<tr>
 	<td class='forumheader' style='text-align:right'>