diff --git a/theme/views_slideshow_jcarousel.theme.inc b/theme/views_slideshow_jcarousel.theme.inc
index 9993f73..bce1976 100644
--- a/theme/views_slideshow_jcarousel.theme.inc
+++ b/theme/views_slideshow_jcarousel.theme.inc
@@ -26,7 +26,7 @@ function _views_slideshow_jcarousel_preprocess_pager(&$vars) {
   );
 
   // Add the settings to the page.
-  drupal_add_js($js_vars, 'setting');
+  drupal_add_js($js_vars, array('type' => 'setting', 'scope' => JS_DEFAULT));
 
   // Add our class to the wrapper.
   $vars['attributes']['class'] = (isset($vars['attributes']['class'])) ? $vars['attributes']['class'] . ' views_slideshow_jcarousel_pager jcarousel-skin-' . $vars['settings']['views_slideshow_jcarousel_pager_skin'] : 'views_slideshow_jcarousel_pager jcarousel-skin-' . $vars['settings']['views_slideshow_jcarousel_pager_skin'];
@@ -39,10 +39,10 @@ function _views_slideshow_jcarousel_preprocess_pager(&$vars) {
       $rendered_fields = '';
       foreach ($vars['settings']['views_slideshow_jcarousel_pager_fields'] as $field => $use) {
         if ($use !== 0 && is_object($vars['view']->field[$field])) {
-          $rendered_fields .= theme('views_slideshow_jcarousel_pager_field', $vars['view'], $field, $count);
+          $rendered_fields .= theme('views_slideshow_jcarousel_pager_field', array('view' => $vars['view'], 'field' => $field, 'count' => $count));
         }
       }
-      $vars['rendered_field_items'] .= theme('views_slideshow_jcarousel_pager_item', $vars['vss_id'], $rendered_fields, $count, $vars['location']);
+      $vars['rendered_field_items'] .= theme('views_slideshow_jcarousel_pager_item', array('vss_id' => $vars['vss_id'], 'item' => $rendered_fields, 'count' => $count, 'location' => $vars['location']));
     }
 
     if (module_exists('libraries')) {
diff --git a/views_slideshow_jcarousel.info b/views_slideshow_jcarousel.info
index ac6f59c..0c7d679 100644
--- a/views_slideshow_jcarousel.info
+++ b/views_slideshow_jcarousel.info
@@ -2,4 +2,4 @@ name = Views Slideshow: JCarousel
 description = Adds a jCarousel option to views slideshow
 dependencies[] = views_slideshow
 package = Views
-core = 6.x
+core = 7.x
diff --git a/views_slideshow_jcarousel.module b/views_slideshow_jcarousel.module
index bcfe53e..8821dda 100644
--- a/views_slideshow_jcarousel.module
+++ b/views_slideshow_jcarousel.module
@@ -1,20 +1,20 @@
 <?php
 /**
- * Implement hook_theme().
+ * Implements hook_theme().
  */
 function views_slideshow_jcarousel_theme($existing, $type, $theme, $path) {
   return array(
     'views_slideshow_jcarousel_pager' => array(
-      'arguments' => array('vss_id' => NULL, 'view' => NULL, 'settings' => array(), 'location' => NULL, 'attributes' => array()),
+      'variables' => array('vss_id' => NULL, 'view' => NULL, 'settings' => array(), 'location' => NULL, 'attributes' => array()),
       'template' => 'theme/views-slideshow-jcarousel-pager',
     ),
     'views_slideshow_jcarousel_pager_field' => array(
-      'arguments' => array('view' => NULL, 'field' => NULL, 'count' => NULL),
+      'variables' => array('view' => NULL, 'field' => NULL, 'count' => NULL),
       'template' => 'theme/views-slideshow-jcarousel-pager-field',
       'file' => 'theme/views_slideshow_jcarousel.theme.inc',
     ),
     'views_slideshow_jcarousel_pager_item' => array(
-      'arguments' => array('vss_id' => NULL, 'item' => NULL, 'count' => NULL, 'location' => NULL),
+      'variables' => array('vss_id' => NULL, 'item' => NULL, 'count' => NULL, 'location' => NULL),
       'template' => 'theme/views-slideshow-jcarousel-pager-item',
     ),
   );
@@ -49,6 +49,10 @@ function _views_slideshow_jcarousel_library_path() {
   return $jcarousel_path;
 }
 
+/**
+ * @todo Please document this function.
+ * @see http://drupal.org/node/1354
+ */
 function views_slideshow_jcarousel_views_slideshow_js_method_register() {
   return array(
     'viewsSlideshowJcarouselPager',
@@ -56,7 +60,7 @@ function views_slideshow_jcarousel_views_slideshow_js_method_register() {
 }
 
 /**
- * Implementation of hook_views_slideshow_info
+ * Implements hook_views_slideshow_info().
  */
 function views_slideshow_jcarousel_views_slideshow_widget_pager_info($view) {
   $settings = array();
@@ -74,7 +78,7 @@ function views_slideshow_jcarousel_views_slideshow_widget_pager_info($view) {
 }
 
 /**
- * Implements hook_views_slideshow_option_definition.
+ * Implements hook_views_slideshow_option_definition().
  */
 function views_slideshow_jcarousel_views_slideshow_option_definition() {
   $locations = array('top', 'bottom');
@@ -121,7 +125,7 @@ function views_slideshow_jcarousel_pager_views_slideshow_widget_pager_form_optio
     '#dependency' => array(
       $dependency . '-enable' => array(1),
       $dependency . '-type' => array('views_slideshow_jcarousel_pager'),
-    )
+    ),
   );
 
   // Add field to see if they would like the carousel to activate the pager item
@@ -174,7 +178,10 @@ function views_slideshow_jcarousel_pager_views_slideshow_widget_pager_form_optio
   $form['views_slideshow_jcarousel_pager_orientation'] = array(
     '#type' => 'select',
     '#title' => t('Orientation of the Pager'),
-    '#options' => array(FALSE => 'Horizontal', TRUE => 'Vertical'),
+    '#options' => array(
+      FALSE => 'Horizontal',
+      TRUE => 'Vertical',
+    ),
     '#default_value' => $defaults['views_slideshow_jcarousel_pager_orientation'],
     '#description' => t('Should the pager be horizontal or vertical.'),
     '#prefix' => '<div id="' . $dependency . '-views-slideshow-jcarousel-pager-orientation">',
@@ -250,7 +257,13 @@ function views_slideshow_jcarousel_pager_views_slideshow_widget_pager_form_optio
   $form['views_slideshow_jcarousel_pager_wrap'] = array(
     '#type' => 'select',
     '#title' => t('Wrapping'),
-    '#options' => array(NULL => 'Disabled', 'circular' => 'Circular', 'first' => 'First', 'last' => 'Last', 'both' => 'Both'),
+    '#options' => array(
+      NULL => 'Disabled',
+      'circular' => 'Circular',
+      'first' => 'First',
+      'last' => 'Last',
+      'both' => 'Both',
+    ),
     '#default_value' => $defaults['views_slideshow_jcarousel_pager_wrap'],
     '#description' => t('Wrap the carousel.'),
     '#prefix' => '<div id="' . $dependency . '-views-slideshow-jcarousel-pager-wrap">',
@@ -275,7 +288,7 @@ function views_slideshow_jcarousel_pager_views_slideshow_widget_pager_form_optio
  */
 
 // Trying to make sure the theme.inc get's loaded.
-include_once('theme/views_slideshow_jcarousel.theme.inc');
+include_once DRUPAL_ROOT . '/' . 'theme/views_slideshow_jcarousel.theme.inc';
 
 function template_preprocess_views_slideshow_jcarousel_pager(&$vars) {
   _views_slideshow_jcarousel_preprocess_pager($vars);