diff --git a/panels/views-bonus-panels-threecol-term.tpl.php b/panels/views-bonus-panels-threecol-term.tpl.php
index 6c27552..298fb3b 100644
--- a/panels/views-bonus-panels-threecol-term.tpl.php
+++ b/panels/views-bonus-panels-threecol-term.tpl.php
@@ -1,9 +1,9 @@
 <?php
-// $Id: views-bonus-panels-threecol-term.tpl.php,v 1.1 2009-01-03 04:50:45 neclimdul Exp $
+// $Id: views-bonus-panels-threecol-term.tpl.php,v 1.1 2009/01/03 04:50:45 neclimdul Exp $
 /**
  * @file
  * Three column term grouped rendering template.
  */
 
-panels_load_include('display-render');
+//panels_load_include('display-render');
 print panels_print_layout($panel_name, $content);
diff --git a/panels/views_bonus_panels.info b/panels/views_bonus_panels.info
index a4f91ce..eb90e6f 100644
--- a/panels/views_bonus_panels.info
+++ b/panels/views_bonus_panels.info
@@ -1,7 +1,19 @@
-; $Id: views_bonus_panels.info,v 1.1 2008-12-28 05:26:20 neclimdul Exp $
+; $Id: views_bonus_panels.info,v 1.1 2008/12/28 05:26:20 neclimdul Exp $
 name = Bonus: Panels
 description = Various views style plugins to put views nodes in panels
 dependencies[] = views
 dependencies[] = panels
 package = Views
-core = 6.x
+core = 7.x
+
+project = "views_bonus"
+datestamp = "1276701909"
+
+files[] = views-bonus-panels-threecol-term.tpl.php
+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 a/panels/views_bonus_panels.module b/panels/views_bonus_panels.module
index f823710..6279956 100644
--- a/panels/views_bonus_panels.module
+++ b/panels/views_bonus_panels.module
@@ -1,12 +1,12 @@
 <?php
