diff --git a/video.field.inc b/video.field.inc
index 4e74cb3..77850b0 100644
--- a/video.field.inc
+++ b/video.field.inc
@@ -954,6 +954,7 @@ function video_field_formatter_info() {
       'settings' => array(
         'image_style' => '',
         'image_link' => '',
+		 'widthxheight' => '640x360',
       ),
     ),
   );
@@ -963,8 +964,8 @@ function video_field_formatter_info() {
  * Implements hook_field_formatter_settings_form().
  */
 function video_field_formatter_settings_form($field, $instance, $view_mode, $form, &$form_state) {
-  $display = $instance['display'][$view_mode];
-  $settings = $display['settings'];
+  $display      = $instance['display'][$view_mode];
+  $settings     = $display['settings'];
   $image_styles = image_style_options(FALSE);
 
   switch ($display['type']) {
@@ -987,6 +988,21 @@ function video_field_formatter_settings_form($field, $instance, $view_mode, $for
           'file' => t('File'),
         ),
       );
+      if (module_exists('colorbox')){
+	    $element['image_link']['#options']['colorbox'] = t('Colorbox');
+	    $element['widthxheight'] = array(
+         '#title' => t('Video Player Dimensions'),
+         '#type' => 'select',
+         '#default_value' => $settings['widthxheight'],
+         '#description' => t('Select the desired dimensions of the video player. You can add your own dimensions at !settings.', array('!settings' => l(t('video module settings'), 'admin/config/media/video'))),
+         '#options' => video_utility::getDimensions(),
+         '#states' => array(
+           'visible' => array(
+             'input[name="options[settings][image_link]"]' => array('value' => 'colorbox'),
+           ),
+         ),
+       );
+	  }
       break;
 
     case 'video_formatter_player':
@@ -1012,13 +1028,15 @@ function video_field_formatter_settings_form($field, $instance, $view_mode, $for
   return $element;
 }
 
+
+
 /**
  * Implements hook_field_formatter_settings_summary().
  */
 function video_field_formatter_settings_summary($field, $instance, $view_mode) {
-  $display = $instance['display'][$view_mode];
-  $settings = $display['settings'];
-  $summary = array();
+  $display      = $instance['display'][$view_mode];
+  $settings     = $display['settings'];
+  $summary      = array();
   $image_styles = image_style_options(FALSE);
   // Unset possible 'No defined styles' option.
   unset($image_styles['']);
@@ -1037,7 +1055,9 @@ function video_field_formatter_settings_summary($field, $instance, $view_mode) {
       $link_types = array(
         'content' => t('Linked to content'),
         'file' => t('Linked to video file'),
+		 'colorbox' => t('Linked to Colorbox overlay')
       );
+
       // Display this setting only if image is linked.
       if (isset($link_types[$settings['image_link']])) {
         $summary[] = $link_types[$settings['image_link']];
@@ -1055,6 +1075,8 @@ function video_field_formatter_settings_summary($field, $instance, $view_mode) {
   return implode('<br />', $summary);
 }
 
+
+
 /**
  * Implements hook_field_formatter_view().
  */
@@ -1070,14 +1092,19 @@ function video_field_formatter_view($entity_type, $entity, $field, $instance, $l
           $uri = entity_uri($entity_type, $entity);
         }
         elseif ($settings['image_link'] == 'file') {
-          $link_file = TRUE;
-        }
-        if (isset($link_file)) {
           $uri = array(
             'path' => file_create_url($item['uri']),
             'options' => array(),
           );
         }
+		elseif($settings['image_link'] == 'colorbox'){
+		  $dimentions = explode('x', $settings['widthxheight']);
+		  $uri = array(
+           'path' => 'video/embed/' . $entity->nid . '/' . str_replace('x', '/',$settings['widthxheight']),
+           'options' => array('query' => array('width' => $dimentions[0], 'height' => $dimentions[1] + 10, 'iframe' => 'true'))
+         );
+		}
+		
         $element[$delta] = array(
           '#theme' => 'video_formatter_thumbnail',
           '#item' => $item,
@@ -1086,7 +1113,8 @@ function video_field_formatter_view($entity_type, $entity, $field, $instance, $l
           '#entity' => $entity,
           '#entity_type' => $entity_type,
           '#field' => $field,
-          '#instance' => $instance
+          '#instance' => $instance,
+		   '#colorbox' => ($settings['image_link'] == 'colorbox') ? TRUE : FALSE
         );
         break;
 
@@ -1108,6 +1136,7 @@ function video_field_formatter_view($entity_type, $entity, $field, $instance, $l
   return $element;
 }
 
+
 /**
  * Implements hook_filefield_sources_widgets().
  */
diff --git a/video.module b/video.module
index eda5677..6f6e512 100644
--- a/video.module
+++ b/video.module
@@ -92,7 +92,7 @@ function video_theme() {
     'file' => 'video.theme.inc',
   );
   $theme['video_formatter_thumbnail'] = array(
-    'variables' => array('item' => NULL, 'path' => NULL, 'image_style' => NULL, 'entity' => NULL, 'entity_type' => NULL, 'field' => NULL, 'instance' => NULL),
+    'variables' => array('item' => NULL, 'path' => NULL, 'image_style' => NULL, 'entity' => NULL, 'entity_type' => NULL, 'field' => NULL, 'instance' => NULL, 'colorbox' => NULL),
     'file' => 'video.theme.inc',
   );
   $theme['video_widget'] = array(
diff --git a/video.theme.inc b/video.theme.inc
index 740c4fe..0a32079 100644
--- a/video.theme.inc
+++ b/video.theme.inc
@@ -129,12 +129,17 @@ function theme_video_formatter_thumbnail($variables) {
     $options = $variables['path']['options'];
     // When displaying an image inside a link, the html option must be TRUE.
     $options['html'] = TRUE;
+    if($variables['colorbox']){
+	   $options['attributes'] = array('class' => array('colorbox-load'));
+	 }
     $output = l($output, $path, $options);
   }
 
   return $output;
 }
 
+
+
 /**
  * Returns HTML for an image using a specific image style.
  *