From 459620fece1002c5ab0c2b8a9ffc68e2eafbd50c Mon Sep 17 00:00:00 2001
From: Matti Hamalainen <ccr@tnsp.org>
Date: Thu, 5 Feb 2015 20:45:57 +0200
Subject: [PATCH 01/11] Add setting for toggling WebGL support on/off.

---
 content/browserOverlay.js        | 13 +++++++++++++
 content/browserOverlay.xul       | 22 ++++++++++++++++++++++
 content/options.xul              | 15 +++++++++++++++
 defaults/preferences/defaults.js |  4 ++++
 locale/en-US/quickjava.dtd       |  2 ++
 locale/es/quickjava.dtd          |  2 ++
 6 files changed, 58 insertions(+)

diff --git a/content/browserOverlay.js b/content/browserOverlay.js
index 1f93040..c719aeb 100644
--- a/content/browserOverlay.js
+++ b/content/browserOverlay.js
@@ -42,6 +42,7 @@ onLoad: function(evt)
       this.qj_Prefix_Tb_FM_Container = this.qj_Prefix_Tb_Container + 'Favorites_Menu_';
 
       this.qj_JS                  = 'JavaScript';
+      this.qj_WebGL               = 'WebGL';
       this.qj_J                   = 'Java';
       this.qj_F                   = 'Flash';
       this.qj_SL                  = 'Silverlight';
@@ -156,6 +157,7 @@ setStartupValues: function(startupType)
     this.setStartupValue(this.qj_I);
     this.setStartupValue(this.qj_J);
     this.setStartupValue(this.qj_JS);
+    this.setStartupValue(this.qj_WebGL);
     this.setStartupValue(this.qj_F);
     this.setStartupValue(this.qj_SL);
     this.setStartupValue(this.qj_AI);
@@ -249,6 +251,7 @@ onClick: function(event)
         this.toggleEnabledIfStatusbarVisible(this.qj_I);
         this.toggleEnabledIfStatusbarVisible(this.qj_J);
         this.toggleEnabledIfStatusbarVisible(this.qj_JS);
+        this.toggleEnabledIfStatusbarVisible(this.qj_WebGL);
         this.toggleEnabledIfStatusbarVisible(this.qj_F);
         this.toggleEnabledIfStatusbarVisible(this.qj_SL);
         this.toggleEnabledIfStatusbarVisible(this.qj_AI);
@@ -294,6 +297,7 @@ onCommandFavorites: function(event)
         doReload = (this.toggleEnabledIfFavorite(this.qj_I, turnOn) && this.checkForReload(this.qj_I)) || doReload;
         doReload = (this.toggleEnabledIfFavorite(this.qj_J, turnOn) && this.checkForReload(this.qj_J)) || doReload;
         doReload = (this.toggleEnabledIfFavorite(this.qj_JS, turnOn) && this.checkForReload(this.qj_JS)) || doReload;
+        doReload = (this.toggleEnabledIfFavorite(this.qj_WebGL, turnOn) && this.checkForReload(this.qj_WebGL)) || doReload;
         doReload = (this.toggleEnabledIfFavorite(this.qj_F, turnOn) && this.checkForReload(this.qj_F)) || doReload;
         doReload = (this.toggleEnabledIfFavorite(this.qj_SL, turnOn) && this.checkForReload(this.qj_SL)) || doReload;
         doReload = (this.toggleEnabledIfFavorite(this.qj_AI, turnOn) && this.checkForReload(this.qj_AI)) || doReload;
@@ -327,6 +331,7 @@ reset_pref_click: function(event, whichReset)
 GetTypeFromId: function(id)
   {
     if (id == this.qj_Prefix_Sb_Container + this.qj_JS || id == this.qj_Prefix_Tb_Container + this.qj_JS || id == this.qj_Prefix_Tb_FM_Container + this.qj_JS) { return this.qj_JS; }
+    if (id == this.qj_Prefix_Sb_Container + this.qj_WebGL || id == this.qj_Prefix_Tb_Container + this.qj_WebGL || id == this.qj_Prefix_Tb_FM_Container + this.qj_WebGL) { return this.qj_WebGL; }
     if (id == this.qj_Prefix_Sb_Container + this.qj_J  || id == this.qj_Prefix_Tb_Container + this.qj_J || id == this.qj_Prefix_Tb_FM_Container + this.qj_J)  { return this.qj_J; }
     if (id == this.qj_Prefix_Sb_Container + this.qj_F  || id == this.qj_Prefix_Tb_Container + this.qj_F || id == this.qj_Prefix_Tb_FM_Container + this.qj_F)  { return this.qj_F; }
     if (id == this.qj_Prefix_Sb_Container + this.qj_SL || id == this.qj_Prefix_Tb_Container + this.qj_SL || id == this.qj_Prefix_Tb_FM_Container + this.qj_SL) { return this.qj_SL; }
@@ -352,6 +357,7 @@ updateIconsNow: function()
     {
       //Set the icons
       this.setIcon(this.qj_JS, this.isEnabled(this.qj_JS));
+      this.setIcon(this.qj_WebGL, this.isEnabled(this.qj_WebGL));
       this.setIcon(this.qj_J,  this.isEnabled(this.qj_J));
       this.setIcon(this.qj_F,  this.isEnabled(this.qj_F));
       this.setIcon(this.qj_SL, this.isEnabled(this.qj_SL));
@@ -455,6 +461,10 @@ toggleEnabled: function(whichIcon) {
   {
     this.prefs.setBoolPref("javascript.enabled", setEnabled);
   }
+  else if (whichIcon == this.qj_WebGL)
+  {
+    this.prefs.setBoolPref("webgl.disabled", !setEnabled);
+  }
   else if (whichIcon == this.qj_AI)
   {
     this.prefs.setCharPref("image.animation_mode", (setEnabled ? "normal" : "none"));
@@ -606,6 +616,7 @@ showOptions: function() {
 isEnabled: function(whichIcon) {
   if (typeof(Ci) == 'undefined') { return false; } //This is not a normal window (example: options dialog)
   if (whichIcon == this.qj_JS) { return this.prefs.getBoolPref("javascript.enabled"); }
+  if (whichIcon == this.qj_WebGL) { return this.prefs.getBoolPref("webgl.disabled") == false; }
   if (whichIcon == this.qj_AI) { return (this.prefs.getCharPref("image.animation_mode") == "normal"); }
 
   if (whichIcon == this.qj_C)  { return (this.prefs.getIntPref("network.cookie.cookieBehavior") != 2); }
@@ -641,6 +652,7 @@ isEnabledAllFavorites: function()
   return (!this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_I) || this.isEnabled(this.qj_I))
       && (!this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_J) || this.isEnabled(this.qj_J))
       && (!this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_JS) || this.isEnabled(this.qj_JS))
+      && (!this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_WebGL) || this.isEnabled(this.qj_WebGL))
       && (!this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_F) || this.isEnabled(this.qj_F))
       && (!this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_SL) || this.isEnabled(this.qj_SL))
       && (!this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_AI) || this.isEnabled(this.qj_AI))
@@ -654,6 +666,7 @@ isEnabledAnyFavorites: function()
   return (this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_I) && this.isEnabled(this.qj_I))
       || (this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_J) && this.isEnabled(this.qj_J))
       || (this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_JS) && this.isEnabled(this.qj_JS))
+      || (this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_WebGL) && this.isEnabled(this.qj_WebGL))
       || (this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_F) && this.isEnabled(this.qj_F))
       || (this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_SL) && this.isEnabled(this.qj_SL))
       || (this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_AI) && this.isEnabled(this.qj_AI))
diff --git a/content/browserOverlay.xul b/content/browserOverlay.xul
index 52f4d29..47079f0 100644
--- a/content/browserOverlay.xul
+++ b/content/browserOverlay.xul
@@ -43,6 +43,16 @@
       </hbox>
     </statusbarpanel>
 
+    <statusbarpanel context="quickjava_contextmenu" class="statusbarpanel-iconic-text QuickJava_StatusIcon_Container" id="QuickJava_StatusIcon_Container_WebGL" tooltip="QuickJava_status_tip_WebGL" onclick="thatoneguydotnet.QuickJava.onClick(event);">
+      <hbox>
+        <vbox>
+          <spacer flex="1" />
+          <label id="QuickJava_StatusIcon_WebGL" class="quickjava-button" value="GL"/>
+          <spacer flex="1" />
+        </vbox>
+      </hbox>
+    </statusbarpanel>
+
     <statusbarpanel context="quickjava_contextmenu" class="statusbarpanel-iconic-text QuickJava_StatusIcon_Container" id="QuickJava_StatusIcon_Container_Silverlight" tooltip="QuickJava_status_tip_Silverlight" onclick="thatoneguydotnet.QuickJava.onClick(event);">
       <hbox>
         <vbox>
@@ -127,6 +137,11 @@
       <label id="QuickJava_ToolbarIcon_Silverlight" class="quickjava-button" value="SL" />
     </toolbarbutton>
 
+    <toolbarbutton id="QuickJava_ToolbarIcon_Container_Silverlight" label="&quickjava.webgl;"
+      oncommand="thatoneguydotnet.QuickJava.onCommand(event);" tooltiptext="&quickjava.tooltip.webgl;" context="quickjava_contextmenu" >
+      <label id="QuickJava_ToolbarIcon_Silverlight" class="quickjava-button" value="SL" />
+    </toolbarbutton>
+
     <toolbarbutton id="QuickJava_ToolbarIcon_Container_AnimatedImage" label="&quickjava.animage;"
       oncommand="thatoneguydotnet.QuickJava.onCommand(event);" tooltiptext="&quickjava.tooltip.animage;" context="quickjava_contextmenu" >
       <label id="QuickJava_ToolbarIcon_AnimatedImage" class="quickjava-button" value="A" />
@@ -166,6 +181,7 @@
            <menuitem label="J" value="J" id="QuickJava_ToolbarIcon_Container_Favorites_Menu_Java" type="checkbox" oncommand="thatoneguydotnet.QuickJava.onCommand(event);" />
            <menuitem label="F" value="F" id="QuickJava_ToolbarIcon_Container_Favorites_Menu_Flash" type="checkbox" oncommand="thatoneguydotnet.QuickJava.onCommand(event);" />
            <menuitem label="SL" value="SL" id="QuickJava_ToolbarIcon_Container_Favorites_Menu_Silverlight" type="checkbox" oncommand="thatoneguydotnet.QuickJava.onCommand(event);" />
+           <menuitem label="GL" value="WebGL" id="QuickJava_ToolbarIcon_Container_Favorites_Menu_WebGL" type="checkbox" oncommand="thatoneguydotnet.QuickJava.onCommand(event);" />
            <menuitem label="A" value="A" id="QuickJava_ToolbarIcon_Container_Favorites_Menu_AnimatedImage" type="checkbox" oncommand="thatoneguydotnet.QuickJava.onCommand(event);" />
            <menuitem label="C" value="C" id="QuickJava_ToolbarIcon_Container_Favorites_Menu_Cookies" type="checkbox" oncommand="thatoneguydotnet.QuickJava.onCommand(event);" />
            <menuitem label="I" value="I" id="QuickJava_ToolbarIcon_Container_Favorites_Menu_Images" type="checkbox" oncommand="thatoneguydotnet.QuickJava.onCommand(event);" />
@@ -201,6 +217,12 @@
         <description value="&quickjava.tooltip.silverlight;" id="QuickJava_status_tip_desc_Silverlight"/>
       </hbox>
     </tooltip>
+
+    <tooltip id="QuickJava_status_tip_WebGL" noautohide="true" orient="horizontal">
+      <hbox>
+        <description value="&quickjava.tooltip.webgl;" id="QuickJava_status_tip_desc_WebGL"/>
+      </hbox>
+    </tooltip>
     
     <tooltip id="QuickJava_status_tip_AnimatedImage" noautohide="true" orient="horizontal">
       <hbox>
diff --git a/content/options.xul b/content/options.xul
index 8bd188d..1814c9e 100644
--- a/content/options.xul
+++ b/content/options.xul
@@ -11,6 +11,7 @@
     <script type="application/x-javascript" src="chrome://quickjava/content/browserOverlay.js" />
     <preferences>
       <preference id="thatoneguydotnet_quickjava_pref_hidestatus_javascript"          name="thatoneguydotnet.QuickJava.hidestatus.JavaScript"     type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_hidestatus_webgl"               name="thatoneguydotnet.QuickJava.hidestatus.WebGL"          type="bool"/>
       <preference id="thatoneguydotnet_quickjava_pref_hidestatus_java"                name="thatoneguydotnet.QuickJava.hidestatus.Java"           type="bool"/>
       <preference id="thatoneguydotnet_quickjava_pref_hidestatus_flash"               name="thatoneguydotnet.QuickJava.hidestatus.Flash"          type="bool"/>
       <preference id="thatoneguydotnet_quickjava_pref_hidestatus_silverlight"         name="thatoneguydotnet.QuickJava.hidestatus.Silverlight"    type="bool"/>
@@ -29,6 +30,7 @@
 
       <preference id="thatoneguydotnet_quickjava_pref_startupStatus_type"             name="thatoneguydotnet.QuickJava.startupStatus.type"           type="int"/>
       <preference id="thatoneguydotnet_quickjava_pref_startupStatus_javascript"       name="thatoneguydotnet.QuickJava.startupStatus.JavaScript"     type="int"/>
+      <preference id="thatoneguydotnet_quickjava_pref_startupStatus_webgl"            name="thatoneguydotnet.QuickJava.startupStatus.WebGL"          type="int"/>
       <preference id="thatoneguydotnet_quickjava_pref_startupStatus_java"             name="thatoneguydotnet.QuickJava.startupStatus.Java"           type="int"/>
       <preference id="thatoneguydotnet_quickjava_pref_startupStatus_flash"            name="thatoneguydotnet.QuickJava.startupStatus.Flash"          type="int"/>
       <preference id="thatoneguydotnet_quickjava_pref_startupStatus_silverlight"      name="thatoneguydotnet.QuickJava.startupStatus.Silverlight"    type="int"/>
@@ -41,6 +43,7 @@
       <preference id="thatoneguydotnet_quickjava_pref_favorites_differentDisplay"     name="thatoneguydotnet.QuickJava.favorites.differentDisplay"  type="int"/>
       <preference id="thatoneguydotnet_quickjava_pref_favorites_differentToggle"      name="thatoneguydotnet.QuickJava.favorites.differentToggle"   type="int"/>
       <preference id="thatoneguydotnet_quickjava_pref_favorites_javascript"           name="thatoneguydotnet.QuickJava.favorites.JavaScript"     type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_favorites_webgl"                name="thatoneguydotnet.QuickJava.favorites.WebGL"          type="bool"/>
       <preference id="thatoneguydotnet_quickjava_pref_favorites_java"                 name="thatoneguydotnet.QuickJava.favorites.Java"           type="bool"/>
       <preference id="thatoneguydotnet_quickjava_pref_favorites_flash"                name="thatoneguydotnet.QuickJava.favorites.Flash"          type="bool"/>
       <preference id="thatoneguydotnet_quickjava_pref_favorites_silverlight"          name="thatoneguydotnet.QuickJava.favorites.Silverlight"    type="bool"/>
