diff --git a/ChangeLog b/ChangeLog
index 3720d3f91..e29907384 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ $Source$
       thanks to Matt "Cyber Dog" LaPlante
     * libraries/display_import.lib.php: missing '/' for closing div tag
     * libraries/display_export.lib.php: no name attribute for sup tag
+    * server_engines.php: revised (style, code, xhtml output)
 
 2005-12-05 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * libraries/common.lib.php: added PMA_array_merge_recursive()
diff --git a/server_engines.php b/server_engines.php
index fac7d17b1..1bb5882fe 100644
--- a/server_engines.php
+++ b/server_engines.php
@@ -1,7 +1,13 @@
 <?php
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
+/**
+ * display list of server enignes and additonal information about them
+ */
 
+/**
+ * requirements
+ */
 require_once('./libraries/common.lib.php');
 
 /**
@@ -16,6 +22,13 @@ require('./libraries/storage_engines.lib.php');
  */
 require('./libraries/server_links.inc.php');
 
+/**
+ * defines
+ */
+define('PMA_ENGINE_DETAILS_TYPE_PLAINTEXT', 0);
+define('PMA_ENGINE_DETAILS_TYPE_SIZE',      1);
+define('PMA_ENGINE_DETAILS_TYPE_NUMERIC',   2); //Has no effect yet...
+define('PMA_ENGINE_DETAILS_TYPE_BOOLEAN',   3); // 'ON' or 'OFF'
 
 /**
  * Function for displaying the table of an engine's parameters
@@ -24,23 +37,9 @@ require('./libraries/server_links.inc.php');
  *                  The array elements should have the following format:
  *                      $variable => array('title' => $title, 'desc' => $description);
  * @param   string  Prefix for the SHOW VARIABLES query.
- * @param   int     The indentation level
- *
- * @global  array   The global phpMyAdmin configuration.
- *
  * @return  string  The table that was generated based on the given information.
  */
