diff --git a/includes/theme.inc b/includes/theme.inc
index 9bd7062..281b67b 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -1709,7 +1709,7 @@ function theme_table($variables) {
   if (count($rows)) {
     $output .= "<tbody>\n";
     $flip = array('even' => 'odd', 'odd' => 'even');
-    $class = 'even';
+    $class = 'odd';
     foreach ($rows as $number => $row) {
       $attributes = array();
 
@@ -1730,8 +1730,8 @@ function theme_table($variables) {
       if (count($cells)) {
         // Add odd/even class
         if (empty($row['no_striping'])) {
-          $class = $flip[$class];
           $attributes['class'][] = $class;
+          $class = $flip[$class];
         }
 
         // Build row
@@ -2057,7 +2057,7 @@ function template_preprocess(&$variables, $hook) {
   // Track run count for each hook to provide zebra striping.
   // See "template_preprocess_block()" which provides the same feature specific to blocks.
   $count[$hook] = isset($count[$hook]) && is_int($count[$hook]) ? $count[$hook] : 1;
-  $variables['zebra'] = ($count[$hook] % 2) ? 'odd' : 'even';
+  $variables['zebra'] = ($count[$hook] % 2) ? 'even' : 'odd';
   $variables['id'] = $count[$hook]++;
 
   // Tell all templates where they are located.
diff --git a/modules/block/block-admin-display-form.tpl.php b/modules/block/block-admin-display-form.tpl.php
index 94b6104..b1e1c14 100644
--- a/modules/block/block-admin-display-form.tpl.php
+++ b/modules/block/block-admin-display-form.tpl.php
@@ -51,7 +51,7 @@
         <td colspan="5"><em><?php print t('No blocks in this region'); ?></em></td>
       </tr>
       <?php foreach ($block_listing[$region] as $delta => $data): ?>
-      <tr class="draggable <?php print $row % 2 == 0 ? 'odd' : 'even'; ?><?php print $data->row_class ? ' ' . $data->row_class : ''; ?>">
+      <tr class="draggable <?php print ($row % 2) ? 'even' : 'odd'; ?><?php print $data->row_class ? ' ' . $data->row_class : ''; ?>">
         <td class="block"><?php print $data->block_title; ?></td>
         <td><?php print $data->region_select; ?></td>
         <td><?php print $data->weight_select; ?></td>
diff --git a/modules/block/block.module b/modules/block/block.module
index c5e229b..80ca1d7 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -933,7 +933,7 @@ function template_preprocess_block(&$variables) {
     $block_counter[$variables['block']->region] = 1;
   }
   // Same with zebra striping.
-  $variables['block_zebra'] = ($block_counter[$variables['block']->region] % 2) ? 'odd' : 'even';
+  $variables['block_zebra'] = ($block_counter[$variables['block']->region] % 2) ? 'even' : 'odd';
   $variables['block_id'] = $block_counter[$variables['block']->region]++;
 
   // Create the $content variable that templates expect.
diff --git a/modules/field/field.module b/modules/field/field.module
index 163f448..44a0fd1 100644
--- a/modules/field/field.module
+++ b/modules/field/field.module
@@ -1160,7 +1160,7 @@ function theme_field($variables) {
   // Render the items.
   $output .= '<div class="field-items"' . $variables['content_attributes'] . '>';
   foreach ($variables['items'] as $delta => $item) {
-    $classes = 'field-item ' . ($delta % 2 ? 'odd' : 'even');
+    $classes = 'field-item ' . (($delta % 2) ? 'even' : 'odd');
     $output .= '<div class="' . $classes . '"' . $variables['item_attributes'][$delta] . '>' . drupal_render($item) . '</div>';
   }
   $output .= '</div>';
diff --git a/modules/field/theme/field.tpl.php b/modules/field/theme/field.tpl.php
index e4cd85c..7a92be7 100644
--- a/modules/field/theme/field.tpl.php
+++ b/modules/field/theme/field.tpl.php
@@ -54,7 +54,7 @@ HTML comment.
   <?php endif; ?>
   <div class="field-items"<?php print $content_attributes; ?>>
     <?php foreach ($items as $delta => $item) : ?>
-      <div class="field-item <?php print $delta % 2 ? 'odd' : 'even'; ?>"<?php print $item_attributes[$delta]; ?>><?php print render($item); ?></div>
+      <div class="field-item <?php print ($delta % 2) ? 'even' : 'odd'; ?>"<?php print $item_attributes[$delta]; ?>><?php print render($item); ?></div>
     <?php endforeach; ?>
   </div>
 </div>
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index c58b5c9..3646902 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -1057,7 +1057,7 @@ function template_preprocess_forum_list(&$variables) {
     $variables['forums'][$id]->link = url("forum/$forum->tid");
     $variables['forums'][$id]->name = check_plain($forum->name);
     $variables['forums'][$id]->is_container = !empty($forum->container);
-    $variables['forums'][$id]->zebra = $row % 2 == 0 ? 'odd' : 'even';
+    $variables['forums'][$id]->zebra = ($row % 2) ? 'even' : 'odd';
     $row++;
 
     $variables['forums'][$id]->new_text = '';
@@ -1107,7 +1107,7 @@ function template_preprocess_forum_topic_list(&$variables) {
     $row = 0;
     foreach ($variables['topics'] as $id => $topic) {
       $variables['topics'][$id]->icon = theme('forum_icon', array('new_posts' => $topic->new, 'num_posts' => $topic->comment_count, 'comment_mode' => $topic->comment_mode, 'sticky' => $topic->sticky, 'first_new' => $topic->first_new));
-      $variables['topics'][$id]->zebra = $row % 2 == 0 ? 'odd' : 'even';
+      $variables['topics'][$id]->zebra = ($row % 2) ? 'even' : 'odd';
       $row++;
 
       // We keep the actual tid in forum table, if it's different from the