diff -upNp ../../patchable/pager.inc ../../patched/pager.inc
--- ../../patchable/pager.inc	2007-02-15 05:40:17.000000000 -0600
+++ ../../patched/pager.inc	2007-04-13 15:19:14.000000000 -0500
@@ -114,13 +114,13 @@ function theme_pager($tags = array(), $l
   $output = '';
 
   if ($pager_total[$element] > 1) {
-    $output .= '<div class="pager">';
-    $output .= theme('pager_first', ($tags[0] ? $tags[0] : t('« first')), $limit, $element, $parameters);
-    $output .= theme('pager_previous', ($tags[1] ? $tags[1] : t('‹ previous')), $limit, $element, 1, $parameters);
+    $output .= "\n" . '<ul class="pager">' . "\n";
+    $output .= '<li class="pager-first">' . theme('pager_first', ($tags[0] ? $tags[0] : t('« first')), $limit, $element, $parameters) . '</li>' . "\n";
+    $output .= '<li class="pager-previous">' . theme('pager_previous', ($tags[1] ? $tags[1] : t('‹ previous')), $limit, $element, 1, $parameters) . '</li>' . "\n";
     $output .= theme('pager_list', $limit, $element, ($tags[2] ? $tags[2] : 9 ), '', $parameters);
-    $output .= theme('pager_next', ($tags[3] ? $tags[3] : t('next ›')), $limit, $element, 1, $parameters);
-    $output .= theme('pager_last', ($tags[4] ? $tags[4] : t('last »')), $limit, $element, $parameters);
-    $output .= '</div>';
+    $output .= '<li class="pager-next">' . theme('pager_next', ($tags[3] ? $tags[3] : t('next ›')), $limit, $element, 1, $parameters) . '</li>' . "\n";
+    $output .= '<li class="pager-last">' . theme('pager_last', ($tags[4] ? $tags[4] : t('last »')), $limit, $element, $parameters) . '</li>' . "\n";
+    $output .= '</ul>' . "\n";
 
     return $output;
   }
@@ -155,7 +155,11 @@ function theme_pager_first($text, $limit
 
   // If we are anywhere but the first page
   if ($pager_page_array[$element] > 0) {
-    $output = theme('pager_link', $text, pager_load_array(0, $element, $pager_page_array), $element, $parameters, array('class' => 'pager-first'));
+    $output = theme('pager_link', $text, pager_load_array(0, $element, $pager_page_array), $element, $parameters);
+  }
+  // Print text for positioning purposes without a link
+  else {
+    $output = $text;
   }
 
   return $output;
@@ -193,10 +197,14 @@ function theme_pager_previous($text, $li
     }
     // The previous page is not the first page.
     else {
-      $output = theme('pager_link', $text, $page_new, $element, $parameters, array('class' => 'pager-previous'));
+      $output = theme('pager_link', $text, $page_new, $element, $parameters);
     }
   }
-
+  // Print text for positioning purposes without a link
+  else {
+    $output = $text;
+  }
+  
   return $output;
 }
 
@@ -231,9 +239,13 @@ function theme_pager_next($text, $limit,
     }
     // The next page is not the last page.
     else {
-      $output = theme('pager_link', $text, $page_new, $element, $parameters, array('class' => 'pager-next'));
+      $output = theme('pager_link', $text, $page_new, $element, $parameters);
     }
   }
+  // Print text for positioning purposes without a link
+  else {
+    $output = $text;
+  }
 
   return $output;
 }
@@ -260,7 +272,11 @@ function theme_pager_last($text, $limit,
 
   // If we are anywhere but the last page
   if ($pager_page_array[$element] < ($pager_total[$element] - 1)) {
-    $output = theme('pager_link', $text, pager_load_array($pager_total[$element] - 1, $element, $pager_page_array), $element, $parameters, array('class' => 'pager-last'));
+    $output = theme('pager_link', $text, pager_load_array($pager_total[$element] - 1, $element, $pager_page_array), $element, $parameters);
+  }
+  // Print text for positioning purposes without a link
+  else {
+    $output = $text;
   }
 
   return $output;
@@ -287,7 +303,7 @@ function theme_pager_last($text, $limit,
 function theme_pager_list($limit, $element = 0, $quantity = 5, $text = '', $parameters = array()) {
   global $pager_page_array, $pager_total;
 
-  $output = '<span class="pager-list">';
+  $output = '';
   // Calculate various markers within this pager piece:
   // Middle is used to "center" pages around the current page.
   $pager_middle = ceil($quantity / 2);
@@ -319,27 +335,26 @@ function theme_pager_list($limit, $eleme
   if ($i != $pager_max) {
     $output .= $text;
     if ($i > 1) {
-      $output .= '<span class="pager-ellipsis">…</span>';
+      $output .= '<li class="pager-ellipsis">…</li>';
     }
 
     // Now generate the actual pager piece.
     for (; $i <= $pager_last && $i <= $pager_max; $i++) {
       if ($i < $pager_current) {
-        $output .= theme('pager_previous', $i, $limit, $element, ($pager_current - $i), $parameters);
+        $output .= '<li class="pager-item">' . theme('pager_previous', $i, $limit, $element, ($pager_current - $i), $parameters) . '</li>' . "\n";
       }
       if ($i == $pager_current) {
-        $output .= '<strong class="pager-current">'. $i .'</strong>';
+        $output .= '<li class="pager-current">'. $i .'</li>' . "\n";
       }
       if ($i > $pager_current) {
-        $output .= theme('pager_next', $i, $limit, $element, ($i - $pager_current), $parameters);
+        $output .= '<li class="pager-item">' . theme('pager_next', $i, $limit, $element, ($i - $pager_current), $parameters) . '</li>' . "\n";
       }
     }
 
     if ($i < $pager_max) {
-      $output .= '<span class="pager-ellipsis">…</span>';
+      $output .= '<li class="pager-ellipsis">…</li>';
     }
   }
-  $output .= '</span>';
 
   return $output;
 }
diff -upNp ../../patchable/system.css ../../patched/system.css
--- ../../patchable/system.css	2007-04-09 08:58:03.000000000 -0500
+++ ../../patched/system.css	2007-04-13 15:19:40.000000000 -0500
@@ -122,8 +122,14 @@ tr.merge-up, tr.merge-up td, tr.merge-up
   clear: both;
   text-align: center;
 }
-.pager a, .pager strong.pager-current {
-  padding: 0.5em;
+.pager li {
+  background-image:none;
+  display:inline;
+  list-style-type:none;
+  padding:5px;
+}
+.pager-current {
+  font-weight:bold;
 }
 .tips {
   margin-top: 0;