diff --git a/.babelrc b/.babelrc
index 9ecf9a2..35ba0da 100644
--- a/.babelrc
+++ b/.babelrc
@@ -5,9 +5,27 @@
     "react"
   ],
   "plugins": [
-    "transform-decorators-legacy",
-    "transform-class-properties",
-    "transform-object-rest-spread",
-    "transform-react-remove-prop-types"
+    [
+      "css-modules-transform",
+      {
+        "extractCss": {
+          "dir": "./lib/",
+          "relativeRoot": "./src/",
+          "filename": "[path]/[name].css"
+        },
+        "keepImport": true,
+        "preprocessCss": "./scripts/sass.js"
+      }
+    ],
+    [
+      "transform-runtime",
+      {
+        "helpers": false,
+        "polyfill": false,
+        "regenerator": true,
+        "moduleName": "babel-runtime"
+      }
+    ],
+    "transform-decorators-legacy"
   ]
-}
+}
\ No newline at end of file
diff --git a/.eslintrc.json b/.eslintrc.json
index ffd4f03..20ea7e7 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,33 +1,15 @@
 {
-  "extends": ["semistandard", "standard-react"],
+  "extends": [
+    "semistandard",
+    "standard-react"
+  ],
   "parser": "babel-eslint",
   "env": {
     "browser": true,
-    "mocha": true,
-    "node": true
+    "mocha": true
   },
   "globals": {
     "expect": true,
     "FileReader": true
-  },
-  "rules": {
-    "curly": ["error", "all"],
-    "jsx-quotes": ["error", "prefer-single"],
-    "newline-after-var": ["error", "always"],
-    "no-alert": "error",
-    "no-debugger": "error",
-    "no-duplicate-imports": ["error", {
-      "includeExports": true
-    }],
-    "object-curly-spacing": ["error", "always"],
-    "object-property-newline": 0,
-    "one-var-declaration-per-line": ["error", "always"],
-    "padded-blocks": ["error", {
-      "blocks": "never",
-      "classes": "never",
-      "switches": "never"
-    }],
-    "react/jsx-closing-bracket-location": "error",
-    "react/jsx-curly-spacing": ["error", "always"]
   }
-}
+}
\ No newline at end of file
diff --git a/.stylelintrc.json b/.stylelintrc.json
index 9248483..425b4df 100644
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@@ -1,8 +1,3 @@
 {
-  "extends": "stylelint-config-standard",
-  "rules": {
-    "selector-pseudo-class-no-unknown": [
-      true, { "ignorePseudoClasses": ["global"] }
-    ]
-  }
-}
+  "extends": "stylelint-config-standard"
+}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 4e8ef60..f7b7d7a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,146 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@babel/code-frame": {
+      "version": "7.0.0-beta.32",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.32.tgz",
+      "integrity": "sha512-EVq4T1a2GviKiQ75OfxNrGPPhJyXzg9jjORuuwhloZbFdrhT4FHa73sv9OFWBwX7rl2b6bxBVmfxrBQYWYz9tA==",
+      "dev": true,
+      "requires": {
+        "chalk": "2.3.0",
+        "esutils": "2.0.2",
+        "js-tokens": "3.0.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "chalk": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+          "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.0",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "4.5.0"
+          }
+        },
+        "supports-color": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "dev": true,
+          "requires": {
+            "has-flag": "2.0.0"
+          }
+        }
+      }
+    },
+    "@babel/helper-function-name": {
+      "version": "7.0.0-beta.32",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.32.tgz",
+      "integrity": "sha512-ysfIt7p72xm5fjSJsv7fMVN/j+EwIdqu8/MJjt6TqB4wM2r6rFRi0ujBTWDkLGQkRB/P5uDV8qcFCHAHnNzmsg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-get-function-arity": "7.0.0-beta.32",
+        "@babel/template": "7.0.0-beta.32",
+        "@babel/types": "7.0.0-beta.32"
+      }
+    },
+    "@babel/helper-get-function-arity": {
+      "version": "7.0.0-beta.32",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.32.tgz",
+      "integrity": "sha512-bm7lIlizycJQY5SJ3HXWJV4XjSrOt1onzrDcOxUo9FEnKRZDEr/zfi5ar2s5tvvZvve/jGHwZKVKekRw2cjPCQ==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "7.0.0-beta.32"
+      }
+    },
+    "@babel/template": {
+      "version": "7.0.0-beta.32",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.32.tgz",
+      "integrity": "sha512-DB9sLgX2mfE29vjAkxHlzLyWr31EO9HaYoAM/UsPSsL70Eudl0i25URwIfQT6S6ckeVFnFP1t6PhERVeV4EAHA==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "7.0.0-beta.32",
+        "@babel/types": "7.0.0-beta.32",
+        "babylon": "7.0.0-beta.32",
+        "lodash": "4.17.4"
+      },
+      "dependencies": {
+        "babylon": {
+          "version": "7.0.0-beta.32",
+          "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.32.tgz",
+          "integrity": "sha512-PvAmyP2IJEBVAuE5yVzrTSWCCN9VMa1eGns8w3w6FYD/ivHSUmS7n+F40Fmjn+0nCQSUFR96wP0CqQ4jxTnF4Q==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.0.0-beta.32",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.0.0-beta.32.tgz",
+      "integrity": "sha512-dGe2CLduCIZ/iDkbmnqspQguRy5ARvI+zC8TiwFnsJ2YYO2TWK7x2aEwrbkSmi0iPlBP+Syiag7Idc1qNQq74g==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "7.0.0-beta.32",
+        "@babel/helper-function-name": "7.0.0-beta.32",
+        "@babel/types": "7.0.0-beta.32",
+        "babylon": "7.0.0-beta.32",
+        "debug": "3.1.0",
+        "globals": "10.4.0",
+        "invariant": "2.2.2",
+        "lodash": "4.17.4"
+      },
+      "dependencies": {
+        "babylon": {
+          "version": "7.0.0-beta.32",
+          "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.32.tgz",
+          "integrity": "sha512-PvAmyP2IJEBVAuE5yVzrTSWCCN9VMa1eGns8w3w6FYD/ivHSUmS7n+F40Fmjn+0nCQSUFR96wP0CqQ4jxTnF4Q==",
+          "dev": true
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "globals": {
+          "version": "10.4.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-10.4.0.tgz",
+          "integrity": "sha512-uNUtxIZpGyuaq+5BqGGQHsL4wUlJAXRqOm6g3Y48/CWNGTLONgBibI0lh6lGxjR2HljFYUfszb+mk4WkgMntsA==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/types": {
+      "version": "7.0.0-beta.32",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.32.tgz",
+      "integrity": "sha512-w8+wzVcYCMb9OfaBfay2Vg5hyj7UfBX6qQtA+kB0qsW1h1NH/7xHMwvTZNqkuFBwjz5wxGS2QmaIcC3HH+UoxA==",
+      "dev": true,
+      "requires": {
+        "esutils": "2.0.2",
+        "lodash": "4.17.4",
+        "to-fast-properties": "2.0.0"
+      },
+      "dependencies": {
+        "to-fast-properties": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+          "dev": true
+        }
+      }
+    },
     "@parity/abi": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/@parity/abi/-/abi-2.1.1.tgz",
@@ -12,6 +152,18 @@
         "bignumber.js": "3.0.1",
         "js-sha3": "0.5.5",
         "utf8": "2.1.2"
+      },
+      "dependencies": {
+        "bignumber.js": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-3.0.1.tgz",
+          "integrity": "sha1-gHZS0Q453jfp40lyR+3HmLt0b3Y="
+        },
+        "js-sha3": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.5.tgz",
+          "integrity": "sha1-uvDA6MVK1ZA0R9+Wreekobynmko="
+        }
       }
     },
     "@parity/api": {
@@ -33,6 +185,16 @@
         "store": "2.0.12"
       },
       "dependencies": {
+        "bignumber.js": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-3.0.1.tgz",
+          "integrity": "sha1-gHZS0Q453jfp40lyR+3HmLt0b3Y="
+        },
+        "js-sha3": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.5.tgz",
+          "integrity": "sha1-uvDA6MVK1ZA0R9+Wreekobynmko="
+        },
         "lodash": {
           "version": "4.17.4",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
@@ -51,6 +213,13 @@
         "node-fetch": "1.7.3",
         "qs": "6.5.1",
         "whatwg-fetch": "2.0.3"
+      },
+      "dependencies": {
+        "bignumber.js": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-3.0.1.tgz",
+          "integrity": "sha1-gHZS0Q453jfp40lyR+3HmLt0b3Y="
+        }
       }
     },
     "@parity/jsonrpc": {
@@ -67,6 +236,13 @@
         "ethereumjs-tx": "1.3.3",
         "u2f-api": "0.0.9",
         "u2f-api-polyfill": "0.4.3"
+      },
+      "dependencies": {
+        "bignumber.js": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-3.0.1.tgz",
+          "integrity": "sha1-gHZS0Q453jfp40lyR+3HmLt0b3Y="
+        }
       }
     },
     "@parity/shared": {
@@ -88,6 +264,43 @@
         "solc": "github:ngotchac/solc-js#04eb38cc3003fba8cb3656653a7941ed36408818",
         "useragent.js": "0.5.6",
         "yargs": "6.6.0"
+      },
+      "dependencies": {
+        "mobx": {
+          "version": "2.6.4",
+          "resolved": "https://registry.npmjs.org/mobx/-/mobx-2.6.4.tgz",
+          "integrity": "sha1-4FqRpbLJfaw/2rNAJOa3Sn9DEas="
+        },
+        "mobx-react": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-4.0.3.tgz",
+          "integrity": "sha1-QOsx0l4LjWMEjtojdsxWv6vRT3U=",
+          "requires": {
+            "hoist-non-react-statics": "1.2.0"
+          }
+        },
+        "react-redux": {
+          "version": "4.4.6",
+          "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-4.4.6.tgz",
+          "integrity": "sha1-S50ymFMHoRCWot1hVhmABE/MYgk=",
+          "requires": {
+            "hoist-non-react-statics": "1.2.0",
+            "invariant": "2.2.2",
+            "lodash": "4.17.4",
+            "loose-envify": "1.3.1"
+          }
+        },
+        "redux": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/redux/-/redux-3.6.0.tgz",
+          "integrity": "sha1-iHwrPQub2G7KK+cFccJ2VMGeGI0=",
+          "requires": {
+            "lodash": "4.17.4",
+            "lodash-es": "4.17.4",
+            "loose-envify": "1.3.1",
+            "symbol-observable": "1.0.4"
+          }
+        }
       }
     },
     "@parity/wordlist": {
@@ -95,6 +308,12 @@
       "resolved": "https://registry.npmjs.org/@parity/wordlist/-/wordlist-1.1.0.tgz",
       "integrity": "sha1-np7Tq3g39WM7WETmCjVenmPkJ64="
     },
+    "abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true
+    },
     "acorn": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz",
@@ -136,6 +355,12 @@
       "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=",
       "dev": true
     },
+    "amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+      "dev": true
+    },
     "ansi-escapes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz",
@@ -213,7 +438,7 @@
       "dev": true,
       "requires": {
         "define-properties": "1.1.2",
-        "es-abstract": "1.9.0"
+        "es-abstract": "1.10.0"
       }
     },
     "array-union": {
@@ -248,6 +473,18 @@
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
       "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
     },
+    "asn1": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+      "dev": true
+    },
+    "assert-plus": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
+      "dev": true
+    },
     "async-each": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
@@ -255,6 +492,18 @@
       "dev": true,
       "optional": true
     },
+    "async-foreach": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
+      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
+      "dev": true
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
     "attr-accept": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-1.1.0.tgz",
@@ -274,6 +523,18 @@
         "postcss-value-parser": "3.3.0"
       }
     },
+    "aws-sign2": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+      "dev": true
+    },
+    "aws4": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
+      "dev": true
+    },
     "babel-cli": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-cli/-/babel-cli-6.26.0.tgz",
@@ -349,15 +610,23 @@
       }
     },
     "babel-eslint": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-7.2.3.tgz",
-      "integrity": "sha1-sv4tgBJkcPXBlELcdXJTqJdxCCc=",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-8.0.2.tgz",
+      "integrity": "sha512-yyl5U088oE+419+BNLJDKVWkUokuPLQeQt9ZTy9uM9kAzbtQgyYL3JkG425B8jxXA7MwTxnDAtRLMKJNH36qjA==",
       "dev": true,
       "requires": {
-        "babel-code-frame": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0",
-        "babylon": "6.18.0"
+        "@babel/code-frame": "7.0.0-beta.32",
+        "@babel/traverse": "7.0.0-beta.32",
+        "@babel/types": "7.0.0-beta.32",
+        "babylon": "7.0.0-beta.32"
+      },
+      "dependencies": {
+        "babylon": {
+          "version": "7.0.0-beta.32",
+          "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.32.tgz",
+          "integrity": "sha512-PvAmyP2IJEBVAuE5yVzrTSWCCN9VMa1eGns8w3w6FYD/ivHSUmS7n+F40Fmjn+0nCQSUFR96wP0CqQ4jxTnF4Q==",
+          "dev": true
+        }
       }
     },
     "babel-generator": {
@@ -579,14 +848,13 @@
         "babel-runtime": "6.26.0"
       }
     },
-    "babel-plugin-react-intl": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-react-intl/-/babel-plugin-react-intl-2.3.1.tgz",
-      "integrity": "sha1-PUORLoJNoAXgjo6COdW6eEN0uwA=",
+    "babel-plugin-css-modules-transform": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-css-modules-transform/-/babel-plugin-css-modules-transform-1.3.0.tgz",
+      "integrity": "sha512-9g+y8eDMMDofCbjGn3rFumSbg37VZun6+s63B9G7nWmmcPpbaqykPiprYhWIwNQHkpWocyeuztDwkUrhptvd+Q==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "intl-messageformat-parser": "1.2.0",
+        "css-modules-require-hook": "4.2.2",
         "mkdirp": "0.5.1"
       }
     },
@@ -1063,12 +1331,6 @@
         "babel-runtime": "6.26.0"
       }
     },
-    "babel-plugin-transform-react-remove-prop-types": {
-      "version": "0.4.10",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.10.tgz",
-      "integrity": "sha512-JlT+Bsnuk5gRroIm2Wl4k0e84bVCtqPEfbijvF3Gl8o5+CTrs/lwRiXhZh2cVeHt/KLA89sU9tCkawY8gLoizA==",
-      "dev": true
-    },
     "babel-plugin-transform-regenerator": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
@@ -1077,6 +1339,15 @@
         "regenerator-transform": "0.10.1"
       }
     },
+    "babel-plugin-transform-runtime": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz",
+      "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
     "babel-plugin-transform-strict-mode": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
@@ -1086,29 +1357,6 @@
         "babel-types": "6.26.0"
       }
     },
-    "babel-plugin-webpack-alias": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-webpack-alias/-/babel-plugin-webpack-alias-2.1.2.tgz",
-      "integrity": "sha1-BaG6I8KFlWYPtupXNkJPxZa0okc=",
-      "dev": true,
-      "requires": {
-        "babel-types": "6.26.0",
-        "find-up": "2.1.0",
-        "lodash.some": "4.6.0",
-        "lodash.template": "4.4.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "requires": {
-            "locate-path": "2.0.0"
-          }
-        }
-      }
-    },
     "babel-polyfill": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
@@ -1371,20 +1619,36 @@
       "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
       "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
     },
+    "bail": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.2.tgz",
+      "integrity": "sha1-99bBcxYwqfnw1NNe0fli4gdKF2Q="
+    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
     },
-    "batch-processor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
-      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    "bcrypt-pbkdf": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "tweetnacl": "0.14.5"
+      }
+    },
+    "big.js": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
+      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
+      "dev": true
     },
     "bignumber.js": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-3.0.1.tgz",
-      "integrity": "sha1-gHZS0Q453jfp40lyR+3HmLt0b3Y="
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.1.0.tgz",
+      "integrity": "sha512-eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA=="
     },
     "binary-extensions": {
       "version": "1.10.0",
@@ -1414,6 +1678,15 @@
         "readable-stream": "2.3.3"
       }
     },
+    "block-stream": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      }
+    },
     "blockies": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/blockies/-/blockies-0.0.2.tgz",
@@ -1430,14 +1703,20 @@
       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
       "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
     },
-    "brace": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/brace/-/brace-0.9.0.tgz",
-      "integrity": "sha1-rQNLrmUiDrZ22UnLKAOD+o4S+nI=",
+    "boom": {
+      "version": "2.10.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+      "dev": true,
       "requires": {
-        "w3c-blob": "0.0.1"
+        "hoek": "2.16.3"
       }
     },
+    "brace": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/brace/-/brace-0.11.0.tgz",
+      "integrity": "sha1-FVzYBgdofcjLkI8N+U5ioDPB1WM="
+    },
     "brace-expansion": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
@@ -1538,6 +1817,12 @@
       "integrity": "sha1-l+p0cvnT5pHu3jTyGYPPwhmseEI=",
       "dev": true
     },
+    "caseless": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
+      "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
+      "dev": true
+    },
     "chain-function": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/chain-function/-/chain-function-1.0.0.tgz",
@@ -1555,6 +1840,21 @@
         "supports-color": "2.0.0"
       }
     },
+    "character-entities": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.1.tgz",
+      "integrity": "sha1-92hxvl72bdt/j440eOzDdMJ9bco="
+    },
+    "character-entities-legacy": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.1.tgz",
+      "integrity": "sha1-9Ad53xoQGHK7UQo9KV4fzPFHIC8="
+    },
+    "character-reference-invalid": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.1.tgz",
+      "integrity": "sha1-lCg191Dk7GGjCOYMLvjMEBEgLvw="
+    },
     "chokidar": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
@@ -1564,6 +1864,7 @@
       "requires": {
         "anymatch": "1.3.2",
         "async-each": "1.0.1",
+        "fsevents": "1.1.3",
         "glob-parent": "2.0.0",
         "inherits": "2.0.3",
         "is-binary-path": "1.0.1",
@@ -1663,33 +1964,21 @@
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
       "dev": true
     },
+    "combined-stream": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+      "dev": true,
+      "requires": {
+        "delayed-stream": "1.0.0"
+      }
+    },
     "commander": {
       "version": "2.11.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
       "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
       "dev": true
     },
-    "commonmark": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/commonmark/-/commonmark-0.24.0.tgz",
-      "integrity": "sha1-uA3gGCxUY1VkOqFdsSv7KCNoJ48=",
-      "requires": {
-        "entities": "1.1.1",
-        "mdurl": "1.0.1",
-        "string.prototype.repeat": "0.2.0"
-      }
-    },
-    "commonmark-react-renderer": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/commonmark-react-renderer/-/commonmark-react-renderer-4.3.4.tgz",
-      "integrity": "sha512-+/Rzo3sI37NR8LaVdkUiqBH3+CEW75hc86shwY4E9eEERg78VCy4rSkaP/p7OG5bTvosUMkvhn5d1ZJ5iyt/ag==",
-      "requires": {
-        "lodash.assign": "4.2.0",
-        "lodash.isplainobject": "4.0.6",
-        "pascalcase": "0.1.1",
-        "xss-filters": "1.2.7"
-      }
-    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -1814,6 +2103,65 @@
         "which": "1.3.0"
       }
     },
+    "cryptiles": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+      "dev": true,
+      "requires": {
+        "boom": "2.10.1"
+      }
+    },
+    "css-modules-require-hook": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/css-modules-require-hook/-/css-modules-require-hook-4.2.2.tgz",
+      "integrity": "sha1-mbuV5c6c9JBg7tdJl8f3oEvyIes=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "generic-names": "1.0.3",
+        "glob-to-regexp": "0.3.0",
+        "icss-replace-symbols": "1.1.0",
+        "lodash": "4.17.4",
+        "postcss": "6.0.14",
+        "postcss-modules-extract-imports": "1.1.0",
+        "postcss-modules-local-by-default": "1.2.0",
+        "postcss-modules-resolve-imports": "1.3.0",
+        "postcss-modules-scope": "1.1.0",
+        "postcss-modules-values": "1.3.0",
+        "seekout": "1.0.2"
+      }
+    },
+    "css-selector-tokenizer": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz",
+      "integrity": "sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=",
+      "dev": true,
+      "requires": {
+        "cssesc": "0.1.0",
+        "fastparse": "1.1.1",
+        "regexpu-core": "1.0.0"
+      },
+      "dependencies": {
+        "regexpu-core": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
+          "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
+          "dev": true,
+          "requires": {
+            "regenerate": "1.3.3",
+            "regjsgen": "0.2.0",
+            "regjsparser": "0.1.5"
+          }
+        }
+      }
+    },
+    "cssesc": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz",
+      "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=",
+      "dev": true
+    },
     "currently-unhandled": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
@@ -1838,14 +2186,14 @@
       "integrity": "sha1-vHZD/KjlOoNH4vva/6I2eWtYUJs="
     },
     "d3-format": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.2.0.tgz",
-      "integrity": "sha1-a0gLqohohdRlHcJIqPSsnaFtsHo="
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.2.1.tgz",
+      "integrity": "sha512-U4zRVLDXW61bmqoo+OJ/V687e1T5nVd3TAKAJKgtpZ/P1JsMgyod0y9br+mlQOryTAACdiXI3wCjuERHFNp91w=="
     },
     "d3-interpolate": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.1.5.tgz",
-      "integrity": "sha1-aeCZ/zkhRxblY8muw+qdHqS4p58=",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.1.6.tgz",
+      "integrity": "sha512-mOnv5a+pZzkNIHtw/V6I+w9Lqm9L5bG3OTXPM5A+QO0yyVMQ4W1uZhR+VOJmazaOZXri2ppbiZ5BUNWT0pFM9A==",
       "requires": {
         "d3-color": "1.0.3"
       }
@@ -1856,44 +2204,61 @@
       "integrity": "sha1-JB6xhJvZ6egCHA0KeZ+KDo5EF2Q="
     },
     "d3-scale": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-1.0.0.tgz",
-      "integrity": "sha1-C0F1yjHL5l4lRCfkZi3678NzRi0=",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-1.0.6.tgz",
+      "integrity": "sha1-vOGdqA06DPQiyVQ64zIghiILNO0=",
       "requires": {
         "d3-array": "1.2.1",
         "d3-collection": "1.0.4",
         "d3-color": "1.0.3",
-        "d3-format": "1.2.0",
-        "d3-interpolate": "1.1.5",
-        "d3-time": "1.0.7",
-        "d3-time-format": "2.1.0"
+        "d3-format": "1.2.1",
+        "d3-interpolate": "1.1.6",
+        "d3-time": "1.0.8",
+        "d3-time-format": "2.1.1"
       }
     },
     "d3-shape": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.0.0.tgz",
-      "integrity": "sha1-zKMySHV55Fc1TIg4oKKDvmOEWbo=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.2.0.tgz",
+      "integrity": "sha1-RdAVOPBkuv0F6j1tLLdI/YxB93c=",
       "requires": {
         "d3-path": "1.0.5"
       }
     },
     "d3-time": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.0.7.tgz",
-      "integrity": "sha1-lMr27bt4ebuAnQ0fdXK8SEgvcnA="
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.0.8.tgz",
+      "integrity": "sha512-YRZkNhphZh3KcnBfitvF3c6E0JOFGikHZ4YqD+Lzv83ZHn1/u6yGenRU1m+KAk9J1GnZMnKcrtfvSktlA1DXNQ=="
     },
     "d3-time-format": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.1.0.tgz",
-      "integrity": "sha512-mqTsfDTylgwE3YE/VNs9oB2OGX274fO0B5j1irbgLQI+X3FPoJg25pesNxrcdZ2nBeRx/6sHDJlDyMIjWL0BGQ==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.1.1.tgz",
+      "integrity": "sha512-8kAkymq2WMfzW7e+s/IUNAtN/y3gZXGRrdGfo6R8NKPAA85UBTxZg5E61bR6nLwjPjj4d3zywSQe1CkYLPFyrw==",
       "requires": {
-        "d3-time": "1.0.7"
+        "d3-time": "1.0.8"
       }
     },
-    "date-difference": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/date-difference/-/date-difference-1.0.0.tgz",
-      "integrity": "sha1-0+bog8DK0tydv8vxLgYpe5cpiXQ=",
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
+    "date-difference": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/date-difference/-/date-difference-1.0.0.tgz",
+      "integrity": "sha1-0+bog8DK0tydv8vxLgYpe5cpiXQ=",
       "requires": {
         "get-stdin": "3.0.2",
         "meow": "3.7.0"
@@ -1948,6 +2313,12 @@
         "rimraf": "2.6.2"
       }
     },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true
+    },
     "delegates": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
@@ -1986,10 +2357,15 @@
         "create-hmac": "1.1.6"
       }
     },
-    "editions": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/editions/-/editions-1.3.3.tgz",
-      "integrity": "sha1-CQcQG92iD6w8vjNMJ8vQaI3Jmls="
+    "ecc-jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "jsbn": "0.1.1"
+      }
     },
     "electron-to-chromium": {
       "version": "1.3.27",
@@ -1997,14 +2373,6 @@
       "integrity": "sha1-eOy4o5kGYYe7N07t412ccFZagD0=",
       "dev": true
     },
-    "element-resize-detector": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.1.12.tgz",
-      "integrity": "sha1-iz/W7t2hf5wAs2Cg6i35knroC6I=",
-      "requires": {
-        "batch-processor": "1.0.0"
-      }
-    },
     "elliptic": {
       "version": "6.4.0",
       "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz",
@@ -2019,6 +2387,12 @@
         "minimalistic-crypto-utils": "1.0.1"
       }
     },
+    "emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "dev": true
+    },
     "encoding": {
       "version": "0.1.12",
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
@@ -2035,11 +2409,6 @@
         "once": "1.4.0"
       }
     },
-    "entities": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
-      "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA="
-    },
     "error-ex": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
@@ -2049,9 +2418,9 @@
       }
     },
     "es-abstract": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.9.0.tgz",
-      "integrity": "sha512-kk3IJoKo7A3pWJc0OV8yZ/VEX2oSUytfekrJiqoxBlKJMFAJVJVpGdHClCCTdv+Fn2zHfpDHHIelMFhZVfef3Q==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.10.0.tgz",
+      "integrity": "sha512-/uh/DhdqIOSkAWifU+8nG78vlQxdLckUdI/sPgy0VhuXi2qJ7T8czBmqIYtLQVpCIFYafChnsRsB5pyb1JdmCQ==",
       "dev": true,
       "requires": {
         "es-to-primitive": "1.1.1",
@@ -2354,9 +2723,9 @@
       "dev": true
     },
     "eslint-plugin-react": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.4.0.tgz",
-      "integrity": "sha512-tvjU9u3VqmW2vVuYnE8Qptq+6ji4JltjOjJ9u7VAOxVYkUkyBZWRvNYKbDv5fN+L6wiA+4we9+qQahZ0m63XEA==",
+      "version": "7.5.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.5.1.tgz",
+      "integrity": "sha512-YGSjB9Qu6QbVTroUZi66pYky3DfoIPLdHQ/wmrBGyBRnwxQsBXAov9j2rpXt/55i8nyMv6IRWJv2s4d4YnduzQ==",
       "dev": true,
       "requires": {
         "doctrine": "2.0.0",
@@ -2536,6 +2905,12 @@
         "is-extglob": "1.0.0"
       }
     },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "dev": true
+    },
     "fast-deep-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
@@ -2554,6 +2929,12 @@
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
       "dev": true
     },
+    "fastparse": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz",
+      "integrity": "sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg=",
+      "dev": true
+    },
     "fbjs": {
       "version": "0.8.16",
       "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz",
@@ -2677,6 +3058,23 @@
       "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
       "dev": true
     },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "dev": true
+    },
+    "form-data": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+      "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+      "dev": true,
+      "requires": {
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.5",
+        "mime-types": "2.1.17"
+      }
+    },
     "fs-readdir-recursive": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz",
@@ -2689,6 +3087,922 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
+    "fsevents": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz",
+      "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nan": "2.7.0",
+        "node-pre-gyp": "0.6.39"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ajv": {
+          "version": "4.11.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
+          }
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "aproba": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "delegates": "1.0.0",
+            "readable-stream": "2.2.9"
+          }
+        },
+        "asn1": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "assert-plus": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aws4": {
+          "version": "1.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "balanced-match": {
+          "version": "0.4.2",
+          "bundled": true,
+          "dev": true
+        },
+        "bcrypt-pbkdf": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "tweetnacl": "0.14.5"
+          }
+        },
+        "block-stream": {
+          "version": "0.0.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3"
+          }
+        },
+        "boom": {
+          "version": "2.10.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "brace-expansion": {
+          "version": "1.1.7",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "balanced-match": "0.4.2",
+            "concat-map": "0.0.1"
+          }
+        },
+        "buffer-shims": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "caseless": {
+          "version": "0.12.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "co": {
+          "version": "4.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "combined-stream": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "delayed-stream": "1.0.0"
+          }
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "cryptiles": {
+          "version": "2.0.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "boom": "2.10.1"
+          }
+        },
+        "dashdash": {
+          "version": "1.14.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "debug": {
+          "version": "2.6.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "deep-extend": {
+          "version": "0.4.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "detect-libc": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ecc-jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "extend": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "extsprintf": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "forever-agent": {
+          "version": "0.6.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "form-data": {
+          "version": "2.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.15"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "fstream": {
+          "version": "1.0.11",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "inherits": "2.0.3",
+            "mkdirp": "0.5.1",
+            "rimraf": "2.6.1"
+          }
+        },
+        "fstream-ignore": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fstream": "1.0.11",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4"
+          }
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aproba": "1.1.1",
+            "console-control-strings": "1.1.0",
+            "has-unicode": "2.0.1",
+            "object-assign": "4.1.1",
+            "signal-exit": "3.0.2",
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wide-align": "1.1.2"
+          }
+        },
+        "getpass": {
+          "version": "0.1.7",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "graceful-fs": {
+          "version": "4.1.11",
+          "bundled": true,
+          "dev": true
+        },
+        "har-schema": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "har-validator": {
+          "version": "4.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ajv": "4.11.8",
+            "har-schema": "1.0.5"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "hawk": {
+          "version": "3.1.3",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "boom": "2.10.1",
+            "cryptiles": "2.0.5",
+            "hoek": "2.16.3",
+            "sntp": "1.0.9"
+          }
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "bundled": true,
+          "dev": true
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "0.2.0",
+            "jsprim": "1.4.0",
+            "sshpk": "1.13.0"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true,
+          "dev": true
+        },
+        "ini": {
+          "version": "1.3.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "number-is-nan": "1.0.1"
+          }
+        },
+        "is-typedarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "isstream": {
+          "version": "0.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jodid25519": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "json-schema": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "json-stable-stringify": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsonify": "0.0.0"
+          }
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jsonify": {
+          "version": "0.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jsprim": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "extsprintf": "1.0.2",
+            "json-schema": "0.2.3",
+            "verror": "1.3.6"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "mime-db": {
+          "version": "1.27.0",
+          "bundled": true,
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.15",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "mime-db": "1.27.0"
+          }
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "brace-expansion": "1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "node-pre-gyp": {
+          "version": "0.6.39",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "detect-libc": "1.0.2",
+            "hawk": "3.1.3",
+            "mkdirp": "0.5.1",
+            "nopt": "4.0.1",
+            "npmlog": "4.1.0",
+            "rc": "1.2.1",
+            "request": "2.81.0",
+            "rimraf": "2.6.1",
+            "semver": "5.3.0",
+            "tar": "2.2.1",
+            "tar-pack": "3.4.0"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1.1.0",
+            "osenv": "0.1.4"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "1.1.4",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "oauth-sign": {
+          "version": "0.8.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "wrappy": "1.0.2"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "performance-now": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "bundled": true,
+          "dev": true
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "qs": {
+          "version": "6.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "0.4.2",
+            "ini": "1.3.4",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.2.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "buffer-shims": "1.0.0",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "1.0.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "request": {
+          "version": "2.81.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aws-sign2": "0.6.0",
+            "aws4": "1.6.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.5",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.1.4",
+            "har-validator": "4.2.1",
+            "hawk": "3.1.3",
+            "http-signature": "1.1.1",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.15",
+            "oauth-sign": "0.8.2",
+            "performance-now": "0.2.0",
+            "qs": "6.4.0",
+            "safe-buffer": "5.0.1",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.2",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "glob": "7.1.2"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "semver": {
+          "version": "5.3.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "sntp": {
+          "version": "1.0.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "sshpk": {
+          "version": "1.13.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asn1": "0.2.3",
+            "assert-plus": "1.0.0",
+            "bcrypt-pbkdf": "1.0.1",
+            "dashdash": "1.14.1",
+            "ecc-jsbn": "0.1.1",
+            "getpass": "0.1.7",
+            "jodid25519": "1.0.2",
+            "jsbn": "0.1.1",
+            "tweetnacl": "0.14.5"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
+        "stringstream": {
+          "version": "0.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "2.2.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "block-stream": "0.0.9",
+            "fstream": "1.0.11",
+            "inherits": "2.0.3"
+          }
+        },
+        "tar-pack": {
+          "version": "3.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "2.6.8",
+            "fstream": "1.0.11",
+            "fstream-ignore": "1.0.5",
+            "once": "1.4.0",
+            "readable-stream": "2.2.9",
+            "rimraf": "2.6.1",
+            "tar": "2.2.1",
+            "uid-number": "0.0.6"
+          }
+        },
+        "tough-cookie": {
+          "version": "2.3.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "punycode": "1.4.1"
+          }
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
+        "tweetnacl": {
+          "version": "0.14.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "uid-number": {
+          "version": "0.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "uuid": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "verror": {
+          "version": "1.3.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "extsprintf": "1.0.2"
+          }
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "string-width": "1.0.2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        }
+      }
+    },
+    "fstream": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "inherits": "2.0.3",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2"
+      }
+    },
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -2716,6 +4030,39 @@
         "wide-align": "1.1.2"
       }
     },
+    "gaze": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz",
+      "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=",
+      "dev": true,
+      "requires": {
+        "globule": "1.2.0"
+      }
+    },
+    "generate-function": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
+      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
+      "dev": true
+    },
+    "generate-object-property": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
+      "dev": true,
+      "requires": {
+        "is-property": "1.0.2"
+      }
+    },
+    "generic-names": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/generic-names/-/generic-names-1.0.3.tgz",
+      "integrity": "sha1-LXhqEhruUIh2eWk56OO/+DbCCRc=",
+      "dev": true,
+      "requires": {
+        "loader-utils": "0.2.17"
+      }
+    },
     "geopattern": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/geopattern/-/geopattern-1.2.3.tgz",
@@ -2739,6 +4086,23 @@
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-3.0.2.tgz",
       "integrity": "sha1-wc7SS5A5s43thb3xYeV3E7bdSr4="
     },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
     "github-from-package": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
@@ -2777,6 +4141,12 @@
         "is-glob": "2.0.1"
       }
     },
+    "glob-to-regexp": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
+      "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
+      "dev": true
+    },
     "globals": {
       "version": "9.18.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
@@ -2802,11 +4172,34 @@
       "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
       "dev": true
     },
+    "globule": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz",
+      "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2",
+        "lodash": "4.17.4",
+        "minimatch": "3.0.4"
+      }
+    },
     "graceful-fs": {
       "version": "4.1.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
       "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
     },
+    "har-validator": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
+      "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "commander": "2.11.0",
+        "is-my-json-valid": "2.16.1",
+        "pinkie-promise": "2.0.1"
+      }
+    },
     "has": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
@@ -2852,6 +4245,18 @@
         "minimalistic-assert": "1.0.0"
       }
     },
+    "hawk": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+      "dev": true,
+      "requires": {
+        "boom": "2.10.1",
+        "cryptiles": "2.0.5",
+        "hoek": "2.16.3",
+        "sntp": "1.0.9"
+      }
+    },
     "history": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/history/-/history-3.3.0.tgz",
@@ -2873,6 +4278,12 @@
         "minimalistic-crypto-utils": "1.0.1"
       }
     },
+    "hoek": {
+      "version": "2.16.3",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+      "dev": true
+    },
     "hoist-non-react-statics": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz",
@@ -2898,11 +4309,37 @@
       "integrity": "sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos=",
       "dev": true
     },
+    "http-signature": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "0.2.0",
+        "jsprim": "1.4.1",
+        "sshpk": "1.13.1"
+      }
+    },
     "iconv-lite": {
       "version": "0.4.19",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
       "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
     },
+    "icss-replace-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
+      "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=",
+      "dev": true
+    },
+    "icss-utils": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-3.0.1.tgz",
+      "integrity": "sha1-7nDTroysOMa+XtkehRsn7tNDrQ8=",
+      "dev": true,
+      "requires": {
+        "postcss": "6.0.14"
+      }
+    },
     "ignore": {
       "version": "3.3.7",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz",
@@ -2915,6 +4352,12 @@
       "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
       "dev": true
     },
+    "in-publish": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
+      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
+      "dev": true
+    },
     "indent-string": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
@@ -2961,7 +4404,7 @@
         "cli-width": "2.2.0",
         "external-editor": "2.0.5",
         "figures": "2.0.0",
-        "lodash": "4.17.2",
+        "lodash": "4.17.4",
         "mute-stream": "0.0.7",
         "run-async": "2.3.0",
         "rx-lite": "4.0.8",
@@ -3039,24 +4482,26 @@
       "integrity": "sha1-BKNp/sv61tpgBbrh8UMzMy3PkxY="
     },
     "intl-messageformat": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-1.3.0.tgz",
-      "integrity": "sha1-99kmre16OrGbLcYB79VOmaS9Tq4=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-2.2.0.tgz",
+      "integrity": "sha1-NFvNRt5jC3aDMwwuUhd/9eq0hPw=",
       "requires": {
-        "intl-messageformat-parser": "1.2.0"
+        "intl-messageformat-parser": "1.4.0"
+      },
+      "dependencies": {
+        "intl-messageformat-parser": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz",
+          "integrity": "sha1-tD1FqXRoytvkQzHXS7Ho3qRPwHU="
+        }
       }
     },
