diff --git a/phpgwapi/templates/default/parts.inc.php b/phpgwapi/templates/default/parts.inc.php
deleted file mode 100644
index 43c00dc1ac..0000000000
--- a/phpgwapi/templates/default/parts.inc.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-  /**************************************************************************\
-  * phpGroupWare                                                             *
-  * http://www.phpgroupware.org                                              *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-  /* $Id$ */
-
-	$GLOBALS['phpgw']->template->set_var('phpgw_left_table_width','5%');
-	$GLOBALS['phpgw']->template->set_var('phpgw_right_table_width','5%');
-
-	$GLOBALS['phpgw']->template->set_var('phpgw_top_table_height','5%');
-	$GLOBALS['phpgw']->template->set_var('phpgw_top_frame_height','45');
-	$GLOBALS['phpgw']->template->set_var('phpgw_top_scrolling','NO');
-	$GLOBALS['phpgw']->template->set_var('phpgw_body_table_width','90%');
-	$GLOBALS['phpgw']->template->set_var('phpgw_body_table_height','89%');
-	$GLOBALS['phpgw']->template->set_var('phpgw_bottom_table_height','1%');
-	$GLOBALS['phpgw']->template->set_var('phpgw_bottom_frame_height','40');
-
-	function parse_toppart($output)
-  {
-		$GLOBALS['phpgw']->template->set_file('parts','parts.tpl');
-		$GLOBALS['phpgw']->template->set_block('parts','top_part');
-		$GLOBALS['phpgw']->template->set_block('parts','top_part_app');
-
-	/*	$var['navbar_color'] = $GLOBALS['phpgw_info']['theme']['navbar_bg'];
-
-		if ($GLOBALS['phpgw_info']['flags']['navbar_target'])
-		{
-			$target = ' target="' . $GLOBALS['phpgw_info']['flags']['navbar_target'] . '"';
-		} */
-
-		$i = 1;
-		while ($app = each($GLOBALS['phpgw_info']['navbar']))
-		{
-			if ($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'] == 'text')
-			{
-				$tabs[$i]['label'] = lang($app[1]['title']);
-				$tabs[$i]['link']  = $app[1]['url'];
-				if (ereg($GLOBALS['phpgw_info']['navbar'][$app[0]],$PHP_SELF))
-				{
-					$selected = $i;
-				}
-				$i++;
-			}
-			else
-			{
-				$title = '<img src="' . $app[1]['icon'] . '" alt="' . lang($app[1]['title']) . '" title="'
-					. lang($app[1]['title']) . '" border="0">';
-				if ($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'] == 'icons_and_text')
-				{
-					$title .= "<br>" . lang($app[1]['title']);
-					$var['width'] = '7%';
-				}
-				else
-				{
-					$var['width']  = '3%';
-				}
-   
-				$var['value'] = '<a href="' . $app[1]['url'] . '"' . $target . '>' . $title . '</a>';
-				$var['align'] = 'center';
-				$GLOBALS['phpgw']->template->set_var($var);
-				$GLOBALS['phpgw']->template->parse('applications','top_part_app',True);
-			}
-		}
-		if ($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'] == 'text')
-		{
-			$var['align'] = 'right';
-			$var['value'] = $GLOBALS['phpgw']->common->create_tabs($tabs,$selected,-1);
-			$GLOBALS['phpgw']->template->set_var($var);
-			$GLOBALS['phpgw']->template->parse('applications','top_part_app',True);
-		}
-
-		if	 ($GLOBALS['phpgw_info']['server']['showpoweredbyon'] == 'top')
-		{
-			$var['powered_by'] = lang('Powered by phpGroupWare version x',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
-		}
-		if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers']))
-		{
-			$db  = $GLOBALS['phpgw']->db;
-			$db->query("select count(session_id) from phpgw_sessions where session_flags != 'A'");
-			$db->next_record();
-			$var['current_users'] = '<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions')
-				. '">&nbsp;' . lang('Current users') . ': ' . $db->f(0) . '</a>';
-		}
-		$now = time();
-		$var['user_info'] = $GLOBALS['phpgw']->common->display_fullname() . ' - '
-				. lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
-				. $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
-//				. lang($GLOBALS['phpgw']->common->show_date($now,'F')) . ' '
-//				. $GLOBALS['phpgw']->common->show_date($now,'d, Y');
-
-		// This is gonna change
-		if (isset($cd))
-		{
-			$var['messages'] = checkcode($cd);
-		}
-		$GLOBALS['phpgw']->template->set_var($var);
-		$GLOBALS['phpgw']->template->fp($output,'top_part');
-	}
-
-	function parse_bottompart($output)
-	{
-		if ($GLOBALS['phpgw_info']['server']['showpoweredbyon'] == 'bottom')
-		{
-			$GLOBALS['phpgw']->template->set_file('parts','parts.tpl');
-			$GLOBALS['phpgw']->template->set_block('parts','bottom_part');
-			$var = Array(
-				'msg'			=> lang('Powered by phpGroupWare version x',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']),
-				'version'		=> $GLOBALS['phpgw_info']['server']['versions']['phpgwapi']
-			);
-			$GLOBALS['phpgw']->template->set_var($var);
-			$GLOBALS['phpgw']->template->fp($output,'bottom_part');
-		}
-		else
-		{
-			$GLOBALS['phpgw']->template->set_var($output,'');
-		}
-	}
-	
diff --git a/phpgwapi/templates/default/parts.tpl b/phpgwapi/templates/default/parts.tpl
deleted file mode 100644
index 6e050d266f..0000000000
--- a/phpgwapi/templates/default/parts.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- BEGIN top_part -->
-<TABLE width="100%" cellspacing="0" cellpadding="0">
-	<TR class="navbar">
-		<TD align="left" nowrap>{user_info}</TD>
-		{applications}
-	</TR>
-</TABLE>
-<TABLE width="100%" height="1%" border="0" cellspacing="0" cellpadding="0">
-	<TR class="navbar">
-		<TD align="left">{powered_by}&nbsp;</TD>
-		<TD align="right">&nbsp;{current_users}</TD>
-	</TR>
-</TABLE>
-<!-- END top_part -->
-
-<!-- BEGIN bottom_part -->
-<TABLE border="0" cellspacing="0" cellpadding="0" width="100%" class="navbar"><TR><TD valign="middle" align="CENTER">{msg}</TD></TR></Table>
-<!-- END bottom_part -->
-
-<!-- BEGIN top_part_app -->
-<td align="{align}" width="{width}">{value}</td>
-<!-- END top_part_app -->
diff --git a/phpgwapi/templates/default/phpgw.tpl b/phpgwapi/templates/default/phpgw.tpl
deleted file mode 100644
index c082a276f8..0000000000
--- a/phpgwapi/templates/default/phpgw.tpl
+++ /dev/null
@@ -1,134 +0,0 @@
-<!-- BEGIN phpgw_main_tables_start -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-	<META http-equiv="Content-Type" content="text/html; charset={phpgw_head_charset}">
-	<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org">
-	<META NAME="description" CONTENT="{phpgw_head_description}">
-	<META NAME="keywords" CONTENT="{phpgw_head_keywords}">
-	<META name="robots" content="none">
-	<BASE target="{phpgw_head_target}">
-	<LINK REL="ICON" href="favicon.ico" type="image/x-ico">
-	<LINK REL="SHORTCUT ICON" href="favicon.ico">
-	<TITLE>{phpgw_head_website_title}</TITLE>
-	{phpgw_head_javascript}
-	{phpgw_css}
-	{phpgw_head_tags}
-</HEAD>
-<BODY {phpgw_body_tags}>
-	<TABLE width="100%" height="100%" cellspacing="0" cellpadding="0">
-		<TR>
-			<TD width="100%" valign="top" colspan="3">{phpgw_top}</TD>
-		</TR>
-		<TR>
-			<TD width="{phpgw_left_table_width}" height="{phpgw_body_table_height}" valign="top">{phpgw_left}</TD>
-			<TD width="{phpgw_body_table_width}" height="{phpgw_body_table_height}" valign="top">
-				{phpgw_msgbox}
-<!-- END phpgw_main_tables_start -->
-
-<!-- BEGIN phpgw_main_tables_end -->
-				{phpgw_body}
-			</TD>
-			<TD width="{phpgw_right_table_width}" height="{phpgw_body_table_height}" align="right" valign="top">{phpgw_right}</TD>
-		</TR>
-		<TR>
-			<TD width="100%" height="{phpgw_bottom_table_height}" align="left" valign="top" colspan="3">{phpgw_bottom}</TD>
-		</TR>
-	</TABLE>
-</BODY>
-</HTML>
-<!-- END phpgw_main_tables_end -->
-
-<!-- BEGIN phpgw_main_basic_start -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-	<META http-equiv="Content-Type" content="text/html; charset={phpgw_head_charset}">
-	<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org">
-	<META NAME="description" CONTENT="{phpgw_head_description}">
-	<META NAME="keywords" CONTENT="{phpgw_head_keywords}">
-	<META name="robots" content="none">
-	<BASE target="{phpgw_head_target}">
-	<LINK REL="ICON" href="{phpgw_head_browser_ico}" type="image/x-ico">
-	<LINK REL="SHORTCUT ICON" href="{phpgw_head_browser_ico}">
-	<TITLE>{phpgw_head_website_title}</TITLE>
-	{phpgw_head_javascript}
-	{phpgw_css}
-	{phpgw_head_tags}
-</HEAD>
-<BODY {phpgw_body_tags}>
-	{phpgw_msgbox}
-<!-- END phpgw_main_basic_start -->
-
-<!-- BEGIN phpgw_main_basic_end -->
-	{phpgw_body}
-</BODY>
-</HTML>
-<!-- END phpgw_main_basic_end -->
-
-<!-- BEGIN phpgw_main_frames_start -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-	<META http-equiv="Content-Type" content="text/html; charset={phpgw_head_charset}">
-	<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org">
-	<META NAME="description" CONTENT="{phpgw_head_description}">
-	<META NAME="keywords" CONTENT="{phpgw_head_keywords}">
-	<META name="robots" content="none">
-	<BASE target="{phpgw_head_target}">
-	<LINK REL="ICON" href="{phpgw_head_browser_ico}" type="image/x-ico">
-	<LINK REL="SHORTCUT ICON" href="{phpgw_head_browser_ico}">
-	<TITLE>{phpgw_head_website_title}</TITLE>
-	<FRAMESET frameborder="0" border="0" framespacing="0" ROWS="{phpgw_top_frame_height},{phpgw_body_frame_height},{phpgw_bottom_frame_height}">
-		<FRAME MARGINWIDTH=0 MARGINHEIGHT=0 SRC="{phpgw_top_link}" NAME="top" SCROLLING="{phpgw_top_scrolling}">
-		<FRAMESET frameborder="0" border="0" framespacing="0" COLS="{phpgw_left_frame_width},{phpgw_body_frame_width},{phpgw_right_frame_width}">
-			<FRAME MARGINWIDTH=0 MARGINHEIGHT=0 SRC="{phpgw_left_link}" NAME="left" SCROLLING="{phpgw_left_scrolling}">
-			<FRAME MARGINWIDTH=0 MARGINHEIGHT=0 SRC="{phpgw_body_link}" NAME="body">
-			<FRAME MARGINWIDTH=0 MARGINHEIGHT=0 SRC="{phpgw_right_link}" NAME="right" SCROLLING="{phpgw_right_scrolling}">
-		</FRAMESET>
-		<FRAME MARGINWIDTH=0 MARGINHEIGHT=0 SRC="{phpgw_bottom_link}" NAME="bottom" SCROLLING="{phpgw_bottom_scrolling}">
-		<NOFRAMES>
-			<P>phpGroupWare is configured to use frames, but your browser does not support them.<BR>
-			<A href="{phpgw_unupported_link}">click here to force non-frames mode</A>
-		</NOFRAMES>
-	</FRAMESET>
-</HEAD>
-<!-- END phpgw_main_frames_start -->
-
-<!-- BEGIN phpgw_main_frames_end -->
-</HTML>
-<!-- END phpgw_main_frames_end -->
-
-<!-- BEGIN phpgw_head_javascript -->
-	<SCRIPT language="JavaScript" type="text/javascript">
-		<!--
-		function MM_swapImgRestore() { //v3.0
-			var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
-		}
-		function MM_preloadImages() { //v3.0
-			var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
-			var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
-			if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
-		}
-		function MM_findObj(n, d) { //v4.0
-			var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
-			d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
-			if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
-			for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
-			if(!x && document.getElementById) x=document.getElementById(n); return x;
-		}
-		function MM_swapImage() { //v3.0
-			var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
-			if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
-		}
-
-		function multiLoad(top_doc,left_doc,body_doc,right_doc,bottom_doc) {
-			if(top_doc != null){ parent.top.location.href=top_doc; }
-			if(left_doc != null){ parent.left.location.href=left_doc; }
-			if(body_doc != null){ parent.body.location.href=body_doc; }
-			if(right_doc != null){ parent.right.location.href=right_doc; }
-			if(bottom_doc != null){ parent.bottom.location.href=bottom_doc; }
-		}
-		//-->
-	</SCRIPT>
-<!-- END phpgw_head_javascript -->