diff --git a/header.inc.php.template b/header.inc.php.template
index d8de51e4da..1a0e58defa 100644
--- a/header.inc.php.template
+++ b/header.inc.php.template
@@ -9,7 +9,6 @@
 	*  Free Software Foundation; either version 2 of the License, or (at your  *
 	*  option) any later version.                                              *
 	\**************************************************************************/
-
 	/* $Id$ */
 
 	/**************************************************************************\
@@ -48,6 +47,9 @@
 	/* Select which login theme you want */
 	$GLOBALS['phpgw_info']['login_theme'] = 'submarine';
 
+	/* Enables support for non xslt apps or apps which weren't already ported to the last version of class.Templates.inc.php */
+	$GLOBALS['phpgw_info']['server']['support_old_style_apps'] = True;
+
 	/* This is used to control mcrypt's use */
 	$GLOBALS['phpgw_info']['server']['mcrypt_enabled'] = {ENABLE_MCRYPT};
 	/* Set this to 'old' for versions < 2.4, otherwise the exact mcrypt version you use. */
@@ -96,7 +98,7 @@
 	$GLOBALS['phpgw_info']['server']['versions']['phpgwapi'] = $setup_info['phpgwapi']['version'];
 	$GLOBALS['phpgw_info']['server']['versions']['current_header'] = $setup_info['phpgwapi']['versions']['current_header'];
 	unset($setup_info);
-	$GLOBALS['phpgw_info']['server']['versions']['header'] = '1.22';
+	$GLOBALS['phpgw_info']['server']['versions']['header'] = '1.23';
 	/* This is a fix for NT */
 	if(!isset($GLOBALS['phpgw_info']['flags']['noapi']) || !$GLOBALS['phpgw_info']['flags']['noapi'] == True)
 	{
diff --git a/home.php b/home.php
index 7618c923f4..f0be05bc8d 100755
--- a/home.php
+++ b/home.php
@@ -211,5 +211,8 @@
 		$GLOBALS['phpgw']->preferences->save_repository();
 	}
 
-	$GLOBALS['phpgw']->xslttpl->set_var('phpgw',$GLOBALS['phpgw']->portalbox->output);
+	if (!$GLOBALS['phpgw_info']['user']['preferences']['common']['default_app'])
+	{
+		$GLOBALS['phpgw']->xslttpl->set_var('phpgw',$GLOBALS['phpgw']->portalbox->output);
+	}
 ?>
diff --git a/index.php b/index.php
index 8bfb53e977..f61ab48b30 100755
--- a/index.php
+++ b/index.php
@@ -71,7 +71,10 @@
 //		eval("\$GLOBALS['obj']->$method();");
 		execmethod($GLOBALS['HTTP_GET_VARS']['menuaction']);
 
-		$GLOBALS['phpgw']->common->stop_xslt_capture();	// send captured output to the xslttpl
+		if ($GLOBALS['phpgw_info']['server']['support_old_style_apps'])
+		{
+			$GLOBALS['phpgw']->common->stop_xslt_capture();	// send captured output to the xslttpl
+		}
 
 		unset($app);
 		unset($obj);
diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index 84a4c8bb3e..3a8e1fbb25 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -1240,7 +1240,10 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
 			switch($GLOBALS['phpgw_info']['flags']['currentapp'])
 			{
 				case 'home':
-					$var['home'] = True;
+					if (!$GLOBALS['phpgw_info']['user']['preferences']['common']['default_app'])
+					{
+						$var['home'] = True;
+					}
 					break;
 				case 'about':
 					$var['about'] = True;
@@ -1389,7 +1392,6 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
 			{
 				/* Hope we don't get to this point.  Better then the user seeing a */
 				/* complety back screen and not know whats going on                */
-				$GLOBALS['phpgw_info']['theme']['bg_color'] = 'FFFFFF';
 				$GLOBALS['phpgw']->log->write(array('text'=>'F-Abort, No themes found'));
 			}
 			$phpgw_css_file = $GLOBALS['phpgw_info']['server']['webserver_url'] . SEP . 'phpgwapi' . SEP . 'templates' . SEP . $GLOBALS['phpgw_info']['user']['preferences']['common']['template_set']
@@ -1419,25 +1421,6 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
 			return '';
 		}
 