@@ -51,6 +54,7 @@
       <preference id="thatoneguydotnet_quickjava_pref_favorites_proxy"                name="thatoneguydotnet.QuickJava.favorites.Proxy"          type="bool"/>
 
       <preference id="thatoneguydotnet_quickjava_pref_reload_javascript"              name="thatoneguydotnet.QuickJava.reload.JavaScript"        type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_reload_webgl"                   name="thatoneguydotnet.QuickJava.reload.WebGL"             type="bool"/>
       <preference id="thatoneguydotnet_quickjava_pref_reload_java"                    name="thatoneguydotnet.QuickJava.reload.Java"              type="bool"/>
       <preference id="thatoneguydotnet_quickjava_pref_reload_flash"                   name="thatoneguydotnet.QuickJava.reload.Flash"             type="bool"/>
       <preference id="thatoneguydotnet_quickjava_pref_reload_silverlight"             name="thatoneguydotnet.QuickJava.reload.Silverlight"       type="bool"/>
@@ -81,6 +85,7 @@
               <row>
                 <label    value=""                                                            id="prompt_lbl" />
                 <label    value="&quickjava.javascript;"                                      id="prompt_javascript_lbl" />
+                <label    value="&quickjava.webgl;"                                           id="prompt_webgl_lbl" />
                 <label    value="&quickjava.cookies;"                                         id="prompt_cookies_lbl" />
                 <label    value="&quickjava.java;"                                            id="prompt_java_lbl" />
                 <label    value="&quickjava.flash;"                                           id="prompt_flash_lbl" />
@@ -93,6 +98,7 @@
               <row>
                 <label    value="&quickjava.options.hidestatusprompt;"                        id="hidestatus_prompt_lbl" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_hidestatus_javascript"  id="hidestatus_javascript_cb" />
+                <checkbox preference="thatoneguydotnet_quickjava_pref_hidestatus_webgl"       id="hidestatus_webgl_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_hidestatus_cookies"     id="hidestatus_cookies_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_hidestatus_java"        id="hidestatus_java_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_hidestatus_flash"       id="hidestatus_flash_cb" />
@@ -105,6 +111,7 @@
               <row>
                 <label    value="&quickjava.options.favoritesprompt;"                        id="favorites_prompt_lbl" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_favorites_javascript"  id="favorites_javascript_cb" />
+                <checkbox preference="thatoneguydotnet_quickjava_pref_favorites_webgl"       id="favorites_webgl_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_favorites_cookies"     id="favorites_cookies_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_favorites_java"        id="favorites_java_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_favorites_flash"       id="favorites_flash_cb" />
@@ -117,6 +124,7 @@
               <row>
                 <label    value="&quickjava.options.reloadprompt;"                        id="reload_prompt_lbl" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_reload_javascript"  id="reload_javascript_cb" />
+                <checkbox preference="thatoneguydotnet_quickjava_pref_reload_webgl"       id="reload_webgl_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_reload_cookies"     id="reload_cookies_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_reload_java"        id="reload_java_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_reload_flash"       id="reload_flash_cb" />
@@ -144,6 +152,13 @@
                     <menuitem label="&quickjava.options.off;" value="2" />
                   </menupopup>
                 </menulist>
+                <menulist preference="thatoneguydotnet_quickjava_pref_startupStatus_webgl"       id="startupStatus_webgl_cb">
+                  <menupopup>
+                    <menuitem label="&quickjava.options.nochange;" value="0" />
+                    <menuitem label="&quickjava.options.on;" value="1" />
+                    <menuitem label="&quickjava.options.off;" value="2" />
+                  </menupopup>
+                </menulist>
                 <menulist preference="thatoneguydotnet_quickjava_pref_startupStatus_cookies"     id="startupStatus_cookies_cb">
                   <menupopup>
                     <menuitem label="&quickjava.options.nochange;" value="0" />
diff --git a/defaults/preferences/defaults.js b/defaults/preferences/defaults.js
index 2413dac..63047fc 100644
--- a/defaults/preferences/defaults.js
+++ b/defaults/preferences/defaults.js
@@ -2,6 +2,7 @@ pref("thatoneguydotnet.QuickJava.curVersion",               '');
 
 /* which icons are hidden in status/addon bar */
 pref("thatoneguydotnet.QuickJava.hidestatus.JavaScript",    false);
+pref("thatoneguydotnet.QuickJava.hidestatus.WebGL",         false);
 pref("thatoneguydotnet.QuickJava.hidestatus.Java",          false);
 pref("thatoneguydotnet.QuickJava.hidestatus.Flash",         false);
 pref("thatoneguydotnet.QuickJava.hidestatus.Silverlight",   false);
@@ -16,6 +17,7 @@ pref("thatoneguydotnet.QuickJava.startupStatus.type",          0);
 
 /* 0 = no change, 1 = enabled, 2 = disabled */
 pref("thatoneguydotnet.QuickJava.startupStatus.JavaScript",    0);
+pref("thatoneguydotnet.QuickJava.startupStatus.WebGL",         0);
 pref("thatoneguydotnet.QuickJava.startupStatus.Java",          0);
 pref("thatoneguydotnet.QuickJava.startupStatus.Flash",         0);
 pref("thatoneguydotnet.QuickJava.startupStatus.Silverlight",   0);
@@ -27,6 +29,7 @@ pref("thatoneguydotnet.QuickJava.startupStatus.Proxy",         0);
 
 /* which icons are visible in the favorites menu button */
 pref("thatoneguydotnet.QuickJava.favorites.JavaScript",     true);
+pref("thatoneguydotnet.QuickJava.favorites.WebGL",          true);
 pref("thatoneguydotnet.QuickJava.favorites.Java",           true);
 pref("thatoneguydotnet.QuickJava.favorites.Flash",          true);
 pref("thatoneguydotnet.QuickJava.favorites.Silverlight",    false);
@@ -42,6 +45,7 @@ pref("thatoneguydotnet.QuickJava.favorites.differentToggle",          0);
 
 /* which icons cause a reload of the page when they are changed */
 pref("thatoneguydotnet.QuickJava.reload.JavaScript",        false);
+pref("thatoneguydotnet.QuickJava.reload.WebGL",             false);
 pref("thatoneguydotnet.QuickJava.reload.Java",              false);
 pref("thatoneguydotnet.QuickJava.reload.Flash",             false);
 pref("thatoneguydotnet.QuickJava.reload.Silverlight",       false);
diff --git a/locale/en-US/quickjava.dtd b/locale/en-US/quickjava.dtd
index b4269d7..3caec62 100644
--- a/locale/en-US/quickjava.dtd
+++ b/locale/en-US/quickjava.dtd
@@ -1,6 +1,7 @@
 <!ENTITY quickjava.javascript               "Javascript">
 <!ENTITY quickjava.java                     "Java">
 <!ENTITY quickjava.flash                    "Flash">
+<!ENTITY quickjava.webgl                    "WebGL">
 <!ENTITY quickjava.silverlight              "SilverLight">
 <!ENTITY quickjava.animage                  "Animated Images">
 <!ENTITY quickjava.cookies                  "Cookies">
@@ -13,6 +14,7 @@
 <!ENTITY quickjava.tooltip.javascript     "Enable/Disable Javascript">
 <!ENTITY quickjava.tooltip.java           "Enable/Disable Java">
 <!ENTITY quickjava.tooltip.flash          "Enable/Disable Flash">
+<!ENTITY quickjava.tooltip.webgl          "Enable/Disable WebGL">
 <!ENTITY quickjava.tooltip.silverlight    "Enable/Disable SilverLight">
 <!ENTITY quickjava.tooltip.animage        "Enable/Disable Animated Images">
 <!ENTITY quickjava.tooltip.cookies        "Enable/Disable Cookies">
diff --git a/locale/es/quickjava.dtd b/locale/es/quickjava.dtd
index 1c744b3..0e1c035 100644
--- a/locale/es/quickjava.dtd
+++ b/locale/es/quickjava.dtd
@@ -1,6 +1,7 @@
 <!ENTITY quickjava.javascript               "Javascript">
 <!ENTITY quickjava.java                     "Java">
 <!ENTITY quickjava.flash                    "Flash">
+<!ENTITY quickjava.webgl                    "WebGL">
 <!ENTITY quickjava.silverlight              "SilverLight">
 <!ENTITY quickjava.animage                  "Imágenes animadas">
 <!ENTITY quickjava.cookies                  "Cookies">
@@ -13,6 +14,7 @@
 <!ENTITY quickjava.tooltip.javascript     "Habilita/Deshabilita Javascript">
 <!ENTITY quickjava.tooltip.java           "Habilita/Deshabilita Java">
 <!ENTITY quickjava.tooltip.flash          "Habilita/Deshabilita Flash">
+<!ENTITY quickjava.tooltip.webgl          "Habilita/Deshabilita WebGL">
 <!ENTITY quickjava.tooltip.silverlight    "Habilita/Deshabilita SilverLight">
 <!ENTITY quickjava.tooltip.animage        "Habilita/Deshabilita imágenes animadas">
 <!ENTITY quickjava.tooltip.cookies        "Habilita/Deshabilita cookies">

From 7d39daa898609331fc390dba99d03160538b6b87 Mon Sep 17 00:00:00 2001
From: Doug <Doug0716@gmail.com>
Date: Tue, 22 Mar 2016 20:33:45 -0500
Subject: [PATCH 02/11] Version 2.0.8 Add error handling due to CSS method
 sometimes throwing an exception

Version 2.0.8 Add error handling due to CSS method sometimes throwing an
exception, have not figured out what causes this yet
---
 ReadMe.txt                |  2 ++
 content/browserOverlay.js | 40 ++++++++++++++++++++++++++++-----------
 install.rdf               |  6 +++---
 3 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/ReadMe.txt b/ReadMe.txt
index 8993dbb..d9172c5 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -5,6 +5,8 @@
 //from the Add-on bar and/or Toolbar.
 //
 //Version History
+//Version 2.0.8 Add error handling due to CSS method sometimes throwing an exception, have not figured out what causes this yet
+//Version 2.0.7 Changed how the stylesheets are being read due to change in FF44
 //Version 2.0.6 Fixed a bug when customizing some toolbars, thanks to Quicksaver (the developer of the Puzzle Toolbar addon) for the code
 //Version 2.0.5 Fixed a bug when toggling CSS
 //Version 2.0.4 Fixed a bug when using the dropdown of the QJ Favorites to toggle settings
diff --git a/content/browserOverlay.js b/content/browserOverlay.js
index 1f93040..a15882e 100644
--- a/content/browserOverlay.js
+++ b/content/browserOverlay.js
@@ -13,7 +13,7 @@ onLoad: function(evt)
     this.alertPluginNames               = false;
     this.alertPluginNamesOnMatch        = false;
     this.firstInstallUrl                = 'http://quickjavaplugin.blogspot.com/2012/07/quickjava-quick-help.html';
-    this.newVersionUrl                  = '';
+    this.newVersionUrl                  = 'http://quickjavaplugin.blogspot.com/2012/07/quickjava-quick-help.html';
 
     this.curVersion                     = ''; //do not initialize, automatically loaded
     this.massToggle                     = false; //program use, do not initialize to true
@@ -89,9 +89,11 @@ onLoad: function(evt)
 handleError: function(e)
   {
     this.consoleLog("An exception occurred in the QuickJava script. Error name: " + e.name
-    + ".\n\n Error description: " + e.description
-    + ".\n\n Error number: " + e.number
-    + ".\n\n Error message: " + e.message, true);
+    + ".\n Error description: " + e.description
+    + ".\n Error number: " + e.number
+    + ".\n Error message: " + e.message
+    + ".\n Stack: " + e.stack
+    , true);
   },
 firstStartup: function(e)
   {
@@ -101,9 +103,12 @@ firstStartup: function(e)
   },
 versionCheck: function(addon)
   {
-    if (this.curVersion != addon.version)
+    //strip out any non-numeric or decimal characters (such as "signed" text)
+    var curVersionClean = this.curVersion.replace(/[^\d.]/g, '');
+    var addonVersionClean = addon.version.replace(/[^\d.]/g, '');
+    if (curVersionClean != addonVersionClean)
     {
-      if (this.curVersion == '')
+      if (curVersionClean == '')
       {
         this.installButton("nav-bar", "QuickJava_ToolbarIcon_Container_Favorites_Item");
         this.updateIcons();
@@ -116,8 +121,8 @@ versionCheck: function(addon)
       {
         this.openTab(this.newVersionUrl,true);
       }
-      this.curVersion = addon.version;
-      this.prefs.setCharPref("thatoneguydotnet.QuickJava.curVersion", this.curVersion)
+      curVersionClean = addonVersionClean;
+      this.prefs.setCharPref("thatoneguydotnet.QuickJava.curVersion", curVersionClean)
     }
   },
   
@@ -383,6 +388,8 @@ GetRegEx: function(whichIcon)
   },
 
 setIcon: function(whichIcon, onOff)
+  {
+  try
   {
     var isHidden      = this.prefs.getBoolPref(this.qj_Prefix_Pref_Hide + whichIcon);
     var statusNumber  = (onOff == 1 ? "1" : (onOff == 0 ? "0" : "-2"));
@@ -400,6 +407,7 @@ setIcon: function(whichIcon, onOff)
       favDropDown.setAttribute("checked", onOff == 1 ? true : false);
       favDropDown.setAttribute("style", this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + whichIcon) ? "" : "display: none;");
     }
+  } catch (e) { try { this.handleError(e); } catch (e) {} }
   },
 
 setFavIcon: function()
