address erroneous text issue #113

Bump and resubmit again
fmt and resubmit
2021-12-02 19:50:33 -05:00 · 2021-11-03 00:22:37 -04:00 · 2021-10-30 10:12:24 -04:00 · 2021-10-30 10:08:09 -04:00 · 2021-10-13 21:29:25 -04:00 · 2021-10-13 21:27:02 -04:00
66 changed files with 2330 additions and 1954 deletions
--- a/46
+++ b/46
@@ -37,11 +37,11 @@ clean: rc clean-artifacts
 ## EVEN RELEASES are AMO RELEASES
 ## ODD RELEASES are SELFHOSTED RELEASES

-MOZ_VERSION=0.96
-VERSION=0.95
+MOZ_VERSION=0.126
+VERSION=0.125

 ## INCREMENT THIS EVERY TIME YOU DO A RELEASE
-LAST_VERSION=0.93
+LAST_VERSION=0.123

 YELLOW=F7E59A
 ORANGE=FFC56D
@@ -64,7 +64,7 @@ amo-readme:
 		sed 's|</h3>|</strong>|g' | \
 		grep -v '<img' > amo-index.html

-MAGNET=`torrent2magnet i2ppb@eyedeekay.github.io.xpi.torrent`
+MAGNET=`rhash --magnet i2ppb@eyedeekay.github.io.xpi.torrent`

 index:
 	@echo "<!DOCTYPE html>" > index.html
@@ -98,15 +98,15 @@ 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
-	sed -si 's|$(shell grep $(LAST_VERSION) _locales/en/messages.json)|    "message": "$(VERSION)",|g' _locales/en/messages.json; true
-	sed -si 's|$(shell grep $(MOZ_VERSION) _locales/en/messages.json)|    "message": "$(VERSION)",|g' _locales/en/messages.json; true
+	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
-	sed -si 's|$(shell grep $(LAST_VERSION) _locales/en/messages.json)|    "message": "$(MOZ_VERSION)",|g' _locales/en/messages.json; true
-	sed -si 's|$(shell grep $(VERSION) _locales/en/messages.json)|    "message": "$(MOZ_VERSION)",|g' _locales/en/messages.json; true
+	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
@@ -147,7 +147,10 @@ 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
+moz-release: release moz-submit 
+#upload-xpi torrent upload-torrent deb upload-deb upload-rss seed
+
+full-sign: moz-sign upload-xpi torrent upload-torrent deb upload-deb upload-rss seed

 WEB_EXT_API_KEY=AMO_KEY
 WEB_EXT_API_SECRET=AMO_SECRET
