update changelog

some style fixes, issue with noscript when visiting susimail for the first time, ready for release
2021-05-24 14:06:23 -04:00 · 2021-05-24 14:03:11 -04:00 · 2021-05-24 13:58:44 -04:00 · 2021-05-24 13:57:37 -04:00 · 2021-04-27 14:16:30 +00:00 · 2021-04-26 17:18:41 -04:00
45 changed files with 1981 additions and 2126 deletions
--- a/9
+++ b/9
@@ -37,11 +37,11 @@ clean: rc clean-artifacts
 ## EVEN RELEASES are AMO RELEASES
 ## ODD RELEASES are SELFHOSTED RELEASES

-MOZ_VERSION=0.90
-VERSION=0.89
+MOZ_VERSION=0.100
+VERSION=0.99

 ## INCREMENT THIS EVERY TIME YOU DO A RELEASE
-LAST_VERSION=0.87
+LAST_VERSION=0.97

 YELLOW=F7E59A
 ORANGE=FFC56D
@@ -344,7 +344,7 @@ wire:
 	cp -v "./i2ppb-$(VERSION)@eyedeekay.github.io.xpi.torrent" "$(HOME)/i2p/MuWireDownloads/"
 	cp -v "../i2ppb-$(VERSION)@eyedeekay.github.io.xpi" "$(HOME)/i2p/MuWireDownloads/"

-test:
+ndtest:
 	web-ext run -u about:debugging \
 		-u http://127.0.0.1:7657/home \
 		-u http://127.0.0.1:7657/i2ptunnel \
@@ -354,6 +354,7 @@ test:
 		-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 \