@@ -450,6 +458,7 @@ toggleEnabledIfFavorite: function(whichIcon, turnOn)
   // to aValue. aName is used for the "not found" message and is optional
 toggleEnabled: function(whichIcon) {
   if (typeof(Ci) == 'undefined') { return false; } //This is not a normal window (example: options dialog)
+
   var setEnabled = !this.isEnabled(whichIcon);
   if (whichIcon == this.qj_JS)
   {
@@ -510,9 +519,10 @@ toggleEnabled: function(whichIcon) {
       var wm = Components.classes['@mozilla.org/appshell/window-mediator;1']
       .getService(Components.interfaces.nsIWindowMediator);
       var window = wm.getMostRecentWindow(null);
-      msgAlert(window, "No " + aName + " plugin found!");
+      this.consoleLog(window, "No " + aName + " plugin found!");
     }
   }
+
   this.updateIcons();
   if(!this.massToggle && this.checkForReload(whichIcon))
   {
@@ -544,7 +554,7 @@ setStyleDisabledExtended: function(turnOff)
       {
         var setSheet = '';
         var firstSheet = '';
-        var curSheetAry = gPageStyleMenu.getAllStyleSheets();
+        var curSheetAry = gPageStyleMenu.getBrowserStyleSheets();
         for (curSheetIdx in curSheetAry) {
           //this.consoleLog('gPageStyleMenu *' + curSheetAry[curSheetIdx].title + '*');
           setSheet = curSheetAry[curSheetIdx].title;
@@ -604,6 +614,8 @@ showOptions: function() {
 
   // Returns plugin enabled status of plugin(s), whose name matches on aRegEx
 isEnabled: function(whichIcon) {
+try
+{
   if (typeof(Ci) == 'undefined') { return false; } //This is not a normal window (example: options dialog)
   if (whichIcon == this.qj_JS) { return this.prefs.getBoolPref("javascript.enabled"); }
   if (whichIcon == this.qj_AI) { return (this.prefs.getCharPref("image.animation_mode") == "normal"); }
@@ -611,7 +623,12 @@ isEnabled: function(whichIcon) {
   if (whichIcon == this.qj_C)  { return (this.prefs.getIntPref("network.cookie.cookieBehavior") != 2); }
 
   if (whichIcon == this.qj_I)  { return (this.prefs.getIntPref("permissions.default.image") == 1); }
-  if (whichIcon == this.qj_CS) { return !(getMarkupDocumentViewer().authorStyleDisabled); }
+
+  if (whichIcon == this.qj_CS) {
+    var docViewer = getMarkupDocumentViewer();
+    return !(docViewer.authorStyleDisabled);
+  }
+
   if (whichIcon == this.qj_P)  { return (this.prefs.getIntPref("network.proxy.type") != 0); }
 
   var aRegEx = this.GetRegEx(whichIcon);
@@ -632,6 +649,7 @@ isEnabled: function(whichIcon) {
       }
     }
   }
+} catch (e) { try { this.handleError(e); } catch (e) {} }
   return 0;
 },
 
diff --git a/install.rdf b/install.rdf
index 7cabfe6..9af55ed 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,7 +5,7 @@ xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 	<Description about="urn:mozilla:install-manifest">
 		<em:id>{E6C1199F-E687-42da-8C24-E7770CC3AE66}</em:id>
 		<em:name>QuickJava</em:name>
-		<em:version>2.0.6</em:version>
+		<em:version>2.0.8</em:version>
 		<em:description>Enable/Disable Javascript, Java, Flash, Silverlight, Animated Images, Cookies, Images, CSS, and Proxy from Toolbar.</em:description>
 		<em:creator>Doug Greene</em:creator>
 		<em:homepageURL>http://quickjavaplugin.blogspot.com/</em:homepageURL>
@@ -15,8 +15,8 @@ xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 		<em:targetApplication>
 			<Description>
 				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-				<em:minVersion>33.0</em:minVersion>
-				<em:maxVersion>36.*</em:maxVersion>
+				<em:minVersion>44.0</em:minVersion>
+				<em:maxVersion>48.0</em:maxVersion>
 			</Description>
 		</em:targetApplication>
 	        <em:translator>strel</em:translator>	<!-- es -->

From 9649dba1a2f60afb0fcf13e2d748c07cac6fc008 Mon Sep 17 00:00:00 2001
From: Doug <ThatOneGuyDotNet@users.noreply.github.com>
Date: Tue, 22 Mar 2016 20:35:45 -0500
Subject: [PATCH 03/11] Delete {E6C1199F-E687-42da-8C24-E7770CC3AE66}

---
 {E6C1199F-E687-42da-8C24-E7770CC3AE66} | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 {E6C1199F-E687-42da-8C24-E7770CC3AE66}

diff --git a/{E6C1199F-E687-42da-8C24-E7770CC3AE66} b/{E6C1199F-E687-42da-8C24-E7770CC3AE66}
deleted file mode 100644
index 714c161..0000000
--- a/{E6C1199F-E687-42da-8C24-E7770CC3AE66}
+++ /dev/null
@@ -1 +0,0 @@
-C:\Users\Doug\Documents\Hobbies\Computers\Firefox\QuickJava
\ No newline at end of file

From fc87521c8681e58f6ca5f7c751936e87c9287abb Mon Sep 17 00:00:00 2001
From: Doug <Doug0716@gmail.com>
Date: Tue, 22 Mar 2016 20:46:21 -0500
Subject: [PATCH 04/11] Add license link to ReadMe

---
 ReadMe.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ReadMe.txt b/ReadMe.txt
index d9172c5..e55bc7c 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -4,6 +4,8 @@
 //Allows quick enable and disable of Java, Javascript, Cookies, Image Animations, Flash, Silverlight, Images, Stylesheets and Proxy
 //from the Add-on bar and/or Toolbar.
 //
+//License: https://www.mozilla.org/en-US/MPL/1.1/
+//
 //Version History
 //Version 2.0.8 Add error handling due to CSS method sometimes throwing an exception, have not figured out what causes this yet
 //Version 2.0.7 Changed how the stylesheets are being read due to change in FF44

From 2a9ce816d9f3e2bf38868d938a234f594941b13b Mon Sep 17 00:00:00 2001
From: Doug <Doug0716@gmail.com>
Date: Tue, 22 Mar 2016 20:48:08 -0500
Subject: [PATCH 05/11] Ignore Extension Testing File

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 5ebd21a..02d3419 100644
--- a/.gitignore
+++ b/.gitignore
@@ -161,3 +161,4 @@ pip-log.txt
 
 # Mac crap
 .DS_Store
+{E6C1199F-E687-42da-8C24-E7770CC3AE66}

From 188905d9420218452f9441f989888c6ceaee99d1 Mon Sep 17 00:00:00 2001
From: Doug <Doug0716@gmail.com>
Date: Sun, 21 Aug 2016 23:02:10 -0500
Subject: [PATCH 06/11] Version 2.1.0 WebGL, WebRTC, Fix CSS button bugs, Fix
 'Reset' button bugs,+

//Version 2.1.0 Add WebGL and WebRTC support. Move preferences to
extensions branch. Fix CSS toggle bugs. Fix Options 'Reset' buttons bug.
Fix install/new version popup. Add jp locale.
---
 ReadMe.txt                        |   1 +
 chrome.manifest                   |   3 +-
 content/browserOverlay.js         | 262 ++++++++++++++++++++++--------
 content/browserOverlay.xul        |  52 ++++--
 content/options.xul               | 127 ++++++++-------
 defaults/preferences/defaults.js  | 108 ++++++------
 install.rdf                       |   6 +-
 locale/en-US/quickjava.dtd        |   2 +
 locale/en-US/quickjava.properties |   2 +-
 locale/es/quickjava.dtd           |   4 +-
 locale/es/quickjava.properties    |   2 +-
 locale/jp/quickjava.dtd           |  66 ++++++++
 locale/jp/quickjava.properties    |   1 +
 13 files changed, 442 insertions(+), 194 deletions(-)
 create mode 100644 locale/jp/quickjava.dtd
 create mode 100644 locale/jp/quickjava.properties

diff --git a/ReadMe.txt b/ReadMe.txt
index e55bc7c..174f1b3 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -7,6 +7,7 @@
 //License: https://www.mozilla.org/en-US/MPL/1.1/
 //
 //Version History
+//Version 2.1.0 Add WebGL and WebRTC support. Move preferences to extensions branch. Fix CSS toggle bugs. Fix Options 'Reset' buttons bug. Fix install/new version popup. Add jp locale.
 //Version 2.0.8 Add error handling due to CSS method sometimes throwing an exception, have not figured out what causes this yet
 //Version 2.0.7 Changed how the stylesheets are being read due to change in FF44
 //Version 2.0.6 Fixed a bug when customizing some toolbars, thanks to Quicksaver (the developer of the Puzzle Toolbar addon) for the code
diff --git a/chrome.manifest b/chrome.manifest
index 49d211b..7a0f053 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -6,4 +6,5 @@ skin	quickjava	classic/1.0	chrome://quickjava/content/skin/classic/quickjava/
 style	chrome://browser/content/browser.xul	chrome://quickjava/skin/quickjava.css
 style	chrome://global/content/customizeToolbar.xul	chrome://quickjava/skin/quickjava.css
 locale     quickjava   en-US   locale/en-US/
-locale     quickjava   es      locale/es/
\ No newline at end of file
+locale     quickjava   es      locale/es/
+locale     quickjava   jp      locale/jp/
diff --git a/content/browserOverlay.js b/content/browserOverlay.js
index 601a8b9..95bc4cc 100644
--- a/content/browserOverlay.js
+++ b/content/browserOverlay.js
@@ -7,20 +7,22 @@ if(!thatoneguydotnet.QuickJava) thatoneguydotnet.QuickJava={};
 
 thatoneguydotnet.QuickJava={
 
-onLoad: function(evt)
-  {
-    if (typeof(Ci) == 'undefined') { return false; } //This is not a normal window (example: options dialog)
-    this.alertPluginNames               = false;
-    this.alertPluginNamesOnMatch        = false;
-    this.firstInstallUrl                = 'http://quickjavaplugin.blogspot.com/2012/07/quickjava-quick-help.html';
-    this.newVersionUrl                  = 'http://quickjavaplugin.blogspot.com/2012/07/quickjava-quick-help.html';
-
-    this.curVersion                     = ''; //do not initialize, automatically loaded
-    this.massToggle                     = false; //program use, do not initialize to true
-
-    try
-    {
-      this.qj_Prefix_Pref         = 'thatoneguydotnet.QuickJava';
+qj_JS                  : 'JavaScript',
+qj_J                   : 'Java',
+qj_F                   : 'Flash',
+qj_WebGL               : 'WebGL',
+qj_WebRTC              : 'WebRTC',
+qj_SL                  : 'Silverlight',
+qj_AI                  : 'AnimatedImage',
+qj_C                   : 'Cookies',
+qj_I                   : 'Images',
+qj_CS                  : 'CSS',
+qj_P                   : 'Proxy',
+
+initQJ: function()
+  {
+      this.qj_Prefix_Pref         = 'extensions.thatoneguydotnet.QuickJava';
+      this.qj_Prefix_PrefOld         = 'thatoneguydotnet.QuickJava';
       this.Plugin_TopicStr        = this.qj_Prefix_Pref + ".plugins.refreshIcons";
       this.qj_Pref_CustomStyle    = '.custombuttonstyle';
       this.qj_Pref_Default        = '.default';
@@ -41,20 +43,20 @@ onLoad: function(evt)
       this.qj_Prefix_Tb_Container = this.qj_Prefix_Tb + 'Container_';
       this.qj_Prefix_Tb_FM_Container = this.qj_Prefix_Tb_Container + 'Favorites_Menu_';
 
-      this.qj_JS                  = 'JavaScript';
-      this.qj_WebGL               = 'WebGL';
-      this.qj_J                   = 'Java';
-      this.qj_F                   = 'Flash';
-      this.qj_SL                  = 'Silverlight';
-      this.qj_AI                  = 'AnimatedImage';
-      this.qj_C                   = 'Cookies';
-      this.qj_I                   = 'Images';
-      this.qj_CS                  = 'CSS';
-      this.qj_P                   = 'Proxy';
-
       this.qj_Fav                 = 'Favorites';
       this.qj_Fav_Different       = this.qj_Fav + '_Different';
+  },
+onLoad: function(evt)
+  {
+    if (typeof(Ci) == 'undefined') { return false; } //This is not a normal window (example: options dialog)
+    this.alertPluginNames               = false;
+    this.alertPluginNamesOnMatch        = false;
 
+    this.curVersion                     = ''; //do not initialize, automatically loaded
+    this.massToggle                     = false; //program use, do not initialize to true
+
+    try
+    {
       this.customStyleIndxDefault = -1;
       this.customStyleIndxEnabled = -1;
 
@@ -65,6 +67,7 @@ onLoad: function(evt)
 
       //Initialize pref monitors
       this.onLoadDetails();
+      this.movePreferences();
 
       //First startup routine
       if (Components.classes["@mozilla.org/appshell/window-mediator;1"]
@@ -72,11 +75,11 @@ onLoad: function(evt)
             .getEnumerator("").getNext() == window)
       {
         this.firstStartup();
-        this.setStartupValues(0);
+        setTimeout('thatoneguydotnet.QuickJava.setStartupValues(0);',10);
       }
       else
       {
-        this.setStartupValues(1);
+        setTimeout('thatoneguydotnet.QuickJava.setStartupValues(1);',10);
       }
 
       //Update custom style
@@ -98,7 +101,7 @@ handleError: function(e)
   },
 firstStartup: function(e)
   {
-    this.curVersion = this.prefs.getCharPref("thatoneguydotnet.QuickJava.curVersion");
+    this.curVersion = this.prefs.getCharPref(this.qj_Prefix_Pref + ".curVersion");
     Components.utils.import("resource://gre/modules/AddonManager.jsm");
     AddonManager.getAddonByID("{E6C1199F-E687-42da-8C24-E7770CC3AE66}", function(addon) { thatoneguydotnet.QuickJava.versionCheck(addon);});
   },
@@ -115,18 +118,18 @@ versionCheck: function(addon)
         this.updateIcons();
         if (this.firstInstallUrl != '')
         {
-          this.openTab(this.firstInstallUrl,true);
+          setTimeout('thatoneguydotnet.QuickJava.openTab(thatoneguydotnet.QuickJava.firstInstallUrl,true);', 1000);
         }
       }
       else if (this.newVersionUrl != '')
       {
-        this.openTab(this.newVersionUrl,true);
+          setTimeout('thatoneguydotnet.QuickJava.openTab(thatoneguydotnet.QuickJava.newVersionUrl,true);', 1000);
       }
       curVersionClean = addonVersionClean;
-      this.prefs.setCharPref("thatoneguydotnet.QuickJava.curVersion", curVersionClean)
+      this.prefs.setCharPref(this.qj_Prefix_Pref + ".curVersion", curVersionClean)
     }
   },
-  
+
 installButton: function(toolbarId, id, afterId)
   {
     if (!document.getElementById(id)) {
@@ -153,17 +156,24 @@ newTabOpened: function(e)
 {
   thatoneguydotnet.QuickJava.setStartupValues(2);
 },
+
+newTabSelected: function(e)
+{
+  thatoneguydotnet.QuickJava.updateIcons();
+},
+
 setStartupValues: function(startupType)
 {
   /* 0 = initial luanch, 1 = new window, 2 = new tab */
-  var runAt = this.prefs.getIntPref('thatoneguydotnet.QuickJava.startupStatus.type');
+  var runAt = this.prefs.getIntPref(this.qj_Prefix_Pref + '.startupStatus.type');
   if (runAt >= startupType)
   {
     this.setStartupValue(this.qj_I);
     this.setStartupValue(this.qj_J);
     this.setStartupValue(this.qj_JS);
-    this.setStartupValue(this.qj_WebGL);
     this.setStartupValue(this.qj_F);
+    this.setStartupValue(this.qj_WebGL);
+    this.setStartupValue(this.qj_WebRTC);
     this.setStartupValue(this.qj_SL);
     this.setStartupValue(this.qj_AI);
     this.setStartupValue(this.qj_C);
@@ -172,16 +182,19 @@ setStartupValues: function(startupType)
 },
 setStartupValue: function(whichIcon)
 {
-  /* 0 = no change, 1 = enabled, 2 = disabled */
-  var statusToSet = this.prefs.getIntPref('thatoneguydotnet.QuickJava.startupStatus.' + whichIcon);
-  if (statusToSet > 0)
+  try
   {
-    var turnOn = (statusToSet == 1 ? 1 : 0);
-    if (this.isEnabled(whichIcon) != turnOn)
+    /* 0 = no change, 1 = enabled, 2 = disabled */
+    var statusToSet = this.prefs.getIntPref(this.qj_Prefix_Pref + '.startupStatus.' + whichIcon);
+    if (statusToSet > 0)
     {
-      this.toggleEnabled(whichIcon);
+      var turnOn = (statusToSet == 1 ? 1 : 0);
+      if (this.isEnabled(whichIcon) != turnOn)
+      {
+        this.toggleEnabled(whichIcon);
+      }
     }
-  }
+  } catch (e) { try { this.handleError(e); } catch (e) {} }
 },
 findElement: function(node, childId)
   {
@@ -196,7 +209,7 @@ findElement: function(node, childId)
   },
 getProxyOnValue: function()
   {
-    var onValue             = this.prefs.getIntPref("thatoneguydotnet.QuickJava.priorvalue.Proxy");
+    var onValue             = this.prefs.getIntPref(this.qj_Prefix_Pref + ".priorvalue.Proxy");
     var curValue            = this.prefs.getIntPref("network.proxy.type");
     var updateStoredValue   = false;
 
@@ -214,14 +227,14 @@ getProxyOnValue: function()
     }
 
     if(updateStoredValue) {
-      this.prefs.setIntPref("thatoneguydotnet.QuickJava.priorvalue.Proxy", onValue);
+      this.prefs.setIntPref(this.qj_Prefix_Pref + ".priorvalue.Proxy", onValue);
     }
     return onValue;
   },
 
 getCookieOnValue: function()
   {
-    var onValue             = this.prefs.getIntPref("thatoneguydotnet.QuickJava.priorvalue.Cookie");
+    var onValue             = this.prefs.getIntPref(this.qj_Prefix_Pref + ".priorvalue.Cookie");
     var curValue            = this.prefs.getIntPref("network.cookie.cookieBehavior");
     var updateStoredValue   = false;
 
@@ -239,7 +252,7 @@ getCookieOnValue: function()
     }
 
     if (updateStoredValue) {
-      this.prefs.setIntPref("thatoneguydotnet.QuickJava.priorvalue.Cookie", onValue);
+      this.prefs.setIntPref(this.qj_Prefix_Pref + ".priorvalue.Cookie", onValue);
     }
     return onValue;
   },
@@ -256,8 +269,9 @@ onClick: function(event)
         this.toggleEnabledIfStatusbarVisible(this.qj_I);
         this.toggleEnabledIfStatusbarVisible(this.qj_J);
         this.toggleEnabledIfStatusbarVisible(this.qj_JS);
-        this.toggleEnabledIfStatusbarVisible(this.qj_WebGL);
         this.toggleEnabledIfStatusbarVisible(this.qj_F);
+        this.toggleEnabledIfStatusbarVisible(this.qj_WebGL);
+        this.toggleEnabledIfStatusbarVisible(this.qj_WebRTC);
         this.toggleEnabledIfStatusbarVisible(this.qj_SL);
         this.toggleEnabledIfStatusbarVisible(this.qj_AI);
         this.toggleEnabledIfStatusbarVisible(this.qj_C);
@@ -302,8 +316,9 @@ onCommandFavorites: function(event)
         doReload = (this.toggleEnabledIfFavorite(this.qj_I, turnOn) && this.checkForReload(this.qj_I)) || doReload;
         doReload = (this.toggleEnabledIfFavorite(this.qj_J, turnOn) && this.checkForReload(this.qj_J)) || doReload;
         doReload = (this.toggleEnabledIfFavorite(this.qj_JS, turnOn) && this.checkForReload(this.qj_JS)) || doReload;
-        doReload = (this.toggleEnabledIfFavorite(this.qj_WebGL, turnOn) && this.checkForReload(this.qj_WebGL)) || doReload;
         doReload = (this.toggleEnabledIfFavorite(this.qj_F, turnOn) && this.checkForReload(this.qj_F)) || doReload;
+        doReload = (this.toggleEnabledIfFavorite(this.qj_WebGL, turnOn) && this.checkForReload(this.qj_WebGL)) || doReload;
+        doReload = (this.toggleEnabledIfFavorite(this.qj_WebRTC, turnOn) && this.checkForReload(this.qj_WebRTC)) || doReload;
         doReload = (this.toggleEnabledIfFavorite(this.qj_SL, turnOn) && this.checkForReload(this.qj_SL)) || doReload;
         doReload = (this.toggleEnabledIfFavorite(this.qj_AI, turnOn) && this.checkForReload(this.qj_AI)) || doReload;
         doReload = (this.toggleEnabledIfFavorite(this.qj_C, turnOn) && this.checkForReload(this.qj_C)) || doReload;
@@ -336,9 +351,10 @@ reset_pref_click: function(event, whichReset)
 GetTypeFromId: function(id)
   {
     if (id == this.qj_Prefix_Sb_Container + this.qj_JS || id == this.qj_Prefix_Tb_Container + this.qj_JS || id == this.qj_Prefix_Tb_FM_Container + this.qj_JS) { return this.qj_JS; }
-    if (id == this.qj_Prefix_Sb_Container + this.qj_WebGL || id == this.qj_Prefix_Tb_Container + this.qj_WebGL || id == this.qj_Prefix_Tb_FM_Container + this.qj_WebGL) { return this.qj_WebGL; }
     if (id == this.qj_Prefix_Sb_Container + this.qj_J  || id == this.qj_Prefix_Tb_Container + this.qj_J || id == this.qj_Prefix_Tb_FM_Container + this.qj_J)  { return this.qj_J; }
     if (id == this.qj_Prefix_Sb_Container + this.qj_F  || id == this.qj_Prefix_Tb_Container + this.qj_F || id == this.qj_Prefix_Tb_FM_Container + this.qj_F)  { return this.qj_F; }
+    if (id == this.qj_Prefix_Sb_Container + this.qj_WebGL || id == this.qj_Prefix_Tb_Container + this.qj_WebGL || id == this.qj_Prefix_Tb_FM_Container + this.qj_WebGL) { return this.qj_WebGL; }
+    if (id == this.qj_Prefix_Sb_Container + this.qj_WebRTC || id == this.qj_Prefix_Tb_Container + this.qj_WebRTC || id == this.qj_Prefix_Tb_FM_Container + this.qj_WebRTC) { return this.qj_WebRTC; }
     if (id == this.qj_Prefix_Sb_Container + this.qj_SL || id == this.qj_Prefix_Tb_Container + this.qj_SL || id == this.qj_Prefix_Tb_FM_Container + this.qj_SL) { return this.qj_SL; }
     if (id == this.qj_Prefix_Sb_Container + this.qj_AI || id == this.qj_Prefix_Tb_Container + this.qj_AI || id == this.qj_Prefix_Tb_FM_Container + this.qj_AI) { return this.qj_AI; }
     if (id == this.qj_Prefix_Sb_Container + this.qj_C  || id == this.qj_Prefix_Tb_Container + this.qj_C || id == this.qj_Prefix_Tb_FM_Container + this.qj_C)  { return this.qj_C; }
@@ -351,7 +367,7 @@ updateIcons: function()
   {
     //this.consoleLog('updateIcons');
     //do as setTimeout so any other processes can finish first
-    setTimeout('thatoneguydotnet.QuickJava.updateIconsNow();',10);
+    setTimeout('thatoneguydotnet.QuickJava.updateIconsNow();',100);
     this.updateIconsNow();
   },
 
@@ -362,9 +378,10 @@ updateIconsNow: function()
     {
       //Set the icons
       this.setIcon(this.qj_JS, this.isEnabled(this.qj_JS));
-      this.setIcon(this.qj_WebGL, this.isEnabled(this.qj_WebGL));
       this.setIcon(this.qj_J,  this.isEnabled(this.qj_J));
       this.setIcon(this.qj_F,  this.isEnabled(this.qj_F));
+      this.setIcon(this.qj_WebGL, this.isEnabled(this.qj_WebGL));
+      this.setIcon(this.qj_WebRTC, this.isEnabled(this.qj_WebRTC));
       this.setIcon(this.qj_SL, this.isEnabled(this.qj_SL));
       this.setIcon(this.qj_AI, this.isEnabled(this.qj_AI));
       this.setIcon(this.qj_C,  this.isEnabled(this.qj_C));
@@ -382,13 +399,13 @@ GetRegEx: function(whichIcon)
     switch (whichIcon)
     {
       case this.qj_J:
-        return new RegExp(this.prefs.getCharPref("thatoneguydotnet.QuickJava.regex.Java"), 'i');
+        return new RegExp(this.prefs.getCharPref(this.qj_Prefix_Pref + ".regex.Java"), 'i');
         break;
       case this.qj_F:
-        return new RegExp(this.prefs.getCharPref("thatoneguydotnet.QuickJava.regex.Flash"), 'i');
+        return new RegExp(this.prefs.getCharPref(this.qj_Prefix_Pref + ".regex.Flash"), 'i');
         break;
       case this.qj_SL:
-        return new RegExp(this.prefs.getCharPref("thatoneguydotnet.QuickJava.regex.Silverlight"), 'i');
+        return new RegExp(this.prefs.getCharPref(this.qj_Prefix_Pref + ".regex.Silverlight"), 'i');
         break;
     }
   },
@@ -470,10 +487,6 @@ toggleEnabled: function(whichIcon) {
   {
     this.prefs.setBoolPref("javascript.enabled", setEnabled);
   }
-  else if (whichIcon == this.qj_WebGL)
-  {
-    this.prefs.setBoolPref("webgl.disabled", !setEnabled);
-  }
   else if (whichIcon == this.qj_AI)
   {
     this.prefs.setCharPref("image.animation_mode", (setEnabled ? "normal" : "none"));
@@ -496,6 +509,14 @@ toggleEnabled: function(whichIcon) {
     var onValue = this.getProxyOnValue();
     this.prefs.setIntPref("network.proxy.type", (setEnabled ? onValue : "0"));
   }
+  else if (whichIcon == this.qj_WebGL)
+  {
+    this.prefs.setBoolPref("webgl.disabled", !setEnabled);
+  }
+  else if (whichIcon == this.qj_WebRTC)
+  {
+    this.prefs.setBoolPref("media.peerconnection.enabled", setEnabled);
+  }
   else
   {
     var aRegEx = this.GetRegEx(whichIcon);
@@ -511,7 +532,7 @@ toggleEnabled: function(whichIcon) {
         {
                 plugins[i].enabledState = (setEnabled ? Ci.nsIPluginTag.STATE_ENABLED : Ci.nsIPluginTag.STATE_DISABLED);
 //Doesn't seem to be working, Flash still runs on the test page w/o asking after setting to CLICKTOPLAY
-                if (setEnabled && this.prefs.getBoolPref("thatoneguydotnet.QuickJava.enabledState.ClickToPlay")) { 
+                if (setEnabled && this.prefs.getBoolPref(this.qj_Prefix_Pref + ".enabledState.ClickToPlay")) { 
             plugins[i].enabledState = Ci.nsIPluginTag.STATE_CLICKTOPLAY;
 //alert(plugins[i].enabledState + ', ' + Ci.nsIPluginTag.STATE_CLICKTOPLAY);
           }
@@ -628,16 +649,18 @@ try
 {
   if (typeof(Ci) == 'undefined') { return false; } //This is not a normal window (example: options dialog)
   if (whichIcon == this.qj_JS) { return this.prefs.getBoolPref("javascript.enabled"); }
-  if (whichIcon == this.qj_WebGL) { return this.prefs.getBoolPref("webgl.disabled") == false; }
   if (whichIcon == this.qj_AI) { return (this.prefs.getCharPref("image.animation_mode") == "normal"); }
 
   if (whichIcon == this.qj_C)  { return (this.prefs.getIntPref("network.cookie.cookieBehavior") != 2); }
 
   if (whichIcon == this.qj_I)  { return (this.prefs.getIntPref("permissions.default.image") == 1); }
+  if (whichIcon == this.qj_WebGL) { return this.prefs.getBoolPref("webgl.disabled") == false; }
+  if (whichIcon == this.qj_WebRTC) { return this.prefs.getBoolPref("media.peerconnection.enabled"); }
 
   if (whichIcon == this.qj_CS) {
-    var docViewer = getMarkupDocumentViewer();
-    return !(docViewer.authorStyleDisabled);
+    let styleSheetInfo = gPageStyleMenu._getStyleSheetInfo(gBrowser.selectedBrowser);
+    let styleSheets = styleSheetInfo.filteredStyleSheets;
+    return !(styleSheetInfo.authorStyleDisabled);
   }
 
   if (whichIcon == this.qj_P)  { return (this.prefs.getIntPref("network.proxy.type") != 0); }
@@ -670,8 +693,9 @@ isEnabledAllFavorites: function()
   return (!this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_I) || this.isEnabled(this.qj_I))
       && (!this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_J) || this.isEnabled(this.qj_J))
       && (!this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_JS) || this.isEnabled(this.qj_JS))
-      && (!this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_WebGL) || this.isEnabled(this.qj_WebGL))
       && (!this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_F) || this.isEnabled(this.qj_F))
+      && (!this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_WebGL) || this.isEnabled(this.qj_WebGL))
+      && (!this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_WebRTC) || this.isEnabled(this.qj_WebRTC))
       && (!this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_SL) || this.isEnabled(this.qj_SL))
       && (!this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_AI) || this.isEnabled(this.qj_AI))
       && (!this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_C) || this.isEnabled(this.qj_C))
@@ -684,8 +708,9 @@ isEnabledAnyFavorites: function()
   return (this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_I) && this.isEnabled(this.qj_I))
       || (this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_J) && this.isEnabled(this.qj_J))
       || (this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_JS) && this.isEnabled(this.qj_JS))
