diff --git a/panopoly_widgets.file_default_displays.inc b/panopoly_widgets.file_default_displays.inc
index 0a9cb3a..3554073 100644
--- a/panopoly_widgets.file_default_displays.inc
+++ b/panopoly_widgets.file_default_displays.inc
@@ -12,11 +12,31 @@ function panopoly_widgets_file_default_displays() {
 
   $file_display = new stdClass();
   $file_display->api_version = 1;
+  $file_display->name = 'video__default__media_youtube_image';
+  $file_display->weight = 1;
+  $file_display->status = TRUE;
+  $file_display->settings = array(
+    'image_style' => 'panopoly_image_video',
+  );
+  $export['video__default__media_youtube_image'] = $file_display;
+
+  $file_display = new stdClass();
+  $file_display->api_version = 1;
   $file_display->name = 'video__link__file_field_file_default';
   $file_display->weight = 0;
   $file_display->status = TRUE;
   $file_display->settings = '';
   $export['video__link__file_field_file_default'] = $file_display;
 
+  $file_display = new stdClass();
+  $file_display->api_version = 1;
+  $file_display->name = 'video__teaser__media_youtube_image';
+  $file_display->weight = 1;
+  $file_display->status = TRUE;
+  $file_display->settings = array(
+    'image_style' => 'panopoly_image_video',
+  );
+  $export['video__teaser__media_youtube_image'] = $file_display;
+
   return $export;
 }
diff --git a/panopoly_widgets.info b/panopoly_widgets.info
index 018421d..598e666 100644
--- a/panopoly_widgets.info
+++ b/panopoly_widgets.info
@@ -102,5 +102,7 @@ features[field_instance][] = fieldable_panels_pane-spotlight-field_basic_spotlig
 features[field_instance][] = fieldable_panels_pane-table-field_basic_table_table
 features[field_instance][] = fieldable_panels_pane-text-field_basic_text_text
 features[field_instance][] = fieldable_panels_pane-video-field_video_file
+features[file_display][] = video__default__media_youtube_image
 features[file_display][] = video__link__file_field_file_default
+features[file_display][] = video__teaser__media_youtube_image
 features[views_view][] = panopoly_widgets_general_content
diff --git a/panopoly_widgets.install b/panopoly_widgets.install
index da01bc8..6e4b61c 100644
--- a/panopoly_widgets.install
+++ b/panopoly_widgets.install
@@ -178,3 +178,12 @@ function panopoly_widgets_update_7005(&$sandbox) {
     variable_del($variable_name);
   }
 }
+
+/**
+ * Implements hook_update_N().
+ *
+ * Revert the 'file_display' so YouTube works in WYSIWYG with newer Media.
+ */
+function panopoly_widgets_update_7006(&$sandbox) {
+  features_revert(array('panopoly_widgets' => array('file_display')));
+}
diff --git a/panopoly_widgets.make b/panopoly_widgets.make
index 316acbe..548e312 100644
--- a/panopoly_widgets.make
+++ b/panopoly_widgets.make
@@ -18,19 +18,13 @@ projects[menu_block][subdir] = contrib
 
 ; Panopoly - Contrib - Files & Media
 
-projects[file_entity][version] = 2.x-dev
+projects[file_entity][version] = 2.0-alpha3
 projects[file_entity][subdir] = contrib
-projects[file_entity][download][type] = git
-projects[file_entity][download][revision] = 5e12856
-projects[file_entity][download][branch] = 7.x-2.x
 
-projects[media][version] = 2.x-dev
+projects[media][version] = 2.0-alpha3
 projects[media][subdir] = contrib
-projects[media][download][type] = git
-projects[media][download][revision] = 2319170
-projects[media][download][branch] = 7.x-2.x
 
-projects[media_youtube][version] = 2.0-rc3
+projects[media_youtube][version] = 2.0-rc4
 projects[media_youtube][subdir] = contrib
 
 projects[media_vimeo][version] = 2.0-rc1
diff --git a/panopoly_widgets.spotlight.inc b/panopoly_widgets.spotlight.inc
index 1f394e6..390c61f 100644
--- a/panopoly_widgets.spotlight.inc
+++ b/panopoly_widgets.spotlight.inc
@@ -165,7 +165,7 @@ function panopoly_widgets_field_formatter_view($entity_type, $entity, $field, $i
 
   // Assemble the tabs content
   foreach ($items as $delta => $item_data) {
-    $element[$delta]['#markup'] = (($delta == 0) ? $header : '') . theme('panopoly_spotlight_view', array('items' => $item_data, 'delta' => $delta, 'settings' => $settings));
+    $element[$delta]['#markup'] = ($delta == 0) ? $header . theme('panopoly_spotlight_view', array('items' => $item_data, 'delta' => $delta, 'settings' => $settings)) : theme('panopoly_spotlight_view', array('items' => $item_data, 'delta' => $delta, 'settings' => $settings));
   }
   return $element;
 }
