diff --git a/_includes/analytics.html b/_includes/analytics.html
index 6b600f863..c75a48fce 100644
--- a/_includes/analytics.html
+++ b/_includes/analytics.html
@@ -3,11 +3,55 @@
 {% if site.google_analytics_id %}
   <!-- Google Analytics (http://google.com/analytics) -->
   <script>
-    !function(j,e,k,y,l,L){j.GoogleAnalyticsObject=y,j[y]||(j[y]=function(){
-    (j[y].q=j[y].q||[]).push(arguments)}),j[y].l=+new Date,l=e.createElement(k),
-    L=e.getElementsByTagName(k)[0],l.src='//www.google-analytics.com/analytics.js',
-    L.parentNode.insertBefore(l,L)}(window,document,'script','ga');
-    ga('create', '{{ site.google_analytics_id }}', 'jekyllrb.com');
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', '{{ site.google_analytics_id }}', 'auto', {
+      'allowLinker': true
+    });
     ga('send', 'pageview');
+    ga('linker:autoLink', ['invite.nylas.com', 'nylas.com', 'developer.nylas.com']);
   </script>
 {% endif %}
+
+<!-- AdRoll Code -->
+<script type="text/javascript">
+   adroll_adv_id = "KTKDYJUIVJG5PGVN2DJGCG";
+   adroll_pix_id = "VEPSFYZKB5HUFMYMLZ5OWU";
+   (function () {
+       var _onload = function(){
+           if (document.readyState && !/loaded|complete/.test(document.readyState)){setTimeout(_onload, 10);return}
+           if (!window.__adroll_loaded){__adroll_loaded=true;setTimeout(_onload, 50);return}
+           var scr = document.createElement("script");
+           var host = (("https:" == document.location.protocol) ? "s.adroll.com" : "a.adroll.com");
+           scr.setAttribute('async', 'true');
+           scr.type = "text/javascript";
+           scr.src = document.location.protocol + "//" + host + "/j/roundtrip.js";
+           ((document.getElementsByTagName('head') || [null])[0] ||
+               document.getElementsByTagName('script')[0].parentNode).appendChild(scr);
+       };
+       if (window.addEventListener) {window.addEventListener('load', _onload, false);}
+       else {window.attachEvent('onload', _onload)}
+   }());
+</script>
+
+<!-- Facebook Pixel Code -->
+<script>
+!function(f,b,e,v,n,t,s){if(f.fbq)return;n=f.fbq=function(){n.callMethod?
+n.callMethod.apply(n,arguments):n.queue.push(arguments)};if(!f._fbq)f._fbq=n;
+n.push=n;n.loaded=!0;n.version='2.0';n.queue=[];t=b.createElement(e);t.async=!0;
+t.src=v;s=b.getElementsByTagName(e)[0];s.parentNode.insertBefore(t,s)}(window,
+document,'script','//connect.facebook.net/en_US/fbevents.js');
+
+fbq('init', '416174325242828');
+fbq('track', "PageView");</script>
+<noscript><img height="1" width="1" style="display:none"
+src="https://www.facebook.com/tr?id=416174325242828&ev=PageView&noscript=1"
+/></noscript>
+<!-- End Facebook Pixel Code -->
+
+<!-- Optimizely -->
+<script src="//cdn.optimizely.com/js/3228770331.js"></script>
+<!-- End optimizely -->
diff --git a/_sass/_docs.scss b/_sass/_docs.scss
index ace9cb2a3..13d64ba79 100644
--- a/_sass/_docs.scss
+++ b/_sass/_docs.scss
@@ -99,9 +99,11 @@
   code, pre {
     font-family: Monaco, Andale Mono, Courier New, monospace;
   }
+
+  // inline code (`ClassName`)
   code {
-    color: rgba(0,0,0,0.76);
-    background-color: #f2f2f2;
+    color: #2F3942;
+    background-color: #eee;
     padding: 1px 3px;
     font-size: 14px;
     -webkit-border-radius: 3px;
@@ -116,9 +118,12 @@
     white-space: pre-wrap;
     word-wrap: break-word;
   }