-		function load_phpgw_body_tags()
-		{
-			$GLOBALS['phpgw_info']['flags']['body_tags']['onLoad'] = $this->load_preload_images_data(); 
-
-			if(@is_array($GLOBALS['phpgw_info']['flags']['body_tags']))
-			{
-				$body_tags_string = '';
-				reset($GLOBALS['phpgw_info']['flags']['body_tags']);
-				while(list($key,$value) = each($GLOBALS['phpgw_info']['flags']['body_tags']))
-				{
-					if($value != '')
-					{
-						$body_tags_string .= " $key=\"$value\"";
-					}
-				}
-				$GLOBALS['phpgw']->template->set_var('phpgw_body_tags',$body_tags_string);
-			}
-		}
-
 		/*!
 		@function phpgw_header
 		@abstract load the phpgw header
@@ -1536,10 +1519,17 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
 					$GLOBALS['phpgw_info']['flags']['currentapp'] != 'logout' &&
 					!@$GLOBALS['phpgw_info']['flags']['noappfooter'])
 				{
-					$this->start_xslt_capture();	// if index already turned it off
+					if($GLOBALS['phpgw_info']['server']['support_old_style_apps'])
+					{
+						$this->start_xslt_capture();	// if index already turned it off
+					}
 					$this->phpgw_appfooter();
 				}
-				$this->stop_xslt_capture();
+
+				if ($GLOBALS['phpgw_info']['server']['support_old_style_apps'])
+				{
+					$this->stop_xslt_capture();
+				}
 
 				$GLOBALS['phpgw']->xslttpl->pp();
 				$GLOBALS['phpgw']->db->disconnect();
diff --git a/phpgwapi/inc/functions.inc.php b/phpgwapi/inc/functions.inc.php
index 261de5ab15..de0ab5d376 100644
--- a/phpgwapi/inc/functions.inc.php
+++ b/phpgwapi/inc/functions.inc.php
@@ -269,10 +269,13 @@
 	define('PHPGW_ACL_PRIVATE',16);
 	define('PHPGW_ACL_GROUP_MANAGERS',32);
 
-	/****************************************************************************\
-	* Forcing all non-cooperating apps to send there output through the xslt-tpl *
-	\****************************************************************************/
-	$GLOBALS['phpgw']->common->start_xslt_capture();
+	if ($GLOBALS['phpgw_info']['server']['support_old_style_apps'])
+	{
+		/****************************************************************************\
+		* Forcing all non-cooperating apps to send there output through the xslt-tpl *
+		\****************************************************************************/
+		$GLOBALS['phpgw']->common->start_xslt_capture();
+	}
 
 	/****************************************************************************\
 	* Forcing the footer to run when the rest of the script is done.             *
diff --git a/phpgwapi/setup/setup.inc.php b/phpgwapi/setup/setup.inc.php
index 986a394d1c..dcef7d9a98 100755
--- a/phpgwapi/setup/setup.inc.php
+++ b/phpgwapi/setup/setup.inc.php
@@ -14,7 +14,7 @@
 	/* Basic information about this app */
 	$setup_info['phpgwapi']['name']      = 'phpgwapi';
 	$setup_info['phpgwapi']['version']   = '0.9.15.008';
-	$setup_info['phpgwapi']['versions']['current_header'] = '1.22';
+	$setup_info['phpgwapi']['versions']['current_header'] = '1.23';
 	$setup_info['phpgwapi']['enable']    = 3;
 	$setup_info['phpgwapi']['app_order'] = 1;
 
diff --git a/phpgwapi/templates/default/css/phpgw.css b/phpgwapi/templates/default/css/phpgw.css
index 9b7e9a84e1..99e70bc041 100644
--- a/phpgwapi/templates/default/css/phpgw.css
+++ b/phpgwapi/templates/default/css/phpgw.css
@@ -50,7 +50,7 @@ table.login
 	text-align: center;
 }
 
-.login,.portal,.about
+.login,.portal,.about,.msgbox
 {
 	border-width: 1px;
 	border-style: ridge;
diff --git a/phpgwapi/templates/default/css/submarine.css b/phpgwapi/templates/default/css/submarine.css
index 96d407ed86..a5494d6f99 100644
--- a/phpgwapi/templates/default/css/submarine.css
+++ b/phpgwapi/templates/default/css/submarine.css
@@ -39,6 +39,11 @@ a:hover
 	background-color: #CCEEFF;
 }
 
