diff --git a/jslib b/jslib
index f44e99d74d..abb54f0073 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit f44e99d74dc011c026525d171f7d2940b60b6587
+Subproject commit abb54f007305eabd77996623dd20cbe45345e82a
diff --git a/package-lock.json b/package-lock.json
index e0fb213dbc..083ab5727b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -661,9 +661,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "10.17.28",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.28.tgz",
-      "integrity": "sha512-dzjES1Egb4c1a89C7lKwQh8pwjYmlOAG9dW1pBgxEk57tMrLnssOfEthz8kdkNaBd7lIqQx7APm5+mZ619IiCQ==",
+      "version": "10.17.35",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.35.tgz",
+      "integrity": "sha512-gXx7jAWpMddu0f7a+L+txMplp3FnHl53OhQIF9puXKq3hDGY/GjH+MF04oWnV/adPSCrbtHumDCFwzq2VhltWA==",
       "dev": true
     },
     "@types/node-forge": {
@@ -2067,6 +2067,12 @@
       "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
       "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="
     },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "dev": true
+    },
     "buffer-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
@@ -2610,9 +2616,9 @@
       }
     },
     "cli-spinners": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.2.0.tgz",
-      "integrity": "sha512-tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.4.0.tgz",
+      "integrity": "sha512-sJAofoarcm76ZGpuooaO0eDy8saEy+YoZBLjC4h8srt4jeBnkYeOgqxgsJQTpyt2LjI5PTfLJHSL+41Yu4fEJA==",
       "dev": true
     },
     "cli-width": {
@@ -3730,6 +3736,11 @@
         "object.defaults": "^1.1.0"
       }
     },
+    "easy-stack": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/easy-stack/-/easy-stack-1.0.0.tgz",
+      "integrity": "sha1-EskbMIWjfwuqM26UhurEv5Tj54g="
+    },
     "ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
@@ -3758,14 +3769,6 @@
         "@types/node": "^10.12.18",
         "electron-download": "^4.1.0",
         "extract-zip": "^1.0.3"
-      },
-      "dependencies": {
-        "@types/node": {
-          "version": "10.17.13",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.13.tgz",
-          "integrity": "sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg==",
-          "dev": true
-        }
       }
     },
     "electron-builder": {
@@ -4033,6 +4036,17 @@
             "ms": "^2.1.1"
           }
         },
+        "fs-extra": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+          "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -4128,9 +4142,9 @@
       }
     },
     "electron-rebuild": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-1.9.0.tgz",
-      "integrity": "sha512-lnHW+gJIhukqVhME2v+LRDldafWwP0kGOPEpPuj59+F4NHEfu/vOjk8OLBcgDGt72CSWZm7zFUDE07oZxQJbHw==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-1.11.0.tgz",
+      "integrity": "sha512-cn6AqZBQBVtaEyj5jZW1/LOezZZ22PA1HvhEP7asvYPJ8PDF4i4UFt9be4i9T7xJKiSiomXvY5Fd+dSq3FXZxA==",
       "dev": true,
       "requires": {
         "colors": "^1.3.3",
@@ -4141,13 +4155,13 @@
         "node-gyp": "^6.0.1",
         "ora": "^3.4.0",
         "spawn-rx": "^3.0.0",
-        "yargs": "^13.2.4"
+        "yargs": "^14.2.0"
       },
       "dependencies": {
         "ajv": {
-          "version": "6.11.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz",
-          "integrity": "sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==",
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -4169,9 +4183,9 @@
           "dev": true
         },
         "chownr": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz",
-          "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==",
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+          "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
           "dev": true
         },
         "cliui": {
@@ -4192,9 +4206,9 @@
           "dev": true
         },
         "fast-deep-equal": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
-          "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
           "dev": true
         },
         "find-up": {
@@ -4206,17 +4220,6 @@
             "locate-path": "^3.0.0"
           }
         },
-        "fs-extra": {
-          "version": "8.1.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-          "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
         "get-caller-file": {
           "version": "2.0.5",
           "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@@ -4238,18 +4241,18 @@
           }
         },
         "graceful-fs": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-          "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
+          "version": "4.2.4",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+          "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
           "dev": true
         },
         "har-validator": {
-          "version": "5.1.3",
-          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-          "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+          "version": "5.1.5",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+          "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
           "dev": true,
           "requires": {
-            "ajv": "^6.5.5",
+            "ajv": "^6.12.3",
             "har-schema": "^2.0.0"
           }
         },
@@ -4276,9 +4279,9 @@
           }
         },
         "node-abi": {
-          "version": "2.13.0",
-          "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.13.0.tgz",
-          "integrity": "sha512-9HrZGFVTR5SOu3PZAnAY2hLO36aW1wmA+FDsVkr85BTST32TLCA1H/AEcatVRAsWLyXS3bqUDYCAjq5/QGuSTA==",
+          "version": "2.19.1",
+          "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.19.1.tgz",
+          "integrity": "sha512-HbtmIuByq44yhAzK7b9j/FelKlHYISKQn0mtvcBrU5QBkhoCMp5bu8Hv5AI34DcKfOAcJBcOEMwLlwO62FFu9A==",
           "dev": true,
           "requires": {
             "semver": "^5.4.1"
@@ -4312,9 +4315,9 @@
           }
         },
         "nopt": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-          "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