-define('PMA_ENGINE_DETAILS_TYPE_PLAINTEXT', 0);
-define('PMA_ENGINE_DETAILS_TYPE_SIZE',      1);
-define('PMA_ENGINE_DETAILS_TYPE_NUMERIC',   2); //Has no effect yet...
-define('PMA_ENGINE_DETAILS_TYPE_BOOLEAN',   3); // 'ON' or 'OFF'
-function PMA_generateEngineDetails($variables, $like = NULL, $indent = 0) {
-    global $cfg;
-
-    $spaces = '';
-    for ($i = 0; $i < $indent; $i++) {
-        $spaces .= '    ';
-    }
+function PMA_generateEngineDetails($variables, $like = null) {
 
     /**
      * Get the variables!
@@ -54,39 +53,44 @@ function PMA_generateEngineDetails($variables, $like = NULL, $indent = 0) {
         $res = PMA_DBI_query($sql_query);
         $mysql_vars = array();
         while ($row = PMA_DBI_fetch_row($res)) {
-            if (isset($variables[$row[0]])) $mysql_vars[$row[0]] = $row[1];
+            if (isset($variables[$row[0]])) {
+                $mysql_vars[$row[0]] = $row[1];
+            }
         }
         PMA_DBI_free_result($res);
         unset($res, $row, $sql_query);
     }
 
-    if (empty($mysql_vars)) return $spaces . '<p>' . "\n"
-                                 . $spaces . '    ' . $GLOBALS['strNoDetailsForEngine'] . "\n"
-                                 . $spaces . '</p>' . "\n";
+    if (empty($mysql_vars)) {
+        return '<p>' . "\n"
+             . '    ' . $GLOBALS['strNoDetailsForEngine'] . "\n"
+             . '</p>' . "\n";
+    }
 
-    $dt_table          = $spaces . '<table>' . "\n";
-    $useBgcolorOne     = TRUE;
-    $has_content       = FALSE;
+    $dt_table       = '<table class="data">' . "\n";
+    $odd_row        = false;
+    $has_content    = false;
 
     foreach ($variables as $var => $details) {
-        if (!isset($mysql_vars[$var])) continue;
-
-        if (!isset($details['type'])) $details['type'] = PMA_ENGINE_DETAILS_TYPE_PLAINTEXT;
-        $is_num = $details['type'] == PMA_ENGINE_DETAILS_TYPE_SIZE || $details['type'] == PMA_ENGINE_DETAILS_TYPE_NUMERIC;
-
-        $bgcolor = $useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo'];
-
-        $dt_table     .= $spaces . '    <tr>' . "\n"
-                       . $spaces . '        <td bgcolor="' . $bgcolor . '">' . "\n";
-        if (!empty($variables[$var]['desc'])) {
-            $dt_table .= $spaces . '            ' . PMA_showHint($details['desc']) . "\n";
+        if (!isset($mysql_vars[$var])) {
+            continue;
         }
-        $dt_table     .= $spaces . '        </td>' . "\n"
-    	               . $spaces . '        <td bgcolor="' . $bgcolor . '">' . "\n"
-                       . $spaces . '            &nbsp;' . $details['title'] . '&nbsp;' . "\n"
-                       . $spaces . '        </td>' . "\n"
-                       . $spaces . '        <td bgcolor="' . $bgcolor . '"' . ($is_num ? ' align="right"' : '') . '>' . "\n"
-                       . $spaces . '            &nbsp;';
+
+        if (!isset($details['type'])) {
+            $details['type'] = PMA_ENGINE_DETAILS_TYPE_PLAINTEXT;
+        }
+        $is_num = $details['type'] == PMA_ENGINE_DETAILS_TYPE_SIZE
+            || $details['type'] == PMA_ENGINE_DETAILS_TYPE_NUMERIC;
+
+        $dt_table     .= '<tr class="' . ( $odd_row ? 'odd' : 'even' ) . '">' . "\n"
+                       . '    <td>' . "\n";
+        if (!empty($variables[$var]['desc'])) {
+            $dt_table .= '        ' . PMA_showHint($details['desc']) . "\n";
+        }
+        $dt_table     .= '    </td>' . "\n"
+    	               . '    <th>' . htmlspecialchars($details['title']) . "\n"
+                       . '    </th>' . "\n"
+                       . '    <td class="value">';
         switch ($details['type']) {
             case PMA_ENGINE_DETAILS_TYPE_SIZE:
                 $parsed_size = PMA_formatByteDown($mysql_vars[$var]);
@@ -96,14 +100,17 @@ function PMA_generateEngineDetails($variables, $like = NULL, $indent = 0) {
             default:
                 $dt_table .= htmlspecialchars($mysql_vars[$var]);
         }
-        $dt_table     .= '&nbsp;' . "\n"
-                      . $spaces . '        </td>' . "\n"
-                      . $spaces . '    </tr>' . "\n";
-        $useBgcolorOne = !$useBgcolorOne;
-        $has_content   = TRUE;
+        $dt_table     .= '</td>' . "\n"
+                      . '</tr>' . "\n";
+        $odd_row    = !$odd_row;
+        $has_content   = true;
     }
 
-    if (!$has_content) return '';
+    if (!$has_content) {
+        return '';
+    }
+
+    $dt_table       .= '</table>' . "\n";
 
     return $dt_table;
 }
@@ -112,14 +119,17 @@ function PMA_generateEngineDetails($variables, $like = NULL, $indent = 0) {
 /**
  * Did the user request information about a certain storage engine?
  */
-if (empty($engine) || empty($mysql_storage_engines[$engine])) {
+if ( empty($_REQUEST['engine'])
+  || empty($mysql_storage_engines[$_REQUEST['engine']]) ) {
 
     /**
      * Displays the sub-page heading
      */
     echo '<h2>' . "\n"
-       . ($cfg['MainPageIconic'] ? '<img class="icon" src="' . $pmaThemeImage . 'b_engine.png" width="16" height="16" alt="" />' : '' )
-       . '    ' . $strStorageEngines . "\n"
+       . ($GLOBALS['cfg']['MainPageIconic']
+            ? '<img class="icon" src="' . $pmaThemeImage . 'b_engine.png"'
+                .' width="16" height="16" alt="" />' : '' )
+       . "\n" . $strStorageEngines . "\n"
        . '</h2>' . "\n";
 
 
@@ -127,43 +137,41 @@ if (empty($engine) || empty($mysql_storage_engines[$engine])) {
      * Displays the table header
      */
     echo '<table>' . "\n"
-       . '    <thead>' . "\n"
-       . '        <tr>' . "\n"
-       . '            <th>' . "\n"
-       . '                ' . $strStorageEngine . "\n"
-       . '            </th>' . "\n";
+       . '<thead>' . "\n"
+       . '<tr><th>' . $strStorageEngine . '</th>' . "\n";
     if (PMA_MYSQL_INT_VERSION >= 40102) {
-        echo '            <th>' . "\n"
-           . '                ' . $strDescription . "\n"
-           . '            </th>' . "\n";
+        echo '    <th>' . $strDescription . '</th>' . "\n";
     }
-    echo '        </tr>' . "\n"
-       . '    </thead>' . "\n"
-       . '    <tbody>' . "\n";
+    echo '</tr>' . "\n"
+       . '</thead>' . "\n"
+       . '<tbody>' . "\n";
 
 
     /**
      * Listing the storage engines
      */
-    $useBgcolorOne = TRUE;
-    $common_url = './server_engines.php?' . PMA_generate_common_url() . '&amp;engine=';
+    $odd_row = true;
     foreach ($mysql_storage_engines as $engine => $details) {
-        echo '        <tr' . ($details['Support'] == 'NO' || $details['Support'] == 'DISABLED' ? ' class="disabled"' : '') . '>' . "\n"
-           . '            <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '">' . "\n"
-           . '                <a href="' . $common_url . $engine . '">' . "\n"
-           . '                    ' . htmlspecialchars($details['Engine']) . "\n"
-           . '                </a>' . "\n"
-           . '            </td>' . "\n";
+        echo '<tr class="'
+           . ($odd_row ? 'odd' : 'even')
+           . ($details['Support'] == 'NO' || $details['Support'] == 'DISABLED'
+                ? ' disabled'
+                : '')
+           . '">' . "\n"
+           . '    <td><a href="./server_engines.php'
+           . PMA_generate_common_url(array( 'engine' => $engine )) . '">' . "\n"
+           . '            ' . htmlspecialchars($details['Engine']) . "\n"
+           . '        </a>' . "\n"
+           . '    </td>' . "\n";
         if (PMA_MYSQL_INT_VERSION >= 40102) {
-            echo '            <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '">' . "\n"
-               . '                ' . htmlspecialchars($details['Comment']) . "\n"
-               . '            </td>' . "\n";
+            echo '    <td>' . htmlspecialchars($details['Comment']) . "\n"
+               . '    </td>' . "\n";
         }
-        echo '        </tr>' . "\n";
-        $useBgcolorOne = !$useBgcolorOne;
+        echo '</tr>' . "\n";
+        $odd_row = !$odd_row;
     }
-    unset($useBgcolorOne, $common_url, $engine, $details);
-    echo '    </tbody>' . "\n"
+    unset($odd_row, $engine, $details);
+    echo '</tbody>' . "\n"
        . '</table>' . "\n";
 
 } else {
@@ -172,51 +180,57 @@ if (empty($engine) || empty($mysql_storage_engines[$engine])) {
      * Displays details about a given Storage Engine
      */
 
-    $engine_plugin = PMA_StorageEngine::getEngine($engine);
+    $engine_plugin = PMA_StorageEngine::getEngine($_REQUEST['engine']);
     echo '<h2>' . "\n"
-       . ($cfg['MainPageIconic'] ? '<img src="' . $pmaThemeImage . 'b_engine.png" width="16" height="16" border="0" hspace="2" align="middle" />' : '' )
+       . ($GLOBALS['cfg']['MainPageIconic']
+            ? '<img class="icon" src="' . $pmaThemeImage . 'b_engine.png"'
+                .' width="16" height="16" alt="" />' : '' )
        . '    ' . htmlspecialchars($engine_plugin->getTitle()) . "\n"
        . '</h2>' . "\n\n";
     if (PMA_MYSQL_INT_VERSION >= 40102) {
         echo '<p>' . "\n"
-           . '    <i>' . "\n"
+           . '    <em>' . "\n"
            . '        ' . htmlspecialchars($engine_plugin->getComment()) . "\n"
-           . '    </i>' . "\n"
+           . '    </em>' . "\n"
            . '</p>' . "\n\n";
     }
     $infoPages = $engine_plugin->getInfoPages();
     if (!empty($infoPages) && is_array($infoPages)) {
-        $common_url = './server_engines.php?' . PMA_generate_common_url() . '&amp;engine=' . urlencode($engine);
         echo '<p>' . "\n"
-           . '    <b>[</b>' . "\n";
-        if (empty($page)) {
-            echo '    <b>' . $strServerTabVariables . '</b>' . "\n";
+           . '    <strong>[</strong>' . "\n";
+        if (empty($_REQUEST['page'])) {
+            echo '    <strong>' . $strServerTabVariables . '</strong>' . "\n";
         } else {
-            echo '    <a href="' . $common_url . '">' . $strServerTabVariables . '</a>' . "\n";
+            echo '    <a href="./server_engines.php'
+                . PMA_generate_common_url(array( 'engine' => $engine )) . '">'
+                . $strServerTabVariables . '</a>' . "\n";
         }
         foreach ($infoPages as $current => $label) {
-            echo '    <b>|</b>' . "\n";
-            if (isset($page) && $page == $current) {
-                echo '    <b>' . $label . '</b>' . "\n";
+            echo '    <strong>|</strong>' . "\n";
+            if (isset($_REQUEST['page']) && $_REQUEST['page'] == $current) {
+                echo '    <strong>' . $label . '</strong>' . "\n";
             } else {
-                echo '    <a href="' . $common_url . '&amp;page=' . urlencode($current) . '">' . $label . '</a>' . "\n";
+                echo '    <a href="./server_engines.php'
+                    . PMA_generate_common_url(
+                        array( 'engine' => $engine, 'page' => $current ))
+                    . '">' . htmlspecialchars($label) . '</a>' . "\n";
             }
         }
         unset($current, $label);
-        echo '    <b>]</b>' . "\n"
+        echo '    <strong>]</strong>' . "\n"
            . '</p>' . "\n\n";
     }
     unset($infoPages, $page_output);
-	if (!empty($page)) {
-        $page_output = $engine_plugin->getPage($page);
+	if (!empty($_REQUEST['page'])) {
+        $page_output = $engine_plugin->getPage($_REQUEST['page']);
     }
     if (!empty($page_output)) {
         echo $page_output;
     } else {
-        echo '<p>' . "\n"
-           . '    ' . $engine_plugin->getSupportInformationMessage() . "\n"
+        echo '<p> ' . $engine_plugin->getSupportInformationMessage() . "\n"
            . '</p>' . "\n"
-           . PMA_generateEngineDetails($engine_plugin->getVariables(), $engine_plugin->getVariablesLikePattern());
+           . PMA_generateEngineDetails($engine_plugin->getVariables(),
+                $engine_plugin->getVariablesLikePattern());
     }
 }