+.msgbox
+{
+	background-color: #FFFFFF;
+}
+
 .row_off
 {
 	background-color: #DDF0FF;
diff --git a/phpgwapi/templates/default/msgbox.xsl b/phpgwapi/templates/default/msgbox.xsl
index 54dcb133dd..387eb37a68 100644
--- a/phpgwapi/templates/default/msgbox.xsl
+++ b/phpgwapi/templates/default/msgbox.xsl
@@ -5,9 +5,9 @@
 	</xsl:template>
 
 	<xsl:template match="msgbox_data">
-		<table cellpadding="2" cellspacing="2" align="center" bgcolor="#FFFFFF">
+		<table cellpadding="2" cellspacing="0" align="center" class="msgbox">
 			<tr>
-				<td align="center">
+				<td align="center" valign="middle">
 					<xsl:variable name="msgbox_img"><xsl:value-of select="msgbox_img"/></xsl:variable>
 					<xsl:variable name="msgbox_img_alt"><xsl:value-of select="msgbox_img_alt"/></xsl:variable>
 					<img src="{$msgbox_img}" alt="{$msgbox_img_alt}" onMouseout="window.status='';return true;">
@@ -16,7 +16,7 @@
 								<xsl:value-of select="lang_msgbox_statustext"/>
 							<xsl:text>'; return true;</xsl:text>
 						</xsl:attribute>
-					</img>
+					</img><xsl:text> </xsl:text>
 					<xsl:value-of select="msgbox_text"/>
 				</td>
 			</tr>
diff --git a/phpgwapi/templates/idsociety/css/dove.css b/phpgwapi/templates/idsociety/css/dove.css
index f83f0f2c22..3d2cbcc559 100644
--- a/phpgwapi/templates/idsociety/css/dove.css
+++ b/phpgwapi/templates/idsociety/css/dove.css
@@ -35,6 +35,11 @@ a:hover
 	background-color: #e6e6e6;
 }
 
+.msgbox
+{
+	background-color: #FFFFFF;
+}
+
 .th
 {
 	background-color: #486591;
diff --git a/phpgwapi/templates/idsociety/css/fancy.css b/phpgwapi/templates/idsociety/css/fancy.css
index ed040f6701..9d9184c8db 100644
--- a/phpgwapi/templates/idsociety/css/fancy.css
+++ b/phpgwapi/templates/idsociety/css/fancy.css
@@ -35,6 +35,11 @@ a:hover
 	background-color: #AABBCC;
 }
 
+.msgbox
+{
+	background-color: #FFFFFF;
+}
+
 .row_on
 {
 	background-color: #EEEEFF;
diff --git a/phpgwapi/templates/idsociety/css/idsociety.css b/phpgwapi/templates/idsociety/css/idsociety.css
index 1a37799a87..f473edbb6f 100644
--- a/phpgwapi/templates/idsociety/css/idsociety.css
+++ b/phpgwapi/templates/idsociety/css/idsociety.css
@@ -34,6 +34,11 @@ a:hover
 	background-color: #DDDDDD;
 }
 
+.msgbox
+{
+	background-color: #FFFFFF;
+}
+
 .row_off
 {
 	background-color: #EEEEEE;
diff --git a/phpgwapi/templates/idsociety/css/phpgw.css b/phpgwapi/templates/idsociety/css/phpgw.css
index a50ef5e48b..b93da08434 100644
--- a/phpgwapi/templates/idsociety/css/phpgw.css
+++ b/phpgwapi/templates/idsociety/css/phpgw.css
@@ -86,7 +86,7 @@ table.login
 	text-align: center;
 }
 
-.login,.portal,.about
+.login,.portal,.about,.msgbox
 {
 	border-width: 1px;
 	border-style: ridge;
diff --git a/phpgwapi/templates/idsociety/css/submarine.css b/phpgwapi/templates/idsociety/css/submarine.css
index b239c0ff43..483f27a403 100644
--- a/phpgwapi/templates/idsociety/css/submarine.css
+++ b/phpgwapi/templates/idsociety/css/submarine.css
@@ -29,6 +29,11 @@ a:hover
 	background-color: #CCEEFF;
 }
 
