Merge pull request #32 from eyedeekay/smart-home

Smart home
fmt
2019-11-22 17:57:55 -05:00 · 2019-11-22 17:55:58 -05:00 · 2019-11-22 17:49:27 -05:00 · 2019-11-22 17:02:54 -05:00 · 2019-11-22 17:01:03 -05:00 · 2019-11-22 16:39:28 -05:00
29 changed files with 1540 additions and 119 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -0,0 +1,251 @@
+module.exports = {
+  env: {
+    browser: true,
+    es6: true,
+    webextensions: true
+  },
+  extends: "eslint:recommended",
+  globals: {
+    Atomics: "readonly",
+    SharedArrayBuffer: "readonly"
+  },
+  parserOptions: {
+    ecmaVersion: 2018
+  },
+  rules: {
+    "accessor-pairs": "error",
+    "array-bracket-newline": "error",
+    "array-bracket-spacing": ["error", "never"],
+    "array-callback-return": "error",
+    "array-element-newline": "error",
+    "arrow-body-style": "error",
+    "arrow-parens": ["error", "as-needed"],
+    "arrow-spacing": [
+      "error",
+      {
+        after: true,
+        before: true
+      }
+    ],
+    "block-scoped-var": "off",
+    "block-spacing": "error",
+    "brace-style": ["error", "1tbs"],
+    "callback-return": "error",
+    camelcase: "off",
+    "capitalized-comments": "off",
+    "class-methods-use-this": "error",
+    "comma-dangle": "error",
+    "comma-spacing": [
+      "error",
+      {
+        after: true,
+        before: false
+      }
+    ],
+    "comma-style": ["error", "last"],
+    complexity: "error",
+    "computed-property-spacing": ["error", "never"],
+    "consistent-return": "off",
+    "consistent-this": "error",
+    curly: "error",
+    "default-case": "error",
+    "default-param-last": "error",
+    "dot-location": "error",
+    "dot-notation": "off",
+    "eol-last": "error",
+    eqeqeq: "off",
+    "func-call-spacing": "error",
+    "func-name-matching": "error",
+    "func-names": "off",
+    "func-style": "off",
+    "function-call-argument-newline": ["error", "consistent"],
+    "function-paren-newline": "error",
+    "generator-star-spacing": "error",
+    "global-require": "error",
+    "guard-for-in": "error",
+    "handle-callback-err": "error",
+    "id-blacklist": "error",
+    "id-length": "error",
+    "id-match": "error",
+    "implicit-arrow-linebreak": ["error", "beside"],
+    indent: "off",
+    "indent-legacy": "off",
+    "init-declarations": "error",
+    "jsx-quotes": "error",
+    "key-spacing": "error",
+    "keyword-spacing": [
+      "error",
+      {
+        after: true,
+        before: true
+      }
+    ],
+    "line-comment-position": "error",
+    "linebreak-style": ["error", "unix"],
+    "lines-around-comment": "off",
+    "lines-around-directive": "error",
+    "lines-between-class-members": "error",
+    "max-classes-per-file": "error",
+    "max-depth": "error",
+    "max-len": "error",
+    "max-lines": "error",
+    "max-lines-per-function": "off",
+    "max-nested-callbacks": "error",
+    "max-params": "error",
+    "max-statements": "off",
+    "max-statements-per-line": "error",
+    "multiline-comment-style": ["error", "bare-block"],
+    "multiline-ternary": "error",
+    "new-cap": "error",
+    "new-parens": "error",
+    "newline-after-var": "off",
+    "newline-before-return": "off",
+    "newline-per-chained-call": "error",
+    "no-alert": "error",
+    "no-array-constructor": "error",
+    "no-await-in-loop": "error",
+    "no-bitwise": "error",
+    "no-buffer-constructor": "error",
+    "no-caller": "error",
+    "no-catch-shadow": "error",
+    "no-confusing-arrow": "error",
+    "no-console": "off",
+    "no-continue": "error",
+    "no-div-regex": "error",
+    "no-duplicate-imports": "error",
+    "no-else-return": "off",
+    "no-empty-function": "error",
+    "no-eq-null": "error",
+    "no-eval": "error",
+    "no-extend-native": "error",
+    "no-extra-bind": "error",
+    "no-extra-label": "error",
+    "no-extra-parens": "error",
+    "no-floating-decimal": "error",
+    "no-implicit-coercion": "error",
+    "no-implicit-globals": "off",
+    "no-implied-eval": "error",
+    "no-import-assign": "error",
+    "no-inline-comments": "error",
+    "no-inner-declarations": ["error", "functions"],
+    "no-invalid-this": "error",
+    "no-iterator": "error",
+    "no-label-var": "error",
+    "no-labels": "error",
+    "no-lone-blocks": "error",
+    "no-lonely-if": "error",
+    "no-loop-func": "error",
+    "no-magic-numbers": "off",
+    "no-mixed-operators": "error",
+    "no-mixed-requires": "error",
+    "no-multi-assign": "error",
+    "no-multi-spaces": "error",
+    "no-multi-str": "error",
+    "no-multiple-empty-lines": "error",
+    "no-native-reassign": "error",
+    "no-negated-condition": "error",
+    "no-negated-in-lhs": "error",
+    "no-nested-ternary": "error",
+    "no-new": "error",
+    "no-new-func": "error",
+    "no-new-object": "error",
+    "no-new-require": "error",
+    "no-new-wrappers": "error",
+    "no-octal-escape": "error",
+    "no-param-reassign": "error",
+    "no-path-concat": "error",
+    "no-plusplus": "error",
+    "no-process-env": "error",
+    "no-process-exit": "error",
+    "no-proto": "error",
+    "no-restricted-globals": "error",
+    "no-restricted-imports": "error",
+    "no-restricted-modules": "error",
+    "no-restricted-properties": "error",
+    "no-restricted-syntax": "error",
+    "no-return-assign": "error",
+    "no-return-await": "error",
+    "no-script-url": "error",
+    "no-self-compare": "error",
+    "no-sequences": "error",
+    "no-shadow": "error",
+    "no-spaced-func": "error",
+    "no-sync": "error",
+    "no-tabs": "error",
+    "no-template-curly-in-string": "error",
+    "no-ternary": "error",
+    "no-throw-literal": "error",
+    "no-trailing-spaces": "error",
+    "no-undef-init": "error",
+    "no-undefined": "off",
+    "no-underscore-dangle": "error",
+    "no-unmodified-loop-condition": "error",
+    "no-unneeded-ternary": "error",
+    "no-unused-expressions": "error",
+    "no-use-before-define": "off",
+    "no-useless-call": "error",
+    "no-useless-computed-key": "error",
+    "no-useless-concat": "error",
+    "no-useless-constructor": "error",
+    "no-useless-rename": "error",
+    "no-useless-return": "error",
+    "no-var": "off",
+    "no-void": "error",
+    "no-warning-comments": "error",
+    "no-whitespace-before-property": "error",
+    "nonblock-statement-body-position": "error",
+    "object-curly-newline": "error",
+    "object-curly-spacing": "error",
+    "object-property-newline": "error",
+    "object-shorthand": "error",
+    "one-var": "off",
+    "one-var-declaration-per-line": "error",
+    "operator-assignment": "error",
+    "operator-linebreak": "error",
+    "padded-blocks": "off",
+    "padding-line-between-statements": "error",
+    "prefer-arrow-callback": "off",
+    "prefer-const": "off",
+    "prefer-destructuring": "off",
+    "prefer-named-capture-group": "error",
+    "prefer-numeric-literals": "error",
+    "prefer-object-spread": "error",
+    "prefer-promise-reject-errors": "error",
+    "prefer-reflect": "error",
+    "prefer-regex-literals": "error",
+    "prefer-rest-params": "error",
+    "prefer-spread": "error",
+    "prefer-template": "off",
+    "quote-props": "off",
+    quotes: ["error", "double"],
+    radix: "error",
+    "require-await": "error",
+    "require-jsdoc": "off",
+    "require-unicode-regexp": "error",
+    "rest-spread-spacing": "error",
+    semi: "error",
+    "semi-spacing": "error",
+    "semi-style": ["error", "last"],
+    "sort-imports": "error",
+    "sort-keys": "off",
+    "sort-vars": "error",
+    "space-before-blocks": "error",
+    "space-before-function-paren": "off",
+    "space-in-parens": ["error", "never"],
+    "space-infix-ops": "error",
+    "space-unary-ops": "error",
+    "spaced-comment": "off",
+    strict: ["error", "never"],
+    "switch-colon-spacing": "error",
+    "symbol-description": "error",
+    "template-curly-spacing": "error",
+    "template-tag-spacing": "error",
+    "unicode-bom": ["error", "never"],
+    "valid-jsdoc": "error",
+    "vars-on-top": "off",
+    "wrap-iife": "error",
+    "wrap-regex": "error",
+    "yield-star-spacing": "error",
+    yoda: ["error", "never"]
+  }
+};
--- a/GOALS.md
+++ b/GOALS.md
@@ -0,0 +1,114 @@
+These are the goals of the I2P Browser, and not really this plugin in-and-of-itself
+===================================================================================
+
+A
+
+User Interface:
+---------------
+
+ * Remove search engines
+ * Replace bookmarks
+ * Donate banner / UI
+ * Patch Firefox to have relative (from the binary) profile directory
+ * Start use the Firefox update process to update browser installations
+ * Mark .i2p cookies as secure
+ * Mark .i2p domains as secure connection
+ * Add tests for .i2p secure marking
+ * Improve the delay-the-user XUL dialogs to be more accurate in regards
+  of where the router is in it’s bootup progress
+ * Disable the WebIDE
+ * Disable GamePad API by default
+ * Disable Web Speech API by default
+ * Disable the Web Audio API by default
+ * UI redesign bootstrapping and configuration screens (delay-the-user dialogs)
+ * Default browser choose wining should de disabled like
+  browser.shell.checkDefaultBrowser, it can be default, but then
+  choosen by the user without any begging ahead
+ * Extend the firefox preferences UI for I2P router configuration thought
+  of as "must have" or "very nice to have"
+ * Shrink the BroadcastChannel API's boundaries of access or disable completely
+ * Make a API white/grey/black -list, in super paranoia mode we should
+  probably disable almost all, while in most cases the user probably want
+  to be as close to a normal browser/web experinence that
+  they are used to from before
+
+Leak Avoidance:
+---------------
+
+ * Stop web socket DNS leak
+ * If doable, slim down the CA store from unnecessary CAs
+ * Disable the microphone by default
+ * Ensure WebRTC is disabled in compile time
+ * Disable mDNS features
+ * Ensure links like sftp:// and smb:// ,
+  as well as \\samba-share is blocked/denied
+ * Don’t allow IndexedDB storage for third party domains (likability issue)
+ * Patch the DNS service to prevent any browser or addon DNS resolution
+ * Restrict what MIME types that are exposed to content scripts
+
+General Security:
+-----------------
+
+ * Backport any security patches that might appear from Mozilla
+ * Don’t allow XHR/Websockets requests towards 127.0.0.1/localhost
+ * Always use the  most sane form of preferences defaults in context
+  of privacy and security.
+
+Unnecessary Connections:
+------------------------
+
+ * Disable getpocket.com features and alike
+ * Remove sync option from preferences
+ * Clear state when the app exits, by default
+ * Disable updater telemetry
+ * Make firefox stop call home to mozilla for different reasons
+ * Prevent non-Necko network connections
+ * Figure out how to approach prerender, preconnect, and prefetch link tags
+
+Disk Avoidance:
+---------------
+
+ * Don’t allow SSL key logging
+ * Only cache media in memory
+ * Disable the password saving functionality to avoid such being written to disk
+ * Disable the Auto form-fill to keep as much as possible not written to disk
+
+Platforms:
+----------
+
+ * Support for Android?
+ * Support for iOS?
+
+Anti-Fingerprinting:
+--------------------
+
+ * Test for preferences which ensures a sane default and
+  something to tell when/if we break it
+ * Disable support for system adding
+ * Disable Firefox enterprise policies
+ * Disable NTLM authentication
+ * Disable SPNEGO authentication
+ * Handle privacy issues regarding window.name
+ * Test runner for I2P Browser test cases
+ * Block loading of plugins
+ * Disable OS spesific firefox features that can help fingerprint
+  the end user's operating system
+ * Block html5 canvas by default
+ * Block by default or disable WebGL completely?
+ * Never start fullscreen, always start with fixed width/height to
+  avoid expose screen resolution
+ * Report fake system uptime to content scripts
+ * Spoof Accept-Language and Accept-Charset headers no matter browser language
+ * Spoof timezone to always be UTC
+ * Develop methods to reduce the accuracy of JavaScript
+  performance fingerprinting
+ * Always report only one CPU core (dom.maxHardwareConcurrencys)
+ * Avoid Keystroke fingerprinting by messing with the event resolution
+ * Disable GeoIP-based search results
+
+???
+---
+
+ * SVG drawing
+ * MathML drawing
+ * I2Pd flavor
--- a/40
+++ b/40
@@ -36,8 +36,8 @@ clean:
 ## EVEN RELEASES are AMO RELEASES
 ## ODD RELEASES are SELFHOSTED RELEASES

