diff --git export/views_bonus_export.info export/views_bonus_export.info
index 9fca64c..57b402f 100644
--- export/views_bonus_export.info
+++ export/views_bonus_export.info
@@ -3,5 +3,17 @@ name = Bonus: Views Export
 description = "Plugin to export views a couple of formats including Comma Separated Values(CSV), Doc or XML"
 dependencies[] = views
 package = Views
-core = 6.x
+core = 7.x
+files[] = views_bonus_export.module
+files[] = views_bonus_export.views.inc
+files[] = views_bonus_export.theme.inc
+; Style handlers
+files[] = views_bonus_plugin_style_export_csv.inc
+files[] = views_bonus_plugin_style_export_doc.inc
+files[] = views_bonus_plugin_style_export.inc
+files[] = views_bonus_plugin_style_export_txt.inc
+files[] = views_bonus_plugin_style_export_xls.inc
+files[] = views_bonus_plugin_style_export_xml.inc
+
+
 
diff --git export/views_bonus_export.module export/views_bonus_export.module
index 9510ec2..359754c 100644
--- export/views_bonus_export.module
+++ export/views_bonus_export.module
@@ -46,12 +46,13 @@ function views_bonus_export_theme() {
  *
  * @ingroup themeable
  */
-function theme_views_bonus_export_feed_icon($image_path, $url, $query = '', $text = '') {
+function theme_views_bonus_export_feed_icon($variables) {
+  extract($variables, EXTR_SKIP);
   $url_options = array('html' => true);
   if ($query) {
     $url_options['query'] = $query;
   }
-  $image = theme('image', $image_path, $text, $text);
+  $image = theme('image', array('path' => $image_path, 'title' => $text, 'alt' => $text));
   return l($image, $url, $url_options);
 }
 
@@ -176,11 +177,11 @@ function views_bonus_export_views_post_render(&$view, &$output, &$cache) {
 function _views_bonus_export_add_headers(&$view) {
   $style = $view->style_plugin;
 
-  drupal_set_header('Cache-Control: max-age=60, must-revalidate');
+  drupal_add_http_header('Cache-Control: max-age=60, must-revalidate');
 
   if (!empty($style->definition['export headers'])) {
     foreach ($style->definition['export headers'] as $header) {
-      drupal_set_header($header);
+      drupal_add_http_header($header);
     }
   }
 
@@ -191,7 +192,7 @@ function _views_bonus_export_add_headers(&$view) {
     );
 
     if ($filename) {
-      drupal_set_header('Content-Disposition: attachment; filename="'. $filename .'"');
+      drupal_add_http_header('Content-Disposition: attachment; filename="'. $filename .'"');
     }
   }
 }
diff --git paged_feed/views_bonus_paged_feed.info paged_feed/views_bonus_paged_feed.info
index e31f083..c0f0805 100644
--- paged_feed/views_bonus_paged_feed.info
+++ paged_feed/views_bonus_paged_feed.info
@@ -3,4 +3,7 @@ name = Bonus: Paged Feed
 description = "Like a feed display on it pages. How cool!"
 dependencies[] = views
 package = Views
-core = 6.x
+core = 7.x
+files[] = views_bonus_paged_feed.module
+files[] = views_bonus_paged_feed.views.inc
+files[] = views_bonus_plugin_display_paged_feed.inc
diff --git panels/views_bonus_panels.info panels/views_bonus_panels.info
index a4f91ce..d0d442e 100644
--- panels/views_bonus_panels.info
+++ panels/views_bonus_panels.info
@@ -4,4 +4,11 @@ description = Various views style plugins to put views nodes in panels
 dependencies[] = views
 dependencies[] = panels
 package = Views
-core = 6.x
+core = 7.x
+files[] = views_bonus_panels.module
+files[] = views_bonus_panels.views.inc
+files[] = views_bonus_plugin_style_panels_threecol.inc
+files[] = views_bonus_plugin_style_panels_threecol_stack.inc
+files[] = views_bonus_plugin_style_panels_threecol_term.inc
+files[] = views_bonus_plugin_style_panels_twocol.inc
+files[] = views_bonus_plugin_style_panels_twocol_stack.inc
diff --git panels/views_bonus_panels.module panels/views_bonus_panels.module
index f823710..f92b578 100644
--- panels/views_bonus_panels.module
+++ panels/views_bonus_panels.module
@@ -14,7 +14,9 @@ function views_bonus_panels_views_api() {
   );
 }
 
-function theme_views_bonus_panels_render($view, $options, $rows, $title) {
+function theme_views_bonus_panels_render($variables)) {
+  extract($variables, EXTR_SKIP);
+
   panels_load_include('display-render');
   list($panel_name, $content) = views_bonus_panels_shared_preprocess($view->plugin_name, $rows);
   return panels_print_layout($panel_name, $content);
diff --git views_spy/views-bonus-spy.js views_spy/views-bonus-spy.js
index 6797f81..daaf81c 100644
--- views_spy/views-bonus-spy.js
+++ views_spy/views-bonus-spy.js
@@ -64,17 +64,19 @@
    
 })(jQuery);
 
-Drupal.behaviors.views_spy = function(context) {
-  $.each(Drupal.settings.views_spy, function(id) {
-    /*
-     * Our view settings
-     */
-    var interval = this.interval;  // How fast we'll be switching through the elements
-    var limit = this.limit;  // How many items to show at a time
-    var fadespeed = this.fadespeed; // How fast the opacity animation will be
-    var slidespeed = this.slidespeed; // How fast the sliding animation will be
-    var autopause = this.autopause; // pause on mouse over
-    
-    $('#' + id).simpleSpy(limit, interval, fadespeed, slidespeed, autopause);
-  });
-};
+Drupal.behaviors.views_spy = {
+  attach: function(context) {
+    $.each(Drupal.settings.views_spy, function(id) {
+      /*
+       * Our view settings
+       */
+      var interval = this.interval;  // How fast we'll be switching through the elements
+      var limit = this.limit;  // How many items to show at a time
+      var fadespeed = this.fadespeed; // How fast the opacity animation will be
+      var slidespeed = this.slidespeed; // How fast the sliding animation will be
+      var autopause = this.autopause; // pause on mouse over
+
+      $('#' + id).simpleSpy(limit, interval, fadespeed, slidespeed, autopause);
+    });
+  };
+}
diff --git views_spy/views_bonus_spy.info views_spy/views_bonus_spy.info
index be96928..5bfb68a 100644
--- views_spy/views_bonus_spy.info
+++ views_spy/views_bonus_spy.info
@@ -2,6 +2,9 @@
 name = Bonus: Views Spy
 description = Provides an jQuery spy views display plugin.
 package = Views
-core = 6.x
+core = 7.x
 dependencies[] = views
+files[] = views_bonus_plugin_style_spy.inc
+files[] = views_bonus_spy.module
+files[] = views_bonus_spy.views.inc