--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -16,7 +16,7 @@
    "description": "Description of the extension."
  },
  "extensionVersion": {
-    "message": "0.77",
+    "message": "0.99",
    "description": "Version of the extension."
  },
  "proxyFailedStatus": {
--- a/_locales/es/messages.json
+++ b/_locales/es/messages.json
@@ -0,0 +1,302 @@
+{
+  "extensionName": {
+    "message": "I2P en navegación privada",
+    "description": "Nombre de la extensión."
+  },
+  "toopieName": {
+    "message": "toopie.html",
+    "description": "Nombre de la barra lateral."
+  },
+  "toopieTLS": {
+    "message": "Propiedades del sitio",
+    "description": "Nombre del panel de seguridad."
+  },
+  "extensionDescription": {
+    "message": "Su navegador ahora está configurado para usar I2P.",
+    "description": "Descripción de la extensión."
+  },
+  "extensionVersion": {
+    "message": "0,99",
+    "description": "Versión de la extensión."
+  },
+  "proxyFailedStatus": {
+    "message": "El proxy no está listo",
+    "description": "Estado fallido del proxy."
+  },
+  "proxySuccessStatus": {
+    "message": "El proxy está listo",
+    "description": "Estado fallido del proxy."
+  },
+  "controlHeader": {
+    "message": "Control",
+    "description": "Título del panel de control."
+  },
+  "controlExplain": {
+    "message": "Estos controles se utilizan para personalizar su experiencia de navegación I2P",
+    "description": "Introduce el panel de control."
+  },
+  "clearData": {
+    "message": "Borrar datos de navegación:",
+    "description": "Elemento de menú Borrar datos de navegación."
+  },
+  "clearDesc": {
+    "message": "Use esto para borrar sus datos de navegación I2P.",
+    "description": "Borrar descripción de la acción de datos de navegación."
+  },
+  "enableWebRTC": {
+    "message": "¿Habilitar WebRTC con proxy?",
+    "description": "Etiqueta de casilla de verificación de WebRTC."
+  },
+  "rtcDesc": {
+    "message": "WebRTC está deshabilitado de forma predeterminada, pero puede volver a encenderlo y forzarlo para que respete el proxy. Si es un usuario de la extensión del navegador Snowflake, esta opción está deshabilitada y WebRTC está activado de forma predeterminada.",
+    "description": "Descripción de la acción de WebRTC"
+  },
+  "disableHistory": {
+    "message": "¿Deshabilitar el historial en las pestañas I2P?",
+    "description": "Etiqueta de casilla de verificación del historial."
+  },
+  "histDesc": {
+    "message": "El historial se borra automáticamente cuando se cierran las pestañas de I2P. Si desea borrar el historial sobre la marcha, marque esta casilla.",
+    "description": "Descripción de la acción del historial"
+  },
+  "applicationHeader": {
+    "message": "Aplicaciones",
+    "description": "Encabezado de la sección de aplicaciones."
+  },
+  "applicationExplain": {
+    "message": "Estas aplicaciones funcionan con I2P directamente para brindarles seguridad y privacidad.",
+    "description": "Descripción de la sección de aplicación."
+  },
+  "windowVisitConsole": {
+    "message": "Consola del enrutador:",
+    "description": "Etiqueta de la consola del enrutador."
+  },
+  "routerConsole": {
+    "message": "El punto de entrada para todas las demás aplicaciones I2P es la consola del enrutador I2P. Para visitarla, haga clic aquí.",
+    "description": "Descripción de la consola del enrutador."
+  },
+  "windowVisitHomepage": {
+    "message": "Página de inicio:",
+    "description": "Página de inicio para la etiqueta de extensión."
+  },
+  "abouthome": {
+    "message": "Para obtener más información sobre esta extensión, visite esta página.",
+    "description": "Descripción de la página del botón de extensión."
+  },
+  "windowVisitHelppage": {
+    "message": "Página de ayuda:",
+    "description": "Página de ayuda para la etiqueta de extensión."
+  },
+  "help": {
+    "message": "Para obtener más información sobre esta extensión, visite esta página.",
+    "description": "Descripción de la página del botón de extensión."
+  },
+  "windowVisitI2ptunnel": {
+    "message": "Administrador de servicios ocultos:",
+    "description": "Título para i2ptunnel"
+  },
+  "i2ptunnel": {
+    "message": "I2P tiene una interfaz basada en web para configurar servicios .i2p como sitios web que puede configurar.",
+    "description": "Descripción de i2ptunnel"
+  },
+  "windowVisitSusimail": {
+    "message": "Correo electrónico:",
+    "descripción": "Título del correo electrónico"
+  },
+  "susimail": {
+    "message": "I2P también incluye un cliente de correo web que se puede utilizar para acceder al correo electrónico in-I2P.",
+    "description": "Descripción para correo electrónico"
+  },
+  "windowVisitSnark": {
+    "message": "Bittorrent:",
+    "description": "Título para Bittorrent"
+  },
+  "snark": {
+    "message": "I2P es capaz de compartir archivos de igual a igual de forma anónima utilizando la aplicación bittorrent incorporada.",
+    "description": "Descripción de Bittorrent"
+  },
+  "windowVisitSources": {
+    "message": "Código fuente de extensión:",
+    "description": "Título del enlace del código fuente"
+  },
+  "sources": {
+    "message": "Examine el código fuente aquí",
+    "description": "Descripción del enlace del código fuente"
+  },
+  "windowVisitWebPage": {
+    "message": "Página de inicio de la extensión:",
+    "description": "Visita la página de inicio de la extensión en Github"
+  },
+  "homepage": {
+    "message": "Hay más información disponible aquí",
+    "description": "Encontrar más información"
+  },
+  "windowVisitReleases": {
+    "message": "Extension Releases:",
+    "description": "Visite la página de lanzamiento"
+  },
+  "releases": {
+    "message": "Compruebe si hay nuevas versiones aquí",
+    "description": "Descripción de la nueva página de lanzamiento"
+  },
+  "titlePreface": {
+    "message": "Navegador I2P",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "titlePrefacePrivate": {
+    "message": "Navegador I2P (privado)",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "extensionPreface": {
+    "message": "Gestión I2P",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "webPreface": {
+    "message": "Navegador web",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "webPrefacePrivate": {
+    "message": "Navegador web (privado)",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "ircPreface": {
+    "message": "Envío de IRC",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "ircPrefacePrivate": {
+    "message": "Despacho de IRC (privado)",
+    "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"
+  },
+  "botePrefacePrivate": {
+    "message": "I2P-Bote Mail (privado)",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "routerPreface": {
+    "message": "Consola del enrutador",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "routerPrefacePrivate": {
+    "message": "Consola del enrutador (privada)",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "torrentPreface": {
+    "message": "Bittorrent",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "torrentPrefacePrivate": {
+    "message": "Bittorrent (privado)",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "mailPreface": {
+    "message": "Correo web",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "mailPrefacePrivate": {
+    "message": "Correo web (privado)",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "i2ptunnelPreface": {
+    "message": "Administrador de servicios ocultos",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "i2ptunnelPrefacePrivate": {
+    "message": "Administrador de servicios ocultos (privado)",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "muwirePreface": {
+    "message": "MuWire",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "muwirePrefacePrivate": {
+    "message": "MuWire (privado)",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "resetMessage": {
+    "message": "Reset Tunnel",
+    "description": "Mensaje para el botón Reset Tunnel"
+  },
+  "infoTitle": {
+    "message": "Ayuda I2P",
+    "description": "Título del menú de ayuda"
+  },
+  "infoMessage": {
+    "message": "¡Ahora puede navegar libremente por eepWeb! Su navegador ahora está configurado para navegar de forma anónima en la red I2P. Mientras navega, su tráfico se enrutará a través de otros nodos de red para disfrazar su origen, tanto desde el servidor de los propios nodos. ",
+    "description": "Mensaje de ayuda"
+  },
+  "helpMessage": {
+    "message": "Obtén ayuda adicional",
+    "description": "Mensaje de ayuda"
+  },
+  "newsMessage": {
+    "message": "Visite el blog de I2P para conocer las últimas novedades sobre i2p.",
+    "description": "Mensaje de ayuda"
+  },
+  "forumMessage": {
+    "message": "Visite el Foro I2P para obtener más información o solicitar ayuda",
+    "description": "Mensaje de ayuda"
+  },
+  "proxyHelpText": {
+    "message": "Configure aquí su proxy I2P",
+    "description": "Ayuda para configurar las opciones del botón Reset Tunnel"
+  },
+  "hostText": {
+    "message": "Anfitrión:",
+    "description": "Host para el proxy HTTP o SOCKS5"
+  },
+  "portText": {
+    "message": "Puerto:",
+    "description": "Puerto para el proxy HTTP o SOCKS5"
+  },
+  "controlHelpText": {
+    "message": "Configure aquí la consola de su enrutador.",
+    "description": "Ayuda para configurar las opciones del botón Reset Tunnel"
+  },
+  "controlHostText": {
+    "message": "Host de control:",
+    "description": "Host para la consola del enrutador"
+  },
+  "controlPortText": {
+    "message": "Puerto de control:",
+    "description": "Puerto para la consola del enrutador"
+  },
+  "controlHostValue": {
+    "message": "127.0.0.1",
+    "description": "Host para la consola del enrutador"
+  },
+  "controlPortValue": {
+    "message": "7657",
+    "description": "Puerto para la consola del enrutador"
+  },
+  "isBase32": {
+    "message": "Dirección con formato I2P Base32",
+    "description": "Mensaje para el panel de información del sitio base32"
+  },
+  "isHostName": {
+    "message": "Nombre de host de salto I2P",
+    "description": "Mensaje para el nombre de host del panel de información del sitio"
+  },
+  "siteLabel": {
+    "message": "Dirección / Información del sitio:",
+    "description": "Etiqueta para la información del sitio i2p"
+  },
+  "certLabel": {
+    "message": "Información del certificado:",
+    "description": "Etiqueta para la información del certificado"
+  },
+  "certAbsent": {
+    "message": "Este sitio no está usando HTTPS. I2P aún lo verifica criptográficamente.",
+    "description": "Contenido de la información del certificado si no está"
+  },
+  "certPresent": {
+    "message": "Este sitio utiliza HTTPS. HTTPS sobre I2P es experimental y requiere certificados autofirmados o autorizaciones raíz alternativas.",
+    "description": "Contenido de la información del certificado si está presente"
+  },
+  "protocolHandlerValue": {
+    "message": "http://127.0.0.1:7657/i2psnark/?nofilter_newURL=%s&action=Add&foo=Add+torrent",
+    "description": "Valor para el controlador de protocolo magnético"
+  }
+}
--- a/background.js
+++ b/background.js
@@ -1,24 +1,24 @@
-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");

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

 function onContextGotLog(contexts) {
@@ -33,13 +33,13 @@ 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);
  }
@@ -47,8 +47,8 @@ function onContextsGot(contexts) {
    browser.contextualIdentities
      .create({
        name: webpref,
-        color: 'red',
-        icon: 'circle',
+        color: "red",
+        icon: "circle",
      })
      .then(onCreated, onNotCreated);
  }
@@ -56,8 +56,8 @@ function onContextsGot(contexts) {
    browser.contextualIdentities
      .create({
        name: routerpref,
-        color: 'blue',
-        icon: 'briefcase',
+        color: "blue",
+        icon: "briefcase",
      })
      .then(onCreated, onNotCreated);
  }
@@ -65,8 +65,8 @@ function onContextsGot(contexts) {
    browser.contextualIdentities
      .create({
        name: tunnelpref,
-        color: 'green',
-        icon: 'tree',
+        color: "green",
+        icon: "tree",
      })
      .then(onCreated, onNotCreated);
  }
@@ -74,8 +74,8 @@ function onContextsGot(contexts) {
    browser.contextualIdentities
      .create({
        name: mailpref,
-        color: 'yellow',
-        icon: 'briefcase',
+        color: "yellow",
+        icon: "briefcase",
      })
      .then(onCreated, onNotCreated);
  }
@@ -83,8 +83,8 @@ function onContextsGot(contexts) {
    browser.contextualIdentities
      .create({
        name: torrentpref,
-        color: 'purple',
-        icon: 'chill',
+        color: "purple",
+        icon: "chill",
      })
      .then(onCreated, onNotCreated);
  }
@@ -92,8 +92,8 @@ function onContextsGot(contexts) {
    browser.contextualIdentities
      .create({
        name: ircpref,
-        color: 'red',
-        icon: 'vacation',
+        color: "red",
+        icon: "vacation",
      })
      .then(onCreated, onNotCreated);
  }
@@ -101,8 +101,8 @@ function onContextsGot(contexts) {
    browser.contextualIdentities
      .create({
        name: muwirepref,
-        color: 'turquoise',
-        icon: 'gift',
+        color: "turquoise",
+        icon: "gift",
      })
      .then(onCreated, onNotCreated);
  }
@@ -110,30 +110,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 +146,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 +155,7 @@ function themeWindowByTab(tabId) {
      }
    });
  }
-  if (typeof tabId === 'number') {
+  if (typeof tabId === "number") {
    let tab = browser.tabs.get(tabId);
    tab.then(tabWindow);
  } else {
@@ -175,101 +175,95 @@ 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");
  }
+
  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("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 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("Active in Router Console window");
        dynamicTheme();
      } else if (context.name == tunnelpref) {
-        console.log('Active in Hidden Services Manager window');
+        console.log("Active in Hidden Services Manager window");
        dynamicTheme();
      } else if (context.name == mailpref) {
-        console.log('Active in Web Mail window');
+        console.log("Active in Web Mail window");
        dynamicTheme();
      } else if (context.name == torrentpref) {
-        console.log('Active in Bittorrent window');
+        console.log("Active in Bittorrent window");
        dynamicTheme();
      } else if (context.name == botepref) {
-        console.log('Active in Bote window');
+        console.log("Active in Bote window");
        dynamicTheme();
      } else if (context.name == ircpref) {
-        console.log('Active in IRC window');
+        console.log("Active in IRC window");
        dynamicTheme();
      } else if (context.name == muwirepref) {
-        console.log('Active in MuWire window');
+        console.log("Active in MuWire window");
        dynamicTheme();
      }
    }
    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');
+      console.log("Not active in I2P window");
      function unSetTheme(them) {
-        console.log('unsetting theme', them);
+        console.log("unsetting theme", them);
        if (Object.keys(them).length > 0) {
-          browser.theme.update(window.id, them.originalTheme);
+          try {
+            browser.theme.update(window.id, them.originalTheme);
+          } catch (e) {
+            console.log(
+              "Original theme set error. Your theme must have an SVG in it.",
+              e
+            );
+          }
        } else {
          browser.theme.update(window.id, { colors: null });
        }
      }
-      browser.storage.local.get('originalTheme').then(unSetTheme, onError);
+      browser.storage.local.get("originalTheme").then(unSetTheme, onError);
    }
  }

@@ -283,62 +277,62 @@ 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 == 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 +347,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,
@@ -375,39 +369,43 @@ 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);
-            }
+      if (updateInfo.theme.colors != null) {
+        console.log(
+          "testing theme",
+          updateInfo.theme.colors.toolbar,
+          "!=",
+          btheme.colors.toolbar
+        );
+        console.log(
+          "testing theme",
+          updateInfo.theme.colors.toolbar,
+          "!=",
+          dtheme.colors.toolbar
+        );
+        if (
+          updateInfo.theme.colors.toolbar != dtheme.colors.toolbar &&
+          updateInfo.theme.colors.toolbar != btheme.colors.toolbar
+        ) {
+          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);
    }
  }
+  console.log("Handling theme", updateInfo);
  browser.storage.local.get("originalTheme").then(maybeSet, onError);
 }

@@ -466,20 +464,37 @@ 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) {
+          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);
+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,11 @@ function conditionalBookmarksSetup(obj) {
 }

 if (browser != null) {
-  let gettingStorage = browser.storage.local.get('bookmarks_state');
+  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/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,77 @@ 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");
+contentUpdateById("proxy-check", "proxyFailedStatus");

 // 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");
 });
+
+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);
+  });
--- 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,41 @@
+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
+
+ -- idk <hankhill19580@gmail.com>  Sat, 21 DEC 2020 6:15:05 -0400
+
+i2psetproxy.js (0.93-1) UNRELEASED; urgency=low
+
+  * Emergency fix of the first one
+
+ -- idk <hankhill19580@gmail.com>  Sat, 14 DEC 2020 5:18:53 -0400
+
+i2psetproxy.js (0.91-1) UNRELEASED; urgency=low
+
+  * Exclude clearnet code hosting sites from scrub checks
+
+ -- idk <hankhill19580@gmail.com>  Sat, 14 DEC 2020 2:46:23 -0400
+
+i2psetproxy.js (0.89-1) UNRELEASED; urgency=low
+
+  * Pages with lots of AJAX requests could trigger a performance degradation
+  * Improve performance of x-i2p-* headers and meta tags
+
+ -- idk <hankhill19580@gmail.com>  Sat, 13 DEC 2020 2:22:00 -0400
+
 i2psetproxy.js (0.87-1) UNRELEASED; urgency=low

  * Disable searching for i2p sites in non-i2p search engines
--- 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,34 +1,140 @@
+
+
 * {
  padding: 0;
-  color: #1f1a24;
-  margin: 0
+  margin: 0;
 }
-a,
-button {
-  color: #1f1a24;
+
+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+h3, ul+h2 {
+  margin-top: 20px;
+}
+
+a, button {
+  color: #3b6bbf;
  text-decoration: none;
-  background: none;
  font-weight: 700;
  word-wrap: break-word;
  outline: 0;
-  padding: 3px;
-  margin: auto
 }
+
 .applicationDesc {
+  color: #81888f;
  text-decoration: none;
  font-weight: 700;
  word-wrap: break-word;
-  outline: 0
+  outline: 0;
 }
-.applicationDesc:hover,
-a:hover,
-button:hover {
-  color: #495057;
+
+.applicationDesc:hover, a:hover, button:hover {
  text-decoration: none;
  font-weight: 700;
  word-wrap: break-word;
-  outline: 0
+  outline: 0;
 }
+
 button {
  border: none;
  cursor: pointer;
@@ -36,137 +142,77 @@ button {
  text-decoration: none;
  font-weight: 700;
  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
+  outline: 0;
 }
+
 .background {
-  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
+  background-color: #f8f8ff;
+  height: 100%;
 }
+
 .content {
-  min-height: 3rem;
-  padding: 1rem;
  margin: 1.5rem;
-  display: block;
-  border-radius: 2px;
-  min-width: 100%
-}
-#header,
-.application-info,
-.browser-info,
-.extended-info,
-.search-info {
-  min-height: 3rem;
  padding: 1rem;
-  margin-top: 1.5rem;
-  display: block;
+  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;
 }
-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%
+
+#header, .application-info, .browser-info, .extended-info, .search-info {
+  margin-top: 1.5rem;
+  padding: 1rem;
+  min-height: 3rem;
+  min-width: 95%;
+  display: inline-block;
+  border: 1px solid #d9d9d6;
+  border-radius: 2px;
+  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;
  word-wrap: break-word;
  outline: 0;
-  text-align: left
+  text-align: left;
 }
+
 #links .showhider {
-  font-size: 25px
+  font-size: 25px;
 }
+
 .section-header {
  display: flex;
  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%
+  margin-bottom: 80px;
 }
+
 #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;
  padding: .5rem;
@@ -175,107 +221,138 @@ 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;
  padding: .5rem;
  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 {
+
+#applicationExplain, #controlExplain {
  min-height: 5rem;
  padding: .5rem;
  margin: .5rem;
-  text-align: left!important;
-  float: left
+  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 {
  min-height: 3rem;
  padding: .5rem;
  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;
  padding: .5rem;
  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;
  padding: .5rem;
  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;
  text-align: left;
-  display: none
+  display: none;
 }
+
 #info-content {
-  display: none
+  display: none;
 }
-.consoleOn:hover #proxy-check,
-.proxyReady:hover #proxy-check {
+
+.consoleOn:hover #proxy-check, .proxyReady:hover #proxy-check {
  visibility: visible;
-  opacity: 1
+  opacity: 1;
 }
+
 img {
  max-width: 100%;
-  margin: 3%
 }
+
 img.readyness {
  height: 100%;
-  width: auto
+  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
@@ -1,151 +1,9 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8">
-    <link href="home.css" rel="stylesheet">
-    <link href="search.css" rel="stylesheet">
-    <link href="sidebar.css" rel="stylesheet">
    <title>
    </title>
 </head>
 <body>
-    <!--<div>-->
-
-    <div class='background'>
-        <div class='content'>
-            <div class="text-section-header">
-                <h1 id="text-section-header">I2P Browsing</h1>
-            </div>
-
-            <div id="i2pbrowser-version">
-            </div>
-
-            <div id="i2pbrowser-description">
-                <p id="description">I2P in Private Browsing is a webextension to secure and enhance your I2P use in the browser.</p>
-
-                <p id="beta">This is an experimental product.</p>
-            </div>
-
-            <div id="readyness">
-                <!--<div id="consoleOn" class="hideIfI2PConsoleOff">
-              <img class="readyness" src="http://proxy.i2p/themes/console/images/local_up.png" alt="Proxy is not ready."/>
-              <span id="proxy-check">Proxy is ready.</span>
-            </div>-->
-                <!--<div id="proxyUnready" class="hideIfI2PProxyOn">The proxy is not ready yet.</div>-->
-
-                <div class="hideIfI2PProxyOff" id="proxyReady">
-                    <img alt="Proxy is not ready." class="readyness" src="http://proxy.i2p/themes/console/images/local_up.png"> <span id="proxy-check">Proxy is ready.</span>
-                </div>
-            </div>
-
-            <div class="hideIfI2PConsoleOff" id="onboarding">
-                <h3 id="onboardingTitle">New to I2P? Learn more here.</h3>
-
-                <h4 id="onboardingZero"><button class="showhider" id="onboardingButtonZero">Protect your Privacy</button>
-                </h4>
-
-                <p class="onboardingContent" id="onboardingContentZero">I2P Browser allows you to surf the internet using the private and secure I2P network. When using it, you are protected against tracking, surveillance, and censorship as a first-class participant in the I2P network. I2P Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser.</p>
-
-                <h4 id="onboardingOne"><button class="showhider" id="onboardingButtonOne">Configure your Experience</button>
-                </h4>
-
-                <p class="onboardingContent" id="onboardingContentOne">We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. Note: By default, NoScript and HTTPS Everywhere are not included on the toolbar, but you can customize your toolbar to add them. With all the security and privacy features provided by I2P, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.</p>
-
-                <h4 id="onboardingTwo"><button class="showhider" id="onboardingButtonTwo">Share Files</button>
-                </h4>
-
-                <p class="onboardingContent" id="onboardingContentTwo">I2P is capable of using peer-to-peer applications like BitTorrent, protecting your identity when you share files. Our anonymous bittorrent client is available in the browser.</p>
-
-                <h4 id="onboardingThree"><button class="showhider" id="onboardingButtonThree">Hidden e-mail</button>
-                </h4>
-
-                <p class="onboardingContent" id="onboardingContentThree">There is also an anonymous e-mail service available inside of I2P, which is accessible from our browser via the menu directly below.</p>
-
-                <h4 id="onboardingFour"><button class="showhider" id="onboardingButtonFour">Experience Tips</button>
-                </h4>
-
-                <p class="onboardingContent" id="onboardingContentFour">With all the security and privacy features provided by I2P, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.</p>
-            </div>
-            <!--<p class="hideIfI2POn">&aboutI2p.warn_not_running; <a href="about:i2p">&aboutI2p.refresh_text;</a> &aboutI2p.reccommend_not_running;</p>-->
-
-            <div class="application-info">
-                <p class="hideIfI2PConsoleOff">
-                </p>
-
-                <h3 id="applicationHeader">Applications</h3>
-
-                <p id="applicationExplain">These applications use I2P to provide them with security and privacy.</p>
-
-                <ul>
-                    <!--<li class="application">
-                        <a class="applicationName" href="http://legwork.i2p" id="window-link-toopie" target="_blank">Search:</a> <span class="applicationDesc" id="search">Legwork is an in-I2P search engine.</span>
-                        <div class="topnav">
-                            <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>
-                    </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>
-
-                    <li class="application">
-                        <a class="applicationName" href="http://127.0.0.1:7657/" id="window-visit-router">Router Console</a> <span class="applicationDesc" id="routerConsole">The entrypoint for all other I2P applications is the I2P Router Console. To visit it, click here.</span>
-                    </li>
-
-                    <li class="application">
-                        <a class="applicationName" href="http://127.0.0.1:7657/i2ptunnel" id="window-visit-i2ptunnel">Hidden Services Manager</a> <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>
-
-                    <li class="application">
-                        <a class="applicationName" href="http://127.0.0.1:7657/susimail" id="window-visit-susimail">E-Mail</a> <span class="applicationDesc" id="susimail">I2P also bundles a webmail client which can be used to access in-I2P e-mail. To use it, go here:</span>
-                    </li>
-
-                    <li class="application">
-                        <a class="applicationName" href="http://127.0.0.1:7657/i2psnark" id="window-visit-snark">BitTorrent</a> <span class="applicationDesc" id="snark">I2P is capable of anonymous Peer-to-Peer file sharing, to use the built-in bittorrent client go here:</span>
-                    </li>
-                </ul>
-
-                <p>
-                </p>
-            </div>
-
-            <div class="extended-info">
-                <h3 id="links"><button class="showhider" id="fliplinks">Links</button>
-                </h3>
-
-                <div id="info-content">
-                    <p id="linksExplain">If you want to get more information about I2P, you can visit these links.</p>
-
-                    <p>
-                    </p>
-
-                    <ul>
-                        <li class="application">
-                            <a href="http://i2p-projekt.i2p/" id="window-visit-i2p">I2P Project Homepage:</a> <span class="applicationDesc" id="i2ppage">More information is available here.</span>
-                        </li>
-
-                        <li class="application">
-                            <a href="/index.html" id="window-visit-homepage">Webextension Homepage:</a> <span class="applicationDesc" id="webpage">More information is available here.</span>
-                        </li>
-
-                        <li class="application">
-                            <a href="http://git.idk.i2p/idk/I2P-in-Private-Browsing-Mode-Firefox" id="window-visit-sources">Source Code:</a> <span class="applicationDesc" id="sources">Browse the source of this webextension or contribute here.</span>
-                        </li>
-
-                        <li class="application">
-                            <a href="http://git.idk.i2p/idk/I2P-in-Private-Browsing-Mode-Firefox/-/releases" id="window-visit-releases">Releases:</a> <span class="applicationDesc" id="releases">Check for new releases here.</span>
-                        </li>
-                    </ul>
-
-                    <p>
-                    </p>
-                </div>
-            </div>
-        </div>
-    </div>
-    <script src="home.js" type="text/javascript"></script> 
-    <script src="content.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,16 +17,16 @@ 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') {
+  hostname = hostname.split(":")[0];
+  if (hostname === "127.0.0.1") {
    return true;
-  } else if (hostname === 'localhost') {
+  } else if (hostname === "localhost") {
    return true;
  }

@@ -34,117 +34,139 @@ function localHost(url) {
 }

 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);
-  if (url.includes('=')) {
-    if (url.includes('.i2p')) {
-      lsit = url.split('=');
+  let hostname = "";
+  console.log("(hosts)", url);
+  let u = new URL(url);
+  if (u.host.endsWith(".i2p")) {
+    hostname = u.host;
+  } 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);
  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 === '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/i2pcontrol/i2pcontrol.js
+++ b/i2pcontrol/i2pcontrol.js
@@ -1,9 +1,9 @@
-var hello = 'hello i2pcontrol';
+var hello = "hello i2pcontrol";

 function makeid(length) {
-  var result = '';
+  var result = "";
  var characters =
-    'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
  var charactersLength = characters.length;
  for (var i = 0; i < length; i++) {
    result += characters.charAt(Math.floor(Math.random() * charactersLength));
@@ -22,15 +22,15 @@ function send(
    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
+      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',
+        "Content-Type": "application/json",
      },
-      redirect: 'follow', // manual, *follow, error
-      referrerPolicy: 'no-referrer', // no-referrer, *client
+      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);
@@ -39,7 +39,7 @@ function send(

  //console.log("http://" + control_host + ":" + control_port + "/" + control_path)
  return postData(
-    'http://' + control_host + ':' + control_port + '/' + control_path + '/',
+    "http://" + control_host + ":" + control_port + "/" + control_path + "/",
    message
  );
 }
@@ -51,12 +51,12 @@ async function authenticate(
  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;
+  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);
 }

@@ -81,14 +81,14 @@ async function Echo(
  password = "itoopie"
 ) {
  function echo(token) {
-    console.log('(i2pcontrol) testing I2PControl connection');
+    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;
+    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);
@@ -121,13 +121,13 @@ async function GetRate(
 ) {
  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;
+    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);
@@ -160,12 +160,12 @@ async function I2PControl(
 ) {
  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;
+    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);
@@ -204,12 +204,12 @@ async function RouterInfo(
 ) {
  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;
+    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);
@@ -255,12 +255,12 @@ async function RouterManager(
 ) {
  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;
+    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);
@@ -300,12 +300,12 @@ async function NetworkSetting(
 ) {
  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;
+    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);
@@ -336,49 +336,49 @@ function UpdateNetworkSettingElementByID(
 }

 function UpdateContents() {
-  UpdateRouterInfoElementByID('i2p.router.status', 'router-status');
-  UpdateRouterInfoElementByID('i2p.router.uptime', 'router-uptime');
-  UpdateRouterInfoElementByID('i2p.router.version', 'router-version');
+  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'
+    "i2p.router.net.bw.inbound.1s",
+    "router-net-bw-inbound-1s"
  );
  UpdateRouterInfoElementByID(
-    'i2p.router.net.bw.inbound.15s',
-    'router-net-bw-inbound-15s'
+    "i2p.router.net.bw.inbound.15s",
+    "router-net-bw-inbound-15s"
  );
  UpdateRouterInfoElementByID(
-    'i2p.router.net.bw.outbound.1s',
-    'router-net-bw-outbound-1s'
+    "i2p.router.net.bw.outbound.1s",
+    "router-net-bw-outbound-1s"
  );
  UpdateRouterInfoElementByID(
-    'i2p.router.net.bw.outbound.15s',
-    'router-net-bw-outbound-15s'
+    "i2p.router.net.bw.outbound.15s",
+    "router-net-bw-outbound-15s"
  );
-  UpdateRouterInfoElementByID('i2p.router.net.status', 'router-net-status');
+  UpdateRouterInfoElementByID("i2p.router.net.status", "router-net-status");
  UpdateRouterInfoElementByID(
-    'i2p.router.net.tunnels.participating',
-    'router-net-tunnels-participating'
+    "i2p.router.net.tunnels.participating",
+    "router-net-tunnels-participating"
  );
  UpdateRouterInfoElementByID(
-    'i2p.router.netdb.activepeers',
-    'router-netdb-activepeers'
+    "i2p.router.netdb.activepeers",
+    "router-netdb-activepeers"
  );
  UpdateRouterInfoElementByID(
-    'i2p.router.netdb.fastpeers',
-    'router-netdb-fastpeers'
+    "i2p.router.netdb.fastpeers",
+    "router-netdb-fastpeers"
  );
  UpdateRouterInfoElementByID(
-    'i2p.router.netdb.highcapacitypeers',
-    'router-netdb-highcapacitypeers'
+    "i2p.router.netdb.highcapacitypeers",
+    "router-netdb-highcapacitypeers"
  );
  UpdateRouterInfoElementByID(
-    'i2p.router.netdb.isreseeding',
-    'router-netdb-isreseeding'
+    "i2p.router.netdb.isreseeding",
+    "router-netdb-isreseeding"
  );
  UpdateRouterInfoElementByID(
-    'i2p.router.netdb.knownpeers',
-    'router-netdb-knownpeers'
+    "i2p.router.netdb.knownpeers",
+    "router-netdb-knownpeers"
  );
 }

@@ -386,6 +386,6 @@ var done = Echo(hello);
 done.then(Done);

 function Done(output) {
-  console.log('(i2pcontrol) I2PControl connection tested,', output);
+  console.log("(i2pcontrol) I2PControl connection tested,", output);
  return output;
 }
--- a/i2ppb@eyedeekay.github.io.xpi.torrent
+++ b/i2ppb@eyedeekay.github.io.xpi.torrent
--- a/icons/README.md
+++ b/icons/README.md
--- 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/index.html
+++ b/index.html
@@ -1,222 +1,9 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>I2P in Private Browsing Mode</title>
-    <link href="home.css" rel="stylesheet" type="text/css">
-    <link href="sidebar.css" rel="stylesheet" type="text/css">
+    <title>
+    </title>
 </head>
 <body>
-    <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>
-
-    <h2>Privacy Policy</h2>
-
-    <p>This browser extension does not collect any personal information. It requires access to local storage and browsing data permissions in order to delete them when directed to by the user. This browser extension does not transmit any information to any third party, nor will it, ever.</p>
-
-    <p>This browser extension cannot influence telemetry carried out by browser vendors to determine performance in their distribution channels, nor can it mitigate any other browser vendor telemetry.</p>
-
-    <p>This browser extension is entirely Free, Open-Source software.</p>
-
-    <h2>Installation(Cross-Platform):</h2>
-
-    <p>For desktop users this addon is available from addons.mozilla.org, where you will be able to recive automatic updates: <a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">I2P in Private Browsing</a>.</p>
-
-    <h2>Debian Installation:</h2>
-
-    <p>Should you prefer, it is possible to install this extension system-wide by side-loading it into Debian. You can generate your own deb file by running the command:</p>
-
-    <pre><code>    make deb
-</code></pre>
-    <p>and then you can install it with:</p>
-
-    <pre><code>    sudo apt install ../i2psetproxy.js_*.deb
-</code></pre>
-    <h2>Bittorrent Download:</h2>
-
-    <p>The self-hosted plugin is available from bittorrent both within the I2P and Clearnet Bittorrent network(With a web seed to support it in case one goes dead).</p>
-
-    <ul>
-        <li>
-            <a href="magnet:?xt=urn:btih:517e97aeb8ad60357d693c37fbc5a3f4eb9ac224">Magnet Link</a>
-        </li>
-
-        <li>
-            <a href="./i2ppb@eyedeekay.github.io.xpi.torrent">Get the .torrent file</a>
-        </li>
-    </ul>
-
-    <h2>Usage:</h2>
-
-    <ul>
-        <li>Basically, it "Just Works." After you install the plugin, browsing to an I2P domain will automatically stop the current tab and re-open the I2P site in an I2P Browser tab.</li>
-
-        <li>Besides that, four bookmarks are added to the "Bookmarks Toolbar," which will take you to visit your Java I2P applications, or the "Simplified I2P Landing Page" embedded in the plugin:</li>
-
-        <li><img alt="Landing page" src="lander.png" title="">
-        </li>
-
-        <li>Also, there's a menu for accessing I2P functionality while you're browsing. It lets you control a few settings in a granular way.</li>
-
-        <li><img alt="Menu" src="menu.png" title="">
-        </li>
-
-        <li>You can re-enable WebRTC but force it to always use the proxy that is enforced by the tab.</li>
-
-        <li>You can either force the browser to delete all history for I2P sites immediately, or you can close all your I2P Browser tabs at once and delete the history for I2P browsing when you're done.</li>
-
-        <li>That's all there is to it! Your browser is configured to safely use and administer I2P.</li>
-
-        <li>Optionally, you can add I2PSnark-RPC and use Bittorrent-over-I2P via the transmission-rpc interface. To do this, have a look at the torrent guide: <a href="torrent/index.html">Torrent guide</a>
-        </li>
-    </ul>
-
-    <h3>Features</h3>
-
-    <ul>
-        <li>[done] <strong>Provide</strong> a way to launch into an I2P-Specific contextual identity (container). Intercept requests to .i2p domains and automatically route them to the I2P container. Isolate the router console from other local applications by automatically intercepting requests to the router console to another container.</li>
-
-        <li><img alt="Visiting i2p-projekt.i2p" src="i2psetproxy.js.png" title="">
-        </li>
-
-        <li>[done] <strong>Indicate</strong> the I2P browser is in use visually. Find an acceptable way to indicate it on Android.</li>
-
-        <li><img alt="Visiting webmail" src="susimail.png" title="">
-        </li>
-
-        <li>[done] <strong>Set</strong> the http proxy to use the local I2P proxy automatically. Provide specific configuration for other types of I2P proxies(SOCKS, isolating HTTP)</li>
-
-        <li>[done] <strong>Disable</strong> risky webRTC features/offer the option to re-enable them with the proxy enforced.</li>
-
-        <li>[done] <strong>Change</strong> the color of the browser window to indicate that I2P is in use</li>
-
-        <li><img alt="Visiting i2ptunnel" src="i2ptunnel.png" title="">
-        </li>
-
-        <li>[ready] <strong>Provide</strong> help in a variety of languages.</li>
-
-        <li>[done] <strong>Monitor</strong> the health and readiness of the I2P router it is instructed to use. Currently the plugin checks whether the HTTP Proxy is working by fetching an image from "http://proxy.i2p" and displaying a result. A work-in-progress binding to i2pcontrol is available in ./i2pcontrol, it is inert at this time.</li>
-
-        <li><img alt="Visiting toopie.html" src="toopie.png" title="">
-        </li>
-
-        <li>[Done] <strong>Handle</strong> router console applications under their own origins and within their own contextual identity. (1) The router console is automatically confined to it's own container tab. (2) Use a custom protocol handler to place each i2p application/plugin under it's own origin, shortening router console URL's and placing applications under their own origin.</li>
-
-        <li><img alt="Visiting routerconsole" src="routerconsole.png" title="">
-        </li>
-
-        <li>[Done] <strong>Handle Torrents</strong> by talking to i2psnark-rpc plugin and then 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 alt="Visiting i2psnark" src="i2psnark.png" title="">
-        </li>
-
-        <li><img alt="Monitoring torrents" src="transmissionrpc.png" title="">
-        </li>
-
-        <li><img alt="Distribute your site as a torrent." src="x-i2p-torrentlocation.png" 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 distribute some or all of their resources as torrents, allowing the torrents to be treated effectively as a CDN.</li>
-
-        <li>[barely started] <strong>Isolate</strong> traffic by contextual identity to it's own HTTP Proxy tunnel, each reflecting it's own pseudonymous identity within I2P. The contextual identities. For now, the contextual identities used to manage browsing are "I2P Browsing" and "Web Browsing" where I2P Browsing is capable of using an outproxy but in the case of traffic destined for the clearnet does not do header rewriting, and Web Browsing falls back to the Proxy configured in Firefox. The I2P Browsing will be expanded to
-            <ul>
-                <li>I2P Amnesiac Browsing: Use for General Browsing, stores no history and uses an HTTP Proxy with a very short tunnel-close timeout and no key-reuse.</li>
-
-                <li>I2P Social Networking: Use this for logging into social network accounts, forums, and other interactive asynchronous public communication platforms where your identity is behaviorally linkable. This has a very long tunnel-close timeout and key-reuse until specifically invoked.</li>
-
-                <li>I2P Blogging: Use this for posting content to the web interface of your blog or to other similar websites that you create content on.</li>
-            </ul>
-        </li>
-
-        <li><img alt="Visiting clearweb" src="clearweb.png" title="">
-        </li>
-    </ul>
-
-    <h3>Video</h3>
-
-    <ul>
-        <li><img alt="Video of the plugin in action" src="i2psetproxy.js.gif" title="">
-        </li>
-    </ul>
-
-    <h2>Documents</h2>
-
-    <ul>
-        <li><strong><a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/download/docs/Browser.Design.Documentation.pdf">Browser Outline</a></strong>: This document is an outline of each of the browser extension's feature panels in presentation form.</li>
-
-        <li><strong><a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/download/docs/Landing.Page.Documentation.pdf">Smart Lander Design</a></strong>: This is the original outline of the smart landing page which became the I2P home page within the browser and the drop-down control panel.</li>
-
-        <li><strong><a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/wiki/Other-Extensions">Other extensions</a></strong>: and how they work with this one.</li>
-    </ul>
-
-    <h2>Super Extra Important Background Info:</h2>
-
-    <p>This plugin's viability is directly related to the viability of Mozilla and Tor's work on hardening Firefox itself and of particular interest are the "Uplift" and "Fusion(Firefox Using Onions)" projects.</p>
-
-    <h3>Links about Project Uplift</h3>
-
-    <ul>
-        <li>
-            <a href="https://wiki.mozilla.org/Security/Tor_Uplift">Tor Uplift</a> is a project which brings important features of the Tor Browser to the mainstream of Firefox users by including patches from Tor Browser Bundle into Firefox where it is appropriate.
-        </li>
-
-        <li>
-            <a href="https://wiki.mozilla.org/Security/FirstPartyIsolation">First Party Isolation</a> is a feature in Firefox and other browsers which keeps information from leaking across first-party domains.
-        </li>
-
-        <li>
-            <a href="https://wiki.mozilla.org/Security/Fingerprinting">Fingerprinting</a> is a technique where a tracker attempts to extract unique information about a user from a side-channel in order to create an identifier that can be used to correlate the user across many sites.
-        </li>
-
-        <li>
-            <a href="https://wiki.mozilla.org/Security/Fennec%2BTor_Project">Fennec</a> is Firefox for Android and this link has some analysis of the privacy consequences of the Android platform.
-        </li>
-
-        <li>
-            <a href="https://wiki.mozilla.org/Security/Tor_Uplift/Tracking">Tracking</a> in Firefox is surveyed here.
-        </li>
-    </ul>
-
-    <p>Project uplift seems to have largely been accomplished?</p>
-
-    <h3>Links about Project Fusion</h3>
-
-    <ul>
-        <li>
-            <a href="https://wiki.mozilla.org/Security/Fusion">Project Fusion</a> or Firefox using Onions is a joint Mozilla/Tor effort to create an enhanced Private Browsing mode for Firefox which uses Tor.
-        </li>
-
-        <li>
-            <a href="https://trac.torproject.org/projects/tor/wiki/org/meetings/2018Rome/Notes/FusionProject">Notes</a> from a meeting about Fusion.
-        </li>
-
-        <li>
-            <a href="https://blog.torproject.org/tor-heart-firefox">Tor at the Heart: Firefox</a> is a blog about Tor and the relationship they have to Firefox re: TBB, Fusion.
-        </li>
-    </ul>
-
-    <h2>The <strong>Other</strong> Version</h2>
-
-    <p>New versions of this extension create an I2P in Private Browsing mode instead, using container tabs.</p>
-
-    <p>Since this is a drastic change to the behavior of the old plugin, and since there is no UI a new entry for the new plugin has been made at a new location on addons.mozilla.org.</p>
-
-    <ul>
-        <li>
-            <p>This is the new version: <a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">[link]</a></p>
-        </li>
-
-        <li>
-            <p>This is the old version: <a href="https://addons.mozilla.org/en-US/firefox/addon/I2P-Proxy/">[link]</a></p>
-        </li>
-    </ul>
-
-    <h2>Android usage:</h2>
-
-    <p>Use the old version, on either an old version of Firefox(pre-68) or by enabling this custom collection: [Recommended Plugins] https://addons.mozilla.org/en-US/firefox/collections/14614396/I2P-Browser-Fork/</p>
 </body>
 </html>
--- 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;
  });
 }

--- 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
@@ -27,7 +27,7 @@
  ],
  "manifest_version": 2,
  "name": "__MSG_extensionName__",
