diff --git a/phpgwapi/templates/idsociety/footer.tpl b/phpgwapi/templates/idsociety/footer.tpl
index adc7a57561..916af37b0c 100644
--- a/phpgwapi/templates/idsociety/footer.tpl
+++ b/phpgwapi/templates/idsociety/footer.tpl
@@ -1,10 +1,23 @@
 <!-- BEGIN footer -->
-     </td>
-    </TR>
-   </TABLE>
+			</td>
+		</tr>
+		</table>
+		<br>
 
-   </td>
-  </tr>
-</TABLE>
+		<!-- BEGIN B_powered_bottom -->
+		<table border="0" cellspacing="0" cellpadding="0" width="100%">
+		<tr>
+			<td align="center" bgcolor="{power_backcolor}">
+				<font color="{power_textcolor}">{powered}</font>
+			</td>
+		</tr>
+		</table>
+		<!-- END B_powered_bottom -->
+
+		<p>&nbsp;</p>
+
+	</td>
+</tr>
+</table>
 
 <!-- END footer -->
diff --git a/phpgwapi/templates/idsociety/navbar.inc.php b/phpgwapi/templates/idsociety/navbar.inc.php
index 011eb7c53f..84aec59cb0 100644
--- a/phpgwapi/templates/idsociety/navbar.inc.php
+++ b/phpgwapi/templates/idsociety/navbar.inc.php
@@ -9,7 +9,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-  /* $Id$ */
+	/* $Id$ */
 
 	function parse_navbar($force = False)
 	{
@@ -18,14 +18,17 @@
 		$tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
 		$tpl->set_unknowns('remove');
 
-		$templates = Array('navbar' => 'navbar.tpl');
-		$tpl->set_file($templates);
+		$tpl->set_file(array(
+			'navbar' => 'navbar.tpl'
+		));
+
+		$tpl->set_block('navbar','B_powered_top','V_powered_top');
 
 		$tpl->set_var('img_root',PHPGW_IMAGES_DIR);
 		$tpl->set_var('img_root_roll',PHPGW_IMAGES_DIR . '/rollover');
 		$tpl->set_var('table_bg_color',$phpgw_info['theme']['navbar_bg']);
 
-#  echo '<pre>'; print_r($phpgw_info['navbar']); echo '</pre>';
+		#  echo '<pre>'; print_r($phpgw_info['navbar']); echo '</pre>';
 		$applications = '';
 		while ($app = each($phpgw_info['navbar']))
 		{
@@ -37,7 +40,7 @@
 				$img_src_over = $phpgw_info['server']['webserver_url'] . '/' . $app[0] . '/templates/idsociety/images/navbar-over.gif';
 				$img_src_out = $phpgw_info['server']['webserver_url'] . '/' . $app[0] . '/templates/idsociety/images/navbar.gif';
 
-// onMouseOver="two.src='rollover/admin_over.gif'" onMouseOut="two.src='images/admin.gif'"><img src="images/admin.gif" border="0" name="two"
+				// onMouseOver="two.src='rollover/admin_over.gif'" onMouseOut="two.src='images/admin.gif'"><img src="images/admin.gif" border="0" name="two"
 				$applications .= '<tr><td><a href="' . $app[1]['url'] . '"';
 				if (isset($phpgw_info['flags']['navbar_target']))
 				{
@@ -79,11 +82,17 @@
 		}
 		$tpl->set_var('logout_img',PHPGW_IMAGES_DIR . '/logout-grey.gif');
 
-/*		if ($phpgw_info['server']['showpoweredbyon'] == 'top')
+		if ($phpgw_info['server']['showpoweredbyon'] == 'top')
 		{
-			$tpl->set_var('powered_by',lang('Powered by phpGroupWare version x',$phpgw_info['server']['versions']['phpgwapi']));
+			$tpl->set_var("powered_by",lang("Powered by phpGroupWare version x",$phpgw_info["server"]["versions"]["phpgwapi"]));
+			$tpl->set_var('power_size','2');
+			$tpl->parse('V_powered_top','B_powered_top');
 		}
-*/
+		else
+		{
+			$tpl->set_var('V_powered_top','');
+		}
+
 		if (isset($phpgw_info['navbar']['admin']) && isset($phpgw_info['user']['preferences']['common']['show_currentusers']))
 		{
 			$db  = $phpgw->db;
@@ -118,12 +127,9 @@
 */
 
 		// If the application has a header include, we now include it
-		if ((isset($phpgw_info['flags']['noheader']) && 
-		     $phpgw_info['flags']['noheader']) && 
-		    (!isset($phpgw_info['flags']['noappheader']) ||
-		     !$phpgw_info['flags']['noappheader']))
+		if ($phpgw_info["flags"]["noheader"] && ! $phpgw_info["flags"]["noappheader"])
 		{
-
+		
 		}
 		return $tpl->fp('out','navbar');
 	}
@@ -134,10 +140,23 @@
 		$tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
 		$tpl->set_unknowns('remove');
 
-  		$templates = array('footer' => 'footer.tpl');
-		$tpl->set_file($templates);
-		$tpl->set_var('img_root',PHPGW_IMAGES_DIR);
-		$tpl->set_var('table_bg_color',$phpgw_info['theme']['navbar_bg']);
-		$tpl->set_var('version',$phpgw_info['server']['versions']['phpgwapi']);
+		$tpl->set_file(array('footer' => 'footer.tpl'));
+		$tpl->set_block('footer','B_powered_bottom','V_powered_bottom');
+
+		if ($phpgw_info["server"]["showpoweredbyon"] == "bottom")
+		{
+			$powered = lang("Powered by phpGroupWare version x", $phpgw_info["server"]["versions"]["phpgwapi"]);
+			$tpl->set_var('powered',$powered);
+			$tpl->set_var('img_root',PHPGW_IMAGES_DIR);
+			$tpl->set_var('power_backcolor',$phpgw_info['theme']['navbar_bg']);
+			$tpl->set_var('power_textcolor',$phpgw_info['theme']['navbar_text']);
+			//$tpl->set_var('version',$phpgw_info['server']['versions']['phpgwapi']);
+ 			$tpl->parse('V_powered_bottom','B_powered_bottom');
+		}
+		else
+		{
+			$tpl->set_var('V_powered_bottom','');
+		}
+		
 		$tpl->pfp('out','footer');
 	}
diff --git a/phpgwapi/templates/idsociety/navbar.tpl b/phpgwapi/templates/idsociety/navbar.tpl
index 7fe974041a..d570d7c078 100755
--- a/phpgwapi/templates/idsociety/navbar.tpl
+++ b/phpgwapi/templates/idsociety/navbar.tpl
@@ -11,52 +11,51 @@
 
 <table width="100%" height="100%" cellspacing="0" cellpadding="0" border="0">
 <tr>
- <td width="154" valign="top" background="{img_root}/nav_bar_left_spacer.gif"><!-- left nav table -->
-
-	<TABLE BORDER="0" cellpadding="0" cellspacing="0" width="154" height="">
-    <TR>
-     <TD valign="top" width="154" height="58" background="{img_root}/em.gif"><img src="{img_root}/logo.gif"></TD>
-    </TR>
-
-    <TR>
-     <TD><img src="{img_root}/right_nav_bar.gif" border="0" name="one"></TD>
-    </tr>
-
-{applications}
-
-    <TR>
-     <TD><img src="{img_root}/nav_bar_left_top_bg.gif"></TD>
-    </TR>
-   </TABLE>
-
-  </td>
-  <td width="100%" valign="top"> <!-- top right table -->
-  <!-- this TD background image moved to body element -->
-   <TABLE BORDER="0" WIDTH="100%" HEIGHT="" CELLPADDING="0" CELLSPACING="0">
-    <TR>
-     <TD valign="top" width="12" height="58" background="{img_root}/nav_top_spacer.gif"><img src="{img_root}/em.gif"></TD>
-    </TR>
-
-    <TR>
-     <TD background="{img_root}/top_spacer_middle.gif" align="right" width="100%"><!-- right top nav table -->
-
-       <TABLE cellpadding="0" cellspacing="0" border="0" height="15">
-        <TR>
-         <TD><a href="{home_link}" onMouseOver="nine.src='{img_root}/rollover/welcome_over.gif'" onMouseOut="nine.src='{img_root}/welcome.gif'"><img src="{img_root}/welcome.gif" border="0" name="nine"></TD>
-         <TD><a href="{preferences_link}" onMouseOver="ten.src='{img_root}/rollover/preferences_over.gif'" onMouseOut="ten.src='{img_root}/preferences.gif'"><img src="{img_root}/preferences.gif" border="0" name="ten"></TD>
-         <TD><a href="{logout_link}" onMouseOver="eleven.src='{img_root}/rollover/log_out_over.gif'" onMouseOut="eleven.src='{img_root}/log_out.gif'"><img src="{img_root}/log_out.gif" border="0" name="eleven"></TD>
-         <TD><a href="{help_link}" onMouseOver="help.src='{img_root}/rollover/help-over.gif'" onMouseOut="help.src='{img_root}/question_mark.gif'"><img src="{img_root}/question_mark.gif" border="0" name="help"></TD>
-        </TR>
-      </TABLE>
-
-     </TD>
-	</TR>
-    <TR>
-      <TD ALIGN="left" width="100%">
-{user_info}&nbsp;&nbsp;{current_users}
-      </TD>
-    </TR>
-	<TR>
-		<TD>
-
+	<td width="154" valign="top" background="{img_root}/nav_bar_left_spacer.gif"><!-- left nav table -->
+		<table border="0" cellpadding="0" cellspacing="0" width="154" height="">
+ 		<tr>
+			<td valign="top" width="154" height="58" background="{img_root}/em.gif"><img src="{img_root}/logo.gif"></td>
+		</tr>
+		<tr>
+			<td><img src="{img_root}/right_nav_bar.gif" border="0" name="one"></td>
+		</tr>
+		<!-- applications supplies their own tr's and td's -->
+		{applications}
+		<tr>
+			<td><img src="{img_root}/nav_bar_left_top_bg.gif"></td>
+		</tr>
+		</table>
+	</td>
+	<td width="100%" valign="top"> <!-- top right table -->
+	<!-- this TD background image moved to body element -->
+		<table border="0" width="100%" height="" cellpadding="0" cellspacing="0">
+		<tr>
+			<td valign="top" width="12" height="58" background="{img_root}/nav_top_spacer.gif"><img src="{img_root}/em.gif"></td>
+		</tr>
+		<tr>
+			<td background="{img_root}/top_spacer_middle.gif" align="right" width="100%"><!-- right top nav table -->
+				<table cellpadding="0" cellspacing="0" border="0" height="15">
+				<tr>
+					<td><a href="{home_link}" onMouseOver="nine.src='{img_root}/rollover/welcome_over.gif'" onMouseOut="nine.src='{img_root}/welcome.gif'"><img src="{img_root}/welcome.gif" border="0" name="nine"></td>
+					<td><a href="{preferences_link}" onMouseOver="ten.src='{img_root}/rollover/preferences_over.gif'" onMouseOut="ten.src='{img_root}/preferences.gif'"><img src="{img_root}/preferences.gif" border="0" name="ten"></td>
+					<td><a href="{logout_link}" onMouseOver="eleven.src='{img_root}/rollover/log_out_over.gif'" onMouseOut="eleven.src='{img_root}/log_out.gif'"><img src="{img_root}/log_out.gif" border="0" name="eleven"></td>
+					<td><a href="{help_link}" onMouseOver="help.src='{img_root}/rollover/help-over.gif'" onMouseOut="help.src='{img_root}/question_mark.gif'"><img src="{img_root}/question_mark.gif" border="0" name="help"></td>
+				</tr>
+				</table>
+			</td>
+		</tr>
+		<!-- BEGIN B_powered_top -->
+		<tr>
+			<td align="left">
+				<font size="{power_size}">&nbsp;{powered_by}</font>
+			</td>
+		</tr>
+		<!-- END B_powered_top -->
+		<tr>
+			<td align="left">
+				{user_info}&nbsp;&nbsp;&nbsp;&nbsp;{current_users}
+			</td>
+		</tr>
+		<tr>
+			<td>
 <!-- END navbar -->
diff --git a/phpgwapi/themes/idsociety.theme b/phpgwapi/themes/idsociety.theme
index b6cd3f23a8..9e41eb7e3f 100755
--- a/phpgwapi/themes/idsociety.theme
+++ b/phpgwapi/themes/idsociety.theme
@@ -24,7 +24,7 @@
 	$phpgw_info['theme']['th_bg']= '#d3dce3';
 	$phpgw_info['theme']['th_text']= '#000000';
 	$phpgw_info['theme']['navbar_bg']= '#adadad';
-	$phpgw_info['theme']['navbar_text']= '#000000';
+	$phpgw_info['theme']['navbar_text']= '#ffffff';
 	$phpgw_info['theme']['table_bg']= '#9999ff';
 	$phpgw_info['theme']['table_text']= '#000000';
 	$phpgw_info['theme']['font']= 'Arial, Helvetica, san-serif';