diff --git a/includes/theme.inc b/includes/theme.inc
index 2a91b08d847874d151a2777959d6166f14537194..d46b31a06d8a0408db2e09b15c96a4cce48855c5 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -702,8 +702,8 @@ function theme_table($header, $rows, $attributes = NULL) {
         $cells = $row;
       }
 
-      // Add light/dark class
-      $class = ($number % 2 == 1) ? 'light': 'dark';
+      // Add odd/even class
+      $class = ($number % 2 == 1) ? 'even': 'odd';
       if (isset($attributes['class'])) {
         $attributes['class'] .= ' '. $class;
       }
diff --git a/misc/drupal.css b/misc/drupal.css
index 838300c1c91f1abd8aad7b37e88117ceac9aa477..41db2666750caa92b34ce42ed9c6b9affeea4973 100644
--- a/misc/drupal.css
+++ b/misc/drupal.css
@@ -30,11 +30,11 @@ th {
 th.active img {
   display: inline;
 }
-tr.dark, tr.light {
+tr.even, tr.odd {
   background-color: #eee;
   border-bottom: 1px solid #ccc;
 }
-tr.dark, tr.light {
+tr.even, tr.odd {
   padding: 0.1em 0.6em;
 }
 td.active {
@@ -134,7 +134,7 @@ br.clear {
   margin-top: 1em;
   margin-bottom: 1em;
 }
-tr.light .form-item, tr.dark .form-item {
+tr.odd .form-item, tr.even .form-item {
   margin-top: 0;
   margin-bottom: 0;
   white-space: nowrap;
diff --git a/misc/print.css b/misc/print.css
index c70280d8896d9e49d187b9905b1050a2284f6a49..6b1e57218d6dee228bd00dabd0f337174468df00 100644
--- a/misc/print.css
+++ b/misc/print.css
@@ -9,10 +9,10 @@ th {
   color: #006;
   border-bottom: 1px solid #ccc;
 }
-tr.dark {
+tr.odd {
   background-color: #ddd;
 }
-tr.light {
+tr.even {
   background-color: #fff;
 }
 td {
diff --git a/themes/bluemarine/style.css b/themes/bluemarine/style.css
index 4f6e637d6c8afea475937c7b2c7636437f2ffaa0..557ac161ea7785cc1dc00327ce6560cb1fb8aed1 100644
--- a/themes/bluemarine/style.css
+++ b/themes/bluemarine/style.css
@@ -10,7 +10,7 @@ body {
   background-color: #fff;
   font: 76% Verdana, Arial, Helvetica, sans-serif;
 }
-tr.dark td, tr.light td {
+tr.odd td, tr.even td {
   padding: 0.3em;
 }
 h1, h2, h3, h4, h5, h6 {
diff --git a/themes/pushbutton/style.css b/themes/pushbutton/style.css
index aef735a27cc4685376c8ec1b96d7aba14dff4607..6a27275087d85cd785ba9033f73928559c634530 100644
--- a/themes/pushbutton/style.css
+++ b/themes/pushbutton/style.css
@@ -24,7 +24,7 @@ img {
   display: block;
   border: 0;
 }
-tr.dark td, tr.light td {
+tr.odd td, tr.even td {
   padding: 0.3em;
 }
 a:link {
@@ -509,7 +509,7 @@ table#footer-menu {
 #tracker th img {
   float: right;
 }
-#tracker tr.light, #tracker tr.dark {
+#tracker tr.even, #tracker tr.odd {
   background-color: #fff;
 }
 #tracker td {
@@ -539,10 +539,10 @@ table#footer-menu {
 #forum table tr th img  {
   margin: 0;
 }
-#forum tr.dark {
+#forum tr.odd {
   background: #e0edfb;
 }
-#forum tr.light {
+#forum tr.even {
   background: #fff;
 }
 #forum td {