-// $Id: views_bonus_panels.module,v 1.4 2009-06-24 08:20:35 neclimdul Exp $
+// $Id: views_bonus_panels.module,v 1.4 2011/06/06 08:20:35 neclimdul Exp $
 /**
  * @file
  * Base module file for views bonus panels plugins.
  */
 
 /**
- * Implementation of hook_views_api().
+ * Implements hook_views_api().
  */
 function views_bonus_panels_views_api() {
   return array(
@@ -14,8 +14,24 @@ function views_bonus_panels_views_api() {
   );
 }
 
-function theme_views_bonus_panels_render($view, $options, $rows, $title) {
-  panels_load_include('display-render');
+function views_bonus_panels_theme() {
+  return array (
+    'views_bonus_panels_render' => array (
+      'variables' => array ('view' => NULL, 'options' => NULL, 'rows' => NULL, 'title' => NULL)
+    )
+  );
+}
+
+/**
+ * @todo Please document this function.
+ * @see http://drupal.org/node/1354
+ */
+function theme_views_bonus_panels_render($variables) {
+  $view = $variables['view'];
+  $options = $variables['options'];
+  $rows = $variables['rows'];
+  $title = $variables['title'];
+
   list($panel_name, $content) = views_bonus_panels_shared_preprocess($view->plugin_name, $rows);
   return panels_print_layout($panel_name, $content);
 }
@@ -28,7 +44,7 @@ function template_preprocess_views_bonus_panels_threecol_term(&$vars) {
  * Shared preprocess to devide out rendered rows into panel sections.
  *
  * @param plugin_name
- * 
+ *
  * @param $rows
  * An array of rendered views rows.
  * @return
diff --git a/panels/views_bonus_panels.views.inc b/panels/views_bonus_panels.views.inc
index ad78f59..e85b1d5 100644
--- a/panels/views_bonus_panels.views.inc
+++ b/panels/views_bonus_panels.views.inc
@@ -1,12 +1,12 @@
 <?php
-// $Id: views_bonus_panels.views.inc,v 1.4 2009-06-30 19:22:24 neclimdul Exp $
+// $Id: views_bonus_panels.views.inc,v 1.4 2009/06/30 19:22:24 neclimdul Exp $
 /**
  * @file
  * Views include file with views hooks.
  */
 
 /**
- * Implementation of hook_views_plugins().
+ * Implements hook_views_plugins().
  */
 function views_bonus_panels_views_plugins() {
   return array(
diff --git a/panels/views_bonus_plugin_style_panels_threecol.inc b/panels/views_bonus_plugin_style_panels_threecol.inc
index a36b4fc..6328647 100644
--- a/panels/views_bonus_plugin_style_panels_threecol.inc
+++ b/panels/views_bonus_plugin_style_panels_threecol.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: views_bonus_plugin_style_panels_threecol.inc,v 1.3 2009-01-03 04:50:45 neclimdul Exp $
+// $Id: views_bonus_plugin_style_panels_threecol.inc,v 1.3 2009/01/03 04:50:45 neclimdul Exp $
 /**
  * @file
  * Plugin include file for a 3 column style plugin.
diff --git a/panels/views_bonus_plugin_style_panels_threecol_stack.inc b/panels/views_bonus_plugin_style_panels_threecol_stack.inc
index 8dad174..84536f5 100644
--- a/panels/views_bonus_plugin_style_panels_threecol_stack.inc
+++ b/panels/views_bonus_plugin_style_panels_threecol_stack.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: views_bonus_plugin_style_panels_threecol_stack.inc,v 1.3 2009-01-03 04:50:45 neclimdul Exp $
+// $Id: views_bonus_plugin_style_panels_threecol_stack.inc,v 1.3 2009/01/03 04:50:45 neclimdul Exp $
 /**
  * @file
  * Plugin include file for a 3 column stacked style plugin.
diff --git a/panels/views_bonus_plugin_style_panels_threecol_term.inc b/panels/views_bonus_plugin_style_panels_threecol_term.inc
index 906208c..ca58efc 100644
--- a/panels/views_bonus_plugin_style_panels_threecol_term.inc
+++ b/panels/views_bonus_plugin_style_panels_threecol_term.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: views_bonus_plugin_style_panels_threecol_term.inc,v 1.3 2009-01-03 04:50:45 neclimdul Exp $
+// $Id: views_bonus_plugin_style_panels_threecol_term.inc,v 1.3 2009/01/03 04:50:45 neclimdul Exp $
 /**
  * @file
  * Plugin include file for a 3 column term based style plugin.
diff --git a/panels/views_bonus_plugin_style_panels_twocol.inc b/panels/views_bonus_plugin_style_panels_twocol.inc
index d43c608..1fb4504 100644
--- a/panels/views_bonus_plugin_style_panels_twocol.inc
+++ b/panels/views_bonus_plugin_style_panels_twocol.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: views_bonus_plugin_style_panels_twocol.inc,v 1.3 2009-01-03 04:50:45 neclimdul Exp $
+// $Id: views_bonus_plugin_style_panels_twocol.inc,v 1.3 2009/01/03 04:50:45 neclimdul Exp $
 /**
  * @file
  * Plugin include file for a 2 column style plugin.
diff --git a/panels/views_bonus_plugin_style_panels_twocol_stack.inc b/panels/views_bonus_plugin_style_panels_twocol_stack.inc
index 2225024..1c64b65 100644
--- a/panels/views_bonus_plugin_style_panels_twocol_stack.inc
+++ b/panels/views_bonus_plugin_style_panels_twocol_stack.inc
@@ -1,8 +1,8 @@
 <?php
-// $Id: views_bonus_plugin_style_panels_twocol_stack.inc,v 1.3 2009-01-03 04:50:45 neclimdul Exp $
+// $Id: views_bonus_plugin_style_panels_twocol_stack.inc,v 1.3 2009/01/03 04:50:45 neclimdul Exp $
 /**
  * @file
-* Plugin include file for a 2 column stacked style plugin.
+ * Plugin include file for a 2 column stacked style plugin.
  */
 
 /**