-MOZ_VERSION=0.40
-VERSION=0.41
+MOZ_VERSION=0.42
+VERSION=0.43
 #VERSION=$(MOZ_VERSION)
 #VERSION=1.27

@@ -71,11 +71,18 @@ xpi:
 version:
 	sed -i 's|$(shell grep "\"version\": " manifest.json)|  \"version\": \"$(VERSION)\",|g' manifest.json

+moz-version:
+	sed -i 's|$(shell grep "\"version\": " manifest.json)|  \"version\": \"$(MOZ_VERSION)\",|g' manifest.json
+
 zip: version
 	zip --exclude="./i2ppb@eyedeekay.github.io.xpi" \
 		--exclude="./i2psetproxy.js@eyedeekay.github.io.xpi" \
 		--exclude="./i2psetproxy.js.png" \
 		--exclude="./i2psetproxy.js.gif" \
+		--exclude="./package.json" \
+		--exclude="./package-lock.json" \
+		--exclude="./.node_modules" \
+		--exclude="./node_modules" \
 		--exclude="./.git" -r -FS ../i2psetproxy.js.zip *

 release:
@@ -88,6 +95,30 @@ recreate-release: delete-release release upload

 upload: upload-xpi upload-deb

+
+WEB_EXT_API_KEY=AMO_KEY
+WEB_EXT_API_SECRET=AMO_SECRET
+
+
+-include ../api_keys_moz.mk
+
+tk:
+	echo $(WEB_EXT_API_KEY)
+
+##ODD NUMBERED, SELF-DISTRIBUTED VERSIONS HERE!
+sign: version
+	@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."
+	web-ext sign --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET)
+
+##EVEN NUMBERED, MOZILLA-DISTRIBUTED VERSIONS HERE!
+submit: moz-version
+	@echo "Using the 'submit' target to instantly sign an extension for Mozilla distribution"
+	@echo "requires a JWT API Key and Secret from addons.mozilla.org to be made available"
+	@echo "to the Makefile under the variables WEB_EXT_API_KEY and WEB_EXT_API_SECRET."
+	web-ext sign --channel listed --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET)
+
 upload-xpi:
 	gothub upload -u eyedeekay -r i2psetproxy.js -t $(VERSION) -n "i2ppb@eyedeekay.github.io.xpi" -f "./i2ppb@eyedeekay.github.io.xpi"

@@ -100,6 +131,9 @@ libpolyfill:
 	wget -O chromium/browser-polyfill.js https://unpkg.com/webextension-polyfill/dist/browser-polyfill.js

 fmt:
+	cleancss -O1 all -O2 all --format beautify home.css -o .home.css && mv .home.css home.css
+	cleancss -O1 all -O2 all --format beautify info.css -o .info.css && mv .info.css info.css
+	#find . -path ./node_modules -prune -o -name '*.css' -exec cleancss -O1 --format beautify {} \;
 	find . -path ./node_modules -prune -o -name '*.js' -exec prettier --write {} \;

 lint:
@@ -118,3 +152,5 @@ deborig:

 deb: deborig
 	cd ../i2psetproxy.js-$(VERSION) && debuild -us -uc -rfakeroot
+
+-include mirrors.mk
--- a/README.md
+++ b/README.md
@@ -89,10 +89,16 @@ command:

 ![Visiting i2p-projekt.i2p](i2psetproxy.js.png)

-![Visiting clearweb](clearweb.png)
-
 ![Visiting routerconsole](routerconsole.png)

