add hidden manifest to .gitignore

check in point release change
Re-enable closure compiler
2021-08-30 22:35:51 -04:00 · 2021-08-30 22:35:13 -04:00 · 2021-08-08 11:36:35 -04:00 · 2021-07-24 20:43:55 -04:00 · 2021-07-24 19:11:35 -04:00 · 2021-07-08 22:19:22 -04:00
65 changed files with 2646 additions and 1792 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ README.md.asc
 node_modules/
 web-ext-artifacts
 releases.diff
-.releases.atom
+.releases.atom
+.manifest.json
--- a/52
+++ b/52
@@ -37,11 +37,11 @@ clean: rc clean-artifacts
 ## EVEN RELEASES are AMO RELEASES
 ## ODD RELEASES are SELFHOSTED RELEASES

-MOZ_VERSION=0.86
-VERSION=0.85
+MOZ_VERSION=0.112.1
+VERSION=0.111.1

 ## INCREMENT THIS EVERY TIME YOU DO A RELEASE
-LAST_VERSION=0.83
+LAST_VERSION=0.112

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

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

 index:
 	@echo "<!DOCTYPE html>" > index.html
@@ -98,15 +98,15 @@ version:
 	sed -i 's|7647|7657|g' *.js* torrent/*.js*
 	sed -i 's|$(shell grep "\"version\": " manifest.json)|  \"version\": \"$(VERSION)\",|g' manifest.json
 #	sed -i 's|$(shell grep "\"version_name\": " manifest.json)|  \"version_name\": \"$(VERSION)\",|g' manifest.json
-	sed -si 's|$(shell grep $(LAST_VERSION) _locales/en/messages.json)|    "message": "$(VERSION)",|g' _locales/en/messages.json; true
-	sed -si 's|$(shell grep $(MOZ_VERSION) _locales/en/messages.json)|    "message": "$(VERSION)",|g' _locales/en/messages.json; true
+	find . -name 'messages.json' -exec sed -i 's|$(LAST_VERSION)|$(VERSION)|g' {} \;
+	find . -name 'messages.json' -exec sed -i 's|$(MOZ_VERSION)|$(VERSION)|g' {} \;

 moz-version:
 	sed -i 's|7647|7657|g' *.js* torrent/*.js*
 	sed -i 's|$(shell grep "\"version\": " manifest.json)|  \"version\": \"$(MOZ_VERSION)\",|g' manifest.json
 #	sed -i 's|$(shell grep "\"version_name\": " manifest.json)|  \"version_name\": \"$(MOZ_VERSION)\",|g' manifest.json
-	sed -si 's|$(shell grep $(LAST_VERSION) _locales/en/messages.json)|    "message": "$(MOZ_VERSION)",|g' _locales/en/messages.json; true
-	sed -si 's|$(shell grep $(VERSION) _locales/en/messages.json)|    "message": "$(MOZ_VERSION)",|g' _locales/en/messages.json; true
+	find . -name 'messages.json' -exec sed -i 's|$(LAST_VERSION)|$(MOZ_VERSION)|g' {} \;
+	find . -name 'messages.json' -exec sed -i 's|$(VERSION)|$(MOZ_VERSION)|g' {} \;

 rhz-version:
 	sed -i 's|$(shell grep "\"version\": " manifest.json)|  \"version\": \"$(VERSION)1\",|g' manifest.json
@@ -168,7 +168,7 @@ moz-sign: version clean-artifacts
 	@echo "Using the 'sign' target to instantly sign an extension for self-distribution"
 	@echo "requires a JWT API Key and Secret from addons.mozilla.org to be made available"
 	@echo "to the Makefile under the variables WEB_EXT_API_KEY and WEB_EXT_API_SECRET."
-	$(HOME)/node_modules/web-ext-submit/extender.sh --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET)
+	$(HOME)/web-ext/bin/web-ext sign --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET) --timeout 900000 #--api-url-prefix http://localhost:3000/api/v4
 	make copyss
 	sleep 5

@@ -182,7 +182,7 @@ moz-submit: moz-version
 	@echo "to the Makefile under the variables WEB_EXT_API_KEY and WEB_EXT_API_SECRET."
 	mv manifest.json .manifest.json
 	grep -v update_url .manifest.json > manifest.json
-	web-ext sign --channel listed --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET); true
+	$(HOME)/web-ext/bin/web-ext sign --channel listed --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET) --timeout 900000 --verbose #--api-url-prefix http://localhost:3000/api/v4
 	sleep 5
 	mv .manifest.json manifest.json

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

 webext:
-	web-ext run -u "about:devtools-toolbox?type=extension&id=i2ppb%40eyedeekay.github.io"
+	$(HOME)/web-ext/bin/web-ext run --firefox /usr/bin/firefox -u "about:devtools-toolbox?type=extension&id=i2ppb%40eyedeekay.github.io"

 snark-mirror:
 	http_proxy=http://127.0.0.1:4444 wget -c -O ../i2psnark-rpc.su3 http://stats.i2p/i2p/plugins/i2psnark-rpc.su3
@@ -339,7 +339,35 @@ snark-mirror:
 seed:
 	cp -v "./i2ppb-$(VERSION)@eyedeekay.github.io.xpi.torrent" "$(HOME)/.i2p/i2psnark"
 	cp -v "../i2ppb-$(VERSION)@eyedeekay.github.io.xpi" "$(HOME)/.i2p/i2psnark"
-	
+
 wire:
 	cp -v "./i2ppb-$(VERSION)@eyedeekay.github.io.xpi.torrent" "$(HOME)/i2p/MuWireDownloads/"
 	cp -v "../i2ppb-$(VERSION)@eyedeekay.github.io.xpi" "$(HOME)/i2p/MuWireDownloads/"
+
+ndtest:
+	$(HOME)/web-ext/bin/web-ext run --firefox /usr/bin/firefox -u about:debugging \
+		-u http://127.0.0.1:7657/home \
+		-u http://127.0.0.1:7657/i2ptunnel \
+		-u http://127.0.0.1:7657/i2psnark \
+		-u http://127.0.0.1:7657/webmail \
+		-u http://127.0.0.1:7657/MuWire \
+		-u http://idk.i2p/video.html \
+		-u http://idk.i2p \
+		-u http://stats.i2p \
+		-u http://tvndxxkxcstbtqfxg7iigco6bj22ff2y6jxikmk7wqkyadkhrd4a.b32.i2p \
+		-u https://ramble.pw \
+		-u https://ramble.pw/f/i2p \
+
+lht-test:
+	$(HOME)/web-ext/bin/web-ext run --firefox /usr/bin/firefox -u about:debugging \
+		-u http://localhost:7657/home \
+		-u http://localhost:7657/i2ptunnel \
+		-u http://localhost:7657/i2psnark \
+		-u http://localhost:7657/webmail \
+		-u http://localhost:7657/MuWire/ \
+		-u http://idk.i2p
+
+compile:
+	closure-compiler --js background.js --js cert.js --js content.js --js handler.js --js host.js --js location.js --js privacy.js --js script.js \
+		--js  torrent.js --js bookmarks.js --js  config.js --js  context.js --js  home.js --js info.js --js platform.js --js proxy.js --js  scrub.js \
+		--js_output_file compile.js
--- a/README.md
+++ b/README.md
@@ -115,15 +115,16 @@ Usage:
   the use of I2PSnark as a peer-to-peer delivery mechanism for media files.
  * ![Visiting i2psnark](i2psnark.png)
  * ![Monitoring torrents](transmissionrpc.png)
-  * ![Distribute your site as a torrent.](x-i2p-torrentlocation.png)
-  * [Started] **Indicate** the level of authenticity provided by TLS. TLS is
-   optional on I2P for now, but some sites offer it anyway. TLS support is
-   experimental and in the works.
-  * [Started] **Provide** alternate, in-I2P destinations for web sites that want to
-   mirror their content within I2P.
-  * [Started] **Enhance** the I2P browsing experience by allowing site developers
+  * [Done] **Enhance** the I2P browsing experience by allowing site developers
   distribute some or all of their resources as torrents, allowing the torrents to
   be treated effectively as a CDN.
+  * ![Distribute your site as a torrent.](x-i2p-torrentlocation.png)
+  * [Done] **Indicate** the level of authenticity provided by TLS. TLS is
+   optional on I2P for now, but some sites offer it anyway. TLS support is
+   experimental and in the works.
+  * ![Use HTTPS with your I2P Site.](i2p-https.png)
+  * [Done] **Provide** alternate, in-I2P destinations for web sites that want to
+   mirror their content within I2P.
  * [barely started] **Isolate** traffic by contextual identity to it's own HTTP
   Proxy tunnel, each reflecting it's own pseudonymous identity within I2P. The
   contextual identities. For now, the contextual identities used to manage
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -3,6 +3,10 @@
    "message": "I2P In Private Browsing",
    "description": "Name of the extension."
  },
+  "extensionNameVariant": {
+    "message": "I2P In Private Browsing - Rhizome Variant",
+    "description": "Name of the extension."
+  },
  "toopieName": {
    "message": "toopie.html",
    "description": "Name of the sidebar."
@@ -16,7 +20,7 @@
    "description": "Description of the extension."
  },
  "extensionVersion": {
-    "message": "0.77",
+    "message": "0.108",
    "description": "Version of the extension."
  },
  "proxyFailedStatus": {
@@ -167,6 +171,22 @@
    "message": "Dispatch IRC (Private)",
    "description": "Preface for the browser titlebar"
  },
+  "blogPreface": {
+    "message": "Blog",
+    "description": "Preface for the browser titlebar"
+  },
+  "blogPrefacePrivate": {
+    "message": "Blog (Private)",
+    "description": "Preface for the browser titlebar"
+  },
+  "botePreface": {
+    "message": "I2P-Bote Mail",
+    "description": "Preface for the browser titlebar"
+  },
+  "botePrefacePrivate": {
+    "message": "I2P-Bote Mail (Private)",
+    "description": "Preface for the browser titlebar"
+  },
  "routerPreface": {
    "message": "Router Console",
    "description": "Preface for the browser titlebar"
--- a/_locales/es/messages.json
+++ b/_locales/es/messages.json
@@ -0,0 +1,314 @@
+{
+  "extensionName": {
+    "message": "I2P en navegación privada",
+    "description": "Nombre de la extensión."
+  },
+  "extensionNameVariant": {
+    "message": "I2P en navegación privada - Rhizome",
+    "description": "Nombre de la extensión."
+  },
+  "toopieName": {
+    "message": "toopie.html",
+    "description": "Nombre de la barra lateral."
+  },
+  "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.108",
+    "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"
+  },
+  "blogPreface": {
+    "message": "Blog",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "blogPrefacePrivate": {
+    "message": "Blog (Private)",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "botePreface": {
+    "message": "I2P-Bote Mail",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "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/alternate-address.png
+++ b/alternate-address.png
--- a/background.js
+++ b/background.js
@@ -1,19 +1,33 @@
-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 titlepref = browser.i18n.getMessage('titlePreface');
+var titleprefpriv = browser.i18n.getMessage('titlePrefacePrivate');
+var webpref = browser.i18n.getMessage('webPreface');
+var webprefpriv = browser.i18n.getMessage('webPrefacePrivate');
+var routerpref = browser.i18n.getMessage('routerPreface');
+var routerprefpriv = browser.i18n.getMessage('routerPrefacePrivate');
+var mailpref = browser.i18n.getMessage('mailPreface');
+var mailprefpriv = browser.i18n.getMessage('mailPrefacePrivate');
+var torrentpref = browser.i18n.getMessage('torrentPreface');
+var torrentprefpriv = browser.i18n.getMessage('torrentPrefacePrivate');
+var tunnelpref = browser.i18n.getMessage('i2ptunnelPreface');
+var tunnelprefpriv = browser.i18n.getMessage('i2ptunnelPrefacePrivate');
+var ircpref = browser.i18n.getMessage('ircPreface');
+var ircprefpriv = browser.i18n.getMessage('ircPrefacePrivate');
+var extensionpref = browser.i18n.getMessage('extensionPreface');
+var muwirepref = browser.i18n.getMessage('muwirePreface');
+var muwireprefpriv = browser.i18n.getMessage('muwirePrefacePrivate');
+var botepref = browser.i18n.getMessage('botePreface');
+var blogpref = browser.i18n.getMessage('blogPreface');
+var blogprefpriv = browser.i18n.getMessage('blogPrefacePrivate');
+
+function onError(err) {
+  console.log('(background)', err);
+}
+
+function onContextGotLog(contexts) {
+  if (contexts != null) {
+    console.log(contexts);
+  }
+}

 function onContextsGot(contexts) {
  var ids = [];
@@ -31,6 +45,15 @@ function onContextsGot(contexts) {
      })
      .then(onCreated, onNotCreated);
  }
+  if (ids.indexOf(blogpref) == -1) {
+    browser.contextualIdentities
+      .create({
+        name: blogpref,
+        color: 'pink',
+        icon: 'pet',
+      })
+      .then(onCreated, onNotCreated);
+  }
  if (ids.indexOf(webpref) == -1) {
    browser.contextualIdentities
      .create({
@@ -94,6 +117,15 @@ function onContextsGot(contexts) {
      })
      .then(onCreated, onNotCreated);
  }
+  if (ids.indexOf(botepref) == -1) {
+    browser.contextualIdentities
+      .create({
+        name: botepref,
+        color: 'blue',
+        icon: 'fence',
+      })
+      .then(onCreated, onNotCreated);
+  }
 }

 function onContextsError() {
@@ -154,108 +186,79 @@ 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');
+    browser.theme.reset();
+  }
+
+  function dynamicTheme() {
+    if (window.incognito) {
+      browser.theme.update(window.id, dtheme);
+    } else {
+      browser.theme.update(window.id, dtheme);
+    }
+  }
+
+  function browserTheme() {
+    console.log('(theme)Active in I2P window');
+    if (window.incognito) {
+      browser.theme.update(window.id, btheme);
+    } else {
+      browser.theme.update(window.id, btheme);
+    }
+  }
+
+  function unsetTheme() {
+    browser.theme.reset();
  }
  function logTabs(tabInfo) {
    function onContextGotTheme(context) {
      if (context.name == titlepref) {
-        console.log('Active in I2P window');
-        if (window.incognito) {
-          browser.theme.update(window.id, {
-            colors: {
-              frame: '#363A68',
-              toolbar: '#363A68',
-            },
-          });
-        } else {
-          browser.theme.update(window.id, {
-            colors: {
-              frame: '#363A68',
-              toolbar: '#363A68',
-            },
-          });
-        }
-        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);
-        }
+        browserTheme();
+        browser.pageAction.show(tabInfo[0].id);
      } else if (context.name == routerpref) {
-        console.log('Active in Router Console window');
-        if (window.incognito) {
-          browser.theme.update(window.id, {
-            colors: {
-              frame: '#4456B7',
-              toolbar: '#4456B7',
-            },
-          });
-        } else {
-          browser.theme.update(window.id, {
-            colors: {
-              frame: '#4456B7',
-              toolbar: '#4456B7',
-            },
-          });
-        }
+        console.log('(theme) Active in Router Console window');
+        dynamicTheme();
      } else if (context.name == tunnelpref) {
-        console.log('Active in Hidden Services Manager window');
-        if (window.incognito) {
-          browser.theme.update(window.id, {
-            colors: {
-              frame: '#4456B7',
-              toolbar: '#4456B7',
-            },
-          });
-        } else {
-          browser.theme.update(window.id, {
-            colors: {
-              frame: '#4456B7',
-              toolbar: '#4456B7',
-            },
-          });
-        }
+        console.log('(theme) Active in Hidden Services Manager window');
+        dynamicTheme();
      } else if (context.name == mailpref) {
-        console.log('Active in Web Mail window');
-        if (window.incognito) {
-          browser.theme.update(window.id, {
-            colors: {
-              frame: '#4456B7',
-              toolbar: '#4456B7',
-            },
-          });
-        } else {
-          browser.theme.update(window.id, {
-            colors: {
-              frame: '#4456B7',
-              toolbar: '#4456B7',
-            },
-          });
-        }
+        console.log('(theme) Active in Web Mail window');
+        dynamicTheme();
      } else if (context.name == torrentpref) {
-        console.log('Active in Bittorrent window');
-        if (window.incognito) {
-          browser.theme.update(window.id, {
-            colors: {
-              frame: '#4456B7',
-              toolbar: '#4456B7',
-            },
-          });
-        } else {
-          browser.theme.update(window.id, {
-            colors: {
-              frame: '#4456B7',
-              toolbar: '#4456B7',
-            },
-          });
-        }
+        console.log('(theme) Active in Bittorrent window');
+        dynamicTheme();
+      } else if (context.name == botepref) {
+        console.log('(theme) Active in Bote window');
+        dynamicTheme();
+      } else if (context.name == ircpref) {
+        console.log('(theme) Active in IRC window');
+        dynamicTheme();
+      } else if (context.name == blogpref) {
+        console.log('(theme) (theme) Active in Blog window');
+        dynamicTheme();
+      } else if (context.name == muwirepref) {
+        console.log('(theme) Active in MuWire window');
+        dynamicTheme();
+      } else {
+        console.log('(theme) Not active in MuWire window');
+        browser.theme.reset();
      }
    }
    if (
@@ -266,16 +269,8 @@ function themeWindow(window) {
        .get(tabInfo[0].cookieStoreId)
        .then(onContextGotTheme, onThemeError);
    } else {
-      console.log('Not active in I2P window');
-      function unSetTheme(them) {
-        console.log('unsetting theme', them);
-        if (Object.keys(them).length > 0) {
-          browser.theme.update(window.id, them.originalTheme);
-        } else {
-          browser.theme.update(window.id, { colors: null });
-        }
-      }
-      browser.storage.local.get('originalTheme').then(unSetTheme, onError);
+      console.log('(theme) Not active in I2P window');
+      browser.theme.reset();
    }
  }

@@ -291,90 +286,46 @@ function setTitle(window) {
  function onContextError() {
    console.log('Context Error');
  }
+  function setTitle(title, privtitle) {
+    if (window.incognito) {
+      browser.windows.update(window.id, {
+        titlePreface: privtitle + ': ',
+      });
+    } else {
+      browser.windows.update(window.id, {
+        titlePreface: title + ': ',
+      });
+    }
+  }
  function logTabs(tabInfo) {
    function onContextGotTitle(context) {
      if (context.name == titlepref) {
        console.log('Active in I2P window');
-
-        if (window.incognito) {
-          browser.windows.update(window.id, {
-            titlePreface: titleprefpriv + ': ',
-          });
-        } else {
-          browser.windows.update(window.id, {
-            titlePreface: titlepref + ': ',
-          });
-        }
-      } else if (context.name == webpref) {
-        console.log('Active in Web window');
-        if (window.incognito) {
-          browser.windows.update(window.id, {
-            titlePreface: webprefpriv + ' - ',
-          });
-        } else {
-          browser.windows.update(window.id, {
-            titlePreface: webpref + ' - ',
-          });
-        }
+        setTitle(titlepref, titleprefpriv);
+      } else if (context.name == muwirepref) {
+        console.log('Active in MuWire window');
+        setTitle(muwirepref, muwireprefpriv);
      } else if (context.name == routerpref) {
        console.log('Active in Router Console window');
-        if (window.incognito) {
-          browser.windows.update(window.id, {
-            titlePreface: titleprefpriv + ' - ' + routerprefpriv + ': ',
-          });
-        } else {
-          browser.windows.update(window.id, {
-            titlePreface: titlepref + ' - ' + routerpref + ': ',
-          });
-        }
+        setTitle(routerpref, routerprefpriv);
+      } else if (context.name == botepref) {
+        console.log('Active in Bote window');
+        setTitle(botepref, boteprefpriv);
      } else if (context.name == tunnelpref) {
        console.log('Active in Hidden Services Manager window');
-
-        if (window.incognito) {
-          browser.windows.update(window.id, {
-            titlePreface: titleprefpriv + ' - ' + tunnelprefpriv + ': ',
-          });
-        } else {
-          browser.windows.update(window.id, {
-            titlePreface: titlepref + ' - ' + tunnelpref + ': ',
-          });
-        }
+        setTitle(tunnelpref, tunnelprefpriv);
      } else if (context.name == mailpref) {
        console.log('Active in I2P Web Mail window');
-
-        if (window.incognito) {
-          browser.windows.update(window.id, {
-            titlePreface: titleprefpriv + ' - ' + mailprefpriv + ': ',
-          });
-        } else {
-          browser.windows.update(window.id, {
-            titlePreface: titlepref + ' - ' + mailpref + ': ',
-          });
-        }
+        setTitle(mailpref, mailprefpriv);
+      } else if (context.name == blogpref) {
+        console.log('Active in I2P Blog window');
+        setTitle(blogpref, blogprefpriv);
      } else if (context.name == torrentpref) {
        console.log('Active in I2P Torrent window');
-
-        if (window.incognito) {
-          browser.windows.update(window.id, {
-            titlePreface: titleprefpriv + ' - ' + torrentprefpriv + ': ',
-          });
-        } else {
-          browser.windows.update(window.id, {
-            titlePreface: titlepref + ' - ' + torrentpref + ': ',
-          });
-        }
+        setTitle(torrentpref, torrentprefpriv);
      } else if (context.name == ircpref) {
        console.log('Active in IRC window');
-
-        if (window.incognito) {
-          browser.windows.update(window.id, {
-            titlePreface: ircprefpriv + ' - ' + ircprefpriv + ': ',
-          });
-        } else {
-          browser.windows.update(window.id, {
-            titlePreface: ircpref + ' - ' + ircpref + ': ',
-          });
-        }
+        setTitle(ircpref, ircprefpriv);
      }
    }

@@ -424,46 +375,6 @@ gettingListenerInfo.then((got) => {
  }
 });

-function handleUpdated(updateInfo) {
-  function maybeSet(them) {
-    console.log("original theme found:", them, Object.keys(them).length);
-    try {
-      if (
-        Object.keys(them).length == 0 ||
-        (them.originalTheme.colors == null &&
-          them.originalTheme.images == null &&
-          them.originalTheme.properties == null)
-      ) {
-        if (
-          updateInfo.theme.colors.frame != "#4456B7" &&
-          updateInfo.theme.colors.frame != "#363A68"
-        ) {
-          function onSet() {
-            console.log("stored theme:", updateInfo.theme);
-          }
-          if (
-            updateInfo.theme.colors != null ||
-            updateInfo.theme.images != null ||
-            updateInfo.theme.properties != null
-          ) {
-            console.log("storing theme:", updateInfo.theme);
-            browser.storage.local
-              .set({ originalTheme: updateInfo.theme })
-              .then(onSet, onError);
-          }
-        }
-      } else {
-        console.log("keeping stored theme:", them);
-      }
-    } catch {
-      console.log("theme storage error");
-    }
-  }
-  browser.storage.local.get("originalTheme").then(maybeSet, onError);
-}
-
-browser.theme.onUpdated.addListener(handleUpdated);
-
 function handleClick() {
  console.log("Opening page action");
  browser.pageAction.openPopup();
@@ -513,3 +424,41 @@ browser.webRequest.onHeadersReceived.addListener(
  { urls: ["<all_urls>"] },
  ["blocking", "responseHeaders"]
 );
+
+function onClosedWindowCheck() {
+  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);
+}
+
+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(onOpenedWindowCheck);
--- a/bookmarks.js
+++ b/bookmarks.js
@@ -1,214 +1,245 @@
-var gettingInfo = browser.runtime.getPlatformInfo();
-gettingInfo.then((got) => {
-  if (got.os != 'android') {
-    function bookmarks(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 createRhizomeBookmark = browser.bookmarks.create({
-                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',
-                parentId: bookmarkToolbar[0].id,
-              });
-              createBookmark.then(onCreated);
+function bookmarksSetup() {
+  var gettingInfo = browser.runtime.getPlatformInfo();
+  gettingInfo.then((got) => {
+    if (got.os != 'android') {
+      function bookmarks(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 createRhizomeBookmark = browser.bookmarks.create({
+                  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',
+                  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"
+            );
+            let gettingProxyInfo = browser.proxy.settings.get({});
+            gettingProxyInfo.then(gotProxyInfo);
          }
-          console.log(
-            "(bookmarks) checking if we're running in an I2P Browser"
-          );
-          let gettingProxyInfo = browser.proxy.settings.get({});
-          gettingProxyInfo.then(gotProxyInfo);
        }
-      }
-      function bookTorrent(bookmarkItems) {
-        if (!bookmarkItems.length) {
-          function gotProxyInfo(info) {
-            let port = info.value.http.split(':')[1];
-            if (port == '7644') {
-              let createBookmark = browser.bookmarks.create({
-                url: 'http://localhost:7657/i2psnark',
-                title: 'Bittorrent',
-                parentId: bookmarkToolbar[0].id,
-              });
-              createBookmark.then(onCreated);
-            } else {
-              let createRhizomeBookmark = browser.bookmarks.create({
-                url:
-                  'http://' + control_host + ':' + control_port + '/i2psnark',
-                title: 'Bittorrent',
-                parentId: bookmarkToolbar[0].id,
-              });
-              createRhizomeBookmark.then(onCreated);
+        function bookTorrent(bookmarkItems) {
+          if (!bookmarkItems.length) {
+            function gotProxyInfo(info) {
+              let port = info.value.http.split(':')[1];
+              if (port == '7644') {
+                let createBookmark = browser.bookmarks.create({
+                  url: 'http://localhost:7657/i2psnark',
+                  title: 'Bittorrent',
+                  parentId: bookmarkToolbar[0].id,
+                });
+                createBookmark.then(onCreated);
+              } else {
+                let createRhizomeBookmark = browser.bookmarks.create({
+                  url:
+                    'http://' + control_host + ':' + control_port + '/i2psnark',
+                  title: 'Bittorrent',
+                  parentId: bookmarkToolbar[0].id,
+                });
+                createRhizomeBookmark.then(onCreated);
+              }
            }
+            console.log(
+              "(bookmarks) checking if we're running in an I2P Browser"
+            );
+            let gettingProxyInfo = browser.proxy.settings.get({});
+            gettingProxyInfo.then(gotProxyInfo);
          }
-          console.log(
-            "(bookmarks) checking if we're running in an I2P Browser"
-          );
-          let gettingProxyInfo = browser.proxy.settings.get({});
-          gettingProxyInfo.then(gotProxyInfo);
        }
-      }
-      function bookConsole(bookmarkItems) {
-        if (!bookmarkItems.length) {
-          function gotProxyInfo(info) {
-            let port = info.value.http.split(':')[1];
-            if (port == '7644') {
-              let createBookmark = browser.bookmarks.create({
-                url: 'http://localhost:7657/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',
-                parentId: bookmarkToolbar[0].id,
-              });
-              createRhizomeBookmark.then(onCreated);
+        function bookConsole(bookmarkItems) {
+          if (!bookmarkItems.length) {
+            function gotProxyInfo(info) {
+              let port = info.value.http.split(':')[1];
+              if (port == '7644') {
+                let createBookmark = browser.bookmarks.create({
+                  url: 'http://localhost:7657/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',
+                  parentId: bookmarkToolbar[0].id,
+                });
+                createRhizomeBookmark.then(onCreated);
+              }
            }
+            console.log(
+              "(bookmarks) checking if we're running in an I2P Browser"
+            );
+            let gettingProxyInfo = browser.proxy.settings.get({});
+            gettingProxyInfo.then(gotProxyInfo);
          }
-          console.log(
-            "(bookmarks) checking if we're running in an I2P Browser"
-          );
-          let gettingProxyInfo = browser.proxy.settings.get({});
-          gettingProxyInfo.then(gotProxyInfo);
        }
-      }
-      function bookMail(bookmarkItems) {
-        if (!bookmarkItems.length) {
-          function gotProxyInfo(info) {
-            let port = info.value.http.split(':')[1];
-            if (port == '7644') {
-              let createBookmark = browser.bookmarks.create({
-                url: 'http://localhost:7657/webmail',
-                title: 'Web Mail',
-                parentId: bookmarkToolbar[0].id,
-              });
-              createBookmark.then(onCreated);
-            } else {
-              let createRhizomeBookmark = browser.bookmarks.create({
-                url: 'http://' + control_host + ':' + control_port + '/webmail',
-                title: 'Web Mail',
-                parentId: bookmarkToolbar[0].id,
-              });
-              createRhizomeBookmark.then(onCreated);
+        function bookMail(bookmarkItems) {
+          if (!bookmarkItems.length) {
+            function gotProxyInfo(info) {
+              let port = info.value.http.split(':')[1];
+              if (port == '7644') {
+                let createBookmark = browser.bookmarks.create({
+                  url: 'http://localhost:7657/webmail',
+                  title: 'Web Mail',
+                  parentId: bookmarkToolbar[0].id,
+                });
+                createBookmark.then(onCreated);
+              } else {
+                let createRhizomeBookmark = browser.bookmarks.create({
+                  url:
+                    'http://' + control_host + ':' + control_port + '/webmail',
+                  title: 'Web Mail',
+                  parentId: bookmarkToolbar[0].id,
+                });
+                createRhizomeBookmark.then(onCreated);
+              }
+              console.log('(bookmarks) adding webmail bookmark');
            }
-            console.log('(bookmarks) adding webmail bookmark');
+            console.log(
+              "(bookmarks) checking if we're running in an I2P Browser"
+            );
+            let gettingProxyInfo = browser.proxy.settings.get({});
+            gettingProxyInfo.then(gotProxyInfo);
          }
-          console.log(
-            "(bookmarks) checking if we're running in an I2P Browser"
-          );
-          let gettingProxyInfo = browser.proxy.settings.get({});
-          gettingProxyInfo.then(gotProxyInfo);
        }
-      }
-      function bookI2PTunnel(bookmarkItems) {
-        if (!bookmarkItems.length) {
-          function gotProxyInfo(info) {
-            let port = info.value.http.split(':')[1];
-            if (port == '7644') {
-              var createBookmark = browser.bookmarks.create({
-                url: 'http://localhost:7657/i2ptunnel',
-                title: 'Hidden Services Manager',
-                parentId: bookmarkToolbar[0].id,
-              });
-              createBookmark.then(onCreated);
-            } else {
-              var createRhizomeBookmark = browser.bookmarks.create({
-                url:
-                  'http://' + control_host + ':' + control_port + '/i2ptunnel',
-                title: 'Hidden Services Manager',
-                parentId: bookmarkToolbar[0].id,
-              });
-              createRhizomeBookmark.then(onCreated);
+        function bookI2PTunnel(bookmarkItems) {
+          if (!bookmarkItems.length) {
+            function gotProxyInfo(info) {
+              let port = info.value.http.split(':')[1];
+              if (port == '7644') {
+                var createBookmark = browser.bookmarks.create({
+                  url: 'http://localhost:7657/i2ptunnel',
+                  title: 'Hidden Services Manager',
+                  parentId: bookmarkToolbar[0].id,
+                });
+                createBookmark.then(onCreated);
+              } else {
+                var createRhizomeBookmark = browser.bookmarks.create({
+                  url:
+                    'http://' +
+                    control_host +
+                    ':' +
+                    control_port +
+                    '/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"
+            );
+            var gettingProxyInfo = browser.proxy.settings.get({});
+            gettingProxyInfo.then(gotProxyInfo);
          }
-          console.log(
-            "(bookmarks) checking if we're running in an I2P Browser"
-          );
-          var gettingProxyInfo = browser.proxy.settings.get({});
-          gettingProxyInfo.then(gotProxyInfo);
+        }
+
+        function onRejected(error) {
+          console.log(`An error : ${error}`);
+        }
+        function onCreated(node) {
+          console.log('Bookmarked', node);
+        }
+
+        var b0 = browser.bookmarks.search({
+          title: 'I2P Extension Home Page',
+        });
+        b0.then(bookHome, onRejected);
+
+        var b1 = browser.bookmarks.search({
+          title: 'Bittorrent',
+        });
+        b1.then(bookTorrent, onRejected);
+
+        var b2 = browser.bookmarks.search({
+          title: 'Hidden Services Manager',
+        });
+        b2.then(bookI2PTunnel, onRejected);
+
+        var b3 = browser.bookmarks.search({
+          title: 'Web Mail',
+        });
+        b3.then(bookMail, onRejected);
+
+        var b4 = browser.bookmarks.search({
+          title: 'I2P Console',
+        });
+        b4.then(bookConsole, onRejected);
+        defaultSettings['bookmarks_state'] = true;
+      }
+
+      var bt = browser.bookmarks.search({
+        query: 'Toolbar',
+      });
+
+      function toolDir(bookmarkToolbar) {
+        let defaultSettings = {};
+        browser.storage.local.set(defaultSettings);
+        console.log('(bookmarks) created');
+        var ibbt = browser.bookmarks.search('I2P Toolbar');
+        function setupDir(ibbt) {
+          function onToolbarCreated(node) {
+            var ibt = browser.bookmarks.search('I2P Toolbar');
+            ibt.then(bookmarks);
+          }
+          if (ibbt[0] == null) {
+            let createBookmark = browser.bookmarks.create({
+              title: 'I2P Toolbar',
+              parentId: bookmarkToolbar[0].id,
+            });
+            createBookmark.then(onToolbarCreated);
+          }
+        }
+        ibbt.then(setupDir);
+      }
+      bt.then(toolDir);
+
+      function handleCreated(id, bookmarkInfo) {
+        //var propValue;
+        for (var propName in bookmarkInfo) {
+          let propValue = bookmarkInfo[propName];
+          console.log(propName, propValue);
        }
      }

-      function onRejected(error) {
-        console.log(`An error : ${error}`);
-      }
-      function onCreated(node) {
-        console.log('Bookmarked', node);
-      }
-
-      var b0 = browser.bookmarks.search({
-        title: 'I2P Extension Home Page',
-      });
-      b0.then(bookHome, onRejected);
-
-      var b1 = browser.bookmarks.search({
-        title: 'Bittorrent',
-      });
-      b1.then(bookTorrent, onRejected);
-
-      var b2 = browser.bookmarks.search({
-        title: 'Hidden Services Manager',
-      });
-      b2.then(bookI2PTunnel, onRejected);
-
-      var b3 = browser.bookmarks.search({
-        title: 'Web Mail',
-      });
-      b3.then(bookMail, onRejected);
-
-      var b4 = browser.bookmarks.search({
-        title: 'I2P Console',
-      });
-      b4.then(bookConsole, onRejected);
+      browser.bookmarks.onCreated.addListener(handleCreated);
    }
+  });
+}

-    var bt = browser.bookmarks.search({
-      query: 'Toolbar',
-    });
-
-    function toolDir(bookmarkToolbar) {
-      var ibbt = browser.bookmarks.search('I2P Toolbar');
-      function setupDir(ibbt) {
-        function onToolbarCreated(node) {
-          var ibt = browser.bookmarks.search('I2P Toolbar');
-          ibt.then(bookmarks);
-        }
-        if (ibbt[0] == null) {
-          let createBookmark = browser.bookmarks.create({
-            title: 'I2P Toolbar',
-            parentId: bookmarkToolbar[0].id,
-          });
-          createBookmark.then(onToolbarCreated);
-        }
-      }
-      ibbt.then(setupDir);
-    }
-    bt.then(toolDir);
-
-    function handleCreated(id, bookmarkInfo) {
-      //var propValue;
-      for (var propName in bookmarkInfo) {
-        let propValue = bookmarkInfo[propName];
-        console.log(propName, propValue);
-      }
-    }
-
-    browser.bookmarks.onCreated.addListener(handleCreated);
+function conditionalBookmarksSetup(obj) {
+  console.log('(bookmarks) state', obj.bookmarks_state);
+  if (obj.bookmarks_state == false) {
+    bookmarksSetup();
  }
-});
+  if (obj.bookmarks_state == undefined) {
+    bookmarksSetup();
+  }
+}
+
+if (browser != null) {
+  let gettingStorage = browser.storage.local.get('bookmarks_state');
+  gettingStorage.then(conditionalBookmarksSetup, bookmarksSetup);
+}
+
+const bookmarksButton = document.getElementById('bookmarksButton');
+if (bookmarksButton != null) {
+  bookmarksButton.addEventListener('click', bookmarksSetup);
+}
--- a/cert.js
+++ b/cert.js
@@ -9,7 +9,7 @@ function blankContent(id) {

 function contentUpdateById(id, message) {
  let infoTitle = document.getElementById(id);
-  let messageContent = chrome.i18n.getMessage(message);
+  let messageContent = browser.i18n.getMessage(message);
  if (infoTitle === null) {
    console.log('content error', id, messageContent);
    return;
--- a/clearweb.png
+++ b/clearweb.png
--- a/content.js
+++ b/content.js
@@ -1,6 +1,6 @@
 function contentUpdateById(id, message) {
  let infoTitle = document.getElementById(id);
-  let messageContent = chrome.i18n.getMessage(message);
+  let messageContent = browser.i18n.getMessage(message);
  if (infoTitle === null) {
    console.log('content error', id, messageContent);
    return;
@@ -49,6 +49,44 @@ contentUpdateById('window-visit-releases', 'windowVisitReleases');
 contentUpdateById('releases', 'releases');

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

 function onError(error) {
  console.log(`Error : ${error}`);
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,93 @@
-i2psetproxy.js (0.83-1) UNRELEASED; urgency=low
+i2psetproxy.js (0.111-1) UNRELEASED; urgency=low
+
+  * simplify background theme issue fix
+
+ -- idk <hankhill19580@gmail.com> Wed, 07 Jul 2021 23:27:27 -0400
+
+i2psetproxy.js (0.109-1) UNRELEASED; urgency=low
+
+  * connection interrupted mid release, retry failed validation. Bump and retry
+
+ -- idk <hankhill19580@gmail.com> Wed, 07 Jul 2021 22:00:25 -0400
+
+connection interrupted mid release, retry failed validation. Bump and retry
+
+i2psetproxy.js (0.107-1) UNRELEASED; urgency=low
+
+  * Small code fixes
+  * Fix for interference with non-I2P containers
+
+ -- idk <hankhill19580@gmail.com> Wed, 07 Jul 2021 22:00:25 -0400
+
+i2psetproxy.js (0.105-1) UNRELEASED; urgency=low
+
+  * Add help page for configuring i2pcontrol
+  * Add help page for configuring i2psnark-rpc
+  * Update the icons
+
+ -- idk <hankhill19580@gmail.com> Wed, 26 May 2021 12:56:56 -0400
+
+i2psetproxy.js (0.103-1) UNRELEASED; urgency=low
+
+  * Fix for double-test issue on /home.html page in the extension
+  * Fix for broken options menu
+
+ -- idk <hankhill19580@gmail.com> Wed, 26 May 2021 12:56:56 -0400
+
+i2psetproxy.js (0.101-1) UNRELEASED; urgency=low
+
+  * Sweeping changes to styles
+  * fix for issue when using noscript and visiting susimail
+
+ -- idk <hankhill19580@gmail.com>  Mon, 24 May 2021 3:41:35 -0400
+
+i2psetproxy.js (0.99-1) UNRELEASED; urgency=low
+
+  * Sweeping changes to styles
+  * fix for issue when using noscript and visiting susimail
+
+ -- idk <hankhill19580@gmail.com>  Mon, 24 May 2021 2:05:21 -0400
+
+i2psetproxy.js (0.97-1) UNRELEASED; urgency=low
+
+  * Fix theme issue, add x-i2p-torrentlocation HEADER support
+
+ -- idk <hankhill19580@gmail.com>  FRI, 5 FEB 2021 1:02:55 -0400
+
+i2psetproxy.js (0.95-1) UNRELEASED; urgency=low
+
+  * Fix github #102 and #103
+
+ -- 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
+  * Add contexts for i2pbote and Dispatch
+  * Remain in tighter control of x-i2p-torrentlocation priority
+
+ -- idk <hankhill19580@gmail.com>  Sat, 10 NOV 2020 1:33:50 -0400
+
+i2psetproxy.js (0.85-1) UNRELEASED; urgency=low

  * Fix a bug which was causing i2psnark to fail to isolate.

--- a/handler.js
+++ b/handler.js
@@ -1,9 +1,9 @@
 function routerHost(url) {
-  console.log('(urlcheck) HANDLER URL CHECK');
+  //  console.log("(urlcheck) HANDLER URL CHECK");
  let hostname = '';
  let path = '';
  function pathcheck(str) {
-    console.log('(urlcheck) HANDLER PATH CHECK', str);
+    //    console.log("(urlcheck) HANDLER PATH CHECK", str);
    if (str != undefined) {
      let final = str.split('/')[0];
      if (final === 'i2ptunnelmgr' || final === 'i2ptunnel') {
@@ -14,22 +14,31 @@ function routerHost(url) {
        final === 'torrents' ||
        final.startsWith('transmission') ||
        final.startsWith('tracker') ||
-        str.includes(':7662')
+        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';
+        if (!url.includes('.css')) {
+          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';
        }
+      } else if (final.startsWith('i2pbote')) {
+        if (!url.includes('.png')) {
+          console.log('(urlcheck) I2PBote application path', final);
+          return 'i2pbote';
+        }
      } else if (
        final === 'home' ||
        final === 'console' ||
        final === 'dns' ||
+        final === 'susidns' ||
+        final.startsWith('susidns') ||
        final === 'sitemap' ||
        final.startsWith('config')
      ) {
@@ -104,9 +113,8 @@ var handlerSetup = function(requestDetails) {
  }
  return requestDetails;
 };
-
-browser.webRequest.onBeforeRequest.addListener(
-  handlerSetup,
-  { urls: ['<all_urls>'] },
-  ['blocking']
-);
+/*
+browser.webRequest.onBeforeRequest.addListener(handlerSetup, {
+  urls: ['<all_urls>'],
+});
+*/
--- 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,101 +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;
+  }
+}
+
+@media screen and (max-width: 1200px) {
+  body {
+    font-size: 10.5pt;
+  }
+}
+
+video {
+  width: 100%
+}
+
+.hidden {
+  visibility: none;
+  display: none
 }
