diff --git a/PLAN.md b/PLAN.md
new file mode 100644
index 0000000..dac5ecc
--- /dev/null
+++ b/PLAN.md
@@ -0,0 +1,70 @@
+The I2P Browser has made strides at improving users anonymity when browsing
+the anonymous web inside of I2P. However, it has in many ways simply re-hashed
+the existing work of Tor on the Tor Browser. This is mostly a good thing, but it
+is unfortunate because in a sense we have failed to add I2P specific features
+that could improve the user experience and set us apart from the Tor Browser.
+
+I think that moving forward, we should try to extend the functionality of I2P
+Browser into more I2P-specific realms and make an effort to make those things
+more accessible and highlight that they are in use. I don't really know how to
+explain what I mean without describing what I want to do, so
+
+Let's avoid *adding* features to i2pbutton
+------------------------------------------
+
+i2pbutton contains alot of code from Tor which even they don't really want to
+maintain. It's dying the same long, slow death it's always been dying, since
+back before there was a Tor Browser and torbutton was just an easy way to
+configure Tor in your Firefox browser. I don't relish the thought of being one
+the last two groups on the planet maintaining an XUL extension, so I think that
+we should always be trying to do less with i2pbutton and more with a modern
+extension. Other advantages of modern extensions are better debugging tools
+and easier-to-use, more understandable API's for doing the following other
+things.
+
+Contexts for Security and Placing Router Applications under their own Origin
+----------------------------------------------------------------------------
+
+It is possible, however unlikely, for an attack on a local service or a router
+plugin to leak information about what's going on on the router console because
+they will share the same origin. We can resolve this issue, though, by placing
+applications each into their own origin under a so-called "Container Tab,"
+completely separating eepWeb traffic and Router Console administration. The
+origin of the application will be the same as the part of the application URL
+*after* localhost:7657, so for instance "http://localhost:7657/torrents"
+would become just "torrents" in the URL bar and have that origin.
+
+Dynamic Themes
+--------------
+
+Since I2P Browsing and Router Console Administration are going to be separated
+to their own contextual identities, we can manipulate the appearance of the
+Firefox browser to accomplish 2 things: We can indicate which context we are in
+both by manipulating the UI text and color, and manipulate UI elements based on
+what context we're in or even what URL(In the router console) we're on. We can
+use this to make router console applications appear more tightly integrated with
+the functionality of the browser. It's kind of obliquely like how many
+applications are written with user-interfaces that are actually just
+browsers(Including Mattermost), but with us using the whole browser,
+acknowledging it's presence and utility but quite literally highlighting(in
+color) our unique features. So for instance, when the user is using snark it
+could change color to match snark and change text to say "Torrent Client."
+
+Application Integration - Torrents
+----------------------------------
+
+I2P's strengths are in it's applications, but many users never even make it to
+the applications, and even if they do, the I2P applications often lack the
+familiar workflows that people are used to. For instance, when one downloads
+a torrent on the non-anonymous internet, you simply click a link and the browser
+"Handles" the link, automatically launching the torrent client, adding the
+torrent, and sometimes prompting the user for more actions. This isn't possible
+yet with i2psnark and an external browser, but in I2P browser we can write a
+"Protocol Handler" which talks to snark-rpc, replicating the ease of just
+clicking a torrent link to automatically add it to a torrent client. Of course
+that does require us to bundle the snark-rpc plugin. Besides that, once we've
+added the torrent, we can keep talking to snark-rpc to keep track of the
+download progress and display information about that in the already-available
+Firefox downloads menu that users are already familiar with, so that they can
+keep track of the files they are downloading after navigating away from the
+snark interface, or perhaps even without needing to interact with snark at all.
diff --git a/README.md b/README.md
index 34614be..094517e 100644
--- a/README.md
+++ b/README.md
@@ -15,10 +15,15 @@ New versions of this extension create an I2P in Private Browsing mode instead.
 Since this is a drastic change to the behavior of the old plugin, a new entry
 for the new plugin has been made at a new location on addons.mozilla.org.
 
+ * This is the new version: [[link]](https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/)
+
+ * This is the old version: [[link]](https://addons.mozilla.org/en-US/firefox/addon/I2P-Proxy/)
+
 Android usage:
 --------------
 
-Open the following link [Github Releases Version](https://github.com/eyedeekay/i2psetproxy.js/releases/)
+Open the following link
+[Github Releases Version](https://github.com/eyedeekay/i2psetproxy.js/releases/)
 in the browser you want to use for I2P. Firefox will warn you that it is about
 to install an extension and indicate the permissions required. Read them over
 and when you're ready, accept them. That's all it should take, your browser is
@@ -27,7 +32,8 @@ now configured to use I2P.
 ### addons.mozilla.org
 
 If you would prefer to recieve automatic updates from AMO, the correct product
-page for this plugin is [I2P-proxy](https://addons.mozilla.org/en-US/firefox/addon/I2P-proxy/).
+page for this plugin is
+[I2P In Private Browsing](https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/).
 This absolutely requires a working outproxy. If you want to avoid the use of AMO
 for updates, you can download the identical plugin from this repository's
 releases page. The latest AMO Plugin will always be identical to the latest
@@ -48,9 +54,13 @@ submission to AMO.
    isolating HTTP)
   * [done/wip] **Disable** risky webRTC features/offer the option to re-enable
    them with the proxy enforced.
-  * [done] **Change** the color of the browser window to indicate that I2P is in use
-  * [done-ish] **Reset** the HTTP Proxy tunnel to generate a new destination on-demand
-   * it does this by working in conjunction with this [standalone HTTP proxy](https://github.com/eyedeekay/httptunnel), currently disabled*.
+  * [done] **Change** the color of the browser window to indicate that I2P is in
+   use
+  * [done-ish] **Reset** the HTTP Proxy tunnel to generate a new destination
+   on-demand
+   * it does this by working in conjunction with this
+    [standalone HTTP proxy](https://github.com/eyedeekay/httptunnel), currently
+    disabled*.
   * [ready] **Provide** help in a variety of languages.
   * [wip] **Monitor** the health and readiness of the I2P router it is
    instructed to use.
diff --git a/info.js b/info.js
index e47a453..b0acd93 100644
--- a/info.js
+++ b/info.js
@@ -8,7 +8,7 @@ document.addEventListener("click", e => {
       type: "panel",
       incognito: true
     };
-    let creating = chrome.windows.create(createData);
+    let creating = browser.windows.create(createData);
     creating.then(() => {
       console.log("The help panel has been created");
     });
@@ -17,7 +17,7 @@ document.addEventListener("click", e => {
       type: "panel",
       incognito: true
     };
-    let creating = chrome.windows.create(createData);
+    let creating = browser.windows.create(createData);
     creating.then(() => {
       console.log("The news panel has been created");
     });
diff --git a/scrub.js b/scrub.js
index 2865511..424f9e5 100644
--- a/scrub.js
+++ b/scrub.js
@@ -107,7 +107,7 @@ var contextSetup = async function(requestDetails) {
             });
             created.then(onCreated, onError);
           }
-          getting = browser.windows.create();
+          getting = browser.windows.getCurrent();
           getting.then(Create);
           return tabId;
         }
@@ -145,7 +145,7 @@ var contextSetup = async function(requestDetails) {
             });
             created.then(onCreated, onError);
           }
-          getting = browser.windows.create();
+          getting = browser.windows.getCurrent();
           getting.then(Create);
           return tabId;
         }