diff --git a/common/config/rush/npm-shrinkwrap.json b/common/config/rush/npm-shrinkwrap.json
index 1c72e5e..951aff3 100644
--- a/common/config/rush/npm-shrinkwrap.json
+++ b/common/config/rush/npm-shrinkwrap.json
@@ -41,9 +41,9 @@
       "integrity": "sha1-5NEKueQ6c3A6F8b0FDi+3ih2k0A="
     },
     "@types/cheerio": {
-      "version": "0.22.1",
-      "resolved": "https://registry.npmjs.org/@types/cheerio/-/cheerio-0.22.1.tgz",
-      "integrity": "sha1-dAxM2MTT8wdPg7mrYucR6sLHZM4="
+      "version": "0.22.2",
+      "resolved": "https://registry.npmjs.org/@types/cheerio/-/cheerio-0.22.2.tgz",
+      "integrity": "sha512-7YJQbllem83umRzZ+ry6RZFAbBWNoHvbiW6tE5VEAJIoX6F22hrKrBw3ibRvHm2zPnOhZGrZJusAbp1zZKcLzQ=="
     },
     "@types/chokidar": {
       "version": "1.7.0",
@@ -101,9 +101,9 @@
       "integrity": "sha1-pNgMCC/v5x5Ap8DwfR5lVbu8e1I="
     },
     "@types/node": {
-      "version": "7.0.32",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.32.tgz",
-      "integrity": "sha512-7+0Ai8r8Xt6NNVM0Eo+XSqiZsBUYXg2yrCwyBhQzSfFHTGQWzFv/pk9106vPR8HWjKmGK+zzUj244POs4xfO2g=="
+      "version": "8.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.7.tgz",
+      "integrity": "sha512-fuCPLPe4yY0nv6Z1rTLFCEC452jl0k7i3gF/c8hdEKpYtEpt6Sk67hTGbxx8C0wmifFGPvKYd/O8CvS6dpgxMQ=="
     },
     "@types/prop-types": {
       "version": "15.5.1",
@@ -111,9 +111,9 @@
       "integrity": "sha1-Hs9SYhKZ5luFU3Qzf7Ef0tEGb8E="
     },
     "@types/react": {
-      "version": "15.0.31",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-15.0.31.tgz",
-      "integrity": "sha512-SCeEnC+1K3ZftVjBJMXmKkoCbC4VsDUL4q0HyvnYj6FqiVvg+Klambc8FhroRyGCi6zb5V21F+41DXyio5rpdA=="
+      "version": "15.0.34",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-15.0.34.tgz",
+      "integrity": "sha512-BDSzuTYvOJAknO4qSIFb1Y0+BREhwhBDNMrVAu8JPRjosc94jBQJwIZ++H9uK6EInKIrk0PxNVstmwT02H7E/A=="
     },
     "@types/react-dom": {
       "version": "15.5.1",
@@ -121,9 +121,9 @@
       "integrity": "sha512-4c+e/QPfvSa48YhgGOcQWoHishTo6BuJqka0Bh8qeLdnK1jS+1Nz8W/w1G17AIjtLxONYFUqmi8qyt+8p/yMFA=="
     },
     "@types/sinon": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-2.3.1.tgz",
