diff --git a/includes/path.inc b/includes/path.inc
index e2da7c29083b98880fd885fbd91ebe48c0fc2312..0202c4820d5e88b800e9b6ad4905dc4aee289a0e 100644
--- a/includes/path.inc
+++ b/includes/path.inc
@@ -1,4 +1,5 @@
-<?
+<?php
+// $Id$
 
 /**
  * @file
diff --git a/misc/drupal.css b/misc/drupal.css
index 680fb64604ae751c6484dc2cab74ca2034ef5f50..6484675c1bf2501185fc6643bfffc35174c194c7 100644
--- a/misc/drupal.css
+++ b/misc/drupal.css
@@ -459,6 +459,9 @@ img.screenshot {
   font-size: 0.85em;
   text-align: right;
 }
+table.watchdog-event th {
+  border-bottom: 1px solid #ccc;
+}
 tr.watchdog-user {
   background: #ffd;
 }
diff --git a/modules/watchdog.module b/modules/watchdog.module
index 4f19dce27bd47df1c1a03eac65c4805492d17dc4..3c66a75646244c7c9e6909f050fea63c8618f0e8 100644
--- a/modules/watchdog.module
+++ b/modules/watchdog.module
@@ -156,20 +156,27 @@ function watchdog_event($id) {
   $output = '';
   $result = db_query('SELECT w.*, u.name, u.uid FROM {watchdog} w INNER JOIN {users} u ON w.uid = u.uid WHERE w.wid = %d', $id);
   if ($watchdog = db_fetch_object($result)) {
-    $output .= '<table border="1" cellpadding="2" cellspacing="2">';
-    $output .= ' <tr><th>'. t('Type') .'</th><td>' . t($watchdog->type) . '</td></tr>';
-    $output .= ' <tr><th>'. t('Date') .'</th><td>'. format_date($watchdog->timestamp, 'large') .'</td></tr>';
-    $output .= ' <tr><th>'. t('User') .'</th><td>'. theme('username', $watchdog) .'</td></tr>';
-    $output .= ' <tr><th>'. t('Location') ."</th><td>". l($watchdog->location, $watchdog->location) ."</td></tr>";
-    $output .= ' <tr><th>'. t('Referrer') ."</th><td>". l($watchdog->referer, $watchdog->referer) ."</td></tr>";
-    $output .= ' <tr><th>'. t('Message') ."</th><td>$watchdog->message</td></tr>";
-    $output .= ' <tr><th>'. t('Severity') .'</th><td>'. $severity[$watchdog->severity] .'</td></tr>';
-    $output .= ' <tr><th>'. t('Hostname') ."</th><td>$watchdog->hostname</td></tr>";
-    $output .= '</table>';
+    $header = array(t('Type'), t('Date'), t('User'), t('Location'), t('Referrer'), t('Message'), t('Severity'), t('Hostname'));
+    $data = array(t($watchdog->type), format_date($watchdog->timestamp, 'large'), theme('username', $watchdog), l($watchdog->location, $watchdog->location), l($watchdog->referer, $watchdog->referer), $watchdog->message, $severity[$watchdog->severity], $watchdog->hostname);
+    $output = theme('watchdog_event', $header, $data);
   }
   return $output;
 }
 
+function theme_watchdog_event($header, $data) {
+  $output = '';
+  $output .= '<table class="watchdog-event">';
+
+  $n = count($header);
+  for ($i = 0; $i < $n; $i++) {
+    $output .= '<tr class="' . ($i % 2 == 0 ? 'even' : 'odd') . '"><th>' . $header[$i] . '</th><td>' . $data[$i] . '</td></tr>';
+  }
+
+  $output .= '</table>';
+
+  return $output;
+}
+
 function _watchdog_get_message_types() {
   $types = array();
 
diff --git a/modules/watchdog/watchdog.module b/modules/watchdog/watchdog.module
index 4f19dce27bd47df1c1a03eac65c4805492d17dc4..3c66a75646244c7c9e6909f050fea63c8618f0e8 100644
--- a/modules/watchdog/watchdog.module
+++ b/modules/watchdog/watchdog.module
@@ -156,20 +156,27 @@ function watchdog_event($id) {
   $output = '';
   $result = db_query('SELECT w.*, u.name, u.uid FROM {watchdog} w INNER JOIN {users} u ON w.uid = u.uid WHERE w.wid = %d', $id);
   if ($watchdog = db_fetch_object($result)) {
-    $output .= '<table border="1" cellpadding="2" cellspacing="2">';
-    $output .= ' <tr><th>'. t('Type') .'</th><td>' . t($watchdog->type) . '</td></tr>';
-    $output .= ' <tr><th>'. t('Date') .'</th><td>'. format_date($watchdog->timestamp, 'large') .'</td></tr>';
-    $output .= ' <tr><th>'. t('User') .'</th><td>'. theme('username', $watchdog) .'</td></tr>';
-    $output .= ' <tr><th>'. t('Location') ."</th><td>". l($watchdog->location, $watchdog->location) ."</td></tr>";
-    $output .= ' <tr><th>'. t('Referrer') ."</th><td>". l($watchdog->referer, $watchdog->referer) ."</td></tr>";
-    $output .= ' <tr><th>'. t('Message') ."</th><td>$watchdog->message</td></tr>";
-    $output .= ' <tr><th>'. t('Severity') .'</th><td>'. $severity[$watchdog->severity] .'</td></tr>';
-    $output .= ' <tr><th>'. t('Hostname') ."</th><td>$watchdog->hostname</td></tr>";
-    $output .= '</table>';
+    $header = array(t('Type'), t('Date'), t('User'), t('Location'), t('Referrer'), t('Message'), t('Severity'), t('Hostname'));
+    $data = array(t($watchdog->type), format_date($watchdog->timestamp, 'large'), theme('username', $watchdog), l($watchdog->location, $watchdog->location), l($watchdog->referer, $watchdog->referer), $watchdog->message, $severity[$watchdog->severity], $watchdog->hostname);
+    $output = theme('watchdog_event', $header, $data);
   }
   return $output;
 }
 
+function theme_watchdog_event($header, $data) {
+  $output = '';
+  $output .= '<table class="watchdog-event">';
+
+  $n = count($header);
+  for ($i = 0; $i < $n; $i++) {
+    $output .= '<tr class="' . ($i % 2 == 0 ? 'even' : 'odd') . '"><th>' . $header[$i] . '</th><td>' . $data[$i] . '</td></tr>';
+  }
+
+  $output .= '</table>';
+
+  return $output;
+}
+
 function _watchdog_get_message_types() {
   $types = array();