-  "version": "0.87",
+  "version": "0.95",
  "description": "__MSG_extensionDescription__",
  "homepage_url": "https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox",
  "icons": {
--- a/options/options.html
+++ b/options/options.html
@@ -1,95 +1,9 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8">
-    <link href="/home.css" rel="stylesheet">
-    <link href="options.css" rel="stylesheet">
    <title>
    </title>
 </head>
 <body>
-    <section class="scheme-options">
-        <span class="title">Proxy Scheme:</span> <select id="proxy_scheme">
-            <option selected value="http">
-                HTTP
-            </option>
-            <option value="socks5">
-                SOCKS5
-            </option>
-        </select>
-    </section>
-
-    <section class="scheme-options">
-        <span class="title">Bookmarks Status:</span> <input id="bookmarksState" name="bookmarksstate" type="checkbox" value="bookmarksstate"> <label for="bookmarksState">Bookmarks were created at install-time. <button id="bookmarksButton" type="submit">Re-Create Bookmarks</button></label>
-    </section>
-
-    <section class="scheme-options proxy-options" id="proxy-options">
-        <label for="bookmarksState"></label>
-        <div class="title">
-            <label for="bookmarksState">Proxy Options</label>
-        </div>
-        <label for="bookmarksState"></label>
-        <p id="proxyHelpText"><label for="bookmarksState"></label>
-        </p>
-        <label for="bookmarksState"><label id="portText">Host:</label> <input data="host" id="host" type="text" value="127.0.0.1">
-        <br>
-        <label id="hostText">Port:</label> <input data="port" id="port" type="text" value="4444"></label>
-    </section>
-    <!--<section class="scheme-options identity-options">
-      <div class="panel">
-        <div id="identity-list">Identity list?</div>
-      </div>
-    </section>-->
-
-    <section class="scheme-options console-options" id="console-options">
-        <div>
-            <div class="title">
-                Router Console Options
-            </div>
-
-            <p id="controlHelpText">Configure your router console options here.</p>
-            <label id="controlPortText">Console Host:</label> <input data="controlhost" id="controlhost" type="text" value="127.0.0.1">
-            <br>
-            <label id="controlHostText">Console Port:</label> <input data="controlport" id="controlport" type="text" value="7657">
-        </div>
-    </section>
-
-    <section class="scheme-options control-options" id="control-options">
-        <div>
-            <div class="title">
-                I2PControl RPC Client Options
-            </div>
-
-            <p id="rpcHelpText">Configure your I2PControl options here.</p>
-            <label id="rpcPortText">Control Host:</label> <input data="rpchost" id="rpchost" type="text" value="127.0.0.1">
-            <br>
-            <label id="rpcHostText">Control Port:</label> <input data="rpcport" id="rpcport" type="text" value="7657">
-            <br>
-            <label id="rpcPathText">Control Path:</label> <input data="rpcpath" id="rpcpath" type="text" value="jsonrpc">
-            <br>
-            <label id="rpcPassText">Control Password:</label> <input data="rpcpass" id="rpcpass" type="text" value="itoopie">
-        </div>
-    </section>
-
-    <section class="scheme-options transmission-options" id="transmission-options">
-        <div>
-            <div class="title">
-                Bittorrent RPC Client Options
-            </div>
-
-            <p id="rpcHelpText">Configure your Bittorrent options here.</p>
-            <label id="btRpcHostText">Torrent RPC Host:</label> <input data="btrpchost" id="btrpchost" type="text" value="127.0.0.1">
-            <br>
-            <label id="btRpcPortText">Torrent RPC Port:</label> <input data="btrpcport" id="btrpcport" type="text" value="7657">
-            <br>
-            <label id="btRpcPathText">Torrent RPC Path:</label> <input data="btrpcpath" id="btrpcpath" type="text" value="transmission/">
-            <br>
-            <label id="rpcPassText">Torrent RPC Password:</label> <input data="btrpcpass" id="btrpcpass" type="text" value="">
-        </div>
-    </section>
-    <input id="save-button" type="button" value="Save preferences"> 
-    <script src="options.js"></script> 
-    <script src="/bookmarks.js"></script> <!--<script src="/torrent/browser-polyfill.min.js"></script>
-    <script src="/torrent/options.js"></script>-->
 </body>
 </html>
--- 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').value;
-  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 == 'false') {
+  if (bookmarks_state.value == "false") {
    return false;
  }
-  if (bookmarks_state == '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,
      },
    });
