diff --git a/add-on/_locales/en/messages.json b/add-on/_locales/en/messages.json
index 7374a55f6..f241e0783 100644
--- a/add-on/_locales/en/messages.json
+++ b/add-on/_locales/en/messages.json
@@ -227,12 +227,16 @@
     "message": "Embedded (experimental): run js-ipfs node in your browser (use only for development, read about its limitations under the link below)",
     "description": "An option description on the Preferences screen (option_ipfsNodeType_description)"
   },
+  "option_ipfsNodeType_embedded_chromesockets_description": {
+    "message": "Embedded with Chrome Sockets (experimental): run js-ipfs node in your browser with access to chrome.sockets APIs (details under the link below)",
+    "description": "An option description on the Preferences screen (option_ipfsNodeType_description)"
+  },
   "option_ipfsNodeConfig_title": {
     "message": "IPFS Node Config",
     "description": "An option title on the Preferences screen (option_ipfsNodeConfig_title)"
   },
   "option_ipfsNodeConfig_description": {
-    "message": "Configuration for the embedded IPFS node. Must be valid JSON.",
+    "message": "Additional configuration for the embedded IPFS node (arrays will be merged). Must be valid JSON.",
     "description": "An option description on the Preferences screen (option_ipfsNodeConfig_description)"
   },
   "option_ipfsNodeType_external": {
@@ -243,6 +247,10 @@
     "message": "Embedded",
     "description": "An option on the Preferences screen (option_ipfsNodeType_embedded)"
   },
