diff --git a/phpgwapi/templates/idsociety/head.inc.php b/phpgwapi/templates/idsociety/head.inc.php
index 0a1863a100..363f2ee9bc 100644
--- a/phpgwapi/templates/idsociety/head.inc.php
+++ b/phpgwapi/templates/idsociety/head.inc.php
@@ -11,6 +11,16 @@
 
   /* $Id$ */
 
+	// needed until hovlink is specified in all theme files
+	if ($phpgw_info['theme']['hovlink'] == '')
+	{
+		$csshover = '';
+	}
+	else
+	{
+		$csshover = 'A:hover{ text-decoration:none; color: "' .$phpgw_info['theme']['hovlink'] .'" }';
+	};
+
 	$bodyheader = 'BGCOLOR="'.$phpgw_info['theme']['bg_color'].'" ALINK="'.$phpgw_info['theme']['alink'].'" LINK="'.$phpgw_info['theme']['link'].'" VLINK="'.$phpgw_info['theme']['vlink'].'"';
 	if (!$phpgw_info['server']['htmlcompliant'])
 	{
@@ -24,6 +34,7 @@
 	$tpl->set_var('font_family',$phpgw_info['theme']['font']);
 	$tpl->set_var('website_title',$phpgw_info['server']['site_title']);
 	$tpl->set_var('body_tags',$bodyheader);
+	$tpl->set_var('css_hovlink',$csshover);
 	$tpl->pfp('out','head');
 	unset($tpl);
 ?>
diff --git a/phpgwapi/templates/idsociety/head.tpl b/phpgwapi/templates/idsociety/head.tpl
index 48ae47a981..716ba7ec86 100644
--- a/phpgwapi/templates/idsociety/head.tpl
+++ b/phpgwapi/templates/idsociety/head.tpl
@@ -8,12 +8,13 @@
 <META NAME="keywords" CONTENT="phpGroupWare">
 <STYLE type="text/css">
 <!--
-    a { text-decoration:none; }
-    A:link{ text-decoration:none }
-    A:visted{ text-decoration:none }
-    A:active{ text-decoration:none }
-    body { margin-top: 0px; margin-right: 0px; margin-left: 0px; font-family: {font_family} }
-    .tablink { color: #000000; }
+  a { text-decoration:none; }
+  A:link{ text-decoration:none }
+  A:visted{ text-decoration:none }
+  A:active{ text-decoration:none }
+  {css_hovlink}
+  body { margin-top: 0px; margin-right: 0px; margin-left: 0px; font-family: "{font_family}" }
+  .tablink { color: "#000000"; }
 -->
 </STYLE>
 <script language="javascript">
@@ -32,5 +33,5 @@ function MM_preloadImages() {
 
 <TITLE>{website_title}</TITLE>
 </HEAD>
-<BODY {body_tags}>
-<!-- END Head -->
+<!-- idsociety body tags continue into navbar.tpl, so the closing bracket here is there END Head -->
+<BODY {body_tags} 
diff --git a/phpgwapi/templates/idsociety/navbar.tpl b/phpgwapi/templates/idsociety/navbar.tpl
index a5547f85b2..114e4f0342 100755
--- a/phpgwapi/templates/idsociety/navbar.tpl
+++ b/phpgwapi/templates/idsociety/navbar.tpl
@@ -1,4 +1,12 @@
-<body bgcolor="AAAAAA" marginwidth="0" marginheight="0" topmargin="0" bottommargin="0" rightmargin="0" leftmargin="0" border="0" onLoad="MM_preloadImages('{app_images}','{img_root}/log_out_over.gif','{img_root}/preferences_over.gif','{img_root}/help-over.gif','{img_root}/welcome_over.gif')">
+ marginwidth="0" marginheight="0" topmargin="0" bottommargin="0" rightmargin="0" leftmargin="0" border="0" 
+ onLoad="MM_preloadImages('{app_images}',
+'{img_root}/log_out_over.gif',
+'{img_root}/preferences_over.gif',
+'{img_root}/help-over.gif',
+'{img_root}/welcome_over.gif')">
+  <!-- the above is the continuation and finishing if the < body > element started in head.tpl
+  the margin items could be merged into head, as head already supplies some
+  the variables for onLoad are set in navbar -->
 
 <table width="100%" height="100%" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -11,7 +19,7 @@
 
     <TR>
      <TD><img src="{img_root}/right_nav_bar.gif" border="0" name="one"></TD>
-    <TR>
+    </tr>
 
 {applications}
 