@@ -417,11 +417,14 @@ function forgetBrowsingData(storedSettings) {
 function i2pHostName(url) {
  let hostname = "";
  console.log("(hosts)", url);
-  if (url.includes("=")) {
+  let u = new URL(url);
+  if (u.host.endsWith(".i2p")) {
+    hostname = u.host;
+  } else if (url.includes("=")) {
    if (url.includes(".i2p")) {
      lsit = url.split("=");
      for (let item in lsit) {
-        var items = lsit[item].split(`\%`); //"\%")
+        var items = lsit[item].split(`\ % `); //"\%")
        for (let p in items) {
          if (items[p].includes(".i2p")) {
            hostname = items[p].replace("3D", 1);
--- a/proxy.js
+++ b/proxy.js
@@ -1,10 +1,10 @@
-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 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");

 browser.privacy.network.peerConnectionEnabled.set({
  value: true,
@@ -14,17 +14,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 +32,22 @@ 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')) {
+    if (requestDetails.url.includes(":7662")) {
      proxy = null;
      return proxy;
    }
-    console.log('(bt proxy)', 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 +56,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,18 +79,20 @@ var handleContextProxyRequest = async function(requestDetails) {
    }
  }
  try {
-    var handleProxyRequest = function(context) {
+    var handleProxyRequest = function (context) {
      proxy = {
-        failoverTimeout: 0,
-        proxyDns: false,
+        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();
@@ -109,44 +111,48 @@ var handleContextProxyRequest = async function(requestDetails) {
      } 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
              );
            }
          }
-        } else if (i2pHost(requestDetails.url)) {
+        }
+        if (i2pHost(requestDetails.url)) {
          proxy = {
            type: getScheme(),
            host: getHost(),
            port: getPort(),
          };
        }
+        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';
+        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)) {
@@ -157,7 +163,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(),
@@ -166,13 +172,13 @@ 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 (requestDetails.tabId > 0) {
-      if (requestDetails.url.includes('MuWire')) {
+      if (requestDetails.url.includes("MuWire")) {
        return;
      }
      if (proxyHost(requestDetails.url)) {
@@ -182,7 +188,7 @@ var handleContextProxyRequest = async function(requestDetails) {
          port: getPort(),
        };
        return proxy;
-      } else if (extensionHost(requestDetails.url)) {
+      } else if (extensionHost(requestDetails)) {
        return;
      } else if (i2pHost(requestDetails.url)) {
        var tab = tabGet(requestDetails.tabId);
@@ -201,64 +207,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'
+    "control_host"
  );
  gettingControlHostStoredSettings.then(
    checkControlHostStoredSettings,
@@ -268,14 +282,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'
+    "control_port"
  );
  gettingControlPortStoredSettings.then(
    checkControlPortStoredSettings,
@@ -289,28 +303,28 @@ 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'
+    "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;
 }
@@ -318,8 +332,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;
 }
@@ -327,41 +341,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: ['*://*.i2p/*', '*://localhost/*', '*://127.0.0.1/*', '*://*/*i2p*'],
+    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();
@@ -372,7 +380,7 @@ setupProxy();
 var gettingListenerInfo = browser.runtime.getPlatformInfo();
 gettingListenerInfo.then((got) => {
  browser.windows.onCreated.addListener(() => {
-    chrome.storage.local.get(function() {
+    chrome.storage.local.get(function () {
      setupProxy();
    });
  });
--- a/releases.atom
+++ b/releases.atom
@@ -4,13 +4,90 @@
  <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-06T17:13:52Z</updated>
+  <updated>2020-12-21T23:13:19Z</updated>
+  <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;
+i2psetproxy.js (0.95-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Fix github &lt;a class=&quot;issue-link js-issue-link&quot; data-error-text=&quot;Failed to load title&quot; data-id=&quot;763036769&quot; data-permission-text=&quot;Title is private&quot; data-url=&quot;https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/issues/102&quot; data-hovercard-type=&quot;issue&quot; data-hovercard-url=&quot;/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/issues/102/hovercard&quot; href=&quot;https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/issues/102&quot;&gt;#102&lt;/a&gt; and &lt;a class=&quot;issue-link js-issue-link&quot; data-error-text=&quot;Failed to load title&quot; data-id=&quot;763043125&quot; data-permission-text=&quot;Title is private&quot; data-url=&quot;https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/issues/103&quot; data-hovercard-type=&quot;issue&quot; data-hovercard-url=&quot;/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/issues/103/hovercard&quot; href=&quot;https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/issues/103&quot;&gt;#103&lt;/a&gt;&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, 21 DEC 2020 6:15:05 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.93-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.93</id>
+    <updated>2020-12-14T22:20:08Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.93"/>
+    <title>0.93</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.93-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Emergency fix of the first one&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, 14 DEC 2020 5:18:53 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.91-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.91</id>
+    <updated>2020-12-14T19:47:59Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.91"/>
+    <title>0.91</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.91-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Exclude clearnet code hosting sites from scrub checks&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, 14 DEC 2020 2:46:23 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.89-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.89</id>
+    <updated>2020-12-13T19:11:13Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.89"/>
+    <title>0.89</title>
+    <content type="html">&lt;p&gt;============================&lt;/p&gt;
+&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.89-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Pages with lots of AJAX requests could trigger a performance degradation&lt;/li&gt;
+&lt;li&gt;Improve performance of x-i2p-* headers and meta tags&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;i2psetproxy.js (0.87-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.87</id>
    <updated>2020-12-06T18:37:57Z</updated>
    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.87"/>
    <title>0.87</title>
-    <enclosure url="magnet:?xt=urn:btih:517e97aeb8ad60357d693c37fbc5a3f4eb9ac224" 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.87-1) UNRELEASED; urgency=low&lt;/p&gt;
@@ -117,83 +194,4 @@ i2psetproxy.js (0.79-1) UNRELEASED; urgency=low&lt;/p&gt;
    </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.75</id>
-    <updated>2020-06-23T03:22:59Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.75"/>
-    <title>0.75</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.75-1) UNRELEASED; urgency=low&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;Update bookmarks format&lt;/li&gt;
-&lt;li&gt;Deprecate WebRTC State Management&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, 22 JUN 2020 11:22:37 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.73-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.73</id>
-    <updated>2020-03-24T23:49:45Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.73"/>
-    <title>0.73</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.73-1) UNRELEASED; urgency=low&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;Fix incomplete bugfix from 0.69 again&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;  Tue, 24 MAR 2020 19:48:14 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.71-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.71</id>
-    <updated>2020-03-24T23:01:20Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.71"/>
-    <title>0.71</title>
-    <content type="html">&lt;h1&gt;I2P in Private Browsing Mode&lt;/h1&gt;
-&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.71-1) UNRELEASED; urgency=low&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;Fix incomplete bugfix from 0.69&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;  Tue, 24 MAR 2020 0:19:59 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.69-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.69</id>
-    <updated>2020-03-24T04:19:44Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.69"/>
-    <title>0.69</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.69-1) UNRELEASED; urgency=low&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;Add MuWire contextual ID&lt;/li&gt;
-&lt;li&gt;Fix bug occurring on certain modded I2P installs&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; Tue, 24 MAR 2020 0:12:02 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.67-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>
 </feed>
--- 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
@@ -1,25 +1,25 @@
-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 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 contextScrub = async function(requestDetails) {
+var contextScrub = async function (requestDetails) {
  function onHeaderError() {
-    console.log('Header scrub error');
+    console.log("Header scrub error");
  }
  try {
-    var headerScrub = function(context) {
-      var ua = 'MYOB/6.66 (AN/ON)';
+    var headerScrub = function (context) {
+      var ua = "MYOB/6.66 (AN/ON)";
      if (!context) {
      } else if (context.name == titlepref) {
        for (var header of requestDetails.requestHeaders) {
-          if (header.name.toLowerCase() === 'user-agent') {
+          if (header.name.toLowerCase() === "user-agent") {
            header.value = ua;
          }
        }
@@ -28,7 +28,7 @@ var contextScrub = async function(requestDetails) {
        };
      }
    };
-    var contextGet = async function(tabInfo) {
+    var contextGet = async function (tabInfo) {
      try {
        //console.log("(scrub)Tab info from Function", tabInfo);
        let context = await browser.contextualIdentities.get(
@@ -39,7 +39,7 @@ var contextScrub = async function(requestDetails) {
        return undefined;
      }
    };
-    var tabGet = async function(tabId) {
+    var tabGet = async function (tabId) {
      try {
        //console.log("(scrub)Tab ID from Request", tabId);
        let tabInfo = await browser.tabs.get(tabId);
@@ -56,11 +56,11 @@ var contextScrub = async function(requestDetails) {
      return req;
    }
  } catch (error) {
-    console.log('(scrub)Not scrubbing non-I2P request.', error);
+    console.log("(scrub)Not scrubbing non-I2P request.", error);
  }
-}
+};

-var notMyContextNotMyProblem = async function() {
+var notMyContextNotMyProblem = async function () {
  var contexts = await browser.contextualIdentities.query({});
  var context1 = await browser.contextualIdentities.query({
    name: titlepref,
@@ -87,7 +87,7 @@ var notMyContextNotMyProblem = async function() {
    name: botepref,
  });
  var othercontexts = [];
-  console.log('Contexts:', contexts);
+  console.log("Contexts:", contexts);
  for (context in contexts) {
    if (
      contexts[context].cookieStoreId == context1[0].cookieStoreId ||
@@ -99,9 +99,9 @@ var notMyContextNotMyProblem = async function() {
      contexts[context].cookieStoreId == context7[0].cookieStoreId
    ) {
      console.log(
-        'Context found',
+        "Context found",
        contexts[context].cookieStoreId,
-        'is my responsibility'
+        "is my responsibility"
      );
    } else {
      //console.log("Context found", contexts[context].cookieStoreId, "is not my responsibility")
@@ -109,15 +109,15 @@ var notMyContextNotMyProblem = async function() {
    }
  }
  return othercontexts;
-}
+};

-var contextSetup = function(requestDetails) {
+var contextSetup = function (requestDetails) {
  function onContextError() {
-    console.log('Context launcher error');
+    console.log("Context launcher error");
  }
  //console.log("(isolate)Forcing I2P requests into context");
  try {
-    var i2pTabFind = async function(tabId) {
+    var i2pTabFind = async function (tabId) {
      try {
        var context = await browser.contextualIdentities.query({
          name: titlepref,
@@ -127,14 +127,14 @@ var contextSetup = function(requestDetails) {
            function onCreated(tab) {
              function closeOldTab() {
                if (tabId.id != tab.id) {
-                  console.log('(isolate) Closing un-isolated tab', tabId.id);
-                  console.log('in favor of', tab.id);
-                  console.log('with context', tab.cookieStoreId);
+                  console.log("(isolate) Closing un-isolated tab", tabId.id);
+                  console.log("in favor of", tab.id);
+                  console.log("with context", tab.cookieStoreId);
                  browser.tabs.remove(tabId.id);
                }
                browser.pageAction.setPopup({
                  tabId: tabId.id,
-                  popup: 'security.html',
+                  popup: "security.html",
                });
                browser.pageAction.show(tabId.id);
              }
@@ -152,10 +152,10 @@ var contextSetup = function(requestDetails) {
          return tabId;
        }
      } catch (error) {
-        console.log('(isolate)Context Error', error);
+        console.log("(isolate)Context Error", error);
      }
    };
-    var routerTabFind = async function(tabId) {
+    var routerTabFind = async function (tabId) {
      try {
        var context = await browser.contextualIdentities.query({
          name: routerpref,
@@ -165,9 +165,9 @@ var contextSetup = function(requestDetails) {
            function onCreated(tab) {
              function closeOldTab(tabs) {
                if (tabId.id != tab.id) {
-                  console.log('(isolate) Closing un-isolated tab', tabId.id);
-                  console.log('in favor of', tab.id);
-                  console.log('with context', tab.cookieStoreId);
+                  console.log("(isolate) Closing un-isolated tab", tabId.id);
+                  console.log("in favor of", tab.id);
+                  console.log("with context", tab.cookieStoreId);
                  browser.tabs.remove(tabId.id);
                  browser.tabs.move(tab.id, { index: 0 });
                }
@@ -181,10 +181,10 @@ var contextSetup = function(requestDetails) {
              });
              pins.then(closeOldTab, onError);
            }
-            if (requestDetails.url.endsWith('xhr1.html')) {
-              hostname = url.split('/')[2];
-              let prefix = url.substr(0, url.indexOf('://') + 3);
-              requestDetails.url = prefix + hostname + '/home';
+            if (requestDetails.url.endsWith("xhr1.html")) {
+              hostname = url.split("/")[2];
+              let prefix = url.substr(0, url.indexOf("://") + 3);
+              requestDetails.url = prefix + hostname + "/home";
            }
            var created = browser.tabs.create({
              active: true,
@@ -199,10 +199,10 @@ var contextSetup = function(requestDetails) {
          return tabId;
        }
      } catch (error) {
-        console.log('(isolate)Context Error', error);
+        console.log("(isolate)Context Error", error);
      }
    };
-    var i2ptunnelTabFind = async function(tabId) {
+    var i2ptunnelTabFind = async function (tabId) {
      try {
        var context = await browser.contextualIdentities.query({
          name: tunnelpref,
@@ -212,9 +212,9 @@ var contextSetup = function(requestDetails) {
            function onCreated(tab) {
              function closeOldTab(tabs) {
                if (tabId.id != tab.id) {
-                  console.log('(isolate) Closing un-isolated tab', tabId.id);
-                  console.log('in favor of', tab.id);
-                  console.log('with context', tab.cookieStoreId);
+                  console.log("(isolate) Closing un-isolated tab", tabId.id);
+                  console.log("in favor of", tab.id);
+                  console.log("with context", tab.cookieStoreId);
                  browser.tabs.remove(tabId.id);
                  browser.tabs.move(tab.id, { index: 0 });
                }
@@ -228,10 +228,10 @@ var contextSetup = function(requestDetails) {
              });
              pins.then(closeOldTab, onError);
            }
-            if (requestDetails.url.endsWith('xhr1.html')) {
-              hostname = url.split('/')[2];
-              let prefix = url.substr(0, url.indexOf('://') + 3);
-              requestDetails.url = prefix + hostname + '/i2ptunnelmgr/';
+            if (requestDetails.url.endsWith("xhr1.html")) {
+              hostname = url.split("/")[2];
+              let prefix = url.substr(0, url.indexOf("://") + 3);
+              requestDetails.url = prefix + hostname + "/i2ptunnelmgr/";
            }
            var created = browser.tabs.create({
              active: true,
@@ -246,10 +246,10 @@ var contextSetup = function(requestDetails) {
          return tabId;
        }
      } catch (error) {
-        console.log('(isolate)Context Error', error);
+        console.log("(isolate)Context Error", error);
      }
    };
-    var snarkTabFind = async function(tabId) {
+    var snarkTabFind = async function (tabId) {
      try {
        var context = await browser.contextualIdentities.query({
          name: torrentpref,
@@ -259,16 +259,16 @@ var contextSetup = function(requestDetails) {
            name: titlepref,
          });
          let tmp = new URL(tabId.url);
-          console.log('(isolate)tabid host', tmp.host);
-          if (!requestDetails.url.includes('snark/' + tmp.host)) {
+          console.log("(isolate)tabid host", tmp.host);
+          if (!requestDetails.url.includes("snark/" + tmp.host)) {
            //          if (tabId.cookieStoreId != exemptContext[0].cookieStoreId){
            function Create() {
              function onCreated(tab) {
                function closeOldTab(tabs) {
                  if (tabId.id != tab.id) {
-                    console.log('(isolate) Closing un-isolated tab', tabId.id);
-                    console.log('in favor of', tab.id);
-                    console.log('with context', tab.cookieStoreId);
+                    console.log("(isolate) Closing un-isolated tab", tabId.id);
+                    console.log("in favor of", tab.id);
+                    console.log("with context", tab.cookieStoreId);
                    browser.tabs.remove(tabId.id);
                    browser.tabs.move(tab.id, { index: 0 });
                  }
@@ -282,10 +282,10 @@ var contextSetup = function(requestDetails) {
                });
                pins.then(closeOldTab, onError);
              }
-              if (requestDetails.url.endsWith('xhr1.html')) {
-                hostname = url.split('/')[2];
-                let prefix = url.substr(0, url.indexOf('://') + 3);
-                requestDetails.url = prefix + hostname + '/i2psnark/';
+              if (requestDetails.url.endsWith("xhr1.html")) {
+                hostname = url.split("/")[2];
+                let prefix = url.substr(0, url.indexOf("://") + 3);
+                requestDetails.url = prefix + hostname + "/i2psnark/";
              }
              var created = browser.tabs.create({
                active: true,
@@ -301,10 +301,10 @@ var contextSetup = function(requestDetails) {
          }
        }
      } catch (error) {
-        console.log('(isolate)Context Error', error);
+        console.log("(isolate)Context Error", error);
      }
    };
-    var muwireTabFind = async function(tabId) {
+    var muwireTabFind = async function (tabId) {
      try {
        var context = await browser.contextualIdentities.query({
          name: muwirepref,
@@ -314,9 +314,9 @@ var contextSetup = function(requestDetails) {
            function onCreated(tab) {
              function closeOldTab(tabs) {
                if (tabId.id != tab.id) {
-                  console.log('(isolate) Closing un-isolated tab', tabId.id);
-                  console.log('in favor of', tab.id);
-                  console.log('with context', tab.cookieStoreId);
+                  console.log("(isolate) Closing un-isolated tab", tabId.id);
+                  console.log("in favor of", tab.id);
+                  console.log("with context", tab.cookieStoreId);
                  browser.tabs.remove(tabId.id);
                  browser.tabs.move(tab.id, { index: 0 });
                }
@@ -330,10 +330,10 @@ var contextSetup = function(requestDetails) {
              });
              pins.then(closeOldTab, onError);
            }
-            if (requestDetails.url.endsWith('xhr1.html')) {
-              hostname = url.split('/')[2];
-              let prefix = url.substr(0, url.indexOf('://') + 3);
-              requestDetails.url = prefix + hostname + '/muwire/';
+            if (requestDetails.url.endsWith("xhr1.html")) {
+              hostname = url.split("/")[2];
+              let prefix = url.substr(0, url.indexOf("://") + 3);
+              requestDetails.url = prefix + hostname + "/muwire/";
            }
            var created = browser.tabs.create({
              active: true,
@@ -348,10 +348,10 @@ var contextSetup = function(requestDetails) {
          return tabId;
        }
      } catch (error) {
-        console.log('(isolate)Context Error', error);
+        console.log("(isolate)Context Error", error);
      }
    };
-    var i2pboteTabFind = async function(tabId) {
+    var i2pboteTabFind = async function (tabId) {
      try {
        var context = await browser.contextualIdentities.query({
          name: botepref,
@@ -361,9 +361,9 @@ var contextSetup = function(requestDetails) {
            function onCreated(tab) {
              function closeOldTab(tabs) {
                if (tabId.id != tab.id) {
-                  console.log('(isolate) Closing un-isolated tab', tabId.id);
-                  console.log('in favor of', tab.id);
-                  console.log('with context', tab.cookieStoreId);
+                  console.log("(isolate) Closing un-isolated tab", tabId.id);
+                  console.log("in favor of", tab.id);
+                  console.log("with context", tab.cookieStoreId);
                  browser.tabs.remove(tabId.id);
                  browser.tabs.move(tab.id, { index: 0 });
                }
@@ -377,10 +377,10 @@ var contextSetup = function(requestDetails) {
              });
              pins.then(closeOldTab, onError);
            }
-            if (requestDetails.url.endsWith('xhr1.html')) {
-              hostname = url.split('/')[2];
-              let prefix = url.substr(0, url.indexOf('://') + 3);
-              requestDetails.url = prefix + hostname + '/i2pbote/';
+            if (requestDetails.url.endsWith("xhr1.html")) {
+              hostname = url.split("/")[2];
+              let prefix = url.substr(0, url.indexOf("://") + 3);
+              requestDetails.url = prefix + hostname + "/i2pbote/";
            }
            var created = browser.tabs.create({
              active: true,
@@ -395,10 +395,10 @@ var contextSetup = function(requestDetails) {
          return tabId;
        }
      } catch (error) {
-        console.log('(isolate)Context Error', error);
+        console.log("(isolate)Context Error", error);
      }
    };
-    var mailTabFind = async function(tabId) {
+    var mailTabFind = async function (tabId) {
      try {
        var context = await browser.contextualIdentities.query({
          name: mailpref,
@@ -408,9 +408,9 @@ var contextSetup = function(requestDetails) {
            function onCreated(tab) {
              function closeOldTab(tabs) {
                if (tabId.id != tab.id) {
-                  console.log('(isolate) Closing un-isolated tab', tabId.id);
-                  console.log('in favor of', tab.id);
-                  console.log('with context', tab.cookieStoreId);
+                  console.log("(isolate) Closing un-isolated tab", tabId.id);
+                  console.log("in favor of", tab.id);
+                  console.log("with context", tab.cookieStoreId);
                  browser.tabs.remove(tabId.id);
                  browser.tabs.move(tab.id, { index: 0 });
                }
@@ -424,10 +424,10 @@ var contextSetup = function(requestDetails) {
              });
              pins.then(closeOldTab, onError);
            }
-            if (requestDetails.url.endsWith('xhr1.html')) {
-              hostname = url.split('/')[2];
-              let prefix = url.substr(0, url.indexOf('://') + 3);
-              requestDetails.url = prefix + hostname + '/webmail/';
+            if (requestDetails.url.endsWith("xhr1.html")) {
+              hostname = url.split("/")[2];
+              let prefix = url.substr(0, url.indexOf("://") + 3);
+              requestDetails.url = prefix + hostname + "/webmail/";
            }
            var created = browser.tabs.create({
              active: true,
@@ -442,23 +442,23 @@ var contextSetup = function(requestDetails) {
          return tabId;
        }
      } catch (error) {
-        console.log('(isolate)Context Error', error);
+        console.log("(isolate)Context Error", error);
      }
    };
-    var ircTabFind = async function(tabId) {
+    var ircTabFind = async function (tabId) {
      try {
        var context = await browser.contextualIdentities.query({
          name: ircpref,
        });
        if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          if (requestDetails.url.includes(':7669')) {
+          if (requestDetails.url.includes(":7669")) {
            function Create() {
              function onCreated(tab) {
                function closeOldTab(tabs) {
                  if (tabId.id != tab.id) {
-                    console.log('(isolate) Closing un-isolated tab', tabId.id);
-                    console.log('in favor of', tab.id);
-                    console.log('with context', tab.cookieStoreId);
+                    console.log("(isolate) Closing un-isolated tab", tabId.id);
+                    console.log("in favor of", tab.id);
+                    console.log("with context", tab.cookieStoreId);
                    browser.tabs.remove(tabId.id);
                    browser.tabs.move(tab.id, { index: 0 });
                  }
@@ -486,90 +486,16 @@ var contextSetup = function(requestDetails) {
          }
        }
      } catch (error) {
-        console.log('(isolate)Context Error', error);
+        console.log("(isolate)Context Error", error);
      }
    };
-    var normalTabFind = async function(tabId) {
-      if (tabId == undefined) {
-        return;
-      }
-      try {
-        var anoncontext = await browser.contextualIdentities.query({
-          name: titlepref,
-        });
-        var irccontext = await browser.contextualIdentities.query({
-          name: ircpref,
-        });
-        var othercontexts = await notMyContextNotMyProblem();
-        var nmp = false;
-        for (context in othercontexts) {
-          if (tabId.cookieStoreId == othercontexts[context].cookieStoreId) {
-            console.log('Not my problem');
-            nmp = true;
-          }
-        }
-        if (
-          tabId.cookieStoreId == 'firefox-default' ||
-          tabId.cookieStoreId == 'firefox-private' ||
-          tabId.cookieStoreId == anoncontext[0].cookieStoreId ||
-          tabId.cookieStoreId == irccontext[0].cookieStoreId ||
-          nmp
-        ) {
-          console.log(
-            '(ISOLATE)',
-            tabId.cookieStoreId,
-            'not',
-            anoncontext[0].cookieStoreId,
-            irccontext[0].cookieStoreId
-          );
-          return;
-        } else {
-          function Create() {
-            function onCreated(tab) {
-              function closeOldTab() {
-                if (
-                  tabId.id != tab.id &&
-                  tabId.cookieStoreId != tab.cookieStoreId
-                ) {
-                  console.log(
-                    '(isolate) Closing isolated tab',
-                    tabId.id,
-                    'with context',
-                    tabId.cookieStoreId
-                  );
-                  console.log(
-                    '(isolate) in favor of',
-                    tab.id,
-                    'with context',
-                    tab.cookieStoreId
-                  );
-                  browser.tabs.remove(tabId.id);
-                }
-              }
-              closeOldTab(tab);
-            }
-            var created = browser.tabs.create({
-              active: true,
-              cookieStoreId: 'firefox-default',
-              url: requestDetails.url,
-            });
-            created.then(onCreated, onContextError);
-          }
-          var gettab = browser.tabs.get(tabId.id);
-          gettab.then(Create, onContextError);
-          return tabId;
-        }
-      } catch (error) {
-        console.log('(isolate)Context Error', error);
-      }
-    };
-    var tabGet = async function(tabId) {
+    var tabGet = async function (tabId) {
      try {
        //console.log("(isolate)Tab ID from Request", tabId);
        let tabInfo = await browser.tabs.get(tabId);
        return tabInfo;
      } catch (error) {
-        console.log('(isolate)Tab error', error);
+        console.log("(isolate)Tab error", error);
      }
    };
    if (requestDetails == undefined) {
@@ -588,48 +514,27 @@ var contextSetup = function(requestDetails) {
    if (requestDetails.tabId > 0) {
      var tab = tabGet(requestDetails.tabId);
      tab.then(isolate);
+
      function isolate(oldtab) {
-        //        if (oldtab.cookieStoreId == 'firefox-default') {
-        if (i2pHost(requestDetails.url)) {
-          var thn = i2pHostName(requestDetails.url);
-          if (requestDetails.url.includes('=' + thn)) {
-            console.log('(scrub)checking search hostnames =' + thn);
-            var tpt = requestDetails.url.split('=' + thn, 2);
-            requestDetails.url =
-              'http://' + thn + '/' + tpt[1].replace('%2F', '');
-          }
-          console.log('(scrub) new hostname', requestDetails.url);
-          var setcookie = browser.cookies.set({
-            firstPartyDomain: i2pHostName(requestDetails.url),
-            url: requestDetails.url,
-            secure: true,
-          });
-          setcookie.then(onContextGotLog, onContextError);
-          var i2ptab = tab.then(i2pTabFind, onContextError);
-          return requestDetails;
-        }
-        if (extensionHost(requestDetails)) {
-          return requestDetails;
-        }
        let localhost = localHost(requestDetails.url);
        let routerhost = routerHost(requestDetails.url);
        if (routerhost) {
-          if (routerhost === 'i2ptunnelmgr') {
+          if (routerhost === "i2ptunnelmgr") {
            var tunneltab = tab.then(i2ptunnelTabFind, onContextError);
            return requestDetails;
-          } else if (routerhost === 'i2psnark') {
+          } else if (routerhost === "i2psnark") {
            var snarktab = tab.then(snarkTabFind, onContextError);
            return requestDetails;
-          } else if (routerhost === 'webmail') {
+          } else if (routerhost === "webmail") {
            var mailtab = tab.then(mailTabFind, onContextError);
            return requestDetails;
-          } else if (routerhost === 'muwire') {
+          } else if (routerhost === "muwire") {
            var routertab = tab.then(muwireTabFind, onContextError);
            return requestDetails;
-          } else if (routerhost === 'i2pbote') {
+          } else if (routerhost === "i2pbote") {
            var routertab = tab.then(i2pboteTabFind, onContextError);
            return requestDetails;
-          } else if (routerhost === 'routerconsole') {
+          } else if (routerhost === "routerconsole") {
            var routertab = tab.then(routerTabFind, onContextError);
            return requestDetails;
          }
@@ -638,19 +543,50 @@ var contextSetup = function(requestDetails) {
            var irctab = tab.then(ircTabFind, onContextError);
            return requestDetails;
          }
-          var normalTab = tab.then(normalTabFind, onContextError);
-          return requestDetails;
-          //return requestDetails;
        }
+        //        if (oldtab.cookieStoreId == 'firefox-default') {
+        if (i2pHost(requestDetails.url)) {
+          var thn = i2pHostName(requestDetails.url);
+          if (requestDetails.url.includes("=" + thn)) {
+            if (
+              !requestDetails.url.includes("://github.com") ||
+              !requestDetails.url.includes("://notabug.org") ||
+              !requestDetails.url.includes("://i2pgit.org") ||
+              !requestDetails.url.includes("://gitlab.com")
+            ) {
+              if (!localhost) {
+                console.log("(scrub)checking search hostnames =" + thn);
+                var tpt = requestDetails.url.split("=" + thn, 2);
+                requestDetails.url =
+                  "http://" + thn + "/" + tpt[1].replace("%2F", "");
+              }
+            }
+          }
+          console.log("(scrub) new hostname", requestDetails.url);
+          var setcookie = browser.cookies.set({
+            firstPartyDomain: i2pHostName(requestDetails.url),
+            url: requestDetails.url,
+            secure: true,
+          });
+          setcookie.then(onContextGotLog, onContextError);
+          if (!routerhost) {
+            var i2ptab = tab.then(i2pTabFind, onContextError);
+          }
+          return requestDetails;
+        }
+        if (extensionHost(requestDetails)) {
+          return requestDetails;
+        }
+
        //}
      }
    }
  } catch (error) {
-    console.log('(isolate)Not an I2P request, blackholing', error);
+    console.log("(isolate)Not an I2P request, blackholing", error);
  }
 };

-var coolheadersSetup = function(e) {
+var coolheadersSetup = function (e) {
  var asyncSetPageAction = new Promise((resolve, reject) => {
    window.setTimeout(() => {
      if (e.tabId != undefined) {
@@ -658,103 +594,106 @@ var coolheadersSetup = function(e) {
        popup.then(gotPopup);
      }
      function gotPopup(p) {
-        console.log('(scrub) checking popup', p);
+        console.log("(scrub) checking popup", p);
        if (p.length != 0) return;
        let headers = e.responseHeaders.filter((word) =>
-          word.name.toUpperCase().includes('I2P')
+          word.name.toUpperCase().includes("I2P")
        );
        for (i = headers.length - 1; i >= 0; i--) {
          let header = headers[i];
-          console.log('(scrub) checking header', header);
-          if (header.name.toUpperCase().endsWith('I2P-LOCATION')) {
+          console.log("(scrub) checking header", header);
+          if (header.name.toUpperCase().endsWith("I2P-LOCATION")) {
            var tab = browser.tabs.get(e.tabId);
            tab.then(altSrc);
            function altSrc(tab) {
-              console.log('(scrub) X-I2P-LOCATION');
+              console.log("(scrub) X-I2P-LOCATION");
              let url = new URL(header.value);
              browser.pageAction.setPopup({
                tabId: e.tabId,
-                popup: 'location.html',
+                popup: "location.html",
              });
              browser.pageAction.setIcon({
-                path: 'icons/i2plogo.png',
+                path: "icons/i2plogo.png",
                tabId: e.tabId,
              });
              let eurl = new URL(tab.url);
              browser.pageAction.setTitle({
                tabId: e.tabId,
-                title: 'http://' + url.host + eurl.pathname,
+                title: "http://" + url.host + eurl.pathname,
              });
              browser.pageAction.show(e.tabId);
            }
            break;
-          } else {
-            if (header.name.toUpperCase().endsWith('I2P-TORRENTLOCATION')) {
-              var imgs = document.getElementsByTagName('img');
-              for (let img of imgs) {
-                if (tmpsrc.host == location.host) {
-                  img.src =
-                    'http://127.0.0.1:7657/i2psnark/' +
-                    tmpsrc.host +
-                    tmpsrc.pathname;
-                  img.onerror = function() {
-                    img.src = tmpsrc;
+          }
+          if (header.name.toUpperCase().endsWith("I2P-TORRENTLOCATION")) {
+            console.log("(scrub) checking header torrentlocation", header);
+            var imgs = document.getElementsByTagName("img");
+            for (let img of imgs) {
+              if (tmpsrc.host == location.host) {
+                img.src =
+                  "http://127.0.0.1:7657/i2psnark/" +
+                  tmpsrc.host +
+                  tmpsrc.pathname;
+                img.onerror = function () {
+                  img.src = tmpsrc;
+                };
+              }
+            }
+            var videos = document.getElementsByTagName("video");
+            for (let video of videos) {
+              let tmpsrc = new URL(video.currentSrc);
+              if (tmpsrc.host == location.host) {
+                if (!video.innerHTML.includes("127.0.0.1")) {
+                  innerHTML = video.innerHTML;
+                  topInnerHTML = video.innerHTML.replace(
+                    'src="',
+                    'src="http://127.0.0.1:7657/i2psnark/' + location.host + "/"
+                  );
+                  video.innerHTML = topInnerHTML; // + innerHTML;
+                  video.onerror = function () {
+                    video.innerHTML = topInnerHTML + innerHTML;
                  };
                }
              }
-              var videos = document.getElementsByTagName('video');
-              for (let video of videos) {
-                let tmpsrc = new URL(video.currentSrc);
-                if (tmpsrc.host == location.host) {
-                  if (!video.innerHTML.includes('127.0.0.1')) {
-                    innerHTML = video.innerHTML;
-                    topInnerHTML = video.innerHTML.replace(
-                      'src="',
-                      'src="http://127.0.0.1:7657/i2psnark/' +
-                        location.host +
-                        '/'
-                    );
-                    video.innerHTML = topInnerHTML; // + innerHTML;
-                    video.onerror = function() {
-                      video.innerHTML = topInnerHTML + innerHTML;
-                    };
-                  }
-                }
-              }
-              var audios = document.getElementsByTagName('audio');
-              for (let audio of audios) {
-                let tmpsrc = new URL(audio.currentSrc);
-                if (tmpsrc.host == location.host) {
-                  if (!audio.innerHTML.includes('127.0.0.1')) {
-                    innerHTML = audio.innerHTML;
-                    topInnerHTML = audio.innerHTML.replace(
-                      'src="',
-                      'src="http://127.0.0.1:7657/i2psnark/' +
-                        location.host +
-                        '/'
-                    );
-                    audio.innerHTML = topInnerHTML; // + innerHTML;
-                    audio.onerror = function() {
-                      audio.innerHTML = topInnerHTML + innerHTML;
-                    };
-                  }
-                }
-              }
-              browser.pageAction.setPopup({
-                tabId: tabId.id,
-                popup: 'torrent.html',
-              });
-              browser.pageAction.setIcon({
-                path: 'icons/i2plogo.png',
-                tabId: e.tabId,
-              });
-              browser.pageAction.setTitle({
-                tabId: e.tabId,
-                title: header.value,
-              });
-              browser.pageAction.show(e.tabId);
-              break;
            }
+            var audios = document.getElementsByTagName("audio");
+            for (let audio of audios) {
+              let tmpsrc = new URL(audio.currentSrc);
+              if (tmpsrc.host == location.host) {
+                if (!audio.innerHTML.includes("127.0.0.1")) {
+                  innerHTML = audio.innerHTML;
+                  topInnerHTML = audio.innerHTML.replace(
+                    'src="',
+                    'src="http://127.0.0.1:7657/i2psnark/' + location.host + "/"
+                  );
+                  audio.innerHTML = topInnerHTML; // + innerHTML;
+                  audio.onerror = function () {
+                    audio.innerHTML = topInnerHTML + innerHTML;
+                  };
+                }
+              }
+            }
+            browser.pageAction.setPopup({
+              tabId: e.tabId,
+              popup: "torrent.html",
+            });
+            if (tab.url.startsWith("https")) {
+              browser.pageAction.setIcon({
+                path: "icons/infotoopiesbt.png",
+                tabId: e.tabId,
+              });
+            } else {
+              browser.pageAction.setIcon({
+                path: "icons/infotoopiebt.png",
+                tabId: e.tabId,
+              });
+            }
+            browser.pageAction.setTitle({
+              tabId: e.tabId,
+              title: header.value,
+            });
+            browser.pageAction.show(e.tabId);
+            break;
          }
        }
      }
@@ -766,47 +705,107 @@ var coolheadersSetup = function(e) {

 function getTabURL(tab) {
  if (tab.url.startsWith("https")) {
-    try {
-      browser.tabs
-        .sendMessage(tab.id, { req: "i2p-location" })
-        .then((response) => {
-          if (response != undefined) {
-            console.log("(scrub) i2p-location response object", response);
-            if (response.content.toUpperCase() != "NO-ALT-LOCATION") {
-              browser.pageAction.setPopup({
-                tabId: tab.id,
-                popup: "location.html",
-              });
-              browser.pageAction.setIcon({
-                path: "icons/i2plogo.png",
-                tabId: tab.id,
-              });
-              browser.pageAction.setTitle({
-                tabId: tab.id,
-                title: response.content,
-              });
-              browser.pageAction.show(tab.id);
+    browser.pageAction.setPopup({
+      tabId: tab.id,
+      popup: "security.html",
+    });
+    browser.pageAction.setIcon({
+      path: "icons/infotoopies.png",
+      tabId: tab.id,
+    });
+    console.log(tab.url);
+    if (tab.url.includes(".i2p")) {
+      //console.log("(background) tabinfo", tabInfo[0].id)
+      try {
+        browser.tabs
+          .sendMessage(tab.id, { req: "i2p-torrentlocation" })
+          .then((response) => {
+            if (response != undefined && response != "") {
+              console.log(
+                "(pageaction) i2p-torrentlocation response object",
+                response
+              );
+              if (response.content.toUpperCase() != "NO-ALT-LOCATION") {
+                browser.pageAction.setPopup({
+                  tabId: tab.id,
+                  popup: "torrent.html",
+                });
+                browser.pageAction.setIcon({
+                  path: "icons/infotoopiesbt.png",
+                  tabId: tab.id,
+                });
+                browser.pageAction.setTitle({
+                  tabId: tab.id,
+                  title: response.content,
+                });
+                browser.pageAction.show(tab.id);
+              }
            }
-          }
-        });
-      console.log("(pageaction)", tab.id, tab.url);
-    } catch (e) {
-      console.log("(pageaction)", e);
+          });
+        console.log("(pageaction)", tab.id, tab.url);
+      } catch (e) {
+        console.log("(pageaction)", e);
+      }
+    } else {
+      try {
+        browser.tabs
+          .sendMessage(tab.id, { req: "i2p-location" })
+          .then((response) => {
+            if (response != undefined) {
+              console.log(
+                "(pageaction) i2p-location response object",
+                response
+              );
+              if (response.content.toUpperCase() != "NO-ALT-LOCATION") {
+                browser.pageAction.setPopup({
+                  tabId: tab.id,
+                  popup: "location.html",
+                });
+                browser.pageAction.setIcon({
+                  path: "icons/i2plogo.png",
+                  tabId: tab.id,
+                });
+                browser.pageAction.setTitle({
+                  tabId: tab.id,
+                  title: response.content,
+                });
+                browser.pageAction.show(tab.id);
+              }
+            }
+          });
+        console.log("(pageaction)", tab.id, tab.url);
+      } catch (e) {
+        console.log("(pageaction)", e);
+      }
    }
  } else {
+    if (tab.url.includes(".i2p")) {
+      browser.pageAction.setPopup({
+        tabId: tab.id,
+        popup: "security.html",
+      });
+      browser.pageAction.setIcon({
+        path: "icons/infotoopie.png",
+        tabId: tab.id,
+      });
+      console.log(tab.url);
+    }
    try {
      browser.tabs
        .sendMessage(tab.id, { req: "i2p-torrentlocation" })
        .then((response) => {
          if (response != undefined) {
-            console.log("(scrub) i2p-location response object", response);
+            console.log(
+              "(pageaction) i2p-torrentlocation response object",
+              response
+            );
            if (response.content.toUpperCase() != "NO-ALT-LOCATION") {
              browser.pageAction.setPopup({
                tabId: tab.id,
                popup: "torrent.html",
              });
              browser.pageAction.setIcon({
-                path: "icons/i2plogo.png",
+                path: "icons/infotoopiebt.png",
                tabId: tab.id,
              });
              browser.pageAction.setTitle({
--- 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/security.html
+++ b/security.html
@@ -1,55 +1,9 @@
 <!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</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>
-    <script src="cert.js"></script>
 </body>
 </html>
--- a/toopie.html
+++ b/toopie.html
@@ -1,86 +1,9 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>I2P Router Information</title>
-    <link href="home.css" rel="stylesheet" type="text/css">
-    <link href="sidebar.css" rel="stylesheet" type="text/css">
+    <title>
+    </title>
 </head>
 <body>
-    <script src="i2pcontrol/i2pcontrol.js"></script> 
-    <script src="info.js"></script> 
-    <script src="content.js"></script>
-    <h1>I2P Router Information</h1>
-
-    <ul>
-        <li>
-            <a href="http://localhost:7657" target="_blank"><img alt="i2p router console" class="center" src="/icons/i2plogo.png"></a>
-        </li>
-    </ul>
-
-    <ul class="button-list">
-        <li><button id="label-router-restart" target="_blank"><img alt="Restart:" id="label-router-shutdown" src="/images/restart.svg"></button>
-        <br>
-        <span id="router-restart">Gracefully restart router</span>
-        </li>
-
-        <li><button id="label-router-shutdown" target="_blank"><img alt="Shutdown:" id="label-router-shutdown" src="/images/shutdown.svg"></button>
-        <br>
-        <span id="router-shutdown">Gracefully shutdown router</span>
-        </li>
-    </ul>
-
-    <ul>
-        <li><button id="label-router-status" target="_blank">Status</button>
-        </li>
-    </ul>
-
-    <ul class="label-list" id="label-status-list">
-        <li><span id="label-router-status">Router Status:</span> <span id="router-status">Replace with Router Status</span></li>
-
-        <li><span id="label-router-uptime">Router Uptime(Ms):</span> <span id="router-uptime">Replace with Router Uptime</span></li>
-
-        <li><span id="label-router-version">Router Version:</span> <span id="router-version">Replace with Router Version</span></li>
-    </ul>
-
-    <ul>
-        <li><button id="label-router-bandwidth" target="_blank">Bandwidth</button>
-        </li>
-    </ul>
-
-    <ul class="label-list" id="label-bandwidth-list">
-        <li><span id="label-router-bw-outbound-1s">Outbound bw 1s:</span> <span id="router-net-bw-outbound-1s">Replace with Router Bandwidth Outbound 1s</span></li>
-
-        <li><span id="label-router-bw-outbound-15s">Outbound bw 15s:</span> <span id="router-net-bw-outbound-15s">Replace with Router Bandwidth Outbound 15s</span></li>
-
-        <li><span id="label-router-bw-inbound-1s">Inbound bw 1s:</span> <span id="router-net-bw-inbound-1s">Replace with Router Bandwidth Inbound 1s</span></li>
-
-        <li><span id="label-router-bw-inbound-15s">Inbound bw 15s:</span> <span id="router-net-bw-inbound-15s">Replace with Router Bandwidth Outbound 15s</span></li>
-    </ul>
-    <!--<li>
-<span id="label-router-net-status">Network Status:</span>
-<span id="router-net-status">Replace with Router Network Status</span>
-</li>-->
-
-    <ul>
-        <li><button id="label-router-peers" target="_blank">Peers</button>
-        </li>
-    </ul>
-
-    <ul class="label-list" id="label-peers-list">
-        <li><span id="label-router-net-tunnels-participating">Transit Tunnels:</span> <span id="router-net-tunnels-participating">Replace with Router Participating Tunnel Count</span></li>
-
-        <li><span id="label-router-activepeers">Active Peers:</span> <span id="router-netdb-activepeers">Replace with Router Active Peers</span></li>
-
-        <li><span id="label-router-netdb-fastpeers">Fast Peers:</span> <span id="router-netdb-fastpeers">Replace with Router Fast Peers</span></li>
-
-        <li><span id="label-router-netdb-highcapacitypeers">High Capacity Peers:</span> <span id="router-netdb-highcapacitypeers">Replace with High Capacity Peers</span></li>
-
-        <li><span id="label-router-netdb-isreseeding">Reseed status:</span> <span id="router-netdb-isreseeding">Replace with Router netDB Reseeding Status</span></li>
-
-        <li><span id="label-router-netdb-knownpeers">Known Peers:</span> <span id="router-netdb-knownpeers">Replace with Router Known Peers</span></li>
-    </ul>
-
-    <br>
-    <br>
 </body>
 </html>
--- 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/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"]
    );
  });
 }
--- 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/popup.js
+++ b/torrent/popup.js
@@ -1,22 +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 || ""));
  }
-  console.log('(torrent) rpcurl', server.base_url + 'rpc');
-  return fetch(server.base_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) {
@@ -32,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();
  });
 }
@@ -141,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/window.html
+++ b/window.html
@@ -1,159 +1,9 @@
 <!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 class="section-header panel-section panel-section-header" id="topbar">
-        <!--<div class="text-section-header" id="text-section-header">-->
-        <a href="#" id="browser-action"><img class="tabicon" height="32px" src="icons/browse.png" width="32px">Browse</a> <a href="#" id="torrent-action"><img class="tabicon" height="32px" src="icons/torrents.png" width="32px">Download</a> <!--</div>-->
-    </div>
-
-    <div id="browserpanel">
-        <div class="panel">
-            <div class="section-header panel-section panel-section-header" id="headline">
-                <div class="text-section-header">
-                    <h1 id="text-section-header">The Invisible Internet Browser</h1>
-                </div>
-            </div>
-
-            <div class="search-info">
-                <div id="i2pbrowser-version">
-                </div>
-
-                <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>
-                </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>
-                </div>
-
-                <div id="i2pbrowser-description">
-                    <p id="description">You are now able to use I2P in this browser.</p>
-                    <button class="hidden" id="visit-irc">Visit IRC</button>
-                </div>
-            </div>
-
-            <div class="browser-info">
-                <p class="hideIfI2PConsoleOff">
-                </p>
-
-                <h3 id="controlHeader">Controls</h3>
-
-                <p id="controlExplain">These controls are used to tailor your I2P Browsing Experience</p>
-
-                <ul>
-                    <!--<li class="application">
-                        <a href="#" id="clear-browser-data">Clear Browsing Data:</a> <span class="applicationDesc" id="clear-desc">Use this to erase your browsing data.</span>
-                    </li>
-
-                    <li class="application"><input id="enable-web-rtc" name="enablewebrtc" type="checkbox" value="webrtc"> <label for="enable-web-rtc">Enable WebRTC <strong>with Proxy?</strong></label> <span class="applicationDesc" id="rtcDesc">WebRTC is disabled by default, but can be enabled by checking this box.</span></li>-->
-
-                    <li class="application">
-                        <div class="panel-section-separator">
-                        </div>
-
-                        <div class="panel-section-identity">
-                            <div id="identity-list">
-                            </div>
-                        </div>
-                    </li>
-
-                    <li class="application"><input id="disable-history" name="disablehistory" type="checkbox" value="history"> <label for="disable-history">Disable History in I2P Tabs</label> <span class="applicationDesc" id="histDesc">History is automatically cleared when your I2P tabs are closed. If you want to clear history as you go, check this box.</span></li>
-                </ul>
-            </div>
-            <!--<div class="panel-section-separator">
-            </div>-->
-
-            <div class="application-info">
-                <p class="hideIfI2PConsoleOff">
-                </p>
-
-                <h3 id="applicationHeader">Applications</h3>
-
-                <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-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"><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>
-
-                    <li class="application"><button class="applicationName" id="window-visit-susimail" target="_blank">E-Mail</button> <span class="applicationDesc" id="susimail">I2P also bundles a webmail client which can be used to access in-I2P e-mail. To use it, go here:</span></li>
-
-                    <li class="application"><button class="applicationName" id="window-visit-snark" target="_blank">BitTorrent</button> <span class="applicationDesc" id="snark">I2P is capable of anonymous Peer-to-Peer file sharing, to use the built-in bittorrent client go here:</span></li>
-                </ul>
-            </div>
-        </div>
-    </div>
-
-    <br>
-
-    <div id="torrentpanel">
-        <div class="panel" id="torrentstatus">
-            <div class="section-header panel-section panel-section-header">
-                <div class="text-section-header" id="text-section-torrents-header">
-                    <h1>Torrent Downloads</h1>
-                </div>
-            </div>
-
-            <div id="config-pane">
-                <strong>Torrent RPC Configuration</strong>
-                <br>
-                The server address is not set yet.
-                <br>
-                <a class="config-opener" href="#">Open the settings</a> to continue.
-            </div>
-
-            <div id="torrents-pane">
-                <header>
-                    <h1>Torrent Controls</h1>
-                    <a class="webui-opener" href="#" target="_blank"><img alt="Open Web UI" src="images/i2plogo.png"></a> <!--<a class="config-opener" href="#">
-                            <img alt="Settings" src="images/gear.svg"></a>
-                            <a class="info-opener" href="https://github.com/myfreeweb/transmitter" target="_blank">
-                            <img alt="Extension Info" src="images/info.svg"></a>-->
-                </header>
-                <input id="torrents-search" placeholder="Search…" type="search">
-                <template id="torrents-tpl">
-                    <ul>
-                        <li>
-                            <div class="torrent-head">
-                                <div class="torrent-name">
-                                </div>
-
-                                <div class="torrent-speeds">
-                                </div>
-                            </div>
-                            <progress class="torrent-progress" max="100"></progress>
-                        </li>
-                    </ul>
-                </template>
-
-                <ul id="torrents-list">
-                </ul>
-
-                <div id="torrents-error">
-                </div>
-            </div>
-        </div>
-    </div>
-    <script src="context.js"></script> 
-    <script src="privacy.js"></script> 
-    <script src="i2pcontrol/i2pcontrol.js"></script> 
-    <script src="info.js"></script> 
-    <script crossorigin="anonymous" src="content.js"></script> 
-    <script src="torrent/popup.js"></script> 
-    <script src="torrent/common.js"></script>
 </body>
 </html>
Author	SHA1	Message	Date
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
idk	8bebe2a920	Extensions run requests in what is effectively their own container for our purposes, and one that's not exactly easy to determine is in use. But when we don't recognize the context and cannot jump out of context into an I2P tab, we basically it's coming from inside an extension(Or firefox-private, but that's sort of a whole other can of worms I need to tackle soon). TL:DR if it has no context, then we'll need to decide in favor of proxying requests to .i2p urls via I2P HTTP Proxy for it. The effect is that we can set the RPC remote for say, a bittorrent client, to the .b32.i2p URL of our BiglyBT xmwebwebui remote, for instance.	2020-12-23 18:17:36 -05:00
idk	fedb2d3707	update changelog	2020-12-21 18:15:41 -05:00
idk	b605ea515f	Merge pull request #104 from eyedeekay/spanish Spanish	2020-12-21 23:13:19 +00:00
idk	a38d18c049	fix #102	2020-12-21 18:11:30 -05:00
idk	a0be345f86	fix 102	2020-12-21 17:47:23 -05:00
idk	e08ce1c71e	add a spanish translation. It's probably not very good, as it's the combination of Google Translate and my high school Spanish, but at least it exists and maybe could spark some interest, being a single checkin of a fairly simple nature	2020-12-21 16:07:38 -05:00
idk	f25a29052f	emergency fix for proxy urls, exclusion was too broad	2020-12-14 17:19:20 -05:00
idk	13c5042006	Exclude clearnet code hosting sites from scrub checks	2020-12-14 14:47:34 -05:00
idk	01ce1a2f13	fmt	2020-12-14 14:44:46 -05:00
idk	8430e3b952	git commit -am exclude searches on clearnet code hosting services from scrub checks	2020-12-14 14:43:04 -05:00