update changelog

trim down results of eslint, some of these are false
Merge pull request #57 from eyedeekay/lint
2020-01-02 16:50:46 -05:00 · 2020-01-02 16:44:19 -05:00 · 2020-01-02 20:48:34 +00:00 · 2020-01-02 15:43:24 -05:00 · 2020-01-02 13:59:21 -05:00 · 2020-01-02 18:00:48 +00:00
30 changed files with 1476 additions and 1129 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -50,7 +50,7 @@ module.exports = {
    curly: "error",
    "default-case": "error",
    "default-param-last": "error",
-    "dot-location": "error",
+    "dot-location": "off",
    "dot-notation": "off",
    "eol-last": "error",
    eqeqeq: "off",
@@ -59,7 +59,7 @@ module.exports = {
    "func-names": "off",
    "func-style": "off",
    "function-call-argument-newline": ["error", "consistent"],
-    "function-paren-newline": "error",
+    "function-paren-newline": "off",
    "generator-star-spacing": "error",
    "global-require": "error",
    "guard-for-in": "error",
@@ -88,7 +88,7 @@ module.exports = {
    "max-classes-per-file": "error",
    "max-depth": "error",
    "max-len": "error",
-    "max-lines": "error",
+    "max-lines": "off",
    "max-lines-per-function": "off",
    "max-nested-callbacks": "error",
    "max-params": "error",
@@ -96,7 +96,7 @@ module.exports = {
    "max-statements-per-line": "error",
    "multiline-comment-style": ["error", "bare-block"],
    "multiline-ternary": "error",
-    "new-cap": "error",
+    "new-cap": "off",
    "new-parens": "error",
    "newline-after-var": "off",
    "newline-before-return": "off",
@@ -127,7 +127,7 @@ module.exports = {
    "no-implied-eval": "error",
    "no-import-assign": "error",
    "no-inline-comments": "error",
-    "no-inner-declarations": ["error", "functions"],
+    "no-inner-declarations": "off",
    "no-invalid-this": "error",
    "no-iterator": "error",
    "no-label-var": "error",
@@ -182,6 +182,7 @@ module.exports = {
    "no-unmodified-loop-condition": "error",
    "no-unneeded-ternary": "error",
    "no-unused-expressions": "error",
+    "no-unused-vars": "off",
    "no-use-before-define": "off",
    "no-useless-call": "error",
    "no-useless-computed-key": "error",
@@ -195,7 +196,7 @@ module.exports = {
    "no-whitespace-before-property": "error",
    "nonblock-statement-body-position": "error",
    "object-curly-newline": "error",
-    "object-curly-spacing": "error",
+    "object-curly-spacing": "off",
    "object-property-newline": "error",
    "object-shorthand": "error",
    "one-var": "off",
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 README.md.asc
 node_modules/
+web-ext-artifacts
--- a/72
+++ b/72
@@ -36,8 +36,8 @@ clean:
 ## EVEN RELEASES are AMO RELEASES
 ## ODD RELEASES are SELFHOSTED RELEASES

-MOZ_VERSION=0.46
-VERSION=0.47
+MOZ_VERSION=0.54
+VERSION=0.55
 #VERSION=$(MOZ_VERSION)
 #VERSION=1.27

@@ -60,7 +60,18 @@ amo-readme:
 		sed 's|</h2>|</strong>|g' | \
 		sed 's|<h3>|<strong>|g' | \
 		sed 's|</h3>|</strong>|g' | \
-		grep -v '<img' > index.html
+		grep -v '<img' > amo-index.html
+
+index:
+	@echo "<!DOCTYPE html>" > index.html
+	@echo "<html>" >> index.html
+	@echo "<head>" >> index.html
+	@echo "  <title>I2P in Private Browsing Mode</title>" >> index.html
+	@echo "  <link rel=\"stylesheet\" type=\"text/css\" href =\"home.css\" />" >> index.html
+	@echo "</head>" >> index.html
+	markdown README.md >> index.html
+	@echo "</html>" >> index.html
+

 xpi:
 	#wget -O ../i2ppb@eyedeekay.github.io.xpi \
@@ -69,10 +80,19 @@ xpi:
 	cp ~/Downloads/i2p_in_private_browsing-$(VERSION)-an+fx.xpi ./i2ppb@eyedeekay.github.io.xpi

 version:
+	sed -i 's|7647|7657|g' *.js* */*.js*
 	sed -i 's|$(shell grep "\"version\": " manifest.json)|  \"version\": \"$(VERSION)\",|g' manifest.json
+	sed -i 's|$(shell grep "\"version_name\": " manifest.json)|  \"version_name\": \"$(VERSION)\",|g' manifest.json

 moz-version:
+	sed -i 's|7647|7657|g' *.js* */*.js*
 	sed -i 's|$(shell grep "\"version\": " manifest.json)|  \"version\": \"$(MOZ_VERSION)\",|g' manifest.json
+	sed -i 's|$(shell grep "\"version_name\": " manifest.json)|  \"version_name\": \"$(MOZ_VERSION)\",|g' manifest.json
+
+rhz-version:
+	sed -i 's|$(shell grep "\"version\": " manifest.json)|  \"version\": \"$(VERSION)1\",|g' manifest.json
+	sed -i 's|$(shell grep "\"version_name\": " manifest.json)|  \"version_name\": \"$(VERSION)1-rhizome\",|g' manifest.json
+	sed -i 's|7657|7647|g' *.js* */*.js*

 zip: version
 	zip --exclude="./i2ppb@eyedeekay.github.io.xpi" \
@@ -83,10 +103,13 @@ zip: version
 		--exclude="./package-lock.json" \
 		--exclude="./.node_modules" \
 		--exclude="./node_modules" \
-		--exclude="./.git" -r -FS ../i2psetproxy.js.zip *
+		--exclude="./.git" \
+		--exclude="*/*.xpi" \
+		--exclude="web-ext-artifacts" \
+		--exclude="./*.pdf" -r -FS ../i2psetproxy.js.zip *

 release:
-	cat desc debian/changelog | gothub release -p -u eyedeekay -r i2psetproxy.js -t $(VERSION) -n $(VERSION) -d -
+	cat desc debian/changelog | gothub release -p -u eyedeekay -r i2psetproxy.js -t $(VERSION) -n $(VERSION) -d -; true

 delete-release:
 	gothub delete -u eyedeekay -r i2psetproxy.js -t $(VERSION); true
@@ -95,6 +118,7 @@ recreate-release: delete-release release upload

 upload: upload-xpi upload-deb

+full-release: release submit deb upload

 WEB_EXT_API_KEY=AMO_KEY
 WEB_EXT_API_SECRET=AMO_SECRET
@@ -105,14 +129,18 @@ WEB_EXT_API_SECRET=AMO_SECRET
 tk:
 	echo $(WEB_EXT_API_KEY)

-submit: moz-sign moz-submit
+submit: moz-sign rhz-submit moz-submit
+
+clean-artifacts:
+	rm -fr web-ext-artifacts/*

 ##ODD NUMBERED, SELF-DISTRIBUTED VERSIONS HERE!
-moz-sign: version
+moz-sign: version clean-artifacts
 	@echo "Using the 'sign' target to instantly sign an extension for self-distribution"
 	@echo "requires a JWT API Key and Secret from addons.mozilla.org to be made available"
 	@echo "to the Makefile under the variables WEB_EXT_API_KEY and WEB_EXT_API_SECRET."
-	web-ext sign --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET); true
+	web-ext-submit --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET); true
+	cp web-ext-artifacts/*.xpi ./i2ppb@eyedeekay.github.io.xpi; true

 ##EVEN NUMBERED, MOZILLA-DISTRIBUTED VERSIONS HERE!
 moz-submit: moz-version
@@ -121,6 +149,19 @@ moz-submit: moz-version
 	@echo "to the Makefile under the variables WEB_EXT_API_KEY and WEB_EXT_API_SECRET."
 	web-ext sign --channel listed --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET); true

+rhz-submit: rhz-version
+	@echo "Using the 'sign' target to instantly sign an extension for self-distribution"
+	@echo "requires a JWT API Key and Secret from addons.mozilla.org to be made available"
+	@echo "to the Makefile under the variables WEB_EXT_API_KEY and WEB_EXT_API_SECRET."
+	web-ext-submit --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET); true
+	#cp web-ext-artifacts/*.xpi ./i2ppb@eyedeekay.github.io.xpi
+
+gettorrent:
+	wget "http://127.0.0.1:7657/i2psnark/i2ppb@eyedeekay.github.io.xpi.torrent"
+
+upload-torrent:
+	gothub upload -R -u eyedeekay -r i2psetproxy.js -t $(VERSION) -n "i2ppb@eyedeekay.github.io.xpi.torrent" -f "./i2ppb@eyedeekay.github.io.xpi.torrent"
+
 upload-xpi:
 	gothub upload -R -u eyedeekay -r i2psetproxy.js -t $(VERSION) -n "i2ppb@eyedeekay.github.io.xpi" -f "./i2ppb@eyedeekay.github.io.xpi"

@@ -135,20 +176,26 @@ upload-deb:
 fmt:
 	cleancss -O1 all -O2 all --format beautify home.css -o .home.css && mv .home.css home.css
 	cleancss -O1 all -O2 all --format beautify info.css -o .info.css && mv .info.css info.css
-	#find . -path ./node_modules -prune -o -name '*.css' -exec cleancss -O1 --format beautify {} \;
 	find . -path ./node_modules -prune -o -name '*.js' -exec prettier --write {} \;
+	find . -path ./node_modules -prune -o -name '*.json' -exec prettier --write {} \;

 lint:
-	eslint --fix *.js
+	eslint --color *.js

-deborig:
+deborig: fmt version
 	rm -rf ../i2psetproxy.js-$(VERSION)
 	cp -r . ../i2psetproxy.js-$(VERSION)
+	cd ../i2psetproxy.js-$(VERSION)
+	rm -rf *.xpi web-ext-artifacts
 	tar \
 		-cvz \
 		--exclude=.git \
 		--exclude=i2psetproxy.js.gif \
 		--exclude=node_modules \
+		--exclude=web-ext-artifacts \
+		--exclude=*.xpi \
+		--exclude=*/*.xpi \
+		--exclude=*.pdf \
 		-f ../i2psetproxy.js_$(VERSION).orig.tar.gz \
 		.

@@ -156,3 +203,6 @@ deb: deborig
 	cd ../i2psetproxy.js-$(VERSION) && debuild -us -uc -rfakeroot

 -include mirrors.mk
+
+dat:
+	wget -c -O dat.js https://bundle.run/dat-js
--- a/README.md
+++ b/README.md
@@ -1,48 +1,24 @@
 i2psetproxy.js
 ==============

-WebExtension that does extended configuration of a dedicated I2P browser. While
-**experimental**, it's capable of enforcing the use of the I2P Proxy without
-needing to touch about:config and disables several
-fingerprinting/de-anonymization vectors on it's own. It is also the easiest way
-to configure an I2P browser on Android without requiring the user to root their
-device. It aims to be as similar to a fully-fledged I2P browser as possible and
-borrows some code from I2P Rhizome(Which it is also compatible with).
+This is an **Experimental** webextension which introduces a set of new "Private
+Browsing" modes to Firefox-based browsers(Supporting webextensions) that makes
+it easier to configure a browser to use I2P securely and adds features for
+making I2P applications easier to use. It does this by isolating I2P-specific
+settings to Contextual Identities within Firefox, then loading them
+automatically when the user requests them. It also adds convenience and
+management features specific to I2P like protocol handlers and native messaging
+systems.

-The Old Version
---------------
+Installation(Cross-Platform):
+-----------------------------

-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.
+For desktop users this addon is available from addons.mozilla.org, where you
+will be able to recive automatic updates:
+https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/.

- * 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/)
-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
-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 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
-github release, except for the version number, which must be incremented for
-submission to AMO.
-
-Debian usage:
-------------
+Debian Installation:
+--------------------

 Should you prefer, it is possible to install this extension system-wide by
 side-loading it into Debian. You can generate your own deb file by running the
@@ -50,6 +26,31 @@ command:

        make deb

+and then you can install it with:
+
+        sudo apt install ../i2psetproxy.js_*.deb
+
+Usage:
+------
+
+  * Basically, it "Just Works." After you install the plugin, browsing to an I2P
+   domain will automatically stop the current tab and re-open the I2P site in an
+   I2P Browser tab.
+  * Besides that, four bookmarks are added to the "Bookmarks Toolbar," which
+   will take you to visit your Java I2P applications, or the "Simplified I2P
+   Landing Page" embedded in the plugin:
+  * ![Landing page](lander.png)
+  * Also, there's a menu for accessing I2P functionality while you're browsing.
+   It lets you control a few settings in a granular way.
+  * ![Menu](menu.png)
+  * You can re-enable WebRTC but force it to always use the proxy that is
+   enforced by the tab.
+  * You can either force the browser to delete all history for I2P sites
+   immediately, or you can close all your I2P Browser tabs at once and delete
+   the history for I2P browsing when you're done.
+  * That's all there is to it! Your browser is configured to safely use and
+   administer I2P
+
 ### Features

  * [done] **Provide** a way to launch into an I2P-Specific contextual identity
@@ -57,50 +58,64 @@ command:
   to the I2P container. Isolate the router console from other local
   applications by automatically intercepting requests to the router console to
   another container.
-  * [done/wip] **Indicate** the I2P browser is in use visually. Find an
+  * ![Visiting i2p-projekt.i2p](i2psetproxy.js.png)
+  * [done] **Indicate** the I2P browser is in use visually. Find an
   acceptable way to indicate it on Android.
+  * ![Visiting webmail](susimail.png)
  * [done] **Set** the http proxy to use the local I2P proxy automatically.
   Provide specific configuration for other types of I2P proxies(SOCKS,
   isolating HTTP)
-  * [done/wip] **Disable** risky webRTC features/offer the option to re-enable
+  * [done] **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*.
-  * [ready] **Provide** help in a variety of languages.
+  * ![Visiting i2ptunnel](i2ptunnel.png)
+  * [ready/broken/wip] **Provide** help in a variety of languages.
  * [wip] **Monitor** the health and readiness of the I2P router it is
   instructed to use. Currently the plugin checks whether the HTTP Proxy is
   working by fetching an image from "http://proxy.i2p" and displaying a result.
   A work-in-progress binding to i2pcontrol is available in ./i2pcontrol, it is
   inert at this time.
-  * [1/2] **Handle** router console applications under their own origins and
+  * [Done] **Handle** router console applications under their own origins and
   within their own contextual identity. (1) The router console is automatically
   confined to it's own container tab. (2) Use a custom protocol handler to
   place each i2p application/plugin under it's own origin, shortening router
   console URL's and placing applications under their own origin.
-  * [not started] **Handle Torrents** by talking to i2psnark-rpc plugin and then
+  * ![Visiting routerconsole](routerconsole.png)
+  * [wip] **Handle Torrents** by talking to i2psnark-rpc plugin and then
   adding them directly into the Firefox downloads drop-downs, menus, etc. If I
-   can.
+   can. Right now instead of talking to snark-rpc, it uses a web-based protocl
+   handler that simply auto-fills the torrent into i2psnark.
+  * ![Visiting i2psnark](i2psnark.png)
+  * [barely started] **Isolate** traffic by contextual identity to it's own HTTP
+   Proxy tunnel, each reflecting it's own pseudonymous identity within I2P. The
+   contextual identities. For now, the contextual identities used to manage
+   browsing are "I2P Browsing" and "Web Browsing" where I2P Browsing is capable
+   of using an outproxy but in the case of traffic destined for the clearnet
+   does not do header rewriting, and Web Browsing falls back to the Proxy
+   configured in Firefox. The I2P Browsing will be expanded to
+    - I2P Amnesiac Browsing: Use for General Browsing, stores no history and
+    uses an HTTP Proxy with a very short tunnel-close timeout and no key-reuse.
+    - I2P Social Networking: Use this for logging into social network accounts,
+    forums, and other interactive asynchronous public communication platforms
+    where your identity is behaviorally linkable. This has a very long
+    tunnel-close timeout and key-reuse until specifically invoked.
+    - I2P Blogging: Use this for posting content to the web interface of your
+    blog or to other similar websites that you create content on.
+  * ![Visiting clearweb](clearweb.png)

-### Screenshot
+### Video

-![Visiting i2p-projekt.i2p](i2psetproxy.js.png)
+  * ![Video of the plugin in action](i2psetproxy.js.gif)

-![Visiting routerconsole](routerconsole.png)
+Documents
+------------

-![Visiting webmail](susimail.png)
-
-![Visiting i2psnark](i2psnark.png)
-
-![Visiting i2ptunnel](i2ptunnel.png)
-
-![Visiting clearweb](clearweb.png)
-
-![Video of the plugin in action](i2psetproxy.js.gif)
+  * **[Browser Outline](browser.pdf)**: This document is an outline of each of
+  the browser extension's feature panels in presentation form.
+  * **[Smart Lander Design](smartlander.pdf)**: This is the original outline of
+  the smart landing page which became the I2P home page within the browser and
+  the drop-down control panel.

 Super Extra Important Background Info:
 --------------------------------------
@@ -123,4 +138,36 @@ Project uplift seems to have largely been accomplished?

 * https://wiki.mozilla.org/Security/Fusion
 * https://trac.torproject.org/projects/tor/wiki/org/meetings/2018Rome/Notes/FusionProject
- * https://blog.torproject.org/tor-heart-firefox
+ * https://blog.torproject.org/tor-heart-firefox
+
+The Old Version
+---------------
+
+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/)
+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
+now configured to use I2P.
+
+### Android addons.mozilla.org(Temporarily Disabled)
+
+If you would prefer to recieve automatic updates from AMO, the correct product
+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
+github release, except for the version number, which must be incremented for
+submission to AMO.
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -23,6 +23,14 @@
    "message": "Web Browser (Private)",
    "description": "Preface for the browser titlebar"
  },
+  "localPreface": {
+    "message": "Localhost Browser",
+    "description": "Preface for the browser titlebar"
+  },
+  "localPrefacePrivate": {
+    "message": "Localhost Browser (Private)",
+    "description": "Preface for the browser titlebar"
+  },
  "routerPreface": {
    "message": "Router Console",
    "description": "Preface for the browser titlebar"
@@ -97,10 +105,22 @@
  },
  "controlHostText": {
    "message": "Control Host: ",
-    "description": "Host for the Reset Tunnel button"
+    "description": "Host for the Router Console"
  },
  "controlPortText": {
    "message": "Control Port: ",
-    "description": "Port for the Reset Tunnel button"
+    "description": "Port for the Router Console"
+  },
+  "controlHostValue": {
+    "message": "127.0.0.1",
+    "description": "Host for the Router Console"
+  },
+  "controlPortValue": {
+    "message": "7657",
+    "description": "Port for the Router Console"
+  },
+  "protocolHandlerValue": {
+    "message": "http://127.0.0.1:7657/i2psnark/?nofilter_newURL=%s&action=Add&foo=Add+torrent",
+    "description": "Value for the magnet protocol handler"
  }
 }
--- a/background.js
+++ b/background.js
@@ -10,8 +10,10 @@ var torrentpref = chrome.i18n.getMessage("torrentPreface");
 var torrentprefpriv = chrome.i18n.getMessage("torrentPrefacePrivate");
 var tunnelpref = chrome.i18n.getMessage("i2ptunnelPreface");
 var tunnelprefpriv = chrome.i18n.getMessage("i2ptunnelPrefacePrivate");
+var localpref = chrome.i18n.getMessage("localPreface");
+var localprefpriv = chrome.i18n.getMessage("localPrefacePrivate");

-function onGot(contexts) {
+function onContextsGot(contexts) {
  var ids = [];
  for (let context of contexts) {
    console.log(`Name: ${context.name}`);
@@ -25,7 +27,7 @@ function onGot(contexts) {
        color: "orange",
        icon: "fingerprint"
      })
-      .then(onCreated, onError);
+      .then(onCreated, onNotCreated);
  }
  if (ids.indexOf(webpref) == -1) {
    browser.contextualIdentities
@@ -34,7 +36,7 @@ function onGot(contexts) {
        color: "red",
        icon: "circle"
      })
-      .then(onCreated, onError);
+      .then(onCreated, onNotCreated);
  }
  if (ids.indexOf(routerpref) == -1) {
    browser.contextualIdentities
@@ -43,7 +45,7 @@ function onGot(contexts) {
        color: "blue",
        icon: "briefcase"
      })
-      .then(onCreated, onError);
+      .then(onCreated, onNotCreated);
  }
  if (ids.indexOf(tunnelpref) == -1) {
    browser.contextualIdentities
@@ -52,7 +54,7 @@ function onGot(contexts) {
        color: "green",
        icon: "tree"
      })
-      .then(onCreated, onError);
+      .then(onCreated, onNotCreated);
  }
  if (ids.indexOf(mailpref) == -1) {
    browser.contextualIdentities
@@ -61,7 +63,7 @@ function onGot(contexts) {
        color: "yellow",
        icon: "briefcase"
      })
-      .then(onCreated, onError);
+      .then(onCreated, onNotCreated);
  }
  if (ids.indexOf(torrentpref) == -1) {
    browser.contextualIdentities
@@ -70,57 +72,109 @@ function onGot(contexts) {
        color: "purple",
        icon: "chill"
      })