-      || (this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_WebGL) && this.isEnabled(this.qj_WebGL))
       || (this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_F) && this.isEnabled(this.qj_F))
+      || (this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_WebGL) && this.isEnabled(this.qj_WebGL))
+      || (this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_WebRTC) && this.isEnabled(this.qj_WebRTC))
       || (this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_SL) && this.isEnabled(this.qj_SL))
       || (this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_AI) && this.isEnabled(this.qj_AI))
       || (this.prefs.getBoolPref(this.qj_Prefix_Pref_Fav + this.qj_C) && this.isEnabled(this.qj_C))
@@ -759,9 +784,10 @@ consoleLog: function(msg, stackTrace)
 
 onLoadDetails: function(evt)
   {
+    gBrowser.tabContainer.addEventListener("TabSelect", thatoneguydotnet.QuickJava.newTabSelected, false)
     gBrowser.tabContainer.addEventListener("TabOpen", thatoneguydotnet.QuickJava.newTabOpened, false)
     this.CUIListener = {
-      handler: function(aWidgetId) { 
+      handler: function(aWidgetId) {
         if (aWidgetId.indexOf('QuickJava') >= 0) {
           thatoneguydotnet.QuickJava.consoleLog(aWidgetId);
           /* Our toolbar icons may have been added or removed to/from a toolbar or panel */
@@ -829,6 +855,7 @@ onLoadDetails: function(evt)
         }
         else if (aData ==  "javascript.enabled" || aData == "permissions.default.image" || aData == "network.proxy.type"
             || aData == "network.cookie.cookieBehavior" || aData == "image.animation_mode"
+            || aData == "webgl.disabled" || aData == "media.peerconnection.enabled"
             || (aData.match("^"+this.QuickJavaObject.qj_Prefix_Pref)==this.QuickJavaObject.qj_Prefix_Pref))
         {
           thatoneguydotnet.QuickJava.updateIcons();
@@ -849,10 +876,115 @@ onUnload: function(evt)
       if (thatoneguydotnet.QuickJava.PrefObserver && thatoneguydotnet.QuickJava.PrefObserver.unregister) { thatoneguydotnet.QuickJava.PrefObserver.unregister(); }
       if (thatoneguydotnet.QuickJava.PluginObserver && thatoneguydotnet.QuickJava.PluginObserver.unregister) { thatoneguydotnet.QuickJava.PluginObserver.unregister(); }
       if (gBrowser) { gBrowser.tabContainer.removeEventListener("TabOpen", thatoneguydotnet.QuickJava.newTabOpened, false); }
+      if (gBrowser) { gBrowser.tabContainer.removeEventListener("TabSelect", thatoneguydotnet.QuickJava.newTabSelected, false); }
       if (this.CUIListener) { CustomizableUI.removeListener(this.CUIListener); }
     } catch (e) { try { this.handleError(e); } catch (e) {} }
+  },
+
+movePreferences: function()
+  {
+    if (this.prefs.getPrefType(this.qj_Prefix_PrefOld + '.curVersion'))
+    {
+      this.consoleLog('QuickJava moving preferences');
+
+      this.movePreference(this.qj_Prefix_PrefOld + '.curVersion', false, true, false); // Bool,Char,Int
+
+      /* which icons are hidden in status/addon bar */
+      this.movePreference(this.qj_Prefix_PrefOld + '.hidestatus.JavaScript', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.hidestatus.Java', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.hidestatus.Flash', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.hidestatus.WebGL', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.hidestatus.WebRTC', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.hidestatus.Silverlight', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.hidestatus.AnimatedImage', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.hidestatus.Cookies', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.hidestatus.Images', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.hidestatus.CSS', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.hidestatus.Proxy', true, false, false); // Bool,Char,Int
+
+      /* 0 = initial luanch, 1 = new window, 2 = new tab */
+      this.movePreference(this.qj_Prefix_PrefOld + '.startupStatus.type', false, false, true); // Bool,Char,Int
+
+      /* 0 = no change, 1 = enabled, 2 = disabled */
+      this.movePreference(this.qj_Prefix_PrefOld + '.startupStatus.JavaScript', false, false, true); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.startupStatus.Java', false, false, true); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.startupStatus.Flash', false, false, true); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.startupStatus.WebGL', false, false, true); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.startupStatus.WebRTC', false, false, true); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.startupStatus.Silverlight', false, false, true); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.startupStatus.AnimatedImage', false, false, true); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.startupStatus.Cookies', false, false, true); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.startupStatus.Images', false, false, true); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.startupStatus.CSS', false, false, true); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.startupStatus.Proxy', false, false, true); // Bool,Char,Int
+
+      /* which icons are visible in the favorites menu button */
+      this.movePreference(this.qj_Prefix_PrefOld + '.favorites.JavaScript', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.favorites.Java', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.favorites.Flash', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.favorites.WebGL', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.favorites.WebRTC', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.favorites.Silverlight', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.favorites.AnimatedImage', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.favorites.Cookies', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.favorites.Images', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.favorites.CSS', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.favorites.Proxy', true, false, false); // Bool,Char,Int
+
+      /* What to display/do when some favories are enabled and some are different.  1 = Enabled, 0 = Disabled */
+      this.movePreference(this.qj_Prefix_PrefOld + '.favorites.differentDisplay', false, false, true); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.favorites.differentToggle', false, false, true); // Bool,Char,Int
+
+      /* which icons cause a reload of the page when they are changed */
+      this.movePreference(this.qj_Prefix_PrefOld + '.reload.JavaScript', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.reload.Java', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.reload.Flash', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.reload.WebGL', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.reload.WebRTC', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.reload.Silverlight', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.reload.AnimatedImage', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.reload.Cookies', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.reload.Images', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.reload.CSS', true, false, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.reload.Proxy', true, false, false); // Bool,Char,Int
+
+      this.movePreference(this.qj_Prefix_PrefOld + '.priorvalue.Proxy', false, false, true); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.priorvalue.Cookie', false, false, true); // Bool,Char,Int
+
+      this.movePreference(this.qj_Prefix_PrefOld + '.enabledState.ClickToPlay', true, false, false); // Bool,Char,Int
+
+      this.movePreference(this.qj_Prefix_PrefOld + '.regex.Java', false, true, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.regex.Flash', false, true, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.regex.Silverlight', false, true, false); // Bool,Char,Int
+
+      this.movePreference(this.qj_Prefix_PrefOld + '.custombuttonstyle.default', false, true, false); // Bool,Char,Int
+      this.movePreference(this.qj_Prefix_PrefOld + '.custombuttonstyle.enabled', false, true, false); // Bool,Char,Int
+    }
+  },
+
+movePreference : function(oldPrefName, isBool, isChar, isInt)
+  {
+    if (this.prefs.getPrefType(oldPrefName))//this.qj_Prefix_PrefOld + '.curVersion'))
+    {
+      var newPrefName = oldPrefName.replace(this.qj_Prefix_PrefOld,this.qj_Prefix_Pref);
+      this.consoleLog('Move ' + oldPrefName + ' to ' + newPrefName);
+      if (isBool)
+      {
+        this.prefs.setBoolPref(newPrefName, this.prefs.getBoolPref(oldPrefName));
+      }
+      else if (isChar)
+      {
+        this.prefs.setCharPref(newPrefName, this.prefs.getCharPref(oldPrefName));
+      }
+      else if (isInt)
+      {
+        this.prefs.setIntPref(newPrefName, this.prefs.getIntPref(oldPrefName));
+      }
+      this.prefs.clearUserPref(oldPrefName);
+    }
   }
 };
 
