diff --git a/about.php b/about.php
index 95b901b330..8eba7fb432 100644
--- a/about.php
+++ b/about.php
@@ -21,8 +21,7 @@
 		$included = $GLOBALS['phpgw']->hooks->single('about',$app);
 	}
 
-	$tpl = CreateObject('phpgwapi.xslttemplates',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default'));
-	$tpl->add_file(array('about'));
+	$GLOBALS['phpgw']->xslttpl->add_file(array('about'));
 
 	if ($included)
 	{
@@ -39,6 +38,6 @@
 		'about_app'				=> $app_data
 	);
 
-	$tpl->set_var('about',$data);
-	$tpl->pparse();
+	$GLOBALS['phpgw']->xslttpl->set_var('about',$data);
+	$GLOBALS['phpgw']->xslttpl->pparse();
 ?>
diff --git a/addressbook/inc/hook_home.inc.php b/addressbook/inc/hook_home.inc.php
index 33b0c5ac0a..eef529e7d9 100644
--- a/addressbook/inc/hook_home.inc.php
+++ b/addressbook/inc/hook_home.inc.php
@@ -42,7 +42,6 @@
 			Array(
 				'title'     => $title,
 				'width'     => '100%',
-				'outerborderwidth' => '0',
 				'header_background_image' => $GLOBALS['phpgw']->common->image('phpgwapi/templates/default','bg_filler')
 			)
 		);
@@ -65,9 +64,11 @@
 
 		while(list($key,$val) = @each($bdays))
 		{
-			$portalbox->data[] = array(
+			$portalbox->data[] = array
+			(
 				'text' => lang("Today is x's birthday!", $val['n_given'] . ' ' . $val['n_family']),
-				'link' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id=' .  $val['id'])
+				'link' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id=' .  $val['id']),
+				'lang_link_statustext'	=> lang('show contact')
 			);
 		}
 
@@ -77,9 +78,11 @@
 
 		while(list($key,$val) = @each($bdays))
 		{
-			$portalbox->data[] = array(
+			$portalbox->data[] = array
+			(
 				'text' => lang("Tomorrow is x's birthday.", $val['n_given'] . ' ' . $val['n_family']),
-				'link' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id='.$val['id'])
+				'link' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id='.$val['id']),
+				'lang_link_statustext'  => lang('show contact')
 			);
 		}
 		if(count($portalbox->data))
@@ -87,7 +90,7 @@
 			$tmp = $portalbox->draw();
 		}
 		unset($portalbox);
-		$tmp .= "\n<!-- Birthday info -->\n";
+
 		$GLOBALS['phpgw']->template->set_var('phpgw_body',$tmp,True);
 		unset($tmp);
 	}
diff --git a/phpgwapi/inc/class.listbox.inc.php b/phpgwapi/inc/class.listbox.inc.php
index e01039dbfd..045bba43ed 100755
--- a/phpgwapi/inc/class.listbox.inc.php
+++ b/phpgwapi/inc/class.listbox.inc.php
@@ -43,7 +43,6 @@
 		*/
 		function listbox($param)
 		{
-			$this->setvar('classname','listbox');
 			$this->setvar('outerwidth',300);
 			$this->setvar('innerwidth',300);
 			$this->setvar('width',300);
diff --git a/phpgwapi/inc/class.portalbox.inc.php b/phpgwapi/inc/class.portalbox.inc.php
index 5996fc2af2..994b9a0cc8 100755
--- a/phpgwapi/inc/class.portalbox.inc.php
+++ b/phpgwapi/inc/class.portalbox.inc.php
@@ -27,12 +27,10 @@
 		//Set up the Object, reserving memory space for variables
 
 		var $outerwidth;
-		var $outerborderwidth = 1;
 		var $width;
 		var $innerwidth;
 		var $controls;
 		var $header_background_image;
-		var $classname;
 		var $up;
 		var $down;
 		var $close;
@@ -45,9 +43,6 @@
 		// Textual variables
 		var $title;
 
-		// Template
-		var $p;
-
 		/*
 		Use these functions to get and set the values of this
 		object's variables. This is good OO practice, as it means
@@ -92,7 +87,6 @@
 
 			$this->output = array
 			(
-				'outer_border'				=> $this->getvar('outerborderwidth'),
 				'outer_width'				=> $this->getvar('width'),
 				'title'						=> $this->getvar('title'),
 				'inner_width'				=> $this->getvar('width'),