diff -Naur /home/master/temp/lightbox2/lightbox2.formatter.inc /home/master/wwwhome/test2.ru/tim/sites/all/modules/lightbox2/lightbox2.formatter.inc
--- /home/master/temp/lightbox2/lightbox2.formatter.inc	2010-09-22 17:47:15.000000000 +0700
+++ /home/master/wwwhome/test2.ru/tim/sites/all/modules/lightbox2/lightbox2.formatter.inc	2012-01-15 01:27:06.613649399 +0700
@@ -98,7 +98,8 @@
   else {
     $rules = _imagecache_get_presets();
   }
-  if ($view_preset == 'link' || $view_preset == 'original' || in_array($view_preset, (array) $rules)) {
+  list($view_preset_clean, $tmp) = explode('/', $view_preset);
+  if ($view_preset_clean == 'link' || $view_preset_clean == 'original' || in_array($view_preset_clean, (array) $rules)) {
     $rel = 'lightbox';
     if (strpos($formatter, '__lightshow2__') !== FALSE) {
       $rel = 'lightshow';
@@ -110,7 +111,6 @@
     elseif (strpos($formatter, '__lightframe2__') !== FALSE) {
       $rel = 'lightframe';
     }
-
     // Check if this is a compact display.
     list($tmp, $lightbox_type, $tmp) = explode('__', $formatter, 3);
     if ($lightbox_type == 'lightbox2_compact') {
@@ -247,29 +247,35 @@
     'class' => 'imagefield imagefield-lightbox2 imagefield-lightbox2-' . $view_preset . ' imagefield-' . $field_name . ' ' . $class,
   );
 
+  list($view_preset, $uncrop) = explode('/', $view_preset);
+  $uncrop = (empty($uncrop)) ? '' : '.crop_display.jpg';
+
   $attributes = array();
   if (isset($args['compact']) && $item['#delta']) {
     $image = '';
   }
   elseif ($view_preset == 'original') {
-    $image = theme('lightbox2_image', $item['filepath'], $image_tag_alt, $image_tag_title, $attributes);
+    $image = theme('lightbox2_image', $item['filepath'].$uncrop, $image_tag_alt, $image_tag_title, $attributes);
   }
   elseif ($view_preset == 'link') {
     // Not actually an image, just a text link.
     $image = variable_get('lightbox2_view_image_text', 'View image');
   }
   else {
-    $image = theme('imagecache', $view_preset, $item['filepath'], $image_tag_alt, $image_tag_title, $attributes);
+    $image = theme('imagecache', $view_preset, $item['filepath'].$uncrop, $image_tag_alt, $image_tag_title, $attributes);
   }
 
+  list($args['lightbox_preset'], $uncrop) = explode('/', $args['lightbox_preset']);
+  $uncrop = (empty($uncrop)) ? '' : '.crop_display.jpg';
+
   if ($args['lightbox_preset'] == 'node') {
     $output = l($image, 'node/'. $node->nid .'/lightbox2', array('attributes' => $link_attributes, 'html' => TRUE));
   }
   elseif ($args['lightbox_preset'] == 'original') {
-    $output = l($image, file_create_url($item['filepath']), array('attributes' => $link_attributes, 'html' => TRUE));
+    $output = l($image, file_create_url($item['filepath'].$uncrop), array('attributes' => $link_attributes, 'html' => TRUE));
   }
   else {
-    $output = l($image, imagecache_create_url($args['lightbox_preset'], $item['filepath']), array('attributes' => $link_attributes, 'html' => TRUE));
+    $output = l($image, imagecache_create_url($args['lightbox_preset'], $item['filepath'].$uncrop), array('attributes' => $link_attributes, 'html' => TRUE));
   }
 
   return $output;
diff -Naur /home/master/temp/lightbox2/lightbox2.module /home/master/wwwhome/test2.ru/tim/sites/all/modules/lightbox2/lightbox2.module
--- /home/master/temp/lightbox2/lightbox2.module	2010-09-24 15:33:00.000000000 +0700
+++ /home/master/wwwhome/test2.ru/tim/sites/all/modules/lightbox2/lightbox2.module	2012-01-15 01:28:25.283649392 +0700
@@ -744,6 +744,7 @@
     else {
       $rules = _imagecache_get_presets();
     }
+    $rules[] = 'original';
     $iframe['imagefield__lightframe2__original__node'] = array(
       'label' => 'Lightbox2 iframe: original->node page',
       'field types' => array('image', 'filefield'),
@@ -753,55 +754,25 @@
       'field types' => array('image', 'filefield'),
     );
     foreach ($rules as $ruleid => $view_rule) {
-      $lightbox['imagefield__lightbox2__original__'. $view_rule] = array(
-        'label' => 'Lightbox2: original->'. $view_rule,
-        'field types' => array('image', 'filefield'),
-      );
-      $lightbox['imagefield__lightbox2_compact__original__'. $view_rule] = array(
-        'label' => 'Lightbox2: original->'. $view_rule . ' compact',
-        'field types' => array('image', 'filefield'),
-      );
-      $lightbox['imagefield__lightbox2__'. $view_rule .'__original'] = array(
-        'label' => 'Lightbox2: '. $view_rule .'->original',
-        'field types' => array('image', 'filefield'),
-      );
-      $lightbox['imagefield__lightbox2_compact__'. $view_rule .'__original'] = array(
-        'label' => 'Lightbox2: '. $view_rule .'->original compact',
-        'field types' => array('image', 'filefield'),
-      );
-      $lightbox['imagefield__lightbox2__link__'. $view_rule] = array(
-        'label' => 'Lightbox2: link->'. $view_rule,
-        'field types' => array('image', 'filefield'),
-      );
-      $slideshow['imagefield__lightshow2__original__'. $view_rule] = array(
-        'label' => 'Lightbox2 slideshow: original->'. $view_rule,
-        'field types' => array('image', 'filefield'),
-      );
-      $slideshow['imagefield__lightshow2_compact__original__'. $view_rule] = array(
-        'label' => 'Lightbox2 slideshow: original->'. $view_rule . ' compact',
-        'field types' => array('image', 'filefield'),
-      );
-      $slideshow['imagefield__lightshow2__'. $view_rule .'__original'] = array(
-        'label' => 'Lightbox2 slideshow: '. $view_rule .'->original',
-        'field types' => array('image', 'filefield'),
-      );
-      $slideshow['imagefield__lightshow2_compact__'. $view_rule .'__original'] = array(
-        'label' => 'Lightbox2 slideshow: '. $view_rule .'->original compact',
-        'field types' => array('image', 'filefield'),
-      );
-      $slideshow['imagefield__lightshow2__link__'. $view_rule] = array(
-        'label' => 'Lightbox2 slideshow: link->'. $view_rule,
-        'field types' => array('image', 'filefield'),
-      );
-      $iframe['imagefield__lightframe2__'. $view_rule .'__node'] = array(
-        'label' => 'Lightbox2 iframe: '. $view_rule .'->node page',
-        'field types' => array('image', 'filefield'),
-      );
       foreach ($rules as $rid => $lightbox_rule) {
         $lightbox['imagefield__lightbox2__'. $view_rule .'__'. $lightbox_rule] = array(
           'label' => 'Lightbox2: '. $view_rule .'->'. $lightbox_rule,
           'field types' => array('image', 'filefield'),
         );
+        if (module_exists('imagefield_crop')) {
+          $lightbox['imagefield__lightbox2__'. $view_rule .'/uncrop__'. $lightbox_rule] = array(
+            'label' => 'Lightbox2: '. $view_rule .' (uncroped)->'. $lightbox_rule,
+            'field types' => array('image', 'filefield'),
+          );
+          $lightbox['imagefield__lightbox2__'. $view_rule .'__'. $lightbox_rule .'/uncrop'] = array(
+            'label' => 'Lightbox2: '. $view_rule .'->'. $lightbox_rule .' (uncroped)',
+            'field types' => array('image', 'filefield'),
+          );
+          $lightbox['imagefield__lightbox2__'. $view_rule .'/uncrop__'. $lightbox_rule .'/uncrop'] = array(
+            'label' => 'Lightbox2: '. $view_rule .' (uncroped)->'. $lightbox_rule .' (uncroped)',
+            'field types' => array('image', 'filefield'),
+          );
+        }
         $lightbox['imagefield__lightbox2_compact__'. $view_rule .'__'. $lightbox_rule] = array(
           'label' => 'Lightbox2: '. $view_rule .'->'. $lightbox_rule . ' compact',
           'field types' => array('image', 'filefield'),
@@ -924,70 +895,32 @@
       'function' => 'theme_lightbox2_formatter_imagefield',
       'file' => 'lightbox2.formatter.inc',
     );
-
-    foreach (imagecache_presets() as $src) {
-      $theme['lightbox2_formatter_imagefield__lightbox2__'. $src['presetname'] .'__original'] = array(
-        'arguments' => array('element' => NULL),
-        'function' => 'theme_lightbox2_formatter_imagefield',
-        'file' => 'lightbox2.formatter.inc',
-      );
-      $theme['lightbox2_formatter_imagefield__lightbox2_compact__'. $src['presetname'] .'__original'] = array(
-        'arguments' => array('element' => NULL),
-        'function' => 'theme_lightbox2_formatter_imagefield',
-        'file' => 'lightbox2.formatter.inc',
-      );
-      $theme['lightbox2_formatter_imagefield__lightshow2__'. $src['presetname'] .'__original'] = array(
-        'arguments' => array('element' => NULL),
-        'function' => 'theme_lightbox2_formatter_imagefield',
-        'file' => 'lightbox2.formatter.inc',
-      );
-      $theme['lightbox2_formatter_imagefield__lightshow2_compact__'. $src['presetname'] .'__original'] = array(
-        'arguments' => array('element' => NULL),
-        'function' => 'theme_lightbox2_formatter_imagefield',
-        'file' => 'lightbox2.formatter.inc',
-      );
-      $theme['lightbox2_formatter_imagefield__lightbox2__original__'. $src['presetname']] = array(
-        'arguments' => array('element' => NULL),
-        'function' => 'theme_lightbox2_formatter_imagefield',
-        'file' => 'lightbox2.formatter.inc',
-      );
-      $theme['lightbox2_formatter_imagefield__lightbox2_compact__original__'. $src['presetname']] = array(
-        'arguments' => array('element' => NULL),
-        'function' => 'theme_lightbox2_formatter_imagefield',
-        'file' => 'lightbox2.formatter.inc',
-      );
-      $theme['lightbox2_formatter_imagefield__lightshow2__original__'. $src['presetname']] = array(
-        'arguments' => array('element' => NULL),
-        'function' => 'theme_lightbox2_formatter_imagefield',
-        'file' => 'lightbox2.formatter.inc',
-      );
-      $theme['lightbox2_formatter_imagefield__lightshow2_compact__original__'. $src['presetname']] = array(
-        'arguments' => array('element' => NULL),
-        'function' => 'theme_lightbox2_formatter_imagefield',
-        'file' => 'lightbox2.formatter.inc',
-      );
-      $theme['lightbox2_formatter_imagefield__lightframe2__'. $src['presetname'] .'__node'] = array(
-        'arguments' => array('element' => NULL),
-        'function' => 'theme_lightbox2_formatter_imagefield',
-        'file' => 'lightbox2.formatter.inc',
-      );
-      $theme['lightbox2_formatter_imagefield__lightbox2__link__'. $src['presetname']] = array(
-        'arguments' => array('element' => NULL),
-        'function' => 'theme_lightbox2_formatter_imagefield',
-        'file' => 'lightbox2.formatter.inc',
-      );
-      $theme['lightbox2_formatter_imagefield__lightshow2__link__'. $src['presetname']] = array(
-        'arguments' => array('element' => NULL),
-        'function' => 'theme_lightbox2_formatter_imagefield',
-        'file' => 'lightbox2.formatter.inc',
-      );
-
-      foreach (imagecache_presets() as $dest) {
+    $presets = imagecache_presets();
+    $presets[]['presetname'] = 'original';
+    foreach ($presets as $src) {
+      foreach ($presets as $dest) {
         $theme['lightbox2_formatter_imagefield__lightbox2__'. $src['presetname'] .'__'. $dest['presetname']] = array(
           'arguments' => array('element' => NULL),
           'function' => 'theme_lightbox2_formatter_imagefield',
           'file' => 'lightbox2.formatter.inc',
         );
+        if (module_exists('imagefield_crop')) {
+          $theme['lightbox2_formatter_imagefield__lightbox2__'. $src['presetname'] .'/uncrop__'. $dest['presetname']] = array(
+            'arguments' => array('element' => NULL),
+            'function' => 'theme_lightbox2_formatter_imagefield',
+            'file' => 'lightbox2.formatter.inc',
+          );
+          $theme['lightbox2_formatter_imagefield__lightbox2__'. $src['presetname'] .'__'. $dest['presetname']. '/uncrop'] = array(
+            'arguments' => array('element' => NULL),
+            'function' => 'theme_lightbox2_formatter_imagefield',
+            'file' => 'lightbox2.formatter.inc',
+          );
+          $theme['lightbox2_formatter_imagefield__lightbox2__'. $src['presetname'] .'/uncrop__'. $dest['presetname']. '/uncrop'] = array(
+            'arguments' => array('element' => NULL),
+            'function' => 'theme_lightbox2_formatter_imagefield',
+            'file' => 'lightbox2.formatter.inc',
+          );
+        }
         $theme['lightbox2_formatter_imagefield__lightbox2_compact__'. $src['presetname'] .'__'. $dest['presetname']] = array(
           'arguments' => array('element' => NULL),
           'function' => 'theme_lightbox2_formatter_imagefield',