diff -upr DrupalForFirebug{0.0.7}/chrome/content/drupalforfirebug/FirebugOverlay.xul DrupalForFirebug{0.0.7}_modified_for_firebug_1.9.1/chrome/content/drupalforfirebug/FirebugOverlay.xul
--- DrupalForFirebug{0.0.7}/chrome/content/drupalforfirebug/FirebugOverlay.xul	2010-04-24 11:35:42.000000000 +0300
+++ DrupalForFirebug{0.0.7}_modified_for_firebug_1.9.1/chrome/content/drupalforfirebug/FirebugOverlay.xul	2012-02-27 19:03:47.039225145 +0200
@@ -19,35 +19,35 @@
                <toolbarbutton id="fbDrupalForFirebug-general" label="General" type="radio"
                                 tooltiptext="Drupal For Firebug General"
                                 class="toolbar-text-button" group="DrupalForFirebug" checked="true" 
-                                oncommand="Firebug.DrupalForFirebug.onToggleFilter(FirebugContext, 'general')"/>
+                                oncommand="Firebug.DrupalForFirebug.onToggleFilter(Firebug.currentContext, 'general')"/>
                <toolbarbutton id="fbDrupalForFirebug-sql" label="SQL" type="radio"
                                 tooltiptext="Drupal SQL Queries"
                                 class="toolbar-text-button" group="DrupalForFirebug"
-                                oncommand="Firebug.DrupalForFirebug.onToggleFilter(FirebugContext, 'sql')"/>
+                                oncommand="Firebug.DrupalForFirebug.onToggleFilter(Firebug.currentContext, 'sql')"/>
                 <toolbarbutton id="fbDrupalForFirebug-forms" label="Forms" type="radio"
                                 tooltiptext="Drupal Form Altering"
                                 class="toolbar-text-button" group="DrupalForFirebug"
-                                oncommand="Firebug.DrupalForFirebug.onToggleFilter(FirebugContext, 'hook_form_alter')"/>
+                                oncommand="Firebug.DrupalForFirebug.onToggleFilter(Firebug.currentContext, 'hook_form_alter')"/>
                 <toolbarbutton id="fbDrupalForFirebug-users" label="Users" type="radio"
                                 tooltiptext="Drupal User Object Activity"
                                 class="toolbar-text-button" group="DrupalForFirebug"
-                                oncommand="Firebug.DrupalForFirebug.onToggleFilter(FirebugContext, 'hook_user')"/>
+                                oncommand="Firebug.DrupalForFirebug.onToggleFilter(Firebug.currentContext, 'hook_user')"/>
                 <toolbarbutton id="fbDrupalForFirebug-nodes" label="Nodes" type="radio"
                                 tooltiptext="Drupal Node API Operations"
                                 class="toolbar-text-button" group="DrupalForFirebug"
-                                oncommand="Firebug.DrupalForFirebug.onToggleFilter(FirebugContext, 'hook_nodeapi')"/>
+                                oncommand="Firebug.DrupalForFirebug.onToggleFilter(Firebug.currentContext, 'hook_nodeapi')"/>
                 <toolbarbutton id="fbDrupalForFirebug-views" label="Views" type="radio"
                                 tooltiptext="Drupal Views Operations"
                                 class="toolbar-text-button" group="DrupalForFirebug"
-                                oncommand="Firebug.DrupalForFirebug.onToggleFilter(FirebugContext, 'hook_views')"/>
+                                oncommand="Firebug.DrupalForFirebug.onToggleFilter(Firebug.currentContext, 'hook_views')"/>
                 <toolbarbutton id="fbDrupalForFirebug-page" label="Page" type="radio"
                                 tooltiptext="Drupal Page Operations"
                                 class="toolbar-text-button" group="DrupalForFirebug"
-                                oncommand="Firebug.DrupalForFirebug.onToggleFilter(FirebugContext, 'hook_page_alter')"/>
+                                oncommand="Firebug.DrupalForFirebug.onToggleFilter(Firebug.currentContext, 'hook_page_alter')"/>
                 <toolbarbutton id="fbDrupalForFirebug-php" label="Execute PHP" type="radio"
                                 tooltiptext="Drupal Execute PHP"
                                 class="toolbar-text-button" group="DrupalForFirebug"
-                                oncommand="Firebug.DrupalForFirebug.onToggleFilter(FirebugContext, 'php')"/>
+                                oncommand="Firebug.DrupalForFirebug.onToggleFilter(Firebug.currentContext, 'php')"/>
             </hbox> 
 
         </hbox> 