-    "intl-messageformat-parser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-1.2.0.tgz",
-      "integrity": "sha1-WQa3+VOrdHDg3IVJCXtki5kYkv8="
-    },
     "intl-relativeformat": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/intl-relativeformat/-/intl-relativeformat-1.3.0.tgz",
-      "integrity": "sha1-iT3HB2/M04DPCRojAMOA+les5Fs=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/intl-relativeformat/-/intl-relativeformat-2.1.0.tgz",
+      "integrity": "sha1-AQ8RBYAiUfQKxH0OPhogE0iiVd8=",
       "requires": {
-        "intl-messageformat": "1.3.0"
+        "intl-messageformat": "2.2.0"
       }
     },
     "invariant": {
@@ -3072,6 +4517,20 @@
       "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
       "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
     },
+    "is-alphabetical": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.1.tgz",
+      "integrity": "sha1-x3B5zJHU76x3W+EDS/LSQ/lebwg="
+    },
+    "is-alphanumerical": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.1.tgz",
+      "integrity": "sha1-37SqTRCF4zvbYcLe6cgOnGwZ9Ts=",
+      "requires": {
+        "is-alphabetical": "1.0.1",
+        "is-decimal": "1.0.1"
+      }
+    },
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -3090,8 +4549,7 @@
     "is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
     },
     "is-builtin-module": {
       "version": "1.0.0",
@@ -3113,6 +4571,11 @@
       "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
       "dev": true
     },
+    "is-decimal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.1.tgz",
+      "integrity": "sha1-9ftqlJlq2ejjdh+/vQkfH8qMToI="
+    },
     "is-directory": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
@@ -3176,6 +4639,23 @@
       "resolved": "https://registry.npmjs.org/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz",
       "integrity": "sha1-fY035q135dEnFIkTxXPggtd39VQ="
     },
+    "is-hexadecimal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.1.tgz",
+      "integrity": "sha1-bghLvJIGH7sJcexYts5tQE4k2mk="
+    },
+    "is-my-json-valid": {
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz",
+      "integrity": "sha512-ochPsqWS1WXj8ZnMIV0vnNXooaMhp7cyL4FMSIPKTtnV0Ha/T19G2b9kkhcNsabV9bxYkze7/aLZJb/bYuFduQ==",
+      "dev": true,
+      "requires": {
+        "generate-function": "2.0.0",
+        "generate-object-property": "1.2.0",
+        "jsonpointer": "4.0.1",
+        "xtend": "4.0.1"
+      }
+    },
     "is-number": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
@@ -3214,6 +4694,11 @@
         "path-is-inside": "1.0.2"
       }
     },
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="
+    },
     "is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
@@ -3240,6 +4725,12 @@
       "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
       "dev": true
     },
+    "is-property": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
+      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
+      "dev": true
+    },
     "is-regex": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
@@ -3280,11 +4771,27 @@
       "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
       "dev": true
     },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
+    },
     "is-utf8": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
       "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
     },
+    "is-whitespace-character": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.1.tgz",
+      "integrity": "sha1-muAXbzKCtlRXoZks2whPil+DPjs="
+    },
+    "is-word-character": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.1.tgz",
+      "integrity": "sha1-WgP6HqkazopusMfNdw64bWXIvvs="
+    },
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -3310,6 +4817,12 @@
         "whatwg-fetch": "2.0.3"
       }
     },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
+    },
     "jquery": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz",
@@ -3322,9 +4835,9 @@
       "dev": true
     },
     "js-sha3": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.5.tgz",
-      "integrity": "sha1-uvDA6MVK1ZA0R9+Wreekobynmko="
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.6.1.tgz",
+      "integrity": "sha1-W4n3enR3Z5h39YxKB1JAk0sflcA="
     },
     "js-tokens": {
       "version": "3.0.2",
@@ -3341,6 +4854,13 @@
         "esprima": "4.0.0"
       }
     },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true,
+      "optional": true
+    },
     "jschardet": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.6.0.tgz",
@@ -3352,6 +4872,12 @@
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
       "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0="
     },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+      "dev": true
+    },
     "json-schema-traverse": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
@@ -3364,13 +4890,45 @@
       "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
       "dev": true
     },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
+    },
     "json5": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
       "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
     },
+    "jsonpointer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
+      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
+      "dev": true
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
     "jsqr": {
-      "version": "git+https://github.com/JodusNodus/jsQR.git#5ba1acefa1cbb9b2bc92b49f503f2674e2ec212b"
+      "version": "git+https://github.com/cozmo/jsQR.git#397a6eb8f90752cf640cb4bb67ba6f86e3bb5d1f"
     },
     "jsx-ast-utils": {
       "version": "2.0.1",
@@ -3443,6 +5001,18 @@
         "strip-bom": "2.0.0"
       }
     },
+    "loader-utils": {
+      "version": "0.2.17",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
+      "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
+      "dev": true,
+      "requires": {
+        "big.js": "3.2.0",
+        "emojis-list": "2.1.0",
+        "json5": "0.5.1",
+        "object-assign": "4.1.1"
+      }
+    },
     "locate-path": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
@@ -3462,67 +5032,48 @@
       }
     },
     "lodash": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz",
-      "integrity": "sha1-NKMFW6vgTOQkZ7YH1wAHLH/2v0I="
+      "version": "4.17.4",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+      "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
     },
     "lodash-es": {
       "version": "4.17.4",
       "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.4.tgz",
       "integrity": "sha1-3MHXVS4VCgZABzupyzHXDwMpUOc="
     },
-    "lodash._reinterpolate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-      "dev": true
-    },
     "lodash.assign": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
       "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc="
     },
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "dev": true
+    },
     "lodash.cond": {
       "version": "4.5.2",
       "resolved": "https://registry.npmjs.org/lodash.cond/-/lodash.cond-4.5.2.tgz",
       "integrity": "sha1-9HGh2khr5g9quVXRcRVSPdHSVdU=",
       "dev": true
     },
+    "lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
+    },
     "lodash.isequal": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
       "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
     },
-    "lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
-    },
-    "lodash.some": {
+    "lodash.mergewith": {
       "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
-      "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=",
+      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz",
+      "integrity": "sha1-FQzwoWeR9ZA7iJHqsVRgknS96lU=",
       "dev": true
     },
-    "lodash.template": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz",
-      "integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=",
-      "dev": true,
-      "requires": {
-        "lodash._reinterpolate": "3.0.0",
-        "lodash.templatesettings": "4.1.0"
-      }
-    },
-    "lodash.templatesettings": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz",
-      "integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=",
-      "dev": true,
-      "requires": {
-        "lodash._reinterpolate": "3.0.0"
-      }
-    },
     "log-symbols": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.1.0.tgz",
@@ -3644,6 +5195,11 @@
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
       "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0="
     },
+    "markdown-escapes": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.1.tgz",
+      "integrity": "sha1-GZTfLTr0gR3lmmcUk0wrIpJzRRg="
+    },
     "math-expression-evaluator": {
       "version": "1.2.17",
       "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz",
@@ -3675,11 +5231,6 @@
         }
       }
     },
-    "mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
-    },
     "memorystream": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
@@ -3730,6 +5281,21 @@
         "regex-cache": "0.4.4"
       }
     },
+    "mime-db": {
+      "version": "1.30.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
+      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
+      "dev": true
+    },
+    "mime-types": {
+      "version": "2.1.17",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+      "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+      "dev": true,
+      "requires": {
+        "mime-db": "1.30.0"
+      }
+    },
     "mimic-fn": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz",
@@ -3768,22 +5334,29 @@
       }
     },
     "mobx": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/mobx/-/mobx-2.6.4.tgz",
-      "integrity": "sha1-4FqRpbLJfaw/2rNAJOa3Sn9DEas="
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/mobx/-/mobx-3.3.1.tgz",
+      "integrity": "sha1-w4/Booeg3aP11Lhe/hE3/t2dzfA="
     },
     "mobx-react": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-4.0.3.tgz",
-      "integrity": "sha1-QOsx0l4LjWMEjtojdsxWv6vRT3U=",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-4.3.4.tgz",
+      "integrity": "sha1-WM2hBbgBj5v4e9beMzrF6w1cnf4=",
       "requires": {
-        "hoist-non-react-statics": "1.2.0"
+        "hoist-non-react-statics": "2.3.1"
+      },
+      "dependencies": {
+        "hoist-non-react-statics": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz",
+          "integrity": "sha1-ND24TGAYxlB3iJgkATWhQg7iLOA="
+        }
       }
     },
     "moment": {
-      "version": "2.17.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.17.0.tgz",
-      "integrity": "sha1-pMKS4CqsXd77Kabu0k9Rk43Tt08="
+      "version": "2.19.2",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.2.tgz",
+      "integrity": "sha512-Rf6jiHPEfxp9+dlzxPTmRHbvoFXsh2L/U8hOupUMpnuecHQmI6cF6lUbJl3QqKPko1u6ujO+FxtcajLVfLpAtA=="
     },
     "ms": {
       "version": "2.0.0",
@@ -3824,11 +5397,94 @@
         "is-stream": "1.1.0"
       }
     },
+    "node-gyp": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz",
+      "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=",
+      "dev": true,
+      "requires": {
+        "fstream": "1.0.11",
+        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "nopt": "3.0.6",
+        "npmlog": "4.1.2",
+        "osenv": "0.1.4",
+        "request": "2.79.0",
+        "rimraf": "2.6.2",
+        "semver": "5.3.0",
+        "tar": "2.2.1",
+        "which": "1.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+          "dev": true
+        }
+      }
+    },
+    "node-sass": {
+      "version": "4.7.2",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.7.2.tgz",
+      "integrity": "sha512-CaV+wLqZ7//Jdom5aUFCpGNoECd7BbNhjuwdsX/LkXBrHl8eb1Wjw4HvWqcFvhr5KuNgAk8i/myf/MQ1YYeroA==",
+      "dev": true,
+      "requires": {
+        "async-foreach": "0.1.3",
+        "chalk": "1.1.3",
+        "cross-spawn": "3.0.1",
+        "gaze": "1.1.2",
+        "get-stdin": "4.0.1",
+        "glob": "7.1.2",
+        "in-publish": "2.0.0",
+        "lodash.assign": "4.2.0",
+        "lodash.clonedeep": "4.5.0",
+        "lodash.mergewith": "4.6.0",
+        "meow": "3.7.0",
+        "mkdirp": "0.5.1",
+        "nan": "2.7.0",
+        "node-gyp": "3.6.2",
+        "npmlog": "4.1.2",
+        "request": "2.79.0",
+        "sass-graph": "2.2.4",
+        "stdout-stream": "1.4.0",
+        "true-case-path": "1.0.2"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
+          "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "4.1.1",
+            "which": "1.3.0"
+          }
+        },
+        "get-stdin": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+          "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+          "dev": true
+        }
+      }
+    },
     "noop-logger": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz",
       "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI="
     },
+    "nopt": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+      "dev": true,
+      "requires": {
+        "abbrev": "1.1.1"
+      }
+    },
     "normalize-package-data": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
@@ -3883,6 +5539,12 @@
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
       "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
     },
+    "oauth-sign": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
+      "dev": true
+    },
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -3953,6 +5615,16 @@
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
     },
+    "osenv": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
+      "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
+      "dev": true,
+      "requires": {
+        "os-homedir": "1.0.2",
+        "os-tmpdir": "1.0.2"
+      }
+    },
     "output-file-sync": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz",
@@ -3979,6 +5651,19 @@
         "p-limit": "1.1.0"
       }
     },
+    "parse-entities": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.1.tgz",
+      "integrity": "sha1-gRLYhHExnyerrk1klksSL+ThuJA=",
+      "requires": {
+        "character-entities": "1.2.1",
+        "character-entities-legacy": "1.1.1",
+        "character-reference-invalid": "1.1.1",
+        "is-alphanumerical": "1.0.1",
+        "is-decimal": "1.0.1",
+        "is-hexadecimal": "1.0.1"
+      }
+    },
     "parse-glob": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
@@ -3999,11 +5684,6 @@
         "error-ex": "1.3.1"
       }
     },
-    "pascalcase": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
-    },
     "path-exists": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
@@ -4169,6 +5849,64 @@
       "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=",
       "dev": true
     },
+    "postcss-modules-extract-imports": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz",
+      "integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=",
+      "dev": true,
+      "requires": {
+        "postcss": "6.0.14"
+      }
+    },
+    "postcss-modules-local-by-default": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz",
+      "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=",
+      "dev": true,
+      "requires": {
+        "css-selector-tokenizer": "0.7.0",
+        "postcss": "6.0.14"
+      }
+    },
+    "postcss-modules-resolve-imports": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-resolve-imports/-/postcss-modules-resolve-imports-1.3.0.tgz",
+      "integrity": "sha1-OY0wALla6WlCDN9M2D+oBn8cXq4=",
+      "dev": true,
+      "requires": {
+        "css-selector-tokenizer": "0.7.0",
+        "icss-utils": "3.0.1",
+        "minimist": "1.2.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
+    "postcss-modules-scope": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz",
+      "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=",
+      "dev": true,
+      "requires": {
+        "css-selector-tokenizer": "0.7.0",
+        "postcss": "6.0.14"
+      }
+    },
+    "postcss-modules-values": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz",
+      "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=",
+      "dev": true,
+      "requires": {
+        "icss-replace-symbols": "1.1.0",
+        "postcss": "6.0.14"
+      }
+    },
     "postcss-reporter": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-5.0.0.tgz",
@@ -4348,15 +6086,21 @@
         "once": "1.4.0"
       }
     },
+    "punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+      "dev": true
+    },
     "push.js": {
       "version": "0.0.11",
       "resolved": "https://registry.npmjs.org/push.js/-/push.js-0.0.11.tgz",
       "integrity": "sha1-T606n5CEQhLiqmfQc6I9Rw4yqJE="
     },
     "qrcode-generator": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/qrcode-generator/-/qrcode-generator-1.2.0.tgz",
-      "integrity": "sha1-8YZUY/F4ZUfrsJDnxDC/PK9DoBc="
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/qrcode-generator/-/qrcode-generator-1.3.1.tgz",
+      "integrity": "sha1-7ty+lnzrpVhfD0uNnXkWlhozU2k="
     },
     "qs": {
       "version": "6.5.1",
@@ -4440,11 +6184,10 @@
       }
     },
     "react": {
-      "version": "15.6.1",
-      "resolved": "https://registry.npmjs.org/react/-/react-15.6.1.tgz",
-      "integrity": "sha1-uqhDTsZ4C96ZfNw4C3nNM7ljk98=",
+      "version": "16.1.1",
+      "resolved": "https://registry.npmjs.org/react/-/react-16.1.1.tgz",
+      "integrity": "sha512-FQfiFfk2z2Fk87OngNJHT05KyC9DOVn8LPeB7ZX+9u5+yU1JK6o5ozRlU3PeOMr0IFkWNvgn9jU8/IhRxR1F0g==",
       "requires": {
-        "create-react-class": "15.6.2",
         "fbjs": "0.8.16",
         "loose-envify": "1.3.1",
         "object-assign": "4.1.1",
@@ -4452,58 +6195,44 @@
       }
     },
     "react-ace": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-4.1.0.tgz",
-      "integrity": "sha1-ZZ+qAQ0XP2DWqJQPCzJcXkIsq1Q=",
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-5.7.0.tgz",
+      "integrity": "sha1-8soAkLTt7kOdw3yenmZp3uCBFyQ=",
       "requires": {
-        "brace": "0.8.0",
-        "lodash.isequal": "4.5.0"
+        "brace": "0.10.0",
+        "lodash.get": "4.4.2",
+        "lodash.isequal": "4.5.0",
+        "prop-types": "15.6.0"
       },
       "dependencies": {
         "brace": {
-          "version": "0.8.0",
-          "resolved": "https://registry.npmjs.org/brace/-/brace-0.8.0.tgz",
-          "integrity": "sha1-6CbG1QVMrl9getexyBI23SzwGXg=",
+          "version": "0.10.0",
+          "resolved": "https://registry.npmjs.org/brace/-/brace-0.10.0.tgz",
+          "integrity": "sha1-7e9OubCSi6HuX3F//BV3SabdXXY=",
           "requires": {
             "w3c-blob": "0.0.1"
           }
         }
       }
     },
-    "react-addons-transition-group": {
-      "version": "15.6.2",
-      "resolved": "https://registry.npmjs.org/react-addons-transition-group/-/react-addons-transition-group-15.6.2.tgz",
-      "integrity": "sha1-i668Kukczb8kX+Kcn9PTb4tHGSM=",
-      "requires": {
-        "react-transition-group": "1.2.1"
-      }
-    },
-    "react-container-dimensions": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/react-container-dimensions/-/react-container-dimensions-1.2.0.tgz",
-      "integrity": "sha1-v7XnDhCqgtLsukkUfRS7TCLK/ao=",
-      "requires": {
-        "element-resize-detector": "1.1.12",
-        "invariant": "2.2.2"
-      }
-    },
     "react-copy-to-clipboard": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-4.2.3.tgz",
-      "integrity": "sha1-JoxaD73pqV2WFFAU5/hRELDn+44=",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.1.tgz",
+      "integrity": "sha512-ELKq31/E3zjFs5rDWNCfFL4NvNFQvGRoJdAKReD/rUPA+xxiLPQmZBZBvy2vgH7V0GE9isIQpT9WXbwIVErYdA==",
       "requires": {
-        "copy-to-clipboard": "3.0.8"
+        "copy-to-clipboard": "3.0.8",
+        "prop-types": "15.6.0"
       }
     },
     "react-datetime": {
-      "version": "2.8.10",
-      "resolved": "https://registry.npmjs.org/react-datetime/-/react-datetime-2.8.10.tgz",
-      "integrity": "sha1-BtQxe3c0MQ4OgQlVVSZlYSg0YTI=",
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/react-datetime/-/react-datetime-2.11.0.tgz",
+      "integrity": "sha512-LfToQVZrFjH9b+R4PWemo/jJcWawHWHL+eF1HFWGZ9zGXXgy7d/X1+PzJUBYiZfteFM+VSdaHvYyqReqP/nGaQ==",
       "requires": {
         "create-react-class": "15.6.2",
         "object-assign": "3.0.0",
         "prop-types": "15.6.0",
-        "react-onclickoutside": "5.11.1"
+        "react-onclickoutside": "6.7.0"
       },
       "dependencies": {
         "object-assign": {
@@ -4514,9 +6243,9 @@
       }
     },
     "react-dom": {
-      "version": "15.6.1",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.1.tgz",
-      "integrity": "sha1-LLDtQZEDjlPCCes6eaI+Kkz5lHA=",
+      "version": "16.1.1",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.1.1.tgz",
+      "integrity": "sha512-q06jiwST8SEPAMIEkAsu7BgynEZtqF87VrTc70XsW7nxVhWEu2Y4MF5UfxxHQO/mNtQHQWP0YcFxmwm9oMrMaQ==",
       "requires": {
         "fbjs": "0.8.16",
         "loose-envify": "1.3.1",
@@ -4525,37 +6254,27 @@
       }
     },
     "react-dropzone": {
-      "version": "3.7.3",
-      "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-3.7.3.tgz",
-      "integrity": "sha1-eFK2ZSpDr8f6ByAh8zaRI+pKYeA=",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-4.2.3.tgz",
+      "integrity": "sha512-QAXuGDqBUPC0p560pskC3yyS8I1jJUnzvZC0PHrd5NayYBQRD4poQfM1D/bxg4jhUaFU4avNhOB3ehMQd4JMvA==",
       "requires": {
-        "attr-accept": "1.1.0"
+        "attr-accept": "1.1.0",
+        "prop-types": "15.6.0"
       }
     },
     "react-element-to-jsx-string": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/react-element-to-jsx-string/-/react-element-to-jsx-string-6.0.0.tgz",
-      "integrity": "sha1-8sFRR27o3YF4ke01K+Ss6fs2McI=",
+      "version": "13.1.0",
+      "resolved": "https://registry.npmjs.org/react-element-to-jsx-string/-/react-element-to-jsx-string-13.1.0.tgz",
+      "integrity": "sha512-IlWivaMn9zkBa5+TZGW4+5+qeQePveQZBFF5UQQdEGm6Ca+c0uwuZgIcFqP27hYekI4kuQiwG/Hav8iGJKmzsg==",
       "requires": {
-        "collapse-white-space": "1.0.3",
         "is-plain-object": "2.0.4",
-        "lodash": "4.17.4",
-        "sortobject": "1.1.1",
-        "stringify-object": "3.2.1",
-        "traverse": "0.6.6"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.4",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-          "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
-        }
+        "stringify-object": "3.2.1"
       }
     },
     "react-event-listener": {
-      "version": "0.4.5",
-      "resolved": "https://registry.npmjs.org/react-event-listener/-/react-event-listener-0.4.5.tgz",
-      "integrity": "sha1-4+iVoJcM8U7o+JAROvaBl6vz0LE=",
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/react-event-listener/-/react-event-listener-0.5.1.tgz",
+      "integrity": "sha1-ujYHbke8N8Wmf/XM1Kn/DxViEEA=",
       "requires": {
         "babel-runtime": "6.26.0",
         "fbjs": "0.8.16",
@@ -4564,116 +6283,120 @@
       }
     },
     "react-intl": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-2.1.5.tgz",
-      "integrity": "sha1-+Xleo0t5DctdDY73Bg3dvoW/h2M=",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-2.4.0.tgz",
+      "integrity": "sha1-ZsFNyd+ac7L7v71gIXJugKYT6xU=",
       "requires": {
         "intl-format-cache": "2.1.0",
-        "intl-messageformat": "1.3.0",
-        "intl-relativeformat": "1.3.0",
+        "intl-messageformat": "2.2.0",
+        "intl-relativeformat": "2.1.0",
         "invariant": "2.2.2"
       }
     },
     "react-markdown": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-2.5.1.tgz",
-      "integrity": "sha512-N5xMde42RrclLIdF16bckTApFM56vkn4q3GoZlLkuE8IK23GOIqJsuE62RTrkgq//pAt4dovVgZcgawh7YtN4w==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-3.0.2.tgz",
+      "integrity": "sha512-3b/fg6vviyTnAqlWPNcNm5FlPFVeXOroaUnhmo+bAxeAD8Njx65Ztr48ihmZSxr+2DEGRtew2TesfkKED81kkQ==",
       "requires": {
-        "commonmark": "0.24.0",
-        "commonmark-react-renderer": "4.3.4",
-        "prop-types": "15.6.0"
+        "prop-types": "15.6.0",
+        "remark-parse": "4.0.0",
+        "unified": "6.1.6",
+        "unist-util-visit": "1.2.0",
+        "xtend": "4.0.1"
       }
     },
     "react-onclickoutside": {
-      "version": "5.11.1",
-      "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-5.11.1.tgz",
-      "integrity": "sha1-ADFOUlZ89V+rqUyrus0RlhkHBiM=",
-      "requires": {
-        "create-react-class": "15.6.2"
-      }
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.7.0.tgz",
+      "integrity": "sha512-IBivBP7xayM7SbbVlAnKgHgoWdfCVqnNBNgQRY5x9iFQm55tFdolR02hX1fCJJtTEKnbaL1stB72/TZc6+p2+Q=="
     },
     "react-portal": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/react-portal/-/react-portal-3.0.0.tgz",
-      "integrity": "sha1-kwT86DbooyFrIliPjckbRHco8K4="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/react-portal/-/react-portal-4.0.0.tgz",
+      "integrity": "sha512-EplgMeLOJrR/DVuuxR9YI8NM1FGTP0I0o5sq/FSjDIDUSvcmMU7IPPp+p5EWU7Vmm520oByl4nDixvlUh5TyAA==",
+      "requires": {
+        "prop-types": "15.6.0"
+      }
     },
     "react-qr-reader": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/react-qr-reader/-/react-qr-reader-1.1.3.tgz",
-      "integrity": "sha512-ruBF8KaSwUW9nbzjO4rA7/HOCGYZuNUz9od7uBRy8SRBi24nwxWWmwa2z8R6vPGDRglA0y2Qk1aVBuC1olTnHw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/react-qr-reader/-/react-qr-reader-2.0.1.tgz",
+      "integrity": "sha512-J/VuCq/udEqry7Z4nXGTbguetfSdRJr1Cv0lYKbVKIW1blfhB0Xe6OjO+5Th5B8884+s40BDFwtqP67h7YTtYA==",
       "requires": {
-        "jsqr": "git+https://github.com/JodusNodus/jsQR.git#5ba1acefa1cbb9b2bc92b49f503f2674e2ec212b",
+        "jsqr": "git+https://github.com/cozmo/jsQR.git#397a6eb8f90752cf640cb4bb67ba6f86e3bb5d1f",
         "prop-types": "15.6.0",
-        "webrtc-adapter": "2.1.0"
+        "webrtc-adapter": "5.0.6"
       }
     },
     "react-redux": {
-      "version": "4.4.6",
-      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-4.4.6.tgz",
-      "integrity": "sha1-S50ymFMHoRCWot1hVhmABE/MYgk=",
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.0.6.tgz",
+      "integrity": "sha512-8taaaGu+J7PMJQDJrk/xiWEYQmdo3mkXw6wPr3K3LxvXis3Fymiq7c13S+Tpls/AyNUAsoONkU81AP0RA6y6Vw==",
       "requires": {
-        "hoist-non-react-statics": "1.2.0",
+        "hoist-non-react-statics": "2.3.1",
         "invariant": "2.2.2",
-        "lodash": "4.17.2",
-        "loose-envify": "1.3.1"
+        "lodash": "4.17.4",
+        "lodash-es": "4.17.4",
+        "loose-envify": "1.3.1",
+        "prop-types": "15.6.0"
+      },
+      "dependencies": {
+        "hoist-non-react-statics": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz",
+          "integrity": "sha1-ND24TGAYxlB3iJgkATWhQg7iLOA="
+        }
+      }
+    },
+    "react-resize-detector": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/react-resize-detector/-/react-resize-detector-1.1.0.tgz",
+      "integrity": "sha512-68KVcQlhcWQGXMAie82YueCa4f4yqwEoiQbVyYlSgJEin1zMtNBLLeU/+6FLNf1TTgjwSfpbMTJTw/uU0HNgtQ==",
+      "requires": {
+        "prop-types": "15.6.0"
       }
     },
     "react-router": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-3.0.0.tgz",
-      "integrity": "sha1-PzE+Tbr1cEjEjdCow8rCTZNmff8=",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-3.2.0.tgz",
+      "integrity": "sha512-sXlLOg0TRCqnjCVskqBHGjzNjcJKUqXEKnDSuxMYJSPJNq9hROE9VsiIW2kfIq7Ev+20Iz0nxayekXyv0XNmsg==",
       "requires": {
+        "create-react-class": "15.6.2",
         "history": "3.3.0",
         "hoist-non-react-statics": "1.2.0",
         "invariant": "2.2.2",
         "loose-envify": "1.3.1",
+        "prop-types": "15.6.0",
         "warning": "3.0.0"
       }
     },
-    "react-router-redux": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/react-router-redux/-/react-router-redux-4.0.7.tgz",
-      "integrity": "sha1-mx/eTnAQbFD0chThK92IjPuW4qY="
-    },
     "react-smooth": {
-      "version": "0.1.11",
-      "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-0.1.11.tgz",
-      "integrity": "sha1-84n45Yy7VGq7SSHKDL57B5vFGg0=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-1.0.0.tgz",
+      "integrity": "sha1-sp2+vd3bBtIbWwiWIWf7nqwYl9g=",
       "requires": {
-        "lodash": "4.13.1",
+        "lodash": "4.17.4",
+        "prop-types": "15.6.0",
         "raf": "3.4.0",
-        "react-addons-transition-group": "15.6.2"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.13.1",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz",
-          "integrity": "sha1-g+SxCRP0hJbU0W/sSlYK8u50S2g="
-        }
-      }
-    },
-    "react-tap-event-plugin": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/react-tap-event-plugin/-/react-tap-event-plugin-2.0.1.tgz",
-      "integrity": "sha1-MWvrO8ZVbinshppyk+icgmqQdNI=",
-      "requires": {
-        "fbjs": "0.8.16"
+        "react-transition-group": "2.2.1"
       }
     },
     "react-tooltip": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-3.2.2.tgz",
-      "integrity": "sha1-OlmcDqu9nrlZeqLXKyF/17o1h2c=",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-3.4.0.tgz",
+      "integrity": "sha1-A38495fD5rG1jSU0zMjCx2r09S0=",
       "requires": {
-        "classnames": "2.2.5"
+        "classnames": "2.2.5",
+        "prop-types": "15.6.0"
       }
     },
     "react-transition-group": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-1.2.1.tgz",
-      "integrity": "sha512-CWaL3laCmgAFdxdKbhhps+c0HRGF4c+hdM4H23+FI1QBNUyx/AMeIJGWorehPNSaKnQNOAxL7PQmqMu78CDj3Q==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.2.1.tgz",
+      "integrity": "sha512-q54UBM22bs/CekG8r3+vi9TugSqh0t7qcEVycaRc9M0p0aCEu+h6rp/RFiW7fHfgd1IKpd9oILFTl5QK+FpiPA==",
       "requires": {
         "chain-function": "1.0.0",
+        "classnames": "2.2.5",
         "dom-helpers": "3.2.1",
         "loose-envify": "1.3.1",
         "prop-types": "15.6.0",
@@ -4727,37 +6450,27 @@
       }
     },
     "recharts": {
-      "version": "0.15.2",
-      "resolved": "https://registry.npmjs.org/recharts/-/recharts-0.15.2.tgz",
-      "integrity": "sha1-Y28ho0HwCzHJJXOe1K73CttV2A8=",
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/recharts/-/recharts-1.0.0-beta.2.tgz",
+      "integrity": "sha1-8nqw3fd1DzjnfslJXffNWm7cykA=",
       "requires": {
         "classnames": "2.2.5",
-        "core-js": "2.4.0",
-        "d3-scale": "1.0.0",
-        "d3-shape": "1.0.0",
-        "lodash": "4.13.1",
-        "react-container-dimensions": "1.2.0",
-        "react-smooth": "0.1.11",
-        "recharts-scale": "0.2.1",
+        "core-js": "2.5.1",
+        "d3-interpolate": "1.1.6",
+        "d3-scale": "1.0.6",
+        "d3-shape": "1.2.0",
+        "lodash": "4.17.4",
+        "prop-types": "15.6.0",
+        "react-resize-detector": "1.1.0",
+        "react-smooth": "1.0.0",
+        "recharts-scale": "0.3.2",
         "reduce-css-calc": "1.3.0"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.0.tgz",
-          "integrity": "sha1-30CKtG0Br/kcAcPnlxk11CLFT4E="
-        },
-        "lodash": {
-          "version": "4.13.1",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz",
-          "integrity": "sha1-g+SxCRP0hJbU0W/sSlYK8u50S2g="
-        }
       }
     },
     "recharts-scale": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/recharts-scale/-/recharts-scale-0.2.1.tgz",
-      "integrity": "sha1-N49UPtF8MkXk2a+xCq9imCQNL8s="
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/recharts-scale/-/recharts-scale-0.3.2.tgz",
+      "integrity": "sha1-2sdiFxSkdl0VLLKtvDDHO4MSCMk="
     },
     "redent": {
       "version": "1.0.0",
@@ -4806,11 +6519,11 @@
       "integrity": "sha1-+htHGLxSkqcd3R5dg5yb6pdw8Us="
     },
     "redux": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-3.6.0.tgz",
-      "integrity": "sha1-iHwrPQub2G7KK+cFccJ2VMGeGI0=",
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz",
+      "integrity": "sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==",
       "requires": {
-        "lodash": "4.17.2",
+        "lodash": "4.17.4",
         "lodash-es": "4.17.4",
         "loose-envify": "1.3.1",
         "symbol-observable": "1.0.4"
@@ -4822,7 +6535,7 @@
       "integrity": "sha1-347HkdniZ1ROWKi6K3L8XDCvujs=",
       "requires": {
         "invariant": "2.2.2",
-        "lodash": "4.17.2",
+        "lodash": "4.17.4",
         "reduce-reducers": "0.1.2"
       }
     },
@@ -4883,6 +6596,28 @@
         "jsesc": "0.5.0"
       }
     },
+    "remark-parse": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-4.0.0.tgz",
+      "integrity": "sha512-XZgICP2gJ1MHU7+vQaRM+VA9HEL3X253uwUM/BGgx3iv6TH2B3bF3B8q00DKcyP9YrJV+/7WOWEWBFF/u8cIsw==",
+      "requires": {
+        "collapse-white-space": "1.0.3",
+        "is-alphabetical": "1.0.1",
+        "is-decimal": "1.0.1",
+        "is-whitespace-character": "1.0.1",
+        "is-word-character": "1.0.1",
+        "markdown-escapes": "1.0.1",
+        "parse-entities": "1.1.1",
+        "repeat-string": "1.6.1",
+        "state-toggle": "1.0.0",
+        "trim": "0.0.1",
+        "trim-trailing-lines": "1.1.0",
+        "unherit": "1.1.0",
+        "unist-util-remove-position": "1.1.1",
+        "vfile-location": "2.0.2",
+        "xtend": "4.0.1"
+      }
+    },
     "remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
@@ -4898,8 +6633,7 @@
     "repeat-string": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
     },
     "repeating": {
       "version": "2.0.1",
@@ -4909,6 +6643,59 @@
         "is-finite": "1.0.2"
       }
     },
+    "replace-ext": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
+      "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs="
+    },
+    "request": {
+      "version": "2.79.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz",
+      "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=",
+      "dev": true,
+      "requires": {
+        "aws-sign2": "0.6.0",
+        "aws4": "1.6.0",
+        "caseless": "0.11.0",
+        "combined-stream": "1.0.5",
+        "extend": "3.0.1",
+        "forever-agent": "0.6.1",
+        "form-data": "2.1.4",
+        "har-validator": "2.0.6",
+        "hawk": "3.1.3",
+        "http-signature": "1.1.1",
+        "is-typedarray": "1.0.0",
+        "isstream": "0.1.2",
+        "json-stringify-safe": "5.0.1",
+        "mime-types": "2.1.17",
+        "oauth-sign": "0.8.2",
+        "qs": "6.3.2",
+        "stringstream": "0.0.5",
+        "tough-cookie": "2.3.3",
+        "tunnel-agent": "0.4.3",
+        "uuid": "3.1.0"
+      },
+      "dependencies": {
+        "extend": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+          "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+          "dev": true
+        },
+        "qs": {
+          "version": "6.3.2",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
+          "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=",
+          "dev": true
+        },
+        "tunnel-agent": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
+          "dev": true
+        }
+      }
+    },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -4982,6 +6769,14 @@
       "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.0.0.tgz",
       "integrity": "sha1-nbOE/0uJqPYVY9kjldhiWxjzr7A="
     },
+    "rtcpeerconnection-shim": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/rtcpeerconnection-shim/-/rtcpeerconnection-shim-1.2.1.tgz",
+      "integrity": "sha512-1IsK2xj8yrxYfce1YpaI53KwMlwHfnAMx34DjPja9nUbmOlJe43L5ZlAuE5wh+SynyuuSZxoxhFoIlXPgXPEKA==",
+      "requires": {
+        "sdp": "2.5.0"
+      }
+    },
     "run-async": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
@@ -5011,15 +6806,80 @@
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
       "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
     },
+    "sass-graph": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
+      "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2",
+        "lodash": "4.17.4",
+        "scss-tokenizer": "0.2.3",
+        "yargs": "7.1.0"
+      },
+      "dependencies": {
+        "yargs": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
+          "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
+          "dev": true,
+          "requires": {
+            "camelcase": "3.0.0",
+            "cliui": "3.2.0",
+            "decamelize": "1.2.0",
+            "get-caller-file": "1.0.2",
+            "os-locale": "1.4.0",
+            "read-pkg-up": "1.0.1",
+            "require-directory": "2.1.1",
+            "require-main-filename": "1.0.1",
+            "set-blocking": "2.0.0",
+            "string-width": "1.0.2",
+            "which-module": "1.0.0",
+            "y18n": "3.2.1",
+            "yargs-parser": "5.0.0"
+          }
+        },
+        "yargs-parser": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
+          "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+          "dev": true,
+          "requires": {
+            "camelcase": "3.0.0"
+          }
+        }
+      }
+    },
     "scryptsy": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/scryptsy/-/scryptsy-2.0.0.tgz",
       "integrity": "sha1-Jiw28CMc+nZU4jY/o5TNLexm83g="
     },
+    "scss-tokenizer": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
+      "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
+      "dev": true,
+      "requires": {
+        "js-base64": "2.3.2",
+        "source-map": "0.4.4"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+          "dev": true,
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        }
+      }
+    },
     "sdp": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/sdp/-/sdp-1.5.4.tgz",
-      "integrity": "sha1-jgOPbdsUvXZa4fS1IW4SCUUR4NA="
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/sdp/-/sdp-2.5.0.tgz",
+      "integrity": "sha512-4HT7gdxA+AZHl5LDdiLpagFKBS5qAKFYE71CPSNrr+2dCFg9iKXY4JSIhHKZHVnwJAzZ/4jA+z1nam4U+LoYug=="
     },
     "secp256k1": {
       "version": "3.3.1",
@@ -5037,34 +6897,29 @@
         "safe-buffer": "5.1.1"
       }
     },