+          "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
           "dev": true,
           "requires": {
             "abbrev": "1",
@@ -4328,9 +4331,9 @@
           "dev": true
         },
         "p-limit": {
-          "version": "2.2.2",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
-          "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "dev": true,
           "requires": {
             "p-try": "^2.0.0"
@@ -4351,10 +4354,16 @@
           "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
           "dev": true
         },
+        "punycode": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+          "dev": true
+        },
         "request": {
-          "version": "2.88.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-          "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+          "version": "2.88.2",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+          "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
           "dev": true,
           "requires": {
             "aws-sign2": "~0.7.0",
@@ -4364,7 +4373,7 @@
             "extend": "~3.0.2",
             "forever-agent": "~0.6.1",
             "form-data": "~2.3.2",
-            "har-validator": "~5.1.0",
+            "har-validator": "~5.1.3",
             "http-signature": "~1.2.0",
             "is-typedarray": "~1.0.0",
             "isstream": "~0.1.2",
@@ -4374,7 +4383,7 @@
             "performance-now": "^2.1.0",
             "qs": "~6.5.2",
             "safe-buffer": "^5.1.2",
-            "tough-cookie": "~2.4.3",
+            "tough-cookie": "~2.5.0",
             "tunnel-agent": "^0.6.0",
             "uuid": "^3.3.2"
           }
@@ -4430,13 +4439,13 @@
           }
         },
         "tough-cookie": {
-          "version": "2.4.3",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-          "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+          "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
           "dev": true,
           "requires": {
-            "psl": "^1.1.24",
-            "punycode": "^1.4.1"
+            "psl": "^1.1.28",
+            "punycode": "^2.1.1"
           }
         },
         "wrap-ansi": {
@@ -4457,12 +4466,13 @@
           "dev": true
         },
         "yargs": {
-          "version": "13.3.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
-          "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
+          "version": "14.2.3",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz",
+          "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==",
           "dev": true,
           "requires": {
             "cliui": "^5.0.0",
+            "decamelize": "^1.2.0",
             "find-up": "^3.0.0",
             "get-caller-file": "^2.0.1",
             "require-directory": "^2.1.1",
@@ -4471,13 +4481,13 @@
             "string-width": "^3.0.0",
             "which-module": "^2.0.0",
             "y18n": "^4.0.0",
-            "yargs-parser": "^13.1.1"
+            "yargs-parser": "^15.0.1"
           }
         },
         "yargs-parser": {
-          "version": "13.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
-          "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
+          "version": "15.0.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.1.tgz",
+          "integrity": "sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==",
           "dev": true,
           "requires": {
             "camelcase": "^5.0.0",
@@ -4894,6 +4904,11 @@
       "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
       "dev": true
     },
+    "event-pubsub": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/event-pubsub/-/event-pubsub-4.3.0.tgz",
+      "integrity": "sha512-z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ=="
+    },
     "events": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
@@ -5085,15 +5100,15 @@
       }
     },
     "extract-zip": {
-      "version": "1.6.7",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz",
-      "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz",
+      "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==",
       "dev": true,
       "requires": {
-        "concat-stream": "1.6.2",
-        "debug": "2.6.9",
-        "mkdirp": "0.5.1",
-        "yauzl": "2.4.1"
+        "concat-stream": "^1.6.2",
+        "debug": "^2.6.9",
+        "mkdirp": "^0.5.4",
+        "yauzl": "^2.10.0"
       },
       "dependencies": {
         "debug": {
@@ -5104,6 +5119,21 @@
           "requires": {
             "ms": "2.0.0"
           }
+        },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
         }
       }
     },
@@ -5141,9 +5171,9 @@
       "dev": true
     },
     "fd-slicer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
-      "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
       "dev": true,
       "requires": {
         "pend": "~1.2.0"
@@ -5655,14 +5685,22 @@
       "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
     },
     "fs-extra": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
-      "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
+        "graceful-fs": "^4.2.0",
         "jsonfile": "^4.0.0",
         "universalify": "^0.1.0"
+      },
+      "dependencies": {
+        "graceful-fs": {
+          "version": "4.2.4",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+          "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+          "dev": true
+        }
       }
     },
     "fs-minipass": {
@@ -7392,6 +7430,11 @@
       "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
       "dev": true
     },
+    "if-async": {
+      "version": "3.7.4",
+      "resolved": "https://registry.npmjs.org/if-async/-/if-async-3.7.4.tgz",
+      "integrity": "sha1-VYaN6wCT08Z79xZudFNT+5vLIaI="
+    },
     "iferr": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
@@ -8000,6 +8043,19 @@
       "integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==",
       "dev": true
     },
+    "js-message": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/js-message/-/js-message-1.0.5.tgz",
+      "integrity": "sha1-IwDSSxrwjondCVvBpMnJz8uJLRU="
+    },
+    "js-queue": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/js-queue/-/js-queue-2.0.0.tgz",
+      "integrity": "sha1-NiITz4YPRo8BJfxslqvBdCUx+Ug=",
+      "requires": {
+        "easy-stack": "^1.0.0"
+      }
+    },
     "js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
@@ -9310,6 +9366,16 @@
         }
       }
     },
+    "node-ipc": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/node-ipc/-/node-ipc-9.1.1.tgz",
+      "integrity": "sha512-FAyICv0sIRJxVp3GW5fzgaf9jwwRQxAKDJlmNFUL5hOy+W4X/I5AypyHoq0DXXbo9o/gt79gj++4cMr4jVWE/w==",
+      "requires": {
+        "event-pubsub": "4.3.0",
+        "js-message": "1.0.5",
+        "js-queue": "2.0.0"
+      }
+    },
     "node-libs-browser": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.0.tgz",
@@ -10743,6 +10809,49 @@
       "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==",
       "dev": true
     },