--- a/home.html
+++ b/home.html
@@ -86,8 +86,8 @@
                        </div>
                    </li>-->

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

                    <li class="application">
@@ -147,5 +147,6 @@
    </div>
    <script src="home.js" type="text/javascript"></script> 
    <script src="content.js" type="text/javascript"></script> <!--</div>-->
+    <script src="i2pcontrol/i2pcontrol.js" type="text/javascript"></script> <!--</div>-->
 </body>
 </html>
--- a/host.js
+++ b/host.js
@@ -24,33 +24,70 @@ function localHost(url) {
    hostname = url.split('/')[0];
  }
  hostname = hostname.split(':')[0];
+  console.log('(isolate) hostname localhost', hostname);
+  console.log('(isolate) url localhost', url);
  if (hostname === '127.0.0.1') {
-    return true;
+    if (url.indexOf('7669') != -1) return 'irc';
  } else if (hostname === 'localhost') {
-    return true;
+    if (url.indexOf('8084') != -1) return 'blog';
  }

  return false;
 }

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

 function i2pHostName(url) {
  let hostname = '';
-  if (url.indexOf('://') > -1) {
+  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);
+          }
+          break;
+        }
+        if (hostname != '') {
+          break;
+        }
+      }
+    }
+  } else if (url.indexOf('://') > -1) {
    hostname = url.split('/')[2];
  } else {
    hostname = url.split('/')[0];
  }
