diff --git a/sites/all/modules/contrib/colorbox/colorbox.module b/sites/all/modules/contrib/colorbox/colorbox.module
index 814b6af..d4b20ce 100644
--- a/sites/all/modules/contrib/colorbox/colorbox.module
+++ b/sites/all/modules/contrib/colorbox/colorbox.module
@@ -417,7 +417,7 @@ function colorbox_field_formatter_info() {
   return array(
     'colorbox' => array(
       'label' => t('Colorbox'),
-      'field types' => array('image'),
+      'field types' => array('image', 'file', 'media'),
       'settings' => array(
         'colorbox_node_style' => '',
         'colorbox_image_style' => '',
diff --git a/sites/all/modules/contrib/colorbox/colorbox.theme.inc b/sites/all/modules/contrib/colorbox/colorbox.theme.inc
index eebdbb3..b6e7afd 100644
--- a/sites/all/modules/contrib/colorbox/colorbox.theme.inc
+++ b/sites/all/modules/contrib/colorbox/colorbox.theme.inc
@@ -25,8 +25,8 @@ function theme_colorbox_image_formatter($variables) {
 
   $image = array(
     'path' => $item['uri'],
-    'alt' => $item['alt'],
-    'title' => $item['title'],
+    'alt' => isset($item['alt']) ? $item['alt'] : NULL,
+    'title' => isset($item['title']) ? $item['title'] : NULL,
     'style_name' => $settings['colorbox_node_style'],
   );