diff --git a/admin/inc/class.uiaccounts.inc.php b/admin/inc/class.uiaccounts.inc.php
index 00adcdcab9..2fb15be179 100755
--- a/admin/inc/class.uiaccounts.inc.php
+++ b/admin/inc/class.uiaccounts.inc.php
@@ -143,7 +143,6 @@
 			$total = $GLOBALS['phpgw']->accounts->total;
 
 			$var = Array(
-				'th_bg'             => $GLOBALS['phpgw_info']['theme']['th_bg'],
 				'left_next_matchs'  => $this->nextmatchs->left('/index.php',$start,$total,'menuaction=admin.uiaccounts.list_groups'),
 				'right_next_matchs' => $this->nextmatchs->right('/index.php',$start,$total,'menuaction=admin.uiaccounts.list_groups'),
 				'lang_groups' => lang('%1 - %2 of %3 user groups',$start+1,$start+count($account_info),$total),
@@ -177,9 +176,8 @@
 
 				foreach($account_info as $account)
 				{
-					$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
 					$var = Array(
-						'tr_color'    => $tr_color,
+						'class'       => $this->nextmatchs->alternate_row_color('', True),
 						'group_name'  => (!$account['account_lid']?' ':$account['account_lid']),
 						'delete_link' => $this->row_action('delete','group',$account['account_id'])
 					);
@@ -744,7 +742,6 @@
 			$t->set_block('account','link_row');
 
 			$var = Array(
-				'th_bg'        => $GLOBALS['phpgw_info']['theme']['th_bg'],
 				'tr_color1'    => $GLOBALS['phpgw_info']['theme']['row_on'],
 				'tr_color2'    => $GLOBALS['phpgw_info']['theme']['row_off'],
 				'lang_action'  => lang('View user account'),
@@ -999,8 +996,8 @@
 				$app = $perm_display[$i][0];
 				if(!($i & 1))
 				{
-					$tr_color = $this->nextmatchs->alternate_row_color();
-					$perm_html .= '<tr bgcolor="'.$tr_color.'">';
+					$tr_class = $this->nextmatchs->alternate_row_color('',True);
+					$perm_html .= '<tr class="'.$tr_class.'">';
 				}
 				$perm_html .= '<td>' . $perm_display[$i][1] . '</td>'
 					. '<td><input type="checkbox" name="account_apps['
diff --git a/admin/inc/class.uimenuclass.inc.php b/admin/inc/class.uimenuclass.inc.php
index e6819f71ef..05c28feb55 100644
--- a/admin/inc/class.uimenuclass.inc.php
+++ b/admin/inc/class.uimenuclass.inc.php
@@ -28,11 +28,11 @@
 			$this->rowColor[1] = $GLOBALS['phpgw_info']['theme']['row_off'];
 		}
 
-		function section_item($pref_link='',$pref_text='', $bgcolor)
+		function section_item($pref_link='',$pref_text='', $class)
 		{
 			$this->t->set_var('row_link',$pref_link);
 			$this->t->set_var('row_text',$pref_text);
-			$this->t->set_var('tr_color',$bgcolor);
+			$this->t->set_var('class',$class);
 			$this->t->parse('all_rows','link_row',True);
 		}
 
@@ -58,12 +58,10 @@
 				{
 					$link = $GLOBALS['phpgw']->link($value['url'],'account_id=' . get_var('account_id',array('GET','POST')));
 				}
-				$this->section_item($link,lang($value['description']),$this->rowColor[($i % 2)]);
+				$this->section_item($link,lang($value['description']),($i%2) ? "row_on": "row_off");
 				$i++;
 			}
 
-			$this->t->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
-
 			if(strpos($_menuData[0]['extradata'],'user'))
 			{
 				$destination = 'users';
diff --git a/admin/index.php b/admin/index.php
index 0a6d60d404..d7f21504b8 100755
--- a/admin/index.php
+++ b/admin/index.php
@@ -36,7 +36,6 @@
 	// This func called by the includes to dump a row header
 	function section_start($appname='',$icon='')
 	{
-		$GLOBALS['admin_tpl']->set_var('icon_backcolor',$GLOBALS['phpgw_info']['theme']['row_off']);
 		$GLOBALS['admin_tpl']->set_var('link_backcolor',$GLOBALS['phpgw_info']['theme']['row_off']);
 		$GLOBALS['admin_tpl']->set_var('app_name',$GLOBALS['phpgw_info']['apps'][$appname]['title']);
 		$GLOBALS['admin_tpl']->set_var('a_name',$appname);
diff --git a/admin/templates/default/groups.tpl b/admin/templates/default/groups.tpl
index 121f6af689..0cb105ebd7 100644
--- a/admin/templates/default/groups.tpl
+++ b/admin/templates/default/groups.tpl
@@ -9,7 +9,7 @@
  </table>
 
  <table border="0" width="45%" align="center">
-  <tr bgcolor="{th_bg}">
+  <tr class="th">
    <td>{sort_name}</td>
    <td>{header_edit}</td>
    <td>{header_delete}</td>
@@ -36,7 +36,7 @@
 <!-- END list -->
 
 <!-- BEGIN row -->
- <tr bgcolor="{tr_color}">
+ <tr class="{class}">
   <td>{group_name}</td>
   <td class="narrow_column">{edit_link}</td>
   <td class="narrow_column">{delete_link}</td>
diff --git a/admin/templates/default/index.tpl b/admin/templates/default/index.tpl
index 7896d9d6fc..66a2e8669a 100755
--- a/admin/templates/default/index.tpl
+++ b/admin/templates/default/index.tpl
@@ -6,14 +6,14 @@
 <!-- END list -->
 
 <!-- BEGIN app_row -->
- <tr bgcolor="{icon_backcolor}">
+ <tr class="row_off">
   <td class="narrow_column" valign="middle"><img src="{app_icon}" alt="[ {app_name} ]"> <a name="{a_name}"></a></td>
   <td width="95%" valign="middle"><strong>&nbsp;&nbsp;{app_name}</strong></td>
  </tr>
 <!-- END app_row -->
 
 <!-- BEGIN app_row_noicon -->
- <tr bgcolor="{icon_backcolor}">
+ <tr class="row_off">
   <td colspan="2" width="95%" valign="middle"><strong>&nbsp;&nbsp;{app_name}</strong> <a name="{a_name}"></a></td>
  </tr>
 <!-- END app_row_noicon -->
diff --git a/admin/templates/default/menurow.tpl b/admin/templates/default/menurow.tpl
index faef389cad..c0ddd8282e 100644
--- a/admin/templates/default/menurow.tpl
+++ b/admin/templates/default/menurow.tpl
@@ -1,6 +1,6 @@
 <!-- BEGIN menu_links -->
 				<table border="0" width="100%">
-					<tr bgcolor="{th_bg}">
+					<tr class="th">
 						<td>&nbsp;</td>
 					</tr>
   					{all_rows}
@@ -13,7 +13,7 @@
 				</table>
 <!-- END menu_links -->
 <!-- BEGIN link_row -->
-					<tr bgcolor="{tr_color}">
+					<tr class="{class}">
 						<td>&nbsp;&nbsp;<a href="{row_link}">{row_text}</a></td>
 					</tr>
 <!-- END link_row -->
diff --git a/admin/templates/idots/index.tpl b/admin/templates/idots/index.tpl
index 09ef803a21..552839f2d0 100644
--- a/admin/templates/idots/index.tpl
+++ b/admin/templates/idots/index.tpl
@@ -26,14 +26,14 @@
 <!-- END list -->
 
 <!-- BEGIN app_row -->
- <tr height="60" bgcolor="{icon_backcolor}">
+ <tr height="60" class="row_off">
   <td width="5%" align="center" valign="middle"><img src="{app_icon}" alt="[ {app_name} ]"> <a name="{a_name}"></a></td>
   <td width="95%" valign="middle"><strong>&nbsp;&nbsp;{app_name}</strong></td>
  </tr>
 <!-- END app_row -->
 
 <!-- BEGIN app_row_noicon -->
- <tr bgcolor="{icon_backcolor}">
+ <tr class="row_off">
   <td colspan="2" width="95%" valign="middle"><strong>&nbsp;&nbsp;{app_name}</strong> <a name="{a_name}"></a></td>
  </tr>
 <!-- END app_row_noicon -->