diff --git a/Gruntfile.js b/Gruntfile.js
index 436e73d..4afd279 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -127,21 +127,21 @@ module.exports = function(grunt) {
                     'requirejs/require.js',
                     'imap-client/src/*.js',
                     'imap-client/node_modules/browserbox/src/*.js',
-                    'imap-client/node_modules/browserbox/node_modules/imap-handler/src/*.js',
+                    'imap-client/node_modules/browserbox/node_modules/wo-imap-handler/src/*.js',
                     'imap-client/node_modules/browserbox/node_modules/mimefuncs/src/*.js',
                     'imap-client/node_modules/browserbox/node_modules/tcp-socket/src/*.js',
-                    'imap-client/node_modules/browserbox/node_modules/utf7/src/*.js',
+                    'imap-client/node_modules/browserbox/node_modules/wo-utf7/src/*.js',
                     'mailreader/src/*.js',
                     'mailreader/node_modules/mimeparser/src/*.js',
-                    'mailreader/node_modules/mimeparser/node_modules/addressparser/src/*.js',
+                    'mailreader/node_modules/mimeparser/node_modules/wo-addressparser/src/*.js',
                     'pgpbuilder/src/*.js',
                     'pgpbuilder/node_modules/mailbuild/src/*.js',
                     'pgpbuilder/node_modules/mailbuild/node_modules/mimetypes/src/*.js',
                     'pgpbuilder/node_modules/mailbuild/node_modules/punycode/punycode.min.js',
                     'pgpmailer/src/*.js',
-                    'pgpmailer/node_modules/smtpclient/src/*.js',
-                    'pgpmailer/node_modules/smtpclient/node_modules/stringencoding/dist/stringencoding.js',
-                    'axe/axe.js',
+                    'pgpmailer/node_modules/wo-smtpclient/src/*.js',
+                    'pgpmailer/node_modules/wo-smtpclient/node_modules/wo-stringencoding/dist/stringencoding.js',
+                    'axe-logger/axe.js',
                     'dompurify/purify.js',
                     'jquery/dist/jquery.min.js',
                     'ng-infinite-scroll/build/ng-infinite-scroll.min.js'
diff --git a/package.json b/package.json
index 5291594..297f58f 100644
--- a/package.json
+++ b/package.json
@@ -11,12 +11,12 @@
     },
     "dependencies": {
         "crypto-lib": "https://github.com/whiteout-io/crypto-lib/tarball/v0.2.0",
-        "imap-client": "https://github.com/whiteout-io/imap-client/tarball/v0.3.6",
-        "mailreader": "https://github.com/whiteout-io/mailreader/tarball/v0.3.4",
-        "pgpmailer": "https://github.com/whiteout-io/pgpmailer/tarball/v0.3.7",
-        "pgpbuilder": "https://github.com/whiteout-io/pgpbuilder/tarball/v0.3.5",
+        "imap-client": "~0.3.7",
+        "mailreader": "~0.3.5",
+        "pgpmailer": "~0.3.10",
+        "pgpbuilder": "~0.3.7",
         "requirejs": "2.1.14",
-        "axe": "https://github.com/whiteout-io/axe/tarball/v0.0.2",
+        "axe-logger": "~0.0.2",
         "dompurify": "~0.4.2",
         "jquery": "~2.1.1",
         "ng-infinite-scroll": "https://github.com/sroze/ngInfiniteScroll/tarball/1.1.1"