pare this branch down to only the manifest.json and the Makefile

create android-trunk branch
bump strict_min_version 85 to shut up the linter
2021-09-30 18:10:34 -04:00 · 2021-09-30 16:46:20 -04:00 · 2021-09-26 14:55:10 -04:00 · 2021-09-26 00:37:45 -04:00 · 2021-09-26 00:35:40 -04:00 · 2021-09-26 04:27:17 +00:00
40 changed files with 628 additions and 3631 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -0,0 +1,252 @@
+module.exports = {
+  env: {
+    browser: true,
+    es6: true,
+    webextensions: true,
+  },
+  extends: "eslint:recommended",
+  globals: {
+    Atomics: "readonly",
+    SharedArrayBuffer: "readonly",
+  },
+  parserOptions: {
+    ecmaVersion: 2018,
+  },
+  rules: {
+    "accessor-pairs": "error",
+    "array-bracket-newline": "error",
+    "array-bracket-spacing": ["error", "never"],
+    "array-callback-return": "error",
+    "array-element-newline": "error",
+    "arrow-body-style": "error",
+    "arrow-parens": ["error", "as-needed"],
+    "arrow-spacing": [
+      "error",
+      {
+        after: true,
+        before: true,
+      },
+    ],
+    "block-scoped-var": "off",
+    "block-spacing": "error",
+    "brace-style": ["error", "1tbs"],
+    "callback-return": "error",
+    camelcase: "off",
+    "capitalized-comments": "off",
+    "class-methods-use-this": "error",
+    "comma-dangle": "error",
+    "comma-spacing": [
+      "error",
+      {
+        after: true,
+        before: false,
+      },
+    ],
+    "comma-style": ["error", "last"],
+    complexity: "error",
+    "computed-property-spacing": ["error", "never"],
+    "consistent-return": "off",
+    "consistent-this": "error",
+    curly: "error",
+    "default-case": "error",
+    "default-param-last": "error",
+    "dot-location": "off",
+    "dot-notation": "off",
+    "eol-last": "error",
+    eqeqeq: "off",
+    "func-call-spacing": "error",
+    "func-name-matching": "error",
+    "func-names": "off",
+    "func-style": "off",
+    "function-call-argument-newline": ["error", "consistent"],
+    "function-paren-newline": "off",
+    "generator-star-spacing": "error",
+    "global-require": "error",
+    "guard-for-in": "error",
+    "handle-callback-err": "error",
+    "id-blacklist": "error",
+    "id-length": "error",
+    "id-match": "error",
+    "implicit-arrow-linebreak": ["error", "beside"],
+    indent: "off",
+    "indent-legacy": "off",
+    "init-declarations": "error",
+    "jsx-quotes": "error",
+    "key-spacing": "error",
+    "keyword-spacing": [
+      "error",
+      {
+        after: true,
+        before: true,
+      },
+    ],
+    "line-comment-position": "error",
+    "linebreak-style": ["error", "unix"],
+    "lines-around-comment": "off",
+    "lines-around-directive": "error",
+    "lines-between-class-members": "error",
+    "max-classes-per-file": "error",
+    "max-depth": "error",
+    "max-len": "error",
+    "max-lines": "off",
+    "max-lines-per-function": "off",
+    "max-nested-callbacks": "error",
+    "max-params": "error",
+    "max-statements": "off",
+    "max-statements-per-line": "error",
+    "multiline-comment-style": ["error", "bare-block"],
+    "multiline-ternary": "error",
+    "new-cap": "off",
+    "new-parens": "error",
+    "newline-after-var": "off",
+    "newline-before-return": "off",
+    "newline-per-chained-call": "error",
+    "no-alert": "error",
+    "no-array-constructor": "error",
+    "no-await-in-loop": "error",
+    "no-bitwise": "error",
+    "no-buffer-constructor": "error",
+    "no-caller": "error",
+    "no-catch-shadow": "error",
+    "no-confusing-arrow": "error",
+    "no-console": "off",
+    "no-continue": "error",
+    "no-div-regex": "error",
+    "no-duplicate-imports": "error",
+    "no-else-return": "off",
+    "no-empty-function": "error",
+    "no-eq-null": "error",
+    "no-eval": "error",
+    "no-extend-native": "error",
+    "no-extra-bind": "error",
+    "no-extra-label": "error",
+    "no-extra-parens": "error",
+    "no-floating-decimal": "error",
+    "no-implicit-coercion": "error",
+    "no-implicit-globals": "off",
+    "no-implied-eval": "error",
+    "no-import-assign": "error",
+    "no-inline-comments": "error",
+    "no-inner-declarations": "off",
+    "no-invalid-this": "error",
+    "no-iterator": "error",
+    "no-label-var": "error",
+    "no-labels": "error",
+    "no-lone-blocks": "error",
+    "no-lonely-if": "error",
+    "no-loop-func": "error",
+    "no-magic-numbers": "off",
+    "no-mixed-operators": "error",
+    "no-mixed-requires": "error",
+    "no-multi-assign": "error",
+    "no-multi-spaces": "error",
+    "no-multi-str": "error",
+    "no-multiple-empty-lines": "error",
+    "no-native-reassign": "error",
+    "no-negated-condition": "error",
+    "no-negated-in-lhs": "error",
+    "no-nested-ternary": "error",
+    "no-new": "error",
+    "no-new-func": "error",
+    "no-new-object": "error",
+    "no-new-require": "error",
+    "no-new-wrappers": "error",
+    "no-octal-escape": "error",
+    "no-param-reassign": "error",
+    "no-path-concat": "error",
+    "no-plusplus": "error",
+    "no-process-env": "error",
+    "no-process-exit": "error",
+    "no-proto": "error",
+    "no-restricted-globals": "error",
+    "no-restricted-imports": "error",
+    "no-restricted-modules": "error",
+    "no-restricted-properties": "error",
+    "no-restricted-syntax": "error",
+    "no-return-assign": "error",
+    "no-return-await": "error",
+    "no-script-url": "error",
+    "no-self-compare": "error",
+    "no-sequences": "error",
+    "no-shadow": "error",
+    "no-spaced-func": "error",
+    "no-sync": "error",
+    "no-tabs": "error",
+    "no-template-curly-in-string": "error",
+    "no-ternary": "error",
+    "no-throw-literal": "error",
+    "no-trailing-spaces": "error",
+    "no-undef-init": "error",
+    "no-undefined": "off",
+    "no-underscore-dangle": "error",
+    "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",
+    "no-useless-concat": "error",
+    "no-useless-constructor": "error",
+    "no-useless-rename": "error",
+    "no-useless-return": "error",
+    "no-var": "off",
+    "no-void": "error",
+    "no-warning-comments": "error",
+    "no-whitespace-before-property": "error",
+    "nonblock-statement-body-position": "error",
+    "object-curly-newline": "error",
+    "object-curly-spacing": "off",
+    "object-property-newline": "error",
+    "object-shorthand": "error",
+    "one-var": "off",
+    "one-var-declaration-per-line": "error",
+    "operator-assignment": "error",
+    "operator-linebreak": "error",
+    "padded-blocks": "off",
+    "padding-line-between-statements": "error",
+    "prefer-arrow-callback": "off",
+    "prefer-const": "off",
+    "prefer-destructuring": "off",
+    "prefer-named-capture-group": "error",
+    "prefer-numeric-literals": "error",
+    "prefer-object-spread": "error",
+    "prefer-promise-reject-errors": "error",
+    "prefer-reflect": "error",
+    "prefer-regex-literals": "error",
+    "prefer-rest-params": "error",
+    "prefer-spread": "error",
+    "prefer-template": "off",
+    "quote-props": "off",
+    quotes: ["error", "double"],
+    radix: "error",
+    "require-await": "error",
+    "require-jsdoc": "off",
+    "require-unicode-regexp": "error",
+    "rest-spread-spacing": "error",
+    semi: "error",
+    "semi-spacing": "error",
+    "semi-style": ["error", "last"],
+    "sort-imports": "error",
+    "sort-keys": "off",
+    "sort-vars": "error",
+    "space-before-blocks": "error",
+    "space-before-function-paren": "off",
+    "space-in-parens": ["error", "never"],
+    "space-infix-ops": "error",
+    "space-unary-ops": "error",
+    "spaced-comment": "off",
+    strict: ["error", "never"],
+    "switch-colon-spacing": "error",
+    "symbol-description": "error",
+    "template-curly-spacing": "error",
+    "template-tag-spacing": "error",
+    "unicode-bom": ["error", "never"],
+    "valid-jsdoc": "error",
+    "vars-on-top": "off",
+    "wrap-iife": "error",
+    "wrap-regex": "error",
+    "yield-star-spacing": "error",
+    yoda: ["error", "never"],
+  },
+};
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 README.md.asc
-
+node_modules/
+web-ext-artifacts
+releases.diff
+.releases.atom
--- a/.web-extension-id
+++ b/.web-extension-id
@@ -0,0 +1,3 @@
+# This file was created by https://github.com/mozilla/web-ext
+# Your auto-generated extension ID for addons.mozilla.org is:
+i2ppb@eyedeekay.github.io
--- a/21
+++ b/21
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 idk
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/372
+++ b/372
@@ -1,86 +1,380 @@
-PREFIX:=/usr
+
+PREFIX?=/usr

 default: zip