-      .then(onCreated, onError);
+      .then(onCreated, onNotCreated);
  }
+  if (ids.indexOf(localpref) == -1) {
+    browser.contextualIdentities
+      .create({
+        name: localpref,
+        color: "red",
+        icon: "fence"
+      })
+      .then(onCreated, onNotCreated);
+  }
+}
+
+function onContextsError() {
+  console.log("Error finding contextual identities, is the API enabled?");
 }

 function onCreated(context) {
  console.log(`New identity's ID: ${context.cookieStoreId}.`);
 }

-function onError(e) {
-  console.error(e);
+function onNotCreated(context) {
+  console.log(`identity ID: ${context.cookieStoreId} not created`);
 }

-browser.contextualIdentities.query({}).then(onGot, onError);
+browser.contextualIdentities.query({}).then(onContextsGot, onContextsError);

-if (!isDroid()) {
-  chrome.windows.onCreated.addListener(themeWindow);
-  chrome.windows.onFocusChanged.addListener(themeWindow);
-  chrome.windows.onRemoved.addListener(themeWindow);
-  chrome.tabs.onUpdated.addListener(themeWindowByTab);
-  chrome.tabs.onActivated.addListener(themeWindowByTab);
-} else {
-}
+var gettingInfo = browser.runtime.getPlatformInfo();
+gettingInfo.then(got => {
+  if (got.os != "android") {
+    browser.windows.onCreated.addListener(themeWindow);
+    browser.windows.onFocusChanged.addListener(themeWindow);
+    browser.windows.onRemoved.addListener(themeWindow);
+    browser.tabs.onUpdated.addListener(themeWindowByTab);
+    browser.tabs.onActivated.addListener(themeWindowByTab);
+  }
+});

 function themeWindowByTab(tabId) {
  function tabWindow(tab) {
-    getwindow = browser.windows.get(tab.windowId);
-    getwindow.then(themeWindow);
+    var gettingPlatformInfo = browser.runtime.getPlatformInfo();
+    gettingPlatformInfo.then(got => {
+      if (got.os == "android") {
+        let getwindow = browser.tabs.get(tab.tabId);
+        getwindow.then(themeWindow);
+      } else {
+        let getwindow = browser.windows.get(tab.windowId);
+        getwindow.then(themeWindow);
+      }
+    });
  }
  if (typeof tabId === "number") {
-    tab = browser.tabs.get(tabId);
+    let tab = browser.tabs.get(tabId);
    tab.then(tabWindow);
  } else {
    tabWindow(tabId);
  }
 }

+function isEmpty(obj) {
+  if (obj === undefined || obj === null) {
+    return true;
+  }
+  for (var key in obj) {
+    if (obj.hasOwnProperty(key)) {
+      return false;
+    }
+  }
+  return true;
+}
+
+var oldtheme = null;
+
+var getOldTheme = async function getOldTheme() {
+  let foundtheme = await browser.theme.getCurrent();
+  if (!isEmpty(foundtheme)) {
+    oldtheme = foundtheme;
+    console.log("Found old theme", oldtheme);
+  }
+  return oldtheme;
+};
+
+getOldTheme();
+
 function themeWindow(window) {
  // Check if the window is in private browsing
+  function onThemeError() {
+    console.log("got theme", oldtheme);
+    browser.theme.update(oldtheme);
+  }
  function logTabs(tabInfo) {
-    function onGot(context) {
+    function onContextGotTheme(context) {
      if (context.name == titlepref) {
        console.log("Active in I2P window");
        if (window.incognito) {
-          chrome.theme.update(window.id, {
+          browser.theme.update(window.id, {
            colors: {
              frame: "#FFC56D",
              toolbar: "#FFC56D"
            }
          });
        } else {
-          chrome.theme.update(window.id, {
+          browser.theme.update(window.id, {
            colors: {
              frame: "#FFC56D",
              toolbar: "#FFC56D"
@@ -130,14 +184,14 @@ function themeWindow(window) {
      } else if (context.name == routerpref) {
        console.log("Active in Router Console window");
        if (window.incognito) {
-          chrome.theme.update(window.id, {
+          browser.theme.update(window.id, {
            colors: {
              frame: "#A4C8E1",
              toolbar: "#A4C8E1"
            }
          });
        } else {
-          chrome.theme.update(window.id, {
+          browser.theme.update(window.id, {
            colors: {
              frame: "#A4C8E1",
              toolbar: "#A4C8E1"
@@ -147,14 +201,14 @@ function themeWindow(window) {
      } else if (context.name == tunnelpref) {
        console.log("Active in Hidden Services Manager window");
        if (window.incognito) {
-          chrome.theme.update(window.id, {
+          browser.theme.update(window.id, {
            colors: {
              frame: "#D9D9D6",
              toolbar: "#D9D9D6"
            }
          });
        } else {
-          chrome.theme.update(window.id, {
+          browser.theme.update(window.id, {
            colors: {
              frame: "#D9D9D6",
              toolbar: "#D9D9D6"
@@ -164,14 +218,14 @@ function themeWindow(window) {
      } else if (context.name == mailpref) {
        console.log("Active in Web Mail window");
        if (window.incognito) {
-          chrome.theme.update(window.id, {
+          browser.theme.update(window.id, {
            colors: {
              frame: "#F7E59A",
              toolbar: "#F7E59A"
            }
          });
        } else {
-          chrome.theme.update(window.id, {
+          browser.theme.update(window.id, {
            colors: {
              frame: "#F7E59A",
              toolbar: "#F7E59A"
@@ -181,14 +235,14 @@ function themeWindow(window) {
      } else if (context.name == torrentpref) {
        console.log("Active in Bittorrent window");
        if (window.incognito) {
-          chrome.theme.update(window.id, {
+          browser.theme.update(window.id, {
            colors: {
              frame: "#A48FE1",
              toolbar: "#A48FE1"
            }
          });
        } else {
-          chrome.theme.update(window.id, {
+          browser.theme.update(window.id, {
            colors: {
              frame: "#A48FE1",
              toolbar: "#A48FE1"
@@ -197,7 +251,11 @@ function themeWindow(window) {
        }
      } else {
        console.log("Not active in I2P window");
-        chrome.theme.reset(window.id);
+        if (isEmpty(oldtheme)) {
+          browser.theme.reset();
+        } else {
+          browser.theme.update(window.id, oldtheme);
+        }
      }
    }
    if (
@@ -206,9 +264,13 @@ function themeWindow(window) {
    ) {
      browser.contextualIdentities
        .get(tabInfo[0].cookieStoreId)
-        .then(onGot, onError);
+        .then(onContextGotTheme, onThemeError);
    } else {
-      chrome.theme.reset(window.id);
+      if (isEmpty(oldtheme)) {
+        browser.theme.reset();
+      } else {
+        browser.theme.update(window.id, oldtheme);
+      }
    }
  }

@@ -216,83 +278,96 @@ function themeWindow(window) {
    currentWindow: true,
    active: true
  });
-  querying.then(logTabs, onError);
+  querying.then(logTabs, onThemeError);
 }

 function setTitle(window) {
+  // Check if the window is in private browsing
+  function onContextError() {
+    console.log("Context Error");
+  }
  function logTabs(tabInfo) {
-    console.log(tabInfo);
-
-    function onGot(context) {
+    function onContextGotTitle(context) {
      if (context.name == titlepref) {
        console.log("Active in I2P window");

        if (window.incognito) {
-          chrome.windows.update(window.id, {
-            titlePreface: titleprefpriv
+          browser.windows.update(window.id, {
+            titlePreface: titleprefpriv + ": "
          });
        } else {
-          chrome.windows.update(window.id, {
-            titlePreface: titlepref
+          browser.windows.update(window.id, {
+            titlePreface: titlepref + ": "
          });
        }
      } else if (context.name == webpref) {
        console.log("Active in Web window");
-
        if (window.incognito) {
-          chrome.windows.update(window.id, {
-            titlePreface: ""
+          browser.windows.update(window.id, {
+            titlePreface: webprefpriv + " - "
          });
        } else {
-          chrome.windows.update(window.id, {
-            titlePreface: ""
+          browser.windows.update(window.id, {
+            titlePreface: webpref + " - "
          });
        }
      } else if (context.name == routerpref) {
        console.log("Active in Router Console window");
        if (window.incognito) {
-          chrome.windows.update(window.id, {
-            titlePreface: routerprefpriv
+          browser.windows.update(window.id, {
+            titlePreface: titleprefpriv + " - " + routerprefpriv + ": "
          });
        } else {
-          chrome.windows.update(window.id, {
-            titlePreface: routerpref
+          browser.windows.update(window.id, {
+            titlePreface: titlepref + " - " + routerpref + ": "
          });
        }
      } else if (context.name == tunnelpref) {
        console.log("Active in Hidden Services Manager window");

        if (window.incognito) {
-          chrome.windows.update(window.id, {
-            titlePreface: tunnelprefpriv
+          browser.windows.update(window.id, {
+            titlePreface: titleprefpriv + " - " + tunnelprefpriv + ": "
          });
        } else {
-          chrome.windows.update(window.id, {
-            titlePreface: tunnelpref
+          browser.windows.update(window.id, {
+            titlePreface: titlepref + " - " + tunnelpref + ": "
          });
        }
      } else if (context.name == mailpref) {
-        console.log("Active in Web Mail window");
+        console.log("Active in I2P Web Mail window");

        if (window.incognito) {
-          chrome.windows.update(window.id, {
-            titlePreface: mailprefpriv
+          browser.windows.update(window.id, {
+            titlePreface: titleprefpriv + " - " + mailprefpriv + ": "
          });
        } else {
-          chrome.windows.update(window.id, {
-            titlePreface: mailpref
+          browser.windows.update(window.id, {
+            titlePreface: titlepref + " - " + mailpref + ": "
          });
        }
      } else if (context.name == torrentpref) {
-        console.log("Active in I2P window");
+        console.log("Active in I2P Torrent window");

        if (window.incognito) {
-          chrome.windows.update(window.id, {
-            titlePreface: torrentprefpriv
+          browser.windows.update(window.id, {
+            titlePreface: titleprefpriv + " - " + torrentprefpriv + ": "
          });
        } else {
-          chrome.windows.update(window.id, {
-            titlePreface: torrentpref
+          browser.windows.update(window.id, {
+            titlePreface: titlepref + " - " + torrentpref + ": "
+          });
+        }
+      } else if (context.name == localpref) {
+        console.log("Active in Localhost window");
+
+        if (window.incognito) {
+          browser.windows.update(window.id, {
+            titlePreface: localprefpriv + " - " + localprefpriv + ": "
+          });
+        } else {
+          browser.windows.update(window.id, {
+            titlePreface: localpref + " - " + localpref + ": "
          });
        }
      }
@@ -304,17 +379,15 @@ function setTitle(window) {
    ) {
      browser.contextualIdentities
        .get(tabInfo[0].cookieStoreId)
-        .then(onGot, onError);
+        .then(onContextGotTitle, onContextError);
+    } else if (window.incognito) {
+      browser.windows.update(window.id, {
+        titlePreface: ""
+      });
    } else {
-      if (window.incognito) {
-        chrome.windows.update(window.id, {
-          titlePreface: ""
-        });
-      } else {
-        chrome.windows.update(window.id, {
-          titlePreface: ""
-        });
-      }
+      browser.windows.update(window.id, {
+        titlePreface: ""
+      });
    }
  }

@@ -322,36 +395,63 @@ function setTitle(window) {
    currentWindow: true,
    active: true
  });
-  querying.then(logTabs, onError);
+  querying.then(logTabs, onContextError);
 }

-chrome.windows.onCreated.addListener(() => {
-  /* var gettingStoredSettings = chrome.storage.local.get();
-     gettingStoredSettings.then(setupProxy, onError); */
-  chrome.storage.local.get(function(got) {
-    setupProxy();
-  });
+var gettingListenerInfo = browser.runtime.getPlatformInfo();
+gettingListenerInfo.then(got => {
+  function onPlatformError() {
+    console.log("Error finding platform info");
+  }
+  if (got.os != "android") {
+    browser.windows.onCreated.addListener(() => {
+      chrome.storage.local.get(function() {
+        setupProxy();
+      });
+    });
+    browser.tabs.onCreated.addListener(() => {
+      var getting = browser.windows.getCurrent({
+        populate: true
+      });
+      getting.then(setTitle, onPlatformError);
+    });
+    browser.tabs.onActivated.addListener(() => {
+      var getting = browser.windows.getCurrent({
+        populate: true
+      });
+      getting.then(setTitle, onPlatformError);
+    });
+  }
 });
-
-chrome.tabs.onCreated.addListener(() => {
-  var getting = browser.windows.getCurrent({
-    populate: true
-  });
-  getting.then(setTitle, onError);
+/*
+var gettingInfo = browser.runtime.getPlatformInfo();
+gettingInfo.then(got => {
+  if (got.os != "android") {
+    browser.tabs.onCreated.addListener(() => {
+      var getting = browser.windows.getCurrent({
+        populate: true
+      });
+      getting.then(setTitle, onError);
+    });
+  }
 });
-
-chrome.tabs.onActivated.addListener(() => {
-  var getting = browser.windows.getCurrent({
-    populate: true
-  });
-  getting.then(setTitle, onError);
+var gettingInfo = browser.runtime.getPlatformInfo();
+gettingInfo.then(got => {
+  if (got.os != "android") {
+    browser.tabs.onActivated.addListener(() => {
+      var getting = browser.windows.getCurrent({
+        populate: true
+      });
+      getting.then(setTitle, onError);
+    });
+  }
 });
-
+*/
 function handleUpdated(updateInfo) {
-  if (updateInfo.theme.colors) {
+  if (updateInfo.theme) {
    console.log(`Theme was applied: ${updateInfo.theme}`);
  } else {
-    console.log(`Theme was removed`);
+    console.log("Theme was removed");
  }
 }

--- a/bookmarks.js
+++ b/bookmarks.js
@@ -1,153 +1,168 @@
-function bookmarks(bookmarkToolbar) {
-  console.log("Setting up bookmark toolbar", bookmarkToolbar);
-  function bookHome(bookmarkItems) {
-    if (!bookmarkItems.length) {
-      function gotProxyInfo(info) {
-        let host = info.value.http.split(":")[0];
-        let port = info.value.http.split(":")[1];
-        if (port == "7644") {
-          var createBookmark = browser.bookmarks.create({
-            url: "about:I2p",
-            title: "I2P Home Page",
-            parentId: bookmarkToolbar[0].id
-          });
-          createBookmark.then(onCreated);
-        } else {
-          var createBookmark = browser.bookmarks.create({
-            url: browser.runtime.getURL("home.html"),
-            title: "I2P Home Page",
-            parentId: bookmarkToolbar[0].id
-          });
-          createBookmark.then(onCreated);
-        }
-        console.log("(bookmarks) adding home page bookmark");
-      }
-      console.log("(bookmarks) checking if we're running in an I2P Browser");
-      var gettingInfo = browser.proxy.settings.get({});
-      gettingInfo.then(gotProxyInfo);
-    }
-  }
-  function bookTorrent(bookmarkItems) {
-    if (!bookmarkItems.length) {
-      function gotProxyInfo(info) {
-        let host = info.value.http.split(":")[0];
-        let port = info.value.http.split(":")[1];
-        if (port == "7644") {
-          var createBookmark = browser.bookmarks.create({
-            url: "http://localhost:7647/i2psnark",
-            title: "Bittorrent",
-            parentId: bookmarkToolbar[0].id
-          });
-          createBookmark.then(onCreated);
-        } else {
-          var createBookmark = browser.bookmarks.create({
-            url: "http://localhost:7657/i2psnark",
-            title: "Bittorrent",
-            parentId: bookmarkToolbar[0].id
-          });
-          createBookmark.then(onCreated);
+var gettingInfo = browser.runtime.getPlatformInfo();
+gettingInfo.then(got => {
+  if (got.os != "android") {
+    function bookmarks(bookmarkToolbar) {
+      console.log("Setting up bookmark toolbar", bookmarkToolbar);
+      function bookHome(bookmarkItems) {
+        if (!bookmarkItems.length) {
+          function gotProxyInfo(info) {
+            let port = info.value.http.split(":")[1];
+            if (port == "7644") {
+              let createRhizomeBookmark = browser.bookmarks.create({
+                url: "about:I2p",
+                title: "I2P Home Page",
+                parentId: bookmarkToolbar[0].id
+              });
+              createRhizomeBookmark.then(onCreated);
+            } else {
+              let createBookmark = browser.bookmarks.create({
+                url: browser.runtime.getURL("home.html"),
+                title: "I2P Home Page",
+                parentId: bookmarkToolbar[0].id
+              });
+              createBookmark.then(onCreated);
+            }
+            console.log("(bookmarks) adding home page bookmark");
+          }
+          console.log(
+            "(bookmarks) checking if we're running in an I2P Browser"
+          );
+          let gettingProxyInfo = browser.proxy.settings.get({});
+          gettingProxyInfo.then(gotProxyInfo);
        }
      }
-      console.log("(bookmarks) checking if we're running in an I2P Browser");
-      var gettingInfo = browser.proxy.settings.get({});
-      gettingInfo.then(gotProxyInfo);
-    }
-  }
-  function bookMail(bookmarkItems) {
-    if (!bookmarkItems.length) {
-      function gotProxyInfo(info) {
-        let host = info.value.http.split(":")[0];
-        let port = info.value.http.split(":")[1];
-        if (port == "7644") {
-          var createBookmark = browser.bookmarks.create({
-            url: "http://localhost:7647/webmail",
-            title: "Web Mail",
-            parentId: bookmarkToolbar[0].id
-          });
-          createBookmark.then(onCreated);
-        } else {
-          var createBookmark = browser.bookmarks.create({
-            url: "http://localhost:7657/webmail",
-            title: "Web Mail",
-            parentId: bookmarkToolbar[0].id
-          });
-          createBookmark.then(onCreated);
+      function bookTorrent(bookmarkItems) {
+        if (!bookmarkItems.length) {
+          function gotProxyInfo(info) {
+            let port = info.value.http.split(":")[1];
+            if (port == "7644") {
+              let createBookmark = browser.bookmarks.create({
+                url: "http://localhost:7657/i2psnark",
+                title: "Bittorrent",
+                parentId: bookmarkToolbar[0].id
+              });
+              createBookmark.then(onCreated);
+            } else {
+              let createRhizomeBookmark = browser.bookmarks.create({
+                url:
+                  "http://" + control_host + ":" + control_port + "/i2psnark",
+                title: "Bittorrent",
+                parentId: bookmarkToolbar[0].id
+              });
+              createRhizomeBookmark.then(onCreated);
+            }
+          }
+          console.log(
+            "(bookmarks) checking if we're running in an I2P Browser"
+          );
+          let gettingProxyInfo = browser.proxy.settings.get({});
+          gettingProxyInfo.then(gotProxyInfo);
        }
-        console.log("(bookmarks) adding webmail bookmark");
      }
-      console.log("(bookmarks) checking if we're running in an I2P Browser");
-      var gettingInfo = browser.proxy.settings.get({});
-      gettingInfo.then(gotProxyInfo);
-    }
-  }
-  function bookI2PTunnel(bookmarkItems) {
-    if (!bookmarkItems.length) {
-      function gotProxyInfo(info) {
-        let host = info.value.http.split(":")[0];
-        let port = info.value.http.split(":")[1];
-        if (port == "7644") {
-          var createBookmark = browser.bookmarks.create({
-            url: "http://localhost:7647/i2ptunnelmgr",
-            title: "Hidden Services Manager",
-            parentId: bookmarkToolbar[0].id
-          });
-          createBookmark.then(onCreated);
-        } else {
-          var createBookmark = browser.bookmarks.create({
-            url: "http://localhost:7657/i2ptunnelmgr",
-            title: "Hidden Services Manager",
-            parentId: bookmarkToolbar[0].id
-          });
-          createBookmark.then(onCreated);
+      function bookMail(bookmarkItems) {
+        if (!bookmarkItems.length) {
+          function gotProxyInfo(info) {
+            let port = info.value.http.split(":")[1];
+            if (port == "7644") {
+              let createBookmark = browser.bookmarks.create({
+                url: "http://localhost:7657/webmail",
+                title: "Web Mail",
+                parentId: bookmarkToolbar[0].id
+              });
+              createBookmark.then(onCreated);
+            } else {
+              let createRhizomeBookmark = browser.bookmarks.create({
+                url: "http://" + control_host + ":" + control_port + "/webmail",
+                title: "Web Mail",
+                parentId: bookmarkToolbar[0].id
+              });
+              createRhizomeBookmark.then(onCreated);
+            }
+            console.log("(bookmarks) adding webmail bookmark");
+          }
+          console.log(
+            "(bookmarks) checking if we're running in an I2P Browser"
+          );
+          let gettingProxyInfo = browser.proxy.settings.get({});
+          gettingProxyInfo.then(gotProxyInfo);
        }
-        console.log("(bookmarks) adding i2ptunnel bookmark");
      }
-      console.log("(bookmarks) checking if we're running in an I2P Browser");
-      var gettingInfo = browser.proxy.settings.get({});
-      gettingInfo.then(gotProxyInfo);
+      function bookI2PTunnel(bookmarkItems) {
+        if (!bookmarkItems.length) {
+          function gotProxyInfo(info) {
+            let port = info.value.http.split(":")[1];
+            if (port == "7644") {
+              var createBookmark = browser.bookmarks.create({
+                url: "http://localhost:7657/i2ptunnelmgr",
+                title: "Hidden Services Manager",
+                parentId: bookmarkToolbar[0].id
+              });
+              createBookmark.then(onCreated);
+            } else {
+              var createRhizomeBookmark = browser.bookmarks.create({
+                url:
+                  "http://" +
+                  control_host +
+                  ":" +
+                  control_port +
+                  "/i2ptunnelmgr",
+                title: "Hidden Services Manager",
+                parentId: bookmarkToolbar[0].id
+              });
+              createRhizomeBookmark.then(onCreated);
+            }
+            console.log("(bookmarks) adding i2ptunnel bookmark");
+          }
+          console.log(
+            "(bookmarks) checking if we're running in an I2P Browser"
+          );
+          var gettingProxyInfo = browser.proxy.settings.get({});
+          gettingProxyInfo.then(gotProxyInfo);
+        }
+      }
+
+      function onRejected(error) {
+        console.log(`An error: ${error}`);
+      }
+      function onCreated(node) {
+        console.log("Bookmarked", node);
+      }
+
+      var b0 = browser.bookmarks.search({
+        title: "I2P Home Page"
+      });
+      b0.then(bookHome, onRejected);
+
+      var b1 = browser.bookmarks.search({
+        title: "Bittorrent"
+      });
+      b1.then(bookTorrent, onRejected);
+
+      var b2 = browser.bookmarks.search({
+        title: "Hidden Services Manager"
+      });
+      b2.then(bookI2PTunnel, onRejected);
+
+      var b3 = browser.bookmarks.search({
+        title: "Web Mail"
+      });
+      b3.then(bookMail, onRejected);
    }
+
+    var bt = browser.bookmarks.search({
+      query: "Toolbar"
+    });
+
+    bt.then(bookmarks);
+
+    function handleCreated(id, bookmarkInfo) {
+      //var propValue;
+      for (var propName in bookmarkInfo) {
+        let propValue = bookmarkInfo[propName];
+        console.log(propName, propValue);
+      }
+    }
+
+    browser.bookmarks.onCreated.addListener(handleCreated);
  }
-
-  function onRejected(error) {
-    console.log(`An error: ${error}`);
-  }
-  function onCreated(node) {
-    console.log("Bookmarked", node);
-  }
-
-  var b0 = browser.bookmarks.search({
-    title: "I2P Home Page"
-  });
-  b0.then(bookHome, onRejected);
-
-  var b1 = browser.bookmarks.search({
-    title: "Bittorrent"
-  });
-  b1.then(bookTorrent, onRejected);
-
-  var b2 = browser.bookmarks.search({
-    title: "Hidden Services Manager"
-  });
-  b2.then(bookI2PTunnel, onRejected);
-
-  var b3 = browser.bookmarks.search({
-    title: "Web Mail"
-  });
-  b3.then(bookMail, onRejected);
-}
-
-var bt = browser.bookmarks.search({
-  query: "Toolbar"
 });
-
-bt.then(bookmarks);
-
-function handleCreated(id, bookmarkInfo) {
-  var propValue;
-  for (var propName in bookmarkInfo) {
-    propValue = bookmarkInfo[propName];
-    console.log(propName, propValue);
-  }
-}
-
-browser.bookmarks.onCreated.addListener(handleCreated);
--- a/browser.pdf
+++ b/browser.pdf
--- a/context.js
+++ b/context.js
@@ -1,19 +1,19 @@
 //var windowIds = []
-
-function onCreated(windowInfo) {
-  console.log(`Created window: ${windowInfo.id}`);
-  browser.tabs.create({
-    windowId: windowInfo.id,
-    url: "about:blank",
-    cookieStoreId: event.target.dataset.identity
-  });
-}
+var titlepref = chrome.i18n.getMessage("titlePreface");

 function onError(error) {
  console.log(`Error: ${error}`);
 }

 function eventHandler(event) {
+  function onCreated(windowInfo) {
+    console.log(`Created window: ${windowInfo.id}`);
+    browser.tabs.create({
+      windowId: windowInfo.id,
+      url: "about:blank",
+      cookieStoreId: event.target.dataset.identity
+    });
+  }
  if (event.target.dataset.action == "create") {
    var creating = browser.tabs.create({
      cookieStoreId: event.target.dataset.identity
@@ -26,7 +26,7 @@ function eventHandler(event) {
        cookieStoreId: event.target.dataset.identity
      })
      .then(tabs => {
-        browser.tabs.remove(tabs.map(i => i.id));
+        browser.tabs.remove(tabs.map(rem => rem.id));
      });
  }
  event.preventDefault();
@@ -34,13 +34,13 @@ function eventHandler(event) {

 function createOptions(node, identity) {
  for (let option of ["Create", "Close All"]) {
-    let a = document.createElement("a");
-    a.href = "#";
-    a.innerText = option;
-    a.dataset.action = option.toLowerCase().replace(" ", "-");
-    a.dataset.identity = identity.cookieStoreId;
-    a.addEventListener("click", eventHandler);
-    node.appendChild(a);
+    let alink = document.createElement("a");
+    alink.href = "#";
+    alink.innerText = option;
+    alink.dataset.action = option.toLowerCase().replace(" ", "-");
+    alink.dataset.identity = identity.cookieStoreId;
+    alink.addEventListener("click", eventHandler);
+    node.appendChild(alink);
  }
 }

@@ -52,7 +52,7 @@ if (browser.contextualIdentities === undefined) {
 } else {
  browser.contextualIdentities
    .query({
-      name: "I2P Browser"
+      name: titlepref
    })
    .then(identities => {
      if (!identities.length) {
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,32 @@
+i2psetproxy.js (0.55-1) UNRELEASED; urgency=low
+
+  * Get rid of Web Browsing context launcher
+  * Fix linter errors
+  * Tolerate themes
+  * Tolerate other containerizers
+
+ -- idk <hankhill19580@gmail.com>  Thu, 2 JAN 2019 16:47:33 -0400
+
+i2psetproxy.js (0.53-1) UNRELEASED; urgency=low
+
+  * Quick Fix
+
+ -- idk <hankhill19580@gmail.com>  Sat, 23 NOV 2019 20:11:30 -0400
+
+i2psetproxy.js (0.51-1) UNRELEASED; urgency=low
+
+  * Numerous code cleanups, compatibility fixes
+  * enable-disable history
+  * better homepage, better control panel, saner options
+
+ -- idk <hankhill19580@gmail.com>  Sat, 23 NOV 2019 20:10:30 -0400
+
+i2psetproxy.js (0.49-1) UNRELEASED; urgency=low
+
+  * fix tabs
+
+ -- idk <hankhill19580@gmail.com>  Sat, 23 NOV 2019 22:51:11 -0400
+
 i2psetproxy.js (0.47-1) UNRELEASED; urgency=low

  * Improve android compatibility
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -1 +1,6 @@
-i2psetproxy.js.gif
+i2psetproxy.js.gif
+i2psetproxy.js@eyedeekay.github.io.xpi
+i2ppb@eyedeekay.github.io.xpi
+web-ext-artifacts/i2p_in_private_browsing-0.51-an+fx.xpi
+smartlander.pdf
+browser.pdf
--- a/geti2p.url
+++ b/geti2p.url
@@ -0,0 +1 @@
+0.9.43
--- a/handler.js
+++ b/handler.js
@@ -21,14 +21,14 @@ function trimHost(url) {
  } else {
    hostname = url.split("/")[0];
  }
-  let path = url.replace(prefix+hostname, "")
-  console.log("(handler) path", prefix+hostname, path)
-  return path
+  let path = url.replace(prefix + hostname, "");
+  console.log("(handler) path", prefix + hostname, path);
+  return path;
 }

-var handlerSetup = async function(requestDetails) {
+var handlerSetup = function(requestDetails) {
  //console.log("checking protocol handler listener")
-  var rwurl = identifyProtocolHandler(requestDetails.url);
+  let rwurl = identifyProtocolHandler(requestDetails.url);
  if (rwurl != false) {
    console.log("(handler) rewrite URL requested", rwurl);
    requestDetails.redirectUrl = rwurl;
--- a/home.css
+++ b/home.css
@@ -76,8 +76,10 @@ p {
  border: 1px solid #d9d9d6;
  border-radius: 2px;
  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
-  background: #f8f8ff
+  background: #f8f8ff;
+  min-width: 95%
 }
+.application-info,
 .extended-info {
  min-height: 3rem;
  padding: 1rem;
@@ -87,17 +89,7 @@ p {
  border-radius: 2px;
  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
  background: #f8f8ff;
-  min-width: 50%
-}
-.application-info {
-  min-height: 3rem;
-  padding: 1rem;
-  margin-top: 1.5rem;
-  display: inline-block;
-  border: 1px solid #d9d9d6;
-  border-radius: 2px;
-  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
-  background: #f8f8ff
+  min-width: 95%
 }
 h1 {
  margin-right: auto;
@@ -269,21 +261,28 @@ li {
 }
 .onboardingContent {
  font-size: .8rem!important;
-  text-align: left
+  text-align: left;
+  display: none
 }
 #proxy-check {
  visibility: hidden
 }
+#info-content {
+  display: none
+}
 .consoleOn:hover #proxy-check,
 .proxyReady:hover #proxy-check {
  visibility: visible;
  opacity: 1
 }
+img {
+  max-width: 100%
+}
 img.readyness {
  height: 100%;
  width: auto
 }
-@media only screen and (max-width: 768px) {
+@media only screen and (max-width: 399px) {
  .application-info {
    display: none
  }
--- a/home.html
+++ b/home.html
@@ -32,15 +32,15 @@
          </div>
          <div id="onboarding" class="hideIfI2PConsoleOff">
            <h3 id="onboardingTitle">New to I2P? Learn more here.</h3>
-            <h4 id="onboardingZero"><button class="showhider" onclick="flipVisibility('onboardingContentZero')">Protect your Privacy</button></h4>
+            <h4 id="onboardingZero"><button id="onboardingButtonZero" class="showhider" onclick="flipVisibility('onboardingContentZero')">Protect your Privacy</button></h4>
            <p id="onboardingContentZero" class="onboardingContent">I2P Browser allows you to surf the internet using the private and secure I2P network. When using it, you are protected against tracking, surveillance, and censorship as a first-class participant in the I2P network. I2P Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser.</p>
-            <h4 id="onboardingOne"><button class="showhider" onclick="flipVisibility('onboardingContentOne')">Configure your Experience</button></h4>
+            <h4 id="onboardingOne"><button id="onboardingButtonOne" class="showhider" onclick="flipVisibility('onboardingContentOne')">Configure your Experience</button></h4>
            <p id="onboardingContentOne" class="onboardingContent">We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. Note: By default, NoScript and HTTPS Everywhere are not included on the toolbar, but you can customize your toolbar to add them. With all the security and privacy features provided by I2P, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.</p>
-            <h4 id="onboardingTwo"><button class="showhider" onclick="flipVisibility('onboardingContentTwo')">Share Files</button></h4>
+            <h4 id="onboardingTwo"><button id="onboardingButtonTwo" class="showhider" onclick="flipVisibility('onboardingContentTwo')">Share Files</button></h4>
            <p id="onboardingContentTwo" class="onboardingContent">I2P is capable of using peer-to-peer applications like BitTorrent, protecting your identity when you share files. Our anonymous bittorrent client is available in the browser.</p>
-            <h4 id="onboardingThree"><button class="showhider" onclick="flipVisibility('onboardingContentThree')">Hidden e-mail</button></h4>
+            <h4 id="onboardingThree"><button id="onboardingButtonThree" class="showhider" onclick="flipVisibility('onboardingContentThree')">Hidden e-mail</button></h4>
            <p id="onboardingContentThree" class="onboardingContent">There is also an anonymous e-mail service available inside of I2P, which is accessible from our browser via the menu directly below.</p>
-            <h4 id="onboardingFour"><button class="showhider" onclick="flipVisibility('onboardingContentFour')">Experience Tips</button></h4>
+            <h4 id="onboardingFour"><button id="onboardingButtonFour" class="showhider" onclick="flipVisibility('onboardingContentFour')">Experience Tips</button></h4>
            <p id="onboardingContentFour" class="onboardingContent">With all the security and privacy features provided by I2P, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.</p>
          </div>
          <!--<p class="hideIfI2POn">&aboutI2p.warn_not_running; <a href="about:i2p">&aboutI2p.refresh_text;</a> &aboutI2p.reccommend_not_running;</p>-->
@@ -49,17 +49,17 @@
            <h3>Applications</h3>
            <p id="applicationExplain">These applications use I2P to provide them with security and privacy.</p>
              <ul>
-                <a class="applicationName" href="http://127.0.0.1:7657/i2ptunnel">
+                <a class="applicationName" target="_blank" href="http://127.0.0.1:7657/i2ptunnel">
                  <li class="application">
                    Hidden Services Manager <span class="applicationDesc">I2P has a web-based interface for configuring .i2p services like web sites, to set up your own web sites, go here:</span>
                  </li>
                </a>
-                <a class="applicationName" href="http://127.0.0.1:7657/susimail">
+                <a class="applicationName" target="_blank" href="http://127.0.0.1:7657/susimail">
                  <li class="application">
                  E-Mail <span class="applicationDesc">I2P also bundles a webmail client which can be used to access in-I2P e-mail. To use it, go here:</span>
                  </li>
                </a>
-                <a class="applicationName" href="http://127.0.0.1:7657/i2psnark">
+                <a class="applicationName" target="_blank" href="http://127.0.0.1:7657/i2psnark">
                  <li class="application">
                    BitTorrent <span class="applicationDesc">I2P is capable of anonymous Peer-to-Peer file sharing, to use the built-in bittorrent client go here:</span>
                  </li>
@@ -68,7 +68,7 @@
            </p>
          </div>
        <div class="extended-info">
-          <h3 id="links"><button class="showhider" onclick="flipVisibility('info-content')">Links</button></h3>
+          <h3 id="links"><button id="fliplinks" class="showhider">Links</button></h3>
            <div id="info-content">
            <p id="linksExplain">If you want to get more information about I2P, you can visit these links.</p>
            <p>
--- a/home.js
+++ b/home.js
@@ -1,8 +1,24 @@
+document.addEventListener("click", clickEvent => {
+  if (clickEvent.target.id === "onboardingButtonZero") {
+    flipVisibility("onboardingContentZero");
+  } else if (clickEvent.target.id === "onboardingButtonOne") {
+    flipVisibility("onboardingContentOne");
+  } else if (clickEvent.target.id === "onboardingButtonTwo") {
+    flipVisibility("onboardingContentTwo");
+  } else if (clickEvent.target.id === "onboardingButtonThree") {
+    flipVisibility("onboardingContentThree");
+  } else if (clickEvent.target.id === "onboardingButtonFour") {
+    flipVisibility("onboardingContentFour");
+  } else if (clickEvent.target.id === "fliplinks") {
+    flipVisibility("info-content");
+  }
+});
+
 function flipVisibility(div) {
-  var x = document.getElementById(div);
-  if (x.style.display === "none") {
-    x.style.display = "block";
+  let flippable = document.getElementById(div);
+  if (flippable.style.display === "none") {
+    flippable.style.display = "block";
  } else {
-    x.style.display = "none";
+    flippable.style.display = "none";
  }
 }
--- a/host.js
+++ b/host.js
@@ -28,6 +28,12 @@ function localHost(url) {
  return false;
 }

+function extensionHost(url) {
+  var res = url.startsWith(browser.runtime.getURL(""));
+  console.log("Extension URL?", res, url, browser.runtime.getURL(""));
+  return res;
+}
+
 function i2pHostName(url) {
  let hostname = "";
  if (url.indexOf("://") > -1) {
@@ -71,24 +77,27 @@ function routerHost(url) {
  }
  if (url.indexOf("://") > -1) {
    hostname = url.split("/")[2];
-    prefix = url.substr(0, url.indexOf("://") + 3);
+    let prefix = url.substr(0, url.indexOf("://") + 3);
    path = url.replace(prefix + hostname + "/", "");
  } else if (identifyProtocolHandler(url)) {
-    url = identifyProtocolHandler(url);
-    return routerHost(url);
+    let newurl = identifyProtocolHandler(url);
+    return routerHost(newurl);
  } else {
    hostname = url.split("/")[0];
    path = url.replace(hostname + "/", "");
  }
-  if (hostname === "127.0.0.1:7657") {
+  if (hostname === control_host + ":" + control_port) {
+    console.log("(hostcheck) router console found on configured ports");
+    return pathcheck(path);
+  } else if (hostname === "127.0.0.1:7657") {
    return pathcheck(path);
  } else if (hostname === "localhost:7657") {
    return pathcheck(path);
  }

-  if (hostname === "127.0.0.1:7647") {
+  if (hostname === "127.0.0.1:7657") {
    return pathcheck(path);
-  } else if (hostname === "localhost:7647") {
+  } else if (hostname === "localhost:7657") {
    return pathcheck(path);
  }

--- a/i2psetproxy.js@eyedeekay.github.io.xpi
+++ b/i2psetproxy.js@eyedeekay.github.io.xpi
--- a/index.html
+++ b/index.html
@@ -1,44 +1,63 @@
-<strong>i2psetproxy.js</strong>
+<!DOCTYPE html>
+<html>
+<head>
+  <title>I2P in Private Browsing Mode</title>
+  <link rel="stylesheet" type="text/css" href ="home.css" />
+</head>
+<h1>i2psetproxy.js</h1>

-WebExtension that does extended configuration of a dedicated I2P browser. While
-<strong>experimental</strong>, it's capable of enforcing the use of the I2P Proxy without
-needing to touch about:config and disables several
-fingerprinting/de-anonymization vectors on it's own. It is also the easiest way
-to configure an I2P browser on Android without requiring the user to root their
-device.
+<p>This is an <strong>Experimental</strong> webextension which introduces a set of new "Private
+Browsing" modes to Firefox-based browsers(Supporting webextensions) that makes
+it easier to configure a browser to use I2P securely and adds features for
+making I2P applications easier to use. It does this by isolating I2P-specific
+settings to Contextual Identities within Firefox, then loading them
+automatically when the user requests them. It also adds convenience and
+management features specific to I2P like protocol handlers and native messaging
+systems.</p>

-<strong>The Old Version</strong>
+<h2>Installation(Cross-Platform):</h2>

-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.
+<p>For desktop users this addon is available from addons.mozilla.org, where you
+will be able to recive automatic updates:
+https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/.</p>
+
+<h2>Debian Installation:</h2>
+
+<p>Should you prefer, it is possible to install this extension system-wide by
+side-loading it into Debian. You can generate your own deb file by running the
+command:</p>
+
+<pre><code>    make deb
+</code></pre>
+
+<p>and then you can install it with:</p>
+
+<pre><code>    sudo apt install ../i2psetproxy.js_*.deb
+</code></pre>
+
+<h2>Usage:</h2>

 <ul>
-<li>This is the new version: <a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">[link]</a></li>
-<li>This is the old version: <a href="https://addons.mozilla.org/en-US/firefox/addon/I2P-Proxy/">[link]</a></li>
+<li>Basically, it "Just Works." After you install the plugin, browsing to an I2P
+domain will automatically stop the current tab and re-open the I2P site in an
+I2P Browser tab.</li>
+<li>Besides that, four bookmarks are added to the "Bookmarks Toolbar," which
+will take you to visit your Java I2P applications, or the "Simplified I2P
+Landing Page" embedded in the plugin:</li>
+<li><img src="lander.png" alt="Landing page" title="" /></li>
+<li>Also, there's a menu for accessing I2P functionality while you're browsing.
+It lets you control a few settings in a granular way.</li>
+<li><img src="menu.png" alt="Menu" title="" /></li>
+<li>You can re-enable WebRTC but force it to always use the proxy that is
+enforced by the tab.</li>
+<li>You can either force the browser to delete all history for I2P sites
+immediately, or you can close all your I2P Browser tabs at once and delete
+the history for I2P browsing when you're done.</li>
+<li>That's all there is to it! Your browser is configured to safely use and
+administer I2P</li>
 </ul>

-<strong>Android usage:</strong>
-
-Open the following link
-<a href="https://github.com/eyedeekay/i2psetproxy.js/releases/">Github Releases Version</a>
-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
-now configured to use I2P.
-
-<strong>addons.mozilla.org</strong>
-
-If you would prefer to recieve automatic updates from AMO, the correct product
-page for this plugin is
-<a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">I2P In Private Browsing</a>.
-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
-github release, except for the version number, which must be incremented for
-submission to AMO.
-
-<strong>Features</strong>
+<h3>Features</h3>

 <ul>
 <li>[done] <strong>Provide</strong> a way to launch into an I2P-Specific contextual identity
@@ -46,46 +65,78 @@ submission to AMO.
 to the I2P container. Isolate the router console from other local
 applications by automatically intercepting requests to the router console to
 another container.</li>
-<li>[done/wip] <strong>Indicate</strong> the I2P browser is in use visually. Find an
+<li><img src="i2psetproxy.js.png" alt="Visiting i2p-projekt.i2p" title="" /></li>
+<li>[done] <strong>Indicate</strong> the I2P browser is in use visually. Find an
 acceptable way to indicate it on Android.</li>
+<li><img src="susimail.png" alt="Visiting webmail" title="" /></li>
 <li>[done] <strong>Set</strong> the http proxy to use the local I2P proxy automatically.
 Provide specific configuration for other types of I2P proxies(SOCKS,
 isolating HTTP)</li>
-<li>[done/wip] <strong>Disable</strong> risky webRTC features/offer the option to re-enable
+<li>[done] <strong>Disable</strong> risky webRTC features/offer the option to re-enable
 them with the proxy enforced.</li>
 <li>[done] <strong>Change</strong> the color of the browser window to indicate that I2P is in
 use</li>
-<li>[done-ish] <strong>Reset</strong> the HTTP Proxy tunnel to generate a new destination
-on-demand
-<ul>
-<li>it does this by working in conjunction with this
-<a href="https://github.com/eyedeekay/httptunnel">standalone HTTP proxy</a>, currently
-disabled*.</li>
-</ul></li>
-<li>[ready] <strong>Provide</strong> help in a variety of languages.</li>
+<li><img src="i2ptunnel.png" alt="Visiting i2ptunnel" title="" /></li>
+<li>[ready/broken/wip] <strong>Provide</strong> help in a variety of languages.</li>
 <li>[wip] <strong>Monitor</strong> the health and readiness of the I2P router it is
-instructed to use.</li>
-<li>[1/2] <strong>Handle</strong> router console applications under their own origins and
+instructed to use. Currently the plugin checks whether the HTTP Proxy is
+working by fetching an image from "http://proxy.i2p" and displaying a result.
+A work-in-progress binding to i2pcontrol is available in ./i2pcontrol, it is
+inert at this time.</li>
+<li>[Done] <strong>Handle</strong> router console applications under their own origins and
 within their own contextual identity. (1) The router console is automatically
 confined to it's own container tab. (2) Use a custom protocol handler to
 place each i2p application/plugin under it's own origin, shortening router
 console URL's and placing applications under their own origin.</li>
-<li>[not started] <strong>Handle Torrents</strong> by talking to i2psnark-rpc plugin and then
+<li><img src="routerconsole.png" alt="Visiting routerconsole" title="" /></li>
+<li>[wip] <strong>Handle Torrents</strong> by talking to i2psnark-rpc plugin and then
 adding them directly into the Firefox downloads drop-downs, menus, etc. If I
-can.</li>
+can. Right now instead of talking to snark-rpc, it uses a web-based protocl
+handler that simply auto-fills the torrent into i2psnark.</li>
+<li><img src="i2psnark.png" alt="Visiting i2psnark" title="" /></li>
+<li>[barely started] <strong>Isolate</strong> traffic by contextual identity to it's own HTTP
+Proxy tunnel, each reflecting it's own pseudonymous identity within I2P. The
+contextual identities. For now, the contextual identities used to manage
+browsing are "I2P Browsing" and "Web Browsing" where I2P Browsing is capable
+of using an outproxy but in the case of traffic destined for the clearnet
+does not do header rewriting, and Web Browsing falls back to the Proxy
+configured in Firefox. The I2P Browsing will be expanded to
+<ul>
+<li>I2P Amnesiac Browsing: Use for General Browsing, stores no history and
+uses an HTTP Proxy with a very short tunnel-close timeout and no key-reuse.</li>
+<li>I2P Social Networking: Use this for logging into social network accounts,
+forums, and other interactive asynchronous public communication platforms
+where your identity is behaviorally linkable. This has a very long
+tunnel-close timeout and key-reuse until specifically invoked.</li>
+<li>I2P Blogging: Use this for posting content to the web interface of your
+blog or to other similar websites that you create content on.</li>
+</ul></li>
+<li><img src="clearweb.png" alt="Visiting clearweb" title="" /></li>
 </ul>

-<strong>Screenshot</strong>
+<h3>Video</h3>

+<ul>
+<li><img src="i2psetproxy.js.gif" alt="Video of the plugin in action" title="" /></li>
+</ul>

+<h2>Documents</h2>

-<strong>Super Extra Important Background Info:</strong>
+<ul>
+<li><strong><a href="browser.pdf">Browser Outline</a></strong>: This document is an outline of each of
+the browser extension's feature panels in presentation form.</li>
+<li><strong><a href="smartlander.pdf">Smart Lander Design</a></strong>: This is the original outline of
+the smart landing page which became the I2P home page within the browser and
+the drop-down control panel.</li>
+</ul>

-This plugin's viability is directly related to the viability of Mozilla and
+<h2>Super Extra Important Background Info:</h2>
+
+<p>This plugin's viability is directly related to the viability of Mozilla and
 Tor's work on hardening Firefox itself and of particular interest are the
-"Uplift" and "Fusion(Firefox Using Onions)" projects.
+"Uplift" and "Fusion(Firefox Using Onions)" projects.</p>

-<strong>Links about Project Uplift</strong>
+<h3>Links about Project Uplift</h3>

 <ul>
 <li>https://wiki.mozilla.org/Security/Tor_Uplift</li>
@@ -95,12 +146,44 @@ Tor's work on hardening Firefox itself and of particular interest are the
 <li>https://wiki.mozilla.org/Security/Tor_Uplift/Tracking</li>
 </ul>

-Project uplift seems to have largely been accomplished?
+<p>Project uplift seems to have largely been accomplished?</p>

-<strong>Links about Project Fusion</strong>
+<h3>Links about Project Fusion</h3>

 <ul>
 <li>https://wiki.mozilla.org/Security/Fusion</li>
 <li>https://trac.torproject.org/projects/tor/wiki/org/meetings/2018Rome/Notes/FusionProject</li>
 <li>https://blog.torproject.org/tor-heart-firefox</li>
 </ul>
+
+<h2>The Old Version</h2>
+
+<p>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.</p>
+
+<ul>
+<li><p>This is the new version: <a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">[link]</a></p></li>
+<li><p>This is the old version: <a href="https://addons.mozilla.org/en-US/firefox/addon/I2P-Proxy/">[link]</a></p></li>
+</ul>
+
+<h2>Android usage:</h2>
+
+<p>Open the following link
+<a href="https://github.com/eyedeekay/i2psetproxy.js/releases/">Github Releases Version</a>
+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
+now configured to use I2P.</p>
+
+<h3>Android addons.mozilla.org(Temporarily Disabled)</h3>
+
+<p>If you would prefer to recieve automatic updates from AMO, the correct product
+page for this plugin is
+<a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">I2P In Private Browsing</a>.
+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
+github release, except for the version number, which must be incremented for
+submission to AMO.</p>
+</html>
--- a/info.js
+++ b/info.js
@@ -1,9 +1,30 @@
-document.addEventListener("click", e => {
-  function getCurrentWindow() {
-    return chrome.windows.getCurrent();
-  }
+function checkPeerConnection() {
+  let getting = browser.privacy.network.peerConnectionEnabled.get({});
+  getting.then(got => {
+    let webrtc = got.value;
+    console.log("checking webrtc", webrtc);
+    document.getElementById("enable-web-rtc").checked = webrtc;
+  });
+}

-  if (e.target.id === "window-create-help-panel") {
+checkPeerConnection();
+
+function checkHistory() {
+  let getting = browser.storage.local.get("disable_history");
+  getting.then(got => {
+    let disable_history = got.disable_history;
+    if (disable_history == undefined) {
+      disable_history = false;
+    }
+    console.log("checking history", disable_history);
+    document.getElementById("disable-history").checked = disable_history;
+  });
+}
+
+checkHistory();
+
+document.addEventListener("click", clickEvent => {
+  if (clickEvent.target.id === "window-create-help-panel") {
    let createData = {
      type: "panel",
      incognito: true
@@ -12,7 +33,7 @@ document.addEventListener("click", e => {
    creating.then(() => {
      console.log("The help panel has been created");
    });
-  } else if (e.target.id === "window-create-news-panel") {
+  } else if (clickEvent.target.id === "window-create-news-panel") {
    let createData = {
      type: "panel",
      incognito: true
@@ -21,67 +42,74 @@ document.addEventListener("click", e => {
    creating.then(() => {
      console.log("The news panel has been created");
    });
-  } else if (e.target.id === "generate-fresh-tunnel") {
-    function RefreshIdentity() {
+  } else if (clickEvent.target.id === "generate-fresh-tunnel") {
+    function refreshIdentity() {
      console.log("Generating new identity");
      const Http = new XMLHttpRequest();
      const url = "http://" + controlHost + ":" + controlPort;
      Http.open("GET", url);
      Http.send();
-      Http.onreadystatechange = e => {
+      Http.onreadystatechange = event => {
        console.log(Http.responseText);
      };
    }
-    RefreshIdentity();
-  } else if (e.target.id === "window-preface-title") {
-    getCurrentWindow().then(currentWindow => {
-      let updateInfo = {
-        titlePreface: "I2P Help | "
-      };
-      chrome.windows.update(currentWindow.id, updateInfo);
-    });
-  } else if (e.target.id === "window-visit-homepage") {
+    refreshIdentity();
+  } else if (clickEvent.target.id === "window-preface-title") {
+  } else if (clickEvent.target.id === "window-visit-homepage") {
    console.log("attempting to create homepage tab");
    goHome();
-  } else if (e.target.id === "window-visit-i2ptunnel") {
+  } else if (clickEvent.target.id === "window-visit-i2ptunnel") {
    console.log("attempting to create i2ptunnel tab");
    goTunnel();
-  } else if (e.target.id === "window-visit-susimail") {
+  } else if (clickEvent.target.id === "window-visit-susimail") {
    console.log("attempting to create susimail tab");
    goMail();
-  } else if (e.target.id === "window-visit-snark") {
+  } else if (clickEvent.target.id === "window-visit-snark") {
    console.log("attempting to create snark tab");
    goSnark();
-  } else if (e.target.id === "clear-browser-data") {
+  } else if (clickEvent.target.id === "clear-browser-data") {
    forgetBrowsingData();
-  } else if (e.target.id === "check-i2p-control") {
-    echo("I2P Router Detected", "panel-section-i2pcontrol-check");
-  } else if (e.target.id === "enable-web-rtc") {
-    if (e.target.checked) {
+  } else if (clickEvent.target.id === "check-i2p-control") {
+    //echo("I2P Router Detected", "panel-section-i2pcontrol-check");
+  } else if (clickEvent.target.id === "enable-web-rtc") {
+    if (clickEvent.target.checked) {
      browser.runtime.sendMessage({ rtc: "enableWebRTC" });
    } else {
      browser.runtime.sendMessage({ rtc: "disableWebRTC" });
    }
    return;
+  } else if (clickEvent.target.id === "disable-history") {
+    if (clickEvent.target.checked) {
+      browser.runtime.sendMessage({ history: "disableHistory" });
+    } else {
+      browser.runtime.sendMessage({ history: "enableHistory" });
+    }
+    return;
  }

-  e.preventDefault();
+  clickEvent.preventDefault();
 });

 function proxyReadiness() {
  console.log(this.responseText);
 }

+var gettingInfo = browser.runtime.getPlatformInfo();
+gettingInfo.then(got => {
+  if (got.os != "android") {
+    browser.history.onVisited.addListener(onVisited);
+  }
+});
+
 function goHome() {
  function gotProxyInfo(info) {
-    let host = info.value.http.split(":")[0];
    let port = info.value.http.split(":")[1];
    if (port == "7644") {
-      let createData = {
+      let createRhizomeData = {
        url: "about:I2p"
      };
      console.log("visiting homepage");
-      let creating = browser.tabs.create(createData);
+      let creating = browser.tabs.create(createRhizomeData);
    } else {
      let createData = {
        url: "home.html"
@@ -92,71 +120,70 @@ function goHome() {
    console.log("(bookmarks) adding home page bookmark");
  }
  console.log("(bookmarks) checking if we're running in an I2P Browser");
-  var gettingInfo = browser.proxy.settings.get({});
-  gettingInfo.then(gotProxyInfo);
+  var gettingProxyInfo = browser.proxy.settings.get({});
+  gettingProxyInfo.then(gotProxyInfo);
+}
+
+function onTabCreated() {
+  console.log("Tab Created");
 }

 function goTunnel() {
+  function onTabError() {
+    console.log("I2PTunnel tab created");
+  }
  let createData = {
-    url: "http://127.0.0.1:7657/i2ptunnel"
+    url: "http://" + control_host + ":" + control_port + "/i2ptunnel"
  };
-  console.log("visiting homepage");
+  console.log("visiting i2ptunnel");
  let creating = browser.tabs.create(createData);
+  creating(onTabCreated, onTabError);
 }

 function goMail() {
+  function onTabError() {
+    console.log("Mail tab created");
+  }
  let createData = {
-    url: "http://127.0.0.1:7657/susimail"
+    url: "http://" + control_host + ":" + control_port + "/susimail"
  };
-  console.log("visiting homepage");
+  console.log("visiting mail");
  let creating = browser.tabs.create(createData);
+  creating(onTabCreated, onTabError);
 }

 function goSnark() {
+  function onTabError() {
+    console.log("Snark tab created");
+  }
  let createData = {
-    url: "http://127.0.0.1:7657/i2psnark"
+    url: "http://" + control_host + ":" + control_port + "/i2psnark"
  };
-  console.log("visiting homepage");
+  console.log("visiting snark");
  let creating = browser.tabs.create(createData);
-}
-/*
-//document.addEventListener("onpageshow", e => {
-console.log("(Check) Checking Proxy Readiness");
-const Http = new XMLHttpRequest();
-Http.addEventListener("load", proxyReadiness);
-const url = "http://proxy.i2p"; ///themes/console/images/favicon.ico";
-Http.open("GET", url);
-Http.send();
-//});
-
-function transferComplete(evt) {
-  console.log(
-    "The transfer is complete.",
-    this.status,
-    this.statusText,
-    this.responseText
-  );
+  creating(onTabCreated, onTabError);
 }

-function transferFailed(evt) {
-  console.log(
-    "An error occurred while transferring the file.",
-    this.status,
-    this.statusText,
-    this.responseText
-  );
-}
+function onVisited(historyItem) {
+  function onCleaned(results) {
+    if (results.length) {
+      console.log(" was not removed");
+    } else {
+      console.log(" was removed");
+    }
+  }

-function transferCanceled(evt) {
-  console.log(
-    "The transfer has been canceled by the user.",
-    this.status,
-    this.statusText,
-    this.responseText
-  );
+  function onRemoved() {
+    var searching = browser.history.search({
+      text: historyItem.url,
+      startTime: 0
+    });
+    searching.then(onCleaned);
+  }
+  if (!history) {
+    if (i2pHost(historyItem.url)) {
+      var deletingUrl = browser.history.deleteUrl(historyItem.url);
+    }
+    deletingUrl.then(onRemoved);
+  }
 }
-
-Http.addEventListener("load", transferComplete);
-Http.addEventListener("error", transferFailed);
-Http.addEventListener("abort", transferCanceled);
-*/
--- a/lander.png
+++ b/lander.png
--- a/manifest.json
+++ b/manifest.json
@@ -5,7 +5,6 @@
      "strict_min_version": "60.0"
    }
  },
-  "content_security_policy": "script-src 'self' 'sha256-AT9pbzcnD9T9Agf3fMgPh55nsx/xONoULxPFvOb93Uo='; object-src 'self'",
  "permissions": [
    "theme",
    "browsingData",
@@ -24,7 +23,8 @@
  ],
  "manifest_version": 2,
  "name": "__MSG_extensionName__",
-  "version": "0.46",
+  "version": "0.55",
+  "version_name": "0.55",
  "description": "__MSG_extensionDescription__",
  "homepage_url": "https://github.com/eyedeekay/i2psetproxy.js",
  "icons": {
@@ -54,16 +54,22 @@
      "bookmarks.js"
    ]
  },
-  "protocol_handlers": [{
-    "protocol": "ext+rc",
-    "name": "RouterConsole",
-    "uriTemplate": "http://127.0.0.1:7657/%s"
-  },
-  {
-    "protocol": "magnet",
-    "name": "I2PTorrent",
-    "uriTemplate": "http://127.0.0.1:7657/i2psnark/?nofilter_newURL=%s&action=Add&foo=Add+torrent"
-  }],
+  "protocol_handlers": [
+    {
+      "protocol": "ext+rc",
+      "name": "RouterConsole",
+      "uriTemplate": "http://127.0.0.1:7657/%s"
+    },
+    {
+      "protocol": "ext+dati2p",
+      "name": "Dat over I2P",
+      "uriTemplate": "/dat.html#!/%s"
+    },
+    {
+      "protocol": "magnet",
+      "name": "I2PTorrent",
+      "uriTemplate": "http://127.0.0.1:7657/i2psnark/?nofilter_newURL=%s&action=Add&foo=Add+torrent"
+    }
+  ],
  "default_locale": "en"
 }
-
--- a/menu.png
+++ b/menu.png
--- a/options/options.js
+++ b/options/options.js
@@ -1,14 +1,3 @@
-function isDroid() {
-  var gettingInfo = browser.runtime.getPlatformInfo();
-  gettingInfo.then(got => {
-    if (got.os == "android") {
-      return true;
-    } else {
-      return false;
-    }
-  });
-}
-
 function SetHostText() {
  var hostid = document.getElementById("hostText");
  hostid.textContent = chrome.i18n.getMessage("hostText");
@@ -24,174 +13,6 @@ function SetControlHostText() {
  controlhostid.textContent = chrome.i18n.getMessage("controlHostText");
 }

-var handleContextProxyRequest = async function(requestDetails) {
-  console.log("(proxy)Searching for proxy by context");
-  try {
-    var handleProxyRequest = function(context) {
-      proxy = {
-        failoverTimeout: 0,
-        proxyDns: false
-      };
-      if (context != undefined) {
-        if (context.name == "i2pbrowser") {
-          proxy = {
-            type: getScheme(),
-            host: getHost(),
-            port: getPort()
-          };
-          console.log(
-            "(proxy)",
-            context.name,
-            "Using",
-            proxy.type,
-            "proxy ",
-            proxy.host + ":" + proxy.port
-          );
-          return proxy;
-        } else if (context.name == "routerconsole") {
-          if (routerHost(requestDetails.url)) {
-            return proxy;
-          } else if (!routerHost(requestDetails.url)) {
-            proxy = {
-              type: "http",
-              host: "localhost",
-              port: "65535"
-            };
-          }
-          proxy = {
-            type: getScheme(),
-            host: getHost(),
-            port: getPort()
-          };
-          console.log(
-            "(proxy)",
-            context.name,
-            "Using",
-            proxy.type,
-            "proxy ",
-            proxy.host + ":" + proxy.port
-          );
-          return proxy;
-        } else if (context.name == "fenced-default") {
-          if (localHost(requestDetails.url)) {
-            if (!routerHost(requestDetails.url)) {
-              proxy = {
-                type: "http",
-                host: "localhost",
-                port: "65535"
-              };
-            }
-          }
-          console.log(
-            "(proxy)",
-            context.name,
-            "Using",
-            proxy.type,
-            "proxy ",
-            proxy.host + ":" + proxy.port
-          );
-          return proxy;
-        }
-      }
-      if (!routerHost(requestDetails.url)) {
-        proxy = {
-          type: "http",
-          host: "localhost",
-          port: "65535"
-        };
-      } else if (i2pHost(requestDetails.url)) {
-        proxy = {
-          type: getScheme(),
-          host: getHost(),
-          port: getPort()
-        };
-      }
-      return proxy;
-    };
-    var contextGet = async function(tabInfo) {
-      try {
-        console.log("(proxy)Tab info from Function", tabInfo);
-        context = await browser.contextualIdentities.get(tabInfo.cookieStoreId);
-        return context;
-      } catch (error) {
-        console.log("(proxy)Context Error", error);
-      }
-    };
-    var tabFind = async function(tabId) {
-      try {
-        context = await browser.contextualIdentities.query({
-          name: "i2pbrowser"
-        });
-        tabId.cookieStoreId = context[0].cookieStoreId;
-        console.log("(proxy) forcing context", tabId.cookieStoreId);
-        return tabId;
-      } catch (error) {
-        console.log("(proxy)Context Error", error);
-      }
-    };
-    var tabGet = async function(tabId) {
-      try {
-        console.log("(proxy)Tab ID from Request", tabId);
-        let tabInfo = await browser.tabs.get(tabId);
-        return tabInfo;
-      } catch (error) {
-        console.log("(proxy)Tab error", error);
-      }
-    };
-
-    if (requestDetails.tabId > 0) {
-      if (proxyHost(requestDetails.url)) {
-        console.log("(Proxy)I2P Proxy test URL detected, ", requestDetails.url);
-        return {
-          type: getScheme(),
-          host: getHost(),
-          port: getPort()
-        };
-      } else if (i2pHost(requestDetails.url)) {
-        console.log("(Proxy)I2P URL detected, ");
-        var tab = tabGet(requestDetails.tabId);
-        var mtab = tab.then(tabFind);
-        requestDetails.tabId = mtab;
-        var context = mtab.then(contextGet);
-        var proxy = await context.then(handleProxyRequest);
-        console.log("(proxy)Returning I2P Proxy", proxy);
-        return proxy;
-      } else {
-        var tab = tabGet(requestDetails.tabId);
-        var context = tab.then(contextGet);
-        var proxy = await context.then(handleProxyRequest);
-        console.log("(proxy)Returning I2P Proxy", proxy);
-        return proxy;
-      }
-      proxy = {
-        type: getScheme(),
-        host: getHost(),
-        port: getPort()
-      };
-      console.log("(proxy)Returning I2P Proxy", proxy);
-      return proxy;
-    }
-  } catch (error) {
-    console.log("(proxy)Not using I2P Proxy.", error);
-  }
-};
-
-function setupProxy() {
-  var controlHost = getControlHost();
-  var controlPort = getControlPort();
-  var Host = getHost();
-  var Port = getPort();
-  var Scheme = getScheme();
-
-  /**/
-  console.log("Setting up Firefox WebExtension proxy");
-  browser.proxy.onRequest.addListener(handleContextProxyRequest, {
-    urls: ["<all_urls>"]
-  });
-  console.log("i2p settings created for WebExtension Proxy");
-  /**/
-}
-
 function SetControlPortText() {
  var controlportid = document.getElementById("controlPortText");
  controlportid.textContent = chrome.i18n.getMessage("controlPortText");
@@ -324,6 +145,75 @@ function checkStoredSettings(storedSettings) {
  gettingInfo.then(gotProxyInfo);
 }

+function checkAndroidStoredSettings(storedSettings) {
+  let defaultSettings = {};
+  let host = "";
+  let port = "";
+  console.log("proxy", "'" + host + "'", ":", port);
+  if (!storedSettings.proxy_scheme) {
+    defaultSettings["proxy_scheme"] = "http";
+  }
+  if (!storedSettings.proxy_host) {
+    if (host == "") {
+      defaultSettings["proxy_host"] = "127.0.0.1";
+    } else {
+      defaultSettings["proxy_host"] = host;
+    }
+  } else {
+    if (host != "") {
+      defaultSettings["proxy_host"] = host;
+    } else {
+      defaultSettings["proxy_host"] = storedSettings.proxy_host;
+    }
+  }
+  if (!storedSettings.proxy_port) {
+    if (port == undefined) {
+      defaultSettings["proxy_port"] = 4444;
+    } else {
+      defaultSettings["proxy_port"] = port;
+    }
+  } else {
+    if (port != undefined) {
+      defaultSettings["proxy_port"] = port;
+    } else {
+      defaultSettings["proxy_port"] = storedSettings.proxy_port;
+    }
+  }
+  if (!storedSettings.control_host) {
+    if (host == "") {
+      defaultSettings["control_host"] = "127.0.0.1";
+    } else {
+      defaultSettings["control_host"] = host;
+    }
+  } else {
+    if (host != "") {
+      defaultSettings["control_host"] = host;
+    } else {
+      defaultSettings["control_host"] = storedSettings.control_host;
+    }
+  }
+  if (!storedSettings.control_port) {
+    if (port == undefined) {
+      defaultSettings["control_port"] = 4444;
+    } else {
+      defaultSettings["control_port"] = port;
+    }
+  } else {
+    if (port != undefined) {
+      defaultSettings["control_port"] = port;
+    } else {
+      defaultSettings["control_port"] = storedSettings.control_port;
+    }
+  }
+  console.log(
+    defaultSettings["proxy_host"],
+    defaultSettings["proxy_port"],
+    defaultSettings["control_host"],
+    defaultSettings["control_port"]
+  );
+  chrome.storage.local.set(defaultSettings);
+}
+
 function onError(e) {
  console.error(e);
 }
@@ -346,7 +236,6 @@ function storeSettings() {
  console.log("storing proxy port:", proxy_port);
  console.log("storing control host:", control_host);
  console.log("storing control port:", control_port);
-  setupProxy();
 }

 function updateUI(restoredSettings) {
@@ -375,15 +264,25 @@ function updateUI(restoredSettings) {
  SetControlHostText();
  SetControlPortText();
  SetControlHelpText();
-  setupProxy();
 }

 function onError(e) {
  console.error(e);
 }
-chrome.storage.local.get(function(got) {
-  checkStoredSettings(got);
-  updateUI(got);
+
+var gettingInfo = browser.runtime.getPlatformInfo();
+gettingInfo.then(got => {
+  if (got.os != "android") {
+    chrome.storage.local.get(function(got) {
+      checkStoredSettings(got);
+      updateUI(got);
+    });
+  } else {
+    chrome.storage.local.get(function(got) {
+      checkAndroidStoredSettings(got);
+      updateUI(got);
+    });
+  }
 });

 const saveButton = document.querySelector("#save-button");
--- a/platform.js
+++ b/platform.js
@@ -1,13 +1,26 @@
+var android = false;
+
+var gettingInfo = browser.runtime.getPlatformInfo();
+gettingInfo.then(got => {
+  if (got.os == "android") {
+    console.log("Running in Android detected");
+    android = true;
+    return true;
+  } else {
+    console.log("Running in Desktop detected");
+    android = false;
+    return false;
+  }
+});
+
 function isDroid() {
-  var gettingInfo = browser.runtime.getPlatformInfo();
-  gettingInfo.then(got => {
-    if (got.os == "android") {
-      console.log("Running in Android detected");
-      return true;
-    } else {
-      console.log("Running in Desktop detected");
-      return false;
-    }
-  });
+  console.log("android?", android);
+  if (android == undefined) {
+    return false;
+  }
+  return android;
+}
+
+function notClosable() {
  return false;
 }
--- a/privacy.js
+++ b/privacy.js
@@ -1,13 +1,4 @@
-var webpref = chrome.i18n.getMessage("webPreface");
-var webprefpriv = chrome.i18n.getMessage("webPrefacePrivate");
-var routerpref = chrome.i18n.getMessage("routerPreface");
-var routerprefpriv = chrome.i18n.getMessage("routerPrefacePrivate");
-var mailpref = chrome.i18n.getMessage("mailPreface");
-var mailprefpriv = chrome.i18n.getMessage("mailPrefacePrivate");
-var torrentpref = chrome.i18n.getMessage("torrentPreface");
-var torrentprefpriv = chrome.i18n.getMessage("torrentPrefacePrivate");
-var tunnelpref = chrome.i18n.getMessage("i2ptunnelPreface");
-var tunnelprefpriv = chrome.i18n.getMessage("i2ptunnelPrefacePrivate");
+var titlepref = chrome.i18n.getMessage("titlePreface");

 function onSet(result) {
  if (result) {
@@ -86,7 +77,7 @@ function disableReferrers() {

 // enable fingerprinting resistent features(letterboxing and stuff)
 function enableResistFingerprinting() {
-  var setting = browser.privacy.websites.referrersEnabled.set({
+  var setting = browser.privacy.websites.resistFingerprinting.set({
    value: true
  });
  console.log("Enabling resist fingerprinting/val=", {
@@ -139,32 +130,56 @@ function setAllPrivacy() {
 setAllPrivacy();

 function ResetPeerConnection() {
-  browser.privacy.network.peerConnectionEnabled.set({
-    value: false
+  var webrtc = false;
+  var rtc = browser.privacy.network.peerConnectionEnabled.set({
+    value: webrtc
  });
-  browser.privacy.network.networkPredictionEnabled.set({
-    value: false
-  });
-  chrome.privacy.network.webRTCIPHandlingPolicy.set({
-    value: "disable_non_proxied_udp"
-  });
-  console.log("Re-disabled WebRTC");
+  rtc.then(AssurePeerConnection);
 }

 function EnablePeerConnection() {
-  browser.privacy.network.peerConnectionEnabled.set({
-    value: true
-  });
-  browser.privacy.network.networkPredictionEnabled.set({
-    value: false
-  });
-  chrome.privacy.network.webRTCIPHandlingPolicy.set({
-    value: "disable_non_proxied_udp"
+  var webrtc = false;
+  var rtc = browser.privacy.network.peerConnectionEnabled.set({
+    value: webrtc
  });
+  rtc.then(SetupPeerConnection);
  console.log("Enabled WebRTC");
 }

-ResetPeerConnection();
+function SetupPeerConnection() {
+  var webrtc = true;
+  console.log("Pre-disabled WebRTC");
+  let rtc = browser.privacy.network.peerConnectionEnabled.set({
+    value: webrtc
+  });
+  rtc.then(AssurePeerConnection);
+}
+
+function AssurePeerConnection() {
+  function assure(webrtc) {
+    browser.privacy.network.peerConnectionEnabled.set({
+      value: webrtc.value
+    });
+    browser.privacy.network.networkPredictionEnabled.set({
+      value: false
+    });
+    chrome.privacy.network.webRTCIPHandlingPolicy.set({
+      value: "proxy_only"
+    });
+  }
+  rtc = browser.privacy.network.peerConnectionEnabled.get({});
+  rtc.then(assure);
+}
+
+var gettingInfo = browser.runtime.getPlatformInfo();
+gettingInfo.then(got => {
+  if (got.os == "android") {
+    browser.tabs.onCreated.addListener(ResetPeerConnection);
+  } else {
+    browser.windows.onCreated.addListener(ResetPeerConnection);
+  }
+});
+//AssurePeerConnection();

 function ResetDisableSavePasswords() {
  browser.privacy.services.passwordSavingEnabled.set({
@@ -187,24 +202,10 @@ var defaultSettings = {
  dataTypes: ["downloads", "passwords", "formData", "localStorage", "history"]
 };

-var appSettings = {
-  since: "forever",
-  dataTypes: [""]
-};
-
-function onError(e) {
-  console.error(e);
+function onError(therror) {
+  console.error(therror);
 }

-function checkStoredSettings(storedSettings) {
-  chrome.storage.local.set(appSettings);
-}
-
-const gettingStoredSettings = browser.storage.local.get();
-gettingStoredSettings.then(checkStoredSettings, onError);
-
-function clearCookiesContext(cookieStoreId) {}
-
 function forgetBrowsingData(storedSettings) {
  function getSince(selectedSince) {
    if (selectedSince === "forever") {
@@ -244,7 +245,7 @@ function forgetBrowsingData(storedSettings) {

  function deepCleanHistory(historyItems) {
    console.log("Deep cleaning history");
-    for (item of historyItems) {
+    for (let item of historyItems) {
      if (i2pHost(item.url)) {
        browser.history.deleteUrl({
          url: item.url
@@ -256,48 +257,48 @@ function forgetBrowsingData(storedSettings) {
            hostnames: [i2pHostName(item.url)],
            since
          })
-          .then(onGot);
+          .then(onContextGotLog);
        console.log("cleared Passwords");
        browser.browsingData
          .removeDownloads({
            hostnames: [i2pHostName(item.url)],
            since
          })
-          .then(onGot);
+          .then(onContextGotLog);
        console.log("cleared Downloads");
        browser.browsingData
          .removeFormData({
            hostnames: [i2pHostName(item.url)],
            since
          })
-          .then(onGot);
+          .then(onContextGotLog);
        console.log("cleared Form Data");
        browser.browsingData
          .removeLocalStorage({
            hostnames: [i2pHostName(item.url)],
            since
          })
-          .then(onGot);
+          .then(onContextGotLog);
        console.log("cleared Local Storage");

-        contexts = browser.contextualIdentities.query({
+        let contexts = browser.contextualIdentities.query({
          name: titlepref
        });

        function deepCleanCookies(cookies) {
-          for (cookie of cookies) {
+          for (let cookie of cookies) {
            var removing = browser.cookies.remove({
              firstPartyDomain: cookie.firstPartyDomain,
              name: cookie.name,
              url: item.url
            });
-            removing.then(onGot, onError);
+            removing.then(onContextGotLog, onError);
          }
          console.log("Cleared cookies");
        }

        function deepCleanContext(cookieStoreIds) {
-          for (cookieStoreId of cookieStoreIds) {
+          for (let cookieStoreId of cookieStoreIds) {
            var removing = browser.cookies.getAll({
              firstPartyDomain: null,
              storeId: cookieStoreId.cookieStoreId
@@ -338,8 +339,8 @@ function i2pHost(url) {
  return hostname.endsWith(".i2p");
 }

-function onGot(contexts) {
-  if (contexts != null) {
+function onContextGotLog(contexts) {
+  if (contexts !== null) {
    for (let context of contexts) {
      console.log(context);
    }
@@ -348,13 +349,48 @@ function onGot(contexts) {

 browser.runtime.onMessage.addListener(message);

-function message(message) {
-  console.log(message);
-  if (message.rtc === "enableWebRTC") {
+function enableHistory() {
+  function checkStoredSettings(storedSettings) {
+    storedSettings["disable_history"] = false;
+    console.log(storedSettings);
+    function enablehistory(settings) {
+      console.log("Store History:", settings);
+    }
+    let setting = browser.storage.local.set(storedSettings);
+    setting.then(enablehistory);
+  }
+  const gettingStoredSettings = browser.storage.local.get();
+  gettingStoredSettings.then(checkStoredSettings, onError);
+}
+
+function disableHistory() {
+  function checkStoredSettings(storedSettings) {
+    storedSettings["disable_history"] = true;
+    console.log(storedSettings);
+    function enablehistory(settings) {
+      console.log("Store History:", settings);
+    }
+    var setting = browser.storage.local.set(storedSettings);
+    setting.then(enablehistory);
+  }
+  const gettingStoredSettings = browser.storage.local.get();
+  gettingStoredSettings.then(checkStoredSettings, onError);
+}
+
+function message(recieved) {
+  console.log(recieved);
+  if (recieved.rtc === "enableWebRTC") {
    console.log("enableWebRTC");
    EnablePeerConnection();
-  } else {
+  } else if (recieved.rtc === "disableWebRTC") {
    console.log("disableWebRTC");
    ResetPeerConnection();
  }
+  if (recieved.history === "enableHistory") {
+    console.log("enableHistory");
+    enableHistory();
+  } else if (recieved.history === "disableHistory") {
+    console.log("disableHistory");
+    disableHistory();
+  }
 }
--- a/proxy.js
+++ b/proxy.js
@@ -1,13 +1,7 @@
+var titlepref = chrome.i18n.getMessage("titlePreface");
 var webpref = chrome.i18n.getMessage("webPreface");
-var webprefpriv = chrome.i18n.getMessage("webPrefacePrivate");
 var routerpref = chrome.i18n.getMessage("routerPreface");
 var routerprefpriv = chrome.i18n.getMessage("routerPrefacePrivate");
-var mailpref = chrome.i18n.getMessage("mailPreface");
-var mailprefpriv = chrome.i18n.getMessage("mailPrefacePrivate");
-var torrentpref = chrome.i18n.getMessage("torrentPreface");
-var torrentprefpriv = chrome.i18n.getMessage("torrentPrefacePrivate");
-var tunnelpref = chrome.i18n.getMessage("i2ptunnelPreface");
-var tunnelprefpriv = chrome.i18n.getMessage("i2ptunnelPrefacePrivate");

 browser.privacy.network.peerConnectionEnabled.set({
  value: false
@@ -33,6 +27,10 @@ var handleContextProxyRequest = async function(requestDetails) {
        failoverTimeout: 0,
        proxyDns: false
      };
+      if (context == "firefox-default" || context == "firefox-private") {
+        proxy = null;
+        return proxy;
+      }
      if (context != undefined) {
        if (context.name == titlepref) {
          proxy = {
@@ -40,14 +38,9 @@ var handleContextProxyRequest = async function(requestDetails) {
            host: getHost(),
            port: getPort()
          };
-          console.log(
-            "(proxy)",
-            context.name,
-            "Using",
-            proxy.type,
-            "proxy ",
-            proxy.host + ":" + proxy.port
-          );
+          console.log("(proxy)", context.name);
+          console.log("Using", proxy.type);
+          console.log("proxy ", proxy.host + ":" + proxy.port);
          return proxy;
        } else if (context.name == routerpref) {
          if (routerHost(requestDetails.url)) {
@@ -64,14 +57,9 @@ var handleContextProxyRequest = async function(requestDetails) {
            host: getHost(),
            port: getPort()
          };
-          console.log(
-            "(proxy)",
-            context.name,
-            "Using",
-            proxy.type,
-            "proxy ",
-            proxy.host + ":" + proxy.port
-          );
+          console.log("(proxy)", context.name);
+          console.log("Using", proxy.type);
+          console.log("proxy ", proxy.host + ":" + proxy.port);
          return proxy;
        } else if (context.name == webpref) {
          if (localHost(requestDetails.url)) {
@@ -83,28 +71,23 @@ var handleContextProxyRequest = async function(requestDetails) {
              };
            }
          }
-          console.log(
-            "(proxy)",
-            context.name,
-            "Using",
-            proxy.type,
-            "proxy ",
-            proxy.host + ":" + proxy.port
-          );
+          console.log("(proxy)", context.name);
+          console.log("Using", proxy.type);
+          console.log("proxy ", proxy.host + ":" + proxy.port);
          return proxy;
        }
      }
      if (!routerHost(requestDetails.url)) {
        if (localHost(requestDetails.url)) {
          console.log(
-            "(proxy) non-routerconsole localhost url, dropping",
+            "(proxy) non-routerconsole localhost url, will not interfere",
            requestDetails.url
          );
-          proxy = {
+          /*proxy = {
            type: "http",
            host: "localhost",
            port: "65535"
-          };
+          };*/
        }
      } else if (i2pHost(requestDetails.url)) {
        proxy = {
@@ -121,15 +104,8 @@ var handleContextProxyRequest = async function(requestDetails) {
        context = await browser.contextualIdentities.get(tabInfo.cookieStoreId);
        return context;
      } catch (error) {
-        console.log("(proxy)Context Error", error);
-      }
-    };
-    var tabFind = async function(tabId) {
-      try {
-        console.log("(proxy) forcing context", tabId.cookieStoreId);
-        return tabId;
-      } catch (error) {
-        console.log("(proxy)Context Error", error);
+        console.error(error);
+        //return; //"firefox-default";
      }
    };
    var tabGet = async function(tabId) {
@@ -154,9 +130,8 @@ var handleContextProxyRequest = async function(requestDetails) {
      } else if (i2pHost(requestDetails.url)) {
        console.log("(Proxy)I2P URL detected, ");
        var tab = tabGet(requestDetails.tabId);
-        var mtab = tab.then(tabFind);
-        requestDetails.tabId = mtab;
-        var context = mtab.then(contextGet);
+        requestDetails.tabId = tab;
+        var context = tab.then(contextGet);
        var proxy = await context.then(handleProxyRequest);
        console.log("(proxy)Returning I2P Proxy", proxy);
        return proxy;
@@ -167,9 +142,9 @@ var handleContextProxyRequest = async function(requestDetails) {
        console.log("(proxy)Returning I2P Proxy", proxy);
        return proxy;
      }
-      proxy = {};
+      /*proxy = {};
      console.log("(proxy)Returning unset Proxy", proxy);
-      return proxy;
+      return proxy;*/
    }
  } catch (error) {
    console.log("(proxy)Not using I2P Proxy.", error);
@@ -177,6 +152,116 @@ var handleContextProxyRequest = async function(requestDetails) {
 };

 var proxy_scheme = "HTTP";
+var proxy_host = "127.0.0.1";
+var proxy_port = "4444";
+var control_host = "127.0.0.1";
+var control_port = "4444";
+var disable_history = false;
+
+function SetupSettings() {
+  console.log("Initialising Settings");
+  function onSetupError() {
+    console.log("Settings initialization error");
+  }
+  //
+  function checkSchemeStoredSettings(storedSettings) {
+    if (storedSettings.proxy_scheme === undefined) {
+      proxy_scheme = "http";
+      storedSettings.proxy_scheme = proxy_scheme;
+    } else {
+      proxy_scheme = storedSettings.proxy_scheme;
+    }
+    console.log("Initialising Proxy Scheme", storedSettings.proxy_scheme);
+    setupProxy();
+  }
+  var gettingSchemeStoredSettings = browser.storage.local.get("proxy_scheme");
+  gettingSchemeStoredSettings.then(checkSchemeStoredSettings, onSetupError);
+
+  //
+  function checkHostStoredSettings(storedSettings) {
+    if (storedSettings.proxy_host != undefined) {
+      proxy_host = storedSettings.proxy_host;
+    } else {
+      proxy_host = "127.0.0.1";
+      storedSettings.proxy_host = proxy_host;
+    }
+    console.log("Initialising Host", storedSettings.proxy_host);
+    setupProxy();
+  }
+  var gettingHostStoredSettings = browser.storage.local.get("proxy_host");
+  gettingHostStoredSettings.then(checkHostStoredSettings, onSetupError);
+
+  //
+  function checkPortStoredSettings(storedSettings) {
+    if (storedSettings.proxy_port != undefined) {
+      proxy_port = storedSettings.proxy_port;
+    } else {
+      proxy_port = "4444";
+      storedSettings.proxy_port = proxy_port;
+    }
+    console.log("Initialising Port", storedSettings.proxy_port);
+    setupProxy();
+  }
+  var gettingPortStoredSettings = browser.storage.local.get("proxy_port");
+  gettingPortStoredSettings.then(checkPortStoredSettings, onSetupError);
+
+  //
+  function checkControlHostStoredSettings(storedSettings) {
+    if (storedSettings.control_host != undefined) {
+      control_host = storedSettings.control_host;
+    } else {
+      control_host = "127.0.0.1";
+      storedSettings.control_host = control_host;
+    }
+    console.log("Initialising Control Host", storedSettings.control_host);
+    setupProxy();
+  }
+  var gettingControlHostStoredSettings = browser.storage.local.get(
+    "control_host"
+  );
+  gettingControlHostStoredSettings.then(
+    checkControlHostStoredSettings,
+    onSetupError
+  );
+
+  //
+  function checkControlPortStoredSettings(storedSettings) {
+    if (storedSettings.control_port != undefined) {
+      let control_port = storedSettings.control_port;
+    } else {
+      let new_control_port = "7657";
+      storedSettings.control_port = new_control_port;
+    }
+    console.log("Initialising Control Port", storedSettings.control_port);
+    setupProxy();
+  }
+  var gettingControlPortStoredSettings = browser.storage.local.get(
+    "control_port"
+  );
+  gettingControlPortStoredSettings.then(
+    checkControlPortStoredSettings,
+    onSetupError
+  );
+
+  //
+  function checkHistoryStoredSettings(storedSettings) {
+    if (storedSettings.disable_history != undefined) {
+      disable_history = storedSettings.disable_history;
+    } else {
+      disable_history = false;
+      storedSettings.disable_history = disable_history;
+    }
+    console.log(
+      "Initialising Disabled History",
+      storedSettings.disable_history
+    );
+    setupProxy();
+  }
+  var gettingHistoryStoredSettings = browser.storage.local.get(
+    "disable_history"
+  );
+  gettingHistoryStoredSettings.then(checkHistoryStoredSettings, onSetupError);
+}

 function getScheme() {
  if (proxy_scheme == undefined) {
@@ -195,13 +280,6 @@ function getScheme() {
  return proxy_scheme;
 }

-/*
-var proxy_host = "127.0.0.1";
-var proxy_port = "4444";
-var control_host = "127.0.0.1";
-var control_port = "4444";
-*/
-
 function getHost() {
  if (proxy_host == undefined) {
    proxy_host = "127.0.0.1";
@@ -230,18 +308,12 @@ function getControlHost() {

 function getControlPort() {
  if (control_port == undefined) {
-    return "4444";
+    return "7657";
  }
  return control_port;
 }

 function setupProxy() {
-  var controlHost = getControlHost();
-  var controlPort = getControlPort();
-  var Host = getHost();
-  var Port = getPort();
-  var Scheme = getScheme();
-
  /**/
  console.log("Setting up Firefox WebExtension proxy");
  browser.proxy.onRequest.addListener(handleContextProxyRequest, {
@@ -251,107 +323,35 @@ function setupProxy() {
  /**/
 }

-function checkStoredSettings(storedSettings) {
-  function gotProxyInfo(info) {
-    let defaultSettings = {};
-    let host = info.value.http.split(":")[0];
-    let port = info.value.http.split(":")[1];
-    console.log("proxy", "'" + host + "'", ":", port);
-    if (!storedSettings.proxy_scheme) {
-      defaultSettings["proxy_scheme"] = "http";
-    }
-    if (!storedSettings.proxy_host) {
-      if (host == "") {
-        defaultSettings["proxy_host"] = "127.0.0.1";
-      } else {
-        defaultSettings["proxy_host"] = host;
-      }
-    } else {
-      if (host != "") {
-        defaultSettings["proxy_host"] = host;
-      } else {
-        defaultSettings["proxy_host"] = storedSettings.proxy_host;
-      }
-    }
-    if (!storedSettings.proxy_port) {
-      if (port == undefined) {
-        defaultSettings["proxy_port"] = 4444;
-      } else {
-        defaultSettings["proxy_port"] = port;
-      }
-    } else {
-      if (port != undefined) {
-        defaultSettings["proxy_port"] = port;
-      } else {
-        defaultSettings["proxy_port"] = storedSettings.proxy_port;
-      }
-    }
-    if (!storedSettings.control_host) {
-      if (host == "") {
-        defaultSettings["control_host"] = "127.0.0.1";
-      } else {
-        defaultSettings["control_host"] = host;
-      }
-    } else {
-      if (host != "") {
-        defaultSettings["control_host"] = host;
-      } else {
-        defaultSettings["control_host"] = storedSettings.control_host;
-      }
-    }
-    if (!storedSettings.control_port) {
-      if (port == undefined) {
-        defaultSettings["control_port"] = 4444;
-      } else {
-        defaultSettings["control_port"] = port;
-      }
-    } else {
-      if (port != undefined) {
-        defaultSettings["control_port"] = port;
-      } else {
-        defaultSettings["control_port"] = storedSettings.control_port;
-      }
-    }
-    console.log("(browserinfo) NATIVE PROXYSETTINGS", info.value);
-    console.log(
-      defaultSettings["proxy_host"],
-      defaultSettings["proxy_port"],
-      defaultSettings["control_host"],
-      defaultSettings["control_port"]
-    );
-    chrome.storage.local.set(defaultSettings);
-  }
-  var gettingInfo = browser.proxy.settings.get({});
-  gettingInfo.then(gotProxyInfo);
-}
-
-//function gotProxyInfo(info) {
-//console.log("(browserinfo)", info.value);
-//}
-
-//var gettingInfo = browser.proxy.settings.get({});
-//gettingInfo.then(gotProxyInfo);
-
-function update(restoredSettings) {
-  proxy_scheme = restoredSettings.proxy_scheme;
+function update() {
  console.log("restoring proxy scheme:", proxy_scheme);
-  proxy_host = restoredSettings.proxy_host;
  console.log("restoring proxy host:", proxy_host);
-  proxy_port = restoredSettings.proxy_port;
  console.log("restoring proxy port:", proxy_port);
-  control_host = restoredSettings.control_host;
  console.log("restoring control host:", control_host);
-  control_port = restoredSettings.control_port;
  console.log("restoring control port:", control_port);
 }

-chrome.storage.local.get(function(got) {
-  checkStoredSettings(got);
-  update(got);
-  setupProxy();
-});
-
-// Theme all currently open windows
-if (!isDroid()) {
-  browser.windows.getAll().then(wins => wins.forEach(themeWindow));
+function updateFromStorage() {
+  console.log("updating settings from storage");
+  var gettingInfo = browser.runtime.getPlatformInfo();
+  gettingInfo.then(got => {
+    if (got.os != "android") {
+      browser.windows.getAll().then(wins => wins.forEach(themeWindow));
+      chrome.storage.local.get(function() {
+        SetupSettings();
+        update();
+        setupProxy();
+      });
+    } else {
+      chrome.storage.local.get(function() {
+        SetupSettings();
+        update();
+        setupProxy();
+      });
+    }
+  });
 }
+
+browser.storage.onChanged.addListener(updateFromStorage);
+SetupSettings();
+setupProxy();
--- a/scrub.js
+++ b/scrub.js
@@ -1,24 +1,22 @@
 var titlepref = chrome.i18n.getMessage("titlePreface");
-var titleprefpriv = chrome.i18n.getMessage("titlePrefacePrivate");
 var webpref = chrome.i18n.getMessage("webPreface");
-var webprefpriv = chrome.i18n.getMessage("webPrefacePrivate");
 var routerpref = chrome.i18n.getMessage("routerPreface");
-var routerprefpriv = chrome.i18n.getMessage("routerPrefacePrivate");
 var mailpref = chrome.i18n.getMessage("mailPreface");
-var mailprefpriv = chrome.i18n.getMessage("mailPrefacePrivate");
 var torrentpref = chrome.i18n.getMessage("torrentPreface");
-var torrentprefpriv = chrome.i18n.getMessage("torrentPrefacePrivate");
 var tunnelpref = chrome.i18n.getMessage("i2ptunnelPreface");
-var tunnelprefpriv = chrome.i18n.getMessage("i2ptunnelPrefacePrivate");
+var localpref = chrome.i18n.getMessage("localPreface");

 var contextScrub = async function(requestDetails) {
+  function onHeaderError() {
+    console.log("Header scrub error");
+  }
  console.log("(scrub)Scrubbing info from contextualized request");
  try {
    var headerScrub = function(context) {
+      var ua = "MYOB/6.66 (AN/ON)";
      if (!context) {
-        console.error("Context not found");
+        console.log("Context not found", context);
      } else if (context.name == titlepref) {
-        var ua = "MYOB/6.66 (AN/ON)";
        if (i2pHost(requestDetails.url)) {
          for (var header of requestDetails.requestHeaders) {
            if (header.name.toLowerCase() === "user-agent") {
@@ -31,7 +29,6 @@ var contextScrub = async function(requestDetails) {
          requestHeaders: requestDetails.requestHeaders
        };
      } else if (context.name == routerpref) {
-        var ua = "MYOB/6.66 (AN/ON)";
        if (i2pHost(requestDetails.url)) {
          for (var header of requestDetails.requestHeaders) {
            if (header.name.toLowerCase() === "user-agent") {
@@ -39,7 +36,6 @@ var contextScrub = async function(requestDetails) {
              console.log("(scrub)User-Agent header modified", header.value);
            }
          }
-        } else if (routerHost(requestDetails.url)) {
        }
        return {
          requestHeaders: requestDetails.requestHeaders
@@ -49,22 +45,12 @@ var contextScrub = async function(requestDetails) {
    var contextGet = async function(tabInfo) {
      try {
        console.log("(scrub)Tab info from Function", tabInfo);
-        context = await browser.contextualIdentities.get(tabInfo.cookieStoreId);
+        let context = await browser.contextualIdentities.get(
+          tabInfo.cookieStoreId
+        );
        return context;
      } catch (error) {
-        console.log("(scrub)Conext Error", error);
-      }
-    };
-    var tabFind = async function(tabId) {
-      try {
-        context = await browser.contextualIdentities.query({
-          name: titlepref
-        });
-        tabId.cookieStoreId = context[0].cookieStoreId;
-        console.log("(scrub) forcing context", tabId.cookieStoreId);
-        return tabId;
-      } catch (error) {
-        console.log("(scrub)Context Error", error);
+        return undefined;
      }
    };
    var tabGet = async function(tabId) {
@@ -73,7 +59,7 @@ var contextScrub = async function(requestDetails) {
        let tabInfo = await browser.tabs.get(tabId);
        return tabInfo;
      } catch (error) {
-        console.log("(scrub)Tab error", error);
+        return undefined;
      }
    };
    if (requestDetails.tabId > 0) {
@@ -81,18 +67,16 @@ var contextScrub = async function(requestDetails) {
      var context = {};
      var req = {};
      if (i2pHost(requestDetails.url)) {
-        console.log("(Proxy)I2P URL detected, ");
+        console.log("(scrub)I2P URL detected, ");
        tab = tabGet(requestDetails.tabId);
-        var mtab = tab.then(tabFind);
-        requestDetails.tabId = mtab;
-        context = mtab.then(contextGet);
-        req = await context.then(headerScrub);
+        context = tab.then(contextGet, onHeaderError);
+        req = await context.then(headerScrub, onHeaderError);
        console.log("(scrub)Scrubbing I2P Request", req);
        return req;
      } else if (routerHost(requestDetails.url)) {
        tab = tabGet(requestDetails.tabId);
-        context = tab.then(contextGet);
-        req = await context.then(headerScrub);
+        context = tab.then(contextGet, onHeaderError);
+        req = await context.then(headerScrub, onHeaderError);
        console.log("(scrub)Scrubbing non-I2P Request", req);
        return req;
      }
@@ -104,40 +88,40 @@ var contextScrub = async function(requestDetails) {
 };

 var contextSetup = async function(requestDetails) {
+  function onContextError() {
+    console.log("Context launcher error");
+  }
  console.log("(isolate)Forcing I2P requests into context");
  try {
-    var tabFind = async function(tabId) {
+    var i2pTabFind = async function(tabId) {
      try {
        var context = await browser.contextualIdentities.query({
          name: titlepref
        });
        if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          console.log(
-            "(isolate) forcing I2P Browsing",
-            requestDetails.url,
-            " context",
-            tabId.cookieStoreId,
-            context[0].cookieStoreId
-          );
-          function Create(window) {
+          console.log("(isolate) I2P context", context[0].cookieStoreId);
+          console.log("tab context", tabId.cookieStoreId);
+          function Create() {
            function onCreated(tab) {
-              console.log("(isolate) Closing old, un-isolated tab", window);
-              browser.tabs.remove(tabId.id);
-              browser.tabs.remove(window.tabs[0].id);
-            }
-            function onError(error) {
-              console.log(`Error: ${error}`);
+              function closeOldTab() {
+                if (tabId.id != tab.id) {
+                  console.log("(isolate) Closing un-isolated tab", tabId.id);
+                  console.log("in favor of", tab.id);
+                  console.log("with context", tab.cookieStoreId);
+                  browser.tabs.remove(tabId.id);
+                }
+              }
+              closeOldTab(tab);
            }
            var created = browser.tabs.create({
              active: true,
              cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url,
-              windowId: window.id
+              url: requestDetails.url
            });
-            created.then(onCreated, onError);
+            created.then(onCreated, onContextError);
          }
-          var getting = browser.windows.getCurrent();
-          getting.then(Create);
+          var gettab = browser.tabs.get(tabId.id);
+          gettab.then(Create, onContextError);
          return tabId;
        }
      } catch (error) {
@@ -150,32 +134,29 @@ var contextSetup = async function(requestDetails) {
          name: routerpref
        });
        if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          console.log(
-            "(isolate) forcing Router Console",
-            requestDetails.url,
-            " context",
-            tabId.cookieStoreId,
-            context[0].cookieStoreId
-          );
-          function Create(window) {
+          console.log("(isolate) I2P context", context[0].cookieStoreId);
+          console.log("tab context", tabId.cookieStoreId);
+          function Create() {
            function onCreated(tab) {
-              console.log("(isolate) Closing old, un-isolated tab");
-              browser.tabs.remove(tabId.id);
-              browser.tabs.remove(window.tabs[0].id);
-            }
-            function onError(error) {
-              console.log(`Error: ${error}`);
+              function closeOldTab() {
+                if (tabId.id != tab.id) {
+                  console.log("(isolate) Closing un-isolated tab", tabId.id);
+                  console.log("in favor of", tab.id);
+                  console.log("with context", tab.cookieStoreId);
+                  browser.tabs.remove(tabId.id);
+                }
+              }
+              closeOldTab(tab);
            }
            var created = browser.tabs.create({
              active: true,
              cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url,
-              windowId: window.id
+              url: requestDetails.url
            });
-            created.then(onCreated, onError);
+            created.then(onCreated, onContextError);
          }
-          var getting = browser.windows.getCurrent();
-          getting.then(Create);
+          var gettab = browser.tabs.get(tabId.id);
+          gettab.then(Create, onContextError);
          return tabId;
        }
      } catch (error) {
@@ -188,34 +169,29 @@ var contextSetup = async function(requestDetails) {
          name: tunnelpref
        });
        if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          console.log(
-            "(isolate) forcing HSM context",
-            requestDetails.url,
-            " context",
-            tabId.cookieStoreId,
-            context[0].cookieStoreId
-          );
-          function Create(window) {
+          console.log("(isolate) I2P context", context[0].cookieStoreId);
+          console.log("tab context", tabId.cookieStoreId);
+          function Create() {
            function onCreated(tab) {
-              console.log("(isolate) Closing old, un-isolated tab");
-              browser.tabs.remove(tabId.id);
-              if (window != undefined) {
-                browser.tabs.remove(window.tabs[0].id);
+              function closeOldTab() {
+                if (tabId.id != tab.id) {
+                  console.log("(isolate) Closing un-isolated tab", tabId.id);
+                  console.log("in favor of", tab.id);
+                  console.log("with context", tab.cookieStoreId);
+                  browser.tabs.remove(tabId.id);
+                }
              }
-            }
-            function onError(error) {
-              console.log(`Error: ${error}`);
+              closeOldTab(tab);
            }
            var created = browser.tabs.create({
              active: true,
              cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url,
-              windowId: window.id
+              url: requestDetails.url
            });
-            created.then(onCreated, onError);
+            created.then(onCreated, onContextError);
          }
-          var getting = browser.windows.getCurrent();
-          getting.then(Create);
+          var gettab = browser.tabs.get(tabId.id);
+          gettab.then(Create, onContextError);
          return tabId;
        }
      } catch (error) {
@@ -228,32 +204,29 @@ var contextSetup = async function(requestDetails) {
          name: torrentpref
        });
        if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          console.log(
-            "(isolate) forcing Bittorrent",
-            requestDetails.url,
-            " context",
-            tabId.cookieStoreId,
-            context[0].cookieStoreId
-          );
-          function Create(window) {
+          console.log("(isolate) I2P context", context[0].cookieStoreId);
+          console.log("tab context", tabId.cookieStoreId);
+          function Create() {
            function onCreated(tab) {
-              console.log("(isolate) Closing old, un-isolated tab");
-              browser.tabs.remove(tabId.id);
-              browser.tabs.remove(window.tabs[0].id);
-            }
-            function onError(error) {
-              console.log(`Error: ${error}`);
+              function closeOldTab() {
+                if (tabId.id != tab.id) {
+                  console.log("(isolate) Closing un-isolated tab", tabId.id);
+                  console.log("in favor of", tab.id);
+                  console.log("with context", tab.cookieStoreId);
+                  browser.tabs.remove(tabId.id);
+                }
+              }
+              closeOldTab(tab);
            }
            var created = browser.tabs.create({
              active: true,
              cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url,
-              windowId: window.id
+              url: requestDetails.url
            });
-            created.then(onCreated, onError);
+            created.then(onCreated, onContextError);
          }
-          var getting = browser.windows.getCurrent();
-          getting.then(Create);
+          var gettab = browser.tabs.get(tabId.id);
+          gettab.then(Create, onContextError);
          return tabId;
        }
      } catch (error) {
@@ -266,32 +239,64 @@ var contextSetup = async function(requestDetails) {
          name: mailpref
        });
        if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          console.log(
-            "(isolate) forcing Web Mail",
-            requestDetails.url,
-            " context",
-            tabId.cookieStoreId,
-            context[0].cookieStoreId
-          );
-          function Create(window) {
+          console.log("(isolate) I2P context", context[0].cookieStoreId);
+          console.log("tab context", tabId.cookieStoreId);
+          function Create() {
            function onCreated(tab) {
-              console.log("(isolate) Closing old, un-isolated tab");
-              browser.tabs.remove(tabId.id);
-              browser.tabs.remove(window.tabs[0].id);
-            }
-            function onError(error) {
-              console.log(`Error: ${error}`);
+              function closeOldTab() {
+                if (tabId.id != tab.id) {
+                  console.log("(isolate) Closing un-isolated tab", tabId.id);
+                  console.log("in favor of", tab.id);
+                  console.log("with context", tab.cookieStoreId);
+                  browser.tabs.remove(tabId.id);
+                }
+              }
+              closeOldTab(tab);
            }
            var created = browser.tabs.create({
              active: true,
              cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url,
-              windowId: window.id
+              url: requestDetails.url
            });
-            created.then(onCreated, onError);
+            created.then(onCreated, onContextError);
          }
-          var getting = browser.windows.getCurrent();
-          getting.then(Create);
+          var gettab = browser.tabs.get(tabId.id);
+          gettab.then(Create, onContextError);
+          return tabId;
+        }
+      } catch (error) {
+        console.log("(isolate)Context Error", error);
+      }
+    };
+    var localTabFind = async function(tabId) {
+      try {
+        var context = await browser.contextualIdentities.query({
+          name: localpref
+        });
+        if (tabId.cookieStoreId != context[0].cookieStoreId) {
+          console.log("(isolate) I2P context", context[0].cookieStoreId);
+          console.log("tab context", tabId.cookieStoreId);
+          function Create() {
+            function onCreated(tab) {
+              function closeOldTab() {
+                if (tabId.id != tab.id) {
+                  console.log("(isolate) Closing un-isolated tab", tabId.id);
+                  console.log("in favor of", tab.id);
+                  console.log("with context", tab.cookieStoreId);
+                  browser.tabs.remove(tabId.id);
+                }
+              }
+              closeOldTab(tab);
+            }
+            var created = browser.tabs.create({
+              active: true,
+              cookieStoreId: context[0].cookieStoreId,
+              url: requestDetails.url
+            });
+            created.then(onCreated, onContextError);
+          }
+          var gettab = browser.tabs.get(tabId.id);
+          gettab.then(Create, onContextError);
          return tabId;
        }
      } catch (error) {
@@ -309,32 +314,29 @@ var contextSetup = async function(requestDetails) {
          tabId.cookieStoreId == "firefox-private"
        ) {
          if (tabId.cookieStoreId != context[0].cookieStoreId) {
-            console.log(
-              "(isolate) forcing Web Browsing",
-              requestDetails.url,
-              " context",
-              tabId.cookieStoreId,
-              context[0].cookieStoreId
-            );
-            function Create(window) {
+            console.log("(isolate) I2P context", context[0].cookieStoreId);
+            console.log("tab context", tabId.cookieStoreId);
+            function Create() {
              function onCreated(tab) {
-                console.log("(isolate) Closing old, un-isolated tab");
-                browser.tabs.remove(tabId.id);
-                browser.tabs.remove(window.tabs[0].id);
-              }
-              function onError(error) {
-                console.log(`Error: ${error}`);
+                function closeOldTab() {
+                  if (tabId.id != tab.id) {
+                    console.log("(isolate) Closing un-isolated tab", tabId.id);
+                    console.log("in favor of", tab.id);
+                    console.log("with context", tab.cookieStoreId);
+                    browser.tabs.remove(tabId.id);
+                  }
+                }
+                closeOldTab(tab);
              }
              var created = browser.tabs.create({
                active: true,
                cookieStoreId: context[0].cookieStoreId,
-                url: requestDetails.url,
-                windowId: window.id
+                url: requestDetails.url
              });
-              created.then(onCreated, onError);
+              created.then(onCreated, onContextError);
            }
-            var getting = browser.windows.getCurrent();
-            getting.then(Create);
+            var gettab = browser.tabs.get(tabId.id);
+            gettab.then(Create, onContextError);
            return tabId;
          }
        }
@@ -351,6 +353,9 @@ var contextSetup = async function(requestDetails) {
        console.log("(isolate)Tab error", error);
      }
    };
+    if (requestDetails == undefined) {
+      return requestDetails;
+    }
    if (requestDetails.tabId > 0) {
      if (proxyHost(requestDetails.url)) {
        setcookie = browser.cookies.set({
@@ -358,7 +363,12 @@ var contextSetup = async function(requestDetails) {
          url: requestDetails.url,
          secure: true
        });
-        setcookie.then(onGot, onError);
+        setcookie.then(onContextGotLog, onContextError);
+        return requestDetails;
+      }
+      console.log("(isolate)Request Details", requestDetails);
+      var tab = tabGet(requestDetails.tabId);
+      if (extensionHost(requestDetails.url)) {
        return requestDetails;
      }
      if (i2pHost(requestDetails.url)) {
@@ -367,39 +377,36 @@ var contextSetup = async function(requestDetails) {
          url: requestDetails.url,
          secure: true
        });
-        setcookie.then(onGot, onError);
-        var tab = tabGet(requestDetails.tabId);
-        var mtab = tab.then(tabFind);
+        setcookie.then(onContextGotLog, onContextError);
+        var i2ptab = tab.then(i2pTabFind, onContextError);
        return requestDetails;
      }
+      let localhost = localHost(requestDetails.url);
      let routerhost = routerHost(requestDetails.url);
+      if (!routerhost) {
+        if (localhost) {
+          var localtab = tab.then(localTabFind, onContextError);
+          return requestDetails;
+        }
+      }
      if (routerhost) {
        if (routerhost === "i2ptunnelmgr") {
-          var tab = tabGet(requestDetails.tabId);
-          var mtab = tab.then(i2ptunnelTabFind);
+          var tunneltab = tab.then(i2ptunnelTabFind, onContextError);
          return requestDetails;
        } else if (routerhost === "i2psnark") {
-          var tab = tabGet(requestDetails.tabId);
-          var mtab = tab.then(snarkTabFind);
+          var snarktab = tab.then(snarkTabFind, onContextError);
          return requestDetails;
        } else if (routerhost === "webmail") {
-          var tab = tabGet(requestDetails.tabId);
-          var mtab = tab.then(mailTabFind);
+          var mailtab = tab.then(mailTabFind, onContextError);
          return requestDetails;
        } else if (routerhost === "routerconsole") {
-          var tab = tabGet(requestDetails.tabId);
-          var mtab = tab.then(routerTabFind);
+          var routertab = tab.then(routerTabFind, onContextError);
          return requestDetails;
        }
      } else {
-        var tab = tabGet(requestDetails.tabId);
-        var mtab = tab.then(anyTabFind);
        return requestDetails;
      }
    }
-    //var tab = tabGet(requestDetails.tabId);
-    //var mtab = tab.then(anyTabFind);
-    return requestDetails;
  } catch (error) {
    console.log("(isolate)Not an I2P request, blackholing", error);
  }
@@ -416,25 +423,3 @@ browser.webRequest.onBeforeSendHeaders.addListener(
  { urls: ["<all_urls>"] },
  ["blocking", "requestHeaders"]
 );
-
-/*
-function notify(message) {
-  var response = await fetch('https://proxy.i2p', {
-      credentials: 'include'
-    });
-    const myJson = await response.json();
-    console.log(JSON.stringify(myJson));
-
-  console.log(message);
-  const Http = new XMLHttpRequest();
-  Http.mozAnon = true;
-  Http.withCredentials = true;
-  const url = "http://proxy.i2p";
-  Http.open("GET", url);
-  Http.send();
-  Http.onreadystatechange = e => {
-    console.log(Http.responseText);
-    browser.runtime.sendMessage(Http.responseText);
-  };
-}
-*/
--- a/smartlander.pdf
+++ b/smartlander.pdf
--- a/window.html
+++ b/window.html
@@ -39,13 +39,18 @@
                <li class="application">
                  <input type="checkbox" id="enable-web-rtc" name="enablewebrtc" value="webrtc">
                  <label for="enable-web-rtc">Enable WebRTC <strong>with Proxy?</strong></label>
-                  <span class="applicationDesc">For more information about this extension, go here:</span>
+                  <span class="applicationDesc">WebRTC is disabled by default, but can be enabled by checking this box.</span>
                </li>
                <li class="application">
                  <div class="panel-section-separator"></div>
                  <div class="panel-section-identity">
                  <div id="identity-list"></div>
                </li>
+                <li class="application">
+                  <input type="checkbox" id="disable-history" name="disablehistory" value="history">
+                  <label for="disable-history">Disable History in I2P Tabs</label>
+                  <span class="applicationDesc">History is automatically cleared when your I2P tabs are closed. If you want to clear history as you go, check this box.</span>
+                </li>
              </ul>
            </p>
          </p>
@@ -56,16 +61,16 @@
            <h3>Applications</h3>
            <p id="applicationExplain">These applications use I2P to provide them with security and privacy.</p>
              <ul>
-                <li class="application"><button id="window-visit-homepage" class="applicationName window-visit-homepage" href="#">
+                <li class="application"><button id="window-visit-homepage" target="_blank" class="applicationName window-visit-homepage" href="#">
                    Home Page <span class="applicationDesc">For more information about this extension, go here:</span>
                </button></li>
-                <li class="application"><button id="window-visit-i2ptunnel" class="applicationName">
+                <li class="application"><button id="window-visit-i2ptunnel" target="_blank" class="applicationName">
                    Hidden Services Manager <span class="applicationDesc">I2P has a web-based interface for configuring .i2p services like web sites, to set up your own web sites, go here:</span>
                </button></li>
-                <li class="application"><button id="window-visit-susimail" class="applicationName">
+                <li class="application"><button id="window-visit-susimail" target="_blank" class="applicationName">
                  E-Mail <span class="applicationDesc">I2P also bundles a webmail client which can be used to access in-I2P e-mail. To use it, go here:</span>
                </button></li>
-                <li class="application"><button id="window-visit-snark" class="applicationName">
+                <li class="application"><button id="window-visit-snark" target="_blank" class="applicationName">
                  BitTorrent <span class="applicationDesc">I2P is capable of anonymous Peer-to-Peer file sharing, to use the built-in bittorrent client go here:</span>
                </button></li>
              </ul>
Author	SHA1	Message	Date
idk	4e30e1077b	update changelog	2020-01-02 16:50:46 -05:00
idk	040b57781e	trim down results of eslint, some of these are false	2020-01-02 16:44:19 -05:00
idk	07ca54a885	Merge pull request #57 from eyedeekay/lint First round of lint errors	2020-01-02 20:48:34 +00:00
idk	e125b77d11	Fix a whole bunch of linter errors, about half of them	2020-01-02 15:43:24 -05:00
idk	851e3854a7	deal with some lint stuff in background.js	2020-01-02 13:59:21 -05:00
idk	0d414130a7	Merge pull request #55 from eyedeekay/android Fixes encountered on the way to understanding Android	2020-01-02 18:00:48 +00:00
idk	25a7b523f9	Add localhost tab for non-i2p stuff, remove default container for web browsing	2020-01-02 11:28:10 -05:00
idk	01fbf32acd	figure out why it isn't launching into containers like on desktop	2019-12-25 00:42:16 -05:00
idk	e2642553b5	figure out why it isn't launching into containers like on desktop	2019-12-24 23:52:58 -05:00
idk	d04709e3a5	figure out why it isn't launching into containers like on desktop	2019-12-24 23:43:40 -05:00
idk	10dd0af335	figure out why it isn't launching into containers like on desktop	2019-12-24 23:25:35 -05:00
idk	b33a7b623b	figure out why it isn't launching into containers like on desktop	2019-12-24 23:20:33 -05:00
idk	55841f8421	figure out why it isn't launching into containers like on desktop	2019-12-24 23:14:01 -05:00
idk	303bd90d84	figure out why it isn't launching into containers like on desktop	2019-12-24 23:08:35 -05:00
idk	274eb1a98b	figure out why it isn't launching into containers like on desktop	2019-12-24 23:06:58 -05:00
idk	4e544dd9e4	figure out why it isn't launching into containers like on desktop	2019-12-24 23:01:25 -05:00
idk	6fe1bc3fb5	figure out why it isn't launching into containers like on desktop	2019-12-24 22:52:56 -05:00
idk	4897ceff7f	figure out why it isn't launching into containers like on desktop	2019-12-24 22:50:09 -05:00
idk	8551a13494	figure out why it isn't launching into containers like on desktop	2019-12-24 22:43:27 -05:00
idk	064ec504b5	figure out why it isn't launching into containers like on desktop	2019-12-24 22:37:49 -05:00
idk	16c9fbb19f	figure out why it isn't launching into containers like on desktop	2019-12-24 22:21:04 -05:00
idk	ca58d2e307	figure out why it isn't launching into containers like on desktop	2019-12-24 21:53:31 -05:00
idk	fc89fe9ada	figure out why it isn't launching into containers like on desktop	2019-12-24 21:23:37 -05:00
idk	d6ece55d71	figure out why it isn't launching into containers like on desktop	2019-12-24 21:18:28 -05:00
idk	ff9a1484b0	figure out why it isn't launching into containers like on desktop	2019-12-24 21:14:40 -05:00
idk	70e3bee4da	figure out why it isn't launching into containers like on desktop	2019-12-24 21:09:57 -05:00
idk	cd25d95fdf	fmt	2019-12-24 21:03:37 -05:00
idk	65c914a9d0	fmt	2019-12-24 20:58:53 -05:00
idk	c0bb7e234d	try and figure out this android thing	2019-12-24 20:57:56 -05:00
idk	3fefc88a38	Merge pull request #42 from eyedeekay/unobtrusive Co-existence enhancements	2019-12-25 00:04:34 +00:00
idk	5a5cc51536	only close old tabs if the ID differs from the new tab	2019-12-24 18:44:58 -05:00
idk	25ec2d58c1	only close old tabs if the ID differs from the new tab	2019-12-24 18:41:42 -05:00
idk	f896f6ef92	add a mode for semi-safe localhost browsing	2019-12-24 18:31:44 -05:00
idk	e10d96905b	Merge pull request #41 from eyedeekay/gh-pages Readme Updates	2019-12-24 21:53:29 +00:00
idk	9e015c51ef	update usage section	2019-12-24 16:51:38 -05:00
idk	ff9ba99476	update usage section	2019-12-24 16:50:47 -05:00
idk	ce4ec0cdfc	update usage section	2019-12-24 16:46:51 -05:00
idk	5b9c706cc9	update readme, pages	2019-12-24 15:28:14 -05:00
idk	2aba15f280	update readme, pages	2019-12-24 15:25:16 -05:00
idk	fd5364ab8e	update readme, pages	2019-12-24 14:03:01 -05:00
idk	08639cbf43	update readme, pages	2019-12-24 13:46:09 -05:00
idk	52ba8fa837	update readme, pages	2019-12-24 13:44:44 -05:00
idk	2b69ff05cf	update readme, pages	2019-12-24 13:42:02 -05:00
idk	6a8a9039c9	update readme, pages	2019-12-24 13:36:18 -05:00
idk	3a52c4e2a6	update readme, pages	2019-12-24 13:33:15 -05:00
idk	2fb1d71ae9	update page	2019-12-24 13:32:57 -05:00
idk	185467937c	update page	2019-12-24 13:28:25 -05:00
idk	64c5c05b82	update page	2019-12-24 13:26:21 -05:00
idk	4615513bb2	readme update	2019-12-24 13:25:19 -05:00
idk	3b63ba945d	try something different for the readme	2019-12-24 12:11:06 -05:00
idk	1911641cd0	readme update, pdfs	2019-12-24 11:21:07 -05:00
idk	e18eeaf934	hotfix	2019-11-28 19:24:53 -05:00
idk	ea92d4a5b8	Merge pull request #36 from eyedeekay/rhizome Rhizome	2019-11-29 00:07:31 +00:00
idk	51cc8c96e1	rhizome variant	2019-11-28 18:45:34 -05:00
idk	12fff599f0	rhizome variant	2019-11-28 18:44:05 -05:00
idk	30231ab974	rhizome variant	2019-11-28 18:43:32 -05:00
idk	1362ca32d9	cleanup manifest	2019-11-28 17:55:19 -05:00
idk	0c64c301c9	cleanup manifest	2019-11-28 17:54:20 -05:00
idk	38147d45e1	cleanup manifest	2019-11-28 17:54:02 -05:00
idk	093db8443c	cleanup manifest	2019-11-28 17:52:35 -05:00
idk	56a220136b	OK this one might work	2019-11-27 00:58:53 -05:00
idk	e903349e4c	OK this one might work	2019-11-27 00:45:25 -05:00
idk	175683a8ed	OK this one might work	2019-11-27 00:38:21 -05:00
idk	d7449a5e8a	OK this one might work	2019-11-27 00:34:48 -05:00
idk	3bcbfc1e58	OK this one might work	2019-11-27 00:31:10 -05:00
idk	13210031e6	another hack to deal with slightly different tag behavior	2019-11-27 00:03:44 -05:00
idk	5a2acc1c1c	another hack to deal with slightly different tag behavior	2019-11-26 23:26:33 -05:00
idk	4aed7e0db4	another hack to deal with slightly different tag behavior	2019-11-26 23:22:24 -05:00
idk	f4d2334900	another hack to deal with slightly different tag behavior	2019-11-26 23:15:57 -05:00
idk	7902aded0a	another hack to deal with slightly different tag behavior	2019-11-26 23:06:24 -05:00
idk	256a990ebc	another hack to deal with slightly different tag behavior	2019-11-26 22:45:49 -05:00
idk	ff883a2a9a	Merge pull request #35 from eyedeekay/droid-compat Bugfixes, Code Cleanup, Android Fixes	2019-11-26 15:00:07 +00:00
idk	d1943b4262	In android extension menus have tab ids, try this way of identifying them	2019-11-26 01:07:48 -05:00
idk	c96ec6c3b7	force disconnect of webrtc sessions when webrtc with proxy enabled	2019-11-25 20:42:46 -05:00
idk	6467ea6f63	enable-disable history, don't try to kill undefined tabs	2019-11-25 20:20:53 -05:00
idk	352d71af26	enable-disable history, don't try to kill undefined tabs	2019-11-25 20:20:27 -05:00
idk	ab7774ea29	enable-disable history, don't try to kill undefined tabs	2019-11-25 20:19:44 -05:00
idk	4e00c72d5f	remove tabfind. Never create a window, ever.	2019-11-24 23:44:33 -05:00
idk	acd7adc9c1	remove tabfind. Never create a window, ever.	2019-11-24 23:29:06 -05:00
idk	94f0124f0f	no but closer	2019-11-24 23:16:48 -05:00
idk	89523390de	no but closer	2019-11-24 23:14:01 -05:00
idk	77f57d7f1e	no but closer	2019-11-24 23:04:49 -05:00
idk	a33afc52d3	no but closer	2019-11-24 22:59:50 -05:00
idk	b06facacb0	no but closer	2019-11-24 22:50:43 -05:00
idk	bd4c9c0658	no but closer	2019-11-24 22:43:50 -05:00
idk	b23b90baa1	no but closer	2019-11-24 22:32:12 -05:00
idk	5b6224f9ce	no but closer	2019-11-24 22:23:13 -05:00
idk	232ada5ed3	no but closer	2019-11-24 22:18:27 -05:00
idk	2fab8e042f	pretty sure that'll fix it	2019-11-24 20:57:41 -05:00
idk	749ff30b5b	Bring some sanity to the settings section	2019-11-24 20:43:17 -05:00
idk	f0b4a0a849	try and figure out why it works on Desktop but not Android still	2019-11-24 19:49:47 -05:00
idk	870eaa6e3e	try and figure out why it works on Desktop but not Android still	2019-11-24 19:47:33 -05:00
idk	c7af1a0d72	try and figure out why it works on Desktop but not Android still	2019-11-24 18:15:38 -05:00
idk	4c10cd2855	try and figure out why it works on Desktop but not Android still	2019-11-24 18:13:34 -05:00
idk	6f45363692	reuse less function names	2019-11-24 18:04:58 -05:00
idk	8d14c945f3	reuse less function names	2019-11-24 17:43:43 -05:00
idk	070955225d	reuse less function names	2019-11-24 17:28:58 -05:00
idk	9987325f1a	reuse less function names	2019-11-24 17:24:34 -05:00
idk	2bbeed8385	reuse less function names	2019-11-24 17:14:43 -05:00
idk	875fe8b86d	fix android maybe	2019-11-24 05:50:06 -05:00
idk	b2184119f7	fix android maybe	2019-11-24 05:41:45 -05:00
idk	cb5fa75616	fix android maybe	2019-11-24 05:29:19 -05:00
idk	5c7a80997f	fix android maybe	2019-11-24 05:21:56 -05:00
idk	32035348c1	Try some android stuff	2019-11-24 04:55:39 -05:00
idk	049b79753e	Try some android stuff	2019-11-24 04:54:28 -05:00
idk	25c24757d4	Try some android stuff	2019-11-24 04:32:35 -05:00
idk	2d17f4fb0f	Try some android stuff	2019-11-24 04:28:14 -05:00
idk	916ee81668	Try some android stuff	2019-11-24 04:25:06 -05:00
idk	1dd48e4344	Try some android stuff	2019-11-24 04:13:12 -05:00