+
+  // code blocks (```)
   pre code {
+    color: #eee;
     font-size: 13px;
-    background-color: #f2f2f2;
+    background-color: #2F3942;
     padding: 0;
     display: block;
     padding: 14px;
diff --git a/_sass/_main.scss b/_sass/_main.scss
index 94c4fa3c3..d690dfea0 100644
--- a/_sass/_main.scss
+++ b/_sass/_main.scss
@@ -249,8 +249,10 @@ p {
 }
 .hacker {
   width:100%;
-  height:500px;
   margin-top:100px;
+  margin-bottom:80px;
+  padding-top: 55px;
+  padding-bottom: 55px;
   background: url(../images/hacker_background.png) center no-repeat;
   background-size: cover;
 }
diff --git a/_sass/_tomorrow.scss b/_sass/_tomorrow.scss
index eb66fd1f1..50f8489de 100644
--- a/_sass/_tomorrow.scss
+++ b/_sass/_tomorrow.scss
@@ -1,218 +1,137 @@
-/**
- * GitHub Gist Theme
- * Author : Louis Barranqueiro - https://github.com/LouisBarranqueiro
+/*!
+ * Agate by Taufik Nurrohman <https://github.com/tovic>
+ * ----------------------------------------------------
+ *
+ * #ade5fc
+ * #a2fca2
+ * #c6b4f0
+ * #d36363
+ * #fcc28c
+ * #fc9b9b
+ * #ffa
+ * #fff
+ * #333
+ * #62c8f3
+ * #888
+ *
  */
 
 .hljs {
   display: block;
-  background: white;
-  padding: 0.5em;
-  color: #333333;
   overflow-x: auto;
+  padding: .5em;
+  background: #333;
+  color: white;
   -webkit-text-size-adjust: none;
 }
 
-.hljs-comment,
-.bash .hljs-shebang,
-.java .hljs-javadoc,
-.javascript .hljs-javadoc,
-.rust .hljs-preprocessor {
-  color: #969896;
-}
-
-.hljs-string,
-.apache .hljs-sqbracket,
-.coffeescript .hljs-subst,
-.coffeescript .hljs-regexp,
-.cpp .hljs-preprocessor,
-.c .hljs-preprocessor,
-.javascript .hljs-regexp,
-.json .hljs-attribute,
-.makefile .hljs-variable,
-.markdown .hljs-value,
-.markdown .hljs-link_label,
-.markdown .hljs-strong,
-.markdown .hljs-emphasis,
-.markdown .hljs-blockquote,
-.nginx .hljs-regexp,
-.nginx .hljs-number,
-.objectivec .hljs-preprocessor .hljs-title,
-.perl .hljs-regexp,
-.php .hljs-regexp,
-.xml .hljs-value,
-.less .hljs-built_in,
-.scss .hljs-built_in {
-  color: #df5000;
-}
-
-.hljs-keyword,
-.css .hljs-at_rule,
-.css .hljs-important,
-.http .hljs-request,
-.ini .hljs-setting,
-.haskell .hljs-type,
-.java .hljs-javadoctag,
-.javascript .hljs-tag,
-.javascript .hljs-javadoctag,
-.nginx .hljs-title,
-.objectivec .hljs-preprocessor,
-.php .hljs-phpdoc,
-.sql .hljs-built_in,
-.less .hljs-tag,
-.less .hljs-at_rule,
-.scss .hljs-tag,
-.scss .hljs-at_rule,
-.scss .hljs-important,
-.stylus .hljs-at_rule,
-.go .hljs-typename,
-.swift .hljs-preprocessor {
-  color: #a71d5d;
-}
-
-.apache .hljs-common,
-.apache .hljs-cbracket,
-.apache .hljs-keyword,
-.bash .hljs-literal,
-.bash .hljs-built_in,
-.coffeescript .hljs-literal,
-.coffeescript .hljs-built_in,
-.coffeescript .hljs-number,
-.cpp .hljs-number,
-.cpp .hljs-built_in,
-.c .hljs-number,
-.c .hljs-built_in,
-.cs .hljs-number,
-.cs .hljs-built_in,
-.css .hljs-attribute,
-.css .hljs-hexcolor,
-.css .hljs-number,
-.css .hljs-function,
-.haskell .hljs-number,
-.http .hljs-literal,
-.http .hljs-attribute,
-.java .hljs-number,
-.javascript .hljs-built_in,
-.javascript .hljs-literal,
-.javascript .hljs-number,
-.json .hljs-number,
-.makefile .hljs-keyword,
-.markdown .hljs-link_reference,
-.nginx .hljs-built_in,
-.objectivec .hljs-literal,
-.objectivec .hljs-number,
-.objectivec .hljs-built_in,
-.php .hljs-literal,
-.php .hljs-number,
-.python .hljs-number,
-.ruby .hljs-prompt,
-.ruby .hljs-constant,
-.ruby .hljs-number,
-.ruby .hljs-subst .hljs-keyword,
-.ruby .hljs-symbol,
-.rust .hljs-number,
-.sql .hljs-number,
-.puppet .hljs-function,
-.less .hljs-number,
-.less .hljs-hexcolor,
-.less .hljs-function,
-.less .hljs-attribute,
-.scss .hljs-preprocessor,
-.scss .hljs-number,
-.scss .hljs-hexcolor,
-.scss .hljs-function,
-.scss .hljs-attribute,
-.stylus .hljs-number,
-.stylus .hljs-hexcolor,
-.stylus .hljs-attribute,
-.stylus .hljs-params,
-.go .hljs-built_in,
-.go .hljs-constant,
-.swift .hljs-built_in,
-.swift .hljs-number {
-  color: #0086b3;
-}
-
-.apache .hljs-tag,
-.cs .hljs-xmlDocTag,
-.css .hljs-tag,
-.xml .hljs-title,
-.stylus .hljs-tag {
-  color: #63a35c;
-}
-
-.bash .hljs-variable,
-.cs .hljs-preprocessor,
-.cs .hljs-preprocessor .hljs-keyword,
-.css .hljs-attr_selector,
-.css .hljs-value,
-.ini .hljs-value,
-.ini .hljs-keyword,
-.javascript .hljs-tag .hljs-title,
-.makefile .hljs-constant,
-.nginx .hljs-variable,
-.xml .hljs-tag,
-.scss .hljs-variable {
-  color: #333333;
-}
-
-.bash .hljs-title,
-.coffeescript .hljs-title,
-.cpp .hljs-title,
-.c .hljs-title,
-.cs .hljs-title,
-.css .hljs-id,
-.css .hljs-class,
-.css .hljs-pseudo,
-.ini .hljs-title,
-.haskell .hljs-title,
-.haskell .hljs-pragma,
-.java .hljs-title,
-.javascript .hljs-title,
-.makefile .hljs-title,
-.objectivec .hljs-title,
-.perl .hljs-sub,
-.php .hljs-title,
-.python .hljs-decorator,
-.python .hljs-title,
-.ruby .hljs-parent,
-.ruby .hljs-title,
-.rust .hljs-title,
-.xml .hljs-attribute,
-.puppet .hljs-title,
-.less .hljs-id,
-.less .hljs-pseudo,
-.less .hljs-class,
-.scss .hljs-id,
-.scss .hljs-pseudo,
-.scss .hljs-class,
-.stylus .hljs-class,
-.stylus .hljs-id,
-.stylus .hljs-pseudo,
-.stylus .hljs-title,
-.swift .hljs-title,
-.diff .hljs-chunk {
-  color: #795da3;
-}
-
-.coffeescript .hljs-reserved,
-.coffeescript .hljs-attribute {
-  color: #1d3e81;
-}
-
-.diff .hljs-chunk {
+.asciidoc .hljs-title,
+.hljs-label,
+.hljs-tag .hljs-title,
+.hljs-prompt,
+.http .hljs-request {
   font-weight: bold;
 }
 
-.diff .hljs-addition {
-  color: #55a532;
-  background-color: #eaffea;
+.hljs-change,
+.hljs-code {
+  font-style: italic;
 }
 
-.diff .hljs-deletion {
-  color: #bd2c00;
-  background-color: #ffecec;
+.hljs-tag,
+.ini .hljs-title {
+  color: #62c8f3;
 }
 
-.markdown .hljs-link_url {
+.hljs-id,
+.hljs-cbracket,
+.hljs-tag .hljs-value {
+  color: #ade5fc;
+}
+
+.hljs-string,
+.hljs-bullet {
+  color: #a2fca2;
+}
+
+.hljs-type,
+.hljs-variable,
+.hljs-name,
+.actionscript .hljs-title,
+.aspectj .hljs-annotation,
+.aspectj .hljs-title,
+.hljs-attribute,
+.hljs-change,
+.hljs-blockquote,
+.hljs-built_in {
+  color: #ffa;
+}
+
+.hljs-number,
+.hljs-hexcolor,
+.hljs-link_label,
+.hljs-link_reference {
+  color: #d36363;
+}
+
+.hljs-keyword,
+.hljs-literal,
+.hljs-constant,
+.css .hljs-tag,
+.hljs-typename,
+.hljs-winutils {
+  color: #fcc28c;
+}
+
+.hljs-comment,
+.hljs-cdata,
+.hljs-preprocessor,
+.hljs-annotation,
+.hljs-decorator,
+.hljs-doctype,
+.hljs-deletion,
+.hljs-shebang,
+.apache .hljs-sqbracket,
+.tex .hljs-formula,
+.hljs-header,
+.hljs-horizontal_rule,
+.hljs-code {
+  color: #888;
+}
+
+.hljs-regexp,
+.hljs-attr_selector {
+  color: #c6b4f0;
+}
+
+.hljs-important,
+.hljs-doctype,
+.hljs-pi,
+.hljs-chunk,
+.actionscript .hljs-type,
+.hljs-shebang,
+.hljs-pragma,
+.http .hljs-attribute {
+  color: #fc9b9b;
+}
+
+.hljs-deletion {
+  background-color: #fc9b9b;
+  color: #333;
+}
+
+.hljs-addition {
+  background-color: #a2fca2;
+  color: #333;
+}
+
+.hljs a,
+.hljs-tag .hljs-attribute {
+  color: inherit;
+}
+
+.hljs a:focus,
+.hljs a:hover {
+  color: inherit;
   text-decoration: underline;
 }
diff --git a/images/popover_translate.png b/images/popover_translate.png
new file mode 100644
index 000000000..57c69b8e3
Binary files /dev/null and b/images/popover_translate.png differ
diff --git a/images/talk_JIRXVGVPzn8.png b/images/talk_JIRXVGVPzn8.png
new file mode 100644
index 000000000..574166233
Binary files /dev/null and b/images/talk_JIRXVGVPzn8.png differ
diff --git a/images/talk_Uu4Yz2HmCgE.png b/images/talk_Uu4Yz2HmCgE.png
new file mode 100644
index 000000000..73204a381
Binary files /dev/null and b/images/talk_Uu4Yz2HmCgE.png differ
diff --git a/index.html b/index.html
index 1ac6bb693..c1d0c398c 100644
--- a/index.html
+++ b/index.html
@@ -63,34 +63,62 @@ everything from the simplest workflow enhancements to entirely new views of your
 
 
 <div class="hacker">
-  <div class="container">
-    <div class="grid">
-      <div class="unit half" style="text-align: left; margin-top:60px;">
-        <h3 style="margin-bottom:0; color:white;">Welcome Developers.</h3>
-        <h4 style="max-width:500px; color:white;">Innovate on top of email with JavaScript, NodeJS and React.</h4>
-        <div class="cta" style="margin-top:40px;">
-          <a href="examples" class="btn btn-large" style="margin-right:10px;">
-            See Examples
-          </a>
-          <a href="docs" class="btn btn-large btn-emphasis">
-            Get Started
-          </a>
-        </div>
-      </div>
-      <div class="unit half">
-        <pre><code class="lang-coffee">render: =&gt;
-          &lt;<span class="hljs-type">Popover</span> <span class="hljs-keyword">ref</span>=<span class="hljs-string">"popover"</span>
-                   className=<span class="hljs-string">"translate-language-picker pull-right"</span>
-                   buttonComponent={@_renderButton()}&gt;
-            &lt;<span class="hljs-type">Menu</span> items={ <span class="hljs-type">Object</span>.keys(<span class="hljs-type">YandexLanguages</span>) }
-                  itemKey={ (item) -&gt; item }
-                  itemContent={ (item) -&gt; item }
-                  onSelect={@_onTranslate}
-                  /&gt;
-          &lt;/<span class="hljs-type">Popover</span>&gt;
-        </code></pre>
-
+  <div class="grid" style="position:relative;">
+    <div class="unit half" style="text-align: left;">
+      <h3 style="margin-bottom:0; color:white;">Welcome Developers.</h3>
+      <h4 style="max-width:500px; color:white;">Innovate on top of email with JavaScript, NodeJS, React, and Electron.</h4>
+      <div class="cta" style="margin-top:40px;">
+        <a href="examples" class="btn btn-large" style="margin-right:10px;">
+          See Examples
+        </a>
+        <a href="docs" class="btn btn-large btn-emphasis">
+          Get Started
+        </a>
       </div>
     </div>
+    <div class="unit half">
+      <pre style="background-color:rgba(0,0,0,0.4); color:white; font-size: 0.8em; line-height: 1.6em; margin-right:45px; padding-left: 20px; border-radius:4px; border:1px solid rgba(0,0,0,0.4);">
+        <code class="javascript">
+render: <span class="hljs-keyword">function</span>() {
+  <span class="hljs-keyword">return</span> <span class="hljs-tag">&lt;Popover </span>
+    <span class="hljs-literal">ref</span>=<span class="hljs-string">"popover"</span>
+    <span class="hljs-literal">className</span>=<span class="hljs-string">"translate-language-picker pull-right"</span>
+    <span class="hljs-literal">buttonComponent</span>={<span class="hljs-variable">@_renderButton()</span>}&gt;
+    <span class="hljs-tag">&lt;Menu</span>
+      <span class="hljs-literal">items</span>={ <span class="hljs-tag">Object</span>.keys(<span class="hljs-tag">YandexLanguages</span>) }
+      <span class="hljs-literal">onSelect</span>={<span class="hljs-variable">@_onTranslate</span>}/&gt;
+  <span class="hljs-tag">&lt;/Popover&gt;</span>
+}</code>
+        </pre>
+    </div>
+    <div style="position:absolute; width:300px; height:200px; bottom:0; right:0;">
+      <img src="images/popover_translate.png" style="width:300px;"/>
+    </div>
   </div>
 </div>
+
+<div class="grid">
+  <h3>Meet the team behind N1</h3>
+  <p>
+    We're a <a href="https://nylas.com/about">small team of engineers</a> solving
+    big problems - and we're <a href="https://nylas.com/jobs">hiring!</a>
+    If you'd like to get in touch, feel free to email us at <a href="mailto:hello@nylas.com">hello@nylas.com</a>.
+    N1 is <a href="https://github.com/nylas/N1">open source</a> and we welcome
+    pull requests!
+  </p>
+
+  <div class="unit half">
+    <a href="https://www.youtube.com/watch?v=Uu4Yz2HmCgE">
+      <img width="100%" src="images/talk_Uu4Yz2HmCgE.png">
+      <h4 style="font-size:20px;">ReactEurope 2015: How React & Flux Turn Apps Into Extensible Platforms</h4>
+    </a>
+  </div>
+  <div class="unit half">
+    <a href="https://www.youtube.com/watch?v=JIRXVGVPzn8">
+      <img width="100%" src="images/talk_JIRXVGVPzn8.png">
+      <h4 style="font-size:20px;">Bay Area Electron Meetup: Making the web feel native</h4>
+    </a>
+  </div>
+</div>
+
+<div style="padding:30px;"></div>