+PWD=`pwd`
+
 install: uninstall
 	mkdir -p $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io \
 		$(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
-	cp -r ./chromium/ $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
-	cp -r ./icons/ $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
-	cp -r ./_locales/ $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
-	cp -r ./options/ $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./*.js $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./*.html $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./*.css $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./*.md $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./*.xpi $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./manifest.json $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./LICENSE $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
-	ln -s $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io \
-		$(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+	@echo $(PWD)
+	cp -v ./* $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/; true
+	cp -vr ./i2pcontrol $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/i2pcontrol
+	cp -vr ./torrent $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/torrent
+	cp -vr ./_locales $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/_locales
+	cp -vr ./icons $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/icons
+	cp -vr ./options $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/options
+	make link
+
+link:
+	ln -sf  $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io \
+		$(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/i2ppb@eyedeekay.github.io

 uninstall:
 	rm -rf $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io \
 		$(PREFIX)/share/webext/i2psetproxy.js@eyedeekay.github.io \
-		$(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+		$(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/i2ppb@eyedeekay.github.io
+

 ls:
 	ls -lah $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io; \
 	ls -lah $(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}

-clean:
-	rm -f ../i2psetproxy.js.zip ../i2p_proxy*.xpi
+clean: rc clean-artifacts
+	rm -fr ../i2psetproxy.js.zip ../i2p_proxy*.xpi *.torrent #../i2psetproxy.js_*.*

 ## EVEN RELEASES are AMO RELEASES
 ## ODD RELEASES are SELFHOSTED RELEASES

-MOZ_VERSION=0.36
-VERSION=0.36
-#VERSION=1.27
+MOZ_VERSION=0.114
+VERSION=0.113

-xpi:
-	wget -O ../i2ppb@eyedeekay.github.io.xpi \
-		https://addons.mozilla.org/firefox/downloads/file/3419789/i2psetproxyjs-$(MOZ_VERSION)-an+fx.xpi
-	cp ../i2ppb@eyedeekay.github.io.xpi ./i2ppb@eyedeekay.github.io.xpi
+## INCREMENT THIS EVERY TIME YOU DO A RELEASE
+LAST_VERSION=0.111.1
+
+YELLOW=F7E59A
+ORANGE=FFC56D
+GREY=D9D9D6
+BLUE=A4C8E1
+PURPLE=A48fE1
+
+colors:
+	@echo " yellow $(YELLOW) \n orange $(ORANGE) \n grey $(GREY) \n blue $(BLUE) \n purple $(PURPLE)"
+
+amo-readme:
+	markdown README.md | \
+		sed 's|<p>||g' | \
+		sed 's|</p>||g' | \
+		sed 's|<h1>|<strong>|g' | \
+		sed 's|</h1>|</strong>|g' | \
+		sed 's|<h2>|<strong>|g' | \
+		sed 's|</h2>|</strong>|g' | \
+		sed 's|<h3>|<strong>|g' | \
+		sed 's|</h3>|</strong>|g' | \
+		grep -v '<img' > amo-index.html
+
+MAGNET=`rhash --magnet i2ppb@eyedeekay.github.io.xpi.torrent`
+
+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 "  <link rel=\"stylesheet\" type=\"text/css\" href=\"sidebar.css\" />" >> index.html
+	@echo "</head>" >> index.html
+	@echo "<body>" >> index.html
+	sed "s|magnetsub|[Magnet Link]($(MAGNET))|g" README.md | sed 's|README.md|index.html|g' | markdown >> index.html
+	@echo "</body>" >> index.html
+	@echo "</html>" >> index.html
+
+torrenthelp:
+	@echo "<!DOCTYPE html>" > torrent/index.html
+	@echo "<html>" >> torrent/index.html
+	@echo "<head>" >> torrent/index.html
+	@echo "  <title>I2P in Private Browsing Mode</title>" >> torrent/index.html
+	@echo "  <link rel=\"stylesheet\" type=\"text/css\" href=\"../home.css\" />" >> torrent/index.html
+	@echo "  <link rel=\"stylesheet\" type=\"text/css\" href=\"../sidebar.css\" />" >> torrent/index.html
+	@echo "</head>" >> torrent/index.html
+	@echo "<body>" >> torrent/index.html
+	sed "s|magnetsub|[Magnet Link]($(MAGNET))|g" torrent/README.md | markdown >> torrent/index.html
+	@echo "</body>" >> torrent/index.html
+	@echo "</html>" >> torrent/index.html
+
+xpi: getxpi

 version:
+	sed -i 's|7647|7657|g' *.js* torrent/*.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
+	find . -name 'messages.json' -exec sed -i 's|$(LAST_VERSION)|$(VERSION)|g' {} \;
+	find . -name 'messages.json' -exec sed -i 's|$(MOZ_VERSION)|$(VERSION)|g' {} \;
+
+moz-version:
+	sed -i 's|7647|7657|g' *.js* torrent/*.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
+	find . -name 'messages.json' -exec sed -i 's|$(LAST_VERSION)|$(MOZ_VERSION)|g' {} \;
+	find . -name 'messages.json' -exec sed -i 's|$(VERSION)|$(MOZ_VERSION)|g' {} \;
+
+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* torrent/*.js*

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

-release:
-	cat desc | gothub release -p -u eyedeekay -r i2psetproxy.js -t $(VERSION) -n $(VERSION) -d -
+rc:
+	@grep "$(VERSION)" debian/changelog
+	@echo "changelog is prepared"
+	rm -f *.xpi
+
+rtest: rc index torrenthelp
+
+release: rc index torrenthelp
+	cat desc debian/changelog | grep -B 10 "$(LAST_VERSION)" | gothub release -p -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n $(VERSION) -d -; true
+
+update-release:
+	cat desc debian/changelog | grep -B 10 "$(LAST_VERSION)" | gothub edit -p -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n $(VERSION) -d -; true

 delete-release:
-	gothub delete -u eyedeekay -r i2psetproxy.js -t $(VERSION); true
+	gothub delete -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION); true

 recreate-release: delete-release release upload

 upload: upload-xpi upload-deb

+full-release: release submit upload-xpi torrent upload-torrent deb upload-deb upload-rss seed
+
+WEB_EXT_API_KEY=AMO_KEY
+WEB_EXT_API_SECRET=AMO_SECRET
+
+
+-include ../api_keys_moz.mk
+
+tk:
+	echo $(WEB_EXT_API_KEY)
+
+submit: moz-submit moz-sign
+
+clean-artifacts:
+	rm -fr web-ext-artifacts/*
+
+##ODD NUMBERED, SELF-DISTRIBUTED VERSIONS HERE!
+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."
+	$(HOME)/web-ext/bin/web-ext sign --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET) --timeout 900000 #--api-url-prefix http://localhost:3000/api/v4
+	make copyss
+	sleep 5
+
+copyss:
+	cp web-ext-artifacts/*.xpi ../i2ppb@eyedeekay.github.io.xpi; true
+
+##EVEN NUMBERED, MOZILLA-DISTRIBUTED VERSIONS HERE!
+moz-submit: moz-version
+	@echo "Using the 'submit' target to instantly sign an extension for Mozilla 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."
+	mv manifest.json .manifest.json
+	grep -v update_url .manifest.json > manifest.json
+	$(HOME)/web-ext/bin/web-ext sign --channel listed --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET) --timeout 900000 --verbose #--api-url-prefix http://localhost:3000/api/v4
+	sleep 5
+	mv .manifest.json manifest.json
+
+rhz-submit: rhz-version
+	@echo "Rhizome releases are disabled while browser is completed."
+	#@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."
+	#$HOME/node_modules/web-ext-submit/extender.sh --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
+
+getxpi:
+	gothub download -t $(VERSION) -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -n i2ppb@eyedeekay.github.io.xpi
+	mv ./i2ppb@eyedeekay.github.io.xpi ../i2ppb-$(VERSION)@eyedeekay.github.io.xpi
+	cp ../i2ppb-$(VERSION)@eyedeekay.github.io.xpi ../i2ppb@eyedeekay.github.io.xpi
+
+torrent: getxpi
+	rm -f "./i2ppb-$(VERSION)@eyedeekay.github.io.xpi.torrent"
+	mktorrent -a http://w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa.b32.i2p/a \
+		-a http://zviyq72xcmjupynn5y2f5qa3u7bxyu34jnqmwt6czte2l7idxm7q.b32.i2p/announce \
+		-a http://s5ikrdyjwbcgxmqetxb3nyheizftms7euacuub2hic7defkh3xhq.b32.i2p/a \
+		-a http://uajd4nctepxpac4c4bdyrdw7qvja2a5u3x25otfhkptcjgd53ioq.b32.i2p/announce \
+		-a http://explodie.org:6969/announce \
+		-a http://tracker.opentrackr.org:1337/announce \
+		-a http://tracker.kamigami.org:2710/announce \
+		-a http://tracker.internetwarriors.net:1337/announce \
+		-a http://tracker.darli.net:6611/announce \
+		-a http://tracker.corpscorp.online:80/announce \
+		-a http://tracker.bz:80/announce \
+		-a http://tracker.bt4g.com:2095/announce \
+		-a http://retracker.sevstar.net:2710/announce \
+		-a http://h4.trakx.nibba.trade:80/announce \
+		-a http://www.proxmox.com:6969/announce \
+		-a http://www.loushao.net:8080/announce \
+		-a http://vps02.net.orel.ru:80/announce \
+		-a http://tracker4.itzmx.com:2710/announce \
+		-a http://tracker3.itzmx.com:6961/announce \
+		-a http://tracker2.itzmx.com:6961/announce \
+		-a http://tracker1.itzmx.com:8080/announce \
+		-a http://tracker01.loveapp.com:6789/announce \
+		-a http://tracker.zerobytes.xyz:1337/announce \
+		-a http://tracker.yoshi210.com:6969/announce \
+		-a http://tracker.torrentyorg.pl:80/announce \
+		-a http://tracker.nyap2p.com:8080/announce \
+		-a http://tracker.lelux.fi:80/announce \
+		-a http://tracker.gbitt.info:80/announce \
+		-a http://pow7.com:80/announce \
+		-a http://opentracker.i2p.rocks:6969/announce \
+		-a http://open.acgtracker.com:1096/announce \
+		-a http://open.acgnxtracker.com:80/announce \
+		-a http://mail2.zelenaya.net:80/announce \
+		-a http://acg.rip:6699/announce \
+		-n "i2ppb-$(VERSION)@eyedeekay.github.io.xpi" \
+		-o "i2ppb-$(VERSION)@eyedeekay.github.io.xpi.torrent" \
+		-w https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/download/$(VERSION)/i2ppb@eyedeekay.github.io.xpi \
+		../i2ppb@eyedeekay.github.io.xpi; true
+	cp -v "./i2ppb-$(VERSION)@eyedeekay.github.io.xpi.torrent" "./i2ppb@eyedeekay.github.io.xpi.torrent"
+	make index
+
+upload-torrent:
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2ppb@eyedeekay.github.io.xpi.torrent" -f "./i2ppb-$(VERSION)@eyedeekay.github.io.xpi.torrent"
+
 upload-xpi:
-	gothub upload -u eyedeekay -r i2psetproxy.js -t $(VERSION) -n "i2ppb@eyedeekay.github.io.xpi" -f "./i2ppb@eyedeekay.github.io.xpi"
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2ppb@eyedeekay.github.io.xpi" -f "../i2ppb@eyedeekay.github.io.xpi"

 upload-deb:
-	gothub upload -u eyedeekay -r i2psetproxy.js -t $(VERSION) -n "i2psetproxy.js_$(VERSION)-1_amd64.deb" -f "../i2psetproxy.js_$(VERSION)-1_amd64.deb"
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psetproxy.js_$(VERSION)-1_amd64.deb" -f "../i2psetproxy.js_$(VERSION)-1_amd64.deb"
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psetproxy.js_$(VERSION).orig.tar.gz" -f "../i2psetproxy.js_$(VERSION).orig.tar.gz"
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psetproxy.js_$(VERSION)-1.debian.tar.xz" -f "../i2psetproxy.js_$(VERSION)-1.debian.tar.xz"
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psetproxy.js_$(VERSION)-1.dsc" -f "../i2psetproxy.js_$(VERSION)-1.dsc"
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psetproxy.js_$(VERSION)-1_amd64.changes" -f "../i2psetproxy.js_$(VERSION)-1_amd64.changes"
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psetproxy.js_$(VERSION)-1_amd64.buildinfo" -f "../i2psetproxy.js_$(VERSION)-1_amd64.buildinfo"

-lib: libpolyfill
+upload-docs:
+	gothub release -p -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t docs -n "Documentation" -d "PDF's and text about the extension"; true
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t docs -n "Landing Page Documentation.pdf" -f ../smartlander.pdf
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t docs -n "Browser Design Documentation.pdf" -f ../browser.pdf

-libpolyfill:
-	wget -O chromium/browser-polyfill.js https://unpkg.com/webextension-polyfill/dist/browser-polyfill.js
+fmt: fmt-css fmt-html fmt-js

-fmt:
-	find . -path ./node_modules -prune -o -name '*.js' -exec prettier --write {} \;
+fmt-css:
+	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
+	cleancss -O1 all -O2 all --format beautify search.css -o .search.css && mv .search.css search.css
+	cleancss -O1 all -O2 all --format beautify sidebar.css -o .sidebar.css && mv .sidebar.css sidebar.css
+	cleancss -O1 all -O2 all --format beautify options/options.css -o options/.options.css && mv options/.options.css options/options.css

-deborig:
-	rm -rfv ../i2psetproxy.js-$(VERSION)
-	cp -rv . ../i2psetproxy.js-$(VERSION)
-	tar --exclude='./.git' --exclude="./node_modules" -cvzf ../i2psetproxy.js_$(VERSION).orig.tar.gz .
+fmt-html:
+	tidy --as-xhtml --drop-empty-elements no --input-xml --tidy-mark no -indent --indent-spaces 4 -wrap 0 --new-blocklevel-tags article,header,footer --new-inline-tags video,audio,canvas,ruby,rt,rp --break-before-br yes --sort-attributes alpha --vertical-space yes index.html > .index.html; mv .index.html index.html
+	tidy --as-xhtml --drop-empty-elements no --input-xml --tidy-mark no -indent --indent-spaces 4 -wrap 0 --new-blocklevel-tags article,header,footer --new-inline-tags video,audio,canvas,ruby,rt,rp --break-before-br yes --sort-attributes alpha --vertical-space yes window.html > .window.html; mv .window.html window.html
+	tidy --as-xhtml --drop-empty-elements no --input-xml --tidy-mark no -indent --indent-spaces 4 -wrap 0 --new-blocklevel-tags article,header,footer --new-inline-tags video,audio,canvas,ruby,rt,rp --break-before-br yes --sort-attributes alpha --vertical-space yes home.html > .home.html; mv .home.html home.html
+	tidy --as-xhtml --drop-empty-elements no --input-xml --tidy-mark no -indent --indent-spaces 4 -wrap 0 --new-blocklevel-tags article,header,footer --new-inline-tags video,audio,canvas,ruby,rt,rp --break-before-br yes --sort-attributes alpha --vertical-space yes toopie.html > .toopie.html; mv .toopie.html toopie.html
+	tidy --as-xhtml --drop-empty-elements no --input-xml --tidy-mark no -indent --indent-spaces 4 -wrap 0 --new-blocklevel-tags article,header,footer --new-inline-tags video,audio,canvas,ruby,rt,rp --break-before-br yes --sort-attributes alpha --vertical-space yes security.html > .security.html; mv .security.html security.html
+	tidy --as-xhtml --drop-empty-elements no --input-xml --tidy-mark no -indent --indent-spaces 4 -wrap 0 --new-blocklevel-tags article,header,footer --new-inline-tags video,audio,canvas,ruby,rt,rp --break-before-br yes --sort-attributes alpha --vertical-space yes options/options.html > options/.options.html; mv options/.options.html options/options.html
+
+fmt-js:
+	fixjsstyle *.js
+	fixjsstyle options/*.js
+	fixjsstyle torrent/*.js
+	fixjsstyle i2pcontrol/*.js
+	fixjsstyle manifest.json
+	#find . -path ./node_modules -prune -o -name '*.json' -exec fixjsstyle --write {} \;
+
+fmt-prettier:
+	find . -name '*.js*' -exec $(HOME)/node_modules/.bin/prettier -w {} \;
+
+lint:
+
+	gjslint *.js; true
+	#eslint --color *.js
+
+deborig: version
+	rm -rf ../i2psetproxy.js-$(VERSION)
+	mkdir -p ../i2psetproxy.js-$(VERSION)
+	cp -r ./* ../i2psetproxy.js-$(VERSION)
+	cd ../i2psetproxy.js-$(VERSION) && \
+	rm -rf web-ext-artifacts .git node_modules && \
+	tar \
+		-cvz \
+		--exclude=i2psetproxy.js.gif \
+		--exclude=*.pdf \
+		-f ../i2psetproxy.js_$(VERSION).orig.tar.gz \
+		.

 deb: deborig
 	cd ../i2psetproxy.js-$(VERSION) && debuild -us -uc -rfakeroot
+
+-include mirrors.mk
+
+dat:
+	wget -c -O dat.js https://bundle.run/dat-js
+
+rss: torrent
+	rm -f releases.diff
+	mv releases.atom .releases.atom
+	wget https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases.atom
+	sed -i "s|<title>$(VERSION)</title>|<title>$(VERSION)</title>\n    <enclosure url=\"$(MAGNET)\" type=\"application/x-bittorrent\" />|g" releases.atom
+
+upload-rss: rss
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t docs -n "releases.atom" -f releases.atom
+
+upload-updatemanifest:
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t docs -n "updateManifest.json" -f updateManifest.json
+
+webext:
+	$(HOME)/web-ext/bin/web-ext run --firefox /usr/bin/firefox -u "about:devtools-toolbox?type=extension&id=i2ppb%40eyedeekay.github.io"
+
+snark-mirror:
+	http_proxy=http://127.0.0.1:4444 wget -c -O ../i2psnark-rpc.su3 http://stats.i2p/i2p/plugins/i2psnark-rpc.su3
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psnark-rpc.su3" -f ../i2psnark-rpc.su3
+	http_proxy=http://127.0.0.1:4444 wget -c -O ../i2psnark-rpc-update.su3 http://stats.i2p/i2p/plugins/i2psnark-rpc-update.su3
+	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t $(VERSION) -n "i2psnark-rpc-update.su3" -f ../i2psnark-rpc-update.su3
+
+seed:
+	cp -v "./i2ppb-$(VERSION)@eyedeekay.github.io.xpi.torrent" "$(HOME)/.i2p/i2psnark"
+	cp -v "../i2ppb-$(VERSION)@eyedeekay.github.io.xpi" "$(HOME)/.i2p/i2psnark"
+
+wire:
+	cp -v "./i2ppb-$(VERSION)@eyedeekay.github.io.xpi.torrent" "$(HOME)/i2p/MuWireDownloads/"
+	cp -v "../i2ppb-$(VERSION)@eyedeekay.github.io.xpi" "$(HOME)/i2p/MuWireDownloads/"
+
+ndtest:
+	$(HOME)/web-ext/bin/web-ext run --firefox /usr/bin/firefox -u about:debugging \
+		-u http://127.0.0.1:7657/home \
+		-u http://127.0.0.1:7657/i2ptunnel \
+		-u http://127.0.0.1:7657/i2psnark \
+		-u http://127.0.0.1:7657/webmail \
+		-u http://127.0.0.1:7657/MuWire \
+		-u http://idk.i2p/video.html \
+		-u http://idk.i2p \
+		-u http://stats.i2p \
+		-u http://tvndxxkxcstbtqfxg7iigco6bj22ff2y6jxikmk7wqkyadkhrd4a.b32.i2p \
+		-u https://ramble.pw \
+		-u https://ramble.pw/f/i2p \
+
+lht-test:
+	$(HOME)/web-ext/bin/web-ext run --firefox /usr/bin/firefox -u about:debugging \
+		-u http://localhost:7657/home \
+		-u http://localhost:7657/i2ptunnel \
+		-u http://localhost:7657/i2psnark \
+		-u http://localhost:7657/webmail \
+		-u http://localhost:7657/MuWire/ \
+		-u http://idk.i2p
+
+android:
+	$(HOME)/web-ext/bin/web-ext run --target firefox-android \
+		--android-device NE1GAM7780819544 \
+		--browser-console
+
+run:
+	$(HOME)/web-ext/bin/web-ext run --firefox /usr/bin/firefox -u about:debugging
+
+chromium:
+	$(HOME)/web-ext/bin/web-ext run --target chromium
+	
--- a/README.md
+++ b/README.md
@@ -1,93 +0,0 @@
-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.
-
-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.
-
-Android usage:
--------------
-
-Open the following link [Github Releases Version](https://github.com/eyedeekay/i2psetproxy.js/releases/download/1.26/i2psetproxy.js@eyedeekay.github.io.xpi)
-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-proxy](https://addons.mozilla.org/en-US/firefox/addon/I2P-proxy/).
-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.
-
-### Features
-
-  * [done] **Provide** a way to launch into an I2P-Specific contextual identity
-   (container). Intercept requests to .i2p domains and automatically route them
-   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
-   acceptable way to indicate it on Android.
-  * [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
-   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.
-  * [wip] **Monitor** the health and readiness of the I2P router it is
-   instructed to use.
-  * [1/2] **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
-   adding them directly into the Firefox downloads drop-downs, menus, etc. If I
-   can.
-
-### Screenshot
-
-![Visiting i2p-projekt.i2p](i2psetproxy.js.png)
-
-![Video of the plugin in action](i2psetproxy.js.gif)
-
-Super Extra Important Background Info:
--------------------------------------
-
-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.
-
-### Links about Project Uplift
-
- * https://wiki.mozilla.org/Security/Tor_Uplift
- * https://wiki.mozilla.org/Security/FirstPartyIsolation
- * https://wiki.mozilla.org/Security/Fingerprinting
- * https://wiki.mozilla.org/Security/Fennec%2BTor_Project
- * https://wiki.mozilla.org/Security/Tor_Uplift/Tracking
-
-Project uplift seems to have largely been accomplished?
-
-### Links about Project Fusion
-
- * 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
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1,66 +0,0 @@
-{
-  "extensionName": {
-    "message": "I2P In Private Browsing",
-    "description": "Name of the extension."
-  },
-  "extensionDescription": {
-    "message": "Set up a browser to use the i2p http proxy automatically",
-    "description": "Description of the extension."
-  },
-  "titlePreface": {
-    "message": "I2P Browser - ",
-    "description": "Preface for the browser titlebar"
-  },
-  "titlePrefacePrivate": {
-    "message": "I2P Browser (Private) - ",
-    "description": "Preface for the browser titlebar"
-  },
-  "resetMessage": {
-    "message": "Reset Tunnel",
-    "description": "Message for the Reset Tunnel button"
-  },
-  "infoTitle": {
-    "message": "I2P Help",
-    "description": "Title for the help menu"
-  },
-  "infoMessage": {
-    "message": "You are now free to browse the eepWeb! Your browser is now configured to browse anonymously on the I2P network. As you browse, your traffic will be routed through other network nodes to disguise it's origin, both from the server and from the nodes themselves.",
-    "description": "Help Message"
-  },
-  "helpMessage": {
-    "message": "Get additional help",
-    "description": "Help Message"
-  },
-  "newsMessage": {
-    "message": "Visit the I2P Blog to learn the latest about i2p.",
-    "description": "Help Message"
-  },
-  "forumMessage": {
-    "message": "Visit the I2P Forum to learn more or ask for assistance",
-    "description": "Help Message"
-  },
-  "clearData": {
-    "message": "Clear all browsing data",
-    "description": "Help Message"
-  },
-  "hostText": {
-    "message": "Host: ",
-    "description": "Host for the HTTP or SOCKS5 Proxy"
-  },
-  "portText": {
-    "message": "Port: ",
-    "description": "Port for the HTTP or SOCKS5 Proxy"
-  },
-  "controlHelpText": {
-    "message": "These options will be inert if used with the default i2p HTTP or SOCKS proxy.",
-    "description": "Help for configuring the options for the Reset Tunnel button"
-  },
-  "controlHostText": {
-    "message": "Control Host: ",
-    "description": "Host for the Reset Tunnel button"
-  },
-  "controlPortText": {
-    "message": "Control Port: ",
-    "description": "Port for the Reset Tunnel button"
-  }
-}
--- a/background.js
+++ b/background.js
@@ -1,182 +0,0 @@
-function onGot(contexts) {
-  var ids = [];
-  for (let context of contexts) {
-    console.log(`Name: ${context.name}`);
-    ids.push(context.name);
-  }
-  console.log("Checking new contexts");
-  if (ids.indexOf("i2pbrowser") == -1) {
-    function onCreated(context) {
-      console.log(`New identity's ID: ${context.cookieStoreId}.`);
-    }
-
-    function onError(e) {
-      console.error(e);
-    }
-    browser.contextualIdentities
-      .create({
-        name: "i2pbrowser",
-        color: "purple",
-        icon: "fingerprint"
-      })
-      .then(onCreated, onError);
-  }
-  if (ids.indexOf("routerconsole") == -1) {
-    function onCreated(context) {
-      console.log(`New identity's ID: ${context.cookieStoreId}.`);
-    }
-
-    function onError(e) {
-      console.error(e);
-    }
-    browser.contextualIdentities
-      .create({
-        name: "routerconsole",
-        color: "turquoise",
-        icon: "briefcase"
-      })
-      .then(onCreated, onError);
-  }
-}
-
-function onError(e) {
-  console.error(e);
-}
-
-browser.contextualIdentities.query({}).then(onGot, onError);
-
-if (!isDroid()) {
-  chrome.windows.onCreated.addListener(themeWindow);
-  chrome.tabs.onUpdated.addListener(themeWindowByTab);
-  chrome.tabs.onActivated.addListener(themeWindowByTab);
-}
-
-var titlepref = chrome.i18n.getMessage("titlePreface");
-var titleprefpriv = chrome.i18n.getMessage("titlePrefacePrivate");
-
-function themeWindowByTab(tab) {
-  getwindow = browser.windows.get(tab.windowId);
-  getwindow.then(themeWindow);
-}
-
-function themeWindow(window) {
-  // Check if the window is in private browsing
-  function logTabs(tabInfo) {
-    console.log(tabInfo);
-
-    function onGot(context) {
-      if (context.name == "i2pbrowser") {
-        console.log("Active in I2P window");
-        if (window.incognito) {
-          chrome.theme.update(window.id, {
-            colors: {
-              frame: "#2D4470",
-              toolbar: "#2D4470"
-            }
-          });
-        } else {
-          chrome.theme.update(window.id, {
-            colors: {
-              frame: "#9DABD5",
-              toolbar: "#9DABD5"
-            }
-          });
-        }
-      } else if (context.name == "routerconsole") {
-        console.log("Active in I2P window");
-        if (window.incognito) {
-          chrome.theme.update(window.id, {
-            colors: {
-              frame: "#00CED1",
-              toolbar: "#00CED1"
-            }
-          });
-        } else {
-          chrome.theme.update(window.id, {
-            colors: {
-              frame: "#40E0D0",
-              toolbar: "#40E0D0"
-            }
-          });
-        }
-      } else {
-        console.log("Not active in I2P window");
-      }
-    }
-
-    function onError(e) {
-      console.error(e);
-    }
-    if (tabInfo[0].cookieStoreId != "firefox-default") {
-      browser.contextualIdentities
-        .get(tabInfo[0].cookieStoreId)
-        .then(onGot, onError);
-    } else {
-      chrome.theme.reset(window.id);
-    }
-  }
-
-  function onError(error) {
-    console.log(`Error: ${error}`);
-  }
-  var querying = browser.tabs.query({
-    currentWindow: true,
-    active: true
-  });
-  querying.then(logTabs, onError);
-}
-
-function setTitle(window) {
-  function logTabs(tabInfo) {
-    console.log(tabInfo);
-
-    function onGot(context) {
-      if (context.name == "i2pbrowser") {
-        console.log("Active in I2P window");
-
-        console.log("Active in I2P window");
-        if (window.incognito) {
-          chrome.windows.update(window.id, {
-            titlePreface: titleprefpriv
-          });
-        } else {
-          chrome.windows.update(window.id, {
-            titlePreface: titlepref
-          });
-        }
-      }
-    }
-
-    function onError(e) {
-      console.error(e);
-    }
-    if (tabInfo[0].cookieStoreId != "firefox-default")
-      browser.contextualIdentities
-        .get(tabInfo[0].cookieStoreId)
-        .then(onGot, onError);
-  }
-
-  function onError(error) {
-    console.log(`Error: ${error}`);
-  }
-  var querying = browser.tabs.query({
-    currentWindow: true,
-    active: true
-  });
-  querying.then(logTabs, onError);
-}
-
-chrome.windows.onCreated.addListener(() => {
-  //var gettingStoredSettings = chrome.storage.local.get();
-  //gettingStoredSettings.then(setupProxy, onError);
-  chrome.storage.local.get(function(got) {
-    setupProxy();
-  });
-});
-
-chrome.tabs.onCreated.addListener(() => {
-  var getting = browser.windows.getCurrent({
-    populate: true
-  });
-  getting.then(setTitle, onError);
-});
--- a/chromium/LICENSE
+++ b/chromium/LICENSE
@@ -1,373 +0,0 @@
-Mozilla Public License Version 2.0
-==================================
-
-1. Definitions
--------------
-
-1.1. "Contributor"
-    means each individual or legal entity that creates, contributes to
-    the creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-    means the combination of the Contributions of others (if any) used
-    by a Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-    means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-    means Source Code Form to which the initial Contributor has attached
-    the notice in Exhibit A, the Executable Form of such Source Code
-    Form, and Modifications of such Source Code Form, in each case
-    including portions thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-    means
-
-    (a) that the initial Contributor has attached the notice described
-        in Exhibit B to the Covered Software; or
-
-    (b) that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the
-        terms of a Secondary License.
-
-1.6. "Executable Form"
-    means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-    means a work that combines Covered Software with other material, in
-    a separate file or files, that is not Covered Software.
-
-1.8. "License"
-    means this document.
-
-1.9. "Licensable"
-    means having the right to grant, to the maximum extent possible,
-    whether at the time of the initial grant or subsequently, any and
-    all of the rights conveyed by this License.
-
-1.10. "Modifications"
-    means any of the following:
-
-    (a) any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered
-        Software; or
-
-    (b) any new file in Source Code Form that contains any Covered
-        Software.
-
-1.11. "Patent Claims" of a Contributor
-    means any patent claim(s), including without limitation, method,
-    process, and apparatus claims, in any patent Licensable by such
-    Contributor that would be infringed, but for the grant of the
-    License, by the making, using, selling, offering for sale, having
-    made, import, or transfer of either its Contributions or its
-    Contributor Version.
-
-1.12. "Secondary License"
-    means either the GNU General Public License, Version 2.0, the GNU
-    Lesser General Public License, Version 2.1, the GNU Affero General
-    Public License, Version 3.0, or any later versions of those
-    licenses.
-
-1.13. "Source Code Form"
-    means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-    means an individual or a legal entity exercising rights under this
-    License. For legal entities, "You" includes any entity that
-    controls, is controlled by, or is under common control with You. For
-    purposes of this definition, "control" means (a) the power, direct
-    or indirect, to cause the direction or management of such entity,
-    whether by contract or otherwise, or (b) ownership of more than
-    fifty percent (50%) of the outstanding shares or beneficial
-    ownership of such entity.
-
-2. License Grants and Conditions
--------------------------------
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
-    Licensable by such Contributor to use, reproduce, make available,
-    modify, display, perform, distribute, and otherwise exploit its
-    Contributions, either on an unmodified basis, with Modifications, or
-    as part of a Larger Work; and
-
-(b) under Patent Claims of such Contributor to make, use, sell, offer
-    for sale, have made, import, and otherwise transfer either its
-    Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution
-become effective for each Contribution on the date the Contributor first
-distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under
-this License. No additional rights or licenses will be implied from the
-distribution or licensing of Covered Software under this License.
-Notwithstanding Section 2.1(b) above, no patent license is granted by a
-Contributor:
-
-(a) for any code that a Contributor has removed from Covered Software;
-    or
-
-(b) for infringements caused by: (i) Your and any other third party's
-    modifications of Covered Software, or (ii) the combination of its
-    Contributions with other software (except as part of its Contributor
-    Version); or
-
-(c) under Patent Claims infringed by Covered Software in the absence of
-    its Contributions.
-
-This License does not grant any rights in the trademarks, service marks,
-or logos of any Contributor (except as may be necessary to comply with
-the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to
-distribute the Covered Software under a subsequent version of this
-License (see Section 10.2) or under the terms of a Secondary License (if
-permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its
-Contributions are its original creation(s) or it has sufficient rights
-to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under
-applicable copyright doctrines of fair use, fair dealing, or other
-equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-in Section 2.1.
-
-3. Responsibilities
-------------------
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any
-Modifications that You create or to which You contribute, must be under
-the terms of this License. You must inform recipients that the Source
-Code Form of the Covered Software is governed by the terms of this
-License, and how they can obtain a copy of this License. You may not
-attempt to alter or restrict the recipients' rights in the Source Code
-Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-(a) such Covered Software must also be made available in Source Code
-    Form, as described in Section 3.1, and You must inform recipients of
-    the Executable Form how they can obtain a copy of such Source Code
-    Form by reasonable means in a timely manner, at a charge no more
-    than the cost of distribution to the recipient; and
-
-(b) You may distribute such Executable Form under the terms of this
-    License, or sublicense it under different terms, provided that the
-    license for the Executable Form does not attempt to limit or alter
-    the recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice,
-provided that You also comply with the requirements of this License for
-the Covered Software. If the Larger Work is a combination of Covered
-Software with a work governed by one or more Secondary Licenses, and the
-Covered Software is not Incompatible With Secondary Licenses, this
-License permits You to additionally distribute such Covered Software
-under the terms of such Secondary License(s), so that the recipient of
-the Larger Work may, at their option, further distribute the Covered
-Software under the terms of either this License or such Secondary
-License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices
-(including copyright notices, patent notices, disclaimers of warranty,
-or limitations of liability) contained within the Source Code Form of
-the Covered Software, except that You may alter any license notices to
-the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support,
-indemnity or liability obligations to one or more recipients of Covered
-Software. However, You may do so only on Your own behalf, and not on
-behalf of any Contributor. You must make it absolutely clear that any
-such warranty, support, indemnity, or liability obligation is offered by
-You alone, and You hereby agree to indemnify every Contributor for any
-liability incurred by such Contributor as a result of warranty, support,
-indemnity or liability terms You offer. You may include additional
-disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
---------------------------------------------------
-
-If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Software due to
-statute, judicial order, or regulation then You must: (a) comply with
-the terms of this License to the maximum extent possible; and (b)
-describe the limitations and the code they affect. Such description must
-be placed in a text file included with all distributions of the Covered
-Software under this License. Except to the extent prohibited by statute
-or regulation, such description must be sufficiently detailed for a
-recipient of ordinary skill to be able to understand it.
-
-5. Termination
--------------
-
-5.1. The rights granted under this License will terminate automatically
-if You fail to comply with any of its terms. However, if You become
-compliant, then the rights granted under this License from a particular
-Contributor are reinstated (a) provisionally, unless and until such
-Contributor explicitly and finally terminates Your grants, and (b) on an
-ongoing basis, if such Contributor fails to notify You of the
-non-compliance by some reasonable means prior to 60 days after You have
-come back into compliance. Moreover, Your grants from a particular
-Contributor are reinstated on an ongoing basis if such Contributor
-notifies You of the non-compliance by some reasonable means, this is the
-first time You have received notice of non-compliance with this License
-from such Contributor, and You become compliant prior to 30 days after
-Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-infringement claim (excluding declaratory judgment actions,
-counter-claims, and cross-claims) alleging that a Contributor Version
-directly or indirectly infringes any patent, then the rights granted to
-You by any and all Contributors for the Covered Software under Section
-2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-end user license agreements (excluding distributors and resellers) which
-have been validly granted by You or Your distributors under this License
-prior to termination shall survive termination.
-
-************************************************************************
-*                                                                      *
-*  6. Disclaimer of Warranty                                           *
-*  -------------------------                                           *
-*                                                                      *
-*  Covered Software is provided under this License on an "as is"       *
-*  basis, without warranty of any kind, either expressed, implied, or  *
-*  statutory, including, without limitation, warranties that the       *
-*  Covered Software is free of defects, merchantable, fit for a        *
-*  particular purpose or non-infringing. The entire risk as to the     *
-*  quality and performance of the Covered Software is with You.        *
-*  Should any Covered Software prove defective in any respect, You     *
-*  (not any Contributor) assume the cost of any necessary servicing,   *
-*  repair, or correction. This disclaimer of warranty constitutes an   *
-*  essential part of this License. No use of any Covered Software is   *
-*  authorized under this License except under this disclaimer.         *
-*                                                                      *
-************************************************************************
-
-************************************************************************
-*                                                                      *
-*  7. Limitation of Liability                                          *
-*  --------------------------                                          *
-*                                                                      *
-*  Under no circumstances and under no legal theory, whether tort      *
-*  (including negligence), contract, or otherwise, shall any           *
-*  Contributor, or anyone who distributes Covered Software as          *
-*  permitted above, be liable to You for any direct, indirect,         *
-*  special, incidental, or consequential damages of any character      *
-*  including, without limitation, damages for lost profits, loss of    *
-*  goodwill, work stoppage, computer failure or malfunction, or any    *
-*  and all other commercial damages or losses, even if such party      *
-*  shall have been informed of the possibility of such damages. This   *
-*  limitation of liability shall not apply to liability for death or   *
-*  personal injury resulting from such party's negligence to the       *
-*  extent applicable law prohibits such limitation. Some               *
-*  jurisdictions do not allow the exclusion or limitation of           *
-*  incidental or consequential damages, so this exclusion and          *
-*  limitation may not apply to You.                                    *
-*                                                                      *
-************************************************************************
-
-8. Litigation
-------------
-
-Any litigation relating to this License may be brought only in the
-courts of a jurisdiction where the defendant maintains its principal
-place of business and such litigation shall be governed by laws of that
-jurisdiction, without reference to its conflict-of-law provisions.
-Nothing in this Section shall prevent a party's ability to bring
-cross-claims or counter-claims.
-
-9. Miscellaneous
----------------
-
-This License represents the complete agreement concerning the subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent
-necessary to make it enforceable. Any law or regulation which provides
-that the language of a contract shall be construed against the drafter
-shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
---------------------------
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section
-10.3, no one other than the license steward has the right to modify or
-publish new versions of this License. Each version will be given a
-distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version
-of the License under which You originally received the Covered Software,
-or under the terms of any subsequent version published by the license
-steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to
-create a new license for such software, you may create and use a
-modified version of this License if you rename the license and remove
-any references to the name of the license steward (except to note that
-such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With
-Secondary Licenses under the terms of this version of the License, the
-notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
-------------------------------------------
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
---------------------------------------------------------
-
-  This Source Code Form is "Incompatible With Secondary Licenses", as
-  defined by the Mozilla Public License, v. 2.0.
--- a/chromium/browser-polyfill.js
+++ b/chromium/browser-polyfill.js
--- a/content.js
+++ b/content.js
@@ -1,17 +0,0 @@
-var infoTitle = document.getElementById("text-section-header");
-infoTitle.textContent = chrome.i18n.getMessage("infoTitle");
-
-var infoMessage = document.getElementById("text-section-helptext");
-infoMessage.textContent = chrome.i18n.getMessage("infoMessage");
-
-var helpMessage = document.getElementById("window-create-forum-panel");
-helpMessage.textContent = chrome.i18n.getMessage("forumMessage");
-/*
-var helpMessage = document.getElementById('window-create-help-panel');
-helpMessage.textContent = chrome.i18n.getMessage("helpMessage")
-*/
-var newsMessage = document.getElementById("window-create-news-panel");
-newsMessage.textContent = chrome.i18n.getMessage("newsMessage");
-
-var clearData = document.getElementById("clear-browser-data");
-clearData.textContent = chrome.i18n.getMessage("clearData");
--- a/context.js
+++ b/context.js
@@ -1,74 +0,0 @@
-//var windowIds = []
-
-function eventHandler(event) {
-  if (event.target.dataset.action == "create") {
-    function onCreated(windowInfo) {
-      console.log(`Created window: ${windowInfo.id}`);
-      browser.tabs.create({
-        windowId: windowInfo.id,
-        url: "about:blank",
-        cookieStoreId: event.target.dataset.identity
-      });
-    }
-
-    function onError(error) {
-      console.log(`Error: ${error}`);
-    }
-    var creating = browser.windows.create({
-      cookieStoreId: event.target.dataset.identity
-    });
-    creating.then(onCreated, onError);
-  }
-  if (event.target.dataset.action == "close-all") {
-    browser.tabs
-      .query({
-        cookieStoreId: event.target.dataset.identity
-      })
-      .then(tabs => {
-        browser.tabs.remove(tabs.map(i => i.id));
-      });
-  }
-  event.preventDefault();
-}
-
-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);
-  }
-}
-
-var div = document.getElementById("identity-list");
-
-if (browser.contextualIdentities === undefined) {
-  div.innerText =
-    "browser.contextualIdentities not available. Check that the privacy.userContext.enabled pref is set to true, and reload the add-on.";
-} else {
-  browser.contextualIdentities
-    .query({
-      name: "i2pbrowser"
-    })
-    .then(identities => {
-      if (!identities.length) {
-        div.innerText = "No identities returned from the API.";
-        return;
-      }
-
-      for (let identity of identities) {
-        let row = document.createElement("div");
-        let span = document.createElement("span");
-        span.className = "identity";
-        span.innerText = identity.name;
-        span.style = `color: ${identity.color}`;
-        console.log(identity);
-        row.appendChild(span);
-        createOptions(row, identity);
-        div.appendChild(row);
-      }
-    });
-}
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,8 +0,0 @@
-i2psetproxy.js for Debian
-
-Please edit this to provide information specific to
-this i2psetproxy.js Debian package.
-
-    (Automatically generated by debmake Version 4.3.1)
-
- -- idk <hankhill19580@gmail.com>  Thu, 01 Aug 2019 00:32:39 -0400
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +0,0 @@
-i2psetproxy.js (0.35-1) UNRELEASED; urgency=low
-
-  * Automatically activate contexts
-
- -- idk <hankhill19580@gmail.com>  Thu, 01 Aug 2019 00:32:39 -0400
-
-
-i2psetproxy.js (0.31-1) UNRELEASED; urgency=low
-
-  * Initial release. Closes: #nnnn
-    <nnnn is the bug number of your ITP>
-
- -- idk <hankhill19580@gmail.com>  Thu, 01 Aug 2019 00:32:39 -0400
--- a/debian/compat
+++ b/debian/compat
@@ -1 +0,0 @@
-11
--- a/debian/control
+++ b/debian/control
@@ -1,17 +0,0 @@
-Source: i2psetproxy.js
-Section: unknown
-Priority: optional
-Maintainer: idk <hankhill19580@gmail.com>
-Build-Depends: debhelper (>=11~)
-Standards-Version: 4.1.4
-Homepage: https://github.com/eyedeekay/i2psetproxy.js
-
-Package: i2psetproxy.js
-Architecture: any
-Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Plugin for configuring i2p in Firefox and Chromium
- This is a webextension which safely configures a Browser on the
- Debian operating system to use I2P. i2psetproxy.js users form
- their own anonymity set, like TAILS users or Brave users do on
- the Tor network.
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,58 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: i2psetproxy.js
-Source: https://github.com/eyedeekay/i2psetproxy.js
-
-Files:     .gitignore
-           Makefile
-           README.md
-           _locales/en/messages.json
-           background.js
-           content.js
-           context.js
-           .circleci/config.yml
-           experiments/i2ptab.md
-           experiments/tunblink.md
-           i2psetproxy.js.png
-           i2psetproxy.js@eyedeekay.github.io.xpi
-           icons/toopie.png
-           info.css
-           info.js
-           manifest.json
-           options/options.css
-           options/options.js
-           options/options.html
-           package-lock.json
-           platform.js
-           privacy.js
-           proxy.js
-           scrub.js
-           window.html
-           debian/*
-Copyright: MIT
-License:   MIT
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
-
-Files:     chromium/browser-polyfill.js
-Copyright: MPL in: chromium/LICENSE
-License:   MPL-2.0
- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/.
- .
-
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-# You must remove unused comment lines for the released package.
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +0,0 @@
-#!/usr/bin/make -f
-
-%:
-	dh $@
-
-override_dh_auto_install:
-	mkdir -p $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io \
-		$$(pwd)/debian/i2psetproxy.js/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
-	cp -r ./chromium/ $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
-	cp -r ./icons/ $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
-	cp -r ./options/ $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
-	cp -r ./_locales/ $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./*.js $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./*.html $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./*.css $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./*.md $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./manifest.json $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
-	cp ./LICENSE $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
-	ln -sf $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io \
-		$$(pwd)/debian/i2psetproxy.js/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +0,0 @@
-3.0 (quilt)
--- a/debian/source/local-options
+++ b/debian/source/local-options
@@ -1,2 +0,0 @@
-#abort-on-upstream-changes
-#unapply-patches
--- a/debian/watch
+++ b/debian/watch
@@ -1 +0,0 @@
-version=3
--- a/6
+++ b/6
@@ -1,6 +0,0 @@
-I2P in Private Browsing Mode
-============================
-
-A simple plugin for configuring a Firefox based web browser to isolate I2P
-Browsing to a single contextual identity, thus creating an I2P in Private
-Browsing mode. It requires the use of a pre-installed I2P Router.
--- a/experiments/i2ptab.md
+++ b/experiments/i2ptab.md
@@ -1,3 +0,0 @@
-Private Browsing with I2P Tab
-=============================
-
--- a/experiments/tunblink.md
+++ b/experiments/tunblink.md
@@ -1,45 +0,0 @@
-Usage with standalone HTTP Proxy
--------------------------------
-
-This functionality is currently disabled.
-
-I developed a simple HTTP proxy that can be used with this extension to enable the
-user to initiate a re-start of the HTTP proxy tunnel, with a new set of keys and a
-new destination. This, combined with re-setting the browser settings back to the
-original defaults(which is also done by the HTTP Proxy when re-initiated), amounts
-to a "Fresh Identity" feature for the I2P browser.
-
-Before you begin, get the [Standalone HTTP proxy from here](http://github.com/eyedeekay/httptunnel)
-and run it like so:
-
-        httpproxy -littleboss=start
-
-You can also use 'go get'
-
-        go get -u github.com/eyedeekay/httptunnel/httpproxy
-
-If you change the default host and port, you will need to alter the following guide.
-
-In order to use it with the custom HTTP proxy, open the "Add-On's" menu and select
-the options for the i2psetproxy.js plugin. Change the "Proxy" configuration from
-
-        Host: 127.0.0.1
-        Port: 4444
-
-to
-
-        Host: 127.0.0.1
-        Port: 7950
-
-and change the "Control" configuration from:
-
-        Host: 127.0.0.1
-        Port: 4444
-
-to
-
-        Host: 127.0.0.1
-        Port: 7951
-
-Now, when you press the Toopie button in the toolbar, you will see in the output
-of the HTTP proxy that it has been re-started.
--- a/i2psetproxy.js.gif
+++ b/i2psetproxy.js.gif
--- a/i2psetproxy.js.png
+++ b/i2psetproxy.js.png
--- a/i2psetproxy.js@eyedeekay.github.io.xpi
+++ b/i2psetproxy.js@eyedeekay.github.io.xpi
--- a/icons/toopie.png
+++ b/icons/toopie.png
--- a/info.css
+++ b/info.css
@@ -1,18 +0,0 @@
-html, body {
-  width: 350px;
-}
-
-a {
-  margin: 10px;
-  display: inline-block;
-}
-
-.panel {
-  margin: 5px;
-}
-
-span.identity {
-  width: 100px;
-  display: inline-block;
-  margin-left: 1em;
-}
--- a/info.js
+++ b/info.js
@@ -1,50 +0,0 @@
-document.addEventListener("click", e => {
-  function getCurrentWindow() {
-    return chrome.windows.getCurrent();
-  }
-
-  if (e.target.id === "window-create-help-panel") {
-    let createData = {
-      type: "panel",
-      incognito: true
-    };
-    let creating = chrome.windows.create(createData);
-    creating.then(() => {
-      console.log("The help panel has been created");
-    });
-  } else if (e.target.id === "window-create-news-panel") {
-    let createData = {
-      type: "panel",
-      incognito: true
-    };
-    let creating = chrome.windows.create(createData);
-    creating.then(() => {
-      console.log("The news panel has been created");
-    });
-  } else if (e.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 => {
-        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 === "clear-browser-data") {
-    forgetBrowsingData();
-  } else if (e.target.id === "check-i2p-control") {
-    echo("I2P Router Detected", "panel-section-i2pcontrol-check");
-  }
-
-  e.preventDefault();
-});
--- a/manifest.json
+++ b/manifest.json
@@ -2,58 +2,79 @@
  "applications": {
    "gecko": {
      "id": "i2ppb@eyedeekay.github.io",
-      "strict_min_version": "60.0"
+      "strict_min_version": "85.0"
    }
  },
  "permissions": [
    "theme",
+    "alarms",
    "browsingData",
+    "management",
    "notifications",
    "proxy",
    "privacy",
    "storage",
+    "webNavigation",
    "webRequest",
    "webRequestBlocking",
    "contextualIdentities",
    "cookies",
-    "history",
    "tabs",
    "<all_urls>"
  ],
  "manifest_version": 2,
  "name": "__MSG_extensionName__",
-  "version": "0.36",
+  "version": "0.113",
  "description": "__MSG_extensionDescription__",
-  "homepage_url": "https://github.com/eyedeekay/i2psetproxy.js",
+  "homepage_url": "https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox",
  "icons": {
-    "48": "icons/toopie.png"
+    "48": "icons/i2plogo.png"
  },
  "browser_action": {
    "browser_style": true,
-    "default_icon": "icons/toopie.png",
+    "default_icon": "icons/i2plogo.png",
    "default_title": "__MSG_extensionName__",
    "default_popup": "window.html"
  },
+  "page_action": {
+    "browser_style": true,
+    "default_title": "__MSG_toopieTLS__",
+    "default_icon": "icons/i2plogo.png",
+    "show_matches": [
+      "http://*.i2p/*",
+      "https://*.i2p/*",
+      "http://*.b32.i2p/*",
+      "https://*.b32.i2p/*"
+    ],
+    "pinned": true
+  },
  "options_ui": {
    "page": "options/options.html"
  },
+  "content_scripts": [
+    {
+      "matches": ["<all_urls>"],
+      "js": ["script.js"]
+    }
+  ],
  "background": {
+    "persistent": true,
    "scripts": [
-      "chromium/browser-polyfill.js",
+      "config.js",
+      "torrent/common.js",
+      "torrent/background.js",
+      "i2pcontrol/i2pcontrol.js",
+      "host.js",
      "privacy.js",
      "platform.js",
      "background.js",
+      "handler.js",
      "proxy.js",
      "info.js",
-      "i2pcontrol.js",
-      "scrub.js"
+      "home.js",
+      "scrub.js",
+      "bookmarks.js"
    ]
  },
-  "protocol_handlers": [{
-    "protocol": "web+rc",
-    "name": "RouterConsole",
-    "uriTemplate": "http://router.console/?%s"
-  }],
  "default_locale": "en"
 }
-
--- a/options/options.css
+++ b/options/options.css
@@ -1,62 +0,0 @@
-body {
-  width: 25em;
-  font-family: "Open Sans Light", sans-serif;
-  font-size: 0.9em;
-  font-weight: 300;
-}
-
-section.scheme-options {
-  padding: 0.5em 0;
-  margin: 1em 0;
-}
-
-#clear-button {
-  margin: 0 1.3em 1em 0;
-}
-
-section.scheme-options input,
-section.scheme-options>select,
-#clear-button {
-  float: right;
-}
-
-label {
-  display: block;
-  padding: 0.2em 0;
-}
-
-label:hover {
-  background-color: #EAEFF2;
-}
-
-.title {
-  font-size: 1.2em;
-  margin-bottom: 0.5em;
-}
-
-html, body {
-  width: 350px;
-}
-
-a {
-  margin: 10px;
-  display: inline-block;
-}
-
-.panel {
-  margin: 5px;
-}
-
-span.identity {
-  width: 100px;
-  display: inline-block;
-  margin-left: 1em;
-}
-
-.control-options {
-  display: none;
-}
-
-.identity-options {
-  display: none;
-}
--- a/options/options.html
+++ b/options/options.html
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-  <head>
-    <meta charset="utf-8">
-    <link rel="stylesheet" href="options.css"/>
-  </head>
-  <body>
-
-    <section class="scheme-options">
-      <span class="title">Proxy Scheme:</span>
-      <select id="proxy_scheme">
-        <option value="http" selected="selected">HTTP</option>
-        <option value="socks5">SOCKS5</option>
-      </select>
-    </section>
-
-    <section class="scheme-options proxy-options">
-      <div class="title" >Proxy Options</div>
-
-      <label id="portText">Host: </label>
-      <input type="text" data="host" id="host" value="127.0.0.1"/>
-      <br>
-      <label id="hostText">Port: </label>
-      <input type="text" data="port" id="port" value="4444"/>
-
-    </section>
-    <section class="scheme-options identity-options">
-      <div class="panel">
-        <div id="identity-list">Identity list?</div>
-      </div>
-    </section>
-
-    <section class="scheme-options control-options">
-      <div class="title" >Controller Options</div>
-      <p id="controlHelpText"> These options will be inert if used with the default i2p HTTP or SOCKS
-      proxy. </p>
-      <label id="controlPortText">Control Host: </label>
-      <input type="text" data="controlhost" id="controlhost" value="127.0.0.1"/>
-      <br>
-      <label id="controlHostText">Control Port: </label>
-      <input type="text" data="controlport" id="controlport" value="4444"/>
-
-    </section>
-
-    <input type="button" value="Save preferences" id="save-button"/>
-
-    <script src="options.js"></script>
-  </body>
-
-</html>
--- a/options/options.js
+++ b/options/options.js
@@ -1,213 +0,0 @@
-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");
-}
-
-function SetPortText() {
-  var portid = document.getElementById("portText");
-  portid.textContent = chrome.i18n.getMessage("portText");
-}
-
-function SetControlHostText() {
-  var controlhostid = document.getElementById("controlHostText");
-  controlhostid.textContent = chrome.i18n.getMessage("controlHostText");
-}
-
-function setupProxy() {
-  var controlHost = getControlHost();
-  var controlPort = getControlPort();
-  var Host = getHost();
-  var Port = getPort();
-  var Scheme = getScheme();
-  if (!getChrome()) {
-    function handleProxyRequest(requestInfo) {
-      console.log("proxying request via listener");
-      console.log("   ", Scheme, Host, ":", Port);
-      return {
-        type: Scheme,
-        host: Host,
-        port: Port,
-        proxyDns: true
-      };
-    }
-    console.log("Setting up Firefox WebExtension proxy");
-    browser.proxy.onRequest.addListener(handleProxyRequest, {
-      urls: ["<all_urls>"]
-    });
-    console.log("i2p settings created for WebExtension Proxy");
-  } else {
-    var config = {
-      mode: "fixed_servers",
-      rules: {
-        singleProxy: {
-          scheme: Scheme,
-          host: Host,
-          port: parseInt(Port)
-        }
-      }
-    };
-    chrome.proxy.settings.set(
-      {
-        value: config,
-        scope: "regular"
-      },
-      function() {}
-    );
-  }
-}
-
-function SetControlPortText() {
-  var controlportid = document.getElementById("controlPortText");
-  controlportid.textContent = chrome.i18n.getMessage("controlPortText");
-}
-
-function SetControlHelpText() {
-  var portid = document.getElementById("controlHelpText");
-  portid.textContent = chrome.i18n.getMessage("controlHelpText");
-}
-
-function getScheme() {
-  const proxy_scheme = document.querySelector("#proxy_scheme");
-  console.log("Got i2p proxy scheme:", proxy_scheme.value);
-  if (proxy_scheme == "HTTP") {
-    return "http";
-  }
-  if (proxy_scheme == "SOCKS") {
-    return "socks";
-  }
-  return proxy_scheme.value;
-}
-
-function getHost() {
-  proxy_host = document.getElementById("host").value;
-  console.log("Got i2p proxy host:", proxy_host);
-  if (proxy_host == undefined) {
-    return "127.0.0.1";
-  }
-  return proxy_host;
-}
-
-function getPort() {
-  proxy_port = document.getElementById("port").value;
-  console.log("Got i2p proxy port:", proxy_port);
-  if (proxy_port == undefined) {
-    return "4444";
-  }
-  return proxy_port;
-}
-
-function getControlHost() {
-  control_host = document.getElementById("controlhost").value;
-  console.log("Got i2p control host:", control_host);
-  if (control_host == undefined) {
-    return "127.0.0.1";
-  }
-  return control_host;
-}
-
-function getControlPort() {
-  control_port = document.getElementById("controlport").value;
-  console.log("Got i2p control port:", control_port);
-  if (control_port == undefined) {
-    return "4444";
-  }
-  return control_port;
-}
-
-function checkStoredSettings(storedSettings) {
-  let defaultSettings = {};
-  if (!storedSettings.proxy_scheme) {
-    defaultSettings["proxy_scheme"] = "http";
-  }
-  if (!storedSettings.proxy_host) {
-    defaultSettings["proxy_host"] = "127.0.0.1";
-  }
-  if (!storedSettings.proxy_port) {
-    defaultSettings["proxy_port"] = 4444;
-  }
-  if (!storedSettings.control_host) {
-    defaultSettings["control_host"] = "127.0.0.1";
-  }
-  if (!storedSettings.control_port) {
-    defaultSettings["control_port"] = 4444;
-  }
-  chrome.storage.local.set(defaultSettings);
-}
-
-function onError(e) {
-  console.error(e);
-}
-
-function storeSettings() {
-  let proxy_scheme = getScheme();
-  let proxy_host = getHost();
-  let proxy_port = getPort();
-  let control_host = getControlHost();
-  let control_port = getControlPort();
-  chrome.storage.local.set({
-    proxy_scheme,
-    proxy_host,
-    proxy_port,
-    control_host,
-    control_port
-  });
-  console.log("storing proxy scheme:", proxy_scheme);
-  console.log("storing proxy host:", proxy_host);
-  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) {
-  const selectList = document.querySelector("#proxy_scheme");
-  selectList.value = restoredSettings.proxy_scheme;
-  console.log("showing proxy scheme:", selectList.value);
-
-  const hostitem = document.getElementById("host");
-  hostitem.value = restoredSettings.proxy_host;
-  console.log("showing proxy host:", hostitem.value);
-
-  const portitem = document.getElementById("port");
-  portitem.value = restoredSettings.proxy_port;
-  console.log("showing proxy port:", portitem.value);
-
-  const controlhostitem = document.getElementById("controlhost");
-  controlhostitem.value = restoredSettings.control_host;
-  console.log("showing control host:", controlhostitem.value);
-
-  const controlportitem = document.getElementById("controlport");
-  controlportitem.value = restoredSettings.control_port;
-  console.log("showing control port:", controlportitem.value);
-
-  SetHostText();
-  SetPortText();
-  SetControlHostText();
-  SetControlPortText();
-  SetControlHelpText();
-  setupProxy();
-}
-
-function onError(e) {
-  console.error(e);
-}
-chrome.storage.local.get(function(got) {
-  checkStoredSettings(got);
-  updateUI(got);
-});
-
-const saveButton = document.querySelector("#save-button");
-saveButton.addEventListener("click", storeSettings);
-
-//EXPERIMENTAL: Open in I2P Tab
--- a/platform.js
+++ b/platform.js
@@ -1,23 +0,0 @@
-function getChrome() {
-  if (browser.runtime.getBrowserInfo == undefined) {
-    console.log("Running in Chrome detected");
-    return true;
-  }
-  return false;
-}
-
-function isDroid() {
-  if (!getChrome()) {
-    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;
-      }
-    });
-  }
-  return false;
-}
--- a/privacy.js
+++ b/privacy.js
@@ -1,375 +0,0 @@
-function getChrome() {
-  if (chrome.runtime.getBrowserInfo == undefined) {
-    return true;
-  }
-  return false;
-}
-
-function onSet(result) {
-  if (result) {
-    console.log("->: Value was updated");
-  } else {
-    console.log("-X: Value was not updated");
-  }
-}
-
-// This disables queries to centralized databases of bad URLs to screen for
-// risky sites in your browser
-function disableHyperlinkAuditing() {
-  if (!getChrome()) {
-    var setting = browser.privacy.websites.hyperlinkAuditingEnabled.set({
-      value: false
-    });
-    console.log("Disabling hyperlink auditing/val=", {
-      value: false
-    });
-    setting.then(onSet);
-  }
-}
-
-// This enables first-party isolation
-function enableFirstPartyIsolation() {
-  if (!getChrome()) {
-    var setting = browser.privacy.websites.firstPartyIsolate.set({
-      value: true
-    });
-    console.log("Enabling first party isolation/val=", {
-      value: true
-    });
-    setting.then(onSet);
-  }
-}
-
-// This rejects tracking cookies and third-party cookies but it
-// LEAVES "Persistent" Cookies unmodified in favor of an option in the content
-// interface for now
-function disableEvilCookies() {
-  if (!getChrome()) {
-    var getting = browser.privacy.websites.cookieConfig.get({});
-    getting.then(got => {
-      var setting = browser.privacy.websites.cookieConfig.set({
-        value: {
-          behavior: "reject_third_party",
-          nonPersistentCookies: got.value.nonPersistentCookies
-        }
-      });
-      console.log("Setting cookie behavior/val=", {
-        value: {
-          behavior: "reject_third_party",
-          nonPersistentCookies: got.value.nonPersistentCookies
-        }
-      });
-      setting.then(onSet);
-    });
-  }
-}
-
-// Make sure that they're gone
-/*function disableBadCookies(){
-    var setting = browser.privacy.websites.thirdPartyCookiesAllowed.set({
-      value: false
-    });
-    console.log("Disabling third party cookies/val=", {
-      value: false
-    })
-    setting.then(onSet);
-}*/
-
-// this disables the use of referrer headers
-function disableReferrers() {
-  if (!getChrome()) {
-    var setting = browser.privacy.websites.referrersEnabled.set({
-      value: false
-    });
-    console.log("Disabling referrer headers/val=", {
-      value: false
-    });
-    setting.then(onSet);
-  }
-}
-
-// enable fingerprinting resistent features(letterboxing and stuff)
-function enableResistFingerprinting() {
-  if (!getChrome()) {
-    var setting = browser.privacy.websites.referrersEnabled.set({
-      value: true
-    });
-    console.log("Enabling resist fingerprinting/val=", {
-      value: true
-    });
-    setting.then(onSet);
-  }
-}
-
-// This is essentially a blocklist of clearnet web-sites known to do bad tracking
-function enableTrackingProtection() {
-  if (!getChrome()) {
-    var setting = browser.privacy.websites.trackingProtectionMode.set({
-      value: "always"
-    });
-    console.log("Enabling tracking protection/val=", {
-      value: "always"
-    });
-    setting.then(onSet);
-  }
-}
-
-// This disables protected content, which is a form of digital restrictions
-// management dependent on identifying information
-function disableDigitalRestrictionsManagement() {
-  if (!getChrome()) {
-    var gettingInfo = browser.runtime.getPlatformInfo();
-    gettingInfo.then(got => {
-      if (got.os == "win") {
-        var setting = browser.privacy.websites.protectedContentEnabled.set({
-          value: false
-        });
-        console.log(
-          "Setting Protected Content(Digital Restrictions Management) false/val=",
-          {
-            value: false
-          }
-        );
-        setting.then(onSet);
-      }
-    });
-  }
-}
-
-function setAllPrivacy() {
-  disableHyperlinkAuditing();
-  enableFirstPartyIsolation();
-  disableEvilCookies();
-  disableReferrers();
-  enableTrackingProtection();
-  enableResistFingerprinting();
-  disableDigitalRestrictionsManagement();
-}
-
-setAllPrivacy();
-
-function ResetPeerConnection() {
-  if (!getChrome()) {
-    browser.privacy.network.peerConnectionEnabled.set({
-      value: false
-    });
-    browser.privacy.network.networkPredictionEnabled.set({
-      value: false
-    });
-  }
-  chrome.privacy.network.webRTCIPHandlingPolicy.set({
-    value: "disable_non_proxied_udp"
-  });
-  console.log("Re-disabled WebRTC");
-}
-
-function EnablePeerConnection() {
-  if (!getChrome()) {
-    browser.privacy.network.peerConnectionEnabled.set({
-      value: true
-    });
-    browser.privacy.network.networkPredictionEnabled.set({
-      value: false
-    });
-  }
-  chrome.privacy.network.webRTCIPHandlingPolicy.set({
-    value: "disable_non_proxied_udp"
-  });
-  console.log("Enabled WebRTC");
-}
-
-ResetPeerConnection();
-
-function ResetDisableSavePasswords() {
-  browser.privacy.services.passwordSavingEnabled.set({
-    value: false
-  });
-  console.log("Re-disabled saved passwords");
-}
-
-function EnableSavePasswords() {
-  browser.privacy.services.passwordSavingEnabled.set({
-    value: true
-  });
-  console.log("Enabled saved passwords");
-}
-
-//ResetDisableSavePasswords()
-
-var defaultSettings = {
-  since: "forever",
-  dataTypes: ["downloads", "passwords", "formData", "localStorage", "history"]
-};
-
-var appSettings = {
-  since: "forever",
-  dataTypes: [""]
-};
-
-function onError(e) {
-  console.error(e);
-}
-
-function checkStoredSettings(storedSettings) {
-  chrome.storage.local.set(appSettings);
-}
-
-if (!getChrome()) {
-  const gettingStoredSettings = browser.storage.local.get();
-  gettingStoredSettings.then(checkStoredSettings, onError);
-}
-
-function clearCookiesContext(cookieStoreId) {}
-
-function forgetBrowsingData(storedSettings) {
-  function getSince(selectedSince) {
-    if (selectedSince === "forever") {
-      return 0;
-    }
-
-    const times = {
-      hour: () => {
-        return 1000 * 60 * 60;
-      },
-      day: () => {
-        return 1000 * 60 * 60 * 24;
-      },
-      week: () => {
-        return 1000 * 60 * 60 * 24 * 7;
-      }
-    };
-
-    const sinceMilliseconds = times[selectedSince].call();
-    return Date.now() - sinceMilliseconds;
-  }
-
-  function getTypes(selectedTypes) {
-    let dataTypes = {};
-    for (let item of selectedTypes) {
-      dataTypes[item] = true;
-    }
-    return dataTypes;
-  }
-
-  const since = getSince(defaultSettings.since);
-  const dataTypes = getTypes(defaultSettings.dataTypes);
-
-  function notify() {
-    let dataTypesString = Object.keys(dataTypes).join(", ");
-    let sinceString = new Date(since).toLocaleString();
-    browser.notifications.create({
-      type: "basic",
-      title: "Removed browsing data",
-      message: `Removed ${dataTypesString}\n for i2pbrowser`
-    });
-  }
-
-  function deepCleanHistory(historyItems) {
-    console.log("Deep cleaning history");
-    for (item of historyItems) {
-      if (i2pHost(item.url)) {
-        browser.history.deleteUrl({
-          url: item.url
-        });
-        browser.browsingData.removeCache({});
-        console.log("cleared Cache");
-        browser.browsingData
-          .removePasswords({
-            hostnames: [i2pHostName(item.url)],
-            since: since
-          })
-          .then(onGot);
-        console.log("cleared Passwords");
-        browser.browsingData
-          .removeDownloads({
-            hostnames: [i2pHostName(item.url)],
-            since: since
-          })
-          .then(onGot);
-        console.log("cleared Downloads");
-        browser.browsingData
-          .removeFormData({
-            hostnames: [i2pHostName(item.url)],
-            since: since
-          })
-          .then(onGot);
-        console.log("cleared Form Data");
-        browser.browsingData
-          .removeLocalStorage({
-            hostnames: [i2pHostName(item.url)],
-            since: since
-          })
-          .then(onGot);
-        console.log("cleared Local Storage");
-
-        contexts = browser.contextualIdentities.query({
-          name: "i2pbrowser"
-        });
-
-        function deepCleanCookies(cookies) {
-          for (cookie of cookies) {
-            var removing = browser.cookies.remove({
-              firstPartyDomain: cookie.firstPartyDomain,
-              name: cookie.name,
-              url: item.url
-            });
-            removing.then(onGot, onError);
-          }
-          console.log("Cleared cookies")
-        }
-
-        function deepCleanContext(cookieStoreIds) {
-          for (cookieStoreId of cookieStoreIds) {
-            var removing = browser.cookies.getAll({
-              firstPartyDomain: null,
-              storeId: cookieStoreId.cookieStoreId
-            });
-            removing.then(deepCleanCookies, onError);
-          }
-        }
-
-        contexts.then(deepCleanContext, onError);
-      }
-    }
-    notify();
-  }
-
-  var searching = browser.history.search({
-    text: "i2p",
-    startTime: 0
-  });
-
-  searching.then(deepCleanHistory);
-
-  setAllPrivacy();
-  ResetPeerConnection();
-}
-
-function i2pHostName(url) {
-  let hostname = "";
-  if (url.indexOf("://") > -1) {
-    hostname = url.split("/")[2];
-  } else {
-    hostname = url.split("/")[0];
-  }
-  return hostname;
-}
-
-function i2pHost(url) {
-  let hostname = i2pHostName(url);
-  return hostname.endsWith(".i2p");
-}
-
-function onGot(contexts) {
-  if (contexts != null) {
-    for (let context of contexts) {
-      console.log(context);
-    }
-  }
-}
-
-function onError(e) {
-  console.error(e);
-}
-
-//browser.contextualIdentities.query("i2pbrowser").then(clearCookiesContext, onError);
--- a/proxy.js
+++ b/proxy.js
@@ -1,236 +0,0 @@
-if (!getChrome()) {
-  browser.privacy.network.peerConnectionEnabled.set({
-    value: false
-  });
-  console.log("Preliminarily disabled WebRTC.");
-}
-
-chrome.privacy.network.networkPredictionEnabled.set({
-  value: false
-});
-chrome.privacy.network.webRTCIPHandlingPolicy.set({
-  value: "disable_non_proxied_udp"
-});
-
-function shouldProxyRequest(requestInfo) {
-  return requestInfo.parentFrameId != -1;
-}
-
-var handleContextProxyRequest = async function(requestDetails) {
-  console.log("(proxy)Searching for proxy by context");
-  try {
-    var handleProxyRequest = function(context) {
-      proxy = {
-        failoverTimeout: 0,
-        type: "direct",
-        proxyDns: false
-      };
-      if (context.name == "i2pbrowser") {
-        proxy = {
-          type: getScheme(),
-          host: getHost(),
-          port: getPort()
-        };
-        console.log(
-          "(proxy)Using",
-          proxy.type,
-          "proxy ",
-          proxy.host + ":" + proxy.port
-        );
-        return proxy;
-      }
-      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 (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;
-      }
-    }
-  } catch (error) {
-    console.log("(proxy)Not using I2P Proxy.", error);
-  }
-};
-
-var proxy_scheme = "HTTP";
-
-function getScheme() {
-  if (proxy_scheme == undefined) {
-    proxy_scheme = "http";
-  }
-  if (proxy_scheme == "HTTP") {
-    proxy_scheme = "http";
-  }
-  if (proxy_scheme == "SOCKS") {
-    proxy_scheme = "socks";
-  }
-  if (proxy_scheme != "http" && proxy_scheme != "socks") {
-    proxy_scheme = "http";
-  }
-  //console.log("Got i2p proxy scheme:", proxy_scheme);
-  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";
-  }
-  return proxy_host;
-}
-
-function getPort() {
-  if (proxy_port == undefined) {
-    var scheme = getScheme();
-    if (scheme == "socks") {
-      proxy_port = "4446";
-    } else {
-      proxy_port = "4444";
-    }
-  }
-  return proxy_port;
-}
-
-function getControlHost() {
-  if (control_host == undefined) {
-    return "127.0.0.1";
-  }
-  return control_host;
-}
-
-function getControlPort() {
-  if (control_port == undefined) {
-    return "4444";
-  }
-  return control_port;
-}
-
-function setupProxy() {
-  var controlHost = getControlHost();
-  var controlPort = getControlPort();
-  var Host = getHost();
-  var Port = getPort();
-  var Scheme = getScheme();
-  if (!getChrome()) {
-    /**/
-    console.log("Setting up Firefox WebExtension proxy");
-    browser.proxy.onRequest.addListener(handleContextProxyRequest, {
-      urls: ["<all_urls>"]
-    });
-    console.log("i2p settings created for WebExtension Proxy");
-    /**/
-  } else {
-    var config = {
-      mode: "fixed_servers",
-      rules: {
-        singleProxy: {
-          scheme: Scheme,
-          host: Host,
-          port: parseInt(Port)
-        }
-      }
-    };
-    chrome.proxy.settings.set(
-      {
-        value: config,
-        scope: "regular"
-      },
-      function() {}
-    );
-  }
-}
-
-function checkStoredSettings(storedSettings) {
-  let defaultSettings = {};
-  if (!storedSettings.proxy_scheme) {
-    defaultSettings["proxy_scheme"] = "http";
-  }
-  if (!storedSettings.proxy_host) {
-    defaultSettings["proxy_host"] = "127.0.0.1";
-  }
-  if (!storedSettings.proxy_port) {
-    defaultSettings["proxy_port"] = 4444;
-  }
-  if (!storedSettings.control_host) {
-    defaultSettings["control_host"] = "127.0.0.1";
-  }
-  if (!storedSettings.control_port) {
-    defaultSettings["control_port"] = 4444;
-  }
-  chrome.storage.local.set(defaultSettings);
-}
-
-function update(restoredSettings) {
-  proxy_scheme = restoredSettings.proxy_scheme;
-  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 (!getChrome()) {
-  if (!isDroid()) {
-    browser.windows.getAll().then(wins => wins.forEach(themeWindow));
-  }
-}
--- a/scrub.js
+++ b/scrub.js
@@ -1,232 +0,0 @@
-var contextScrub = async function(requestDetails) {
-  console.log("(scrub)Scrubbing info from contextualized request");
-  try {
-    var headerScrub = function(context) {
-      if (!context) {
-        console.error("Context not found");
-      } else {
-        if ((context.name = "i2pbrowser")) {
-          var ua = "MYOB/6.66 (AN/ON)";
-          if (i2pHost(requestUrl.url)) {
-            for (var header of requestDetails.requestHeaders) {
-              if (header.name.toLowerCase() === "user-agent") {
-                header.value = ua;
-                console.log("(scrub)User-Agent header modified", header.value);
-              }
-            }
-          }
-          return {
-            requestHeaders: requestDetails.requestHeaders
-          };
-        }
-      }
-    };
-    var contextGet = async function(tabInfo) {
-      try {
-        console.log("(scrub)Tab info from Function", tabInfo);
-        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: "i2pbrowser"
-        });
-        tabId.cookieStoreId = context[0].cookieStoreId;
-        console.log("(scrub) forcing context", tabId.cookieStoreId);
-        return tabId;
-      } catch (error) {
-        console.log("(scrub)Context Error", error);
-      }
-    };
-    var tabGet = async function(tabId) {
-      try {
-        console.log("(scrub)Tab ID from Request", tabId);
-        let tabInfo = await browser.tabs.get(tabId);
-        return tabInfo;
-      } catch (error) {
-        console.log("(scrub)Tab error", error);
-      }
-    };
-    if (requestDetails.tabId > 0) {
-      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 req = await context.then(headerScrub);
-        console.log("(scrub)Scrubbing I2P Request", req);
-        return req;
-      } else {
-        var tab = tabGet(requestDetails.tabId);
-        var context = tab.then(contextGet);
-        var req = await context.then(headerScrub);
-        console.log("(scrub)Scrubbing I2P Request", req);
-        return req;
-      }
-    }
-  } catch (error) {
-    console.log("(scrub)Not scrubbing non-I2P request.", error);
-  }
-};
-
-var contextSetup = async function(requestDetails) {
-  console.log("(isolate)Forcing I2P requests into context");
-  try {
-    var tabFind = async function(tabId) {
-      try {
-        context = await browser.contextualIdentities.query({
-          name: "i2pbrowser"
-        });
-        if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          console.log(
-            "(isolate) forcing",
-            requestDetails.url,
-            " context",
-            tabId.cookieStoreId,
-            context[0].cookieStoreId
-          );
-          function Create(window) {
-            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}`);
-            }
-            created = browser.tabs.create({
-              active: true,
-              cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url,
-              windowId: window.id
-            });
-            created.then(onCreated, onError);
-          }
-          getting = browser.windows.create();
-          getting.then(Create);
-          return tabId;
-        }
-      } catch (error) {
-        console.log("(isolate)Context Error", error);
-      }
-    };
-    var routerTabFind = async function(tabId) {
-      try {
-        context = await browser.contextualIdentities.query({
-          name: "routerconsole"
-        });
-        if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          console.log(
-            "(isolate) forcing",
-            requestDetails.url,
-            " context",
-            tabId.cookieStoreId,
-            context[0].cookieStoreId
-          );
-          function Create(window) {
-            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}`);
-            }
-            created = browser.tabs.create({
-              active: true,
-              cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url,
-              windowId: window.id
-            });
-            created.then(onCreated, onError);
-          }
-          getting = browser.windows.create();
-          getting.then(Create);
-          return tabId;
-        }
-      } catch (error) {
-        console.log("(isolate)Context Error", error);
-      }
-    };
-    var tabGet = async function(tabId) {
-      try {
-        console.log("(isolate)Tab ID from Request", tabId);
-        let tabInfo = await browser.tabs.get(tabId);
-        return tabInfo;
-      } catch (error) {
-        console.log("(isolate)Tab error", error);
-      }
-    };
-    if (requestDetails.tabId > 0) {
-      if (i2pHost(requestDetails.url)) {
-        var tab = tabGet(requestDetails.tabId);
-        var mtab = tab.then(tabFind);
-        return requestDetails;
-      }
-      if (routerHost(requestDetails.url)) {
-        var tab = tabGet(requestDetails.tabId);
-        var mtab = tab.then(routerTabFind);
-        return requestDetails;
-      }
-    }
-  } catch (error) {
-    console.log(
-      "(isolate)Not an I2P request, no need to force into alternate cookiestore.",
-      error
-    );
-  }
-};
-
-function i2pHostName(url) {
-  let hostname = "";
-  if (url.indexOf("://") > -1) {
-    hostname = url.split("/")[2];
-  } else {
-    hostname = url.split("/")[0];
-  }
-  return hostname;
-}
-
-function i2pHost(url) {
-  let hostname = i2pHostName(url);
-  return hostname.endsWith(".i2p");
-}
-
-function routerHost(url) {
-  let hostname = "";
-  if (url.indexOf("://") > -1) {
-    hostname = url.split("/")[2];
-  } else {
-    hostname = url.split("/")[0];
-  }
-  if (hostname === "127.0.0.1:7657") {
-    return true;
-  } else if (hostname === "localhost:7657") {
-    return true;
-  }
-
-  if (hostname === "127.0.0.1:7070") {
-    return true;
-  } else if (hostname === "localhost:7070") {
-    return true;
-  }
-
-  return false;
-}
-
-browser.webRequest.onBeforeRequest.addListener(
-  contextSetup,
-  { urls: ["<all_urls>"] },
-  ["blocking"]
-);
-
-browser.webRequest.onBeforeSendHeaders.addListener(
-  contextScrub,
-  { urls: ["<all_urls>"] },
-  ["blocking", "requestHeaders"]
-);
--- a/window.html
+++ b/window.html
@@ -1,53 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-  <head>
-    <meta charset="utf-8">
-    <link rel="stylesheet" href="info.css"/>
-  </head>
-
-  <body>
-    <div class="panel">
-      <div class="panel-section panel-section-header">
-        <div id="text-section-header" class="text-section-header">I2P Assistance</div>
-      </div>
-
-      <div id="text-section-helptext">
-      You are now free to browse the eepWeb!
-
-      Your browser is now configured to browse anonymously on the I2P network.
-      As you browse, your traffic will be routed through other network nodes
-      to disguise it's origin, both from the server and from the nodes
-      themselves.
-
-      </div>
-
-      <div class="panel-section-separator"></div>
-          <!-- This is where I'll eventually put the tunnel control panel -->
-          <!-- <a href="#" id="generate-fresh-tunnel> Generate a Fresh Tunnel</a>"-->
-          <!-- -->
-      <strong><a href="#" id="clear-browser-data">Clear all browsing data</a></strong><br>
-          <!--<strong><a href="#" id="temp-enable-webrtc">Temporarily enable WebRTC</a></strong><br>-->
-      <div class="panel-section-separator"></div>
-          <a href="http://i2pforum.i2p" id="window-create-forum-panel">Visit the I2P Forums</a><br>
-          <a href="http://i2p-projekt.i2p/blog" id="window-create-news-panel">Get the latest I2P News</a><br>
-      <div class="panel-section-separator"></div>
-          <a href="#" id="check-i2p-control">Check I2P Router Health</a><div id="panel-section-i2pcontrol-check"></div>
-      <div class="panel-section-separator"></div>
-
-      <div class="panel-section-identity">
-          <div id="identity-list"></div>
-      </div>
-
-    </div>
-
-
-  <script src="context.js"></script>
-  <script src="privacy.js"></script>
-  <script src="info.js"></script>
-  <script src="content.js"></script>
-  <script src="i2pcontrol.js"></script>
-
-</body>
-
-</html>
				`@@ -1 +0,0 @@`
				`# You must remove unused comment lines for the released package.`