+thatoneguydotnet.QuickJava.initQJ();
 window.addEventListener('load', function(e) { thatoneguydotnet.QuickJava.onLoad(e); },false);
-window.addEventListener('unload',function(e) { thatoneguydotnet.QuickJava.onUnload(e); },false);
+window.addEventListener('unload',function(e) { thatoneguydotnet.QuickJava.onUnload(e); },false);
\ No newline at end of file
diff --git a/content/browserOverlay.xul b/content/browserOverlay.xul
index 47079f0..54c6cf3 100644
--- a/content/browserOverlay.xul
+++ b/content/browserOverlay.xul
@@ -6,7 +6,7 @@
 <overlay id="quickjava-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
   <script type="application/x-javascript" src="chrome://quickjava/content/browserOverlay.js"/>
-  
+
   <stringbundleset id="stringbundleset">
     <stringbundle id="quickjava-strings" src="chrome://quickjava/locale/quickjava.properties"/>
   </stringbundleset>
@@ -53,6 +53,16 @@
       </hbox>
     </statusbarpanel>
 
+    <statusbarpanel context="quickjava_contextmenu" class="statusbarpanel-iconic-text QuickJava_StatusIcon_Container" id="QuickJava_StatusIcon_Container_WebRTC" tooltip="QuickJava_status_tip_WebRTC" onclick="thatoneguydotnet.QuickJava.onClick(event);">
+      <hbox>
+        <vbox>
+          <spacer flex="1" />
+          <label id="QuickJava_StatusIcon_WebRTC" class="quickjava-button" value="RTC"/>
+          <spacer flex="1" />
+        </vbox>
+      </hbox>
+    </statusbarpanel>
+
     <statusbarpanel context="quickjava_contextmenu" class="statusbarpanel-iconic-text QuickJava_StatusIcon_Container" id="QuickJava_StatusIcon_Container_Silverlight" tooltip="QuickJava_status_tip_Silverlight" onclick="thatoneguydotnet.QuickJava.onClick(event);">
       <hbox>
         <vbox>
@@ -62,7 +72,7 @@
         </vbox>
       </hbox>
     </statusbarpanel>
-    
+
     <statusbarpanel context="quickjava_contextmenu" class="statusbarpanel-iconic-text QuickJava_StatusIcon_Container" id="QuickJava_StatusIcon_Container_Cookies" tooltip="QuickJava_status_tip_Cookies" onclick="thatoneguydotnet.QuickJava.onClick(event);">
       <hbox>
         <vbox>
@@ -131,14 +141,19 @@
       oncommand="thatoneguydotnet.QuickJava.onCommand(event);" tooltiptext="&quickjava.tooltip.flash;" context="quickjava_contextmenu" >
       <label id="QuickJava_ToolbarIcon_Flash" class="quickjava-button" value="F" />
     </toolbarbutton>
-    
-    <toolbarbutton id="QuickJava_ToolbarIcon_Container_Silverlight" label="&quickjava.silverlight;"
-      oncommand="thatoneguydotnet.QuickJava.onCommand(event);" tooltiptext="&quickjava.tooltip.silverlight;" context="quickjava_contextmenu" >
-      <label id="QuickJava_ToolbarIcon_Silverlight" class="quickjava-button" value="SL" />
-    </toolbarbutton>
 
-    <toolbarbutton id="QuickJava_ToolbarIcon_Container_Silverlight" label="&quickjava.webgl;"
+    <toolbarbutton id="QuickJava_ToolbarIcon_Container_WebGL" label="&quickjava.webgl;"
       oncommand="thatoneguydotnet.QuickJava.onCommand(event);" tooltiptext="&quickjava.tooltip.webgl;" context="quickjava_contextmenu" >
+      <label id="QuickJava_ToolbarIcon_WebGL" class="quickjava-button" value="GL" />
+    </toolbarbutton>
+
+    <toolbarbutton id="QuickJava_ToolbarIcon_Container_WebRTC" label="&quickjava.webrtc;"
+      oncommand="thatoneguydotnet.QuickJava.onCommand(event);" tooltiptext="&quickjava.tooltip.webrtc;" context="quickjava_contextmenu" >
+      <label id="QuickJava_ToolbarIcon_WebRTC" class="quickjava-button" value="RTC" />
+    </toolbarbutton>
+
+    <toolbarbutton id="QuickJava_ToolbarIcon_Container_Silverlight" label="&quickjava.silverlight;"
+      oncommand="thatoneguydotnet.QuickJava.onCommand(event);" tooltiptext="&quickjava.tooltip.silverlight;" context="quickjava_contextmenu" >
       <label id="QuickJava_ToolbarIcon_Silverlight" class="quickjava-button" value="SL" />
     </toolbarbutton>
 
@@ -180,8 +195,9 @@
            <menuitem label="JS" value="JS" id="QuickJava_ToolbarIcon_Container_Favorites_Menu_JavaScript" type="checkbox" oncommand="thatoneguydotnet.QuickJava.onCommand(event);" />
            <menuitem label="J" value="J" id="QuickJava_ToolbarIcon_Container_Favorites_Menu_Java" type="checkbox" oncommand="thatoneguydotnet.QuickJava.onCommand(event);" />
            <menuitem label="F" value="F" id="QuickJava_ToolbarIcon_Container_Favorites_Menu_Flash" type="checkbox" oncommand="thatoneguydotnet.QuickJava.onCommand(event);" />
-           <menuitem label="SL" value="SL" id="QuickJava_ToolbarIcon_Container_Favorites_Menu_Silverlight" type="checkbox" oncommand="thatoneguydotnet.QuickJava.onCommand(event);" />
            <menuitem label="GL" value="WebGL" id="QuickJava_ToolbarIcon_Container_Favorites_Menu_WebGL" type="checkbox" oncommand="thatoneguydotnet.QuickJava.onCommand(event);" />
+           <menuitem label="RTC" value="WebRTC" id="QuickJava_ToolbarIcon_Container_Favorites_Menu_WebRTC" type="checkbox" oncommand="thatoneguydotnet.QuickJava.onCommand(event);" />
+           <menuitem label="SL" value="SL" id="QuickJava_ToolbarIcon_Container_Favorites_Menu_Silverlight" type="checkbox" oncommand="thatoneguydotnet.QuickJava.onCommand(event);" />
            <menuitem label="A" value="A" id="QuickJava_ToolbarIcon_Container_Favorites_Menu_AnimatedImage" type="checkbox" oncommand="thatoneguydotnet.QuickJava.onCommand(event);" />
            <menuitem label="C" value="C" id="QuickJava_ToolbarIcon_Container_Favorites_Menu_Cookies" type="checkbox" oncommand="thatoneguydotnet.QuickJava.onCommand(event);" />
            <menuitem label="I" value="I" id="QuickJava_ToolbarIcon_Container_Favorites_Menu_Images" type="checkbox" oncommand="thatoneguydotnet.QuickJava.onCommand(event);" />
@@ -211,19 +227,25 @@
         <description value="&quickjava.tooltip.flash;" id="QuickJava_status_tip_desc_Flash"/>
       </hbox>
     </tooltip>
-    
-    <tooltip id="QuickJava_status_tip_Silverlight" noautohide="true" orient="horizontal">
+
+    <tooltip id="QuickJava_status_tip_WebGL" noautohide="true" orient="horizontal">
       <hbox>
-        <description value="&quickjava.tooltip.silverlight;" id="QuickJava_status_tip_desc_Silverlight"/>
+        <description value="&quickjava.tooltip.webgl;" id="QuickJava_status_tip_desc_WebGL"/>
       </hbox>
     </tooltip>
 
-    <tooltip id="QuickJava_status_tip_WebGL" noautohide="true" orient="horizontal">
+    <tooltip id="QuickJava_status_tip_WebRTC" noautohide="true" orient="horizontal">
       <hbox>
-        <description value="&quickjava.tooltip.webgl;" id="QuickJava_status_tip_desc_WebGL"/>
+        <description value="&quickjava.tooltip.webrtc;" id="QuickJava_status_tip_desc_WebRTC"/>
       </hbox>
     </tooltip>
-    
+
+    <tooltip id="QuickJava_status_tip_Silverlight" noautohide="true" orient="horizontal">
+      <hbox>
+        <description value="&quickjava.tooltip.silverlight;" id="QuickJava_status_tip_desc_Silverlight"/>
+      </hbox>
+    </tooltip>
+
     <tooltip id="QuickJava_status_tip_AnimatedImage" noautohide="true" orient="horizontal">
       <hbox>
         <description value="&quickjava.tooltip.animage;" id="QuickJava_status_tip_desc_AnimatedImage"/>
diff --git a/content/options.xul b/content/options.xul
index 1814c9e..597752f 100644
--- a/content/options.xul
+++ b/content/options.xul
@@ -10,59 +10,63 @@
   <prefpane id="quickjava-pref-pane">
     <script type="application/x-javascript" src="chrome://quickjava/content/browserOverlay.js" />
     <preferences>
-      <preference id="thatoneguydotnet_quickjava_pref_hidestatus_javascript"          name="thatoneguydotnet.QuickJava.hidestatus.JavaScript"     type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_hidestatus_webgl"               name="thatoneguydotnet.QuickJava.hidestatus.WebGL"          type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_hidestatus_java"                name="thatoneguydotnet.QuickJava.hidestatus.Java"           type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_hidestatus_flash"               name="thatoneguydotnet.QuickJava.hidestatus.Flash"          type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_hidestatus_silverlight"         name="thatoneguydotnet.QuickJava.hidestatus.Silverlight"    type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_hidestatus_animage"             name="thatoneguydotnet.QuickJava.hidestatus.AnimatedImage"  type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_hidestatus_cookies"             name="thatoneguydotnet.QuickJava.hidestatus.Cookies"        type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_hidestatus_images"              name="thatoneguydotnet.QuickJava.hidestatus.Images"         type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_hidestatus_css"                 name="thatoneguydotnet.QuickJava.hidestatus.CSS"            type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_hidestatus_proxy"               name="thatoneguydotnet.QuickJava.hidestatus.Proxy"          type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_hidestatus_javascript"          name="extensions.thatoneguydotnet.QuickJava.hidestatus.JavaScript"     type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_hidestatus_java"                name="extensions.thatoneguydotnet.QuickJava.hidestatus.Java"           type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_hidestatus_flash"               name="extensions.thatoneguydotnet.QuickJava.hidestatus.Flash"          type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_hidestatus_webgl"               name="extensions.thatoneguydotnet.QuickJava.hidestatus.WebGL"          type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_hidestatus_webrtc"              name="extensions.thatoneguydotnet.QuickJava.hidestatus.WebRTC"         type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_hidestatus_silverlight"         name="extensions.thatoneguydotnet.QuickJava.hidestatus.Silverlight"    type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_hidestatus_animage"             name="extensions.thatoneguydotnet.QuickJava.hidestatus.AnimatedImage"  type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_hidestatus_cookies"             name="extensions.thatoneguydotnet.QuickJava.hidestatus.Cookies"        type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_hidestatus_images"              name="extensions.thatoneguydotnet.QuickJava.hidestatus.Images"         type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_hidestatus_css"                 name="extensions.thatoneguydotnet.QuickJava.hidestatus.CSS"            type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_hidestatus_proxy"               name="extensions.thatoneguydotnet.QuickJava.hidestatus.Proxy"          type="bool"/>
 
