Merge branch 'master' into i3981-contract-rates

44 files changed, 1166 insertions, 141 deletions

diff --git a/.eslintrc b/.eslintrc
index 8af71bf4e..511d6f216 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -35,7 +35,6 @@
 
   "globals": {
     "document": false,
-    "log": true,
     "navigator": false,
     "web3": true,
     "window": false
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index 6dc5ecc6b..000000000
--- a/.jshintrc
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "node": true,
-  "browser": true,
-  "esnext": true,
-  "bitwise": true,
-  "camelcase": true,
-  "curly": true,
-  "eqeqeq": true,
-  "immed": true,
-  "indent": 2,
-  "latedef": true,
-  "newcap": true,
-  "noarg": true,
-  "quotmark": "single",
-  "regexp": true,
-  "undef": true,
-  "unused": true,
-  "strict": true,
-  "trailing": true,
-  "smarttabs": true,
-  "globals" : {
-    "chrome": true,
-    "crypto": true,
-    "describe": true,
-    "it": true
-  }
-}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6038dfa55..9275f6c7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Improved performance of 3D fox logo
 - Fetch token prices based on contract address, not symbol
+- Fix bug that prevents setting language locale in settings.
 
 ## 4.5.5 Fri Apr 06 2018
 
diff --git a/README.md b/README.md
index 2e68991b5..a25a8be98 100644
--- a/README.md
+++ b/README.md
@@ -68,6 +68,7 @@ To write tests that will be run in the browser using QUnit, add your test files
 - [How to develop a live-reloading UI](./docs/ui-dev-mode.md)
 - [How to add a new translation to MetaMask](./docs/translating-guide.md)
 - [Publishing Guide](./docs/publishing.md)
+- [The MetaMask Team](./docs/team.md)
 - [How to develop an in-browser mocked UI](./docs/ui-mock-mode.md)
 - [How to live reload on local dependency changes](./docs/developing-on-deps.md)
 - [How to add new networks to the Provider Menu](./docs/adding-new-networks.md)
