diff --git a/setup/templates/default/footer.tpl b/setup/templates/default/footer.tpl
index 3140bd5c0e..1986158a2c 100644
--- a/setup/templates/default/footer.tpl
+++ b/setup/templates/default/footer.tpl
@@ -1,3 +1,15 @@
 <!-- footer.tpl -->
-</body>
-</html>
+<br/><br/>
+</td>
+</tr>
+</tbody></table>
+
+<br></td>
+<td width="15"></td>
+</tr>
+</tbody></table>
+						</td></tr>
+</tbody></table></td></tr>
+</tbody></table>
+<p align="center" class="copyright">&nbsp;<a class="copyright" href="http://www.egroupware.org/">eGroupWare</a> version {pgw_ver} </p>
+</body></html>
diff --git a/setup/templates/default/head.tpl b/setup/templates/default/head.tpl
index 36bf8ea820..c4d9e364b4 100644
--- a/setup/templates/default/head.tpl
+++ b/setup/templates/default/head.tpl
@@ -2,37 +2,124 @@
 <html>
 <head>
 
-<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org">
-<META NAME="description" CONTENT="phpGroupWare">
-<META NAME="keywords" CONTENT="phpGroupWare">
+<META name="AUTHOR" content="eGroupWare http://www.egroupware.org">
+<META NAME="description" CONTENT="eGroupWare">
+<META NAME="keywords" CONTENT="eGroupWare">
 <META HTTP-EQUIV="Pragma" CONTENT="no-cache">
 <META HTTP-EQUIV="Cache-control" CONTENT="no-cache">
 <META HTTP-EQUIV="content-type" CONTENT="text/html;charset={lang_charset}">