@@ -182,26 +182,26 @@ function panopoly_widgets_field_widget_form(&$form, &$form_state, $field, $insta
 
     // Define the element
     $element['title'] = array(
-      '#title' => t('Title'),
+      '#title' => 'Title',
       '#type' => 'textfield',
       '#default_value' => isset($items[$delta]['title']) ? $items[$delta]['title'] : NULL,
     );
 
     $element['link'] = array(
-      '#title' => t('Link'),
+      '#title' => 'Link',
       '#type' => 'textfield',
       '#default_value' => isset($items[$delta]['link']) ? $items[$delta]['link'] : NULL,
     );
 
     $element['fid'] = array(
-      '#title' => t('Image'),
+      '#title' => 'Image',
       '#type' => 'managed_file',
       '#upload_location' => file_field_widget_uri($field, $instance),
       '#default_value' => isset($items[$delta]['fid']) ? $items[$delta]['fid'] : NULL,
     );
 
     $element['description'] = array(
-      '#title' => t('Description'),
+      '#title' => 'Description',
       '#type' => 'textarea',
       '#rows' => '2',
       '#resizable' => FALSE,
@@ -213,20 +213,6 @@ function panopoly_widgets_field_widget_form(&$form, &$form_state, $field, $insta
 }
 
 /**
- * Implements hook_field_validate().
- */
-function panopoly_widgets_field_validate($entity_type, $entity, $field, $instance, $langcode, $items, &$errors) {
-  foreach ($items as $delta => $item) {
-    if (!panopoly_widgets_field_is_empty($item, $field) && empty($item['fid'])) {
-      $errors[$field['field_name']][$langcode][$delta][] = array(
-        'error' => 'panopoly_widgets_spotlight_image_required',
-        'message' => t('!name field is required.', array('!name' => t('Image'))),
-      );
-    }
-  }
-}
-
-/**
  * Implements hook_field_presave()
  */
 function panopoly_widgets_field_presave($entity_type, $entity, $field, $instance, $langcode, &$items) {
@@ -251,16 +237,7 @@ function panopoly_widgets_field_presave($entity_type, $entity, $field, $instance
  * Implements hook_field_load().
  */
 function panopoly_widgets_field_load($entity_type, $entities, $field, $instances, $langcode, &$items, $age) {
-  $entity_items_copy = $items;
   image_field_load($entity_type, $entities, $field, $instances, $langcode, $items, $age);
-
-  // image_field_load() will overwrite 'title' with the image title. Here we
-  // return it to the item title.
-  foreach ($entity_items_copy as $entity_id => $items_copy) {
-    foreach ($items_copy as $delta => $item) {
-      $items[$entity_id][$delta]['title'] = $item['title'];
-    }
-  }
 }
 
 /**
@@ -323,9 +300,6 @@ function panopoly_widgets_field_prepare_view($entity_type, $entities, $field, $i
 function theme_panopoly_spotlight_view($variables) {
   $title = $variables['items']['title'];
   $description = $variables['items']['description'];
-  $link = $variables['items']['link'];
-  $settings = $variables['settings'];
-
   if (module_exists('uuid')) {
     $image_entity = entity_uuid_load('file', array($variables['items']['uuid']));
     $image = file_load(array_pop($image_entity)->fid);
@@ -333,21 +307,17 @@ function theme_panopoly_spotlight_view($variables) {
   else {
     $image = (object) $variables['items'];
   }
+  $link = $variables['items']['link'];
+  $settings = $variables['settings'];
 
   $output = '<div id="' . 'panopoly-spotlight-' . $variables['delta'] . '" class="' . 'panopoly-spotlight' . '">';
   $output .= theme('image_style', array('style_name' => $settings['image_style'], 'path' => $image->uri));
   $output .= '<div class="panopoly-spotlight-wrapper">';
-  if (!empty($title) || !empty($link)) {
-    if (empty($title)) {
-      $title = t('Link');
-    }
-    $output .= '<h3 class="panopoly-spotlight-label">' . (empty($link) ? check_plain($title) : l($title, $link)) . '</h3>';
-  }
-  if (!empty($description)) {
-    $output .= '<div class="panopoly-spotlight-info">';
-    $output .= '<p>' . $description . '</p>';
-    $output .= '</div>';
-  }
+  $output .= '<h3 class="panopoly-spotlight-label">' . t('Spotlight') . '</h3>';
+  $output .= '<div class="panopoly-spotlight-info">';
+  $output .= '<h2>' . l($title, $link) . '</h2>';
+  $output .= '<p>' . $description . '</p>';
+  $output .= '</div>';
   $output .= '</div>';
   $output .= '</div>';