-      <preference id="thatoneguydotnet_quickjava_pref_regex_Java"                     name="thatoneguydotnet.QuickJava.regex.Java"                type="string"/>
-      <preference id="thatoneguydotnet_quickjava_pref_regex_Flash"                    name="thatoneguydotnet.QuickJava.regex.Flash"               type="string"/>
-      <preference id="thatoneguydotnet_quickjava_pref_regex_Silverlight"              name="thatoneguydotnet.QuickJava.regex.Silverlight"         type="string"/>
+      <preference id="thatoneguydotnet_quickjava_pref_regex_Java"                     name="extensions.thatoneguydotnet.QuickJava.regex.Java"                type="string"/>
+      <preference id="thatoneguydotnet_quickjava_pref_regex_Flash"                    name="extensions.thatoneguydotnet.QuickJava.regex.Flash"               type="string"/>
+      <preference id="thatoneguydotnet_quickjava_pref_regex_Silverlight"              name="extensions.thatoneguydotnet.QuickJava.regex.Silverlight"         type="string"/>
 
-      <preference id="thatoneguydotnet_quickjava_pref_custombuttonstyle_default"      name="thatoneguydotnet.QuickJava.custombuttonstyle.default" type="string"/>
-      <preference id="thatoneguydotnet_quickjava_pref_custombuttonstyle_enabled"      name="thatoneguydotnet.QuickJava.custombuttonstyle.enabled" type="string"/>
+      <preference id="thatoneguydotnet_quickjava_pref_custombuttonstyle_default"      name="extensions.thatoneguydotnet.QuickJava.custombuttonstyle.default" type="string"/>
+      <preference id="thatoneguydotnet_quickjava_pref_custombuttonstyle_enabled"      name="extensions.thatoneguydotnet.QuickJava.custombuttonstyle.enabled" type="string"/>
 
-      <preference id="thatoneguydotnet_quickjava_pref_startupStatus_type"             name="thatoneguydotnet.QuickJava.startupStatus.type"           type="int"/>
-      <preference id="thatoneguydotnet_quickjava_pref_startupStatus_javascript"       name="thatoneguydotnet.QuickJava.startupStatus.JavaScript"     type="int"/>
-      <preference id="thatoneguydotnet_quickjava_pref_startupStatus_webgl"            name="thatoneguydotnet.QuickJava.startupStatus.WebGL"          type="int"/>
-      <preference id="thatoneguydotnet_quickjava_pref_startupStatus_java"             name="thatoneguydotnet.QuickJava.startupStatus.Java"           type="int"/>
-      <preference id="thatoneguydotnet_quickjava_pref_startupStatus_flash"            name="thatoneguydotnet.QuickJava.startupStatus.Flash"          type="int"/>
-      <preference id="thatoneguydotnet_quickjava_pref_startupStatus_silverlight"      name="thatoneguydotnet.QuickJava.startupStatus.Silverlight"    type="int"/>
-      <preference id="thatoneguydotnet_quickjava_pref_startupStatus_animage"          name="thatoneguydotnet.QuickJava.startupStatus.AnimatedImage"  type="int"/>
-      <preference id="thatoneguydotnet_quickjava_pref_startupStatus_cookies"          name="thatoneguydotnet.QuickJava.startupStatus.Cookies"        type="int"/>
-      <preference id="thatoneguydotnet_quickjava_pref_startupStatus_images"           name="thatoneguydotnet.QuickJava.startupStatus.Images"         type="int"/>
-      <preference id="thatoneguydotnet_quickjava_pref_startupStatus_css"              name="thatoneguydotnet.QuickJava.startupStatus.CSS"            type="int"/>
-      <preference id="thatoneguydotnet_quickjava_pref_startupStatus_proxy"            name="thatoneguydotnet.QuickJava.startupStatus.Proxy"          type="int"/>
+      <preference id="thatoneguydotnet_quickjava_pref_startupStatus_type"             name="extensions.thatoneguydotnet.QuickJava.startupStatus.type"           type="int"/>
+      <preference id="thatoneguydotnet_quickjava_pref_startupStatus_javascript"       name="extensions.thatoneguydotnet.QuickJava.startupStatus.JavaScript"     type="int"/>
+      <preference id="thatoneguydotnet_quickjava_pref_startupStatus_java"             name="extensions.thatoneguydotnet.QuickJava.startupStatus.Java"           type="int"/>
+      <preference id="thatoneguydotnet_quickjava_pref_startupStatus_flash"            name="extensions.thatoneguydotnet.QuickJava.startupStatus.Flash"          type="int"/>
+      <preference id="thatoneguydotnet_quickjava_pref_startupStatus_webgl"            name="extensions.thatoneguydotnet.QuickJava.startupStatus.WebGL"          type="int"/>
+      <preference id="thatoneguydotnet_quickjava_pref_startupStatus_webrtc"           name="extensions.thatoneguydotnet.QuickJava.startupStatus.WebRTC"         type="int"/>
+      <preference id="thatoneguydotnet_quickjava_pref_startupStatus_silverlight"      name="extensions.thatoneguydotnet.QuickJava.startupStatus.Silverlight"    type="int"/>
+      <preference id="thatoneguydotnet_quickjava_pref_startupStatus_animage"          name="extensions.thatoneguydotnet.QuickJava.startupStatus.AnimatedImage"  type="int"/>
+      <preference id="thatoneguydotnet_quickjava_pref_startupStatus_cookies"          name="extensions.thatoneguydotnet.QuickJava.startupStatus.Cookies"        type="int"/>
+      <preference id="thatoneguydotnet_quickjava_pref_startupStatus_images"           name="extensions.thatoneguydotnet.QuickJava.startupStatus.Images"         type="int"/>
+      <preference id="thatoneguydotnet_quickjava_pref_startupStatus_css"              name="extensions.thatoneguydotnet.QuickJava.startupStatus.CSS"            type="int"/>
+      <preference id="thatoneguydotnet_quickjava_pref_startupStatus_proxy"            name="extensions.thatoneguydotnet.QuickJava.startupStatus.Proxy"          type="int"/>
 
-      <preference id="thatoneguydotnet_quickjava_pref_favorites_differentDisplay"     name="thatoneguydotnet.QuickJava.favorites.differentDisplay"  type="int"/>
-      <preference id="thatoneguydotnet_quickjava_pref_favorites_differentToggle"      name="thatoneguydotnet.QuickJava.favorites.differentToggle"   type="int"/>
-      <preference id="thatoneguydotnet_quickjava_pref_favorites_javascript"           name="thatoneguydotnet.QuickJava.favorites.JavaScript"     type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_favorites_webgl"                name="thatoneguydotnet.QuickJava.favorites.WebGL"          type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_favorites_java"                 name="thatoneguydotnet.QuickJava.favorites.Java"           type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_favorites_flash"                name="thatoneguydotnet.QuickJava.favorites.Flash"          type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_favorites_silverlight"          name="thatoneguydotnet.QuickJava.favorites.Silverlight"    type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_favorites_animage"              name="thatoneguydotnet.QuickJava.favorites.AnimatedImage"  type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_favorites_cookies"              name="thatoneguydotnet.QuickJava.favorites.Cookies"        type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_favorites_images"               name="thatoneguydotnet.QuickJava.favorites.Images"         type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_favorites_css"                  name="thatoneguydotnet.QuickJava.favorites.CSS"            type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_favorites_proxy"                name="thatoneguydotnet.QuickJava.favorites.Proxy"          type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_favorites_differentDisplay"     name="extensions.thatoneguydotnet.QuickJava.favorites.differentDisplay"  type="int"/>
+      <preference id="thatoneguydotnet_quickjava_pref_favorites_differentToggle"      name="extensions.thatoneguydotnet.QuickJava.favorites.differentToggle"   type="int"/>
+      <preference id="thatoneguydotnet_quickjava_pref_favorites_javascript"           name="extensions.thatoneguydotnet.QuickJava.favorites.JavaScript"     type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_favorites_java"                 name="extensions.thatoneguydotnet.QuickJava.favorites.Java"           type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_favorites_flash"                name="extensions.thatoneguydotnet.QuickJava.favorites.Flash"          type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_favorites_webgl"                name="extensions.thatoneguydotnet.QuickJava.favorites.WebGL"          type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_favorites_webrtc"               name="extensions.thatoneguydotnet.QuickJava.favorites.WebRTC"         type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_favorites_silverlight"          name="extensions.thatoneguydotnet.QuickJava.favorites.Silverlight"    type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_favorites_animage"              name="extensions.thatoneguydotnet.QuickJava.favorites.AnimatedImage"  type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_favorites_cookies"              name="extensions.thatoneguydotnet.QuickJava.favorites.Cookies"        type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_favorites_images"               name="extensions.thatoneguydotnet.QuickJava.favorites.Images"         type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_favorites_css"                  name="extensions.thatoneguydotnet.QuickJava.favorites.CSS"            type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_favorites_proxy"                name="extensions.thatoneguydotnet.QuickJava.favorites.Proxy"          type="bool"/>
 
-      <preference id="thatoneguydotnet_quickjava_pref_reload_javascript"              name="thatoneguydotnet.QuickJava.reload.JavaScript"        type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_reload_webgl"                   name="thatoneguydotnet.QuickJava.reload.WebGL"             type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_reload_java"                    name="thatoneguydotnet.QuickJava.reload.Java"              type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_reload_flash"                   name="thatoneguydotnet.QuickJava.reload.Flash"             type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_reload_silverlight"             name="thatoneguydotnet.QuickJava.reload.Silverlight"       type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_reload_animage"                 name="thatoneguydotnet.QuickJava.reload.AnimatedImage"     type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_reload_cookies"                 name="thatoneguydotnet.QuickJava.reload.Cookies"           type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_reload_images"                  name="thatoneguydotnet.QuickJava.reload.Images"            type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_reload_css"                     name="thatoneguydotnet.QuickJava.reload.CSS"               type="bool"/>
-      <preference id="thatoneguydotnet_quickjava_pref_reload_proxy"                   name="thatoneguydotnet.QuickJava.reload.Proxy"             type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_reload_javascript"              name="extensions.thatoneguydotnet.QuickJava.reload.JavaScript"        type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_reload_java"                    name="extensions.thatoneguydotnet.QuickJava.reload.Java"              type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_reload_flash"                   name="extensions.thatoneguydotnet.QuickJava.reload.Flash"             type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_reload_webgl"                   name="extensions.thatoneguydotnet.QuickJava.reload.WebGL"             type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_reload_webrtc"                  name="extensions.thatoneguydotnet.QuickJava.reload.WebRTC"            type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_reload_silverlight"             name="extensions.thatoneguydotnet.QuickJava.reload.Silverlight"       type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_reload_animage"                 name="extensions.thatoneguydotnet.QuickJava.reload.AnimatedImage"     type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_reload_cookies"                 name="extensions.thatoneguydotnet.QuickJava.reload.Cookies"           type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_reload_images"                  name="extensions.thatoneguydotnet.QuickJava.reload.Images"            type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_reload_css"                     name="extensions.thatoneguydotnet.QuickJava.reload.CSS"               type="bool"/>
+      <preference id="thatoneguydotnet_quickjava_pref_reload_proxy"                   name="extensions.thatoneguydotnet.QuickJava.reload.Proxy"             type="bool"/>
     </preferences>
     <vbox>
       <groupbox>
@@ -85,10 +89,11 @@
               <row>
                 <label    value=""                                                            id="prompt_lbl" />
                 <label    value="&quickjava.javascript;"                                      id="prompt_javascript_lbl" />
-                <label    value="&quickjava.webgl;"                                           id="prompt_webgl_lbl" />
                 <label    value="&quickjava.cookies;"                                         id="prompt_cookies_lbl" />
                 <label    value="&quickjava.java;"                                            id="prompt_java_lbl" />
                 <label    value="&quickjava.flash;"                                           id="prompt_flash_lbl" />
+                <label    value="&quickjava.webgl;"                                           id="prompt_webgl_lbl" />
+                <label    value="&quickjava.webrtc;"                                          id="prompt_webrtc_lbl" />
                 <label    value="&quickjava.silverlight;"                                     id="prompt_silverlight_lbl" />
                 <label    value="&quickjava.images;"                                          id="prompt_images_lbl" />
                 <label    value="&quickjava.animage;"                                         id="prompt_animage_lbl" />
@@ -98,10 +103,11 @@
               <row>
                 <label    value="&quickjava.options.hidestatusprompt;"                        id="hidestatus_prompt_lbl" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_hidestatus_javascript"  id="hidestatus_javascript_cb" />
-                <checkbox preference="thatoneguydotnet_quickjava_pref_hidestatus_webgl"       id="hidestatus_webgl_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_hidestatus_cookies"     id="hidestatus_cookies_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_hidestatus_java"        id="hidestatus_java_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_hidestatus_flash"       id="hidestatus_flash_cb" />
+                <checkbox preference="thatoneguydotnet_quickjava_pref_hidestatus_webgl"       id="hidestatus_webgl_cb" />
+                <checkbox preference="thatoneguydotnet_quickjava_pref_hidestatus_webrtc"      id="hidestatus_webrtc_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_hidestatus_silverlight" id="hidestatus_silverlight_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_hidestatus_images"      id="hidestatus_images_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_hidestatus_animage"     id="hidestatus_animage_cb" />
@@ -111,10 +117,11 @@
               <row>
                 <label    value="&quickjava.options.favoritesprompt;"                        id="favorites_prompt_lbl" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_favorites_javascript"  id="favorites_javascript_cb" />
-                <checkbox preference="thatoneguydotnet_quickjava_pref_favorites_webgl"       id="favorites_webgl_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_favorites_cookies"     id="favorites_cookies_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_favorites_java"        id="favorites_java_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_favorites_flash"       id="favorites_flash_cb" />
+                <checkbox preference="thatoneguydotnet_quickjava_pref_favorites_webgl"       id="favorites_webgl_cb" />
+                <checkbox preference="thatoneguydotnet_quickjava_pref_favorites_webrtc"      id="favorites_webrtc_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_favorites_silverlight" id="favorites_silverlight_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_favorites_images"      id="favorites_images_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_favorites_animage"     id="favorites_animage_cb" />
@@ -124,10 +131,11 @@
               <row>
                 <label    value="&quickjava.options.reloadprompt;"                        id="reload_prompt_lbl" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_reload_javascript"  id="reload_javascript_cb" />
-                <checkbox preference="thatoneguydotnet_quickjava_pref_reload_webgl"       id="reload_webgl_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_reload_cookies"     id="reload_cookies_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_reload_java"        id="reload_java_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_reload_flash"       id="reload_flash_cb" />
+                <checkbox preference="thatoneguydotnet_quickjava_pref_reload_webgl"       id="reload_webgl_cb" />
+                <checkbox preference="thatoneguydotnet_quickjava_pref_reload_webrtc"      id="reload_webrtc_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_reload_silverlight" id="reload_silverlight_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_reload_images"      id="reload_images_cb" />
                 <checkbox preference="thatoneguydotnet_quickjava_pref_reload_animage"     id="reload_animage_cb" />
