bump strict-min-version so the validator shuts up, nobody's as far back as Firefox 60 right now

Remove obsolete workaround to theme reset issue
fix some background-theme stuff
2021-07-07 22:53:14 -04:00 · 2021-07-07 22:34:01 -04:00 · 2021-07-07 21:55:35 -04:00 · 2021-07-07 21:40:53 -04:00 · 2021-07-07 21:30:34 -04:00 · 2021-07-07 21:28:06 -04:00
48 changed files with 1196 additions and 484 deletions
--- a/26
+++ b/26
@ -37,11 +37,11 @@ clean: rc clean-artifacts
 ## EVEN RELEASES are AMO RELEASES
 ## ODD RELEASES are SELFHOSTED RELEASES

-MOZ_VERSION=0.100
-VERSION=0.99
+MOZ_VERSION=0.108
+VERSION=0.107

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

 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)/node_modules/web-ext/bin/web-ext sign --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET)
 	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)/node_modules/web-ext/bin/web-ext sign --channel listed --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET); true
 	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)/node_modules/web-ext/bin/web-ext run --firefox /usr/bin/firefox -u "about:devtools-toolbox?type=extension&id=i2ppb%40eyedeekay.github.io"

 snark-mirror:
 	http_proxy=http://127.0.0.1:4444 wget -c -O ../i2psnark-rpc.su3 http://stats.i2p/i2p/plugins/i2psnark-rpc.su3
@ -345,7 +345,7 @@ wire:
 	cp -v "../i2ppb-$(VERSION)@eyedeekay.github.io.xpi" "$(HOME)/i2p/MuWireDownloads/"

 ndtest:
-	web-ext run -u about:debugging \
+	$(HOME)/node_modules/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 \
@ -359,7 +359,7 @@ ndtest:
 		-u https://ramble.pw/f/i2p \

 lht-test:
-	web-ext run -u about:debugging \
+	$(HOME)/node_modules/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 \
--- 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.99",
+    "message": "0.107",
    "description": "Version of the extension."
  },
  "proxyFailedStatus": {
@ -167,6 +171,14 @@
    "message": "Dispatch IRC (Private)",
    "description": "Preface for the browser titlebar"
  },
+  "blogPreface": {
+    "message": "Blog",
+    "description": "Preface for the browser titlebar"
+  },
+  "blogPrefacePrivate": {
+    "message": "Blog (Private)",
+    "description": "Preface for the browser titlebar"
+  },
  "botePreface": {
    "message": "I2P-Bote Mail",
    "description": "Preface for the browser titlebar"
--- a/_locales/es/messages.json
+++ b/_locales/es/messages.json
@ -3,6 +3,10 @@
    "message": "I2P en navegación privada",
    "description": "Nombre de la extensión."
  },
+  "extensionNameVariant": {
+    "message": "I2P en navegación privada - Rhizome",
+    "description": "Nombre de la extensión."
+  },
  "toopieName": {
    "message": "toopie.html",
    "description": "Nombre de la barra lateral."
@ -16,7 +20,7 @@
    "description": "Descripción de la extensión."
  },
  "extensionVersion": {
-    "message": "0,99",
+    "message": "0,107",
    "description": "Versión de la extensión."
  },
  "proxyFailedStatus": {
@ -167,6 +171,14 @@
    "message": "Despacho de IRC (privado)",
    "description": "Prefacio de la barra de título del navegador"
  },
