diff --git a/admin/config.php b/admin/config.php
index 45e664f00d..9fe5a3cbdf 100644
--- a/admin/config.php
+++ b/admin/config.php
@@ -16,6 +16,7 @@
 		'noheader'   => True,
 		'nonavbar'   => True,
 		'currentapp' => "admin",
+		'enable_nextmatchs_class' => True
 	);
 	include('../header.inc.php');
 
@@ -25,6 +26,13 @@
 		'footer' => 'config_footer.tpl'
 	));
 
+	function nextcolor()
+	{
+		global $phpgw,$trcolor;
+		$trcolor = $phpgw->nextmatchs->alternate_row_color($tr_color);
+		echo $trcolor;
+	}
+
 	$c = CreateObject('phpgwapi.config',$appname);
 	$c->read_repository();
 
@@ -63,13 +71,11 @@
 
 	$t->set_var('title',lang('Site Configuration'));
 	$t->set_var('action_url',$phpgw->link('/admin/config.php'));
+	$t->set_var('th_bg',$phpgw_info["theme"]["th_bg"]);
+	$t->set_var('th_text',$phpgw_info["theme"]["th_text"]);
 	$t->pparse('out','header');
 
-	include(PHPGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP . 'config.inc.php');
-	if ($appname == 'admin')
-	{
-		include(PHPGW_SERVER_ROOT . SEP . 'preferences' . SEP . 'setup' . SEP . 'config.inc.php');
-	}
+	include(PHPGW_SERVER_ROOT . SEP . $appname . SEP . 'inc' . SEP . 'config.inc.php');
 
 	$t->pparse('out','footer');
 	$phpgw->common->phpgw_footer();
diff --git a/admin/templates/default/config_footer.tpl b/admin/templates/default/config_footer.tpl
index 5de5001727..c879076cc6 100644
--- a/admin/templates/default/config_footer.tpl
+++ b/admin/templates/default/config_footer.tpl
@@ -1,5 +1,5 @@
 <!-- BEGIN footer -->
-  <tr bgcolor="FFFFFF">
+  <tr bgcolor="{th_bg}">
     <td colspan="2">
 &nbsp;
     </td>
diff --git a/admin/templates/default/config_head.tpl b/admin/templates/default/config_head.tpl
index bcd2445b26..a30664540c 100644
--- a/admin/templates/default/config_head.tpl
+++ b/admin/templates/default/config_head.tpl
@@ -1,7 +1,7 @@
 <!-- BEGIN head -->
 <form method="POST" action="{action_url}">
 <table border="0" align="center">
-   <tr bgcolor="486591">
-    <td colspan="2"><font color="fefefe">&nbsp;<b>{title}</b></font></td>
+   <tr bgcolor="{th_bg}">
+    <td colspan="2"><font color="{th_text}">&nbsp;<b>{title}</b></font></td>
    </tr>
 <!-- END head -->