+  "option_ipfsNodeType_embedded_chromesockets": {
+    "message": "Embedded + chrome.sockets",
+    "description": "An option on the Preferences screen (option_ipfsNodeType_embedded_chromesockets)"
+  },
   "option_header_gateways": {
     "message": "Gateways",
     "description": "A section header on the Preferences screen (option_header_gateways)"
diff --git a/add-on/src/lib/dnslink.js b/add-on/src/lib/dnslink.js
index 1107f1a7b..a39332179 100644
--- a/add-on/src/lib/dnslink.js
+++ b/add-on/src/lib/dnslink.js
@@ -105,7 +105,7 @@ module.exports = function createDnslinkResolver (getState) {
     readDnslinkFromTxtRecord (fqdn) {
       const state = getState()
       let apiProvider
-      if (state.ipfsNodeType === 'external' && state.peerCount !== offlinePeerCount) {
+      if (state.ipfsNodeType !== 'embedded' && state.peerCount !== offlinePeerCount) {
         apiProvider = state.apiURLString
       } else {
         // fallback to resolver at public gateway
diff --git a/add-on/src/lib/ipfs-client/embedded-brave.js b/add-on/src/lib/ipfs-client/embedded-chromesockets.js
similarity index 69%
rename from add-on/src/lib/ipfs-client/embedded-brave.js
rename to add-on/src/lib/ipfs-client/embedded-chromesockets.js
index 31e9cde0c..c07d71976 100644
--- a/add-on/src/lib/ipfs-client/embedded-brave.js
+++ b/add-on/src/lib/ipfs-client/embedded-chromesockets.js
@@ -1,14 +1,18 @@
 'use strict'
 /* eslint-env browser, webextensions */
+const browser = require('webextension-polyfill')
+const debug = require('debug')
 
 // Polyfills required by embedded HTTP server
 const uptimeStart = Date.now()
 process.uptime = () => Math.floor((Date.now() - uptimeStart) / 1000)
 process.hrtime = require('browser-process-hrtime')
 
-const defaultsDeep = require('@nodeutils/defaults-deep')
+const mergeOptions = require('merge-options')
 const Ipfs = require('ipfs')
 const HttpApi = require('ipfs/src/http')
+const multiaddr = require('multiaddr')
+const maToUri = require('multiaddr-to-uri')
 
 const { optionDefaults } = require('../options')
 
@@ -25,6 +29,9 @@ let nodeHttpApi = null
 // to  include everything (mplex, libp2p, mss): localStorage.debug = '*'
 localStorage.debug = 'jsipfs*,ipfs*,-*:mfs*,-*:ipns*,-ipfs:preload*'
 
+const log = debug('ipfs-companion:client:embedded')
+log.error = debug('ipfs-companion:client:embedded:error')
+
 exports.init = function init (opts) {
   /*
   // TEST RAW require('http') SERVER
@@ -36,17 +43,25 @@ exports.init = function init (opts) {
     hapiServer = startRawHapiServer(9092)
   }
   */
-  console.log('[ipfs-companion] Embedded ipfs init')
+  log('init: embedded js-ipfs+chrome.sockets')
 
-  const defaultOpts = optionDefaults.ipfsNodeConfig
-  const userOpts = JSON.parse(opts.ipfsNodeConfig)
-  const ipfsOpts = defaultsDeep(defaultOpts, userOpts, { start: false })
+  const defaultOpts = JSON.parse(optionDefaults.ipfsNodeConfig)
+  defaultOpts.libp2p = {
+    config: {
+      dht: {
+        enabled: false
+      }
+    }
+  }
 
+  const userOpts = JSON.parse(opts.ipfsNodeConfig)
+  const ipfsOpts = mergeOptions.call({ concatArrays: true }, defaultOpts, userOpts, { start: false })
+  log('creating js-ipfs with opts: ', ipfsOpts)
   node = new Ipfs(ipfsOpts)
 
   return new Promise((resolve, reject) => {
     node.once('error', (error) => {
-      console.error('[ipfs-companion] Something went terribly wrong during startup of js-ipfs!', error)
+      log.error('something went terribly wrong during startup of js-ipfs!', error)
       reject(error)
     })
     node.once('ready', async () => {
@@ -55,13 +70,14 @@ exports.init = function init (opts) {
         try {
           const httpServers = new HttpApi(node, ipfsOpts)
           nodeHttpApi = await httpServers.start()
+          await updateConfigWithHttpEndpoints(node)
           resolve(node)
         } catch (err) {
           reject(err)
         }
       })
       node.on('error', error => {
-        console.error('[ipfs-companion] Something went terribly wrong in embedded js-ipfs!', error)
+        log.error('something went terribly wrong in embedded js-ipfs!', error)
       })
       try {
         await node.start()
@@ -72,8 +88,21 @@ exports.init = function init (opts) {
   })
 }
 
+// Update internal configuration to HTTP Endpoints from js-ipfs instance
+async function updateConfigWithHttpEndpoints (ipfs) {
+  const ma = await ipfs.config.get('Addresses.Gateway')
+  log(`synchronizing Addresses.Gateway=${ma} to customGatewayUrl and ipfsNodeConfig`)
+  const httpGateway = maToUri(ma.includes('/http') ? ma : multiaddr(ma).encapsulate('/http'))
+  const ipfsNodeConfig = JSON.parse((await browser.storage.local.get('ipfsNodeConfig')).ipfsNodeConfig)
+  ipfsNodeConfig.config.Addresses.Gateway = ma
+  await browser.storage.local.set({
+    customGatewayUrl: httpGateway,
+    ipfsNodeConfig: JSON.stringify(ipfsNodeConfig, null, 2)
+  })
+}
+
 exports.destroy = async function () {
-  console.log('[ipfs-companion] Embedded ipfs destroy')
+  log('destroy: embedded js-ipfs+chrome.sockets')
 
   /*
   if (httpServer) {
@@ -98,7 +127,7 @@ exports.destroy = async function () {
     try {
       await nodeHttpApi.stop()
     } catch (err) {
-      console.error(`[ipfs-companion]  failed to stop HttpApi`, err)
+      log.error('failed to stop HttpApi', err)
     }
     nodeHttpApi = null
   }
diff --git a/add-on/src/lib/ipfs-client/embedded.js b/add-on/src/lib/ipfs-client/embedded.js
index d49ef758a..a795eb04d 100644
--- a/add-on/src/lib/ipfs-client/embedded.js
+++ b/add-on/src/lib/ipfs-client/embedded.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const defaultsDeep = require('@nodeutils/defaults-deep')
+const mergeOptions = require('merge-options')
 const Ipfs = require('ipfs')
 const { optionDefaults } = require('../options')
 
@@ -9,9 +9,9 @@ let node = null
 exports.init = function init (opts) {
   console.log('[ipfs-companion] Embedded ipfs init')
 
-  const defaultOpts = optionDefaults.ipfsNodeConfig
+  const defaultOpts = JSON.parse(optionDefaults.ipfsNodeConfig)
   const userOpts = JSON.parse(opts.ipfsNodeConfig)
-  const ipfsOpts = defaultsDeep(defaultOpts, userOpts, { start: false })
+  const ipfsOpts = mergeOptions.call({ concatArrays: true }, defaultOpts, userOpts, { start: false })
 
   node = new Ipfs(ipfsOpts)
 
diff --git a/add-on/src/lib/ipfs-client/index.js b/add-on/src/lib/ipfs-client/index.js
index bf4cfb139..abfc485ff 100644
--- a/add-on/src/lib/ipfs-client/index.js
+++ b/add-on/src/lib/ipfs-client/index.js
@@ -2,28 +2,25 @@
 
 /* eslint-env browser, webextensions */
 
+const debug = require('debug')
+const log = debug('ipfs-companion:client')
+log.error = debug('ipfs-companion:client:error')
+
 const browser = require('webextension-polyfill')
 const external = require('./external')
-const embeddedJs = require('./embedded')
-const embeddedJsBrave = require('./embedded-brave')
+const embedded = require('./embedded')
+const embeddedWithChromeSockets = require('./embedded-chromesockets')
 
 let client
 
-// TODO: make generic
-const hasChromeSocketsForTcp = typeof chrome === 'object' &&
-  typeof chrome.runtime === 'object' &&
-  typeof chrome.runtime.id === 'string' &&
-  typeof chrome.sockets === 'object' &&
-  typeof chrome.sockets.tcpServer === 'object' &&
-  typeof chrome.sockets === 'object' &&
-  typeof chrome.sockets.tcp === 'object'
-
 async function initIpfsClient (opts) {
   await destroyIpfsClient()
-
   switch (opts.ipfsNodeType) {
     case 'embedded':
-      client = hasChromeSocketsForTcp ? embeddedJsBrave : embeddedJs // TODO: make generic
+      client = embedded
+      break
+    case 'embedded:chromesockets':
+      client = embeddedWithChromeSockets
       break
     case 'external':
       client = external
@@ -63,7 +60,7 @@ async function _reloadIpfsClientDependents () {
         // detect bundled webui in any of open tabs
         if (_isWebuiTab(tab.url)) {
           browser.tabs.reload(tab.id)
-          console.log('[ipfs-companion] reloading bundled webui')
+          log('reloading bundled webui')
         }
       })
     }
diff --git a/add-on/src/lib/ipfs-companion.js b/add-on/src/lib/ipfs-companion.js
index 2be52b21e..eb2396e9a 100644
--- a/add-on/src/lib/ipfs-companion.js
+++ b/add-on/src/lib/ipfs-companion.js
@@ -12,7 +12,7 @@ const { initIpfsClient, destroyIpfsClient } = require('./ipfs-client')
 const { createIpfsUrlProtocolHandler } = require('./ipfs-protocol')
 const createNotifier = require('./notifier')
 const createCopier = require('./copier')
-const createRuntimeChecks = require('./runtime-checks')
+const { createRuntimeChecks } = require('./runtime-checks')
 const { createContextMenus, findValueForContext, contextMenuCopyAddressAtPublicGw, contextMenuCopyRawCid, contextMenuCopyCanonicalAddress } = require('./context-menus')
 const createIpfsProxy = require('./ipfs-proxy')
 const { showPendingLandingPages } = require('./on-installed')
diff --git a/add-on/src/lib/ipfs-path.js b/add-on/src/lib/ipfs-path.js
index c393b93b7..4ff23ce21 100644
--- a/add-on/src/lib/ipfs-path.js
+++ b/add-on/src/lib/ipfs-path.js
@@ -85,7 +85,7 @@ function createIpfsPathValidator (getState, getIpfs, dnslinkResolver) {
     // Test if actions such as 'per site redirect toggle' should be enabled for the URL
     isRedirectPageActionsContext (url) {
       const state = getState()
-      return state.ipfsNodeType === 'external' && // hide with embedded node
+      return state.ipfsNodeType !== 'embedded' && // hide with embedded node
       (IsIpfs.ipnsUrl(url) || // show on /ipns/<fqdn>
         (url.startsWith('http') && // hide on non-HTTP pages
          !url.startsWith(state.gwURLString) && // hide on /ipfs/*
diff --git a/add-on/src/lib/options.js b/add-on/src/lib/options.js
index fdb3a4e54..8ab70ac44 100644
--- a/add-on/src/lib/options.js
+++ b/add-on/src/lib/options.js
@@ -1,28 +1,14 @@
 'use strict'
 
 const isFQDN = require('is-fqdn')
+const { hasChromeSocketsForTcp } = require('./runtime-checks')
 
 exports.optionDefaults = Object.freeze({
   active: true, // global ON/OFF switch, overrides everything else
-  ipfsNodeType: 'embedded', // Brave should default to js-ipfs: https://github.com/ipfs-shipyard/ipfs-companion/issues/664
-  ipfsNodeConfig: JSON.stringify({
-    config: {
-      Addresses: {
-        Swarm: [],
-        API: '/ip4/127.0.0.1/tcp/5002',
-        Gateway: '/ip4/127.0.0.1/tcp/9090'
-      }
-    },
-    libp2p: {
-      config: {
-        dht: {
-          enabled: false
-        }
-      }
-    }
-  }, null, 2),
+  ipfsNodeType: buildDefaultIpfsNodeType(),
+  ipfsNodeConfig: buildDefaultIpfsNodeConfig(),
   publicGatewayUrl: 'https://ipfs.io',
-  useCustomGateway: false, // TODO: Brave should not redirect to public one, but own
+  useCustomGateway: true,
   noRedirectHostnames: [],
   automaticMode: true,
   linkify: false,
@@ -37,6 +23,27 @@ exports.optionDefaults = Object.freeze({
   ipfsProxy: true // window.ipfs
 })
 
+function buildDefaultIpfsNodeType () {
+  // Right now Brave is the only vendor giving us access to chrome.sockets
+  return hasChromeSocketsForTcp() ? 'embedded:chromesockets' : 'external'
+}
+
+function buildDefaultIpfsNodeConfig () {
+  let config = {
+    config: {
+      Addresses: {
+        Swarm: []
+      }
+    }
+  }
+  if (hasChromeSocketsForTcp()) {
+    // config.config.Addresses.API = '/ip4/127.0.0.1/tcp/5002'
+    config.config.Addresses.API = '' // disable API port
+    config.config.Addresses.Gateway = '/ip4/127.0.0.1/tcp/8080'
+  }
+  return JSON.stringify(config, null, 2)
+}
+
 // `storage` should be a browser.storage.local or similar
 exports.storeMissingOptions = (read, defaults, storage) => {
   const requiredKeys = Object.keys(defaults)
@@ -105,4 +112,16 @@ exports.migrateOptions = async (storage) => {
     })
     await storage.remove('dnslink')
   }
+  // ~ v2.8.x + Brave
+  // Upgrade js-ipfs to js-ipfs + chrome.sockets
+  const { ipfsNodeType } = await storage.get('ipfsNodeType')
+  if (ipfsNodeType === 'embedded' && hasChromeSocketsForTcp()) {
+    console.log(`[ipfs-companion] migrating ipfsNodeType to 'embedded:chromesockets'`)
+    // Overwrite old config
+    const ipfsNodeConfig = JSON.parse(exports.optionDefaults.ipfsNodeConfig)
+    await storage.set({
+      ipfsNodeType: 'embedded:chromesockets',
+      ipfsNodeConfig: JSON.stringify(ipfsNodeConfig, null, 2)
+    })
+  }
 }
diff --git a/add-on/src/lib/runtime-checks.js b/add-on/src/lib/runtime-checks.js
index f164b2b07..81eb41d8b 100644
--- a/add-on/src/lib/runtime-checks.js
+++ b/add-on/src/lib/runtime-checks.js
@@ -39,9 +39,11 @@ async function createRuntimeChecks (browser) {
     browser,
     isFirefox: runtimeIsFirefox,
     isAndroid: runtimeIsAndroid,
+    isBrave: runtimeHasSocketsForTcp, // TODO: make it more robust
     hasChromeSocketsForTcp: runtimeHasSocketsForTcp,
     hasNativeProtocolHandler: runtimeHasNativeProtocol
   })
 }
 
-module.exports = createRuntimeChecks
+module.exports.createRuntimeChecks = createRuntimeChecks
+module.exports.hasChromeSocketsForTcp = hasChromeSocketsForTcp
diff --git a/add-on/src/options/forms/gateways-form.js b/add-on/src/options/forms/gateways-form.js
index b16f0e763..724619e98 100644
--- a/add-on/src/options/forms/gateways-form.js
+++ b/add-on/src/options/forms/gateways-form.js
@@ -23,7 +23,7 @@ function gatewaysForm ({
   const onPublicGatewayUrlChange = onOptionChange('publicGatewayUrl', normalizeGatewayURL)
   const onNoRedirectHostnamesChange = onOptionChange('noRedirectHostnames', hostTextToArray)
   const mixedContentWarning = !secureContextUrl.test(customGatewayUrl)
-  const supportRedirectToCustomGateway = ipfsNodeType === 'external'
+  const supportRedirectToCustomGateway = ipfsNodeType !== 'embedded'
 
   return html`
     <form>
@@ -66,6 +66,7 @@ function gatewaysForm ({
                 spellcheck="false"
                 title="Enter URL without any sub-path"
                 onchange=${onCustomGatewayUrlChange}
+                ${ipfsNodeType !== 'external' ? 'disabled' : ''}
                 value=${customGatewayUrl} />
 
             </div>
diff --git a/add-on/src/options/forms/ipfs-node-form.js b/add-on/src/options/forms/ipfs-node-form.js
index 3ae72e8ce..036e35b5b 100644
--- a/add-on/src/options/forms/ipfs-node-form.js
+++ b/add-on/src/options/forms/ipfs-node-form.js
@@ -3,11 +3,12 @@
 
 const browser = require('webextension-polyfill')
 const html = require('choo/html')
+const { hasChromeSocketsForTcp } = require('../../lib/runtime-checks')
 
 function ipfsNodeForm ({ ipfsNodeType, ipfsNodeConfig, onOptionChange }) {
   const onIpfsNodeTypeChange = onOptionChange('ipfsNodeType')
   const onIpfsNodeConfigChange = onOptionChange('ipfsNodeConfig')
-
+  const withChromeSockets = hasChromeSocketsForTcp()
   return html`
     <form>
       <fieldset>
@@ -18,7 +19,7 @@ function ipfsNodeForm ({ ipfsNodeType, ipfsNodeConfig, onOptionChange }) {
               <dt>${browser.i18n.getMessage('option_ipfsNodeType_title')}</dt>
               <dd>
                 <p>${browser.i18n.getMessage('option_ipfsNodeType_external_description')}</p>
-                <p>${browser.i18n.getMessage('option_ipfsNodeType_embedded_description')}</p>
+                <p>${browser.i18n.getMessage(withChromeSockets ? 'option_ipfsNodeType_embedded_chromesockets_description' : 'option_ipfsNodeType_embedded_description')}</p>
                 <p><a href="https://github.com/ipfs-shipyard/ipfs-companion/blob/master/docs/node-types.md#node-types-in-ipfs-companion" target="_blank">
                   ${browser.i18n.getMessage('option_legend_readMore')}
                 </a></p>
@@ -31,14 +32,22 @@ function ipfsNodeForm ({ ipfsNodeType, ipfsNodeConfig, onOptionChange }) {
               selected=${ipfsNodeType === 'external'}>
               ${browser.i18n.getMessage('option_ipfsNodeType_external')}
             </option>
-            <option
-              value='embedded'
-              selected=${ipfsNodeType === 'embedded'}>
-              ${browser.i18n.getMessage('option_ipfsNodeType_embedded')}
-            </option>
+            ${withChromeSockets ? html`
+                <option
+                  value='embedded:chromesockets'
+                  selected=${ipfsNodeType === 'embedded:chromesockets'}>
+                  ${browser.i18n.getMessage('option_ipfsNodeType_embedded_chromesockets')}
+                </option>
+              ` : html`
+                <option
+                  value='embedded'
+                  selected=${ipfsNodeType === 'embedded'}>
+                  ${browser.i18n.getMessage('option_ipfsNodeType_embedded')}
+                </option>
+              `}
           </select>
         </div>
-        ${ipfsNodeType === 'embedded' ? html`
+        ${ipfsNodeType.startsWith('embedded') ? html`
           <div>
             <label for="ipfsNodeConfig">
               <dl>
diff --git a/add-on/src/options/page.js b/add-on/src/options/page.js
index ecba7bcda..7b077752b 100644
--- a/add-on/src/options/page.js
+++ b/add-on/src/options/page.js
@@ -55,6 +55,12 @@ module.exports = function optionsPage (state, emit) {
     ipfsNodeConfig: state.options.ipfsNodeConfig,
     onOptionChange
   })}
+  ${state.options.ipfsNodeType === 'external' ? apiForm({
+    ipfsApiUrl: state.options.ipfsApiUrl,
+    ipfsApiPollMs: state.options.ipfsApiPollMs,
+    automaticMode: state.options.automaticMode,
+    onOptionChange
+  }) : null}
   ${gatewaysForm({
     ipfsNodeType: state.options.ipfsNodeType,
     customGatewayUrl: state.options.customGatewayUrl,
@@ -63,12 +69,6 @@ module.exports = function optionsPage (state, emit) {
     noRedirectHostnames: state.options.noRedirectHostnames,
     onOptionChange
   })}
-  ${state.options.ipfsNodeType === 'external' ? apiForm({
-    ipfsApiUrl: state.options.ipfsApiUrl,
-    ipfsApiPollMs: state.options.ipfsApiPollMs,
-    automaticMode: state.options.automaticMode,
-    onOptionChange
-  }) : null}
   ${experimentsForm({
     displayNotifications: state.options.displayNotifications,
     preloadAtPublicGateway: state.options.preloadAtPublicGateway,
diff --git a/add-on/src/popup/browser-action/gateway-status.js b/add-on/src/popup/browser-action/gateway-status.js
index 57815f7f7..adc3b5734 100644
--- a/add-on/src/popup/browser-action/gateway-status.js
+++ b/add-on/src/popup/browser-action/gateway-status.js
@@ -24,7 +24,7 @@ module.exports = function gatewayStatus ({
   swarmPeers,
   ipfsNodeType
 }) {
-  const api = ipfsApiUrl && ipfsNodeType === 'embedded' ? 'js-ipfs' : ipfsApiUrl
+  const api = ipfsApiUrl && ipfsNodeType.startsWith('embedded') ? 'JS IPFS' : ipfsApiUrl
   return html`
     <ul class="fade-in list mv0 pv2 ph3 white">
   ${statusEntry({
diff --git a/add-on/src/popup/browser-action/operations.js b/add-on/src/popup/browser-action/operations.js
index c16249d2d..9df83f0db 100644
--- a/add-on/src/popup/browser-action/operations.js
+++ b/add-on/src/popup/browser-action/operations.js
@@ -11,7 +11,7 @@ module.exports = function operations ({
   ipfsNodeType,
   onToggleGlobalRedirect
 }) {
-  const activeRedirectSwitch = active && ipfsNodeType === 'external'
+  const activeRedirectSwitch = active && ipfsNodeType !== 'embedded'
   return html`
     <div class="fade-in pv1 bb b--black-10">
   ${navItem({
diff --git a/add-on/src/popup/browser-action/page.js b/add-on/src/popup/browser-action/page.js
index 73f804390..0c2f04573 100644
--- a/add-on/src/popup/browser-action/page.js
+++ b/add-on/src/popup/browser-action/page.js
@@ -20,10 +20,9 @@ module.exports = function browserActionPage (state, emit) {
   const onOpenPrefs = () => emit('openPrefs')
   const onToggleGlobalRedirect = () => emit('toggleGlobalRedirect')
   const onToggleSiteRedirect = () => emit('toggleSiteRedirect')
-  const onToggleNodeType = () => emit('toggleNodeType')
   const onToggleActive = () => emit('toggleActive')
 
-  const headerProps = Object.assign({ onToggleNodeType, onToggleActive, onOpenPrefs }, state)
+  const headerProps = Object.assign({ onToggleActive, onOpenPrefs }, state)
   const activeTabActionsProps = Object.assign({ onToggleSiteRedirect, onCopy, onPin, onUnPin }, state)
   const opsProps = Object.assign({ onQuickUpload, onOpenWebUi, onToggleGlobalRedirect }, state)
 
diff --git a/add-on/src/popup/browser-action/store.js b/add-on/src/popup/browser-action/store.js
index 3c7b26421..2ecc90d82 100644
--- a/add-on/src/popup/browser-action/store.js
+++ b/add-on/src/popup/browser-action/store.js
@@ -197,19 +197,6 @@ module.exports = (state, emitter) => {
     }
   })
 
-  emitter.on('toggleNodeType', async () => {
-    const prev = state.ipfsNodeType
-    state.ipfsNodeType = prev === 'external' ? 'embedded' : 'external'
-    emitter.emit('render')
-    try {
-      await browser.storage.local.set({ ipfsNodeType: state.ipfsNodeType })
-    } catch (error) {
-      console.error(`Unable to update ipfs node type due to ${error}`)
-      state.ipfsNodeType = prev
-      emitter.emit('render')
-    }
-  })
-
   emitter.on('toggleActive', async () => {
     const prev = state.active
     state.active = !prev
diff --git a/add-on/src/popup/browser-action/tools.js b/add-on/src/popup/browser-action/tools.js
index 2c3ae0180..58c3ba99f 100644
--- a/add-on/src/popup/browser-action/tools.js
+++ b/add-on/src/popup/browser-action/tools.js
@@ -15,7 +15,7 @@ module.exports = function tools ({
   onOpenWebUi
 }) {
   const activeQuickUpload = active && isIpfsOnline && isApiAvailable
-  const activeWebUI = active && isIpfsOnline && ipfsNodeType === 'external'
+  const activeWebUI = active && isIpfsOnline && ipfsNodeType !== 'embedded'
 
   return html`
     <div>
diff --git a/add-on/src/popup/logo.js b/add-on/src/popup/logo.js
index 12fd1feaf..e2ee0da41 100644
--- a/add-on/src/popup/logo.js
+++ b/add-on/src/popup/logo.js
@@ -4,7 +4,7 @@
 const html = require('choo/html')
 
 function logo ({ path, size = 52, ipfsNodeType = 'external', isIpfsOnline = true, heartbeat = true }) {
-  const logoTypePrefix = ipfsNodeType === 'embedded' ? 'js-' : ''
+  const logoTypePrefix = ipfsNodeType.startsWith('embedded') ? 'js-' : ''
   const logoFileName = `${logoTypePrefix}ipfs-logo-${isIpfsOnline ? 'on' : 'off'}.svg`
   return html`
     <img
diff --git a/package.json b/package.json
index 4aebd9c44..cbd33d10e 100644
--- a/package.json
+++ b/package.json
@@ -110,11 +110,11 @@
   },
   "dependencies": {
     "@material/switch": "1.0.1",
-    "@nodeutils/defaults-deep": "1.1.0",
     "browser-process-hrtime": "1.0.0",
     "choo": "6.13.1",
     "chrome-dgram": "3.0.1",
     "chrome-net": "https://github.com/lidel/chrome-net/tarball/838ffde4a33721888f74783821e0486dfcc88797/chrome-net.tar.gz",
+    "debug": "4.1.1",
     "doc-sniff": "1.0.1",
     "drag-and-drop-files": "0.0.1",
     "file-type": "10.9.0",
@@ -131,7 +131,10 @@
     "is-ipfs": "0.6.0",
     "is-svg": "4.0.0",
     "lru-cache": "5.1.1",
+    "merge-options": "1.0.1",
     "mime-types": "2.1.22",
+    "multiaddr": "6.0.6",
+    "multiaddr-to-uri": "4.0.1",
     "p-queue": "4.0.0",
     "path-browserify": "1.0.0",
     "piggybacker": "2.0.0",
diff --git a/test/functional/lib/ipfs-companion.test.js b/test/functional/lib/ipfs-companion.test.js
index 543eec970..f8b820410 100644
--- a/test/functional/lib/ipfs-companion.test.js
+++ b/test/functional/lib/ipfs-companion.test.js
@@ -8,6 +8,7 @@ describe('init', function () {
   let init
 
   before(function () {
+    global.localStorage = {}
     global.window = {}
     global.browser = browser
     global.URL = URL
diff --git a/test/functional/lib/ipfs-request-dnslink.test.js b/test/functional/lib/ipfs-request-dnslink.test.js
index bb0ca3af0..164d6ef23 100644
--- a/test/functional/lib/ipfs-request-dnslink.test.js
+++ b/test/functional/lib/ipfs-request-dnslink.test.js
@@ -5,7 +5,7 @@ const { expect } = require('chai')
 const { URL } = require('url')
 const browser = require('sinon-chrome')
 const { initState } = require('../../../add-on/src/lib/state')
-const createRuntimeChecks = require('../../../add-on/src/lib/runtime-checks')
+const { createRuntimeChecks } = require('../../../add-on/src/lib/runtime-checks')
 const { createRequestModifier } = require('../../../add-on/src/lib/ipfs-request')
 const createDnslinkResolver = require('../../../add-on/src/lib/dnslink')
 const { createIpfsPathValidator } = require('../../../add-on/src/lib/ipfs-path')
@@ -54,7 +54,7 @@ describe('modifyRequest processing', function () {
       // API is online and has one peer
       state.peerCount = 1
       // embedded node (js-ipfs) defaults to public gw
-      activeGateway = (state.ipfsNodeType === 'external' ? state.gwURLString : state.pubGwURLString)
+      activeGateway = (state.ipfsNodeType === 'embedded' ? state.pubGwURLString : state.gwURLString)
       // clear dnslink cache to ensure DNS TXT record lookup is triggered
       dnslinkResolver.clearCache()
     })
@@ -151,7 +151,7 @@ describe('modifyRequest processing', function () {
       // API is online and has one peer
       state.peerCount = 1
       // embedded node (js-ipfs) defaults to public gw
-      activeGateway = (state.ipfsNodeType === 'external' ? state.gwURLString : state.pubGwURLString)
+      activeGateway = (state.ipfsNodeType === 'embedded' ? state.pubGwURLString : state.gwURLString)
       // clear dnslink cache to ensure DNS TXT record lookup is triggered
       dnslinkResolver.clearCache()
     })
@@ -213,7 +213,7 @@ describe('modifyRequest processing', function () {
       // API is online and has one peer
       state.peerCount = 1
       // embedded node (js-ipfs) defaults to public gw
-      activeGateway = (state.ipfsNodeType === 'external' ? state.gwURLString : state.pubGwURLString)
+      activeGateway = (state.ipfsNodeType === 'embedded' ? state.pubGwURLString : state.gwURLString)
     })
     describe('and dnslink cache miss', function () {
       beforeEach(function () {
diff --git a/test/functional/lib/ipfs-request-gateway-redirect.test.js b/test/functional/lib/ipfs-request-gateway-redirect.test.js
index faeeea2d1..f2a735671 100644
--- a/test/functional/lib/ipfs-request-gateway-redirect.test.js
+++ b/test/functional/lib/ipfs-request-gateway-redirect.test.js
@@ -5,7 +5,7 @@ const { expect } = require('chai')
 const { URL } = require('url')
 const browser = require('sinon-chrome')
 const { initState } = require('../../../add-on/src/lib/state')
-const createRuntimeChecks = require('../../../add-on/src/lib/runtime-checks')
+const { createRuntimeChecks } = require('../../../add-on/src/lib/runtime-checks')
 const { createRequestModifier, redirectOptOutHint } = require('../../../add-on/src/lib/ipfs-request')
 const createDnslinkResolver = require('../../../add-on/src/lib/dnslink')
 const { createIpfsPathValidator } = require('../../../add-on/src/lib/ipfs-path')
diff --git a/test/functional/lib/ipfs-request-protocol-handlers.js b/test/functional/lib/ipfs-request-protocol-handlers.js
index dc68a292a..7a3e384d5 100644
--- a/test/functional/lib/ipfs-request-protocol-handlers.js
+++ b/test/functional/lib/ipfs-request-protocol-handlers.js
@@ -5,7 +5,7 @@ const { expect } = require('chai')
 const { URL } = require('url')
 const browser = require('sinon-chrome')
 const { initState } = require('../../../add-on/src/lib/state')
-const createRuntimeChecks = require('../../../add-on/src/lib/runtime-checks')
+const { createRuntimeChecks } = require('../../../add-on/src/lib/runtime-checks')
 const { createRequestModifier } = require('../../../add-on/src/lib/ipfs-request')
 const createDnslinkResolver = require('../../../add-on/src/lib/dnslink')
 const { createIpfsPathValidator } = require('../../../add-on/src/lib/ipfs-path')
diff --git a/test/functional/lib/ipfs-request-workarounds.test.js b/test/functional/lib/ipfs-request-workarounds.test.js
index a62a6aa0b..18e0d0d4e 100644
--- a/test/functional/lib/ipfs-request-workarounds.test.js
+++ b/test/functional/lib/ipfs-request-workarounds.test.js
@@ -4,7 +4,7 @@ const { expect } = require('chai')
 const { URL } = require('url') // URL implementation with support for .origin attribute
 const browser = require('sinon-chrome')
 const { initState } = require('../../../add-on/src/lib/state')
-const createRuntimeChecks = require('../../../add-on/src/lib/runtime-checks')
+const { createRuntimeChecks } = require('../../../add-on/src/lib/runtime-checks')
 const { createRequestModifier } = require('../../../add-on/src/lib/ipfs-request')
 const createDnslinkResolver = require('../../../add-on/src/lib/dnslink')
 const { createIpfsPathValidator } = require('../../../add-on/src/lib/ipfs-path')
diff --git a/test/functional/lib/runtime-checks.test.js b/test/functional/lib/runtime-checks.test.js
index 018f3f9e4..f4daabbeb 100644
--- a/test/functional/lib/runtime-checks.test.js
+++ b/test/functional/lib/runtime-checks.test.js
@@ -2,7 +2,7 @@
 const { describe, it, before, beforeEach, after } = require('mocha')
 const { expect } = require('chai')
 const browser = require('sinon-chrome')
-const createRuntimeChecks = require('../../../add-on/src/lib/runtime-checks')
+const { createRuntimeChecks } = require('../../../add-on/src/lib/runtime-checks')
 
 describe('runtime-checks.js', function () {
   before(() => {
@@ -78,6 +78,22 @@ describe('runtime-checks.js', function () {
     })
   })
 
+  /* TODO
+  describe('hasChromeSocketsForTcp', function () {
+    beforeEach(function () {
+      browser.flush()
+    })
+
+    it('should return true when chrome.sockets.tcp* are present', async function () {
+      // TODO
+    })
+
+    it('should return false when chrome.sockets.tcp* are missing', async function () {
+      // TODO
+    })
+  })
+  */
+
   after(function () {
     delete global.browser
     browser.flush()
diff --git a/yarn.lock b/yarn.lock
index 43ebc778d..83c645f38 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -747,7 +747,7 @@
   dependencies:
     "@material/feature-targeting" "^0.44.1"
 
-"@nodeutils/defaults-deep@1.1.0", "@nodeutils/defaults-deep@^1.1.0":
+"@nodeutils/defaults-deep@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@nodeutils/defaults-deep/-/defaults-deep-1.1.0.tgz#bb1124dc8d7ce0bc5da1d668ace58149258ef20b"
   integrity sha1-uxEk3I184LxdodZorOWBSSWO8gs=
@@ -3351,6 +3351,13 @@ debug@3.2.6, debug@^3.1.0:
   dependencies:
     ms "^2.1.1"
 
+debug@4.1.1, debug@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+  dependencies:
+    ms "^2.1.1"
+
 debug@^4.0.1, debug@^4.1.0, debug@~4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
@@ -3358,13 +3365,6 @@ debug@^4.0.1, debug@^4.1.0, debug@~4.1.0:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
-  dependencies:
-    ms "^2.1.1"
-
 debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
@@ -8744,7 +8744,7 @@ merge-descriptors@1.0.1:
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
   integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
 
-merge-options@^1.0.1:
+merge-options@1.0.1, merge-options@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-options/-/merge-options-1.0.1.tgz#2a64b24457becd4e4dc608283247e94ce589aa32"
   integrity sha512-iuPV41VWKWBIOpBsjoxjDZw8/GbSfZ2mk7N1453bwMrfzdrIk7EzBd+8UVR6rkw67th7xnk9Dytl3J+lHPdxvg==
@@ -9055,7 +9055,7 @@ ms@2.1.1, ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
-multiaddr-to-uri@^4.0.1:
+multiaddr-to-uri@4.0.1, multiaddr-to-uri@^4.0.1:
   version "4.0.1"
   resolved "https://registry.npmjs.org/multiaddr-to-uri/-/multiaddr-to-uri-4.0.1.tgz#3b89d2a460a96602a16f3bfe296ee771ecb2558b"
   integrity sha512-RVHKm5NXcMWMIhrwF4B4Q34JtMXt1/2wgnDTnKRE+AGAiXfqFika0bIfCsAtLp+gZJOWeDLeT1vR6P0gGyVAtg==