+  "blogPreface": {
+    "message": "Blog",
+    "description": "Prefacio de la barra de título del navegador"
+  },
+  "blogPrefacePrivate": {
+    "message": "Blog (Private)",
+    "description": "Prefacio de la barra de título del navegador"
+  },
  "botePreface": {
    "message": "I2P-Bote Mail",
    "description": "Prefacio de la barra de título del navegador"
--- a/alternate-address.png
+++ b/alternate-address.png
--- a/background.js
+++ b/background.js
@ -16,6 +16,8 @@ var extensionpref = chrome.i18n.getMessage("extensionPreface");
 var muwirepref = chrome.i18n.getMessage("muwirePreface");
 var muwireprefpriv = chrome.i18n.getMessage("muwirePrefacePrivate");
 var botepref = chrome.i18n.getMessage("botePreface");
+var blogpref = chrome.i18n.getMessage("blogPreface");
+var blogprefpriv = chrome.i18n.getMessage("blogPrefacePrivate");

 function onError(err) {
  console.log("(background)", err);
@ -43,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({
@ -192,7 +203,8 @@ let dtheme = {
 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() {
@ -204,39 +216,49 @@ function themeWindow(window) {
  }

  function browserTheme() {
-    console.log("Active in I2P window");
+    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) {
        browserTheme();
        browser.pageAction.show(tabInfo[0].id);
      } else if (context.name == routerpref) {
-        console.log("Active in Router Console window");
+        console.log("(theme) Active in Router Console window");
        dynamicTheme();
      } else if (context.name == tunnelpref) {
-        console.log("Active in Hidden Services Manager window");
+        console.log("(theme) Active in Hidden Services Manager window");
        dynamicTheme();
      } else if (context.name == mailpref) {
-        console.log("Active in Web Mail window");
+        console.log("(theme) Active in Web Mail window");
        dynamicTheme();
      } else if (context.name == torrentpref) {
-        console.log("Active in Bittorrent window");
+        console.log("(theme) Active in Bittorrent window");
        dynamicTheme();
      } else if (context.name == botepref) {
-        console.log("Active in Bote window");
+        console.log("(theme) Active in Bote window");
        dynamicTheme();
      } else if (context.name == ircpref) {
-        console.log("Active in IRC window");
+        console.log("(theme) Active in IRC window");
+        dynamicTheme();
+      } else if (context.name == blogpref) {
+        console.log("(theme) (theme) Active in Blog window");
        dynamicTheme();
      } else if (context.name == muwirepref) {
-        console.log("Active in MuWire window");
+        console.log("(theme) Active in MuWire window");
        dynamicTheme();
+      } else {
+        console.log("(theme) Not active in MuWire window");
+        browser.theme.reset();
      }
    }
    if (
@ -247,23 +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) {
-          try {
-            browser.theme.update(window.id, them.originalTheme);
-          } catch (e) {
-            console.log(
-              "Original theme set error. Your theme must have an SVG in it.",
-              e
-            );
-          }
-        } else {
-          browser.theme.update(window.id, { colors: null });
-        }
-      }
-      browser.storage.local.get("originalTheme").then(unSetTheme, onError);
+      console.log("(theme) Not active in I2P window");
+      browser.theme.reset();
    }
  }

@ -310,6 +317,9 @@ function setTitle(window) {
      } else if (context.name == mailpref) {
        console.log("Active in I2P Web Mail window");
        setTitle(mailpref, mailprefpriv);
+      } else if (context.name == blogpref) {
+        console.log("Active in I2P Blog window");
+        setTitle(blogpref, blogprefpriv);
      } else if (context.name == torrentpref) {
        console.log("Active in I2P Torrent window");
        setTitle(torrentpref, torrentprefpriv);
@ -365,52 +375,6 @@ gettingListenerInfo.then((got) => {
  }
 });

-function handleUpdated(updateInfo) {
-  function maybeSet(them) {
-    console.log("original theme found:", them, Object.keys(them).length);
-    try {
-      if (updateInfo.theme.colors != null) {
-        console.log(
-          "testing theme",
-          updateInfo.theme.colors.toolbar,
-          "!=",
-          btheme.colors.toolbar
-        );
-        console.log(
-          "testing theme",
-          updateInfo.theme.colors.toolbar,
-          "!=",
-          dtheme.colors.toolbar
-        );
-        if (
-          updateInfo.theme.colors.toolbar != dtheme.colors.toolbar &&
-          updateInfo.theme.colors.toolbar != btheme.colors.toolbar
-        ) {
-          function onSet() {
-            console.log("stored theme:", updateInfo.theme);
-          }
-          /*if (
-            updateInfo.theme.colors != null &&
-            updateInfo.theme.images != null &&
-            updateInfo.theme.properties != null
-          ) {*/
-          console.log("storing theme:", updateInfo.theme);
-          browser.storage.local
-            .set({ originalTheme: updateInfo.theme })
-            .then(onSet, onError);
-          //}
-        }
-      }
-    } catch (e) {
-      console.log("theme storage error", e);
-    }
-  }
-  console.log("Handling theme", updateInfo);
-  browser.storage.local.get("originalTheme").then(maybeSet, onError);
-}
-
-browser.theme.onUpdated.addListener(handleUpdated);
-
 function handleClick() {
  console.log("Opening page action");
  browser.pageAction.openPopup();
--- a/clearweb.png
+++ b/clearweb.png
--- a/content.js
+++ b/content.js
@ -50,6 +50,10 @@ contentUpdateById("releases", "releases");

 fetch("http://proxy.i2p").then((myJson) => {
  contentUpdateById("proxy-check", "proxySuccessStatus");
+  let readyness = document.querySelectorAll(".readyness");
+  if (readyness != null) {
+    hide(readyness);
+  }
 });

 function hide(elements) {
@ -76,3 +80,13 @@ fetch("http://127.0.0.1:7657/themes/console/light/images/i2plogo.png")
    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/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,32 @@
+i2psetproxy.js (0.107-1) UNRELEASED; urgency=low
+
+  * Small code fixes
+  * Fix for interference with non-I2P containers
+
+ -- idk <hankhill19580@gmail.com> Wed, 26 May 2021 12:56:56 -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
--- a/home.html
+++ b/home.html
@ -1,9 +1,152 @@
 <!DOCTYPE html>
 <html>
 <head>
+    <meta charset="utf-8">
+    <link href="home.css" rel="stylesheet">
+    <link href="search.css" rel="stylesheet">
+    <link href="sidebar.css" rel="stylesheet">
    <title>
    </title>
 </head>
 <body>
+    <!--<div>-->
+
+    <div class='background'>
+        <div class='content'>
+            <div class="text-section-header">
+                <h1 id="text-section-header">I2P Browsing</h1>
+            </div>
+
+            <div id="i2pbrowser-version">
+            </div>
+
+            <div id="i2pbrowser-description">
+                <p id="description">I2P in Private Browsing is a webextension to secure and enhance your I2P use in the browser.</p>
+
+                <p id="beta">This is an experimental product.</p>
+            </div>
+
+            <div id="readyness">
+                <!--<div id="consoleOn" class="hideIfI2PConsoleOff">
+              <img class="readyness" src="http://proxy.i2p/themes/console/images/local_up.png" alt="Proxy is not ready."/>
+              <span id="proxy-check">Proxy is ready.</span>
+            </div>-->
+                <!--<div id="proxyUnready" class="hideIfI2PProxyOn">The proxy is not ready yet.</div>-->
+
+                <div class="hideIfI2PProxyOff" id="proxyReady">
+                    <img alt="Proxy is not ready." class="readyness" src="http://proxy.i2p/themes/console/images/local_up.png"> <span id="proxy-check">Proxy is ready.</span>
+                </div>
+            </div>
+
+            <div class="hideIfI2PConsoleOff" id="onboarding">
+                <h3 id="onboardingTitle">New to I2P? Learn more here.</h3>
+
+                <h4 id="onboardingZero"><button class="showhider" id="onboardingButtonZero">Protect your Privacy</button>
+                </h4>
+
+                <p class="onboardingContent" id="onboardingContentZero">I2P Browser allows you to surf the internet using the private and secure I2P network. When using it, you are protected against tracking, surveillance, and censorship as a first-class participant in the I2P network. I2P Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser.</p>
+
+                <h4 id="onboardingOne"><button class="showhider" id="onboardingButtonOne">Configure your Experience</button>
+                </h4>
+
+                <p class="onboardingContent" id="onboardingContentOne">We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. Note: By default, NoScript and HTTPS Everywhere are not included on the toolbar, but you can customize your toolbar to add them. With all the security and privacy features provided by I2P, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.</p>
+
+                <h4 id="onboardingTwo"><button class="showhider" id="onboardingButtonTwo">Share Files</button>
+                </h4>
+
+                <p class="onboardingContent" id="onboardingContentTwo">I2P is capable of using peer-to-peer applications like BitTorrent, protecting your identity when you share files. Our anonymous bittorrent client is available in the browser.</p>
+
+                <h4 id="onboardingThree"><button class="showhider" id="onboardingButtonThree">Hidden e-mail</button>
+                </h4>
+
+                <p class="onboardingContent" id="onboardingContentThree">There is also an anonymous e-mail service available inside of I2P, which is accessible from our browser via the menu directly below.</p>
+
+                <h4 id="onboardingFour"><button class="showhider" id="onboardingButtonFour">Experience Tips</button>
+                </h4>
+
+                <p class="onboardingContent" id="onboardingContentFour">With all the security and privacy features provided by I2P, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.</p>
+            </div>
+            <!--<p class="hideIfI2POn">&aboutI2p.warn_not_running; <a href="about:i2p">&aboutI2p.refresh_text;</a> &aboutI2p.reccommend_not_running;</p>-->
+
+            <div class="application-info">
+                <p class="hideIfI2PConsoleOff">
+                </p>
+
+                <h3 id="applicationHeader">Applications</h3>
+
+                <p id="applicationExplain">These applications use I2P to provide them with security and privacy.</p>
+
+                <ul>
+                    <!--<li class="application">
+                        <a class="applicationName" href="http://legwork.i2p" id="window-link-toopie" target="_blank">Search:</a> <span class="applicationDesc" id="search">Legwork is an in-I2P search engine.</span>
+                        <div class="topnav">
+                            <form action="http://legwork.i2p/yacysearch.html?" method="get">
+                                <input id="search-query" name="query" placeholder="Search on legwork.i2p(Opens a new tab)" type="search"> <input id="search-submit" text="Submit" type="submit">
+                            </form>
+                        </div>
+                    </li>-->
+
+                    <li class="application 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">
+                        <a class="applicationName" href="http://127.0.0.1:7657/" id="window-visit-router">Router Console</a> <span class="applicationDesc" id="routerConsole">The entrypoint for all other I2P applications is the I2P Router Console. To visit it, click here.</span>
+                    </li>
+
+                    <li class="application">
+                        <a class="applicationName" href="http://127.0.0.1:7657/i2ptunnel" id="window-visit-i2ptunnel">Hidden Services Manager</a> <span class="applicationDesc" id="i2ptunnel">I2P has a web-based interface for configuring .i2p services like web sites, to set up your own web sites, go here:</span>
+                    </li>
+
+                    <li class="application">
+                        <a class="applicationName" href="http://127.0.0.1:7657/susimail" id="window-visit-susimail">E-Mail</a> <span class="applicationDesc" id="susimail">I2P also bundles a webmail client which can be used to access in-I2P e-mail. To use it, go here:</span>
+                    </li>
+
+                    <li class="application">
+                        <a class="applicationName" href="http://127.0.0.1:7657/i2psnark" id="window-visit-snark">BitTorrent</a> <span class="applicationDesc" id="snark">I2P is capable of anonymous Peer-to-Peer file sharing, to use the built-in bittorrent client go here:</span>
+                    </li>
+                </ul>
+
+                <p>
+                </p>
+            </div>
+
+            <div class="extended-info">
+                <h3 id="links"><button class="showhider" id="fliplinks">Links</button>
+                </h3>
+
+                <div id="info-content">
+                    <p id="linksExplain">If you want to get more information about I2P, you can visit these links.</p>
+
+                    <p>
+                    </p>
+
+                    <ul>
+                        <li class="application">
+                            <a href="http://i2p-projekt.i2p/" id="window-visit-i2p">I2P Project Homepage:</a> <span class="applicationDesc" id="i2ppage">More information is available here.</span>
+                        </li>
+
+                        <li class="application">
+                            <a href="/index.html" id="window-visit-homepage">Webextension Homepage:</a> <span class="applicationDesc" id="webpage">More information is available here.</span>
+                        </li>
+
+                        <li class="application">
+                            <a href="http://git.idk.i2p/idk/I2P-in-Private-Browsing-Mode-Firefox" id="window-visit-sources">Source Code:</a> <span class="applicationDesc" id="sources">Browse the source of this webextension or contribute here.</span>
+                        </li>
+
+                        <li class="application">
+                            <a href="http://git.idk.i2p/idk/I2P-in-Private-Browsing-Mode-Firefox/-/releases" id="window-visit-releases">Releases:</a> <span class="applicationDesc" id="releases">Check for new releases here.</span>
+                        </li>
+                    </ul>
+
+                    <p>
+                    </p>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script src="home.js" type="text/javascript"></script> 
+    <script src="content.js" type="text/javascript"></script> <!--</div>-->
+    <script src="i2pcontrol/i2pcontrol.js" type="text/javascript"></script> <!--</div>-->
 </body>
 </html>
--- a/host.js
+++ b/host.js
@ -24,10 +24,12 @@ 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;
--- 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/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/torrents.png
+++ b/icons/torrents.png
--- a/images/gear.png
+++ b/images/gear.png
--- a/index.html
+++ b/index.html
@ -1,9 +1,234 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>
-    </title>
+  <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>
+
+<p>This is an webextension which introduces a set of new "Private Browsing" modes
+to Firefox-based browsers(Supporting webextensions) that makes it easier to
+configure a browser to use I2P securely and adds features for making I2P
+applications easier to use. It does this by isolating I2P-specific settings to
+Contextual Identities within Firefox, then loading them automatically when the
+user requests them. It also adds convenience and management features, like an
+embedded I2P console and Bittorrent integration with clients using the
+transmission-rpc API.</p>
+
+<h2>Privacy Policy</h2>
+
+<p>This browser extension does not collect any personal information. It requires
+access to local storage and browsing data permissions in order to delete them
+when directed to by the user. This browser extension does not transmit any
+information to any third party, nor will it, ever.</p>
+
+<p>This browser extension cannot influence telemetry carried out by browser vendors
+to determine performance in their distribution channels, nor can it mitigate any
+other browser vendor telemetry. </p>
+
+<p>This browser extension is entirely Free, Open-Source software.</p>
+
+<h2>Installation(Cross-Platform):</h2>
+
+<p>For desktop users this addon is available from addons.mozilla.org, where you
+will be able to recive automatic updates:
+<a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">I2P in Private Browsing</a>.</p>
+
+<h2>Debian Installation:</h2>
+
+<p>Should you prefer, it is possible to install this extension system-wide by
+side-loading it into Debian. You can generate your own deb file by running the
+command:</p>
+
+<pre><code>    make deb
+</code></pre>
+
+<p>and then you can install it with:</p>
+
+<pre><code>    sudo apt install ../i2psetproxy.js_*.deb
+</code></pre>
+
+<h2>Bittorrent Download:</h2>
+
+<p>The self-hosted plugin is available from bittorrent both within the I2P and
+Clearnet Bittorrent network(With a web seed to support it in case one goes
+dead).</p>
+
+<ul>
+<li><a href="magnet:?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>
+
+<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>
+
+<h3>Features</h3>
+
+<ul>
+<li>[done] <strong>Provide</strong> a way to launch into an I2P-Specific contextual identity
+(container). Intercept requests to .i2p domains and automatically route them
+to the I2P container. Isolate the router console from other local
+applications by automatically intercepting requests to the router console to
+another container.</li>
+<li><img 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>
+
+<h3>Video</h3>
+
+<ul>
+<li><img src="i2psetproxy.js.gif" alt="Video of the plugin in action" title="" /></li>
+</ul>
+
+<h2>Documents</h2>
+
+<ul>
+<li><strong><a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/download/docs/Browser.Design.Documentation.pdf">Browser Outline</a></strong>: This document is an outline of each of
+the browser extension's feature panels in presentation form.</li>
+<li><strong><a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/download/docs/Landing.Page.Documentation.pdf">Smart Lander Design</a></strong>: This is the original outline of
+the smart landing page which became the I2P home page within the browser and
+the drop-down control panel.</li>
+<li><strong><a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/wiki/Other-Extensions">Other extensions</a></strong>: and how they work with this one.</li>
+</ul>
+
+<h2>Super Extra Important Background Info:</h2>
+
+<p>This plugin's viability is directly related to the viability of Mozilla and
+Tor's work on hardening Firefox itself and of particular interest are the
+"Uplift" and "Fusion(Firefox Using Onions)" projects.</p>
+
+<h3>Links about Project Uplift</h3>
+
+<ul>
+<li><a href="https://wiki.mozilla.org/Security/Tor_Uplift">Tor Uplift</a> is a project which
+brings important features of the Tor Browser to the mainstream of Firefox
+users by including patches from Tor Browser Bundle into Firefox where it is
+appropriate.</li>
+<li><a href="https://wiki.mozilla.org/Security/FirstPartyIsolation">First Party Isolation</a>
+is a feature in Firefox and other browsers which keeps information from
+leaking across first-party domains.</li>
+<li><a href="https://wiki.mozilla.org/Security/Fingerprinting">Fingerprinting</a> is a
+technique where a tracker attempts to extract unique information about a user
+from a side-channel in order to create an identifier that can be used to
+correlate the user across many sites.</li>
+<li><a href="https://wiki.mozilla.org/Security/Fennec%2BTor_Project">Fennec</a> is Firefox
+for Android and this link has some analysis of the privacy consequences of the
+Android platform.</li>
+<li><a href="https://wiki.mozilla.org/Security/Tor_Uplift/Tracking">Tracking</a> in Firefox
+is surveyed here.</li>
+</ul>
+
+<p>Project uplift seems to have largely been accomplished?</p>
+
+<h3>Links about Project Fusion</h3>
+
+<ul>
+<li><a href="https://wiki.mozilla.org/Security/Fusion">Project Fusion</a> or Firefox using
+Onions is a joint Mozilla/Tor effort to create an enhanced Private Browsing
+mode for Firefox which uses Tor.</li>
+<li><a href="https://trac.torproject.org/projects/tor/wiki/org/meetings/2018Rome/Notes/FusionProject">Notes</a>
+from a meeting about Fusion.</li>
+<li><a href="https://blog.torproject.org/tor-heart-firefox">Tor at the Heart: Firefox</a> is
+a blog about Tor and the relationship they have to Firefox re: TBB, Fusion.</li>
+</ul>
+
+<h2>The <strong>Other</strong> Version</h2>
+
+<p>New versions of this extension create an I2P in Private Browsing mode instead,
+using container tabs.</p>
+
+<p>Since this is a drastic change to the behavior of the old plugin, and since there
+is no UI a new entry
+for the new plugin has been made at a new location on addons.mozilla.org.</p>
+
+<ul>
+<li><p>This is the new version: <a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">[link]</a></p></li>
+<li><p>This is the old version: <a href="https://addons.mozilla.org/en-US/firefox/addon/I2P-Proxy/">[link]</a></p></li>
+</ul>
+
+<h2>Android usage:</h2>
+
+<p>Use the old version, on either an old version of Firefox(pre-68) or by enabling
+this custom collection: [Recommended Plugins] https://addons.mozilla.org/en-US/firefox/collections/14614396/I2P-Browser-Fork/</p>
 </body>
 </html>
--- a/info.js
+++ b/info.js
@ -123,6 +123,12 @@ document.addEventListener("click", (clickEvent) => {
  } else if (clickEvent.target.id === "window-visit-index") {
    console.log("attempting to create index tab");
    goIndex();
+  } else if (clickEvent.target.id === "window-visit-torrent") {
+    console.log("attempting to create torrent tab");
+    goTorrent();
+  } else if (clickEvent.target.id === "window-visit-help") {
+    console.log("attempting to create torrent tab");
+    goHelp();
  } else if (clickEvent.target.id === "window-visit-homepage") {
    console.log("attempting to create homepage tab");
    goHome();
@ -197,6 +203,9 @@ function showTorrentsMenu() {
 }

 function goHome() {
+  function onTabError() {
+    console.log("Help tab created");
+  }
  function gotProxyInfo(info) {
    let port = info.value.http.split(":")[1];
    if (port == "7644") {
@ -223,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",
@ -233,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");
--- a/lander.png
+++ b/lander.png
--- 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": [
@ -27,7 +27,7 @@
  ],
  "manifest_version": 2,
  "name": "__MSG_extensionName__",
-  "version": "0.95",
+  "version": "0.107",
  "description": "__MSG_extensionDescription__",
  "homepage_url": "https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox",
  "icons": {
@ -49,7 +49,7 @@
  "page_action": {
    "browser_style": true,
    "default_title": "__MSG_toopieTLS__",
-    "default_icon": "icons/toopie.png",
+    "default_icon": "icons/i2plogo.png",
    "show_matches": [
      "http://*.i2p/*",
      "https://*.i2p/*",
--- a/menu.png
+++ b/menu.png
--- a/options/options.html
+++ b/options/options.html
@ -1,9 +1,96 @@
 <!DOCTYPE html>
 <html>
 <head>
+    <meta charset="utf-8">
+    <link href="/home.css" rel="stylesheet">
+    <link href="options.css" rel="stylesheet">
    <title>
    </title>
 </head>
 <body>
+    <section class="scheme-options">
+        <span class="title">Proxy Scheme:</span> <select id="proxy_scheme">
+            <option selected value="http">
+                HTTP
+            </option>
+            <option value="socks5">
+                SOCKS5
+            </option>
+        </select>
+    </section>
+
+    <section class="scheme-options">
+        <span class="title">Bookmarks Status:</span>
+        <input 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">
+        <br>
+        <label id="hostText">Port:</label> <input data="port" id="port" type="text" value="4444">
+    </section>
+    <!--<section class="scheme-options identity-options">
+      <div class="panel">
+        <div id="identity-list">Identity list?</div>
+      </div>
+    </section>-->
+
+    <section class="scheme-options console-options" id="console-options">
+        <div>
+            <div class="title">
+                Router Console Options
+            </div>
+
+            <p id="controlHelpText">Configure your router console options here.</p>
+            <label id="controlPortText">Console Host:</label> <input data="controlhost" id="controlhost" type="text" value="127.0.0.1">
+            <br>
+            <label id="controlHostText">Console Port:</label> <input data="controlport" id="controlport" type="text" value="7657">
+        </div>
+    </section>
+
+    <section class="scheme-options control-options" id="control-options">
+        <div>
+            <div class="title">
+                I2PControl RPC Client Options
+            </div>
+
+            <p id="rpcHelpText">Configure your I2PControl options here.</p>
+            <label id="rpcPortText">Control Host:</label> <input data="rpchost" id="rpchost" type="text" value="127.0.0.1">
+            <br>
+            <label id="rpcHostText">Control Port:</label> <input data="rpcport" id="rpcport" type="text" value="7657">
+            <br>
+            <label id="rpcPathText">Control Path:</label> <input data="rpcpath" id="rpcpath" type="text" value="jsonrpc">
+            <br>
+            <label id="rpcPassText">Control Password:</label> <input data="rpcpass" id="rpcpass" type="text" value="itoopie">
+        </div>
+    </section>
+
+    <section class="scheme-options transmission-options" id="transmission-options">
+        <div>
+            <div class="title">
+                Bittorrent RPC Client Options
+            </div>
+
+            <p id="rpcHelpText">Configure your Bittorrent options here.</p>
+            <label id="btRpcHostText">Torrent RPC Host:</label> <input data="btrpchost" id="btrpchost" type="text" value="127.0.0.1">
+            <br>
+            <label id="btRpcPortText">Torrent RPC Port:</label> <input data="btrpcport" id="btrpcport" type="text" value="7657">
+            <br>
+            <label id="btRpcPathText">Torrent RPC Path:</label> <input data="btrpcpath" id="btrpcpath" type="text" value="transmission/">
+            <br>
+            <label id="rpcPassText">Torrent RPC Password:</label> <input data="btrpcpass" id="btrpcpass" type="text" value="">
+        </div>
+    </section>
+    <input id="save-button" type="button" value="Save preferences"> 
+    <script src="options.js"></script>
+    <script src="/bookmarks.js"></script> <!--<script src="/torrent/browser-polyfill.min.js"></script>
+    <script src="/torrent/options.js"></script>-->
 </body>
 </html>
--- a/proxy.js
+++ b/proxy.js
@ -1,10 +1,15 @@
 var titlepref = chrome.i18n.getMessage("titlePreface");
 var webpref = chrome.i18n.getMessage("webPreface");
-var ircpref = chrome.i18n.getMessage("ircPreface");
-var torrentpref = chrome.i18n.getMessage("torrentPreface");
 var routerpref = chrome.i18n.getMessage("routerPreface");
-var routerprefpriv = chrome.i18n.getMessage("routerPrefacePrivate");
+var mailpref = chrome.i18n.getMessage("mailPreface");
+var torrentpref = chrome.i18n.getMessage("torrentPreface");
+var tunnelpref = chrome.i18n.getMessage("i2ptunnelPreface");
 var ircpref = chrome.i18n.getMessage("ircPreface");
+var extensionpref = chrome.i18n.getMessage("extensionPreface");
+var muwirepref = chrome.i18n.getMessage("muwirePreface");
+var botepref = chrome.i18n.getMessage("botePreface");
+var blogpref = chrome.i18n.getMessage("blogPreface");
+var blogprefpriv = chrome.i18n.getMessage("blogPrefacePrivate");

 browser.privacy.network.peerConnectionEnabled.set({
  value: true,
@ -37,6 +42,21 @@ var handleContextProxyRequest = async function (requestDetails) {
      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")) {
@ -97,6 +117,9 @@ var handleContextProxyRequest = async function (requestDetails) {
        if (context.name == ircpref) {
          proxy = ircProxy();
          return proxy;
+        } else if (context.name == blogpref) {
+          proxy = blogProxy();
+          return proxy;
        } else if (context.name == titlepref) {
          proxy = mainProxy();
          return proxy;
@ -106,8 +129,15 @@ var handleContextProxyRequest = async function (requestDetails) {
        } else if (context.name == torrentpref) {
          proxy = btProxy();
          return proxy;
+        } else if (context.name == mailpref) {
+          return proxy;
+        } else if (context.name == tunnelpref) {
+          return proxy;
+        } else if (context.name == muwirepref) {
+          return proxy;
+        } else if (context.name == botepref) {
+          return proxy;
        }
-        return proxy;
      } else {
        if (!routerHost(requestDetails.url)) {
          if (localHost(requestDetails.url)) {
@ -129,6 +159,8 @@ var handleContextProxyRequest = async function (requestDetails) {
            host: getHost(),
            port: getPort(),
          };
+        } else {
+          proxy = null;
        }
        if (requestDetails.url.includes("rpc")) {
          console.log("(proxy for rpc url)", rpc);
@ -188,8 +220,6 @@ var handleContextProxyRequest = async function (requestDetails) {
          port: getPort(),
        };
        return proxy;
-      } else if (extensionHost(requestDetails)) {
-        return;
      } else if (i2pHost(requestDetails.url)) {
        var tab = tabGet(requestDetails.tabId);
        requestDetails.tabId = tab;
@ -197,6 +227,8 @@ var handleContextProxyRequest = async function (requestDetails) {
        var proxy = await context.then(handleProxyRequest);
        //console.log('(proxy)Returning I2P Proxy', proxy);
        return proxy;
+      } else if (extensionHost(requestDetails)) {
+        return;
      } else {
        var tab = tabGet(requestDetails.tabId);
        var context = tab.then(contextGet);
--- a/releases.atom
+++ b/releases.atom
@ -4,13 +4,110 @@
  <link type="text/html" rel="alternate" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases"/>
  <link type="application/atom+xml" rel="self" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases.atom"/>
  <title>Release notes from I2P-in-Private-Browsing-Mode-Firefox</title>
-  <updated>2020-12-21T23:13:19Z</updated>
+  <updated>2021-05-26T22:32:58Z</updated>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.105</id>
+    <updated>2021-05-27T20:19:35Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.105"/>
+    <title>0.105</title>
+    <enclosure url="magnet:?xl=2485<title>0.105</title>dn=i2ppb%40eyedeekay.github.io.xpi.torrent<title>0.105</title>xt=urn:tree:tiger:w6kewvpw25bnau2rwkczbnryrjdzn54ietse3zi<title>0.105</title>xt=urn:ed2k:1cd9743fb664404298b7f2ad7ee45db0<title>0.105</title>xt=urn:aich:4vhcsp6t3c2mkjzds2etixyinyj7xtkp" type="application/x-bittorrent" />
+    <content type="html">&lt;p&gt;Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.105-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Add help page for configuring i2pcontrol&lt;/li&gt;
+&lt;li&gt;Add help page for configuring i2psnark-rpc&lt;/li&gt;
+&lt;li&gt;Update the icons&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt; Wed, 26 May 2021 12:56:56 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.103-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.103</id>
+    <updated>2021-05-26T16:59:28Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.103"/>
+    <title>0.103</title>
+    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
+Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.103-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Fix for double-test issue on /home.html page in the extension&lt;/li&gt;
+&lt;li&gt;Fix for broken options menu&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt; Wed, 26 May 2021 12:56:56 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.101-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.101</id>
+    <updated>2021-05-24T19:42:29Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.101"/>
+    <title>0.101</title>
+    <content type="html">&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Mon, 24 May 2021 3:41:35 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.99-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Sweeping changes to styles&lt;/li&gt;
+&lt;li&gt;fix for issue when using noscript and visiting susimail&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Mon, 24 May 2021 2:05:21 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.97-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.99</id>
+    <updated>2021-05-24T18:08:37Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.99"/>
+    <title>0.99</title>
+    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
+Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.99-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Sweeping changes to styles&lt;/li&gt;
+&lt;li&gt;fix for issue when using noscript and visiting susimail&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Mon, 24 May 2021 2:05:21 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.97-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
+  <entry>
+    <id>tag:github.com,2008:Repository/169256012/0.97</id>
+    <updated>2021-02-05T18:05:51Z</updated>
+    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.97"/>
+    <title>0.97</title>
+    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
+Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
+Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
+i2psetproxy.js (0.97-1) UNRELEASED; urgency=low&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Fix theme issue, add x-i2p-torrentlocation HEADER support&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  FRI, 5 FEB 2021 1:02:55 -0400&lt;/p&gt;
+&lt;p&gt;i2psetproxy.js (0.95-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
+    <author>
+      <name>eyedeekay</name>
+    </author>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+  </entry>
  <entry>
    <id>tag:github.com,2008:Repository/169256012/0.95</id>
    <updated>2020-12-21T23:21:35Z</updated>
    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.95"/>
    <title>0.95</title>
-    <enclosure url="magnet:?xt=urn:btih:7ec361c3ddc3fb904e369a19cdf4259af94af624" type="application/x-bittorrent" />
    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
 Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
 Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
@ -23,7 +120,7 @@ i2psetproxy.js (0.95-1) UNRELEASED; urgency=low&lt;/p&gt;
    <author>
      <name>eyedeekay</name>
    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
  </entry>
  <entry>
    <id>tag:github.com,2008:Repository/169256012/0.93</id>
@ -42,7 +139,7 @@ i2psetproxy.js (0.93-1) UNRELEASED; urgency=low&lt;/p&gt;
    <author>
      <name>eyedeekay</name>
    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
  </entry>
  <entry>
    <id>tag:github.com,2008:Repository/169256012/0.91</id>
@ -61,7 +158,7 @@ i2psetproxy.js (0.91-1) UNRELEASED; urgency=low&lt;/p&gt;
    <author>
      <name>eyedeekay</name>
    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
  </entry>
  <entry>
    <id>tag:github.com,2008:Repository/169256012/0.89</id>
@ -81,7 +178,7 @@ i2psetproxy.js (0.89-1) UNRELEASED; urgency=low&lt;/p&gt;
    <author>
      <name>eyedeekay</name>
    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
  </entry>
  <entry>
    <id>tag:github.com,2008:Repository/169256012/0.87</id>
@ -101,97 +198,6 @@ i2psetproxy.js (0.87-1) UNRELEASED; urgency=low&lt;/p&gt;
    <author>
      <name>eyedeekay</name>
    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
-  </entry>
-  <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.85</id>
-    <updated>2020-11-11T06:44:44Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.85"/>
-    <title>0.85</title>
-    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
-Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
-Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
-i2psetproxy.js (0.85-1) UNRELEASED; urgency=low&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;Fix a bug which was causing i2psnark to fail to isolate.&lt;/li&gt;
-&lt;/ul&gt;
-&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Sat, 10 NOV 2020 1:33:50 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.83-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
-    <author>
-      <name>eyedeekay</name>
-    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
-  </entry>
-  <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.83</id>
-    <updated>2020-11-11T04:00:27Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.83"/>
-    <title>0.83</title>
-    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
-Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
-Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
-i2psetproxy.js (0.83-1) UNRELEASED; urgency=low&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;Add a tab for I2P-Native Dispatch&lt;/li&gt;
-&lt;/ul&gt;
-&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Sat, 10 NOV 2020 22:00:01 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.81-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
-    <author>
-      <name>eyedeekay</name>
-    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
-  </entry>
-  <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.81</id>
-    <updated>2020-11-08T02:44:34Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.81"/>
-    <title>0.81</title>
-    <content type="html">&lt;p&gt;Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
-i2psetproxy.js (0.81-1) UNRELEASED; urgency=low&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;X-I2P-TorrentLocation header&lt;/li&gt;
-&lt;li&gt;Visual tweaks&lt;/li&gt;
-&lt;li&gt;Deprecate localhost browser container permanently&lt;/li&gt;
-&lt;li&gt;Isolation rules improvements&lt;/li&gt;
-&lt;/ul&gt;
-&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Sat, 07 NOV 2020 21:34:25 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.79-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
-    <author>
-      <name>eyedeekay</name>
-    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
-  </entry>
-  <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.79</id>
-    <updated>2020-09-26T03:36:46Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.79"/>
-    <title>0.79</title>
-    <content type="html">&lt;p&gt;A simple plugin for configuring a Firefox based web browser to isolate I2P&lt;br&gt;
-Browsing to a single contextual identity, thus creating an I2P in Private&lt;br&gt;
-Browsing mode. It requires the use of a pre-installed I2P Router.&lt;br&gt;
-i2psetproxy.js (0.79-1) UNRELEASED; urgency=low&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;Pin application tabs to the front of the tab order&lt;/li&gt;
-&lt;li&gt;Refine pageaction behavior&lt;/li&gt;
-&lt;/ul&gt;
-&lt;p&gt;-- idk &lt;a href=&quot;mailto:hankhill19580@gmail.com&quot;&gt;hankhill19580@gmail.com&lt;/a&gt;  Mon, 24 SEP 2020 20:18:03 -0400&lt;/p&gt;
-&lt;p&gt;i2psetproxy.js (0.77-1) UNRELEASED; urgency=low&lt;/p&gt;</content>
-    <author>
-      <name>eyedeekay</name>
-    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
-  </entry>
-  <entry>
-    <id>tag:github.com,2008:Repository/169256012/0.77</id>
-    <updated>2020-09-25T00:19:45Z</updated>
-    <link rel="alternate" type="text/html" href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/tag/0.77"/>
-    <title>0.77</title>
-    <content type="html">&lt;p&gt;Merge pull request &lt;a class=&quot;issue-link js-issue-link&quot; href=&quot;https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/pull/100&quot;&gt;#100&lt;/a&gt; from eyedeekay/bookmarks&lt;/p&gt;
-
-&lt;p&gt;make the bookmarks part of a subdirectory&lt;/p&gt;</content>
-    <author>
-      <name>eyedeekay</name>
-    </author>
-    <media:thumbnail height="30" width="30" url="https://avatars3.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
+    <media:thumbnail height="30" width="30" url="https://avatars.githubusercontent.com/u/8733713?s=60&amp;v=4"/>
  </entry>
 </feed>
--- a/routerconsole.png
+++ b/routerconsole.png
--- a/scrub.js
+++ b/scrub.js
@ -8,6 +8,8 @@ var ircpref = chrome.i18n.getMessage("ircPreface");
 var extensionpref = chrome.i18n.getMessage("extensionPreface");
 var muwirepref = chrome.i18n.getMessage("muwirePreface");
 var botepref = chrome.i18n.getMessage("botePreface");
+var blogpref = chrome.i18n.getMessage("blogPreface");
+var blogprefpriv = chrome.i18n.getMessage("blogPrefacePrivate");

 var contextScrub = async function (requestDetails) {
  function onHeaderError() {
@ -86,6 +88,9 @@ var notMyContextNotMyProblem = async function () {
  var context7 = await browser.contextualIdentities.query({
    name: botepref,
  });
+  var context8 = await browser.contextualIdentities.query({
+    name: blogpref,
+  });
  var othercontexts = [];
  console.log("Contexts:", contexts);
  for (context in contexts) {
@ -113,143 +118,94 @@ var notMyContextNotMyProblem = async function () {

 var contextSetup = function (requestDetails) {
  function onContextError() {
-    console.log("Context launcher error");
+    console.error("Context launcher error");
+  }
+  async function forceIntoIsolation(tabId, contextidentifier, tab, pin = true) {
+    console.info(
+      "(isolate) forcing context for",
+      tabId,
+      contextidentifier,
+      tab
+    );
+    try {
+      var context = await browser.contextualIdentities.query({
+        name: contextidentifier,
+      });
+      if (tabId.cookieStoreId != context[0].cookieStoreId) {
+        function Create() {
+          function onCreated(tab) {
+            function closeOldTab() {
+              if (tabId.id != tab.id) {
+                console.log(
+                  "(isolate) Closing un-isolated tab",
+                  tabId.id,
+                  "in favor of",
+                  tab.id,
+                  "with context",
+                  tab.cookieStoreId
+                );
+                browser.tabs.remove(tabId.id);
+              }
+              browser.pageAction.setPopup({
+                tabId: tabId.id,
+                popup: "security.html",
+              });
+              browser.pageAction.show(tabId.id);
+            }
+            closeOldTab(tab);
+          }
+          var created = browser.tabs.create({
+            active: true,
+            cookieStoreId: context[0].cookieStoreId,
+            url: requestDetails.url,
+            pinned: pin,
+          });
+          created.then(onCreated, onContextError);
+        }
+        var gettab = browser.tabs.get(tabId.id);
+        gettab.then(Create, onContextError);
+        return tabId;
+      }
+    } catch (error) {
+      console.error("(isolate)Context Error", error);
+    }
  }
-  //console.log("(isolate)Forcing I2P requests into context");
  try {
    var i2pTabFind = async function (tabId) {
+      console.info("(isolate)Context Discovery browser");
      try {
        var context = await browser.contextualIdentities.query({
          name: titlepref,
        });
-        if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          function Create() {
-            function onCreated(tab) {
-              function closeOldTab() {
-                if (tabId.id != tab.id) {
-                  console.log("(isolate) Closing un-isolated tab", tabId.id);
-                  console.log("in favor of", tab.id);
-                  console.log("with context", tab.cookieStoreId);
-                  browser.tabs.remove(tabId.id);
-                }
-                browser.pageAction.setPopup({
-                  tabId: tabId.id,
-                  popup: "security.html",
-                });
-                browser.pageAction.show(tabId.id);
-              }
-              closeOldTab(tab);
-            }
-            var created = browser.tabs.create({
-              active: true,
-              cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url,
-            });
-            created.then(onCreated, onContextError);
-          }
-          var gettab = browser.tabs.get(tabId.id);
-          gettab.then(Create, onContextError);
-          return tabId;
-        }
+        return forceIntoIsolation(tabId, titlepref, tab, false);
      } catch (error) {
-        console.log("(isolate)Context Error", error);
+        console.error("(isolate)Context Error", error);
      }
    };
    var routerTabFind = async function (tabId) {
+      console.info("(isolate)Context Discovery console");
      try {
        var context = await browser.contextualIdentities.query({
          name: routerpref,
        });
-        if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          function Create() {
-            function onCreated(tab) {
-              function closeOldTab(tabs) {
-                if (tabId.id != tab.id) {
-                  console.log("(isolate) Closing un-isolated tab", tabId.id);
-                  console.log("in favor of", tab.id);
-                  console.log("with context", tab.cookieStoreId);
-                  browser.tabs.remove(tabId.id);
-                  browser.tabs.move(tab.id, { index: 0 });
-                }
-                for (index = 0; index < tabs.length; index++) {
-                  if (index != tabs.length - 1)
-                    browser.tabs.remove(tabs[index].id);
-                }
-              }
-              var pins = browser.tabs.query({
-                cookieStoreId: context[0].cookieStoreId,
-              });
-              pins.then(closeOldTab, onError);
-            }
-            if (requestDetails.url.endsWith("xhr1.html")) {
-              hostname = url.split("/")[2];
-              let prefix = url.substr(0, url.indexOf("://") + 3);
-              requestDetails.url = prefix + hostname + "/home";
-            }
-            var created = browser.tabs.create({
-              active: true,
-              pinned: true,
-              cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url,
-            });
-            created.then(onCreated, onContextError);
-          }
-          var gettab = browser.tabs.get(tabId.id);
-          gettab.then(Create, onContextError);
-          return tabId;
-        }
+        return forceIntoIsolation(tabId, routerpref, tab);
      } catch (error) {
-        console.log("(isolate)Context Error", error);
+        console.error("(isolate)Context Error", error);
      }
    };
    var i2ptunnelTabFind = async function (tabId) {
+      console.info("(isolate)Context Discovery browser");
      try {
        var context = await browser.contextualIdentities.query({
          name: tunnelpref,
        });
-        if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          function Create() {
-            function onCreated(tab) {
-              function closeOldTab(tabs) {
-                if (tabId.id != tab.id) {
-                  console.log("(isolate) Closing un-isolated tab", tabId.id);
-                  console.log("in favor of", tab.id);
-                  console.log("with context", tab.cookieStoreId);
-                  browser.tabs.remove(tabId.id);
-                  browser.tabs.move(tab.id, { index: 0 });
-                }
-                for (index = 0; index < tabs.length; index++) {
-                  if (index != tabs.length - 1)
-                    browser.tabs.remove(tabs[index].id);
-                }
-              }
-              var pins = browser.tabs.query({
-                cookieStoreId: context[0].cookieStoreId,
-              });
-              pins.then(closeOldTab, onError);
-            }
-            if (requestDetails.url.endsWith("xhr1.html")) {
-              hostname = url.split("/")[2];
-              let prefix = url.substr(0, url.indexOf("://") + 3);
-              requestDetails.url = prefix + hostname + "/i2ptunnelmgr/";
-            }
-            var created = browser.tabs.create({
-              active: true,
-              pinned: true,
-              cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url,
-            });
-            created.then(onCreated, onContextError);
-          }
-          var gettab = browser.tabs.get(tabId.id);
-          gettab.then(Create, onContextError);
-          return tabId;
-        }
+        return forceIntoIsolation(tabId, tunnelpref, tab);
      } catch (error) {
-        console.log("(isolate)Context Error", error);
+        console.error("(isolate)Context Error", error);
      }
    };
    var snarkTabFind = async function (tabId) {
+      console.info("(isolate)Context Discovery torrents");
      try {
        var context = await browser.contextualIdentities.query({
          name: torrentpref,
@ -266,9 +222,14 @@ var contextSetup = function (requestDetails) {
              function onCreated(tab) {
                function closeOldTab(tabs) {
                  if (tabId.id != tab.id) {
-                    console.log("(isolate) Closing un-isolated tab", tabId.id);
-                    console.log("in favor of", tab.id);
-                    console.log("with context", tab.cookieStoreId);
+                    console.log(
+                      "(isolate) Closing un-isolated tab",
+                      tabId.id,
+                      "in favor of",
+                      tab.id,
+                      "with context",
+                      tab.cookieStoreId
+                    );
                    browser.tabs.remove(tabId.id);
                    browser.tabs.move(tab.id, { index: 0 });
                  }
@ -305,188 +266,58 @@ var contextSetup = function (requestDetails) {
      }
    };
    var muwireTabFind = async function (tabId) {
+      console.info("(isolate)Context Discovery muwire");
      try {
        var context = await browser.contextualIdentities.query({
          name: muwirepref,
        });
-        if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          function Create() {
-            function onCreated(tab) {
-              function closeOldTab(tabs) {
-                if (tabId.id != tab.id) {
-                  console.log("(isolate) Closing un-isolated tab", tabId.id);
-                  console.log("in favor of", tab.id);
-                  console.log("with context", tab.cookieStoreId);
-                  browser.tabs.remove(tabId.id);
-                  browser.tabs.move(tab.id, { index: 0 });
-                }
-                for (index = 0; index < tabs.length; index++) {
-                  if (index != tabs.length - 1)
-                    browser.tabs.remove(tabs[index].id);
-                }
-              }
-              var pins = browser.tabs.query({
-                cookieStoreId: context[0].cookieStoreId,
-              });
-              pins.then(closeOldTab, onError);
-            }
-            if (requestDetails.url.endsWith("xhr1.html")) {
-              hostname = url.split("/")[2];
-              let prefix = url.substr(0, url.indexOf("://") + 3);
-              requestDetails.url = prefix + hostname + "/muwire/";
-            }
-            var created = browser.tabs.create({
-              active: true,
-              pinned: true,
-              cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url,
-            });
-            created.then(onCreated, onContextError);
-          }
-          var gettab = browser.tabs.get(tabId.id);
-          gettab.then(Create, onContextError);
-          return tabId;
-        }
+        return forceIntoIsolation(tabId, muwirepref, tab);
      } catch (error) {
-        console.log("(isolate)Context Error", error);
+        console.error("(isolate)Context Error", error);
      }
    };
    var i2pboteTabFind = async function (tabId) {
+      console.info("(isolate)Context Discovery bote");
      try {
        var context = await browser.contextualIdentities.query({
          name: botepref,
        });
-        if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          function Create() {
-            function onCreated(tab) {
-              function closeOldTab(tabs) {
-                if (tabId.id != tab.id) {
-                  console.log("(isolate) Closing un-isolated tab", tabId.id);
-                  console.log("in favor of", tab.id);
-                  console.log("with context", tab.cookieStoreId);
-                  browser.tabs.remove(tabId.id);
-                  browser.tabs.move(tab.id, { index: 0 });
-                }
-                for (index = 0; index < tabs.length; index++) {
-                  if (index != tabs.length - 1)
-                    browser.tabs.remove(tabs[index].id);
-                }
-              }
-              var pins = browser.tabs.query({
-                cookieStoreId: context[0].cookieStoreId,
-              });
-              pins.then(closeOldTab, onError);
-            }
-            if (requestDetails.url.endsWith("xhr1.html")) {
-              hostname = url.split("/")[2];
-              let prefix = url.substr(0, url.indexOf("://") + 3);
-              requestDetails.url = prefix + hostname + "/i2pbote/";
-            }
-            var created = browser.tabs.create({
-              active: true,
-              pinned: true,
-              cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url,
-            });
-            created.then(onCreated, onContextError);
-          }
-          var gettab = browser.tabs.get(tabId.id);
-          gettab.then(Create, onContextError);
-          return tabId;
-        }
+        return forceIntoIsolation(tabId, botepref, tab);
      } catch (error) {
-        console.log("(isolate)Context Error", error);
+        console.error("(isolate)Context Error", error);
      }
    };
    var mailTabFind = async function (tabId) {
+      console.info("(isolate)Context Discovery mail");
      try {
        var context = await browser.contextualIdentities.query({
          name: mailpref,
        });
-        if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          function Create() {
-            function onCreated(tab) {
-              function closeOldTab(tabs) {
-                if (tabId.id != tab.id) {
-                  console.log("(isolate) Closing un-isolated tab", tabId.id);
-                  console.log("in favor of", tab.id);
-                  console.log("with context", tab.cookieStoreId);
-                  browser.tabs.remove(tabId.id);
-                  browser.tabs.move(tab.id, { index: 0 });
-                }
-                for (index = 0; index < tabs.length; index++) {
-                  if (index != tabs.length - 1)
-                    browser.tabs.remove(tabs[index].id);
-                }
-              }
-              var pins = browser.tabs.query({
-                cookieStoreId: context[0].cookieStoreId,
-              });
-              pins.then(closeOldTab, onError);
-            }
-            if (requestDetails.url.endsWith("xhr1.html")) {
-              hostname = url.split("/")[2];
-              let prefix = url.substr(0, url.indexOf("://") + 3);
-              requestDetails.url = prefix + hostname + "/webmail/";
-            }
-            var created = browser.tabs.create({
-              active: true,
-              pinned: true,
-              cookieStoreId: context[0].cookieStoreId,
-              url: requestDetails.url,
-            });
-            created.then(onCreated, onContextError);
-          }
-          var gettab = browser.tabs.get(tabId.id);
-          gettab.then(Create, onContextError);
-          return tabId;
-        }
+        return forceIntoIsolation(tabId, mailpref, tab);
      } catch (error) {
-        console.log("(isolate)Context Error", error);
+        console.error("(isolate)Context Error", error);
      }
    };
    var ircTabFind = async function (tabId) {
+      console.info("(isolate)Context Discovery irc");
      try {
        var context = await browser.contextualIdentities.query({
          name: ircpref,
        });
-        if (tabId.cookieStoreId != context[0].cookieStoreId) {
-          if (requestDetails.url.includes(":7669")) {
-            function Create() {
-              function onCreated(tab) {
-                function closeOldTab(tabs) {
-                  if (tabId.id != tab.id) {
-                    console.log("(isolate) Closing un-isolated tab", tabId.id);
-                    console.log("in favor of", tab.id);
-                    console.log("with context", tab.cookieStoreId);
-                    browser.tabs.remove(tabId.id);
-                    browser.tabs.move(tab.id, { index: 0 });
-                  }
-                  for (index = 0; index < tabs.length; index++) {
-                    if (index != tabs.length - 1)
-                      browser.tabs.remove(tabs[index].id);
-                  }
-                }
-                var pins = browser.tabs.query({
-                  cookieStoreId: context[0].cookieStoreId,
-                });
-                pins.then(closeOldTab, onError);
-              }
-              var created = browser.tabs.create({
-                active: true,
-                pinned: true,
-                cookieStoreId: context[0].cookieStoreId,
-                url: requestDetails.url,
-              });
-              created.then(onCreated, onContextError);
-            }
-            var gettab = browser.tabs.get(tabId.id);
-            gettab.then(Create, onContextError);
-            return tabId;
-          }
-        }
+        return forceIntoIsolation(tabId, ircpref, tab);
      } catch (error) {
-        console.log("(isolate)Context Error", error);
+        console.error("(isolate)Context Error", error);
+      }
+    };
+    var blogTabFind = async function (tabId) {
+      console.info("(isolate)Context Discovery blog");
+      try {
+        var context = await browser.contextualIdentities.query({
+          name: blogpref,
+        });
+        return forceIntoIsolation(tabId, blogpref, tab);
+      } catch (error) {
+        console.error("(isolate)Context Error", error);
      }
    };
    var tabGet = async function (tabId) {
@ -540,8 +371,13 @@ var contextSetup = function (requestDetails) {
          }
        } else {
          if (localhost) {
-            var irctab = tab.then(ircTabFind, onContextError);
-            return requestDetails;
+            if (localhost === "blog") {
+              var routertab = tab.then(blogTabFind, onContextError);
+              return requestDetails;
+            } else if (localhost === "irc") {
+              var irctab = tab.then(ircTabFind, onContextError);
+              return requestDetails;
+            }
          }
        }
        //        if (oldtab.cookieStoreId == 'firefox-default') {
--- a/security.html
+++ b/security.html
@ -1,9 +1,55 @@
 <!DOCTYPE html>
 <html>
 <head>
+    <meta charset="utf-8">
+    <link href="search.css" rel="stylesheet">
+    <link href="home.css" rel="stylesheet"><!--<link href="info.css" rel="stylesheet">--><!--<link href="torrent/popup.css" rel="stylesheet">-->
+
    <title>
    </title>
 </head>
 <body>
+    <div id="browserpanel">
+        <div class="panel">
+            <div class="section-header panel-section panel-section-header" id="headline">
+                <div class="text-section-header" id="text-section-header">
+                    <h1 id="text-section-header">I2P Site Properties</h1>
+                </div>
+            </div>
+        </div>
+
+        <div class="panel">
+            <ul>
+                <li>
+                    <div class="address-info">
+                        <div id="addresstype">
+                            <span id="TypeLabel">Address Type:</span> <span id="Type"></span>
+                            <div id="TypeInfo">
+                                <span id="AddressInfo"></span>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+
+                <li>
+                    <div class="tls-info">
+                        <div id="sitecert">
+                            <span id="CertLabel">Certificate Information:</span> <span id="Cert"></span>
+                            <div id="CertInfo">
+                                <span id="AddressCertInfo"></span>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+
+                <li>
+                    <div id="signingcert">
+                        <span id="SignedLabel">Signed By:</span> <span id="Signed"></span>
+                    </div>
+                </li>
+            </ul>
+        </div>
+    </div>
+    <script src="cert.js"></script>
 </body>
 </html>
--- a/susimail.png
+++ b/susimail.png
--- a/toopie.html
+++ b/toopie.html
@ -1,9 +1,86 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>
-    </title>
+    <title>I2P Router Information</title>
+    <link href="home.css" rel="stylesheet" type="text/css">
+    <link href="sidebar.css" rel="stylesheet" type="text/css">
 </head>
 <body>
+    <script src="i2pcontrol/i2pcontrol.js"></script> 
+    <script src="info.js"></script> 
+    <script src="content.js"></script>
+    <h1>I2P Router Information</h1>
+
+    <ul>
+        <li>
+            <a href="http://localhost:7657" target="_blank"><img alt="i2p router console" class="center" src="/icons/i2plogo.png"></a>
+        </li>
+    </ul>
+
+    <ul class="button-list">
+        <li><button id="label-router-restart" target="_blank"><img alt="Restart:" id="label-router-shutdown" src="/images/restart.svg"></button>
+        <br>
+        <span id="router-restart">Gracefully restart router</span>
+        </li>
+
+        <li><button id="label-router-shutdown" target="_blank"><img alt="Shutdown:" id="label-router-shutdown" src="/images/shutdown.svg"></button>
+        <br>
+        <span id="router-shutdown">Gracefully shutdown router</span>
+        </li>
+    </ul>
+
+    <ul>
+        <li><button id="label-router-status" target="_blank">Status</button>
+        </li>
+    </ul>
+
+    <ul class="label-list" id="label-status-list">
+        <li><span id="label-router-status">Router Status:</span> <span id="router-status">Replace with Router Status</span></li>
+
+        <li><span id="label-router-uptime">Router Uptime(Ms):</span> <span id="router-uptime">Replace with Router Uptime</span></li>
+
+        <li><span id="label-router-version">Router Version:</span> <span id="router-version">Replace with Router Version</span></li>
+    </ul>
+
+    <ul>
+        <li><button id="label-router-bandwidth" target="_blank">Bandwidth</button>
+        </li>
+    </ul>
+
+    <ul class="label-list" id="label-bandwidth-list">
+        <li><span id="label-router-bw-outbound-1s">Outbound bw 1s:</span> <span id="router-net-bw-outbound-1s">Replace with Router Bandwidth Outbound 1s</span></li>
+
+        <li><span id="label-router-bw-outbound-15s">Outbound bw 15s:</span> <span id="router-net-bw-outbound-15s">Replace with Router Bandwidth Outbound 15s</span></li>
+
+        <li><span id="label-router-bw-inbound-1s">Inbound bw 1s:</span> <span id="router-net-bw-inbound-1s">Replace with Router Bandwidth Inbound 1s</span></li>
+
+        <li><span id="label-router-bw-inbound-15s">Inbound bw 15s:</span> <span id="router-net-bw-inbound-15s">Replace with Router Bandwidth Outbound 15s</span></li>
+    </ul>
+    <!--<li>
+<span id="label-router-net-status">Network Status:</span>
+<span id="router-net-status">Replace with Router Network Status</span>
+</li>-->
+
+    <ul>
+        <li><button id="label-router-peers" target="_blank">Peers</button>
+        </li>
+    </ul>
+
+    <ul class="label-list" id="label-peers-list">
+        <li><span id="label-router-net-tunnels-participating">Transit Tunnels:</span> <span id="router-net-tunnels-participating">Replace with Router Participating Tunnel Count</span></li>
+
+        <li><span id="label-router-activepeers">Active Peers:</span> <span id="router-netdb-activepeers">Replace with Router Active Peers</span></li>
+
+        <li><span id="label-router-netdb-fastpeers">Fast Peers:</span> <span id="router-netdb-fastpeers">Replace with Router Fast Peers</span></li>
+
+        <li><span id="label-router-netdb-highcapacitypeers">High Capacity Peers:</span> <span id="router-netdb-highcapacitypeers">Replace with High Capacity Peers</span></li>
+
+        <li><span id="label-router-netdb-isreseeding">Reseed status:</span> <span id="router-netdb-isreseeding">Replace with Router netDB Reseeding Status</span></li>
+
+        <li><span id="label-router-netdb-knownpeers">Known Peers:</span> <span id="router-netdb-knownpeers">Replace with Router Known Peers</span></li>
+    </ul>
+
+    <br>
+    <br>
 </body>
 </html>
--- a/toopie.png
+++ b/toopie.png
--- 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/transmissionrpc.png
+++ b/transmissionrpc.png
--- a/window.html
+++ b/window.html
@ -1,9 +1,161 @@
 <!DOCTYPE html>
 <html>
 <head>
+    <meta charset="utf-8">
+    <link href="search.css" rel="stylesheet">
+    <link href="home.css" rel="stylesheet">
+    <link href="info.css" rel="stylesheet"><!--<link href="torrent/popup.css" rel="stylesheet">-->
+
    <title>
    </title>
 </head>
 <body>
+    <div class="section-header panel-section panel-section-header" id="topbar">
+        <!--<div class="text-section-header" id="text-section-header">-->
+        <a href="#" id="browser-action"><img class="tabicon" height="32px" src="icons/browse.png" width="32px">Browse</a> <a href="#" id="torrent-action"><img class="tabicon" height="32px" src="icons/torrents.png" width="32px">Download</a> <!--</div>-->
+    </div>
+
+    <div id="browserpanel">
+        <div class="panel">
+            <div class="section-header panel-section panel-section-header" id="headline">
+                <div class="text-section-header">
+                    <h1 id="text-section-header">The Invisible Internet Browser</h1>
+                </div>
+            </div>
+
+            <div class="search-info">
+                <div id="i2pbrowser-version">
+                </div>
+
+                <div class="topnav">
+                    <a class="applicationName window-visit-homepage" href="#" id="window-visit-homepage" target="_blank">Home Page</a>
+                    <form action="http://yacy.idk.i2p/yacysearch.html?" method="get">
+                        <input id="search-query" name="query" placeholder="Search on yacy.idk.i2p(Opens a new tab)" type="search"> <input id="search-submit" text="Submit" type="submit">
+                    </form>
+                </div>
+
+                <div class="hideIfI2PProxyOff" id="readyness">
+                    <img class="readyness" src="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>
+
+            <div class="browser-info">
+                <p class="hideIfI2PConsoleOff">
+                </p>
+
+                <h3 id="controlHeader">Controls</h3>
+
+                <p id="controlExplain">These controls are used to tailor your I2P Browsing Experience</p>
+
+                <ul>
+                    <!--<li class="application">
+                        <a href="#" id="clear-browser-data">Clear Browsing Data:</a> <span class="applicationDesc" id="clear-desc">Use this to erase your browsing data.</span>
+                    </li>
+
+                    <li class="application"><input id="enable-web-rtc" name="enablewebrtc" type="checkbox" value="webrtc"> <label for="enable-web-rtc">Enable WebRTC <strong>with Proxy?</strong></label> <span class="applicationDesc" id="rtcDesc">WebRTC is disabled by default, but can be enabled by checking this box.</span></li>-->
+
+                    <li class="application">
+                        <div class="panel-section-separator">
+                        </div>
+
+                        <div class="panel-section-identity">
+                            <div id="identity-list">
+                            </div>
+                        </div>
+                    </li>
+
+                    <li class="application"><input id="disable-history" name="disablehistory" type="checkbox" value="history"> <label for="disable-history">Disable History in I2P Tabs</label> <span class="applicationDesc" id="histDesc">History is automatically cleared when your I2P tabs are closed. If you want to clear history as you go, check this box.</span></li>
+                </ul>
+            </div>
+            <!--<div class="panel-section-separator">
+            </div>-->
+
+            <div class="application-info">
+                <p class="hideIfI2PConsoleOff">
+                </p>
+
+                <h3 id="applicationHeader">Applications</h3>
+
+                <p id="applicationExplain">These applications use I2P to provide them with security and privacy.</p>
+
+                <ul>
+                    <li class="application"><button class="applicationName window-visit-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 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>
+
+                    <li class="application"><button class="applicationName" id="window-visit-susimail" target="_blank">E-Mail</button> <span class="applicationDesc" id="susimail">I2P also bundles a webmail client which can be used to access in-I2P e-mail. To use it, go here:</span></li>
+
+                    <li class="application"><button class="applicationName" id="window-visit-snark" target="_blank">BitTorrent</button> <span class="applicationDesc" id="snark">I2P is capable of anonymous Peer-to-Peer file sharing, to use the built-in bittorrent client go here:</span></li>
+                </ul>
+            </div>
+        </div>
+    </div>
+
+    <br>
+
+    <div id="torrentpanel">
+        <div class="panel" id="torrentstatus">
+            <div class="section-header panel-section panel-section-header">
+                <div class="text-section-header" id="text-section-torrents-header">
+                    <h1>Torrent Downloads</h1>
+                </div>
+            </div>
+
+            <div id="config-pane">
+                <strong>Torrent RPC Configuration</strong>
+                <br>
+                The server address is not set yet.
+                <br>
+                <a class="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>
+
+            <div id="torrents-pane">
+                <header>
+                    <h1>Torrent Controls</h1>
+                    <a class="webui-opener" href="#" target="_blank"><img alt="Open Web UI" src="images/i2plogo.png"></a> <!--<a class="config-opener" href="#">
+                            <img alt="Settings" src="images/gear.svg"></a>
+                            <a class="info-opener" href="https://github.com/myfreeweb/transmitter" target="_blank">
+                            <img alt="Extension Info" src="images/info.svg"></a>-->
+                </header>
+                <input id="torrents-search" placeholder="Search…" type="search">
+                <template id="torrents-tpl">
+                    <ul>
+                        <li>
+                            <div class="torrent-head">
+                                <div class="torrent-name">
+                                </div>
+
+                                <div class="torrent-speeds">
+                                </div>
+                            </div>
+                            <progress class="torrent-progress" max="100"></progress>
+                        </li>
+                    </ul>
+                </template>
+
+                <ul id="torrents-list">
+                </ul>
+
+                <div id="torrents-error">
+                </div>
+            </div>
+        </div>
+    </div>
+    <script src="context.js"></script> 
+    <script src="privacy.js"></script> 
+    <script src="i2pcontrol/i2pcontrol.js"></script> 
+    <script src="info.js"></script> 
+    <script crossorigin="anonymous" src="content.js"></script> 
+    <script src="torrent/popup.js"></script> 
+    <script src="torrent/common.js"></script>
 </body>
 </html>
--- a/x-i2p-torrentlocation.png
+++ b/x-i2p-torrentlocation.png
Author	SHA1	Message	Date
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	7b6438dce5	fix some background-theme stuff	2021-07-07 21:55:35 -04: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