diff --git a/media_gallery.fields.inc b/media_gallery.fields.inc
index f172915..88708ed 100644
--- a/media_gallery.fields.inc
+++ b/media_gallery.fields.inc
@@ -132,6 +132,9 @@ function media_gallery_field_formatter_view($entity_type, $entity, $field, $inst
       case 'media_gallery_collection_thumbnail':
         $element[$delta]['#theme'] = 'media_gallery_collection_thumbnail';
         break;
+      default:
+        $element[$delta]['#theme'] = $file_view_mode;
+        break;
     }
   }
 
diff --git a/media_gallery.module b/media_gallery.module
index 6d1641e..1c89f58 100644
--- a/media_gallery.module
+++ b/media_gallery.module
@@ -22,13 +22,15 @@ define('MEDIA_GALLERY_PAGER_ELEMENT', 1);
  * Helper function to return the view modes used by this module for displaying files in gallery context.
  */
 function media_gallery_file_view_modes() {
-  return array(
+  $modes = array(
     'media_gallery_thumbnail' => t('Gallery thumbnail'),
     'media_gallery_lightbox' => t('Gallery lightbox'),
     'media_gallery_detail' => t('Gallery detail'),
     'media_gallery_block_thumbnail' => t('Gallery block thumbnail'),
     'media_gallery_collection_thumbnail' => t('Gallery collection thumbnail'),
   );
+  drupal_alter('media_gallery_file_view_modes', $modes);
+  return $modes;
 }
 
 /**