-      "integrity": "sha512-WXpK6gOice0sdhfrAtRaDNtg0E0e04MRuCKYuqtCmc8O1P9P+ia3Z5zuMf4cDVB27s9w4UjjML5/6vjkiI2gNA=="
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-2.3.2.tgz",
+      "integrity": "sha512-92DKsC/9bnsfyBLdY5AP8Zk7LDbwVF0hBHsfQ3IY3kHXEo3NdJA57090wGmzcnITxupyvR3lXk278tPktM6OJw=="
     },
     "@types/source-map": {
       "version": "0.5.0",
@@ -166,14 +166,14 @@
       "integrity": "sha1-c7ISuxg49f/xQ0Hj436VbwVgABs="
     },
     "@types/webpack": {
-      "version": "2.2.16",
-      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-2.2.16.tgz",
-      "integrity": "sha512-RWL7Qrf9dE2Y3SPR8FZ2ATIJzKzvzvpfAhXs2A+2YpAYufoBqc94766Dv7TLB8zj7P6NK8t4KMrGNnYFJGKGiQ=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-3.0.1.tgz",
+      "integrity": "sha512-rvxpZw2k+u9aesdM39jN+a1f1g/6DeVIYU3601uyiSFMnfHCv+/iHJQiyGzuf4pSZ35LLIamzt9S+ccunuqEZg=="
     },
     "@types/yargs": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-6.6.0.tgz",
-      "integrity": "sha1-kfjiWAqAgwSfeDEcBZqlfWlJ32s="
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-8.0.0.tgz",
+      "integrity": "sha512-HR3mkr3OuDvlbT0jtB5mkqOALEXik2mMz0kDNRRXBp7S83rbylqAKcTw+eY0yeTu8Nl7oVLf1nCI7zoJ4j+JMg=="
     },
     "abab": {
       "version": "1.0.3",
@@ -731,9 +731,9 @@
       "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk="
     },
     "commander": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.10.0.tgz",
-      "integrity": "sha512-q/r9trjmuikWDRJNTBHAVnWhuU6w+z80KgBq7j9YDclik5E7X4xi0KnlZBNFA1zOQ+SH/vHMWd2mC9QTOz7GpA=="
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
+      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ=="
     },
     "concat-map": {
       "version": "0.0.1",
@@ -1012,9 +1012,9 @@
       "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY="
     },
     "enhanced-resolve": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz",
-      "integrity": "sha1-n0tib1dyRe3PSyrYPYbhf09CHew="
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.3.0.tgz",
+      "integrity": "sha512-2qbxE7ek3YxPJ1ML6V+satHkzHpJQKWkRHmRx6mfAoW59yP8YH8BFplbegSP+u2hBd6B6KCOpvJQ3dZAP+hkpg=="
     },
     "entities": {
       "version": "1.1.1",
@@ -1027,9 +1027,9 @@
       "integrity": "sha1-B9XOaRJBJA+4F78sSxjW5TAkDfY="
     },
     "enzyme-matchers": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/enzyme-matchers/-/enzyme-matchers-3.3.0.tgz",
-      "integrity": "sha512-59dLTPOxsx9sljHdvn5O2A7jbwO14mxXkTrlg+HClRRw+OE6FbcyFtejuDzKl3per3uR651vyMauaKGHjzVakg=="
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/enzyme-matchers/-/enzyme-matchers-3.4.0.tgz",
+      "integrity": "sha1-SMLbPVxwyKw7CZP3smczZ0V+6pw="
     },
     "enzyme-to-json": {
       "version": "1.5.1",
@@ -2151,9 +2151,9 @@
       "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE="
     },
     "hash.js": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.1.tgz",
-      "integrity": "sha512-I2TYCUjYQMmqmRMCp6jKMC5bvdXxGIZ/heITRR/0F1u0OP920ImEj/cXt3WgcTKBnNYGn7enxUzdai3db829JA=="
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
+      "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA=="
     },
     "hawk": {
       "version": "3.1.3",
@@ -2181,9 +2181,9 @@
       "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw="
     },
     "hosted-git-info": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz",
-      "integrity": "sha1-AHa59GonBQbduq6lZJaJdGBhKmc="
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
+      "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg=="
     },
     "html-encoding-sniffer": {
       "version": "1.0.1",
@@ -2341,9 +2341,9 @@
       "integrity": "sha1-wVvz5LZrYtcu+vKSWEhmPsvGGbY=",
       "dependencies": {
         "isobject": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.0.tgz",
-          "integrity": "sha1-OVZSF/NmF4nooKDAgNX35rxG4aA="
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
         }
       }
     },
