diff --git a/js/splashify.js b/js/splashify.js
index 4cfd101..35d1e78 100644
--- a/js/splashify.js
+++ b/js/splashify.js
@@ -2,11 +2,13 @@ Drupal.behaviors.splashify = function(context) {
   $(window).load(function() {
     var settings = Drupal.settings;
     var splash = $.jStorage.get("splash");
-    var nowtimeSeconds = settings.splashify.js_nowtime;
+    var expireAfter = settings.splashify.js_expire_after;
+    var now = new Date();
+    var nowtimeSeconds = now.getTime() / 1000;
     var splashalways = settings.splashify.js_splash_always;
     if (!splash || (splash < nowtimeSeconds) || (splashalways == '1')) {
       // Set when the splash variable should expire.
-      $.jStorage.set("splash", settings.splashify.js_expiretime);
+      $.jStorage.set("splash", nowtimeSeconds + expireAfter);
 
       // If we are displaying each splash page in sequence, we need to
       // determine the next url.
diff --git a/splashify.display.inc b/splashify.display.inc
index c491b99..6e36a9b 100644
--- a/splashify.display.inc
+++ b/splashify.display.inc
@@ -271,9 +271,8 @@ function splashify_init() {
 
   // Make our splash settings variables available to our JavaScript.
   $js_settings = array(
-    'js_nowtime' => $js_nowtime,
     'js_splash_always' => $js_splash_always ? '1' : '0',
-    'js_expiretime' => $js_expiretime,
+    'js_expire_after' => $js_expiretime - $js_nowtime,
     'js_mode' => $js_mode,
     'js_mode_settings' => $js_mode_settings,
   );
diff --git a/splashify.module b/splashify.module
index 698a368..90ecb68 100644
--- a/splashify.module
+++ b/splashify.module
@@ -23,7 +23,7 @@ function splashify_menu() {
   );
 
   // Define the admin area.
-  $items['admin/config/system/splashify'] = array(
+  $items['admin/settings/splashify'] = array(
     'page callback' => 'drupal_get_form',
     'page arguments' => array('splashify_admin_when_form'),
     'title' => 'Splashify',
@@ -34,7 +34,7 @@ function splashify_menu() {
     'weight' => 6,
   );
 
-  $items['admin/config/system/splashify/when'] = array(
+  $items['admin/settings/splashify/when'] = array(
     'page callback' => 'drupal_get_form',
     'page arguments' => array('splashify_admin_when_form'),
     'title' => 'When',
@@ -44,7 +44,7 @@ function splashify_menu() {
     'weight' => 6,
   );
 
-  $items['admin/config/system/splashify/where'] = array(
+  $items['admin/settings/splashify/where'] = array(
     'page callback' => 'drupal_get_form',
     'page arguments' => array('splashify_admin_where_form'),
     'title' => 'Where',
@@ -54,7 +54,7 @@ function splashify_menu() {
     'weight' => 8,
   );
 
-  $items['admin/config/system/splashify/what'] = array(
+  $items['admin/settings/splashify/what'] = array(
     'page callback' => 'drupal_get_form',
     'page arguments' => array('splashify_admin_what_form'),
     'title' => 'What',
@@ -64,7 +64,7 @@ function splashify_menu() {
     'weight' => 10,
   );
 
-  $items['admin/config/system/splashify/how'] = array(
+  $items['admin/settings/splashify/how'] = array(
     'page callback' => 'drupal_get_form',
     'page arguments' => array('splashify_admin_how_form'),
     'title' => 'How',
@@ -80,13 +80,8 @@ function splashify_menu() {
 /**
  * Implements hook_permission().
  */
-function splashify_permission() {
-  return array(
-    'access splashify admin' => array(
-      'title' => t('Administer Splashify'),
-      'description' => t('Access the admin area for the splashify module.'),
-    ),
-  );
+function splashify_perm() {
+  return array('access splashify admin');
 }
 
 /**