9 files changed, 46 insertions, 8 deletions

diff --git a/app/fonts/Montserrat/Montserrat-Light.ttf b/app/fonts/Montserrat/Montserrat-Light.ttf
new file mode 100644
index 000000000..cd8f62d7e
--- /dev/null
+++ b/app/fonts/Montserrat/Montserrat-Light.ttf
diff --git a/app/fonts/Montserrat/Montserrat-Light.woff b/app/fonts/Montserrat/Montserrat-Light.woff
new file mode 100644
index 000000000..d8aa6e103
--- /dev/null
+++ b/app/fonts/Montserrat/Montserrat-Light.woff
diff --git a/app/fonts/Montserrat/Montserrat-UltraLight.ttf b/app/fonts/Montserrat/Montserrat-UltraLight.ttf
new file mode 100644
index 000000000..16d2dbf15
--- /dev/null
+++ b/app/fonts/Montserrat/Montserrat-UltraLight.ttf
diff --git a/app/fonts/Montserrat/Montserrat-UltraLight.woff b/app/fonts/Montserrat/Montserrat-UltraLight.woff
new file mode 100644
index 000000000..156ff32c8
--- /dev/null
+++ b/app/fonts/Montserrat/Montserrat-UltraLight.woff
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 470591323..8a5ffb75a 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -89,10 +89,12 @@ module.exports = class MetamaskController {
     })
 
     function logger (err, request, response) {
-      if (err) return console.error(err.stack)
+      if (err) return console.error(err)
       if (!request.isMetamaskInternal) {
         console.log(`RPC (${originDomain}):`, request, '->', response)
-        if (response.error) console.error('Error in RPC response:\n' + response.error.message)
+        if (response.error) {
+          console.error('Error in RPC response:\n', response.error)
+        }
       }
     }
   }
diff --git a/docs/video_script.txt b/docs/video_script.txt
new file mode 100644
index 000000000..1b363324c
--- /dev/null
+++ b/docs/video_script.txt
@@ -0,0 +1,27 @@
+Hi, and welcome to MetaMask.
+
+Today we’re happy to share our gift to the Ethereum ecosystem.
+
+The MetaMask browser extension turns Google Chrome into an Ethereum browser, letting websites retrieve data from the blockchain, and letting users securely manage identities and sign transactions.
+
+When you start up MetaMask, you are given a seed phrase that can be used to restore all the accounts you ever create within MetaMask.
+
+You can switch the current account with the switch account button in the top right, and you can add more accounts at the bottom of the account list.
+
+Your account vault is encrypted and locally stored within your browser, meaning no account information ever touches our servers. However, with your secret phrase, you can easily restore your vault with the same accounts.
+
+At first glance, Metamask enables you to send ether like a normal wallet application, but Metamask's true strength lies in enabling your browser to visit Ethereum enabled websites.
+
+Here’s a simple Ethereum distributed app, or Ðapp, called Tokens, that lets you easily deploy your own currency.
+
+When you visit a Dapp like Tokens with MetaMask installed, that website has access to the Ethereum blockchain via the standard Web3 Javascript API. When it wants to write to the blockchain, it asks web3 to send the transaction, prompting MetaMask to ask for user confirmation.
+
+After you submit a transaction, wait for the next block for the change to be reflected on the website...and there it is!
+
+Now I have my own MetaMaskCoins! I can check my balance or, if I want to send some to another account, I can click the copy link on it. I check its balance, see it has none, then send it some meta-coins!
+
+This has been nice, but it’s all been on the test-net. I can always switch what blockchain I’m working on, say the main blockhain, and I’m ready issue a token with the full security of the Ethereum blockchain.
+
+MetaMask connects to these blockchains with no synchronization time because we host blockchain nodes by default. You can always point MetaMask at your own Ethereum RPC Server, and fully control your connection to the blockchain.
+
+And that’s how MetaMask lets ordinary websites talk to a trusted Ethereum provider, all while letting the user store and manage their own private keys. We hope this will help enable a new wave of blockchain-enabled websites.
diff --git a/package.json b/package.json
index 413c19ca5..991af4907 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "start": "gulp dev",
     "test": "mocha --require test/helper.js --compilers js:babel-register --recursive",
     "watch": "mocha watch --compilers js:babel-register --recursive",
-    "ui": "beefy ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./"
+    "ui": "node development/genStates.js && beefy ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./"
   },
   "browserify": {
     "transform": [
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 00ec373ad..62b9d80ae 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -107,7 +107,7 @@ AccountDetailScreen.prototype.render = function () {
                   paddingTop: '3px',
                   width: '5em',
                   fontSize: '13px',
-                  fontFamily: 'Montserrat Thin',
+                  fontFamily: 'Montserrat Light',
                   textRendering: 'geometricPrecision',
                   marginTop: '10px',
                   marginBottom: '15px',
diff --git a/ui/app/css/fonts.css b/ui/app/css/fonts.css
index da024ce84..3b9f581b9 100644
--- a/ui/app/css/fonts.css
+++ b/ui/app/css/fonts.css
@@ -20,8 +20,17 @@
 }
 
 @font-face {
-  font-family: 'Montserrat Thin';
-    src: url('/fonts/Montserrat/Montserrat-Regular.woff') format('woff');
-    src: url('/fonts/Montserrat/Montserrat-Regular.ttf') format('truetype');
-  text-rendering: geometricPrecision;
+  font-family: 'Montserrat Light';
+    src: url('/fonts/Montserrat/Montserrat-Light.woff') format('woff');
+    src: url('/fonts/Montserrat/Montserrat-Light.ttf') format('truetype');
+    font-weight: normal;
+    font-style: normal;
+}
+
+@font-face {
+  font-family: 'Montserrat UltraLight';
+    src: url('/fonts/Montserrat/Montserrat-UltraLight.woff') format('woff');
+    src: url('/fonts/Montserrat/Montserrat-UltraLight.ttf') format('truetype');
+    font-weight: normal;
+    font-style: normal;
 }