+    "regedit": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/regedit/-/regedit-3.0.3.tgz",
+      "integrity": "sha512-SpHmMKOtiEYx0MiRRC48apBsmThoZ4svZNsYoK8leHd5bdUHV1nYb8pk8gh6Moou7/S9EDi1QsjBTpyXVQrPuQ==",
+      "requires": {
+        "debug": "^4.1.0",
+        "if-async": "^3.7.4",
+        "stream-slicer": "0.0.6",
+        "through2": "^0.6.3"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+        },
+        "through2": {
+          "version": "0.6.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+          "requires": {
+            "readable-stream": ">=1.0.33-1 <1.1.0-0",
+            "xtend": ">=4.0.0 <4.1.0-0"
+          }
+        }
+      }
+    },
     "regenerate": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
@@ -11791,6 +11900,11 @@
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
       "dev": true
     },
+    "stream-slicer": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/stream-slicer/-/stream-slicer-0.0.6.tgz",
+      "integrity": "sha1-+GsqxcJEC3oKh7cfM2ZcB4gEYTg="
+    },
     "strict-uri-encode": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
@@ -14728,12 +14842,13 @@
       }
     },
     "yauzl": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
-      "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
       "dev": true,
       "requires": {
-        "fd-slicer": "~1.0.1"
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
       }
     },
     "zone.js": {
diff --git a/package.json b/package.json
index 2ebf0de3ed..6014cb126d 100644
--- a/package.json
+++ b/package.json
@@ -119,6 +119,19 @@
         "portable",
         "nsis-web",
         "appx"
+      ],
+      "extraResources": [
+        {
+          "from": "node_modules/regedit/vbs",
+          "to": "regedit/vbs",
+          "filter": [
+            "**/*"
+          ]
+        },
+        {
+          "from": "resources/native-messaging.bat",
+          "to": "native-messaging.bat"
+        }
       ]
     },
     "linux": {
@@ -251,13 +264,13 @@
     "electron-notarize": "^0.2.1",
     "electron-rebuild": "^1.9.0",
     "electron-reload": "^1.5.0",
-    "mini-css-extract-plugin": "^0.9.0",
     "file-loader": "^2.0.0",
     "font-awesome": "4.7.0",
     "gulp": "^4.0.0",
     "gulp-google-webfonts": "^2.0.0",
     "html-loader": "^0.5.5",
     "html-webpack-plugin": "^3.2.0",
+    "mini-css-extract-plugin": "^0.9.0",
     "ngx-infinite-scroll": "7.0.1",
     "node-abi": "^2.9.0",
     "node-loader": "^0.6.0",
@@ -299,8 +312,10 @@
     "keytar": "4.13.0",
     "lunr": "2.3.3",
     "node-forge": "0.7.6",
+    "node-ipc": "^9.1.1",
     "nord": "0.2.1",
     "papaparse": "4.6.0",
+    "regedit": "^3.0.3",
     "rxjs": "6.6.2",
     "sweetalert2": "9.8.1",
     "tslib": "^2.0.1",
diff --git a/resources/native-messaging.bat b/resources/native-messaging.bat
new file mode 100644
index 0000000000..45519250dd
--- /dev/null
+++ b/resources/native-messaging.bat
@@ -0,0 +1,7 @@
+@echo off
+:: Helper script for starting the Native Messaging Proxy on Windows.
+
+cd ../
+set ELECTRON_RUN_AS_NODE=1
+set ELECTRON_NO_ATTACH_CONSOLE=1
+Bitwarden.exe resources/app.asar %*
diff --git a/src/app/accounts/settings.component.html b/src/app/accounts/settings.component.html
index 6f11bd8074..e7c9965e71 100644
--- a/src/app/accounts/settings.component.html
+++ b/src/app/accounts/settings.component.html
@@ -88,6 +88,16 @@
                             </div>
                             <small class="help-block">{{'disableFaviconDesc' | i18n}}</small>
                         </div>
+                        <div class="form-group">
+                            <div class="checkbox">
+                                <label for="enableBrowserIntegration">
+                                    <input id="enableBrowserIntegration" type="checkbox" name="EnableBrowserIntegration"
+                                        [(ngModel)]="enableBrowserIntegration" (change)="saveBrowserIntegration()">
+                                    {{'enableBrowserIntegration' | i18n}}
+                                </label>
+                            </div>
+                            <small class="help-block">{{'enableBrowserIntegrationDesc' | i18n}}</small>
+                        </div>
                         <div class="form-group">
                             <div class="checkbox">
                                 <label for="enableTray">
diff --git a/src/app/accounts/settings.component.ts b/src/app/accounts/settings.component.ts
index 111993fc8e..5a949b7611 100644
--- a/src/app/accounts/settings.component.ts
+++ b/src/app/accounts/settings.component.ts
@@ -33,6 +33,7 @@ export class SettingsComponent implements OnInit {
     vaultTimeoutAction: string;
     pin: boolean = null;
     disableFavicons: boolean = false;
+    enableBrowserIntegration: boolean = false;
     enableMinToTray: boolean = false;
     enableCloseToTray: boolean = false;
     enableTray: boolean = false;
@@ -143,6 +144,7 @@ export class SettingsComponent implements OnInit {
         const pinSet = await this.vaultTimeoutService.isPinLockSet();
         this.pin = pinSet[0] || pinSet[1];
         this.disableFavicons = await this.storageService.get<boolean>(ConstantsService.disableFaviconKey);
+        this.enableBrowserIntegration = await this.storageService.get<boolean>(ElectronConstants.enableBrowserIntegration);
         this.enableMinToTray = await this.storageService.get<boolean>(ElectronConstants.enableMinimizeToTrayKey);
         this.enableCloseToTray = await this.storageService.get<boolean>(ElectronConstants.enableCloseToTrayKey);
         this.enableTray = await this.storageService.get<boolean>(ElectronConstants.enableTrayKey);
@@ -313,6 +315,11 @@ export class SettingsComponent implements OnInit {
         this.messagingService.send(this.openAtLogin ? 'addOpenAtLogin' : 'removeOpenAtLogin');
     }
 
+    async saveBrowserIntegration() {
+        await this.storageService.save(ElectronConstants.enableBrowserIntegration, this.enableBrowserIntegration);
+        this.messagingService.send(this.enableBrowserIntegration ? 'enableBrowserIntegration' : 'disableBrowserIntegration');
+    }
+
     private callAnalytics(name: string, enabled: boolean) {
         const status = enabled ? 'Enabled' : 'Disabled';
         this.analytics.eventTrack.next({ action: `${status} ${name}` });
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index cc14a1c5e9..2b1fdafc72 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -52,6 +52,7 @@ import { UserService } from 'jslib/abstractions/user.service';
 import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service';
 
 import { ConstantsService } from 'jslib/services/constants.service';
+import { NativeMessagingService } from '../services/nativeMessaging.service';
 
 const BroadcasterSubscriptionId = 'AppComponent';
 const IdleTimeout = 60000 * 10; // 10 minutes
@@ -97,7 +98,7 @@ export class AppComponent implements OnInit {
         private searchService: SearchService, private notificationsService: NotificationsService,
         private platformUtilsService: PlatformUtilsService, private systemService: SystemService,
         private stateService: StateService, private eventService: EventService,
-        private policyService: PolicyService) { }
+        private policyService: PolicyService, private nativeMessagingService: NativeMessagingService) { }
 
     ngOnInit() {
         this.ngZone.runOutsideAngular(() => {
diff --git a/src/app/services.module.ts b/src/app/services.module.ts
index 4a91be86b4..e6733a7cc3 100644
--- a/src/app/services.module.ts
+++ b/src/app/services.module.ts
@@ -18,6 +18,7 @@ import { isDev } from 'jslib/electron/utils';
 import { DeviceType } from 'jslib/enums/deviceType';
 
 import { I18nService } from '../services/i18n.service';
+import { NativeMessagingService } from '../services/nativeMessaging.service';
 
 import { AuthGuardService } from 'jslib/angular/services/auth-guard.service';
 import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
@@ -132,6 +133,8 @@ const environmentService = new EnvironmentService(apiService, storageService, no
 const eventService = new EventService(storageService, apiService, userService, cipherService);
 const systemService = new SystemService(storageService, vaultTimeoutService, messagingService, platformUtilsService,
     null);
+const nativeMessagingService = new NativeMessagingService(cryptoFunctionService, cryptoService, platformUtilsService,
+    logService, i18nService, userService, messagingService);
 
 const analytics = new Analytics(window, () => isDev(), platformUtilsService, storageService, appIdService);
 containerService.attachToGlobal(window);
@@ -216,6 +219,7 @@ export function initFactory(): Function {
         { provide: PolicyServiceAbstraction, useValue: policyService },
         { provide: SendServiceAbstraction, useValue: sendService },
         { provide: CryptoFunctionServiceAbstraction, useValue: cryptoFunctionService },
+        { provide: NativeMessagingService, useValue: nativeMessagingService },
         {
             provide: APP_INITIALIZER,
             useFactory: initFactory,
diff --git a/src/global.d.ts b/src/global.d.ts
index 4859a0869e..4fe5b43fb8 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -1,2 +1,6 @@
 declare function escape(s: string): string;
 declare function unescape(s: string): string;
+declare module 'node-ipc' {
+    const x: any;
+    export = x;
+}
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 2ec24da91c..525e9da141 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -1437,5 +1437,20 @@
   },
   "acceptPoliciesError": {
     "message": "Terms of Service and Privacy Policy have not been acknowledged."
+  },
+  "enableBrowserIntegration": {
+    "message": "Enable browser integration"
+  },
+  "enableBrowserIntegrationDesc": {
+    "message": "Browser integration is used for biometrics in browser."
+  },
+  "approve": {
+    "message": "Approve"
+  },
+  "verifyBrowserTitle": {
+    "message": "Verify browser connection"
+  },
+  "verifyBrowserDescription": {
+    "message": "Please ensure the shown fingerprint is identical to the fingerprint showed in the browser extension."
   }
 }
diff --git a/src/main.ts b/src/main.ts
index 2388577fc8..1b6edc9323 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -18,6 +18,8 @@ import { ElectronStorageService } from 'jslib/electron/services/electronStorage.
 import { TrayMain } from 'jslib/electron/tray.main';
 import { UpdaterMain } from 'jslib/electron/updater.main';
 import { WindowMain } from 'jslib/electron/window.main';
+import { NativeMessagingMain } from './main/nativeMessaging.main';
+import { NativeMessagingProxy } from './proxy/native-messaging-proxy';
 
 export class Main {
     logService: ElectronLogService;
@@ -33,6 +35,7 @@ export class Main {
     powerMonitorMain: PowerMonitorMain;
     trayMain: TrayMain;
     biometricMain: BiometricMain;
+    nativeMessagingMain: NativeMessagingMain;
 
     constructor() {
         // Set paths for portable builds
@@ -116,6 +119,8 @@ export class Main {
             const BiometricDarwinMain = require('jslib/electron/biometric.darwin.main').default;
             this.biometricMain = new BiometricDarwinMain(this.storageService, this.i18nService);
         }
+
+        this.nativeMessagingMain = new NativeMessagingMain(this.logService, this.windowMain, app.getPath('userData'), app.getAppPath());
     }
 
     bootstrap() {
@@ -140,6 +145,10 @@ export class Main {
                 await this.biometricMain.init();
             }
 
+            if (await this.storageService.get<boolean>(ElectronConstants.enableBrowserIntegration)) {
+                this.nativeMessagingMain.listen();
+            }
+
             if (!app.isDefaultProtocolClient('bitwarden')) {
                 app.setAsDefaultProtocolClient('bitwarden');
             }
@@ -175,5 +184,22 @@ export class Main {
     }
 }
 
-const main = new Main();
-main.bootstrap();
+if (process.argv.some(arg => arg.indexOf('chrome-extension://') !== -1 || arg.indexOf('{') !== -1)) {
+    if (process.platform === 'darwin') {
+        app.on('ready', () => {
+            app.dock.hide();
+        });
+    }
+
+    process.stdout.on('error', (e) => {
+        if (e.code === 'EPIPE') {
+            process.exit(0);
+        }
+    });
+
+    const proxy = new NativeMessagingProxy();
+    proxy.run();
+} else {
+    const main = new Main();
+    main.bootstrap();
+}
diff --git a/src/main/messaging.main.ts b/src/main/messaging.main.ts
index 720e6fe999..02981422f4 100644
--- a/src/main/messaging.main.ts
+++ b/src/main/messaging.main.ts
@@ -38,7 +38,7 @@ export class MessagingMain {
             case 'minimizeOnCopy':
                 this.storageService.get<boolean>(ElectronConstants.minimizeOnCopyToClipboardKey).then(
                     (shouldMinimize) => {
-                        if (shouldMinimize && this.main.windowMain.win != null) {
+                        if (shouldMinimize && this.main.windowMain.win !== null) {
                             this.main.windowMain.win.minimize();
                         }
                     });
@@ -57,6 +57,16 @@ export class MessagingMain {
                 break;
             case 'removeOpenAtLogin':
                 this.removeOpenAtLogin();
+            case 'setFocus':
+                this.setFocus();
+                break;
+            case 'enableBrowserIntegration':
+                this.main.nativeMessagingMain.generateManifests();
+                this.main.nativeMessagingMain.listen();
+                break;
+            case 'disableBrowserIntegration':
+                this.main.nativeMessagingMain.removeManifests();
+                this.main.nativeMessagingMain.stop();
                 break;
             default:
                 break;
@@ -123,4 +133,9 @@ export class MessagingMain {
     private linuxStartupFile(): string {
         return path.join(app.getPath('home'), '.config', 'autostart', 'bitwarden.desktop');
     }
+
+    private setFocus() {
+        this.main.trayMain.restoreFromTray();
+        this.main.windowMain.win.focusOnWebView();
+    }
 }
diff --git a/src/main/nativeMessaging.main.ts b/src/main/nativeMessaging.main.ts
new file mode 100644
index 0000000000..39dfbd492b
--- /dev/null
+++ b/src/main/nativeMessaging.main.ts
@@ -0,0 +1,203 @@
+import { promises as fs, existsSync } from 'fs';
+import * as ipc from 'node-ipc';
+import * as path from 'path';
+import * as util from 'util';
+import { homedir } from 'os';
+
+import { LogService } from 'jslib/abstractions/log.service';
+import { ipcMain } from 'electron';
+import { WindowMain } from 'jslib/electron/window.main';
+
+export class NativeMessagingMain {
+    private connected = false;
+
+    constructor(private logService: LogService, private windowMain: WindowMain, private userPath: string, private appPath: string) {}
+
+    listen() {
+        ipc.config.id = 'bitwarden';
+        ipc.config.retry = 1500;
+
+        ipc.serve(() => {
+            ipc.server.on('message', (data: any, socket: any) => {
+                // This is a ugly hack until electron is updated 7.0.0 which supports ipcMain.invoke
+                this.windowMain.win.webContents.send('nativeMessaging', data);
+                ipcMain.once('nativeMessagingReply', (event, msg) => {
+                    if (msg != null) {
+                        this.send(msg, socket);
+                    }
+                });
+            });
+
+            ipc.server.on('connect', () => {
+                this.connected = true;
+            })
+
+            ipc.server.on(
+                'socket.disconnected',
+                (socket: any, destroyedSocketID: any) => {
+                    this.connected = false;
+                    ipc.log(
+                        'client ' + destroyedSocketID + ' has disconnected!'
+                    );
+                }
+            );
+        });
+
+        ipc.server.start();
+    }
+
+    stop() {
+        ipc.server.stop();
+    }
+
+    send(message: object, socket: any) {
+        ipc.server.emit(socket, 'message', message);
+    }
+
+    generateManifests() {
+        const baseJson = {
+            'name': 'com.8bit.bitwarden',
+            'description': 'Bitwarden desktop <-> browser bridge',
+            'path': this.binaryPath(),
+            'type': 'stdio',
+        }
+
+        const firefoxJson = {...baseJson, ...{ 'allowed_extensions': ['{446900e4-71c2-419f-a6a7-df9c091e268b}']}};
+        const chromeJson = {...baseJson, ...{
+            'allowed_origins': [
+                'chrome-extension://nngceckbapebfimnlniiiahkandclblb/',
+                'chrome-extension://jbkfoedolllekgbhcbcoahefnbanhhlh/',
+                'chrome-extension://ccnckbpmaceehanjmeomladnmlffdjgn/'
+            ]
+        }};
+
+        switch (process.platform) {
+            case 'win32':
+                const destination = path.join(this.userPath, 'browsers');
+                this.writeManifest(path.join(destination, 'firefox.json'), firefoxJson);
+                this.writeManifest(path.join(destination, 'chrome.json'), chromeJson);
+
+                this.createWindowsRegistry('HKLM\\SOFTWARE\\Mozilla\\Firefox', 'HKCU\\SOFTWARE\\Mozilla\\NativeMessagingHosts\\com.8bit.bitwarden', path.join(destination, 'firefox.json'))
+                this.createWindowsRegistry('HKCU\\SOFTWARE\\Google\\Chrome', 'HKCU\\SOFTWARE\\Google\\Chrome\\NativeMessagingHosts\\com.8bit.bitwarden', path.join(destination, 'chrome.json'))
+                break;
+            case 'darwin':
+                if (existsSync(`${homedir()}/Library/Application\ Support/Mozilla/`)) {
+                    this.writeManifest(`${homedir()}/Library/Application\ Support/Mozilla/NativeMessagingHosts/com.8bit.bitwarden.json`, firefoxJson)
+                }
+
+                if (existsSync(`${homedir()}/Library/Application\ Support/Google/Chrome`)) {
+                    this.writeManifest(`${homedir()}/Library/Application\ Support/Google/Chrome/NativeMessagingHosts/com.8bit.bitwarden.json`, chromeJson)
+                }
+                break;
+            case 'linux':
+                if (existsSync(`${homedir()}/.mozilla/`)) {
+                    this.writeManifest(`${homedir()}/.mozilla/native-messaging-hosts/com.8bit.bitwarden.json`, firefoxJson)
+                }
+
+                if (existsSync(`${homedir()}/.config/google-chrome/`)) {
+                    this.writeManifest(`${homedir()}/.config/google-chrome/NativeMessagingHosts/com.8bit.bitwarden.json`, chromeJson)
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    removeManifests() {
+        switch (process.platform) {
+            case 'win32':
+                fs.unlink(path.join(this.userPath, 'browsers', 'firefox.json'));
+                fs.unlink(path.join(this.userPath, 'browsers', 'chrome.json'));
+                this.deleteWindowsRegistry('HKCU\\SOFTWARE\\Mozilla\\NativeMessagingHosts\\com.8bit.bitwarden');
+                this.deleteWindowsRegistry('HKCU\\SOFTWARE\\Google\\Chrome\\NativeMessagingHosts\\com.8bit.bitwarden');
+                break;
+            case 'darwin':
+                if (existsSync('~/Library/Application Support/Mozilla/NativeMessagingHosts/com.8bit.bitwarden.json')) {
+                    fs.unlink('~/Library/Application Support/Mozilla/NativeMessagingHosts/com.8bit.bitwarden.json');
+                }
+
+                if (existsSync('~/Library/Application Support/Google/Chrome/NativeMessagingHosts/com.8bit.bitwarden.json')) {
+                    fs.unlink('~/Library/Application Support/Mozilla/NativeMessagingHosts/com.8bit.bitwarden.json');
+                }
+                break;
+            case 'linux':
+                if (existsSync('~/.mozilla/native-messaging-hosts/com.8bit.bitwarden.json')) {
+                    fs.unlink('~/.mozilla/native-messaging-hosts/com.8bit.bitwarden.json');
+                }
+
+                if (existsSync('~/.config/google-chrome/NativeMessagingHosts/com.8bit.bitwarden.json')) {
+                    fs.unlink('~/.config/google-chrome/NativeMessagingHosts/com.8bit.bitwarden.json');
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    private writeManifest(destination: string, manifest: object) {
+        fs.mkdir(path.dirname(destination));
+        fs.writeFile(destination, JSON.stringify(manifest, null, 2)).catch(this.logService.error);
+    }
+
+    private binaryPath() {
+        const dir = path.join(this.appPath, '..');
+        if (process.platform === 'win32') {
+            return path.join(dir, 'native-messaging.bat');
+        } else if (process.platform === 'darwin') {
+            return path.join(dir, '..', 'MacOS', 'Bitwarden');
+        }
+
+        return path.join(dir, '..', 'bitwarden');
+    }
+
+    private async createWindowsRegistry(check: string, location: string, jsonFile: string) {
+        const regedit = require('regedit');
+        regedit.setExternalVBSLocation('resources/regedit/vbs');
+
+        const list = util.promisify(regedit.list);
+        const createKey = util.promisify(regedit.createKey);
+        const putValue = util.promisify(regedit.putValue);
+
+        this.logService.debug(`Adding registry: ${location}`)
+
+        // Check installed
+        try {
+            await list(check)
+        } catch {
+            return;
+        }
+
+        try {
+            await createKey(location);
+
+            // Insert path to manifest
+            const obj: any = {};
+            obj[location] = {
+                'default': {
+                    value: jsonFile,
+                    type: 'REG_DEFAULT',
+                },
+            }
+
+            return putValue(obj);
+        } catch (error) {
+            this.logService.error(error);
+        }
+    }
+
+    private async deleteWindowsRegistry(key: string) {
+        const regedit = require('regedit');
+
+        const list = util.promisify(regedit.list);
+        const deleteKey = util.promisify(regedit.deleteKey);
+
+        this.logService.debug(`Removing registry: ${key}`)
+
+        try {
+            await list(key);
+            await deleteKey(key);
+        } catch {
+            // Do nothing
+        }
+    }
+}
diff --git a/src/package.json b/src/package.json
index 98ad04bf4e..781a491dc0 100644
--- a/src/package.json
+++ b/src/package.json
@@ -2,7 +2,7 @@
   "name": "bitwarden",
   "productName": "Bitwarden",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "1.23.0",
+  "version": "1.23.1",
   "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
   "homepage": "https://bitwarden.com",
   "license": "GPL-3.0",
@@ -19,6 +19,7 @@
     "electron-store": "1.3.0",
     "electron-updater": "4.3.5",
     "keytar": "4.13.0",
+    "node-ipc": "^9.1.1",
     "zxcvbn": "4.4.2"
   }
 }
diff --git a/src/proxy/ipc.ts b/src/proxy/ipc.ts
new file mode 100644
index 0000000000..2bd9eb5e75
--- /dev/null
+++ b/src/proxy/ipc.ts
@@ -0,0 +1,51 @@
+/* tslint:disable:no-console */
+import * as ipc from 'node-ipc';
+
+ipc.config.id = 'proxy';
+ipc.config.retry = 1500;
+ipc.config.logger = console.warn; // Stdout is used for native messaging
+
+export default class IPC {
+    onMessage: (message: object) => void
+
+    private connected = false;
+
+    connect() {
+        ipc.connectTo('bitwarden', () => {
+            ipc.of.bitwarden.on('connect', () => {
+                this.connected = true;
+                console.error(
+                    '## connected to bitwarden desktop ##',
+                    ipc.config.delay
+                );
+
+                // Notify browser extension, connection is established to desktop application.
+                this.onMessage({command: 'connected'})
+            });
+
+            ipc.of.bitwarden.on('disconnect', () => {
+                this.connected = false;
+                console.error('disconnected from world');
+
+                // Notify browser extension, no connection to desktop application.
+                this.onMessage({command: 'disconnected'})
+            });
+
+            ipc.of.bitwarden.on('message', (message: any) => {
+                this.onMessage(message);
+            });
+
+            ipc.of.bitwarden.on('error', (err: any) => {
+                console.error('error', err);
+            });
+        });
+    }
+
+    isConnected(): boolean {
+        return this.connected;
+    }
+
+    send(json: object) {
+        ipc.of.bitwarden.emit('message', json);
+    }
+}
diff --git a/src/proxy/native-messaging-proxy.ts b/src/proxy/native-messaging-proxy.ts
new file mode 100644
index 0000000000..f308016ead
--- /dev/null
+++ b/src/proxy/native-messaging-proxy.ts
@@ -0,0 +1,23 @@
+import NativeMessage from './nativemessage';
+import IPC from './ipc';
+
+// Proxy is a lightweight application which provides bi-directional communication
+// between the browser extension and a running desktop application.
+//
+// Browser extension <-[native messaging]-> proxy <-[ipc]-> desktop
+export class NativeMessagingProxy {
+    private ipc: IPC;
+    private nativeMessage: NativeMessage;
+
+    constructor() {
+        this.ipc = new IPC();
+        this.nativeMessage = new NativeMessage(this.ipc);
+    }
+
+    run() {
+        this.ipc.connect();
+        this.nativeMessage.listen();
+
+        this.ipc.onMessage = this.nativeMessage.send;
+    }
+}
diff --git a/src/proxy/nativemessage.ts b/src/proxy/nativemessage.ts
new file mode 100644
index 0000000000..3bcee29a6c
--- /dev/null
+++ b/src/proxy/nativemessage.ts
@@ -0,0 +1,89 @@
+/* tslint:disable:no-console */
+import IPC from './ipc';
+
+// Mostly based on the example from MDN,
+// https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Native_messaging
+export default class NativeMessage {
+    ipc: IPC;
+
+    constructor(ipc: IPC) {
+        this.ipc = ipc;
+    }
+
+    send(message: object) {
+        const messageBuffer = Buffer.from(JSON.stringify(message));
+
+        const headerBuffer = Buffer.alloc(4);
+        headerBuffer.writeUInt32LE(messageBuffer.length, 0);
+
+        process.stdout.write(Buffer.concat([headerBuffer, messageBuffer]));
+    }
+
+    listen() {
+        let payloadSize: number = null;
+
+        // A queue to store the chunks as we read them from stdin.
+        // This queue can be flushed when `payloadSize` data has been read
+        const chunks: any = [];
+
+        // Only read the size once for each payload
+        const sizeHasBeenRead = () => Boolean(payloadSize);
+
+        // All the data has been read, reset everything for the next message
+        const flushChunksQueue = () => {
+            payloadSize = null;
+            chunks.splice(0);
+        };
+
+        const processData = () => {
+            // Create one big buffer with all all the chunks
+            const stringData = Buffer.concat(chunks);
+            console.error(stringData);
+
+            // The browser will emit the size as a header of the payload,
+            // if it hasn't been read yet, do it.
+            // The next time we'll need to read the payload size is when all of the data
+            // of the current payload has been read (ie. data.length >= payloadSize + 4)
+            if (!sizeHasBeenRead()) {
+                try {
+                    payloadSize = stringData.readUInt32LE(0);
+                } catch (e) {
+                    console.error(e);
+                    return;
+                }
+            }
+
+            // If the data we have read so far is >= to the size advertised in the header,
+            // it means we have all of the data sent.
+            // We add 4 here because that's the size of the bytes that old the payloadSize
+            if (stringData.length >= payloadSize + 4) {
+                // Remove the header
+                const contentWithoutSize = stringData
+                    .slice(4, payloadSize + 4)
+                    .toString();
+
+                // Reset the read size and the queued chunks
+                flushChunksQueue();
+
+                const json = JSON.parse(contentWithoutSize);
+
+                // Forward to desktop application
+                this.ipc.send(json);
+            }
+        };
+
+        process.stdin.on('readable', () => {
+            // A temporary variable holding the nodejs.Buffer of each
+            // chunk of data read off stdin
+            let chunk = null;
+
+            // Read all of the available data
+            // tslint:disable-next-line:no-conditional-assignment
+            while ((chunk = process.stdin.read()) !== null) {
+                chunks.push(chunk);
+            }
+
+            processData();
+        });
+    }
+}
diff --git a/src/services/nativeMessaging.service.ts b/src/services/nativeMessaging.service.ts
new file mode 100644
index 0000000000..a594c953de
--- /dev/null
+++ b/src/services/nativeMessaging.service.ts
@@ -0,0 +1,104 @@
+import { ipcRenderer } from 'electron';
+import Swal from 'sweetalert2';
+
+import { CryptoService } from 'jslib/abstractions/crypto.service';
+import { CryptoFunctionService } from 'jslib/abstractions/cryptoFunction.service';
+import { I18nService } from 'jslib/abstractions/i18n.service';
+import { LogService } from 'jslib/abstractions/log.service';
+import { MessagingService } from 'jslib/abstractions/messaging.service';
+import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
+import { UserService } from 'jslib/abstractions/user.service';
+
+import { Utils } from 'jslib/misc/utils';
+import { SymmetricCryptoKey } from 'jslib/models/domain/symmetricCryptoKey';
+
+const MessageValidTimeout = 10 * 1000;
+const EncryptionAlgorithm = 'sha1';
+
+export class NativeMessagingService {
+    private sharedSecret: any;
+
+    constructor(private cryptoFunctionService: CryptoFunctionService, private cryptoService: CryptoService,
+        private platformUtilService: PlatformUtilsService, private logService: LogService, private i18nService: I18nService,
+        private userService: UserService, private messagingService: MessagingService) {
+        ipcRenderer.on('nativeMessaging', async (event: any, message: any) => {
+            this.messageHandler(message);
+        });
+    }
+
+    private async messageHandler(rawMessage: any) {
+
+        // Request to setup secure encryption
+        if (rawMessage.command === 'setupEncryption') {
+            const remotePublicKey = Utils.fromB64ToArray(rawMessage.publicKey).buffer;
+            const fingerprint = (await this.cryptoService.getFingerprint(await this.userService.getUserId(), remotePublicKey)).join(' ');
+
+            this.messagingService.send('setFocus');
+
+            // Await confirmation that fingerprint is correct
+            const submitted = await Swal.fire({
+                title: this.i18nService.t('verifyBrowserTitle'),
+                html: `${this.i18nService.t('verifyBrowserDescription')}<br><br><strong>${fingerprint}</strong>`,
+                showCancelButton: true,
+                cancelButtonText: this.i18nService.t('cancel'),
+                showConfirmButton: true,
+                confirmButtonText: this.i18nService.t('approve'),
+                allowOutsideClick: false,
+            });
+
+            if (submitted.value !== true) {
+                return;
+            }
+
+            this.secureCommunication(remotePublicKey);
+            return;
+        }
+
+        const message = JSON.parse(await this.cryptoService.decryptToUtf8(rawMessage, this.sharedSecret));
+
+        // Shared secret is invalidated, force re-authentication
+        if (message == null) {
+            ipcRenderer.send('nativeMessagingReply', {command: 'invalidateEncryption'});
+            return;
+        }
+
+        if (Math.abs(message.timestamp - Date.now()) > MessageValidTimeout) {
+            this.logService.error('NativeMessage is to old, ignoring.');
+            return;
+        }
+
+        switch (message.command) {
+            case 'biometricUnlock':
+                if (! this.platformUtilService.supportsBiometric()) {
+                    return this.send({command: 'biometricUnlock', response: 'not supported'});
+                }
+
+                const response = await this.platformUtilService.authenticateBiometric();
+                if (response) {
+                    this.send({command: 'biometricUnlock', response: 'unlocked', keyB64: (await this.cryptoService.getKey()).keyB64});
+                } else {
+                    this.send({command: 'biometricUnlock', response: 'canceled'});
+                }
+
+                break;
+            default:
+                this.logService.error('NativeMessage, got unknown command.');
+        }
+    }
+
+    private async send(message: any) {
+        message.timestamp = Date.now();
+
+        const encrypted = await this.cryptoService.encrypt(JSON.stringify(message), this.sharedSecret);
+
+        ipcRenderer.send('nativeMessagingReply', encrypted);
+    }
+
+    private async secureCommunication(remotePublicKey: ArrayBuffer) {
+        const secret = await this.cryptoFunctionService.randomBytes(64);
+        this.sharedSecret = new SymmetricCryptoKey(secret);
+
+        const encryptedSecret = await this.cryptoFunctionService.rsaEncrypt(secret, remotePublicKey, EncryptionAlgorithm);
+        ipcRenderer.send('nativeMessagingReply', {command: 'setupEncryption', sharedSecret: Utils.fromBufferToB64(encryptedSecret)});
+    }
+}
diff --git a/tsconfig.json b/tsconfig.json
index bd8e9adde8..1d1e18999e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -43,6 +43,7 @@
   "exclude": [
     "node_modules",
     "jslib/node_modules",
+    "proxy",
     "dist",
     "dist-safari",
     "jslib/dist",