diff --git a/ChangeLog b/ChangeLog
index b25e2b2b1..cbfd42922 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@ $Source$
     * libraries/function.js: tuned PMA_merkRowsInit():
       every table with class data now has mark and hover effect
     * css/phpmyadmin.css.php: nowrap for IE and pre for the rest
+    * css/phpmyadmin.css.php, server_status.php: css cleanup
 
 2005-10-19 Alexander M. Turek  <me@derrabus.de>
     * lang/*.inc.php, libraries/mysql_charsets.lib.php: Correct description
diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php
index b76606694..eb9a08321 100644
--- a/css/phpmyadmin.css.php
+++ b/css/phpmyadmin.css.php
@@ -30,22 +30,6 @@ caption {
     font-size: <?php echo $font_size; ?>;
 }
 
-table .value {
-    text-align: right;
-    white-space: nowrap;
-    font-family: "Courier New", Courier, monospace;
-}
-/* IE doesnt handles 'pre' right */
-table [class=value] {
-    white-space: pre;
-}
-
-table .unit,
-table .name {
-    text-align: left;
-    font-weight: normal;
-}
-
 #tableuserrights td,
 #tablespecificuserrights td,
 #tabledatabases td {
@@ -217,6 +201,7 @@ fieldset div[class=formelement] select {
     float: left;
 }
 
+
 /* Calendar */
 table.calendar      { width: 100%; }
 table.calendar td   { text-align: center; }
@@ -238,6 +223,7 @@ img.calendar { border: none; }
 form.clock   { text-align: center; }
 /* end Calendar */
 
+
 /* Options, eg. on import page */
 fieldset {
     background-color: <?php echo $GLOBALS['cfg']['BgcolorOne']; ?>;
@@ -260,6 +246,7 @@ textarea { overflow: auto; }
 
 .nospace { margin: 0; padding: 0; }
 
+
 /* topmenu */
 
 /* Gecko bug */
@@ -357,33 +344,56 @@ span.tab, span.tabcaution {
 <?php } ?>
 /* end topmenu */
 
+
+/* data tables */
+table.data caption,
+table.data th,
+table.data td {
+    padding: 0.1em 0.5em 0.1em 0.5em;
+    margin: 0;
+    margin: 0.1em;
+    vertical-align: top;
+}
+
 /* odd table rows 1,3,5,7,... */
+table tr.odd th,
 table tr.odd {
     background-color: <?php echo $GLOBALS['cfg']['BgcolorOne']; ?>;
+    text-align: left;
 }
 
 /* even table rows 2,4,6,8,... */
+table tr.even th,
 table tr.even {
     background-color: <?php echo $GLOBALS['cfg']['BgcolorTwo']; ?>;
+    text-align: left;
 }
 
-/* even table rows 2,4,6,8,... */
+/* marked tbale rows */
+table tr.marked th,
 table tr.marked {
     background-color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>;
 }
 
-/* even table rows 2,4,6,8,... */
-table.data tbody tr:hover,
+/* hovered table rows */
+table tr.odd:hover,
+table tr.even:hover,
+table tr.odd:hover th,
+table tr.even:hover th,
+table tr.hover th,
 table tr.hover {
     background-color: <?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>;
 }
 
-table tr.even th,
-table tr.odd th {
-    background-color: inherit;
-    color: inherit;
+table .value {
+    text-align: right;
+    white-space: nowrap;
+    font-family: "Courier New", Courier, monospace;
+}
+/* IE doesnt handles 'pre' right */
+table [class=value] {
+    white-space: pre;
 }
-
 
 .value .attention {
     color: red;
@@ -400,18 +410,6 @@ div#serverstatus table caption a.top {
     float: right;
 }
 
-table.data caption,
-table.data th,
-table.data td,
-div#serverstatus table caption,
-div#serverstatus table th,
-div#serverstatus table td {
-    padding: 0.1em 0.5em 0.1em 0.5em;
-    margin: 0;
-    margin: 0.1em;
-    vertical-align: top;
-}
-
 div#serverstatus div#serverstatusqueriesdetails table,
 div#serverstatus table#serverstatustraffic,
 div#serverstatus table#serverstatusconnections {
@@ -422,11 +420,14 @@ div#serverstatus table#serverstatusconnections {
 .clearfloat {
     clear: both;
 }
-
-div#serverstatus table.statuslist .name {
+div#serverstatussection table {
+    width: 100%;
+    margin-bottom: 1em;
+}
+div#serverstatussection table .name {
     width: 18em;
 }
-div#serverstatus table.statuslist .value {
+div#serverstatussection table .value {
     width: 6em;
 }
 
@@ -446,13 +447,9 @@ div#serverstatus table tbody td.descr a:after,
 div#serverstatus table .tblFooters a:after {
     content: ']';
 }
-
-div#serverstatus table.statuslist {
-    width: 100%;
-    margin-bottom: 1em;
-}
 /* end serverstatus */
 
+
 img.lightbulb { 
     cursor: pointer; 
 }
diff --git a/server_status.php b/server_status.php
index 053edd606..3e3748928 100644
--- a/server_status.php
+++ b/server_status.php
@@ -363,7 +363,7 @@ foreach ( $sections as $section_name => $section ) {
 
 <h3><?php echo $strServerTrafficNotes; ?></h3>
 
-<table id="serverstatustraffic">
+<table id="serverstatustraffic" class="data">
 <thead>
 <tr>
     <th colspan="2"><?php echo $strTraffic; ?></th>
@@ -408,7 +408,7 @@ foreach ( $sections as $section_name => $section ) {
 </tbody>
 </table>
 
-<table id="serverstatusconnections">
+<table id="serverstatusconnections" class="data">
 <thead>
 <tr>
     <th colspan="2"><?php echo $strConnections; ?></th>
@@ -478,7 +478,7 @@ foreach ( $sections as $section_name => $section ) {
             0, $GLOBALS['number_decimal_separator'],
             $GLOBALS['number_thousands_separator'] ) ); ?></h3>
 
-<table id="serverstatusqueriessummary">
+<table id="serverstatusqueriessummary" class="data">
 <thead>
 <tr>
     <th><?php echo $strTotalUC; ?></th>
@@ -524,7 +524,7 @@ foreach ( $sections['com']['vars'] as $name => $value ) {
             echo '    </table>' . "\n";
         }
 ?>
-    <table id="serverstatusqueriesdetails<?php echo $current_table; ?>">
+    <table id="serverstatusqueriesdetails<?php echo $current_table; ?>" class="data">
     <col class="namecol" />
     <col class="valuecol" span="3" />
     <thead>
@@ -578,7 +578,7 @@ unset(
 foreach ( $sections as $section_name => $section ) {
     if ( ! empty( $section['vars'] ) ) {
 ?>
-    <table class="statuslist" id="serverstatussection<?php echo $section_name; ?>">
+    <table class="data" id="serverstatussection<?php echo $section_name; ?>">
     <caption class="tblHeaders">
         <a class="top"
            href="<?php echo $_SERVER['PHP_SELF'] . '?' .