diff --git a/galleryformatter.module b/galleryformatter.module
index ed8a764..c55f8ad 100644
--- a/galleryformatter.module
+++ b/galleryformatter.module
@@ -15,6 +15,8 @@ function galleryformatter_field_formatter_info() {
         'slide_style' => 'galleryformatter_slide',
         'thumb_style' => 'galleryformatter_thumb',
         'style' => 'Greenarrows',
+        'onclick_full' => 0,
+        'show_full_link' => 1,
         'link_to_full' => 1,
         'link_to_full_style' => 0,
         'modal' => 'none',
@@ -108,6 +110,30 @@ function galleryformatter_field_formatter_settings_form($field, $instance, $view
       )
   );
 
+  $form['onclick_full'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Open full image -or modal- on slide click.'),
+    '#default_value' => $settings['onclick_full'],
+    '#description' => t('If you check this on, when you click on the slide the link is triggered -opening modal when a modal is configured-.'),
+    '#states' => array(
+      'visible' => array(
+        ':input[name="fields['. $field['field_name'] .'][settings_edit_form][settings][link_to_full]"]' => array('checked' => TRUE),
+      )
+    )
+  );
+
+  $form['show_full_link'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Show a view full image link'),
+    '#default_value' => $settings['link_to_full'],
+    '#description' => t('If you check this on, a view full image link will be added to the image -a magnify glass in default style-.'),
+    '#states' => array(
+      'visible' => array(
+        ':input[name="fields['. $field['field_name'] .'][settings_edit_form][settings][link_to_full]"]' => array('checked' => TRUE),
+      )
+    )
+  );
+
   return $form;
 }
 
@@ -128,6 +154,9 @@ function galleryformatter_field_formatter_settings_summary($field, $instance, $v
     $summary[] = t('Full image style: @value', array('@value' => $full_image_style));
 
     $summary[] =  t('Modal used for full image: @value', array('@value' => $settings['modal']));
+
+    $summary[] =  $settings['onclick_full'] ? t('Full link on slide click') : t('Next slide on slide click');
+    $summary[] =  $settings['show_full_link'] ? t('Show view full image link') : t('No full image link');
   }
 
   return implode ('<br />', $summary);
@@ -226,10 +255,10 @@ function galleryformatter_field_formatter_view($entity_type, $entity, $field, $i
     $renderitems['slides'][$delta]['hash_id'] = 'slide-' . $delta . '-' . $slideset_id;
 
     $renderitems['slides'][$delta]['image'] = theme('image_formatter', array(
-          'item' => $item,
-          'image_style' => $settings['slide_style'],
-        )
-      );
+        'item' => $item,
+        'image_style' => $settings['slide_style'],
+      )
+    );
     if ($settings['link_to_full'] == TRUE) {
       /* @TODO
        * doesnt work yet
@@ -244,20 +273,33 @@ function galleryformatter_field_formatter_view($entity_type, $entity, $field, $i
         case 'none':
           break;
         case 'colorbox':
-          $link_attributes['class'] = 'colorbox';
+          $link_attributes['class'] = $settings['onclick_full'] ? 'colorbox' : 'colorbox shownext';
           $link_attributes['rel'] = 'gallery-['. $slideset_id .']';
           break;
         case 'shadowbox':
+          if (!$settings['onclick_full']) {
+            $link_attributes['class'] = 'shownext';
+          }
           $link_attributes['rel'] = 'shadowbox['.$slideset_id .']';
           $element['#attached']['library'][] = array('shadowbox', 'shadowbox');
           break;
         case 'lightbox2':
+          if (!$settings['onclick_full']) {
+            $link_attributes['class'] = 'shownext';
+          }
           $link_attributes['rel'] = 'lightbox['. $slideset_id .']';
           break;
       }
       $link_url = $settings['link_to_full_style'] ? image_style_url($settings['link_to_full_style'], $item['uri']) : file_create_url($item['uri']);
+
       // link the slide image and include the span for the icon
-      $renderitems['slides'][$delta]['image'] = l('<span class="view-full" title="'. t('View the full image') .'">'. t('View the full image') .'</span>', $link_url, array('attributes' => $link_attributes, 'html' => TRUE,)) . $renderitems['slides'][$delta]['image'];
+      $link_content = $settings['show_full_link'] ? '<span class="view-full" title="'. t('View the full image') .'">'. t('View the full image') .'</span>' : '';
+      $image_rendered = $renderitems['slides'][$delta]['image'];
+      $link_content .= $settings['onclick_full'] ? $image_rendered : '';
+
+      $renderitems['slides'][$delta]['image'] = l($link_content, $link_url, array('attributes' => $link_attributes, 'html' => TRUE,));
+      $renderitems['slides'][$delta]['image'] .= $settings['onclick_full'] ? '' : $image_rendered;
+
       $renderitems['slides'][$delta]['full_image_url'] = $link_url;
     } // END linking to original
 
diff --git a/theme/galleryformatter.js b/theme/galleryformatter.js
index 626513c..febefd1 100644
--- a/theme/galleryformatter.js
+++ b/theme/galleryformatter.js
@@ -145,7 +145,7 @@ Drupal.galleryformatter.prepare = function(el) {
       }
     });
 
-    $('img', $slideContainer).click(function(){
+    $('.shownext + img', $slideContainer).click(function(){
       $thumbs.trigger('showNext');
     });