--- contrib/emvideo/emvideo.theme.inc	Wed Oct 20 21:33:21 2010
+++ contrib/emvideo/emvideo.theme.inc	Wed Nov 24 17:49:59 2010
@@ -164,6 +164,21 @@
       $output = l($link_title, $link_url);
     }
   }
+	$display_title = '';
+	// Create "title" container
+	if (isset($options['title'])) {
+		$display_title = '<div class="item-title">'. $options['title'] ."</div>";
+	} else if (isset($item['title'])) {
+		$display_title = '<div class="item-title">'. $item['title']. "</div>";
+	}
+	$display_description = '';
+	// Create "title" container
+	if (isset($options['description'])) {
+		$display_description = '<div class="item-description">'. $options['description'] ."</div>";
+	} else if (isset($item['description'])) {
+		$display_description = '<div class="item-description">'. $item['description']. "</div>";
+	}
+	$output .= $display_title . $display_description;
 
   return $output;
 }
@@ -218,7 +233,25 @@
 
 function theme_emvideo_modal_generic($field, $item, $formatter, $node, $options = array()) {
   $title = isset($options['title']) ? $options['title'] : (isset($item['title']) ? $item['title'] : (isset($node->title) ? $node->title : (isset($node->node_title) ? $node->node_title : (isset($field['widget']['thumbnail_link_title']) ? $field['widget']['thumbnail_link_title'] : variable_get('emvideo_default_thumbnail_link_title', t('See video'))))));
-  $thumbnail = isset($options['thumbnail']) ? $options['thumbnail'] : theme('emvideo_video_thumbnail', $field, $item, 'video_thumbnail', $node, TRUE, $options);
+   $display_title = ''; 
+  $display_description = '';
+  if(isset($options['thumbnail'])===TRUE){
+	$thumbnail = $options['thumbnail'];
+	// Create "title" container
+	if (isset($options['title'])) {
+		$display_title = '<div class="item-title">'. $options['title'] ."</div>";
+	} else if (isset($item['title'])) {
+		$display_title = '<div class="item-title">'. $item['title']. "</div>";
+	}
+	// Create "description" container
+	if (isset($options['description'])) {
+		$display_description = '<div class="item-description">'. $options['description'] ."</div>";
+	} else if (isset($item['description'])) {
+		$display_description = '<div class="item-description">'. $item['description']. "</div>";
+	}
+  } else {
+	$thumbnail = theme('emvideo_video_thumbnail', $field, $item, 'video_thumbnail', $node, TRUE, $options);
+  }
   $width = ($formatter == 'video_replace_preview') ? $field['widget']['preview_width'] : $field['widget']['video_width'];
   $height = ($formatter == 'video_replace_preview') ? $field['widget']['preview_height'] : $field['widget']['video_height'];
   $destination = 'emvideo/modal/'. $node->nid .'/'. $width .'/'. $height .'/'. $field['field_name'] .'/'. $item['provider'] .'/'. $item['value'];
@@ -260,15 +293,8 @@
   $class = 'emvideo-modal emvideo-'. $options['modal'];
   if ($options['wrapper-class']) {
     $class .= ' '. $options['wrapper-class'];
-  }
-  $display_title = '';
-  // Create "title" container
-  if (isset($options['title'])) {
-    $display_title = '<div class="item-title">'. $options['title'] ."</div>";
-  } else if (isset($item['title'])) {
-    $display_title = '<div class="item-title">'. $item['title']. "</div>";
-  }
-  $output = '<div class="'. $class .'">'. l($thumbnail, $destination, $attributes) . $display_title .'</div>';
+  } 
+  $output = '<div class="'. $class .'">'.l($thumbnail, $destination, $attributes) . $display_title . $display_description . '</div>';
   return $output;
 }