diff --git a/admin.inc b/admin.inc
index 401c6cd..fc2ea7a 100644
--- a/admin.inc
+++ b/admin.inc
@@ -17,6 +17,7 @@
       <p><?php _e('Need some sane defaults for your theme? Click one of the links below to populate the selectors on the left:', 'keyboard-navigation') ?></p>
 
       <ul>
+        <li><a href="#" class="pre-populate comicpress_28"><?php _e('Default ComicPress 2.8 Theme', 'keyboard-navigation') ?></a></li>
         <li><a href="#" class="pre-populate comicpress_25"><?php _e('Default ComicPress 2.5 Theme', 'keyboard-navigation') ?></a></li>
       </ul>
     </div>
@@ -60,6 +61,12 @@
         next:     "div#menunav a span.next",
         first:    "",
         last:     "div#header h1 a"
+      },
+      'comicpress_28': {
+        previous: ".navi-prev",
+        next:     ".navi-next",
+        first:    ".navi-first",
+        last:     ".navi-last"
       }
     };
     
diff --git a/keyboard-navigation.js b/keyboard-navigation.js
index f4cd059..feb90f1 100644
--- a/keyboard-navigation.js
+++ b/keyboard-navigation.js
@@ -15,7 +15,7 @@ KeyboardNavigation.get_hrefs = function(fields, admin_mode) {
         while (top_node) {
           if (top_node.href) {
             found_properties[key] = top_node.href; is_found = true;
-            if (highlight_selectors) {
+            if (admin_mode) {
               var highlight_a = new Element("a", { "title": key + ": " + instructions, "href": top_node.href, "style": "display: block; position: absolute; border: solid #f00 1px; background-color: #ff0; z-index: 1" });
               highlight_a.setOpacity(0.5);
               highlight_a.clonePosition(top_node);
@@ -33,7 +33,7 @@ KeyboardNavigation.get_hrefs = function(fields, admin_mode) {
     }
   }
 
-  if (highlight_selectors) {
+  if (admin_mode) {
     if (missing_properties.length > 0) {
       var message = "[Keyboard Navigation] Missing selectors:\n\n" + missing_properties.join("\n");
       if (top.console) {
diff --git a/keyboard-navigation.php b/keyboard-navigation.php
index e095f50..657132f 100644
--- a/keyboard-navigation.php
+++ b/keyboard-navigation.php
@@ -6,6 +6,8 @@ Description: Attach keyboard navigation to blog entries.
 Version: 1.0
 Author: John Bintz
 Author URI: http://www.coswellproductions.org/wordpress/
+Requires at least: 2.7
+Tested up to: 2.8.4
 
 Copyright 2008-2009 John Bintz  (email : jcoswell@coswellproductions.org)
 
@@ -29,7 +31,7 @@ class KeyboardNavigation {
   function init() {
     wp_enqueue_script('prototype');
     
-    add_action('wp_footer',  array(&$this, "footer"));
+    add_action('wp_footer',  array(&$this, "wp_footer"));
     add_action('admin_menu', array(&$this, "admin_menu"));    
     add_action('admin_head', array(&$this, "admin_head"));
     
@@ -69,25 +71,32 @@ class KeyboardNavigation {
 
   function KeyboardNavigation() {}
 
-  function footer() {
-    $plugin_url_root = pathfinding_get_admin_url() . '/' . pathfinding_get_plugin_path(); ?>
-      <script type="text/javascript" src="<?php echo $plugin_url_root ?>/keyboard_navigation.js"></script>
-      <script type="text/javascript">
+  function wp_footer() {
+    $plugin_dir_url = plugin_dir_url(__FILE__);
+    $options = get_option('keyboard-navigation-options');
+    $nonce = wp_create_nonce('keyboard-navigation');
+    $options = get_option('keyboard-navigation-options');
+    if (!is_array($options)) { $options = array(); }
+    
+    ?><script type="text/javascript">
+      var s = document.createElement('script');
+      s.src = '<?php echo $plugin_dir_url . 'keyboard-navigation.js' ?>';
+      s.onload = function() {    
         var keyboard_navigation_fields = {};
         <?php foreach (array_keys($this->fields) as $field) {
-          $selector = get_option("keyboard-navigation-selector-${field}");
-          if (!empty($selector)) { ?>
-            keyboard_navigation_fields['<?php echo $field ?>'] = "<?php echo addslashes($selector) ?>";
+          if (!empty($options['selectors'][$field])) { ?>
+            keyboard_navigation_fields['<?php echo $field ?>'] = "<?php echo addslashes($options['selectors'][$field]) ?>";
           <?php }
         } ?>
 
-        var highlight_selectors = <?php echo (WP_ADMIN && (get_option("keyboard-navigation-highlight-selected-elements") == 1)) ? "true" : "false" ?>;
-
+        var highlight_selectors = <?php echo (current_user_can('edit_themes') && $options['highlight']) ? "true" : "false" ?>;
+  
         var results = KeyboardNavigation.get_hrefs(keyboard_navigation_fields, highlight_selectors);
         if (results != false) { KeyboardNavigation.add_events(results); }
-      </script>
-    <?php
-  }
+      };
+      document.getElementsByTagName('body')[0].appendChild(s);
+    </script>
+  <?php }
 
   function admin_menu() {
     add_options_page('Keyboard Navigation', __("Keyboard Navigation", 'keyboard-navigation'), 'edit_themes', 'keyboard-navigation', array($this, "link_editor"));
@@ -108,7 +117,7 @@ class KeyboardNavigation {
     if (!is_array($options)) { $options = array(); }
     
     $plugin_data = get_plugin_data(__FILE__);
-    
+
     include(dirname(__FILE__) . '/admin.inc');
   }
 }