diff --git a/views_litepager.info b/views_litepager.info
index be66908..2e7069a 100644
--- a/views_litepager.info
+++ b/views_litepager.info
@@ -1,5 +1,6 @@
 name = Views Litepager
 description = Provide a pager plugin for Views that doesn't require an expensive count query
 dependencies[] = views
-core = 6.x
-package = Views
\ No newline at end of file
+core = 7.x
+package = Views
+files[] = views_litepager_plugin_pager_lite.inc
\ No newline at end of file
diff --git a/views_litepager.module b/views_litepager.module
index 80c4f3f..85ccb09 100644
--- a/views_litepager.module
+++ b/views_litepager.module
@@ -20,49 +20,63 @@ function views_litepager_views_api() {
 function views_litepager_theme() {
   return array(
     'pager_lite' => array(
-      'arguments' => array('tags' => array(), 'limit' => 10, 'element' => 0, 'parameters' => array()),
+      'variables' => array('tags' => array(), 'element' => 0, 'parameters' => array()),
     ),
     'pager_lite_next' => array(
-      'arguments' => array('text' => NULL, 'limit' => NULL, 'element' => 0, 'interval' => 1, 'parameters' => array()),
+      'variables' => array('text' => NULL, 'element' => 0, 'interval' => 1, 'parameters' => array()),
     ),
   );
 }
 
-function theme_pager_lite($tags = array(), $limit = 10, $element = 0, $parameters = array(), $quantity = 9, $pager = NULL) {
+function theme_pager_lite($variables) {
+  $tags = $variables['tags'];
+  $element = $variables['element'];
+  $parameters = $variables['parameters'];
   global $pager_page_array, $pager_total;
 
   // current is the page we are currently paged to
   $pager_current = $pager_page_array[$element] + 1;
 
 
-  $li_previous = theme('pager_previous', (isset($tags[1]) ? $tags[1] : t('‹‹')), $limit, $element, 1, $parameters);
+  $li_previous = theme('pager_previous', array('text' => (isset($tags[1]) ? $tags[1] : t('‹‹')), 'element' => $element, 'interval' => 1, 'parameters' => $parameters));
   if (empty($li_previous)) {
     $li_previous = " ";
   }
 
-  $li_next = theme('pager_lite_next', (isset($tags[3]) ? $tags[3] : t('››')), $limit, $element, 1, $parameters);
+  $li_next = theme('pager_lite_next', array('text' => (isset($tags[3]) ? $tags[3] : t('››')), 'element' => $element, 'interval' => 1, 'parameters' => $parameters));
   if (empty($li_next)) {
     $li_next = " ";
   }
 
   $items[] = array(
-    'class' => 'pager-previous',
+    'class' => array('pager-previous'),
     'data' => $li_previous,
   );
 
   $items[] = array(
-    'class' => 'pager-current',
+    'class' => array('pager-current'),
     'data' => format_plural($pager_current, 'Page 1', 'Page @count'),
   );
 
   $items[] = array(
-    'class' => 'pager-next',
+    'class' => array('pager-next'),
     'data' => $li_next,
   );
-  return theme('item_list', $items, NULL, 'ul', array('class' => 'pager'));
+  return theme('item_list', array(
+    'items' => $items,
+    'title' => NULL,
+    'type' => 'ul',
+    'attributes' => array('class' => array('pager')),
+    )
+  );
 }
 
-function theme_pager_lite_next($text, $limit, $element = 0, $interval = 1, $parameters = array()) {
+function theme_pager_lite_next($variables) {
+  $text = $variables['text'];
+  $element = $variables['element'];
+  $interval = $variables['interval'];
+  $parameters = $variables['parameters'];
+
   global $pager_page_array, $pager_total;
   $output = '';
 
@@ -71,11 +85,11 @@ function theme_pager_lite_next($text, $limit, $element = 0, $interval = 1, $para
     $page_new = pager_load_array($pager_page_array[$element] + $interval, $element, $pager_page_array);
     // If the next page is the last page, mark the link as such.
     if ($pager_page_array[$element] == $pager_total[$element]) {
-      $output = theme('pager_last', $text, $limit, $element, $parameters);
+      $output = theme('pager_last', array('text' => $text, 'element' => $element, 'parameters' => $parameters));
     }
     // The next page is not the last page.
     else {
-      $output = theme('pager_link', $text, $page_new, $element, $parameters);
+      $output = theme('pager_link', array('text' => $text, 'page_new' => $page_new, 'element' => $element, 'parameters' => $parameters));
     }
   }
 
diff --git a/views_litepager.views.inc b/views_litepager.views.inc
index cacff4f..6f97464 100644
--- a/views_litepager.views.inc
+++ b/views_litepager.views.inc
@@ -5,7 +5,7 @@
  */
 
 /**
- * Implementation of hook_views_plugins
+ * Implements hook_views_plugins().
  */
 function views_litepager_views_plugins() {
   $plugins = array(
diff --git a/views_litepager_plugin_pager_lite.inc b/views_litepager_plugin_pager_lite.inc
index 2f93222..6923b62 100644
--- a/views_litepager_plugin_pager_lite.inc
+++ b/views_litepager_plugin_pager_lite.inc
@@ -47,7 +47,10 @@ class views_litepager_plugin_pager_lite extends views_plugin_pager_full {
     }
     else {
       $pager_theme = views_theme_functions('pager_lite', $this->view, $this->display);
-      return theme($pager_theme, $input, $this->options['items_per_page'], $this->options['id']);
+
+      $output = theme($pager_theme, array(
+        'parameters' => $input, 'element' => $this->options['id']));
+      return $output;
     }
   }
 }