diff -upr DrupalForFirebug{0.0.7}/chrome/content/drupalforfirebug/FirebugPanel.js DrupalForFirebug{0.0.7}_modified_for_firebug_1.9.1/chrome/content/drupalforfirebug/FirebugPanel.js
--- DrupalForFirebug{0.0.7}/chrome/content/drupalforfirebug/FirebugPanel.js	2010-04-24 11:34:34.000000000 +0300
+++ DrupalForFirebug{0.0.7}_modified_for_firebug_1.9.1/chrome/content/drupalforfirebug/FirebugPanel.js	2012-02-28 15:11:17.027204388 +0200
@@ -1,3 +1,4 @@
+
 FBL.ns(function() { with (FBL) { 
 Firebug.DrupalForFirebug = extend(Firebug.Module, 
 { 
@@ -36,24 +37,24 @@ Firebug.DrupalForFirebug = extend(Firebu
           var filterCategory = 'php';
         }
         
-        if (getBrowser().selectedTab.linkedBrowser.contentWindow.document.getElementById('drupalforfirebug_' + filterCategory)) { 
-          var drupal_firebug_content = getBrowser().selectedTab.linkedBrowser.contentWindow.document.getElementById('drupalforfirebug_' + filterCategory).innerHTML;
-          FirebugContext.getPanel("DrupalForFirebug").updateSpace(drupal_firebug_content);
+        if (content.document.getElementById('drupalforfirebug_' + filterCategory)) { 
+          var drupal_firebug_content = content.document.getElementById('drupalforfirebug_' + filterCategory).innerHTML;
+          Firebug.currentContext.getPanel("DrupalForFirebug").updateSpace(drupal_firebug_content);
         } else {
-          FirebugContext.getPanel("DrupalForFirebug").updateSpace('No Drupal for Firebug data was found. Either this site is not running Drupal or the Drupal for Firebug module has not been installed/enabled.');
+          Firebug.currentContext.getPanel("DrupalForFirebug").updateSpace('No Drupal for Firebug data was found. Either this site is not running Drupal or the Drupal for Firebug module has not been installed/enabled.');
         }
     },
     hidePanel: function(browser, panel) 
     {
-        FirebugContext.getPanel("DrupalForFirebug").updateSpace(''); 
+        Firebug.currentContext.getPanel("DrupalForFirebug").updateSpace(''); 
     },
     onToggleFilter: function(context, filterCategory)
     {
-       if (getBrowser().selectedTab.linkedBrowser.contentWindow.document.getElementById('drupalforfirebug_' + filterCategory)) {
-         var drupal_firebug_content = getBrowser().selectedTab.linkedBrowser.contentWindow.document.getElementById('drupalforfirebug_' + filterCategory).innerHTML;
-         FirebugContext.getPanel("DrupalForFirebug").updateSpace(drupal_firebug_content);
+       if (content.document.getElementById('drupalforfirebug_' + filterCategory)) {
+         var drupal_firebug_content = content.document.getElementById('drupalforfirebug_' + filterCategory).innerHTML;
+         Firebug.currentContext.getPanel("DrupalForFirebug").updateSpace(drupal_firebug_content);
        } else {
-         FirebugContext.getPanel("DrupalForFirebug").updateSpace('No Drupal for Firebug data was found. Either this site is not running Drupal or the Drupal for Firebug module has not been installed/enabled.');
+         Firebug.currentContext.getPanel("DrupalForFirebug").updateSpace('No Drupal for Firebug data was found. Either this site is not running Drupal or the Drupal for Firebug module has not been installed/enabled.');
        }
     },
 }); 
diff -upr DrupalForFirebug{0.0.7}/install.rdf DrupalForFirebug{0.0.7}_modified_for_firebug_1.9.1/install.rdf
--- DrupalForFirebug{0.0.7}/install.rdf	2010-04-24 11:34:48.000000000 +0300
+++ DrupalForFirebug{0.0.7}_modified_for_firebug_1.9.1/install.rdf	2012-02-27 19:17:35.499452666 +0200
@@ -5,7 +5,7 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>DrupalForFirebug@drupal.org</em:id>
-    <em:version>0.0.7</em:version>
+    <em:version>0.0.7a</em:version>
     <em:type>2</em:type>
    
     <!-- Firefox -->
@@ -13,7 +13,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>1.5</em:minVersion>
-        <em:maxVersion>3.6.*</em:maxVersion>
+        <em:maxVersion>11.*</em:maxVersion>
       </Description>
     </em:targetApplication>