@@ -168,7 +171,7 @@ 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)/node_modules/web-ext-submit/extender.sh --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(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

@@ -182,7 +185,7 @@ moz-submit: moz-version
 	@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
-	web-ext sign --channel listed --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET); true
+	$(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; true #--api-url-prefix http://localhost:3000/api/v4
 	sleep 5
 	mv .manifest.json manifest.json

@@ -284,6 +287,8 @@ fmt-js:
 	fixjsstyle torrent/*.js
 	fixjsstyle i2pcontrol/*.js
 	fixjsstyle manifest.json
+	#work around fixjsstyle issue
+	sed -i 's|= >|=>|g' *.js */*.js
 	#find . -path ./node_modules -prune -o -name '*.json' -exec fixjsstyle --write {} \;

 fmt-prettier:
@@ -328,7 +333,7 @@ upload-updatemanifest:
 	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t docs -n "updateManifest.json" -f updateManifest.json

 webext:
-	web-ext run -u "about:devtools-toolbox?type=extension&id=i2ppb%40eyedeekay.github.io"
+	$(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
@@ -345,7 +350,7 @@ wire:
 	cp -v "../i2ppb-$(VERSION)@eyedeekay.github.io.xpi" "$(HOME)/i2p/MuWireDownloads/"

 ndtest:
-	web-ext run -u about:debugging \
+	$(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 \
@@ -354,14 +359,27 @@ ndtest:
 		-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:
-	web-ext run -u about:debugging \
+	$(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
@@ -2,13 +2,14 @@ I2P in Private Browsing Mode(Firefox-Only)
 ==========================================

 This is an webextension which introduces a set of new "Private Browsing" modes
-to Firefox-based browsers(Supporting webextensions) that makes it easier to
-configure a browser to use I2P securely and adds features for making I2P
-applications easier to use. It does this by isolating I2P-specific settings to
-Contextual Identities within Firefox, then loading them automatically when the
-user requests them. It also adds convenience and management features, like an
-embedded I2P console and Bittorrent integration with clients using the
-transmission-rpc API.
+to Firefox-based browsers(Supporting webextensions, must be current ESR or
+greater) that makes it easier to configure a browser to use I2P securely and
+adds features for making I2P applications easier to use. It does this by
+isolating I2P-specific settings to Contextual Identities within Firefox, then
+loading them automatically when the user requests them. It also adds convenience
+and management features, like an embedded I2P console and Bittorrent integration
+with clients using the transmission-rpc API and via in-browser protocol handling
+integrations.

 Privacy Policy
 --------------
@@ -115,15 +116,16 @@ Usage:
   the use of I2PSnark as a peer-to-peer delivery mechanism for media files.
  * ![Visiting i2psnark](i2psnark.png)
  * ![Monitoring torrents](transmissionrpc.png)
-  * ![Distribute your site as a torrent.](x-i2p-torrentlocation.png)
-  * [Started] **Indicate** the level of authenticity provided by TLS. TLS is
-   optional on I2P for now, but some sites offer it anyway. TLS support is
-   experimental and in the works.
-  * [Started] **Provide** alternate, in-I2P destinations for web sites that want to
-   mirror their content within I2P.
-  * [Started] **Enhance** the I2P browsing experience by allowing site developers
+  * [Done] **Enhance** the I2P browsing experience by allowing site developers
   distribute some or all of their resources as torrents, allowing the torrents to
   be treated effectively as a CDN.
+  * ![Distribute your site as a torrent.](x-i2p-torrentlocation.png)
+  * [Done] **Indicate** the level of authenticity provided by TLS. TLS is
+   optional on I2P for now, but some sites offer it anyway. TLS support is
+   experimental and in the works.
+  * ![Use HTTPS with your I2P Site.](i2p-https.png)
+  * [Done] **Provide** alternate, in-I2P destinations for web sites that want to
+   mirror their content within I2P.
  * [barely started] **Isolate** traffic by contextual identity to it's own HTTP
   Proxy tunnel, each reflecting it's own pseudonymous identity within I2P. The
   contextual identities. For now, the contextual identities used to manage
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -3,6 +3,10 @@
    "message": "I2P In Private Browsing",
    "description": "Name of the extension."
  },
+  "extensionNameVariant": {
+    "message": "I2P In Private Browsing - Rhizome Variant",
+    "description": "Name of the extension."
+  },
  "toopieName": {
    "message": "toopie.html",
    "description": "Name of the sidebar."
@@ -16,7 +20,7 @@
    "description": "Description of the extension."
  },
  "extensionVersion": {
-    "message": "0.77",
+    "message": "0.108",
    "description": "Version of the extension."
  },
  "proxyFailedStatus": {
@@ -167,6 +171,14 @@
    "message": "Dispatch IRC (Private)",
    "description": "Preface for the browser titlebar"
  },
+  "blogPreface": {
+    "message": "Blog",
+    "description": "Preface for the browser titlebar"
+  },
+  "blogPrefacePrivate": {
+    "message": "Blog (Private)",
+    "description": "Preface for the browser titlebar"
+  },
  "botePreface": {
    "message": "I2P-Bote Mail",
    "description": "Preface for the browser titlebar"
--- a/_locales/es/messages.json
+++ b/_locales/es/messages.json
@@ -3,6 +3,10 @@
    "message": "I2P en navegación privada",
    "description": "Nombre de la extensión."
  },
+  "extensionNameVariant": {
+    "message": "I2P en navegación privada - Rhizome",
+    "description": "Nombre de la extensión."
+  },
  "toopieName": {
    "message": "toopie.html",
    "description": "Nombre de la barra lateral."
@@ -16,7 +20,7 @@
    "description": "Descripción de la extensión."
  },
  "extensionVersion": {
-    "message": "0,77",
+    "message": "0.108",
    "description": "Versión de la extensión."
  },
  "proxyFailedStatus": {
@@ -167,6 +171,14 @@
    "message": "Despacho de IRC (privado)",
    "description": "Prefacio de la barra de título del navegador"
  },
+  "blogPreface": {
+    "message": "Blog",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "blogPrefacePrivate": {
+    "message": "Blog (Private)",
+    "description": "Prefacio de la barra de título del navegador"
+  },
  "botePreface": {
    "message": "I2P-Bote Mail",
    "description": "Prefacio de la barra de título del navegador"
--- a/alternate-address.png
+++ b/alternate-address.png
--- a/background.js
+++ b/background.js
@@ -1,24 +1,26 @@
-var titlepref = chrome.i18n.getMessage('titlePreface');
-var titleprefpriv = chrome.i18n.getMessage('titlePrefacePrivate');
-var webpref = chrome.i18n.getMessage('webPreface');
-var webprefpriv = chrome.i18n.getMessage('webPrefacePrivate');
-var routerpref = chrome.i18n.getMessage('routerPreface');
-var routerprefpriv = chrome.i18n.getMessage('routerPrefacePrivate');
-var mailpref = chrome.i18n.getMessage('mailPreface');
-var mailprefpriv = chrome.i18n.getMessage('mailPrefacePrivate');
-var torrentpref = chrome.i18n.getMessage('torrentPreface');
-var torrentprefpriv = chrome.i18n.getMessage('torrentPrefacePrivate');
-var tunnelpref = chrome.i18n.getMessage('i2ptunnelPreface');
-var tunnelprefpriv = chrome.i18n.getMessage('i2ptunnelPrefacePrivate');
-var ircpref = chrome.i18n.getMessage('ircPreface');
-var ircprefpriv = chrome.i18n.getMessage('ircPrefacePrivate');
-var extensionpref = chrome.i18n.getMessage('extensionPreface');
-var muwirepref = chrome.i18n.getMessage('muwirePreface');
-var muwireprefpriv = chrome.i18n.getMessage('muwirePrefacePrivate');
-var botepref = chrome.i18n.getMessage('botePreface');
+var titlepref = chrome.i18n.getMessage("titlePreface");
+var titleprefpriv = chrome.i18n.getMessage("titlePrefacePrivate");
+var webpref = chrome.i18n.getMessage("webPreface");
+var webprefpriv = chrome.i18n.getMessage("webPrefacePrivate");
+var routerpref = chrome.i18n.getMessage("routerPreface");
+var routerprefpriv = chrome.i18n.getMessage("routerPrefacePrivate");
+var mailpref = chrome.i18n.getMessage("mailPreface");
+var mailprefpriv = chrome.i18n.getMessage("mailPrefacePrivate");
+var torrentpref = chrome.i18n.getMessage("torrentPreface");
+var torrentprefpriv = chrome.i18n.getMessage("torrentPrefacePrivate");
+var tunnelpref = chrome.i18n.getMessage("i2ptunnelPreface");
+var tunnelprefpriv = chrome.i18n.getMessage("i2ptunnelPrefacePrivate");
+var ircpref = chrome.i18n.getMessage("ircPreface");
+var ircprefpriv = chrome.i18n.getMessage("ircPrefacePrivate");
+var extensionpref = chrome.i18n.getMessage("extensionPreface");
+var muwirepref = chrome.i18n.getMessage("muwirePreface");
+var muwireprefpriv = chrome.i18n.getMessage("muwirePrefacePrivate");
+var botepref = chrome.i18n.getMessage("botePreface");
+var blogpref = chrome.i18n.getMessage("blogPreface");
+var blogprefpriv = chrome.i18n.getMessage("blogPrefacePrivate");

 function onError(err) {
-  console.log('(background)', err);
+  console.log("(background)", err);
 }

 function onContextGotLog(contexts) {
@@ -33,13 +35,22 @@ function onContextsGot(contexts) {
    console.log(`Name : ${context.name}`);
    ids.push(context.name);
  }
-  console.log('Checking new contexts');
+  console.log("Checking new contexts");
  if (ids.indexOf(titlepref) == -1) {
    browser.contextualIdentities
      .create({
        name: titlepref,
-        color: 'orange',
-        icon: 'fingerprint',
+        color: "orange",
+        icon: "fingerprint",
+      })
+      .then(onCreated, onNotCreated);
+  }
+  if (ids.indexOf(blogpref) == -1) {
+    browser.contextualIdentities
+      .create({
+        name: blogpref,
+        color: "pink",
+        icon: "pet",
      })
      .then(onCreated, onNotCreated);
  }
@@ -47,8 +58,8 @@ function onContextsGot(contexts) {
    browser.contextualIdentities
      .create({
        name: webpref,
-        color: 'red',
-        icon: 'circle',
+        color: "red",
+        icon: "circle",
      })
      .then(onCreated, onNotCreated);
  }
@@ -56,8 +67,8 @@ function onContextsGot(contexts) {
    browser.contextualIdentities
      .create({
        name: routerpref,
-        color: 'blue',
-        icon: 'briefcase',
+        color: "blue",
+        icon: "briefcase",
      })
      .then(onCreated, onNotCreated);
  }
@@ -65,8 +76,8 @@ function onContextsGot(contexts) {
    browser.contextualIdentities
      .create({
        name: tunnelpref,
-        color: 'green',
-        icon: 'tree',
+        color: "green",
+        icon: "tree",
      })
      .then(onCreated, onNotCreated);
  }
@@ -74,8 +85,8 @@ function onContextsGot(contexts) {
    browser.contextualIdentities
      .create({
        name: mailpref,
-        color: 'yellow',
-        icon: 'briefcase',
+        color: "yellow",
+        icon: "briefcase",
      })
      .then(onCreated, onNotCreated);
  }
@@ -83,8 +94,8 @@ function onContextsGot(contexts) {
    browser.contextualIdentities
      .create({
        name: torrentpref,
-        color: 'purple',
-        icon: 'chill',
+        color: "purple",
+        icon: "chill",
      })
      .then(onCreated, onNotCreated);
  }
@@ -92,8 +103,8 @@ function onContextsGot(contexts) {
    browser.contextualIdentities
      .create({
        name: ircpref,
-        color: 'red',
-        icon: 'vacation',
+        color: "red",
+        icon: "vacation",
      })
      .then(onCreated, onNotCreated);
  }
@@ -101,8 +112,8 @@ function onContextsGot(contexts) {
    browser.contextualIdentities
      .create({
        name: muwirepref,
-        color: 'turquoise',
-        icon: 'gift',
+        color: "turquoise",
+        icon: "gift",
      })
      .then(onCreated, onNotCreated);
  }
@@ -110,30 +121,30 @@ function onContextsGot(contexts) {
    browser.contextualIdentities
      .create({
        name: botepref,
-        color: 'blue',
-        icon: 'fence',
+        color: "blue",
+        icon: "fence",
      })
      .then(onCreated, onNotCreated);
  }
 }

 function onContextsError() {
-  console.log('Error finding contextual identities, is the API enabled?');
+  console.log("Error finding contextual identities, is the API enabled?");
 }

 function onCreated(context) {
-  console.log(' ID:', context.cookieStoreId, 'created.');
+  console.log(" ID:", context.cookieStoreId, "created.");
 }

 function onNotCreated(context) {
-  console.log('ID:', context.cookieStoreId, 'not created.');
+  console.log("ID:", context.cookieStoreId, "not created.");
 }

 browser.contextualIdentities.query({}).then(onContextsGot, onContextsError);

 var gettingInfo = browser.runtime.getPlatformInfo();
 gettingInfo.then((got) => {
-  if (got.os != 'android') {
+  if (got.os != "android") {
    browser.windows.onCreated.addListener(themeWindow);
    browser.windows.onFocusChanged.addListener(themeWindow);
    browser.windows.onRemoved.addListener(themeWindow);
@@ -146,7 +157,7 @@ function themeWindowByTab(tabId) {
  function tabWindow(tab) {
    var gettingPlatformInfo = browser.runtime.getPlatformInfo();
    gettingPlatformInfo.then((got) => {
-      if (got.os == 'android') {
+      if (got.os == "android") {
        let getwindow = browser.tabs.get(tab.tabId);
        getwindow.then(themeWindow);
      } else {
@@ -155,7 +166,7 @@ function themeWindowByTab(tabId) {
      }
    });
  }
-  if (typeof tabId === 'number') {
+  if (typeof tabId === "number") {
    let tab = browser.tabs.get(tabId);
    tab.then(tabWindow);
  } else {
@@ -175,101 +186,92 @@ function isEmpty(obj) {
  return true;
 }

+let btheme = {
+  colors: {
+    frame: "#363A68",
+    toolbar: "#363A68",
+  },
+};
+
+let dtheme = {
+  colors: {
+    frame: "#4456B7",
+    toolbar: "#4456B7",
+  },
+};
+
 function themeWindow(window) {
  // Check if the window is in private browsing
  function onThemeError() {
-    console.log('theme color set error');
+    console.log("(theme) color set error");
+    browserTheme();
  }
+
  function dynamicTheme() {
    if (window.incognito) {
-      browser.theme.update(window.id, {
-        colors: {
-          frame: '#4456B7',
-          toolbar: '#4456B7',
-        },
-      });
+      browser.theme.update(window.id, dtheme);
    } else {
-      browser.theme.update(window.id, {
-        colors: {
-          frame: '#4456B7',
-          toolbar: '#4456B7',
-        },
-      });
+      browser.theme.update(window.id, dtheme);
    }
  }
+
  function browserTheme() {
-    console.log('Active in I2P window');
+    console.log("(theme)Active in I2P window");
    if (window.incognito) {
-      browser.theme.update(window.id, {
-        colors: {
-          frame: '#363A68',
-          toolbar: '#363A68',
-        },
-      });
+      browser.theme.update(window.id, btheme);
    } else {
-      browser.theme.update(window.id, {
-        colors: {
-          frame: '#363A68',
-          toolbar: '#363A68',
-        },
-      });
+      browser.theme.update(window.id, btheme);
    }
  }
+
+  function unsetTheme() {
+    console.log("(theme)Resetting theme window");
+    browser.theme.reset(window.id);
+  }
  function logTabs(tabInfo) {
    function onContextGotTheme(context) {
      if (context.name == titlepref) {
        browserTheme();
-        if (tabInfo[0].url.startsWith('https://')) {
-          browser.pageAction.setPopup({
-            tabId: tabInfo[0].id,
-            popup: 'security.html',
-          });
-          //console.log("(background) tabinfo", tabInfo[0].id)
-          browser.pageAction.show(tabInfo[0].id);
-        } else {
-          //browser.pageAction.hide(tabInfo[0].id);
-        }
+        browser.pageAction.show(tabInfo[0].id);
      } else if (context.name == routerpref) {
-        console.log('Active in Router Console window');
+        console.log("(theme) Active in Router Console window");
        dynamicTheme();
      } else if (context.name == tunnelpref) {
-        console.log('Active in Hidden Services Manager window');
+        console.log("(theme) Active in Hidden Services Manager window");
        dynamicTheme();
      } else if (context.name == mailpref) {
-        console.log('Active in Web Mail window');
+        console.log("(theme) Active in Web Mail window");
        dynamicTheme();
      } else if (context.name == torrentpref) {
-        console.log('Active in Bittorrent window');
+        console.log("(theme) Active in Bittorrent window");
        dynamicTheme();
      } else if (context.name == botepref) {
-        console.log('Active in Bote window');
+        console.log("(theme) Active in Bote window");
        dynamicTheme();
      } else if (context.name == ircpref) {
-        console.log('Active in IRC window');
+        console.log("(theme) Active in IRC window");
+        dynamicTheme();
+      } else if (context.name == blogpref) {
+        console.log("(theme) (theme) Active in Blog window");
        dynamicTheme();
      } else if (context.name == muwirepref) {
-        console.log('Active in MuWire window');
+        console.log("(theme) Active in MuWire window");
        dynamicTheme();
+      } else {
+        console.log("(theme) Not active in I2P Window");
+        unsetTheme();
      }
    }
    if (
-      tabInfo[0].cookieStoreId != 'firefox-default' &&
-      tabInfo[0].cookieStoreId != 'firefox-private'
+      tabInfo[0].cookieStoreId != "firefox-default" &&
+      tabInfo[0].cookieStoreId != "firefox-private"
    ) {
      browser.contextualIdentities
        .get(tabInfo[0].cookieStoreId)
        .then(onContextGotTheme, onThemeError);
    } else {
-      console.log('Not active in I2P window');
-      function unSetTheme(them) {
-        console.log('unsetting theme', them);
-        if (Object.keys(them).length > 0) {
-          browser.theme.update(window.id, them.originalTheme);
-        } else {
-          browser.theme.update(window.id, { colors: null });
-        }
-      }
-      browser.storage.local.get('originalTheme').then(unSetTheme, onError);
+      console.log("(theme) Not active in I2P window");
+      unsetTheme();
    }
  }

@@ -283,62 +285,65 @@ function themeWindow(window) {
 function setTitle(window) {
  // Check if the window is in private browsing
  function onContextError() {
-    console.log('Context Error');
+    console.log("Context Error");
  }
  function setTitle(title, privtitle) {
    if (window.incognito) {
      browser.windows.update(window.id, {
-        titlePreface: privtitle + ': ',
+        titlePreface: privtitle + ": ",
      });
    } else {
      browser.windows.update(window.id, {
-        titlePreface: title + ': ',
+        titlePreface: title + ": ",
      });
    }
  }
  function logTabs(tabInfo) {
    function onContextGotTitle(context) {
      if (context.name == titlepref) {
-        console.log('Active in I2P window');
+        console.log("Active in I2P window");
        setTitle(titlepref, titleprefpriv);
      } else if (context.name == muwirepref) {
-        console.log('Active in MuWire window');
+        console.log("Active in MuWire window");
        setTitle(muwirepref, muwireprefpriv);
      } else if (context.name == routerpref) {
-        console.log('Active in Router Console window');
+        console.log("Active in Router Console window");
        setTitle(routerpref, routerprefpriv);
      } else if (context.name == botepref) {
-        console.log('Active in Bote window');
+        console.log("Active in Bote window");
        setTitle(botepref, boteprefpriv);
      } else if (context.name == tunnelpref) {
-        console.log('Active in Hidden Services Manager window');
+        console.log("Active in Hidden Services Manager window");
        setTitle(tunnelpref, tunnelprefpriv);
      } else if (context.name == mailpref) {
-        console.log('Active in I2P Web Mail window');
+        console.log("Active in I2P Web Mail window");
        setTitle(mailpref, mailprefpriv);
+      } else if (context.name == blogpref) {
+        console.log("Active in I2P Blog window");
+        setTitle(blogpref, blogprefpriv);
      } else if (context.name == torrentpref) {
-        console.log('Active in I2P Torrent window');
+        console.log("Active in I2P Torrent window");
        setTitle(torrentpref, torrentprefpriv);
      } else if (context.name == ircpref) {
-        console.log('Active in IRC window');
+        console.log("Active in IRC window");
        setTitle(ircpref, ircprefpriv);
      }
    }

    if (
-      tabInfo[0].cookieStoreId != 'firefox-default' &&
-      tabInfo[0].cookieStoreId != 'firefox-private'
+      tabInfo[0].cookieStoreId != "firefox-default" &&
+      tabInfo[0].cookieStoreId != "firefox-private"
    ) {
      browser.contextualIdentities
        .get(tabInfo[0].cookieStoreId)
        .then(onContextGotTitle, onContextError);
    } else if (window.incognito) {
      browser.windows.update(window.id, {
-        titlePreface: '',
+        titlePreface: "",
      });
    } else {
      browser.windows.update(window.id, {
-        titlePreface: '',
+        titlePreface: "",
      });
    }
  }
@@ -353,9 +358,9 @@ function setTitle(window) {
 var gettingListenerInfo = browser.runtime.getPlatformInfo();
 gettingListenerInfo.then((got) => {
  function onPlatformError() {
-    console.log('Error finding platform info');
+    console.log("Error finding platform info");
  }
-  if (got.os != 'android') {
+  if (got.os != "android") {
    browser.tabs.onCreated.addListener(() => {
      var getting = browser.windows.getCurrent({
        populate: true,
@@ -371,48 +376,6 @@ gettingListenerInfo.then((got) => {
  }
 });

-function handleUpdated(updateInfo) {
-  function maybeSet(them) {
-    console.log("original theme found:", them, Object.keys(them).length);
-    try {
-      if (
-        Object.keys(them).length == 0 ||
-        (them.originalTheme.colors == null &&
-          them.originalTheme.images == null &&
-          them.originalTheme.properties == null)
-      ) {
-        if (updateInfo.theme.colors != null) {
-          if (
-            updateInfo.theme.colors.frame != "#4456B7" &&
-            updateInfo.theme.colors.frame != "#363A68"
-          ) {
-            function onSet() {
-              console.log("stored theme:", updateInfo.theme);
-            }
-            if (
-              updateInfo.theme.colors != null &&
-              updateInfo.theme.images != null &&
-              updateInfo.theme.properties != null
-            ) {
-              console.log("storing theme:", updateInfo.theme);
-              browser.storage.local
-                .set({ originalTheme: updateInfo.theme })
-                .then(onSet, onError);
-            }
-          }
-        }
-      } else {
-        console.log("keeping stored theme:", them);
-      }
-    } catch (e) {
-      console.log("theme storage error", e);
-    }
-  }
-  browser.storage.local.get("originalTheme").then(maybeSet, onError);
-}
-
-browser.theme.onUpdated.addListener(handleUpdated);
-
 function handleClick() {
  console.log("Opening page action");
  browser.pageAction.openPopup();
@@ -466,20 +429,42 @@ browser.webRequest.onHeadersReceived.addListener(
 function onClosedWindowCheck() {
  var getContext = browser.contextualIdentities.query({ name: titlepref });
  function checkTabs(ctx) {
-    function conditionallyDelete(tabs) {
-      if (tabs.length == 0) {
-        browser.contextualIdentities.remove(ctx[0].cookieStoreId);
-        browser.contextualIdentities
-          .query({})
-          .then(onContextsGot, onContextsError);
+    for (let context in ctx) {
+      function conditionallyDelete(tabs) {
+        if (tabs.length == 0) {
+          browser.contextualIdentities.remove(context.cookieStoreId);
+        }
      }
+      var tabs = browser.tabs.query({ cookieStoreId: context.cookieStoreId });
+      tabs.then(conditionallyDelete, onError);
    }
-    var tabs = browser.tabs.query({ cookieStoreId: ctx[0].cookieStoreId });
-    tabs.then(conditionallyDelete, onError);
  }
  getContext.then(checkTabs, onError);
 }

+function onOpenedWindowCheck() {
+  var getContext = browser.contextualIdentities.query({ name: titlepref });
+  function checkTabs(ctx) {
+    for (let context in ctx) {
+      function conditionallyDelete(tabs) {
+        if (tabs.length == 0 && context != 0) {
+          console.log(context);
+          browser.contextualIdentities.remove(context.cookieStoreId);
+        }
+      }
+      var tabs = browser.tabs.query({ cookieStoreId: context.cookieStoreId });
+      tabs.then(conditionallyDelete, onError);
+    }
+  }
+  getContext.then(checkTabs, onError);
+}
+
+onOpenedWindowCheck();
+
 browser.tabs.onRemoved.addListener(onClosedWindowCheck);
-browser.windows.onRemoved.addListener(onClosedWindowCheck);
-browser.windows.onCreated.addListener(onClosedWindowCheck);
+
+if (browser.windows != undefined) {
+  console.log("windows unavailable on android", browser.runtime.PlatformOs);
+  browser.windows.onRemoved.addListener(onClosedWindowCheck);
+  browser.windows.onCreated.addListener(onOpenedWindowCheck);
+}
--- a/bookmarks.js
+++ b/bookmarks.js
@@ -1,30 +1,30 @@
 function bookmarksSetup() {
  var gettingInfo = browser.runtime.getPlatformInfo();
  gettingInfo.then((got) => {
-    if (got.os != 'android') {
+    if (got.os != "android") {
      function bookmarks(bookmarkToolbar) {
-        console.log('(bookmarks)', bookmarkToolbar);
-        console.log('Setting up bookmark toolbar', bookmarkToolbar);
+        console.log("(bookmarks)", bookmarkToolbar);
+        console.log("Setting up bookmark toolbar", bookmarkToolbar);
        function bookHome(bookmarkItems) {
          if (!bookmarkItems.length) {
            function gotProxyInfo(info) {
-              let port = info.value.http.split(':')[1];
-              if (port == '7644') {
+              let port = info.value.http.split(":")[1];
+              if (port == "7644") {
                let createRhizomeBookmark = browser.bookmarks.create({
-                  url: 'about:I2p',
-                  title: 'I2P Extension Home Page',
+                  url: "about:I2p",
+                  title: "I2P Extension Home Page",
                  parentId: bookmarkToolbar[0].id,
                });
                createRhizomeBookmark.then(onCreated);
              } else {
                let createBookmark = browser.bookmarks.create({
-                  url: browser.runtime.getURL('home.html'),
-                  title: 'I2P Extension Home Page',
+                  url: browser.runtime.getURL("home.html"),
+                  title: "I2P Extension Home Page",
                  parentId: bookmarkToolbar[0].id,
                });
                createBookmark.then(onCreated);
              }
-              console.log('(bookmarks) adding home page bookmark');
+              console.log("(bookmarks) adding home page bookmark");
            }
            console.log(
              "(bookmarks) checking if we're running in an I2P Browser"
@@ -36,19 +36,19 @@ function bookmarksSetup() {
        function bookTorrent(bookmarkItems) {
          if (!bookmarkItems.length) {
            function gotProxyInfo(info) {
-              let port = info.value.http.split(':')[1];
-              if (port == '7644') {
+              let port = info.value.http.split(":")[1];
+              if (port == "7644") {
                let createBookmark = browser.bookmarks.create({
-                  url: 'http://localhost:7657/i2psnark',
-                  title: 'Bittorrent',
+                  url: "http://localhost:7657/i2psnark",
+                  title: "Bittorrent",
                  parentId: bookmarkToolbar[0].id,
                });
                createBookmark.then(onCreated);
              } else {
                let createRhizomeBookmark = browser.bookmarks.create({
                  url:
-                    'http://' + control_host + ':' + control_port + '/i2psnark',
-                  title: 'Bittorrent',
+                    "http://" + control_host + ":" + control_port + "/i2psnark",
+                  title: "Bittorrent",
                  parentId: bookmarkToolbar[0].id,
                });
                createRhizomeBookmark.then(onCreated);
@@ -64,18 +64,18 @@ function bookmarksSetup() {
        function bookConsole(bookmarkItems) {
          if (!bookmarkItems.length) {
            function gotProxyInfo(info) {
-              let port = info.value.http.split(':')[1];
-              if (port == '7644') {
+              let port = info.value.http.split(":")[1];
+              if (port == "7644") {
                let createBookmark = browser.bookmarks.create({
-                  url: 'http://localhost:7657/home',
-                  title: 'I2P Console',
+                  url: "http://localhost:7657/home",
+                  title: "I2P Console",
                  parentId: bookmarkToolbar[0].id,
                });
                createBookmark.then(onCreated);
              } else {
                let createRhizomeBookmark = browser.bookmarks.create({
-                  url: 'http://' + control_host + ':' + control_port + '/home',
-                  title: 'I2P Console',
+                  url: "http://" + control_host + ":" + control_port + "/home",
+                  title: "I2P Console",
                  parentId: bookmarkToolbar[0].id,
                });
                createRhizomeBookmark.then(onCreated);
@@ -91,24 +91,24 @@ function bookmarksSetup() {
        function bookMail(bookmarkItems) {
          if (!bookmarkItems.length) {
            function gotProxyInfo(info) {
-              let port = info.value.http.split(':')[1];
-              if (port == '7644') {
+              let port = info.value.http.split(":")[1];
+              if (port == "7644") {
                let createBookmark = browser.bookmarks.create({
-                  url: 'http://localhost:7657/webmail',
-                  title: 'Web Mail',
+                  url: "http://localhost:7657/webmail",
+                  title: "Web Mail",
                  parentId: bookmarkToolbar[0].id,
                });
                createBookmark.then(onCreated);
              } else {
                let createRhizomeBookmark = browser.bookmarks.create({
                  url:
-                    'http://' + control_host + ':' + control_port + '/webmail',
-                  title: 'Web Mail',
+                    "http://" + control_host + ":" + control_port + "/webmail",
+                  title: "Web Mail",
                  parentId: bookmarkToolbar[0].id,
                });
                createRhizomeBookmark.then(onCreated);
              }
-              console.log('(bookmarks) adding webmail bookmark');
+              console.log("(bookmarks) adding webmail bookmark");
            }
            console.log(
              "(bookmarks) checking if we're running in an I2P Browser"
@@ -120,28 +120,28 @@ function bookmarksSetup() {
        function bookI2PTunnel(bookmarkItems) {
          if (!bookmarkItems.length) {
            function gotProxyInfo(info) {
-              let port = info.value.http.split(':')[1];
-              if (port == '7644') {
+              let port = info.value.http.split(":")[1];
+              if (port == "7644") {
                var createBookmark = browser.bookmarks.create({
-                  url: 'http://localhost:7657/i2ptunnel',
-                  title: 'Hidden Services Manager',
+                  url: "http://localhost:7657/i2ptunnel",
+                  title: "Hidden Services Manager",
                  parentId: bookmarkToolbar[0].id,
                });
                createBookmark.then(onCreated);
              } else {
                var createRhizomeBookmark = browser.bookmarks.create({
                  url:
-                    'http://' +
+                    "http://" +
                    control_host +
-                    ':' +
+                    ":" +
                    control_port +
-                    '/i2ptunnel',
-                  title: 'Hidden Services Manager',
+                    "/i2ptunnel",
+                  title: "Hidden Services Manager",
                  parentId: bookmarkToolbar[0].id,
                });
                createRhizomeBookmark.then(onCreated);
              }
-              console.log('(bookmarks) adding i2ptunnel bookmark');
+              console.log("(bookmarks) adding i2ptunnel bookmark");
            }
            console.log(
              "(bookmarks) checking if we're running in an I2P Browser"
@@ -155,53 +155,53 @@ function bookmarksSetup() {
          console.log(`An error : ${error}`);
        }
        function onCreated(node) {
-          console.log('Bookmarked', node);
+          console.log("Bookmarked", node);
        }

        var b0 = browser.bookmarks.search({
-          title: 'I2P Extension Home Page',
+          title: "I2P Extension Home Page",
        });
        b0.then(bookHome, onRejected);

        var b1 = browser.bookmarks.search({
-          title: 'Bittorrent',
+          title: "Bittorrent",
        });
        b1.then(bookTorrent, onRejected);

        var b2 = browser.bookmarks.search({
-          title: 'Hidden Services Manager',
+          title: "Hidden Services Manager",
        });
        b2.then(bookI2PTunnel, onRejected);

        var b3 = browser.bookmarks.search({
-          title: 'Web Mail',
+          title: "Web Mail",
        });
        b3.then(bookMail, onRejected);

        var b4 = browser.bookmarks.search({
-          title: 'I2P Console',
+          title: "I2P Console",
        });
        b4.then(bookConsole, onRejected);
-        defaultSettings['bookmarks_state'] = true;
+        defaultSettings["bookmarks_state"] = true;
      }

      var bt = browser.bookmarks.search({
-        query: 'Toolbar',
+        query: "Toolbar",
      });

      function toolDir(bookmarkToolbar) {
        let defaultSettings = {};
        chrome.storage.local.set(defaultSettings);
-        console.log('(bookmarks) created');
-        var ibbt = browser.bookmarks.search('I2P Toolbar');
+        console.log("(bookmarks) created");
+        var ibbt = browser.bookmarks.search("I2P Toolbar");
        function setupDir(ibbt) {
          function onToolbarCreated(node) {
-            var ibt = browser.bookmarks.search('I2P Toolbar');
+            var ibt = browser.bookmarks.search("I2P Toolbar");
            ibt.then(bookmarks);
          }
          if (ibbt[0] == null) {
            let createBookmark = browser.bookmarks.create({
-              title: 'I2P Toolbar',
+              title: "I2P Toolbar",
              parentId: bookmarkToolbar[0].id,
            });
            createBookmark.then(onToolbarCreated);
@@ -225,7 +225,7 @@ function bookmarksSetup() {
 }

 function conditionalBookmarksSetup(obj) {
-  console.log('(bookmarks) state', obj.bookmarks_state);
+  console.log("(bookmarks) state", obj.bookmarks_state);
  if (obj.bookmarks_state == false) {
    bookmarksSetup();
  }
@@ -235,11 +235,13 @@ function conditionalBookmarksSetup(obj) {
 }

 if (browser != null) {
-  let gettingStorage = browser.storage.local.get('bookmarks_state');
-  gettingStorage.then(conditionalBookmarksSetup, bookmarksSetup);
+  if (browser.windows != undefined) {
+    let gettingStorage = browser.storage.local.get("bookmarks_state");
+    gettingStorage.then(conditionalBookmarksSetup, bookmarksSetup);
+  }
 }

-const bookmarksButton = document.getElementById('bookmarksButton');
+const bookmarksButton = document.getElementById("bookmarksButton");
 if (bookmarksButton != null) {
-  bookmarksButton.addEventListener('click', bookmarksSetup);
+  bookmarksButton.addEventListener("click", bookmarksSetup);
 }
--- a/cert.js
+++ b/cert.js
@@ -1,42 +1,42 @@
 function blankContent(id) {
  let infoTitle = document.getElementById(id);
  if (infoTitle === null) {
-    console.log('content error', id);
+    console.log("content error", id);
    return;
  }
-  infoTitle.textContent = '';
+  infoTitle.textContent = "";
 }

 function contentUpdateById(id, message) {
  let infoTitle = document.getElementById(id);
  let messageContent = chrome.i18n.getMessage(message);
  if (infoTitle === null) {
-    console.log('content error', id, messageContent);
+    console.log("content error", id, messageContent);
    return;
  }
  infoTitle.textContent = messageContent;
 }

-contentUpdateById('TypeLabel', 'siteLabel');
+contentUpdateById("TypeLabel", "siteLabel");

-contentUpdateById('CertLabel', 'certLabel');
+contentUpdateById("CertLabel", "certLabel");

 function tabCheck(tabInfo) {
  // Information Section
-  console.log('(cert) checking tab');
-  var host = tabInfo[0].url.split('.i2p')[0] + '.i2p';
+  console.log("(cert) checking tab");
+  var host = tabInfo[0].url.split(".i2p")[0] + ".i2p";
  if (host.length < 51) {
-    contentUpdateById('AddressInfo', 'isHostName');
+    contentUpdateById("AddressInfo", "isHostName");
  } else {
-    if (host.endsWith('b32.i2p')) {
-      contentUpdateById('AddressInfo', 'isBase32');
+    if (host.endsWith("b32.i2p")) {
+      contentUpdateById("AddressInfo", "isBase32");
    }
  }
-  if (host.startsWith('https')) {
-    contentUpdateById('AddressCertInfo', 'certPresent');
-    console.log('(cert) initiating request to check server cert');
+  if (host.startsWith("https")) {
+    contentUpdateById("AddressCertInfo", "certPresent");
+    console.log("(cert) initiating request to check server cert");
    fetch(host).then((response) => {
-      console.log('Updating cert information', response);
+      console.log("Updating cert information", response);
    });
  } else {
    contentUpdateById("AddressCertInfo", "certAbsent");
--- a/clearweb.png
+++ b/clearweb.png
--- a/config.js
+++ b/config.js
@@ -1,18 +1,18 @@
-var proxy_scheme = 'HTTP';
-var proxy_host = '127.0.0.1';
-var proxy_port = '4444';
+var proxy_scheme = "HTTP";
+var proxy_host = "127.0.0.1";
+var proxy_port = "4444";

-var control_host = '127.0.0.1';
-var control_port = '7657';
+var control_host = "127.0.0.1";
+var control_port = "7657";

-var rpc_host = '127.0.0.1';
-var rpc_port = '7657';
-var rpc_path = 'jsonrpc';
-var rpc_pass = 'itoopie';
+var rpc_host = "127.0.0.1";
+var rpc_port = "7657";
+var rpc_path = "jsonrpc";
+var rpc_pass = "itoopie";

-var bt_rpc_host = '127.0.0.1';
-var bt_rpc_port = '7657';
-var bt_rpc_path = 'transmission/rpc';
-var bt_rpc_pass = 'transmission';
+var bt_rpc_host = "127.0.0.1";
+var bt_rpc_port = "7657";
+var bt_rpc_path = "transmission/rpc";
+var bt_rpc_pass = "transmission";

 var disable_history = false;
--- a/content.js
+++ b/content.js
@@ -2,52 +2,96 @@ function contentUpdateById(id, message) {
  let infoTitle = document.getElementById(id);
  let messageContent = chrome.i18n.getMessage(message);
  if (infoTitle === null) {
-    console.log('content error', id, messageContent);
+    console.log("content error", id, messageContent);
    return;
  }
  infoTitle.textContent = messageContent;
 }

 // Information Section
-contentUpdateById('text-section-header', 'extensionName');
-contentUpdateById('description', 'extensionDescription');
-contentUpdateById('i2pbrowser-version', 'extensionVersion');
-contentUpdateById('proxy-check', 'proxyFailedStatus');
+contentUpdateById("text-section-header", "extensionName");
+contentUpdateById("description", "extensionDescription");
+contentUpdateById("i2pbrowser-version", "extensionVersion");

 // Control Section
-contentUpdateById('controlHeader', 'controlHeader');
-contentUpdateById('controlExplain', 'controlExplain');
-contentUpdateById('clear-browser-data', 'clearData');
-contentUpdateById('clear-desc', 'clearDesc');
-contentUpdateById('enable-web-rtc', 'enableWebRTC');
-contentUpdateById('rtcDesc', 'rtcDesc');
-contentUpdateById('disable-history', 'disableHistory');
-contentUpdateById('histDesc', 'histDesc');
+contentUpdateById("controlHeader", "controlHeader");
+contentUpdateById("controlExplain", "controlExplain");
+contentUpdateById("clear-browser-data", "clearData");
+contentUpdateById("clear-desc", "clearDesc");
+contentUpdateById("enable-web-rtc", "enableWebRTC");
+contentUpdateById("rtcDesc", "rtcDesc");
+contentUpdateById("disable-history", "disableHistory");
+contentUpdateById("histDesc", "histDesc");

 // Application Section
-contentUpdateById('applicationHeader', 'applicationHeader');
-contentUpdateById('applicationExplain', 'applicationExplain');
-contentUpdateById('window-visit-index', 'windowVisitHelppage');
-contentUpdateById('help', 'help');
-contentUpdateById('window-visit-router', 'windowVisitConsole');
-contentUpdateById('routerConsole', 'routerConsole');
-contentUpdateById('window-visit-homepage', 'windowVisitHomepage');
-contentUpdateById('abouthome', 'abouthome');
-contentUpdateById('window-visit-i2ptunnel', 'windowVisitI2ptunnel');
-contentUpdateById('i2ptunnel', 'i2ptunnel');
-contentUpdateById('window-visit-susimail', 'windowVisitSusiMail');
-contentUpdateById('susimail', 'susimail');
-contentUpdateById('window-visit-snark', 'windowVisitSnark');
-contentUpdateById('snark', 'snark');
+contentUpdateById("applicationHeader", "applicationHeader");
+contentUpdateById("applicationExplain", "applicationExplain");
+contentUpdateById("window-visit-index", "windowVisitHelppage");
+contentUpdateById("help", "help");
+contentUpdateById("window-visit-router", "windowVisitConsole");
+contentUpdateById("routerConsole", "routerConsole");
+contentUpdateById("window-visit-homepage", "windowVisitHomepage");
+contentUpdateById("abouthome", "abouthome");
+contentUpdateById("window-visit-i2ptunnel", "windowVisitI2ptunnel");
+contentUpdateById("i2ptunnel", "i2ptunnel");
+contentUpdateById("window-visit-susimail", "windowVisitSusiMail");
+contentUpdateById("susimail", "susimail");
+contentUpdateById("window-visit-snark", "windowVisitSnark");
+contentUpdateById("snark", "snark");

 // Homepage Section
-contentUpdateById('window-visit-webpage', 'windowVisitWebPage');
-contentUpdateById('webpage', 'help');
-contentUpdateById('window-visit-sources', 'windowVisitSources');
-contentUpdateById('sources', 'sources');
-contentUpdateById('window-visit-releases', 'windowVisitReleases');
-contentUpdateById('releases', 'releases');
+contentUpdateById("window-visit-webpage", "windowVisitWebPage");
+contentUpdateById("webpage", "help");
+contentUpdateById("window-visit-sources", "windowVisitSources");
+contentUpdateById("sources", "sources");
+contentUpdateById("window-visit-releases", "windowVisitReleases");
+contentUpdateById("releases", "releases");

-fetch('http://proxy.i2p').then((myJson) => {
-  contentUpdateById('proxy-check', 'proxySuccessStatus');
+fetch("http://proxy.i2p").then((myJson) => {
+  contentUpdateById("proxy-check", "proxySuccessStatus");
+  let readyness = document.querySelectorAll(".readyness");
+  if (readyness != null) {
+    hide(readyness);
+  }
+}, (error) => {
+  contentUpdateById("proxy-check", "proxyFailedStatus");
+  let readyness = document.querySelectorAll(".readyness");
+  if (readyness != null) {
+    hide(readyness);
+  }
 });
+
+function hide(elements) {
+  elements = elements.length ? elements : [elements];
+  for (var index = 0; index < elements.length; index++) {
+    elements[index].style.display = "none";
+  }
+}
+
+function unhide(elements) {
+  elements = elements.length ? elements : [elements];
+  for (var index = 0; index < elements.length; index++) {
+    elements[index].style.display = "inline-block";
+  }
+}
+
+//TODO: Don't hard-code this.
+fetch("http://127.0.0.1:7657/themes/console/light/images/i2plogo.png")
+  .then((myJson) => {
+    var consoleLinks = document.querySelectorAll(".application-info");
+    unhide(consoleLinks);
+  })
+  .catch((error) => {
+    var consoleLinks = document.querySelectorAll(".application-info");
+    hide(consoleLinks);
+  });
+
+fetch("http://127.0.0.1:7657/jsonrpc/")
+  .then((myJson) => {
+    var toopieLinks = document.querySelectorAll(".window-visit-toopie");
+    unhide(toopieLinks);
+  })
+  .catch((error) => {
+    var toopieLinks = document.querySelectorAll(".window-visit-toopie");
+    hide(toopieLinks);
+  });
--- a/context.js
+++ b/context.js
@@ -1,5 +1,5 @@
 //var windowIds = []
-var titlepref = chrome.i18n.getMessage('titlePreface');
+var titlepref = chrome.i18n.getMessage("titlePreface");

 function onError(error) {
  console.log(`Error : ${error}`);
@@ -10,17 +10,17 @@ function eventHandler(event) {
    console.log(`Created window : ${windowInfo.id}`);
    browser.tabs.create({
      windowId: windowInfo.id,
-      url: 'about:blank',
+      url: "about:blank",
      cookieStoreId: event.target.dataset.identity,
    });
  }
-  if (event.target.dataset.action == 'create') {
+  if (event.target.dataset.action == "create") {
    var creating = browser.tabs.create({
      cookieStoreId: event.target.dataset.identity,
    });
    creating.then(onCreated, onError);
  }
-  if (event.target.dataset.action == 'close-all') {
+  if (event.target.dataset.action == "close-all") {
    browser.tabs
      .query({
        cookieStoreId: event.target.dataset.identity,
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,106 @@
+i2psetproxy.js (0.125-1) UNRELEASED; urgency=low
+
+  * Bump and resubmit to mozilla.
+
+ -- idk <hankhill19580@gmail.com> Wed, 3 Nov 2021 00:20:33 -0400
+
+i2psetproxy.js (0.123-1) UNRELEASED; urgency=low
+
+  * Bump and resubmit to mozilla.
+  * I am not going to optionally keep cookies.
+  * That would be introducing a pointless security issue.
+
+ -- idk <hankhill19580@gmail.com> Wed, 30 Oct 2021 10:11:51 -0400
+
+i2psetproxy.js (0.121-1) UNRELEASED; urgency=low
+
+  * switch to browser_specific_settings manifest key
+
+ -- idk <hankhill19580@gmail.com> Wed, 13 Oct 2021 21:28:28 -0400
+
+i2psetproxy.js (0.119-1) UNRELEASED; urgency=low
+
+  * Fixes to ease releasing via AMO
+
+ -- idk <hankhill19580@gmail.com> Wed, 13 Oct 2021 20:37:30 -0400
+
+i2psetproxy.js (0.117-1) UNRELEASED; urgency=low
+
+  * Switch to legwork for search provider.
+  * admin isn't answering, but the service is up unlike yacy.idk.i2p.
+
+ -- idk <hankhill19580@gmail.com> Mon, 4 Oct 2021 20:38:59 -0400
+
+i2psetproxy.js (0.115-1) UNRELEASED; urgency=low
+
+  * Improve functionality of X-I2P-Location and X-I2P-Torrentlocation 
+  * Fix usage of browser.theme.reset()
+  * Add checks to disable features that are broken on Android
+
+ -- idk <hankhill19580@gmail.com> Fri, 1 Oct 2021 15:29:22 -0400
+
+i2psetproxy.js (0.113-1) UNRELEASED; urgency=low
+
+  * Fix checks on BRB, railroad containers
+
+ -- idk <hankhill19580@gmail.com> Sun, 26 Sep 2021 00:37:22 -0400
+
+i2psetproxy.js (0.111-1) UNRELEASED; urgency=low
+
+  * simplify background theme issue fix
+
+ -- idk <hankhill19580@gmail.com> Wed, 07 Jul 2021 23:27:27 -0400
+
+i2psetproxy.js (0.109-1) UNRELEASED; urgency=low
+
+  * connection interrupted mid release, retry failed validation. Bump and retry
+
+ -- idk <hankhill19580@gmail.com> Wed, 07 Jul 2021 22:00:25 -0400
+
+connection interrupted mid release, retry failed validation. Bump and retry
+
+i2psetproxy.js (0.107-1) UNRELEASED; urgency=low
+
+  * Small code fixes
+  * Fix for interference with non-I2P containers
+
+ -- idk <hankhill19580@gmail.com> Wed, 07 Jul 2021 22:00:25 -0400
+
+i2psetproxy.js (0.105-1) UNRELEASED; urgency=low
+
+  * Add help page for configuring i2pcontrol
+  * Add help page for configuring i2psnark-rpc
+  * Update the icons
+
+ -- idk <hankhill19580@gmail.com> Wed, 26 May 2021 12:56:56 -0400
+
+i2psetproxy.js (0.103-1) UNRELEASED; urgency=low
+
+  * Fix for double-test issue on /home.html page in the extension
+  * Fix for broken options menu
+
+ -- idk <hankhill19580@gmail.com> Wed, 26 May 2021 12:56:56 -0400
+
+i2psetproxy.js (0.101-1) UNRELEASED; urgency=low
+
+  * Sweeping changes to styles
+  * fix for issue when using noscript and visiting susimail
+
+ -- idk <hankhill19580@gmail.com>  Mon, 24 May 2021 3:41:35 -0400
+
+i2psetproxy.js (0.99-1) UNRELEASED; urgency=low
+
+  * Sweeping changes to styles
+  * fix for issue when using noscript and visiting susimail
+
+ -- idk <hankhill19580@gmail.com>  Mon, 24 May 2021 2:05:21 -0400
+
+i2psetproxy.js (0.97-1) UNRELEASED; urgency=low
+
+  * Fix theme issue, add x-i2p-torrentlocation HEADER support
+
+ -- idk <hankhill19580@gmail.com>  FRI, 5 FEB 2021 1:02:55 -0400
+
 i2psetproxy.js (0.95-1) UNRELEASED; urgency=low

  * Fix github #102 and #103
--- a/handler.js
+++ b/handler.js
@@ -1,69 +1,73 @@
 function routerHost(url) {
  //  console.log("(urlcheck) HANDLER URL CHECK");
-  let hostname = '';
-  let path = '';
+  let hostname = "";
+  let path = "";
  function pathcheck(str) {
    //    console.log("(urlcheck) HANDLER PATH CHECK", str);
    if (str != undefined) {
-      let final = str.split('/')[0];
-      if (final === 'i2ptunnelmgr' || final === 'i2ptunnel') {
-        console.log('(urlcheck) Tunnel application path', final);
-        return 'i2ptunnelmgr';
+      let final = str.split("/")[0];
+      if (final === "i2ptunnelmgr" || final === "i2ptunnel") {
+        console.log("(urlcheck) Tunnel application path", final);
+        return "i2ptunnelmgr";
      } else if (
-        final === 'i2psnark' ||
-        final === 'torrents' ||
-        final.startsWith('transmission') ||
-        final.startsWith('tracker') ||
-        url.includes(':7662')
+        final === "i2psnark" ||
+        final === "torrents" ||
+        final.startsWith("transmission") ||
+        final.startsWith("tracker") ||
+        url.includes(":7662")
      ) {
-        console.log('(urlcheck) Torrent application path', final);
-        return 'i2psnark';
-      } else if (final === 'webmail' || final === 'susimail') {
-        console.log('(urlcheck) Mail application path', final);
-        return 'webmail';
-      } else if (final.startsWith('MuWire')) {
-        if (!url.includes('.png')) {
-          console.log('(urlcheck) MuWire application path', final);
-          return 'muwire';
+        console.log("(urlcheck) Torrent application path", final);
+        return "i2psnark";
+      } else if (final === "webmail" || final === "susimail") {
+        if (!url.includes(".css")) {
+          console.log("(urlcheck) Mail application path", final);
+          return "webmail";
        }
-      } else if (final.startsWith('i2pbote')) {
-        if (!url.includes('.png')) {
-          console.log('(urlcheck) I2PBote application path', final);
-          return 'i2pbote';
+      } else if (final.startsWith("MuWire")) {
+        if (!url.includes(".png")) {
+          console.log("(urlcheck) MuWire application path", final);
+          return "muwire";
+        }
+      } else if (final.startsWith("i2pbote")) {
+        if (!url.includes(".png")) {
+          console.log("(urlcheck) I2PBote application path", final);
+          return "i2pbote";
        }
      } else if (
-        final === 'home' ||
-        final === 'console' ||
-        final === 'dns' ||
-        final === 'sitemap' ||
-        final.startsWith('config')
+        final === "home" ||
+        final === "console" ||
+        final === "dns" ||
+        final === "susidns" ||
+        final.startsWith("susidns") ||
+        final === "sitemap" ||
+        final.startsWith("config")
      ) {
-        console.log('(urlcheck) Console application path', final);
-        return 'routerconsole';
+        console.log("(urlcheck) Console application path", final);
+        return "routerconsole";
      }
    }
    return true;
  }
-  if (url.indexOf('://') > -1) {
-    hostname = url.split('/')[2];
-    let prefix = url.substr(0, url.indexOf('://') + 3);
-    path = url.replace(prefix + hostname + '/', '');
+  if (url.indexOf("://") > -1) {
+    hostname = url.split("/")[2];
+    let prefix = url.substr(0, url.indexOf("://") + 3);
+    path = url.replace(prefix + hostname + "/", "");
  } else if (identifyProtocolHandler(url)) {
    let newurl = identifyProtocolHandler(url);
    return routerHost(newurl);
  } else {
-    hostname = url.split('/')[0];
-    path = url.replace(hostname + '/', '');
+    hostname = url.split("/")[0];
+    path = url.replace(hostname + "/", "");
  }
-  if (hostname === control_host + ':' + control_port) {
+  if (hostname === control_host + ":" + control_port) {
    //console.log("(hostcheck) router console found on configured ports");
    return pathcheck(path);
  }
-  if (hostname === 'localhost' + ':' + control_port) {
+  if (hostname === "localhost" + ":" + control_port) {
    //console.log("(hostcheck) router console found on configured ports");
    return pathcheck(path);
  }
-  if (hostname === '127.0.0.1' + ':' + control_port) {
+  if (hostname === "127.0.0.1" + ":" + control_port) {
    return pathcheck(path);
  }

@@ -73,36 +77,36 @@ function routerHost(url) {
 function identifyProtocolHandler(url) {
  //console.log("looking for handler-able requests")
  if (routerHost(url)) {
-    if (url.includes(encodeURIComponent('ext+rc:'))) {
-      return url.replace(encodeURIComponent('ext+rc:'), '');
-    } else if (url.includes('ext+rc:')) {
-      return url.replace('ext+rc:', '');
+    if (url.includes(encodeURIComponent("ext+rc:"))) {
+      return url.replace(encodeURIComponent("ext+rc:"), "");
+    } else if (url.includes("ext+rc:")) {
+      return url.replace("ext+rc:", "");
    }
-  } else if (url.includes('ext+rc:')) {
+  } else if (url.includes("ext+rc:")) {
    return url;
  }
  return false;
 }

 function trimHost(url) {
-  let hostname = '';
-  let prefix = '';
-  if (url.indexOf('://') > -1) {
-    prefix = url.substr(0, url.indexOf('://') + 3);
-    hostname = url.split('/')[2];
+  let hostname = "";
+  let prefix = "";
+  if (url.indexOf("://") > -1) {
+    prefix = url.substr(0, url.indexOf("://") + 3);
+    hostname = url.split("/")[2];
  } else {
-    hostname = url.split('/')[0];
+    hostname = url.split("/")[0];
  }
-  let path = url.replace(prefix + hostname, '');
-  console.log('(handler) path', prefix + hostname, path);
+  let path = url.replace(prefix + hostname, "");
+  console.log("(handler) path", prefix + hostname, path);
  return path;
 }

-var handlerSetup = function(requestDetails) {
+var handlerSetup = function (requestDetails) {
  //console.log("checking protocol handler listener")
  let rwurl = identifyProtocolHandler(requestDetails.url);
  if (rwurl != false) {
-    console.log('(handler) rewrite URL requested', rwurl);
+    console.log("(handler) rewrite URL requested", rwurl);
    requestDetails.redirectUrl = rwurl;
    requestDetails.url = trimHost(rwurl);
    requestDetails.originUrl = trimHost(rwurl);
--- a/home.css
+++ b/home.css
@@ -1,20 +1,113 @@
 * {
  padding: 0;
-  color: #1f1a24;
  margin: 0
 }
+html {
+  margin: 0 4%;
+  padding: 0 20px;
+  min-height: 100%;
+  background: #9ab;
+  background: repeating-linear-gradient(to bottom, #9ab, #89a 2px);
+  scrollbar-color: #bcd #789
+}
+body {
+  margin: 0;
+  padding: 20px 40px;
+  font-family: Open Sans,Noto Sans,Segoe UI,sans-serif;
+  font-size: 12pt;
+  color: #495057;
+  text-decoration: none;
+  word-wrap: break-word;
+  border-left: 1px solid #495057;
+  border-right: 1px solid #495057;
+  box-shadow: 0 0 2px 2px rgba(0, 0, 0, .1);
+  background: #f2f2f2
+}
+h1,
+h2,
+h3,
+h4 {
+  display: block;
+  font-weight: 700
+}
+h1 {
+  text-transform: uppercase;
+  font-weight: 900;
+  font-size: 200%
+}
+h2 {
+  font-size: 140%
+}
+h3 {
+  font-size: 120%
+}
+h4 {
+  margin-bottom: 5px;
+  text-align: right;
+  text-transform: none;
+  font-size: 90%;
+  font-weight: 600;
+  font-style: italic
+}
+p {
+  margin-bottom: 15px;
+  width: 100%;
+  line-height: 1.4;
+  word-wrap: break-word;
+  text-align: justify;
+  text-decoration: none
+}
+ul {
+  margin: 10px 20px;
+  list-style: none
+}
+li {
+  margin-left: 0;
+  padding: 12px 15px 15px 20px;
+  width: calc(100% - 40px);
+  text-align: justify;
+  border: 1px solid #9ab;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff;
+  background: #dee2e6
+}
+li li {
+  padding-bottom: 0;
+  width: calc(100% - 40px);
+  text-align: left;
+  border: none;
+  border-top: 1px solid #9ab;
+  box-shadow: none
+}
+li li:first-of-type {
+  margin-top: 15px;
+  border-top: none
+}
+li a:first-of-type {
+  display: block;
+  width: 100%
+}
+#applicationExplain {
+  float: unset
+}
+li+li {
+  margin-top: 15px
+}
+h3+ul,
+ul+h2,
+ul+h3 {
+  margin-top: 20px
+}
 a,
 button {
-  color: #1f1a24;
+  color: #3b6bbf;
  text-decoration: none;
-  background: none;
  font-weight: 700;
  word-wrap: break-word;
-  outline: 0;
-  padding: 3px;
-  margin: auto
+  outline: 0
 }
 .applicationDesc {
+  color: #81888f;
  text-decoration: none;
  font-weight: 700;
  word-wrap: break-word;
@@ -23,7 +116,6 @@ button {
 .applicationDesc:hover,
 a:hover,
 button:hover {
-  color: #495057;
  text-decoration: none;
  font-weight: 700;
  word-wrap: break-word;
@@ -38,91 +130,43 @@ button {
  word-wrap: break-word;
  outline: 0
 }
-body {
-  display: flex;
-  flex-direction: column;
-  font-family: "Droid Sans","Noto Sans",Ubuntu,"Segoe UI","Lucida Grande",Verdana,Helvetica,sans-serif;
-  margin: 0 auto;
-  padding: 0;
-  text-decoration: none;
-  font-weight: 700;
-  word-wrap: break-word;
-  outline: 0
-}
-.button-list {
-  min-height: 230px;
-  min-width: 230px
-}
 .background {
+  background-color: #f8f8ff;
  height: 100%
 }
-p {
-  line-height: 32px;
-  font-size: 17px;
-  font-family: "Droid Sans","Noto Sans",Ubuntu,"Segoe UI","Lucida Grande",Verdana,Helvetica,sans-serif;
-  text-decoration: none;
-  font-weight: 700;
-  word-wrap: break-word;
-  outline: 0
-}
 .content {
-  min-height: 3rem;
-  padding: 1rem;
  margin: 1.5rem;
-  display: block;
+  padding: 1rem;
+  min-height: 3rem;
+  min-width: 95%;
+  display: inline-block;
+  border: 1px solid #d9d9d6;
  border-radius: 2px;
-  min-width: 100%
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
+  background: #f8f8ff
 }
 #header,
 .application-info,
 .browser-info,
 .extended-info,
 .search-info {
-  min-height: 3rem;
-  padding: 1rem;
  margin-top: 1.5rem;
-  display: block;
+  padding: 1rem;
+  min-height: 3rem;
+  min-width: 95%;
+  display: inline-block;
+  border: 1px solid #d9d9d6;
  border-radius: 2px;
-  min-width: 100%
-}
-h1 {
-  margin: auto;
-  font-family: "Droid Sans","Noto Sans",Ubuntu,"Segoe UI","Lucida Grande",Verdana,Helvetica,sans-serif;
-  font-weight: 600;
-  font-size: 32px;
-  color: #e6e6e7;
-  background: #1f1a24;
-  width: 100%;
-  border-radius: 2px 2px 0 0
-}
-h2,
-h3 {
-  margin-right: auto;
-  font-family: "Droid Sans","Noto Sans",Ubuntu,"Segoe UI","Lucida Grande",Verdana,Helvetica,sans-serif;
-  font-weight: 600;
-  font-size: 25px;
-  color: #e6e6e7;
-  border-radius: 2px 2px 0 0;
-  background: #1f1a24;
-  width: 100%;
-  padding-left: 5%
-}
-h4 {
-  margin-right: auto;
-  font-family: "Droid Sans","Noto Sans",Ubuntu,"Segoe UI","Lucida Grande",Verdana,Helvetica,sans-serif;
-  font-weight: 600;
-  font-size: 20px!important;
-  color: #41465f;
-  border-radius: 2px 2px 0 0;
-  background: #1f1a24;
-  width: 100%;
-  padding-left: 5%
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
+  background: #f8f8ff
 }
 .showhider {
  margin-right: auto;
-  font-family: "Droid Sans","Noto Sans",Ubuntu,"Segoe UI","Lucida Grande",Verdana,Helvetica,sans-serif;
-  border: none;
  padding: 0!important;
+  text-transform: uppercase;
+  background: none!important;
+  border: none;
+  width: 90%;
  color: #3b6bbf;
  text-decoration: none;
  font-weight: 700;
@@ -138,34 +182,18 @@ h4 {
  flex-direction: row;
  margin-bottom: 80px
 }
-ul {
-  margin: auto;
-  border-radius: 2px;
-  width: 100%;
-  margin: 0;
-  padding: 0
-}
-li {
-  display: block;
-  text-align: center;
-  margin: 0;
-  padding: 0
-}
-.center {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-  width: 50%
-}
 #readyness {
  padding-top: 1rem;
  padding-bottom: 1rem;
  margin: 1rem;
  width: 42%;
  min-width: 42%;
+  background: #dee2e6;
  text-align: center!important;
+  border: 1px solid #dee2e6;
  border-radius: 2px;
-  display: block
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
+  display: inline-block
 }
 #onboarding {
  min-height: 5rem;
@@ -175,22 +203,22 @@ li {
  width: 42%;
  min-width: 42%;
  font-size: 2rem;
+  background: #a48fe1;
  text-align: center!important;
-  border-radius: 2px
+  border: 1px solid #a48fe1;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
 }
 #i2pbrowser-description {
  padding-top: 1rem;
  padding-bottom: 1rem;
  width: 50%;
  min-width: 50%;
-  display: block
-}
-html body ul.label-list li {
-  list-style: none;
-  float: left
-}
-html body ul.label-list li:nth-child(odd) {
-  clear: left
+  display: inline-block;
+  background: #dee2e6;
+  border: 1px solid #dee2e6;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
 }
 #linksExplain {
  min-height: 5rem;
@@ -198,15 +226,24 @@ html body ul.label-list li:nth-child(odd) {
  margin: .5rem;
  width: 30%;
  min-width: 30%;
+  background: #dee2e6;
  text-align: center!important;
-  border-radius: 2px
+  border: 1px solid #dee2e6;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
 }
 #applicationExplain,
 #controlExplain {
  min-height: 5rem;
  padding: .5rem;
  margin: .5rem;
-  text-align: left!important;
+  width: 30%;
+  min-width: 30%;
+  background: #dee2e6;
+  text-align: center!important;
+  border: 1px solid #dee2e6;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
  float: left
 }
 #proxyReady {
@@ -215,9 +252,13 @@ html body ul.label-list li:nth-child(odd) {
  margin: .2rem;
  width: 38%;
  min-width: 38%;
-  display: block;
+  display: inline-block;
+  background: #d9d9d6;
  float: right;
-  text-align: center!important
+  text-align: center!important;
+  border: 1px solid #d9d9d6;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
 }
 #proxyUnready {
  min-height: 3rem;
@@ -225,9 +266,13 @@ html body ul.label-list li:nth-child(odd) {
  margin: .2rem;
  width: 38%;
  min-width: 38%;
-  display: block;
+  display: inline-block;
  float: right;
-  text-align: center!important
+  text-align: center!important;
+  border: 1px solid #ffc56d;
+  border-radius: 2px;
+  background: #ffc56d;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
 }
 #consoleOn {
  min-height: 3rem;
@@ -235,19 +280,13 @@ html body ul.label-list li:nth-child(odd) {
  margin: .2rem;
  width: 38%;
  min-width: 38%;
-  display: block;
+  display: inline-block;
  float: left;
-  text-align: center!important
-}
-.tabicon {
-  min-width: 64px;
-  min-height: 64px
-}
-li.application {
-  text-align: left
-}
-button.applicationName {
-  width: auto
+  text-align: center!important;
+  border: 1px solid #f7e59a;
+  border-radius: 2px;
+  background: #f7e59a;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
 }
 .onboardingContent {
  font-size: .8rem!important;
@@ -263,19 +302,26 @@ button.applicationName {
  opacity: 1
 }
 img {
-  max-width: 100%;
-  margin: 3%
+  max-width: 100%
 }
 img.readyness {
  height: 100%;
  width: auto
 }
-input {
-  color: #1f1a24
+@media only screen and (max-width: 399px) {
+  .application-info {
+    display: none
+  }
 }
-#hidden {
-  display: none
+@media screen and (max-width: 1200px) {
+  body {
+    font-size: 10.5pt
+  }
+}
+video {
+  width: 100%
 }
 .hidden {
+  visibility: none;
  display: none
 }
--- a/home.html
+++ b/home.html
@@ -86,8 +86,8 @@
                        </div>
                    </li>-->

-                    <li class="application">
-                        <a class="applicationName" href="toopie.html" id="window-visit-toopie">Toopie</a> <span class="applicationDesc" id="toopie">For information about your I2P router status, go here:</span>
+                    <li class="application window-visit-toopie">
+                        <a class="applicationName window-visit-toopie" href="toopie.html" id="window-visit-toopie">Toopie</a> <span class="applicationDesc window-visit-toopie" id="toopie">For information about your I2P router status, go here:</span>
                    </li>

                    <li class="application">
@@ -147,5 +147,7 @@
    </div>
    <script src="home.js" type="text/javascript"></script> 
    <script src="content.js" type="text/javascript"></script> <!--</div>-->
+     
+    <script src="i2pcontrol/i2pcontrol.js" type="text/javascript"></script> <!--</div>-->
 </body>
 </html>
--- a/home.js
+++ b/home.js
@@ -1,25 +1,25 @@
-document.addEventListener('click', (clickEvent) => {
-  if (clickEvent.target.id === 'onboardingButtonZero') {
-    flipVisibility('onboardingContentZero');
-  } else if (clickEvent.target.id === 'onboardingButtonOne') {
-    flipVisibility('onboardingContentOne');
-  } else if (clickEvent.target.id === 'onboardingButtonTwo') {
-    flipVisibility('onboardingContentTwo');
-  } else if (clickEvent.target.id === 'onboardingButtonThree') {
-    flipVisibility('onboardingContentThree');
-  } else if (clickEvent.target.id === 'onboardingButtonFour') {
-    flipVisibility('onboardingContentFour');
-  } else if (clickEvent.target.id === 'fliplinks') {
-    flipVisibility('info-content');
+document.addEventListener("click", (clickEvent) => {
+  if (clickEvent.target.id === "onboardingButtonZero") {
+    flipVisibility("onboardingContentZero");
+  } else if (clickEvent.target.id === "onboardingButtonOne") {
+    flipVisibility("onboardingContentOne");
+  } else if (clickEvent.target.id === "onboardingButtonTwo") {
+    flipVisibility("onboardingContentTwo");
+  } else if (clickEvent.target.id === "onboardingButtonThree") {
+    flipVisibility("onboardingContentThree");
+  } else if (clickEvent.target.id === "onboardingButtonFour") {
+    flipVisibility("onboardingContentFour");
+  } else if (clickEvent.target.id === "fliplinks") {
+    flipVisibility("info-content");
  }
 });

 function flipVisibility(div) {
-  console.log('(home) seeking flippable', div);
+  console.log("(home) seeking flippable", div);
  let flippable = document.getElementById(div);
-  if (flippable.style.display !== 'block') {
-    flippable.style.display = 'block';
+  if (flippable.style.display !== "block") {
+    flippable.style.display = "block";
  } else {
-    flippable.style.display = 'none';
+    flippable.style.display = "none";
  }
 }
--- a/host.js
+++ b/host.js
@@ -1,15 +1,15 @@
 function proxyHost(url) {
-  let hostname = '';
-  if (url.indexOf('://') > -1) {
-    hostname = url.split('/')[2];
+  let hostname = "";
+  if (url.indexOf("://") > -1) {
+    hostname = url.split("/")[2];
  } else {
-    hostname = url.split('/')[0];
+    hostname = url.split("/")[0];
  }
-  if (hostname == 'proxy.i2p') {
+  if (hostname == "proxy.i2p") {
    return true;
  }
  if (
-    hostname == 'c6lilt4cr5x7jifxridpkesf2zgfwqfchtp6laihr4pdqomq25iq.b32.i2p'
+    hostname == "c6lilt4cr5x7jifxridpkesf2zgfwqfchtp6laihr4pdqomq25iq.b32.i2p"
  ) {
    return true;
  }
@@ -17,140 +17,160 @@ function proxyHost(url) {
 }

 function localHost(url) {
-  let hostname = '';
-  if (url.indexOf('://') > -1) {
-    hostname = url.split('/')[2];
+  let hostname = "";
+  if (url.indexOf("://") > -1) {
+    hostname = url.split("/")[2];
  } else {
-    hostname = url.split('/')[0];
+    hostname = url.split("/")[0];
  }
-  hostname = hostname.split(':')[0];
-  if (hostname === '127.0.0.1') {
-    return true;
-  } else if (hostname === 'localhost') {
-    return true;
+  hostname = hostname.split(":")[0];
+  console.log("(urlcheck) hostname localhost", hostname);
+  console.log("(urlcheck) url localhost", url);
+  if (hostname === "127.0.0.1") {
+    if (url.indexOf(":8084") != -1) return "blog";
+    if (url.indexOf(":7669") != -1) return "irc";
+  } else if (hostname === "localhost") {
+    if (url.indexOf(":8084") != -1) return "blog";
+    if (url.indexOf(":7669") != -1) return "irc";
  }

  return false;
 }

 function extensionHost(url) {
+  var prefix = browser.runtime
+    .getURL("")
+    .replace("moz-extension://", "")
+    .replace("/", "");
  if (url.originUrl !== undefined) {
-    var res = url.originUrl.startsWith(browser.runtime.getURL(''));
+    var originUrl = url.originUrl
+      .replace("moz-extension://", "")
+      .replace("/", "");
+    //    console.log("(urlcheck) Extension application path", originUrl);
+    //    console.log("(urlcheck) Extension application path", prefix);
+    var res = originUrl.startsWith(prefix);
+    //    console.log("(urlcheck) Extension application path", res);
    if (res) return res;
  }
-  if (url.url !== undefined) {
-    var res = url.url.startsWith(browser.runtime.getURL(''));
+  if (url.documentUrl !== undefined) {
+    //    console.log("(urlcheck) Extension application path", originUrl);
+    //    console.log("(urlcheck) Extension application path", prefix);
+    var res = originUrl.startsWith(prefix);
+    //    console.log("(urlcheck) Extension application path", res);
    if (res) return res;
  }
+  console.log("(urlcheck) Extension application path", url);
 }

 function i2pHostName(url) {
-  let hostname = '';
-  console.log('(hosts)', url);
+  let hostname = "";
+  console.log("(hosts)", url);
  let u = new URL(url);
-  if (u.host.endsWith('.i2p')) {
+  if (u.host.endsWith(".i2p")) {
    hostname = u.host;
-  } else if (url.includes('=')) {
-    if (url.includes('.i2p')) {
-      lsit = url.split('=');
+  } else if (url.includes("=")) {
+    if (url.includes(".i2p")) {
+      lsit = url.split("=");
      for (let item in lsit) {
        var items = lsit[item].split(`\ % `); //"\%")
        for (let p in items) {
-          if (items[p].includes('.i2p')) {
-            hostname = items[p].replace('3D', 1);
+          if (items[p].includes(".i2p")) {
+            hostname = items[p].replace("3D", 1);
          }
          break;
        }
-        if (hostname != '') {
+        if (hostname != "") {
          break;
        }
      }
    }
-  } else if (url.indexOf('://') > -1) {
-    hostname = url.split('/')[2];
+  } else if (url.indexOf("://") > -1) {
+    hostname = url.split("/")[2];
  } else {
-    hostname = url.split('/')[0];
+    hostname = url.split("/")[0];
  }
-  console.log('(hosts) scrub', hostname);
+  console.log("(hosts) scrub", hostname);
  return hostname;
 }

 function i2pHost(url) {
  let hostname = i2pHostName(url);
-  return hostname.endsWith('.i2p');
+  return hostname.endsWith(".i2p");
 }

 function routerHost(url) {
  //  console.log("(urlcheck) HOST URL CHECK");
-  let hostname = '';
-  let path = '';
+  let hostname = "";
+  let path = "";
  function pathcheck(str) {
    if (str != undefined) {
-      let final = str.split('/')[0];
-      if (final === 'i2ptunnelmgr' || final === 'i2ptunnel') {
-        console.log('(urlcheck) Tunnel application path', final);
-        return 'i2ptunnelmgr';
+      let final = str.split("/")[0];
+      if (final === "i2ptunnelmgr" || final === "i2ptunnel") {
+        console.log("(urlcheck) Tunnel application path", final);
+        return "i2ptunnelmgr";
      } else if (
-        final === 'i2psnark' ||
-        final === 'torrents' ||
-        final.startsWith('transmission') ||
-        final.startsWith('tracker') ||
-        url.includes(':7662')
+        final === "i2psnark" ||
+        final === "torrents" ||
+        final.startsWith("transmission") ||
+        final.startsWith("tracker") ||
+        url.includes(":7662")
      ) {
-        console.log('(urlcheck) Torrent application path', final);
-        return 'i2psnark';
-      } else if (final === 'webmail' || final === 'susimail') {
-        console.log('(urlcheck) Mail application path', final);
-        return 'webmail';
-      } else if (final.startsWith('MuWire')) {
-        if (!url.includes('.png')) {
-          console.log('(urlcheck) MuWire application path', final);
-          return 'muwire';
+        console.log("(urlcheck) Torrent application path", final);
+        return "i2psnark";
+      } else if (final === "webmail" || final === "susimail") {
+        if (!url.includes(".css")) {
+          console.log("(urlcheck) Mail application path", final);
+          return "webmail";
        }
-      } else if (final.startsWith('i2pbote')) {
-        if (!url.includes('.png')) {
-          console.log('(urlcheck) I2PBote application path', final);
-          return 'i2pbote';
+      } else if (final.startsWith("MuWire")) {
+        if (!url.includes(".png")) {
+          console.log("(urlcheck) MuWire application path", final);
+          return "muwire";
+        }
+      } else if (final.startsWith("i2pbote")) {
+        if (!url.includes(".png")) {
+          console.log("(urlcheck) I2PBote application path", final);
+          return "i2pbote";
        }
      } else if (
-        final === 'home' ||
-        final === 'console' ||
-        final === 'dns' ||
-        final === 'susidns' ||
-        final.startsWith('susidns') ||
-        final === 'sitemap' ||
-        final.startsWith('config')
+        final === "home" ||
+        final === "console" ||
+        final === "dns" ||
+        final === "susidns" ||
+        final.startsWith("susidns") ||
+        final === "sitemap" ||
+        final.startsWith("config")
      ) {
-        console.log('(urlcheck) Console application path', final);
-        return 'routerconsole';
+        console.log("(urlcheck) Console application path", final);
+        return "routerconsole";
      }
    }
    return true;
  }
-  if (url.indexOf('://') > -1) {
-    hostname = url.split('/')[2];
-    let prefix = url.substr(0, url.indexOf('://') + 3);
-    path = url.replace(prefix + hostname + '/', '');
+  if (url.indexOf("://") > -1) {
+    hostname = url.split("/")[2];
+    let prefix = url.substr(0, url.indexOf("://") + 3);
+    path = url.replace(prefix + hostname + "/", "");
  } else if (identifyProtocolHandler(url)) {
    let newurl = identifyProtocolHandler(url);
    return routerHost(newurl);
  } else {
-    hostname = url.split('/')[0];
-    path = url.replace(hostname + '/', '');
+    hostname = url.split("/")[0];
+    path = url.replace(hostname + "/", "");
  }
-  if (hostname === control_host + ':' + control_port) {
+  if (hostname === control_host + ":" + control_port) {
    return pathcheck(path);
  }
-  if (hostname === 'localhost' + ':' + control_port) {
+  if (hostname === "localhost" + ":" + control_port) {
    return pathcheck(path);
  }
-  if (hostname === '127.0.0.1' + ':' + control_port) {
+  if (hostname === "127.0.0.1" + ":" + control_port) {
    return pathcheck(path);
  }
-  if (hostname === 'localhost' + ':' + 7070) {
+  if (hostname === "localhost" + ":" + 7070) {
    return pathcheck(path);
  }
-  if (hostname === '127.0.0.1' + ':' + 7070) {
+  if (hostname === "127.0.0.1" + ":" + 7070) {
    return pathcheck(path);
  }
  return false;
--- a/i2p-https.png
+++ b/i2p-https.png
--- a/i2pcontrol/README.md
+++ b/i2pcontrol/README.md
@@ -1,5 +1,8 @@
-i2pcontrol.js
-=============
+toopie.html/i2pcontrol.js
+=========================

-This is inside of the webextension for now, but it's actually a fully-fledged,
-standalone library for talking to i2pcontrol.
+To enable toopie.html, the built in I2P monitoring system in this webextension,
+go to the [Web App Configuration page in the I2P Router and start I2PControl](http://127.0.0.1:7657/configwebapps).
+Click the "Start" button next to the menu item that says `jsonrpc`.
+
+- ![i2pcontrol.png](i2pcontrol.png)
--- a/i2pcontrol/i2pcontrol.js
+++ b/i2pcontrol/i2pcontrol.js
@@ -1,391 +1,420 @@
-var hello = 'hello i2pcontrol';
+if (browser.windows != undefined) {
+  var hello = "hello i2pcontrol";

-function makeid(length) {
-  var result = '';
-  var characters =
-    'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-  var charactersLength = characters.length;
-  for (var i = 0; i < length; i++) {
-    result += characters.charAt(Math.floor(Math.random() * charactersLength));
-  }
-  return result;
-}
-
-function send(
-  message,
-  control_host = "127.0.0.1",
-  control_port = "7657",
-  control_path = "jsonrpc"
-) {
-  async function postData(url = "", data = {}) {
-    // Default options are marked with *
-    let requestBody = JSON.stringify(data);
-    //console.log("(i2pcontrol) sending request", requestBody);
-    let opts = {
-      method: 'POST', // *GET, POST, PUT, DELETE, etc.
-      mode: 'cors', // no-cors, *cors, same-origin
-      cache: 'no-cache', // *default, no-cache, reload, force-cache, only-if-cached
-      credentials: 'same-origin', // include, *same-origin, omit
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      redirect: 'follow', // manual, *follow, error
-      referrerPolicy: 'no-referrer', // no-referrer, *client
-      body: requestBody, // body data type must match "Content-Type" header
-    };
-    const response = await fetch(url, opts);
-    return await response.json(); // parses JSON response into native JavaScript objects
+  function makeid(length) {
+    var result = "";
+    var characters =
+      "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+    var charactersLength = characters.length;
+    for (var i = 0; i < length; i++) {
+      result += characters.charAt(Math.floor(Math.random() * charactersLength));
+    }
+    return result;
  }

-  //console.log("http://" + control_host + ":" + control_port + "/" + control_path)
-  return postData(
-    'http://' + control_host + ':' + control_port + '/' + control_path + '/',
-    message
-  );
-}
+  function send(
+    message,
+    control_host = "127.0.0.1",
+    control_port = "7657",
+    control_path = "jsonrpc"
+  ) {
+    async function postData(url = "", data = {}) {
+      // Default options are marked with *
+      let requestBody = JSON.stringify(data);
+      //console.log("(i2pcontrol) sending request", requestBody);
+      let opts = {
+        method: "POST", // *GET, POST, PUT, DELETE, etc.
+        mode: "cors", // no-cors, *cors, same-origin
+        cache: "no-cache", // *default, no-cache, reload, force-cache, only-if-cached
+        credentials: "same-origin", // include, *same-origin, omit
+        headers: {
+          "Content-Type": "application/json",
+        },
+        redirect: "follow", // manual, *follow, error
+        referrerPolicy: "no-referrer", // no-referrer, *client
+        body: requestBody, // body data type must match "Content-Type" header
+      };
+      const response = await fetch(url, opts);
+      return await response.json(); // parses JSON response into native JavaScript objects
+    }

-async function authenticate(
-  password = "itoopie",
-  control_host = "127.0.0.1",
-  control_port = "7657",
-  control_path = "jsonrpc"
-) {
-  var json = new Object();
-  json['id'] = makeid(6);
-  json['jsonrpc'] = '2.0';
-  json['method'] = 'Authenticate';
-  json['params'] = new Object();
-  json['params']['API'] = 1;
-  json['params']['Password'] = password;
-  return send(json, control_host, control_port, control_path);
-}
-
-async function GetToken(
-  password = "itoopie",
-  control_host = "127.0.0.1",
-  control_port = "7657",
-  control_path = "jsonrpc"
-) {
-  function gettoken(authtoken) {
-    return authtoken.result.Token;
+    //console.log("http://" + control_host + ":" + control_port + "/" + control_path)
+    return postData(
+      "http://" + control_host + ":" + control_port + "/" + control_path + "/",
+      message
+    );
  }
-  let me = authenticate(password, control_host, control_port, control_path);
-  return await me.then(gettoken);
-}

-async function Echo(
-  message,
-  control_host = "127.0.0.1",
-  control_port = "7657",
-  control_path = "jsonrpc",
-  password = "itoopie"
-) {
-  function echo(token) {
-    console.log('(i2pcontrol) testing I2PControl connection');
+  async function authenticate(
+    password = "itoopie",
+    control_host = "127.0.0.1",
+    control_port = "7657",
+    control_path = "jsonrpc"
+  ) {
    var json = new Object();
-    json['id'] = makeid(6);
-    json['jsonrpc'] = '2.0';
-    json['method'] = 'Echo';
-    json['params'] = new Object();
-    json['params']['Token'] = token;
-    json['params']['Echo'] = message;
+    json["id"] = makeid(6);
+    json["jsonrpc"] = "2.0";
+    json["method"] = "Authenticate";
+    json["params"] = new Object();
+    json["params"]["API"] = 1;
+    json["params"]["Password"] = password;
    return send(json, control_host, control_port, control_path);
  }
-  let token = GetToken(password, control_host, control_port, control_path);
-  let done = await token.then(echo);
-  return done;
-}

-function UpdateEchoElementByID(
-  Query,
-  ID,
-  control_host = "127.0.0.1",
-  control_port = "7657",
-  control_path = "jsonrpc"
-) {
-  function updateelement(update) {
-    //console.log("(i2pcontrol)", update);
-    if (document.getElementById(ID) !== null)
-      document.getElementById(ID).innerText = update;
+  async function GetToken(
+    password = "itoopie",
+    control_host = "127.0.0.1",
+    control_port = "7657",
+    control_path = "jsonrpc"
+  ) {
+    function gettoken(authtoken) {
+      return authtoken.result.Token;
+    }
+    let me = authenticate(password, control_host, control_port, control_path);
+    return await me.then(gettoken);
  }
-  let net = Echo(Query, control_host, control_port, control_path, password);
-  net.then(updateleement);
-}

-async function GetRate(
-  Query,
-  control_host = "127.0.0.1",
-  control_port = "7657",
-  control_path = "jsonrpc",
-  password = "itoopie"
-) {
-  function getrate(token) {
-    var json = new Object();
-    json['id'] = makeid(6);
-    json['jsonrpc'] = '2.0';
-    json['method'] = 'I2PControl';
-    json['params'] = new Object();
-    json['params']['Token'] = token;
-    json['params']['Stat'] = Query;
-    json['params']['Period'] = 2000;
-    return send(json, control_host, control_port, control_path);
+  async function Echo(
+    message,
+    control_host = "127.0.0.1",
+    control_port = "7657",
+    control_path = "jsonrpc",
+    password = "itoopie"
+  ) {
+    function echo(token) {
+      console.log("(i2pcontrol) testing I2PControl connection");
+      var json = new Object();
+      json["id"] = makeid(6);
+      json["jsonrpc"] = "2.0";
+      json["method"] = "Echo";
+      json["params"] = new Object();
+      json["params"]["Token"] = token;
+      json["params"]["Echo"] = message;
+      return send(json, control_host, control_port, control_path);
+    }
+    let token = GetToken(password, control_host, control_port, control_path);
+    let done = await token.then(echo);
+    return done;
  }
-  let token = GetToken(password, control_host, control_port, control_path);
-  let done = await token.then(getrate);
-  return done;
-}

-function UpdateGetRateElementByID(
-  Query,
-  ID,
-  control_host = "127.0.0.1",
-  control_port = "7657",
-  control_path = "jsonrpc"
-) {
-  function updateelement(update) {
-    //console.log("(i2pcontrol)", update);
-    if (document.getElementById(ID) !== null)
-      document.getElementById(ID).innerText = update;
-  }
-  let net = GetRate(Query, control_host, control_port, control_path, password);
-  net.then(updateleement);
-}
-
-async function I2PControl(
-  Query,
-  control_host = "127.0.0.1",
-  control_port = "7657",
-  control_path = "jsonrpc",
-  password = "itoopie"
-) {
-  function i2pcontrol(token) {
-    var json = new Object();
-    json['id'] = makeid(6);
-    json['jsonrpc'] = '2.0';
-    json['method'] = 'I2PControl';
-    json['params'] = new Object();
-    json['params']['Token'] = token;
-    json['params'][Query] = null;
-    return send(json, control_host, control_port, control_path);
-  }
-  let token = GetToken(password, control_host, control_port, control_path);
-  let done = await token.then(i2pcontrol);
-  return done;
-}
-
-function UpdateI2PControlElementByID(
-  Query,
-  ID,
-  control_host = "127.0.0.1",
-  control_port = "7657",
-  control_path = "jsonrpc"
-) {
-  function updateelement(update) {
-    //console.log("(i2pcontrol)", update);
-    if (document.getElementById(ID) !== null)
-      document.getElementById(ID).innerText = update;
-  }
-  let net = I2PControl(
+  function UpdateEchoElementByID(
    Query,
-    control_host,
-    control_port,
-    control_path,
-    password
-  );
-  net.then(updateleement);
-}
-
-async function RouterInfo(
-  Query,
-  control_host = "127.0.0.1",
-  control_port = "7657",
-  control_path = "jsonrpc",
-  password = "itoopie"
-) {
-  function routerinfo(token) {
-    var json = new Object();
-    json['id'] = makeid(6);
-    json['jsonrpc'] = '2.0';
-    json['method'] = 'RouterInfo';
-    json['params'] = new Object();
-    json['params']['Token'] = token;
-    json['params'][Query] = null;
-    return send(json, control_host, control_port, control_path);
+    ID,
+    control_host = "127.0.0.1",
+    control_port = "7657",
+    control_path = "jsonrpc"
+  ) {
+    function updateelement(update) {
+      //console.log("(i2pcontrol)", update);
+      if (document.getElementById(ID) !== null)
+        document.getElementById(ID).innerText = update;
+    }
+    let net = Echo(Query, control_host, control_port, control_path, password);
+    net.then(updateleement);
  }
-  let token = GetToken(password, control_host, control_port, control_path);
-  let done = await token.then(routerinfo);
-  return done;
-}

-function UpdateRouterInfoElementByID(
-  Query,
-  ID,
-  control_host = "127.0.0.1",
-  control_port = "7657",
-  control_path = "jsonrpc",
-  password = "itoopie"
-) {
-  function updateelement(update) {
-    /*console.log(
+  async function GetRate(
+    Query,
+    control_host = "127.0.0.1",
+    control_port = "7657",
+    control_path = "jsonrpc",
+    password = "itoopie"
+  ) {
+    function getrate(token) {
+      var json = new Object();
+      json["id"] = makeid(6);
+      json["jsonrpc"] = "2.0";
+      json["method"] = "I2PControl";
+      json["params"] = new Object();
+      json["params"]["Token"] = token;
+      json["params"]["Stat"] = Query;
+      json["params"]["Period"] = 2000;
+      return send(json, control_host, control_port, control_path);
+    }
+    let token = GetToken(password, control_host, control_port, control_path);
+    let done = await token.then(getrate);
+    return done;
+  }
+
+  function UpdateGetRateElementByID(
+    Query,
+    ID,
+    control_host = "127.0.0.1",
+    control_port = "7657",
+    control_path = "jsonrpc"
+  ) {
+    function updateelement(update) {
+      //console.log("(i2pcontrol)", update);
+      if (document.getElementById(ID) !== null)
+        document.getElementById(ID).innerText = update;
+    }
+    let net = GetRate(
+      Query,
+      control_host,
+      control_port,
+      control_path,
+      password
+    );
+    net.then(updateleement);
+  }
+
+  async function I2PControl(
+    Query,
+    control_host = "127.0.0.1",
+    control_port = "7657",
+    control_path = "jsonrpc",
+    password = "itoopie"
+  ) {
+    function i2pcontrol(token) {
+      var json = new Object();
+      json["id"] = makeid(6);
+      json["jsonrpc"] = "2.0";
+      json["method"] = "I2PControl";
+      json["params"] = new Object();
+      json["params"]["Token"] = token;
+      json["params"][Query] = null;
+      return send(json, control_host, control_port, control_path);
+    }
+    let token = GetToken(password, control_host, control_port, control_path);
+    let done = await token.then(i2pcontrol);
+    return done;
+  }
+
+  function UpdateI2PControlElementByID(
+    Query,
+    ID,
+    control_host = "127.0.0.1",
+    control_port = "7657",
+    control_path = "jsonrpc"
+  ) {
+    function updateelement(update) {
+      //console.log("(i2pcontrol)", update);
+      if (document.getElementById(ID) !== null)
+        document.getElementById(ID).innerText = update;
+    }
+    let net = I2PControl(
+      Query,
+      control_host,
+      control_port,
+      control_path,
+      password
+    );
+    net.then(updateleement);
+  }
+
+  async function RouterInfo(
+    Query,
+    control_host = "127.0.0.1",
+    control_port = "7657",
+    control_path = "jsonrpc",
+    password = "itoopie"
+  ) {
+    function routerinfo(token) {
+      var json = new Object();
+      json["id"] = makeid(6);
+      json["jsonrpc"] = "2.0";
+      json["method"] = "RouterInfo";
+      json["params"] = new Object();
+      json["params"]["Token"] = token;
+      json["params"][Query] = null;
+      return send(json, control_host, control_port, control_path);
+    }
+    let token = GetToken(password, control_host, control_port, control_path);
+    let done = await token.then(routerinfo);
+    return done;
+  }
+
+  function UpdateRouterInfoElementByID(
+    Query,
+    ID,
+    control_host = "127.0.0.1",
+    control_port = "7657",
+    control_path = "jsonrpc",
+    password = "itoopie"
+  ) {
+    function updateelement(update) {
+      /*console.log(
      "(i2pcontrol) element",
      update.result[Query],
      ID,
      document.getElementById(ID)
    );*/
-    if (document.getElementById(ID) !== null)
-      document.getElementById(ID).innerText = update.result[Query];
+      if (document.getElementById(ID) !== null)
+        document.getElementById(ID).innerText = update.result[Query];
+    }
+
+    let net = RouterInfo(
+      Query,
+      control_host,
+      control_port,
+      control_path,
+      password
+    );
+    net.then(updateelement);
  }

-  let net = RouterInfo(
+  async function RouterManager(
    Query,
-    control_host,
-    control_port,
-    control_path,
-    password
-  );
-  net.then(updateelement);
-}
-
-async function RouterManager(
-  Query,
-  control_host = "127.0.0.1",
-  control_port = "7657",
-  control_path = "jsonrpc",
-  password = "itoopie"
-) {
-  function routermanager(token) {
-    var json = new Object();
-    json['id'] = makeid(6);
-    json['jsonrpc'] = '2.0';
-    json['method'] = 'RouterManager';
-    json['params'] = new Object();
-    json['params']['Token'] = token;
-    json['params'][Query] = null;
-    return send(json, control_host, control_port, control_path);
+    control_host = "127.0.0.1",
+    control_port = "7657",
+    control_path = "jsonrpc",
+    password = "itoopie"
+  ) {
+    function routermanager(token) {
+      var json = new Object();
+      json["id"] = makeid(6);
+      json["jsonrpc"] = "2.0";
+      json["method"] = "RouterManager";
+      json["params"] = new Object();
+      json["params"]["Token"] = token;
+      json["params"][Query] = null;
+      return send(json, control_host, control_port, control_path);
+    }
+    let token = GetToken(password, control_host, control_port, control_path);
+    let done = await token.then(routermanager);
+    return done;
  }
-  let token = GetToken(password, control_host, control_port, control_path);
-  let done = await token.then(routermanager);
-  return done;
-}

-function UpdateRouterManagerElementByID(
-  Query,
-  ID,
-  control_host = "127.0.0.1",
-  control_port = "7657",
-  control_path = "jsonrpc",
-  password = "itoopie"
-) {
-  function updateelement(update) {
-    //console.log("(i2pcontrol)", update);
-    if (document.getElementById(ID) !== null)
+  function UpdateRouterManagerElementByID(
+    Query,
+    ID,
+    control_host = "127.0.0.1",
+    control_port = "7657",
+    control_path = "jsonrpc",
+    password = "itoopie"
+  ) {
+    function updateelement(update) {
+      //console.log("(i2pcontrol)", update);
+      if (document.getElementById(ID) !== null)
+        document.getElementById(ID).innerText = update;
+    }
+    let net = RouterManager(
+      Query,
+      control_host,
+      control_port,
+      control_path,
+      password
+    );
+    net.then(updateleement);
+  }
+
+  async function NetworkSetting(
+    Query,
+    control_host = "127.0.0.1",
+    control_port = "7657",
+    control_path = "jsonrpc",
+    password = "itoopie"
+  ) {
+    function networksetting(token) {
+      var json = new Object();
+      json["id"] = makeid(6);
+      json["jsonrpc"] = "2.0";
+      json["method"] = "NetworkSetting";
+      json["params"] = new Object();
+      json["params"]["Token"] = token;
+      json["params"][Query] = null;
+      return send(json, control_host, control_port, control_path);
+    }
+    let token = GetToken(password, control_host, control_port, control_path);
+    let done = await token.then(networksetting);
+    return done;
+  }
+
+  function UpdateNetworkSettingElementByID(
+    Query,
+    ID,
+    control_host = "127.0.0.1",
+    control_port = "7657",
+    control_path = "jsonrpc",
+    password = "itoopie"
+  ) {
+    function updateelement(update) {
+      //console.log("(i2pcontrol)", update);
      document.getElementById(ID).innerText = update;
+    }
+    let net = NetworkSetting(
+      Query,
+      control_host,
+      control_port,
+      control_path,
+      password
+    );
+    net.then(updateleement);
  }
-  let net = RouterManager(
-    Query,
-    control_host,
-    control_port,
-    control_path,
-    password
-  );
-  net.then(updateleement);
-}

-async function NetworkSetting(
-  Query,
-  control_host = "127.0.0.1",
-  control_port = "7657",
-  control_path = "jsonrpc",
-  password = "itoopie"
-) {
-  function networksetting(token) {
-    var json = new Object();
-    json['id'] = makeid(6);
-    json['jsonrpc'] = '2.0';
-    json['method'] = 'NetworkSetting';
-    json['params'] = new Object();
-    json['params']['Token'] = token;
-    json['params'][Query] = null;
-    return send(json, control_host, control_port, control_path);
+  function UpdateContents() {
+    UpdateRouterInfoElementByID("i2p.router.status", "router-status");
+    UpdateRouterInfoElementByID("i2p.router.uptime", "router-uptime");
+    UpdateRouterInfoElementByID("i2p.router.version", "router-version");
+    UpdateRouterInfoElementByID(
+      "i2p.router.net.bw.inbound.1s",
+      "router-net-bw-inbound-1s"
+    );
+    UpdateRouterInfoElementByID(
+      "i2p.router.net.bw.inbound.15s",
+      "router-net-bw-inbound-15s"
+    );
+    UpdateRouterInfoElementByID(
+      "i2p.router.net.bw.outbound.1s",
+      "router-net-bw-outbound-1s"
+    );
+    UpdateRouterInfoElementByID(
+      "i2p.router.net.bw.outbound.15s",
+      "router-net-bw-outbound-15s"
+    );
+    UpdateRouterInfoElementByID("i2p.router.net.status", "router-net-status");
+    UpdateRouterInfoElementByID(
+      "i2p.router.net.tunnels.participating",
+      "router-net-tunnels-participating"
+    );
+    UpdateRouterInfoElementByID(
+      "i2p.router.netdb.activepeers",
+      "router-netdb-activepeers"
+    );
+    UpdateRouterInfoElementByID(
+      "i2p.router.netdb.fastpeers",
+      "router-netdb-fastpeers"
+    );
+    UpdateRouterInfoElementByID(
+      "i2p.router.netdb.highcapacitypeers",
+      "router-netdb-highcapacitypeers"
+    );
+    UpdateRouterInfoElementByID(
+      "i2p.router.netdb.isreseeding",
+      "router-netdb-isreseeding"
+    );
+    UpdateRouterInfoElementByID(
+      "i2p.router.netdb.knownpeers",
+      "router-netdb-knownpeers"
+    );
  }
-  let token = GetToken(password, control_host, control_port, control_path);
-  let done = await token.then(networksetting);
-  return done;
-}

-function UpdateNetworkSettingElementByID(
-  Query,
-  ID,
-  control_host = "127.0.0.1",
-  control_port = "7657",
-  control_path = "jsonrpc",
-  password = "itoopie"
-) {
-  function updateelement(update) {
-    //console.log("(i2pcontrol)", update);
-    document.getElementById(ID).innerText = update;
+  var done = Echo(hello);
+  done.then(Done).catch(Done);
+
+  function Done(output) {
+    function hide(elements) {
+      elements = elements.length ? elements : [elements];
+      for (var index = 0; index < elements.length; index++) {
+        elements[index].style.display = "none";
+      }
+    }
+
+    function unhide(elements) {
+      elements = elements.length ? elements : [elements];
+      for (var index = 0; index < elements.length; index++) {
+        elements[index].style.display = "inline-block";
+      }
+    }
+
+    console.log("(i2pcontrol) I2PControl connection tested,", output);
+    if (output == hello) {
+      var toopieLinks = document.querySelectorAll(".window-visit-toopie");
+      unhide(toopieLinks);
+    } else {
+      var toopieLinks = document.querySelectorAll(".window-visit-toopie");
+      hide(toopieLinks);
+    }
+    return output;
  }
-  let net = NetworkSetting(
-    Query,
-    control_host,
-    control_port,
-    control_path,
-    password
-  );
-  net.then(updateleement);
-}
-
-function UpdateContents() {
-  UpdateRouterInfoElementByID('i2p.router.status', 'router-status');
-  UpdateRouterInfoElementByID('i2p.router.uptime', 'router-uptime');
-  UpdateRouterInfoElementByID('i2p.router.version', 'router-version');
-  UpdateRouterInfoElementByID(
-    'i2p.router.net.bw.inbound.1s',
-    'router-net-bw-inbound-1s'
-  );
-  UpdateRouterInfoElementByID(
-    'i2p.router.net.bw.inbound.15s',
-    'router-net-bw-inbound-15s'
-  );
-  UpdateRouterInfoElementByID(
-    'i2p.router.net.bw.outbound.1s',
-    'router-net-bw-outbound-1s'
-  );
-  UpdateRouterInfoElementByID(
-    'i2p.router.net.bw.outbound.15s',
-    'router-net-bw-outbound-15s'
-  );
-  UpdateRouterInfoElementByID('i2p.router.net.status', 'router-net-status');
-  UpdateRouterInfoElementByID(
-    'i2p.router.net.tunnels.participating',
-    'router-net-tunnels-participating'
-  );
-  UpdateRouterInfoElementByID(
-    'i2p.router.netdb.activepeers',
-    'router-netdb-activepeers'
-  );
-  UpdateRouterInfoElementByID(
-    'i2p.router.netdb.fastpeers',
-    'router-netdb-fastpeers'
-  );
-  UpdateRouterInfoElementByID(
-    'i2p.router.netdb.highcapacitypeers',
-    'router-netdb-highcapacitypeers'
-  );
-  UpdateRouterInfoElementByID(
-    'i2p.router.netdb.isreseeding',
-    'router-netdb-isreseeding'
-  );
-  UpdateRouterInfoElementByID(
-    'i2p.router.netdb.knownpeers',
-    'router-netdb-knownpeers'
-  );
-}
-
-var done = Echo(hello);
-done.then(Done);
-
-function Done(output) {
-  console.log('(i2pcontrol) I2PControl connection tested,', output);
-  return output;
 }
--- a/i2pcontrol/i2pcontrol.png
+++ b/i2pcontrol/i2pcontrol.png
--- a/i2pcontrol/index.html
+++ b/i2pcontrol/index.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>I2P in Private Browsing Mode</title>
+  <link rel="stylesheet" type="text/css" href="../home.css" />
+  <link rel="stylesheet" type="text/css" href="../sidebar.css" />
+</head>
+<body>
+
+<h1 id="toopie.htmli2pcontrol.js">toopie.html/i2pcontrol.js</h1>
+<p>To enable toopie.html, the built in I2P monitoring system in this webextension, go to the <a href="http://127.0.0.1:7657/configwebapps">Web App Configuration page in the I2P Router and start I2PControl</a>. Click the &quot;Start&quot; button next to the menu item that says <code>jsonrpc</code>.</p>
+<ul>
+<li><img src="i2pcontrol.png" title="fig:" alt="i2pcontrol.png" /></li>
+</ul>
+
+</body>
+</html>
--- a/i2ppb@eyedeekay.github.io.xpi.torrent
+++ b/i2ppb@eyedeekay.github.io.xpi.torrent
--- a/i2psetproxy.js.png
+++ b/i2psetproxy.js.png
--- a/i2psnark-integrate.png
+++ b/i2psnark-integrate.png
--- a/i2psnark.png
+++ b/i2psnark.png
--- a/i2ptunnel.png
+++ b/i2ptunnel.png
--- a/icons/README.md
+++ b/icons/README.md
--- a/icons/browse.png
+++ b/icons/browse.png
--- a/icons/i2plogo.png
+++ b/icons/i2plogo.png
--- a/icons/infotoopie.png
+++ b/icons/infotoopie.png
--- a/icons/infotoopiebt.png
+++ b/icons/infotoopiebt.png
--- a/icons/infotoopies.png
+++ b/icons/infotoopies.png
--- a/icons/infotoopiesbt.png
+++ b/icons/infotoopiesbt.png
--- a/icons/local_up.png
+++ b/icons/local_up.png
--- a/icons/toopie.png
+++ b/icons/toopie.png
--- a/icons/torrents.png
+++ b/icons/torrents.png
--- a/images/gear.png
+++ b/images/gear.png
--- a/index.html
+++ b/index.html
@@ -9,13 +9,14 @@
 <h1>I2P in Private Browsing Mode(Firefox-Only)</h1>

 <p>This is an webextension which introduces a set of new "Private Browsing" modes
-to Firefox-based browsers(Supporting webextensions) that makes it easier to
-configure a browser to use I2P securely and adds features for making I2P
-applications easier to use. It does this by isolating I2P-specific settings to
-Contextual Identities within Firefox, then loading them automatically when the
-user requests them. It also adds convenience and management features, like an
-embedded I2P console and Bittorrent integration with clients using the
-transmission-rpc API.</p>
+to Firefox-based browsers(Supporting webextensions, must be current ESR or
+greater) that makes it easier to configure a browser to use I2P securely and
+adds features for making I2P applications easier to use. It does this by
+isolating I2P-specific settings to Contextual Identities within Firefox, then
+loading them automatically when the user requests them. It also adds convenience
+and management features, like an embedded I2P console and Bittorrent integration
+with clients using the transmission-rpc API and via in-browser protocol handling
+integrations.</p>

 <h2>Privacy Policy</h2>

@@ -57,7 +58,7 @@ Clearnet Bittorrent network(With a web seed to support it in case one goes
 dead).</p>

 <ul>
-<li><a href="magnet:?xt=urn:btih:7ec361c3ddc3fb904e369a19cdf4259af94af624">Magnet Link</a></li>
+<li><a href="magnet:?xl=2485magnetsubdn=i2ppb%40eyedeekay.github.io.xpi.torrentmagnetsubxt=urn:tree:tiger:w6kewvpw25bnau2rwkczbnryrjdzn54ietse3zimagnetsubxt=urn:ed2k:1cd9743fb664404298b7f2ad7ee45db0magnetsubxt=urn:aich:4vhcsp6t3c2mkjzds2etixyinyj7xtkp">Magnet Link</a></li>
 <li><a href="./i2ppb@eyedeekay.github.io.xpi.torrent">Get the .torrent file</a></li>
 </ul>

@@ -124,15 +125,16 @@ adding them directly into the Firefox downloads drop-downs, menus, etc. Enable
 the use of I2PSnark as a peer-to-peer delivery mechanism for media files.</li>
 <li><img src="i2psnark.png" alt="Visiting i2psnark" title="" /></li>
 <li><img src="transmissionrpc.png" alt="Monitoring torrents" title="" /></li>
-<li><img src="x-i2p-torrentlocation.png" alt="Distribute your site as a torrent." title="" /></li>
-<li>[Started] <strong>Indicate</strong> the level of authenticity provided by TLS. TLS is
-optional on I2P for now, but some sites offer it anyway. TLS support is
-experimental and in the works.</li>
-<li>[Started] <strong>Provide</strong> alternate, in-I2P destinations for web sites that want to
-mirror their content within I2P.</li>
-<li>[Started] <strong>Enhance</strong> the I2P browsing experience by allowing site developers
+<li>[Done] <strong>Enhance</strong> the I2P browsing experience by allowing site developers
 distribute some or all of their resources as torrents, allowing the torrents to
 be treated effectively as a CDN.</li>
+<li><img src="x-i2p-torrentlocation.png" alt="Distribute your site as a torrent." title="" /></li>
+<li>[Done] <strong>Indicate</strong> the level of authenticity provided by TLS. TLS is
+optional on I2P for now, but some sites offer it anyway. TLS support is
+experimental and in the works.</li>
+<li><img src="i2p-https.png" alt="Use HTTPS with your I2P Site." title="" /></li>
+<li>[Done] <strong>Provide</strong> alternate, in-I2P destinations for web sites that want to
+mirror their content within I2P.</li>
 <li>[barely started] <strong>Isolate</strong> traffic by contextual identity to it's own HTTP
 Proxy tunnel, each reflecting it's own pseudonymous identity within I2P. The
 contextual identities. For now, the contextual identities used to manage
--- a/info.css
+++ b/info.css
@@ -1,20 +1,19 @@
 body,
 html {
-  width: 450px
+  width: 600px
 }
 .panel {
  margin: 5px;
-  width: 450px;
-  height: 450px
+  width: 500px
 }
 .panel-section-header {
-  width: 450px
+  width: 500px
 }
 #text-section-torrents-header {
-  width: 450px
+  width: 500px
 }
 span.identity {
-  width: 450px;
+  width: 500px;
  display: block;
  margin-left: 1em
 }
--- a/info.js
+++ b/info.js
@@ -2,9 +2,9 @@ function checkPeerConnection() {
  let getting = browser.privacy.network.peerConnectionEnabled.get({});
  getting.then((got) => {
    let webrtc = got.value;
-    console.log('checking webrtc', webrtc);
-    if (document.getElementById('enable-web-rtc') !== null)
-      document.getElementById('enable-web-rtc').checked = webrtc;
+    console.log("checking webrtc", webrtc);
+    if (document.getElementById("enable-web-rtc") !== null)
+      document.getElementById("enable-web-rtc").checked = webrtc;
  });
 }

@@ -123,6 +123,12 @@ document.addEventListener("click", (clickEvent) => {
  } else if (clickEvent.target.id === "window-visit-index") {
    console.log("attempting to create index tab");
    goIndex();
+  } else if (clickEvent.target.id === "window-visit-torrent") {
+    console.log("attempting to create torrent tab");
+    goTorrent();
+  } else if (clickEvent.target.id === "window-visit-help") {
+    console.log("attempting to create torrent tab");
+    goHelp();
  } else if (clickEvent.target.id === "window-visit-homepage") {
    console.log("attempting to create homepage tab");
    goHome();
@@ -197,6 +203,9 @@ function showTorrentsMenu() {
 }

 function goHome() {
+  function onTabError() {
+    console.log("Help tab created");
+  }
  function gotProxyInfo(info) {
    let port = info.value.http.split(":")[1];
    if (port == "7644") {
@@ -216,14 +225,16 @@ function goHome() {
    }
    console.log("(bookmarks) adding home page bookmark");
  }
-  console.log("(bookmarks) checking if we're running in an I2P Browser");
-  var gettingProxyInfo = browser.proxy.settings.get({});
-  gettingProxyInfo.then(gotProxyInfo);
+  if (browser.windows != undefined) {
+    console.log("(bookmarks) checking if we're running in an I2P Browser");
+    var gettingProxyInfo = browser.proxy.settings.get({});
+    gettingProxyInfo.then(gotProxyInfo);
+  }
 }

 function goIndex() {
  function onTabError() {
-    console.log("Help tab created");
+    console.log("Help tab not created");
  }
  let createData = {
    url: "index.html",
@@ -233,6 +244,30 @@ function goIndex() {
  creating.then(onTabCreated, onTabError);
 }

+function goTorrent() {
+  function onTabError() {
+    console.log("Torrent Help tab not created");
+  }
+  let createData = {
+    url: "torrent/index.html",
+  };
+  console.log("visiting torrent help");
+  let creating = browser.tabs.create(createData);
+  creating.then(onTabCreated, onTabError);
+}
+
+function goHelp() {
+  function onTabError() {
+    console.log("Torrent Help tab not created");
+  }
+  let createData = {
+    url: "i2pcontrol/index.html",
+  };
+  console.log("visiting torrent help");
+  let creating = browser.tabs.create(createData);
+  creating.then(onTabCreated, onTabError);
+}
+
 function goToopie() {
  function onTabError() {
    console.log("Toopie tab created");
@@ -252,7 +287,7 @@ function goSearch() {
  }
  let createData = {
    url:
-      "http://yacy.idk.i2p/yacysearch.html?" +
+      "http://legwork.i2p/yacysearch.html?" +
      "query=" +
      document.getElementById("search-query").value,
  };
--- a/lander.png
+++ b/lander.png
--- a/location.js
+++ b/location.js
@@ -1,8 +1,8 @@
 function gotCurrent(tab) {
  function gotTitle(title) {
    let addr = title;
-    document.getElementById('TypeInfo').innerHTML =
-      '<div class="AddressInfo"><a href="' + addr + '">' + addr + '</a></div>';
+    document.getElementById("TypeInfo").innerHTML =
+      '<div class="AddressInfo"><a href="' + addr + '">' + addr + "</a></div>";
  }
  console.log(tab);
  var gettingTitle = browser.pageAction.getTitle({
--- a/manifest.json
+++ b/manifest.json
@@ -1,8 +1,8 @@
 {
-  "applications": {
+  "browser_specific_settings": {
    "gecko": {
      "id": "i2ppb@eyedeekay.github.io",
-      "strict_min_version": "60.0"
+      "strict_min_version": "91.1.0"
    }
  },
  "permissions": [
@@ -27,7 +27,7 @@
  ],
  "manifest_version": 2,
  "name": "__MSG_extensionName__",
-  "version": "0.95",
+  "version": "0.125",
  "description": "__MSG_extensionDescription__",
  "homepage_url": "https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox",
  "icons": {
@@ -49,7 +49,7 @@
  "page_action": {
    "browser_style": true,
    "default_title": "__MSG_toopieTLS__",
-    "default_icon": "icons/toopie.png",
+    "default_icon": "icons/i2plogo.png",
    "show_matches": [
      "http://*.i2p/*",
      "https://*.i2p/*",
--- a/menu.png
+++ b/menu.png
--- a/options/options.js
+++ b/options/options.js
@@ -4,168 +4,168 @@ function SetBookButton() {
 }

 function SetHostText() {
-  var hostid = document.getElementById('hostText');
-  hostid.textContent = chrome.i18n.getMessage('hostText');
+  var hostid = document.getElementById("hostText");
+  hostid.textContent = chrome.i18n.getMessage("hostText");
 }

 function SetPortText() {
-  var portid = document.getElementById('portText');
-  portid.textContent = chrome.i18n.getMessage('portText');
+  var portid = document.getElementById("portText");
+  portid.textContent = chrome.i18n.getMessage("portText");
 }

 function SetPortHelpText() {
-  var portid = document.getElementById('proxyHelpText');
-  portid.textContent = chrome.i18n.getMessage('proxyHelpText');
+  var portid = document.getElementById("proxyHelpText");
+  portid.textContent = chrome.i18n.getMessage("proxyHelpText");
 }

 function SetControlHostText() {
-  var controlhostid = document.getElementById('controlHostText');
-  controlhostid.textContent = chrome.i18n.getMessage('controlHostText');
+  var controlhostid = document.getElementById("controlHostText");
+  controlhostid.textContent = chrome.i18n.getMessage("controlHostText");
 }

 function SetControlPortText() {
-  var controlportid = document.getElementById('controlPortText');
-  controlportid.textContent = chrome.i18n.getMessage('controlPortText');
+  var controlportid = document.getElementById("controlPortText");
+  controlportid.textContent = chrome.i18n.getMessage("controlPortText");
 }

 function SetControlHelpText() {
-  var portid = document.getElementById('controlHelpText');
-  portid.textContent = chrome.i18n.getMessage('controlHelpText');
+  var portid = document.getElementById("controlHelpText");
+  portid.textContent = chrome.i18n.getMessage("controlHelpText");
 }

 function getBookmarksCreated() {
-  bookmarks_state = document.getElementById('bookmarks');
-  console.log('(options)Got i2p bookmarks state:', bookmarks_state);
+  bookmarks_state = document.getElementById("bookmarks");
+  console.log("(options)Got i2p bookmarks state:", bookmarks_state);
  if (bookmarks_state == undefined) {
    return false;
  }
-  if (bookmarks_state.value == 'false') {
+  if (bookmarks_state.value == "false") {
    return false;
  }
-  if (bookmarks_state.value == 'true') {
+  if (bookmarks_state.value == "true") {
    return true;
  }
  return false;
 }

 function getScheme() {
-  const proxy_scheme = document.querySelector('#proxy_scheme');
-  console.log('(options)Got i2p proxy scheme:', proxy_scheme.value);
-  if (proxy_scheme.value == 'HTTP') {
-    return 'http';
+  const proxy_scheme = document.querySelector("#proxy_scheme");
+  console.log("(options)Got i2p proxy scheme:", proxy_scheme.value);
+  if (proxy_scheme.value == "HTTP") {
+    return "http";
  }
-  if (proxy_scheme.value == 'SOCKS') {
-    return 'socks';
+  if (proxy_scheme.value == "SOCKS") {
+    return "socks";
  }
-  if (proxy_scheme.value == 'http') return 'http';
-  if (proxy_scheme.value == 'socks') return 'socks';
-  else return 'http';
+  if (proxy_scheme.value == "http") return "http";
+  if (proxy_scheme.value == "socks") return "socks";
+  else return "http";
 }

 function getHost() {
-  proxy_host = document.getElementById('host').value;
-  console.log('(options)Got i2p proxy host:', proxy_host);
+  proxy_host = document.getElementById("host").value;
+  console.log("(options)Got i2p proxy host:", proxy_host);
  if (proxy_host == undefined) {
-    return '127.0.0.1';
+    return "127.0.0.1";
  }
  return proxy_host;
 }

 function getPort() {
-  proxy_port = document.getElementById('port').value;
-  console.log('(options)Got i2p proxy port:', proxy_port);
+  proxy_port = document.getElementById("port").value;
+  console.log("(options)Got i2p proxy port:", proxy_port);
  if (proxy_port == undefined) {
-    return '4444';
+    return "4444";
  }
  return proxy_port;
 }

 function getControlHost() {
-  control_host = document.getElementById('controlhost').value;
-  console.log('(options)Got i2p control host:', control_host);
+  control_host = document.getElementById("controlhost").value;
+  console.log("(options)Got i2p control host:", control_host);
  if (control_host == undefined) {
-    return '127.0.0.1';
+    return "127.0.0.1";
  }
  return control_host;
 }

 function getControlPort() {
-  control_port = document.getElementById('controlport').value;
-  console.log('(options)Got i2p control port:', control_port);
+  control_port = document.getElementById("controlport").value;
+  console.log("(options)Got i2p control port:", control_port);
  if (control_port == undefined) {
-    return '4444';
+    return "4444";
  }
  return control_port;
 }

 function getRPCHost() {
-  rpc_host = document.getElementById('rpchost').value;
-  console.log('(options)Got i2pcontrol rpc host:', rpc_host);
+  rpc_host = document.getElementById("rpchost").value;
+  console.log("(options)Got i2pcontrol rpc host:", rpc_host);
  if (rpc_host == undefined) {
-    return '127.0.0.1';
+    return "127.0.0.1";
  }
  return rpc_host;
 }

 function getRPCPort() {
-  rpc_port = document.getElementById('rpcport').value;
-  console.log('(options)Got i2pcontrol rpc port:', rpc_port);
+  rpc_port = document.getElementById("rpcport").value;
+  console.log("(options)Got i2pcontrol rpc port:", rpc_port);
  if (rpc_port == undefined) {
-    return '7657';
+    return "7657";
  }
  return rpc_port;
 }

 function getRPCPath() {
-  rpc_path = document.getElementById('rpcpath').value;
-  console.log('(options)Got i2pcontrol rpc path:', rpc_path);
+  rpc_path = document.getElementById("rpcpath").value;
+  console.log("(options)Got i2pcontrol rpc path:", rpc_path);
  if (rpc_path == undefined) {
-    return 'jsonrpc';
+    return "jsonrpc";
  }
  return rpc_path;
 }

 function getRPCPass() {
-  rpc_pass = document.getElementById('rpcpass').value;
-  console.log('(options)Got i2pcontrol rpc password:');
+  rpc_pass = document.getElementById("rpcpass").value;
+  console.log("(options)Got i2pcontrol rpc password:");
  if (rpc_pass == undefined) {
-    return 'itoopie';
+    return "itoopie";
  }
  return rpc_pass;
 }

 function getBTRPCHost() {
-  bt_rpc_host = document.getElementById('btrpchost').value;
-  console.log('(options)Got torrent rpc host:', bt_rpc_host);
+  bt_rpc_host = document.getElementById("btrpchost").value;
+  console.log("(options)Got torrent rpc host:", bt_rpc_host);
  if (bt_rpc_host == undefined) {
-    return '127.0.0.1';
+    return "127.0.0.1";
  }
  return bt_rpc_host;
 }

 function getBTRPCPort() {
-  bt_rpc_port = document.getElementById('btrpcport').value;
-  console.log('(options)Got torrent rpc port:', bt_rpc_port);
+  bt_rpc_port = document.getElementById("btrpcport").value;
+  console.log("(options)Got torrent rpc port:", bt_rpc_port);
  if (bt_rpc_port == undefined) {
-    return '7657';
+    return "7657";
  }
  return bt_rpc_port;
 }

 function getBTRPCPath() {
-  bt_rpc_path = document.getElementById('btrpcpath').value;
-  console.log('(options)Got torrent rpc path:', bt_rpc_path);
+  bt_rpc_path = document.getElementById("btrpcpath").value;
+  console.log("(options)Got torrent rpc path:", bt_rpc_path);
  if (bt_rpc_path == undefined) {
-    return 'transmission/rpc';
+    return "transmission/rpc";
  }
  return bt_rpc_path;
 }

 function getBTRPCPass() {
-  bt_rpc_pass = document.getElementById('btrpcpass').value;
-  console.log('(options)Got torrent rpc password:');
+  bt_rpc_pass = document.getElementById("btrpcpass").value;
+  console.log("(options)Got torrent rpc password:");
  if (bt_rpc_pass == undefined) {
-    return 'itoopie';
+    return "itoopie";
  }
  return bt_rpc_pass;
 }
@@ -173,88 +173,88 @@ function getBTRPCPass() {
 function checkStoredSettings(storedSettings) {
  function gotProxyInfo(info) {
    let defaultSettings = {};
-    let host = info.value.http.split(':')[0];
-    let port = info.value.http.split(':')[1];
+    let host = info.value.http.split(":")[0];
+    let port = info.value.http.split(":")[1];
    if (port != 7644) {
      port = undefined;
    }
-    console.log('(options)proxy', "'" + host + "'", ':', port);
-    if (!storedSettings['bookmarks_state'])
-      defaultSettings['bookmarks_state'] = false;
-    else defaultSettings['bookmarks_state'] = storedSettings['bookmarks_state'];
-    if (!storedSettings['proxy_scheme'])
-      defaultSettings['proxy_scheme'] = 'http';
-    else defaultSettings['proxy_scheme'] = storedSettings['proxy_scheme'];
-    if (!storedSettings['proxy_host']) {
-      if (host == '') defaultSettings['proxy_host'] = '127.0.0.1';
-      else defaultSettings['proxy_host'] = host;
-    } else defaultSettings['proxy_host'] = storedSettings['proxy_host'];
+    console.log("(options)proxy", "'" + host + "'", ":", port);
+    if (!storedSettings["bookmarks_state"])
+      defaultSettings["bookmarks_state"] = false;
+    else defaultSettings["bookmarks_state"] = storedSettings["bookmarks_state"];
+    if (!storedSettings["proxy_scheme"])
+      defaultSettings["proxy_scheme"] = "http";
+    else defaultSettings["proxy_scheme"] = storedSettings["proxy_scheme"];
+    if (!storedSettings["proxy_host"]) {
+      if (host == "") defaultSettings["proxy_host"] = "127.0.0.1";
+      else defaultSettings["proxy_host"] = host;
+    } else defaultSettings["proxy_host"] = storedSettings["proxy_host"];

-    if (!storedSettings['proxy_port']) {
-      if (port == undefined) defaultSettings['proxy_port'] = 4444;
-      else if (port == 7644) defaultSettings['proxy_port'] = port;
-      else defaultSettings['proxy_port'] = 4444;
-    } else defaultSettings['proxy_port'] = storedSettings.proxy_port;
+    if (!storedSettings["proxy_port"]) {
+      if (port == undefined) defaultSettings["proxy_port"] = 4444;
+      else if (port == 7644) defaultSettings["proxy_port"] = port;
+      else defaultSettings["proxy_port"] = 4444;
+    } else defaultSettings["proxy_port"] = storedSettings.proxy_port;

-    if (!storedSettings['control_host']) {
-      if (host == '') defaultSettings['control_host'] = '127.0.0.1';
-      else defaultSettings['control_host'] = host;
-    } else defaultSettings['control_host'] = storedSettings.control_host;
+    if (!storedSettings["control_host"]) {
+      if (host == "") defaultSettings["control_host"] = "127.0.0.1";
+      else defaultSettings["control_host"] = host;
+    } else defaultSettings["control_host"] = storedSettings.control_host;

-    if (!storedSettings['control_port']) {
-      defaultSettings['control_port'] = 7657;
-    } else defaultSettings['control_port'] = storedSettings.control_port;
+    if (!storedSettings["control_port"]) {
+      defaultSettings["control_port"] = 7657;
+    } else defaultSettings["control_port"] = storedSettings.control_port;

-    if (!storedSettings['rpc_host']) {
-      if (host == '') defaultSettings['rpc_host'] = '127.0.0.1';
-      else defaultSettings['rpc_host'] = host;
-    } else defaultSettings['rpc_host'] = storedSettings.rpc_host;
+    if (!storedSettings["rpc_host"]) {
+      if (host == "") defaultSettings["rpc_host"] = "127.0.0.1";
+      else defaultSettings["rpc_host"] = host;
+    } else defaultSettings["rpc_host"] = storedSettings.rpc_host;

-    if (!storedSettings['rpc_port']) {
-      defaultSettings['rpc_port'] = 7657;
-    } else defaultSettings['rpc_port'] = storedSettings.rpc_port;
+    if (!storedSettings["rpc_port"]) {
+      defaultSettings["rpc_port"] = 7657;
+    } else defaultSettings["rpc_port"] = storedSettings.rpc_port;

-    if (!storedSettings['rpc_path']) {
-      defaultSettings['rpc_path'] = 'jsonrpc';
-    } else defaultSettings['rpc_path'] = storedSettings.rpc_path;
+    if (!storedSettings["rpc_path"]) {
+      defaultSettings["rpc_path"] = "jsonrpc";
+    } else defaultSettings["rpc_path"] = storedSettings.rpc_path;

-    if (!storedSettings['rpc_pass']) {
-      defaultSettings['rpc_pass'] = 'itoopie';
-    } else defaultSettings['rpc_pass'] = storedSettings.rpc_pass;
+    if (!storedSettings["rpc_pass"]) {
+      defaultSettings["rpc_pass"] = "itoopie";
+    } else defaultSettings["rpc_pass"] = storedSettings.rpc_pass;

-    if (!storedSettings['bt_rpc_host']) {
-      if (host == '') defaultSettings['bt_rpc_host'] = '127.0.0.1';
-      else defaultSettings['bt_rpc_host'] = host;
-    } else defaultSettings['bt_rpc_host'] = storedSettings.bt_rpc_host;
+    if (!storedSettings["bt_rpc_host"]) {
+      if (host == "") defaultSettings["bt_rpc_host"] = "127.0.0.1";
+      else defaultSettings["bt_rpc_host"] = host;
+    } else defaultSettings["bt_rpc_host"] = storedSettings.bt_rpc_host;

-    if (!storedSettings['bt_rpc_port']) {
-      defaultSettings['bt_rpc_port'] = 7657;
-    } else defaultSettings['bt_rpc_port'] = storedSettings.bt_rpc_port;
+    if (!storedSettings["bt_rpc_port"]) {
+      defaultSettings["bt_rpc_port"] = 7657;
+    } else defaultSettings["bt_rpc_port"] = storedSettings.bt_rpc_port;

-    if (!storedSettings['bt_rpc_path']) {
-      defaultSettings['bt_rpc_path'] = 'transmission/';
-    } else defaultSettings['bt_rpc_path'] = storedSettings.bt_rpc_path;
+    if (!storedSettings["bt_rpc_path"]) {
+      defaultSettings["bt_rpc_path"] = "transmission/";
+    } else defaultSettings["bt_rpc_path"] = storedSettings.bt_rpc_path;

-    if (!storedSettings['bt_rpc_pass']) {
-      defaultSettings['bt_rpc_pass'] = 'transmission';
-    } else defaultSettings['bt_rpc_pass'] = storedSettings.bt_rpc_pass;
+    if (!storedSettings["bt_rpc_pass"]) {
+      defaultSettings["bt_rpc_pass"] = "transmission";
+    } else defaultSettings["bt_rpc_pass"] = storedSettings.bt_rpc_pass;

-    console.log('(options)(browserinfo) NATIVE PROXYSETTINGS', info.value);
-    defaultSettings['base_url'] =
-      'http://' +
-      defaultSettings['bt_rpc_host'] +
-      ':' +
-      defaultSettings['bt_rpc_port'] +
-      '/' +
-      defaultSettings['bt_rpc_path'];
+    console.log("(options)(browserinfo) NATIVE PROXYSETTINGS", info.value);
+    defaultSettings["base_url"] =
+      "http://" +
+      defaultSettings["bt_rpc_host"] +
+      ":" +
+      defaultSettings["bt_rpc_port"] +
+      "/" +
+      defaultSettings["bt_rpc_path"];
    console.log(
-      '(options)',
-      defaultSettings['proxy_scheme'],
-      defaultSettings['proxy_host'],
-      defaultSettings['proxy_port'],
-      defaultSettings['control_host'],
-      defaultSettings['control_port'],
-      defaultSettings['base_url']
+      "(options)",
+      defaultSettings["proxy_scheme"],
+      defaultSettings["proxy_host"],
+      defaultSettings["proxy_port"],
+      defaultSettings["control_host"],
+      defaultSettings["control_port"],
+      defaultSettings["base_url"]
    );

    chrome.storage.local.set(defaultSettings);
@@ -266,75 +266,75 @@ function checkStoredSettings(storedSettings) {

 function checkAndroidStoredSettings(storedSettings) {
  let defaultSettings = {};
-  let host = '';
-  let port = '';
-  if (!storedSettings['bookmarks_state'])
-    defaultSettings['bookmarks_state'] = false;
-  else defaultSettings['bookmarks_state'] = storedSettings['bookmarks_state'];
-  if (!storedSettings['proxy_scheme']) defaultSettings['proxy_scheme'] = 'http';
-  else defaultSettings['proxy_scheme'] = storedSettings['proxy_scheme'];
-  if (!storedSettings['proxy_host']) {
-    if (host == '') defaultSettings['proxy_host'] = '127.0.0.1';
-    else defaultSettings['proxy_host'] = host;
-  } else defaultSettings['proxy_host'] = storedSettings['proxy_host'];
+  let host = "";
+  let port = "";
+  if (!storedSettings["bookmarks_state"])
+    defaultSettings["bookmarks_state"] = false;
+  else defaultSettings["bookmarks_state"] = storedSettings["bookmarks_state"];
+  if (!storedSettings["proxy_scheme"]) defaultSettings["proxy_scheme"] = "http";
+  else defaultSettings["proxy_scheme"] = storedSettings["proxy_scheme"];
+  if (!storedSettings["proxy_host"]) {
+    if (host == "") defaultSettings["proxy_host"] = "127.0.0.1";
+    else defaultSettings["proxy_host"] = host;
+  } else defaultSettings["proxy_host"] = storedSettings["proxy_host"];

-  if (!storedSettings['proxy_port']) {
-    if (port == undefined) defaultSettings['proxy_port'] = 4444;
-    else if (port == 7644) defaultSettings['proxy_port'] = port;
-    else defaultSettings['proxy_port'] = 4444;
-  } else defaultSettings['proxy_port'] = storedSettings.proxy_port;
+  if (!storedSettings["proxy_port"]) {
+    if (port == undefined) defaultSettings["proxy_port"] = 4444;
+    else if (port == 7644) defaultSettings["proxy_port"] = port;
+    else defaultSettings["proxy_port"] = 4444;
+  } else defaultSettings["proxy_port"] = storedSettings.proxy_port;

-  if (!storedSettings['control_host']) {
-    if (host == '') defaultSettings['control_host'] = '127.0.0.1';
-    else defaultSettings['control_host'] = host;
-  } else defaultSettings['control_host'] = storedSettings.control_host;
+  if (!storedSettings["control_host"]) {
+    if (host == "") defaultSettings["control_host"] = "127.0.0.1";
+    else defaultSettings["control_host"] = host;
+  } else defaultSettings["control_host"] = storedSettings.control_host;

-  if (!storedSettings['control_port']) {
-    defaultSettings['control_port'] = 7657;
-  } else defaultSettings['control_port'] = storedSettings.control_port;
+  if (!storedSettings["control_port"]) {
+    defaultSettings["control_port"] = 7657;
+  } else defaultSettings["control_port"] = storedSettings.control_port;

-  if (!storedSettings['rpc_host']) {
-    if (host == '') defaultSettings['rpc_host'] = '127.0.0.1';
-    else defaultSettings['rpc_host'] = host;
-  } else defaultSettings['rpc_host'] = storedSettings.rpc_host;
+  if (!storedSettings["rpc_host"]) {
+    if (host == "") defaultSettings["rpc_host"] = "127.0.0.1";
+    else defaultSettings["rpc_host"] = host;
+  } else defaultSettings["rpc_host"] = storedSettings.rpc_host;

-  if (!storedSettings['rpc_port']) {
-    defaultSettings['rpc_port'] = 7657;
-  } else defaultSettings['rpc_port'] = storedSettings.rpc_port;
+  if (!storedSettings["rpc_port"]) {
+    defaultSettings["rpc_port"] = 7657;
+  } else defaultSettings["rpc_port"] = storedSettings.rpc_port;

-  if (!storedSettings['rpc_path']) {
-    defaultSettings['rpc_path'] = 'jsonrpc';
-  } else defaultSettings['rpc_path'] = storedSettings.rpc_path;
+  if (!storedSettings["rpc_path"]) {
+    defaultSettings["rpc_path"] = "jsonrpc";
+  } else defaultSettings["rpc_path"] = storedSettings.rpc_path;

-  if (!storedSettings['rpc_pass']) {
-    defaultSettings['rpc_pass'] = 'itoopie';
-  } else defaultSettings['rpc_pass'] = storedSettings.rpc_pass;
+  if (!storedSettings["rpc_pass"]) {
+    defaultSettings["rpc_pass"] = "itoopie";
+  } else defaultSettings["rpc_pass"] = storedSettings.rpc_pass;

-  if (!storedSettings['bt_rpc_host']) {
-    if (host == '') defaultSettings['bt_rpc_host'] = '127.0.0.1';
-    else defaultSettings['bt_rpc_host'] = host;
-  } else defaultSettings['bt_rpc_host'] = storedSettings.bt_rpc_host;
+  if (!storedSettings["bt_rpc_host"]) {
+    if (host == "") defaultSettings["bt_rpc_host"] = "127.0.0.1";
+    else defaultSettings["bt_rpc_host"] = host;
+  } else defaultSettings["bt_rpc_host"] = storedSettings.bt_rpc_host;

-  if (!storedSettings['bt_rpc_port']) {
-    defaultSettings['bt_rpc_port'] = 7657;
-  } else defaultSettings['bt_rpc_port'] = storedSettings.bt_rpc_port;
+  if (!storedSettings["bt_rpc_port"]) {
+    defaultSettings["bt_rpc_port"] = 7657;
+  } else defaultSettings["bt_rpc_port"] = storedSettings.bt_rpc_port;

-  if (!storedSettings['bt_rpc_path']) {
-    defaultSettings['bt_rpc_path'] = 'transmission/rpc';
-  } else defaultSettings['bt_rpc_path'] = storedSettings.bt_rpc_path;
+  if (!storedSettings["bt_rpc_path"]) {
+    defaultSettings["bt_rpc_path"] = "transmission/rpc";
+  } else defaultSettings["bt_rpc_path"] = storedSettings.bt_rpc_path;

-  if (!storedSettings['bt_rpc_pass']) {
-    defaultSettings['bt_rpc_pass'] = 'transmission';
-  } else defaultSettings['bt_rpc_pass'] = storedSettings.bt_rpc_pass;
+  if (!storedSettings["bt_rpc_pass"]) {
+    defaultSettings["bt_rpc_pass"] = "transmission";
+  } else defaultSettings["bt_rpc_pass"] = storedSettings.bt_rpc_pass;

-  console.log('(options)(browserinfo) NATIVE PROXYSETTINGS', info.value);
+  console.log("(options)(browserinfo) NATIVE PROXYSETTINGS", info.value);
  console.log(
-    '(options)',
-    defaultSettings['proxy_scheme'],
-    defaultSettings['proxy_host'],
-    defaultSettings['proxy_port'],
-    defaultSettings['control_host'],
-    defaultSettings['control_port']
+    "(options)",
+    defaultSettings["proxy_scheme"],
+    defaultSettings["proxy_host"],
+    defaultSettings["proxy_port"],
+    defaultSettings["control_host"],
+    defaultSettings["control_port"]
  );
  chrome.storage.local.set(defaultSettings);
  return defaultSettings;
@@ -346,87 +346,87 @@ function onError(e) {

 function storeSettings() {
  let storableSettings = {};
-  storableSettings['bookmarks_state'] = getBookmarksCreated();
-  storableSettings['proxy_scheme'] = getScheme();
-  storableSettings['proxy_host'] = getHost();
-  storableSettings['proxy_port'] = getPort();
-  storableSettings['control_host'] = getControlHost();
-  storableSettings['control_port'] = getControlPort();
-  storableSettings['rpc_host'] = getRPCHost();
-  storableSettings['rpc_port'] = getRPCPort();
-  storableSettings['rpc_path'] = getRPCPath();
-  storableSettings['rpc_pass'] = getRPCPass();
-  storableSettings['bt_rpc_host'] = getBTRPCHost();
-  storableSettings['bt_rpc_port'] = getBTRPCPort();
-  storableSettings['bt_rpc_path'] = getBTRPCPath();
-  storableSettings['bt_rpc_pass'] = getBTRPCPass();
-  storableSettings['base_url'] =
-    'http://' + bt_rpc_host + ':' + bt_rpc_port + '/' + bt_rpc_path;
-  console.log('storing', storableSettings);
+  storableSettings["bookmarks_state"] = getBookmarksCreated();
+  storableSettings["proxy_scheme"] = getScheme();
+  storableSettings["proxy_host"] = getHost();
+  storableSettings["proxy_port"] = getPort();
+  storableSettings["control_host"] = getControlHost();
+  storableSettings["control_port"] = getControlPort();
+  storableSettings["rpc_host"] = getRPCHost();
+  storableSettings["rpc_port"] = getRPCPort();
+  storableSettings["rpc_path"] = getRPCPath();
+  storableSettings["rpc_pass"] = getRPCPass();
+  storableSettings["bt_rpc_host"] = getBTRPCHost();
+  storableSettings["bt_rpc_port"] = getBTRPCPort();
+  storableSettings["bt_rpc_path"] = getBTRPCPath();
+  storableSettings["bt_rpc_pass"] = getBTRPCPass();
+  storableSettings["base_url"] =
+    "http://" + bt_rpc_host + ":" + bt_rpc_port + "/" + bt_rpc_path;
+  console.log("storing", storableSettings);
  chrome.storage.local.set(storableSettings);
 }

 function updateUI(restoredSettings) {
-  const selectList = document.querySelector('#proxy_scheme');
+  const selectList = document.querySelector("#proxy_scheme");
  if (selectList != undefined) selectList.value = restoredSettings.proxy_scheme;
  //console.log("(options)showing proxy scheme:", selectList.value);

  console.log(restoredSettings);
-  const bms = document.getElementById('bookmarksState');
+  const bms = document.getElementById("bookmarksState");
  if (bms != undefined) bms.checked = restoredSettings.bookmarks_state;

-  const hostitem = document.getElementById('host');
+  const hostitem = document.getElementById("host");
  if (hostitem != undefined) hostitem.value = restoredSettings.proxy_host;
  //console.log("(options)showing proxy host:", hostitem.value);

-  const portitem = document.getElementById('port');
+  const portitem = document.getElementById("port");
  if (portitem != undefined) portitem.value = restoredSettings.proxy_port;
  //console.log("(options)showing proxy port:", portitem.value);

-  const controlhostitem = document.getElementById('controlhost');
+  const controlhostitem = document.getElementById("controlhost");
  if (controlhostitem == undefined)
    controlhostitem.value = restoredSettings.control_host;
  //console.log("(options)showing control host:", controlhostitem.value);

-  const controlportitem = document.getElementById('controlport');
+  const controlportitem = document.getElementById("controlport");
  if (controlportitem == undefined)
    controlportitem.value = restoredSettings.control_port;
  //console.log("(options)showing control port:", controlportitem.value);

-  const rpchostitem = document.getElementById('rpchost');
+  const rpchostitem = document.getElementById("rpchost");
  if (rpchostitem != undefined) rpchostitem.value = restoredSettings.rpc_host;
  //console.log("(options)showing rpc host:", rpchostitem.value);

-  const rpcportitem = document.getElementById('rpcport');
+  const rpcportitem = document.getElementById("rpcport");
  if (rpcportitem != undefined) rpcportitem.value = restoredSettings.rpc_port;
  //console.log("(options)showing rpc port:", rpcportitem.value);

-  const rpcpathitem = document.getElementById('rpcpath');
+  const rpcpathitem = document.getElementById("rpcpath");
  if (rpcpathitem != undefined) rpcpathitem.value = restoredSettings.rpc_path;
  //console.log("(options)showing rpc path:", rpcpathitem.value);

-  const rpcpassitem = document.getElementById('rpcpass');
+  const rpcpassitem = document.getElementById("rpcpass");
  if (rpcpassitem != undefined) rpcpassitem.value = restoredSettings.rpc_pass;
  //console.log("(options)showing rpc pass:");

-  const btrpchostitem = document.getElementById('btrpchost');
+  const btrpchostitem = document.getElementById("btrpchost");
  if (btrpchostitem != undefined)
-    btrpchostitem.value = restoredSettings.rpc_host;
+    btrpchostitem.value = restoredSettings.bt_rpc_host;
  //console.log("(options)showing bt rpc host:", btrpchostitem.value);

-  const btrpcportitem = document.getElementById('btrpcport');
+  const btrpcportitem = document.getElementById("btrpcport");
  if (btrpcportitem != undefined)
-    btrpcportitem.value = restoredSettings.rpc_port;
+    btrpcportitem.value = restoredSettings.bt_rpc_port;
  //console.log("(options)showing rbt pc port:", rpcportitem.value);

-  const btrpcpathitem = document.getElementById('btrpcpath');
+  const btrpcpathitem = document.getElementById("btrpcpath");
  if (btrpcpathitem != undefined)
-    btrpcpathitem.value = restoredSettings.rpc_path;
+    btrpcpathitem.value = restoredSettings.bt_rpc_path;
  //console.log("(options)showing bt rpc path:", btrpcpathitem.value);

-  const btrpcpassitem = document.getElementById('btrpcpass');
+  const btrpcpassitem = document.getElementById("btrpcpass");
  if (btrpcpassitem != undefined)
-    btrpcpassitem.value = restoredSettings.rpc_pass;
+    btrpcpassitem.value = restoredSettings.bt_rpc_pass;
  //console.log("(options)showing bt rpc pass:");

  SetBookButton();
@@ -444,18 +444,18 @@ function onError(e) {

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

-const saveButton = document.querySelector('#save-button');
-saveButton.addEventListener('click', storeSettings);
+const saveButton = document.querySelector("#save-button");
+saveButton.addEventListener("click", storeSettings);
--- a/platform.js
+++ b/platform.js
@@ -2,19 +2,19 @@ var android = false;

 var gettingInfo = browser.runtime.getPlatformInfo();
 gettingInfo.then((got) => {
-  if (got.os == 'android') {
-    console.log('Running in Android detected');
+  if (got.os == "android") {
+    console.log("Running in Android detected");
    android = true;
    return true;
  } else {
-    console.log('Running in Desktop detected');
+    console.log("Running in Desktop detected");
    android = false;
    return false;
  }
 });

 function isDroid() {
-  console.log('android?', android);
+  console.log("android?", android);
  if (android == undefined) {
    return false;
  }
--- a/privacy.js
+++ b/privacy.js
@@ -1,10 +1,10 @@
-var titlepref = chrome.i18n.getMessage('titlePreface');
+var titlepref = chrome.i18n.getMessage("titlePreface");

 function onSet(result) {
  if (result) {
-    console.log('->: Value was updated');
+    console.log("->: Value was updated");
  } else {
-    console.log('-X: Value was not updated');
+    console.log("-X: Value was not updated");
  }
 }

@@ -14,7 +14,7 @@ function disableHyperlinkAuditing() {
  var setting = browser.privacy.websites.hyperlinkAuditingEnabled.set({
    value: false,
  });
-  console.log('Disabling hyperlink auditing/val=', {
+  console.log("Disabling hyperlink auditing/val=", {
    value: false,
  });
  setting.then(onSet);
@@ -23,7 +23,7 @@ function disableHyperlinkAuditing() {
 // UNINSTALL ONLY
 function enableHyperlinkAuditing() {
  var setting = browser.privacy.websites.hyperlinkAuditingEnabled.clear();
-  console.log('Disabling hyperlink auditing/val=', {
+  console.log("Disabling hyperlink auditing/val=", {
    value: false,
  });
  setting.then(onSet);
@@ -34,7 +34,7 @@ function enableFirstPartyIsolation() {
  var setting = browser.privacy.websites.firstPartyIsolate.set({
    value: true,
  });
-  console.log('Enabling first party isolation/val=', {
+  console.log("Enabling first party isolation/val=", {
    value: true,
  });
  setting.then(onSet);
@@ -43,7 +43,7 @@ function enableFirstPartyIsolation() {
 // UNINSTALL ONLY
 function disableFirstPartyIsolation() {
  var setting = browser.privacy.websites.firstPartyIsolate.clear();
-  console.log('Enabling first party isolation/val=', {
+  console.log("Enabling first party isolation/val=", {
    value: true,
  });
  setting.then(onSet);
@@ -57,13 +57,13 @@ function disableEvilCookies() {
  getting.then((got) => {
    var setting = browser.privacy.websites.cookieConfig.set({
      value: {
-        behavior: 'reject_third_party',
+        behavior: "reject_third_party",
        nonPersistentCookies: got.value.nonPersistentCookies,
      },
    });
-    console.log('Setting cookie behavior/val=', {
+    console.log("Setting cookie behavior/val=", {
      value: {
-        behavior: 'reject_third_party',
+        behavior: "reject_third_party",
        nonPersistentCookies: got.value.nonPersistentCookies,
      },
    });
@@ -421,33 +421,26 @@ function i2pHostName(url) {
  if (u.host.endsWith(".i2p")) {
    hostname = u.host;
  } else if (url.includes("=")) {
-    console.log("(hosts) scrub 1", url);
    if (url.includes(".i2p")) {
      lsit = url.split("=");
-      console.log("(hosts) scrub 2", hostname);
      for (let item in lsit) {
        var items = lsit[item].split(`\ % `); //"\%")
        for (let p in items) {
          if (items[p].includes(".i2p")) {
            hostname = items[p].replace("3D", 1);
          }
-          console.log("(hosts) scrub 3", hostname);
          break;
        }
        if (hostname != "") {
-          console.log("(hosts) scrub 4", hostname);
          break;
        }
      }
    }
  } else if (url.indexOf("://") > -1) {
    hostname = url.split("/")[2];
-    console.log("(hosts) scrub 5", hostname);
  } else {
    hostname = url.split("/")[0];
-    console.log("(hosts) scrub 6", hostname);
  }
-  console.log("(hosts) scrub 7", hostname);
  return hostname;
 }

--- a/proxy.js
+++ b/proxy.js
@@ -1,10 +1,15 @@
-var titlepref = chrome.i18n.getMessage('titlePreface');
-var webpref = chrome.i18n.getMessage('webPreface');
-var ircpref = chrome.i18n.getMessage('ircPreface');
-var torrentpref = chrome.i18n.getMessage('torrentPreface');
-var routerpref = chrome.i18n.getMessage('routerPreface');
-var routerprefpriv = chrome.i18n.getMessage('routerPrefacePrivate');
-var ircpref = chrome.i18n.getMessage('ircPreface');
+var titlepref = chrome.i18n.getMessage("titlePreface");
+var webpref = chrome.i18n.getMessage("webPreface");
+var routerpref = chrome.i18n.getMessage("routerPreface");
+var mailpref = chrome.i18n.getMessage("mailPreface");
+var torrentpref = chrome.i18n.getMessage("torrentPreface");
+var tunnelpref = chrome.i18n.getMessage("i2ptunnelPreface");
+var ircpref = chrome.i18n.getMessage("ircPreface");
+var extensionpref = chrome.i18n.getMessage("extensionPreface");
+var muwirepref = chrome.i18n.getMessage("muwirePreface");
+var botepref = chrome.i18n.getMessage("botePreface");
+var blogpref = chrome.i18n.getMessage("blogPreface");
+var blogprefpriv = chrome.i18n.getMessage("blogPrefacePrivate");

 browser.privacy.network.peerConnectionEnabled.set({
  value: true,
@@ -14,17 +19,17 @@ chrome.privacy.network.networkPredictionEnabled.set({
  value: false,
 });
 chrome.privacy.network.webRTCIPHandlingPolicy.set({
-  value: 'disable_non_proxied_udp',
+  value: "disable_non_proxied_udp",
 });
-console.log('Disabled unproxied UDP.');
+console.log("Disabled unproxied UDP.");

 function shouldProxyRequest(requestInfo) {
  return requestInfo.parentFrameId != -1;
 }

-var handleContextProxyRequest = async function(requestDetails) {
+var handleContextProxyRequest = async function (requestDetails) {
  function ircProxy() {
-    if (!requestDetails.url.includes('7669')) {
+    if (!requestDetails.url.includes("7669")) {
      proxy = {
        type: getScheme(),
        host: getHost(),
@@ -32,22 +37,37 @@ var handleContextProxyRequest = async function(requestDetails) {
      };
      return proxy;
    }
-    if (requestDetails.url.includes(':7669')) {
+    if (requestDetails.url.includes(":7669")) {
      proxy = null;
      return proxy;
    }
  }
-  function btProxy() {
-    proxy = routerProxy();
-    if (requestDetails.url.includes(':7662')) {
+  function blogProxy() {
+    if (!requestDetails.url.includes("8084")) {
+      proxy = {
+        type: getScheme(),
+        host: getHost(),
+        port: getPort(),
+      };
+      return proxy;
+    }
+    if (requestDetails.url.includes(":8084")) {
      proxy = null;
      return proxy;
    }
-    console.log('(bt proxy)', proxy);
+  }
+
+  function btProxy() {
+    proxy = routerProxy();
+    if (requestDetails.url.includes(":7662")) {
+      proxy = null;
+      return proxy;
+    }
+    console.log("(bt proxy)", proxy);
    return proxy;
  }
  function mainProxy() {
-    console.log('(proxy) mainproxy 0');
+    console.log("(proxy) mainproxy 0");
    proxy = {
      type: getScheme(),
      host: getHost(),
@@ -56,11 +76,11 @@ var handleContextProxyRequest = async function(requestDetails) {
    let url = new URL(requestDetails.url);
    if (
      requestDetails.url.startsWith(
-        'http://' + getHost() + ':' + getConsolePort() + '/i2psnark/'
+        "http://" + getHost() + ":" + getConsolePort() + "/i2psnark/"
      )
    ) {
      //+url.host)) {
-      console.log('(proxy) mainproxy 2', url);
+      console.log("(proxy) mainproxy 2", url);
      proxy = null;
    }
    return proxy;
@@ -79,24 +99,27 @@ var handleContextProxyRequest = async function(requestDetails) {
    }
  }
  try {
-    var handleProxyRequest = function(context) {
+    var handleProxyRequest = function (context) {
      proxy = {
        type: getScheme(),
        host: getHost(),
        port: getPort(),
      };

-      if (context == 'firefox-default' || context == 'firefox-private') {
+      if (context == "firefox-default" || context == "firefox-private") {
        proxy = null;
        return proxy;
      }

      if (context != undefined) {
-        console.log('(proxy), context', context);
+        console.log("(proxy), context", context);
        proxy = routerProxy();
        if (context.name == ircpref) {
          proxy = ircProxy();
          return proxy;
+        } else if (context.name == blogpref) {
+          proxy = blogProxy();
+          return proxy;
        } else if (context.name == titlepref) {
          proxy = mainProxy();
          return proxy;
@@ -106,18 +129,25 @@ var handleContextProxyRequest = async function(requestDetails) {
        } else if (context.name == torrentpref) {
          proxy = btProxy();
          return proxy;
+        } else if (context.name == mailpref) {
+          return proxy;
+        } else if (context.name == tunnelpref) {
+          return proxy;
+        } else if (context.name == muwirepref) {
+          return proxy;
+        } else if (context.name == botepref) {
+          return proxy;
        }
-        return proxy;
      } else {
        if (!routerHost(requestDetails.url)) {
          if (localHost(requestDetails.url)) {
-            if (requestDetails.url.includes(':7669')) {
+            if (requestDetails.url.includes(":7669")) {
              proxy = null;
-            } else if (requestDetails.url.includes(':7662')) {
+            } else if (requestDetails.url.includes(":7662")) {
              proxy = null;
            } else {
              console.log(
-                '(proxy) non-routerconsole localhost url, will not interfere',
+                "(proxy) non-routerconsole localhost url, will not interfere",
                requestDetails.url
              );
            }
@@ -129,30 +159,32 @@ var handleContextProxyRequest = async function(requestDetails) {
            host: getHost(),
            port: getPort(),
          };
+        } else {
+          proxy = null;
        }
-        if (requestDetails.url.includes('rpc')){
-          console.log("(proxy for rpc url)", rpc)
+        if (requestDetails.url.includes("rpc")) {
+          console.log("(proxy for rpc url)", rpc);
        }
        //var tab = tabGet(requestDetails.tabId);
        //tab.then(handleTabRequest,)
        return proxy;
      }
    };
-    var contextGet = async function(tabInfo) {
+    var contextGet = async function (tabInfo) {
      try {
        context = await browser.contextualIdentities.get(tabInfo.cookieStoreId);
        return context;
      } catch (error) {
-        console.error(error);
-        return 'firefox-default';
+        console.warn(error);
+        return "firefox-default";
      }
    };
-    var tabGet = async function(tabId) {
+    var tabGet = async function (tabId) {
      try {
        let tabInfo = await browser.tabs.get(tabId);
        return tabInfo;
      } catch (error) {
-        console.log('(proxy)Tab error', error);
+        console.log("(proxy)Tab error", error);
      }
    };
    if (proxyHost(requestDetails.url)) {
@@ -163,7 +195,7 @@ var handleContextProxyRequest = async function(requestDetails) {
      };
      return proxy;
    }
-    if (requestDetails.originUrl == browser.runtime.getURL('security.html')) {
+    if (requestDetails.originUrl == browser.runtime.getURL("security.html")) {
      proxy = {
        type: getScheme(),
        host: getHost(),
@@ -172,13 +204,15 @@ var handleContextProxyRequest = async function(requestDetails) {
      return proxy;
    }
    if (
-      requestDetails.cookieStoreId == 'firefox-default' ||
-      requestDetails.cookieStoreId == 'firefox-private'
+      requestDetails.cookieStoreId == "firefox-default" ||
+      requestDetails.cookieStoreId == "firefox-private"
    ) {
-      return browser.proxy.settings.get({});
+      if (browser.windows != undefined) {
+        return browser.proxy.settings.get({});
+      }
    }
    if (requestDetails.tabId > 0) {
-      if (requestDetails.url.includes('MuWire')) {
+      if (requestDetails.url.includes("MuWire")) {
        return;
      }
      if (proxyHost(requestDetails.url)) {
@@ -188,8 +222,6 @@ var handleContextProxyRequest = async function(requestDetails) {
          port: getPort(),
        };
        return proxy;
-      } else if (extensionHost(requestDetails.url)) {
-        return;
      } else if (i2pHost(requestDetails.url)) {
        var tab = tabGet(requestDetails.tabId);
        requestDetails.tabId = tab;
@@ -197,6 +229,8 @@ var handleContextProxyRequest = async function(requestDetails) {
        var proxy = await context.then(handleProxyRequest);
        //console.log('(proxy)Returning I2P Proxy', proxy);
        return proxy;
+      } else if (extensionHost(requestDetails)) {
+        return;
      } else {
        var tab = tabGet(requestDetails.tabId);
        var context = tab.then(contextGet);
@@ -207,65 +241,72 @@ var handleContextProxyRequest = async function(requestDetails) {
      /*proxy = {};
      console.log("(proxy)Returning unset Proxy", proxy);
      return proxy;*/
+    } else {
+      proxy = {
+        type: getScheme(),
+        host: getHost(),
+        port: getPort(),
+      };
+      //console.log('(proxy for rpc url)', rpc);
+      return proxy;
    }
  } catch (error) {
-    console.log('(proxy)Not using I2P Proxy.', error);
+    console.log("(proxy)Not using I2P Proxy.", error);
  }
-}
+};

 function SetupSettings() {
-  console.log('Initialising Settings');
+  console.log("Initialising Settings");
  function onSetupError() {
-    console.log('Settings initialization error');
+    console.log("Settings initialization error");
  }
  //
  function checkSchemeStoredSettings(storedSettings) {
    if (storedSettings.proxy_scheme == undefined)
-      storedSettings.proxy_scheme = 'http';
+      storedSettings.proxy_scheme = "http";
    else proxy_scheme = storedSettings.proxy_scheme;

-    console.log('Initialising Proxy Scheme', storedSettings.proxy_scheme);
+    console.log("Initialising Proxy Scheme", storedSettings.proxy_scheme);
    setupProxy();
  }
-  var gettingSchemeStoredSettings = browser.storage.local.get('proxy_scheme');
+  var gettingSchemeStoredSettings = browser.storage.local.get("proxy_scheme");
  gettingSchemeStoredSettings.then(checkSchemeStoredSettings, onSetupError);

  //
  function checkHostStoredSettings(storedSettings) {
    if (storedSettings.proxy_host == undefined)
-      storedSettings.proxy_host = '127.0.0.1';
+      storedSettings.proxy_host = "127.0.0.1";
    else proxy_host = storedSettings.proxy_host;

-    console.log('Initialising Host', storedSettings.proxy_host);
+    console.log("Initialising Host", storedSettings.proxy_host);
    setupProxy();
  }
-  var gettingHostStoredSettings = browser.storage.local.get('proxy_host');
+  var gettingHostStoredSettings = browser.storage.local.get("proxy_host");
  gettingHostStoredSettings.then(checkHostStoredSettings, onSetupError);

  //
  function checkPortStoredSettings(storedSettings) {
    if (storedSettings.proxy_port == undefined)
-      storedSettings.proxy_port = '4444';
+      storedSettings.proxy_port = "4444";
    else proxy_port = storedSettings.proxy_port;

-    console.log('Initialising Port', storedSettings.proxy_port);
+    console.log("Initialising Port", storedSettings.proxy_port);
    setupProxy();
  }
-  var gettingPortStoredSettings = browser.storage.local.get('proxy_port');
+  var gettingPortStoredSettings = browser.storage.local.get("proxy_port");
  gettingPortStoredSettings.then(checkPortStoredSettings, onSetupError);

  //
  function checkControlHostStoredSettings(storedSettings) {
    if (storedSettings.control_host == undefined)
-      storedSettings.control_host = '127.0.0.1';
+      storedSettings.control_host = "127.0.0.1";
    else control_host = storedSettings.control_host;

-    console.log('Initialising Control Host', storedSettings.control_host);
+    console.log("Initialising Control Host", storedSettings.control_host);
    setupProxy();
  }
-  var gettingControlHostStoredSettings = browser.storage.local.get(
-    'control_host'
-  );
+  var gettingControlHostStoredSettings =
+    browser.storage.local.get("control_host");
  gettingControlHostStoredSettings.then(
    checkControlHostStoredSettings,
    onSetupError
@@ -274,15 +315,14 @@ function SetupSettings() {
  //
  function checkControlPortStoredSettings(storedSettings) {
    if (storedSettings.control_port == undefined)
-      storedSettings.control_port = '7657';
+      storedSettings.control_port = "7657";
    else control_port = storedSettings.control_port;

-    console.log('Initialising Control Port', storedSettings.control_port);
+    console.log("Initialising Control Port", storedSettings.control_port);
    setupProxy();
  }
-  var gettingControlPortStoredSettings = browser.storage.local.get(
-    'control_port'
-  );
+  var gettingControlPortStoredSettings =
+    browser.storage.local.get("control_port");
  gettingControlPortStoredSettings.then(
    checkControlPortStoredSettings,
    onSetupError
@@ -295,28 +335,27 @@ function SetupSettings() {
    else disable_history = storedSettings.disable_history;

    console.log(
-      'Initialising Disabled History',
+      "Initialising Disabled History",
      storedSettings.disable_history
    );
    setupProxy();
  }
-  var gettingHistoryStoredSettings = browser.storage.local.get(
-    'disable_history'
-  );
+  var gettingHistoryStoredSettings =
+    browser.storage.local.get("disable_history");
  gettingHistoryStoredSettings.then(checkHistoryStoredSettings, onSetupError);
 }

 function getScheme() {
-  if (proxy_scheme == 'HTTP') return 'http';
-  if (proxy_scheme == 'SOCKS') return 'socks';
-  if (proxy_scheme == 'http') return 'http';
-  if (proxy_scheme == 'socks') return 'socks';
-  else return 'http';
+  if (proxy_scheme == "HTTP") return "http";
+  if (proxy_scheme == "SOCKS") return "socks";
+  if (proxy_scheme == "http") return "http";
+  if (proxy_scheme == "socks") return "socks";
+  else return "http";
 }

 function getHost() {
  if (proxy_host == undefined) {
-    proxy_host = '127.0.0.1';
+    proxy_host = "127.0.0.1";
  }
  return proxy_host;
 }
@@ -324,8 +363,8 @@ function getHost() {
 function getPort() {
  if (proxy_port == undefined) {
    var scheme = getScheme();
-    if (scheme == 'socks') proxy_port = '4446';
-    else proxy_port = '4444';
+    if (scheme == "socks") proxy_port = "4446";
+    else proxy_port = "4444";
  }
  return proxy_port;
 }
@@ -333,41 +372,35 @@ function getPort() {
 function getConsolePort() {
  if (control_port == undefined) {
    var scheme = getScheme();
-    if (scheme == 'socks') proxy_port = '7657';
-    else control_port = '7657';
+    if (scheme == "socks") proxy_port = "7657";
+    else control_port = "7657";
  }
  return control_port;
 }

 function setupProxy() {
-  console.log('Setting up Firefox WebExtension proxy');
+  console.log("Setting up Firefox WebExtension proxy");
  browser.proxy.onRequest.addListener(handleContextProxyRequest, {
-    urls: ['<all_urls>'],
+    urls: ["<all_urls>"],
  });
-  console.log('i2p settings created for WebExtension Proxy');
+  console.log("i2p settings created for WebExtension Proxy");
 }

 function update() {
-  console.log('restoring proxy scheme:', proxy_scheme);
-  console.log('restoring proxy host:', proxy_host);
-  console.log('restoring proxy port:', proxy_port);
-  console.log('restoring control host:', control_host);
-  console.log('restoring control port:', control_port);
+  console.log("restoring proxy scheme:", proxy_scheme);
+  console.log("restoring proxy host:", proxy_host);
+  console.log("restoring proxy port:", proxy_port);
+  console.log("restoring control host:", control_host);
+  console.log("restoring control port:", control_port);
 }

 function updateFromStorage() {
-  console.log('updating settings from storage');
-  chrome.storage.local.get(function() {
+  console.log("updating settings from storage");
+  chrome.storage.local.get(function () {
    SetupSettings();
    update();
    setupProxy();
  });
-  var gettingInfo = browser.runtime.getPlatformInfo();
-  gettingInfo.then((got) => {
-    if (got.os != 'android') {
-      browser.windows.getAll().then((wins) => wins.forEach(themeWindow));
-    }
-  });
 }

 updateFromStorage();
@@ -377,9 +410,11 @@ setupProxy();

 var gettingListenerInfo = browser.runtime.getPlatformInfo();
 gettingListenerInfo.then((got) => {
-  browser.windows.onCreated.addListener(() => {
-    chrome.storage.local.get(function() {
-      setupProxy();
+  if (browser.windows != undefined) {
+    browser.windows.onCreated.addListener(() => {
+      chrome.storage.local.get(function () {
+        setupProxy();
+      });
    });
-  });
+  }
 });
--- a/releases.atom
+++ b/releases.atom
@@ -4,13 +4,110 @@
  <link type="text/html" rel="alternate" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases"/>
  <link type="application/atom+xml" rel="self" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases.atom"/>
  <title>Release notes from I2P-in-Private-Browsing-Mode-Firefox</title>
-  <updated>2020-12-21T23:13:19Z</updated>
+  <updated>2021-05-26T22:32:58Z</updated>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.105</id>
+    <updated>2021-05-27T20:19:35Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.105"/>
+    <title>0.105</title>
+    <enclosure url="magnet:?xl=2485<title>0.105</title>dn=i2ppb%40eyedeekay.github.io.xpi.torrent<title>0.105</title>xt=urn:tree:tiger:w6kewvpw25bnau2rwkczbnryrjdzn54ietse3zi<title>0.105</title>xt=urn:ed2k:1cd9743fb664404298b7f2ad7ee45db0<title>0.105</title>xt=urn:aich:4vhcsp6t3c2mkjzds2etixyinyj7xtkp" type="application/x-bittorrent" />
+    <content type="html">&lt;p&gt;Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.105-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Add help page for configuring i2pcontrol&lt;/li&gt;
+&lt;li&gt;Add help page for configuring i2psnark-rpc&lt;/li&gt;
+&lt;li&gt;Update the icons&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt; Wed, 26 May 2021 12:56:56 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.103-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.103</id>
+    <updated>2021-05-26T16:59:28Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.103"/>
+    <title>0.103</title>
+    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
+Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.103-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Fix for double-test issue on /home.html page in the extension&lt;/li&gt;
+&lt;li&gt;Fix for broken options menu&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt; Wed, 26 May 2021 12:56:56 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.101-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.101</id>
+    <updated>2021-05-24T19:42:29Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.101"/>
+    <title>0.101</title>
+    <content type="html">&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Mon, 24 May 2021 3:41:35 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.99-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Sweeping changes to styles&lt;/li&gt;
+&lt;li&gt;fix for issue when using noscript and visiting susimail&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Mon, 24 May 2021 2:05:21 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.97-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.99</id>
+    <updated>2021-05-24T18:08:37Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.99"/>
+    <title>0.99</title>
+    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
+Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.99-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Sweeping changes to styles&lt;/li&gt;
+&lt;li&gt;fix for issue when using noscript and visiting susimail&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Mon, 24 May 2021 2:05:21 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.97-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.97</id>
+    <updated>2021-02-05T18:05:51Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.97"/>
+    <title>0.97</title>
+    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
+Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.97-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Fix theme issue, add x-i2p-torrentlocation HEADER support&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  FRI, 5 FEB 2021 1:02:55 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.95-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
  <entry>
    <id>tag:github.com,2008:Repository/169256012/0.95</id>
    <updated>2020-12-21T23:21:35Z</updated>
    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.95"/>
    <title>0.95</title>
-    <enclosure url="magnet:?xt=urn:btih:7ec361c3ddc3fb904e369a19cdf4259af94af624" type="application/x-bittorrent" />
    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
 Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
 Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
@@ -23,7 +120,7 @@ i2psetproxy.js (0.95-1) UNRELEASED; urgency=low&lt;/p&gt;
    <author>
      <name>eyedeekay</name>
    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
  </entry>
  <entry>
    <id>tag:github.com,2008:Repository/169256012/0.93</id>
@@ -42,7 +139,7 @@ i2psetproxy.js (0.93-1) UNRELEASED; urgency=low&lt;/p&gt;
    <author>
      <name>eyedeekay</name>
    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
  </entry>
  <entry>
    <id>tag:github.com,2008:Repository/169256012/0.91</id>
@@ -61,7 +158,7 @@ i2psetproxy.js (0.91-1) UNRELEASED; urgency=low&lt;/p&gt;
    <author>
      <name>eyedeekay</name>
    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
  </entry>
  <entry>
    <id>tag:github.com,2008:Repository/169256012/0.89</id>
@@ -81,7 +178,7 @@ i2psetproxy.js (0.89-1) UNRELEASED; urgency=low&lt;/p&gt;
    <author>
      <name>eyedeekay</name>
    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
  </entry>
  <entry>
    <id>tag:github.com,2008:Repository/169256012/0.87</id>
@@ -101,97 +198,6 @@ i2psetproxy.js (0.87-1) UNRELEASED; urgency=low&lt;/p&gt;
    <author>
      <name>eyedeekay</name>
    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
-  </entry>
-  <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.85</id>
-    <updated>2020-11-11T06:44:44Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.85"/>
-    <title>0.85</title>
-    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
-Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
-Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
-i2psetproxy.js (0.85-1) UNRELEASED; urgency=low&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;Fix a bug which was causing i2psnark to fail to isolate.&lt;/li&gt;
-&lt;/ul&gt;
-&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Sat, 10 NOV 2020 1:33:50 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.83-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
-    <author>
-      <name>eyedeekay</name>
-    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
-  </entry>
-  <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.83</id>
-    <updated>2020-11-11T04:00:27Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.83"/>
-    <title>0.83</title>
-    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
-Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
-Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
-i2psetproxy.js (0.83-1) UNRELEASED; urgency=low&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;Add a tab for I2P-Native Dispatch&lt;/li&gt;
-&lt;/ul&gt;
-&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Sat, 10 NOV 2020 22:00:01 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.81-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
-    <author>
-      <name>eyedeekay</name>
-    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
-  </entry>
-  <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.81</id>
-    <updated>2020-11-08T02:44:34Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.81"/>
-    <title>0.81</title>
-    <content type="html">&lt;p&gt;Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
-i2psetproxy.js (0.81-1) UNRELEASED; urgency=low&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;X-I2P-TorrentLocation header&lt;/li&gt;
-&lt;li&gt;Visual tweaks&lt;/li&gt;
-&lt;li&gt;Deprecate localhost browser container permanently&lt;/li&gt;
-&lt;li&gt;Isolation rules improvements&lt;/li&gt;
-&lt;/ul&gt;
-&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Sat, 07 NOV 2020 21:34:25 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.79-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
-    <author>
-      <name>eyedeekay</name>
-    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
-  </entry>
-  <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.79</id>
-    <updated>2020-09-26T03:36:46Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.79"/>
-    <title>0.79</title>
-    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
-Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
-Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
-i2psetproxy.js (0.79-1) UNRELEASED; urgency=low&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;Pin application tabs to the front of the tab order&lt;/li&gt;
-&lt;li&gt;Refine pageaction behavior&lt;/li&gt;
-&lt;/ul&gt;
-&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Mon, 24 SEP 2020 20:18:03 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.77-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
-    <author>
-      <name>eyedeekay</name>
-    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
-  </entry>
-  <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.77</id>
-    <updated>2020-09-25T00:19:45Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.77"/>
-    <title>0.77</title>
-    <content type="html">&lt;p&gt;Merge pull request &lt;a class=&quot;issue-link js-issue-link&quot; href=&quot;https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/pull/100&quot;&gt;#100&lt;/a&gt; from eyedeekay/bookmarks&lt;/p&gt;
-
-&lt;p&gt;make the bookmarks part of a subdirectory&lt;/p&gt;</content>
-    <author>
-      <name>eyedeekay</name>
-    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
  </entry>
 </feed>
--- a/routerconsole.png
+++ b/routerconsole.png
--- a/script.js
+++ b/script.js
@@ -1,7 +1,7 @@
 browser.runtime.onMessage.addListener((request) => {
-  var response = 'no-alt-location';
+  var response = "no-alt-location";
  console.log(request);
-  if (request.req === 'i2p-location') {
+  if (request.req === "i2p-location") {
    var tag = document.querySelector('meta[http-equiv="i2p-location"]');
    if (tag != undefined) {
      console.log(tag);
@@ -13,7 +13,7 @@ browser.runtime.onMessage.addListener((request) => {
      if (tag) response = tag.content;
    }
  }
-  if (request.req === 'i2p-torrentlocation') {
+  if (request.req === "i2p-torrentlocation") {
    var tag = document.querySelector('meta[http-equiv="i2p-torrentlocation"]');
    if (tag != undefined) {
      console.log(tag);
--- a/scrub.js
+++ b/scrub.js
--- a/sectorrent.html
+++ b/sectorrent.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <link href="search.css" rel="stylesheet">
+    <link href="home.css" rel="stylesheet"><!--<link href="info.css" rel="stylesheet">--><!--<link href="torrent/popup.css" rel="stylesheet">-->
+
+    <title>
+    </title>
+</head>
+<body>
+    <div id="browserpanel">
+        <div class="panel">
+            <div class="section-header panel-section panel-section-header" id="headline">
+                <div class="text-section-header" id="text-section-header">
+                    <h1 id="text-section-header">I2P Site Properties  | This I2P Site has peer-to-peer resources.</h1>
+                </div>
+            </div>
+        </div>
+
+        <div class="panel">
+            <ul>
+                <li>
+                    <div class="address-info">
+                        <div id="addresstype">
+                            <span id="TypeLabel">Address Type:</span> <span id="Type"></span>
+                            <div id="TypeInfo">
+                                <span id="AddressInfo"></span>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+
+                <li>
+                    <div class="tls-info">
+                        <div id="sitecert">
+                            <span id="CertLabel">Certificate Information:</span> <span id="Cert"></span>
+                            <div id="CertInfo">
+                                <span id="AddressCertInfo"></span>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+
+                <li>
+                    <div id="signingcert">
+                        <span id="SignedLabel">Signed By:</span> <span id="Signed"></span>
+                    </div>
+                </li>
+            </ul>
+        </div>
+        <div class="panel">
+            <p>
+            To help distribute the site content, use the links below to join the swarm.
+            </p>
+            <ul>
+                <li>
+                    <div class="address-info">
+                      <span id="TorrentTypeLabel">Torrent Links:</span> <span id="Type"></span>
+                      <div id="TorrentTypeInfo">
+                      </div>
+                    </div>
+                </li>
+            </ul>
+        </div>
+    </div>
+    <script src="cert.js"></script>
+    <script src="torrent.js"></script>
+</body>
+</html>
--- a/susimail.png
+++ b/susimail.png
--- a/toopie.png
+++ b/toopie.png
--- a/torrent.js
+++ b/torrent.js
@@ -1,8 +1,8 @@
 function gotCurrent(tab) {
  function gotTitle(title) {
    let addr = title;
-    document.getElementById('TypeInfo').innerHTML =
-      '<div class="AddressInfo"><a href="' + addr + '">' + addr + '</a></div>';
+    document.getElementById("TypeInfo").innerHTML =
+      '<div class="AddressInfo"><a href="' + addr + '">' + addr + "</a></div>";
  }
  console.log(tab);
  var gettingTitle = browser.pageAction.getTitle({
--- a/torrent/README.md
+++ b/torrent/README.md
@@ -1,4 +1,4 @@
-Acknowledgement
+Acknowledgementindex
 ===============

 **Many, many thanks to the [Transmitter](https://github.com/myfreeweb/transmitter)
@@ -33,7 +33,7 @@ To install the plugin, go to [http://127.0.0.1:7657/configplugins](http://127.0.
 and scroll down to the section of the page where it says "Installation from URL"
 and paste the following URL:

-```http://stats.i2p/i2p/plugins/i2psnark-rpc.su3```
+`http://stats.i2p/i2p/plugins/i2psnark-rpc.su3`

 Click the "Install Plugin" button and you'll be ready to go. Now, open the
 extension options menu, and just click "Save." The defaults are correct for use
--- a/torrent/background.js
+++ b/torrent/background.js
@@ -1,18 +1,18 @@
-'use strict';
+"use strict";

 ////// Session extraction

 function setupExtractor() {
  browser.webRequest.onHeadersReceived.removeListener(extractSession);
-  browser.storage.local.get('server').then(({ server }) => {
+  browser.storage.local.get("server").then(({ server }) => {
    if (!server) {
      return;
    }
-    console.log('Session extractor setup for', server.base_url);
+    console.log("Session extractor setup for", server.base_url);
    browser.webRequest.onBeforeSendHeaders.addListener(
      extractSession,
-      { urls: [server.base_url + '*'] },
-      ['requestHeaders']
+      { urls: [server.base_url + "*"] },
+      ["requestHeaders"]
    );
  });
 }
@@ -126,20 +126,23 @@ function createContextMenu() {
  });
 }

-createContextMenu();
-
-browser.contextMenus.onClicked.addListener((info, tab) => {
-  if (info.menuItemId === "transmitter-add") {
-    return addUrl(info.linkUrl);
-  } else if (info.menuItemId.startsWith("transmitter-add-loc-")) {
-    let index = parseInt(info.menuItemId.substr("transmitter-add-loc-".length));
-    browser.storage.local.get("server").then(({ server }) => {
-      let path = server.locations[index].path;
-      addUrl(info.linkUrl, path);
-    });
-  }
-});
+if (browser.windows != undefined) {
+  createContextMenu();

+  browser.contextMenus.onClicked.addListener((info, tab) => {
+    if (info.menuItemId === "transmitter-add") {
+      return addUrl(info.linkUrl);
+    } else if (info.menuItemId.startsWith("transmitter-add-loc-")) {
+      let index = parseInt(
+        info.menuItemId.substr("transmitter-add-loc-".length)
+      );
+      browser.storage.local.get("server").then(({ server }) => {
+        let path = server.locations[index].path;
+        addUrl(info.linkUrl, path);
+      });
+    }
+  });
+}
 ////// Badge

 function updateBadge() {
--- a/torrent/common.js
+++ b/torrent/common.js
@@ -1,30 +1,30 @@
-'use strict';
+"use strict";

 ////// RPC

 function rpcCall(meth, args) {
-  return browser.storage.local.get(function(server) {
+  return browser.storage.local.get(function (server) {
    const myHeaders = {
-      'Content-Type': 'application/json',
-      'x-transmission-session-id': server.session,
+      "Content-Type": "application/json",
+      "x-transmission-session-id": server.session,
    };
    //console.log("(torrent)", server.session)
-    if (server.username !== '' || server.btrpcpass !== '') {
-      myHeaders['Authorization'] =
-        'Basic ' +
-        btoa((server.username || '') + ':' + (server.btrpcpass || ''));
+    if (server.username !== "" || server.btrpcpass !== "") {
+      myHeaders["Authorization"] =
+        "Basic " +
+        btoa((server.username || "") + ":" + (server.btrpcpass || ""));
    }
    //console.log("(torrent) rpc", server.base_url);
-    return fetch(server.base_url + 'rpc', {
-      method: 'POST',
+    return fetch(server.base_url + "rpc", {
+      method: "POST",
      headers: myHeaders,
      body: JSON.stringify({ method: meth, arguments: args }),
-      credentials: 'include', // allows HTTPS client certs!
+      credentials: "include", // allows HTTPS client certs!
    })
-      .then(function(response) {
-        const session = response.headers.get('x-transmission-session-id');
+      .then(function (response) {
+        const session = response.headers.get("x-transmission-session-id");
        if (session) {
-          browser.storage.local.get({}).then(function(storage) {
+          browser.storage.local.get({}).then(function (storage) {
            storage.session = session;
            browser.storage.local.set(storage);
          });
@@ -39,7 +39,7 @@ function rpcCall(meth, args) {
        error.response = response;
        throw error;
      })
-      .then(function(response) {
+      .then(function (response) {
        return response.json();
      });
  });
@@ -50,11 +50,11 @@ function rpcCall(meth, args) {
 function formatSpeed(s) {
  // Firefox shows 4 characters max
  if (s < 1000 * 1000) {
-    return (s / 1000).toFixed() + 'K';
+    return (s / 1000).toFixed() + "K";
  }
  if (s < 1000 * 1000 * 1000) {
-    return (s / 1000 / 1000).toFixed() + 'M';
+    return (s / 1000 / 1000).toFixed() + "M";
  }
  // You probably don't have that download speed…
-  return (s / 1000 / 1000 / 1000).toFixed() + 'T';
+  return (s / 1000 / 1000 / 1000).toFixed() + "T";
 }
--- a/torrent/index.html
+++ b/torrent/index.html
@@ -6,7 +6,7 @@
  <link rel="stylesheet" type="text/css" href="../sidebar.css" />
 </head>
 <body>
-<h1>Acknowledgement</h1>
+<h1>Acknowledgementindex</h1>

 <p><strong>Many, many thanks to the <a href="https://github.com/myfreeweb/transmitter">Transmitter</a>
 webextension.</strong></p>
--- a/torrent/popup.js
+++ b/torrent/popup.js
@@ -1,25 +1,27 @@
-'use strict';
+"use strict";

-var TrpcCall = async function(meth, args) {
+var TrpcCall = async function (meth, args) {
  const server = await browser.storage.local.get(null);
  const myHeaders = {
-    'Content-Type': 'application/json',
-    'x-transmission-session-id': server.session,
+    "Content-Type": "application/json",
+    "x-transmission-session-id": server.session,
  };
-  console.log('(torrent) session', server.session);
-  if (server.username !== '' || server.btrpcpass !== '') {
-    myHeaders['Authorization'] =
-      'Basic ' + btoa((server.username || '') + ':' + (server.btrpcpass || ''));
+  console.log("(torrent) session", server.session);
+  if (server.username !== "" || server.bt_rpc_pass !== "") {
+    myHeaders["Authorization"] =
+      "Basic " +
+      btoa((server.username || "") + ":" + (server.bt_rpc_pass || ""));
  }

-  let req_url = server.bt_rpc_host
-  if (server.bt_rpc_port != 0) req_url += ":"+server.bt_rpc_port
-  console.log('(torrent) rpcurl', req_url);
-  return fetch(req_url + 'rpc', {
-    method: 'POST',
+  let req_url = "http://" + server.bt_rpc_host;
+  if (server.bt_rpc_port != 0) req_url += ":" + server.bt_rpc_port;
+  req_url += "/" + server.bt_rpc_path;
+  console.log("(torrent) rpcurl", req_url);
+  return fetch(req_url + "rpc", {
+    method: "POST",
    headers: myHeaders,
    body: JSON.stringify({ method: meth, arguments: args }),
-    credentials: 'include', // allows HTTPS client certs!
+    credentials: "include", // allows HTTPS client certs!
  });

  /*.then(function(response) {
@@ -35,13 +37,13 @@ var TrpcCall = async function(meth, args) {
    error.response = response;
    throw error;
  });*/
-}
+};

-const torrentsPane = document.getElementById('torrents-pane');
-const configPane = document.getElementById('config-pane');
+const torrentsPane = document.getElementById("torrents-pane");
+const configPane = document.getElementById("config-pane");

-for (const opener of document.querySelectorAll('.config-opener')) {
-  opener.addEventListener('click', (e) => {
+for (const opener of document.querySelectorAll(".config-opener")) {
+  opener.addEventListener("click", (e) => {
    browser.runtime.openOptionsPage();
  });
 }
@@ -144,11 +146,14 @@ function showTorrents(server) {
  torrentsPane.hidden = false;
  configPane.hidden = true;
  for (const opener of document.querySelectorAll(".webui-opener")) {
-    opener.href = server.base_url + "web/";
+    let req_url = "http://" + server.bt_rpc_host;
+    if (server.bt_rpc_port != 0) req_url += ":" + server.bt_rpc_port;
+    req_url += "/" + server.bt_rpc_path;
+    opener.href = req_url + "web/";
  }
  console.log("(torrent) showing torrents");
  refreshTorrents(server).catch((_) => refreshTorrentsLogErr(server));
-  setInterval(() => refreshTorrentsLogErr(server), 2000);
+  setInterval(() => refreshTorrentsLogErr(server), 60000);
 }

 //let store =
--- a/transmissionrpc.png
+++ b/transmissionrpc.png
--- a/window.html
+++ b/window.html
@@ -29,13 +29,13 @@

                <div class="topnav">
                    <a class="applicationName window-visit-homepage" href="#" id="window-visit-homepage" target="_blank">Home Page</a>
-                    <form action="http://yacy.idk.i2p/yacysearch.html?" method="get">
-                        <input id="search-query" name="query" placeholder="Search on yacy.idk.i2p(Opens a new tab)" type="search"> <input id="search-submit" text="Submit" type="submit">
+                    <form action="http://legwork.i2p/yacysearch.html?" method="get">
+                        <input id="search-query" name="query" placeholder="Search on legwork.i2p(Opens a new tab)" type="search"> <input id="search-submit" text="Submit" type="submit">
                    </form>
                </div>

                <div class="hideIfI2PProxyOff" id="readyness">
-                    <img class="readyness" src="http://proxy.i2p/themes/console/images/local_up.png"> <span id="proxy-check">Proxy is ready.</span>
+                    <img class="readyness" src="icons/local_up.png"> <span id="proxy-check">Proxy is ready.</span>
                </div>

                <div id="i2pbrowser-description">
@@ -84,9 +84,9 @@
                <p id="applicationExplain">These applications use I2P to provide them with security and privacy.</p>

                <ul>
-                    <li class="application"><button class="applicationName window-visit-homepage" href="#" id="window-visit-index" target="_blank">Help Page</button> <span class="applicationDesc" id="abouthome">For more information about this extension, go here:</span></li>
+                    <li class="application"><button class="applicationName window-visit-help" href="#" id="window-visit-help" target="_blank">Help Page</button> <span class="applicationDesc" id="abouthome">For more information about this extension, go here:</span></li>

-                    <li class="application"><button class="applicationName window-visit-toopie" href="#" id="window-visit-toopie" target="_blank">Toopie</button> <span class="applicationDesc" id="toopie">For information about your I2P router status, go here:</span></li>
+                    <li class="application window-visit-toopie"><button class="applicationName window-visit-toopie" href="#" id="window-visit-toopie" target="_blank">Toopie</button> <span class="applicationDesc window-visit-toopie" id="toopie">For information about your I2P router status, go here:</span></li>

                    <li class="application"><button class="applicationName" id="window-visit-i2ptunnel" target="_blank">Hidden Services Manager</button> <span class="applicationDesc" id="i2ptunnel">I2P has a web-based interface for configuring .i2p services like web sites, to set up your own web sites, go here:</span></li>

@@ -113,6 +113,8 @@
                <br>
                The server address is not set yet.
                <br>
+                <a class="torrent-opener" href="#" id="window-visit-torrent">For assistance, visit the torrent help page</a>.
+                <br>
                <a class="config-opener" href="#">Open the settings</a> to continue.
            </div>

--- a/x-i2p-torrentlocation.png
+++ b/x-i2p-torrentlocation.png
Author	SHA1	Message	Date
idk	73f2883fbd	address erroneous text issue #113	2021-12-02 19:50:33 -05:00
idk	4d317eac4c	Bump and resubmit again	2021-11-03 00:22:37 -04:00
idk	4755637206	fmt and resubmit	2021-10-30 10:12:24 -04:00
idk	b84d8945aa	fmt and resubmit	2021-10-30 10:08:09 -04:00
idk	7e1428310b	Try and cut a release with the new information from Mozilla. Add details about min Firefox version to readme	2021-10-13 21:29:25 -04:00
idk	7cc6dbfdf0	Try and cut a release with the new information from Mozilla. Add details about min Firefox version to readme	2021-10-13 21:27:02 -04:00
idk	e95d67db4b	Try and cut a release with the new information from Mozilla. Add details about min Firefox version to readme	2021-10-13 21:25:54 -04:00
idk	a261f7875a	bump changelog	2021-10-13 20:48:07 -04:00
idk	78141f2839	Try and cut a release with the new information from Mozilla. Add details about min Firefox version to readme	2021-10-13 20:46:17 -04:00
idk	75d23a752c	make fmt	2021-10-13 20:43:39 -04:00
idk	03cc374c54	Bump strict_min_version to 91.1.0 so that I can release again, see https://discourse.mozilla.org/t/can-anyone-release-extensions-right-now-to-me-it-looks-like-addons-mozilla-org-is-critically-broken/84830/25 for the rising action of what appears to be at least a year of absurdity	2021-10-13 20:38:23 -04:00
idk	89f8496bb8	switch to legwork and release another version.	2021-10-04 20:41:20 -04:00
idk	15489b7f10	Bump version, update changelog	2021-10-01 15:48:07 -04:00
idk	3a67d00741	Fix tab.id check in http-equiv section	2021-10-01 15:07:33 -04:00
idk	d5a0edfd68	Add workaround to makefile	2021-10-01 14:33:11 -04:00
idk	1853292b99	browser.theme.reset does not work without a window.id, contrary to the Mozilla documentation. Themes just won't work on Android I think...	2021-10-01 14:30:41 -04:00
idk	f575f95ee2	make prettier	2021-10-01 14:16:15 -04:00
idk	97146391e8	Reverse application priority of header checks and http-equiv checks	2021-10-01 14:14:56 -04:00
idk	31af292a47	Prevent creation of multiple pinned tabs for a single application	2021-10-01 12:15:28 -04:00
idk	ac548b58b0	Merge branch 'android-compat' into 'master' Make changes to allow upstream to manage android containers as well, but do... See merge request idk/I2P-in-Private-Browsing-Mode-Firefox!25	2021-09-30 22:03:40 +00:00
idk	aa6a9a0da8	Make changes to allow upstream to manage android containers as well, but do not change manifest.json because we need all the entries for desktop firefox.	2021-09-30 18:00:30 -04:00
idk	7bfc4f8c66	create android-trunk branch	2021-09-30 16:46:20 -04:00
idk	ffc29deb8e	bump strict_min_version 85 to shut up the linter	2021-09-26 14:55:10 -04:00
idk	78a01f6cc1	Bump version and prepare to bug Mozilla.	2021-09-26 00:37:45 -04:00
idk	d09bb59a1f	Bump version and prepare to bug Mozilla.	2021-09-26 00:35:40 -04:00
idk	e2f8a439b6	Merge branch 'fix-brb-blog' into 'master' Fix checks on blog and port containers See merge request idk/I2P-in-Private-Browsing-Mode-Firefox!24	2021-09-26 04:27:17 +00:00
idk	95a282c07f	Fix checks on blog and port containers	2021-09-26 00:23:48 -04:00
idk	02f3cc871d	Wait until after we confirm it's an I2P site to set pageAction	2021-07-08 22:19:22 -04:00
idk	5d260c5a3e	Well I guess moz-sign has to fail at release time now because amo is 504 when I try to cut a release	2021-07-08 14:40:24 -04:00
idk	b5758839e1	bump version and release	2021-07-07 23:27:43 -04:00
idk	a473da6a8e	bump version and release	2021-07-07 22:58:55 -04:00
idk	75b4ff4b60	Merge pull request #111 from eyedeekay/code-cleanup Code cleanup	2021-07-08 02:57:13 +00:00
idk	d3cf9e8686	bump strict-min-version so the validator shuts up, nobody's as far back as Firefox 60 right now	2021-07-07 22:53:14 -04:00
idk	7bd7701aeb	Remove obsolete workaround to theme reset issue	2021-07-07 22:34:01 -04:00
idk	87c3a62f25	connection interrupted mid release, retry failed validation. Bump and retry	2021-07-07 22:01:36 -04:00
idk	4bc984a72d	connection interrupted mid release, retry failed validation. Bump and retry	2021-07-07 21:58:30 -04:00
idk	7b6438dce5	fix some background-theme stuff	2021-07-07 21:55:35 -04:00
idk	80d5367fed	Merge pull request #110 from eyedeekay/code-cleanup Code cleanup	2021-07-08 01:42:55 +00:00
idk	a7902632bc	Un-bump version, fix some issues with internationalization on releases	2021-07-07 21:40:53 -04:00
idk	199e6577bb	bump version	2021-07-07 21:30:34 -04:00
idk	00fd0aed62	fmt-prettier	2021-07-07 21:28:06 -04:00
idk	daaebe027d	add missing names to proxy.js	2021-07-07 15:15:45 -04:00
idk	3d39e75ffd	mind our own business re: container tab proxy settings	2021-07-07 15:12:59 -04:00
idk	e013c093d8	Upgrade the version number to build a rhizome	2021-05-31 17:19:42 -04:00
idk	5b51fc2c27	add variant extension name	2021-05-31 15:09:23 -04:00
idk	65e43abe02	Remove a whole bunch of redundant code related to forcing a contextual identity to it's own function. Only Snark(Due to X-I2P-Torrentlocation) needs it's own isolator now, everybody else can use the same one. Makes it easier to add new contexts.	2021-05-28 14:20:57 -04:00
idk	7f810f86d0	update graphics for icons with the ones provided by @shoalsteed	2021-05-26 18:32:58 -04:00
idk	899974c339	Fix quotes, update for release	2021-05-26 18:21:12 -04:00
idk	6f30aeaf06	update graphics for icons with the ones provided by @shoalsteed	2021-05-26 17:25:41 -04:00
idk	d285063b4f	add help pages for i2pcontrol and torrents	2021-05-26 15:11:46 -04:00
idk	ffa282671b	update transmission-rpc screenshot	2021-05-26 13:15:33 -04:00
idk	e9acc1fe35	update changelog	2021-05-26 12:57:41 -04:00
idk	04ebfedb84	fix options pages	2021-05-26 12:55:34 -04:00
idk	23d451cf92	update site	2021-05-26 12:01:26 -04:00
idk	44628a1358	update site	2021-05-26 11:58:31 -04:00
idk	04782aa099	update site	2021-05-26 11:57:43 -04:00
idk	ff4302eb2b	update screeenshots, add more screenshots	2021-05-26 11:32:35 -04:00
idk	9185a4daf2	add a context and proxy rules for railroad blog	2021-05-26 11:31:16 -04:00
idk	6b6a73dbdb	update screeenshots, add more screenshots	2021-05-26 11:15:47 -04:00
idk	1729656189	add a context and proxy rules for railroad blog	2021-05-25 16:59:38 -04:00
idk	08b31efbfc	Check proxy before extension URL	2021-05-24 15:41:51 -04:00
idk	e124d61115	Check proxy before extension URL	2021-05-24 15:41:17 -04:00
idk	e6e914cefe	Check proxy before extension URL	2021-05-24 15:40:35 -04:00
idk	4d2e68f79d	fix html	2021-05-24 15:35:35 -04:00
idk	b5bb8ec694	fix broken html	2021-05-24 15:29:02 -04:00
idk	f0651edb06	Merge pull request #107 from eyedeekay/thoroughly-delete-containers Various Bugfixes	2021-05-24 11:08:12 -07:00
idk	49ce0162d1	update changelog	2021-05-24 14:06:23 -04:00
idk	153a49e18f	some style fixes, issue with noscript when visiting susimail for the first time, ready for release	2021-05-24 14:03:11 -04:00
idk	88cc54217c	some style fixes, issue with noscript when visiting susimail for the first time, ready for release	2021-05-24 13:58:44 -04:00
idk	83bb92c0cb	some style fixes, issue with noscript when visiting susimail for the first time, ready for release	2021-05-24 13:57:37 -04:00
idk	f337e64b81	Merge branch 'secure-marking' into 'master' Create icon for each indicating state in the toolbar(HTTPS, Bittorrent,... See merge request idk/I2P-in-Private-Browsing-Mode-Firefox!23	2021-04-27 14:16:30 +00:00
idk	42f90273e2	prettier	2021-04-26 17:18:41 -04:00
idk	616d8429b7	Fix HTTPS marking, re-add http+i2p marking	2021-04-26 17:18:08 -04:00
idk	3261fd1505	fix Proxy Readyness visual indicator	2021-04-25 23:22:23 -04:00
idk	4ea8fd4826	start switching back to the old CSS which I liked better all along anyway, and which will be easier to make work in the future	2021-04-25 17:03:43 -04:00
idk	c899f7b1e7	Create icon for each indicating state in the toolbar(HTTPS, Bittorrent, HTTPS+Bittorrent, X-I2P-Location) with our own lock icons for .i2p sites, https .i2p sites	2021-04-25 16:18:41 -04:00
idk	02bc927262	Create icon for each indicating state in the toolbar(HTTPS, Bittorrent, HTTPS+Bittorrent, X-I2P-Location) with our own lock icons for .i2p sites, https .i2p sites	2021-04-25 16:05:07 -04:00
idk	5393d7f26f	Add new lock icons for I2P and I2P HTTPS secured sites	2021-04-19 19:07:18 -04:00
idk	fa66c26b09	Merge branch 'themes-again' into 'master' bump See merge request idk/I2P-in-Private-Browsing-Mode-Firefox!22	2021-02-05 18:04:33 +00:00
idk	eec31ad3db	bump	2021-02-05 13:03:30 -05:00
idk	3a770cb518	Merge branch 'themes-again' into 'master' Themes again See merge request idk/I2P-in-Private-Browsing-Mode-Firefox!21	2021-02-05 18:00:58 +00:00
idk	7de36bc86c	bump	2021-02-05 13:00:15 -05:00
idk	c0bf732253	fix merge issues	2021-02-05 12:58:35 -05:00
idk	49948a524e	fmt	2021-02-05 12:41:26 -05:00
idk	ac792dbcd5	fix x-i2p-torrentlocation bug	2021-02-01 12:55:39 -05:00
idk	db8508e75b	Merge branch 'themes-again' into 'master' fix the theme issue See merge request idk/I2P-in-Private-Browsing-Mode-Firefox!20	2021-01-31 06:13:58 +00:00
idk	95e0642126	Merge branch 'rpc-over-i2p' into 'master' Extensions run requests in what is effectively their own container for our... See merge request idk/I2P-in-Private-Browsing-Mode-Firefox!19	2021-01-31 06:11:51 +00:00
idk	54b5be97e2	fix the theme issue	2021-01-31 01:07:14 -05:00