+.msgbox
+{
+	background-color: #FFFFFF;
+}
+
 .row_off
 {
 	background-color: #DDF0FF;
diff --git a/phpgwapi/templates/justweb/css/phpgw.css b/phpgwapi/templates/justweb/css/phpgw.css
index 9b7e9a84e1..99e70bc041 100644
--- a/phpgwapi/templates/justweb/css/phpgw.css
+++ b/phpgwapi/templates/justweb/css/phpgw.css
@@ -50,7 +50,7 @@ table.login
 	text-align: center;
 }
 
-.login,.portal,.about
+.login,.portal,.about,.msgbox
 {
 	border-width: 1px;
 	border-style: ridge;
diff --git a/phpgwapi/templates/justweb/css/submarine.css b/phpgwapi/templates/justweb/css/submarine.css
index 96d407ed86..a5494d6f99 100644
--- a/phpgwapi/templates/justweb/css/submarine.css
+++ b/phpgwapi/templates/justweb/css/submarine.css
@@ -39,6 +39,11 @@ a:hover
 	background-color: #CCEEFF;
 }
 
+.msgbox
+{
+	background-color: #FFFFFF;
+}
+
 .row_off
 {
 	background-color: #DDF0FF;
diff --git a/phpgwapi/templates/linux-at-work.de/css/phpgw.css b/phpgwapi/templates/linux-at-work.de/css/phpgw.css
index 9b7e9a84e1..99e70bc041 100644
--- a/phpgwapi/templates/linux-at-work.de/css/phpgw.css
+++ b/phpgwapi/templates/linux-at-work.de/css/phpgw.css
@@ -50,7 +50,7 @@ table.login
 	text-align: center;
 }
 
-.login,.portal,.about
+.login,.portal,.about,.msgbox
 {
 	border-width: 1px;
 	border-style: ridge;
diff --git a/phpgwapi/templates/linux-at-work.de/css/submarine.css b/phpgwapi/templates/linux-at-work.de/css/submarine.css
index 96d407ed86..a5494d6f99 100644
--- a/phpgwapi/templates/linux-at-work.de/css/submarine.css
+++ b/phpgwapi/templates/linux-at-work.de/css/submarine.css
@@ -39,6 +39,11 @@ a:hover
 	background-color: #CCEEFF;
 }
 
+.msgbox
+{
+	background-color: #FFFFFF;
+}
+
 .row_off
 {
 	background-color: #DDF0FF;
diff --git a/phpgwapi/templates/verdilak/css/chestnut.css b/phpgwapi/templates/verdilak/css/chestnut.css
index 9a997a0cca..afb6f47927 100644
--- a/phpgwapi/templates/verdilak/css/chestnut.css
+++ b/phpgwapi/templates/verdilak/css/chestnut.css
@@ -29,6 +29,11 @@ a:hover
 	color: #FFFFFF;
 }
 
+.msgbox
+{
+	background-color: #FFFFFF;
+}
+
 .portal_text
 {
 	color: #FFFFFF;
diff --git a/phpgwapi/templates/verdilak/css/phpgw.css b/phpgwapi/templates/verdilak/css/phpgw.css
index 081451b311..89f9cd10bf 100644
--- a/phpgwapi/templates/verdilak/css/phpgw.css
+++ b/phpgwapi/templates/verdilak/css/phpgw.css
@@ -50,7 +50,7 @@ table.login
 	text-align: center;
 }
 
-.login,.portal,.about
+.login,.portal,.about,.msgbox
 {
 	border-width: 1px;
 	border-style: ridge;
diff --git a/phpgwapi/templates/verdilak/css/submarine.css b/phpgwapi/templates/verdilak/css/submarine.css
index 45426b0e9f..5d01bf6d30 100644
--- a/phpgwapi/templates/verdilak/css/submarine.css
+++ b/phpgwapi/templates/verdilak/css/submarine.css
@@ -39,6 +39,11 @@ a:hover
 	background-color: #CCEEFF;
 }
 
+.msgbox
+{
+	background-color: #FFFFFF;
+}
+
 .row_off
 {
 	background-color: #DDF0FF;