+    "seekout": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/seekout/-/seekout-1.0.2.tgz",
+      "integrity": "sha1-CbqfG9W0b7sTRxjrGaaDgsuxuck=",
+      "dev": true
+    },
     "semantic-ui-css": {
-      "version": "2.2.11",
-      "resolved": "https://registry.npmjs.org/semantic-ui-css/-/semantic-ui-css-2.2.11.tgz",
-      "integrity": "sha512-J8B0nyQ7UiCGRdhiZzQclgbqhIKEXQNjw+fqXUjZxwxy+uk/3K4X21tUb2aD9Cgi1nauQ4xLUhnNAdk2teua/A==",
+      "version": "2.2.12",
+      "resolved": "https://registry.npmjs.org/semantic-ui-css/-/semantic-ui-css-2.2.12.tgz",
+      "integrity": "sha512-RrA3k6hya+kEMDmVLT38SBTDQD8FgdnFi16eMPuQ1N1xUOoBxKzr+HZASb7Zo3xlMvkYqEWvPIp58Wjl6Zcsfg==",
       "requires": {
         "jquery": "3.2.1"
       }
     },
     "semantic-ui-react": {
-      "version": "0.71.2",
-      "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-0.71.2.tgz",
-      "integrity": "sha512-aWkmGnhhdPGwRbtWVuhQV3QQvaoO8ZOrc5g0deW9Q/6J90Le1V5MC1LZTnwrrtUfV7rnEozwaunjZGftYsmG+w==",
+      "version": "0.76.0",
+      "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-0.76.0.tgz",
+      "integrity": "sha512-CdiIT8n7ZwUlytZkYsQMnaVGmoIZI/mVs4lijvLcR568kcnlRkYYaFKhMLq5tFDQU6+QhdTD+8WebF7ov0Ql6Q==",
       "requires": {
         "babel-runtime": "6.26.0",
         "classnames": "2.2.5",
-        "debug": "2.6.9",
-        "lodash": "4.17.2",
-        "prop-types": "15.5.8"
-      },
-      "dependencies": {
-        "prop-types": {
-          "version": "15.5.8",
-          "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.5.8.tgz",
-          "integrity": "sha1-a3suFBCDvjjIWVqlH8VXdccZk5Q=",
-          "requires": {
-            "fbjs": "0.8.16"
-          }
-        }
+        "lodash": "4.17.4",
+        "prop-types": "15.6.0"
       }
     },
     "semver": {
@@ -5150,6 +7005,15 @@
         }
       }
     },
+    "sntp": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+      "dev": true,
+      "requires": {
+        "hoek": "2.16.3"
+      }
+    },
     "solc": {
       "version": "github:ngotchac/solc-js#04eb38cc3003fba8cb3656653a7941ed36408818",
       "requires": {
@@ -5181,14 +7045,6 @@
         }
       }
     },
-    "sortobject": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/sortobject/-/sortobject-1.1.1.tgz",
-      "integrity": "sha1-T2ldTUTtCkwGSCw0wlgqLc3CqzQ=",
-      "requires": {
-        "editions": "1.3.3"
-      }
-    },
     "source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -5232,6 +7088,44 @@
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
+    "sshpk": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
+      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+      "dev": true,
+      "requires": {
+        "asn1": "0.2.3",
+        "assert-plus": "1.0.0",
+        "bcrypt-pbkdf": "1.0.1",
+        "dashdash": "1.14.1",
+        "ecc-jsbn": "0.1.1",
+        "getpass": "0.1.7",
+        "jsbn": "0.1.1",
+        "tweetnacl": "0.14.5"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
+    "state-toggle": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.0.tgz",
+      "integrity": "sha1-0g+aYWu08MO5i5GSLSW2QKorxCU="
+    },
+    "stdout-stream": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.0.tgz",
+      "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.3.3"
+      }
+    },
     "store": {
       "version": "2.0.12",
       "resolved": "https://registry.npmjs.org/store/-/store-2.0.12.tgz",
@@ -5252,11 +7146,6 @@
         "strip-ansi": "3.0.1"
       }
     },
-    "string.prototype.repeat": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz",
-      "integrity": "sha1-q6Nt4I3O5qWjN9SbLqHaGyj8Ds8="
-    },
     "string_decoder": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
@@ -5275,6 +7164,12 @@
         "is-regexp": "1.0.0"
       }
     },
+    "stringstream": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
+      "dev": true
+    },
     "strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@@ -5614,6 +7509,17 @@
         }
       }
     },
+    "tar": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+      "dev": true,
+      "requires": {
+        "block-stream": "0.0.9",
+        "fstream": "1.0.11",
+        "inherits": "2.0.3"
+      }
+    },
     "tar-fs": {
       "version": "1.16.0",
       "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.0.tgz",
@@ -5667,10 +7573,19 @@
       "resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz",
       "integrity": "sha1-bkWxJj8gF/oKzH2J14sVuL932jI="
     },
-    "traverse": {
-      "version": "0.6.6",
-      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz",
-      "integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc="
+    "tough-cookie": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+      "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+      "dev": true,
+      "requires": {
+        "punycode": "1.4.1"
+      }
+    },
+    "trim": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
+      "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0="
     },
     "trim-newlines": {
       "version": "1.0.0",
@@ -5682,6 +7597,40 @@
       "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
       "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM="
     },
+    "trim-trailing-lines": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.0.tgz",
+      "integrity": "sha1-eu+7eAjfnWafbaLkOMrIxGradoQ="
+    },
+    "trough": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.1.tgz",
+      "integrity": "sha1-qf2LA5Swro//guBjOgo2zK1bX4Y="
+    },
+    "true-case-path": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.2.tgz",
+      "integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=",
+      "dev": true,
+      "requires": {
+        "glob": "6.0.4"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "6.0.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
+          "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
+          "dev": true,
+          "requires": {
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        }
+      }
+    },
     "tryit": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz",
@@ -5696,6 +7645,13 @@
         "safe-buffer": "5.1.1"
       }
     },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true,
+      "optional": true
+    },
     "type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -5726,12 +7682,68 @@
       "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz",
       "integrity": "sha512-uRdSdu1oA1rncCQL7sCj8vSyZkgtL7faaw9Tc9rZ3mGgraQ7+Pdx7w5mnOSF3gw9ZNG6oc+KXfkon3bKuROm0g=="
     },
+    "unherit": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.0.tgz",
+      "integrity": "sha1-a5qu379z3xdWrZ4xbdmBiFhAzX0=",
+      "requires": {
+        "inherits": "2.0.3",
+        "xtend": "4.0.1"
+      }
+    },
+    "unified": {
+      "version": "6.1.6",
+      "resolved": "https://registry.npmjs.org/unified/-/unified-6.1.6.tgz",
+      "integrity": "sha512-pW2f82bCIo2ifuIGYcV12fL96kMMYgw7JKVEgh7ODlrM9rj6vXSY3BV+H6lCcv1ksxynFf582hwWLnA1qRFy4w==",
+      "requires": {
+        "bail": "1.0.2",
+        "extend": "3.0.1",
+        "is-plain-obj": "1.1.0",
+        "trough": "1.0.1",
+        "vfile": "2.3.0",
+        "x-is-function": "1.0.4",
+        "x-is-string": "0.1.0"
+      },
+      "dependencies": {
+        "extend": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+          "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
+        }
+      }
+    },
     "uniq": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
       "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
       "dev": true
     },
+    "unist-util-is": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.1.tgz",
+      "integrity": "sha1-DDEmKeP5YMZukx6BLT2A53AQlHs="
+    },
+    "unist-util-remove-position": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.1.tgz",
+      "integrity": "sha1-WoXBVV/BugwQG4ZwfRXlD6TIcbs=",
+      "requires": {
+        "unist-util-visit": "1.2.0"
+      }
+    },
+    "unist-util-stringify-position": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.1.tgz",
+      "integrity": "sha1-PMvcU2ee7W7PN3fdf14yKcG2qjw="
+    },
+    "unist-util-visit": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.2.0.tgz",
+      "integrity": "sha512-lI+jyPlDztHZ2CJhUchcRMQ7MNc0yASgYFxwRTxs0EZ+9HbYFBLVGDJ2FchTBy+pra0O1LVEn0Wkgf19mDVDzw==",
+      "requires": {
+        "unist-util-is": "2.1.1"
+      }
+    },
     "unzip-response": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
@@ -5764,6 +7776,12 @@
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
+    "uuid": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
+      "dev": true
+    },
     "v8flags": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
@@ -5782,6 +7800,49 @@
         "spdx-expression-parse": "1.0.4"
       }
     },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "1.3.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
+    "vfile": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-2.3.0.tgz",
+      "integrity": "sha512-ASt4mBUHcTpMKD/l5Q+WJXNtshlWxOogYyGYYrg4lt/vuRjC1EFQtlAofL5VmtVNIZJzWYFJjzGWZ0Gw8pzW1w==",
+      "requires": {
+        "is-buffer": "1.1.6",
+        "replace-ext": "1.0.0",
+        "unist-util-stringify-position": "1.1.1",
+        "vfile-message": "1.0.0"
+      }
+    },
+    "vfile-location": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.2.tgz",
+      "integrity": "sha1-02dcWch3SY5JK0dW/2Xkrxp1IlU="
+    },
+    "vfile-message": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-1.0.0.tgz",
+      "integrity": "sha512-HPREhzTOB/sNDc9/Mxf8w0FmHnThg5CRSJdR9VRFkD2riqYWs+fuXlj5z8mIpv2LrD7uU41+oPWFOL4Mjlf+dw==",
+      "requires": {
+        "unist-util-stringify-position": "1.1.1"
+      }
+    },
     "w3c-blob": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/w3c-blob/-/w3c-blob-0.0.1.tgz",
@@ -5796,11 +7857,12 @@
       }
     },
     "webrtc-adapter": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-2.1.0.tgz",
-      "integrity": "sha1-YStbxs6Oc8nQZgA4oh+SVahnvz4=",
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-5.0.6.tgz",
+      "integrity": "sha512-dh2hPQFOPP0tLEYlFxtGI5vuQmRqkOdYni5wMKUHIx5I2dw0TJ1HdG7P+UechRWt6TvwPWhtbjVNQcQf1KXJmQ==",
       "requires": {
-        "sdp": "1.5.4"
+        "rtcpeerconnection-shim": "1.2.1",
+        "sdp": "2.5.0"
       }
     },
     "whatwg-fetch": {
@@ -5864,10 +7926,15 @@
         "mkdirp": "0.5.1"
       }
     },
-    "xss-filters": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/xss-filters/-/xss-filters-1.2.7.tgz",
-      "integrity": "sha1-Wfod4gHzby80cNysX1jMwoMLCpo="
+    "x-is-function": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/x-is-function/-/x-is-function-1.0.4.tgz",
+      "integrity": "sha1-XSlNw9Joy90GJYDgxd93o5HR+h4="
+    },
+    "x-is-string": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/x-is-string/-/x-is-string-0.1.0.tgz",
+      "integrity": "sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI="
     },
     "xtend": {
       "version": "4.0.1",
@@ -5925,9 +7992,9 @@
       }
     },
     "zxcvbn": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/zxcvbn/-/zxcvbn-4.4.1.tgz",
-      "integrity": "sha1-I4Gq3X8HiiWoayFTJ1YmR7gKqKw="
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/zxcvbn/-/zxcvbn-4.4.2.tgz",
+      "integrity": "sha1-KOwXzwl0PtyrBW3dixsGJizHPDA="
     }
   }
 }
diff --git a/package.json b/package.json
index caf9dc7..4d17827 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@parity/ui",
   "description": "Parity React UI components",
-  "version": "2.2.15",
+  "version": "3.0.0",
   "main": "lib/index.js",
   "module": "src/index.js",
   "jsnext:main": "src/index.js",
@@ -20,7 +20,6 @@
   "keywords": [],
   "scripts": {
     "build": "babel src --out-dir lib --ignore *.spec.js --copy-files",
-    "ci:makeshift": "makeshift",
     "lint": "npm run lint:css && npm run lint:js",
     "lint:css": "stylelint ./src/**/*.css",
     "lint:js": "eslint src",
@@ -29,26 +28,24 @@
   "devDependencies": {
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.0",
-    "babel-eslint": "^7.2.3",
-    "babel-plugin-react-intl": "^2.3.1",
-    "babel-plugin-transform-class-properties": "^6.24.1",
+    "babel-eslint": "^8.0.2",
+    "babel-plugin-css-modules-transform": "^1.3.0",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-plugin-transform-react-remove-prop-types": "^0.4.8",
-    "babel-plugin-webpack-alias": "^2.1.2",
-    "babel-preset-env": "^1.6.0",
+    "babel-plugin-transform-runtime": "^6.23.0",
+    "babel-preset-env": "^1.6.1",
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-0": "^6.24.1",
-    "eslint": "^4.4.0",
+    "eslint": "^4.11.0",
     "eslint-config-semistandard": "^11.0.0",
     "eslint-config-standard": "^10.2.1",
     "eslint-config-standard-react": "^5.0.0",
-    "eslint-plugin-import": "^2.7.0",
-    "eslint-plugin-node": "^5.1.1",
-    "eslint-plugin-promise": "^3.5.0",
-    "eslint-plugin-react": "^7.1.0",
+    "eslint-plugin-import": "^2.8.0",
+    "eslint-plugin-node": "^5.2.1",
+    "eslint-plugin-promise": "^3.6.0",
+    "eslint-plugin-react": "^7.5.1",
     "eslint-plugin-standard": "^3.0.1",
     "makeshift": "^1.1.0",
+    "node-sass": "^4.7.2",
     "stylelint": "^8.2.0",
     "stylelint-config-standard": "^17.0.0"
   },
@@ -56,40 +53,40 @@
     "@parity/api": "2.1.x",
     "@parity/etherscan": "2.1.x",
     "@parity/shared": "2.2.x",
-    "bignumber.js": "3.0.1",
-    "brace": "0.9.0",
+    "babel-runtime": "^6.26.0",
+    "bignumber.js": "4.1.0",
+    "brace": "0.11.0",
     "date-difference": "1.0.0",
     "eventemitter3": "^2.0.3",
     "file-saver": "1.3.3",
     "geopattern": "1.2.3",
-    "js-sha3": "0.5.5",
+    "js-sha3": "0.6.1",
     "keycode": "^2.1.9",
-    "lodash": "4.17.2",
-    "mobx": "2.6.4",
-    "mobx-react": "4.0.3",
-    "moment": "2.17.0",
-    "qrcode-generator": "1.2.0",
-    "react": "15.6.1",
-    "react-ace": "4.1.0",
-    "react-copy-to-clipboard": "4.2.3",
-    "react-datetime": "2.8.10",
-    "react-dom": "15.6.1",
-    "react-dropzone": "3.7.3",
-    "react-element-to-jsx-string": "6.0.0",
-    "react-event-listener": "^0.4.0",
-    "react-intl": "2.1.5",
-    "react-markdown": "^2.5.0",
-    "react-portal": "3.0.0",
-    "react-qr-reader": "1.1.3",
-    "react-router": "3.0.0",
-    "react-router-redux": "4.0.7",
-    "react-tap-event-plugin": "2.0.1",
-    "react-tooltip": "3.2.2",
-    "recharts": "0.15.2",
-    "redux": "3.6.0",
-    "semantic-ui-css": "2.2.11",
-    "semantic-ui-react": "0.71.2",
-    "zxcvbn": "4.4.1"
+    "lodash": "4.17.4",
+    "mobx": "3.3.1",
+    "mobx-react": "4.3.4",
+    "moment": "2.19.2",
+    "qrcode-generator": "1.3.1",
+    "react": "16.1.1",
+    "react-ace": "5.7.0",
+    "react-copy-to-clipboard": "5.0.1",
+    "react-datetime": "2.11.0",
+    "react-dom": "16.1.1",
+    "react-dropzone": "4.2.3",
+    "react-element-to-jsx-string": "13.1.0",
+    "react-event-listener": "^0.5.1",
+    "react-intl": "2.4.0",
+    "react-markdown": "^3.0.1",
+    "react-portal": "4.0.0",
+    "react-qr-reader": "2.0.1",
+    "react-redux": "^5.0.6",
+    "react-router": "^3.2.0",
+    "react-tooltip": "3.4.0",
+    "recharts": "1.0.0-beta.2",
+    "redux": "3.7.2",
+    "semantic-ui-css": "2.2.12",
+    "semantic-ui-react": "0.76.0",
+    "zxcvbn": "4.4.2"
   },
   "peerDependencies": {}
 }
diff --git a/scripts/sass.js b/scripts/sass.js
new file mode 100644
index 0000000..e29f850
--- /dev/null
+++ b/scripts/sass.js
@@ -0,0 +1,13 @@
+// Preprocess SASS to CSS in babel
+// https://github.com/michalkvasnicak/babel-plugin-css-modules-transform#using-a-preprocessor
+var sass = require('node-sass');
+
+module.exports = function processSass (data, filename) {
+  var result;
+
+  result = sass.renderSync({
+    data: data,
+    file: filename
+  }).css;
+  return result.toString('utf8');
+};
diff --git a/scripts/travis.sh b/scripts/travis.sh
index 3f5e830..66cd8f8 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-# ISC, Copyright 2017 Jaco Greeff
 
 set -e
 
@@ -24,18 +23,16 @@ git config user.name "Travis CI"
 git config user.email "$COMMIT_AUTHOR_EMAIL"
 git remote set-url origin https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git > /dev/null 2>&1
 
-if [ -n "$(git status --untracked-files=no --porcelain)" ]; then
-  echo "Adding build artifacts"
+echo "Adding build artifacts"
 
-  git add .
-  git commit -m "[CI Skip] Build artifacts"
-fi
+git checkout $TRAVIS_BRANCH
+git add .
 
 echo "Publishing to npm"
 
-npm run ci:makeshift
+npm run makeshift
 npm --no-git-tag-version version
-npm version patch -m "[CI Skip] Version bump"
+npm version patch -m "[CI Skip] %s"
 npm publish
 
 echo "Final push to GitHub"
