diff --git a/bookmarks.js b/bookmarks.js
index ce451f6..22a7f02 100644
--- a/bookmarks.js
+++ b/bookmarks.js
@@ -2,42 +2,110 @@ function bookmarks(bookmarkToolbar) {
   console.log("Setting up bookmark toolbar", bookmarkToolbar);
   function bookHome(bookmarkItems) {
     if (!bookmarkItems.length) {
-      function checkIBBookmarks(storedSettings) {
-        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: "Landing Page",
-              parentId: bookmarkToolbar[0].id
-            });
-            createBookmark.then(onCreated);
-          }
+      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: "Home Page",
+            parentId: bookmarkToolbar[0].id
+          });
+          createBookmark.then(onCreated);
+        } else {
+          var createBookmark = browser.bookmarks.create({
+            url:
+              "http://localhost:7657",
+            title: "Home Page",
+            parentId: bookmarkToolbar[0].id
+          });
+          createBookmark.then(onCreated);
         }
-        var gettingInfo = browser.proxy.settings.get({});
-        gettingInfo.then(gotProxyInfo);
+        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) {
-      var createBookmark = browser.bookmarks.create({
-        url: "http://localhost:7657/torrents",
-        title: "Torrents",
-        parentId: bookmarkToolbar[0].id
-      });
-      createBookmark.then(onCreated);
+      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) {
-      var createBookmark = browser.bookmarks.create({
-        url: "http://localhost:7657/webmail",
-        title: "E-Mail",
-        parentId: bookmarkToolbar[0].id
-      });
-      createBookmark.then(onCreated);
+      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);
     }
   }
 
@@ -49,21 +117,27 @@ function bookmarks(bookmarkToolbar) {
   }
 
   var b0 = browser.bookmarks.search({
-    title: "Landing Page"
+    title: "Home Page"
   });
   b0.then(bookHome, onRejected);
 
   var b1 = browser.bookmarks.search({
-    url: "http://localhost:7657/torrents",
-    title: "Torrents"
+    url: "http://localhost:7657/i2psnark",
+    title: "Bittorrent"
   });
   b1.then(bookTorrent, onRejected);
 
   var b2 = browser.bookmarks.search({
-    url: "http://localhost:7657/webmail",
-    title: "E-Mail"
+    url: "http://localhost:7657/i2ptunnelmgr",
+    title: "Hidden Services Manager"
   });
-  b2.then(bookMail, onRejected);
+  b2.then(bookI2PTunnel, onRejected);
+
+  var b3 = browser.bookmarks.search({
+    url: "http://localhost:7657/webmail",
+    title: "Web Mail"
+  });
+  b3.then(bookMail, onRejected);
 }
 
 var bt = browser.bookmarks.search({
@@ -71,4 +145,3 @@ var bt = browser.bookmarks.search({
 });
 
 bt.then(bookmarks);
-
diff --git a/proxy.js b/proxy.js
index 5f69696..56b0e90 100644
--- a/proxy.js
+++ b/proxy.js
@@ -132,7 +132,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);