diff --git a/includes/TimelineEvent.class.inc b/includes/TimelineEvent.class.inc
index 1c0d2ea..697bebb 100644
--- a/includes/TimelineEvent.class.inc
+++ b/includes/TimelineEvent.class.inc
@@ -47,8 +47,8 @@ class TimelineEvent {
       if (isset($row->{$tmp['alias']})) {
         $data = array();
         $tmp = $this->getDefinedFieldUsage('title');
-        $data['title'] = theme('timeline_bubble_title', $row, $tmp['alias']);
-        $data['link'] = theme('timeline_bubble_url', $row, $this->view->style_options['fields']['link']);
+        $data['title'] = theme('timeline_bubble_title', array('row' => $row, 'alias' => $tmp['alias']));
+        $data['link'] = theme('timeline_bubble_url', array('row' => $row, 'link_enabled' => $this->view->style_options['fields']['link']));
 
         $events_validated = $this->logic($row);
         $data['start'] = $events_validated['start']['formated'];
diff --git a/timeline.module b/timeline.module
index 95e57cf..1cf79d7 100644
--- a/timeline.module
+++ b/timeline.module
@@ -45,7 +45,7 @@ function timeline_theme() {
       'arguments' => array('row' => NULL, 'link_enabled' => NULL),
     ),
     'timeline_debug' => array(
-      'arguments' => array('debug_array'),
+      'arguments' => array('debug_array' => NULL),
     ),
   );
 }
diff --git a/timeline.theme.inc b/timeline.theme.inc
index 4cc1e18..499da2f 100644
--- a/timeline.theme.inc
+++ b/timeline.theme.inc
@@ -9,7 +9,7 @@
  */
 function template_preprocess_views_view_timeline(&$vars) {
   if (isset($vars['options']['debug'])) {
-    $vars['debug'] = theme('timeline_debug', $vars['options']['debug']);
+    $vars['debug'] = theme('timeline_debug', array('debug_array' => $vars['options']['debug']));
   }
   // check if data is available
   if ($vars['options']['timeline']['data_count'] > 0) {
@@ -26,7 +26,7 @@ function template_preprocess_views_view_timeline(&$vars) {
     }
   }
   else {
-    theme('timeline_nodata');
+    theme('timeline_nodata', array());
   }
 }
 
@@ -35,7 +35,7 @@ function template_preprocess_views_view_timeline(&$vars) {
  * Overridable theme function.
  * This functions prints a warning when no data is available.
  */
-function theme_timeline_nodata() {
+function theme_timeline_nodata($vars) {
   drupal_set_message(t('There is no data available to show on the timeline'), 'warning');
 }
 
@@ -43,7 +43,9 @@ function theme_timeline_nodata() {
  * Overridable theme function.
  * This returns the title of each event bubble on the timeline.
  */
-function theme_timeline_bubble_title($row, $alias) {
+function theme_timeline_bubble_title($vars) {
+  $row = $vars['row'];
+  $alias = $vars['alias'];
   return $row->$alias;
 }
 
@@ -52,7 +54,10 @@ function theme_timeline_bubble_title($row, $alias) {
  * Overridable theme function.
  * This creates the url that the title of each event bubble is linked to.
  */
-function theme_timeline_bubble_url($row, $link_enabled) {
+function theme_timeline_bubble_url($vars) {
+  $row = $vars['row'];
+  $link_enabled = $vars['link_enabled'];
+
   if ($link_enabled) {
     return base_path() . drupal_get_path_alias('node/' . $row->nid);
   }
@@ -62,7 +67,8 @@ function theme_timeline_bubble_url($row, $link_enabled) {
 /*
  * Function to theme a textarea with a array inside
  */
-function theme_timeline_debug($debug_array) {
+function theme_timeline_debug($vars) {
+  $debug_array = $vars['debug_array'];
   $output = '<div id="timeline_debug">';
   $output .= '<label><strong>DEBUG:</strong></label>';
   $output .= '<div class="resizable-textarea"><textarea id="edit-code" class="form-textarea resizable textarea-processed" name="code" rows ="10" cols="60">';