@@ -2582,9 +2582,9 @@
       "integrity": "sha1-1Ii8RhKvLCRumG6K52caCZFj1AM="
     },
     "jest-enzyme": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/jest-enzyme/-/jest-enzyme-3.3.0.tgz",
-      "integrity": "sha512-bqTP/7JfKmSetyf79Ht38P6hSW6V3t3jTwq+UKmtoAl8PCn4OTvzWZcKtdKrmrcmZKyDTxjngfNdWG0WPjUsyQ=="
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/jest-enzyme/-/jest-enzyme-3.4.0.tgz",
+      "integrity": "sha1-wZvIzEjNj6py5QQHflwakYe7k+I="
     },
     "jest-haste-map": {
       "version": "20.0.4",
@@ -2721,9 +2721,9 @@
       "integrity": "sha1-0M/R3k9XnymEhJJcKA+PHZTsPKs="
     },
     "js-tokens": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz",
-      "integrity": "sha1-COnxMkhKLEWjCQfp3E1VZ7fxFNc="
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
     },
     "js-yaml": {
       "version": "3.8.4",
@@ -2777,9 +2777,9 @@
       "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
     },
     "jsonfile": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.0.tgz",
-      "integrity": "sha1-kufHRE5f/V+jLmqa6LhQNN+DR9A="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
+      "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY="
     },
     "jsonify": {
       "version": "0.0.0",
@@ -3199,9 +3199,9 @@
       "integrity": "sha1-L6nhJgX6EACdRFSdb82KY93g5P8="
     },
     "normalize-package-data": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz",
-      "integrity": "sha1-2Bntoqne29H/pWPqQHHZNngilbs="
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw=="
     },
     "normalize-path": {
       "version": "2.1.1",
@@ -3274,9 +3274,9 @@
           "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs="
         },
         "isobject": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.0.tgz",
-          "integrity": "sha1-OVZSF/NmF4nooKDAgNX35rxG4aA="
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
         }
       }
     },
@@ -3636,9 +3636,9 @@
       "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4="
     },
     "readable-stream": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz",
-      "integrity": "sha1-WgTfBeT1f+Pw3Gj90R3FyXx+b00="
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ=="
     },
     "readdirp": {
       "version": "2.1.0",
@@ -3815,9 +3815,9 @@
       "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
     },
     "sinon": {
-      "version": "2.3.5",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-2.3.5.tgz",
-      "integrity": "sha1-mi/A/41SbacW8wlTqixl1RiRf2w="
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-2.3.6.tgz",
+      "integrity": "sha1-lTeOfg+XapcS6bRZH/WznnPcPd4="
     },
     "slash": {
       "version": "1.0.0",
@@ -3934,14 +3934,24 @@
       "integrity": "sha1-VpcPscOFWOnnC3KL894mmsRa36w="
     },
     "string-width": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz",
-      "integrity": "sha1-Y1xUNsxypuDDh87KJ41OLuxSaH4=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.0.tgz",
+      "integrity": "sha1-AwZkVh/BRslCPsfZeP4kV0N/5tA=",
       "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8="
         }
       }
     },
@@ -4125,9 +4135,9 @@
       "integrity": "sha1-OcKBDAXW9pCNrBWSna4ga0lLc/Q="
     },
     "ts-loader": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-2.2.0.tgz",
