8 files changed, 9 insertions, 11 deletions
diff --git a/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/128.png b/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/128.png
index f9b870d..cb5f023 100644
--- a/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/128.png
+++ b/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/128.png
diff --git a/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/16.png b/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/16.png
index 4f2ca5e..876ca33 100644
--- a/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/16.png
+++ b/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/16.png
diff --git a/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/32.png b/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/32.png
index 848d8d2..bc54eff 100644
--- a/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/32.png
+++ b/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/32.png
diff --git a/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/48.png b/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/48.png
index 92cb70a..2aa60cc 100644
--- a/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/48.png
+++ b/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/48.png
diff --git a/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/64.png b/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/64.png
index d89242c..4a2110f 100644
--- a/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/64.png
+++ b/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/64.png
diff --git a/data/extensions/tortm-browser-button@jeremybenthum/data/popup/popup.html b/data/extensions/tortm-browser-button@jeremybenthum/data/popup/popup.html
index 67b5be0..2a49fbc 100644
--- a/data/extensions/tortm-browser-button@jeremybenthum/data/popup/popup.html
+++ b/data/extensions/tortm-browser-button@jeremybenthum/data/popup/popup.html
@@ -29,6 +29,8 @@
         </tr>
       </table>
     </div>
+    <div id="explore"></div>
+    <script async src="explore/explore.js"></script>
     <script src="popup.js"></script>
   </body>
 </html>
diff --git a/data/extensions/tortm-browser-button@jeremybenthum/lib/common.js b/data/extensions/tortm-browser-button@jeremybenthum/lib/common.js
index 51171b6..ae1ed5a 100644
--- a/data/extensions/tortm-browser-button@jeremybenthum/lib/common.js
+++ b/data/extensions/tortm-browser-button@jeremybenthum/lib/common.js
@@ -16,19 +16,15 @@ var popupsend = function () {
 };
 
 var setproxy = function (callback) {
-  if (tor.id === "OFF") chrome.proxy.settings.set({"scope": "regular", "value": {"proxyType":"system", "mode": "system"}}, callback);
+  if (tor.id === "OFF") chrome.proxy.settings.set({"scope": "regular", "value": {"mode": "system"}}, callback);
   else chrome.proxy.settings.set({
     "scope": "regular",
     "value":  {
-      "proxyDNS":true,
-      "autoConfigUrl":"",
-      "socksVersion":5,
-      "passthrough":"",
-      "proxyType":"manual",
-      "ftp":"",
-      "ssl":"",
-      "http":"",
-      "socks":"127.0.0.1:9050"
+      "mode": "fixed_servers",
+      "rules": {
+        "bypassList": tor.bypassList,
+        "singleProxy": {"scheme": "socks5", "host": "127.0.0.1", "port": 9050}
+      }
     }
   }, callback);
 };
diff --git a/data/extensions/tortm-browser-button@jeremybenthum/lib/proxy.js b/data/extensions/tortm-browser-button@jeremybenthum/lib/proxy.js
index 525bb5b..a8e3748 100644
--- a/data/extensions/tortm-browser-button@jeremybenthum/lib/proxy.js
+++ b/data/extensions/tortm-browser-button@jeremybenthum/lib/proxy.js
@@ -5,7 +5,7 @@ if (/Firefox/.test(navigator.userAgent)) {
       const mode = value.mode;
       const settings = {
         "autoLogin": value.noPrompt,
-        "proxyDNS": true,
+        "proxyDNS": value.remoteDNS,
         "autoConfigUrl": mode === 'pac_script' ? value.pacScript.url : '',
         "socksVersion": mode === 'fixed_servers' && value.rules.singleProxy.scheme === 'socks5' ? 5 : 4,
         "passthrough": mode === 'fixed_servers' && value.rules.bypassList && value.rules.bypassList.length ? value.rules.bypassList.join(', ') : '',