Index: image.module
===================================================================
--- image.module	(revision 57)
+++ image.module	(working copy)
@@ -283,8 +286,8 @@
   }
   $request = ($_GET['size']) ? $_GET['size'] : 'preview';
   $node = node_prepare($node, $main);
-  $node->teaser = l(image_display($node, 'thumbnail'), 'node/'.$node->nid, array(), NULL, NULL, FALSE, TRUE) . $node->teaser;
-  $node->body = image_display($node, $request) . $node->body;
+  $node->teaser = theme('image_teaser', $node);
+  $node->body = theme('image_body', $node, $request);
 }
 
 
@@ -389,7 +392,7 @@
 
   $images = array();
   if ($tid) {
-    $result = pager_query(db_rewrite_sql("SELECT n.nid FROM {term_node} t INNER JOIN {node} n ON t.nid=n.nid WHERE n.status=1 AND n.type='image' AND t.tid=%d ORDER BY n.sticky DESC, n.created DESC"), 6, 0, NULL, $tid);
+    $result = pager_query(db_rewrite_sql("SELECT n.nid FROM {term_node} t INNER JOIN {node} n ON t.nid=n.nid WHERE n.status=1 AND n.type='image' AND t.tid=%d ORDER BY n.sticky DESC, n.created DESC"), variable_get('image_images_per_page', 6), 0, NULL, $tid);
     while ($node = db_fetch_object($result)) {
       $images[] = node_load(array('nid' => $node->nid));
     }
@@ -487,6 +493,20 @@
 }
 
 /**
+ * Theme a teaser
+ */
+function theme_image_teaser($node) {
+ return l(image_display($node, 'thumbnail'), 'node/'.$node->nid, array(), NULL, NULL, FALSE, TRUE) . $node->teaser;
+}
+
+/**
+ * Theme a body
+ */
+function theme_image_body($node, $size) {
+ return image_display($node, $size) . $node->body;
+}
+
+/**
  * Theme a gallery page
  */
 function theme_image_gallery($galleries, $images) {