+  console.log('(hosts) scrub', hostname);
  return hostname;
 }

@@ -60,7 +97,7 @@ function i2pHost(url) {
 }

 function routerHost(url) {
-  console.log('(urlcheck) HOST URL CHECK');
+  //  console.log("(urlcheck) HOST URL CHECK");
  let hostname = '';
  let path = '';
  function pathcheck(str) {
@@ -74,22 +111,31 @@ function routerHost(url) {
        final === 'torrents' ||
        final.startsWith('transmission') ||
        final.startsWith('tracker') ||
-        str.includes(':7662')
+        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';
+        if (!url.includes('.css')) {
+          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';
        }
+      } else if (final.startsWith('i2pbote')) {
+        if (!url.includes('.png')) {
+          console.log('(urlcheck) I2PBote application path', final);
+          return 'i2pbote';
+        }
      } else if (
        final === 'home' ||
        final === 'console' ||
        final === 'dns' ||
+        final === 'susidns' ||
+        final.startsWith('susidns') ||
        final === 'sitemap' ||
        final.startsWith('config')
      ) {
--- a/i2p-https.png
+++ b/i2p-https.png
--- a/i2pcontrol/README.md
+++ b/i2pcontrol/README.md
@@ -1,5 +1,8 @@
-i2pcontrol.js
-=============
+toopie.html/i2pcontrol.js
+=========================

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

 var done = Echo(hello);
-done.then(Done);
+done.then(Done).catch(Done);

 function Done(output) {
+  function hide(elements) {
+    elements = elements.length ? elements : [elements];
+    for (var index = 0; index < elements.length; index++) {
+      elements[index].style.display = 'none';
+    }
+  }
+
+  function unhide(elements) {
+    elements = elements.length ? elements : [elements];
+    for (var index = 0; index < elements.length; index++) {
+      elements[index].style.display = 'inline-block';
+    }
+  }
+
  console.log('(i2pcontrol) I2PControl connection tested,', output);
+  if (output == hello) {
+    var toopieLinks = document.querySelectorAll('.window-visit-toopie');
+    unhide(toopieLinks);
+  } else {
+    var toopieLinks = document.querySelectorAll('.window-visit-toopie');
+    hide(toopieLinks);
+  }
  return output;
 }
--- a/i2pcontrol/i2pcontrol.png
+++ b/i2pcontrol/i2pcontrol.png
--- a/i2pcontrol/index.html
+++ b/i2pcontrol/index.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>I2P in Private Browsing Mode</title>
+  <link rel="stylesheet" type="text/css" href="../home.css" />
+  <link rel="stylesheet" type="text/css" href="../sidebar.css" />
+</head>
+<body>
+
+<h1 id="toopie.htmli2pcontrol.js">toopie.html/i2pcontrol.js</h1>
+<p>To enable toopie.html, the built in I2P monitoring system in this webextension, go to the <a href="http://127.0.0.1:7657/configwebapps">Web App Configuration page in the I2P Router and start I2PControl</a>. Click the &quot;Start&quot; button next to the menu item that says <code>jsonrpc</code>.</p>
+<ul>
+<li><img src="i2pcontrol.png" title="fig:" alt="i2pcontrol.png" /></li>
+</ul>
+
+</body>
+</html>
--- a/i2ppb@eyedeekay.github.io.xpi.torrent
+++ b/i2ppb@eyedeekay.github.io.xpi.torrent
--- a/i2psetproxy.js.png
+++ b/i2psetproxy.js.png
--- a/i2psnark-integrate.png
+++ b/i2psnark-integrate.png
--- a/i2psnark.png
+++ b/i2psnark.png
--- a/i2ptunnel.png
+++ b/i2ptunnel.png
--- a/icons/README.md
+++ b/icons/README.md
--- a/icons/browse.png
+++ b/icons/browse.png
--- a/icons/i2plogo.png
+++ b/icons/i2plogo.png
--- a/icons/infotoopie.png
+++ b/icons/infotoopie.png
--- a/icons/infotoopiebt.png
+++ b/icons/infotoopiebt.png
--- a/icons/infotoopies.png
+++ b/icons/infotoopies.png
--- a/icons/infotoopiesbt.png
+++ b/icons/infotoopiesbt.png
--- a/icons/local_up.png
+++ b/icons/local_up.png
--- a/icons/toopie.png
+++ b/icons/toopie.png
--- a/icons/torrents.png
+++ b/icons/torrents.png
--- a/images/gear.png
+++ b/images/gear.png
--- a/index.html
+++ b/index.html
@@ -1,222 +1,234 @@
 <!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>I2P in Private Browsing Mode</title>
+  <link rel="stylesheet" type="text/css" href="home.css" />
+  <link rel="stylesheet" type="text/css" href="sidebar.css" />
 </head>
 <body>
-    <h1>I2P in Private Browsing Mode(Firefox-Only)</h1>
+<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>
+<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>
+<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 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 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>
+<p>This browser extension is entirely Free, Open-Source software.</p>

-    <h2>Installation(Cross-Platform):</h2>
+<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>
+<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>
+<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>
+<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
+<pre><code>    make deb
 </code></pre>
-    <p>and then you can install it with:</p>

-    <pre><code>    sudo apt install ../i2psetproxy.js_*.deb
+<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>
+<h2>Bittorrent Download:</h2>

-    <ul>
-        <li>
-            <a href="magnet:?xt=urn:btih:09841bd5ca003fa37818754f4bee988698e3c0c8">Magnet Link</a>
-        </li>
+<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>

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

-    <h2>Usage:</h2>
+<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>
+<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 src="lander.png" alt="Landing page" title="" /></li>
+<li>Also, there's a menu for accessing I2P functionality while you're browsing.
+It lets you control a few settings in a granular way.</li>
+<li><img src="menu.png" alt="Menu" title="" /></li>
+<li>You can re-enable WebRTC but force it to always use the proxy that is
+enforced by the tab.</li>
+<li>You can either force the browser to delete all history for I2P sites
+immediately, or you can close all your I2P Browser tabs at once and delete
+the history for I2P browsing when you're done.</li>
+<li>That's all there is to it! Your browser is configured to safely use and
+administer I2P.</li>
+<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>

-        <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>
+<h3>Features</h3>

-        <li><img alt="Landing page" src="lander.png" title="">
-        </li>
+<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 src="i2psetproxy.js.png" alt="Visiting i2p-projekt.i2p" title="" /></li>
+<li>[done] <strong>Indicate</strong> the I2P browser is in use visually. Find an
+acceptable way to indicate it on Android.</li>
+<li><img src="susimail.png" alt="Visiting webmail" title="" /></li>
+<li>[done] <strong>Set</strong> the http proxy to use the local I2P proxy automatically.
+Provide specific configuration for other types of I2P proxies(SOCKS,
+isolating HTTP)</li>
+<li>[done] <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 src="i2ptunnel.png" alt="Visiting i2ptunnel" 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 src="toopie.png" alt="Visiting toopie.html" 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 src="routerconsole.png" alt="Visiting routerconsole" 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 src="i2psnark.png" alt="Visiting i2psnark" title="" /></li>
+<li><img src="transmissionrpc.png" alt="Monitoring torrents" title="" /></li>
+<li>[Done] <strong>Enhance</strong> the I2P browsing experience by allowing site developers
+distribute some or all of their resources as torrents, allowing the torrents to
+be treated effectively as a CDN.</li>
+<li><img src="x-i2p-torrentlocation.png" alt="Distribute your site as a torrent." title="" /></li>
+<li>[Done] <strong>Indicate</strong> the level of authenticity provided by TLS. TLS is
+optional on I2P for now, but some sites offer it anyway. TLS support is
+experimental and in the works.</li>
+<li><img src="i2p-https.png" alt="Use HTTPS with your I2P Site." title="" /></li>
+<li>[Done] <strong>Provide</strong> alternate, in-I2P destinations for web sites that want to
+mirror their content within I2P.</li>
+<li>[barely started] <strong>Isolate</strong> traffic by contextual identity to it's own HTTP
+Proxy tunnel, each reflecting it's own pseudonymous identity within I2P. The
+contextual identities. For now, the contextual identities used to manage
+browsing are "I2P Browsing" and "Web Browsing" where I2P Browsing is capable
+of using an outproxy but in the case of traffic destined for the clearnet
+does not do header rewriting, and Web Browsing falls back to the Proxy
+configured in Firefox. The I2P Browsing will be expanded to
+<ul>
+<li>I2P Amnesiac Browsing: Use for General Browsing, stores no history and
+uses an HTTP Proxy with a very short tunnel-close timeout and no key-reuse.</li>
+<li>I2P Social Networking: Use this for logging into social network accounts,
+forums, and other interactive asynchronous public communication platforms
+where your identity is behaviorally linkable. This has a very long
+tunnel-close timeout and key-reuse until specifically invoked.</li>
+<li>I2P Blogging: Use this for posting content to the web interface of your
+blog or to other similar websites that you create content on.</li>
+</ul></li>
+<li><img src="clearweb.png" alt="Visiting clearweb" title="" /></li>
+</ul>

-        <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>
+<h3>Video</h3>

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

-        <li>You can re-enable WebRTC but force it to always use the proxy that is enforced by the tab.</li>
+<h2>Documents</h2>

-        <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>
+<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>

-        <li>That's all there is to it! Your browser is configured to safely use and administer I2P.</li>
+<h2>Super Extra Important Background Info:</h2>

-        <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>
+<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>Features</h3>
+<h3>Links about Project Uplift</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>
+<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>

-        <li><img alt="Visiting i2p-projekt.i2p" src="i2psetproxy.js.png" title="">
-        </li>
+<p>Project uplift seems to have largely been accomplished?</p>

-        <li>[done] <strong>Indicate</strong> the I2P browser is in use visually. Find an acceptable way to indicate it on Android.</li>
+<h3>Links about Project Fusion</h3>

-        <li><img alt="Visiting webmail" src="susimail.png" title="">
-        </li>
+<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>

-        <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>
+<h2>The <strong>Other</strong> Version</h2>

-        <li>[done] <strong>Disable</strong> risky webRTC features/offer the option to re-enable them with the proxy enforced.</li>
+<p>New versions of this extension create an I2P in Private Browsing mode instead,
+using container tabs.</p>

-        <li>[done] <strong>Change</strong> the color of the browser window to indicate that I2P is in use</li>
+<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>

-        <li><img alt="Visiting i2ptunnel" src="i2ptunnel.png" title="">
-        </li>
+<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>

-        <li>[ready] <strong>Provide</strong> help in a variety of languages.</li>
+<h2>Android usage:</h2>

-        <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>
+<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
@@ -14,7 +14,7 @@ function checkSnowflake() {
  try {
    function snowflake(snowflake) {
      console.log("snowflake plugin found, leaving WebRTC alone", snowflake);
-      EnablePeerConnection();
+      AssurePeerConnection();
    }
    var snowflakeInfo = browser.management.get(
      "{b11bea1f-a888-4332-8d8a-cec2be7d24b9}" // string
@@ -61,6 +61,9 @@ document.addEventListener("click", (clickEvent) => {
    creating.then(() => {
      console.log("The news panel has been created");
    });
+  } else if (clickEvent.target.id === "visit-irc") {
+    browser.sidebarAction.setPanel({ panel: "http://127.0.0.1:7669" });
+    browser.sidebarAction.open();
  } else if (clickEvent.target.id === "generate-fresh-tunnel") {
    function refreshIdentity() {
      console.log("Generating new identity");
@@ -120,6 +123,12 @@ document.addEventListener("click", (clickEvent) => {
  } else if (clickEvent.target.id === "window-visit-index") {
    console.log("attempting to create index tab");
    goIndex();
+  } else if (clickEvent.target.id === "window-visit-torrent") {
+    console.log("attempting to create torrent tab");
+    goTorrent();
+  } else if (clickEvent.target.id === "window-visit-help") {
+    console.log("attempting to create torrent tab");
+    goHelp();
  } else if (clickEvent.target.id === "window-visit-homepage") {
    console.log("attempting to create homepage tab");
    goHome();
@@ -194,6 +203,9 @@ function showTorrentsMenu() {
 }

 function goHome() {
+  function onTabError() {
+    console.log("Help tab created");
+  }
  function gotProxyInfo(info) {
    let port = info.value.http.split(":")[1];
    if (port == "7644") {
@@ -220,7 +232,7 @@ function goHome() {

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

+function goTorrent() {
+  function onTabError() {
+    console.log("Torrent Help tab not created");
+  }
+  let createData = {
+    url: "torrent/index.html",
+  };
+  console.log("visiting torrent help");
+  let creating = browser.tabs.create(createData);
+  creating.then(onTabCreated, onTabError);
+}
+
+function goHelp() {
+  function onTabError() {
+    console.log("Torrent Help tab not created");
+  }
+  let createData = {
+    url: "i2pcontrol/index.html",
+  };
+  console.log("visiting torrent help");
+  let creating = browser.tabs.create(createData);
+  creating.then(onTabCreated, onTabError);
+}
+
 function goToopie() {
  function onTabError() {
    console.log("Toopie tab created");
@@ -332,3 +368,12 @@ const interval = minutes * 60 * 1000;
 setInterval(function () {
  if (UpdateContents !== undefined) UpdateContents();
 }, interval);
+
+fetch("http://127.0.0.1:7669").then((myJson) => {
+  if (myJson.status == 200) {
+    let irc = document.getElementById("visit-irc");
+    if (irc != null) {
+      irc.classList.remove("hidden");
+    }
+  }
+});
--- a/lander.png
+++ b/lander.png
--- a/location.html
+++ b/location.html
@@ -4,7 +4,7 @@
    <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">-->
+    <!--<link href="info.css" rel="stylesheet">--><!--<link href="torrent/popup.css" rel="stylesheet">-->

    <title>
    </title>
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
  "applications": {
    "gecko": {
      "id": "i2ppb@eyedeekay.github.io",
-      "strict_min_version": "60.0"
+      "strict_min_version": "64.0"
    }
  },
  "permissions": [
@@ -16,6 +16,7 @@
    "proxy",
    "privacy",
    "storage",
+    "webNavigation",
    "webRequest",
    "webRequestBlocking",
    "contextualIdentities",
@@ -26,7 +27,7 @@
  ],
  "manifest_version": 2,
  "name": "__MSG_extensionName__",
-  "version": "0.83",
+  "version": "0.112.1",
  "description": "__MSG_extensionDescription__",
  "homepage_url": "https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox",
  "icons": {
@@ -48,7 +49,7 @@
  "page_action": {
    "browser_style": true,
    "default_title": "__MSG_toopieTLS__",
-    "default_icon": "icons/toopie.png",
+    "default_icon": "icons/i2plogo.png",
    "show_matches": [
      "http://*.i2p/*",
      "https://*.i2p/*",
--- a/menu.png
+++ b/menu.png
--- a/options/options.html
+++ b/options/options.html
@@ -19,11 +19,17 @@
        </select>
    </section>

+    <section class="scheme-options">
+        <span class="title">Bookmarks Status:</span>
+        <input type="checkbox" id="bookmarksState" name="bookmarksstate" value="bookmarksstate">
+        <label for="bookmarksState">Bookmarks were created at install-time.</tv>
+        <button type="submit" id="bookmarksButton">Re-Create Bookmarks</button>
+    </section>
+
    <section class="scheme-options proxy-options" id="proxy-options">
        <div class="title">
            Proxy Options
        </div>
-
        <p id="proxyHelpText">
        </p>
        <label id="portText">Host:</label> <input data="host" id="host" type="text" value="127.0.0.1">
@@ -83,7 +89,8 @@
        </div>
    </section>
    <input id="save-button" type="button" value="Save preferences"> 
-    <script src="options.js"></script> <!--<script src="/torrent/browser-polyfill.min.js"></script>
+    <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
@@ -1,3 +1,8 @@
+function SetBookButton() {
+  //  var bmid = document.getElementById("bookmark");
+  //bmid.textContent = chrome.i18n.getMessage("bookmarkButton");
+}
+
 function SetHostText() {
  var hostid = document.getElementById('hostText');
  hostid.textContent = chrome.i18n.getMessage('hostText');
@@ -28,6 +33,21 @@ function SetControlHelpText() {
  portid.textContent = chrome.i18n.getMessage('controlHelpText');
 }

+function getBookmarksCreated() {
+  bookmarks_state = document.getElementById('bookmarks');
+  console.log('(options)Got i2p bookmarks state:', bookmarks_state);
+  if (bookmarks_state == undefined) {
+    return false;
+  }
+  if (bookmarks_state.value == 'false') {
+    return false;
+  }
+  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);
@@ -159,6 +179,9 @@ function checkStoredSettings(storedSettings) {
      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'];
@@ -245,6 +268,9 @@ 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']) {
@@ -320,6 +346,7 @@ function onError(e) {

 function storeSettings() {
  let storableSettings = {};
+  storableSettings['bookmarks_state'] = getBookmarksCreated();
  storableSettings['proxy_scheme'] = getScheme();
  storableSettings['proxy_host'] = getHost();
  storableSettings['proxy_port'] = getPort();
@@ -341,15 +368,19 @@ function storeSettings() {

 function updateUI(restoredSettings) {
  const selectList = document.querySelector('#proxy_scheme');
-  if (selectList == undefined) selectList.value = restoredSettings.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');
+  if (bms != undefined) bms.checked = restoredSettings.bookmarks_state;
+
  const hostitem = document.getElementById('host');
-  if (hostitem == undefined) hostitem.value = restoredSettings.proxy_host;
+  if (hostitem != undefined) hostitem.value = restoredSettings.proxy_host;
  //console.log("(options)showing proxy host:", hostitem.value);

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

  const controlhostitem = document.getElementById('controlhost');
@@ -363,41 +394,42 @@ function updateUI(restoredSettings) {
  //console.log("(options)showing control port:", controlportitem.value);

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

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

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

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

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

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

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

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

+  SetBookButton();
  SetHostText();
  SetPortText();
  SetPortHelpText();
--- a/privacy.js
+++ b/privacy.js
@@ -1,4 +1,4 @@
-var titlepref = chrome.i18n.getMessage('titlePreface');
+var titlepref = browser.i18n.getMessage('titlePreface');

 function onSet(result) {
  if (result) {
@@ -20,6 +20,15 @@ function disableHyperlinkAuditing() {
  setting.then(onSet);
 }

+// UNINSTALL ONLY
+function enableHyperlinkAuditing() {
+  var setting = browser.privacy.websites.hyperlinkAuditingEnabled.clear();
+  console.log('Disabling hyperlink auditing/val=', {
+    value: false,
+  });
+  setting.then(onSet);
+}
+
 // This enables first-party isolation
 function enableFirstPartyIsolation() {
  var setting = browser.privacy.websites.firstPartyIsolate.set({
@@ -31,6 +40,15 @@ function enableFirstPartyIsolation() {
  setting.then(onSet);
 }

+// UNINSTALL ONLY
+function disableFirstPartyIsolation() {
+  var setting = browser.privacy.websites.firstPartyIsolate.clear();
+  console.log('Enabling first party isolation/val=', {
+    value: true,
+  });
+  setting.then(onSet);
+}
+
 /* This rejects tracking cookies and third-party cookies but it
   LEAVES "Persistent" Cookies unmodified in favor of an option in the content
   interface for now */
@@ -53,6 +71,10 @@ function disableEvilCookies() {
  });
 }

+function enableEvilCookies() {
+  var getting = browser.privacy.websites.cookieConfig.clear();
+}
+
 // Make sure that they're gone
 /*function disableBadCookies(){
    var setting = browser.privacy.websites.thirdPartyCookiesAllowed.set({
@@ -75,6 +97,15 @@ function disableReferrers() {
  setting.then(onSet);
 }

+// UNINSATALL ONLY
+function enableReferrers() {
+  var setting = browser.privacy.websites.referrersEnabled.clear();
+  console.log("Disabling referrer headers/val=", {
+    value: false,
+  });
+  setting.then(onSet);
+}
+
 // enable fingerprinting resistent features(letterboxing and stuff)
 function enableResistFingerprinting() {
  var setting = browser.privacy.websites.resistFingerprinting.set({
@@ -86,6 +117,15 @@ function enableResistFingerprinting() {
  setting.then(onSet);
 }

+// UNINSTALL ONLY
+function disableResistFingerprinting() {
+  var setting = browser.privacy.websites.resistFingerprinting.clear();
+  console.log("Enabling resist fingerprinting/val=", {
+    value: false,
+  });
+  setting.then(onSet);
+}
+
 // This is essentially a blocklist of clearnet web-sites known to do bad tracking
 function enableTrackingProtection() {
  var setting = browser.privacy.websites.trackingProtectionMode.set({
@@ -97,6 +137,15 @@ function enableTrackingProtection() {
  setting.then(onSet);
 }

+// UNINSTALL ONLY
+function disableTrackingProtection() {
+  var setting = browser.privacy.websites.trackingProtectionMode.clear();
+  console.log("Enabling tracking protection/val=", {
+    value: "always",
+  });
+  setting.then(onSet);
+}
+
 /* This disables protected content, which is a form of digital restrictions
   management dependent on identifying information */
 function disableDigitalRestrictionsManagement() {
@@ -117,6 +166,45 @@ function disableDigitalRestrictionsManagement() {
  });
 }

+// UNINSTALL ONLY
+function disableDigitalRestrictionsManagement() {
+  var gettingInfo = browser.runtime.getPlatformInfo();
+  gettingInfo.then((got) => {
+    if (got.os == "win") {
+      var setting = browser.privacy.websites.protectedContentEnabled.clear();
+      console.log(
+        "Setting Protected Content(Digital Restrictions Management) false/val=",
+        {
+          value: true,
+        }
+      );
+      setting.then(onSet);
+    }
+  });
+}
+
+function unsetAllPrivacy() {
+  enableHyperlinkAuditing();
+  disableFirstPartyIsolation();
+  enableEvilCookies();
+  enableReferrers();
+  disableTrackingProtection();
+  disableResistFingerprinting();
+  enableDigitalRestrictionsManagement();
+  UnsetPeerConnection();
+  EnableSavePasswords();
+}
+
+browser.management.onUninstalled.addListener((info) => {
+  function gotSelf(selfinfo) {
+    if (info.name == selfinfo.name) {
+      unsetAllPrivacy();
+    }
+  }
+  var gettingSelf = browser.management.getSelf();
+  gettingSelf.then(gotSelf);
+});
+
 function setAllPrivacy() {
  disableHyperlinkAuditing();
  enableFirstPartyIsolation();
@@ -140,7 +228,7 @@ function ResetPeerConnection() {
  }
  function snowflake(snowflake) {
    console.log("snowflake plugin found, leaving WebRTC alone", snowflake);
-    EnablePeerConnection();
+    AssurePeerConnection();
  }
  var snowflakeInfo = browser.management.get(
    "{b11bea1f-a888-4332-8d8a-cec2be7d24b9}" // string
@@ -148,24 +236,12 @@ function ResetPeerConnection() {
  snowflakeInfo.then(snowflake, reset);
 }

-function EnablePeerConnection() {
-  var webrtc = true;
-  var rtc = browser.privacy.network.peerConnectionEnabled.set({
-    value: webrtc,
-  });
-  rtc.then(AssurePeerConnection);
-  console.log("Enabled WebRTC");
-}
-
 function AssurePeerConnection() {
  function assure(webrtc) {
    browser.privacy.network.peerConnectionEnabled.set({
      value: true,
    });
-    browser.privacy.network.networkPredictionEnabled.set({
-      value: false,
-    });
-    chrome.privacy.network.webRTCIPHandlingPolicy.set({
+    browser.privacy.network.webRTCIPHandlingPolicy.set({
      value: "disable_non_proxied_udp",
    });
  }
@@ -173,6 +249,20 @@ function AssurePeerConnection() {
  rtc.then(assure);
 }

+// UNINSTALL ONLY
+function UnsetPeerConnection() {
+  function assure(webrtc) {
+    browser.privacy.network.peerConnectionEnabled.set({
+      value: true,
+    });
+    browser.privacy.network.webRTCIPHandlingPolicy.set({
+      value: "default",
+    });
+  }
+  let rtc = browser.privacy.network.peerConnectionEnabled.get({});
+  rtc.then(assure);
+}
+
 var gettingInfo = browser.runtime.getPlatformInfo();
 gettingInfo.then((got) => {
  if (got.os == "android") {
@@ -191,9 +281,7 @@ function ResetDisableSavePasswords() {
 }

 function EnableSavePasswords() {
-  browser.privacy.services.passwordSavingEnabled.set({
-    value: true,
-  });
+  browser.privacy.services.passwordSavingEnabled.clear();
  console.log("Enabled saved passwords");
 }

@@ -328,7 +416,27 @@ function forgetBrowsingData(storedSettings) {

 function i2pHostName(url) {
  let hostname = "";
-  if (url.indexOf("://") > -1) {
+  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);
+          }
+          break;
+        }
+        if (hostname != "") {
+          break;
+        }
+      }
+    }
+  } else if (url.indexOf("://") > -1) {
    hostname = url.split("/")[2];
  } else {
    hostname = url.split("/")[0];
@@ -338,6 +446,9 @@ function i2pHostName(url) {

 function i2pHost(url) {
  let hostname = i2pHostName(url);
+  if (hostname.endsWith(".i2p")) {
+    console.log("(hostname) i2p", hostname);
+  }
  return hostname.endsWith(".i2p");
 }

@@ -381,7 +492,7 @@ function message(recieved) {
  console.log(recieved);
  if (recieved.rtc === "enableWebRTC") {
    console.log("enableWebRTC");
-    EnablePeerConnection();
+    AssurePeerConnection();
  } else if (recieved.rtc === "disableWebRTC") {
    console.log("disableWebRTC");
    ResetPeerConnection();
--- a/proxy.js
+++ b/proxy.js
@@ -1,17 +1,24 @@
-var titlepref = chrome.i18n.getMessage('titlePreface');
-var webpref = chrome.i18n.getMessage('webPreface');
-var ircpref = chrome.i18n.getMessage('ircPreface');
-var routerpref = chrome.i18n.getMessage('routerPreface');
-var routerprefpriv = chrome.i18n.getMessage('routerPrefacePrivate');
+var titlepref = browser.i18n.getMessage('titlePreface');
+var webpref = browser.i18n.getMessage('webPreface');
+var routerpref = browser.i18n.getMessage('routerPreface');
+var mailpref = browser.i18n.getMessage('mailPreface');
+var torrentpref = browser.i18n.getMessage('torrentPreface');
+var tunnelpref = browser.i18n.getMessage('i2ptunnelPreface');
+var ircpref = browser.i18n.getMessage('ircPreface');
+var extensionpref = browser.i18n.getMessage('extensionPreface');
+var muwirepref = browser.i18n.getMessage('muwirePreface');
+var botepref = browser.i18n.getMessage('botePreface');
+var blogpref = browser.i18n.getMessage('blogPreface');
+var blogprefpriv = browser.i18n.getMessage('blogPrefacePrivate');

 browser.privacy.network.peerConnectionEnabled.set({
  value: true,
 });

-chrome.privacy.network.networkPredictionEnabled.set({
+browser.privacy.network.networkPredictionEnabled.set({
  value: false,
 });
-chrome.privacy.network.webRTCIPHandlingPolicy.set({
+browser.privacy.network.webRTCIPHandlingPolicy.set({
  value: 'disable_non_proxied_udp',
 });
 console.log('Disabled unproxied UDP.');
@@ -21,86 +28,150 @@ function shouldProxyRequest(requestInfo) {
 }

 var handleContextProxyRequest = async function(requestDetails) {
+  function ircProxy() {
+    if (!requestDetails.url.includes('7669')) {
+      proxy = {
+        type: getScheme(),
+        host: getHost(),
+        port: getPort(),
+      };
+      return proxy;
+    }
+    if (requestDetails.url.includes(':7669')) {
+      proxy = null;
+      return proxy;
+    }
+  }
+  function blogProxy() {
+    if (!requestDetails.url.includes('8084')) {
+      proxy = {
+        type: getScheme(),
+        host: getHost(),
+        port: getPort(),
+      };
+      return proxy;
+    }
+    if (requestDetails.url.includes(':8084')) {
+      proxy = null;
+      return proxy;
+    }
+  }
+
+  function btProxy() {
+    proxy = routerProxy();
+    if (requestDetails.url.includes(':7662')) {
+      proxy = null;
+      return proxy;
+    }
+    console.log('(bt proxy)', proxy);
+    return proxy;
+  }
+  function mainProxy() {
+    console.log('(proxy) mainproxy 0');
+    proxy = {
+      type: getScheme(),
+      host: getHost(),
+      port: getPort(),
+    };
+    let url = new URL(requestDetails.url);
+    if (
+      requestDetails.url.startsWith(
+        'http://' + getHost() + ':' + getConsolePort() + '/i2psnark/'
+      )
+    ) {
+      //+url.host)) {
+      console.log('(proxy) mainproxy 2', url);
+      proxy = null;
+    }
+    return proxy;
+  }
+  function routerProxy() {
+    if (routerHost(requestDetails.url)) {
+      proxy = null;
+      return proxy;
+    } else if (!routerHost(requestDetails.url)) {
+      proxy = {
+        type: getScheme(),
+        host: getHost(),
+        port: getPort(),
+      };
+      return proxy;
+    }
+  }
  try {
    var handleProxyRequest = function(context) {
      proxy = {
-        failoverTimeout: 0,
-        proxyDns: false,
+        type: getScheme(),
+        host: getHost(),
+        port: getPort(),
      };
+
      if (context == 'firefox-default' || context == 'firefox-private') {
        proxy = null;
        return proxy;
      }
-      console.log('(proxy), context', context);
+
      if (context != undefined) {
-        if (context.name == titlepref) {
-          if (!requestDetails.url.includes('/i2psnark/')) {
-            console.log('URL', requestDetails.url);
-            proxy = {
-              type: getScheme(),
-              host: getHost(),
-              port: getPort(),
-            };
-          }
+        console.log('(proxy), context', context);
+        proxy = routerProxy();
+        if (context.name == ircpref) {
+          proxy = ircProxy();
          return proxy;
-        } else if (context.name == ircpref) {
+        } else if (context.name == blogpref) {
+          proxy = blogProxy();
+          return proxy;
+        } else if (context.name == titlepref) {
+          proxy = mainProxy();
+          return proxy;
+        } else if (context.name == routerpref) {
+          proxy = routerProxy();
+          return proxy;
+        } else if (context.name == torrentpref) {
+          proxy = btProxy();
+          return proxy;
+        } else if (context.name == mailpref) {
+          return proxy;
+        } else if (context.name == tunnelpref) {
+          return proxy;
+        } else if (context.name == muwirepref) {
+          return proxy;
+        } else if (context.name == botepref) {
+          return proxy;
+        }
+      } else {
+        if (!routerHost(requestDetails.url)) {
+          if (localHost(requestDetails.url)) {
+            if (requestDetails.url.includes(':7669')) {
+              proxy = null;
+            } else if (requestDetails.url.includes(':7662')) {
+              proxy = null;
+            } else {
+              console.log(
+                '(proxy) non-routerconsole localhost url, will not interfere',
+                requestDetails.url
+              );
+            }
+          }
+        }
+        if (i2pHost(requestDetails.url)) {
          proxy = {
            type: getScheme(),
            host: getHost(),
            port: getPort(),
          };
-          if (requestDetails.url.includes(':7669')) {
-            proxy = null;
-          }
-        } else if (context.name == routerpref) {
-          if (routerHost(requestDetails.url)) {
-            proxy = null;
-          } else if (!routerHost(requestDetails.url)) {
-            proxy = {
-              type: getScheme(),
-              host: getHost(),
-              port: getPort(),
-            };
-          }
-          return proxy;
-        } else if (context.name == webpref) {
-          if (localHost(requestDetails.url)) {
-            if (!routerHost(requestDetails.url)) {
-              proxy = {
-                type: 'http',
-                host: 'localhost',
-                port: '65535',
-              };
-            }
-          }
-          return proxy;
+        } else {
+          proxy = null;
        }
-      }
-      if (!routerHost(requestDetails.url)) {
-        if (localHost(requestDetails.url)) {
-          if (requestDetails.url.includes(':7669')) {
-            proxy = null;
-          } else {
-            console.log(
-              '(proxy) non-routerconsole localhost url, will not interfere',
-              requestDetails.url
-            );
-          }
+        if (requestDetails.url.includes('rpc')) {
+          console.log('(proxy for rpc url)', rpc);
        }
-      } else if (i2pHost(requestDetails.url)) {
-        proxy = {
-          type: getScheme(),
-          host: getHost(),
-          port: getPort(),
-        };
+        //var tab = tabGet(requestDetails.tabId);
+        //tab.then(handleTabRequest,)
+        return proxy;
      }
-      //var tab = tabGet(requestDetails.tabId);
-      //tab.then(handleTabRequest,)
-      return proxy;
    };
    var contextGet = async function(tabInfo) {
      try {
-        console.log('(proxy)Tab info from Function', tabInfo);
        context = await browser.contextualIdentities.get(tabInfo.cookieStoreId);
        return context;
      } catch (error) {
@@ -110,7 +181,6 @@ var handleContextProxyRequest = async function(requestDetails) {
    };
    var tabGet = async function(tabId) {
      try {
-        console.log('(proxy)Tab ID from Request', tabId);
        let tabInfo = await browser.tabs.get(tabId);
        return tabInfo;
      } catch (error) {
@@ -126,10 +196,6 @@ var handleContextProxyRequest = async function(requestDetails) {
      return proxy;
    }
    if (requestDetails.originUrl == browser.runtime.getURL('security.html')) {
-      console.log(
-        '(proxy) extension security URL',
-        browser.runtime.getURL('security.html')
-      );
      proxy = {
        type: getScheme(),
        host: getHost(),
@@ -144,6 +210,9 @@ var handleContextProxyRequest = async function(requestDetails) {
      return browser.proxy.settings.get({});
    }
    if (requestDetails.tabId > 0) {
+      if (requestDetails.url.includes('MuWire')) {
+        return;
+      }
      if (proxyHost(requestDetails.url)) {
        proxy = {
          type: getScheme(),
@@ -151,15 +220,15 @@ var handleContextProxyRequest = async function(requestDetails) {
          port: getPort(),
        };
        return proxy;
-      } else if (extensionHost(requestDetails.url)) {
-        return;
      } else if (i2pHost(requestDetails.url)) {
        var tab = tabGet(requestDetails.tabId);
        requestDetails.tabId = tab;
        var context = tab.then(contextGet);
        var proxy = await context.then(handleProxyRequest);
-        console.log('(proxy)Returning I2P Proxy', proxy);
+        //console.log('(proxy)Returning I2P Proxy', proxy);
        return proxy;
+      } else if (extensionHost(requestDetails)) {
+        return;
      } else {
        var tab = tabGet(requestDetails.tabId);
        var context = tab.then(contextGet);
@@ -170,6 +239,14 @@ 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);
@@ -226,9 +303,8 @@ function SetupSettings() {
    console.log('Initialising Control Host', storedSettings.control_host);
    setupProxy();
  }
-  var gettingControlHostStoredSettings = browser.storage.local.get(
-    'control_host'
-  );
+  var gettingControlHostStoredSettings =
+    browser.storage.local.get('control_host');
  gettingControlHostStoredSettings.then(
    checkControlHostStoredSettings,
    onSetupError
@@ -243,9 +319,8 @@ function SetupSettings() {
    console.log('Initialising Control Port', storedSettings.control_port);
    setupProxy();
  }
-  var gettingControlPortStoredSettings = browser.storage.local.get(
-    'control_port'
-  );
+  var gettingControlPortStoredSettings =
+    browser.storage.local.get('control_port');
  gettingControlPortStoredSettings.then(
    checkControlPortStoredSettings,
    onSetupError
@@ -263,9 +338,8 @@ function SetupSettings() {
    );
    setupProxy();
  }
-  var gettingHistoryStoredSettings = browser.storage.local.get(
-    'disable_history'
-  );
+  var gettingHistoryStoredSettings =
+    browser.storage.local.get('disable_history');
  gettingHistoryStoredSettings.then(checkHistoryStoredSettings, onSetupError);
 }

@@ -297,9 +371,9 @@ function getConsolePort() {
  if (control_port == undefined) {
    var scheme = getScheme();
    if (scheme == 'socks') proxy_port = '7657';
-    else proxy_port = '7657';
+    else control_port = '7657';
  }
-  return proxy_port;
+  return control_port;
 }

 function setupProxy() {
@@ -320,17 +394,11 @@ function update() {

 function updateFromStorage() {
  console.log('updating settings from storage');
-  chrome.storage.local.get(function() {
+  browser.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();
@@ -341,7 +409,7 @@ setupProxy();
 var gettingListenerInfo = browser.runtime.getPlatformInfo();
 gettingListenerInfo.then((got) => {
  browser.windows.onCreated.addListener(() => {
-    chrome.storage.local.get(function() {
+    browser.storage.local.get(function() {
      setupProxy();
    });
  });
--- a/releases.atom
+++ b/releases.atom
@@ -4,196 +4,200 @@
  <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-11-11T03:03:56Z</updated>
+  <updated>2021-05-26T22:32:58Z</updated>
  <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.83</id>
-    <updated>2020-11-11T04:00:27Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.83"/>
-    <title>0.83</title>
-    <enclosure url="magnet:?xt=urn:btih:09841bd5ca003fa37818754f4bee988698e3c0c8" type="application/x-bittorrent" />
+    <id>tag:github.com,2008:Repository/169256012/0.105</id>
+    <updated>2021-05-27T20:19:35Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.105"/>
+    <title>0.105</title>
+    <enclosure url="magnet:?xl=2485<title>0.105</title>dn=i2ppb%40eyedeekay.github.io.xpi.torrent<title>0.105</title>xt=urn:tree:tiger:w6kewvpw25bnau2rwkczbnryrjdzn54ietse3zi<title>0.105</title>xt=urn:ed2k:1cd9743fb664404298b7f2ad7ee45db0<title>0.105</title>xt=urn:aich:4vhcsp6t3c2mkjzds2etixyinyj7xtkp" type="application/x-bittorrent" />
+    <content type="html">&lt;p&gt;Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.105-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Add help page for configuring i2pcontrol&lt;/li&gt;
+&lt;li&gt;Add help page for configuring i2psnark-rpc&lt;/li&gt;
+&lt;li&gt;Update the icons&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt; Wed, 26 May 2021 12:56:56 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.103-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.103</id>
+    <updated>2021-05-26T16:59:28Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.103"/>
+    <title>0.103</title>
    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
 Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
 Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
-i2psetproxy.js (0.83-1) UNRELEASED; urgency=low&lt;/p&gt;
+i2psetproxy.js (0.103-1) UNRELEASED; urgency=low&lt;/p&gt;
 &lt;ul&gt;
-&lt;li&gt;Add a tab for I2P-Native Dispatch&lt;/li&gt;
+&lt;li&gt;Fix for double-test issue on /home.html page in the extension&lt;/li&gt;
+&lt;li&gt;Fix for broken options menu&lt;/li&gt;
 &lt;/ul&gt;
-&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Sat, 10 NOV 2020 22:00:01 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.81-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt; Wed, 26 May 2021 12:56:56 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.101-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
    <author>
      <name>eyedeekay</name>
    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
  </entry>
  <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.81</id>
-    <updated>2020-11-08T02:44:34Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.81"/>
-    <title>0.81</title>
-    <content type="html">&lt;p&gt;Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
-i2psetproxy.js (0.81-1) UNRELEASED; urgency=low&lt;/p&gt;
+    <id>tag:github.com,2008:Repository/169256012/0.101</id>
+    <updated>2021-05-24T19:42:29Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.101"/>
+    <title>0.101</title>
+    <content type="html">&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Mon, 24 May 2021 3:41:35 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.99-1) UNRELEASED; urgency=low&lt;/p&gt;
 &lt;ul&gt;
-&lt;li&gt;X-I2P-TorrentLocation header&lt;/li&gt;
-&lt;li&gt;Visual tweaks&lt;/li&gt;
-&lt;li&gt;Deprecate localhost browser container permanently&lt;/li&gt;
-&lt;li&gt;Isolation rules improvements&lt;/li&gt;
+&lt;li&gt;Sweeping changes to styles&lt;/li&gt;
+&lt;li&gt;fix for issue when using noscript and visiting susimail&lt;/li&gt;
 &lt;/ul&gt;
-&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Sat, 07 NOV 2020 21:34:25 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.79-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Mon, 24 May 2021 2:05:21 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.97-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
    <author>
      <name>eyedeekay</name>
    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
  </entry>
  <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.79</id>
-    <updated>2020-09-26T03:36:46Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.79"/>
-    <title>0.79</title>
+    <id>tag:github.com,2008:Repository/169256012/0.99</id>
+    <updated>2021-05-24T18:08:37Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.99"/>
+    <title>0.99</title>
    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
 Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
 Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
-i2psetproxy.js (0.79-1) UNRELEASED; urgency=low&lt;/p&gt;
+i2psetproxy.js (0.99-1) UNRELEASED; urgency=low&lt;/p&gt;
 &lt;ul&gt;
-&lt;li&gt;Pin application tabs to the front of the tab order&lt;/li&gt;
-&lt;li&gt;Refine pageaction behavior&lt;/li&gt;
+&lt;li&gt;Sweeping changes to styles&lt;/li&gt;
+&lt;li&gt;fix for issue when using noscript and visiting susimail&lt;/li&gt;
 &lt;/ul&gt;
-&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Mon, 24 SEP 2020 20:18:03 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.77-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Mon, 24 May 2021 2:05:21 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.97-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
    <author>
      <name>eyedeekay</name>
    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
  </entry>
  <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.77</id>
-    <updated>2020-09-25T00:19:45Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.77"/>
-    <title>0.77</title>
-    <content type="html">&lt;p&gt;Merge pull request &lt;a class=&quot;issue-link js-issue-link&quot; href=&quot;https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/pull/100&quot;&gt;#100&lt;/a&gt; from eyedeekay/bookmarks&lt;/p&gt;
-
-&lt;p&gt;make the bookmarks part of a subdirectory&lt;/p&gt;</content>
-    <author>
-      <name>eyedeekay</name>
-    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
-  </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>
+    <id>tag:github.com,2008:Repository/169256012/0.97</id>
+    <updated>2021-02-05T18:05:51Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.97"/>
+    <title>0.97</title>
    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
 Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
 Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
-i2psetproxy.js (0.75-1) UNRELEASED; urgency=low&lt;/p&gt;
+i2psetproxy.js (0.97-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;li&gt;Fix theme issue, add x-i2p-torrentlocation HEADER support&lt;/li&gt;
 &lt;/ul&gt;
-&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  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>
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  FRI, 5 FEB 2021 1:02:55 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.95-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
    <author>
      <name>eyedeekay</name>
    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
  </entry>
  <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.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>
+    <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>
    <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;
+i2psetproxy.js (0.95-1) UNRELEASED; urgency=low&lt;/p&gt;
 &lt;ul&gt;
-&lt;li&gt;Fix incomplete bugfix from 0.69 again&lt;/li&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;  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>
+&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"/>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
  </entry>
  <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.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;
+    <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://avatars.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://avatars.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.71-1) UNRELEASED; urgency=low&lt;/p&gt;
+i2psetproxy.js (0.89-1) UNRELEASED; urgency=low&lt;/p&gt;
 &lt;ul&gt;
-&lt;li&gt;Fix incomplete bugfix from 0.69&lt;/li&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;-- 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>
+&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"/>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
  </entry>
  <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.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>
-  <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.67</id>
-    <updated>2020-03-18T04:27:30Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.67"/>
-    <title>0.67</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.67-1) UNRELEASED; urgency=low&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;Tweak some default settings that should have gone into 65&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, 17 MAR 2020 22:58:55 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.65-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.65</id>
-    <updated>2020-03-18T03:01:20Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.65"/>
-    <title>0.65</title>
+    <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>
    <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.65-1) UNRELEASED; urgency=low&lt;/p&gt;
+i2psetproxy.js (0.87-1) UNRELEASED; urgency=low&lt;/p&gt;
 &lt;ul&gt;
-&lt;li&gt;Initial prototype of certs implementation&lt;/li&gt;
-&lt;li&gt;Use &quot;pinned apptabs&quot; to minimize the number of tabs occupied by an app&lt;/li&gt;
-&lt;li&gt;Get ready for self-hosted updates but with bittorrent because it&#39;s cooler&lt;/li&gt;
+&lt;li&gt;Disable searching for i2p sites in non-i2p search engines&lt;/li&gt;
+&lt;li&gt;Add contexts for i2pbote and Dispatch&lt;/li&gt;
+&lt;li&gt;Remain in tighter control of x-i2p-torrentlocation priority&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, 17 MAR 2020 22:58:55 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.63-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Sat, 10 NOV 2020 1:33:50 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.85-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"/>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
  </entry>
 </feed>
--- a/routerconsole.png
+++ b/routerconsole.png
--- a/script.js
+++ b/script.js
@@ -1,196 +1,151 @@
 browser.runtime.onMessage.addListener((request) => {
-  var response = '';
+  var response = 'no-alt-location';
+  console.log(request);
  if (request.req === 'i2p-location') {
-    response = 'no-alt-location';
-    const metas = document.getElementsByTagName('meta');
-    for (let i = 0; i < metas.length; i++) {
-      try {
-        tag = metas[i].getAttribute('http-equiv');
-        if (tag.toUpperCase() === 'I2P-LOCATION') {
-          response = metas[i].getAttribute('content');
-        }
-        if (tag.toUpperCase() === 'X-I2P-LOCATION') {
-          response = metas[i].getAttribute('content');
-        }
-      } catch {};
+    var tag = document.querySelector('meta[http-equiv="i2p-location"]');
+    if (tag != undefined) {
+      console.log(tag);
+      if (tag) response = tag.content;
+    }
+    var tag = document.querySelector('meta[http-equiv="x-i2p-location"]');
+    if (tag != undefined) {
+      console.log(tag);
+      if (tag) response = tag.content;
    }
  }
  if (request.req === 'i2p-torrentlocation') {
-    response = 'no-alt-location';
-    const metas = document.getElementsByTagName('meta');
-    for (let i = 0; i < metas.length; i++) {
-      try {
-        tag = metas[i].getAttribute('http-equiv');
-        if (tag.toUpperCase() === 'I2P-TORRENTLOCATION') {
-          response = metas[i].getAttribute('content');
-          var imgs = document.getElementsByTagName('img');
-          for (let img of imgs) {
-            let tmpsrc = new URL(img.src);
-            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 links = document.getElementsByTagName('a');
-          console.log('Listing link', links);
-          for (let link of links) {
-            console.log('(Changing Link)', link);
-            let tmpsrc = new URL(link.href);
-            //            console.log("link", tmpsrc.host, tmpsrc.pathname)
-            if (tmpsrc.host == location.host) {
-              if (
-                !tmpsrc.pathname.endsWith('html') &&
-                !tmpsrc.pathname.endsWith('htm') &&
-                !tmpsrc.pathname.endsWith('php') &&
-                !tmpsrc.pathname.endsWith('jsp') &&
-                !tmpsrc.pathname.endsWith('asp') &&
-                !tmpsrc.pathname.endsWith('aspx') &&
-                !tmpsrc.pathname.endsWith('atom') &&
-                !tmpsrc.pathname.endsWith('rss') &&
-                !tmpsrc.pathname.endsWith('/') &&
-                tmpsrc.pathname.includes('.')
-              ) {
-                console.log('link', tmpsrc.host, tmpsrc.pathname);
-                link.href =
-                  'http://127.0.0.1:7657/i2psnark/' +
-                  tmpsrc.host +
-                  tmpsrc.pathname;
-                link.onerror = function() {
-                  window.location.href = tmpsrc.href;
-                };
-              }
-              //if (!tmpsrc.pathname.endsWith('html')) { // && !tmpsrc.pathname.endsWith('htm') &&
-              //                !tmpsrc.pathname.endsWith('php') && !tmpsrc.pathname.endsWith('jsp') &&
-              //                !tmpsrc.pathname.endsWith('asp') && !tmpsrc.pathname.endsWith('aspx') &&
-              //                tmpsrc.pathname.includes('.') && !tmpsrc..pathname.endsWith('/')) {
-              //console.log('http://127.0.0.1:7657/i2psnark/' + tmpsrc.host + tmpsrc.pathname;)
-              //link.href = 'http://127.0.0.1:7657/i2psnark/' + tmpsrc.host + tmpsrc.pathname;
-              //link.onerror = function() {
-              //link.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;
-              }
-            }
-          }
-          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;
-              }
-            }
-          }
-        }
-        if (tag.toUpperCase() === 'X-I2P-TORRENTLOCATION') {
-          response = metas[i].getAttribute('content');
-          var imgs = document.getElementsByTagName('img');
-          for (let img of imgs) {
-            let tmpsrc = new URL(img.src);
-            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 links = document.getElementsByTagName('a');
-          console.log('Listing link', links);
-          for (let link of links) {
-            console.log('(Changing Link)', link);
-            let tmpsrc = new URL(link.href);
-            //console.log("link", tmpsrc.host, tmpsrc.pathname)
-            if (tmpsrc.host == location.host) {
-              if (
-                !tmpsrc.pathname.endsWith('html') &&
-                !tmpsrc.pathname.endsWith('htm') &&
-                !tmpsrc.pathname.endsWith('php') &&
-                !tmpsrc.pathname.endsWith('jsp') &&
-                !tmpsrc.pathname.endsWith('asp') &&
-                !tmpsrc.pathname.endsWith('aspx') &&
-                !tmpsrc.pathname.endsWith('atom') &&
-                !tmpsrc.pathname.endsWith('rss') &&
-                !tmpsrc.pathname.endsWith('/') &&
-                tmpsrc.pathname.includes('.')
-              ) {
-                console.log('link', tmpsrc.host, tmpsrc.pathname);
-                link.href =
-                  'http://127.0.0.1:7657/i2psnark/' +
-                  tmpsrc.host +
-                  tmpsrc.pathname;
-                link.onerror = function() {
-                  window.location.href = tmpsrc.href;
-                };
-              }
-              //if (!tmpsrc.pathname.endsWith('html')) { // && !tmpsrc.pathname.endsWith('htm') &&
-              //                !tmpsrc.pathname.endsWith('php') && !tmpsrc.pathname.endsWith('jsp') &&
-              //                !tmpsrc.pathname.endsWith('asp') && !tmpsrc.pathname.endsWith('aspx') &&
-              //                tmpsrc.pathname.includes('.') && !tmpsrc..pathname.endsWith('/')) {
-              //console.log('http://127.0.0.1:7657/i2psnark/' + tmpsrc.host + tmpsrc.pathname;)
-              //link.href = 'http://127.0.0.1:7657/i2psnark/' + tmpsrc.host + tmpsrc.pathname;
-              //link.onerror = function() {
-              //link.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;
-              }
-            }
-          }
-          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;
-              }
-            }
-          }
-        }
-      } catch {};
+    var tag = document.querySelector('meta[http-equiv="i2p-torrentlocation"]');
+    if (tag != undefined) {
+      console.log(tag);
+      response = i2pTorrent(tag);
+    }
+    var tag = document.querySelector(
+      'meta[http-equiv="x-i2p-torrentlocation"]'
+    );
+    if (tag != undefined) {
+      console.log(tag);
+      response = i2pTorrent(tag);
    }
  }
  return Promise.resolve({ content: response });
 });
+
+window.document.onload = function (e) {
+  console.log("presetting x-i2p-torrentlocation");
+  var tag = document.querySelector('meta[http-equiv="i2p-torrentlocation"]');
+  if (tag != undefined) {
+    console.log(tag);
+    response = i2pTorrent(tag);
+  }
+  var tag = document.querySelector('meta[http-equiv="x-i2p-torrentlocation"]');
+  if (tag != undefined) {
+    console.log(tag);
+    response = i2pTorrent(tag);
+  }
+};
+
+console.log("presetting x-i2p-torrentlocation");
+var tag = document.querySelector('meta[http-equiv="i2p-torrentlocation"]');
+if (tag != undefined) {
+  console.log(tag);
+  response = i2pTorrent(tag);
+}
+var tag = document.querySelector('meta[http-equiv="x-i2p-torrentlocation"]');
+if (tag != undefined) {
+  console.log(tag);
+  response = i2pTorrent(tag);
+}
+
+function i2pTorrent(tag) {
+  let response = "no-alt-location";
+  if (tag) {
+    response = tag.content;
+    var imgs = document.getElementsByTagName("img");
+    console.log("rewriting torrent link");
+    for (let img of imgs) {
+      let tmpsrc = new URL(img.src);
+      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) {
+      video.setAttribute("preload", "none");
+      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 + "/"
+          );
+          //          let url = new URL("http://127.0.0.1:7657/i2psnark/"+location.host+"/"location.path)
+          console.log(
+            "http://127.0.0.1:7657/i2psnark/" + tmpsrc.host + tmpsrc.pathname
+          ); //+"/"location.path)
+          video.src =
+            "http://127.0.0.1:7657/i2psnark/" + tmpsrc.host + tmpsrc.pathname;
+          video.innerHTML = topInnerHTML; // + innerHTML;
+          video.onerror = function () {
+            console.log("video error");
+            video.innerHTML = topInnerHTML + innerHTML;
+          };
+        }
+      }
+    }
+    var audios = document.getElementsByTagName("audio");
+    for (let audio of audios) {
+      audio.setAttribute("preload", "none");
+      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 + "/"
+          );
+          //console.log("http://127.0.0.1:7657/i2psnark/" + location); //.host+"/"location.path)
+          console.log(
+            "http://127.0.0.1:7657/i2psnark/" + tmpsrc.host + tmpsrc.pathname
+          ); //+"/"location.path)
+          audio.src =
+            "http://127.0.0.1:7657/i2psnark/" + tmpsrc.host + tmpsrc.pathname;
+          audio.innerHTML = topInnerHTML; // + innerHTML;
+          audio.onerror = function () {
+            console.log("audio error");
+            audio.innerHTML = topInnerHTML + innerHTML;
+          };
+        }
+      }
+    }
+    var links = document.getElementsByTagName("a");
+    for (let link of links) {
+      let tmpsrc = new URL(link.href);
+      if (tmpsrc.host == location.host) {
+        if (
+          !tmpsrc.pathname.endsWith("html") &&
+          !tmpsrc.pathname.endsWith("htm") &&
+          !tmpsrc.pathname.endsWith("php") &&
+          !tmpsrc.pathname.endsWith("jsp") &&
+          !tmpsrc.pathname.endsWith("asp") &&
+          !tmpsrc.pathname.endsWith("aspx") &&
+          !tmpsrc.pathname.endsWith("atom") &&
+          !tmpsrc.pathname.endsWith("rss") &&
+          !tmpsrc.pathname.endsWith("/") &&
+          tmpsrc.pathname.includes(".")
+        ) {
+          link.href =
+            "http://127.0.0.1:7657/i2psnark/" + tmpsrc.host + tmpsrc.pathname;
+          link.onerror = function () {
+            window.location.href = tmpsrc.href;
+          };
+        }
+      }
+    }
+  }
+  return response;
+}
--- a/scrub.js
+++ b/scrub.js
--- a/sectorrent.html
+++ b/sectorrent.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <link href="search.css" rel="stylesheet">
+    <link href="home.css" rel="stylesheet"><!--<link href="info.css" rel="stylesheet">--><!--<link href="torrent/popup.css" rel="stylesheet">-->
+
+    <title>
+    </title>
+</head>
+<body>
+    <div id="browserpanel">
+        <div class="panel">
+            <div class="section-header panel-section panel-section-header" id="headline">
+                <div class="text-section-header" id="text-section-header">
+                    <h1 id="text-section-header">I2P Site Properties  | This I2P Site has peer-to-peer resources.</h1>
+                </div>
+            </div>
+        </div>
+
+        <div class="panel">
+            <ul>
+                <li>
+                    <div class="address-info">
+                        <div id="addresstype">
+                            <span id="TypeLabel">Address Type:</span> <span id="Type"></span>
+                            <div id="TypeInfo">
+                                <span id="AddressInfo"></span>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+
+                <li>
+                    <div class="tls-info">
+                        <div id="sitecert">
+                            <span id="CertLabel">Certificate Information:</span> <span id="Cert"></span>
+                            <div id="CertInfo">
+                                <span id="AddressCertInfo"></span>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+
+                <li>
+                    <div id="signingcert">
+                        <span id="SignedLabel">Signed By:</span> <span id="Signed"></span>
+                    </div>
+                </li>
+            </ul>
+        </div>
+        <div class="panel">
+            <p>
+            To help distribute the site content, use the links below to join the swarm.
+            </p>
+            <ul>
+                <li>
+                    <div class="address-info">
+                      <span id="TorrentTypeLabel">Torrent Links:</span> <span id="Type"></span>
+                      <div id="TorrentTypeInfo">
+                      </div>
+                    </div>
+                </li>
+            </ul>
+        </div>
+    </div>
+    <script src="cert.js"></script>
+    <script src="torrent.js"></script>
+</body>
+</html>
--- a/security.html
+++ b/security.html
@@ -3,8 +3,7 @@
 <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">-->
+    <link href="home.css" rel="stylesheet"><!--<link href="info.css" rel="stylesheet">--><!--<link href="torrent/popup.css" rel="stylesheet">-->

    <title>
    </title>
--- a/sidebar.css
+++ b/sidebar.css
@@ -14,4 +14,10 @@ button {
 }
 .button-list {
  display: inline
+}
+#hidden {
+  display: none
+}
+.hidden {
+  display: none
 }
--- a/susimail.png
+++ b/susimail.png
--- a/toopie.png
+++ b/toopie.png
--- a/torrent.html
+++ b/torrent.html
@@ -4,7 +4,7 @@
    <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">-->
+    <!--<link href="info.css" rel="stylesheet">--><!--<link href="torrent/popup.css" rel="stylesheet">-->

    <title>
    </title>
--- a/torrent/README.md
+++ b/torrent/README.md
@@ -1,4 +1,4 @@
-Acknowledgement
+Acknowledgementindex
 ===============

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

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

 Click the "Install Plugin" button and you'll be ready to go. Now, open the
 extension options menu, and just click "Save." The defaults are correct for use
--- a/torrent/index.html
+++ b/torrent/index.html
@@ -6,7 +6,7 @@
  <link rel="stylesheet" type="text/css" href="../sidebar.css" />
 </head>
 <body>
-<h1>Acknowledgement</h1>
+<h1>Acknowledgementindex</h1>

 <p><strong>Many, many thanks to the <a href="https://github.com/myfreeweb/transmitter">Transmitter</a>
 webextension.</strong></p>
--- a/torrent/popup.js
+++ b/torrent/popup.js
@@ -7,12 +7,17 @@ var TrpcCall = async function(meth, args) {
    'x-transmission-session-id': server.session,
  };
  console.log('(torrent) session', server.session);
-  if (server.username !== '' || server.btrpcpass !== '') {
+  if (server.username !== '' || server.bt_rpc_pass !== '') {
    myHeaders['Authorization'] =
-      'Basic ' + btoa((server.username || '') + ':' + (server.btrpcpass || ''));
+      'Basic ' +
+      btoa((server.username || '') + ':' + (server.bt_rpc_pass || ''));
  }
-  console.log('(torrent) rpcurl', server.base_url + 'rpc');
-  return fetch(server.base_url + 'rpc', {
+
+  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 }),
@@ -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/transmissionrpc.png
+++ b/transmissionrpc.png
--- a/window.html
+++ b/window.html
@@ -35,11 +35,12 @@
                </div>

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

                <div id="i2pbrowser-description">
                    <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>

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

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

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

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

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

--- a/x-i2p-torrentlocation.png
+++ b/x-i2p-torrentlocation.png
Author	SHA1	Message	Date
idk	7fbfa52109	add hidden manifest to .gitignore	2021-08-30 22:35:51 -04:00
idk	c926d3a5f0	check in point release change	2021-08-30 22:35:13 -04:00
idk	1c318eb384	Re-enable closure compiler	2021-08-08 11:36:35 -04:00
idk	00da7107bd	re-enable the better linter(requires docker)	2021-07-24 20:43:55 -04:00
idk	b402dc10e6	This is never getting Chrome compatibility back. The Chrome, Chromium, Brave, edgium(<--Worst browser ever, and I'm including IE, the second-worst browser ever) is going to have to be a completely different codebase basically forever	2021-07-24 19:11:35 -04:00
idk	02f3cc871d	Wait until after we confirm it's an I2P site to set pageAction	2021-07-08 22:19:22 -04:00
idk	5d260c5a3e	Well I guess moz-sign has to fail at release time now because amo is 504 when I try to cut a release	2021-07-08 14:40:24 -04:00
idk	b5758839e1	bump version and release	2021-07-07 23:27:43 -04:00
idk	a473da6a8e	bump version and release	2021-07-07 22:58:55 -04:00
idk	75b4ff4b60	Merge pull request #111 from eyedeekay/code-cleanup Code cleanup	2021-07-08 02:57:13 +00:00
idk	d3cf9e8686	bump strict-min-version so the validator shuts up, nobody's as far back as Firefox 60 right now	2021-07-07 22:53:14 -04:00
idk	7bd7701aeb	Remove obsolete workaround to theme reset issue	2021-07-07 22:34:01 -04:00
idk	87c3a62f25	connection interrupted mid release, retry failed validation. Bump and retry	2021-07-07 22:01:36 -04:00
idk	4bc984a72d	connection interrupted mid release, retry failed validation. Bump and retry	2021-07-07 21:58:30 -04:00
idk	7b6438dce5	fix some background-theme stuff	2021-07-07 21:55:35 -04:00
idk	80d5367fed	Merge pull request #110 from eyedeekay/code-cleanup Code cleanup	2021-07-08 01:42:55 +00:00
idk	a7902632bc	Un-bump version, fix some issues with internationalization on releases	2021-07-07 21:40:53 -04:00
idk	199e6577bb	bump version	2021-07-07 21:30:34 -04:00
idk	00fd0aed62	fmt-prettier	2021-07-07 21:28:06 -04:00
idk	daaebe027d	add missing names to proxy.js	2021-07-07 15:15:45 -04:00
idk	3d39e75ffd	mind our own business re: container tab proxy settings	2021-07-07 15:12:59 -04:00
idk	e013c093d8	Upgrade the version number to build a rhizome	2021-05-31 17:19:42 -04:00
idk	5b51fc2c27	add variant extension name	2021-05-31 15:09:23 -04:00
idk	65e43abe02	Remove a whole bunch of redundant code related to forcing a contextual identity to it's own function. Only Snark(Due to X-I2P-Torrentlocation) needs it's own isolator now, everybody else can use the same one. Makes it easier to add new contexts.	2021-05-28 14:20:57 -04:00
idk	7f810f86d0	update graphics for icons with the ones provided by @shoalsteed	2021-05-26 18:32:58 -04:00
idk	899974c339	Fix quotes, update for release	2021-05-26 18:21:12 -04:00
idk	6f30aeaf06	update graphics for icons with the ones provided by @shoalsteed	2021-05-26 17:25:41 -04:00
idk	d285063b4f	add help pages for i2pcontrol and torrents	2021-05-26 15:11:46 -04:00
idk	ffa282671b	update transmission-rpc screenshot	2021-05-26 13:15:33 -04:00
idk	e9acc1fe35	update changelog	2021-05-26 12:57:41 -04:00
idk	04ebfedb84	fix options pages	2021-05-26 12:55:34 -04:00
idk	23d451cf92	update site	2021-05-26 12:01:26 -04:00
idk	44628a1358	update site	2021-05-26 11:58:31 -04:00
idk	04782aa099	update site	2021-05-26 11:57:43 -04:00
idk	ff4302eb2b	update screeenshots, add more screenshots	2021-05-26 11:32:35 -04:00
idk	9185a4daf2	add a context and proxy rules for railroad blog	2021-05-26 11:31:16 -04:00
idk	6b6a73dbdb	update screeenshots, add more screenshots	2021-05-26 11:15:47 -04:00
idk	1729656189	add a context and proxy rules for railroad blog	2021-05-25 16:59:38 -04:00
idk	08b31efbfc	Check proxy before extension URL	2021-05-24 15:41:51 -04:00
idk	e124d61115	Check proxy before extension URL	2021-05-24 15:41:17 -04:00
idk	e6e914cefe	Check proxy before extension URL	2021-05-24 15:40:35 -04:00
idk	4d2e68f79d	fix html	2021-05-24 15:35:35 -04:00
idk	b5bb8ec694	fix broken html	2021-05-24 15:29:02 -04:00
idk	f0651edb06	Merge pull request #107 from eyedeekay/thoroughly-delete-containers Various Bugfixes	2021-05-24 11:08:12 -07:00
idk	49ce0162d1	update changelog	2021-05-24 14:06:23 -04:00
idk	153a49e18f	some style fixes, issue with noscript when visiting susimail for the first time, ready for release	2021-05-24 14:03:11 -04:00
idk	88cc54217c	some style fixes, issue with noscript when visiting susimail for the first time, ready for release	2021-05-24 13:58:44 -04:00
idk	83bb92c0cb	some style fixes, issue with noscript when visiting susimail for the first time, ready for release	2021-05-24 13:57:37 -04:00
idk	f337e64b81	Merge branch 'secure-marking' into 'master' Create icon for each indicating state in the toolbar(HTTPS, Bittorrent,... See merge request idk/I2P-in-Private-Browsing-Mode-Firefox!23	2021-04-27 14:16:30 +00:00
idk	42f90273e2	prettier	2021-04-26 17:18:41 -04:00
idk	616d8429b7	Fix HTTPS marking, re-add http+i2p marking	2021-04-26 17:18:08 -04:00
idk	3261fd1505	fix Proxy Readyness visual indicator	2021-04-25 23:22:23 -04:00
idk	4ea8fd4826	start switching back to the old CSS which I liked better all along anyway, and which will be easier to make work in the future	2021-04-25 17:03:43 -04:00
idk	c899f7b1e7	Create icon for each indicating state in the toolbar(HTTPS, Bittorrent, HTTPS+Bittorrent, X-I2P-Location) with our own lock icons for .i2p sites, https .i2p sites	2021-04-25 16:18:41 -04:00
idk	02bc927262	Create icon for each indicating state in the toolbar(HTTPS, Bittorrent, HTTPS+Bittorrent, X-I2P-Location) with our own lock icons for .i2p sites, https .i2p sites	2021-04-25 16:05:07 -04:00
idk	5393d7f26f	Add new lock icons for I2P and I2P HTTPS secured sites	2021-04-19 19:07:18 -04:00
idk	fa66c26b09	Merge branch 'themes-again' into 'master' bump See merge request idk/I2P-in-Private-Browsing-Mode-Firefox!22	2021-02-05 18:04:33 +00:00
idk	eec31ad3db	bump	2021-02-05 13:03:30 -05:00
idk	3a770cb518	Merge branch 'themes-again' into 'master' Themes again See merge request idk/I2P-in-Private-Browsing-Mode-Firefox!21	2021-02-05 18:00:58 +00:00
idk	7de36bc86c	bump	2021-02-05 13:00:15 -05:00
idk	c0bf732253	fix merge issues	2021-02-05 12:58:35 -05:00
idk	49948a524e	fmt	2021-02-05 12:41:26 -05:00
idk	ac792dbcd5	fix x-i2p-torrentlocation bug	2021-02-01 12:55:39 -05:00
idk	db8508e75b	Merge branch 'themes-again' into 'master' fix the theme issue See merge request idk/I2P-in-Private-Browsing-Mode-Firefox!20	2021-01-31 06:13:58 +00:00
idk	95e0642126	Merge branch 'rpc-over-i2p' into 'master' Extensions run requests in what is effectively their own container for our... See merge request idk/I2P-in-Private-Browsing-Mode-Firefox!19	2021-01-31 06:11:51 +00:00
idk	54b5be97e2	fix the theme issue	2021-01-31 01:07:14 -05:00
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
idk	ac09b72be3	change the url for the MuWire test	2020-12-13 14:07:10 -05:00
idk	d901711c7b	Merge branch 'slightly-better-popup' into 'master' Slightly better popup See merge request idk/I2P-in-Private-Browsing-Mode-Firefox!18	2020-12-13 04:37:06 +00:00
idk	88517a7b52	bail out when the header has already been detected and the pageaction is already set	2020-12-12 23:33:25 -05:00
idk	39eb695522	fmt	2020-12-12 00:08:27 -05:00
idk	009bac364c	fmt	2020-12-11 20:49:16 -05:00
idk	9741b21def	fmt	2020-12-11 20:48:35 -05:00
idk	df7bc109ed	update popup css	2020-12-11 20:47:49 -05:00
idk	8cd9b53be3	update popup css	2020-12-11 20:18:58 -05:00
idk	9db61be253	Merge branch 'do-less' into 'master' Be less Interruptive in non-essential ways Closes #29 and #30 See merge request idk/I2P-in-Private-Browsing-Mode-Firefox!17	2020-12-12 01:16:18 +00:00
idk	78a1794568	fix sanity check on torrent proxy	2020-12-11 16:30:22 -05:00
idk	aa9805e107	Fix torrent-proxy sanity check	2020-12-11 15:42:28 -05:00
idk	a992553ffb	make embedding torrents in pages faster	2020-12-10 10:15:48 -05:00
idk	3a30961cd1	fix btProxy	2020-12-09 21:58:58 -05:00
idk	a6aba7b5f7	fix btProxy	2020-12-09 20:55:57 -05:00
idk	26c4152bf6	fix btProxy	2020-12-09 20:55:04 -05:00
idk	8230fe92a7	uninstall process	2020-12-09 20:53:15 -05:00
idk	6d0cda9e67	get ready to clean up after the extension when it uninstalls	2020-12-09 20:51:08 -05:00
idk	12992c461b	get ready to clean up after the extension when it uninstalls	2020-12-09 20:45:49 -05:00
idk	531963c1c0	filter the headers before we search them	2020-12-09 20:13:20 -05:00
idk	8bfb7cdd27	search the headers backward and break on the first one since the non-standard header is usually near the end	2020-12-09 18:20:48 -05:00
idk	40899889a0	correct promise resolution on scripts.js	2020-12-09 17:59:53 -05:00
idk	bc88ca80fd	re-enable tab-to-tab isolation	2020-12-09 17:53:31 -05:00
idk	3b3744ffff	Cheat at excluding MuWire from !	2020-12-09 17:49:36 -05:00
idk	9cd6ce888e	Try and bail out of all proxy-setting in the Wire Web App	2020-12-09 17:09:54 -05:00
idk	7b2216a12f	Nix timed x-i2p-torrentlocation stuff entirely	2020-12-09 16:43:08 -05:00
idk	1946669b82	pre-filter URL's for so we don't try to run isolator checks on domains that have no chance of needing isolation	2020-12-09 14:36:59 -05:00
idk	bb14021bc0	make it so we only launch containers out of firefox-default, rather than re-checking every single request	2020-12-09 14:19:59 -05:00
idk	51510abaed	Merge branch 'torrent-3' into 'master' Torrent 3 See merge request idk/I2P-in-Private-Browsing-Mode-Firefox!16	2020-12-06 18:35:18 +00:00
idk	f837eb18d5	Make it so clicking the pageaction also triggers the torrent check as a manual approach	2020-12-06 13:32:43 -05:00
idk	bf4b160dcd	fmt	2020-12-06 13:01:02 -05:00
idk	7bd08ab6e0	Check whether it's a torrent-enabled site much more often. It's still not quite right but it's much better now. Update priorities when it comes as a header instead of as a meta tag	2020-12-06 13:00:11 -05:00
idk	647c0523e8	Merge branch 'torrent-3' into 'master' Retain much tighter control of x-i2p-torrentlocation priorities See merge request idk/I2P-in-Private-Browsing-Mode-Firefox!15	2020-12-06 17:13:52 +00:00
idk	58b874d17f	Merge branch 'fix-the-search-thing' into 'master' Fix the search thing See merge request idk/I2P-in-Private-Browsing-Mode-Firefox!14	2020-12-06 17:11:22 +00:00
idk	969d2769fd	Merge branch 'irc-integration' into 'master' Irc integration See merge request idk/I2P-in-Private-Browsing-Mode-Firefox!13	2020-12-06 17:07:47 +00:00
idk	d88d6b2f61	Merge branch 'bookmarks-one-time' into 'master' Bookmarks one time See merge request idk/I2P-in-Private-Browsing-Mode-Firefox!12	2020-12-06 17:07:04 +00:00
idk	b420dc0a28	Merge branch 'master' into 'bookmarks-one-time' # Conflicts: # bookmarks.js # options/options.js # proxy.js	2020-12-06 17:06:47 +00:00
idk	0489a2774f	Merge branch 'i2pbote' into 'master' add a bote context, and when there are no more I2P browsing tabs, delete and... See merge request idk/I2P-in-Private-Browsing-Mode-Firefox!11	2020-12-06 17:04:33 +00:00
idk	49f394acca	resolve merge conflicts in proxy.js	2020-12-06 12:01:27 -05:00
idk	dd788b15ca	Merge branch 'dispatch' into 'master' Dispatch See merge request idk/I2P-in-Private-Browsing-Mode-Firefox!10	2020-12-06 16:45:35 +00:00
idk	84981fa801	fmt	2020-12-06 11:39:50 -05:00
idk	d328dd1ca0	use an onerror event to set the fallback http url for alt torrents	2020-12-06 11:39:14 -05:00
idk	590f2c7cd8	use an onerror event to set the fallback http url for alt torrents	2020-12-06 02:31:36 -05:00
idk	e93ad94c89	Don't preload resources if we think they could be torrents	2020-12-06 02:12:01 -05:00
idk	203decf121	fix the search thing	2020-12-05 23:53:24 -05:00
idk	5ab871b51f	fix the search thing	2020-12-05 23:43:37 -05:00
idk	858d03fa2b	fix the search thing	2020-12-05 22:06:15 -05:00
idk	374ce51eff	fmt	2020-12-03 13:17:06 -05:00
idk	cd3dafe9c8	fmt	2020-12-03 12:20:43 -05:00
idk	8c256241cb	only create bookmarks on the initial run, provide option to re-create them in preferences menu	2020-12-03 12:19:58 -05:00
idk	18cc8eb962	add a bote context, and when there are no more I2P browsing tabs, delete and recreate the context to assure privacy	2020-12-01 18:07:25 -05:00
idk	691dff77a0	fmt	2020-11-10 22:57:33 -05:00
idk	0910986d52	add a tab layer of granularity to isolator	2020-11-10 22:56:27 -05:00