diff --git a/app/_locales/cs/messages.json b/app/_locales/cs/messages.json
new file mode 100644
index 000000000..6a4ebc8a5
--- /dev/null
+++ b/app/_locales/cs/messages.json
@@ -0,0 +1,912 @@
+{
+  "accept": {
+    "message": "Přijmout"
+  },
+  "account": {
+    "message": "Účet"
+  },
+  "accountDetails": {
+    "message": "Detaily účtu"
+  },
+  "accountName": {
+    "message": "Název účtu"
+  },
+  "address": {
+    "message": "Adresa"
+  },
+  "addCustomToken": {
+    "message": "Přidat vlastní token"
+  },
+  "addToken": {
+    "message": "Přidat token"
+  },
+  "addTokens": {
+    "message": "Přidat tokeny"
+  },
+  "amount": {
+    "message": "Částka"
+  },
+  "amountPlusGas": {
+    "message": "Částka + palivo"
+  },
+  "appDescription": {
+    "message": "Ethereum rozšíření prohlížeče",
+    "description": "The description of the application"
+  },
+  "appName": {
+    "message": "MetaMask",
+    "description": "The name of the application"
+  },
+  "approved": {
+    "message": "Schváleno"
+  },
+  "attemptingConnect": {
+    "message": "Pokouším se připojit k blockchainu."
+  },
+  "attributions": {
+    "message": "Zásluhy"
+  },
+  "available": {
+    "message": "Dostupné"
+  },
+  "back": {
+    "message": "Zpět"
+  },
+  "balance": {
+    "message": "Zůstatek:"
+  },
+  "balances": {
+    "message": "Zůstatek tokenu"
+  },
+  "balanceIsInsufficientGas": {
+    "message": "Nedostatek prostředků pro aktuální množství paliva"
+  },
+  "beta": {
+    "message": "BETA"
+  },
+  "betweenMinAndMax": {
+    "message": "musí být větší nebo roven $1 a menší nebo roven $2.",
+    "description": "helper for inputting hex as decimal input"
+  },
+  "blockiesIdenticon": {
+    "message": "Použít Blockies Identicon"
+  },
+  "borrowDharma": {
+    "message": "Pújčit si přes Dharma (Beta)"
+  },
+  "builtInCalifornia": {
+    "message": "MetaMask je navržen a vytvořen v Kalifornii."
+  },
+  "buy": {
+    "message": "Koupit"
+  },
+  "buyCoinbase": {
+    "message": "Nákup na Coinbase"
+  },
+  "buyCoinbaseExplainer": {
+    "message": "Coinbase je světově nejoblíbenější místo k nákupu a prodeji bitcoinu, etherea nebo litecoinu."
+  },
+  "ok": {
+    "message": "Ok"
+  },
+  "cancel": {
+    "message": "Zrušit"
+  },
+  "classicInterface": {
+    "message": "Použít klasické rozhraní"
+  },
+  "clickCopy": {
+    "message": "Kliknutím zkopírovat"
+  },
+  "confirm": {
+    "message": "Potvrdit"
+  },
+  "confirmed": {
+    "message": "Potvrzeno"
+  },
+  "confirmContract": {
+    "message": "Potvrdit kontrakt"
+  },
+  "confirmPassword": {
+    "message": "Potvrdit heslo"
+  },
+  "confirmTransaction": {
+    "message": "Potvrdit transakci"
+  },
+  "continue": {
+    "message": "Pokračovat"
+  },
+  "continueToCoinbase": {
+    "message": "Přejít na Coinbase"
+  },
+  "contractDeployment": {
+    "message": "Nasazení kontraktu"
+  },
+  "conversionProgress": {
+    "message": "Provádí se převod"
+  },
+  "copiedButton": {
+    "message": "Zkopírováno"
+  },
+  "copiedClipboard": {
+    "message": "Zkopírováno do schránky"
+  },
+  "copiedExclamation": {
+    "message": "Zkopírováno!"
+  },
+  "copiedSafe": {
+    "message": "Zkopíroval jsem to na bezpečné místo"
+  },
+  "copy": {
+    "message": "Kopírovat"
+  },
+  "copyToClipboard": {
+    "message": "Kopírovat do schránky"
+  },
+  "copyButton": {
+    "message": " Kopírovat "
+  },
+  "copyPrivateKey": {
+    "message": "Toto je váš privátní klíč (kliknutím zkopírujte)"
+  },
+  "create": {
+    "message": "Vytvořit"
+  },
+  "createAccount": {
+    "message": "Vytvořit účet"
+  },
+  "createDen": {
+    "message": "Vytvořit"
+  },
+  "crypto": {
+    "message": "Krypto",
+    "description": "Exchange type (cryptocurrencies)"
+  },
+  "currentConversion": {
+    "message": "Aktuální převod"
+  },
+  "currentNetwork": {
+    "message": "Aktuální síť"
+  },
+  "customGas": {
+    "message": "Nastavit palivo"
+  },
+  "customToken": {
+    "message": "Vlastní token"
+  },
+  "customize": {
+    "message": "Nastavit"
+  },
+  "customRPC": {
+    "message": "Vlastní RPC"
+  },
+  "decimalsMustZerotoTen": {
+    "message": "Desetinných míst musí být od 0 do 36."
+  },
+  "decimal": {
+    "message": "Počet desetinných míst přesnosti"
+  },
+  "defaultNetwork": {
+    "message": "Výchozí síť pro Etherové transakce je Main Net."
+  },
+  "denExplainer": {
+    "message": "Váš DEN je heslem šifrované uložiště v MetaMasku."
+  },
+  "deposit": {
+    "message": "Vklad"
+  },
+  "depositBTC": {
+    "message": "Vložte BTC na níže uvedenou adresu:"
+  },
+  "depositCoin": {
+    "message": "Vložte $1 na níže uvedenou adresu",
+    "description": "Tells the user what coin they have selected to deposit with shapeshift"
+  },
+  "depositEth": {
+    "message": "Vložit Eth"
+  },
+  "depositEther": {
+    "message": "Vložit Ether"
+  },
+  "depositFiat": {
+    "message": "Vklad s fiat měnou"
+  },
+  "depositFromAccount": {
+    "message": "Vložte z jiného účtu"
+  },
+  "depositShapeShift": {
+    "message": "Vklad přes ShapeShift"
+  },
+  "depositShapeShiftExplainer": {
+    "message": "Pokud vlastníte jiné kryptoměny, můžete je směnit Ether a vložit ho přímo do peněženky MetaMask. Bez založení účtu."
+  },
+  "details": {
+    "message": "Podrobnosti"
+  },
+  "directDeposit": {
+    "message": "Přímý vklad"
+  },
+  "directDepositEther": {
+    "message": "Vložit Ether přímo"
+  },
+  "directDepositEtherExplainer": {
+    "message": "Pokud už vlastníte nějaký Ether, nejrychleji ho dostanete do peněženky přímým vkladem."
+  },
+  "done": {
+    "message": "Hotovo"
+  },
+  "downloadStateLogs": {
+    "message": "Stáhnout stavové protokoly"
+  },
+  "dropped": {
+    "message": "Zrušeno"
+  },
+  "edit": {
+    "message": "Upravit"
+  },
+  "editAccountName": {
+    "message": "Upravit název účtu"
+  },
+  "emailUs": {
+    "message": "Napište nám e-mail!"
+  },
+  "encryptNewDen": {
+    "message": "Zašifrujte svůj nový DEN"
+  },
+  "enterPassword": {
+    "message": "Zadejte heslo"
+  },
+  "enterPasswordConfirm": {
+    "message": "Zadejte heslo k potvrzení"
+  },
+  "passwordNotLongEnough": {
+    "message": "Heslo není dost dlouhé"
+  },
+  "passwordsDontMatch": {
+    "message": "Hesla nejsou stejná"
+  },
+  "etherscanView": {
+    "message": "Prohlédněte si účet na Etherscan"
+  },
+  "exchangeRate": {
+    "message": "Směnný kurz"
+  },
+  "exportPrivateKey": {
+    "message": "Exportovat privátní klíč"
+  },
+  "exportPrivateKeyWarning": {
+    "message": "Exportujte privátní klíč na vlastní riziko."
+  },
+  "failed": {
+    "message": "Neúspěšné"
+  },
+  "fiat": {
+    "message": "FIAT",
+    "description": "Exchange type"
+  },
+  "fileImportFail": {
+    "message": "Import souboru nefunguje? Klikněte sem!",
+    "description": "Helps user import their account from a JSON file"
+  },
+  "followTwitter": {
+    "message": "Sledujte nás na Twitteru"
+  },
+  "from": {
+    "message": "Od"
+  },
+  "fromToSame": {
+    "message": "Adresy odesílatele a příjemce nemohou být stejné"
+  },
+  "fromShapeShift": {
+    "message": "Z ShapeShift"
+  },
+  "gas": {
+    "message": "Palivo",
+    "description": "Short indication of gas cost"
+  },
+  "gasFee": {
+    "message": "Poplatek za palivo"
+  },
+  "gasLimit": {
+    "message": "Limit paliva"
+  },
+  "gasLimitCalculation": {
+    "message": "Počítáme doporučený limit paliva na základě úspěšnosti v síti."
+  },
+  "gasLimitRequired": {
+    "message": "Limit paliva je povinný"
+  },
+  "gasLimitTooLow": {
+    "message": "Limit paliva musí být alespoň 21000"
+  },
+  "generatingSeed": {
+    "message": "Generuji klíčovou frázi..."
+  },
+  "gasPrice": {
+    "message": "Cena paliva (GWEI)"
+  },
+  "gasPriceCalculation": {
+    "message": "Počítáme doporučenou cenu paliva na základě úspěšnosti v síti."
+  },
+  "gasPriceRequired": {
+    "message": "Cena paliva je povinná"
+  },
+  "getEther": {
+    "message": "Získejte Ether"
+  },
+  "getEtherFromFaucet": {
+    "message": "Získejte Ether z faucetu za $1.",
+    "description": "Displays network name for Ether faucet"
+  },
+  "greaterThanMin": {
+    "message": "musí být větší nebo roven $1.",
+    "description": "helper for inputting hex as decimal input"
+  },
+  "here": {
+    "message": "zde",
+    "description": "as in -click here- for more information (goes with troubleTokenBalances)"
+  },
+  "hereList": {
+    "message": "Tady je seznam!!!!"
+  },
+  "hide": {
+    "message": "Skrýt"
+  },
+  "hideToken": {
+    "message": "Skrýt token"
+  },
+  "hideTokenPrompt": {
+    "message": "Skrýt token?"
+  },
+  "howToDeposit": {
+    "message": "Jakým způsobem chcete vložit Ether?"
+  },
+  "holdEther": {
+    "message": "Dovoluje vám držet ether a tokeny a slouží jako most k decentralizovaným aplikacím."
+  },
+  "import": {
+    "message": "Import",
+    "description": "Button to import an account from a selected file"
+  },
+  "importAccount": {
+    "message": "Import účtu"
+  },
+  "importAccountMsg": {
+    "message":"Importované účty nebudou spojeny s vaší původní MetaMaskovou klíčovou frází. Zjistěte více o importovaných účtech "
+  },
+  "importAnAccount": {
+    "message": "Import účtu"
+  },
+  "importDen": {
+    "message": "Import existujícího DEN"
+  },
+  "imported": {
+    "message": "Importováno",
+    "description": "status showing that an account has been fully loaded into the keyring"
+  },
+  "infoHelp": {
+    "message": "Informace a nápověda"
+  },
+  "insufficientFunds": {
+    "message": "Nedostatek finančních prostředků."
+  },
+  "insufficientTokens": {
+    "message": "Nedostatek tokenů."
+  },
+  "invalidAddress": {
+    "message": "Neplatná adresa"
+  },
+  "invalidAddressRecipient": {
+    "message": "Adresa příjemce je neplatná"
+  },
+  "invalidGasParams": {
+    "message": "Neplatná parametry paliva"
+  },
+  "invalidInput": {
+    "message": "Neplatný vstup."
+  },
+  "invalidRequest": {
+    "message": "Neplatný požadavek"
+  },
+  "invalidRPC": {
+    "message": "Neplatné RPC URI"
+  },
+  "jsonFail": {
+    "message": "Něco se pokazilo. Prosím, ujistěte se, že váš JSON soubor má správný formát."
+  },
+  "jsonFile": {
+    "message": "JSON soubor",
+    "description": "format for importing an account"
+  },
+  "keepTrackTokens": {
+    "message": "Udržujte si záznamy o tokenech, které jste koupili s účtem v MetaMasku."
+  },
+  "kovan": {
+    "message": "Kovan Test Network"
+  },
+  "knowledgeDataBase": {
+    "message": "Navštivte naši Knowledge Base"
+  },
+  "max": {
+    "message": "Max"
+  },
+  "learnMore": {
+    "message": "Zjistěte více."
+  },
+  "lessThanMax": {
+    "message": "musí být menší nebo roven $1.",
+    "description": "helper for inputting hex as decimal input"
+  },
+  "likeToAddTokens": {
+    "message": "Chcete přidat tyto tokeny?"
+  },
+  "links": {
+    "message": "Odkazy"
+  },
+  "limit": {
+    "message": "Limit"
+  },
+  "loading": {
+    "message": "Načítám..."
+  },
+  "loadingTokens": {
+    "message": "Načítám tokeny..."
+  },
+  "localhost": {
+    "message": "Localhost 8545"
+  },
+  "login": {
+    "message": "Přihlásit"
+  },
+  "logout": {
+    "message": "Odhlásit"
+  },
+  "loose": {
+    "message": "Nevázané"
+  },
+  "loweCaseWords": {
+    "message": "slova klíčové fráze mají pouze malá písmena"
+  },
+  "mainnet": {
+    "message": "Main Ethereum Network"
+  },
+  "message": {
+    "message": "Zpráva"
+  },
+  "metamaskDescription": {
+    "message": "MetaMask je bezpečný osobní trezor pro Ethereum."
+  },
+  "min": {
+    "message": "Minimum"
+  },
+  "myAccounts": {
+    "message": "Moje účty"
+  },
+  "mustSelectOne": {
+    "message": "Musíte zvolit aspoň 1 token."
+  },
+  "needEtherInWallet": {
+    "message": "Potřebujete Ether v peněžence, abyste mohli pomocí MetaMasku interagovat s decentralizovanými aplikacemi."
+  },
+  "needImportFile": {
+    "message": "Musíte zvolit soubor k importu.",
+    "description": "User is important an account and needs to add a file to continue"
+  },
+  "needImportPassword": {
+    "message": "Musíte zadat heslo pro zvolený soubor.",
+    "description": "Password and file needed to import an account"
+  },
+  "negativeETH": {
+    "message": "Nelze odeslat zápornou částku ETH."
+  },
+  "networks": {
+    "message": "Sítě"
+  },
+  "newAccount": {
+    "message": "Nový účet"
+  },
+  "newAccountNumberName": {
+    "message": "Účet $1",
+    "description": "Default name of next account to be created on create account screen"
+  },
+  "newContract": {
+    "message": "Nový kontrakt"
+  },
+  "newPassword": {
+    "message": "Nové heslo (min 8 znaků)"
+  },
+  "newRecipient": {
+    "message": "Nový příjemce"
+  },
+  "newRPC": {
+    "message": "Nová RPC URL"
+  },
+  "next": {
+    "message": "Další"
+  },
+  "noAddressForName": {
+    "message": "Pro toto jméno nebyla nastavena žádná adresa."
+  },
+  "noDeposits": {
+    "message": "Žádný vklad"
+  },
+  "noTransactionHistory": {
+    "message": "Žádná historie transakcí."
+  },
+  "noTransactions": {
+    "message": "Žádné transakce"
+  },
+  "notStarted": {
+    "message": "Nezačalo"
+  },
+  "oldUI": {
+    "message": "Staré rozhraní"
+  },
+  "oldUIMessage": {
+    "message": "Vrátili jste se ke starému rozhraní. Můžete přepnout na nové rozhraní v nastavení v pravém horním menu."
+  },
+  "or": {
+    "message": "nebo",
+    "description": "choice between creating or importing a new account"
+  },
+  "passwordCorrect": {
+    "message": "Ujistěte se, že je vaše heslo správně."
+  },
+  "passwordMismatch": {
+    "message": "hesla nesouhlasí",
+    "description": "in password creation process, the two new password fields did not match"
+  },
+  "passwordShort": {
+    "message": "heslo je krátké",
+    "description": "in password creation process, the password is not long enough to be secure"
+  },
+  "pastePrivateKey": {
+    "message": "Vložte zde svůj privátní klíč:",
+    "description": "For importing an account from a private key"
+  },
+  "pasteSeed": {
+    "message": "Svou klíčovou frázi vložte zde!"
+  },
+  "personalAddressDetected": {
+    "message": "Detekována osobní adresa. Zadejte adresu kontraktu tokenu."
+  },
+  "pleaseReviewTransaction": {
+    "message": "Zkontrolujte si transakci."
+  },
+  "popularTokens": {
+    "message": "Oblíbené tokeny"
+  },
+  "privacyMsg": {
+    "message": "Zásady ochrany osobních údajů"
+  },
+  "privateKey": {
+    "message": "Privátní klíč",
+    "description": "select this type of file to use to import an account"
+  },
+  "privateKeyWarning": {
+    "message": "Upozornění: Nikdy nezveřejněte tento klíč. Kdokoli může s vaším privátním klíčem odcizit vaše aktiva z účtu."
+  },
+  "privateNetwork": {
+    "message": "Soukromá síť"
+  },
+  "qrCode": {
+    "message": "Ukázat QR kód"
+  },
+  "readdToken": {
+    "message": "Tento token můžete v budoucnu přidat zpět s „Přidat token“ v nastavení účtu."
+  },
+  "readMore": {
+    "message": "Přečtěte si více zde."
+  },
+  "readMore2": {
+    "message": "Přečtěte si více."
+  },
+  "receive": {
+    "message": "Obrdžet"
+  },
+  "recipientAddress": {
+    "message": "Adresa příjemce"
+  },
+  "refundAddress": {
+    "message": "Adresa pro vrácení peněz"
+  },
+  "rejected": {
+    "message": "Odmítnuto"
+  },
+  "resetAccount": {
+    "message": "Resetovat účet"
+  },
+  "restoreFromSeed": {
+    "message": "Obnovit z seed fráze"
+  },
+  "restoreVault": {
+    "message": "Obnovit trezor"
+  },
+  "required": {
+    "message": "Povinné"
+  },
+  "retryWithMoreGas": {
+    "message": "Opakujte s vyšší cenou paliva"
+  },
+  "walletSeed": {
+    "message": "Klíčová fráze peněženky"
+  },
+  "revealSeedWords": {
+    "message": "Zobrazit slova klíčové fráze"
+  },
+  "revealSeedWordsWarning": {
+    "message": "Nebnovujte slova klíčové fráze na veřejnosti! Tato slova mohou být použita k odcizení veškerých vyašich účtů."
+  },
+  "revert": {
+    "message": "Zvrátit"
+  },
+  "rinkeby": {
+    "message": "Rinkeby Test Network"
+  },
+  "ropsten": {
+    "message": "Ropsten Test Network"
+  },
+  "currentRpc": {
+    "message": "Současné RPC"
+  },
+  "connectingToMainnet": {
+    "message": "Připojuji se k Main Ethereum Network"
+  },
+  "connectingToRopsten": {
+    "message": "Připojuji se k Ropsten Test Network"
+  },
+  "connectingToKovan": {
+    "message": "Připojuji se k Kovan Test Network"
+  },
+  "connectingToRinkeby": {
+    "message": "Připojuji se k Rinkeby Test Network"
+  },
+  "connectingToUnknown": {
+    "message": "Připojuji se k neznámé síti"
+  },
+  "sampleAccountName": {
+    "message": "Např. můj nový účet",
+    "description": "Help user understand concept of adding a human-readable name to their account"
+  },
+  "save": {
+    "message": "Uložit"
+  },
+  "reprice_title": {
+    "message": "Změnit cenu transakce"
+  },
+  "reprice_subtitle": {
+    "message": "Navyšte cenu paliva ve snaze k přepsání a urychlení vyší transakce"
+  },
+  "saveAsFile": {
+    "message": "Uložit do souboru",
+    "description": "Account export process"
+  },
+  "saveSeedAsFile": {
+    "message": "Uložit slova klíčové fráze do souboru"
+  },
+  "search": {
+    "message": "Hledat"
+  },
+  "secretPhrase": {
+    "message": "Zadejte svých 12 slov tajné fráze k obnovení trezoru."
+  },
+  "newPassword8Chars": {
+    "message": "Nové heslo (min 8 znaků)"
+  },
+  "seedPhraseReq": {
+    "message": "klíčové fráze mají 12 slov"
+  },
+  "select": {
+    "message": "Vybrat"
+  },
+  "selectCurrency": {
+    "message": "Vybrat měnu"
+  },
+  "selectService": {
+    "message": "Vybrat službu"
+  },
+  "selectType": {
+    "message": "Vybrat typ"
+  },
+  "send": {
+    "message": "Odeslat"
+  },
+  "sendETH": {
+    "message": "Odeslat ETH"
+  },
+  "sendTokens": {
+    "message": "Odeslat tokeny"
+  },
+  "onlySendToEtherAddress": {
+    "message": "Posílejte jen ETH na Ethereum adresu."
+  },
+  "searchTokens": {
+    "message": "Hledat tokeny"
+  },
+  "sendTokensAnywhere": {
+    "message": "Posílejte tokeny komukoli s Ethereum účtem"
+  },
+  "settings": {
+    "message": "Nastavení"
+  },
+  "info": {
+  "message": "Informace"
+  },
+  "shapeshiftBuy": {
+    "message": "Nakoupit na ShapeShift"
+  },
+  "showPrivateKeys": {
+    "message": "Zobrazit privátní klíče"
+  },
+  "showQRCode": {
+    "message": "Zobrazit QR kód"
+  },
+  "sign": {
+    "message": "Podepsat"
+  },
+  "signed": {
+    "message": "Podepsáno"
+  },
+  "signMessage": {
+    "message": "Podepsat zprávu"
+  },
+  "signNotice": {
+    "message": "Podepsání zprávy může mít \nnebezpečný vedlejší učinek. Podepisujte zprávy pouze ze \nstránek, kterým plně důvěřujete celým svým účtem.\n Tato nebezpečná metoda bude odebrána v budoucí verzi. "
+  },
+  "sigRequest": {
+    "message": "Požadavek podpisu"
+  },
+  "sigRequested": {
+    "message": "Požádáno o podpis"
+  },
+  "spaceBetween": {
+    "message": "mezi slovy může být pouze mezera"
+  },
+  "status": {
+    "message": "Stav"
+  },
+  "stateLogs": {
+    "message": "Stavové protokoly"
+  },
+  "stateLogsDescription": {
+    "message": "Stavové protokoly obsahují vaše veřejné adresy účtů a odeslané transakce."
+  },
+  "stateLogError": {
+    "message": "Chyba během získávání stavových protokolů."
+  },
+  "submit": {
+    "message": "Odeslat"
+  },
+  "submitted": {
+    "message": "Odesláno"
+  },
+  "supportCenter": {
+    "message": "Navštivte naše centrum podpory"
+  },
+  "symbolBetweenZeroTen": {
+    "message": "Symbol musí být mezi 0 a 10 znaky."
+  },
+  "takesTooLong": {
+    "message": "Trvá to dlouho?"
+  },
+  "terms": {
+    "message": "Podmínky použití"
+  },
+  "testFaucet": {
+    "message": "Testovací faucet"
+  },
+  "to": {
+    "message": "Komu: "
+  },
+  "toETHviaShapeShift": {
+    "message": "$1 na ETH přes ShapeShift",
+    "description": "system will fill in deposit type in start of message"
+  },
+  "tokenAddress": {
+    "message": "Adresa tokenu"
+  },
+  "tokenAlreadyAdded": {
+    "message": "Token byl už přidán."
+  },
+  "tokenBalance": {
+    "message": "Váš zůstatek tokenu je:"
+  },
+  "tokenSelection": {
+    "message": "Vyhledejte token nebo je vyberte z našeho seznamu oblíbených tokenů."
+  },
+  "tokenSymbol": {
+    "message": "Symbol tokenu"
+  },
+  "tokenWarning1": {
+    "message": "Mějte přehled o tokenech, které jste koupili s účtem MetaMasku. Pokud jste koupili tokeny s jiným účtem, tyto tokeny se zde nezobrazí."
+  },
+  "total": {
+    "message": "Celkem"
+  },
+  "transactions": {
+    "message": "transakce"
+  },
+  "transactionError": {
+    "message": "Chyba transakce. Vyhozena výjimka v kódu kontraktu."
+  },
+  "transactionMemo": {
+    "message": "Poznámka transakce (nepovinné)"
+  },
+  "transactionNumber": {
+    "message": "Číslo transakce"
+  },
+  "transfers": {
+    "message": "Převody"
+  },
+  "troubleTokenBalances": {
+    "message": "Měli jsme problém s načtením vašich tokenových zůstatků. Můžete je vidět ",
+    "description": "Followed by a link (here) to view token balances"
+  },
+  "twelveWords": {
+    "message": "Těchto 12 slov je jedinou možností, jak obnovit MetaMask účet. \nUložte je na bezpečné a neveřejné místo."
+  },
+  "typePassword": {
+    "message": "Zadejte své heslo"
+  },
+  "uiWelcome": {
+    "message": "Vítejte v novém rozhraní (Beta)"
+  },
+  "uiWelcomeMessage": {
+    "message": "Používáte nyní nové rozhraní MetaMasku. Rozhlédněte se kolem, vyzkoušejte nové funkce, jako jsou zasílání tokenů, a dejte nám vědět, pokud narazíte na problém."
+  },
+  "unapproved": {
+    "message": "Neschváleno"
+  },
+  "unavailable": {
+    "message": "Nedostupné"
+  },
+  "unknown": {
+    "message": "Neznámé"
+  },
+  "unknownNetwork": {
+    "message": "Neznámá soukromá síť"
+  },
+  "unknownNetworkId": {
+    "message": "Neznámé ID sítě"
+  },
+  "uriErrorMsg": {
+    "message": "URI vyžadují korektní HTTP/HTTPS prefix."
+  },
+  "usaOnly": {
+    "message": "jen v USA",
+    "description": "Using this exchange is limited to people inside the USA"
+  },
+  "usedByClients": {
+    "message": "Používána různými klienty"
+  },
+  "useOldUI": {
+    "message": "Použijte staré rozhraní"
+  },
+  "validFileImport": {
+    "message": "Musíte vybrat validní soubor k importu."
+  },
+  "vaultCreated": {
+    "message": "Trezor vytvořen"
+  },
+  "viewAccount": {
+    "message": "Zobrazit účet"
+  },
+  "visitWebSite": {
+    "message": "Navštivte naši stránku"
+  },
+  "warning": {
+    "message": "Varování"
+  },
+  "welcomeBeta": {
+    "message": "Vítejte v MetaMask Beta"
+  },
+  "whatsThis": {
+    "message": "Co to je?"
+  },
+  "yourSigRequested": {
+    "message": "Je vyžadován váš podpis"
+  },
+  "youSign": {
+    "message": "Podepisujete"
+  }
+}
diff --git a/app/_locales/index.json b/app/_locales/index.json
index 727504bda..facee3c35 100644
--- a/app/_locales/index.json
+++ b/app/_locales/index.json
@@ -1,4 +1,5 @@
 [
+  { "code": "cs", "name": "Czech" },
   { "code": "de", "name": "German" },
   { "code": "en", "name": "English" },
   { "code": "es", "name": "Spanish" },
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 3f0e289c9..35c484ec5 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -25,8 +25,7 @@ const getObjStructure = require('./lib/getObjStructure')
 const STORAGE_KEY = 'metamask-config'
 const METAMASK_DEBUG = process.env.METAMASK_DEBUG
 
-window.log = log
-log.setDefaultLevel(METAMASK_DEBUG ? 'debug' : 'warn')
+log.setDefaultLevel(process.env.METAMASK_DEBUG ? 'debug' : 'warn')
 
 const platform = new ExtensionPlatform()
 const notificationManager = new NotificationManager()
diff --git a/app/scripts/controllers/blacklist.js b/app/scripts/controllers/blacklist.js
index df41c90c0..d965f80b8 100644
--- a/app/scripts/controllers/blacklist.js
+++ b/app/scripts/controllers/blacklist.js
@@ -1,6 +1,7 @@
 const ObservableStore = require('obs-store')
 const extend = require('xtend')
 const PhishingDetector = require('eth-phishing-detect/src/detector')
+const log = require('loglevel')
 
 // compute phishing lists
 const PHISHING_DETECTION_CONFIG = require('eth-phishing-detect/src/config.json')
diff --git a/app/scripts/controllers/currency.js b/app/scripts/controllers/currency.js
index 36b8808aa..d9e0a3e34 100644
--- a/app/scripts/controllers/currency.js
+++ b/app/scripts/controllers/currency.js
@@ -1,5 +1,6 @@
 const ObservableStore = require('obs-store')
 const extend = require('xtend')
+const log = require('loglevel')
 
 // every ten minutes
 const POLLING_INTERVAL = 600000
diff --git a/app/scripts/controllers/infura.js b/app/scripts/controllers/infura.js
index c6b4c9de2..8f6dd837e 100644
--- a/app/scripts/controllers/infura.js
+++ b/app/scripts/controllers/infura.js
@@ -1,5 +1,6 @@
 const ObservableStore = require('obs-store')
 const extend = require('xtend')
+const log = require('loglevel')
 
 // every ten minutes
 const POLLING_INTERVAL = 10 * 60 * 1000
diff --git a/app/scripts/controllers/network.js b/app/scripts/controllers/network.js
index 617456cd7..45574e673 100644
--- a/app/scripts/controllers/network.js
+++ b/app/scripts/controllers/network.js
@@ -9,6 +9,7 @@ const extend = require('xtend')
 const EthQuery = require('eth-query')
 const createEventEmitterProxy = require('../lib/events-proxy.js')
 const networkConfig = require('../config.js')
+const log = require('loglevel')
 const { OLD_UI_NETWORK_TYPE, DEFAULT_RPC } = networkConfig.enums
 const INFURA_PROVIDER_TYPES = ['ropsten', 'rinkeby', 'kovan', 'mainnet']
 
diff --git a/app/scripts/controllers/recent-blocks.js b/app/scripts/controllers/recent-blocks.js
index 4ae3810eb..0c1ee4e38 100644
--- a/app/scripts/controllers/recent-blocks.js
+++ b/app/scripts/controllers/recent-blocks.js
@@ -2,6 +2,7 @@ const ObservableStore = require('obs-store')
 const extend = require('xtend')
 const BN = require('ethereumjs-util').BN
 const EthQuery = require('eth-query')
+const log = require('loglevel')
 
 class RecentBlocksController {
 
diff --git a/app/scripts/controllers/shapeshift.js b/app/scripts/controllers/shapeshift.js
index 3bbfaa1c5..b38b3812d 100644
--- a/app/scripts/controllers/shapeshift.js
+++ b/app/scripts/controllers/shapeshift.js
@@ -1,5 +1,6 @@
 const ObservableStore = require('obs-store')
 const extend = require('xtend')
+const log = require('loglevel')
 
 // every three seconds when an incomplete tx is waiting
 const POLLING_INTERVAL = 3000
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 336b0d8f7..c8211ebd7 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -7,6 +7,7 @@ const TransactionStateManager = require('../lib/tx-state-manager')
 const TxGasUtil = require('../lib/tx-gas-utils')
 const PendingTransactionTracker = require('../lib/pending-tx-tracker')
 const NonceTracker = require('../lib/nonce-tracker')
+const log = require('loglevel')
 
 /*
   Transaction Controller is an aggregate of sub-controllers and trackers
diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js
index ec99bfc35..92c732813 100644
--- a/app/scripts/inpage.js
+++ b/app/scripts/inpage.js
@@ -3,16 +3,11 @@ cleanContextForImports()
 require('web3/dist/web3.min.js')
 const log = require('loglevel')
 const LocalMessageDuplexStream = require('post-message-stream')
-// const PingStream = require('ping-pong-stream/ping')
-// const endOfStream = require('end-of-stream')
 const setupDappAutoReload = require('./lib/auto-reload.js')
 const MetamaskInpageProvider = require('./lib/inpage-provider.js')
 restoreContextAfterImports()
 
-const METAMASK_DEBUG = process.env.METAMASK_DEBUG
-window.log = log
-log.setDefaultLevel(METAMASK_DEBUG ? 'debug' : 'warn')
-
+log.setDefaultLevel(process.env.METAMASK_DEBUG ? 'debug' : 'warn')
 
 //
 // setup plugin communication
diff --git a/app/scripts/lib/createLoggerMiddleware.js b/app/scripts/lib/createLoggerMiddleware.js
index 2707cbd9e..fc6abf828 100644
--- a/app/scripts/lib/createLoggerMiddleware.js
+++ b/app/scripts/lib/createLoggerMiddleware.js
@@ -1,3 +1,5 @@
+const log = require('loglevel')
+
 // log rpc activity
 module.exports = createLoggerMiddleware
 
diff --git a/app/scripts/lib/local-store.js b/app/scripts/lib/local-store.js
index 5b47985f6..2dda0ba1f 100644
--- a/app/scripts/lib/local-store.js
+++ b/app/scripts/lib/local-store.js
@@ -3,6 +3,7 @@
 // https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/storage/local
 
 const extension = require('extensionizer')
+const log = require('loglevel')
 
 module.exports = class ExtensionStore {
   constructor() {
diff --git a/app/scripts/lib/personal-message-manager.js b/app/scripts/lib/personal-message-manager.js
index 6602f5aa8..43a7d0b42 100644
--- a/app/scripts/lib/personal-message-manager.js
+++ b/app/scripts/lib/personal-message-manager.js
@@ -3,6 +3,7 @@ const ObservableStore = require('obs-store')
 const ethUtil = require('ethereumjs-util')
 const createId = require('./random-id')
 const hexRe = /^[0-9A-Fa-f]+$/g
+const log = require('loglevel')
 
 
 module.exports = class PersonalMessageManager extends EventEmitter {
diff --git a/app/scripts/lib/seed-phrase-verifier.js b/app/scripts/lib/seed-phrase-verifier.js
index 9cea22029..7ba712c0d 100644
--- a/app/scripts/lib/seed-phrase-verifier.js
+++ b/app/scripts/lib/seed-phrase-verifier.js
@@ -1,4 +1,5 @@
 const KeyringController = require('eth-keyring-controller')
+const log = require('loglevel')
 
 const seedPhraseVerifier = {
 
diff --git a/app/scripts/lib/typed-message-manager.js b/app/scripts/lib/typed-message-manager.js
index 8b760790e..60042155e 100644
--- a/app/scripts/lib/typed-message-manager.js
+++ b/app/scripts/lib/typed-message-manager.js
@@ -3,7 +3,7 @@ const ObservableStore = require('obs-store')
 const createId = require('./random-id')
 const assert = require('assert')
 const sigUtil = require('eth-sig-util')
-
+const log = require('loglevel')
 
 module.exports = class TypedMessageManager extends EventEmitter {
   constructor (opts) {
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 73b7cfbb0..a12b6776e 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -45,6 +45,7 @@ const BN = require('ethereumjs-util').BN
 const GWEI_BN = new BN('1000000000')
 const percentile = require('percentile')
 const seedPhraseVerifier = require('./lib/seed-phrase-verifier')
+const log = require('loglevel')
 
 module.exports = class MetamaskController extends EventEmitter {
 
diff --git a/app/scripts/ui.js b/app/scripts/ui.js
index 13c7ac5ec..c326ca1c3 100644
--- a/app/scripts/ui.js
+++ b/app/scripts/ui.js
@@ -9,6 +9,7 @@ const ExtensionPlatform = require('./platforms/extension')
 const NotificationManager = require('./lib/notification-manager')
 const notificationManager = new NotificationManager()
 const setupRaven = require('./lib/setupRaven')
+const log = require('loglevel')
 
 start().catch(log.error)
 
diff --git a/docs/team.md b/docs/team.md
new file mode 100644
index 000000000..72f9d3226
--- /dev/null
+++ b/docs/team.md
@@ -0,0 +1,78 @@
+# The Team
+
+Here is an overview of the current MetaMask team, and their primary roles and responsibilities, in the order they joined the team.
+
+## Core Team Members
+
+The core team maintains aspects of the main product (the extension) and the core libraries (the MetaMask Controller, provider-engine, etc).
+
+### Aaron Davis
+
+@kumavis
+Founder / Technical Lead
+
+Especially in charge of connection to the blockchain. Wrote [provider-engine](https://github.com/MetaMask/provider-engine), and is currently working with @hermanjunge on our JavaScript light-client.
+
+### Dan Finlay
+
+@danfinlay
+Software Engineer / Product Lead
+
+Focused on the deliverable, user-valuable aspects of MetaMask, including usability and documentation. Coordinates efforts between different branches of the team, and integrations with other projects.
+
+### Frankie Pangilinan
+
+@frankiebee
+Software Engineer / Transaction Manager Lead
+
+Frankie contributes code throughout MetaMask, but has become especially specialized in the way MetaMask manages transactions. She is also the original lead of the [Mascara](https://github.com/MetaMask/mascara) project.
+
+### Kevin Serrano
+
+@Zanibas
+Software Engineer / Project Management Lead
+
+Kevin is a software engineer, but also spends a lot of his time keeping the team's administrative operations running smoothly.
+
+### Thomas Huang
+
+@tmashuang
+QA Engineer
+
+Thomas is the head of MetaMask Quality Assurance. He both takes the final pass of branches of code before we ship to production, and is also in charge of continuously improving our automated quality assurance process.
+
+### Christian Jeria
+
+@cjeria
+User Experience Designer
+
+Christian is the lead of MetaMask's user experience. He is continuously designing prototypes, testing them with users, and refining them with our developers for production.
+
+### Paul Bouchon
+
+@bitpshr
+Software Engineer
+
+The newest member of the team! Paul is currently being onboarded, and finding his niche within the team.
+
+## Laboratory Team Members
+
+These team members are working on projects that will benefit MetaMask, but are not directly working on the product itself.
+
+### Herman Junge
+
+@hermanjunge
+Software Engineer
+
+Herman is currently leading the Mustekala project, a JavaScript, IPFS-based Ethereum light client.
+
+## Kyokan Team Members
+
+[Kyokan](http://kyokan.io/) is a consulting firm that has been working closely with the MetaMask team on the latest version of our user interface. Their team members are not members of ConsenSys LLC, but they contribute a lot to the project.
+
+- Daniel Tsui (@sdsui)
+- Chi Kei Chan (@chikeichan)
+- Dan Miller (@danjm)
+- David Yoo (@yookd)
+- Whymarrh Whitby (@whymarrh)
+
diff --git a/old-ui/app/app.js b/old-ui/app/app.js
index 37611987f..fc0d634aa 100644
--- a/old-ui/app/app.js
+++ b/old-ui/app/app.js
@@ -3,6 +3,7 @@ const Component = require('react').Component
 const connect = require('react-redux').connect
 const h = require('react-hyperscript')
 const actions = require('../../ui/app/actions')
+const log = require('loglevel')
 // mascara
 const MascaraFirstTime = require('../../mascara/src/app/first-time').default
 const MascaraBuyEtherScreen = require('../../mascara/src/app/first-time/buy-ether-screen').default
diff --git a/old-ui/app/components/ens-input.js b/old-ui/app/components/ens-input.js
index c85a23514..d09c30644 100644
--- a/old-ui/app/components/ens-input.js
+++ b/old-ui/app/components/ens-input.js
@@ -8,6 +8,7 @@ const ENS = require('ethjs-ens')
 const networkMap = require('ethjs-ens/lib/network-map.json')
 const ensRE = /.+\..+$/
 const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'
+const log = require('loglevel')
 
 
 module.exports = EnsInput
diff --git a/old-ui/app/components/pending-tx.js b/old-ui/app/components/pending-tx.js
index 7f63d9fdf..cd4189fc4 100644
--- a/old-ui/app/components/pending-tx.js
+++ b/old-ui/app/components/pending-tx.js
@@ -3,6 +3,7 @@ const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const actions = require('../../../ui/app/actions')
 const clone = require('clone')
+const log = require('loglevel')
 
 const ethUtil = require('ethereumjs-util')
 const BN = ethUtil.BN
diff --git a/old-ui/app/components/token-list.js b/old-ui/app/components/token-list.js
index 149733b89..e20594b61 100644
--- a/old-ui/app/components/token-list.js
+++ b/old-ui/app/components/token-list.js
@@ -3,6 +3,7 @@ const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const TokenTracker = require('eth-token-tracker')
 const TokenCell = require('./token-cell.js')
+const log = require('loglevel')
 
 module.exports = TokenList
 
diff --git a/old-ui/app/conf-tx.js b/old-ui/app/conf-tx.js
index 1bb8eb97c..67eb31c37 100644
--- a/old-ui/app/conf-tx.js
+++ b/old-ui/app/conf-tx.js
@@ -7,6 +7,7 @@ const NetworkIndicator = require('./components/network')
 const LoadingIndicator = require('./components/loading')
 const txHelper = require('../lib/tx-helper')
 const isPopupOrNotification = require('../../app/scripts/lib/is-popup-or-notification')
+const log = require('loglevel')
 
 const PendingTx = require('./components/pending-tx')
 const PendingMsg = require('./components/pending-msg')
diff --git a/old-ui/lib/tx-helper.js b/old-ui/lib/tx-helper.js
index de3f00d2d..0a6f55a63 100644
--- a/old-ui/lib/tx-helper.js
+++ b/old-ui/lib/tx-helper.js
@@ -1,4 +1,5 @@
 const valuesFor = require('../app/util').valuesFor
+const log = require('loglevel')
 
 module.exports = function (unapprovedTxs, unapprovedMsgs, personalMsgs, typedMessages, network) {
   log.debug('tx-helper called with params:')
diff --git a/package-lock.json b/package-lock.json
index 8b6ffe453..fad386909 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -645,7 +645,7 @@
       "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
       "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
       "requires": {
-        "make-iterator": "1.0.1"
+        "make-iterator": "1.0.0"
       }
     },
     "arr-flatten": {
@@ -658,7 +658,7 @@
       "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
       "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
       "requires": {
-        "make-iterator": "1.0.1"
+        "make-iterator": "1.0.0"
       }
     },
     "arr-union": {
@@ -3362,7 +3362,7 @@
       "requires": {
         "arr-map": "2.0.2",
         "for-own": "1.0.0",
-        "make-iterator": "1.0.1"
+        "make-iterator": "1.0.0"
       },
       "dependencies": {
         "for-own": {
@@ -5827,29 +5827,15 @@
       "resolved": "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-1.4.2.tgz",
       "integrity": "sha1-jZWCAsftuq6Dlwf7pvCf8ydgYhA=",
       "requires": {
-        "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git#71f123b676f2b2d81bc20f343670d90045a3d3d8",
+        "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git#4ea2fdfed09e8f99117d9362d17c6b01b64a2bcf",
         "ethereumjs-util": "5.1.3"
       },
       "dependencies": {
         "ethereumjs-abi": {
-          "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#71f123b676f2b2d81bc20f343670d90045a3d3d8",
+          "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#4ea2fdfed09e8f99117d9362d17c6b01b64a2bcf",
           "requires": {
             "bn.js": "4.11.8",
-            "ethereumjs-util": "4.5.0"
-          },
-          "dependencies": {
-            "ethereumjs-util": {
-              "version": "4.5.0",
-              "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz",
-              "integrity": "sha1-PpQosxfuvaPXJg2FT93alUsfG8Y=",
-              "requires": {
-                "bn.js": "4.11.8",
-                "create-hash": "1.1.3",
-                "keccakjs": "0.2.1",
-                "rlp": "2.0.0",
-                "secp256k1": "3.4.0"
-              }
-            }
+            "ethereumjs-util": "5.1.3"
           }
         },
         "ethereumjs-util": {
@@ -6954,7 +6940,7 @@
       "requires": {
         "detect-file": "1.0.0",
         "is-glob": "3.1.0",
-        "micromatch": "3.1.10",
+        "micromatch": "3.1.9",
         "resolve-dir": "1.0.1"
       },
       "dependencies": {
@@ -6969,22 +6955,32 @@
           "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
         },
         "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.1.tgz",
+          "integrity": "sha512-SO5lYHA3vO6gz66erVvedSCkp7AKWdv6VcQ2N4ysXfPxdAlxAMMAdwegGGcv1Bqwm7naF1hNdk5d6AAIEHV2nQ==",
           "requires": {
             "arr-flatten": "1.1.0",
             "array-unique": "0.3.2",
+            "define-property": "1.0.0",
             "extend-shallow": "2.0.1",
             "fill-range": "4.0.0",
             "isobject": "3.0.1",
+            "kind-of": "6.0.2",
             "repeat-element": "1.1.2",
             "snapdragon": "0.8.1",
             "snapdragon-node": "2.1.1",
             "split-string": "3.1.0",
-            "to-regex": "3.0.2"
+            "to-regex": "3.0.1"
           },
           "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+              "requires": {
+                "is-descriptor": "1.0.2"
+              }
+            },
             "extend-shallow": {
               "version": "2.0.1",
               "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
@@ -7015,7 +7011,7 @@
             "posix-character-classes": "0.1.1",
             "regex-not": "1.0.0",
             "snapdragon": "0.8.1",
-            "to-regex": "3.0.2"
+            "to-regex": "3.0.1"
           },
           "dependencies": {
             "define-property": {
@@ -7082,7 +7078,7 @@
             "fragment-cache": "0.2.1",
             "regex-not": "1.0.0",
             "snapdragon": "0.8.1",
-            "to-regex": "3.0.2"
+            "to-regex": "3.0.1"
           },
           "dependencies": {
             "define-property": {
@@ -7191,6 +7187,21 @@
             }
           }
         },
+        "is-odd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz",
+          "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==",
+          "requires": {
+            "is-number": "4.0.0"
+          },
+          "dependencies": {
+            "is-number": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+              "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="
+            }
+          }
+        },
         "isobject": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
@@ -7202,13 +7213,13 @@
           "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
         },
         "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "version": "3.1.9",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.9.tgz",
+          "integrity": "sha512-SlIz6sv5UPaAVVFRKodKjCg48EbNoIhgetzfK/Cy0v5U52Z6zB136M8tp0UC9jM53LYbmIRihJszvvqpKkfm9g==",
           "requires": {
             "arr-diff": "4.0.0",
             "array-unique": "0.3.2",
-            "braces": "2.3.2",
+            "braces": "2.3.1",
             "define-property": "2.0.2",
             "extend-shallow": "3.0.2",
             "extglob": "2.0.4",
@@ -7218,29 +7229,26 @@
             "object.pick": "1.3.0",
             "regex-not": "1.0.0",
             "snapdragon": "0.8.1",
-            "to-regex": "3.0.2"
+            "to-regex": "3.0.1"
           }
         },
-        "to-regex": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-          "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+        "nanomatch": {
+          "version": "1.2.9",
+          "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz",
+          "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==",
           "requires": {
+            "arr-diff": "4.0.0",
+            "array-unique": "0.3.2",
             "define-property": "2.0.2",
             "extend-shallow": "3.0.2",
-            "regex-not": "1.0.2",
-            "safe-regex": "1.1.0"
-          },
-          "dependencies": {
-            "regex-not": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-              "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-              "requires": {
-                "extend-shallow": "3.0.2",
-                "safe-regex": "1.1.0"
-              }
-            }
+            "fragment-cache": "0.2.1",
+            "is-odd": "2.0.0",
+            "is-windows": "1.0.2",
+            "kind-of": "6.0.2",
+            "object.pick": "1.3.0",
+            "regex-not": "1.0.0",
+            "snapdragon": "0.8.1",
+            "to-regex": "3.0.1"
           }
         }
       }
@@ -7352,9 +7360,9 @@
       "dev": true
     },
     "flush-write-stream": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
-      "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz",
+      "integrity": "sha1-yBuQ2HRnZvGmCaRoCZRsRd2K5Bc=",
       "requires": {
         "inherits": "2.0.3",
         "readable-stream": "2.3.3"
@@ -11679,6 +11687,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz",
       "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==",
+      "dev": true,
       "requires": {
         "is-number": "4.0.0"
       },
@@ -11686,7 +11695,8 @@
         "is-number": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "dev": true
         }
       }
     },
@@ -13041,7 +13051,7 @@
       "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
       "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
       "requires": {
-        "flush-write-stream": "1.0.3"
+        "flush-write-stream": "1.0.2"
       }
     },
     "left-pad": {
@@ -14120,18 +14130,11 @@
       }
     },
     "make-iterator": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.0.tgz",
+      "integrity": "sha1-V7713IXSOSO6I3ZzJNjo+PPZaUs=",
       "requires": {
-        "kind-of": "6.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
-        }
+        "kind-of": "3.2.2"
       }
     },
     "map-async": {
@@ -14174,7 +14177,7 @@
       "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
       "requires": {
         "findup-sync": "2.0.0",
-        "micromatch": "3.1.10",
+        "micromatch": "3.1.9",
         "resolve": "1.4.0",
         "stack-trace": "0.0.10"
       },
@@ -14190,22 +14193,32 @@
           "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
         },
         "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.1.tgz",
+          "integrity": "sha512-SO5lYHA3vO6gz66erVvedSCkp7AKWdv6VcQ2N4ysXfPxdAlxAMMAdwegGGcv1Bqwm7naF1hNdk5d6AAIEHV2nQ==",
           "requires": {
             "arr-flatten": "1.1.0",
             "array-unique": "0.3.2",
+            "define-property": "1.0.0",
             "extend-shallow": "2.0.1",
             "fill-range": "4.0.0",
             "isobject": "3.0.1",
+            "kind-of": "6.0.2",
             "repeat-element": "1.1.2",
             "snapdragon": "0.8.1",
             "snapdragon-node": "2.1.1",
             "split-string": "3.1.0",
-            "to-regex": "3.0.2"
+            "to-regex": "3.0.1"
           },
           "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+              "requires": {
+                "is-descriptor": "1.0.2"
+              }
+            },
             "extend-shallow": {
               "version": "2.0.1",
               "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
@@ -14236,7 +14249,7 @@
             "posix-character-classes": "0.1.1",
             "regex-not": "1.0.0",
             "snapdragon": "0.8.1",
-            "to-regex": "3.0.2"
+            "to-regex": "3.0.1"
           },
           "dependencies": {
             "define-property": {
@@ -14303,7 +14316,7 @@
             "fragment-cache": "0.2.1",
             "regex-not": "1.0.0",
             "snapdragon": "0.8.1",
-            "to-regex": "3.0.2"
+            "to-regex": "3.0.1"
           },
           "dependencies": {
             "define-property": {
@@ -14399,6 +14412,21 @@
             }
           }
         },
+        "is-odd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz",
+          "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==",
+          "requires": {
+            "is-number": "4.0.0"
+          },
+          "dependencies": {
+            "is-number": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+              "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="
+            }
+          }
+        },
         "isobject": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
@@ -14410,13 +14438,13 @@
           "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
         },
         "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "version": "3.1.9",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.9.tgz",
+          "integrity": "sha512-SlIz6sv5UPaAVVFRKodKjCg48EbNoIhgetzfK/Cy0v5U52Z6zB136M8tp0UC9jM53LYbmIRihJszvvqpKkfm9g==",
           "requires": {
             "arr-diff": "4.0.0",
             "array-unique": "0.3.2",
-            "braces": "2.3.2",
+            "braces": "2.3.1",
             "define-property": "2.0.2",
             "extend-shallow": "3.0.2",
             "extglob": "2.0.4",
@@ -14426,29 +14454,26 @@
             "object.pick": "1.3.0",
             "regex-not": "1.0.0",
             "snapdragon": "0.8.1",
-            "to-regex": "3.0.2"
+            "to-regex": "3.0.1"
           }
         },
-        "to-regex": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-          "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+        "nanomatch": {
+          "version": "1.2.9",
+          "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz",
+          "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==",
           "requires": {
+            "arr-diff": "4.0.0",
+            "array-unique": "0.3.2",
             "define-property": "2.0.2",
             "extend-shallow": "3.0.2",
-            "regex-not": "1.0.2",
-            "safe-regex": "1.1.0"
-          },
-          "dependencies": {
-            "regex-not": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-              "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-              "requires": {
-                "extend-shallow": "3.0.2",
-                "safe-regex": "1.1.0"
-              }
-            }
+            "fragment-cache": "0.2.1",
+            "is-odd": "2.0.0",
+            "is-windows": "1.0.2",
+            "kind-of": "6.0.2",
+            "object.pick": "1.3.0",
+            "regex-not": "1.0.0",
+            "snapdragon": "0.8.1",
+            "to-regex": "3.0.1"
           }
         }
       }
@@ -15172,6 +15197,7 @@
       "version": "1.2.9",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz",
       "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==",
+      "dev": true,
       "requires": {
         "arr-diff": "4.0.0",
         "array-unique": "0.3.2",
@@ -15190,17 +15216,20 @@
         "arr-diff": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
         },
         "array-unique": {
           "version": "0.3.2",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+          "dev": true
         },
         "define-property": {
           "version": "2.0.2",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
           "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+          "dev": true,
           "requires": {
             "is-descriptor": "1.0.2",
             "isobject": "3.0.1"
@@ -15210,6 +15239,7 @@
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
           "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "dev": true,
           "requires": {
             "assign-symbols": "1.0.0",
             "is-extendable": "1.0.1"
@@ -15219,6 +15249,7 @@
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
           "requires": {
             "is-plain-object": "2.0.4"
           }
@@ -15226,12 +15257,14 @@
         "isobject": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
         },
         "kind-of": {
           "version": "6.0.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
         }
       }
     },
@@ -17872,7 +17905,7 @@
       "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
       "requires": {
         "for-own": "1.0.0",
-        "make-iterator": "1.0.1"
+        "make-iterator": "1.0.0"
       },
       "dependencies": {
         "for-own": {
@@ -17915,7 +17948,7 @@
       "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
       "requires": {
         "for-own": "1.0.0",
-        "make-iterator": "1.0.1"
+        "make-iterator": "1.0.0"
       },
       "dependencies": {
         "for-own": {
@@ -20476,7 +20509,8 @@
     "ret": {
       "version": "0.1.15",
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true
     },
     "revalidator": {
       "version": "0.1.8",
@@ -20576,6 +20610,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
       "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "dev": true,
       "requires": {
         "ret": "0.1.15"
       }
diff --git a/ui/app/actions.js b/ui/app/actions.js
index 46f34e149..f5cdd32bc 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -3,6 +3,7 @@ const getBuyEthUrl = require('../../app/scripts/lib/buy-eth-url')
 const { getTokenAddressFromTokenObject } = require('./util')
 const ethUtil = require('ethereumjs-util')
 const { fetchLocale } = require('../i18n-helper')
+const log = require('loglevel')
 
 var actions = {
   _setBackgroundConnection: _setBackgroundConnection,
diff --git a/ui/app/app.js b/ui/app/app.js
index 75c3febb0..827b4e9ce 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -6,6 +6,7 @@ const { compose } = require('recompose')
 const h = require('react-hyperscript')
 const actions = require('./actions')
 const classnames = require('classnames')
+const log = require('loglevel')
 
 // init
 const InitializeScreen = require('../../mascara/src/app/first-time').default
diff --git a/ui/app/components/ens-input.js b/ui/app/components/ens-input.js
index feb0a7037..aff4b6ef6 100644
--- a/ui/app/components/ens-input.js
+++ b/ui/app/components/ens-input.js
@@ -11,6 +11,7 @@ const ensRE = /.+\..+$/
 const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'
 const connect = require('react-redux').connect
 const ToAutoComplete = require('./send/to-autocomplete')
+const log = require('loglevel')
 
 EnsInput.contextTypes = {
   t: PropTypes.func,
diff --git a/ui/app/components/pages/home.js b/ui/app/components/pages/home.js
index 7857a2a99..90b8e1d37 100644
--- a/ui/app/components/pages/home.js
+++ b/ui/app/components/pages/home.js
@@ -5,6 +5,7 @@ const { Redirect, withRouter } = require('react-router-dom')
 const { compose } = require('recompose')
 const h = require('react-hyperscript')
 const actions = require('../../actions')
+const log = require('loglevel')
 
 // init
 const NewKeyChainScreen = require('../../new-keychain')
diff --git a/ui/app/components/pages/keychains/restore-vault.js b/ui/app/components/pages/keychains/restore-vault.js
index d57894e00..33575bfbb 100644
--- a/ui/app/components/pages/keychains/restore-vault.js
+++ b/ui/app/components/pages/keychains/restore-vault.js
@@ -6,6 +6,7 @@ const connect = require('../../../metamask-connect')
 const h = require('react-hyperscript')
 const { createNewVaultAndRestore, unMarkPasswordForgotten } = require('../../../actions')
 const { DEFAULT_ROUTE } = require('../../../routes')
+const log = require('loglevel')
 
 class RestoreVaultPage extends PersistentForm {
   constructor (props) {
diff --git a/ui/app/components/token-balance.js b/ui/app/components/token-balance.js
index 2f71c0687..1900ccec7 100644
--- a/ui/app/components/token-balance.js
+++ b/ui/app/components/token-balance.js
@@ -4,6 +4,7 @@ const inherits = require('util').inherits
 const TokenTracker = require('eth-token-tracker')
 const connect = require('react-redux').connect
 const selectors = require('../selectors')
+const log = require('loglevel')
 
 function mapStateToProps (state) {
   return {
diff --git a/ui/app/components/token-list.js b/ui/app/components/token-list.js
index 150a3762d..4189cf801 100644
--- a/ui/app/components/token-list.js
+++ b/ui/app/components/token-list.js
@@ -6,6 +6,7 @@ const TokenTracker = require('eth-token-tracker')
 const TokenCell = require('./token-cell.js')
 const connect = require('react-redux').connect
 const selectors = require('../selectors')
+const log = require('loglevel')
 
 function mapStateToProps (state) {
   return {
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index fee7cd36f..b71538e31 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -6,6 +6,7 @@ const { withRouter } = require('react-router-dom')
 const { compose } = require('recompose')
 const actions = require('./actions')
 const txHelper = require('../lib/tx-helper')
+const log = require('loglevel')
 
 const PendingTx = require('./components/pending-tx')
 const SignatureRequest = require('./components/signature-request')
diff --git a/ui/app/keychains/hd/restore-vault.js b/ui/app/keychains/hd/restore-vault.js
index 38ad14adb..913d20505 100644
--- a/ui/app/keychains/hd/restore-vault.js
+++ b/ui/app/keychains/hd/restore-vault.js
@@ -4,6 +4,7 @@ const PersistentForm = require('../../../lib/persistent-form')
 const connect = require('react-redux').connect
 const h = require('react-hyperscript')
 const actions = require('../../actions')
+const log = require('loglevel')
 
 RestoreVaultScreen.contextTypes = {
   t: PropTypes.func,
diff --git a/ui/app/main-container.js b/ui/app/main-container.js
index 6dd4ff151..c305687ea 100644
--- a/ui/app/main-container.js
+++ b/ui/app/main-container.js
@@ -4,6 +4,7 @@ const inherits = require('util').inherits
 const AccountAndTransactionDetails = require('./account-and-transaction-details')
 const Settings = require('./components/pages/settings')
 const UnlockScreen = require('./components/pages/unlock')
+const log = require('loglevel')
 
 module.exports = MainContainer
 
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 74a0f9299..2b39eb8db 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -1,6 +1,7 @@
 const extend = require('xtend')
 const actions = require('../actions')
 const txHelper = require('../../lib/tx-helper')
+const log = require('loglevel')
 
 module.exports = reduceApp
 
diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js
index 1ed049be2..e65dc2d11 100644
--- a/ui/app/reducers/metamask.js
+++ b/ui/app/reducers/metamask.js
@@ -350,7 +350,7 @@ function reduceMetamask (state, action) {
         welcomeScreenSeen: true,
       })
 
-    case action.SET_CURRENT_LOCALE:
+    case actions.SET_CURRENT_LOCALE:
       return extend(metamaskState, {
         currentLocale: action.value,
       })
diff --git a/ui/index.js b/ui/index.js
index 746e28eab..7b6faac76 100644
--- a/ui/index.js
+++ b/ui/index.js
@@ -6,8 +6,7 @@ const configureStore = require('./app/store')
 const txHelper = require('./lib/tx-helper')
 const { fetchLocale } = require('./i18n-helper')
 const { OLD_UI_NETWORK_TYPE, BETA_UI_NETWORK_TYPE } = require('../app/scripts/config').enums
-
-global.log = require('loglevel')
+const log = require('loglevel')
 
 module.exports = launchMetamaskUi
 
diff --git a/ui/lib/tx-helper.js b/ui/lib/tx-helper.js
index de3f00d2d..0a6f55a63 100644
--- a/ui/lib/tx-helper.js
+++ b/ui/lib/tx-helper.js
@@ -1,4 +1,5 @@
 const valuesFor = require('../app/util').valuesFor
+const log = require('loglevel')
 
 module.exports = function (unapprovedTxs, unapprovedMsgs, personalMsgs, typedMessages, network) {
   log.debug('tx-helper called with params:')