@@ -152,28 +160,35 @@
                     <menuitem label="&quickjava.options.off;" value="2" />
                   </menupopup>
                 </menulist>
-                <menulist preference="thatoneguydotnet_quickjava_pref_startupStatus_webgl"       id="startupStatus_webgl_cb">
+                <menulist preference="thatoneguydotnet_quickjava_pref_startupStatus_cookies"     id="startupStatus_cookies_cb">
                   <menupopup>
                     <menuitem label="&quickjava.options.nochange;" value="0" />
                     <menuitem label="&quickjava.options.on;" value="1" />
                     <menuitem label="&quickjava.options.off;" value="2" />
                   </menupopup>
                 </menulist>
-                <menulist preference="thatoneguydotnet_quickjava_pref_startupStatus_cookies"     id="startupStatus_cookies_cb">
+                <menulist preference="thatoneguydotnet_quickjava_pref_startupStatus_java"        id="startupStatus_java_cb">
                   <menupopup>
                     <menuitem label="&quickjava.options.nochange;" value="0" />
                     <menuitem label="&quickjava.options.on;" value="1" />
                     <menuitem label="&quickjava.options.off;" value="2" />
                   </menupopup>
                 </menulist>
-                <menulist preference="thatoneguydotnet_quickjava_pref_startupStatus_java"        id="startupStatus_java_cb">
+                <menulist preference="thatoneguydotnet_quickjava_pref_startupStatus_flash"       id="startupStatus_flash_cb">
                   <menupopup>
                     <menuitem label="&quickjava.options.nochange;" value="0" />
                     <menuitem label="&quickjava.options.on;" value="1" />
                     <menuitem label="&quickjava.options.off;" value="2" />
                   </menupopup>
                 </menulist>
-                <menulist preference="thatoneguydotnet_quickjava_pref_startupStatus_flash"       id="startupStatus_flash_cb">
+                <menulist preference="thatoneguydotnet_quickjava_pref_startupStatus_webgl"       id="startupStatus_webgl_cb">
+                  <menupopup>
+                    <menuitem label="&quickjava.options.nochange;" value="0" />
+                    <menuitem label="&quickjava.options.on;" value="1" />
+                    <menuitem label="&quickjava.options.off;" value="2" />
+                  </menupopup>
+                </menulist>
+                <menulist preference="thatoneguydotnet_quickjava_pref_startupStatus_webrtc"       id="startupStatus_webrtc_cb">
                   <menupopup>
                     <menuitem label="&quickjava.options.nochange;" value="0" />
                     <menuitem label="&quickjava.options.on;" value="1" />
diff --git a/defaults/preferences/defaults.js b/defaults/preferences/defaults.js
index 63047fc..a13671d 100644
--- a/defaults/preferences/defaults.js
+++ b/defaults/preferences/defaults.js
@@ -1,68 +1,72 @@
-pref("thatoneguydotnet.QuickJava.curVersion",               '');
+pref("extensions.thatoneguydotnet.QuickJava.curVersion",               '');
 
 /* which icons are hidden in status/addon bar */
-pref("thatoneguydotnet.QuickJava.hidestatus.JavaScript",    false);
-pref("thatoneguydotnet.QuickJava.hidestatus.WebGL",         false);
-pref("thatoneguydotnet.QuickJava.hidestatus.Java",          false);
-pref("thatoneguydotnet.QuickJava.hidestatus.Flash",         false);
-pref("thatoneguydotnet.QuickJava.hidestatus.Silverlight",   false);
-pref("thatoneguydotnet.QuickJava.hidestatus.AnimatedImage", false);
-pref("thatoneguydotnet.QuickJava.hidestatus.Cookies",       false);
-pref("thatoneguydotnet.QuickJava.hidestatus.Images",        false);
-pref("thatoneguydotnet.QuickJava.hidestatus.CSS",           false);
-pref("thatoneguydotnet.QuickJava.hidestatus.Proxy",         true);
+pref("extensions.thatoneguydotnet.QuickJava.hidestatus.JavaScript",    false);
+pref("extensions.thatoneguydotnet.QuickJava.hidestatus.Java",          false);
+pref("extensions.thatoneguydotnet.QuickJava.hidestatus.Flash",         false);
+pref("extensions.thatoneguydotnet.QuickJava.hidestatus.WebGL",         false);
+pref("extensions.thatoneguydotnet.QuickJava.hidestatus.WebRTC",         false);
+pref("extensions.thatoneguydotnet.QuickJava.hidestatus.Silverlight",   false);
+pref("extensions.thatoneguydotnet.QuickJava.hidestatus.AnimatedImage", false);
+pref("extensions.thatoneguydotnet.QuickJava.hidestatus.Cookies",       false);
+pref("extensions.thatoneguydotnet.QuickJava.hidestatus.Images",        false);
+pref("extensions.thatoneguydotnet.QuickJava.hidestatus.CSS",           false);
+pref("extensions.thatoneguydotnet.QuickJava.hidestatus.Proxy",         true);
 
 /* 0 = initial luanch, 1 = new window, 2 = new tab */
-pref("thatoneguydotnet.QuickJava.startupStatus.type",          0);
+pref("extensions.thatoneguydotnet.QuickJava.startupStatus.type",          0);
 
 /* 0 = no change, 1 = enabled, 2 = disabled */
-pref("thatoneguydotnet.QuickJava.startupStatus.JavaScript",    0);
-pref("thatoneguydotnet.QuickJava.startupStatus.WebGL",         0);
-pref("thatoneguydotnet.QuickJava.startupStatus.Java",          0);
-pref("thatoneguydotnet.QuickJava.startupStatus.Flash",         0);
-pref("thatoneguydotnet.QuickJava.startupStatus.Silverlight",   0);
-pref("thatoneguydotnet.QuickJava.startupStatus.AnimatedImage", 0);
-pref("thatoneguydotnet.QuickJava.startupStatus.Cookies",       0);
-pref("thatoneguydotnet.QuickJava.startupStatus.Images",        0);
-pref("thatoneguydotnet.QuickJava.startupStatus.CSS",           0);
-pref("thatoneguydotnet.QuickJava.startupStatus.Proxy",         0);
+pref("extensions.thatoneguydotnet.QuickJava.startupStatus.JavaScript",    0);
+pref("extensions.thatoneguydotnet.QuickJava.startupStatus.Java",          0);
+pref("extensions.thatoneguydotnet.QuickJava.startupStatus.Flash",         0);
+pref("extensions.thatoneguydotnet.QuickJava.startupStatus.WebGL",         0);
+pref("extensions.thatoneguydotnet.QuickJava.startupStatus.WebRTC",         0);
+pref("extensions.thatoneguydotnet.QuickJava.startupStatus.Silverlight",   0);
+pref("extensions.thatoneguydotnet.QuickJava.startupStatus.AnimatedImage", 0);
+pref("extensions.thatoneguydotnet.QuickJava.startupStatus.Cookies",       0);
+pref("extensions.thatoneguydotnet.QuickJava.startupStatus.Images",        0);
+pref("extensions.thatoneguydotnet.QuickJava.startupStatus.CSS",           0);
+pref("extensions.thatoneguydotnet.QuickJava.startupStatus.Proxy",         0);
 
 /* which icons are visible in the favorites menu button */
-pref("thatoneguydotnet.QuickJava.favorites.JavaScript",     true);
-pref("thatoneguydotnet.QuickJava.favorites.WebGL",          true);
-pref("thatoneguydotnet.QuickJava.favorites.Java",           true);
-pref("thatoneguydotnet.QuickJava.favorites.Flash",          true);
-pref("thatoneguydotnet.QuickJava.favorites.Silverlight",    false);
-pref("thatoneguydotnet.QuickJava.favorites.AnimatedImage",  false);
-pref("thatoneguydotnet.QuickJava.favorites.Cookies",        false);
-pref("thatoneguydotnet.QuickJava.favorites.Images",         false);
-pref("thatoneguydotnet.QuickJava.favorites.CSS",            false);
-pref("thatoneguydotnet.QuickJava.favorites.Proxy",          false);
+pref("extensions.thatoneguydotnet.QuickJava.favorites.JavaScript",     true);
+pref("extensions.thatoneguydotnet.QuickJava.favorites.Java",           true);
+pref("extensions.thatoneguydotnet.QuickJava.favorites.Flash",          true);
+pref("extensions.thatoneguydotnet.QuickJava.favorites.WebGL",          false);
+pref("extensions.thatoneguydotnet.QuickJava.favorites.WebRTC",          false);
+pref("extensions.thatoneguydotnet.QuickJava.favorites.Silverlight",    false);
+pref("extensions.thatoneguydotnet.QuickJava.favorites.AnimatedImage",  false);
+pref("extensions.thatoneguydotnet.QuickJava.favorites.Cookies",        false);
+pref("extensions.thatoneguydotnet.QuickJava.favorites.Images",         false);
+pref("extensions.thatoneguydotnet.QuickJava.favorites.CSS",            false);
+pref("extensions.thatoneguydotnet.QuickJava.favorites.Proxy",          false);
 
 /* What to display/do when some favories are enabled and some are different.  1 = Enabled, 0 = Disabled */
-pref("thatoneguydotnet.QuickJava.favorites.differentDisplay",         1);
-pref("thatoneguydotnet.QuickJava.favorites.differentToggle",          0);
+pref("extensions.thatoneguydotnet.QuickJava.favorites.differentDisplay",         1);
+pref("extensions.thatoneguydotnet.QuickJava.favorites.differentToggle",          0);
 
 /* which icons cause a reload of the page when they are changed */
-pref("thatoneguydotnet.QuickJava.reload.JavaScript",        false);
-pref("thatoneguydotnet.QuickJava.reload.WebGL",             false);
-pref("thatoneguydotnet.QuickJava.reload.Java",              false);
-pref("thatoneguydotnet.QuickJava.reload.Flash",             false);
-pref("thatoneguydotnet.QuickJava.reload.Silverlight",       false);
-pref("thatoneguydotnet.QuickJava.reload.AnimatedImage",     false);
-pref("thatoneguydotnet.QuickJava.reload.Cookies",           false);
-pref("thatoneguydotnet.QuickJava.reload.Images",            false);
-pref("thatoneguydotnet.QuickJava.reload.CSS",               false);
-pref("thatoneguydotnet.QuickJava.reload.Proxy",             false);
+pref("extensions.thatoneguydotnet.QuickJava.reload.JavaScript",        false);
+pref("extensions.thatoneguydotnet.QuickJava.reload.Java",              false);
+pref("extensions.thatoneguydotnet.QuickJava.reload.Flash",             false);
+pref("extensions.thatoneguydotnet.QuickJava.reload.WebGL",             false);
+pref("extensions.thatoneguydotnet.QuickJava.reload.WebRTC",             false);
+pref("extensions.thatoneguydotnet.QuickJava.reload.Silverlight",       false);
+pref("extensions.thatoneguydotnet.QuickJava.reload.AnimatedImage",     false);
+pref("extensions.thatoneguydotnet.QuickJava.reload.Cookies",           false);
+pref("extensions.thatoneguydotnet.QuickJava.reload.Images",            false);
+pref("extensions.thatoneguydotnet.QuickJava.reload.CSS",               false);
+pref("extensions.thatoneguydotnet.QuickJava.reload.Proxy",             false);
 
-pref("thatoneguydotnet.QuickJava.priorvalue.Proxy",         -1);
-pref("thatoneguydotnet.QuickJava.priorvalue.Cookie",        2);
+pref("extensions.thatoneguydotnet.QuickJava.priorvalue.Proxy",         -1);
+pref("extensions.thatoneguydotnet.QuickJava.priorvalue.Cookie",        2);
 
-pref("thatoneguydotnet.QuickJava.enabledState.ClickToPlay",false);
+pref("extensions.thatoneguydotnet.QuickJava.enabledState.ClickToPlay",false);
 
-pref("thatoneguydotnet.QuickJava.regex.Java",               '(^libnpjp2.so$|(^| )java.*(platform|plug-?in))|(IcedTea)');
-pref("thatoneguydotnet.QuickJava.regex.Flash",              '(^| )Shockwave Flash');
-pref("thatoneguydotnet.QuickJava.regex.Silverlight",        '(^| )Silverlight plug-?in');
+pref("extensions.thatoneguydotnet.QuickJava.regex.Java",               '(^libnpjp2.so$|(^| )java.*(platform|plug-?in))|(IcedTea)');
+pref("extensions.thatoneguydotnet.QuickJava.regex.Flash",              '(^| )Shockwave Flash');
+pref("extensions.thatoneguydotnet.QuickJava.regex.Silverlight",        '(^| )Silverlight plug-?in');
 
-pref("thatoneguydotnet.QuickJava.custombuttonstyle.default",'');
-pref("thatoneguydotnet.QuickJava.custombuttonstyle.enabled",'');
\ No newline at end of file
+pref("extensions.thatoneguydotnet.QuickJava.custombuttonstyle.default",'');
+pref("extensions.thatoneguydotnet.QuickJava.custombuttonstyle.enabled",'');
\ No newline at end of file
diff --git a/install.rdf b/install.rdf
index 9af55ed..a36b46e 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,8 +5,9 @@ xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 	<Description about="urn:mozilla:install-manifest">
 		<em:id>{E6C1199F-E687-42da-8C24-E7770CC3AE66}</em:id>
 		<em:name>QuickJava</em:name>
-		<em:version>2.0.8</em:version>
-		<em:description>Enable/Disable Javascript, Java, Flash, Silverlight, Animated Images, Cookies, Images, CSS, and Proxy from Toolbar.</em:description>
+		<em:version>2.1.0</em:version>
+                <em:multiprocessCompatible>true</em:multiprocessCompatible>
+		<em:description>Enable/Disable Javascript, Java, Flash, WebGL, WebRTC, Silverlight, Animated Images, Cookies, Images, CSS, and Proxy from Toolbar.</em:description>
 		<em:creator>Doug Greene</em:creator>
 		<em:homepageURL>http://quickjavaplugin.blogspot.com/</em:homepageURL>
 		<em:iconURL>chrome://quickjava/skin/icon.png</em:iconURL>
@@ -20,5 +21,6 @@ xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 			</Description>
 		</em:targetApplication>
 	        <em:translator>strel</em:translator>	<!-- es -->
+	        <em:translator>Hideki</em:translator>	<!-- jp -->
 	</Description>
 </RDF>
\ No newline at end of file
diff --git a/locale/en-US/quickjava.dtd b/locale/en-US/quickjava.dtd
index 3caec62..9a38189 100644
--- a/locale/en-US/quickjava.dtd
+++ b/locale/en-US/quickjava.dtd
@@ -2,6 +2,7 @@
 <!ENTITY quickjava.java                     "Java">
 <!ENTITY quickjava.flash                    "Flash">
 <!ENTITY quickjava.webgl                    "WebGL">
+<!ENTITY quickjava.webrtc                   "WebRTC">
 <!ENTITY quickjava.silverlight              "SilverLight">
 <!ENTITY quickjava.animage                  "Animated Images">
 <!ENTITY quickjava.cookies                  "Cookies">
@@ -15,6 +16,7 @@
 <!ENTITY quickjava.tooltip.java           "Enable/Disable Java">
 <!ENTITY quickjava.tooltip.flash          "Enable/Disable Flash">
 <!ENTITY quickjava.tooltip.webgl          "Enable/Disable WebGL">
+<!ENTITY quickjava.tooltip.webrtc         "Enable/Disable WebRTC">
 <!ENTITY quickjava.tooltip.silverlight    "Enable/Disable SilverLight">
 <!ENTITY quickjava.tooltip.animage        "Enable/Disable Animated Images">
 <!ENTITY quickjava.tooltip.cookies        "Enable/Disable Cookies">