+![Visiting webmail](susimail.png)
+
+![Visiting i2psnark](i2psnark.png)
+
+![Visiting i2ptunnel](i2ptunnel.png)
+
+![Visiting clearweb](clearweb.png)
+
 ![Video of the plugin in action](i2psetproxy.js.gif)

 Super Extra Important Background Info:
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -8,11 +8,51 @@
    "description": "Description of the extension."
  },
  "titlePreface": {
-    "message": "I2P Browser - ",
+    "message": "I2P Browser",
    "description": "Preface for the browser titlebar"
  },
  "titlePrefacePrivate": {
-    "message": "I2P Browser (Private) - ",
+    "message": "I2P Browser (Private)",
+    "description": "Preface for the browser titlebar"
+  },
+  "webPreface": {
+    "message": "Web Browser",
+    "description": "Preface for the browser titlebar"
+  },
+  "webPrefacePrivate": {
+    "message": "Web Browser (Private)",
+    "description": "Preface for the browser titlebar"
+  },
+  "routerPreface": {
+    "message": "Router Console",
+    "description": "Preface for the browser titlebar"
+  },
+  "routerPrefacePrivate": {
+    "message": "Router Console (Private)",
+    "description": "Preface for the browser titlebar"
+  },
+  "torrentPreface": {
+    "message": "Bittorrent",
+    "description": "Preface for the browser titlebar"
+  },
+  "torrentPrefacePrivate": {
+    "message": "Bittorrent (Private)",
+    "description": "Preface for the browser titlebar"
+  },
+  "mailPreface": {
+    "message": "Web Mail",
+    "description": "Preface for the browser titlebar"
+  },
+  "mailPrefacePrivate": {
+    "message": "Web Mail (Private)",
+    "description": "Preface for the browser titlebar"
+  },
+  "i2ptunnelPreface": {
+    "message": "Hidden Services Manager",
+    "description": "Preface for the browser titlebar"
+  },
+  "i2ptunnelPrefacePrivate": {
+    "message": "Hidden Services Manager (Private)",
    "description": "Preface for the browser titlebar"
  },
  "resetMessage": {
--- a/background.js
+++ b/background.js
@@ -1,3 +1,16 @@
+var titlepref = chrome.i18n.getMessage("titlePreface");
+var titleprefpriv = chrome.i18n.getMessage("titlePrefacePrivate");
+var webpref = chrome.i18n.getMessage("webPreface");
+var webprefpriv = chrome.i18n.getMessage("webPrefacePrivate");
+var routerpref = chrome.i18n.getMessage("routerPreface");
+var routerprefpriv = chrome.i18n.getMessage("routerPrefacePrivate");
+var mailpref = chrome.i18n.getMessage("mailPreface");
+var mailprefpriv = chrome.i18n.getMessage("mailPrefacePrivate");
+var torrentpref = chrome.i18n.getMessage("torrentPreface");
+var torrentprefpriv = chrome.i18n.getMessage("torrentPrefacePrivate");
+var tunnelpref = chrome.i18n.getMessage("i2ptunnelPreface");
+var tunnelprefpriv = chrome.i18n.getMessage("i2ptunnelPrefacePrivate");
+
 function onGot(contexts) {
  var ids = [];
  for (let context of contexts) {
@@ -5,55 +18,55 @@ function onGot(contexts) {
    ids.push(context.name);
  }
  console.log("Checking new contexts");
-  if (ids.indexOf("I2P Browsing") == -1) {
+  if (ids.indexOf(titlepref) == -1) {
    browser.contextualIdentities
      .create({
-        name: "I2P Browsing",
+        name: titlepref,
        color: "orange",
        icon: "fingerprint"
      })
      .then(onCreated, onError);
  }
-  if (ids.indexOf("Web Browsing") == -1) {
+  if (ids.indexOf(webpref) == -1) {
    browser.contextualIdentities
      .create({
-        name: "Web Browsing",
+        name: webpref,
        color: "red",
        icon: "circle"
      })
      .then(onCreated, onError);
  }
-  if (ids.indexOf("Router Console") == -1) {
+  if (ids.indexOf(routerpref) == -1) {
    browser.contextualIdentities
      .create({
-        name: "Router Console",
+        name: routerpref,
        color: "blue",
        icon: "briefcase"
      })
      .then(onCreated, onError);
  }
-  if (ids.indexOf("Hidden Services Manager") == -1) {
+  if (ids.indexOf(tunnelpref) == -1) {
    browser.contextualIdentities
      .create({
-        name: "Hidden Services Manager",
+        name: tunnelpref,
        color: "green",
        icon: "tree"
      })
      .then(onCreated, onError);
  }
-  if (ids.indexOf("Web Mail") == -1) {
+  if (ids.indexOf(mailpref) == -1) {
    browser.contextualIdentities
      .create({
-        name: "Web Mail",
+        name: mailpref,
        color: "yellow",
        icon: "briefcase"
      })
      .then(onCreated, onError);
  }
-  if (ids.indexOf("Bittorrent") == -1) {
+  if (ids.indexOf(torrentpref) == -1) {
    browser.contextualIdentities
      .create({
-        name: "Bittorrent",
+        name: torrentpref,
        color: "purple",
        icon: "chill"
      })
@@ -79,9 +92,6 @@ if (!isDroid()) {
  chrome.tabs.onActivated.addListener(themeWindowByTab);
 }

-var titlepref = chrome.i18n.getMessage("titlePreface");
-var titleprefpriv = chrome.i18n.getMessage("titlePrefacePrivate");
-
 function themeWindowByTab(tabId) {
  function tabWindow(tab) {
    getwindow = browser.windows.get(tab.windowId);
@@ -99,7 +109,7 @@ function themeWindow(window) {
  // Check if the window is in private browsing
  function logTabs(tabInfo) {
    function onGot(context) {
-      if (context.name == "I2P Browsing") {
+      if (context.name == titlepref) {
        console.log("Active in I2P window");
        if (window.incognito) {
          chrome.theme.update(window.id, {
@@ -116,7 +126,7 @@ function themeWindow(window) {
            }
          });
        }
-      } else if (context.name == "Router Console") {
+      } else if (context.name == routerpref) {
        console.log("Active in Router Console window");
        if (window.incognito) {
          chrome.theme.update(window.id, {
@@ -133,7 +143,7 @@ function themeWindow(window) {
            }
          });
        }
-      } else if (context.name == "Hidden Services Manager") {
+      } else if (context.name == tunnelpref) {
        console.log("Active in Hidden Services Manager window");
        if (window.incognito) {
          chrome.theme.update(window.id, {
@@ -150,7 +160,7 @@ function themeWindow(window) {
            }
          });
        }
-      } else if (context.name == "Web Mail") {
+      } else if (context.name == mailpref) {
        console.log("Active in Web Mail window");
        if (window.incognito) {
          chrome.theme.update(window.id, {
@@ -167,7 +177,7 @@ function themeWindow(window) {
            }
          });
        }
-      } else if (context.name == "Bittorrent") {
+      } else if (context.name == torrentpref) {
        console.log("Active in Bittorrent window");
        if (window.incognito) {
          chrome.theme.update(window.id, {
@@ -213,7 +223,7 @@ function setTitle(window) {
    console.log(tabInfo);

    function onGot(context) {
-      if (context.name == "I2P Browsing") {
+      if (context.name == titlepref) {
        console.log("Active in I2P window");

        if (window.incognito) {
@@ -225,64 +235,63 @@ function setTitle(window) {
            titlePreface: titlepref
          });
        }
-      } else if (context.name == "Web Browsing") {
+      } else if (context.name == webpref) {
        console.log("Active in Web window");

        if (window.incognito) {
          chrome.windows.update(window.id, {
-            titlePreface: titleprefpriv
+            titlePreface: ""
          });
        } else {
          chrome.windows.update(window.id, {
-            titlePreface: titlepref
+            titlePreface: ""
          });
        }
-      } else if (context.name == "Router Console") {
+      } else if (context.name == routerpref) {
        console.log("Active in Router Console window");
-
        if (window.incognito) {
          chrome.windows.update(window.id, {
-            titlePreface: titleprefpriv
+            titlePreface: routerprefpriv
          });
        } else {
          chrome.windows.update(window.id, {
-            titlePreface: titlepref
+            titlePreface: routerpref
          });
        }
-      } else if (context.name == "Hidden Services Manager") {
+      } else if (context.name == tunnelpref) {
        console.log("Active in Hidden Services Manager window");

        if (window.incognito) {
          chrome.windows.update(window.id, {
-            titlePreface: titleprefpriv
+            titlePreface: tunnelprefpriv
          });
        } else {
          chrome.windows.update(window.id, {
-            titlePreface: titlepref
+            titlePreface: tunnelpref
          });
        }
-      } else if (context.name == "Web Mail") {
+      } else if (context.name == mailpref) {
        console.log("Active in Web Mail window");

        if (window.incognito) {
          chrome.windows.update(window.id, {
-            titlePreface: titleprefpriv
+            titlePreface: mailprefpriv
          });
        } else {
          chrome.windows.update(window.id, {
-            titlePreface: titlepref
+            titlePreface: mailpref
          });
        }
-      } else if (context.name == "Bittorrent") {
+      } else if (context.name == torrentpref) {
        console.log("Active in I2P window");

        if (window.incognito) {
          chrome.windows.update(window.id, {
-            titlePreface: titleprefpriv
+            titlePreface: torrentprefpriv
          });
        } else {
          chrome.windows.update(window.id, {
-            titlePreface: titlepref
+            titlePreface: torrentpref
          });
        }
      }
@@ -329,3 +338,20 @@ chrome.tabs.onCreated.addListener(() => {
  });
  getting.then(setTitle, onError);
 });
+
+chrome.tabs.onActivated.addListener(() => {
+  var getting = browser.windows.getCurrent({
+    populate: true
+  });
+  getting.then(setTitle, onError);
+});
+
+function handleUpdated(updateInfo) {
+  if (updateInfo.theme.colors) {
+    console.log(`Theme was applied: ${updateInfo.theme}`);
+  } else {
+    console.log(`Theme was removed`);
+  }
+}
+
+browser.theme.onUpdated.addListener(handleUpdated);
--- a/bookmarks.js
+++ b/bookmarks.js
@@ -0,0 +1,153 @@
+function bookmarks(bookmarkToolbar) {
+  console.log("Setting up bookmark toolbar", bookmarkToolbar);
+  function bookHome(bookmarkItems) {
+    if (!bookmarkItems.length) {
+      function gotProxyInfo(info) {
+        let host = info.value.http.split(":")[0];
+        let port = info.value.http.split(":")[1];
+        if (port == "7644") {
+          var createBookmark = browser.bookmarks.create({
+            url: "about:I2p",
+            title: "I2P Home Page",
+            parentId: bookmarkToolbar[0].id
+          });
+          createBookmark.then(onCreated);
+        } else {
+          var createBookmark = browser.bookmarks.create({
+            url: browser.runtime.getURL("home.html"),
+            title: "I2P Home Page",
+            parentId: bookmarkToolbar[0].id
+          });
+          createBookmark.then(onCreated);
+        }
+        console.log("(bookmarks) adding home page bookmark");
+      }
+      console.log("(bookmarks) checking if we're running in an I2P Browser");
+      var gettingInfo = browser.proxy.settings.get({});
+      gettingInfo.then(gotProxyInfo);
+    }
+  }
+  function bookTorrent(bookmarkItems) {
+    if (!bookmarkItems.length) {
+      function gotProxyInfo(info) {
+        let host = info.value.http.split(":")[0];
+        let port = info.value.http.split(":")[1];
+        if (port == "7644") {
+          var createBookmark = browser.bookmarks.create({
+            url: "http://localhost:7647/i2psnark",
+            title: "Bittorrent",
+            parentId: bookmarkToolbar[0].id
+          });
+          createBookmark.then(onCreated);
+        } else {
+          var createBookmark = browser.bookmarks.create({
+            url: "http://localhost:7657/i2psnark",
+            title: "Bittorrent",
+            parentId: bookmarkToolbar[0].id
+          });
+          createBookmark.then(onCreated);
+        }
+      }
+      console.log("(bookmarks) checking if we're running in an I2P Browser");
+      var gettingInfo = browser.proxy.settings.get({});
+      gettingInfo.then(gotProxyInfo);
+    }
+  }
+  function bookMail(bookmarkItems) {
+    if (!bookmarkItems.length) {
+      function gotProxyInfo(info) {
+        let host = info.value.http.split(":")[0];
+        let port = info.value.http.split(":")[1];
+        if (port == "7644") {
+          var createBookmark = browser.bookmarks.create({
+            url: "http://localhost:7647/webmail",
+            title: "Web Mail",
+            parentId: bookmarkToolbar[0].id
+          });
+          createBookmark.then(onCreated);
+        } else {
+          var createBookmark = browser.bookmarks.create({
+            url: "http://localhost:7657/webmail",
+            title: "Web Mail",
+            parentId: bookmarkToolbar[0].id
+          });
+          createBookmark.then(onCreated);
+        }
+        console.log("(bookmarks) adding webmail bookmark");
+      }
+      console.log("(bookmarks) checking if we're running in an I2P Browser");
+      var gettingInfo = browser.proxy.settings.get({});
+      gettingInfo.then(gotProxyInfo);
+    }
+  }
+  function bookI2PTunnel(bookmarkItems) {
+    if (!bookmarkItems.length) {
+      function gotProxyInfo(info) {
+        let host = info.value.http.split(":")[0];
+        let port = info.value.http.split(":")[1];
+        if (port == "7644") {
+          var createBookmark = browser.bookmarks.create({
+            url: "http://localhost:7647/i2ptunnelmgr",
+            title: "Hidden Services Manager",
+            parentId: bookmarkToolbar[0].id
+          });
+          createBookmark.then(onCreated);
+        } else {
+          var createBookmark = browser.bookmarks.create({
+            url: "http://localhost:7657/i2ptunnelmgr",
+            title: "Hidden Services Manager",
+            parentId: bookmarkToolbar[0].id
+          });
+          createBookmark.then(onCreated);
+        }
+        console.log("(bookmarks) adding i2ptunnel bookmark");
+      }
+      console.log("(bookmarks) checking if we're running in an I2P Browser");
+      var gettingInfo = browser.proxy.settings.get({});
+      gettingInfo.then(gotProxyInfo);
+    }
+  }
+
+  function onRejected(error) {
+    console.log(`An error: ${error}`);
+  }
+  function onCreated(node) {
+    console.log("Bookmarked", node);
+  }
+
+  var b0 = browser.bookmarks.search({
+    title: "I2P Home Page"
+  });
+  b0.then(bookHome, onRejected);
+
+  var b1 = browser.bookmarks.search({
+    title: "Bittorrent"
+  });
+  b1.then(bookTorrent, onRejected);
+
+  var b2 = browser.bookmarks.search({
+    title: "Hidden Services Manager"
+  });
+  b2.then(bookI2PTunnel, onRejected);
+
+  var b3 = browser.bookmarks.search({
+    title: "Web Mail"
+  });
+  b3.then(bookMail, onRejected);
+}
+
+var bt = browser.bookmarks.search({
+  query: "Toolbar"
+});
+
+bt.then(bookmarks);
+
+function handleCreated(id, bookmarkInfo) {
+  var propValue;
+  for (var propName in bookmarkInfo) {
+    propValue = bookmarkInfo[propName];
+    console.log(propName, propValue);
+  }
+}
+
+browser.bookmarks.onCreated.addListener(handleCreated);
--- a/clearweb.png
+++ b/clearweb.png
--- a/content.js
+++ b/content.js
@@ -1,18 +1,17 @@
 var infoTitle = document.getElementById("text-section-header");
 infoTitle.textContent = chrome.i18n.getMessage("infoTitle");
-
-var infoMessage = document.getElementById("text-section-helptext");
-infoMessage.textContent = chrome.i18n.getMessage("infoMessage");
-
+/*
 var helpMessage = document.getElementById("window-create-forum-panel");
 helpMessage.textContent = chrome.i18n.getMessage("forumMessage");
+*/
 /*
 var helpMessage = document.getElementById('window-create-help-panel');
 helpMessage.textContent = chrome.i18n.getMessage("helpMessage")
 */
+/*
 var newsMessage = document.getElementById("window-create-news-panel");
 newsMessage.textContent = chrome.i18n.getMessage("newsMessage");
-
+*/
 var clearData = document.getElementById("clear-browser-data");
 clearData.textContent = chrome.i18n.getMessage("clearData");
 /*
--- a/context.js
+++ b/context.js
@@ -52,7 +52,7 @@ if (browser.contextualIdentities === undefined) {
 } else {
  browser.contextualIdentities
    .query({
-      name: "I2P Browsing"
+      name: "I2P Browser"
    })
    .then(identities => {
      if (!identities.length) {
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+i2psetproxy.js (0.43-1) UNRELEASED; urgency=low
+
+  * Contextualize All the Things
+
+ -- idk <hankhill19580@gmail.com>  Thu, 31 OCT 2019 12:41:33 -0400
+
 i2psetproxy.js (0.41-1) UNRELEASED; urgency=low

  * Only open tabs, not windows
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -0,0 +1 @@
+i2psetproxy.js.gif
--- a/home.css
+++ b/home.css
@@ -0,0 +1,285 @@
+* {
+  padding: 0;
+  margin: 0
+}
+html {
+  height: 100%
+}
+a,
+button {
+  color: #3b6bbf;
+  text-decoration: none;
+  font-weight: 700;
+  word-wrap: break-word;
+  outline: 0
+}
+.applicationDesc {
+  color: #81888f;
+  text-decoration: none;
+  font-weight: 700;
+  word-wrap: break-word;
+  outline: 0
+}
+.applicationDesc:hover,
+a:hover,
+button:hover {
+  color: #495057;
+  text-decoration: none;
+  font-weight: 700;
+  word-wrap: break-word;
+  outline: 0
+}
+button {
+  border: none;
+  cursor: pointer;
+  color: #3b6bbf;
+  text-decoration: none;
+  font-weight: 700;
+  word-wrap: break-word;
+  outline: 0
+}
+body {
+  display: flex;
+  flex-direction: column;
+  font-family: "Droid Sans","Noto Sans",Ubuntu,"Segoe UI","Lucida Grande",Verdana,Helvetica,sans-serif;
+  width: 100%;
+  height: 100%;
+  margin: 0 auto;
+  padding: 0;
+  color: #495057;
+  background-attachment: fixed;
+  background-size: 100% 100%;
+  text-decoration: none;
+  font-weight: 700;
+  word-wrap: break-word;
+  outline: 0
+}
+.background {
+  background-color: #f8f8ff;
+  height: 100%
+}
+p {
+  line-height: 32px;
+  font-size: 17px;
+  font-family: "Droid Sans","Noto Sans",Ubuntu,"Segoe UI","Lucida Grande",Verdana,Helvetica,sans-serif;
+  text-decoration: none;
+  color: #495057;
+  font-weight: 700;
+  word-wrap: break-word;
+  outline: 0
+}
+.content {
+  min-height: 3rem;
+  padding: 1rem;
+  margin: 1.5rem;
+  display: inline-block;
+  border: 1px solid #d9d9d6;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
+  background: #f8f8ff
+}
+.extended-info {
+  min-height: 3rem;
+  padding: 1rem;
+  margin-top: 1.5rem;
+  display: inline-block;
+  border: 1px solid #d9d9d6;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
+  background: #f8f8ff;
+  min-width: 50%
+}
+.application-info {
+  min-height: 3rem;
+  padding: 1rem;
+  margin-top: 1.5rem;
+  display: inline-block;
+  border: 1px solid #d9d9d6;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
+  background: #f8f8ff
+}
+h1 {
+  margin-right: auto;
+  font-family: "Droid Sans","Noto Sans",Ubuntu,"Segoe UI","Lucida Grande",Verdana,Helvetica,sans-serif;
+  font-weight: 600;
+  font-size: 32px;
+  text-transform: uppercase;
+  color: #41465f;
+  border: 1px solid #dee2e6;
+  border-radius: 2px 2px 0 0;
+  width: 90%;
+  padding-left: 5%
+}
+h2,
+h3 {
+  margin-right: auto;
+  font-family: "Droid Sans","Noto Sans",Ubuntu,"Segoe UI","Lucida Grande",Verdana,Helvetica,sans-serif;
+  font-weight: 600;
+  font-size: 25px;
+  text-transform: uppercase;
+  color: #41465f;
+  border: 1px solid #dee2e6;
+  border-radius: 2px 2px 0 0;
+  width: 90%;
+  padding-left: 5%
+}
+h4 {
+  margin-right: auto;
+  font-family: "Droid Sans","Noto Sans",Ubuntu,"Segoe UI","Lucida Grande",Verdana,Helvetica,sans-serif;
+  font-weight: 600;
+  font-size: 20px!important;
+  text-transform: uppercase;
+  color: #41465f;
+  border: 1px solid #dee2e6;
+  border-radius: 2px 2px 0 0;
+  width: 90%;
+  padding-left: 5%
+}
+.showhider {
+  margin-right: auto;
+  font-family: "Droid Sans","Noto Sans",Ubuntu,"Segoe UI","Lucida Grande",Verdana,Helvetica,sans-serif;
+  text-transform: uppercase;
+  background: 0 0!important;
+  border: none;
+  padding: 0!important;
+  width: 90%;
+  color: #3b6bbf;
+  text-decoration: none;
+  font-weight: 700;
+  word-wrap: break-word;
+  outline: 0;
+  text-align: left
+}
+#links .showhider {
+  font-size: 25px
+}
+.section-header {
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 80px
+}
+ul {
+  margin-left: 2rem;
+  list-style: none
+}
+li {
+  min-height: 3rem;
+  padding: .5rem;
+  background: #dee2e6;
+  border: 1px solid #dee2e6;
+  width: 64%;
+  min-width: 64%;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc;
+  margin: .5rem .5rem .5rem 32%
+}
+#readyness {
+  min-height: 5rem;
+  padding: .5rem;
+  margin: .5rem;
+  width: 42%;
+  min-width: 42%;
+  background: #dee2e6;
+  text-align: center!important;
+  border: 1px solid #dee2e6;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
+}
+#onboarding {
+  min-height: 5rem;
+  padding: .5rem;
+  margin: .5rem;
+  width: 42%;
+  min-width: 42%;
+  font-size: 2rem;
+  background: #a48fe1;
+  text-align: center!important;
+  border: 1px solid #a48fe1;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
+}
+#i2pbrowser-description {
+  width: 50%;
+  min-width: 50%;
+  min-height: 5rem;
+  padding: .5rem;
+  display: inline;
+  background: #dee2e6;
+  float: right;
+  border: 1px solid #dee2e6;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
+}
+#applicationExplain,
+#linksExplain {
+  min-height: 5rem;
+  padding: .5rem;
+  margin: .5rem;
+  width: 30%;
+  min-width: 30%;
+  background: #dee2e6;
+  float: left;
+  text-align: center!important;
+  border: 1px solid #dee2e6;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
+}
+#proxyReady {
+  min-height: 3rem;
+  padding: .5rem;
+  margin: .2rem;
+  width: 38%;
+  min-width: 38%;
+  display: inline;
+  background: #d9d9d6;
+  float: right;
+  text-align: center!important;
+  border: 1px solid #d9d9d6;
+  border-radius: 2px;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
+}
+#proxyUnready {
+  min-height: 3rem;
+  padding: .5rem;
+  margin: .2rem;
+  width: 38%;
+  min-width: 38%;
+  display: inline;
+  float: right;
+  text-align: center!important;
+  border: 1px solid #ffc56d;
+  border-radius: 2px;
+  background: #ffc56d;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
+}
+#consoleOn {
+  min-height: 3rem;
+  padding: .5rem;
+  margin: .2rem;
+  width: 38%;
+  min-width: 38%;
+  display: inline;
+  float: left;
+  text-align: center!important;
+  border: 1px solid #f7e59a;
+  border-radius: 2px;
+  background: #f7e59a;
+  box-shadow: inset 0 0 0 1px #fff,0 0 1px #ccc
+}
+.onboardingContent {
+  font-size: .8rem!important;
+  text-align: left
+}
+#proxy-check {
+  visibility: hidden
+}
+.consoleOn:hover #proxy-check,
+.proxyReady:hover #proxy-check {
+  visibility: visible;
+  opacity: 1
+}
+img.readyness {
+  height: 100%;
+  width: auto
+}
--- a/home.html
+++ b/home.html
@@ -0,0 +1,114 @@
+<!DOCTYPE html>
+
+<html>
+  <head>
+    <meta charset="utf-8">
+    <link rel="stylesheet" href="home.css"/>
+  </head>
+
+<body>
+  <!--<div>-->
+  <script src="home.js" type="text/javascript"></script>
+    <div class='background'>
+      <div class='content'>
+        <div class='section-header'>
+          <h1>The Invisible Internet Browser</h1>
+        </div>
+        <div id="i2pbrowser-version"></div>
+          <div id="i2pbrowser-description">
+            <p id="description">The Invisible Internet Browser ( I2P Browser ) is preconfigured to get your content using the anonymous and private I2P network and to provide accessible, first-class access to I2P Peer-to-Peer applications.</p>
+            <p class="beta">This is a experimental sub-project of I2P. It is currently Beta software.</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 id="proxyReady" class="hideIfI2PProxyOff">
+              <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>
+          <div id="onboarding" class="hideIfI2PConsoleOff">
+            <h3 id="onboardingTitle">New to I2P? Learn more here.</h3>
+            <h4 id="onboardingZero"><button class="showhider" onclick="flipVisibility('onboardingContentZero')">Protect your Privacy</button></h4>
+            <p id="onboardingContentZero" class="onboardingContent">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" onclick="flipVisibility('onboardingContentOne')">Configure your Experience</button></h4>
+            <p id="onboardingContentOne" class="onboardingContent">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" onclick="flipVisibility('onboardingContentTwo')">Share Files</button></h4>
+            <p id="onboardingContentTwo" class="onboardingContent">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" onclick="flipVisibility('onboardingContentThree')">Hidden e-mail</button></h4>
+            <p id="onboardingContentThree" class="onboardingContent">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" onclick="flipVisibility('onboardingContentFour')">Experience Tips</button></h4>
+            <p id="onboardingContentFour" class="onboardingContent">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">
+            <h3>Applications</h3>
+            <p id="applicationExplain">These applications use I2P to provide them with security and privacy.</p>
+              <ul>
+                <a class="applicationName" href="http://127.0.0.1:7657/i2ptunnel">
+                  <li class="application">
+                    Hidden Services Manager <span class="applicationDesc">I2P has a web-based interface for configuring .i2p services like web sites, to set up your own web sites, go here:</span>
+                  </li>
+                </a>
+                <a class="applicationName" href="http://127.0.0.1:7657/susimail">
+                  <li class="application">
+                  E-Mail <span class="applicationDesc">I2P also bundles a webmail client which can be used to access in-I2P e-mail. To use it, go here:</span>
+                  </li>
+                </a>
+                <a class="applicationName" href="http://127.0.0.1:7657/i2psnark">
+                  <li class="application">
+                    BitTorrent <span class="applicationDesc">I2P is capable of anonymous Peer-to-Peer file sharing, to use the built-in bittorrent client go here:</span>
+                  </li>
+                </a>
+              </ul>
+            </p>
+          </div>
+        <div class="extended-info">
+          <h3 id="links"><button class="showhider" onclick="flipVisibility('info-content')">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>
+              <ul>
+                <a href="https://github.com/i2p/i2p-browser">
+                <li>
+                  I2P Browser Source Code: <span class="applicationDesc">Go here to browse the source code of our Firefox fork.</span>
+                </li>
+                </a>
+                <a href="https://github.com/i2p/i2pbutton">
+                <li>
+                  I2P Button Source Code: <span class="applicationDesc">Much of the functionality of the I2P Browser is implemented in the I2PButton plugin.</span>
+                </li>
+                </a>
+                <a href="https://github.com/mikalv/i2p-browser-build-scripts">
+                <li>
+                  I2P Browser Build Scripts: <span class="applicationDesc">These scripts are used to build the browser.</span>
+                </li>
+                </a>
+                <a href="https://github.com/mikalv/i2p-browser-design-docs">
+                <li>
+                  I2P Browser Design Document: <span class="applicationDesc">This is the I2P Browser Design Document.</span>
+                </li>
+                </a>
+                <a href="http://trac.i2p2.i2p/">
+                <li>
+                  Trac Wiki: <span class="applicationDesc">To report a bug, visit the Trac Wiki.</span>
+                </li>
+                </a>
+                <a href="http://i2p-projekt.i2p/get-involved/donate">
+                <li>
+                  <em>Support Us: </em> <span class="applicationDesc">I2P is funded by donations. In order to make a donation visit the project web site.</span>
+                </li>
+                </a>
+              </ul>
+            </p>
+            </div>
+          </div>
+        </div>
+     </div>
+  <!--</div>-->
+</body>
+</html>
--- a/home.js
+++ b/home.js
@@ -0,0 +1,8 @@
+function flipVisibility(div) {
+  var x = document.getElementById(div);
+  if (x.style.display === "none") {
+    x.style.display = "block";
+  } else {
+    x.style.display = "none";
+  }
+}
--- a/i2psetproxy.js.png
+++ b/i2psetproxy.js.png
--- a/i2psnark.png
+++ b/i2psnark.png
--- a/i2ptunnel.png
+++ b/i2ptunnel.png
--- a/icons/i2plogo.svg
+++ b/icons/i2plogo.svg
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="109.95727mm"
+   height="27.706699mm"
+   viewBox="0 0 109.95727 27.706699"
+   version="1.1"
+   id="svg4773"
+   inkscape:version="0.92.1 r"
+   sodipodi:docname="horizontal_color.svg">
+  <defs
+     id="defs4767" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="125.25987"
+     inkscape:cy="51.24018"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1366"
+     inkscape:window-height="740"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4770">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-55.768389,-115.63486)">
+    <g
+       id="g5355">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4516"
+         style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
+         d="m 55.768389,116.32817 h 5.625388 v 26.53071 h -5.625388 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4528"
+         style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
+         d="M 83.567492,142.85915 H 64.806129 v -3.94692 l 6.737086,-6.81049 c 1.994831,-2.04361 3.297929,-3.46052 3.910222,-4.24981 0.611829,-0.78977 1.052235,-1.52051 1.321681,-2.19367 0.268981,-0.67315 0.403705,-1.37046 0.403705,-2.09285 0,-1.07686 -0.296392,-1.8787 -0.890103,-2.40504 -0.593711,-0.52589 -1.38579,-0.78929 -2.377165,-0.78929 -1.040621,0 -2.050116,0.23877 -3.028948,0.71589 -0.979764,0.47756 -2.001336,1.15675 -3.066113,2.03756 l -3.083766,-3.65285 c 1.321681,-1.1261 2.416654,-1.92143 3.285851,-2.38646 0.868731,-0.46502 1.817367,-0.8232 2.845444,-1.07406 1.028078,-0.25087 2.178334,-0.3763 3.451235,-0.3763 1.676607,0 3.157633,0.30615 4.442612,0.91798 1.284979,0.61229 2.282403,1.46848 2.992248,2.56995 0.709385,1.10148 1.064782,2.36231 1.064782,3.78154 0,1.23667 -0.217415,2.39575 -0.651785,3.47912 -0.434369,1.08288 -1.107514,2.19365 -2.01946,3.33183 -0.911472,1.13818 -2.517923,2.75997 -4.818901,4.86443 l -3.451235,3.24962 v 0.2569 h 11.693973 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4532"
+         style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
+         d="m 92.213601,128.81343 h 1.850822 c 1.730025,0 3.024298,-0.34145 3.88374,-1.02529 0.858507,-0.68337 1.288228,-1.67846 1.288228,-2.98528 0,-1.31843 -0.360032,-2.29215 -1.079636,-2.92164 -0.720078,-0.62854 -1.848504,-0.94352 -3.384343,-0.94352 h -2.558811 z m 12.703009,-4.21033 c 0,2.85566 -0.89243,5.03911 -2.67682,6.55126 -1.78485,1.51261 -4.322284,2.26845 -7.612787,2.26845 h -2.413402 v 9.43621 h -5.625393 v -26.53071 h 8.474561 c 3.218022,0 5.664411,0.69266 7.340551,2.078 1.6752,1.38532 2.51329,3.45076 2.51329,6.19679" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4536"
+         style="fill:#ffc434;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
+         d="m 121.18308,137.09597 c 0,-3.44937 -2.79621,-6.24557 -6.24559,-6.24557 -3.44937,0 -6.24557,2.7962 -6.24557,6.24557 0,3.44939 2.7962,6.24559 6.24557,6.24559 3.44938,0 6.24559,-2.7962 6.24559,-6.24559" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4540"
+         style="fill:#60ab60;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
+         d="m 121.18308,122.24846 c 0,-3.44937 -2.79621,-6.24557 -6.24559,-6.24557 -3.44937,0 -6.24557,2.7962 -6.24557,6.24557 0,3.44938 2.7962,6.24559 6.24557,6.24559 3.44938,0 6.24559,-2.79621 6.24559,-6.24559" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4544"
+         style="fill:#e15647;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
+         d="m 136.03063,137.09597 c 0,-3.44937 -2.7962,-6.24557 -6.24557,-6.24557 -3.44939,0 -6.24559,2.7962 -6.24559,6.24557 0,3.44939 2.7962,6.24559 6.24559,6.24559 3.44937,0 6.24557,-2.7962 6.24557,-6.24559" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4548"
+         style="fill:#ffc434;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
+         d="m 136.03063,122.24846 c 0,-3.44937 -2.7962,-6.24557 -6.24557,-6.24557 -3.44939,0 -6.24559,2.7962 -6.24559,6.24557 0,3.44938 2.7962,6.24559 6.24559,6.24559 3.44937,0 6.24557,-2.79621 6.24557,-6.24559" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4552"
+         style="fill:#ffc434;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
+         d="m 150.87814,137.09597 c 0,-3.44937 -2.7962,-6.24557 -6.24557,-6.24557 -3.44938,0 -6.24559,2.7962 -6.24559,6.24557 0,3.44939 2.79621,6.24559 6.24559,6.24559 3.44937,0 6.24557,-2.7962 6.24557,-6.24559" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4556"
+         style="fill:#60ab60;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
+         d="m 150.87814,122.24846 c 0,-3.44937 -2.7962,-6.24557 -6.24557,-6.24557 -3.44938,0 -6.24559,2.7962 -6.24559,6.24557 0,3.44938 2.79621,6.24559 6.24559,6.24559 3.44937,0 6.24557,-2.79621 6.24557,-6.24559" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4560"
+         style="fill:#60ab60;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
+         d="m 165.72566,137.09597 c 0,-3.44937 -2.7962,-6.24557 -6.24559,-6.24557 -3.44937,0 -6.24557,2.7962 -6.24557,6.24557 0,3.44939 2.7962,6.24559 6.24557,6.24559 3.44939,0 6.24559,-2.7962 6.24559,-6.24559" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4564"
+         style="fill:#e15647;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46456254"
+         d="m 165.72566,122.24846 c 0,-3.44937 -2.7962,-6.24557 -6.24559,-6.24557 -3.44937,0 -6.24557,2.7962 -6.24557,6.24557 0,3.44938 2.7962,6.24559 6.24557,6.24559 3.44939,0 6.24559,-2.79621 6.24559,-6.24559" />
+    </g>
+  </g>
+</svg>
--- a/index.html
+++ b/index.html
@@ -0,0 +1,106 @@
+<strong>i2psetproxy.js</strong>
+
+WebExtension that does extended configuration of a dedicated I2P browser. While
+<strong>experimental</strong>, it's capable of enforcing the use of the I2P Proxy without
+needing to touch about:config and disables several
+fingerprinting/de-anonymization vectors on it's own. It is also the easiest way
+to configure an I2P browser on Android without requiring the user to root their
+device.
+
+<strong>The Old Version</strong>
+
+New versions of this extension create an I2P in Private Browsing mode instead.
+Since this is a drastic change to the behavior of the old plugin, a new entry
+for the new plugin has been made at a new location on addons.mozilla.org.
+
+<ul>
+<li>This is the new version: <a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">[link]</a></li>
+<li>This is the old version: <a href="https://addons.mozilla.org/en-US/firefox/addon/I2P-Proxy/">[link]</a></li>
+</ul>
+
+<strong>Android usage:</strong>
+
+Open the following link
+<a href="https://github.com/eyedeekay/i2psetproxy.js/releases/">Github Releases Version</a>
+in the browser you want to use for I2P. Firefox will warn you that it is about
+to install an extension and indicate the permissions required. Read them over
+and when you're ready, accept them. That's all it should take, your browser is
+now configured to use I2P.
+
+<strong>addons.mozilla.org</strong>
+
+If you would prefer to recieve automatic updates from AMO, the correct product
+page for this plugin is
+<a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">I2P In Private Browsing</a>.
+This absolutely requires a working outproxy. If you want to avoid the use of AMO
+for updates, you can download the identical plugin from this repository's
+releases page. The latest AMO Plugin will always be identical to the latest
+github release, except for the version number, which must be incremented for
+submission to AMO.
+
+<strong>Features</strong>
+
+<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>[done/wip] <strong>Indicate</strong> the I2P browser is in use visually. Find an
+acceptable way to indicate it on Android.</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/wip] <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>[done-ish] <strong>Reset</strong> the HTTP Proxy tunnel to generate a new destination
+on-demand
+<ul>
+<li>it does this by working in conjunction with this
+<a href="https://github.com/eyedeekay/httptunnel">standalone HTTP proxy</a>, currently
+disabled*.</li>
+</ul></li>
+<li>[ready] <strong>Provide</strong> help in a variety of languages.</li>
+<li>[wip] <strong>Monitor</strong> the health and readiness of the I2P router it is
+instructed to use.</li>
+<li>[1/2] <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>[not started] <strong>Handle Torrents</strong> by talking to i2psnark-rpc plugin and then
+adding them directly into the Firefox downloads drop-downs, menus, etc. If I
+can.</li>
+</ul>
+
+<strong>Screenshot</strong>
+
+
+
+<strong>Super Extra Important Background Info:</strong>
+
+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.
+
+<strong>Links about Project Uplift</strong>
+
+<ul>
+<li>https://wiki.mozilla.org/Security/Tor_Uplift</li>
+<li>https://wiki.mozilla.org/Security/FirstPartyIsolation</li>
+<li>https://wiki.mozilla.org/Security/Fingerprinting</li>
+<li>https://wiki.mozilla.org/Security/Fennec%2BTor_Project</li>
+<li>https://wiki.mozilla.org/Security/Tor_Uplift/Tracking</li>
+</ul>
+
+Project uplift seems to have largely been accomplished?
+
+<strong>Links about Project Fusion</strong>
+
+<ul>
+<li>https://wiki.mozilla.org/Security/Fusion</li>
+<li>https://trac.torproject.org/projects/tor/wiki/org/meetings/2018Rome/Notes/FusionProject</li>
+<li>https://blog.torproject.org/tor-heart-firefox</li>
+</ul>
--- a/info.css
+++ b/info.css
@@ -1,22 +1,54 @@
-html, body {
-  width: 350px;
+body,
+html {
+  width: 50rem
 }
-
 a {
-  margin: 10px;
-  display: inline-block;
+  margin: 10px
 }
-
 .panel {
-  margin: 5px;
+  margin: 5px
 }
-
 span.identity {
  width: 100px;
  display: inline-block;
-  margin-left: 1em;
+  margin-left: 1em
 }
-
 figcaption {
-  display: inline;
-}
+  display: inline
+}
+.section-header {
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 8px
+}
+p {
+  font-size: 12px
+}
+h1 {
+  font-size: 25px
+}
+h2,
+h3 {
+  font-size: 18px
+}
+h4 {
+  font-size: 13px!important
+}
+#links .showhider {
+  font-size: 18px
+}
+#onboarding {
+  font-size: 2rem
+}
+img.readyness {
+  height: 2rem
+}
+#proxyUnready {
+  min-height: 2rem
+}
+#proxyReady {
+  min-height: 2rem
+}
+#consoleOn {
+  min-height: 2rem
+}
--- a/info.js
+++ b/info.js
@@ -40,6 +40,18 @@ document.addEventListener("click", e => {
      };
      chrome.windows.update(currentWindow.id, updateInfo);
    });
+  } else if (e.target.id === "window-visit-homepage") {
+    console.log("attempting to create homepage tab");
+    goHome();
+  } else if (e.target.id === "window-visit-i2ptunnel") {
+    console.log("attempting to create i2ptunnel tab");
+    goTunnel();
+  } else if (e.target.id === "window-visit-susimail") {
+    console.log("attempting to create susimail tab");
+    goMail();
+  } else if (e.target.id === "window-visit-snark") {
+    console.log("attempting to create snark tab");
+    goSnark();
  } else if (e.target.id === "clear-browser-data") {
    forgetBrowsingData();
  } else if (e.target.id === "check-i2p-control") {
@@ -60,6 +72,38 @@ function proxyReadiness() {
  console.log(this.responseText);
 }

+function goHome() {
+  let createData = {
+    url: "home.html"
+  };
+  console.log("visiting homepage");
+  let creating = browser.tabs.create(createData);
+}
+
+function goTunnel() {
+  let createData = {
+    url: "http://127.0.0.1:7657/i2ptunnel"
+  };
+  console.log("visiting homepage");
+  let creating = browser.tabs.create(createData);
+}
+
+function goMail() {
+  let createData = {
+    url: "http://127.0.0.1:7657/susimail"
+  };
+  console.log("visiting homepage");
+  let creating = browser.tabs.create(createData);
+}
+
+function goSnark() {
+  let createData = {
+    url: "http://127.0.0.1:7657/i2psnark"
+  };
+  console.log("visiting homepage");
+  let creating = browser.tabs.create(createData);
+}
+/*
 //document.addEventListener("onpageshow", e => {
 console.log("(Check) Checking Proxy Readiness");
 const Http = new XMLHttpRequest();
@@ -99,3 +143,4 @@ function transferCanceled(evt) {
 Http.addEventListener("load", transferComplete);
 Http.addEventListener("error", transferFailed);
 Http.addEventListener("abort", transferCanceled);
+*/
--- a/manifest.json
+++ b/manifest.json
@@ -5,9 +5,7 @@
      "strict_min_version": "60.0"
    }
  },
-  "chrome_settings_overrides": {
-    "homepage": "home.html"
-  },
+  "content_security_policy": "script-src 'self' 'sha256-AT9pbzcnD9T9Agf3fMgPh55nsx/xONoULxPFvOb93Uo='; object-src 'self'",
  "permissions": [
    "theme",
    "browsingData",
@@ -26,7 +24,7 @@
  ],
  "manifest_version": 2,
  "name": "__MSG_extensionName__",
-  "version": "0.41",
+  "version": "0.43",
  "description": "__MSG_extensionDescription__",
  "homepage_url": "https://github.com/eyedeekay/i2psetproxy.js",
  "icons": {
@@ -48,6 +46,7 @@
      "background.js",
      "proxy.js",
      "info.js",
+      "home.js",
      "i2pcontrol/i2pcontrol.js",
      "scrub.js",
      "bookmarks.js"
--- a/privacy.js
+++ b/privacy.js
@@ -1,3 +1,14 @@
+var webpref = chrome.i18n.getMessage("webPreface");
+var webprefpriv = chrome.i18n.getMessage("webPrefacePrivate");
+var routerpref = chrome.i18n.getMessage("routerPreface");
+var routerprefpriv = chrome.i18n.getMessage("routerPrefacePrivate");
+var mailpref = chrome.i18n.getMessage("mailPreface");
+var mailprefpriv = chrome.i18n.getMessage("mailPrefacePrivate");
+var torrentpref = chrome.i18n.getMessage("torrentPreface");
+var torrentprefpriv = chrome.i18n.getMessage("torrentPrefacePrivate");
+var tunnelpref = chrome.i18n.getMessage("i2ptunnelPreface");
+var tunnelprefpriv = chrome.i18n.getMessage("i2ptunnelPrefacePrivate");
+
 function onSet(result) {
  if (result) {
    console.log("->: Value was updated");
@@ -270,7 +281,7 @@ function forgetBrowsingData(storedSettings) {
        console.log("cleared Local Storage");

        contexts = browser.contextualIdentities.query({
-          name: "I2P Browsing"
+          name: titlepref
        });

        function deepCleanCookies(cookies) {
--- a/proxy.js
+++ b/proxy.js
@@ -1,3 +1,14 @@
+var webpref = chrome.i18n.getMessage("webPreface");
+var webprefpriv = chrome.i18n.getMessage("webPrefacePrivate");
+var routerpref = chrome.i18n.getMessage("routerPreface");
+var routerprefpriv = chrome.i18n.getMessage("routerPrefacePrivate");
+var mailpref = chrome.i18n.getMessage("mailPreface");
+var mailprefpriv = chrome.i18n.getMessage("mailPrefacePrivate");
+var torrentpref = chrome.i18n.getMessage("torrentPreface");
+var torrentprefpriv = chrome.i18n.getMessage("torrentPrefacePrivate");
+var tunnelpref = chrome.i18n.getMessage("i2ptunnelPreface");
+var tunnelprefpriv = chrome.i18n.getMessage("i2ptunnelPrefacePrivate");
+
 browser.privacy.network.peerConnectionEnabled.set({
  value: false
 });
@@ -23,7 +34,7 @@ var handleContextProxyRequest = async function(requestDetails) {
        proxyDns: false
      };
      if (context != undefined) {
-        if (context.name == "I2P Browsing") {
+        if (context.name == titlepref) {
          proxy = {
            type: getScheme(),
            host: getHost(),
@@ -38,7 +49,7 @@ var handleContextProxyRequest = async function(requestDetails) {
            proxy.host + ":" + proxy.port
          );
          return proxy;
-        } else if (context.name == "Router Console") {
+        } else if (context.name == routerpref) {
          if (routerHost(requestDetails.url)) {
            return proxy;
          } else if (!routerHost(requestDetails.url)) {
@@ -62,7 +73,7 @@ var handleContextProxyRequest = async function(requestDetails) {
            proxy.host + ":" + proxy.port
          );
          return proxy;
-        } else if (context.name == "Web Browsing") {
+        } else if (context.name == webpref) {
          if (localHost(requestDetails.url)) {
            if (!routerHost(requestDetails.url)) {
              proxy = {
@@ -132,7 +143,15 @@ var handleContextProxyRequest = async function(requestDetails) {
    };

    if (requestDetails.tabId > 0) {
-      if (i2pHost(requestDetails.url)) {
+      console.log("manifest", requestDetails);
+      if (proxyHost(requestDetails.url)) {
+        proxy = {
+          type: getScheme(),
+          host: getHost(),
+          port: getPort()
+        };
+        return proxy;
+      } else if (i2pHost(requestDetails.url)) {
        console.log("(Proxy)I2P URL detected, ");
        var tab = tabGet(requestDetails.tabId);
        var mtab = tab.then(tabFind);
--- a/routerconsole.png
+++ b/routerconsole.png
--- a/scrub.js
+++ b/scrub.js
@@ -1,10 +1,23 @@
+var titlepref = chrome.i18n.getMessage("titlePreface");
+var titleprefpriv = chrome.i18n.getMessage("titlePrefacePrivate");
+var webpref = chrome.i18n.getMessage("webPreface");
+var webprefpriv = chrome.i18n.getMessage("webPrefacePrivate");
+var routerpref = chrome.i18n.getMessage("routerPreface");
+var routerprefpriv = chrome.i18n.getMessage("routerPrefacePrivate");
+var mailpref = chrome.i18n.getMessage("mailPreface");
+var mailprefpriv = chrome.i18n.getMessage("mailPrefacePrivate");
+var torrentpref = chrome.i18n.getMessage("torrentPreface");
+var torrentprefpriv = chrome.i18n.getMessage("torrentPrefacePrivate");
+var tunnelpref = chrome.i18n.getMessage("i2ptunnelPreface");
+var tunnelprefpriv = chrome.i18n.getMessage("i2ptunnelPrefacePrivate");
+
 var contextScrub = async function(requestDetails) {
  console.log("(scrub)Scrubbing info from contextualized request");
  try {
    var headerScrub = function(context) {
      if (!context) {
        console.error("Context not found");
-      } else if (context.name == "I2P Browsing") {
+      } else if (context.name == titlepref) {
        var ua = "MYOB/6.66 (AN/ON)";
        if (i2pHost(requestDetails.url)) {
          for (var header of requestDetails.requestHeaders) {
@@ -17,7 +30,7 @@ var contextScrub = async function(requestDetails) {
        return {
          requestHeaders: requestDetails.requestHeaders
        };
-      } else if (context.name == "Router Console") {
+      } else if (context.name == routerpref) {
        var ua = "MYOB/6.66 (AN/ON)";
        if (i2pHost(requestDetails.url)) {
          for (var header of requestDetails.requestHeaders) {
@@ -45,7 +58,7 @@ var contextScrub = async function(requestDetails) {
    var tabFind = async function(tabId) {
      try {
        context = await browser.contextualIdentities.query({
-          name: "I2P Browsing"
+          name: titlepref
        });
        tabId.cookieStoreId = context[0].cookieStoreId;
        console.log("(scrub) forcing context", tabId.cookieStoreId);
@@ -96,7 +109,7 @@ var contextSetup = async function(requestDetails) {
    var tabFind = async function(tabId) {
      try {
        var context = await browser.contextualIdentities.query({
-          name: "I2P Browsing"
+          name: titlepref
        });
        if (tabId.cookieStoreId != context[0].cookieStoreId) {
          console.log(
@@ -134,7 +147,7 @@ var contextSetup = async function(requestDetails) {
    var routerTabFind = async function(tabId) {
      try {
        var context = await browser.contextualIdentities.query({
-          name: "Router Console"
+          name: routerpref
        });
        if (tabId.cookieStoreId != context[0].cookieStoreId) {
          console.log(
@@ -172,7 +185,7 @@ var contextSetup = async function(requestDetails) {
    var i2ptunnelTabFind = async function(tabId) {
      try {
        var context = await browser.contextualIdentities.query({
-          name: "Hidden Services Manager"
+          name: tunnelpref
        });
        if (tabId.cookieStoreId != context[0].cookieStoreId) {
          console.log(
@@ -212,7 +225,7 @@ var contextSetup = async function(requestDetails) {
    var snarkTabFind = async function(tabId) {
      try {
        var context = await browser.contextualIdentities.query({
-          name: "Bittorrent"
+          name: torrentpref
        });
        if (tabId.cookieStoreId != context[0].cookieStoreId) {
          console.log(
@@ -250,7 +263,7 @@ var contextSetup = async function(requestDetails) {
    var mailTabFind = async function(tabId) {
      try {
        var context = await browser.contextualIdentities.query({
-          name: "Web Mail"
+          name: mailpref
        });
        if (tabId.cookieStoreId != context[0].cookieStoreId) {
          console.log(
@@ -288,7 +301,7 @@ var contextSetup = async function(requestDetails) {
    var anyTabFind = async function(tabId) {
      try {
        var context = await browser.contextualIdentities.query({
-          name: "Web Browsing"
+          name: webpref
        });
        console.log("(ISOLATE)", tabId.cookieStoreId);
        if (
@@ -340,9 +353,21 @@ var contextSetup = async function(requestDetails) {
    };
    if (requestDetails.tabId > 0) {
      if (proxyHost(requestDetails.url)) {
+        setcookie = browser.cookies.set({
+          firstPartyDomain: i2pHostName(requestDetails.url),
+          url: requestDetails.url,
+          secure: true
+        });
+        setcookie.then(onGot, onError);
        return requestDetails;
      }
      if (i2pHost(requestDetails.url)) {
+        var setcookie = browser.cookies.set({
+          firstPartyDomain: i2pHostName(requestDetails.url),
+          url: requestDetails.url,
+          secure: true
+        });
+        setcookie.then(onGot, onError);
        var tab = tabGet(requestDetails.tabId);
        var mtab = tab.then(tabFind);
        return requestDetails;
@@ -434,10 +459,10 @@ function routerHost(url) {
      if (final === "i2ptunnelmgr" || final === "i2ptunnel") {
        console.log("(urlcheck) application path", final);
        return "i2ptunnelmgr";
-      } else if (final === "i2psnark" || final == "torrents") {
+      } else if (final === "i2psnark" || final === "torrents") {
        console.log("(urlcheck) application path", final);
        return "i2psnark";
-      } else if (final === "webmail") {
+      } else if (final === "webmail" || final === "susimail") {
        console.log("(urlcheck) application path", final);
        return "webmail";
      } else if (final == "") {
--- a/susimail.png
+++ b/susimail.png
--- a/window.html
+++ b/window.html
@@ -3,50 +3,76 @@
 <html>
  <head>
    <meta charset="utf-8">
+    <link rel="stylesheet" href="home.css"/>
    <link rel="stylesheet" href="info.css"/>
  </head>

  <body>
    <div class="panel">
-      <div class="panel-section panel-section-header">
-        <div id="text-section-header" class="text-section-header">I2P Assistance</div>
+        <div class="section-header panel-section panel-section-header">
+          <div id="text-section-header" class="text-section-header"><h1>The Invisible Internet Browser</h1></div>
+        </div>
+      <div class="panel-section-separator"></div>
+        <div id="i2pbrowser-version"></div>
+          <div id="i2pbrowser-description">
+            <p id="description">You are now able to use I2P in this browser.</p>
+            <p class="beta">It is experimental.</p>
+          </div>
+          <div id="readyness">
+              <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>
+              <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>
+      <div class="panel-section-separator"></div>
+        <div class="browser-info">
+          <p class="hideIfI2PConsoleOff">
+            <h3>Controls</h3>
+            <p id="applicationExplain">These controls are used to tailor your I2P Browsing Experience</p>
+              <ul>
+                <a id="clear-browser-data" href="#">
+                  <li class="application">
+                    Clear Browsing Data: <span class="applicationDesc">Use this to erase your browsing data.</span>
+                  </li>
+                </a>
+                <li class="application">
+                  <input type="checkbox" id="enable-web-rtc" name="enablewebrtc" value="webrtc">
+                  <label for="enable-web-rtc">Enable WebRTC <strong>with Proxy?</strong></label>
+                  <span class="applicationDesc">For more information about this extension, go here:</span>
+                </li>
+                <li class="application">
+                  <div class="panel-section-separator"></div>
+                  <div class="panel-section-identity">
+                  <div id="identity-list"></div>
+                </li>
+              </ul>
+            </p>
+          </p>
+        </div>
+      <div class="panel-section-separator"></div>
+        <div class="application-info">
+          <p class="hideIfI2PConsoleOff">
+            <h3>Applications</h3>
+            <p id="applicationExplain">These applications use I2P to provide them with security and privacy.</p>
+              <ul>
+                <li class="application"><button id="window-visit-homepage" class="applicationName window-visit-homepage" href="#">
+                    Home Page <span class="applicationDesc">For more information about this extension, go here:</span>
+                </button></li>
+                <li class="application"><button id="window-visit-i2ptunnel" class="applicationName">
+                    Hidden Services Manager <span class="applicationDesc">I2P has a web-based interface for configuring .i2p services like web sites, to set up your own web sites, go here:</span>
+                </button></li>
+                <li class="application"><button id="window-visit-susimail" class="applicationName">
+                  E-Mail <span class="applicationDesc">I2P also bundles a webmail client which can be used to access in-I2P e-mail. To use it, go here:</span>
+                </button></li>
+                <li class="application"><button id="window-visit-snark" class="applicationName">
+                  BitTorrent <span class="applicationDesc">I2P is capable of anonymous Peer-to-Peer file sharing, to use the built-in bittorrent client go here:</span>
+                </button></li>
+              </ul>
+            </p>
+          </p>
+        </div>
      </div>
-
-      <div id="text-section-helptext">
-      You are now free to browse the eepWeb!
-
-      Your browser is now configured to browse anonymously on the I2P network.
-      As you browse, your traffic will be routed through other network nodes
-      to disguise it's origin, both from the server and from the nodes
-      themselves.
-
-      </div>
-
-      <div class="panel-section-separator"></div>
-          <!-- This is where I'll eventually put the tunnel control panel -->
-          <!-- <a href="#" id="generate-fresh-tunnel> Generate a Fresh Tunnel</a>"-->
-          <!-- -->
-      <strong><a href="#" id="clear-browser-data">Clear all browsing data</a></strong><br>
-      <div class="panel-section-separator"></div>
-          <a href="http://i2pforum.i2p" id="window-create-forum-panel">Visit the I2P Forums</a><br>
-          <a href="http://i2p-projekt.i2p/blog" id="window-create-news-panel">Get the latest I2P News</a><br>
-      <div class="panel-section-separator"></div>
-          <!--<div id="proxy-health">Proxy is:</div>-->
-          <input type="checkbox" id="enable-web-rtc" name="enablewebrtc" value="webrtc">
-          <label for="enable-web-rtc">Enable WebRTC <strong>with Proxy?</strong></label>
-      <div class="panel-section-separator"></div>
-          <!--<a href="#" id="check-i2p-control">Check I2P Router Health</a><div id="panel-section-i2pcontrol-check"></div>-->
-          <figure>
-            <img src="http://proxy.i2p/themes/console/images/favicon.ico" id="panel-proxy-check" alt="Proxy is not ready yet"/>
-            <figcaption>I2P Proxy is Ready</figcaption>
-          </figure>
-      <div class="panel-section-separator"></div>
-      <div class="panel-section-identity">
-          <div id="identity-list"></div>
-      </div>
-    </div>
-
-
  <script src="context.js"></script>
  <script src="privacy.js"></script>
  <script src="info.js"></script>
Author	SHA1	Message	Date
idk	52381453fb	Merge pull request #32 from eyedeekay/smart-home Smart home	2019-11-22 17:57:55 -05:00
idk	317034cb5a	fmt	2019-11-22 17:55:58 -05:00
idk	e9b5060203	use buttons to make the new menu work	2019-11-22 17:49:27 -05:00
idk	2ea3bc169b	exclude mirrors for now	2019-11-22 17:02:54 -05:00
idk	f4c45c4834	exclude mirroring script for now	2019-11-22 17:01:03 -05:00
idk	80bcf6e7ea	fix ci	2019-11-22 16:39:28 -05:00
idk	b7a887c578	fix ci	2019-11-22 16:38:36 -05:00
idk	731a929a88	mark i2p cookies secure, don't set the home page.	2019-11-22 13:24:19 -05:00
idk	8eb75be6ec	improvements to release stuff	2019-11-20 19:55:41 -05:00
idk	30ce917afa	use images as readiness indicators for now	2019-11-20 19:50:12 -05:00
idk	0d5fb3c1bd	backport the smart homepage from the I2P Browser	2019-11-20 17:44:01 -05:00
idk	6d5f56922b	update mirrorlist	2019-11-19 09:38:34 -05:00
idk	8b0bea4e7d	add mirrorlist	2019-11-19 09:37:42 -05:00
idk	92057d459d	add mirrorlist	2019-11-19 09:35:43 -05:00
idk	0c30b2e921	Merge pull request #29 from eyedeekay/titles add i2ptunnel screenshot	2019-11-12 13:13:43 -05:00
idk	df1d971a4d	add i2ptunnel screenshot	2019-11-12 13:11:25 -05:00
idk	9bd7485d4a	Merge pull request #28 from eyedeekay/titles update screenshots	2019-11-12 00:22:09 -05:00
idk	c98f0399d2	update screenshots	2019-11-12 00:21:35 -05:00
idk	15a20cc25f	Merge pull request #27 from eyedeekay/titles update screenshots	2019-11-12 00:14:58 -05:00
idk	b342039e8f	update screenshots	2019-11-12 00:14:11 -05:00
idk	343cec93e2	Merge pull request #26 from eyedeekay/titles Titles	2019-11-12 00:13:09 -05:00
idk	b05ee528fd	update screenshots	2019-11-12 00:11:52 -05:00
idk	d7c4340b4c	use per-tab title prefixes, multilingual titles, multilingual menus	2019-11-11 23:31:37 -05:00
idk	e819532f29	Merge pull request #25 from eyedeekay/update-debian update debian and packaging info	2019-11-11 21:56:08 -05:00
idk	a1a9c8221e	update debian and packaging info	2019-11-11 21:54:26 -05:00
idk	1ebf80b644	Merge pull request #24 from eyedeekay/bookmarks Bookmarks	2019-11-11 21:53:49 -05:00
idk	3727987dd3	Merge pull request #23 from eyedeekay/more-isolation More isolation	2019-11-11 21:53:27 -05:00
idk	34e1251292	fix bookmark	2019-11-11 21:39:35 -05:00
idk	fdf777640d	fix bookmark	2019-11-11 21:38:38 -05:00
idk	4cde00c7de	fix bookmark	2019-11-11 21:02:38 -05:00
idk	92ce8431a2	fix bookmark	2019-11-11 21:01:52 -05:00