+<link href="templates/default/css/idots.css" type="text/css" rel="StyleSheet">
+
+		<style type="text/css">
+  <!--
+  .row_on { color: #000000; background-color: #eeeeee; }
+  .row_off { color: #000000; background-color: #E8F0F0; }
+  .th 
+  { 
+  	color: #000000; 
+  	background-color: #cccccc; 
+  }
 
-  <style type="text/css">
-  <!-- 
-  a, body, tr, th, td, input, select { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt; text-decoration: none; }
-  a:hover, a:active { text-decoration: underline; }
-  .banner { background-color: {banner_bg}; color: {th_text}; font-weight: bold; }
-  .msg { color: {msg}; }
-  .link { color: #FFFFFF; }
-  .th { background: {th_bg}; font-weight: bold; color: {th_text} }
-  .row_on,.th_bright { background: {row_on}; }
-  .row_off { background: {row_off}; }
   -->
   </style>
-  <title>phpGroupWare {lang_setup} {page_title}</title>
+<title>eGroupWare {lang_setup} {page_title}</title>
 </head>
 
-<body bgcolor="#FFFFFF">
+	<body bgcolor="#e5e5e5" alink="red" link="blue" vlink="blue">
+<!--<table width="100%" border="0" cellspacing="0" cellpadding="2">
+				<tr class="banner">
+					<td align="left">
+						&nbsp;eGroupWare version {pgw_ver} {lang_setup} {configdomain}
+					</td>
+					<td align="right">{logoutbutton}</td>
+				</tr>
+				</table>-->
+								<table class="box" height="90%" cellspacing="0" cellpadding="1" width="100%" bgcolor="#ffffff" border="0">
+<tbody><tr> 
+		<td valign="top"> 
+			<table cellspacing="0" cellpadding="0" width="100%" bgcolor="#ffffff" border="0">
+				<tbody><tr> 
+						<td width="185" rowspan="2" align="center" valign="top" class="toppannel"><a href="http://http//www.eGroupWare.org" target="_blank"><img src="templates/default/images/setup-anim.gif" alt="logo" border="0" title="www.eGroupWare.org"></a></td>
+						<td colspan="2" valign="top" style="background-image:url(templates/default/images/panel.png);background-repeat: repeat-x;"> 
+							<table width="100%" border="0" cellpadding="0" cellspacing="0"  bgcolor="#ffffff" style="background-image:url(templates/default/images/panel.png);background-repeat: repeat-x;">
+								<tbody><tr valign="middle"> 
+										
+										
+										<!-- If there are no icons -->
+										<td width="100%"><img src="templates/default/images/spacer.gif" width="100%" height="60" alt=""></td>
+									
+
+										<!-- else the icons -->
+
+										<!--		<td align="center"><a href="http://vlinder.rsm.lingewoud.nl/groupwork/horssen.groupwork.nl/egroupware/admin/index.php"><img src="images/navbar_003.png" alt="Admin" title="Admin" border="0" height="60"></a></td><td align="center"><a href="http://vlinder.rsm.lingewoud.nl/groupwork/horssen.groupwork.nl/egroupware/calendar/index.php"><img src="images/navbar.png" alt="Calendar" title="Calendar" border="0" height="60"></a></td><td align="center"><a href="http://vlinder.rsm.lingewoud.nl/groupwork/horssen.groupwork.nl/egroupware/addressbook/index.php"><img src="images/navbar_002.png" alt="Addressbook" title="Addressbook" border="0" height="60"></a></td><td align="center"><a href="http://vlinder.rsm.lingewoud.nl/groupwork/horssen.groupwork.nl/egroupware/jinn/index.php"><img src="images/navbar_004.png" alt="jinn" title="jinn" border="0" height="60"></a></td>
+										<td width="1%"></td>-->
+
+									</tr>
+									<tr valign="top" bgcolor="#ffffff">
+										<td width="100%">&nbsp;</td>
+
+										<!-- the icons texts -->
+										<!--								<td align="center" class="mainnote"><a href="http://vlinder.rsm.lingewoud.nl/groupwork/horssen.groupwork.nl/egroupware/admin/index.php">Admin</a></td><td align="center" class="mainnote"><a href="http://vlinder.rsm.lingewoud.nl/groupwork/horssen.groupwork.nl/egroupware/calendar/index.php">Calendar</a></td><td align="center" class="mainnote"><a href="http://vlinder.rsm.lingewoud.nl/groupwork/horssen.groupwork.nl/egroupware/addressbook/index.php">Addressbook</a></td><td align="center" class="mainnote"><a href="http://vlinder.rsm.lingewoud.nl/groupwork/horssen.groupwork.nl/egroupware/jinn/index.php">jinn</a></td>
+										<td width="1%" colspan="100"></td>-->
+									</tr>
+						</tbody></table></td>
+						<td width="15" rowspan="2" valign="top" class="toppannel"></td>
+					</tr>
+					<tr>
+						<td align="left" valign="top" class="mainnote">&nbsp;</td>
+						<td align="right" valign="top" class="mainnote">&nbsp;</td>
+					</tr>
+					<tr>
+						<td align="left" valign="top" class="mainnote">&nbsp;</td>
+						<td align="right" valign="top" class="mainnote"><!--<font color=red>Setup adminisator not logged in</font>--></td>
+					</tr>
+			</tbody></table>
+			<table cellspacing="0" cellpadding="0" width="100%" border="0">
+				<tbody><tr valign="top"> 
+						<td width="15"></td>
+						<td valign="top" width="1">
+
+							<!-- start blocks -->
+							<table class="sidebox" cellspacing="1" cellpadding="0" width="100%" border="0">
+								<tbody><tr> 
+										<td class="sideboxtitle" align="center" height="28">General Menu</td>
+									</tr>
+									<tr> 
+										<td class="sideboxcontent" bgcolor="#efefef">
+											<table class="sideboxtext" cellspacing="0" cellpadding="0" width="100%" border="0">
+												<tbody><tr> 
+														<td valign="top" align="center"><font color="#ff9933">*</font>&nbsp;</td>
+														<td width="100%" height="20" align="left" valign="top"><a href="../home.php">Back to user login</a></td>
+													</tr>
+													<tr> 
+													<td valign="top" align="center"><font color="#ff9933">{logouticon}</font>&nbsp;</td>
+													<td width="100%" height="20" align="left" valign="top">{logoutbutton}</td>
+												</tr>												
+												<!--<tr> 
+														<td valign="top" align="center"><font color="#ff9933">*</font>&nbsp;</td>
+														<td width="100%" height="20" align="left" valign="top"><a href="http://vlinder.rsm.lingewoud.nl/groupwork/horssen.groupwork.nl/egroupware/about.php?app=eGroupWare">About </a></td>
+													</tr>-->
+													</tbody></table>
+										</td>
+									</tr>
+							</tbody></table>
+							<br>	
+							<br>
+						</td>
+						<td width="15"><img src="templates/default/images/spacer.gif" width="15" alt=""></td>
+						<td>
+
+										<table cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody><tr> 
+		<td valign="top" height="100%"> 
+			<table align="center" class="box" cellspacing="1" cellpadding="0" width="100%" border="0">
+				<tbody><tr> 
+						<td height="23" colspan="2" align="center" class="articletitle">{lang_setup} {configdomain}</td>
+					</tr>
+					<tr align="center"> 
+						<td height="20" colspan="2" bgcolor="#efefef" class="mainnote">
+							<br>
+							<br>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="2">
-<tr class="banner">
-	<td align="left">
-		&nbsp;eGroupWare version {pgw_ver} {lang_setup} {configdomain}
-	</td>
-	<td align="right">{logoutbutton}</td>
-</tr>
-</table>
 <!-- end head.tpl -->
 
