Index: special_menu_items.install
===================================================================
--- special_menu_items.install	(revision 1922)
+++ special_menu_items.install	(working copy)
@@ -10,9 +10,13 @@
  * Implementation of hook_uninstall().
  */
 function special_menu_items_uninstall() {
-  variable_del('oldtheme_menu_item_link'); 
-  variable_del('special_menu_items_nolink_tag'); 
-  variable_del('special_menu_items_seperator_tag'); 
-  variable_del('special_menu_items_seperator_value'); 
+  variable_del('oldtheme_menu_item_link');
+  variable_del('special_menu_items_nolink_tag');
+  variable_del('special_menu_items_seperator_tag');
+  variable_del('special_menu_items_seperator_value');
   
+  foreach (list_themes() as $theme) {
+    variable_del('oldtheme_menu_item_link_'.$theme->name);
+  }
+  
 }
\ No newline at end of file
Index: special_menu_items.module
===================================================================
--- special_menu_items.module	(revision 1923)
+++ special_menu_items.module	(working copy)
@@ -64,7 +64,8 @@
  * overwriten menu_item_link function. 
  */
 function special_menu_itemsoverwrite_menu_item_link($link) {   
-  $theme_overwrite=variable_get('oldtheme_menu_item_link',null);
+  global $theme;   
+  $theme_overwrite=variable_get('oldtheme_menu_item_link_'.$theme,null);
   
   if (empty($link['localized_options'])) {
     $link['localized_options'] = array();
@@ -133,12 +134,13 @@
  * We replace theme_menu_item_link with our own function.
  */
 function special_menu_items_theme_registry_alter(&$theme_registry) {
+  global $theme;
   
   // Save previous value from registry in case another theme overwrites menu_item_link
   $theme_overwrite = $theme_registry['menu_item_link']['function']; 
   
   //Store the value
-  variable_set('oldtheme_menu_item_link', $theme_overwrite);
+  variable_set('oldtheme_menu_item_link_'.$theme, $theme_overwrite);
   
   // Replace theme_menu_item_link with our special_menu_itemsoverwrite_menu_item_link. 
    $theme_registry['menu_item_link']['function'] = 'special_menu_itemsoverwrite_menu_item_link';
@@ -150,7 +152,6 @@
  * Description changed, added nolink and separator as path types.
  */
 function special_menu_items_form_alter(&$form, $form_state, $form_id) {
- 
   if ($form_id=='menu_edit_item') {
     $default_value=$form['menu']['link_path']['#default_value'];