diff --git a/src/AccountCard/accountCard.example.js b/src/AccountCard/accountCard.example.js
index c7c7fd3..e719247 100644
--- a/src/AccountCard/accountCard.example.js
+++ b/src/AccountCard/accountCard.example.js
@@ -55,50 +55,50 @@ export default function AccountCardExample () {
     <div>
       <PlaygroundExample name='Standard Account Card'>
         <AccountCard
-          account={ account }
-          balance={ balance }
+          account={account}
+          balance={balance}
         />
       </PlaygroundExample>
 
       <PlaygroundExample name='Small Account Card'>
-        <div style={ { width: 300 } }>
+        <div style={{ width: 300 }}>
           <AccountCard
-            account={ account }
-            balance={ balance }
+            account={account}
+            balance={balance}
           />
         </div>
       </PlaygroundExample>
 
       <PlaygroundExample name='Many Tags Account Card'>
-        <div style={ { width: 300 } }>
+        <div style={{ width: 300 }}>
           <AccountCard
-            account={ accountManyTags }
-            balance={ balance }
+            account={accountManyTags}
+            balance={balance}
           />
         </div>
       </PlaygroundExample>
 
       <PlaygroundExample name='No Tags Account Card'>
-        <div style={ { width: 300 } }>
+        <div style={{ width: 300 }}>
           <AccountCard
-            account={ accountNoTags }
-            balance={ balance }
+            account={accountNoTags}
+            balance={balance}
           />
         </div>
       </PlaygroundExample>
 
       <PlaygroundExample name='Two Account Card'>
-        <div style={ { display: 'flex' } }>
-          <div style={ { margin: '0 0.5em' } }>
+        <div style={{ display: 'flex' }}>
+          <div style={{ margin: '0 0.5em' }}>
             <AccountCard
-              account={ account }
-              balance={ balance }
+              account={account}
+              balance={balance}
             />
           </div>
-          <div style={ { margin: '0 0.5em' } }>
+          <div style={{ margin: '0 0.5em' }}>
             <AccountCard
-              account={ account }
-              balance={ balance }
+              account={account}
+              balance={balance}
             />
           </div>
         </div>
diff --git a/src/AccountCard/accountCard.js b/src/AccountCard/accountCard.js
index c6d425a..adb04b6 100644
--- a/src/AccountCard/accountCard.js
+++ b/src/AccountCard/accountCard.js
@@ -63,21 +63,21 @@ export default class AccountCard extends Component {
 
     return (
       <Container
-        key={ address }
-        className={ classes.join(' ') }
-        onClick={ this.onClick }
-        onFocus={ this.onFocus }
-        onKeyDown={ this.handleKeyDown }
-        { ...props }
+        key={address}
+        className={classes.join(' ')}
+        onClick={this.onClick}
+        onFocus={this.onFocus}
+        onKeyDown={this.handleKeyDown}
+        {...props}
       >
-        <div className={ styles.mainContainer }>
-          <div className={ styles.infoContainer }>
-            <IdentityIcon address={ address } />
-            <div className={ styles.accountInfo }>
-              <div className={ styles.accountName }>
+        <div className={styles.mainContainer}>
+          <div className={styles.infoContainer}>
+            <IdentityIcon address={address} />
+            <div className={styles.accountInfo}>
+              <div className={styles.accountName}>
                 <IdentityName
-                  address={ address }
-                  name={ name }
+                  address={address}
+                  name={name}
                   unknown
                 />
               </div>
@@ -87,9 +87,9 @@ export default class AccountCard extends Component {
           </div>
 
           <Balance
-            address={ address }
-            balance={ balance }
-            className={ styles.balance }
+            address={address}
+            balance={balance}
+            className={styles.balance}
             showOnlyEth
           />
           { children }
@@ -98,12 +98,12 @@ export default class AccountCard extends Component {
         {
           tags && tags.length > 0
             ? (
-              <div className={ styles.tagsContainer }>
-                <div className={ styles.tags }>
+              <div className={styles.tagsContainer}>
+                <div className={styles.tags}>
                   <Tags
-                    floating={ false }
+                    floating={false}
                     horizontal
-                    tags={ tags }
+                    tags={tags}
                   />
                 </div>
               </div>
@@ -121,7 +121,7 @@ export default class AccountCard extends Component {
     }
 
     return (
-      <div className={ styles.description }>
+      <div className={styles.description}>
         <span>{ description }</span>
       </div>
     );
@@ -129,12 +129,12 @@ export default class AccountCard extends Component {
 
   renderAddress (address) {
     return (
-      <div className={ styles.addressContainer }>
+      <div className={styles.addressContainer}>
         <span
-          className={ styles.address }
-          onClick={ this.handleAddressClick }
-          ref={ `address` }
-          title={ address }
+          className={styles.address}
+          onClick={this.handleAddressClick}
+          ref={`address`}
+          title={address}
         >
           { address }
         </span>
diff --git a/src/AccountCard/accountCard.spec.js b/src/AccountCard/accountCard.spec.js
index f2dfd82..044edd5 100644
--- a/src/AccountCard/accountCard.spec.js
+++ b/src/AccountCard/accountCard.spec.js
@@ -70,9 +70,9 @@ function render (props = {}) {
 
   component = shallow(
     <AccountCard
-      { ...props }
-      onClick={ onClick }
-      onFocus={ onFocus }
+      {...props}
+      onClick={onClick}
+      onFocus={onFocus}
     />
   );
 
diff --git a/src/Actionbar/Export/export.js b/src/Actionbar/Export/export.js
index 1e602a8..eb642e0 100644
--- a/src/Actionbar/Export/export.js
+++ b/src/Actionbar/Export/export.js
@@ -38,15 +38,15 @@ export default class ActionbarExport extends Component {
 
     return (
       <Button
-        className={ className }
-        icon={ <FileDownloadIcon /> }
+        className={className}
+        icon={<FileDownloadIcon />}
         label={
           <FormattedMessage
             id='ui.actionbar.export.button.export'
             defaultMessage='export'
           />
         }
-        onClick={ this.handleExport }
+        onClick={this.handleExport}
       />
     );
   }
diff --git a/src/Actionbar/Import/import.js b/src/Actionbar/Import/import.js
index ef7ef46..81f73c6 100644
--- a/src/Actionbar/Import/import.js
+++ b/src/Actionbar/Import/import.js
@@ -62,15 +62,15 @@ export default class ActionbarImport extends Component {
     return (
       <div>
         <Button
-          className={ className }
-          icon={ <FileUploadIcon /> }
+          className={className}
+          icon={<FileUploadIcon />}
           label={
             <FormattedMessage
               id='ui.actionbar.import.button.import'
               defaultMessage='import'
             />
           }
-          onClick={ this.onOpenModal }
+          onClick={this.onOpenModal}
         />
         { this.renderModal() }
       </div>
@@ -108,12 +108,12 @@ export default class ActionbarImport extends Component {
 
     return (
       <Portal
-        activeStep={ step }
-        buttons={ this.renderActions() }
-        onClose={ this.onCloseModal }
+        activeStep={step}
+        buttons={this.renderActions()}
+        onClose={this.onCloseModal}
         open
-        steps={ steps }
-        title={ title }
+        steps={steps}
+        title={title}
       >
         { this.renderBody() }
       </Portal>
@@ -125,7 +125,7 @@ export default class ActionbarImport extends Component {
 
     const cancelBtn = (
       <Button
-        icon={ <CancelIcon /> }
+        icon={<CancelIcon />}
         key='cancel'
         label={
           <FormattedMessage
@@ -133,7 +133,7 @@ export default class ActionbarImport extends Component {
             defaultMessage='Cancel'
           />
         }
-        onClick={ this.onCloseModal }
+        onClick={this.onCloseModal}
       />
     );
 
@@ -144,7 +144,7 @@ export default class ActionbarImport extends Component {
     if (validate) {
       const confirmBtn = (
         <Button
-          icon={ <DoneIcon /> }
+          icon={<DoneIcon />}
           key='confirm'
           label={
             <FormattedMessage
@@ -152,7 +152,7 @@ export default class ActionbarImport extends Component {
               defaultMessage='Confirm'
             />
           }
-          onClick={ this.onConfirm }
+          onClick={this.onConfirm}
         />
       );
 
@@ -172,9 +172,9 @@ export default class ActionbarImport extends Component {
             <FormattedMessage
               id='ui.actionbar.import.error'
               defaultMessage='An error occured: {errorText}'
-              values={ {
+              values={{
                 errorText
-              } }
+              }}
             />
           </p>
         </div>
@@ -186,7 +186,7 @@ export default class ActionbarImport extends Component {
     }
 
     return (
-      <FileSelect onSelect={ this.onFileSelect } />
+      <FileSelect onSelect={this.onFileSelect} />
     );
   }
 
@@ -195,7 +195,7 @@ export default class ActionbarImport extends Component {
 
     return (
       <div>
-        <p className={ styles.desc }>
+        <p className={styles.desc}>
           <FormattedMessage
             id='ui.actionbar.import.confirm'
             defaultMessage='Confirm that this is what was intended to import.'
diff --git a/src/Actionbar/Search/search.js b/src/Actionbar/Search/search.js
index f801414..be702e6 100644
--- a/src/Actionbar/Search/search.js
+++ b/src/Actionbar/Search/search.js
@@ -69,33 +69,33 @@ export default class ActionbarSearch extends Component {
 
     return (
       <div
-        className={ styles.searchcontainer }
+        className={styles.searchcontainer}
         key='searchAccount'
       >
-        <div className={ inputContainerClasses.join(' ') }>
+        <div className={inputContainerClasses.join(' ')}>
           <InputChip
             addOnBlur
             autoFocus
-            className={ styles.input }
+            className={styles.input}
             hint={
               <FormattedMessage
                 id='ui.actionbar.search.hint'
                 defaultMessage='Enter search input...'
               />
             }
-            tokens={ tokens }
+            tokens={tokens}
 
-            onBlur={ this.handleSearchBlur }
-            onInputChange={ this.handleInputChange }
-            onTokensChange={ this.handleTokensChange }
+            onBlur={this.handleSearchBlur}
+            onInputChange={this.handleInputChange}
+            onTokensChange={this.handleTokensChange}
           />
         </div>
 
         <Button
-          className={ styles.searchButton }
-          icon={ <SearchIcon /> }
+          className={styles.searchButton}
+          icon={<SearchIcon />}
           label=''
-          onClick={ this.handleSearchClick }
+          onClick={this.handleSearchClick}
         />
       </div>
     );
diff --git a/src/Actionbar/Sort/sort.js b/src/Actionbar/Sort/sort.js
index b45ec69..ba3d0af 100644
--- a/src/Actionbar/Sort/sort.js
+++ b/src/Actionbar/Sort/sort.js
@@ -50,16 +50,16 @@ export default class ActionbarSort extends Component {
 
     return (
       <Popup
-        isOpen={ this.store.menuOpen }
+        isOpen={this.store.menuOpen}
         trigger={
           <Button
-            icon={ <SortIcon /> }
-            onClick={ this.store.handleMenuOpen }
+            icon={<SortIcon />}
+            onClick={this.store.handleMenuOpen}
           />
         }
       >
         <List
-          items={ [
+          items={[
             showDefault && this.renderMenuItem('', (
               <FormattedMessage
                 id='ui.actionbar.sort.typeDefault'
@@ -84,8 +84,8 @@ export default class ActionbarSort extends Component {
                 defaultMessage='Sort by ETH'
               />
             ))
-          ].concat(this.renderSortByMetas()) }
-          onClick={ this.store.handleSortChange }
+          ].concat(this.renderSortByMetas())}
+          onClick={this.store.handleSortChange}
         />
       </Popup>
     );
@@ -99,9 +99,9 @@ export default class ActionbarSort extends Component {
         <FormattedMessage
           id='ui.actionbar.sort.sortBy'
           defaultMessage='Sort by {label}'
-          values={ {
+          values={{
             label: meta.label
-          } }
+          }}
         />
       );
 
diff --git a/src/Actionbar/actionbar.js b/src/Actionbar/actionbar.js
index 03f67fa..4146082 100644
--- a/src/Actionbar/actionbar.js
+++ b/src/Actionbar/actionbar.js
@@ -27,14 +27,14 @@ export default function Actionbar ({ buttons, children, className, health, title
   }
 
   return (
-    <div className={ `${styles.actionbar} ${className}` }>
-      <h3 className={ styles.title }>
+    <div className={`${styles.actionbar} ${className}`}>
+      <h3 className={styles.title}>
         { title }
       </h3>
-      <div className={ styles.children }>
+      <div className={styles.children}>
         { children }
       </div>
-      <div className={ styles.buttons }>
+      <div className={styles.buttons}>
         { buttons }
       </div>
     </div>
diff --git a/src/Actionbar/actionbar.spec.js b/src/Actionbar/actionbar.spec.js
index 84aeec0..621bf0f 100644
--- a/src/Actionbar/actionbar.spec.js
+++ b/src/Actionbar/actionbar.spec.js
@@ -25,7 +25,7 @@ function renderShallow (props) {
   return shallow(
     <Actionbar
       title='title'
-      { ...props }
+      {...props}
     />
   );
 }
diff --git a/src/Badge/badge.js b/src/Badge/badge.js
index c2e399a..47f3b77 100644
--- a/src/Badge/badge.js
+++ b/src/Badge/badge.js
@@ -22,8 +22,8 @@ import styles from './badge.css';
 export default function Badge ({ className, color = 'default', onClick, value }) {
   return (
     <div
-      className={ `${styles.bubble} ${styles[color]} ${className}` }
-      onClick={ onClick }
+      className={`${styles.bubble} ${styles[color]} ${className}`}
+      onClick={onClick}
     >
       { value }
     </div>
diff --git a/src/Badge/badge.spec.js b/src/Badge/badge.spec.js
index de8dee4..f7cf8a2 100644
--- a/src/Badge/badge.spec.js
+++ b/src/Badge/badge.spec.js
@@ -23,7 +23,7 @@ import Badge from './badge';
 
 function renderShallow (props) {
   return shallow(
-    <Badge { ...props } />
+    <Badge {...props} />
   );
 }
 
diff --git a/src/Balance/balance.js b/src/Balance/balance.js
index d2bf024..4ce4851 100644
--- a/src/Balance/balance.js
+++ b/src/Balance/balance.js
@@ -79,10 +79,10 @@ export class Balance extends Component {
 
         return (
           <TokenValue
-            key={ tokenId }
-            showOnlyEth={ showOnlyEth }
-            token={ token }
-            value={ balanceValue }
+            key={tokenId}
+            showOnlyEth={showOnlyEth}
+            token={token}
+            value={balanceValue}
           />
         );
       })
@@ -90,7 +90,7 @@ export class Balance extends Component {
 
     if (!body.length) {
       body = (
-        <div className={ styles.empty }>
+        <div className={styles.empty}>
           <FormattedMessage
             id='ui.balance.none'
             defaultMessage='No balances associated with this account'
diff --git a/src/Balance/balance.spec.js b/src/Balance/balance.spec.js
index cc6a3e4..3f2b4af 100644
--- a/src/Balance/balance.spec.js
+++ b/src/Balance/balance.spec.js
@@ -62,7 +62,7 @@ function render (props = {}) {
   component = shallow(
     <Balance
       className='testClass'
-      { ...props }
+      {...props}
     />,
     {
       context: { api }
diff --git a/src/Balance/tokenValue.js b/src/Balance/tokenValue.js
index 66c1aaf..25c825d 100644
--- a/src/Balance/tokenValue.js
+++ b/src/Balance/tokenValue.js
@@ -78,17 +78,17 @@ class TokenValue extends Component {
     }
 
     return (
-      <div className={ classNames.join(' ') }>
-        <TokenImage token={ token } />
+      <div className={classNames.join(' ')}>
+        <TokenImage token={token} />
         {
           isFullToken
             ? [
-              <div className={ styles.value } key='value'>
-                <span title={ `${rawValue.toFormat()} ${token.tag}` }>
+              <div className={styles.value} key='value'>
+                <span title={`${rawValue.toFormat()} ${token.tag}`}>
                   { rawValue.toFormat(decimals) }
                 </span>
               </div>,
-              <div className={ styles.tag } key='tag'>
+              <div className={styles.tag} key='tag'>
                 { token.tag }
               </div>
             ]
diff --git a/src/BlockNumber/blockNumber.js b/src/BlockNumber/blockNumber.js
index f2b17dc..6f62bf8 100644
--- a/src/BlockNumber/blockNumber.js
+++ b/src/BlockNumber/blockNumber.js
@@ -32,7 +32,7 @@ function BlockNumber ({ className, message }, { api }) {
 
   if (!store.syncing) {
     return (
-      <div className={ [styles.blockNumber, className].join(' ') }>
+      <div className={[styles.blockNumber, className].join(' ')}>
         { store.blockNumber.toFormat() }{ message }
       </div>
     );
@@ -40,13 +40,13 @@ function BlockNumber ({ className, message }, { api }) {
 
   if (store.syncing.warpChunksAmount && store.syncing.warpChunksProcessed && !store.syncing.warpChunksAmount.eq(store.syncing.warpChunksProcessed)) {
     return (
-      <div className={ styles.syncStatus }>
+      <div className={styles.syncStatus}>
         <FormattedMessage
           id='ui.blockStatus.warpRestore'
           defaultMessage='{percentage}% warp restore'
-          values={ {
+          values={{
             percentage: store.syncing.warpChunksProcessed.mul(100).div(store.syncing.warpChunksAmount).toFormat(2)
-          } }
+          }}
         />
       </div>
     );
@@ -61,10 +61,10 @@ function BlockNumber ({ className, message }, { api }) {
         <FormattedMessage
           id='ui.blockStatus.syncStatus'
           defaultMessage='{currentBlock}/{highestBlock} syncing'
-          values={ {
+          values={{
             currentBlock: store.syncing.currentBlock.toFormat(),
             highestBlock: store.syncing.highestBlock.toFormat()
-          } }
+          }}
         />
       </span>
     );
@@ -78,16 +78,16 @@ function BlockNumber ({ className, message }, { api }) {
         <FormattedMessage
           id='ui.blockStatus.warpStatus'
           defaultMessage=', {percentage}% historic'
-          values={ {
+          values={{
             percentage: first.mul(100).div(last).toFormat(2)
-          } }
+          }}
         />
       </span>
     );
   }
 
   return (
-    <div className={ styles.syncStatus }>
+    <div className={styles.syncStatus}>
       { syncStatus }
       { warpStatus }
     </div>
diff --git a/src/BlockTimestamp/blockTimestamp.js b/src/BlockTimestamp/blockTimestamp.js
index d63467f..fae2d4e 100644
--- a/src/BlockTimestamp/blockTimestamp.js
+++ b/src/BlockTimestamp/blockTimestamp.js
@@ -31,7 +31,7 @@ function BlockTimestamp ({ className }, { api }) {
   }
 
   return (
-    <div className={ [styles.blockTimestamp, className].join(' ') }>
+    <div className={[styles.blockTimestamp, className].join(' ')}>
       { moment(store.blockTimestamp).calendar() }
     </div>
   );
diff --git a/src/Button/button.js b/src/Button/button.js
index 91df1cb..99fc1a7 100644
--- a/src/Button/button.js
+++ b/src/Button/button.js
@@ -28,19 +28,19 @@ export default function Button ({ active, animated, basic, className, color, dis
 
   return (
     <SemanticButton
-      active={ active }
-      animated={ animated }
-      basic={ basic }
-      className={ className }
-      content={ label }
-      color={ color }
-      disabled={ _isDisabled }
-      fluid={ fullWidth }
-      icon={ icon }
-      onClick={ _onClick }
-      primary={ primary }
-      size={ size }
-      toggle={ toggle }
+      active={active}
+      animated={animated}
+      basic={basic}
+      className={className}
+      content={label}
+      color={color}
+      disabled={_isDisabled}
+      fluid={fullWidth}
+      icon={icon}
+      onClick={_onClick}
+      primary={primary}
+      size={size}
+      toggle={toggle}
     />
   );
 }
diff --git a/src/Button/button.spec.js b/src/Button/button.spec.js
index d5cc2a7..deb85a8 100644
--- a/src/Button/button.spec.js
+++ b/src/Button/button.spec.js
@@ -27,7 +27,7 @@ function render (props = {}) {
   }
 
   return shallow(
-    <Button { ...props } />
+    <Button {...props} />
   );
 }
 
diff --git a/src/Certifications/certifications.js b/src/Certifications/certifications.js
index 6b2195c..d51e026 100644
--- a/src/Certifications/certifications.js
+++ b/src/Certifications/certifications.js
@@ -41,7 +41,7 @@ class Certifications extends Component {
     }
 
     return (
-      <div className={ [styles.certifications, className].join(' ') }>
+      <div className={[styles.certifications, className].join(' ')}>
         { certifications.map(this.renderCertification) }
       </div>
     );
@@ -62,11 +62,11 @@ class Certifications extends Component {
 
     return (
       <div
-        className={ classNames.join(' ') }
-        key={ name }
+        className={classNames.join(' ')}
+        key={name}
       >
         <img
-          className={ styles.icon }
+          className={styles.icon}
           src={
             icon
               ? `${dappsUrl}${IconCache.hashToImage(icon)}`
@@ -87,7 +87,7 @@ class Certifications extends Component {
     }
 
     return (
-      <div className={ styles.text }>
+      <div className={styles.text}>
         { title || name }
       </div>
     );
diff --git a/src/ClientVersion/clientVersion.js b/src/ClientVersion/clientVersion.js
index c40d313..34b7311 100644
--- a/src/ClientVersion/clientVersion.js
+++ b/src/ClientVersion/clientVersion.js
@@ -33,7 +33,7 @@ function ClientVersion ({ className }, { api }) {
   const [ versionNumber, versionType, , versionDate ] = (versionString || '').split('-');
 
   return (
-    <div className={ [styles.clientVersion, className].join(' ') }>
+    <div className={[styles.clientVersion, className].join(' ')}>
       { clientName } { versionNumber }-{ versionDate } { versionType }
     </div>
   );
diff --git a/src/ConfirmDialog/confirmDialog.js b/src/ConfirmDialog/confirmDialog.js
index fd5c33d..914f2be 100644
--- a/src/ConfirmDialog/confirmDialog.js
+++ b/src/ConfirmDialog/confirmDialog.js
@@ -46,30 +46,30 @@ export default function ConfirmDialog ({ busy, children, className, disabledConf
 
   return (
     <Portal
-      buttons={ [
+      buttons={[
         <Button
-          disabled={ disabledDeny || busy }
-          icon={ iconDeny || <CancelIcon /> }
+          disabled={disabledDeny || busy}
+          icon={iconDeny || <CancelIcon />}
           key='deny'
-          label={ labelDeny || DEFAULT_NO }
-          onClick={ onDeny }
+          label={labelDeny || DEFAULT_NO}
+          onClick={onDeny}
         />,
         <Button
-          disabled={ disabledConfirm || busy }
-          icon={ iconConfirm || <CheckIcon /> }
+          disabled={disabledConfirm || busy}
+          icon={iconConfirm || <CheckIcon />}
           key='confirm'
-          label={ labelConfirm || DEFAULT_YES }
-          onClick={ onConfirm }
+          label={labelConfirm || DEFAULT_YES}
+          onClick={onConfirm}
         />
-      ] }
-      busy={ busy }
-      className={ className }
+      ]}
+      busy={busy}
+      className={className}
       isSmallModal
-      onClose={ onDeny }
-      title={ title }
+      onClose={onDeny}
+      title={title}
       open
     >
-      <div className={ styles.body }>
+      <div className={styles.body}>
         { children }
       </div>
     </Portal>
diff --git a/src/ConfirmDialog/confirmDialog.spec.js b/src/ConfirmDialog/confirmDialog.spec.js
index fc83109..b33d131 100644
--- a/src/ConfirmDialog/confirmDialog.spec.js
+++ b/src/ConfirmDialog/confirmDialog.spec.js
@@ -36,10 +36,10 @@ function render (props = {}) {
 
   component = shallow(
     <ConfirmDialog
-      { ...props }
+      {...props}
       title='test title'
-      onConfirm={ onConfirm }
-      onDeny={ onDeny }
+      onConfirm={onConfirm}
+      onDeny={onDeny}
     >
       <div id='testContent'>
         some test content
diff --git a/src/Container/Link/link.js b/src/Container/Link/link.js
index eedb528..865c828 100644
--- a/src/Container/Link/link.js
+++ b/src/Container/Link/link.js
@@ -27,8 +27,8 @@ export default function Link ({ className, children, isDappLink, link }) {
 
   return (
     <ContainerClass
-      className={ [styles.link, className].join(' ') }
-      to={ link }
+      className={[styles.link, className].join(' ')}
+      to={link}
     >
       { children }
     </ContainerClass>
diff --git a/src/Container/Title/Actions/actions.js b/src/Container/Title/Actions/actions.js
index c9deacc..eb51f6c 100644
--- a/src/Container/Title/Actions/actions.js
+++ b/src/Container/Title/Actions/actions.js
@@ -25,7 +25,7 @@ export default function Actions ({ actions }) {
   }
 
   return (
-    <div className={ styles.actions }>
+    <div className={styles.actions}>
       { actions }
     </div>
   );
diff --git a/src/Container/Title/Byline/byline.js b/src/Container/Title/Byline/byline.js
index 4501ae9..859ab9f 100644
--- a/src/Container/Title/Byline/byline.js
+++ b/src/Container/Title/Byline/byline.js
@@ -26,11 +26,11 @@ export default function Byline ({ byline }) {
   }
 
   return (
-    <div className={ styles.byline }>
+    <div className={styles.byline}>
       {
         typeof byline === 'string'
           ? (
-            <span title={ byline }>
+            <span title={byline}>
               { byline }
             </span>
           )
diff --git a/src/Container/Title/Description/description.js b/src/Container/Title/Description/description.js
index c9bb6aa..e99d385 100644
--- a/src/Container/Title/Description/description.js
+++ b/src/Container/Title/Description/description.js
@@ -26,11 +26,11 @@ export default function Description ({ description }) {
   }
 
   return (
-    <div className={ styles.description }>
+    <div className={styles.description}>
       {
         typeof description === 'string'
           ? (
-            <span title={ description }>
+            <span title={description}>
               { description }
             </span>
           )
diff --git a/src/Container/Title/title.js b/src/Container/Title/title.js
index 78c4b4c..5c094b9 100644
--- a/src/Container/Title/title.js
+++ b/src/Container/Title/title.js
@@ -31,17 +31,17 @@ export default function Title ({ actions, byline, className, description, isOffs
   }
 
   return (
-    <div className={ className }>
+    <div className={className}>
       <div>
-        <h3 className={ [styles.title, isOffset && styles.offset].join(' ') }>
-          <div className={ styles.text }>
+        <h3 className={[styles.title, isOffset && styles.offset].join(' ')}>
+          <div className={styles.text}>
             { title }
           </div>
         </h3>
-        <Byline byline={ byline } />
-        <Description description={ description } />
+        <Byline byline={byline} />
+        <Description description={description} />
       </div>
-      <Actions actions={ actions } />
+      <Actions actions={actions} />
     </div>
   );
 }
diff --git a/src/Container/Title/title.spec.js b/src/Container/Title/title.spec.js
index 932929b..d914cf8 100644
--- a/src/Container/Title/title.spec.js
+++ b/src/Container/Title/title.spec.js
@@ -23,7 +23,7 @@ import Title from './title';
 
 function render (props) {
   return shallow(
-    <Title { ...props } />
+    <Title {...props} />
   );
 }
 
diff --git a/src/Container/container.js b/src/Container/container.js
index 6b3ba73..2e6ff58 100644
--- a/src/Container/container.js
+++ b/src/Container/container.js
@@ -38,10 +38,10 @@ export default function Container ({ children, className, compact, dappLink, hov
           ? styles.compact
           : styles.padded
       }
-      onClick={ onClick }
-      onFocus={ onFocus }
+      onClick={onClick}
+      onFocus={onFocus}
     >
-      <Title title={ title } />
+      <Title title={title} />
       { children }
     </div>
   );
@@ -49,7 +49,7 @@ export default function Container ({ children, className, compact, dappLink, hov
   const hoverCard = (
     hover
       ? (
-        <div className={ styles.hoverOverlay }>
+        <div className={styles.hoverOverlay}>
           { hover }
         </div>
       )
@@ -67,22 +67,22 @@ export default function Container ({ children, className, compact, dappLink, hov
           className
         ].join(' ')
       }
-      style={ style }
-      { ...props }
+      style={style}
+      {...props}
     >
       {
         link
           ? (
             <Link
-              isDappLink={ dappLink }
-              link={ link }
+              isDappLink={dappLink}
+              link={link}
             >
               { card }
               { hoverCard }
             </Link>
           )
           : (
-            <div className={ styles.cardContainer }>
+            <div className={styles.cardContainer}>
               { card }
               { hoverCard }
             </div>
diff --git a/src/Container/container.spec.js b/src/Container/container.spec.js
index a343238..4217d29 100644
--- a/src/Container/container.spec.js
+++ b/src/Container/container.spec.js
@@ -23,7 +23,7 @@ import Container from './container';
 
 function render (props) {
   return shallow(
-    <Container { ...props } />
+    <Container {...props} />
   );
 }
 
diff --git a/src/ContextProvider/contextProvider.js b/src/ContextProvider/contextProvider.js
index 448b1e2..d8768b2 100644
--- a/src/ContextProvider/contextProvider.js
+++ b/src/ContextProvider/contextProvider.js
@@ -53,7 +53,7 @@ export default class ContextProvider extends Component {
     const { locale, messages } = this.localeStore;
 
     return (
-      <IntlProvider locale={ locale } messages={ messages }>
+      <IntlProvider locale={locale} messages={messages}>
         { children }
       </IntlProvider>
     );
diff --git a/src/CopyToClipboard/copyToClipboard.js b/src/CopyToClipboard/copyToClipboard.js
index 65f3b50..60ed011 100644
--- a/src/CopyToClipboard/copyToClipboard.js
+++ b/src/CopyToClipboard/copyToClipboard.js
@@ -62,16 +62,16 @@ class CopyToClipboard extends Component {
 
     return (
       <Clipboard
-        onCopy={ this.onCopy }
-        text={ data }
+        onCopy={this.onCopy}
+        text={data}
       >
         <div
-          className={ styles.icon }
-          onClick={ this.onClick }
-          style={ {
+          className={styles.icon}
+          onClick={this.onClick}
+          style={{
             height: size,
             width: size
-          } }
+          }}
         >
           <CopyIcon />
         </div>
@@ -82,13 +82,13 @@ class CopyToClipboard extends Component {
   onCopy = () => {
     const { data, onCopy, cooldown, showSnackbar } = this.props;
     const message = (
-      <div className={ styles.container }>
+      <div className={styles.container}>
         <FormattedMessage
           id='ui.copyToClipboard.copied'
           defaultMessage='copied {data} to clipboard'
-          values={ {
-            data: <code className={ styles.data }> { data } </code>
-          } }
+          values={{
+            data: <code className={styles.data}> { data } </code>
+          }}
         />
       </div>
     );
diff --git a/src/CurrencySymbol/currencySymbol.js b/src/CurrencySymbol/currencySymbol.js
index ae166b4..f72e58d 100644
--- a/src/CurrencySymbol/currencySymbol.js
+++ b/src/CurrencySymbol/currencySymbol.js
@@ -45,7 +45,7 @@ function CurrencySymbol ({ className }, { api }) {
   const store = Store.get(api);
 
   return (
-    <span className={ className }>
+    <span className={className}>
       { renderSymbol(store.netChain) }
     </span>
   );
diff --git a/src/DappCard/dappCard.js b/src/DappCard/dappCard.js
index 72322f3..0db40a1 100644
--- a/src/DappCard/dappCard.js
+++ b/src/DappCard/dappCard.js
@@ -51,23 +51,23 @@ export default class DappCard extends Component {
         className={
           [styles.container, className].join(' ')
         }
-        link={ this.getLink(app) }
-        onClick={ onClick }
+        link={this.getLink(app)}
+        onClick={onClick}
       >
         <DappIcon
-          app={ app }
-          className={ styles.image }
+          app={app}
+          className={styles.image}
         />
-        <DappVouchFor app={ app } />
+        <DappVouchFor app={app} />
         <Tags
-          className={ styles.tags }
+          className={styles.tags}
           tags={
             showTags
               ? [app.type]
               : null
           }
         />
-        <div className={ styles.description }>
+        <div className={styles.description}>
           <ContainerTitle
             className={
               showLink
@@ -75,10 +75,10 @@ export default class DappCard extends Component {
                 : styles.title
             }
             isOffset
-            title={ app.name }
-            byline={ app.description }
+            title={app.name}
+            byline={app.description}
           />
-          <div className={ styles.author }>
+          <div className={styles.author}>
             { app.author }, v{ app.version }
           </div>
           { children }
diff --git a/src/DappIcon/dappIcon.js b/src/DappIcon/dappIcon.js
index 6eee1ff..b0d78c0 100644
--- a/src/DappIcon/dappIcon.js
+++ b/src/DappIcon/dappIcon.js
@@ -62,8 +62,8 @@ export default function DappIcon ({ app, className, small }, { api }) {
 
   return (
     <img
-      className={ classes }
-      src={ imageSrc }
+      className={classes}
+      src={imageSrc}
     />
   );
 }
diff --git a/src/DappIcon/dappIcon.spec.js b/src/DappIcon/dappIcon.spec.js
index bd0be13..c3644f0 100644
--- a/src/DappIcon/dappIcon.spec.js
+++ b/src/DappIcon/dappIcon.spec.js
@@ -40,7 +40,7 @@ function render (props = {}) {
   }
 
   component = shallow(
-    <DappIcon { ...props } />,
+    <DappIcon {...props} />,
     {
       context: { api: createApi() }
     }
diff --git a/src/DappLink/dappLink.js b/src/DappLink/dappLink.js
index a9e0742..9da6919 100644
--- a/src/DappLink/dappLink.js
+++ b/src/DappLink/dappLink.js
@@ -27,8 +27,8 @@ export default function DappLink ({ children, className, to }, { api }) {
 
   return (
     <div
-      className={ [styles.link, className].join(' ') }
-      onClick={ onClick }
+      className={[styles.link, className].join(' ')}
+      onClick={onClick}
     >
       { children }
     </div>
diff --git a/src/DappVouchFor/dappVouchFor.js b/src/DappVouchFor/dappVouchFor.js
index 7c5068c..0fb87f6 100644
--- a/src/DappVouchFor/dappVouchFor.js
+++ b/src/DappVouchFor/dappVouchFor.js
@@ -43,13 +43,13 @@ export default class DappVouchFor extends Component {
     }
 
     return (
-      <div className={ styles.tag }>
+      <div className={styles.tag}>
         <IdentityIcon
-          address={ this.store.vouchers[0] }
-          className={ styles.image }
-          alt={ `${count} identities vouch for this dapp` }
+          address={this.store.vouchers[0]}
+          className={styles.image}
+          alt={`${count} identities vouch for this dapp`}
         />
-        <div className={ styles.bubble }>
+        <div className={styles.bubble}>
           { count }
         </div>
       </div>
diff --git a/src/Editor/editor.js b/src/Editor/editor.js
index 09dfaca..2da867f 100644
--- a/src/Editor/editor.js
+++ b/src/Editor/editor.js
@@ -67,27 +67,27 @@ export default class Editor extends Component {
 
     return (
       <AceEditor
-        mode={ mode }
+        mode={mode}
         theme='solarized_dark'
         width='100%'
         ref='brace'
-        style={ { flex: 1 } }
-        onChange={ this.handleOnChange }
-        name={ this.name }
-        editorProps={ { $blockScrolling: Infinity } }
-        setOptions={ {
+        style={{ flex: 1 }}
+        onChange={this.handleOnChange}
+        name={this.name}
+        editorProps={{ $blockScrolling: Infinity }}
+        setOptions={{
           useWorker: false,
           fontFamily: 'monospace',
           fontSize: '0.9em'
-        } }
-        maxLines={ max }
-        enableBasicAutocompletion={ !readOnly }
-        showPrintMargin={ false }
-        annotations={ annotations }
-        value={ value }
-        commands={ commands }
-        readOnly={ readOnly }
-        className={ className }
+        }}
+        maxLines={max}
+        enableBasicAutocompletion={!readOnly}
+        showPrintMargin={false}
+        annotations={annotations}
+        value={value}
+        commands={commands}
+        readOnly={readOnly}
+        className={className}
       />
     );
   }
diff --git a/src/Errors/errors.js b/src/Errors/errors.js
index 42be7bc..9771c96 100644
--- a/src/Errors/errors.js
+++ b/src/Errors/errors.js
@@ -50,7 +50,7 @@ class Errors extends Component {
 
     return (
       <Snackbar
-        className={ styles.container }
+        className={styles.container}
         open
         action={
           <FormattedMessage
@@ -58,10 +58,10 @@ class Errors extends Component {
             defaultMessage='close'
           />
         }
-        autoHideDuration={ DURATION_OPEN }
-        message={ this.getErrorMessage() }
-        onRequestClose={ this.onRequestClose }
-        bodyStyle={ STYLE_CONTENT }
+        autoHideDuration={DURATION_OPEN}
+        message={this.getErrorMessage()}
+        onRequestClose={this.onRequestClose}
+        bodyStyle={STYLE_CONTENT}
       />
     );
   }
diff --git a/src/Features/features.js b/src/Features/features.js
index 1956a3a..f696946 100644
--- a/src/Features/features.js
+++ b/src/Features/features.js
@@ -51,7 +51,7 @@ export default class Features extends Component {
 
     return {
       description: (
-        <div className={ styles.description }>
+        <div className={styles.description}>
           { feature.description }
         </div>
       ),
@@ -59,8 +59,8 @@ export default class Features extends Component {
       label: (
         <div>
           <Checkbox
-            checked={ this.store.active[key] }
-            onClick={ onCheck }
+            checked={this.store.active[key]}
+            onClick={onCheck}
           />
           <span>{ feature.name }</span>
         </div>
diff --git a/src/Features/features.spec.js b/src/Features/features.spec.js
index 5ab6bd9..735a33c 100644
--- a/src/Features/features.spec.js
+++ b/src/Features/features.spec.js
@@ -28,7 +28,7 @@ let instance;
 
 function render (props = { visible: true }) {
   component = shallow(
-    <Features { ...props } />
+    <Features {...props} />
   );
   instance = component.instance();
 
diff --git a/src/Form/AddressSelect/addressSelect.js b/src/Form/AddressSelect/addressSelect.js
index 3af34ae..ce9d591 100644
--- a/src/Form/AddressSelect/addressSelect.js
+++ b/src/Form/AddressSelect/addressSelect.js
@@ -44,7 +44,7 @@ let currentId = 1;
 @observer
 class AddressSelect extends Component {
   static contextTypes = {
-    intl: React.PropTypes.object.isRequired,
+    intl: PropTypes.object.isRequired,
     api: PropTypes.object.isRequired
   };
 
@@ -120,9 +120,9 @@ class AddressSelect extends Component {
     const content = this.renderContent();
 
     return (
-      <div className={ styles.main }>
-        { input }
-        { content }
+      <div className={styles.main}>
+        {input}
+        {content}
       </div>
     );
   }
@@ -133,18 +133,18 @@ class AddressSelect extends Component {
 
     const input = (
       <InputAddress
-        accountsInfo={ accountsInfo }
-        allowCopy={ (disabled || readOnly) && allowCopy ? allowCopy : false }
-        className={ className }
-        disabled={ disabled || readOnly }
-        error={ error }
-        hint={ hint }
-        focused={ focused }
-        label={ label }
+        accountsInfo={accountsInfo}
+        allowCopy={(disabled || readOnly) && allowCopy ? allowCopy : false}
+        className={className}
+        disabled={disabled || readOnly}
+        error={error}
+        hint={hint}
+        focused={focused}
+        label={label}
         readOnly
-        tabIndex={ -1 }
+        tabIndex={-1}
         text
-        value={ value }
+        value={value}
       />
     );
 
@@ -153,18 +153,18 @@ class AddressSelect extends Component {
     }
 
     return (
-      <div className={ styles.inputAddressContainer }>
-        { this.renderCopyButton() }
+      <div className={styles.inputAddressContainer}>
+        {this.renderCopyButton()}
         <div
-          className={ styles.inputAddress }
-          onBlur={ this.handleMainBlur }
-          onClick={ this.handleFocus }
-          onFocus={ this.handleMainFocus }
-          onKeyDown={ this.handleInputAddresKeydown }
+          className={styles.inputAddress}
+          onBlur={this.handleMainBlur}
+          onClick={this.handleFocus}
+          onFocus={this.handleMainFocus}
+          onKeyDown={this.handleInputAddresKeydown}
           ref='inputAddress'
-          tabIndex={ 0 }
+          tabIndex={0}
         >
-          { input }
+          {input}
         </div>
       </div>
     );
@@ -182,8 +182,8 @@ class AddressSelect extends Component {
       : value.toString();
 
     return (
-      <div className={ styles.copy }>
-        <CopyToClipboard data={ text } />
+      <div className={styles.copy}>
+        <CopyToClipboard data={text} />
       </div>
     );
   }
@@ -201,33 +201,33 @@ class AddressSelect extends Component {
 
     return (
       <Portal
-        className={ styles.inputContainer }
+        className={styles.inputContainer}
         isChildModal
-        onClick={ this.handleClose }
-        onClose={ this.handleClose }
-        onKeyDown={ this.handleKeyDown }
-        open={ expanded }
+        onClick={this.handleClose}
+        onClose={this.handleClose}
+        onKeyDown={this.handleKeyDown}
+        open={expanded}
         title={
           <LabelWrapper
-            className={ styles.title }
-            htmlFor={ id }
-            label={ label }
+            className={styles.title}
+            htmlFor={id}
+            label={label}
           >
-            <div className={ styles.outerInput }>
+            <div className={styles.outerInput}>
               <input
-                id={ id }
-                className={ styles.input }
-                placeholder={ ilHint }
-                onBlur={ this.handleInputBlur }
-                onClick={ this.stopEvent }
-                onFocus={ this.handleInputFocus }
-                onChange={ this.handleChange }
-                ref={ this.setInputRef }
+                id={id}
+                className={styles.input}
+                placeholder={ilHint}
+                onBlur={this.handleInputBlur}
+                onClick={this.stopEvent}
+                onFocus={this.handleInputFocus}
+                onChange={this.handleChange}
+                ref={this.setInputRef}
               />
               {
                 this.store.loading && (
                   <Loading
-                    className={ styles.loader }
+                    className={styles.loader}
                     size='small'
                   />
                 )
@@ -236,9 +236,9 @@ class AddressSelect extends Component {
           </LabelWrapper>
         }
       >
-        { this.renderCurrentInput() }
-        { this.renderRegistryValues() }
-        { this.renderAccounts() }
+        {this.renderCurrentInput()}
+        {this.renderRegistryValues()}
+        {this.renderAccounts()}
       </Portal>
     );
   }
@@ -258,8 +258,8 @@ class AddressSelect extends Component {
     }
 
     return (
-      <div className={ styles.container }>
-        { this.renderAccountCard({ address, index: 'currentInput_0' }) }
+      <div className={styles.container}>
+        {this.renderAccountCard({ address, index: 'currentInput_0' })}
       </div>
     );
   }
@@ -279,8 +279,8 @@ class AddressSelect extends Component {
       });
 
     return (
-      <div className={ styles.container }>
-        { accounts }
+      <div className={styles.container}>
+        {accounts}
       </div>
     );
   }
@@ -290,8 +290,8 @@ class AddressSelect extends Component {
 
     if (values.length === 0) {
       return (
-        <div className={ styles.categories }>
-          <div className={ styles.empty }>
+        <div className={styles.categories}>
+          <div className={styles.empty}>
             <FormattedMessage
               id='addressSelect.noAccount'
               defaultMessage='No account matches this query...'
@@ -306,8 +306,8 @@ class AddressSelect extends Component {
     });
 
     return (
-      <div className={ styles.categories }>
-        { categories }
+      <div className={styles.categories}>
+        {categories}
       </div>
     );
   }
@@ -330,18 +330,18 @@ class AddressSelect extends Component {
         .map((account) => this.renderAccountCard(account));
 
       content = (
-        <div className={ styles.cards }>
-          { cards }
+        <div className={styles.cards}>
+          {cards}
         </div>
       );
     }
 
     return (
-      <div className={ styles.category } key={ `${key}_${index}` }>
-        <div className={ styles.title }>
-          <h3>{ label }</h3>
+      <div className={styles.category} key={`${key}_${index}`}>
+        <div className={styles.title}>
+          <h3>{label}</h3>
         </div>
-        { content }
+        {content}
       </div>
     );
   }
@@ -357,12 +357,12 @@ class AddressSelect extends Component {
 
     return (
       <AccountCard
-        account={ account }
-        className={ styles.account }
-        key={ `account_${index}` }
-        onClick={ this.handleClick }
-        onFocus={ this.focusItem }
-        ref={ `account_${index}` }
+        account={account}
+        className={styles.account}
+        key={`account_${index}`}
+        onClick={this.handleClick}
+        onFocus={this.focusItem}
+        ref={`account_${index}`}
       />
     );
   }
diff --git a/src/Form/AddressSelect/addressSelectStore.js b/src/Form/AddressSelect/addressSelectStore.js
index 2d6657f..b3bbf43 100644
--- a/src/Form/AddressSelect/addressSelectStore.js
+++ b/src/Form/AddressSelect/addressSelectStore.js
@@ -65,9 +65,9 @@ export default class AddressSelectStore {
           <FormattedMessage
             id='addressSelect.fromRegistry'
             defaultMessage='{name} (from registry)'
-            values={ {
+            values={{
               name
-            } }
+            }}
           />
         )
       };
@@ -94,9 +94,9 @@ export default class AddressSelectStore {
                   <FormattedMessage
                     id='addressSelect.fromEmail'
                     defaultMessage='Verified using email {email}'
-                    values={ {
+                    values={{
                       email
-                    } }
+                    }}
                   />
                 )
               };
@@ -119,9 +119,9 @@ export default class AddressSelectStore {
                   <FormattedMessage
                     id='addressSelect.fromRegistry'
                     defaultMessage='{name} (from registry)'
-                    values={ {
+                    values={{
                       name
-                    } }
+                    }}
                   />
                 )
               };
@@ -144,9 +144,9 @@ export default class AddressSelectStore {
                   <FormattedMessage
                     id='addressSelect.fromRegistry'
                     defaultMessage='{name} (from registry)'
-                    values={ {
+                    values={{
                       name
-                    } }
+                    }}
                   />
                 )
               };
diff --git a/src/Form/Checkbox/checkbox.js b/src/Form/Checkbox/checkbox.js
index 090726e..4e7ab27 100644
--- a/src/Form/Checkbox/checkbox.js
+++ b/src/Form/Checkbox/checkbox.js
@@ -25,13 +25,13 @@ import Label from '../Label';
 export default function Checkbox ({ checked = false, className, label, onClick, style }) {
   return (
     <SemanticCheckbox
-      checked={ checked }
-      className={ className }
+      checked={checked}
+      className={className}
       label={
-        <Label label={ label } />
+        <Label label={label} />
       }
-      onClick={ onClick }
-      style={ style }
+      onClick={onClick}
+      style={style}
     />
   );
 }
diff --git a/src/Form/DappUrlInput/dappUrlInput.js b/src/Form/DappUrlInput/dappUrlInput.js
index 3742ad8..3255ce7 100644
--- a/src/Form/DappUrlInput/dappUrlInput.js
+++ b/src/Form/DappUrlInput/dappUrlInput.js
@@ -32,11 +32,11 @@ export default class DappUrlInput extends Component {
 
     return (
       <input
-        className={ className }
-        onChange={ this.onChange }
-        onKeyDown={ this.onKeyDown }
+        className={className}
+        onChange={this.onChange}
+        onKeyDown={this.onKeyDown}
         type='text'
-        value={ url }
+        value={url}
       />
     );
   }
diff --git a/src/Form/DappUrlInput/dappUrlInput.spec.js b/src/Form/DappUrlInput/dappUrlInput.spec.js
index 21f0573..9fc94f5 100644
--- a/src/Form/DappUrlInput/dappUrlInput.spec.js
+++ b/src/Form/DappUrlInput/dappUrlInput.spec.js
@@ -34,10 +34,10 @@ function render (props = { url: 'http://some.url' }) {
 
   component = shallow(
     <DappUrlInput
-      onChange={ onChange }
-      onGoto={ onGoto }
-      onRestore={ onRestore }
-      { ...props }
+      onChange={onChange}
+      onGoto={onGoto}
+      onRestore={onRestore}
+      {...props}
     />
   );
 
diff --git a/src/Form/Dropdown/dropdown.js b/src/Form/Dropdown/dropdown.js
index b7395b5..72c8537 100644
--- a/src/Form/Dropdown/dropdown.js
+++ b/src/Form/Dropdown/dropdown.js
@@ -31,24 +31,24 @@ export default function Dropdown ({ className, disabled = false, error, fullWidt
   const _onChange = (event, { value }) => onChange(event, value);
 
   return (
-    <LabelWrapper label={ label }>
+    <LabelWrapper label={label}>
       <SemanticDropdown
-        className={ `${styles.dropdown} ${className}` }
-        disabled={ disabled }
-        error={ !!error }
-        fluid={ fullWidth }
-        id={ NAME_ID }
-        name={ NAME_ID }
-        onBlur={ onBlur }
-        onChange={ _onChange }
-        onKeyDown={ onKeyDown }
-        options={ options }
-        placeholder={ parseI18NString(context, hint) }
+        className={`${styles.dropdown} ${className}`}
+        disabled={disabled}
+        error={!!error}
+        fluid={fullWidth}
+        id={NAME_ID}
+        name={NAME_ID}
+        onBlur={onBlur}
+        onChange={_onChange}
+        onKeyDown={onKeyDown}
+        options={options}
+        placeholder={parseI18NString(context, hint)}
         scrolling
         search
         selection
-        text={ parseI18NString(context, text) }
-        value={ value }
+        text={parseI18NString(context, text)}
+        value={value}
       />
     </LabelWrapper>
   );
diff --git a/src/Form/FileSelect/fileSelect.js b/src/Form/FileSelect/fileSelect.js
index aff76c0..763de54 100644
--- a/src/Form/FileSelect/fileSelect.js
+++ b/src/Form/FileSelect/fileSelect.js
@@ -45,11 +45,11 @@ export default class FileSelect extends Component {
 
     return (
       <Dropzone
-        onDrop={ this.onDrop }
-        multiple={ false }
-        className={ `${styles.dropzone} ${error && styles.error} ${className}` }
+        onDrop={this.onDrop}
+        multiple={false}
+        className={`${styles.dropzone} ${error && styles.error} ${className}`}
       >
-        <div className={ styles.label }>
+        <div className={styles.label}>
           { error || label }
         </div>
       </Dropzone>
diff --git a/src/Form/FileSelect/fileSelect.spec.js b/src/Form/FileSelect/fileSelect.spec.js
index 02d5ceb..f343ad1 100644
--- a/src/Form/FileSelect/fileSelect.spec.js
+++ b/src/Form/FileSelect/fileSelect.spec.js
@@ -57,8 +57,8 @@ function render (props = {}) {
   onSelect = sinon.stub();
   component = shallow(
     <FileSelect
-      onSelect={ onSelect }
-      { ...props }
+      onSelect={onSelect}
+      {...props}
     />
   );
   instance = component.instance();
diff --git a/src/Form/Input/input.js b/src/Form/Input/input.js
index ad62a37..152c7bb 100644
--- a/src/Form/Input/input.js
+++ b/src/Form/Input/input.js
@@ -32,7 +32,7 @@ const NAME_ID = ' ';
 
 export default class Input extends Component {
   static contextTypes = {
-    intl: React.PropTypes.object.isRequired
+    intl: PropTypes.object.isRequired
   };
 
   static propTypes = {
@@ -120,38 +120,38 @@ export default class Input extends Component {
 
     return (
       <LabelWrapper
-        className={ `${styles.container} ${className}` }
-        label={ label }
+        className={`${styles.container} ${className}`}
+        label={label}
       >
         <SemanticInput
-          className={ styles.input }
-          disabled={ disabled }
-          error={ !!error }
+          className={styles.input}
+          disabled={disabled}
+          error={!!error}
           fluid
-          id={ NAME_ID }
-          max={ max }
-          min={ min }
-          name={ NAME_ID }
-          onBlur={ this.onBlur }
-          onChange={ this.onChange }
-          onClick={ onClick }
-          onKeyDown={ this.onKeyDown }
-          onKeyUp={ this.onKeyUp }
-          onFocus={ this.onFocus }
-          onPaste={ this.onPaste }
-          placeholder={ parseI18NString(this.context, hint) }
-          readOnly={ readOnly }
+          id={NAME_ID}
+          max={max}
+          min={min}
+          name={NAME_ID}
+          onBlur={this.onBlur}
+          onChange={this.onChange}
+          onClick={onClick}
+          onKeyDown={this.onKeyDown}
+          onKeyUp={this.onKeyUp}
+          onFocus={this.onFocus}
+          onPaste={this.onPaste}
+          placeholder={parseI18NString(this.context, hint)}
+          readOnly={readOnly}
           ref='input'
-          step={ step }
-          style={ style }
-          tabIndex={ tabIndex }
+          step={step}
+          style={style}
+          tabIndex={tabIndex}
         >
-          { this.renderCopyButton() }
+          {this.renderCopyButton()}
           <input
-            type={ type }
-            value={ parseI18NString(this.context, `${displayValue}`) }
+            type={type}
+            value={parseI18NString(this.context, `${displayValue}`)}
           />
-          { children }
+          {children}
         </SemanticInput>
       </LabelWrapper>
     );
@@ -170,8 +170,8 @@ export default class Input extends Component {
       : value.toString();
 
     return (
-      <div className={ styles.copy }>
-        <CopyToClipboard data={ text } />
+      <div className={styles.copy}>
+        <CopyToClipboard data={text} />
       </div>
     );
   }
diff --git a/src/Form/InputAddress/inputAddress.js b/src/Form/InputAddress/inputAddress.js
index d5d871d..a7f3861 100644
--- a/src/Form/InputAddress/inputAddress.js
+++ b/src/Form/InputAddress/inputAddress.js
@@ -89,24 +89,24 @@ class InputAddress extends Component {
     }
 
     return (
-      <div className={ containerClasses.join(' ') }>
+      <div className={containerClasses.join(' ')}>
         <Input
-          allowCopy={ allowCopy && ((disabled || readOnly) ? value : false) }
-          autoFocus={ autoFocus }
-          className={ classes.join(' ') }
-          disabled={ disabled }
-          error={ error }
-          hideUnderline={ hideUnderline }
-          hint={ hint }
-          label={ label }
-          onChange={ this.onChange }
-          onClick={ onClick }
-          onFocus={ onFocus }
-          onSubmit={ this.onSubmit }
-          readOnly={ readOnly }
-          tabIndex={ tabIndex }
-          value={ displayValue }
-          { ...props }
+          allowCopy={allowCopy && ((disabled || readOnly) ? value : false)}
+          autoFocus={autoFocus}
+          className={classes.join(' ')}
+          disabled={disabled}
+          error={error}
+          hideUnderline={hideUnderline}
+          hint={hint}
+          label={label}
+          onChange={this.onChange}
+          onClick={onClick}
+          onFocus={onFocus}
+          onSubmit={this.onSubmit}
+          readOnly={readOnly}
+          tabIndex={tabIndex}
+          value={displayValue}
+          {...props}
         />
         { icon }
       </div>
@@ -135,9 +135,9 @@ class InputAddress extends Component {
     }
 
     return (
-      <div className={ classes.join(' ') }>
+      <div className={classes.join(' ')}>
         <IdentityIcon
-          address={ value }
+          address={value}
           center
           inline
         />
diff --git a/src/Form/InputAddressSelect/inputAddressSelect.js b/src/Form/InputAddressSelect/inputAddressSelect.js
index c00c801..b24df81 100644
--- a/src/Form/InputAddressSelect/inputAddressSelect.js
+++ b/src/Form/InputAddressSelect/inputAddressSelect.js
@@ -42,18 +42,18 @@ function InputAddressSelect ({ accounts, allowCopy, allowedValues, className, co
 
   return (
     <AddressSelect
-      allowCopy={ allowCopy }
+      allowCopy={allowCopy}
       allowInput
-      accounts={ filteredAccounts }
-      className={ className }
-      contacts={ contacts }
-      contracts={ contracts }
-      error={ error }
-      hint={ hint }
-      label={ label }
-      onChange={ onChange }
-      readOnly={ readOnly }
-      value={ value }
+      accounts={filteredAccounts}
+      className={className}
+      contacts={contacts}
+      contracts={contracts}
+      error={error}
+      hint={hint}
+      label={label}
+      onChange={onChange}
+      readOnly={readOnly}
+      value={value}
     />
   );
 }
diff --git a/src/Form/InputChip/Chip/chip.js b/src/Form/InputChip/Chip/chip.js
index 08c4c64..95f04b7 100644
--- a/src/Form/InputChip/Chip/chip.js
+++ b/src/Form/InputChip/Chip/chip.js
@@ -26,15 +26,15 @@ import styles from './chip.css';
 export default function Chip ({ className, isDisabled, isFocused, label, onClick, onDelete }) {
   return (
     <div
-      className={ `${styles.chip} ${isDisabled && styles.disabled} ${isFocused && styles.focus} ${className}` }
-      onTouchTap={ onClick }
+      className={`${styles.chip} ${isDisabled && styles.disabled} ${isFocused && styles.focus} ${className}`}
+      onTouchTap={onClick}
     >
-      <div className={ styles.label }>
+      <div className={styles.label}>
         { label }
       </div>
       <CloseIcon
-        className={ styles.delete }
-        onTouchTap={ onDelete }
+        className={styles.delete}
+        onTouchTap={onDelete}
       />
     </div>
   );
diff --git a/src/Form/InputChip/inputChip.js b/src/Form/InputChip/inputChip.js
index 558ee26..1b4b521 100644
--- a/src/Form/InputChip/inputChip.js
+++ b/src/Form/InputChip/inputChip.js
@@ -60,17 +60,17 @@ export default class InputChip extends Component {
 
     return (
       <LabelWrapper
-        className={ className }
-        label={ label }
+        className={className}
+        label={label}
       >
         <SemanticInput
           fluid
-          onBlur={ this.onBlur }
-          onChange={ this.onChange }
-          onKeyDown={ this.onKeyDown }
-          placeholder={ parseI18NString(this.context, hint) }
+          onBlur={this.onBlur}
+          onChange={this.onChange}
+          onKeyDown={this.onKeyDown}
+          placeholder={parseI18NString(this.context, hint)}
           ref='chipInput'
-          value={ textValue }
+          value={textValue}
         >
           <input />
         </SemanticInput>
@@ -86,9 +86,9 @@ export default class InputChip extends Component {
 
     return (
       <Chip
-        key={ chip }
-        label={ chip }
-        onDelete={ onDelete }
+        key={chip}
+        label={chip}
+        onDelete={onDelete}
       />
     );
   }
diff --git a/src/Form/InputDateTime/inputDateTime.js b/src/Form/InputDateTime/inputDateTime.js
index 73bc908..f42fc0e 100644
--- a/src/Form/InputDateTime/inputDateTime.js
+++ b/src/Form/InputDateTime/inputDateTime.js
@@ -31,17 +31,17 @@ export default function InputDateTime ({ className, hint, label, onChange, value
 
   return (
     <LabelWrapper
-      className={ `${styles.container} ${className}` }
-      label={ label }
+      className={`${styles.container} ${className}`}
+      label={label}
     >
       <div className='ui fluid input'>
         <DateTime
-          className={ styles.input }
-          inputProps={ {
+          className={styles.input}
+          inputProps={{
             placeholder: parseI18NString(context, hint)
-          } }
-          onChange={ _onChange }
-          value={ value }
+          }}
+          onChange={_onChange}
+          value={value}
         />
       </div>
     </LabelWrapper>
diff --git a/src/Form/Label/label.js b/src/Form/Label/label.js
index dae6e68..c589b5b 100644
--- a/src/Form/Label/label.js
+++ b/src/Form/Label/label.js
@@ -28,8 +28,8 @@ export default function Label ({ className, children, htmlFor, label }) {
 
   return (
     <label
-      className={ `${styles.label} ${className}` }
-      htmlFor={ htmlFor }
+      className={`${styles.label} ${className}`}
+      htmlFor={htmlFor}
     >
       { label }
       { children }
diff --git a/src/Form/LabelWrapper/labelWrapper.js b/src/Form/LabelWrapper/labelWrapper.js
index 9afc165..3f51f02 100644
--- a/src/Form/LabelWrapper/labelWrapper.js
+++ b/src/Form/LabelWrapper/labelWrapper.js
@@ -23,10 +23,10 @@ import Label from '../Label';
 
 export default function LabelWrapper ({ className, children, htmlFor, label }) {
   return (
-    <div className={ className }>
+    <div className={className}>
       <Label
-        htmlFor={ htmlFor }
-        label={ label }
+        htmlFor={htmlFor}
+        label={label}
       />
       { children }
     </div>
diff --git a/src/Form/PasswordStrength/passwordStrength.js b/src/Form/PasswordStrength/passwordStrength.js
index 5aef5c6..1a03e41 100644
--- a/src/Form/PasswordStrength/passwordStrength.js
+++ b/src/Form/PasswordStrength/passwordStrength.js
@@ -67,7 +67,7 @@ export default class PasswordStrength extends Component {
 
     return (
       <LabelWrapper
-        className={ styles.strength }
+        className={styles.strength}
         label={
           <FormattedMessage
             id='ui.passwordStrength.label'
@@ -76,12 +76,12 @@ export default class PasswordStrength extends Component {
         }
       >
         <Progress
-          color={ this.getStrengthBarColor(score) }
+          color={this.getStrengthBarColor(score)}
           isDeterminate
-          max={ 100 }
-          value={ score * 100 / 5 + 20 }
+          max={100}
+          value={score * 100 / 5 + 20}
         />
-        <div className={ styles.feedback }>
+        <div className={styles.feedback}>
           { this.renderFeedback(feedback) }
         </div>
       </LabelWrapper>
diff --git a/src/Form/PasswordStrength/passwordStrength.spec.js b/src/Form/PasswordStrength/passwordStrength.spec.js
index 5a02d52..0454e18 100644
--- a/src/Form/PasswordStrength/passwordStrength.spec.js
+++ b/src/Form/PasswordStrength/passwordStrength.spec.js
@@ -27,7 +27,7 @@ const INPUT_NULL = '';
 
 function render (props) {
   return shallow(
-    <PasswordStrength { ...props } />
+    <PasswordStrength {...props} />
   ).shallow();
 }
 
diff --git a/src/Form/RadioButtons/radioButtons.js b/src/Form/RadioButtons/radioButtons.js
index 7042e3a..b7e2bf9 100644
--- a/src/Form/RadioButtons/radioButtons.js
+++ b/src/Form/RadioButtons/radioButtons.js
@@ -30,35 +30,35 @@ export default function RadioButtons ({ className, label, name, onChange, value,
 
   return (
     <LabelWrapper
-      className={ `${styles.container} ${className}` }
-      label={ label }
+      className={`${styles.container} ${className}`}
+      label={label}
     >
       {
         values.map(({ description, key, label }) => (
           <div
-            className={ styles.radioContainer }
-            key={ key }
+            className={styles.radioContainer}
+            key={key}
           >
             <SemanticRadio
-              checked={ value === key }
-              className={ styles.radio }
+              checked={value === key}
+              className={styles.radio}
               label={
-                <Label className={ styles.label }>
-                  <div className={ styles.name }>
+                <Label className={styles.label}>
+                  <div className={styles.name}>
                     { label }
                   </div>
                   {
                     description && (
-                      <div className={ styles.description }>
+                      <div className={styles.description}>
                         { description }
                       </div>
                     )
                   }
                 </Label>
               }
-              name={ name }
-              onChange={ _onChange }
-              value={ key }
+              name={name}
+              onChange={_onChange}
+              value={key}
             />
           </div>
         ))
diff --git a/src/Form/Slider/slider.js b/src/Form/Slider/slider.js
index 5e76a7f..13a8da6 100644
--- a/src/Form/Slider/slider.js
+++ b/src/Form/Slider/slider.js
@@ -24,13 +24,13 @@ export default function Slider ({ className, max, min = 0, onChange, step = 1, v
 
   return (
     <input
-      className={ `${styles.slider} ${className}` }
-      max={ max }
-      min={ min }
-      onChange={ _onChange }
-      step={ step }
+      className={`${styles.slider} ${className}`}
+      max={max}
+      min={min}
+      onChange={_onChange}
+      step={step}
       type='range'
-      value={ value }
+      value={value}
     />
   );
 }
diff --git a/src/Form/Tab/tab.js b/src/Form/Tab/tab.js
index d6448d3..0468e84 100644
--- a/src/Form/Tab/tab.js
+++ b/src/Form/Tab/tab.js
@@ -14,19 +14,20 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 
 import { Tab as SemanticTab } from 'semantic-ui-react';
 
 export default function Tab ({ activeIndex, as, defaultActiveIndex, menu, onTabChange, panes, label }) {
   return (
     <SemanticTab
-      activeIndex={ activeIndex }
-      as={ as }
-      defaultActiveIndex={ defaultActiveIndex }
-      menu={ menu }
-      onTabChange={ onTabChange }
-      panes={ panes }
+      activeIndex={activeIndex}
+      as={as}
+      defaultActiveIndex={defaultActiveIndex}
+      menu={menu}
+      onTabChange={onTabChange}
+      panes={panes}
     />
   );
 }
diff --git a/src/Form/Toggle/toggle.js b/src/Form/Toggle/toggle.js
index ed0e04e..08edaf9 100644
--- a/src/Form/Toggle/toggle.js
+++ b/src/Form/Toggle/toggle.js
@@ -22,12 +22,12 @@ import LabelWrapper from '../LabelWrapper';
 
 export default function Toggle ({ className, label, onToggle, style, toggled }) {
   return (
-    <LabelWrapper label={ label }>
+    <LabelWrapper label={label}>
       <SemanticRadio
-        checked={ toggled }
-        className={ className }
-        onChange={ onToggle }
-        style={ style }
+        checked={toggled}
+        className={className}
+        onChange={onToggle}
+        style={style}
         toggle
       />
     </LabelWrapper>
diff --git a/src/Form/TypedInput/typedInput.js b/src/Form/TypedInput/typedInput.js
index 71f66a2..7006e0b 100644
--- a/src/Form/TypedInput/typedInput.js
+++ b/src/Form/TypedInput/typedInput.js
@@ -114,22 +114,22 @@ export default class TypedInput extends Component {
 
         return (
           <TypedInput
-            allowCopy={ allowCopy }
-            allowedValues={ allowedValues }
-            className={ className }
-            key={ `${subtype.type}_${index}` }
-            onChange={ onChange }
-            param={ subtype }
-            readOnly={ readOnly }
-            value={ value[index] }
+            allowCopy={allowCopy}
+            allowedValues={allowedValues}
+            className={className}
+            key={`${subtype.type}_${index}`}
+            onChange={onChange}
+            param={subtype}
+            readOnly={readOnly}
+            value={value[index]}
           />
         );
       });
 
       return (
         <LabelWrapper
-          className={ styles.inputs }
-          label={ label }
+          className={styles.inputs}
+          label={label}
         >
           { fixedLength || readOnly ? null : this.renderLength() }
           { inputs }
@@ -146,14 +146,14 @@ export default class TypedInput extends Component {
 
   renderLength () {
     return (
-      <div style={ { marginTop: '0.75em' } }>
+      <div style={{ marginTop: '0.75em' }}>
         <Button
-          icon={ <AddIcon /> }
-          onClick={ this.onAddField }
+          icon={<AddIcon />}
+          onClick={this.onAddField}
         />
         <Button
-          icon={ <RemoveIcon /> }
-          onClick={ this.onRemoveField }
+          icon={<RemoveIcon />}
+          onClick={this.onRemoveField}
         />
       </div>
     );
@@ -215,16 +215,16 @@ export default class TypedInput extends Component {
       : this.renderInteger(value, this.onEthValueChange);
 
     return (
-      <div className={ styles.ethInput }>
-        <div className={ styles.input }>
+      <div className={styles.ethInput}>
+        <div className={styles.input}>
           { input }
-          { isEth ? (<div className={ styles.label }>ETH</div>) : null }
+          { isEth ? (<div className={styles.label}>ETH</div>) : null }
         </div>
-        <div className={ styles.toggle }>
+        <div className={styles.toggle}>
           <Toggle
-            toggled={ this.state.isEth }
-            onToggle={ this.onEthTypeChange }
-            style={ { width: 46 } }
+            toggled={this.state.isEth}
+            onToggle={this.onEthTypeChange}
+            style={{ width: 46 }}
           />
         </div>
       </div>
@@ -255,18 +255,18 @@ export default class TypedInput extends Component {
 
     return (
       <Input
-        allowCopy={ allowCopy ? this.getNumberValue(value, false) : undefined }
-        className={ className }
-        label={ label }
-        hint={ hint }
-        value={ realValue }
-        error={ error }
-        onChange={ onChange }
-        readOnly={ readOnly }
-        type={ readOnly ? 'text' : 'number' }
-        step={ 1 }
-        min={ min !== null ? min : (param.signed ? null : 0) }
-        max={ max !== null ? max : null }
+        allowCopy={allowCopy ? this.getNumberValue(value, false) : undefined}
+        className={className}
+        label={label}
+        hint={hint}
+        value={realValue}
+        error={error}
+        onChange={onChange}
+        readOnly={readOnly}
+        type={readOnly ? 'text' : 'number'}
+        step={1}
+        min={min !== null ? min : (param.signed ? null : 0)}
+        max={max !== null ? max : null}
       />
     );
   }
@@ -286,17 +286,17 @@ export default class TypedInput extends Component {
 
     return (
       <Input
-        allowCopy={ allowCopy ? this.getNumberValue(value, false) : undefined }
-        className={ className }
-        label={ label }
-        hint={ hint }
-        value={ realValue }
-        error={ error }
-        onChange={ onChange }
-        readOnly={ readOnly }
+        allowCopy={allowCopy ? this.getNumberValue(value, false) : undefined}
+        className={className}
+        label={label}
+        hint={hint}
+        value={realValue}
+        error={error}
+        onChange={onChange}
+        readOnly={readOnly}
         type='text'
-        min={ min !== null ? min : (param.signed ? null : 0) }
-        max={ max !== null ? max : null }
+        min={min !== null ? min : (param.signed ? null : 0)}
+        max={max !== null ? max : null}
       />
     );
   }
@@ -306,14 +306,14 @@ export default class TypedInput extends Component {
 
     return (
       <Input
-        allowCopy={ allowCopy }
-        className={ className }
-        label={ label }
-        hint={ hint }
-        value={ value }
-        error={ error }
-        onSubmit={ this.onSubmit }
-        readOnly={ readOnly }
+        allowCopy={allowCopy}
+        className={className}
+        label={label}
+        hint={hint}
+        value={value}
+        error={error}
+        onSubmit={this.onSubmit}
+        readOnly={readOnly}
       />
     );
   }
@@ -324,15 +324,15 @@ export default class TypedInput extends Component {
 
     return (
       <InputAddressSelect
-        allowCopy={ allowCopy }
-        allowedValues={ allowedValues }
-        className={ className }
-        error={ error }
-        hint={ hint }
-        label={ label }
-        onChange={ this.onChange }
-        readOnly={ readOnly }
-        value={ value }
+        allowCopy={allowCopy}
+        allowedValues={allowedValues}
+        className={className}
+        error={error}
+        hint={hint}
+        label={label}
+        onChange={this.onChange}
+        readOnly={readOnly}
+        value={value}
       />
     );
   }
@@ -349,13 +349,13 @@ export default class TypedInput extends Component {
 
     return (
       <Dropdown
-        allowCopy={ allowCopy }
-        className={ className }
-        error={ error }
-        hint={ hint }
-        label={ label }
-        onChange={ this.onChangeBool }
-        value={ value }
+        allowCopy={allowCopy}
+        className={className}
+        error={error}
+        hint={hint}
+        label={label}
+        onChange={this.onChangeBool}
+        value={value}
         options={
           ['false', 'true'].map((bool) => {
             return {
diff --git a/src/Form/TypedInput/typedInput.spec.js b/src/Form/TypedInput/typedInput.spec.js
index 81ed314..5d7d39b 100644
--- a/src/Form/TypedInput/typedInput.spec.js
+++ b/src/Form/TypedInput/typedInput.spec.js
@@ -31,8 +31,8 @@ function render (props) {
   onChange = sinon.stub();
   component = shallow(
     <TypedInput
-      { ...props }
-      onChange={ onChange }
+      {...props}
+      onChange={onChange}
     />
   );
 
diff --git a/src/Form/VaultSelect/VaultSelector/vaultSelector.js b/src/Form/VaultSelect/VaultSelector/vaultSelector.js
index a520ce0..3be7f61 100644
--- a/src/Form/VaultSelect/VaultSelector/vaultSelector.js
+++ b/src/Form/VaultSelect/VaultSelector/vaultSelector.js
@@ -36,7 +36,7 @@ export default class VaultSelector extends Component {
     return (
       <Portal
         isChildModal
-        onClose={ this.onClose }
+        onClose={this.onClose}
         open
         title={
           <FormattedMessage
@@ -64,11 +64,11 @@ export default class VaultSelector extends Component {
 
     return (
       <SelectionList
-        items={ vaultsOpened }
-        isChecked={ this.isSelected }
+        items={vaultsOpened}
+        isChecked={this.isSelected}
         noStretch
-        onSelectClick={ this.onSelect }
-        renderItem={ this.renderVault }
+        onSelectClick={this.onSelect}
+        renderItem={this.renderVault}
       />
     );
   }
@@ -78,7 +78,7 @@ export default class VaultSelector extends Component {
       <VaultCard
         hideAccounts
         hideButtons
-        vault={ vault }
+        vault={vault}
       />
     );
   }
diff --git a/src/Form/VaultSelect/VaultSelector/vaultSelector.spec.js b/src/Form/VaultSelect/VaultSelector/vaultSelector.spec.js
index 8c5fd95..125e654 100644
--- a/src/Form/VaultSelect/VaultSelector/vaultSelector.spec.js
+++ b/src/Form/VaultSelect/VaultSelector/vaultSelector.spec.js
@@ -53,10 +53,10 @@ function render () {
 
   component = shallow(
     <VaultSelector
-      onClose={ onClose }
-      onSelect={ onSelect }
+      onClose={onClose}
+      onSelect={onSelect}
       selected='firstValue'
-      vaultStore={ createVaultStore() }
+      vaultStore={createVaultStore()}
     />
   );
   instance = component.instance();
diff --git a/src/Form/VaultSelect/vaultSelect.js b/src/Form/VaultSelect/vaultSelect.js
index a069ed9..17c6801 100644
--- a/src/Form/VaultSelect/vaultSelect.js
+++ b/src/Form/VaultSelect/vaultSelect.js
@@ -63,7 +63,7 @@ export default class VaultSelect extends Component {
       <div>
         { this.renderSelector() }
         <InputAddress
-          allowCopy={ false }
+          allowCopy={false}
           allowInvalid
           disabled
           hint={
@@ -78,8 +78,8 @@ export default class VaultSelect extends Component {
               defaultMessage='associated vault'
             />
           }
-          onClick={ this.openSelector }
-          value={ (value || '').toUpperCase() }
+          onClick={this.openSelector}
+          value={(value || '').toUpperCase()}
         />
       </div>
     );
@@ -95,10 +95,10 @@ export default class VaultSelect extends Component {
 
     return (
       <VaultSelector
-        onClose={ this.closeSelector }
-        onSelect={ this.onSelect }
-        selected={ value }
-        vaultStore={ this.vaultStore }
+        onClose={this.closeSelector}
+        onSelect={this.onSelect}
+        selected={value}
+        vaultStore={this.vaultStore}
       />
     );
   }
diff --git a/src/Form/VaultSelect/vaultSelect.spec.js b/src/Form/VaultSelect/vaultSelect.spec.js
index 8b41cac..90480f4 100644
--- a/src/Form/VaultSelect/vaultSelect.spec.js
+++ b/src/Form/VaultSelect/vaultSelect.spec.js
@@ -40,9 +40,9 @@ function render () {
 
   component = shallow(
     <VaultSelect
-      onSelect={ onSelect }
+      onSelect={onSelect}
       value='initialValue'
-      vaultStore={ createVaultStore() }
+      vaultStore={createVaultStore()}
     />
   );
   instance = component.instance();
diff --git a/src/Form/form.js b/src/Form/form.js
index 39c4782..3416872 100644
--- a/src/Form/form.js
+++ b/src/Form/form.js
@@ -21,8 +21,8 @@ import styles from './form.css';
 
 export default function Form ({ children, className }) {
   return (
-    <div className={ `${styles.form} ${className}` }>
-      <div className={ styles.autofill }>
+    <div className={`${styles.form} ${className}`}>
+      <div className={styles.autofill}>
         <input type='text' name='fakeusernameremembered' />
         <input type='password' name='fakepasswordremembered' />
       </div>
diff --git a/src/GasPriceEditor/gasPriceEditor.js b/src/GasPriceEditor/gasPriceEditor.js
index 03ac93f..7f9b75b 100644
--- a/src/GasPriceEditor/gasPriceEditor.js
+++ b/src/GasPriceEditor/gasPriceEditor.js
@@ -80,9 +80,9 @@ export default class GasPriceEditor extends Component {
     const priceLabel = `price (current: ${new BigNumber(priceDefault).toFormat()})`;
 
     return (
-      <div className={ styles.container }>
+      <div className={styles.container}>
         <RadioButtons
-          className={ styles.conditionRadio }
+          className={styles.conditionRadio}
           label={
             <FormattedMessage
               id='txEditor.condition.label'
@@ -90,20 +90,20 @@ export default class GasPriceEditor extends Component {
             />
           }
           name='conditionType'
-          onChange={ this.onChangeConditionType }
-          value={ conditionType }
-          values={ CONDITION_VALUES }
+          onChange={this.onChangeConditionType}
+          value={conditionType}
+          values={CONDITION_VALUES}
         />
         { this.renderConditions() }
 
-        <div className={ styles.graphContainer }>
-          <div className={ styles.graphColumn }>
+        <div className={styles.graphContainer}>
+          <div className={styles.graphColumn}>
             <GasPriceSelector
-              histogram={ histogram }
-              onChange={ this.onEditGasPrice }
-              price={ price }
+              histogram={histogram}
+              onChange={this.onEditGasPrice}
+              price={price}
             />
-            <div className={ styles.gasPriceDesc }>
+            <div className={styles.gasPriceDesc}>
               <FormattedMessage
                 id='txEditor.gas.info'
                 defaultMessage='You can choose the gas price based on the distribution of recent included transaction gas prices. The lower the gas price is, the cheaper the transaction will be. The higher the gas price is, the faster it should get mined by the network.'
@@ -111,37 +111,37 @@ export default class GasPriceEditor extends Component {
             </div>
           </div>
 
-          <div className={ styles.editColumn }>
-            <div className={ styles.row }>
+          <div className={styles.editColumn}>
+            <div className={styles.row}>
               <Input
-                error={ errorGas }
+                error={errorGas}
                 hint='the amount of gas to use for the transaction'
-                label={ gasLabel }
-                min={ 1 }
-                onChange={ this.onEditGas }
+                label={gasLabel}
+                min={1}
+                onChange={this.onEditGas}
                 type='number'
-                value={ gas }
+                value={gas}
               />
               <Input
-                error={ errorPrice }
+                error={errorPrice}
                 hint='the price of gas to use for the transaction'
-                label={ priceLabel }
-                min={ 1 }
-                onChange={ this.onEditGasPrice }
+                label={priceLabel}
+                min={1}
+                onChange={this.onEditGasPrice}
                 type='number'
-                value={ price }
+                value={price}
               />
             </div>
-            <div className={ styles.row }>
+            <div className={styles.row}>
               <Input
                 disabled
-                error={ errorTotal }
+                error={errorTotal}
                 hint='the total amount of the transaction'
                 label='total transaction amount'
-                value={ `${eth} ETH` }
+                value={`${eth} ETH`}
               />
             </div>
-            <div className={ styles.row }>
+            <div className={styles.row}>
               { children }
             </div>
           </div>
@@ -159,10 +159,10 @@ export default class GasPriceEditor extends Component {
 
     if (conditionType === CONDITIONS.BLOCK) {
       return (
-        <div className={ styles.conditionContainer }>
-          <div className={ styles.input }>
+        <div className={styles.conditionContainer}>
+          <div className={styles.input}>
             <Input
-              error={ conditionBlockError }
+              error={conditionBlockError}
               hint={
                 <FormattedMessage
                   id='txEditor.condition.block.hint'
@@ -175,10 +175,10 @@ export default class GasPriceEditor extends Component {
                   defaultMessage='Transaction send block'
                 />
               }
-              min={ 1 }
-              onChange={ this.onChangeConditionBlock }
+              min={1}
+              onChange={this.onChangeConditionBlock}
               type='number'
-              value={ condition.block }
+              value={condition.block}
             />
           </div>
         </div>
@@ -186,8 +186,8 @@ export default class GasPriceEditor extends Component {
     }
 
     return (
-      <div className={ styles.conditionContainer }>
-        <div className={ styles.input }>
+      <div className={styles.conditionContainer}>
+        <div className={styles.input}>
           <InputDateTime
             hint={
               <FormattedMessage
@@ -201,8 +201,8 @@ export default class GasPriceEditor extends Component {
                 defaultMessage='Transaction send date and time'
               />
             }
-            onChange={ this.onChangeConditionDateTime }
-            value={ condition.time }
+            onChange={this.onChangeConditionDateTime}
+            value={condition.time}
           />
         </div>
       </div>
diff --git a/src/GasPriceEditor/gasPriceEditor.spec.js b/src/GasPriceEditor/gasPriceEditor.spec.js
index dad2cd2..019bfe8 100644
--- a/src/GasPriceEditor/gasPriceEditor.spec.js
+++ b/src/GasPriceEditor/gasPriceEditor.spec.js
@@ -62,8 +62,8 @@ function render (props = {}) {
 
   component = shallow(
     <GasPriceEditor
-      store={ store }
-      { ...props }
+      store={store}
+      {...props}
     />,
     {
       context: {
diff --git a/src/GasPriceSelector/CustomBar/customBar.js b/src/GasPriceSelector/CustomBar/customBar.js
index 3aa580c..b447a4f 100644
--- a/src/GasPriceSelector/CustomBar/customBar.js
+++ b/src/GasPriceSelector/CustomBar/customBar.js
@@ -44,33 +44,33 @@ export default class CustomBar extends Component {
     return (
       <g>
         <Rectangle
-          x={ x - borderWidth }
-          y={ y }
-          width={ borderWidth }
-          height={ height }
-          fill={ borderColor }
+          x={x - borderWidth}
+          y={y}
+          width={borderWidth}
+          height={height}
+          fill={borderColor}
         />
         <Rectangle
-          x={ x + width }
-          y={ y }
-          width={ borderWidth }
-          height={ height }
-          fill={ borderColor }
+          x={x + width}
+          y={y}
+          width={borderWidth}
+          height={height}
+          fill={borderColor}
         />
         <Rectangle
-          x={ x - borderWidth }
-          y={ y - borderWidth }
-          width={ width + borderWidth * 2 }
-          height={ borderWidth }
-          fill={ borderColor }
+          x={x - borderWidth}
+          y={y - borderWidth}
+          width={width + borderWidth * 2}
+          height={borderWidth}
+          fill={borderColor}
         />
         <Rectangle
-          x={ x }
-          y={ y }
-          width={ width }
-          height={ height }
-          fill={ fill }
-          onClick={ onClick }
+          x={x}
+          y={y}
+          width={width}
+          height={height}
+          fill={fill}
+          onClick={onClick}
         />
       </g>
     );
diff --git a/src/GasPriceSelector/CustomCursor/customCursor.js b/src/GasPriceSelector/CustomCursor/customCursor.js
index 4490175..f700cd8 100644
--- a/src/GasPriceSelector/CustomCursor/customCursor.js
+++ b/src/GasPriceSelector/CustomCursor/customCursor.js
@@ -47,20 +47,20 @@ export default class CustomCursor extends Component {
     return (
       <g>
         <Rectangle
-          x={ x }
-          y={ 0 }
-          width={ width }
-          height={ height + y }
+          x={x}
+          y={0}
+          width={width}
+          height={height + y}
           fill='transparent'
-          onClick={ this.onClick }
+          onClick={this.onClick}
         />
         <Rectangle
-          x={ x }
-          y={ y + (height - barHeight) }
-          width={ width }
-          height={ barHeight }
-          fill={ COLORS.hover }
-          onClick={ this.onClick }
+          x={x}
+          y={y + (height - barHeight)}
+          width={width}
+          height={barHeight}
+          fill={COLORS.hover}
+          onClick={this.onClick}
         />
       </g>
     );
diff --git a/src/GasPriceSelector/CustomShape/customShape.js b/src/GasPriceSelector/CustomShape/customShape.js
index 3b6d237..2def9f5 100644
--- a/src/GasPriceSelector/CustomShape/customShape.js
+++ b/src/GasPriceSelector/CustomShape/customShape.js
@@ -36,16 +36,16 @@ export default class CustomShape extends Component {
     return (
       <g>
         <Dot
-          style={ { fill: 'rgb(129, 190, 226)' } }
-          cx={ cx }
-          cy={ cy }
-          r={ 5 }
+          style={{ fill: 'rgb(129, 190, 226)' }}
+          cx={cx}
+          cy={cy}
+          r={5}
         />
         <Dot
-          style={ { fill: 'rgb(129, 190, 226)', zIndex: '700' } }
-          cx={ cx }
-          cy={ cy }
-          r={ 3 }
+          style={{ fill: 'rgb(129, 190, 226)', zIndex: '700' }}
+          cx={cx}
+          cy={cy}
+          r={3}
         />
       </g>
     );
diff --git a/src/GasPriceSelector/CustomTooltip/customTooltip.js b/src/GasPriceSelector/CustomTooltip/customTooltip.js
index e987ba9..86a058a 100644
--- a/src/GasPriceSelector/CustomTooltip/customTooltip.js
+++ b/src/GasPriceSelector/CustomTooltip/customTooltip.js
@@ -49,11 +49,11 @@ export default class CustomTooltip extends Component {
           <FormattedMessage
             id='ui.gasPriceSelector.customTooltip.transactions'
             defaultMessage='{number} {number, plural, one {transaction} other {transactions}} with gas price set from {minPrice} to {maxPrice}'
-            values={ {
+            values={{
               number: count.toNumber(),
               minPrice: <span>{ minprice.toFormat(0) }</span>,
               maxPrice: <span>{ maxprice.toFormat(0) }</span>
-            } }
+            }}
           />
         </p>
       </div>
diff --git a/src/GasPriceSelector/gasPriceSelector.js b/src/GasPriceSelector/gasPriceSelector.js
index b10cab1..596ce9e 100644
--- a/src/GasPriceSelector/gasPriceSelector.js
+++ b/src/GasPriceSelector/gasPriceSelector.js
@@ -103,66 +103,66 @@ export default class GasPriceSelector extends Component {
     const selectedCount = countModifier(histogram.counts[countIndex]);
 
     return (
-      <div className={ styles.chartRow }>
-        <div style={ { flex: 1, height } }>
+      <div className={styles.chartRow}>
+        <div style={{ flex: 1, height }}>
 
-          <div className={ styles.chart }>
-            <ResponsiveContainer height={ height }>
-              <ScatterChart margin={ { top: 0, right: 0, left: 0, bottom: 0 } }>
+          <div className={styles.chart}>
+            <ResponsiveContainer height={height}>
+              <ScatterChart margin={{ top: 0, right: 0, left: 0, bottom: 0 }}>
                 <Scatter
-                  data={ [
+                  data={[
                     { x: sliderValue, y: 0 },
                     { x: sliderValue, y: selectedCount },
                     { x: sliderValue, y: chartData.yDomain[1] }
-                  ] }
-                  isAnimationActive={ false }
+                  ]}
+                  isAnimationActive={false}
                   line
                   shape={
-                    <CustomShape showValue={ selectedCount } />
+                    <CustomShape showValue={selectedCount} />
                   }
                 />
                 <XAxis
                   dataKey='x'
-                  domain={ [0, 1] }
+                  domain={[0, 1]}
                   hide
-                  height={ 0 }
+                  height={0}
                 />
                 <YAxis
                   dataKey='y'
-                  domain={ chartData.yDomain }
+                  domain={chartData.yDomain}
                   hide
-                  width={ 0 }
+                  width={0}
                 />
               </ScatterChart>
             </ResponsiveContainer>
           </div>
 
-          <div className={ styles.chart }>
-            <ResponsiveContainer height={ height }>
+          <div className={styles.chart}>
+            <ResponsiveContainer height={height}>
               <BarChart
-                barCategoryGap={ 1 }
-                data={ chartData.values }
-                margin={ { top: 0, right: 0, left: 0, bottom: 0 } }
+                barCategoryGap={1}
+                data={chartData.values}
+                margin={{ top: 0, right: 0, left: 0, bottom: 0 }}
                 ref='barChart'
               >
                 <Bar
                   dataKey='value'
-                  onClick={ this.onClickprice }
-                  shape={ <CustomBar selected={ selectedIndex } onClick={ this.onClickprice } /> }stroke={ COLORS.line }
+                  onClick={this.onClickprice}
+                  shape={<CustomBar selected={selectedIndex} onClick={this.onClickprice} />}stroke={COLORS.line}
                 />
                 <Tooltip
-                  content={ this.tooltipContentRenderer }
-                  cursor={ this.renderCustomCursor() }
-                  wrapperStyle={ TOOL_STYLE }
+                  content={this.tooltipContentRenderer}
+                  cursor={this.renderCustomCursor()}
+                  wrapperStyle={TOOL_STYLE}
                 />
                 <XAxis
                   dataKey='index'
-                  domain={ chartData.xDomain }
+                  domain={chartData.xDomain}
                   hide
                   type='category'
                 />
                 <YAxis
-                  domain={ chartData.yDomain }
+                  domain={chartData.yDomain}
                   hide
                   type='number'
                 />
@@ -184,9 +184,9 @@ export default class GasPriceSelector extends Component {
 
     return (
       <CustomTooltip
-        histogram={ histogram }
-        intl={ this.context.intl }
-        { ...props }
+        histogram={histogram}
+        intl={this.context.intl}
+        {...props}
       />
     );
   }
@@ -195,14 +195,14 @@ export default class GasPriceSelector extends Component {
     const { sliderValue } = this.state;
 
     return (
-      <div className={ styles.sliderRow }>
+      <div className={styles.sliderRow}>
         <Slider
-          className={ styles.slider }
-          min={ 0.0 }
-          max={ 1.0 }
-          step={ 0.01 }
-          value={ sliderValue }
-          onChange={ this.onEditpriceSlider }
+          className={styles.slider}
+          min={0.0}
+          max={1.0}
+          step={0.01}
+          value={sliderValue}
+          onChange={this.onEditpriceSlider}
         />
       </div>
     );
@@ -214,10 +214,10 @@ export default class GasPriceSelector extends Component {
 
     return (
       <CustomCursor
-        counts={ histogram.counts }
-        getIndex={ this.getBarHoverIndex }
-        onClick={ this.onClickprice }
-        yDomain={ chartData.yDomain }
+        counts={histogram.counts}
+        getIndex={this.getBarHoverIndex}
+        onClick={this.onClickprice}
+        yDomain={chartData.yDomain}
       />
     );
   }
@@ -250,8 +250,10 @@ export default class GasPriceSelector extends Component {
     const yDomain = [0, maxGasCounts * 1.1];
 
     const chartData = {
-      values, N,
-      xDomain, yDomain
+      values,
+      N,
+      xDomain,
+      yDomain
     };
 
     this.setState({ chartData }, () => {
diff --git a/src/GradientBg/gradientBg.js b/src/GradientBg/gradientBg.js
index 599ed38..2013c14 100644
--- a/src/GradientBg/gradientBg.js
+++ b/src/GradientBg/gradientBg.js
@@ -21,7 +21,7 @@ import styles from './gradientBg.css';
 
 export default function GradientBg ({ children, className }) {
   return (
-    <div className={ [styles.background, className].join(' ') }>
+    <div className={[styles.background, className].join(' ')}>
       { children }
     </div>
   );
diff --git a/src/Icons/index.js b/src/Icons/index.js
index f271654..39716a8 100644
--- a/src/Icons/index.js
+++ b/src/Icons/index.js
@@ -18,7 +18,7 @@ import React from 'react';
 import { Icon } from 'semantic-ui-react';
 
 export function createIcon (name, props = {}) {
-  return <Icon name={ name } { ...props } />;
+  return <Icon name={name} {...props} />;
 }
 
 export const AccountsIcon = (props) => createIcon('university', props);
diff --git a/src/IdentityIcon/identityIcon.js b/src/IdentityIcon/identityIcon.js
index a04c194..be8dcf6 100644
--- a/src/IdentityIcon/identityIcon.js
+++ b/src/IdentityIcon/identityIcon.js
@@ -114,40 +114,40 @@ export default class IdentityIcon extends Component {
     if (!address) {
       return (
         <ContractIcon
-          className={ classes }
+          className={classes}
           data-address-img
-          onClick={ onClick }
-          style={ {
+          onClick={onClick}
+          style={{
             background: '#eee',
             height: size,
             width: size
-          } }
+          }}
         />
       );
     } else if (isNullAddress(address)) {
       return (
         <CancelIcon
-          className={ classes }
+          className={classes}
           data-address-img
-          onClick={ onClick }
-          style={ {
+          onClick={onClick}
+          style={{
             background: '#333',
             height: size,
             width: size
-          } }
+          }}
         />
       );
     }
 
     return (
       <img
-        alt={ alt || address }
-        className={ classes }
+        alt={alt || address}
+        className={classes}
         data-address-img
-        height={ size }
-        onClick={ onClick }
-        width={ size }
-        src={ iconsrc }
+        height={size}
+        onClick={onClick}
+        width={size}
+        src={iconsrc}
       />
     );
   }
diff --git a/src/IdentityIcon/identityIcon.spec.js b/src/IdentityIcon/identityIcon.spec.js
index e1ed458..9900346 100644
--- a/src/IdentityIcon/identityIcon.spec.js
+++ b/src/IdentityIcon/identityIcon.spec.js
@@ -42,7 +42,7 @@ function render (props = {}) {
   }
 
   component = shallow(
-    <IdentityIcon { ...props } />,
+    <IdentityIcon {...props} />,
     { context: { api: createApi() } }
   );
 
diff --git a/src/IdentityName/identityName.js b/src/IdentityName/identityName.js
index 71437ee..b081d72 100644
--- a/src/IdentityName/identityName.js
+++ b/src/IdentityName/identityName.js
@@ -42,7 +42,7 @@ export function IdentityName ({ account, address, className, empty, name, shorte
   }
 
   const nullName = isNullAddress(address) ? defaultNameNull : null;
-  const addressFallback = nullName || (shorten ? (<ShortenedHash data={ address } />) : address);
+  const addressFallback = nullName || (shorten ? (<ShortenedHash data={address} />) : address);
   const fallback = unknown ? defaultName : addressFallback;
   const isUuid = account && account.name === account.uuid;
   const displayName = (name && name.toUpperCase().trim()) ||
@@ -52,7 +52,7 @@ export function IdentityName ({ account, address, className, empty, name, shorte
     );
 
   return (
-    <span className={ className }>
+    <span className={className}>
       {
         displayName && displayName.length
           ? displayName
diff --git a/src/IdentityName/identityName.spec.js b/src/IdentityName/identityName.spec.js
index 5876283..07c72da 100644
--- a/src/IdentityName/identityName.spec.js
+++ b/src/IdentityName/identityName.spec.js
@@ -29,7 +29,7 @@ const NAME_JIMMY = 'Jimmy Test';
 function render (props) {
   return shallow(
     <IdentityName
-      { ...props }
+      {...props}
     />
   );
 }
diff --git a/src/LanguageSelector/languageSelector.js b/src/LanguageSelector/languageSelector.js
index ea77ceb..08b40c2 100644
--- a/src/LanguageSelector/languageSelector.js
+++ b/src/LanguageSelector/languageSelector.js
@@ -58,15 +58,15 @@ export default class LanguageSelector extends Component {
             defaultMessage='UI language'
           />
         }
-        value={ this.store.locale }
-        onChange={ this.onChange }
+        value={this.store.locale}
+        onChange={this.onChange}
         options={
           this.store.locales.map((locale) => {
             return {
               key: locale,
               value: locale,
               text: locale,
-              content: <FormattedMessage id={ `languages.${locale}` } />
+              content: <FormattedMessage id={`languages.${locale}`} />
             };
           })
         }
diff --git a/src/LanguageSelector/langugeSelector.spec.js b/src/LanguageSelector/langugeSelector.spec.js
index f3261ff..feb08c3 100644
--- a/src/LanguageSelector/langugeSelector.spec.js
+++ b/src/LanguageSelector/langugeSelector.spec.js
@@ -28,7 +28,7 @@ let component;
 
 function render (props = {}) {
   component = shallow(
-    <LanguageSelector { ...props } />
+    <LanguageSelector {...props} />
   );
 
   return component;
diff --git a/src/List/Item/item.js b/src/List/Item/item.js
index 7fcba90..e9bb240 100644
--- a/src/List/Item/item.js
+++ b/src/List/Item/item.js
@@ -23,9 +23,9 @@ import styles from './item.css';
 export default function Item ({ buttons, className, description, icon, isActive, label, onClick, style }) {
   return (
     <SemanticList.Item
-      className={ `${styles.item} ${isActive ? styles.active : styles.inactive} ${className}` }
-      onClick={ onClick }
-      style={ style }
+      className={`${styles.item} ${isActive ? styles.active : styles.inactive} ${className}`}
+      onClick={onClick}
+      style={style}
     >
       {
         icon && (
@@ -35,13 +35,13 @@ export default function Item ({ buttons, className, description, icon, isActive,
         )
       }
       <SemanticList.Content>
-        <div className={ styles.label }>
+        <div className={styles.label}>
           { label }
         </div>
-        <div className={ styles.description }>
+        <div className={styles.description}>
           { description }
         </div>
-        <div className={ styles.buttons }>
+        <div className={styles.buttons}>
           { buttons }
         </div>
       </SemanticList.Content>
diff --git a/src/List/list.js b/src/List/list.js
index 5db2ee6..b15eaa0 100644
--- a/src/List/list.js
+++ b/src/List/list.js
@@ -29,18 +29,18 @@ export default function List ({ className, items, label, onClick, style }) {
   };
 
   return (
-    <LabelWrapper label={ label }>
-      <SemanticList className={ `${styles.list} ${className}` }>
+    <LabelWrapper label={label}>
+      <SemanticList className={`${styles.list} ${className}`}>
         {
           items.filter((item) => item).map(({ buttons, description, icon, isActive, key, label }, index) => (
             <Item
-              buttons={ buttons }
-              description={ description }
-              icon={ icon }
-              isActive={ isActive }
-              key={ key || index }
-              label={ label }
-              onClick={ wrapOnClick(key || index) }
+              buttons={buttons}
+              description={description}
+              icon={icon}
+              isActive={isActive}
+              key={key || index}
+              label={label}
+              onClick={wrapOnClick(key || index)}
             />
           ))
         }
diff --git a/src/Loading/loading.js b/src/Loading/loading.js
index ae7cbf2..aaff879 100644
--- a/src/Loading/loading.js
+++ b/src/Loading/loading.js
@@ -22,7 +22,7 @@ import styles from './loading.css';
 
 export default function Loading ({ className, size = 'medium' }) {
   return (
-    <div className={ `${styles.loading} ${className}` }>
+    <div className={`${styles.loading} ${className}`}>
       <SemanticLoader />
     </div>
   );
diff --git a/src/MethodDecoding/methodDecoding.js b/src/MethodDecoding/methodDecoding.js
index 2aaa179..dafc706 100644
--- a/src/MethodDecoding/methodDecoding.js
+++ b/src/MethodDecoding/methodDecoding.js
@@ -96,14 +96,14 @@ class MethodDecoding extends Component {
 
     if (isLoading) {
       return (
-        <div className={ styles.loading }>
+        <div className={styles.loading}>
           <Loading />
         </div>
       );
     }
 
     return (
-      <div className={ styles.container }>
+      <div className={styles.container}>
         { this.renderAction() }
         { this.renderGas() }
       </div>
@@ -119,48 +119,48 @@ class MethodDecoding extends Component {
     }
 
     const gasProvided = (
-      <span className={ styles.highlight }>
+      <span className={styles.highlight}>
         <FormattedMessage
           id='ui.methodDecoding.gasValues'
           defaultMessage='{gas} gas ({gasPrice}M/{tag})'
-          values={ {
+          values={{
             gas: gas.toFormat(0),
             gasPrice: gasPrice.div(1000000).toFormat(0),
             tag: <small>ETH</small>
-          } }
+          }}
         />
       </span>
     );
     const totalEthValue = (
-      <span className={ styles.highlight }>
+      <span className={styles.highlight}>
         { this.renderEtherValue(gas.mul(gasPrice).plus(value || 0)) }
       </span>
     );
     const gasUsed = transaction.gasUsed
       ? (
-        <span className={ styles.highlight }>
+        <span className={styles.highlight}>
           <FormattedMessage
             id='ui.methodDecoding.gasUsed'
             defaultMessage=' ({gas} gas used)'
-            values={ {
+            values={{
               gas: transaction.gasUsed.toFormat(0)
-            } }
+            }}
           />
         </span>
       )
       : '';
 
     return (
-      <div className={ styles.gasDetails }>
+      <div className={styles.gasDetails}>
         <FormattedMessage
           id='ui.methodDecoding.txValues'
           defaultMessage='{historic, select, true {Provided} false {Provides}} {gasProvided}{gasUsed} for a total transaction value of {totalEthValue}'
-          values={ {
+          values={{
             historic,
             gasProvided,
             gasUsed,
             totalEthValue
-          } }
+          }}
         />
         { this.renderMinBlock() }
       </div>
@@ -179,7 +179,7 @@ class MethodDecoding extends Component {
 
     if (blockCondition.gt(0)) {
       const blockNumber = (
-        <span className={ styles.highlight }>
+        <span className={styles.highlight}>
           #{ blockCondition.toFormat(0) }
         </span>
       );
@@ -189,10 +189,10 @@ class MethodDecoding extends Component {
           <FormattedMessage
             id='ui.methodDecoding.condition.block'
             defaultMessage='{historic, select, true {Will be submitted} false {To be submitted}} at block {blockNumber}'
-            values={ {
+            values={{
               historic,
               blockNumber
-            } }
+            }}
           />
         </div>
       );
@@ -200,7 +200,7 @@ class MethodDecoding extends Component {
 
     if (condition.time) {
       const timestamp = (
-        <span className={ styles.highlight }>
+        <span className={styles.highlight}>
           { moment(condition.time).format('LLLL') }
         </span>
       );
@@ -210,10 +210,10 @@ class MethodDecoding extends Component {
           <FormattedMessage
             id='ui.methodDecoding.condition.time'
             defaultMessage='{historic, select, true {Will be submitted} false {To be submitted}} {timestamp}'
-            values={ {
+            values={{
               historic,
               timestamp
-            } }
+            }}
           />
         </div>
       );
@@ -288,8 +288,8 @@ class MethodDecoding extends Component {
 
     const inputDesc = (
       <span
-        onClick={ this.toggleInputType }
-        className={ [ styles.clickable, styles.noSelect ].join(' ') }
+        onClick={this.toggleInputType}
+        className={[ styles.clickable, styles.noSelect ].join(' ')}
       >
         {
           type === 'ascii'
@@ -310,24 +310,24 @@ class MethodDecoding extends Component {
     );
     const inputValue = (
       <span
-        onClick={ this.toggleInputExpand }
-        className={ expandable ? styles.clickable : '' }
+        onClick={this.toggleInputExpand}
+        className={expandable ? styles.clickable : ''}
       >
-        <code className={ styles.inputData }>
+        <code className={styles.inputData}>
           { textToShow }
         </code>
       </span>
     );
 
     return (
-      <div className={ styles.details }>
+      <div className={styles.details}>
         <FormattedMessage
           id='ui.methodDecoding.input.withInput'
           defaultMessage='with the {inputDesc} {inputValue}'
-          values={ {
+          values={{
             inputDesc,
             inputValue
-          } }
+          }}
         />
       </div>
     );
@@ -343,19 +343,19 @@ class MethodDecoding extends Component {
       case 'transfer(to,value)':
       default:
         return (
-          <div className={ styles.details }>
+          <div className={styles.details}>
             <FormattedMessage
               id='ui.methodDecoding.token.transfer'
               defaultMessage='{historic, select, true {Transferred} false {Will transfer}} {value} to {address}'
-              values={ {
+              values={{
                 historic,
                 value: (
-                  <span className={ styles.highlight }>
+                  <span className={styles.highlight}>
                     { this.renderTokenValue(value.value) }
                   </span>
                 ),
                 address: this.renderAddressName(address)
-              } }
+              }}
             />
           </div>
         );
@@ -369,7 +369,7 @@ class MethodDecoding extends Component {
 
     if (!historic) {
       return (
-        <div className={ styles.details }>
+        <div className={styles.details}>
           <FormattedMessage
             id='ui.methodDecoding.deploy.willDeploy'
             defaultMessage='Will deploy a contract'
@@ -380,9 +380,9 @@ class MethodDecoding extends Component {
                 <FormattedMessage
                   id='ui.methodDecoding.deploy.withValue'
                   defaultMessage=', sending {value}'
-                  values={ {
+                  values={{
                     value: this.renderEtherValue(value)
-                  } }
+                  }}
                 />
               )
               : null
@@ -392,7 +392,7 @@ class MethodDecoding extends Component {
     }
 
     return (
-      <div className={ styles.details }>
+      <div className={styles.details}>
         <div>
           <FormattedMessage
             id='ui.methodDecoding.deploy.address'
@@ -408,7 +408,7 @@ class MethodDecoding extends Component {
                   id='ui.methodDecoding.deploy.params'
                   defaultMessage='with the following parameters:'
                 />
-                <div className={ styles.inputs }>
+                <div className={styles.inputs}>
                   { this.renderInputs() }
                 </div>
               </div>
@@ -424,7 +424,7 @@ class MethodDecoding extends Component {
     const { isContract } = this.state;
 
     const valueEth = (
-      <span className={ styles.highlight }>
+      <span className={styles.highlight}>
         { this.renderEtherValue(transaction.value) }
       </span>
     );
@@ -438,16 +438,16 @@ class MethodDecoding extends Component {
       : '';
 
     return (
-      <div className={ styles.details }>
+      <div className={styles.details}>
         <FormattedMessage
           id='ui.methodDecoding.receive.info'
           defaultMessage='{historic, select, true {Received} false {Will receive}} {valueEth} from {aContract}{address}'
-          values={ {
+          values={{
             historic,
             valueEth,
             aContract,
             address: this.renderAddressName(transaction.from)
-          } }
+          }}
         />
         { this.renderInputValue() }
       </div>
@@ -459,7 +459,7 @@ class MethodDecoding extends Component {
     const { isContract } = this.state;
 
     const valueEth = (
-      <span className={ styles.highlight }>
+      <span className={styles.highlight}>
         { this.renderEtherValue(transaction.value) }
       </span>
     );
@@ -473,16 +473,16 @@ class MethodDecoding extends Component {
       : '';
 
     return (
-      <div className={ styles.details }>
+      <div className={styles.details}>
         <FormattedMessage
           id='ui.methodDecoding.transfer.info'
           defaultMessage='{historic, select, true {Transferred} false {Will transfer}} {valueEth} to {aContract}{address}'
-          values={ {
+          values={{
             historic,
             valueEth,
             aContract,
             address: this.renderAddressName(transaction.to)
-          } }
+          }}
         />
         { this.renderInputValue() }
       </div>
@@ -497,23 +497,23 @@ class MethodDecoding extends Component {
     const showEth = !!(transaction.value && transaction.value.gt(0));
 
     const method = (
-      <span className={ styles.name }>
+      <span className={styles.name}>
         { methodName }
       </span>
     );
     const ethValue = showEth && (
-      <span className={ styles.highlight }>
+      <span className={styles.highlight}>
         { this.renderEtherValue(transaction.value) }
       </span>
     );
 
     return (
-      <div className={ styles.details }>
-        <div className={ styles.description }>
+      <div className={styles.details}>
+        <div className={styles.description}>
           <FormattedMessage
             id='ui.methodDecoding.signature.info'
             defaultMessage='{historic, select, true {Executed} false {Will execute}} the {method} function on the contract {address} {showEth, select, true {transferring {ethValue}} false {}} {showInputs, select, false {} true {passing the following {inputLength, plural, one {parameter} other {parameters}}}}'
-            values={ {
+            values={{
               historic,
               method,
               ethValue,
@@ -521,13 +521,13 @@ class MethodDecoding extends Component {
               showInputs,
               address: this.renderAddressName(transaction.to),
               inputLength: methodInputs.length
-            } }
+            }}
           />
         </div>
         {
           showInputs
             ? (
-              <div className={ styles.inputs }>
+              <div className={styles.inputs}>
                 { this.renderInputs() }
               </div>
             )
@@ -541,27 +541,27 @@ class MethodDecoding extends Component {
     const { historic, transaction } = this.props;
 
     const method = (
-      <span className={ styles.name }>
+      <span className={styles.name}>
         an unknown/unregistered
       </span>
     );
     const ethValue = (
-      <span className={ styles.highlight }>
+      <span className={styles.highlight}>
         { this.renderEtherValue(transaction.value) }
       </span>
     );
 
     return (
-      <div className={ styles.details }>
+      <div className={styles.details}>
         <FormattedMessage
           id='ui.methodDecoding.unknown.info'
           defaultMessage='{historic, select, true {Executed} false {Will execute}} the {method} on the contract {address} transferring {ethValue}.'
-          values={ {
+          values={{
             historic,
             method,
             ethValue,
             address: this.renderAddressName(transaction.to)
-          } }
+          }}
         />
       </div>
     );
@@ -582,12 +582,12 @@ class MethodDecoding extends Component {
       return (
         <TypedInput
           allowCopy
-          className={ styles.input }
-          label={ label }
-          key={ index }
-          param={ input.type }
+          className={styles.input}
+          label={label}
+          key={index}
+          param={input.type}
           readOnly
-          value={ input.value }
+          value={input.value}
         />
       );
     });
@@ -599,7 +599,7 @@ class MethodDecoding extends Component {
     const { token } = this.props;
 
     return (
-      <span className={ styles.tokenValue }>
+      <span className={styles.tokenValue}>
         { value.div(token.format).toFormat(5) }<small> { token.tag }</small>
       </span>
     );
@@ -610,7 +610,7 @@ class MethodDecoding extends Component {
     const ether = api.util.fromWei(value);
 
     return (
-      <span className={ styles.etherValue }>
+      <span className={styles.etherValue}>
         { ether.toFormat(5) }<small> ETH</small>
       </span>
     );
@@ -618,12 +618,12 @@ class MethodDecoding extends Component {
 
   renderAddressName (address, withName = true) {
     return (
-      <div className={ styles.addressContainer }>
+      <div className={styles.addressContainer}>
         <InputAddress
           disabled
-          className={ styles.address }
-          value={ address }
-          text={ withName }
+          className={styles.address}
+          value={address}
+          text={withName}
         />
       </div>
     );
diff --git a/src/MethodDecoding/tokenValue.js b/src/MethodDecoding/tokenValue.js
index 303ae0c..ec0c62d 100644
--- a/src/MethodDecoding/tokenValue.js
+++ b/src/MethodDecoding/tokenValue.js
@@ -60,7 +60,7 @@ class TokenValue extends Component {
       : 'TOKENS';
 
     return (
-      <span className={ styles.tokenValue }>
+      <span className={styles.tokenValue}>
         { value.div(format).toFormat(precision) }<small> { tag }</small>
       </span>
     );
diff --git a/src/Modal/Busy/busy.js b/src/Modal/Busy/busy.js
index 4f28f1c..74e6f15 100644
--- a/src/Modal/Busy/busy.js
+++ b/src/Modal/Busy/busy.js
@@ -23,11 +23,11 @@ import styles from './busy.css';
 
 export default function Busy ({ children, state, title }) {
   return (
-    <div className={ styles.center }>
-      <div className={ styles.title }>
+    <div className={styles.center}>
+      <div className={styles.title}>
         { title }
       </div>
-      <div className={ styles.state }>
+      <div className={styles.state}>
         { state }
       </div>
       { children }
diff --git a/src/Modal/Completed/completed.js b/src/Modal/Completed/completed.js
index 9cfd9b8..63f358a 100644
--- a/src/Modal/Completed/completed.js
+++ b/src/Modal/Completed/completed.js
@@ -21,7 +21,7 @@ import styles from './completed.css';
 
 export default function Completed ({ children }) {
   return (
-    <div className={ styles.body }>
+    <div className={styles.body}>
       { children }
     </div>
   );
diff --git a/src/ModalBox/modalBox.js b/src/ModalBox/modalBox.js
index 9e46574..45970a7 100644
--- a/src/ModalBox/modalBox.js
+++ b/src/ModalBox/modalBox.js
@@ -23,21 +23,21 @@ import styles from './modalBox.css';
 
 export default function ModalBox ({ children, icon, summary }) {
   return (
-    <div className={ styles.body }>
-      <div className={ styles.icon }>
+    <div className={styles.body}>
+      <div className={styles.icon}>
         { icon }
       </div>
-      <div className={ styles.content }>
+      <div className={styles.content}>
         {
           summary && (
-            <div className={ styles.summary }>
+            <div className={styles.summary}>
               { summary }
             </div>
           )
         }
         {
           children && (
-            <div className={ styles.body }>
+            <div className={styles.body}>
               { children }
             </div>
           )
diff --git a/src/ModalBox/modalBox.spec.js b/src/ModalBox/modalBox.spec.js
index e270f3a..9ab2f03 100644
--- a/src/ModalBox/modalBox.spec.js
+++ b/src/ModalBox/modalBox.spec.js
@@ -30,9 +30,9 @@ const SUMMARY = <div id='testSummary'>testSummary</div>;
 function render () {
   component = shallow(
     <ModalBox
-      children={ CHILDREN }
-      icon={ ICON }
-      summary={ SUMMARY }
+      children={CHILDREN}
+      icon={ICON}
+      summary={SUMMARY}
     />
   );
 
diff --git a/src/NetChain/netChain.js b/src/NetChain/netChain.js
index 7e1bc71..2b779ce 100644
--- a/src/NetChain/netChain.js
+++ b/src/NetChain/netChain.js
@@ -26,7 +26,7 @@ function NetChain ({ className }, { api }) {
   const store = Store.get(api);
 
   return (
-    <div className={ `${styles.chain} ${styles[store.isTest ? 'test' : 'live']} ${className || ''}` }>
+    <div className={`${styles.chain} ${styles[store.isTest ? 'test' : 'live']} ${className || ''}`}>
       { store.netChain }
     </div>
   );
diff --git a/src/NetPeers/netPeers.js b/src/NetPeers/netPeers.js
index ca81a57..bc84e8a 100644
--- a/src/NetPeers/netPeers.js
+++ b/src/NetPeers/netPeers.js
@@ -32,7 +32,7 @@ function NetPeers ({ className, message }, { api }) {
   const { max, connected } = store.netPeers;
 
   return (
-    <div className={ [styles.peers, className].join(' ') }>
+    <div className={[styles.peers, className].join(' ')}>
       { connected ? connected.toFormat() : '0' }/{ max ? max.toFormat() : '0' }{ message }
     </div>
   );
diff --git a/src/Page/page.js b/src/Page/page.js
index e49e7d6..79f6a20 100644
--- a/src/Page/page.js
+++ b/src/Page/page.js
@@ -26,8 +26,8 @@ export default function Page ({ buttons, className, children, padded, title }) {
   return (
     <div>
       <Actionbar
-        buttons={ buttons }
-        title={ title }
+        buttons={buttons}
+        title={title}
       />
       <div
         className={
diff --git a/src/Page/page.spec.js b/src/Page/page.spec.js
index cd5ef3f..1c07b9c 100644
--- a/src/Page/page.spec.js
+++ b/src/Page/page.spec.js
@@ -31,9 +31,9 @@ let component;
 function render () {
   component = shallow(
     <Page
-      buttons={ BUTTONS }
-      className={ CLASSNAME }
-      title={ TITLE }
+      buttons={BUTTONS}
+      className={CLASSNAME}
+      title={TITLE}
     >
       <div id='testContent'>
         { TESTTEXT }
diff --git a/src/ParityBackground/parityBackground.js b/src/ParityBackground/parityBackground.js
index f9a173e..8942b57 100644
--- a/src/ParityBackground/parityBackground.js
+++ b/src/ParityBackground/parityBackground.js
@@ -97,13 +97,13 @@ export default class ParityBackground extends Component {
 
     return (
       <div
-        className={ className }
+        className={className}
         style={
           attachDocument
             ? {}
             : style
         }
-        onTouchTap={ onClick }
+        onTouchTap={onClick}
       >
         { children }
       </div>
diff --git a/src/PlaygroundExample/playgroundExample.js b/src/PlaygroundExample/playgroundExample.js
index 425e6d8..7a9e3d4 100644
--- a/src/PlaygroundExample/playgroundExample.js
+++ b/src/PlaygroundExample/playgroundExample.js
@@ -22,17 +22,17 @@ import styles from './playground.css';
 
 export default function PlaygroundExample ({ children, name }) {
   return (
-    <div className={ styles.exampleContainer }>
+    <div className={styles.exampleContainer}>
       {
         name
           ? <p>{ name }</p>
           : null
       }
-      <div className={ styles.example }>
-        <div className={ styles.code }>
+      <div className={styles.example}>
+        <div className={styles.code}>
           <code>{ reactElementToJSXString(children) }</code>
         </div>
-        <div className={ styles.component }>
+        <div className={styles.component}>
           { children }
         </div>
       </div>
diff --git a/src/Popup/popup.js b/src/Popup/popup.js
index 536bca0..72d0088 100644
--- a/src/Popup/popup.js
+++ b/src/Popup/popup.js
@@ -21,10 +21,10 @@ import { Popup as SemanticPopup } from 'semantic-ui-react';
 export default function Popup ({ children, className, isOpen, trigger, triggerOn }) {
   return (
     <SemanticPopup
-      className={ className }
-      on={ triggerOn }
-      open={ isOpen }
-      trigger={ trigger }
+      className={className}
+      on={triggerOn}
+      open={isOpen}
+      trigger={trigger}
     >
       { children }
     </SemanticPopup>
diff --git a/src/Portal/portal.css b/src/Portal/portal.css
index fa63d06..555a9f0 100644
--- a/src/Portal/portal.css
+++ b/src/Portal/portal.css
@@ -86,8 +86,8 @@ $backgroundOverlay: rgba(255, 255, 255, 0.95);
   &.popover {
     left: $popoverLeft;
     top: $popoverTop;
-    height: calc(100vh - $popoverTop - $popoverBottom);
-    width: calc(100vw - $popoverLeft - $popoverRight);
+    height: calc(100vh - #{$popoverTop} - #{$popoverBottom});
+    width: calc(100vw - #{$popoverLeft} - #{$popoverRight});
     z-index: $popoverZ;
   }
 
diff --git a/src/Portal/portal.example.js b/src/Portal/portal.example.js
index 6d46818..cd134b6 100644
--- a/src/Portal/portal.example.js
+++ b/src/Portal/portal.example.js
@@ -34,10 +34,10 @@ export default class PortalExample extends Component {
       <div>
         <PlaygroundExample name='Standard Portal'>
           <div>
-            <button onClick={ this.handleOpen(0) }>Open</button>
+            <button onClick={this.handleOpen(0)}>Open</button>
             <Portal
-              open={ open[0] || false }
-              onClose={ this.handleClose }
+              open={open[0] || false}
+              onClose={this.handleClose}
             >
               <p>This is the first portal</p>
             </Portal>
@@ -46,11 +46,11 @@ export default class PortalExample extends Component {
 
         <PlaygroundExample name='Popover Portal'>
           <div>
-            <button onClick={ this.handleOpen(1) }>Open</button>
+            <button onClick={this.handleOpen(1)}>Open</button>
             <Portal
               isChildModal
-              open={ open[1] || false }
-              onClose={ this.handleClose }
+              open={open[1] || false}
+              onClose={this.handleClose}
             >
               <p>This is the second portal</p>
             </Portal>
@@ -59,12 +59,12 @@ export default class PortalExample extends Component {
 
         <PlaygroundExample name='Portal in Modal'>
           <div>
-            <button onClick={ this.handleOpen(2) }>Open</button>
+            <button onClick={this.handleOpen(2)}>Open</button>
 
             <Portal
               isChildModal
-              open={ open[3] || false }
-              onClose={ this.handleClose }
+              open={open[3] || false}
+              onClose={this.handleClose}
             >
               <p>This is the second portal</p>
             </Portal>
@@ -73,20 +73,20 @@ export default class PortalExample extends Component {
 
         <PlaygroundExample name='Portal with Buttons'>
           <div>
-            <button onClick={ this.handleOpen(4) }>Open</button>
+            <button onClick={this.handleOpen(4)}>Open</button>
             <Portal
-              activeStep={ 0 }
-              buttons={ [
+              activeStep={0}
+              buttons={[
                 <Button
                   key='close'
                   label='close'
-                  onClick={ this.handleClose }
+                  onClick={this.handleClose}
                 />
-              ] }
+              ]}
               isChildModal
-              open={ open[4] || false }
-              onClose={ this.handleClose }
-              steps={ [ 'step 1', 'step 2' ] }
+              open={open[4] || false}
+              onClose={this.handleClose}
+              steps={[ 'step 1', 'step 2' ]}
               title='Portal with button'
             >
               <p>This is the fourth portal</p>
diff --git a/src/Portal/portal.js b/src/Portal/portal.js
index ed96d25..585ab3a 100644
--- a/src/Portal/portal.js
+++ b/src/Portal/portal.js
@@ -81,8 +81,8 @@ export default class Portal extends Component {
     return (
       <ReactPortal isOpened>
         <div
-          className={ styles.backOverlay }
-          onClick={ this.handleClose }
+          className={styles.backOverlay}
+          onClick={this.handleClose}
         >
           <div
             className={
@@ -97,34 +97,34 @@ export default class Portal extends Component {
                 className
               ].join(' ')
             }
-            onClick={ this.handleContainerClick }
-            onKeyDown={ this.handleKeyDown }
+            onClick={this.handleContainerClick}
+            onKeyDown={this.handleKeyDown}
           >
-            <StackEventListener onKeyUp={ this.handleKeyUp } />
+            <StackEventListener onKeyUp={this.handleKeyUp} />
             {
               !hideClose && (
                 <div
-                  className={ styles.closeIcon }
-                  onClick={ this.handleClose }
+                  className={styles.closeIcon}
+                  onClick={this.handleClose}
                 >
                   <CloseIcon />
                 </div>
               )
             }
             <Title
-              activeStep={ activeStep }
-              busy={ busy }
-              busySteps={ busySteps }
-              className={ styles.titleRow }
-              steps={ steps }
-              title={ title }
+              activeStep={activeStep}
+              busy={busy}
+              busySteps={busySteps}
+              className={styles.titleRow}
+              steps={steps}
+              title={title}
             />
-            <div className={ styles.childContainer }>
+            <div className={styles.childContainer}>
               { children }
             </div>
             {
               buttons && (
-                <div className={ styles.buttonRow }>
+                <div className={styles.buttonRow}>
                   { buttons }
                 </div>
               )
diff --git a/src/Portal/portal.spec.js b/src/Portal/portal.spec.js
index b94b6eb..94eae23 100644
--- a/src/Portal/portal.spec.js
+++ b/src/Portal/portal.spec.js
@@ -29,9 +29,9 @@ function render (props = {}) {
   onClose = sinon.stub();
   component = shallow(
     <Portal
-      onClose={ onClose }
+      onClose={onClose}
       open
-      { ...props }
+      {...props}
     />
   );
 
diff --git a/src/Progress/progress.js b/src/Progress/progress.js
index af59acc..9930dc0 100644
--- a/src/Progress/progress.js
+++ b/src/Progress/progress.js
@@ -21,16 +21,16 @@ import { Progress as SemanticProgress } from 'semantic-ui-react';
 export default function Progress ({ className, color, isDeterminate, max, style, value }) {
   return (
     <SemanticProgress
-      className={ className }
-      color={ color }
-      indicating={ !isDeterminate }
+      className={className}
+      color={color}
+      indicating={!isDeterminate}
       percent={
         isDeterminate
           ? 100 * value / max
           : 100
       }
       size='small'
-      style={ style }
+      style={style}
     />
   );
 }
diff --git a/src/QrCode/qrCode.example.js b/src/QrCode/qrCode.example.js
index d5812b5..2a98680 100644
--- a/src/QrCode/qrCode.example.js
+++ b/src/QrCode/qrCode.example.js
@@ -31,28 +31,28 @@ export default function QrCodeExample () {
 
       <PlaygroundExample name='Simple QRCode with margin'>
         <QrCode
-          margin={ 10 }
+          margin={10}
           value='this is a test'
         />
       </PlaygroundExample>
 
       <PlaygroundExample name='Ethereum Address QRCode'>
         <QrCode
-          margin={ 10 }
+          margin={10}
           value='0x8c30393085C8C3fb4C1fB16165d9fBac5D86E1D9'
         />
       </PlaygroundExample>
 
       <PlaygroundExample name='Bitcoin Address QRCode'>
         <QrCode
-          margin={ 10 }
+          margin={10}
           value='3J98t1WpEZ73CNmQviecrnyiWrnqRhWNLy'
         />
       </PlaygroundExample>
 
       <PlaygroundExample name='Big QRCode'>
         <QrCode
-          size={ 10 }
+          size={10}
           value='this is a test'
         />
       </PlaygroundExample>
diff --git a/src/QrCode/qrCode.js b/src/QrCode/qrCode.js
index 82c6b89..e6ba645 100644
--- a/src/QrCode/qrCode.js
+++ b/src/QrCode/qrCode.js
@@ -65,10 +65,10 @@ export default class QrCode extends Component {
 
     return (
       <div
-        className={ [styles.qr, className].join(' ') }
-        dangerouslySetInnerHTML={ {
+        className={[styles.qr, className].join(' ')}
+        dangerouslySetInnerHTML={{
           __html: image
-        } }
+        }}
       />
     );
   }
diff --git a/src/QrCode/qrCode.spec.js b/src/QrCode/qrCode.spec.js
index 198f684..c6f5054 100644
--- a/src/QrCode/qrCode.spec.js
+++ b/src/QrCode/qrCode.spec.js
@@ -34,8 +34,8 @@ let instance;
 function render (props = {}) {
   component = shallow(
     <QrCode
-      { ...DEFAULT_PROPS }
-      { ...props }
+      {...DEFAULT_PROPS}
+      {...props}
     />
   );
   instance = component.instance();
diff --git a/src/QrScan/qrScan.js b/src/QrScan/qrScan.js
index 71f4666..a23442d 100644
--- a/src/QrScan/qrScan.js
+++ b/src/QrScan/qrScan.js
@@ -28,12 +28,12 @@ const SCAN_STYLE = {
 
 export default function QrScan ({ onError, onScan }) {
   return (
-    <div className={ styles.qr }>
+    <div className={styles.qr}>
       <Reader
-        delay={ SCAN_DELAY }
-        onError={ onError }
-        onScan={ onScan }
-        style={ SCAN_STYLE }
+        delay={SCAN_DELAY}
+        onError={onError}
+        onScan={onScan}
+        style={SCAN_STYLE}
       />
     </div>
   );
diff --git a/src/QrScan/qrScan.spec.js b/src/QrScan/qrScan.spec.js
index 02de2fc..743f411 100644
--- a/src/QrScan/qrScan.spec.js
+++ b/src/QrScan/qrScan.spec.js
@@ -32,8 +32,8 @@ function render () {
 
   component = shallow(
     <QrScan
-      onError={ onError }
-      onScan={ onScan }
+      onError={onError}
+      onScan={onScan}
     />
   );
 
diff --git a/src/ScrollableText/scrollableText.js b/src/ScrollableText/scrollableText.js
index 7d59999..89590d9 100644
--- a/src/ScrollableText/scrollableText.js
+++ b/src/ScrollableText/scrollableText.js
@@ -22,9 +22,9 @@ import styles from './scrollableText.css';
 export default function ScrollableText ({ small, text }) {
   return (
     <input
-      className={ `${styles.input} ${small && styles.small}` }
+      className={`${styles.input} ${small && styles.small}`}
       readOnly
-      value={ text }
+      value={text}
     />
   );
 }
diff --git a/src/SectionList/Overlay/overlay.js b/src/SectionList/Overlay/overlay.js
index 9930557..210fbf6 100644
--- a/src/SectionList/Overlay/overlay.js
+++ b/src/SectionList/Overlay/overlay.js
@@ -26,7 +26,7 @@ export default function Overlay ({ overlay }) {
   }
 
   return (
-    <div className={ styles.overlay }>
+    <div className={styles.overlay}>
       { overlay }
     </div>
   );
diff --git a/src/SectionList/sectionList.example.js b/src/SectionList/sectionList.example.js
index b920f06..f2013aa 100644
--- a/src/SectionList/sectionList.example.js
+++ b/src/SectionList/sectionList.example.js
@@ -54,8 +54,8 @@ export default class SectionListExample extends Component {
   renderSimple () {
     return (
       <SectionList
-        items={ items }
-        renderItem={ this.renderItem }
+        items={items}
+        renderItem={this.renderItem}
       />
     );
   }
@@ -65,15 +65,15 @@ export default class SectionListExample extends Component {
     const overlay = (
       <div>
         <p>Overlay</p>
-        <button onClick={ this.hideOverlay }>hide</button>
+        <button onClick={this.hideOverlay}>hide</button>
       </div>
     );
 
     return (
       <SectionList
-        items={ items }
-        overlay={ showOverlay ? overlay : null }
-        renderItem={ this.renderItem }
+        items={items}
+        overlay={showOverlay ? overlay : null}
+        renderItem={this.renderItem}
       />
     );
   }
@@ -82,7 +82,7 @@ export default class SectionListExample extends Component {
     const { desc, name } = item;
 
     return (
-      <div style={ ITEM_STYLE }>
+      <div style={ITEM_STYLE}>
         <h3>{ name }</h3>
         <h3 data-hover='show'>{ desc }</h3>
       </div>
diff --git a/src/SectionList/sectionList.js b/src/SectionList/sectionList.js
index 28dcdd5..4ce448f 100644
--- a/src/SectionList/sectionList.js
+++ b/src/SectionList/sectionList.js
@@ -57,8 +57,8 @@ export default class SectionList extends Component {
     }
 
     return (
-      <section className={ [styles.section, className].join(' ') }>
-        <Overlay overlay={ overlay } />
+      <section className={[styles.section, className].join(' ')}>
+        <Overlay overlay={overlay} />
         { chunkArray(rendered, ITEMS_PER_ROW).map(this.renderRow) }
       </section>
     );
@@ -67,8 +67,8 @@ export default class SectionList extends Component {
   renderRow = (row, index) => {
     return (
       <div
-        className={ styles.row }
-        key={ `row_${index}` }
+        className={styles.row}
+        key={`row_${index}`}
       >
         { row }
       </div>
@@ -85,13 +85,13 @@ export default class SectionList extends Component {
 
     return (
       <div
-        className={ [
+        className={[
           styles.item,
           noStretch
             ? styles.stretchOff
             : styles.stretchOn
-        ].join(' ') }
-        key={ `item_${index}` }
+        ].join(' ')}
+        key={`item_${index}`}
       >
         { itemRendered }
       </div>
diff --git a/src/SectionList/sectionList.spec.js b/src/SectionList/sectionList.spec.js
index ea00e1f..3935a92 100644
--- a/src/SectionList/sectionList.spec.js
+++ b/src/SectionList/sectionList.spec.js
@@ -33,8 +33,8 @@ function render (props = {}) {
   component = shallow(
     <SectionList
       className='testClass'
-      items={ ITEMS }
-      renderItem={ renderItem }
+      items={ITEMS}
+      renderItem={renderItem}
       section='testSection'
     />
   );
diff --git a/src/SelectionList/selectionList.js b/src/SelectionList/selectionList.js
index 042f24b..4bfe2f3 100644
--- a/src/SelectionList/selectionList.js
+++ b/src/SelectionList/selectionList.js
@@ -45,9 +45,9 @@ export default class SelectionList extends Component {
 
     return (
       <SectionList
-        items={ items }
-        noStretch={ noStretch }
-        renderItem={ this.renderItem }
+        items={items}
+        noStretch={noStretch}
+        renderItem={this.renderItem}
       />
     );
   }
@@ -78,11 +78,11 @@ export default class SelectionList extends Component {
       };
 
       defaultIcon = (
-        <div className={ styles.overlay }>
+        <div className={styles.overlay}>
           {
             isSelected && item.default
-              ? <StarIcon className={ styles.icon } />
-              : <StarIcon className={ styles.iconDisabled } onClick={ makeDefault } />
+              ? <StarIcon className={styles.icon} />
+              : <StarIcon className={styles.iconDisabled} onClick={makeDefault} />
           }
         </div>
       );
@@ -97,11 +97,11 @@ export default class SelectionList extends Component {
     }
 
     return (
-      <div className={ classes.join(' ') }>
+      <div className={classes.join(' ')}>
         <div
-          className={ styles.content }
-          onClick={ handleClick }
-          onDoubleClick={ handleDoubleClick }
+          className={styles.content}
+          onClick={handleClick}
+          onDoubleClick={handleDoubleClick}
         >
           { renderItem(item, index) }
         </div>
diff --git a/src/SelectionList/selectionList.spec.js b/src/SelectionList/selectionList.spec.js
index bad595f..60862e1 100644
--- a/src/SelectionList/selectionList.spec.js
+++ b/src/SelectionList/selectionList.spec.js
@@ -37,11 +37,11 @@ function render (props = {}) {
 
   component = shallow(
     <SelectionList
-      items={ ITEMS }
+      items={ITEMS}
       noStretch='testNoStretch'
-      onDefaultClick={ onDefaultClick }
-      onSelectClick={ onSelectClick }
-      renderItem={ renderItem }
+      onDefaultClick={onDefaultClick}
+      onSelectClick={onSelectClick}
+      renderItem={renderItem}
     />
   );
   instance = component.instance();
diff --git a/src/ShortenedHash/shortenedHash.js b/src/ShortenedHash/shortenedHash.js
index c264006..4c0301e 100644
--- a/src/ShortenedHash/shortenedHash.js
+++ b/src/ShortenedHash/shortenedHash.js
@@ -30,7 +30,7 @@ export default function ShortenedHash ({ data }) {
   }
 
   return (
-    <abbr className={ styles.hash } title={ data }>{ shortened }</abbr>
+    <abbr className={styles.hash} title={data}>{ shortened }</abbr>
   );
 }
 
diff --git a/src/Signer/Account/AccountLink/accountLink.js b/src/Signer/Account/AccountLink/accountLink.js
index 8d6bc19..cf17aaf 100644
--- a/src/Signer/Account/AccountLink/accountLink.js
+++ b/src/Signer/Account/AccountLink/accountLink.js
@@ -51,9 +51,9 @@ export default class AccountLink extends Component {
     if (externalLink) {
       return (
         <a
-          href={ this.state.link }
+          href={this.state.link}
           target='_blank'
-          className={ `${styles.container} ${className}` }
+          className={`${styles.container} ${className}`}
         >
           { children || address }
         </a>
@@ -62,8 +62,8 @@ export default class AccountLink extends Component {
 
     return (
       <Link
-        className={ `${styles.container} ${className}` }
-        to={ this.state.link }
+        className={`${styles.container} ${className}`}
+        to={this.state.link}
       >
         { children || address }
       </Link>
diff --git a/src/Signer/Account/Balance/balance.js b/src/Signer/Account/Balance/balance.js
index 172f294..63131ca 100644
--- a/src/Signer/Account/Balance/balance.js
+++ b/src/Signer/Account/Balance/balance.js
@@ -23,7 +23,7 @@ export default function Balance ({ className, value }) {
     : '?';
 
   return (
-    <span className={ className }> <strong>{ formatted }</strong> <small>ETH</small></span>
+    <span className={className}> <strong>{ formatted }</strong> <small>ETH</small></span>
   );
 }
 
diff --git a/src/Signer/Account/Name/name.js b/src/Signer/Account/Name/name.js
index 2149b57..1f04360 100644
--- a/src/Signer/Account/Name/name.js
+++ b/src/Signer/Account/Name/name.js
@@ -32,16 +32,16 @@ function shortAddress (address) {
 }
 
 export default function Name ({ accounts, address, className, externalLink, netVersion }) {
-  const name = <IdentityName address={ address } empty />;
+  const name = <IdentityName address={address} empty />;
 
   if (!name) {
     return (
       <AccountLink
-        accounts={ accounts }
-        address={ address }
-        className={ className }
-        externalLink={ externalLink }
-        netVersion={ netVersion }
+        accounts={accounts}
+        address={address}
+        className={className}
+        externalLink={externalLink}
+        netVersion={netVersion}
       >
         { shortAddress(address) }
       </AccountLink>
@@ -50,15 +50,15 @@ export default function Name ({ accounts, address, className, externalLink, netV
 
   return (
     <AccountLink
-      accounts={ accounts }
-      address={ address }
-      className={ className }
-      externalLink={ externalLink }
-      netVersion={ netVersion }
+      accounts={accounts}
+      address={address}
+      className={className}
+      externalLink={externalLink}
+      netVersion={netVersion}
     >
       <span>
-        <span className={ styles.name }>{ name }</span>
-        <span className={ styles.address }>{ tinyAddress(address) }</span>
+        <span className={styles.name}>{ name }</span>
+        <span className={styles.address}>{ tinyAddress(address) }</span>
       </span>
     </AccountLink>
   );
diff --git a/src/Signer/Account/account.js b/src/Signer/Account/account.js
index 277457d..540ed01 100644
--- a/src/Signer/Account/account.js
+++ b/src/Signer/Account/account.js
@@ -27,27 +27,27 @@ import styles from './account.css';
 
 export default function Account ({ accounts, address, balance, className, isDisabled, externalLink, netVersion }) {
   return (
-    <div className={ `${styles.account} ${className}` }>
+    <div className={`${styles.account} ${className}`}>
       <AccountLink
-        accounts={ accounts }
-        address={ address }
-        externalLink={ externalLink }
-        netVersion={ netVersion }
+        accounts={accounts}
+        address={address}
+        externalLink={externalLink}
+        netVersion={netVersion}
       >
         <IdentityIcon
           center
-          disabled={ isDisabled }
-          address={ address }
+          disabled={isDisabled}
+          address={address}
         />
       </AccountLink>
       <Name
-        accounts={ accounts }
-        address={ address }
-        externalLink={ externalLink }
-        netVersion={ netVersion }
+        accounts={accounts}
+        address={address}
+        externalLink={externalLink}
+        netVersion={netVersion}
       />
       <Balance
-        value={ balance }
+        value={balance}
       />
     </div>
   );
diff --git a/src/Signer/ConfirmForm/confirmForm.js b/src/Signer/ConfirmForm/confirmForm.js
index b1b1339..506fc2d 100644
--- a/src/Signer/ConfirmForm/confirmForm.js
+++ b/src/Signer/ConfirmForm/confirmForm.js
@@ -60,27 +60,27 @@ export default class ConfirmForm extends Component {
     const ConfirmVia = confirmElement;
 
     return (
-      <Layout.Side className={ className }>
+      <Layout.Side className={className}>
         {
           isRejectOpen
-            ? <ConfirmReject onReject={ onReject } />
+            ? <ConfirmReject onReject={onReject} />
             : (
               <ConfirmVia
-                address={ address }
-                account={ account }
-                id={ id }
-                isDisabled={ isDisabled }
-                isFocussed={ isFocussed }
-                isSending={ isSending }
-                netVersion={ netVersion }
-                onConfirm={ onConfirm }
-                dataToSign={ dataToSign }
+                address={address}
+                account={account}
+                id={id}
+                isDisabled={isDisabled}
+                isFocussed={isFocussed}
+                isSending={isSending}
+                netVersion={netVersion}
+                onConfirm={onConfirm}
+                dataToSign={dataToSign}
               />
             )
         }
         <ConfirmRejectToggle
-          isRejectOpen={ isRejectOpen }
-          onToggle={ this.onToggleReject }
+          isRejectOpen={isRejectOpen}
+          onToggle={this.onToggleReject}
         />
       </Layout.Side>
     );
diff --git a/src/Signer/ConfirmReject/confirmReject.js b/src/Signer/ConfirmReject/confirmReject.js
index b75253c..5aee4f9 100644
--- a/src/Signer/ConfirmReject/confirmReject.js
+++ b/src/Signer/ConfirmReject/confirmReject.js
@@ -32,8 +32,8 @@ export default class ConfirmReject extends Component {
     const { className, onReject } = this.props;
 
     return (
-      <div className={ className }>
-        <div className={ styles.rejectText }>
+      <div className={className}>
+        <div className={styles.rejectText}>
           <FormattedMessage
             id='signer.txPendingReject.info'
             defaultMessage='Are you sure you want to reject the request?'
@@ -47,8 +47,8 @@ export default class ConfirmReject extends Component {
           </strong>
         </div>
         <Button
-          onClick={ onReject }
-          className={ styles.rejectButton }
+          onClick={onReject}
+          className={styles.rejectButton}
           fullWidth
           label={
             <FormattedMessage
diff --git a/src/Signer/ConfirmRejectToggle/confirmRejectToggle.js b/src/Signer/ConfirmRejectToggle/confirmRejectToggle.js
index a9cf84e..396ed73 100644
--- a/src/Signer/ConfirmRejectToggle/confirmRejectToggle.js
+++ b/src/Signer/ConfirmRejectToggle/confirmRejectToggle.js
@@ -25,8 +25,8 @@ import styles from './confirmRejectToggle.css';
 export default function ConfirmRejectToggle ({ className, isRejectOpen, onToggle }) {
   return (
     <a
-      className={ `${styles.rejectToggle} ${className}` }
-      onClick={ onToggle }
+      className={`${styles.rejectToggle} ${className}`}
+      onClick={onToggle}
     >
       {
         isRejectOpen
diff --git a/src/Signer/ConfirmViaHardware/confirmViaHardware.js b/src/Signer/ConfirmViaHardware/confirmViaHardware.js
index 8129db2..cc17a12 100644
--- a/src/Signer/ConfirmViaHardware/confirmViaHardware.js
+++ b/src/Signer/ConfirmViaHardware/confirmViaHardware.js
@@ -45,24 +45,24 @@ export default class ConfirmViaHardware extends Component {
     const _isDisabled = isDisabled || !this.hardwareStore.isConnected(address);
 
     return (
-      <div className={ styles.confirmForm }>
+      <div className={styles.confirmForm}>
         <Form>
           { this.renderHint() }
           <div
             data-effect='solid'
-            data-for={ `transactionConfirmForm${this.id}` }
+            data-for={`transactionConfirmForm${this.id}`}
             data-place='bottom'
             data-tip
           >
             <Button
-              className={ styles.confirmButton }
-              isDisabled={ _isDisabled || isSending }
+              className={styles.confirmButton}
+              isDisabled={_isDisabled || isSending}
               fullWidth
               icon={
                 <IdentityIcon
-                  address={ address }
+                  address={address}
                   button
-                  className={ styles.signerIcon }
+                  className={styles.signerIcon}
                 />
               }
               label={
@@ -80,7 +80,7 @@ export default class ConfirmViaHardware extends Component {
                     />
                   )
               }
-              onClick={ onConfirm }
+              onClick={onConfirm}
             />
           </div>
         </Form>
@@ -94,7 +94,7 @@ export default class ConfirmViaHardware extends Component {
 
     if (isSending) {
       return (
-        <div className={ styles.passwordHint }>
+        <div className={styles.passwordHint}>
           <FormattedMessage
             id='signer.sending.hardware.confirm'
             defaultMessage='Please confirm the transaction on your attached hardware device'
@@ -103,7 +103,7 @@ export default class ConfirmViaHardware extends Component {
       );
     } else if (_isDisabled) {
       return (
-        <div className={ styles.passwordHint }>
+        <div className={styles.passwordHint}>
           <FormattedMessage
             id='signer.sending.hardware.connect'
             defaultMessage='Please attach your hardware device before confirming the transaction'
diff --git a/src/Signer/ConfirmViaKey/confirmViaKey.js b/src/Signer/ConfirmViaKey/confirmViaKey.js
index 82f2bb5..11ce85f 100644
--- a/src/Signer/ConfirmViaKey/confirmViaKey.js
+++ b/src/Signer/ConfirmViaKey/confirmViaKey.js
@@ -79,26 +79,26 @@ export default class ConfirmViaKey extends Component {
     const isWalletOk = walletError === null && wallet !== null;
 
     return (
-      <div className={ styles.confirmForm }>
+      <div className={styles.confirmForm}>
         <Form>
           { this.renderKeyInput() }
           { this.renderPassword() }
           { this.renderHint() }
           <div
             data-effect='solid'
-            data-for={ `transactionConfirmForm${this.id}` }
+            data-for={`transactionConfirmForm${this.id}`}
             data-place='bottom'
             data-tip
           >
             <Button
-              className={ styles.confirmButton }
-              isDisabled={ isDisabled || isSending || !isWalletOk }
+              className={styles.confirmButton}
+              isDisabled={isDisabled || isSending || !isWalletOk}
               fullWidth
               icon={
                 <IdentityIcon
-                  address={ address }
+                  address={address}
                   button
-                  className={ styles.signerIcon }
+                  className={styles.signerIcon}
                 />
               }
               label={
@@ -116,7 +116,7 @@ export default class ConfirmViaKey extends Component {
                     />
                   )
               }
-              onClick={ this.onConfirm }
+              onClick={this.onConfirm}
             />
           </div>
           { this.renderTooltip() }
@@ -146,11 +146,11 @@ export default class ConfirmViaKey extends Component {
             defaultMessage='Key Password'
           />
         }
-        onChange={ this.onModifyPassword }
-        onKeyDown={ this.onKeyDown }
+        onChange={this.onModifyPassword}
+        onKeyDown={this.onKeyDown}
         ref='input'
         type='password'
-        value={ password }
+        value={password}
       />
     );
   }
@@ -165,13 +165,13 @@ export default class ConfirmViaKey extends Component {
     }
 
     return (
-      <div className={ styles.passwordHint }>
+      <div className={styles.passwordHint}>
         <FormattedMessage
           id='signer.txPendingConfirm.passwordHint'
           defaultMessage='(hint) {passwordHint}'
-          values={ {
+          values={{
             passwordHint
-          } }
+          }}
         />
       </div>
     );
@@ -182,8 +182,8 @@ export default class ConfirmViaKey extends Component {
 
     return (
       <Input
-        className={ styles.fileInput }
-        error={ walletError }
+        className={styles.fileInput}
+        error={walletError}
         hint={
           <FormattedMessage
             id='signer.txPendingConfirm.selectKey.hint'
@@ -196,7 +196,7 @@ export default class ConfirmViaKey extends Component {
             defaultMessage='Select Local Key'
           />
         }
-        onChange={ this.onKeySelect }
+        onChange={this.onKeySelect}
         type='file'
       />
     );
@@ -208,7 +208,7 @@ export default class ConfirmViaKey extends Component {
     }
 
     return (
-      <ReactTooltip id={ `transactionConfirmForm${this.id}` }>
+      <ReactTooltip id={`transactionConfirmForm${this.id}`}>
         <FormattedMessage
           id='signer.txPendingConfirm.tooltips.password'
           defaultMessage='Please provide a password for this account'
diff --git a/src/Signer/ConfirmViaKey/confirmViaKey.spec.js b/src/Signer/ConfirmViaKey/confirmViaKey.spec.js
index db3870b..00608b7 100644
--- a/src/Signer/ConfirmViaKey/confirmViaKey.spec.js
+++ b/src/Signer/ConfirmViaKey/confirmViaKey.spec.js
@@ -50,11 +50,11 @@ function render (address) {
 
   component = shallow(
     <TransactionPendingFormConfirm
-      account={ ACCOUNTS[address] }
-      address={ address }
-      onConfirm={ onConfirm }
-      isSending={ false }
-      dataToSign={ {} }
+      account={ACCOUNTS[address]}
+      address={address}
+      onConfirm={onConfirm}
+      isSending={false}
+      dataToSign={{}}
     />
   );
   instance = component.instance();
diff --git a/src/Signer/ConfirmViaPassword/confirmViaPassword.js b/src/Signer/ConfirmViaPassword/confirmViaPassword.js
index 3acd6c3..f7a4367 100644
--- a/src/Signer/ConfirmViaPassword/confirmViaPassword.js
+++ b/src/Signer/ConfirmViaPassword/confirmViaPassword.js
@@ -76,25 +76,25 @@ export default class ConfirmViaPassword extends Component {
     const { address, isDisabled, isSending } = this.props;
 
     return (
-      <div className={ styles.confirmForm }>
+      <div className={styles.confirmForm}>
         <Form>
           { this.renderPassword() }
           { this.renderHint() }
           <div
             data-effect='solid'
-            data-for={ `transactionConfirmForm${this.id}` }
+            data-for={`transactionConfirmForm${this.id}`}
             data-place='bottom'
             data-tip
           >
             <Button
-              className={ styles.confirmButton }
-              isDisabled={ isDisabled || isSending }
+              className={styles.confirmButton}
+              isDisabled={isDisabled || isSending}
               fullWidth
               icon={
                 <IdentityIcon
-                  address={ address }
+                  address={address}
                   button
-                  className={ styles.signerIcon }
+                  className={styles.signerIcon}
                 />
               }
               label={
@@ -112,7 +112,7 @@ export default class ConfirmViaPassword extends Component {
                     />
                   )
               }
-              onClick={ this.onConfirm }
+              onClick={this.onConfirm}
             />
           </div>
           { this.renderTooltip() }
@@ -138,11 +138,11 @@ export default class ConfirmViaPassword extends Component {
             defaultMessage='Account Password'
           />
         }
-        onChange={ this.onModifyPassword }
-        onKeyDown={ this.onKeyDown }
+        onChange={this.onModifyPassword}
+        onKeyDown={this.onKeyDown}
         ref='input'
         type='password'
-        value={ password }
+        value={password}
       />
     );
   }
@@ -156,13 +156,13 @@ export default class ConfirmViaPassword extends Component {
     }
 
     return (
-      <div className={ styles.passwordHint }>
+      <div className={styles.passwordHint}>
         <FormattedMessage
           id='signer.txPendingConfirm.passwordHint'
           defaultMessage='(hint) {passwordHint}'
-          values={ {
+          values={{
             passwordHint
-          } }
+          }}
         />
       </div>
     );
@@ -174,7 +174,7 @@ export default class ConfirmViaPassword extends Component {
     }
 
     return (
-      <ReactTooltip id={ `transactionConfirmForm${this.id}` }>
+      <ReactTooltip id={`transactionConfirmForm${this.id}`}>
         <FormattedMessage
           id='signer.txPendingConfirm.tooltips.password'
           defaultMessage='Please provide a password for this account'
diff --git a/src/Signer/ConfirmViaPassword/confirmViaPassword.spec.js b/src/Signer/ConfirmViaPassword/confirmViaPassword.spec.js
index 7593334..449b1b9 100644
--- a/src/Signer/ConfirmViaPassword/confirmViaPassword.spec.js
+++ b/src/Signer/ConfirmViaPassword/confirmViaPassword.spec.js
@@ -50,11 +50,11 @@ function render (address) {
 
   component = shallow(
     <ConfirmViaPassword
-      account={ ACCOUNTS[address] }
-      address={ address }
-      onConfirm={ onConfirm }
-      isSending={ false }
-      dataToSign={ {} }
+      account={ACCOUNTS[address]}
+      address={address}
+      onConfirm={onConfirm}
+      isSending={false}
+      dataToSign={{}}
     />
   );
   instance = component.instance();
diff --git a/src/Signer/ConfirmViaQr/confirmViaQr.js b/src/Signer/ConfirmViaQr/confirmViaQr.js
index 9e45141..1452ec7 100644
--- a/src/Signer/ConfirmViaQr/confirmViaQr.js
+++ b/src/Signer/ConfirmViaQr/confirmViaQr.js
@@ -70,30 +70,30 @@ export default class ConfirmViaQr extends Component {
       ? (
         <div
           data-effect='solid'
-          data-for={ `transactionConfirmForm${this.id}` }
+          data-for={`transactionConfirmForm${this.id}`}
           data-place='bottom'
           data-tip
         >
           <Button
-            className={ styles.confirmButton }
-            isDisabled={ isDisabled || isSending }
+            className={styles.confirmButton}
+            isDisabled={isDisabled || isSending}
             fullWidth
             icon={
               <IdentityIcon
-                address={ address }
+                address={address}
                 button
-                className={ styles.signerIcon }
+                className={styles.signerIcon}
               />
             }
-            label={ confirmText }
-            onClick={ this.onConfirm }
+            label={confirmText}
+            onClick={this.onConfirm}
           />
         </div>
       )
       : null;
 
     return (
-      <div className={ styles.confirmForm }>
+      <div className={styles.confirmForm}>
         <Form>
           { this.renderQrCode() }
           { this.renderQrScanner() }
@@ -125,7 +125,7 @@ export default class ConfirmViaQr extends Component {
     switch (qrState) {
       case QR_VISIBLE:
         return (
-          <div className={ styles.passwordHint }>
+          <div className={styles.passwordHint}>
             <FormattedMessage
               id='signer.sending.external.scanTx'
               defaultMessage='Please scan the transaction QR on your external device'
@@ -135,7 +135,7 @@ export default class ConfirmViaQr extends Component {
 
       case QR_SCAN:
         return (
-          <div className={ styles.passwordHint }>
+          <div className={styles.passwordHint}>
             <FormattedMessage
               id='signer.sending.external.scanSigned'
               defaultMessage='Scan the QR code of the signed transaction from your external device'
@@ -158,8 +158,8 @@ export default class ConfirmViaQr extends Component {
 
     return (
       <QrCode
-        className={ styles.qr }
-        value={ qr.value }
+        className={styles.qr}
+        value={qr.value}
       />
     );
   }
@@ -173,8 +173,8 @@ export default class ConfirmViaQr extends Component {
 
     return (
       <QrScan
-        className={ styles.camera }
-        onScan={ this.onScan }
+        className={styles.camera}
+        onScan={this.onScan}
       />
     );
   }
diff --git a/src/Signer/ConfirmViaQr/confirmViaQr.spec.js b/src/Signer/ConfirmViaQr/confirmViaQr.spec.js
index db3870b..00608b7 100644
--- a/src/Signer/ConfirmViaQr/confirmViaQr.spec.js
+++ b/src/Signer/ConfirmViaQr/confirmViaQr.spec.js
@@ -50,11 +50,11 @@ function render (address) {
 
   component = shallow(
     <TransactionPendingFormConfirm
-      account={ ACCOUNTS[address] }
-      address={ address }
-      onConfirm={ onConfirm }
-      isSending={ false }
-      dataToSign={ {} }
+      account={ACCOUNTS[address]}
+      address={address}
+      onConfirm={onConfirm}
+      isSending={false}
+      dataToSign={{}}
     />
   );
   instance = component.instance();
diff --git a/src/Signer/Layout/Main/main.js b/src/Signer/Layout/Main/main.js
index 80b641e..2ca93ed 100644
--- a/src/Signer/Layout/Main/main.js
+++ b/src/Signer/Layout/Main/main.js
@@ -21,7 +21,7 @@ import styles from './main.css';
 
 export default function Main ({ children, className }) {
   return (
-    <div className={ `${styles.signerMain} ${className}` }>
+    <div className={`${styles.signerMain} ${className}`}>
       { children }
     </div>
   );
diff --git a/src/Signer/Layout/Side/side.js b/src/Signer/Layout/Side/side.js
index bd92c11..bc4f3ff 100644
--- a/src/Signer/Layout/Side/side.js
+++ b/src/Signer/Layout/Side/side.js
@@ -21,7 +21,7 @@ import styles from './side.css';
 
 export default function Side ({ children, className }) {
   return (
-    <div className={ `${styles.signerSide} ${className}` }>
+    <div className={`${styles.signerSide} ${className}`}>
       { children }
     </div>
   );
diff --git a/src/Signer/Layout/layout.js b/src/Signer/Layout/layout.js
index 9d31874..a2b72ea 100644
--- a/src/Signer/Layout/layout.js
+++ b/src/Signer/Layout/layout.js
@@ -24,7 +24,7 @@ import styles from './layout.css';
 
 export default function Layout ({ className, children }) {
   return (
-    <div className={ `${styles.signerLayout} ${className}` }>
+    <div className={`${styles.signerLayout} ${className}`}>
       { children }
     </div>
   );
diff --git a/src/Signer/Origin/origin.js b/src/Signer/Origin/origin.js
index 71e9768..42e68c7 100644
--- a/src/Signer/Origin/origin.js
+++ b/src/Signer/Origin/origin.js
@@ -43,7 +43,7 @@ export default class Origin extends Component {
     const { origin } = this.props;
 
     return (
-      <div className={ styles.container }>
+      <div className={styles.container}>
         Requested { this.renderOrigin(origin) }
       </div>
     );
@@ -52,7 +52,7 @@ export default class Origin extends Component {
   renderOrigin (origin) {
     if (origin.type === 'unknown') {
       return (
-        <span className={ styles.unknown }>
+        <span className={styles.unknown}>
           <FormattedMessage
             id='signer.requestOrigin.unknownInterface'
             defaultMessage='via unknown interface'
@@ -67,9 +67,9 @@ export default class Origin extends Component {
           <FormattedMessage
             id='signer.requestOrigin.dapp'
             defaultMessage='by a dapp at {url}'
-            values={ {
+            values={{
               url: (
-                <span className={ styles.url }>
+                <span className={styles.url}>
                   {
                     origin.details || (
                       <FormattedMessage
@@ -80,7 +80,7 @@ export default class Origin extends Component {
                   }
                 </span>
               )
-            } }
+            }}
           />
         </span>
       );
@@ -92,9 +92,9 @@ export default class Origin extends Component {
           <FormattedMessage
             id='signer.requestOrigin.rpc'
             defaultMessage='via RPC {url}'
-            values={ {
+            values={{
               url: (
-                <span className={ styles.url }>
+                <span className={styles.url}>
                   ({
                     origin.details || (
                       <FormattedMessage
@@ -105,7 +105,7 @@ export default class Origin extends Component {
                   })
                 </span>
               )
-            } }
+            }}
           />
         </span>
       );
@@ -119,11 +119,11 @@ export default class Origin extends Component {
             defaultMessage='via IPC session'
           />
           <span
-            className={ styles.hash }
-            title={ origin.details }
+            className={styles.hash}
+            title={origin.details}
           >
             <IdentityIcon
-              address={ origin.details }
+              address={origin.details}
               tiny
             />
           </span>
@@ -141,7 +141,7 @@ export default class Origin extends Component {
   renderSigner (session) {
     if (session.substr(2) === this.context.api.transport.sessionHash) {
       return (
-        <span title={ session }>
+        <span title={session}>
           <FormattedMessage
             id='signer.requestOrigin.signerCurrent'
             defaultMessage='via current tab'
@@ -157,11 +157,11 @@ export default class Origin extends Component {
           defaultMessage='via UI session'
         />
         <span
-          className={ styles.hash }
-          title={ `UI Session id: ${session}` }
+          className={styles.hash}
+          title={`UI Session id: ${session}`}
         >
           <IdentityIcon
-            address={ session }
+            address={session}
             tiny
           />
         </span>
diff --git a/src/Signer/Origin/origin.spec.js b/src/Signer/Origin/origin.spec.js
index 0faac6b..fc5cdcd 100644
--- a/src/Signer/Origin/origin.spec.js
+++ b/src/Signer/Origin/origin.spec.js
@@ -32,40 +32,40 @@ const context = {
 describe('views/Signer/components/RequestOrigin', () => {
   it('renders unknown', () => {
     expect(shallow(
-      <RequestOrigin origin={ { type: 'unknown', details: '' } } />,
+      <RequestOrigin origin={{ type: 'unknown', details: '' }} />,
       context
     ).find('FormattedMessage').props().id).to.equal('signer.requestOrigin.unknownInterface');
   });
 
   it('renders dapps', () => {
     expect(shallow(
-      <RequestOrigin origin={ { type: 'dapp', details: 'http://parity.io' } } />,
+      <RequestOrigin origin={{ type: 'dapp', details: 'http://parity.io' }} />,
       context
     ).find('FormattedMessage').props().id).to.equal('signer.requestOrigin.dapp');
   });
 
   it('renders rpc', () => {
     expect(shallow(
-      <RequestOrigin origin={ { type: 'rpc', details: '' } } />,
+      <RequestOrigin origin={{ type: 'rpc', details: '' }} />,
       context
     ).find('FormattedMessage').props().id).to.equal('signer.requestOrigin.rpc');
   });
 
   it('renders ipc', () => {
     expect(shallow(
-      <RequestOrigin origin={ { type: 'ipc', details: '0x1234' } } />,
+      <RequestOrigin origin={{ type: 'ipc', details: '0x1234' }} />,
       context
     ).find('FormattedMessage').props().id).to.equal('signer.requestOrigin.ipc');
   });
 
   it('renders signer', () => {
     expect(shallow(
-      <RequestOrigin origin={ { type: 'signer', details: '0x12345' } } />,
+      <RequestOrigin origin={{ type: 'signer', details: '0x12345' }} />,
       context
     ).find('FormattedMessage').props().id).to.equal('signer.requestOrigin.signerUI');
 
     expect(shallow(
-      <RequestOrigin origin={ { type: 'signer', details: '0x1234' } } />,
+      <RequestOrigin origin={{ type: 'signer', details: '0x1234' }} />,
       context
     ).find('FormattedMessage').props().id).to.equal('signer.requestOrigin.signerCurrent');
   });
diff --git a/src/Signer/Request/request.js b/src/Signer/Request/request.js
index 00793bf..09171ba 100644
--- a/src/Signer/Request/request.js
+++ b/src/Signer/Request/request.js
@@ -27,20 +27,20 @@ export default function Request ({ accounts, className, confirmElement, date, ga
 
     return (
       <RequestSign
-        accounts={ accounts }
-        address={ address }
-        className={ className }
-        confirmElement={ confirmElement }
-        data={ data }
-        id={ id }
-        isDisabled={ isDisabled }
-        isFinished={ false }
-        isFocussed={ isFocussed }
-        isSending={ isSending }
-        netVersion={ netVersion }
-        onConfirm={ onConfirm }
-        onReject={ onReject }
-        origin={ origin }
+        accounts={accounts}
+        address={address}
+        className={className}
+        confirmElement={confirmElement}
+        data={data}
+        id={id}
+        isDisabled={isDisabled}
+        isFinished={false}
+        isFocussed={isFocussed}
+        isSending={isSending}
+        netVersion={netVersion}
+        onConfirm={onConfirm}
+        onReject={onReject}
+        origin={origin}
       />
     );
   }
@@ -50,20 +50,20 @@ export default function Request ({ accounts, className, confirmElement, date, ga
 
     return (
       <RequestDecrypt
-        accounts={ accounts }
-        address={ address }
-        className={ className }
-        confirmElement={ confirmElement }
-        data={ msg }
-        id={ id }
-        isDisabled={ isDisabled }
-        isFinished={ false }
-        isFocussed={ isFocussed }
-        isSending={ isSending }
-        netVersion={ netVersion }
-        onConfirm={ onConfirm }
-        onReject={ onReject }
-        origin={ origin }
+        accounts={accounts}
+        address={address}
+        className={className}
+        confirmElement={confirmElement}
+        data={msg}
+        id={id}
+        isDisabled={isDisabled}
+        isFinished={false}
+        isFocussed={isFocussed}
+        isSending={isSending}
+        netVersion={netVersion}
+        onConfirm={onConfirm}
+        onReject={onReject}
+        origin={origin}
       />
     );
   }
@@ -73,20 +73,20 @@ export default function Request ({ accounts, className, confirmElement, date, ga
   if (transaction) {
     return (
       <RequestSend
-        accounts={ accounts }
-        className={ className }
-        confirmElement={ confirmElement }
-        date={ date }
-        id={ id }
-        gasLimit={ gasLimit }
-        isDisabled={ isDisabled }
-        isFocussed={ isFocussed }
-        isSending={ isSending }
-        netVersion={ netVersion }
-        onConfirm={ onConfirm }
-        onReject={ onReject }
-        origin={ origin }
-        transaction={ transaction }
+        accounts={accounts}
+        className={className}
+        confirmElement={confirmElement}
+        date={date}
+        id={id}
+        gasLimit={gasLimit}
+        isDisabled={isDisabled}
+        isFocussed={isFocussed}
+        isSending={isSending}
+        netVersion={netVersion}
+        onConfirm={onConfirm}
+        onReject={onReject}
+        origin={origin}
+        transaction={transaction}
       />
     );
   }
diff --git a/src/Signer/RequestDecrypt/requestDecrypt.js b/src/Signer/RequestDecrypt/requestDecrypt.js
index f8e3bcf..96ea8c6 100644
--- a/src/Signer/RequestDecrypt/requestDecrypt.js
+++ b/src/Signer/RequestDecrypt/requestDecrypt.js
@@ -67,7 +67,7 @@ export default class RequestDecrypt extends Component {
     const { className } = this.props;
 
     return (
-      <Layout className={ className }>
+      <Layout className={className}>
         { this.renderDetails() }
         { this.renderActions() }
       </Layout>
@@ -86,19 +86,19 @@ export default class RequestDecrypt extends Component {
     }
 
     return (
-      <Layout.Main className={ styles.signDetails }>
-        <div className={ styles.address }>
+      <Layout.Main className={styles.signDetails}>
+        <div className={styles.address}>
           <Account
-            accounts={ accounts }
-            address={ address }
-            balance={ balance }
-            className={ styles.account }
-            externalLink={ externalLink }
-            netVersion={ netVersion }
+            accounts={accounts}
+            address={address}
+            balance={balance}
+            className={styles.account}
+            externalLink={externalLink}
+            netVersion={netVersion}
           />
-          <Origin origin={ origin } />
+          <Origin origin={origin} />
         </div>
-        <div className={ styles.info } title={ api.util.sha3(data) }>
+        <div className={styles.info} title={api.util.sha3(data)}>
           <p>
             <FormattedMessage
               id='signer.decryptRequest.request'
@@ -106,7 +106,7 @@ export default class RequestDecrypt extends Component {
             />
           </p>
 
-          <div className={ styles.signData }>
+          <div className={styles.signData}>
             <p>{ data }</p>
           </div>
         </div>
@@ -121,8 +121,8 @@ export default class RequestDecrypt extends Component {
     if (isFinished) {
       if (status === 'confirmed') {
         return (
-          <div className={ styles.actions }>
-            <span className={ styles.isConfirmed }>
+          <div className={styles.actions}>
+            <span className={styles.isConfirmed}>
               <FormattedMessage
                 id='signer.decryptRequest.state.confirmed'
                 defaultMessage='Confirmed'
@@ -133,8 +133,8 @@ export default class RequestDecrypt extends Component {
       }
 
       return (
-        <div className={ styles.actions }>
-          <span className={ styles.isRejected }>
+        <div className={styles.actions}>
+          <span className={styles.isRejected}>
             <FormattedMessage
               id='signer.decryptRequest.state.rejected'
               defaultMessage='Rejected'
@@ -146,18 +146,18 @@ export default class RequestDecrypt extends Component {
 
     return (
       <ConfirmForm
-        account={ account }
-        address={ address }
-        confirmElement={ confirmElement }
-        id={ id }
-        isDisabled={ isDisabled }
-        isFocussed={ isFocussed }
-        isSending={ isSending }
-        netVersion={ netVersion }
-        onConfirm={ onConfirm }
-        onReject={ onReject }
-        className={ styles.actions }
-        dataToSign={ { decrypt: data } }
+        account={account}
+        address={address}
+        confirmElement={confirmElement}
+        id={id}
+        isDisabled={isDisabled}
+        isFocussed={isFocussed}
+        isSending={isSending}
+        netVersion={netVersion}
+        onConfirm={onConfirm}
+        onReject={onReject}
+        className={styles.actions}
+        dataToSign={{ decrypt: data }}
       />
     );
   }
diff --git a/src/Signer/RequestSend/requestSend.js b/src/Signer/RequestSend/requestSend.js
index d27140f..252ec7b 100644
--- a/src/Signer/RequestSend/requestSend.js
+++ b/src/Signer/RequestSend/requestSend.js
@@ -103,32 +103,32 @@ export default class RequestSend extends Component {
     const account = accounts[from] || {};
 
     return (
-      <Layout className={ className }>
+      <Layout className={className}>
         <TransactionDetails
-          accounts={ accounts }
-          externalLink={ externalLink }
-          from={ from }
-          fromBalance={ fromBalance }
-          gasStore={ this.gasStore }
-          isDisabled={ isDisabled }
-          netVersion={ netVersion }
-          origin={ origin }
-          totalValue={ totalValue }
-          transaction={ transaction }
-          value={ value }
+          accounts={accounts}
+          externalLink={externalLink}
+          from={from}
+          fromBalance={fromBalance}
+          gasStore={this.gasStore}
+          isDisabled={isDisabled}
+          netVersion={netVersion}
+          origin={origin}
+          totalValue={totalValue}
+          transaction={transaction}
+          value={value}
         />
         <ConfirmForm
-          account={ account }
-          address={ from }
-          confirmElement={ confirmElement }
-          id={ id }
-          isDisabled={ isDisabled }
-          isFocussed={ isFocussed }
-          isSending={ isSending }
-          netVersion={ netVersion }
-          onConfirm={ this.onConfirm }
-          onReject={ onReject }
-          dataToSign={ { transaction } }
+          account={account}
+          address={from}
+          confirmElement={confirmElement}
+          id={id}
+          isDisabled={isDisabled}
+          isFocussed={isFocussed}
+          isSending={isSending}
+          netVersion={netVersion}
+          onConfirm={this.onConfirm}
+          onReject={onReject}
+          dataToSign={{ transaction }}
         />
       </Layout>
     );
@@ -138,8 +138,8 @@ export default class RequestSend extends Component {
     const { className } = this.props;
 
     return (
-      <Layout className={ className }>
-        <GasPriceEditor store={ this.gasStore }>
+      <Layout className={className}>
+        <GasPriceEditor store={this.gasStore}>
           <Button
             label={
               <FormattedMessage
@@ -147,7 +147,7 @@ export default class RequestSend extends Component {
                 defaultMessage='view transaction'
               />
             }
-            onClick={ this.gasStore.toggleEditing }
+            onClick={this.gasStore.toggleEditing}
           />
         </GasPriceEditor>
       </Layout>
diff --git a/src/Signer/RequestSign/requestSign.js b/src/Signer/RequestSign/requestSign.js
index 3e6ee31..e175f27 100644
--- a/src/Signer/RequestSign/requestSign.js
+++ b/src/Signer/RequestSign/requestSign.js
@@ -126,7 +126,7 @@ export default class RequestSign extends Component {
     const { className } = this.props;
 
     return (
-      <Layout className={ className }>
+      <Layout className={className}>
         { this.renderDetails() }
         { this.renderActions() }
       </Layout>
@@ -135,7 +135,7 @@ export default class RequestSign extends Component {
 
   renderAsciiDetails (ascii) {
     return (
-      <div className={ styles.signData }>
+      <div className={styles.signData}>
         <p>{ascii}</p>
       </div>
     );
@@ -144,7 +144,7 @@ export default class RequestSign extends Component {
   renderData (data) {
     if (isMarkdown(data)) {
       return (
-        <ReactMarkdown source={ decodeMarkdown(data) } />
+        <ReactMarkdown source={decodeMarkdown(data)} />
       );
     }
 
@@ -172,22 +172,22 @@ export default class RequestSign extends Component {
     }
 
     return (
-      <Layout.Main className={ styles.signDetails }>
-        <div className={ styles.address }>
+      <Layout.Main className={styles.signDetails}>
+        <div className={styles.address}>
           <Account
-            accounts={ accounts }
-            address={ address }
-            balance={ balance }
-            className={ styles.account }
-            externalLink={ externalLink }
-            netVersion={ netVersion }
+            accounts={accounts}
+            address={address}
+            balance={balance}
+            className={styles.account}
+            externalLink={externalLink}
+            netVersion={netVersion}
           />
-          <Origin origin={ origin } />
+          <Origin origin={origin} />
         </div>
         <div
-          className={ styles.info }
+          className={styles.info}
           data-effect='solid'
-          data-for={ `signRequest-${hashToSign}` }
+          data-for={`signRequest-${hashToSign}`}
           data-place='top'
           data-tip
         >
@@ -197,7 +197,7 @@ export default class RequestSign extends Component {
               defaultMessage='A request to sign data using your account:'
             />
           </p>
-          <div className={ styles.signData }>
+          <div className={styles.signData}>
             <p>{ this.renderData(data) }</p>
           </div>
           <p>
@@ -220,8 +220,8 @@ export default class RequestSign extends Component {
     if (isFinished) {
       if (status === 'confirmed') {
         return (
-          <div className={ styles.actions }>
-            <span className={ styles.isConfirmed }>
+          <div className={styles.actions}>
+            <span className={styles.isConfirmed}>
               <FormattedMessage
                 id='signer.signRequest.state.confirmed'
                 defaultMessage='Confirmed'
@@ -232,8 +232,8 @@ export default class RequestSign extends Component {
       }
 
       return (
-        <div className={ styles.actions }>
-          <span className={ styles.isRejected }>
+        <div className={styles.actions}>
+          <span className={styles.isRejected}>
             <FormattedMessage
               id='signer.signRequest.state.rejected'
               defaultMessage='Rejected'
@@ -245,18 +245,18 @@ export default class RequestSign extends Component {
 
     return (
       <ConfirmForm
-        account={ account }
-        address={ address }
-        confirmElement={ confirmElement }
-        id={ id }
-        isDisabled={ isDisabled }
-        isFocussed={ isFocussed }
-        isSending={ isSending }
-        netVersion={ netVersion }
-        onConfirm={ onConfirm }
-        onReject={ onReject }
-        className={ styles.actions }
-        dataToSign={ { data } }
+        account={account}
+        address={address}
+        confirmElement={confirmElement}
+        id={id}
+        isDisabled={isDisabled}
+        isFocussed={isFocussed}
+        isSending={isSending}
+        netVersion={netVersion}
+        onConfirm={onConfirm}
+        onReject={onReject}
+        className={styles.actions}
+        dataToSign={{ data }}
       />
     );
   }
diff --git a/src/Signer/RequestSign/requestSign.spec.js b/src/Signer/RequestSign/requestSign.spec.js
index 24322c3..8950821 100644
--- a/src/Signer/RequestSign/requestSign.spec.js
+++ b/src/Signer/RequestSign/requestSign.spec.js
@@ -53,7 +53,7 @@ function render () {
   };
 
   component = shallow(
-    <SignRequest signerStore={ signerStore } />,
+    <SignRequest signerStore={signerStore} />,
     { context }
   );
 
diff --git a/src/Signer/TransactionDetails/transactionDetails.js b/src/Signer/TransactionDetails/transactionDetails.js
index d377c01..b318e0e 100644
--- a/src/Signer/TransactionDetails/transactionDetails.js
+++ b/src/Signer/TransactionDetails/transactionDetails.js
@@ -64,23 +64,23 @@ export default class TransactionDetails extends Component {
 
     return (
       <Layout.Main>
-        <div className={ styles.from }>
-          <div className={ styles.account }>
+        <div className={styles.from}>
+          <div className={styles.account}>
             <Account
-              accounts={ accounts }
-              address={ from }
-              balance={ fromBalance }
-              externalLink={ externalLink }
-              isDisabled={ isDisabled }
-              netVersion={ netVersion }
+              accounts={accounts}
+              address={from}
+              balance={fromBalance}
+              externalLink={externalLink}
+              isDisabled={isDisabled}
+              netVersion={netVersion}
             />
           </div>
-          <Origin origin={ origin } />
+          <Origin origin={origin} />
         </div>
-        <div className={ styles.method }>
+        <div className={styles.method}>
           <MethodDecoding
-            address={ from }
-            historic={ false }
+            address={from}
+            historic={false}
             transaction={
               gasStore
                 ? gasStore.overrideTransaction(transaction)
@@ -102,16 +102,16 @@ export default class TransactionDetails extends Component {
     }
 
     return (
-      <div className={ styles.editButtonRow }>
+      <div className={styles.editButtonRow}>
         <Button
-          icon={ <GasIcon /> }
+          icon={<GasIcon />}
           label={
             <FormattedMessage
               id='signer.mainDetails.editTx'
               defaultMessage='Edit conditions/gas/gasPrice'
             />
           }
-          onClick={ gasStore.toggleEditing }
+          onClick={gasStore.toggleEditing}
         />
       </div>
     );
@@ -124,31 +124,31 @@ export default class TransactionDetails extends Component {
     return (
       <div>
         <div
-          className={ styles.total }
+          className={styles.total}
           data-effect='solid'
-          data-for={ labelId }
+          data-for={labelId}
           data-place='bottom'
           data-tip
         >
           { totalValueDisplay } <small>ETH</small>
         </div>
-        <ReactTooltip id={ labelId }>
+        <ReactTooltip id={labelId}>
           <FormattedMessage
             id='signer.mainDetails.tooltips.total1'
             defaultMessage='The value of the transaction including the mining fee is {total} {type}.'
-            values={ {
+            values={{
               total: <strong>{ totalValueDisplayWei }</strong>,
               type: <small>WEI</small>
-            } }
+            }}
           />
           <br />
           <FormattedMessage
             id='signer.mainDetails.tooltips.total2'
             defaultMessage='(This includes a mining fee of {fee} {token})'
-            values={ {
+            values={{
               fee: <strong>{ feeEth }</strong>,
               token: <small>ETH</small>
-            } }
+            }}
           />
         </ReactTooltip>
       </div>
@@ -163,13 +163,13 @@ export default class TransactionDetails extends Component {
       <div>
         <div
           data-effect='solid'
-          data-for={ labelId }
+          data-for={labelId}
           data-tip
         >
           <strong>{ valueDisplay } </strong>
           <small>ETH</small>
         </div>
-        <ReactTooltip id={ labelId }>
+        <ReactTooltip id={labelId}>
           <FormattedMessage
             id='signer.mainDetails.tooltips.value1'
             defaultMessage='The value of the transaction.'
diff --git a/src/Signer/TxHashLink/txHashLink.js b/src/Signer/TxHashLink/txHashLink.js
index 83b88ac..187a365 100644
--- a/src/Signer/TxHashLink/txHashLink.js
+++ b/src/Signer/TxHashLink/txHashLink.js
@@ -32,8 +32,8 @@ export default class TxHashLink extends Component {
 
     return (
       <a
-        className={ className }
-        href={ txLink(txHash, false, netVersion) }
+        className={className}
+        href={txLink(txHash, false, netVersion)}
         target='_blank'
       >
         { children || txHash }
diff --git a/src/SignerPending/signerPending.js b/src/SignerPending/signerPending.js
index ef9500a..916ebcd 100644
--- a/src/SignerPending/signerPending.js
+++ b/src/SignerPending/signerPending.js
@@ -33,9 +33,9 @@ function SignerPending ({ className, onClick }, { api }) {
   return (
     <Badge
       color='red'
-      className={ className }
-      onClick={ onClick }
-      value={ pendingCount }
+      className={className}
+      onClick={onClick}
+      value={pendingCount}
     />
   );
 }
diff --git a/src/Snackbar/snackbar.js b/src/Snackbar/snackbar.js
index 52a66c4..d1b1b6d 100644
--- a/src/Snackbar/snackbar.js
+++ b/src/Snackbar/snackbar.js
@@ -78,10 +78,10 @@ export default class Snackbar extends Component {
     }
 
     return (
-      <div className={ `${styles.snacks} ${className}` }>
-        <div style={ bodyStyle }>
+      <div className={`${styles.snacks} ${className}`}>
+        <div style={bodyStyle}>
           <span>{ message }</span>
-          <span id={ styles.action } onClick={ this.hide }>{ action }</span>
+          <span id={styles.action} onClick={this.hide}>{ action }</span>
         </div>
       </div>
     );
diff --git a/src/StackEventListener/stackEventListener.js b/src/StackEventListener/stackEventListener.js
index 278cb7f..f5e00f7 100644
--- a/src/StackEventListener/stackEventListener.js
+++ b/src/StackEventListener/stackEventListener.js
@@ -41,7 +41,7 @@ export default class StackEventListener extends Component {
     return (
       <ReactEventListener
         target='window'
-        onKeyUp={ this.handleKeyUp }
+        onKeyUp={this.handleKeyUp}
       />
     );
   }
diff --git a/src/StatusIndicator/statusIndicator.js b/src/StatusIndicator/statusIndicator.js
index 5f660ec..cd7a9de 100644
--- a/src/StatusIndicator/statusIndicator.js
+++ b/src/StatusIndicator/statusIndicator.js
@@ -33,12 +33,12 @@ function StatusIndicator ({ className, id, status, title = [], tooltipPlacement,
     : store.overall.message;
 
   return (
-    <span className={ [styles.status, className].join(' ') }>
+    <span className={[styles.status, className].join(' ')}>
       <span
-        className={ `${styles[type]} ${styles[checkStatus]}` }
-        data-tip={ message.length }
-        data-for={ `status-${id}` }
-        data-place={ tooltipPlacement }
+        className={`${styles[type]} ${styles[checkStatus]}`}
+        data-tip={message.length}
+        data-for={`status-${id}`}
+        data-place={tooltipPlacement}
         data-effect='solid'
       >
         {
@@ -49,8 +49,8 @@ function StatusIndicator ({ className, id, status, title = [], tooltipPlacement,
 
               return (
                 <span
-                  key={ signal }
-                  className={ `${styles.bar} ${styles[signal]} ${isActive ? styles.active : ''}` }
+                  key={signal}
+                  className={`${styles.bar} ${styles[signal]} ${isActive ? styles.active : ''}`}
                 />
               );
             })
@@ -60,10 +60,10 @@ function StatusIndicator ({ className, id, status, title = [], tooltipPlacement,
       {
         message.find((x) => !x.isEmpty)
           ? (
-            <ReactTooltip id={ `status-${id}` }>
+            <ReactTooltip id={`status-${id}`}>
               {
                 message.map((x) => (
-                  <div key={ x }>
+                  <div key={x}>
                     { x }
                   </div>)
                 )
diff --git a/src/Steps/Step/step.js b/src/Steps/Step/step.js
index 8e185f9..52aa0ec 100644
--- a/src/Steps/Step/step.js
+++ b/src/Steps/Step/step.js
@@ -21,9 +21,9 @@ import { Step as SemanticStep } from 'semantic-ui-react';
 export default function Step ({ className, isActive, isCompleted, label }) {
   return (
     <SemanticStep
-      className={ className }
-      completed={ isCompleted }
-      active={ isActive }
+      className={className}
+      completed={isCompleted}
+      active={isActive}
     >
       <SemanticStep.Content>
         <SemanticStep.Title>
diff --git a/src/Steps/steps.js b/src/Steps/steps.js
index 540c860..920b6a0 100644
--- a/src/Steps/steps.js
+++ b/src/Steps/steps.js
@@ -26,15 +26,15 @@ export default function Steps ({ activeStep, className, steps }) {
   }
 
   return (
-    <div className={ className }>
+    <div className={className}>
       <SemanticStep.Group ordered>
         {
           steps.filter((step) => step).map((step, index) => (
             <Step
-              isActive={ activeStep === index }
-              isCompleted={ activeStep > index }
-              key={ step.key || index }
-              label={ step.label || step }
+              isActive={activeStep === index}
+              isCompleted={activeStep > index}
+              key={step.key || index}
+              label={step.label || step}
             />
           ))
         }
diff --git a/src/Steps/steps.spec.js b/src/Steps/steps.spec.js
index 0a26017..378c314 100644
--- a/src/Steps/steps.spec.js
+++ b/src/Steps/steps.spec.js
@@ -26,7 +26,7 @@ let component;
 function render (props = {}) {
   component = shallow(
     <Steps
-      { ...props }
+      {...props}
     />
   );
 
diff --git a/src/Tabs/Tab/tab.js b/src/Tabs/Tab/tab.js
index be7f4e1..79bc477 100644
--- a/src/Tabs/Tab/tab.js
+++ b/src/Tabs/Tab/tab.js
@@ -21,10 +21,10 @@ import { Menu as SemanticMenu } from 'semantic-ui-react';
 export default function Tab ({ isActive, className, index, label, name, onClick, style }) {
   return (
     <SemanticMenu.Item
-      active={ isActive }
-      index={ index }
-      name={ name }
-      onClick={ onClick }
+      active={isActive}
+      index={index}
+      name={name}
+      onClick={onClick}
     >
       { label }
     </SemanticMenu.Item>
diff --git a/src/Tabs/tabs.js b/src/Tabs/tabs.js
index ee49c70..594ffff 100644
--- a/src/Tabs/tabs.js
+++ b/src/Tabs/tabs.js
@@ -25,17 +25,17 @@ export default function Tabs ({ activeTab, className, tabs, onChange }) {
 
   return (
     <SemanticMenu
-      className={ className }
+      className={className}
       pointing
     >
       {
         tabs.filter((tab) => tab).map((tab, index) => (
           <Tab
-            isActive={ activeTab === index }
-            index={ index }
-            key={ `tab_${index}` }
-            label={ tab.label || tab }
-            onClick={ onTabClick }
+            isActive={activeTab === index}
+            index={index}
+            key={`tab_${index}`}
+            label={tab.label || tab}
+            onClick={onTabClick}
           />
         ))
       }
diff --git a/src/Tags/tags.js b/src/Tags/tags.js
index c01fbaa..586f7ac 100644
--- a/src/Tags/tags.js
+++ b/src/Tags/tags.js
@@ -56,7 +56,7 @@ export default class Tags extends Component {
     classes.push(className);
 
     return (
-      <div className={ classes.join(' ') }>
+      <div className={classes.join(' ')}>
         { this.renderTags() }
       </div>
     );
@@ -87,12 +87,12 @@ export default class Tags extends Component {
 
         return (
           <div
-            key={ `tag_${index}` }
-            className={ tagClasses.join(' ') }
-            onClick={ onClick }
-            ref={ setRef }
+            key={`tag_${index}`}
+            className={tagClasses.join(' ')}
+            onClick={onClick}
+            ref={setRef}
           >
-            <span className={ styles.text }>{ tag }</span>
+            <span className={styles.text}>{ tag }</span>
           </div>
         );
       });
diff --git a/src/Title/Waiting/waiting.js b/src/Title/Waiting/waiting.js
index 55a6e0d..a9b76d4 100644
--- a/src/Title/Waiting/waiting.js
+++ b/src/Title/Waiting/waiting.js
@@ -27,7 +27,7 @@ export default function Waiting ({ activeStep, busy, busySteps, className }) {
   }
 
   return (
-    <div className={ className }>
+    <div className={className}>
       <Progress />
     </div>
   );
diff --git a/src/Title/Waiting/waiting.spec.js b/src/Title/Waiting/waiting.spec.js
index 0c8bd13..f6307a3 100644
--- a/src/Title/Waiting/waiting.spec.js
+++ b/src/Title/Waiting/waiting.spec.js
@@ -26,7 +26,7 @@ let component;
 function render (props = {}) {
   component = shallow(
     <Waiting
-      { ...props }
+      {...props}
     />
   );
 
diff --git a/src/Title/title.js b/src/Title/title.js
index 6c397eb..6213e55 100644
--- a/src/Title/title.js
+++ b/src/Title/title.js
@@ -43,8 +43,8 @@ export default function Title ({ activeStep, busy, busySteps, byline, className,
       }
     >
       <ContainerTitle
-        byline={ byline }
-        description={ description }
+        byline={byline}
+        description={description}
         isOffset
         title={
           steps
@@ -53,15 +53,15 @@ export default function Title ({ activeStep, busy, busySteps, byline, className,
         }
       />
       <Steps
-        activeStep={ activeStep }
-        className={ styles.steps }
-        steps={ steps }
+        activeStep={activeStep}
+        className={styles.steps}
+        steps={steps}
       />
       <Waiting
-        activeStep={ activeStep }
-        busy={ busy }
-        busySteps={ busySteps }
-        className={ styles.waiting }
+        activeStep={activeStep}
+        busy={busy}
+        busySteps={busySteps}
+        className={styles.waiting}
       />
     </div>
   );
diff --git a/src/Title/title.spec.js b/src/Title/title.spec.js
index d7e0b19..5a313ae 100644
--- a/src/Title/title.spec.js
+++ b/src/Title/title.spec.js
@@ -26,12 +26,12 @@ let component;
 function render (props = {}) {
   component = shallow(
     <Title
-      activeStep={ 0 }
+      activeStep={0}
       byline='testByline'
       className='testClass'
       description='testDescription'
       title='testTitle'
-      { ...props }
+      {...props}
     />
   );
 
diff --git a/src/TokenImage/tokenImage.js b/src/TokenImage/tokenImage.js
index f4b30e6..d9ee176 100644
--- a/src/TokenImage/tokenImage.js
+++ b/src/TokenImage/tokenImage.js
@@ -36,8 +36,8 @@ export default function TokenImage ({ token }, { api }) {
 
   return (
     <img
-      src={ imagesrc }
-      alt={ token.name }
+      src={imagesrc}
+      alt={token.name}
     />
   );
 }
diff --git a/src/TxHash/txHash.js b/src/TxHash/txHash.js
index c469661..126cc26 100644
--- a/src/TxHash/txHash.js
+++ b/src/TxHash/txHash.js
@@ -125,8 +125,8 @@ export default class TxHash extends Component {
     const { netVersion } = this.netChainStore;
 
     const hashLink = (
-      <a href={ txLink(hash, false, netVersion) } target='_blank'>
-        <ShortenedHash data={ hash } />
+      <a href={txLink(hash, false, netVersion)} target='_blank'>
+        <ShortenedHash data={hash} />
       </a>
     );
 
@@ -140,7 +140,7 @@ export default class TxHash extends Component {
               <FormattedMessage
                 id='ui.txHash.posted'
                 defaultMessage='The transaction has been posted to the network with a hash of {hashLink}'
-                values={ { hashLink } }
+                values={{ hashLink }}
               />
             )
         }</p>
@@ -187,9 +187,9 @@ export default class TxHash extends Component {
 
     if (!(transactionReceipt && transactionReceipt.blockNumber && transactionReceipt.blockNumber.gt(0))) {
       return (
-        <div className={ styles.confirm }>
-          <Progress className={ styles.progressbar } />
-          <div className={ styles.progressinfo }>
+        <div className={styles.confirm}>
+          <Progress className={styles.progressbar} />
+          <div className={styles.progressinfo}>
             <FormattedMessage
               id='ui.txHash.waiting'
               defaultMessage='waiting for confirmations'
@@ -209,22 +209,22 @@ export default class TxHash extends Component {
     }
 
     return (
-      <div className={ styles.confirm }>
+      <div className={styles.confirm}>
         <Progress
-          className={ styles.progressbar }
-          max={ maxConfirmations }
-          value={ value }
+          className={styles.progressbar}
+          max={maxConfirmations}
+          value={value}
           isDeterminate
         />
-        <div className={ styles.progressinfo }>
-          <abbr title={ `block #${blockNumber.toFormat(0)}` }>
+        <div className={styles.progressinfo}>
+          <abbr title={`block #${blockNumber.toFormat(0)}`}>
             <FormattedMessage
               id='ui.txHash.confirmations'
               defaultMessage='{count} {value, plural, one {confirmation} other {confirmations}}'
-              values={ {
+              values={{
                 count,
                 value
-              } }
+              }}
             />
           </abbr>
         </div>
diff --git a/src/TxHash/txHash.spec.js b/src/TxHash/txHash.spec.js
index 7332211..2c36910 100644
--- a/src/TxHash/txHash.spec.js
+++ b/src/TxHash/txHash.spec.js
@@ -68,8 +68,8 @@ function createApi () {
 function render (props) {
   const component = shallow(
     <TxHash
-      hash={ TXHASH }
-      { ...props }
+      hash={TXHASH}
+      {...props}
     />,
     { context: { api: createApi() } }
   );
diff --git a/src/TxList/TxRow/txRow.js b/src/TxList/TxRow/txRow.js
index 59db206..3eaf8f4 100644
--- a/src/TxList/TxRow/txRow.js
+++ b/src/TxList/TxRow/txRow.js
@@ -88,16 +88,16 @@ export default class TxRow extends Component {
     const { address, className, historic, netVersion, tx } = this.props;
 
     return (
-      <tr className={ className || '' }>
+      <tr className={className || ''}>
         { this.renderBlockNumber(tx.blockNumber) }
         { this.renderAddress(tx.from, false) }
-        <td className={ styles.transaction }>
+        <td className={styles.transaction}>
           { this.renderEtherValue(tx.value) }
           <div>⇒</div>
           <div>
             <a
-              className={ styles.link }
-              href={ txLink(tx.hash, false, netVersion) }
+              className={styles.link}
+              href={txLink(tx.hash, false, netVersion)}
               target='_blank'
             >
               { `${tx.hash.substr(2, 6)}...${tx.hash.slice(-6)}` }
@@ -105,11 +105,11 @@ export default class TxRow extends Component {
           </div>
         </td>
         { this.renderAddress(tx.to || tx.creates, !!tx.creates) }
-        <td className={ styles.method }>
+        <td className={styles.method}>
           <MethodDecoding
-            historic={ historic }
-            address={ address }
-            transaction={ tx }
+            historic={historic}
+            address={address}
+            transaction={tx}
           />
         </td>
       </tr>
@@ -123,12 +123,12 @@ export default class TxRow extends Component {
     if (address && (!isDeploy || isKnownContract)) {
       esLink = (
         <DappLink
-          activeClassName={ styles.currentLink }
-          className={ styles.link }
-          to={ this.addressLink(address) }
+          activeClassName={styles.currentLink}
+          className={styles.link}
+          to={this.addressLink(address)}
         >
           <IdentityName
-            address={ address }
+            address={address}
             shorten
           />
         </DappLink>
@@ -136,15 +136,15 @@ export default class TxRow extends Component {
     }
 
     return (
-      <td className={ styles.address }>
-        <div className={ styles.center }>
+      <td className={styles.address}>
+        <div className={styles.center}>
           <IdentityIcon
             center
-            className={ styles.icon }
-            address={ (!isDeploy || isKnownContract) ? address : '' }
+            className={styles.icon}
+            address={(!isDeploy || isKnownContract) ? address : ''}
           />
         </div>
-        <div className={ styles.center }>
+        <div className={styles.center}>
           { esLink || 'DEPLOY' }
         </div>
       </td>
@@ -161,11 +161,11 @@ export default class TxRow extends Component {
     const value = api.util.fromWei(_value);
 
     if (value.eq(0) && !fullValue) {
-      return <div className={ styles.value }>{ ' ' }</div>;
+      return <div className={styles.value}>{ ' ' }</div>;
     }
 
     return (
-      <div className={ styles.value }>
+      <div className={styles.value}>
         { value.toFormat(5) }<small>ETH</small>
       </div>
     );
@@ -177,7 +177,7 @@ export default class TxRow extends Component {
     const isMined = !!(blockNumber && block);
 
     return (
-      <td className={ styles.timestamp }>
+      <td className={styles.timestamp}>
         <div>{ isMined ? moment(block.timestamp).fromNow() : null }</div>
         <div>{ isMined ? _blockNumber.toFormat() : this.renderCancelToggle() }</div>
       </td>
@@ -189,9 +189,9 @@ export default class TxRow extends Component {
 
     if (canceled) {
       return (
-        <div className={ styles.pending }>
+        <div className={styles.pending}>
           <FormattedMessage
-            lassName={ styles.uppercase }
+            lassName={styles.uppercase}
             id='ui.txList.txRow.canceled'
             defaultMessage='Canceled'
           />
@@ -201,8 +201,8 @@ export default class TxRow extends Component {
 
     if (editing) {
       return (
-        <div className={ styles.pending }>
-          <div className={ styles.uppercase }>
+        <div className={styles.pending}>
+          <div className={styles.uppercase}>
             <FormattedMessage
               id='ui.txList.txRow.editing'
               defaultMessage='Editing'
@@ -217,13 +217,13 @@ export default class TxRow extends Component {
       const isPending = pendingStatus === 'pending';
 
       return (
-        <div className={ styles.pending }>
+        <div className={styles.pending}>
           {
             isPending
               ? (
-                <div className={ styles.pending }>
+                <div className={styles.pending}>
                   <div />
-                  <div className={ styles.uppercase }>
+                  <div className={styles.uppercase}>
                     <FormattedMessage
                       id='ui.txList.txRow.submitting'
                       defaultMessage='Pending'
@@ -236,7 +236,7 @@ export default class TxRow extends Component {
                   <span>
                     { pendingStatus }
                   </span>
-                  <div className={ styles.uppercase }>
+                  <div className={styles.uppercase}>
                     <FormattedMessage
                       id='ui.txList.txRow.scheduled'
                       defaultMessage='Scheduled'
@@ -245,14 +245,14 @@ export default class TxRow extends Component {
                 </div>
               )
           }
-          <a onClick={ this.setEdit } className={ styles.uppercase }>
+          <a onClick={this.setEdit} className={styles.uppercase}>
             <FormattedMessage
               id='ui.txList.txRow.edit'
               defaultMessage='Edit'
             />
           </a>
           <span>{' | '}</span>
-          <a onClick={ this.setCancel } className={ styles.uppercase }>
+          <a onClick={this.setCancel} className={styles.uppercase}>
             <FormattedMessage
               id='ui.txList.txRow.cancel'
               defaultMessage='Cancel'
@@ -291,19 +291,19 @@ export default class TxRow extends Component {
     }
 
     return (
-      <div className={ styles.pending }>
+      <div className={styles.pending}>
         <div />
-        <div className={ styles.uppercase }>
+        <div className={styles.uppercase}>
           <FormattedMessage
             id='ui.txList.txRow.verify.confirm'
             defaultMessage='Are you sure?'
           />
         </div>
-        <a onClick={ (isCancelOpen) ? this.cancelTx : this.editTx }>
+        <a onClick={(isCancelOpen) ? this.cancelTx : this.editTx}>
           { which }
         </a>
         <span>{' | '}</span>
-        <a onClick={ this.revertEditCancel }>
+        <a onClick={this.revertEditCancel}>
           <FormattedMessage
             id='ui.txList.txRow.verify.nevermind'
             defaultMessage='Nevermind'
@@ -338,9 +338,9 @@ export default class TxRow extends Component {
           <FormattedMessage
             id='ui.txList.txRow.pendingStatus.time'
             defaultMessage='{time} left'
-            values={ {
+            values={{
               time: dateDifference(new Date(), time, { compact: true })
-            } }
+            }}
           />
         );
       }
@@ -353,9 +353,9 @@ export default class TxRow extends Component {
           <FormattedMessage
             id='ui.txList.txRow.pendingStatus.blocksLeft'
             defaultMessage='{blockNumber} blocks left'
-            values={ {
+            values={{
               blockNumber: block.abs().toFormat(0)
-            } }
+            }}
           />
         );
       }
diff --git a/src/TxList/TxRow/txRow.spec.js b/src/TxList/TxRow/txRow.spec.js
index 636ffec..efec645 100644
--- a/src/TxList/TxRow/txRow.spec.js
+++ b/src/TxList/TxRow/txRow.spec.js
@@ -54,8 +54,8 @@ const STORE = {
 function render (props) {
   return shallow(
     <TxRow
-      store={ STORE }
-      { ...props }
+      store={STORE}
+      {...props}
     />,
     { context: { api } }
   ).find('TxRow').shallow({ context: { api } });
diff --git a/src/TxList/txList.js b/src/TxList/txList.js
index aa98c7a..793f2b9 100644
--- a/src/TxList/txList.js
+++ b/src/TxList/txList.js
@@ -52,7 +52,7 @@ export default class TxList extends Component {
 
   render () {
     return (
-      <table className={ styles.transactions }>
+      <table className={styles.transactions}>
         <tbody>
           { this.renderRows() }
         </tbody>
@@ -72,15 +72,15 @@ export default class TxList extends Component {
 
       return (
         <TxRow
-          key={ tx.hash }
-          tx={ tx }
-          block={ block }
-          blockNumber={ blockNumber }
-          address={ address }
-          netVersion={ netVersion }
-          editTransaction={ editTransaction }
-          cancelTransaction={ cancelTransaction }
-          killTransaction={ killTransaction }
+          key={tx.hash}
+          tx={tx}
+          block={block}
+          blockNumber={blockNumber}
+          address={address}
+          netVersion={netVersion}
+          editTransaction={editTransaction}
+          cancelTransaction={cancelTransaction}
+          killTransaction={killTransaction}
         />
       );
     });
diff --git a/src/TxList/txList.spec.js b/src/TxList/txList.spec.js
index ef7d71e..efcb5b4 100644
--- a/src/TxList/txList.spec.js
+++ b/src/TxList/txList.spec.js
@@ -29,7 +29,7 @@ const api = new Api({ send: sinon.stub(), on: sinon.stub() });
 function render (props) {
   return shallow(
     <TxList
-      { ...props }
+      {...props}
     />,
     { context: { api } }
   );
diff --git a/src/VaultCard/Accounts/accounts.js b/src/VaultCard/Accounts/accounts.js
index 42e3ae6..c57fe62 100644
--- a/src/VaultCard/Accounts/accounts.js
+++ b/src/VaultCard/Accounts/accounts.js
@@ -30,7 +30,7 @@ export default function Accounts ({ accounts, hideAccounts }) {
 
   if (!accounts || !accounts.length) {
     return (
-      <div className={ styles.empty }>
+      <div className={styles.empty}>
         <FormattedMessage
           id='vaults.accounts.empty'
           defaultMessage='There are no accounts in this vault'
@@ -40,17 +40,17 @@ export default function Accounts ({ accounts, hideAccounts }) {
   }
 
   return (
-    <div className={ styles.accounts }>
+    <div className={styles.accounts}>
       {
         accounts.map((address) => (
           <DappLink
-            key={ address }
-            to={ `/accounts/${address}` }
+            key={address}
+            to={`/accounts/${address}`}
           >
             <IdentityIcon
-              address={ address }
+              address={address}
               center
-              className={ styles.account }
+              className={styles.account}
             />
           </DappLink>
         ))
diff --git a/src/VaultCard/Accounts/accounts.spec.js b/src/VaultCard/Accounts/accounts.spec.js
index f0f11ef..ccbaa59 100644
--- a/src/VaultCard/Accounts/accounts.spec.js
+++ b/src/VaultCard/Accounts/accounts.spec.js
@@ -55,7 +55,7 @@ function createStore () {
 function render (props = {}) {
   component = shallow(
     <Accounts
-      { ...props }
+      {...props}
     />,
     {
       context: {
diff --git a/src/VaultCard/Buttons/buttons.js b/src/VaultCard/Buttons/buttons.js
index a1a2e1c..73f6135 100644
--- a/src/VaultCard/Buttons/buttons.js
+++ b/src/VaultCard/Buttons/buttons.js
@@ -30,9 +30,9 @@ export default function Buttons ({ buttons, hideButtons, vault }) {
   }
 
   return (
-    <div className={ styles.buttons }>
+    <div className={styles.buttons}>
       <Button
-        className={ styles.status }
+        className={styles.status}
         disabled
         icon={
           isOpen
diff --git a/src/VaultCard/Layout/layout.js b/src/VaultCard/Layout/layout.js
index 4a68ec7..4e121c9 100644
--- a/src/VaultCard/Layout/layout.js
+++ b/src/VaultCard/Layout/layout.js
@@ -45,7 +45,7 @@ export default class Layout extends Component {
         }
       >
         <IdentityIcon
-          address={ name }
+          address={name}
           center
           className={
             [
@@ -56,11 +56,11 @@ export default class Layout extends Component {
             ].join(' ')
           }
         />
-        <div className={ styles.info }>
+        <div className={styles.info}>
           <Title
-            byline={ meta.description }
+            byline={meta.description}
             isOffset
-            title={ name }
+            title={name}
           />
           { children }
         </div>
diff --git a/src/VaultCard/Layout/layout.spec.js b/src/VaultCard/Layout/layout.spec.js
index 71979ea..4906daf 100644
--- a/src/VaultCard/Layout/layout.spec.js
+++ b/src/VaultCard/Layout/layout.spec.js
@@ -29,14 +29,14 @@ let component;
 function render () {
   component = shallow(
     <Layout
-      vault={ {
+      vault={{
         isOpen: true,
         meta: {
           description: DESCRIPTION,
           passwordHint: 'some hint'
         },
         name: NAME
-      } }
+      }}
     />
   );
 
diff --git a/src/VaultCard/vaultCard.js b/src/VaultCard/vaultCard.js
index 7290594..dbf1869 100644
--- a/src/VaultCard/vaultCard.js
+++ b/src/VaultCard/vaultCard.js
@@ -30,22 +30,22 @@ export default function VaultCard ({ accounts, buttons, children, hideAccounts,
 
   return (
     <Container
-      className={ styles.container }
+      className={styles.container}
       hover={
         isOpen && (
           <Accounts
-            accounts={ accounts }
-            hideAccounts={ hideAccounts }
+            accounts={accounts}
+            hideAccounts={hideAccounts}
           />
         )
       }
     >
       <Buttons
-        buttons={ buttons }
-        hideButtons={ hideButtons }
-        vault={ vault }
+        buttons={buttons}
+        hideButtons={hideButtons}
+        vault={vault}
       />
-      <Layout vault={ vault }>
+      <Layout vault={vault}>
         { children }
       </Layout>
     </Container>
diff --git a/src/VaultCard/vaultCard.spec.js b/src/VaultCard/vaultCard.spec.js
index f6aa501..acc4e03 100644
--- a/src/VaultCard/vaultCard.spec.js
+++ b/src/VaultCard/vaultCard.spec.js
@@ -28,8 +28,8 @@ let component;
 function render (props = {}) {
   component = shallow(
     <VaultCard
-      vault={ VAULT }
-      { ...props }
+      vault={VAULT}
+      {...props}
     />
   );
 
diff --git a/src/VaultTag/vaultTag.js b/src/VaultTag/vaultTag.js
index f8aeafa..01cd0ff 100644
--- a/src/VaultTag/vaultTag.js
+++ b/src/VaultTag/vaultTag.js
@@ -23,13 +23,13 @@ import styles from './vaultTag.css';
 
 export default function VaultTag ({ vault }) {
   return (
-    <div className={ styles.vault }>
-      <div className={ styles.vaultBody }>
+    <div className={styles.vault}>
+      <div className={styles.vaultBody}>
         <IdentityIcon
-          address={ vault }
+          address={vault}
           inline
         />
-        <div className={ styles.text }>
+        <div className={styles.text}>
           { vault }
         </div>
       </div>
diff --git a/src/Warning/warning.js b/src/Warning/warning.js
index 4b2d7ae..1b9d4cb 100644
--- a/src/Warning/warning.js
+++ b/src/Warning/warning.js
@@ -26,7 +26,7 @@ export default function Warning ({ warning }) {
   }
 
   return (
-    <div className={ styles.warning }>
+    <div className={styles.warning}>
       { warning }
     </div>
   );