diff --git a/locale/en-US/quickjava.properties b/locale/en-US/quickjava.properties
index 65baa5a..e6e81bb 100644
--- a/locale/en-US/quickjava.properties
+++ b/locale/en-US/quickjava.properties
@@ -1 +1 @@
-extensions.{E6C1199F-E687-42da-8C24-E7770CC3AE66}.description = Enable/Disable Javascript, Java, Flash, Silverlight, Animated Images, Cookies, Images, CSS, and Proxy from Toolbar.
\ No newline at end of file
+extensions.{E6C1199F-E687-42da-8C24-E7770CC3AE66}.description = Enable/Disable Javascript, Java, Flash, WebGL, WebRTC, Silverlight, Animated Images, Cookies, Images, CSS, and Proxy from Toolbar.
\ No newline at end of file
diff --git a/locale/es/quickjava.dtd b/locale/es/quickjava.dtd
index 0e1c035..2bb1df1 100644
--- a/locale/es/quickjava.dtd
+++ b/locale/es/quickjava.dtd
@@ -2,6 +2,7 @@
 <!ENTITY quickjava.java                     "Java">
 <!ENTITY quickjava.flash                    "Flash">
 <!ENTITY quickjava.webgl                    "WebGL">
+<!ENTITY quickjava.webrtc                   "WebRTC">
 <!ENTITY quickjava.silverlight              "SilverLight">
 <!ENTITY quickjava.animage                  "Imágenes animadas">
 <!ENTITY quickjava.cookies                  "Cookies">
@@ -15,6 +16,7 @@
 <!ENTITY quickjava.tooltip.java           "Habilita/Deshabilita Java">
 <!ENTITY quickjava.tooltip.flash          "Habilita/Deshabilita Flash">
 <!ENTITY quickjava.tooltip.webgl          "Habilita/Deshabilita WebGL">
+<!ENTITY quickjava.tooltip.webrtc         "Habilita/Deshabilita WebRTC">
 <!ENTITY quickjava.tooltip.silverlight    "Habilita/Deshabilita SilverLight">
 <!ENTITY quickjava.tooltip.animage        "Habilita/Deshabilita imágenes animadas">
 <!ENTITY quickjava.tooltip.cookies        "Habilita/Deshabilita cookies">
@@ -61,4 +63,4 @@
 <!ENTITY quickjava.options.betasettings     "Opciones en beta">
 
 <!ENTITY quickjava.options.favorites.differentprompt     "Cuando los favoritos están en diferentes estados Habilitado/Deshabilitado, mostrar botón como [Habilitado/Deshabilitado]">
-<!ENTITY quickjava.options.favorites.differentprompt2    " y el accionado establece los favoritos a [Habilitado/Deshabilitado]">
+<!ENTITY quickjava.options.favorites.differentprompt2    " y el accionado establece los favoritos a [Habilitado/Deshabilitado]">
\ No newline at end of file
diff --git a/locale/es/quickjava.properties b/locale/es/quickjava.properties
index 9c7724b..7e189aa 100644
--- a/locale/es/quickjava.properties
+++ b/locale/es/quickjava.properties
@@ -1 +1 @@
-extensions.{E6C1199F-E687-42da-8C24-E7770CC3AE66}.description = Habilita/Deshabilita Javascript, Java, Flash, Silverlight, imágenes animadas, cookies, imágenes, CSS, y proxy desde la Barra de herramientas.
\ No newline at end of file
+extensions.{E6C1199F-E687-42da-8C24-E7770CC3AE66}.description = Habilita/Deshabilita Javascript, Java, Flash, WebGL, WebRTC, Silverlight, imágenes animadas, cookies, imágenes, CSS, y proxy desde la Barra de herramientas.
\ No newline at end of file
diff --git a/locale/jp/quickjava.dtd b/locale/jp/quickjava.dtd
new file mode 100644
index 0000000..7c1a1a8
--- /dev/null
+++ b/locale/jp/quickjava.dtd
@@ -0,0 +1,66 @@
+<!ENTITY quickjava.javascript "Javascript">
+<!ENTITY quickjava.java "Java">
+<!ENTITY quickjava.flash "Flash">
+<!ENTITY quickjava.webgl                    "WebGL">
+<!ENTITY quickjava.webrtc                   "WebRTC">
+<!ENTITY quickjava.silverlight "SilverLight">
+<!ENTITY quickjava.animage "Animated Images">
+<!ENTITY quickjava.cookies "Cookies">
+<!ENTITY quickjava.images "Images">
+<!ENTITY quickjava.css "Style">
+<!ENTITY quickjava.proxy "Proxy">
+
+<!ENTITY quickjava.favorites "���C�ɓ���">
+
+<!ENTITY quickjava.tooltip.javascript "�L��/���� Javascript">
+<!ENTITY quickjava.tooltip.java "�L��/���� Java">
+<!ENTITY quickjava.tooltip.flash "�L��/���� Flash">
+<!ENTITY quickjava.tooltip.webgl "�L��/���� WebGL">
+<!ENTITY quickjava.tooltip.webrtc "�L��/���� WebRTC">
+<!ENTITY quickjava.tooltip.silverlight "�L��/���� SilverLight">
+<!ENTITY quickjava.tooltip.animage "�L��/���� Animated Images">
+<!ENTITY quickjava.tooltip.cookies "�L��/���� Cookies">
+<!ENTITY quickjava.tooltip.images "�L��/���� Automatic Image Loading">
+<!ENTITY quickjava.tooltip.css "Toggle Style">
+<!ENTITY quickjava.tooltip.proxy "Toggle Proxy">
+<!ENTITY quickjava.tooltip.favorites "Toggle ���C�ɓ���">
+
+<!ENTITY quickjava.context.refresh "�S�Ă𖳌���">
+<!ENTITY quickjava.context.options "Options">
+
+<!ENTITY quickjava.options.title "QuickJava Options">
+<!ENTITY quickjava.options.advancedsettings "Plugin �̐��K�\�����g�p�������x�Ȑݒ�">
+<!ENTITY quickjava.options.colorsettings "���̑�">
+<!ENTITY quickjava.options.mainoptions "��v�Ȑݒ�">
+<!ENTITY quickjava.options.hidestatusprompt "�A�h�I���o�[�� icon ���\��">
+<!ENTITY quickjava.options.favoritesprompt "���C�ɓ���ɒlj�">
+<!ENTITY quickjava.options.reloadprompt "�ύX���ɍēǂݍ���">
+<!ENTITY quickjava.options.startupStatusprompt "On">
+<!ENTITY quickjava.options.startupinitialload "�i�āj�N�����ɓK�p">
+<!ENTITY quickjava.options.startupnewwindow "�V�K�� Window �œK�p">
+<!ENTITY quickjava.options.startupnewtab "�V�K�� Tab �œK�p">
+
+<!ENTITY quickjava.options.nochange "">
+<!ENTITY quickjava.options.on "On">
+<!ENTITY quickjava.options.off "Off">
+
+<!ENTITY quickjava.options.favoritesdifferentprompt1 "���C�ɓ��肪�قȂ��Ԃ̏ꍇ, �\�� ">
+<!ENTITY quickjava.options.favoritesdifferentprompt2 "�{�^�����������ꍇ�̂��C�ɓ��� ">
+
+<!ENTITY quickjava.options.actions.reload "�ύX���ɍēǂݍ���">
+
+<!ENTITY quickjava.options.links.header "Quickjava Links">
+<!ENTITY quickjava.options.links.help "�����Help">
+<!ENTITY quickjava.options.links.home "Support Website">
+<!ENTITY quickjava.options.links.donate "��t">
+
+<!ENTITY quickjava.options.custombuttonstyles "Custom Button Styles">
+<!ENTITY quickjava.options.custombuttondefault "�K��">
+<!ENTITY quickjava.options.custombuttonenabled "�L��">
+<!ENTITY quickjava.options.custombuttonexample "�L�q��:">
+
+<!ENTITY quickjava.reset "������">
+<!ENTITY quickjava.options.betasettings "In Beta Options">
+
+<!ENTITY quickjava.options.favorites.differentprompt "���C�ɓ���̏�Ԃ� �L��/���� �ƈقȂ�ꍇ ,  [�L��/����]���{�^���ɕ\��">
+<!ENTITY quickjava.options.favorites.differentprompt2 "�����āA�g�O���ł̂��C�ɓ���ݒ� [�L��/����]">
\ No newline at end of file
diff --git a/locale/jp/quickjava.properties b/locale/jp/quickjava.properties
new file mode 100644
index 0000000..c2cc34c
--- /dev/null
+++ b/locale/jp/quickjava.properties
@@ -0,0 +1 @@
+extensions.{E6C1199F-E687-42da-8C24-E7770CC3AE66}.description = QuickJava は、ツールバーおよび／またはステータスバーから直接的に、Java や JavaScript、Images、Flash、WebGL、WebRTC などを、簡単に、「有効／無効」に切り替えることができる Firefox の拡張機能です！（援助が必要ですか？）
\ No newline at end of file

From 99a38617651293830f6649c58f4184f0104c1948 Mon Sep 17 00:00:00 2001
From: Doug <Doug0716@gmail.com>
Date: Sun, 21 Aug 2016 23:11:15 -0500
Subject: [PATCH 07/11] Version 2.1.0 Part 2

Update URLs and FireFox compatible version numbers
---
 content/browserOverlay.js | 3 +++
 install.rdf               | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/content/browserOverlay.js b/content/browserOverlay.js
index 95bc4cc..91b5a26 100644
--- a/content/browserOverlay.js
+++ b/content/browserOverlay.js
@@ -46,11 +46,14 @@ initQJ: function()
       this.qj_Fav                 = 'Favorites';
       this.qj_Fav_Different       = this.qj_Fav + '_Different';
   },
+
 onLoad: function(evt)
   {
     if (typeof(Ci) == 'undefined') { return false; } //This is not a normal window (example: options dialog)
     this.alertPluginNames               = false;
     this.alertPluginNamesOnMatch        = false;
+    this.firstInstallUrl                = 'http://quickjavaplugin.blogspot.com/p/welcome.html';
+    this.newVersionUrl                  = 'http://quickjavaplugin.blogspot.com/2016/08/new-version-210.html';
 
     this.curVersion                     = ''; //do not initialize, automatically loaded
     this.massToggle                     = false; //program use, do not initialize to true
diff --git a/install.rdf b/install.rdf
index a36b46e..58e1ed3 100644
--- a/install.rdf
+++ b/install.rdf
@@ -17,7 +17,7 @@ xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 			<Description>
 				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
 				<em:minVersion>44.0</em:minVersion>
-				<em:maxVersion>48.0</em:maxVersion>
+				<em:maxVersion>51.0</em:maxVersion>
 			</Description>
 		</em:targetApplication>
 	        <em:translator>strel</em:translator>	<!-- es -->

From 2e7fd5d0daa63cacbc331282eaa68ae6a501ba80 Mon Sep 17 00:00:00 2001
From: Doug <Doug0716@gmail.com>
Date: Mon, 22 Aug 2016 21:38:33 -0500
Subject: [PATCH 08/11] Add thanks

---
 ReadMe.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ReadMe.txt b/ReadMe.txt
index 174f1b3..e55bc7c 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -7,7 +7,6 @@
 //License: https://www.mozilla.org/en-US/MPL/1.1/
 //
 //Version History
-//Version 2.1.0 Add WebGL and WebRTC support. Move preferences to extensions branch. Fix CSS toggle bugs. Fix Options 'Reset' buttons bug. Fix install/new version popup. Add jp locale.
 //Version 2.0.8 Add error handling due to CSS method sometimes throwing an exception, have not figured out what causes this yet
 //Version 2.0.7 Changed how the stylesheets are being read due to change in FF44
 //Version 2.0.6 Fixed a bug when customizing some toolbars, thanks to Quicksaver (the developer of the Puzzle Toolbar addon) for the code

From effe5a23885eafb72bda109a621fecd8505d53af Mon Sep 17 00:00:00 2001
From: Doug <Doug0716@gmail.com>
Date: Mon, 22 Aug 2016 21:40:10 -0500
Subject: [PATCH 09/11] Add thanks (apparently I can't GitHub...)

---
 ReadMe.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ReadMe.txt b/ReadMe.txt
index e55bc7c..9b65690 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -7,6 +7,7 @@
 //License: https://www.mozilla.org/en-US/MPL/1.1/
 //
 //Version History
+//Version 2.1.0 Add WebGL and WebRTC support. Move preferences to extensions branch. Fix CSS toggle bugs. Fix Options 'Reset' buttons bug. Fix install/new version popup. Add jp locale (thanks to Hideki!) Also thanks to Gitoffthelawn, Compyooter, staudenmeir, and jimbo1qaz for bug reports and communication.
 //Version 2.0.8 Add error handling due to CSS method sometimes throwing an exception, have not figured out what causes this yet
 //Version 2.0.7 Changed how the stylesheets are being read due to change in FF44
 //Version 2.0.6 Fixed a bug when customizing some toolbars, thanks to Quicksaver (the developer of the Puzzle Toolbar addon) for the code

From e56c3f8787548b4afa1b9899d0979b9f31dca47f Mon Sep 17 00:00:00 2001
From: Doug <Doug0716@gmail.com>
Date: Mon, 22 Aug 2016 21:42:51 -0500
Subject: [PATCH 10/11] Add thanks (missed one)

---
 ReadMe.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ReadMe.txt b/ReadMe.txt
index 9b65690..682b96c 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -7,7 +7,7 @@
 //License: https://www.mozilla.org/en-US/MPL/1.1/
 //
 //Version History
-//Version 2.1.0 Add WebGL and WebRTC support. Move preferences to extensions branch. Fix CSS toggle bugs. Fix Options 'Reset' buttons bug. Fix install/new version popup. Add jp locale (thanks to Hideki!) Also thanks to Gitoffthelawn, Compyooter, staudenmeir, and jimbo1qaz for bug reports and communication.
+//Version 2.1.0 Add WebGL (thanks ccrtnsp) and WebRTC support. Move preferences to extensions branch. Fix CSS toggle bugs. Fix Options 'Reset' buttons bug. Fix install/new version popup. Add jp locale (thanks to Hideki!) Also thanks to Gitoffthelawn, Compyooter, staudenmeir, and jimbo1qaz for bug reports and communication.
 //Version 2.0.8 Add error handling due to CSS method sometimes throwing an exception, have not figured out what causes this yet
 //Version 2.0.7 Changed how the stylesheets are being read due to change in FF44
 //Version 2.0.6 Fixed a bug when customizing some toolbars, thanks to Quicksaver (the developer of the Puzzle Toolbar addon) for the code

From a3bb33e1bfda70efcbd5e4e60f88a174a330cb14 Mon Sep 17 00:00:00 2001
From: Doug <ThatOneGuyDotNet@users.noreply.github.com>
Date: Wed, 28 Feb 2018 17:46:17 -0600
Subject: [PATCH 11/11] Update ReadMe.txt

---
 ReadMe.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ReadMe.txt b/ReadMe.txt
index 682b96c..effa0a2 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -1,3 +1,11 @@
+This plugin is Obsolete as of FF 57.
+
+For additional information please visit:
+http://quickjavaplugin.blogspot.com/2017/10/quickjava-to-be-obsolete-with-firefox.html
+
+
+Old Notes:
+
 //QuickJava
 //By Doug G.
 //