-      "integrity": "sha512-+NdvTzGoE2pee3U2Arg1DB6VVKxGmog7QEARiQxMh5v5ewDxXMpnfVvMt4YxJsB+XVXtaZGtaWnsCINXT3oXxw==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-2.2.2.tgz",
+      "integrity": "sha512-HiusedxruMeHN1/BzpijS/rXSdup2P/IopamX235tLS3OuPU+eSXNyN3YgbHKzYEe71YkUhnm7X+VY4oOAGLtg==",
       "dependencies": {
         "loader-utils": {
           "version": "1.1.0",
@@ -4152,9 +4162,9 @@
       "integrity": "sha1-dhyEArgONHt3M6BDkKdXslNYBGc="
     },
     "tsutils": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.4.0.tgz",
-      "integrity": "sha1-rUzm26Dlo+2934Ymt8oEB4IYn+o="
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.5.1.tgz",
+      "integrity": "sha1-wgATkMee7Bpcz6esEtWZY5aD4M8="
     },
     "tty-browserify": {
       "version": "0.0.0",
@@ -4188,9 +4198,9 @@
       "integrity": "sha1-A6wGNqNIGRRPvL4K4u2av2wZqQg="
     },
     "typescript": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.3.4.tgz",
-      "integrity": "sha1-PTgyGCgjHkNPKHUUlZw3qCtin0I="
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.1.tgz",
+      "integrity": "sha1-w8yxbdqgsjFN4DHn5v7onlujRrw="
     },
     "ua-parser-js": {
       "version": "0.7.13",
@@ -4198,9 +4208,9 @@
       "integrity": "sha1-zZ3S+GSTs/RNvu7zeA/adMXuFL4="
     },
     "uglify-js": {
-      "version": "3.0.20",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.20.tgz",
-      "integrity": "sha512-O/c2/N97k1Ms+23VRx6gIAfGdijuW53SlASmXy0FVapK63rQrduHyE+5X6hUtqNiSLLao9Uv6ijotpNe8t991Q==",
+      "version": "3.0.23",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.23.tgz",
+      "integrity": "sha512-miLHbO2QcdQGxL/q1wLcUr6TGIRHhMnpKyywUbAdZRkJMqCeZCDmBsgYu1Wlj26xHBXN+sU5tHaWh38QsN208g==",
       "dependencies": {
         "commander": {
           "version": "2.9.0",
@@ -4359,9 +4369,9 @@
       "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w="
     },
     "validator": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/validator/-/validator-7.1.0.tgz",
-      "integrity": "sha512-FQoOpdJUMXEHZnXBQ2UmSsUOBs6cJUqVt8gpfTQv3yorqZA/v3rT/xH/5Zd9EKndXPL0Am3Qi6t8udKiaJuMfA=="
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/validator/-/validator-7.2.0.tgz",
+      "integrity": "sha512-c8NGTUYeBEcUIGeMppmNVKHE7wwfm3mYbNZxV+c5mlv9fDHI7Ad3p07qfNrn/CvpdkK2k61fOLRO2sTEhgQXmg=="
     },
     "verror": {
       "version": "1.3.6",
@@ -4416,9 +4426,9 @@
       "integrity": "sha1-7pvOvyEkf3FTy0EBaMq0XjpZ1Nc=",
       "dependencies": {
         "acorn": {
-          "version": "5.0.3",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz",
-          "integrity": "sha1-xGDfCEkUY/AozLguqzcwvwEIez0="
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.0.tgz",
+          "integrity": "sha512-WXZ0VTJT8EE25BmZjc+wr0qIwG7QaEna9csPKHS6WQp8gDo4V376wUWi222LXRiuAF6CAS4Ejv736DdRwuPK9g=="
         },
         "ajv": {
           "version": "5.2.0",
@@ -4557,9 +4567,9 @@
       "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
     },
     "worker-farm": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.3.1.tgz",
-      "integrity": "sha1-QzMRK7SbF6oFC4eJXKayys9A5f8="
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.4.1.tgz",
+      "integrity": "sha512-tgFAtgOYLPutkAyzgpS6VJFL5HY+0ui1Tvua+fITgz8ByaJTMFGtazR6xxQfwfiAcbwE+2fLG/K49wc2TfwCNw=="
     },
     "wrap-ansi": {
       "version": "2.1.0",
diff --git a/package.json b/package.json
index 39754dc..ce63571 100644
--- a/package.json
+++ b/package.json
@@ -10,14 +10,14 @@
     "publish": "npm run rush-tools -- publish --access public"
   },
   "devDependencies": {
-    "@microsoft/rush": "^3.0.9",
-    "@microsoft/rush-lib": "^3.0.9",
+    "@microsoft/rush": "^3.0.11",
+    "@microsoft/rush-lib": "^3.0.11",
     "@types/shelljs": "^0.7.2",
-    "@types/yargs": "^6.6.0",
+    "@types/yargs": "^8.0.0",
     "mz": "^2.6.0",
     "shelljs": "^0.7.8",
-    "ts-node": "^3.0.6",
-    "typescript": "^2.3.4",
+    "ts-node": "^3.1.0",
+    "typescript": "^2.4.1",
     "yargs": "^8.0.2"
   }
 }
diff --git a/packages/react-forms-dom/package.json b/packages/react-forms-dom/package.json
index 5a6c83e..1e1296f 100644
--- a/packages/react-forms-dom/package.json
+++ b/packages/react-forms-dom/package.json
@@ -32,31 +32,31 @@
   ],
   "devDependencies": {
     "@types/chokidar": "^1.7.0",
-    "@types/enzyme": "^2.8.0",
+    "@types/enzyme": "^2.8.1",
     "@types/gulp": "^4.0.4",
-    "@types/jest": "^20.0.1",
-    "@types/sinon": "^2.3.1",
+    "@types/jest": "^20.0.2",
+    "@types/sinon": "^2.3.2",
     "@types/undertaker": "^1.1.2",
     "@types/vinyl-fs": "^2.4.5",
-    "@types/webpack": "^2.2.16",
-    "enzyme": "^2.8.2",
+    "@types/webpack": "^3.0.1",
+    "enzyme": "^2.9.1",
     "gulp": "github:gulpjs/gulp#4.0",
     "jest": "^20.0.4",
-    "jest-enzyme": "^3.2.0",
+    "jest-enzyme": "^3.4.0",
     "react-test-renderer": "^15.6.1",
     "@simplr/mvdir": "0.0.2",
-    "sinon": "^2.3.5",
+    "sinon": "^2.3.6",
     "source-map-loader": "^0.2.1",
     "ts-jest": "^20.0.6",
-    "ts-loader": "^2.1.0",
+    "ts-loader": "^2.2.2",
     "tslint": "^5.4.3",
-    "typescript": "^2.3.4",
-    "uglify-js": "^3.0.18",
+    "typescript": "^2.4.1",
+    "uglify-js": "^3.0.23",
     "webpack": "^3.0.0"
   },
   "dependencies": {
     "@types/prop-types": "^15.5.1",
-    "@types/react": "^15.0.29",
+    "@types/react": "^15.0.34",
     "immutable": "^3.8.1",
     "prop-types": "^15.5.10",
     "react": "^15.6.1",
diff --git a/packages/react-forms-validation/package.json b/packages/react-forms-validation/package.json
index f0edd35..ac620b0 100644
--- a/packages/react-forms-validation/package.json
+++ b/packages/react-forms-validation/package.json
@@ -32,35 +32,35 @@
   ],
   "devDependencies": {
     "@types/gulp": "^4.0.4",
-    "@types/webpack": "^2.2.16",
-    "@types/enzyme": "^2.8.0",
-    "@types/jest": "^20.0.1",
-    "@types/sinon": "^2.3.1",
+    "@types/webpack": "^3.0.1",
+    "@types/enzyme": "^2.8.1",
+    "@types/jest": "^20.0.2",
+    "@types/sinon": "^2.3.2",
     "gulp": "github:gulpjs/gulp#4.0",
     "@simplr/mvdir": "0.0.2",
-    "enzyme": "^2.8.2",
+    "enzyme": "^2.9.1",
     "jest": "^20.0.4",
-    "jest-enzyme": "^3.2.0",
+    "jest-enzyme": "^3.4.0",
     "react-dom": "^15.6.1",
     "react-test-renderer": "^15.6.1",
-    "sinon": "^2.3.5",
+    "sinon": "^2.3.6",
     "ts-jest": "^20.0.6",
-    "ts-loader": "^2.1.0",
+    "ts-loader": "^2.2.2",
     "tslint": "^5.4.3",
-    "typescript": "^2.3.4",
+    "typescript": "^2.4.1",
     "uglifyjs": "^2.4.11",
     "webpack": "^3.0.0"
   },
   "dependencies": {
-    "@types/react": "^15.0.29",
-    "@types/react-dom": "^15.5.0",
+    "@types/react": "^15.0.34",
+    "@types/react-dom": "^15.5.1",
     "@types/validator": "^6.2.0",
     "action-emitter": "^0.2.1",
     "immutable": "^3.8.1",
     "react": "^15.6.1",
     "@simplr/react-forms": "^4.1.1",
     "tslib": "^1.7.1",
-    "validator": "^7.0.0"
+    "validator": "^7.2.0"
   },
   "jest": {
     "setupTestFrameworkScriptFile": "./node_modules/jest-enzyme/lib/index.js",
diff --git a/packages/react-forms-validation/src/subscribers/form-store-subscriber.ts b/packages/react-forms-validation/src/subscribers/form-store-subscriber.ts
index bcf9154..9875a73 100644
--- a/packages/react-forms-validation/src/subscribers/form-store-subscriber.ts
+++ b/packages/react-forms-validation/src/subscribers/form-store-subscriber.ts
@@ -2,7 +2,6 @@ import * as React from "react";
 import * as ActionEmitter from "action-emitter";
 
 import {
-    FieldValue,
     FieldValidationType
 } from "@simplr/react-forms/contracts";
 import { FormStore } from "@simplr/react-forms/stores";
@@ -10,7 +9,6 @@ import {
     FieldRegistered,
     ValueChanged,
     FieldPropsChanged,
-    FieldActive,
     FieldBlurred
 } from "@simplr/react-forms/actions";
 
diff --git a/packages/react-forms/package.json b/packages/react-forms/package.json
index 480d630..a2ec20b 100644
--- a/packages/react-forms/package.json
+++ b/packages/react-forms/package.json
@@ -32,34 +32,34 @@
   ],
   "devDependencies": {
     "@types/chokidar": "^1.7.0",
-    "@types/enzyme": "^2.8.0",
+    "@types/enzyme": "^2.8.1",
     "@types/gulp": "^4.0.4",
-    "@types/jest": "^20.0.1",
-    "@types/sinon": "^2.3.1",
+    "@types/jest": "^20.0.2",
+    "@types/sinon": "^2.3.2",
     "@types/undertaker": "^1.1.2",
     "@types/vinyl-fs": "^2.4.5",
-    "@types/webpack": "^2.2.16",
-    "enzyme": "^2.8.2",
+    "@types/webpack": "^3.0.1",
+    "enzyme": "^2.9.1",
     "gulp": "github:gulpjs/gulp#4.0",
     "jest": "^20.0.4",
-    "jest-enzyme": "^3.2.0",
+    "jest-enzyme": "^3.4.0",
     "react-test-renderer": "^15.6.1",
     "@simplr/mvdir": "0.0.2",
-    "sinon": "^2.3.5",
+    "sinon": "^2.3.6",
     "source-map-loader": "^0.2.1",
     "ts-jest": "^20.0.6",
-    "ts-loader": "^2.1.0",
+    "ts-loader": "^2.2.2",
     "tslint": "^5.4.3",
-    "typescript": "^2.3.4",
-    "uglify-js": "^3.0.18",
+    "typescript": "^2.4.1",
+    "uglify-js": "^3.0.23",
     "webpack": "^3.0.0"
   },
   "dependencies": {
     "@types/fbemitter": "^2.0.32",
-    "@types/flux": "^3.1.0",
+    "@types/flux": "^3.1.1",
     "@types/prop-types": "^15.5.1",
-    "@types/react": "^15.0.29",
-    "@types/react-dom": "^15.5.0",
+    "@types/react": "^15.0.34",
+    "@types/react-dom": "^15.5.1",
     "action-emitter": "^0.2.1",
     "immutable": "^3.8.1",
     "prop-types": "^15.5.10",
diff --git a/packages/react-forms/src/stores/form-store.ts b/packages/react-forms/src/stores/form-store.ts
index edec29c..c5d83d3 100644
--- a/packages/react-forms/src/stores/form-store.ts
+++ b/packages/react-forms/src/stores/form-store.ts
@@ -281,7 +281,7 @@ export class FormStore extends ActionEmitter {
         this.emit(new Actions.ValueChanged(this.FormId, fieldId));
     }
 
-    public async ValidateField(fieldId: string, validationPromise: Promise<never>): Promise<void> {
+    public async ValidateField(fieldId: string, validationPromise: Promise<void>): Promise<void> {
         const field = this.State.Fields.get(fieldId);
         const fieldValue = field.Value;
 
@@ -435,7 +435,7 @@ export class FormStore extends ActionEmitter {
         });
     }
 
-    public async ValidateForm(validationPromise: Promise<never>): Promise<void> {
+    public async ValidateForm(validationPromise: Promise<void>): Promise<void> {
         const form = this.State.Form;
 
         // If form is not validating
diff --git a/tools/mvdir/dist/contracts.d.ts b/tools/mvdir/dist/contracts.d.ts
index d32f443..aeba678 100644
--- a/tools/mvdir/dist/contracts.d.ts
+++ b/tools/mvdir/dist/contracts.d.ts
@@ -1,4 +1,5 @@
-export interface ArgumentsValues {
+import * as yargs from "yargs";
+export interface ArgumentsValues extends yargs.Arguments {
     config?: string;
     from: string;
     to: string;
diff --git a/tools/mvdir/package.json b/tools/mvdir/package.json
index 589dc14..c128fe4 100644
--- a/tools/mvdir/package.json
+++ b/tools/mvdir/package.json
@@ -24,15 +24,15 @@
   "dependencies": {
     "@types/mkdirp": "^0.3.29",
     "@types/mz": "0.0.31",
-    "@types/node": "^7.0.31",
-    "@types/yargs": "^6.6.0",
+    "@types/node": "^8.0.7",
+    "@types/yargs": "^8.0.0",
     "mz": "^2.6.0",
     "yargs": "^8.0.2"
   },
   "devDependencies": {
     "mkdirp": "^0.5.1",
     "tslint": "^5.4.3",
-    "typescript": "^2.3.4"
+    "typescript": "^2.4.1"
   },
   "bin": {
     "mvdir": "dist/cli.js"
diff --git a/tools/mvdir/src/contracts.ts b/tools/mvdir/src/contracts.ts
index d32f443..e452622 100644
--- a/tools/mvdir/src/contracts.ts
+++ b/tools/mvdir/src/contracts.ts
@@ -1,4 +1,6 @@
-export interface ArgumentsValues {
+import * as yargs from "yargs";
+
+export interface ArgumentsValues extends yargs.Arguments {
     config?: string;
     from: string;
     to: string;
diff --git a/tools/rush-tools.ts b/tools/rush-tools.ts
index 8d45e82..537b826 100644
--- a/tools/rush-tools.ts
+++ b/tools/rush-tools.ts
@@ -65,7 +65,7 @@ class RushTools {
     }
 }
 
-interface ArgumentsValues {
+interface ArgumentsValues extends yargs.Arguments {
     config: string;
     exclude: string[];