diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index 54453012..5768e1cf 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -134,9 +134,11 @@ form .g-error {
 }
 
 .g-even-row {
+  background-color: #fff;
 }
 
 .g-odd-row {
+  background-color: #eee;
 }
 
 /** *******************************************************************
diff --git a/modules/comment/views/admin_block_recent_comments.html.php b/modules/comment/views/admin_block_recent_comments.html.php
index 2afa5bf8..ca0d1c0b 100644
--- a/modules/comment/views/admin_block_recent_comments.html.php
+++ b/modules/comment/views/admin_block_recent_comments.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <ul>
   <? foreach ($comments as $i => $comment): ?>
-  <li class="<?= ($i % 2 == 0) ? "gEvenRow" : "gOddRow" ?>">
+  <li class="<?= ($i % 2 == 0) ? "g-even-row" : "g-odd-row" ?>">
     <img src="<?= $comment->author()->avatar_url(32, $theme->url("images/avatar.jpg", true)) ?>"
          class="gAvatar"
          alt="<?= html::clean_attribute($comment->author_name()) ?>"
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index ec5ad7b2..82de378c 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -103,7 +103,7 @@
       </th>
     </tr>
     <? foreach ($comments as $i => $comment): ?>
-    <tr id="gComment-<?= $comment->id ?>" class="<?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
+    <tr id="gComment-<?= $comment->id ?>" class="<?= ($i % 2 == 0) ? "g-odd-row" : "g-even-row" ?>">
       <td>
         <a href="#">
           <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 7d3cf362..5fd6a390 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -1,12 +1,12 @@
 modules/akismet/views/admin_akismet.html.php                 16  DIRTY    $form
 modules/akismet/views/admin_akismet_stats.html.php           9   DIRTY_ATTR $api_key
 modules/akismet/views/admin_akismet_stats.html.php           9   DIRTY_ATTR urlencode($blog_url)
-modules/comment/views/admin_block_recent_comments.html.php   4   DIRTY_ATTR ($i%2==0)?"gEvenRow":"gOddRow"
+modules/comment/views/admin_block_recent_comments.html.php   4   DIRTY_ATTR ($i%2==0)?"g-even-row":"g-odd-row"
 modules/comment/views/admin_block_recent_comments.html.php   5   DIRTY_ATTR $comment->author()->avatar_url(32,$theme->url(,true))
 modules/comment/views/admin_block_recent_comments.html.php   10  DIRTY    gallery::date_time($comment->created)
 modules/comment/views/admin_comments.html.php                42  DIRTY    $menu
 modules/comment/views/admin_comments.html.php                106 DIRTY_ATTR $comment->id
-modules/comment/views/admin_comments.html.php                106 DIRTY_ATTR ($i%2==0)?"gOddRow":"gEvenRow"
+modules/comment/views/admin_comments.html.php                106 DIRTY_ATTR ($i%2==0)?"g-odd-row":"g-even-row"
 modules/comment/views/admin_comments.html.php                109 DIRTY_ATTR $comment->author()->avatar_url(40,$theme->url(,true))
 modules/comment/views/admin_comments.html.php                122 DIRTY_JS $item->url()
 modules/comment/views/admin_comments.html.php                124 DIRTY_ATTR $item->thumb_url()
@@ -72,18 +72,18 @@ modules/gallery/views/admin_languages.html.php               28  DIRTY    form::
 modules/gallery/views/admin_languages.html.php               29  DIRTY    $display_name
 modules/gallery/views/admin_languages.html.php               31  DIRTY    form::radio("default_locale",$code,($default_locale==$code),((isset($installed_locales[$code]))?'':'disabled="disabled"'))
 modules/gallery/views/admin_languages.html.php               102 DIRTY    $share_translations_form
-modules/gallery/views/admin_maintenance.html.php             24  DIRTY_ATTR ($i%2==0)?"gOddRow":"gEvenRow"
+modules/gallery/views/admin_maintenance.html.php             24  DIRTY_ATTR ($i%2==0)?"g-odd-row":"g-even-row"
 modules/gallery/views/admin_maintenance.html.php             24  DIRTY_ATTR log::severity_class($task->severity)
 modules/gallery/views/admin_maintenance.html.php             25  DIRTY_ATTR log::severity_class($task->severity)
 modules/gallery/views/admin_maintenance.html.php             26  DIRTY    $task->name
 modules/gallery/views/admin_maintenance.html.php             29  DIRTY    $task->description
-modules/gallery/views/admin_maintenance.html.php             72  DIRTY_ATTR ($i%2==0)?"gOddRow":"gEvenRow"
+modules/gallery/views/admin_maintenance.html.php             72  DIRTY_ATTR ($i%2==0)?"g-odd-row":"g-even-row"
 modules/gallery/views/admin_maintenance.html.php             72  DIRTY_ATTR $task->state=="stalled"?"gWarning":""
 modules/gallery/views/admin_maintenance.html.php             73  DIRTY_ATTR $task->state=="stalled"?"gWarning":""
 modules/gallery/views/admin_maintenance.html.php             74  DIRTY    gallery::date_time($task->updated)
 modules/gallery/views/admin_maintenance.html.php             77  DIRTY    $task->name
 modules/gallery/views/admin_maintenance.html.php             92  DIRTY    $task->status
-modules/gallery/views/admin_maintenance.html.php             145 DIRTY_ATTR ($i%2==0)?"gOddRow":"gEvenRow"
+modules/gallery/views/admin_maintenance.html.php             145 DIRTY_ATTR ($i%2==0)?"g-odd-row":"g-even-row"
 modules/gallery/views/admin_maintenance.html.php             145 DIRTY_ATTR $task->state=="success"?"gSuccess":"gError"
 modules/gallery/views/admin_maintenance.html.php             146 DIRTY_ATTR $task->state=="success"?"gSuccess":"gError"
 modules/gallery/views/admin_maintenance.html.php             147 DIRTY    gallery::date_time($task->updated)
@@ -93,7 +93,7 @@ modules/gallery/views/admin_maintenance_show_log.html.php    8   DIRTY_JS url::s
 modules/gallery/views/admin_maintenance_show_log.html.php    13  DIRTY    $task->name
 modules/gallery/views/admin_maintenance_task.html.php        55  DIRTY    $task->name
 modules/gallery/views/admin_modules.html.php                 9   DIRTY    access::csrf_form_field()
-modules/gallery/views/admin_modules.html.php                 19  DIRTY_ATTR ($i%2==0)?"gOddRow":"gEvenRow"
+modules/gallery/views/admin_modules.html.php                 19  DIRTY_ATTR ($i%2==0)?"g-odd-row":"g-even-row"
 modules/gallery/views/admin_modules.html.php                 22  DIRTY    form::checkbox($data,'1',module::is_active($module_name))
 modules/gallery/views/admin_modules.html.php                 24  DIRTY    $module_info->version
 modules/gallery/views/admin_theme_options.html.php           5   DIRTY    $form
@@ -267,7 +267,7 @@ modules/user/views/admin_users.html.php                      3   DIRTY_JS url::s
 modules/user/views/admin_users.html.php                      26  DIRTY_JS url::site("admin/users/group/__GROUPID__")
 modules/user/views/admin_users.html.php                      36  DIRTY_JS url::site("admin/users/remove_user_from_group/__USERID__/__GROUPID__?csrf=$csrf")
 modules/user/views/admin_users.html.php                      67  DIRTY_ATTR $user->id
-modules/user/views/admin_users.html.php                      67  DIRTY_ATTR text::alternate("gOddRow","gEvenRow")
+modules/user/views/admin_users.html.php                      67  DIRTY_ATTR text::alternate("g-odd-row","g-even-row")
 modules/user/views/admin_users.html.php                      67  DIRTY_ATTR $user->admin?"admin":""
 modules/user/views/admin_users.html.php                      68  DIRTY_ATTR $user->id
 modules/user/views/admin_users.html.php                      69  DIRTY_ATTR $user->avatar_url(20,$theme->url(,true))
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index 977ba75b..4c79c25b 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -21,7 +21,7 @@
       </tr>
       <? $i = 0; ?>
       <? foreach ($task_definitions as $task): ?>
-      <tr class="<?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?> <?= log::severity_class($task->severity) ?>">
+      <tr class="<?= ($i % 2 == 0) ? "g-odd-row" : "g-even-row" ?> <?= log::severity_class($task->severity) ?>">
         <td class="<?= log::severity_class($task->severity) ?>">
           <?= $task->name ?>
         </td>
@@ -69,7 +69,7 @@
       </tr>
       <? $i = 0; ?>
       <? foreach ($running_tasks as $task): ?>
-      <tr class="<?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?> <?= $task->state == "stalled" ? "gWarning" : "" ?>">
+      <tr class="<?= ($i % 2 == 0) ? "g-odd-row" : "g-even-row" ?> <?= $task->state == "stalled" ? "gWarning" : "" ?>">
         <td class="<?= $task->state == "stalled" ? "gWarning" : "" ?>">
           <?= gallery::date_time($task->updated) ?>
         </td>
@@ -142,7 +142,7 @@
       </tr>
       <? $i = 0; ?>
       <? foreach ($finished_tasks as $task): ?>
-      <tr class="<?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?> <?= $task->state == "success" ? "gSuccess" : "gError" ?>">
+      <tr class="<?= ($i % 2 == 0) ? "g-odd-row" : "g-even-row" ?> <?= $task->state == "success" ? "gSuccess" : "gError" ?>">
         <td class="<?= $task->state == "success" ? "gSuccess" : "gError" ?>">
           <?= gallery::date_time($task->updated) ?>
         </td>
diff --git a/modules/gallery/views/admin_modules.html.php b/modules/gallery/views/admin_modules.html.php
index 9cf03cb3..058844b4 100644
--- a/modules/gallery/views/admin_modules.html.php
+++ b/modules/gallery/views/admin_modules.html.php
@@ -16,7 +16,7 @@
       </tr>
       <? $i = 0 ?>
       <? foreach ($available as $module_name => $module_info):  ?>
-      <tr class="<?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
+      <tr class="<?= ($i % 2 == 0) ? "g-odd-row" : "g-even-row" ?>">
         <? $data = array("name" => $module_name); ?>
         <? if ($module_info->locked) $data["disabled"] = 1; ?>
         <td> <?= form::checkbox($data, '1', module::is_active($module_name)) ?> </td>
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index a46e402f..46bdb65e 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -64,7 +64,7 @@
       </tr>
 
       <? foreach ($users as $i => $user): ?>
-      <tr id="gUser-<?= $user->id ?>" class="<?= text::alternate("gOddRow", "gEvenRow") ?> user <?= $user->admin ? "admin" : "" ?>">
+      <tr id="gUser-<?= $user->id ?>" class="<?= text::alternate("g-odd-row", "g-even-row") ?> user <?= $user->admin ? "admin" : "" ?>">
         <td id="user-<?= $user->id ?>" class="core-info gDraggable">
           <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
                title="<?= t("Drag user onto group below to add as a new member")->for_html_attr() ?>"
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 28115149..61161967 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -281,14 +281,6 @@ li.gError select {
   opacity: 0.4;
 }
 
-.gOddRow {
-  background-color: #eee;
-}
-
-.gEvenRow {
-  background-color: #fff;
-}
-
 /* Status messages ~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #gMessage {