openwhisk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mrutkow...@apache.org
Subject [incubator-openwhisk-website] 03/03: Revert "Re-designing OpenWhisk website (#262)"
Date Tue, 07 Aug 2018 01:14:41 GMT
This is an automated email from the ASF dual-hosted git repository.

mrutkowski pushed a commit to branch revert-262-openwhisk-site-v1
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-website.git

commit 208f42f6e4821d642a8b9430933270a384ab71cf
Author: Matt Rutkowski <mrutkows@us.ibm.com>
AuthorDate: Mon Aug 6 20:14:36 2018 -0500

    Revert "Re-designing OpenWhisk website (#262)"
    
    This reverts commit 60afa26279e3c244149e62ad3a8a7bb25b5c0af6.
---
 CONTRIBUTING.md                                    |   31 +-
 Gemfile                                            |    2 +-
 README.md                                          |   19 -
 _includes/index/index.js                           |   30 -
 _includes/partial/site-footer.html                 |   92 +-
 _includes/partial/site-header.html                 |  170 ++-
 _layouts/about.html                                |   98 ++
 _layouts/community.html                            |  255 ----
 _layouts/contributors.html                         |  145 +++
 _layouts/creators.html                             |  149 +++
 _layouts/default.html                              |   56 +-
 _layouts/developers.html                           |  156 +++
 _layouts/documentation.html                        | 1316 --------------------
 _layouts/downloads.html                            |   93 +-
 _layouts/events.html                               |   29 +-
 _layouts/home.html                                 |  330 +++--
 _layouts/page.html                                 |   22 +
 _layouts/slack.html                                |   69 +-
 _layouts/supporters.html                           |  153 +++
 _plugins/remote_markdown.rb                        |   48 -
 _scss/_base.scss                                   |  382 ------
 _scss/_desktop.scss                                |   16 -
 _scss/_reset.scss                                  |   45 -
 _scss/_skin.scss                                   |  104 --
 _scss/_tablet.scss                                 |   92 --
 _scss/_variables.scss                              |  238 ----
 _scss/block/_main-content.scss                     |  204 +++
 _scss/block/_main-cta.scss                         |  107 ++
 _scss/block/_persona.scss                          |   93 ++
 _scss/block/_quotes.scss                           |  135 ++
 _scss/block/_site-footer.scss                      |   36 +
 _scss/block/_site-header.scss                      |   30 +
 _scss/block/_site-nav.scss                         |  159 +++
 _scss/block/_site-section.scss                     |   37 +
 _scss/block/_where-to-start.scss                   |   55 +
 _scss/block/_why-are-we-here.scss                  |  109 ++
 _scss/config/_reset.scss                           |   33 +
 _scss/config/_typography.scss                      |   63 +
 _scss/config/_variables.scss                       |   38 +
 _scss/util/_button.scss                            |   45 +
 _scss/util/_embed-container.scss                   |   17 +
 _scss/util/_typography.scss                        |    5 +
 about.md                                           |   14 +
 community.md                                       |   28 -
 contact.md                                         |   23 +
 contributors.md                                    |    6 +
 css/main.scss                                      |   32 +-
 developers.md                                      |    6 +
 documentation.md                                   |   24 -
 downloads.md                                       |   26 +-
 events.md                                          |  114 +-
 faq.md                                             |   70 ++
 images/README.md                                   |  176 ---
 images/apache-incubator-egg-logo.png               |  Bin 0 -> 8626 bytes
 images/apache-incubator-new-sm.png                 |  Bin 0 -> 43647 bytes
 images/apache-incubator-new.png                    |  Bin 0 -> 71977 bytes
 images/apache-incubator-new.svg                    |   91 ++
 images/apache-incubator-ring-new.jpg               |  Bin 0 -> 419206 bytes
 images/apache-incubator-ring-openwhisk-sm.png      |  Bin 0 -> 37569 bytes
 images/apache-incubator-ring-openwhisk.png         |  Bin 0 -> 564877 bytes
 images/apache-openwhisk-test.png                   |  Bin 7693 -> 0 bytes
 images/apache-openwhisk.jpg                        |  Bin 0 -> 33140 bytes
 images/apache-openwhisk.png                        |  Bin 28453 -> 0 bytes
 images/apache-openwhisk.svg                        |  476 +------
 images/apache-openwhisk@2x.jpg                     |  Bin 0 -> 81717 bytes
 images/arrow-down.svg                              |   44 -
 images/arrow-right.svg                             |   43 -
 images/deployments/OW-Deployments.png              |  Bin 182622 -> 0 bytes
 images/deployments/OW-Deployments.pptx             |  Bin 12514802 -> 0 bytes
 images/deployments/logo-docker-compose-notext.png  |  Bin 39135 -> 0 bytes
 images/deployments/logo-docker-compose-text.png    |  Bin 11530021 -> 0 bytes
 images/deployments/logo-docker-compose-text.svg    |  107 --
 images/deployments/logo-kubernetes-notext.png      |  Bin 12225 -> 0 bytes
 images/deployments/logo-kubernetes-notext.svg      |   83 --
 images/deployments/logo-kubernetes-text.png        |  Bin 5088 -> 0 bytes
 images/deployments/logo-kubernetes-text.svg        |  102 --
 .../elements/OW-Abstract Architecture Diagram.png  |  Bin 5750714 -> 0 bytes
 .../elements/OW-Abstract Architecture Diagram.pptx |  Bin 2237835 -> 0 bytes
 images/elements/drawing-8-sided-cog.svg            |   84 --
 images/elements/drawing-cog-lt-aquamarine.png      |  Bin 10390 -> 0 bytes
 images/elements/drawing-cog-med-gray.png           |  Bin 7419 -> 0 bytes
 images/elements/drawing-events-data.png            |  Bin 779448 -> 0 bytes
 images/elements/drawing-events-data.svg            |  317 -----
 images/elements/drawing-events-devices.png         |  Bin 15258 -> 0 bytes
 images/elements/drawing-events-devices.svg         |  451 -------
 images/elements/drawing-events-sensors.png         |  Bin 17223 -> 0 bytes
 images/elements/drawing-events-sensors.svg         |  183 ---
 images/elements/drawing-events-social.png          |  Bin 16094 -> 0 bytes
 images/elements/drawing-events-social.svg          |  150 ---
 images/elements/drawing-satellite-dish.png         |  Bin 4635 -> 0 bytes
 images/elements/drawing-satellite-dish.svg         |  103 --
 images/elements/function-of-x-notation.png         |  Bin 5225 -> 0 bytes
 images/elements/function-of-x-notation.svg         |   74 --
 images/elements/illustration-cost-effective.png    |  Bin 13280 -> 0 bytes
 .../elements/illustration-developers-flexible.png  |  Bin 59639 -> 0 bytes
 images/elements/illustration-integrators.png       |  Bin 92447 -> 0 bytes
 images/elements/unused/globe2.svg                  |    1 -
 images/elements/unused/gps2.svg                    |   52 -
 images/elements/unused/location.svg                | 1235 ------------------
 images/{elements/unused => }/icon-chevron-down.svg |    0
 images/icon-cog.png                                |  Bin 8699 -> 0 bytes
 images/icon-github.svg                             |    4 +-
 images/icon-medium.svg                             |    4 +-
 images/icon-slack.svg                              |    4 +-
 images/icon-slideshare.svg                         |    4 +-
 images/icon-stack-overflow.svg                     |    4 +-
 images/icon-twitter.svg                            |    4 +-
 images/icon-youtube.svg                            |    4 +-
 .../illustration-contributors-service.svg          |    0
 images/illustration-contributors-share.svg         |  152 +++
 .../illustration-contributors-skill.svg            |    0
 images/illustration-contributors.svg               |  154 +++
 .../{elements => }/illustration-cost-effective.svg |    0
 images/illustration-developers-ecosystem.svg       |   69 +
 .../illustration-developers-flexible.svg           |    0
 images/illustration-developers-scaling.svg         |   67 +
 .../illustration-integrator-community.svg          |    0
 ...s.svg => illustration-integrator-ecosystem.svg} |   12 +-
 images/illustration-integrator-third-party.svg     |  140 +++
 images/{elements => }/illustration-integrators.svg |    0
 images/illustration-languages-and-integrations.svg |   30 +
 images/illustration-openwhisk-architecture.svg     |   72 ++
 images/illustration-openwhisk.svg                  |   66 +
 images/logo/Java_(Horizontal).svg                  |   96 --
 images/logo/SupportApache-small.png                |  Bin 96596 -> 0 bytes
 images/logo/apache-openwhisk-450w.png              |  Bin 0 -> 7737 bytes
 images/logo/apache-openwhisk-800w.png              |  Bin 0 -> 29863 bytes
 images/logo/apache-openwhisk-logo-only.png         |  Bin 290480 -> 0 bytes
 images/logo/apache-openwhisk-logo-only.svg         |  626 ----------
 images/logo/apache-openwhisk-mark-128w.png         |  Bin 0 -> 4578 bytes
 images/logo/apache-openwhisk-mark-200w.png         |  Bin 0 -> 7339 bytes
 images/logo/apache-openwhisk-mark-300w.png         |  Bin 0 -> 15673 bytes
 images/logo/apache-openwhisk-mark-64w.png          |  Bin 0 -> 2272 bytes
 images/logo/apache-openwhisk-mark.svg              |  655 +---------
 images/logo/apache-openwhisk.png                   |  Bin 6273 -> 0 bytes
 images/logo/apache-openwhisk.svg                   |  659 +---------
 images/openwhisk-large.png                         |  Bin 0 -> 69408 bytes
 images/persona-contributor-torso.svg               |   56 +
 images/persona-contributors.svg                    |   41 +
 images/persona-developer-torso.svg                 |   67 +
 images/persona-developers.svg                      |   59 +
 images/persona-integrator-torso.svg                |   60 +
 images/persona-integrators.svg                     |   49 +
 images/runtimes/OW-Runtimes-small.png              |  Bin 356774 -> 0 bytes
 images/runtimes/OW-Runtimes.png                    |  Bin 2406427 -> 0 bytes
 images/runtimes/OW-Runtimes.pptx                   |  Bin 3099686 -> 0 bytes
 images/runtimes/icon-docker-notext-color.png       |  Bin 246952 -> 0 bytes
 images/runtimes/icon-docker-notext-color.svg       |   97 --
 images/runtimes/icon-java-notext-color.png         |  Bin 19612 -> 0 bytes
 images/runtimes/icon-python-text-color-horz.png    |  Bin 1093404 -> 0 bytes
 images/runtimes/icon-python-text-color-vert.png    |  Bin 650218 -> 0 bytes
 images/runtimes/icon-ruby-notext-color.png         |  Bin 23133 -> 0 bytes
 images/runtimes/icon-ruby-notext-color.svg         |  609 ---------
 images/runtimes/icon-ruby-text-color-horz.png      |  Bin 1214610 -> 0 bytes
 images/runtimes/icon-ruby-text-color-horz.svg      |  624 ----------
 images/runtimes/icon-runtime-nodejs.png            |  Bin 8994 -> 0 bytes
 images/runtimes/icon-runtime-python.png            |  Bin 4257 -> 0 bytes
 images/runtimes/icon-runtime-swift.png             |  Bin 13343 -> 0 bytes
 images/runtimes/icon-swift-notext.png              |  Bin 4367 -> 0 bytes
 images/runtimes/logo-docker-engine-text-color.png  |  Bin 16792 -> 0 bytes
 images/runtimes/logo-docker-engine-text-color.svg  |  149 ---
 images/runtimes/logo-go-notext-lightblue.png       |  Bin 6570 -> 0 bytes
 images/runtimes/logo-go-notext-lightblue.svg       |  125 --
 images/runtimes/logo-haskell-notext-mono.svg       |   16 -
 images/runtimes/logo-java-text-color.png           |  Bin 17615 -> 0 bytes
 images/runtimes/logo-java-text-color.svg           |   93 --
 images/runtimes/logo-nodejs-notext.svg             |  639 ----------
 images/runtimes/logo-nodejs-text-color.png         |  Bin 46753 -> 0 bytes
 images/runtimes/logo-nodejs-text-color.svg         |  181 ---
 images/runtimes/logo-php-text-color.png            |  Bin 30978 -> 0 bytes
 images/runtimes/logo-php-text-color.svg            |   96 --
 images/runtimes/logo-python-notext-color.svg       |  123 --
 images/runtimes/logo-ruby-text-color-card.png      |  Bin 22895 -> 0 bytes
 images/runtimes/logo-rust-notext-black.svg         |   18 -
 images/runtimes/logo-scala-notext-color.svg        |   26 -
 images/runtimes/logo-swift-notext-color.svg        |   22 -
 images/runtimes/logo-swift-text-color.png          |  Bin 5226 -> 0 bytes
 images/runtimes/logo-swift-text-color.svg          |   77 --
 images/supporter/abilisense.png                    |  Bin 43250 -> 5783 bytes
 images/supporter/abilisense@2x.png                 |  Bin 0 -> 14671 bytes
 images/supporter/adobe.png                         |  Bin 27490 -> 3533 bytes
 images/supporter/adobe@2x.png                      |  Bin 0 -> 8138 bytes
 images/supporter/advisorconnect.png                |  Bin 72304 -> 7032 bytes
 images/supporter/advisorconnect@2x.png             |  Bin 0 -> 16817 bytes
 images/supporter/altoros.png                       |  Bin 34054 -> 7908 bytes
 images/supporter/altoros@2x.png                    |  Bin 0 -> 22188 bytes
 images/supporter/apache.png                        |  Bin 0 -> 8198 bytes
 images/supporter/apache@2x.png                     |  Bin 0 -> 19887 bytes
 images/supporter/articoolo.png                     |  Bin 30396 -> 11513 bytes
 images/supporter/articoolo@2x.png                  |  Bin 0 -> 36781 bytes
 images/supporter/bigvu.png                         |  Bin 40464 -> 8600 bytes
 images/supporter/bigvu@2x.png                      |  Bin 0 -> 19766 bytes
 images/supporter/greenq.png                        |  Bin 50023 -> 9896 bytes
 images/supporter/greenq@2x.png                     |  Bin 0 -> 24981 bytes
 images/supporter/ibm-solid.png                     |  Bin 49253 -> 0 bytes
 images/supporter/kong.png                          |  Bin 33194 -> 6390 bytes
 images/supporter/kong@2x.png                       |  Bin 0 -> 13998 bytes
 images/supporter/magentiq.png                      |  Bin 50756 -> 6609 bytes
 images/supporter/magentiq@2x.png                   |  Bin 0 -> 15462 bytes
 images/supporter/naver.png                         |  Bin 26498 -> 0 bytes
 images/supporter/nepente.png                       |  Bin 52928 -> 8163 bytes
 images/supporter/nepente@2x.png                    |  Bin 0 -> 18825 bytes
 images/supporter/neuroapplied.png                  |  Bin 46153 -> 10633 bytes
 images/supporter/neuroapplied@2x.png               |  Bin 0 -> 34286 bytes
 images/supporter/redhat.png                        |  Bin 31830 -> 5504 bytes
 images/supporter/redhat@2x.png                     |  Bin 0 -> 12682 bytes
 images/supporter/sitespirit.png                    |  Bin 40292 -> 6984 bytes
 images/supporter/sitespirit@2x.png                 |  Bin 0 -> 14899 bytes
 images/supporter/wso2.png                          |  Bin 33662 -> 3838 bytes
 images/supporter/wso2@2x.png                       |  Bin 0 -> 8176 bytes
 index.md                                           |    4 -
 integrations.md                                    |    5 +
 media.md                                           |    5 +
 package-creators.md                                |    6 +
 serverless.md                                      |   27 +
 slack.md                                           |   18 -
 social.md                                          |   19 +
 supporters.md                                      |    7 +
 218 files changed, 3962 insertions(+), 11603 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ab2f597..c32a97e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,19 +1,18 @@
 <!--
 #
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+# license agreements.  See the NOTICE file distributed with this work for additional 
+# information regarding copyright ownership.  The ASF licenses this file to you
+# under the Apache License, Version 2.0 (the # "License"); you may not use this 
+# file except in compliance with the License.  You may obtain a copy of the License 
+# at:
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Unless required by applicable law or agreed to in writing, software distributed 
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+# CONDITIONS OF ANY KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations under the License.
 #
 -->
 
@@ -36,18 +35,18 @@ Instructions on how to do this can be found here:
 [http://www.apache.org/licenses/#clas](http://www.apache.org/licenses/#clas)
 
 Once submitted, you will receive a confirmation email from the Apache Software Foundation (ASF) and be added to
-the following list: http://people.apache.org/unlistedclas.html.
+the following list: http://people.apache.org/unlistedclas.html. 
 
 Project committers will use this list to verify pull requests (PRs) come from contributors that have signed a CLA.
 
-We look forward to your contributions!
+We look forward to your contributions! 
 
 ## Raising issues
 
-Please raise any bug reports on the respective project repository's GitHub issue tracker. Be sure to search the
+Please raise any bug reports on the respective project repository's GitHub issue tracker. Be sure to search the 
 list to see if your issue has already been raised.
 
-A good bug report is one that make it easy for us to understand what you were trying to do and what went wrong.
+A good bug report is one that make it easy for us to understand what you were trying to do and what went wrong. 
 Provide as much context as possible so we can try to recreate the issue.
 
 ### Discussion
diff --git a/Gemfile b/Gemfile
index 14e6c86..360d215 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,5 @@
 source "https://rubygems.org"
-ruby "2.5.1"
+ruby RUBY_VERSION
 
 # Hello! This is where you manage which Jekyll version is used to run.
 # When you want to use a different version, change it below, save the
diff --git a/README.md b/README.md
index 08fdc23..a87682f 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,3 @@
-<!--
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
--->
-
 # Apache OpenWhisk Website
 
 [![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
diff --git a/_includes/index/index.js b/_includes/index/index.js
deleted file mode 100644
index 4f274e5..0000000
--- a/_includes/index/index.js
+++ /dev/null
@@ -1,30 +0,0 @@
-
-function applyCollapsible() {
-
-    var coll = document.getElementsByClassName("collapsible-toggle");
-    var i;
-
-    for (i = 0; i < coll.length; i++) {
-      coll[i].addEventListener("click", function() {
-        this.classList.toggle("active");
-        var sibling = this.nextElementSibling;
-        console.log(sibling)
-        if(sibling!==null){
-          if (sibling.style.display === "block") {
-            sibling.style.display = "none";
-          } else {
-            sibling.style.display = "block";
-          }
-        }
-      });
-    }
-}
-
-function openIndex() {
-          console.log("openIndex")
-  document.getElementById("index").style.display = "block";
-}
-function closeIndex() {
-            console.log("closeIndex")
-  document.getElementById("index").style.display = "none";
-}
diff --git a/_includes/partial/site-footer.html b/_includes/partial/site-footer.html
index 057b9d6..33e1199 100644
--- a/_includes/partial/site-footer.html
+++ b/_includes/partial/site-footer.html
@@ -1,13 +1,81 @@
-<footer>
-    <main class="light-text">
-        <div style="text-align: center;">
-            Apache OpenWhisk is an effort undergoing incubation at The Apache
-            Software Foundation (ASF), sponsored by the Incubator.
-            Incubation is required of all newly accepted projects until a further
-            review indicates that the infrastructure, communications, and decision
-            making process have stabilized in a manner consistent with other
-            successful ASF projects. While incubation status is not necessarily a
-            reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
-        </div>
-    </main>
+<footer class="site-footer">
+  <nav class="site-nav site-nav--footer">
+    <a href="{{ site.github.url }}/about.html"
+       class="site-nav__item">About</a>
+    <a href="{{ site.github.url }}/serverless.html"
+       class="site-nav__item">Serverless</a>
+    <a href="{{ site.github.url }}/developers.html"
+       class="site-nav__item">Developers</a>
+    <a href="{{ site.github.url }}/package-creators.html"
+       class="site-nav__item">Package Creators</a>
+    <a href="{{ site.github.url }}/contributors.html"
+       class="site-nav__item">Contributors</a>
+    <a href="{{ site.github.url }}/events.html"
+       class="site-nav__item">Events</a>
+    <a href="{{ site.github.url }}/supporters.html"
+       class="site-nav__item">Supporters</a>
+    <a href="{{ site.github.url }}/faq.html"
+       class="site-nav__item">FAQ</a>
+    <div class="site-nav__group">
+      <a href="https://github.com/apache?q=openwhisk"
+         title="Apache OpenWhisk project repositories on GitHub"
+         class="site-nav__item site-nav__item--margin-left-auto">
+        <img class="site-nav__image"
+             src="{{ site.github.url }}/images/icon-github.svg"
+             alt="Apache OpenWhisk project repositories on GitHub">
+      </a>
+      <a href="https://www.youtube.com/channel/UCbzgShnQk8F43NKsvEYA1SA"
+         title="Apache OpenWhisk on YouTube"
+         class="site-nav__item">
+        <img class="site-nav__image"
+             src="{{ site.github.url }}/images/icon-youtube.svg"
+             alt="Apache OpenWhisk on YouTube">
+      </a>
+      <a href="http://www.slideshare.net/OpenWhisk"
+         title="Apache OpenWhisk on SlideShare"
+         class="site-nav__item">
+        <img class="site-nav__image"
+             src="{{ site.github.url }}/images/icon-slideshare.svg"
+             alt="Apache OpenWhisk on SlideShare">
+      </a>
+      <a href="https://twitter.com/search?q=openwhisk"
+         title="Apache OpenWhisk on Twitter"
+         class="site-nav__item">
+        <img class="site-nav__image"
+             src="{{ site.github.url }}/images/icon-twitter.svg"
+             alt="Apache OpenWhisk on Twitter">
+      </a>
+      <a href="http://stackoverflow.com/questions/tagged/openwhisk"
+         title="Apache OpenWhisk on Stack Overflow"
+         class="site-nav__item">
+        <img class="site-nav__image"
+             src="{{ site.github.url }}/images/icon-stack-overflow.svg"
+             alt="Apache OpenWhisk on Stack Overflow">
+      </a>
+      <a href="slack.html"
+         title="Apache OpenWhisk on Slack"
+         class="site-nav__item">
+        <img class="site-nav__image"
+             src="{{ site.github.url }}/images/icon-slack.svg"
+             alt="Apache OpenWhisk on Slack">
+      </a>
+      <a href="https://medium.com/openwhisk"
+         title="Apache OpenWhisk on Medium"
+         class="site-nav__item">
+        <img class="site-nav__image"
+             src="{{ site.github.url }}/images/icon-medium.svg"
+             alt="Apache OpenWhisk on Medium">
+      </a>
+    </div>
+  </nav>
+  <div class="site-footer__site-disclaimer">
+    Apache OpenWhisk is an effort undergoing incubation at The Apache
+    Software Foundation (ASF), sponsored by the Incubator.
+    Incubation is required of all newly accepted projects until a further
+    review indicates that the infrastructure, communications, and decision
+    making process have stabilized in a manner consistent with other
+    successful ASF projects. While incubation status is not necessarily a
+    reflection of the completeness or stability of the code, it does indicate
+    that the project has yet to be fully endorsed by the ASF.
+  </div>
 </footer>
diff --git a/_includes/partial/site-header.html b/_includes/partial/site-header.html
index 5c20c91..b44529d 100644
--- a/_includes/partial/site-header.html
+++ b/_includes/partial/site-header.html
@@ -1,37 +1,135 @@
-<div class="header">
+<header class="site-header">
+  <div class="site-header__nav site-header__nav--primary">
+    <nav class="site-nav site-nav--main">
+      <a class="site-nav__item site-nav__item--main site-nav__item--logo"
+         href="{{ site.github.url }}/">
+        <img class="site-nav__image"
+             src="{{ site.github.url }}/images/apache-openwhisk.svg"
+             alt="Apache OpenWhisk">
+      </a>
 
-    <a class="header-section-logo" href="/">
-    </a>
-    <div class="header-section-text-links">
-        <div class="header-row-text-links">
-            <a class="header-text-link" href="{{ site.github.url }}/documentation.html">Documentation</a>
-            <a class="header-text-link" href="{{ site.github.url }}/community.html">Community</a>
-            <a class="header-text-link" href="{{ site.github.url }}/downloads.html">Downloads</a>
-        </div>
-    </div>
-    <div class="header-section-social-icons">
-        <div class="header-row-social-icons">
-            <a class="header-button-icon" style="order: 7;" href="https://github.com/apache?q=openwhisk" title="Apache OpenWhisk project repositories on GitHub">
-                <img class="header-icon-image" src="{{ site.github.url }}/images/icon-github.svg">
-            </a>
-            <a class="header-button-icon" style="order: 6;" href="slack.html" title="Apache OpenWhisk on Slack">
-                <img class="header-icon-image" src="{{ site.github.url }}/images/icon-slack.svg">
-            </a>
-            <a class="header-button-icon" style="order: 5;" href="https://twitter.com/search?q=openwhisk" title="Apache OpenWhisk on Twitter">
-                <img class="header-icon-image" src="{{ site.github.url }}/images/icon-twitter.svg">
-            </a>
-            <a class="header-button-icon" style="order: 4;" href="https://medium.com/openwhisk" title="Apache OpenWhisk on Medium">
-                <img class="header-icon-image" src="{{ site.github.url }}/images/icon-medium.svg">
-            </a>
-            <a class="header-button-icon" style="order: 3;" href="https://www.youtube.com/channel/UCbzgShnQk8F43NKsvEYA1SA" title="Apache OpenWhisk on YouTube">
-                <img class="header-icon-image" src="{{ site.github.url }}/images/icon-youtube.svg">
-            </a>
-            <a class="header-button-icon" style="order: 2;" href="http://stackoverflow.com/questions/tagged/openwhisk" title="Apache OpenWhisk on Stack Overflow">
-                <img class="header-icon-image" src="{{ site.github.url }}/images/icon-stack-overflow.svg">
-            </a>
-            <a class="header-button-icon" style="order: 1;" href="http://www.slideshare.net/OpenWhisk" title="Apache OpenWhisk on SlideShare">
-                <img class="header-icon-image" src="{{ site.github.url }}/images/icon-slideshare.svg">
-            </a>
-        </div>
-    </div>
-</div>
+      <div class="site-nav__item site-nav__item--dropdown">
+      <a href="{{ site.github.url }}/about.html"
+            class="site-nav__item site-nav__item--dropdown-link">Docs</a>
+            <div class="site-nav__item site-nav__item--dropdown-container">
+              <a href="{{ site.github.url }}/about.html"
+                  class="site-nav__item site-nav__item--dropdown-item">About</a>
+              <a href="{{ site.github.url }}/serverless.html"
+                  class="site-nav__item site-nav__item--dropdown-item">Serverless</a>
+              <a href="{{ site.github.url }}/faq.html"
+                  class="site-nav__item site-nav__item--dropdown-item">FAQ</a>
+              <a href="https://github.com/apache/incubator-openwhisk/tree/master/docs#readme"
+                  class="site-nav__item site-nav__item--dropdown-item">Documentation</a>
+            </div>
+      </div>
+
+      <div class="site-nav__item site-nav__item--dropdown">
+      <a href="{{ site.github.url }}/developers.html"
+            class="site-nav__item site-nav__item--dropdown-link">Get Started</a>
+            <div class="site-nav__item site-nav__item--dropdown-container">
+              <a href="{{ site.github.url }}/developers.html"
+                  class="site-nav__item site-nav__item--dropdown-item">Developers</a>
+              <a href="{{ site.github.url }}/contributors.html"
+                  class="site-nav__item site-nav__item--dropdown-item">Contributors</a>
+              <a href="{{ site.github.url }}/package-creators.html"
+                  class="site-nav__item site-nav__item--dropdown-item">Package Creators</a>
+              <!--
+              <a href=""
+                  class="site-nav__item site-nav__item--dropdown-item">Live Tutorial</a>
+              <a href=""
+                  class="site-nav__item site-nav__item--dropdown-item">Sandbox</a>
+              -->
+            </div>
+      </div>
+
+      <div class="site-nav__item site-nav__item--dropdown">
+      <a href="{{ site.github.url }}/faq.html"
+            class="site-nav__item site-nav__item--dropdown-link">Community</a>
+            <div class="site-nav__item site-nav__item--dropdown-container">
+              <a href="{{ site.github.url }}/contact.html"
+                  class="site-nav__item site-nav__item--dropdown-item">Mailing Lists</a>
+              <a href="https://cwiki.apache.org/confluence/display/OPENWHISK/OpenWhisk+Project+Wiki"
+                  class="site-nav__item site-nav__item--dropdown-item">Wiki</a>
+              <a href="{{ site.github.url }}/social"
+                  class="site-nav__item site-nav__item--dropdown-item">Social Media</a>
+              <a href="{{ site.github.url }}/events.html"
+                  class="site-nav__item site-nav__item--dropdown-item">Events</a>
+              <a href="{{ site.github.url }}/supporters.html"
+                  class="site-nav__item site-nav__item--dropdown-item">Supporters</a>
+              <a href="https://medium.com/openwhisk"
+                  class="site-nav__item site-nav__item--dropdown-item">Blog</a>
+            </div>
+      </div>
+
+      <div class="site-nav__item site-nav__item--dropdown">
+      <a href="https://github.com/apache/incubator-openwhisk-external-resources"
+            class="site-nav__item site-nav__item--dropdown-link site-nav__item--hide-on-small">Resources</a>
+            <div class="site-nav__item site-nav__item--dropdown-container">
+              <a href="{{ site.github.url }}/downloads.html" class="site-nav__item site-nav__item--dropdown-item">Downloads</a>
+              <a href="https://github.com/apache/incubator-openwhisk-external-resources#feed-providers"
+                  class="site-nav__item site-nav__item--dropdown-item">Integrations</a>
+              <a href="https://github.com/apache/incubator-openwhisk-external-resources#applications"
+                  class="site-nav__item site-nav__item--dropdown-item">Demos &amp; Examples</a>
+              <a href="https://github.com/apache/incubator-openwhisk-external-resources#articles"
+                  class="site-nav__item site-nav__item--dropdown-item">Articles</a>
+              <a href="https://github.com/apache/incubator-openwhisk-external-resources#tutorials"
+                  class="site-nav__item site-nav__item--dropdown-item">Tutorials</a>
+            </div>
+      </div>
+
+    </nav>
+  </div>
+  <div class="site-header__nav site-header__nav--secondary">
+    <nav class="site-nav site-nav--social">
+      <a href="https://github.com/apache?q=openwhisk"
+         title="Apache OpenWhisk project repositories on GitHub"
+         class="site-nav__item">
+        <img class="site-nav__image"
+             src="{{ site.github.url }}/images/icon-github.svg"
+             alt="Apache OpenWhisk project repositories on GitHub">
+      </a>
+      <a href="https://www.youtube.com/channel/UCbzgShnQk8F43NKsvEYA1SA"
+         title="Apache OpenWhisk on YouTube"
+         class="site-nav__item">
+        <img class="site-nav__image"
+             src="{{ site.github.url }}/images/icon-youtube.svg"
+             alt="Apache OpenWhisk on YouTube">
+      </a>
+      <a href="http://www.slideshare.net/OpenWhisk"
+         title="Apache OpenWhisk on SlideShare"
+         class="site-nav__item">
+        <img class="site-nav__image"
+             src="{{ site.github.url }}/images/icon-slideshare.svg"
+             alt="Apache OpenWhisk on SlideShare">
+      </a>
+      <a href="https://twitter.com/search?q=openwhisk"
+         title="Apache OpenWhisk on Twitter"
+         class="site-nav__item">
+        <img class="site-nav__image"
+             src="{{ site.github.url }}/images/icon-twitter.svg"
+             alt="Apache OpenWhisk on Twitter">
+      </a>
+      <a href="http://stackoverflow.com/questions/tagged/openwhisk"
+         title="Apache OpenWhisk on Stack Overflow"
+         class="site-nav__item">
+        <img class="site-nav__image"
+             src="{{ site.github.url }}/images/icon-stack-overflow.svg"
+             alt="Apache OpenWhisk on Stack Overflow">
+      </a>
+      <a href="slack.html"
+         title="Apache OpenWhisk on Slack"
+         class="site-nav__item">
+        <img class="site-nav__image"
+             src="{{ site.github.url }}/images/icon-slack.svg"
+             alt="Apache OpenWhisk on Slack">
+      </a>
+      <a href="https://medium.com/openwhisk"
+         title="Apache OpenWhisk on Medium"
+         class="site-nav__item">
+        <img class="site-nav__image"
+             src="{{ site.github.url }}/images/icon-medium.svg"
+             alt="Apache OpenWhisk on Medium">
+      </a>
+    </nav>
+  </div>
+</header>
diff --git a/_layouts/about.html b/_layouts/about.html
new file mode 100644
index 0000000..e32687c
--- /dev/null
+++ b/_layouts/about.html
@@ -0,0 +1,98 @@
+---
+layout: default
+---
+<section class="site-section site-section--gray">
+  <div class="main-content">
+    <h1 class="main-content__title">
+      {{ page.title }}
+    </h1>
+    <div class="main-content__body-content">
+      {{ content }}
+    </div>
+  </div>
+</section>
+<section class="site-section">
+  <div class="main-content">
+    <h2 class="main-content__heading">High-Level Programming Model</h2>
+    <p class="main-content__text main-content__text">
+      OpenWhisk is an open source, distributed serverless computing platform
+      able to execute application logic (Actions) in response to events
+      (Triggers) from external sources (Feeds) or HTTP requests governed by
+      conditional logic (Rules). It provides a programming environment
+      supported by a REST API-based Command Line Interface (CLI) along with
+      tooling to support packaging and catalog services.
+    </p>
+    <div class="main-content__columns">
+      <div class="main-content__column">
+        <img class="main-content__image"
+             src="{{ site.github.url }}/images/illustration-openwhisk-architecture.svg"
+             alt="Apache OpenWhisk architecture">
+      </div>
+      <div class="main-content__column">
+        <h3 class="main-content__sub-heading">
+          Event Sources
+        </h3>
+        <p class="main-content__text main-content__text--no-top-margin">
+          Event sources, such as devices, queues, databases, and webhooks, emit
+          classes of events in the form of triggers.
+        </p>
+        <h3 class="main-content__sub-heading">
+          Triggers
+        </h3>
+        <p class="main-content__text main-content__text--no-top-margin">
+          Triggers are the class of events (including device readings, published
+          messages, and data changes) that are emitted by event sources.
+        </p>
+        <h3 class="main-content__sub-heading">
+          Actions
+        </h3>
+        <p class="main-content__text main-content__text--no-top-margin">
+          Actions are functions that encapsulate code – written in any supported
+          language by implementing a single method signature – to be executed in
+          response to a trigger.
+        </p>
+        <h3 class="main-content__sub-heading">
+          Rules
+        </h3>
+        <p class="main-content__text main-content__text--no-top-margin">
+          Rules represent the declarative association between a trigger and an
+          action, defining which action(s) should be executed in response to
+          an event.
+        </p>
+        <h3 class="main-content__sub-heading">
+          Sequences
+        </h3>
+        <p class="main-content__text main-content__text--no-top-margin">
+          Sequences allow to chain together a sequence of actions in a declarative fashion.
+        </p>
+        <h3 class="main-content__sub-heading">
+          Packages
+        </h3>
+        <p class="main-content__text main-content__text--no-top-margin">
+          Packages encapsulate external services in a reusable manner and
+          assemble them into triggers and actions.
+        </p>
+      </div>
+    </div>
+  </div>
+</section>
+<section class="site-section site-section--gray">
+  <div class="main-content">
+    <div class="main-content__body-content">
+      Apache OpenWhisk is an effort undergoing incubation at The Apache
+      Software Foundation (ASF), sponsored by the Apache Incubator.
+      Incubation is required of all newly accepted projects until a further
+      review indicates that the infrastructure, communications, and decision
+      making process have stabilized in a manner consistent with other
+      successful ASF projects. While incubation status is not necessarily a
+      reflection of the completeness or stability of the code, it does indicate
+      that the project has yet to be fully endorsed by the ASF.
+    </div>
+    <a href="http://incubator.apache.org/"><img class="main-content__image--side-by-side"
+         src="{{ site.github.url }}/images/apache-incubator-new-sm.png"
+         alt="Apache Incubator logo"></a>
+    <a href="http://incubator.apache.org/"><img class="main-content__image--side-by-side"
+         src="{{ site.github.url }}/images/apache-incubator-ring-openwhisk-sm.png"
+         alt="Apache Incubator logo"></a>
+  </div>
+</section>
diff --git a/_layouts/community.html b/_layouts/community.html
deleted file mode 100644
index 79fe47f..0000000
--- a/_layouts/community.html
+++ /dev/null
@@ -1,255 +0,0 @@
----
-layout: default
----
-<!--
-# Licensed to the Apache Software Foundation (ASF) under one or more contributor
-# license agreements; and to You under the Apache License, Version 2.0.
--->
-
-<div id="whiskIndexedLayout">
-
-  <!-- Community Index -->
-  <div id="whiskIndex">
-    <ul>
-      <li><a href="#community">Community</a></li>
-
-      <!-- Social Media -->
-      <li class="collapsible-toggle"><a href="#social">Media</a></li>
-      <ul class="collapse-content">
-        <li><a href="#github">GitHub</a></li>
-        <li><a href="#slack">Slack</a></li>
-        <li><a href="#twitter">Twitter</a></li>
-        <li><a href="#youtube">YouTube</a></li>
-        <li><a href="#stackoverflow">Stack Overflow</a></li>
-        <li><a href="#slideshare">Slideshare</a></li>
-      </ul>
-
-      <!-- Mailing lists -->
-      <li><a href="#mailing-lists">Mailing Lists</a></li>
-
-      <!-- Project Wiki -->
-      <li><a href="#wiki">Project Wiki</a></li>
-
-      <!-- Events -->
-      <li><a href="#events">Events</a></li>
-
-      <!-- Supporters -->
-      <li><a href="#supporters">Supporters</a></li>
-
-    </ul>
-  </div>
-
-  <section id="whiskNodes">
-
-      <div class="content">
-        <a class="indexable" id="community"></a>
-        <h2>Community</h2>
-        <!-- <h2 class="collapsible-toggle">Community</h2> -->
-        <div class="collapsible-content">
-          <p>The Apache OpenWhisk community attempts to engage its users and developers in as many channels as we are able. Please find and subscribe to the ones that are right for you!</p>
-        </div>
-      </div>
-
-      <main id="doc">
-          <div class="content">
-              <a class="indexable" id="social"></a>
-              <h4>Media</h4>
-              <p>The Apache OpenWhisk project is active on several content sharing and social media channels which aim to make it easier for users to get started, ask questions, stay informed and to interact with our community.</p>
-              <p>Icons that link to each of the following channels are located in the header of our website and include:</p>
-              <ul>
-                  <a class="indexable" id="github"></a>
-                  <li><a href="https://github.com/apache?q=openwhisk" title="Apache OpenWhisk project repositories on GitHub">GitHub</a>: Browse the source code, documentation and tests for all the repositories that make up our project component, deployment and tooling ecosystem.</li>
-                  <a class="indexable" id="slack"></a>
-                  <li><a href="http://openwhisk-team.slack.com/" title="Apache OpenWhisk on Slack">Slack</a>: Engage the OpenWhisk developer community directly in conversations across several topics.</li>
-                  <ul><li><a href="slack.html">Request an invitation</a></li></ul>
-                  <li><a href="https://medium.com/openwhisk" title="Apache OpenWhisk on Medium">Medium</a>: Read the latest blog posts on the OpenWhisk project including how-tos, use cases, architecture topics and more.</li>
-                  <a class="indexable" id="twitter"></a>
-                  <li><a href="https://twitter.com/search?q=openwhisk" title="Apache OpenWhisk on Twitter">Twitter</a>: Follow for the latest news from the OpenWhisk ecosystem.</li>
-                  <a class="indexable" id="youtube"></a>
-                  <li><a href="https://www.youtube.com/channel/UCbzgShnQk8F43NKsvEYA1SA" title="Apache OpenWhisk on YouTube">YouTube</a>: See demos of OpenWhisk in action as well as recordings of community meetings and events.</li>
-                  <a class="indexable" id="stackoverflow"></a>
-                  <li><a href="https://stackoverflow.com/questions/tagged/openwhisk">Stack Overflow</a>: Ask questions and find answers about how to use OpenWhisk.</li>
-                  <a class="indexable" id="slideshare"></a>
-                  <li><a href="https://www.slideshare.net/OpenWhisk">SlideShare</a>: Look over slides from many of the presentations from past events.</li>
-              </ul>
-              <p>If you wish to engage our community's Contributors and Committers around project architecture, design and source code, please subscribe to and participate in our developer mailing list as described below.</p>
-          </div>
-      </main>
-      <main id="doc">
-          <div class="content">
-              <a class="indexable" id="mailing-lists"></a>
-              <h4>Mailing Lists</h4>
-              <br>
-              <h5>How to join the Apache OpenWhisk mailing list<h5>
-              <p>The Dev Mailing List is where we discuss the development of Apache OpenWhisk. It is <b><i>not</i></b> a place for technical support; if you're looking for help on the project, please try our <a style="font-weight:400;" href="/documentation.html">Documentation</a> page and engage with us on one of the Social Media channels listed above.</p>
-              <p>: To subscribe, unsubscribe or post our developer list, send an email message to one of the following addresses:</p>
-                  <ul>
-                      <li><b>Subscribe</b>: <a href="mailto:dev-subscribe@openwhisk.incubator.apache.org">dev-subscribe@openwhisk.incubator.apache.org</a></li>
-                      <li><b>Unsubscribe</b>: <a href="mailto:dev-unsubscribe@openwhisk.incubator.apache.org">dev-unsubscribe@openwhisk.incubator.apache.org</a></li>
-                      <li><b>Post</b> (new topic): <a href="mailto:dev@openwhisk.incubator.apache.org">dev@openwhisk.incubator.apache.org</a></li>
-                  </ul>
-              <p>To comment on a thread, simply reply to the message with the same subject text.</p>
-              <p><b>NOTE:</b> Make sure you add a subject line to the subscribe/unsubscribe messages. Empty emails are ignored.</p>
-              <p>To see existing messages, <a href="http://mail-archives.apache.org/mod_mbox/incubator-openwhisk-dev/">http://mail-archives.apache.org/mod_mbox/incubator-openwhisk-dev/</a>.</p>
-          </div>
-      </main>
-      <main id="doc">
-          <div class="content">
-              <a class="indexable" id="wiki"></a>
-              <h4>Project Wiki</h4>
-              <p>The project maintains a <a href="https://cwiki.apache.org/confluence/display/OPENWHISK/OpenWhisk+Project+Wiki">Confluence Wiki</a> site that provides the community a place to share their thoughts about and collaborate around any aspect of the project; whether it's about the platform architecture, an existing or planned feature or about its use cases and integrations. Examples include:</p>
-              <ul>
-                  <li><a href="https://cwiki.apache.org/confluence/display/OPENWHISK/OpenWhisk+Project+Wiki#OpenWhiskProjectWiki-how-to-contribute">How to contribute?</li>
-                  <li><a href="https://cwiki.apache.org/confluence/display/OPENWHISK/OpenWhisk+Project+Wiki#OpenWhiskProjectWiki-becoming-a-contributor">How do I become a Contributor or Committer?</li>
-                  <li><a href="https://cwiki.apache.org/confluence/display/OPENWHISK/Proposals">Proposals</a> (Design)</li>
-                  <li><a href="https://cwiki.apache.org/confluence/display/OPENWHISK/Presentations%2C+Meeting+Notes+and+Transcripts">Meeting Notes and Transcripts</a></li>
-                  <li><a href="https://cwiki.apache.org/confluence/display/OPENWHISK/Processes">Processes</a></li>
-                  <li><a href="https://cwiki.apache.org/confluence/display/OPENWHISK/Project+Status">Project Status</a></li>
-                  <!-- NOTE: we have no policies now so do not link until they exist -->
-                  <!-- <li><a href="">Policies</a></li> -->
-              </ul>
-          </div>
-      </main>
-
-      <main id="doc">
-          <div class="content">
-              <a class="indexable" id="events"></a>
-              <h4>Events</h4>
-              <p>
-                  Please reach out to community at <a href="mailto:dev@openwhisk.incubator.apache.org">dev@openwhisk.incubator.apache.org</a> to promote any OpenWhisk event.
-              </p>
-              <ul><li><em>
-                  To view a list of past events please refer to the <a href="events.html">Events Archive</a> page.</em></li>
-              </ul>
-          </div>
-       </main>
-
-      <main id="doc">
-          <div class="content">
-              <a class="indexable" id="supporters"></a>
-              <h4>Supporters</h4>
-              <p>The following companies and organizations have acknowledged support of the Apache OpenWhisk project as contributors or users of the technology.</p>
-              <div class="flow-columns">
-                  <div class="flow-item-container">
-                      <a href="https://www.adobe.io/" target="_blank">
-                      <img class="flow-item-image"
-                         src="{{ site.github.url }}/images/supporter/adobe.png"
-                         alt="Adobe supports Apache OpenWhisk">
-                      </a>
-                  </div>
-                  <div class="flow-item-container">
-                      <a href="https://www.ibm.com/cloud/functions" target="_blank">
-                      <img class="flow-item-image"
-                         src="{{ site.github.url }}/images/supporter/ibm-solid.png"
-                         alt="IBM supports Apache OpenWhisk">
-                      </a>
-                  </div>
-                  <div class="flow-item-container">
-                      <a href="https://www.redhat.com/en" target="_blank">
-                      <img class="flow-item-image"
-                         src="{{ site.github.url }}/images/supporter/redhat.png"
-                         alt="RedHat supports Apache OpenWhisk">
-                      </a>
-                  </div>
-                  <div class="flow-item-container">
-                      <a href="https://www.abilisense.com/" target="_blank">
-                      <img class="flow-item-image"
-                     src="{{ site.github.url }}/images/supporter/abilisense.png"
-                     alt="Abilisense supports Apache Openwhisk">
-                      </a>
-                  </div>
-                  <div class="flow-item-container">
-                      <a href="http://advisorconnect.co/" target="_blank">
-                      <img class="flow-item-image"
-                     src="{{ site.github.url }}/images/supporter/advisorconnect.png"
-                     alt="Advisor Connect supports Apache OpenWhisk">
-                      </a>
-                  </div>
-                  <div class="flow-item-container">
-                      <a href="https://www.altoros.com/" target="_blank">
-                          <img class="flow-item-image"
-                         src="{{ site.github.url }}/images/supporter/altoros.png"
-                         alt="Altoros supports Apache OpenWhisk">
-                      </a>
-                  </div>
-                  <div class="flow-item-container">
-                      <a href="http://articoolo.com/" target="_blank">
-                          <img class="flow-item-image"
-                         src="{{ site.github.url }}/images/supporter/articoolo.png"
-                         alt="Articoolo supports Apache OpenWhisk">
-                      </a>
-                  </div>
-                  <div class="flow-item-container">
-                      <a href="http://bigvu.tv/" target="_blank">
-                          <img class="flow-item-image"
-                         src="{{ site.github.url }}/images/supporter/bigvu.png"
-                         alt="BigVU supports Apache OpenWhisk">
-                      </a>
-                  </div>
-                  <div class="flow-item-container">
-                      <a href="https://greenq.gq/" target="_blank">
-                          <img class="flow-item-image"
-                         src="{{ site.github.url }}/images/supporter/greenq.png"
-                         alt="GreenQ supports Apache OpenWhisk">
-                      </a>
-                  </div>
-                  <div class="flow-item-container">
-                      <a href="https://www.mashape.com/" target="_blank">
-                      <img class="flow-item-image"
-                         src="{{ site.github.url }}/images/supporter/kong.png"
-                         alt="Kong supports Apache OpenWhisk">
-                      </a>
-                  </div>
-                  <div class="flow-item-container">
-                      <a href="https://www.magentiq.com/" target="_blank">
-                      <img class="flow-item-image"
-                         src="{{ site.github.url }}/images/supporter/magentiq.png"
-                         alt="Magentiq Eye supports Apache OpenWhisk">
-                      </a>
-                  </div>
-                  <div class="flow-item-container">
-                      <a href="https://www.naver.com/" target="_blank">
-                      <img class="flow-item-image"
-                         src="{{ site.github.url }}/images/supporter/naver.png"
-                         alt="Naver supports Apache OpenWhisk">
-                      </a>
-                  </div>
-                  <div class="flow-item-container">
-                      <a href="http://www.nepente.io/en/" target="_blank">
-                      <img class="flow-item-image"
-                         src="{{ site.github.url }}/images/supporter/nepente.png"
-                         alt="Nepente supports Apache OpenWhisk">
-                      </a>
-                  </div>
-                  <div class="flow-item-container">
-                      <a href="https://www.neuroapplied.com/" target="_blank">
-                      <img class="flow-item-image"
-                         src="{{ site.github.url }}/images/supporter/neuroapplied.png"
-                         alt="NeuroApplied supports Apache OpenWhisk">
-                      </a>
-                  </div>
-                  <div class="flow-item-container">
-                      <a href="http://www.sitespirit.nl/" target="_blank">
-                      <img class="flow-item-image"
-                         src="{{ site.github.url }}/images/supporter/sitespirit.png"
-                         alt="SiteSpirit supports Apache OpenWhisk">
-                      </a>
-                  </div>
-                  <div class="flow-item-container">
-                    <a href="https://wso2.com/" target="_blank">
-                      <img class="flow-item-image"
-                           src="{{ site.github.url }}/images/supporter/wso2.png"
-                           alt="WSO2 supports Apache OpenWhisk">
-                    </a>
-                  </div>
-              </div>
-          </div>
-      </main>
-
-  </section>
-
-</div>
-
-<!-- contact us to let us know of events, blah
-<p>The Apache Software Foundation does not endorse listed events. Get in touch with us to suggest event listings. See social media https://openwhisk.apache.org/social</p>
- -->
diff --git a/_layouts/contributors.html b/_layouts/contributors.html
new file mode 100644
index 0000000..0bc4384
--- /dev/null
+++ b/_layouts/contributors.html
@@ -0,0 +1,145 @@
+---
+layout: default
+---
+
+<section class="site-section site-section--gradient">
+  <div class="main-cta">
+    <div class="main-cta__lede main-cta__lede--padded">
+      <h1 class="main-cta__title">
+        You can play a critical part in building game-changing cloud technology.
+      </h1>
+      <a class="main-cta__button u-button"
+         href="https://github.com/apache/incubator-openwhisk/issues">
+        See Open Issues
+      </a>
+    </div>
+    <div class="main-cta__graphic main-cta__graphic--persona">
+      <img class="main-cta__illustration main-cta__illustration--with-min-width main-cta__illustration--overhang"
+           src="{{ site.github.url }}/images/persona-contributor-torso.svg"
+           alt="Open-Source Contributors and Apache OpenWhisk">
+    </div>
+  </div>
+</section>
+
+<section class="site-section">
+  <div class="main-content">
+    <div class="main-content__columns main-content__columns--vertical-center">
+      <div class="main-content__column">
+        <img class="main-content__image"
+             src="{{ site.github.url }}/images/illustration-contributors-share.svg"
+             alt="Apache OpenWhisk">
+      </div>
+      <div class="main-content__column">
+        <h2 class="main-content__heading">
+          Share your great ideas with the community.
+        </h2>
+        <p class="main-content__text">
+          Have you built something great using Apache OpenWhisk? Share your
+          rules, actions, and triggers with the community! We'll help to
+          promote your work, and you'll help to grow the
+          community library of ready-to-use code available to other deveopers.
+          Everybody wins!
+        </p>
+      </div>
+    </div>
+  </div>
+</section>
+
+<section class="site-section site-section--gray">
+  <div class="main-content">
+    <div class="main-content__columns main-content__columns--reverse main-content__columns--vertical-center">
+      <div class="main-content__column">
+        <img class="main-content__image"
+             src="{{ site.github.url }}/images/illustration-contributors-service.svg"
+             alt="OpenWhisk">
+      </div>
+      <div class="main-content__column">
+        <h2 class="main-content__heading">
+          Share your service with thousands of developers.
+        </h2>
+        <p class="main-content__text">
+          Make your product, tool, or service even more attractive to developers by
+          becoming part of Apache OpenWhisk's growing ecosystem. Create a
+          package to allow developers to use your service with Apache OpenWhisk,
+          open it to the community, and join the serverless revolution!
+        </p>
+      </div>
+    </div>
+  </div>
+</section>
+
+<section class="site-section">
+  <div class="main-content">
+    <div class="main-content__columns main-content__columns--vertical-center">
+      <div class="main-content__column">
+        <img class="main-content__image"
+             src="{{ site.github.url }}/images/illustration-contributors-skill.svg"
+             alt="Apache OpenWhisk">
+      </div>
+      <div class="main-content__column">
+        <h2 class="main-content__heading">
+          Build new skills. Build a community.
+        </h2>
+        <p class="main-content__text">
+          Build your cloud expertise by contributing to bleeding-edge, serverless
+          technology. Become part of a growing community of open source
+          developers working to improve Apache OpenWhisk. Propose a feature,
+          submit a pull request, or create a tutorial — help build a movement!
+        </p>
+      </div>
+    </div>
+  </div>
+</section>
+
+<section class="site-section site-section--light-blue">
+  <div class="quotes quotes--js-fader">
+    <blockquote id="quote1" class="quotes__quote quotes__quote--js-fader">
+      <div class="quotes__text">
+        <p>
+          “Apparently @openwhisk is the only fully open source #serverless
+          technology, can run in-house too.”
+        </p>
+        <p class="quotes__attribution">
+          #OpenWhisk
+        </p>
+      </div>
+    </blockquote>
+    <blockquote id="quote2" class="quotes__quote quotes__quote--js-fader">
+      <div class="quotes__text">
+        <p>
+          “So far I find #OpenWhisk the real highlight of this #serverlessconf
+          London, I’m totally amazed by the work done so far by the dev team!
+          kudos”
+        </p>
+        <p class="quotes__attribution">
+          #OpenWhisk
+        </p>
+      </div>
+    </blockquote>
+    <nav class="quotes__nav">
+      <a class="quotes__nav-link"
+         href="#quote1">Quote 1</a>
+      <a class="quotes__nav-link"
+         href="#quote2">Quote 2</a>
+    </nav>
+  </div>
+</section>
+
+<section class="site-section site-section--medium-blue">
+  <div class="main-content">
+    <div class="main-content__columns">
+      <div class="main-content__column u-align--center">
+        <a class="main-content__button u-button u-button--light"
+           href="{{ site.github.url }}/contact">
+          Join Our Mailing List
+        </a>
+      </div>
+      <div class="main-content__column u-align--center">
+        <a class="main-content__button u-button u-button--light"
+           href="https://github.com/apache?q=openwhisk">
+          Explore the Source on GitHub
+        </a>
+      </div>
+    </div>
+  </div>
+</section>
diff --git a/_layouts/creators.html b/_layouts/creators.html
new file mode 100644
index 0000000..4b0a539
--- /dev/null
+++ b/_layouts/creators.html
@@ -0,0 +1,149 @@
+---
+layout: default
+---
+
+<section class="site-section site-section--gradient">
+  <div class="main-cta">
+    <div class="main-cta__lede main-cta__lede--padded">
+      <h1 class="main-cta__title">
+        Add your package or service to the Apache OpenWhisk ecosystem and expand your app’s
+        reach to thousands of developers.
+      </h1>
+      <a class="main-cta__button u-button"
+         href="https://github.com/apache/incubator-openwhisk/blob/master/docs/packages.md">
+        Add Your Package Now
+      </a>
+    </div>
+    <div class="main-cta__graphic main-cta__graphic--persona">
+      <img class="main-cta__illustration main-cta__illustration--with-min-width main-cta__illustration--overhang"
+           src="{{ site.github.url }}/images/persona-integrator-torso.svg"
+           alt="Package Creators and Apache OpenWhisk">
+    </div>
+  </div>
+</section>
+
+<section class="site-section">
+  <div class="main-content">
+    <div class="main-content__columns main-content__columns--vertical-center">
+      <div class="main-content__column">
+        <img class="main-content__image"
+             src="{{ site.github.url }}/images/illustration-integrator-community.svg"
+             alt="Apache OpenWhisk">
+      </div>
+      <div class="main-content__column">
+        <h2 class="main-content__heading">
+          Build a community of developers around your service.
+        </h2>
+        <p class="main-content__text">
+          Apache OpenWhisk provides an open framework for serverless application
+          developers to integrate event sources and data services from anywhere
+          on the Internet. By integrating your services as an OpenWhisk package,
+          you'll gain access to a community of developers building the next
+          generation of cloud native applications.
+        </p>
+      </div>
+    </div>
+  </div>
+</section>
+
+<section class="site-section site-section--gray">
+  <div class="main-content">
+    <div class="main-content__columns main-content__columns--reverse main-content__columns--vertical-center">
+      <div class="main-content__column">
+        <img class="main-content__image"
+             src="{{ site.github.url }}/images/illustration-integrator-third-party.svg"
+             alt="OpenWhisk">
+      </div>
+      <div class="main-content__column">
+        <h2 class="main-content__heading">
+          Unlock unlimited third-party integrations.
+        </h2>
+        <p class="main-content__text">
+          Staying up-to-date with third-party integrations can be expensive and
+          time-consuming. By adding your service as an Apache OpenWhisk package,
+          developers can integrate your service with <em>anything</em>, with no
+          time or investment from your team. Simply create a package for your
+          service and unleash the creativity of your users!
+        </p>
+      </div>
+    </div>
+  </div>
+</section>
+
+<section class="site-section">
+  <div class="main-content">
+    <div class="main-content__columns main-content__columns--vertical-center">
+      <div class="main-content__column">
+        <img class="main-content__image"
+             src="{{ site.github.url }}/images/illustration-integrator-ecosystem.svg"
+             alt="Apache OpenWhisk">
+      </div>
+      <div class="main-content__column">
+        <h2 class="main-content__heading">
+          Join a growing ecosystem of package creators.
+        </h2>
+        <p class="main-content__text">
+          When you build a package for Apache OpenWhisk, you join an emerging
+          community of package integrations. Does your package work with GitHub?
+          Or Slack? Or can it drive IBM Bluemix Watson cognitive functions? Find
+          out more about the existing packages and their features that OpenWhisk
+          developers are using today.
+        </p>
+      </div>
+    </div>
+  </div>
+</section>
+
+<section class="site-section site-section--light-blue">
+  <div class="quotes quotes--js-fader">
+    <blockquote id="quote1" class="quotes__quote quotes__quote--js-fader">
+      <div class="quotes__text">
+        <p>
+          “What excites me most [about Apache OpenWhisk] is its open source
+          nature, which creates a foundation for a broad ecosystem of
+          contributing parties.”
+        </p>
+        <p class="quotes__attribution">
+          – Andrei Yurkevich, CTO of Altorors
+        </p>
+      </div>
+    </blockquote>
+    <blockquote id="quote2" class="quotes__quote quotes__quote--js-fader">
+      <div class="quotes__text">
+        <p>
+          “Apache OpenWhisk’s modular and effective ecosystem twisted our minds
+          and now we’re able to deploy and connect different parts of our apps
+          and infrastructure easily.”
+        </p>
+        <p class="quotes__attribution">
+          – André Poleza, Co-Founder of Nepente
+        </p>
+      </div>
+    </blockquote>
+    <nav class="quotes__nav">
+      <a class="quotes__nav-link"
+         href="#quote1">Quote 1</a>
+      <a class="quotes__nav-link"
+         href="#quote2">Quote 2</a>
+    </nav>
+  </div>
+</section>
+
+<section class="site-section site-section--medium-blue">
+  <div class="main-content">
+    <div class="main-content__columns">
+      <div class="main-content__column u-align--center">
+        <a class="main-content__button u-button u-button--light"
+           href="{{ site.github.url }}/contact">
+          Join Our Mailing List
+        </a>
+      </div>
+      <div class="main-content__column u-align--center">
+        <a class="main-content__button u-button u-button--light"
+           href="https://github.com/apache?q=openwhisk">
+          Explore the Source on GitHub
+        </a>
+      </div>
+    </div>
+  </div>
+</section>
diff --git a/_layouts/default.html b/_layouts/default.html
index e6d49ea..b68e55e 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -1,35 +1,35 @@
-<!--
-# Licensed to the Apache Software Foundation (ASF) under one or more contributor
-# license agreements; and to You under the Apache License, Version 2.0.
--->
 {% if page.seo_title %}
-    {% assign page_title = page.seo_title %}
+  {% assign page_title = page.seo_title %}
 {% else if page.title %}
-    {% assign page_title = page.title %}
+  {% assign page_title = page.title %}
 {% else %}
-    {% assign page_title = site.title %}
+  {% assign page_title = site.title %}
 {% endif %}
-
 <!DOCTYPE html>
-
 <html>
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
-        {% include head/favicon.html %}
-        <title>{{ page_title }}</title>
-        <link href="https://fonts.googleapis.com/css?family=Roboto:100,100i,300,300i,400,400i,500,500i,700,700i,900,900i" rel="stylesheet">
-        <link rel="stylesheet" href="{{ site.github.url }}/css/main.css">
-        <!-- Load Index, Menu & collapsible support -->
-        <script type="text/javascript">
-            {% include index/index.js %}
-        </script>
-    </head>
-    <!-- Once all page elements are included, register event hooks -->
-    <body onload="applyCollapsible()">
-        <script src="js/main.min.js"></script>
-        {% include partial/site-header.html %}
-        {{ content }}
-        {% include partial/site-footer.html %}
-    </body>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport"
+          content="width=device-width,minimum-scale=1,initial-scale=1">
+    {% include head/favicon.html %}
+    <title>{{ page_title }}</title>
+    {% include head/seo/all.html %}
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:300,700,900">
+    <link rel="stylesheet" href="{{ site.github.url }}/css/main.css">
+  </head>
+  <body class="no-js">
+    {% include partial/site-header.html %}
+    {{ content }}
+    {% include partial/site-footer.html %}
+    <script src="js/main.min.js"></script>
+    <script>
+      (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','https://www.google-analytics.com/analytics.js','ga');
+
+      ga('create', 'UA-88941444-1', 'auto');
+      ga('send', 'pageview');
+    </script>
+  </body>
 </html>
diff --git a/_layouts/developers.html b/_layouts/developers.html
new file mode 100644
index 0000000..87eb4b3
--- /dev/null
+++ b/_layouts/developers.html
@@ -0,0 +1,156 @@
+---
+layout: default
+---
+
+<section class="site-section site-section--gradient">
+  <div class="main-cta">
+    <div class="main-cta__lede main-cta__lede--padded">
+      <h1 class="main-cta__title">
+        Focus on quickly developing
 value-adding code and share with
+        the community.
+      </h1>
+      <a class="main-cta__button u-button"
+         href="https://github.com/apache/incubator-openwhisk/blob/master/docs/actions.md">
+        Create Your First Action
+      </a>
+    </div>
+    <div class="main-cta__graphic main-cta__graphic--persona">
+      <img class="main-cta__illustration main-cta__illustration--with-min-width main-cta__illustration--overhang"
+           src="{{ site.github.url }}/images/persona-developer-torso.svg"
+           alt="Illustration: How Apache OpenWhisk Works">
+    </div>
+  </div>
+</section>
+
+<section class="site-section">
+  <div class="main-content">
+    <div class="main-content__columns main-content__columns--vertical-center">
+      <div class="main-content__column">
+        <img class="main-content__image"
+             src="{{ site.github.url }}/images/illustration-developers-scaling.svg"
+             alt="Apache OpenWhisk scaling and utilization">
+      </div>
+      <div class="main-content__column">
+        <h2 class="main-content__heading">
+          Scaling Per-Request &amp; Optimal Utilization
+        </h2>
+        <p class="main-content__text">
+          Run your action ten thousand times in a fraction of a second, or once
+          a week. Action instances scale to meet demand as needed, then disappear.
+        </p>
+        <p class="main-content__text">
+          Enjoy optimal utilization where you don't pay for idle resources.
+        </p>
+      </div>
+    </div>
+  </div>
+</section>
+
+<section class="site-section site-section--gray">
+  <div class="main-content">
+    <div class="main-content__columns main-content__columns--reverse main-content__columns--vertical-center">
+      <div class="main-content__column">
+        <img class="main-content__image"
+             src="{{ site.github.url }}/images/illustration-developers-flexible.svg"
+             alt="Apache OpenWhisk flexible programming">
+      </div>
+      <div class="main-content__column">
+        <h2 class="main-content__heading">
+          Flexible Programming
+        </h2>
+        <p class="main-content__text">
+          Code in different languages like JavaScript/NodeJS, Swift, Python,
+          Java or run custom logic by packaging code with Docker.
+        </p>
+        <p class="main-content__text">
+          Invoke your code synchronously, asynchronously, or on a schedule.
+        </p>
+        <p class="main-content__text">
+          Use higher-level programming constructs like sequences to declaratively
+          chain together multiple actions.
+          Use parameter binding to avoid hardcoding service credentials in your code.
+        </p>
+        <p class="main-content__text">
+          And also, debug your code in realtime.
+        </p>
+      </div>
+    </div>
+  </div>
+</section>
+
+<section class="site-section">
+  <div class="main-content">
+    <div class="main-content__columns main-content__columns--vertical-center">
+      <div class="main-content__column">
+        <img class="main-content__image"
+             src="{{ site.github.url }}/images/illustration-developers-ecosystem.svg"
+             alt="Apache OpenWhisk scaling and utilization">
+      </div>
+      <div class="main-content__column">
+        <h2 class="main-content__heading">
+          Rich Service Ecosystem
+        </h2>
+        <p class="main-content__text">
+          Benefit from a large ecosystem of event emitters and consumers
+          from different vendors covering domains like analytics,
+          cognitive, data, mobile, and IoT.
+        </p>
+      </div>
+    </div>
+  </div>
+</section>
+
+<section class="site-section site-section--light-blue">
+  <div class="quotes quotes--js-fader">
+    <blockquote id="quote1" class="quotes__quote quotes__quote--js-fader">
+      <div class="quotes__text">
+        <p>
+          “Apache OpenWhisk relieved us from all of our pain points. It allowed
+          us to focus on coding instead of operational aspects, guaranteed
+          optimal utilization and scaling, [and] provided us with a flexible
+          programming model.”
+        </p>
+        <p class="quotes__attribution">
+          – Barry Nijenhuis, SiteSpirit
+        </p>
+      </div>
+    </blockquote>
+    <blockquote id="quote2" class="quotes__quote quotes__quote--js-fader">
+      <div class="quotes__text">
+        <p>
+          “Apache OpenWhisk’s modular and effective ecosystem twisted our minds
+          and now we’re able to deploy and connect different parts of our apps
+          and infrastructure easily.”
+        </p>
+        <p class="quotes__attribution">
+          – André Poleza, Co-Founder of Nepente
+        </p>
+      </div>
+    </blockquote>
+    <nav class="quotes__nav">
+      <a class="quotes__nav-link"
+         href="#quote1">Quote 1</a>
+      <a class="quotes__nav-link"
+         href="#quote2">Quote 2</a>
+    </nav>
+  </div>
+</section>
+
+<section class="site-section site-section--medium-blue">
+  <div class="main-content">
+    <div class="main-content__columns">
+      <div class="main-content__column u-align--center">
+        <a class="main-content__button u-button u-button--light"
+           href="{{ site.github.url }}/contact">
+          Join Our Mailing List
+        </a>
+      </div>
+      <div class="main-content__column u-align--center">
+        <a class="main-content__button u-button u-button--light"
+           href="https://github.com/apache?q=openwhisk">
+          Explore the Source on GitHub
+        </a>
+      </div>
+    </div>
+  </div>
+</section>
diff --git a/_layouts/documentation.html b/_layouts/documentation.html
deleted file mode 100644
index 2c8352f..0000000
--- a/_layouts/documentation.html
+++ /dev/null
@@ -1,1316 +0,0 @@
----
-layout: default
----
-<!--
-# Licensed to the Apache Software Foundation (ASF) under one or more contributor
-# license agreements; and to You under the Apache License, Version 2.0.
--->
-
-<div id="whiskIndexedLayout">
-    <!-- Documentation Index -->
-    <div id="whiskIndex">
-        <ul>
-            <li><a href="#documentation">Documentation</a></li>
-
-            <!-- Operators -->
-            <li class="collapsible-toggle"><a href="#operators">Operators</a></li>
-            <ul class="collapse-content">
-                <li class="collapsible-toggle"><a href="#openwhisk_deployment">OpenWhisk Deployment</a></li>
-                <ul class="collapse-content">
-                    <li><a href="#deploy_docker_compose">Docker Compose</a></li>
-                    <li><a href="#deploy_kubernetes">Kubernetes</a></li>
-                    <li><a href="#deploy_mesos">Mesos</a></li>
-                    <li><a href="#deploy_openshift">OpenShift</a></li>
-                    <li><a href="#deploy_ansible">Ansible</a></li>
-                    <li><a href="#deploy_vagrant">Vagrant</a></li>
-                </ul>
-                <li><a href="#deployment_admin">Administrative Operations</a></li>
-                <li><a href="#operators_resources">Operators Resources</a></li>
-            </ul>
-
-            <!-- Developers -->
-            <li class="collapsible-toggle"><a href="#developers">Developers</a></li>
-            <ul class="collapse-content">
-                <li><a href="#pre-requisites">Pre-requisites</a></li>
-                <li class="collapsible-toggle"><a href="#using-openwhisk">Using OpenWhisk</a></li>
-                <ul class="collapse-content">
-                    <li><a href="#wsk-cli">Configuring wsk CLI</a></li>
-                    <li><a href="#wskdeploy">Deployment Tool - wskdeploy</a></li>
-                    <li><a href="#rest-api">OpenWhisk REST API</a></li>
-                    <li><a href="#openwhisk-clients">OpenWhisk Clients</a></li>
-                </ul>
-                <li class="collapsible-toggle"><a href="#actions">Actions</a></li>
-                <ul class="collapse-content">
-                    <li class="collapsible-toggle"><a href="#nodejs">NodeJS</a></li>
-                    <ul class="collapse-content">
-                        <li><a href="#nodejs-actions">Creating and Invoking Sample Action</a></li>
-                        <li><a href="#nodejs-runtime">NodeJS Runtime</a></li>
-                        <li><a href="#nodejs-additional-resources">Additional Resources</a></li>
-                    </ul>
-                    <li class="collapsible-toggle"><a href="#python">Python</a></li>
-                    <ul class="collapse-content">
-                        <li><a href="#python-actions">Creating and Invoking Sample Action</a></li>
-                        <li><a href="#python-runtime">Python Runtime</a></li>
-                        <li><a href="#python-additional-resources">Additional Resources</a></li>
-                    </ul>
-                    <!--li><a href="#docker">Docker</a></li>
-                    <ul>
-                        <li>Zip Action</li>
-                        <li>SDK (Writing Your Own Runtime)</li>
-                        <li>Other Resources</li>
-                    </ul-->
-                    <li class="collapsible-toggle"><a href="#go">Go</a></li>
-                    <ul class="collapse-content">
-                        <li><a href="#go-actions">Creating and Invoking Action</a></li>
-                        <li><a href="#go-runtime">Go Runtime</a></li>
-                        <li><a href="#go-additional-resources">Additional Resources</a></li>
-                    </ul>
-                    <li class="collapsible-toggle"><a href="#java">Java</a></li>
-                    <ul class="collapse-content">
-                        <li><a href="#java-actions">Creating and Invoking Action</a></li>
-                        <li><a href="#java-runtime">Java Runtime</a></li>
-                        <li><a href="#java-additional-resources">Additional Resources</a></li>
-                    </ul>
-                    <li class="collapsible-toggle"><a href="#php">PHP</a></li>
-                    <ul class="collapse-content">
-                        <li><a href="#php-actions">Creating and Invoking Action</a></li>
-                        <li><a href="#php-runtime">PHP Runtime</a></li>
-                        <li><a href="#php-additional-resources">Additional Resources</a></li>
-                    </ul>
-                    <!--li class="collapsible-toggle"><a href="#swift">Swift</a></li>
-                    <ul class="collapse-content">
-                        <li><a href="#swift-actions">Creating and Invoking Action</a></li>
-                        <li><a href="#swift-runtime">Swift Runtime</a></li>
-                        <li><a href="#swift-additional-resources">Additional Resources</a></li>
-                    </ul-->
-                </ul>
-                <li><a href="#managing_actions_with_openwhisk_packages">Managing Actions with OpenWhisk Packages</a></li>
-                <li><a href="#connecting_actions_to_event_sources">Connecting Actions to Event Sources</a></li>
-                <li><a href="#using_openwhisk_enabled_services">Using OpenWhisk Enabled Services</a></li>
-                <!--li><a href="#exposing_apis_from_actions">Exposing APIs from Actions</a></li-->
-                <li><a href="#sample_openwhisk_applications">Sample OpenWhisk Applications</a></li>
-                <li><a href="#tutorial_and_workshop">Tutorial And Workshop</a></li>
-                <li><a href="#development_tools">Development Tools</a></li>
-            </ul>
-
-            <!-- Contributors -->
-            <li><a href="#contributors">Contributors</a></li>
-
-            <!-- Other Resources -->
-            <li><a href="#other-resources">Other Resources</a></li>
-
-        </ul>
-    </div>
-
-<section id="whiskNodes">
-
-    <div class="content">
-        <a class="indexable" id="documentation"></a>
-        <h2>Documentation</h2>
-        <div class="collapsible-content">
-           <p>There are many resources for learning about OpenWhisk; this page attempts to organize, describe, index and link to the essential information, wherever it resides, to help users in getting started.  In general, much of the best information is in the actual project repositories and we encourage you to seek detailed and in-depth information there.</p>
-        </div>
-    </div>
-
-    <main id="doc">
-        <div class="content">
-            <p>
-                <h5>OpenWhisk documentation is organized by the following roles:</h4>
-            </p>
-            <ul>
-                <li><a href="#operators">Operators</a>: users who deploy, configure, and host the Apache OpenWhisk Function-as-a-Service platform
-                for development, testing and/or production.</li>
-                <li><a href="#developers">Developers</a>: end users
-                developing functions/actions, creating packages, feeds, and feed provider services using project APIs, clients and tooling.</li>
-                <li><a href="#contributors">Contributors</a>: developers designing and developing backend architectural components and tooling that comprise the OpenWhisk platform and its project ecosystem.</li>
-            </ul>
-        </div>
-    </main>
-
-    <!-- Operators Section -->
-    <main id="doc">
-        <div class="content">
-            <a class="indexable" id="operators"></a>
-            <h2>Operators</h2>
-        </div>
-    </main>
-
-    <!-- Deployment section under Operator -->
-    <main id="doc">
-        <div class="content">
-            <a class="indexable" id="openwhisk_deployment"></a>
-            <h3>OpenWhisk Deployment</h3>
-            <img width="400px" src="https://raw.githubusercontent.com/apache/incubator-openwhisk/master/docs/images/OpenWhisk_flow_of_processing.png" alt="OpenWhisk Architecture"/>
-            <p>
-                The above diagram depicts the high-level architecture of OpenWhisk. From Nginx to Kafka to Docker,
-                multiple technologies are powering Apache OpenWhisk - Open Source Serverless Cloud Platform.
-                You can read about the list of OpenWhisk components and its internal flow of processing
-                <a href="https://github.com/apache/incubator-openwhisk/blob/master/docs/about.md#the-internal-flow-of-processing">here</a>.
-            </p>
-            <p>
-                OpenWhisk supports different installation methods for core OpenWhisk components.
-                You can choose one of the following deployment methods based on your platform:
-            </p>
-            <a class="indexable" id="deploy_docker_compose"></a>
-            <h4>Docker Compose</h4>
-            <p>
-                The easiest way to start deploying OpenWhisk is to get Docker installed on Mac, Windows or Linux.
-                This does not give you a production deployment but gives you enough of the pieces to start writing functions and seeing them executing.
-                <div class="terminal">
-<pre>git clone https://github.com/apache/incubator-openwhisk-devtools.git
-cd incubator-openwhisk-devtools/docker-compose
-make quick-start</pre>
-                </div>
-                <p>
-                    For more detailed instructions, see the
-                    <a href="https://github.com/apache/incubator-openwhisk-devtools/blob/master/docker-compose/README.md">OpenWhisk with Docker Compose project</a>.
-                </p>
-            </p>
-            <a class="indexable" id="deploy_kubernetes"></a>
-            <h4>Kubernetes</h4>
-            <p>
-                OpenWhisk can be installed on Minikube, or on a managed Kubernetes cluster provisioned from a public cloud provider,
-                or on a Kubernetes cluster you manage yourself. Please refer to
-                <a href="https://github.com/apache/incubator-openwhisk-deploy-kube/blob/master/README.md">Deploy OpenWhisk to a Kubernetes Cluster</a>
-                for detailed deployment instructions.
-            </p>
-            <a class="indexable" id="deploy_mesos"></a>
-            <h4>Mesos</h4>
-            <p>
-                <a href="https://github.com/apache/incubator-openwhisk-deploy-mesos/blob/master/README.md">Deploy OpenWhisk to a Mesos Cluster</a>
-                is under active development.
-            </p>
-            <a class="indexable" id="deploy_openshift"></a>
-            <h4>OpenShift</h4>
-            <p>
-                <a href="https://github.com/apache/incubator-openwhisk-deploy-openshift/blob/master/README.md">Here</a>
-                are the instructions and details on how to deploy OpenWhisk on OpenShift.
-            </p>
-            <a class="indexable" id="deploy_ansible"></a>
-            <h4>Ansible</h4>
-            <p>
-                <a href="https://github.com/apache/incubator-openwhisk/blob/master/ansible/README.md">Deploying OpenWhisk using Ansible</a>
-                is generally done for creating a development environment. Most of the OpenWhisk tools follow this method of deployment in their
-                CI/CD (Travis) pipeline. The OpenWhisk playbooks are structured such that it allows cleaning, deploying, or re-deploying a single
-                component as well as the entire OpenWhisk stack.
-            </p>
-            <a class="indexable" id="deploy_vagrant"></a>
-            <h4>Vagrant</h4>
-            <p>
-                A Vagrant machine is also available to run OpenWhisk on Mac, Windows PC or GNU/Linux.
-                Downloading and install VirtualBox and Vagrant for your operating system and architecture.
-                You can follow the steps under
-                <a href="https://github.com/apache/incubator-openwhisk#vagrant-setup">Vagrant Setup</a>
-                to run your first OpenWhisk action using Vagrant.
-            </p>
-            <p>
-                There are many different deployment methods available but we recommend
-                <a href="https://github.com/apache/incubator-openwhisk-deploy-kube/blob/master/README.md">Deploy OpenWhisk to a Kubernetes Cluster</a>
-                as its the most easy and quickest way of getting OpenWhisk deployed.
-            </p>
-        </div>
-    </main>
-
-    <!-- Operators Administrative Operations -->
-    <main id="doc">
-        <div class="content">
-            <a class="indexable" id="deployment_admin"></a>
-            <h3 id="deployment_admin">Administrative Operations</h3>
-            <p>
-                This section contains a list of resources which can be utilized to administer the running OpenWhisk instance.
-                <ul>
-                    <li><a href="https://github.com/apache/incubator-openwhisk/tree/master/tools/admin">wskadmin</a></li>
-                </ul>
-            </p>
-        </div>
-    </main>
-
-    <!-- Operators resources -->
-    <main id="doc">
-        <div class="content">
-            <a class="indexable" id="operators_resources"></a>
-            <h3>Operators Resources</h3>
-            <ul>
-                <li><a href="https://medium.com/openwhisk/five-minute-intro-to-open-source-serverless-development-with-openwhisk-328b0ebfa160">Five minute intro to open source serverless development with OpenWhisk</a></li>
-                <li><a href="https://thenewstack.io/behind-scenes-apache-openwhisk-serverless-platform/">An Architectural View of Apache OpenWhisk</a></li>
-                <li><a href="https://medium.com/@rabbah/the-state-of-openwhisk-ae8c129e8a48">The State of OpenWhisk</a></li>
-                <li><a href="https://medium.com/openwhisk/starting-openwhisk-in-sixty-seconds-9288bfb4863d">Starting OpenWhisk in Sixty Seconds</a></li>
-                <li><a href="https://medium.com/openwhisk/deploying-openwhisk-on-kubernetes-3f55f781fbab">Deploying OpenWhisk on Kubernetes</a></li>
-                <li><a href="https://medium.com/openwhisk/uncovering-the-magic-how-serverless-platforms-really-work-3cb127b05f71">Uncovering the magic: How serverless platforms really work!</a></li>
-            </ul>
-        </div>
-    </main>
-
-    <!-- Developers Section -->
-    <main id="doc">
-        <div class="content">
-            <a class="indexable" id="developers"></a>
-            <h2>Developers</h2>
-            <p>
-                The OpenWhisk project and programming model supports different kinds of developers that may wish
-                to user different runtimes and tooling. Here is the developer relevant content to find the information you may need.
-            </p>
-        </div>
-    </main>
-
-    <!-- Developers Pre Requisites section -->
-    <main id="doc">
-        <div class="content">
-            <a class="indexable" id="pre-requisites"></a>
-            <h4>Pre-requisites</h4>
-            <p>Please make sure you have access to working instance of OpenWhisk. If not, refer to
-            <a href="#openwhisk_deployment">OpenWhisk Deployment</a>
-            for detailed instructions on how to install and configure OpenWhisk.
-            </p>
-        </div>
-    </main>
-
-    <!-- Using OpenWhisk section -->
-    <main id="doc">
-        <div class="content">
-            <a class="indexable" id="using-openwhisk"></a>
-            <h4>Using OpenWhisk</h4>
-            <p></p>
-            <p>
-                <a href="#openwhisk_deployment">OpenWhisk Deployment</a>
-                has a guest account configured with the authentication key available at
-                <a href="https://github.com/apache/incubator-openwhisk/blob/master/ansible/files/auth.guest">https://github.com/apache/incubator-openwhisk/blob/master/ansible/files/auth.guest</a>.
-                Also, use the <strong>192.168.33.13</strong> address as the whisk API host.
-            </p>
-            <a class="indexable" id="wsk-cli"></a>
-            <h5>Configure the wsk CLI</h5>
-            <p>
-                OpenWhisk offers wsk Command Line Interface (CLI) to easily create, run, and manage OpenWhisk entities.
-            </p>
-            <ul>
-                <li>
-                    <strong>Download the wsk CLI:</strong>
-                    Download wsk binary for your local environment into a location in your shell path from
-                    <a href="https://github.com/apache/incubator-openwhisk-cli/releases">here</a>.
-                </li>
-                <li>
-                    <strong>CLI Help:</strong>
-                    To get the CLI command help, execute the following command:
-                </li>
-                <div class="terminal">
-<pre>wsk --help</pre>
-                </div>
-                <p></p>
-                <li id="authentication"><strong>Authenticate wsk CLI</strong></li>
-                <p>You can configure wsk CLI to use your OpenWhisk credentials in few different ways:</p>
-                <ul>
-                    <li>With wsk property setup</li>
-                    <p>Run the following command to set whisk API HOST and authorization key to create the configuration file:</p>
-                    <div class="terminal">
-<pre>wsk property set --apihost &lt;API_HOST&gt; --auth &lt;AUTH_KEY&gt; --namespace guest</pre>
-                    </div>
-                    <p>Credentials are stored in <i>~/.wskprops</i>, which you can edit directly if needed.</p>
-                    <li>Environment Variables Setup</li>
-                    <p>Access credentials can be provided using properties file as environment variable:</p>
-                    <div class="terminal">
-<pre>export WSK_CONFIG_FILE=&lt;your-config-file&gt;
-wsk list</pre>
-                    </div>
-                </ul>
-
-            </ul>
-            <a class="indexable" id="wskdeploy"></a>
-            <h5>Whisk Deploy</h5>
-            <p>
-                <a href="https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/README.md">Whisk Deploy</a>
-                is an utility to help deploy all your OpenWhisk Packages, Actions, Triggers, and Rules using a single command.
-            </p>
-            <ul>
-                <li>
-                    Download the Whisk Deploy:
-                    Binaries of <i>wskdeploy</i> are available for download on the project's GitHub release page:
-                    <a href="https://github.com/apache/incubator-openwhisk-wskdeploy/releases">https://github.com/apache/incubator-openwhisk-wskdeploy/releases.</a>
-                </li>
-                <p></p>
-                <li>
-                    wskdeploy Help:
-                    Start by verifying the utility can display the command line help:
-                </li>
-                <div class="terminal">
-<pre>wskdeploy --help</pre>
-                </div>
-                <p></p>
-                <li>
-                    Create Package Manifest File <i>manifest.yaml</i>:
-                    Please refer to the
-                    <a href="https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/docs/programming_guide.md#wskdeploy-utility-by-example">Whisk Deploy Programming Guide</a>
-                    for all manifest file grammar and syntax. This programming guide has step-by-step instructions for deploying OpenWhisk applications
-                    using wskdeploy.
-                </li>
-                <p></p>
-                <li>Deploy your Application:</li>
-                <ul>
-                    <li><strong>Note:</strong> Before you proceed with the deployment, please make sure you have the authentication setup as described
-                    <a href="#authentication">here</a>.</li>
-                    <li>Deploying an OpenWhisk Manifest file:</li>
-                    <div class="terminal">
-<pre>wskdeploy -m manifest.yaml</pre>
-                    </div>
-                </ul>
-            </ul>
-            <a class="indexable" id="rest-api"></a>
-            <h5>OpenWhisk REST API</h5>
-            <p>
-                After your OpenWhisk environment is enabled, you can use OpenWhisk with your web apps or mobile apps with REST API calls.
-                For more details about the APIs for actions, activations, packages, rules, and triggers, see the
-                <a href="https://github.com/apache/incubator-openwhisk/blob/master/docs/rest_api.md">OpenWhisk API</a>
-                documentation.
-            </p>
-            <a class="indexable" id="openwhisk-clients"></a>
-            <h5>OpenWhisk Clients</h5>
-            <p>OpenWhisk provides a wrapper around the OpenWhisk APIs in multiple different languages.:</p>
-            <ul>
-                <li id="javascript-client"><a href="https://github.com/apache/incubator-openwhisk-client-js/blob/master/README.md">JavaScript</a></li>
-                <li id="go-client"><a href="https://github.com/apache/incubator-openwhisk-client-go/blob/master/README.md">Go</a></li>
-                <li id="swift-client"><a href="https://github.com/apache/incubator-openwhisk-client-swift/blob/master/README.md">Swift</a></li>
-                <li id="python-client"><a href="https://github.com/apache/incubator-openwhisk-client-python/blob/master/README.md">Python</a></li>
-            </ul>
-        </div>
-    </main>
-
-        <!-- actions section -->
-        <main id="doc">
-            <div class="content">
-                <a class="indexable" id="actions"></a>
-                <h4>Actions</h4>
-                <p>
-                    <strong>What is an OpenWhisk action?</strong>
-                    Actions are stateless functions(code snippets) that run on the OpenWhisk platform.
-                    Actions encapsulates application logic to be executed in response to events.
-                    You can find more details on specifics of an action in main OpenWhisk GitHub repo at
-                    <a href="https://github.com/apache/incubator-openwhisk/blob/master/docs/actions.md">incubator-openwhisk</a>.
-                </p>
-                <p>
-                    <strong>Which programming language can I use to write an OpenWhisk action?</strong>
-                    An action can be created from a function written using any of the supported runtimes.
-                    <a href="https://github.com/apache/incubator-openwhisk/blob/master/docs/actions.md#languages-and-runtimes">Here</a>
-                    is the list of runtimes supported by OpenWhisk:
-                    <ul>
-                        <li><a href="https://github.com/apache/incubator-openwhisk-runtime-nodejs/blob/master/README.md">JavaScript</a> - OpenWhisk runtime for Node.js v6 and v8</li>
-                        <li><a href="https://github.com/apache/incubator-openwhisk-runtime-docker/blob/master/README.md">Docker</a> - OpenWhisk runtime for Docker Actions using SDK</li>
-                        <li><a href="https://github.com/apache/incubator-openwhisk-runtime-go/blob/master/README.md">Go</a> - OpenWhisk runtime for Go lang</li>
-                        <li><a href="https://github.com/apache/incubator-openwhisk-runtime-php/blob/master/README.md">PHP</a> - OpenWhisk runtime for PHP 7.2 and 7.1</li>
-                        <li><a href="https://github.com/apache/incubator-openwhisk-runtime-python/blob/master/README.md">Python</a> - OpenWhisk runtime for Python 2.7 and 3</li>
-                        <li><a href="https://github.com/apache/incubator-openwhisk-runtime-swift/blob/master/README.md">Swift</a> - OpenWhisk runtime for Swift 3 and 4</li>
-                        <li><a href="https://github.com/apache/incubator-openwhisk-runtime-java/blob/master/README.md">Java</a> - OpenWhisk runtime for Java 8</li>
-                    </ul>
-                </p>
-                <p>
-                    While the actual function code will be specific to a language and runtime, the OpenWhisk operations to create,
-                    invoke and manage an action are the same regardless of the implementation choice. OpenWhisk wsk CLI and Whisk Deploy
-                    specified in <a href="#using-openwhisk">Using OpenWhisk</a> section supports action management on OpenWhisk platform.
-                </p>
-                <p>
-                    <strong>What if your preferred language/runtime is not supported by OpenWhisk?</strong>
-                    If your favorite language is not listed above, you may find the Docker action or native binary path more suitable.
-                    The OpenWhisk platform is extensible and you can add new languages or runtimes (with custom packages and third-party dependencies)
-                    following the guide described
-                    <a href="https://github.com/apache/incubator-openwhisk/blob/master/docs/actions-new.md">here</a>.
-                    Please reach out to other whiskers on dev mailing list at
-                    <a href="mailto:dev@openwhisk.incubator.apache.org">dev@openwhisk.incubator.apache.org</a>.
-                    once you have followed the guide on creating a new language/runtimes. Here are some examples of runtimes added by community:
-                    <ul>
-                        <li><a href="https://github.com/rainbyte/openwhisk-wrapper">Haskell based OpenWhisk Services</a></li>
-                        <li><a href="http://jamesthom.as/blog/2017/01/18/openwhisk-and-rust/">OpenWhisk and Rust</a></li>
-                        <li><a href="https://github.com/gekola/openwhisk_docker_samples">Run Clojure, Erlang, Ruby, and Rust Actions on OpenWhisk using Docker</a></li>
-                        <li><a href="https://github.com/imesh/openwhisk-runtime-ballerina#apache-openwhisk-runtime-for-ballerina">Ballerina</a></li>
-                    </ul>
-                    </p>
-
-                <p>
-                    <strong>After you create an action, how can you invoke that action?</strong>
-                    You can invoke actions manually using OpenWhisk CLI or fire a trigger with which your action is associated with.
-                    If you are not faimiliar with triggers, we are looking into triggers in next section.
-                </p>
-                <p>
-                    <strong>Can an application logic be divided into multiple actions? </strong>
-                    Multiple actions from different languages may be composed together to create a longer processing pipeline called a
-                    <a href="https://github.com/apache/incubator-openwhisk/blob/master/docs/actions.md#creating-action-sequences">sequence</a>.
-                    Sequence can be treated as an action in terms of it creation and invocation.
-                </p>
-                <p>Please read
-                <a href="https://github.com/apache/incubator-openwhisk/blob/master/docs/actions.md">OpenWhisk Actions</a>
-                for further details.</p>
-            </div>
-        </main>
-
-        <!-- Here we are starting with writing actions in NodeJS -->
-        <main id="doc">
-            <div class="content">
-                <a class="indexable" id="nodejs"></a>
-                <h4>NodeJs</h4>
-                <p></p>
-                <a class="indexable" id="nodejs-actions"></a>
-                <h5>Creating and Invoking NodeJS actions</h5>
-                <p>
-                    Let's look at how to write a sample hello world action in NodeJS. You can visit
-                    <a href="https://github.com/apache/incubator-openwhisk/blob/master/docs/actions-node.md#creating-and-invoking-javascript-actions">Creating and Invoking NodeJS actions</a>
-                    page for further details.
-                </p>
-                <p>
-                    <strong>Note:</strong> We will be using <i>wsk</i> CLI in this section. If you don't have it installed and configured,
-                    please refer to the section on <a href="#wsk-cli">Configure the wsk CLI</a> to configure it.
-                </p>
-                <ol>
-                    <li style="list-style-type: decimal">Create a file named <i>hello.js</i>:</li>
-                    <div class="terminal">
-<pre>function main() {
-    return {payload: 'Hello world'};
-}</pre>
-                    </div>
-                    <li style="list-style-type: decimal">Create an action called <i>helloJS</i> using <i>hello.js</i>:</li>
-                    <div class="terminal">
-                        <pre>wsk action create helloJS hello.js</pre>
-                    </div>
-                    <div class="terminal">
-                        <pre>ok: created action helloJS</pre>
-                    </div>
-                    <li style="list-style-type: decimal">Invoke the <i>helloJS</i> action as a blocking activation:</li>
-                    <div class="terminal">
-                        <pre>wsk action invoke helloJS --blocking</pre>
-                    </div>
-                    <div class="terminal">
-<pre>{
-"result": {
-    "payload": "Hello world"
-},
-"status": "success",
-"success": true
-}</pre>
-                    </div>
-                    <li style="list-style-type: decimal">Deploy using <i>wskdeploy</i>:
-                        <p></p>
-                        <ol>
-                            <li>Create <i>manifest.yaml</i> with the following YAML content:</li>
-                            <div class="terminal">
-<pre>packages:
-    helloworld:
-        actions:
-            helloJS:
-                function: hello.js</pre>
-                            </div>
-                            Or
-                            <p></p>
-                            <div class="terminal">
-<pre>packages:
-    helloworld:
-        actions:
-            helloJS:
-                code: |
-                    function main() {
-                        return {payload: 'Hello world'};
-                    }
-                runtime: nodejs:6</pre>
-                            </div>
-                            <li>Run deployment with <i>wskdeploy</i>:</li>
-                            <div class="terminal">
-<pre>wskdeploy -m manifest.yaml</pre>
-                            </div>
-                        </ol>
-                </ol>
-                <a class="indexable" id="nodejs-runtime"></a>
-                <h5>OpenWhisk Runtime for NodeJS</h5>
-                <p>
-                    OpenWhisk supports <strong>Node.js 6</strong> and <strong>Node.js 8</strong> runtimes where Node.js 6 being default pick by wsk CLI and Whisk Deploy.
-                    If you wish to learn more about NodeJS runtime along with
-                    the libraries that are supported or "built-in" by default, please visit
-                    <a href="https://github.com/apache/incubator-openwhisk-runtime-nodejs/blob/master/README.md">NodeJS Runtime GitHub Repository</a>.
-                </p>
-                <a class="indexable" id="nodejs-additional-resources"></a>
-                <h5>Additional Resources</h5>
-                <p>
-                    <ul>
-                        <li><a href="https://medium.com/openwhisk/debugging-node-js-openwhisk-actions-3da3303e6741">Debugging Node.js OpenWhisk Actions</li>
-                        <li><a href="https://medium.com/openwhisk/updates-to-openwhisk-node-js-actions-ed5556cd5ae9">Updates to OpenWhisk Node.js actions</a></li>
-                        <li><a href="https://medium.com/openwhisk/integrating-openwhisk-with-your-node-application-d489b8a20102">Integrating OpenWhisk with Your Node Applications</a></li>
-                    </ul>
-                </p>
-            </div>
-        </main>
-
-        <!-- Here we are starting with writing actions in python -->
-        <main id="doc">
-            <div class="content">
-                <a class="indexable" id="python"></a>
-                <h4>Python</h4>
-                <p></p>
-                <a class="indexable" id="python-actions"></a>
-                <h5>Creating And Invoking Python actions</h5>
-                <p>
-                    Let's look at how to write a sample hello world action in Python. You can visit
-                    <a href="https://github.com/apache/incubator-openwhisk/blob/master/docs/actions-node.md#creating-and-invoking-python-actions">Creating and Invoking Python actions</a>
-                    page for further details.
-                </p>
-                <p>
-                    <strong>Note:</strong> We will be using <i>wsk</i> CLI in this section. If you don't have it installed and configured,
-                    please refer to the section on <a href="#wsk-cli">Configure the wsk CLI</a> to configure it.
-                </p>
-                <ol>
-                    <li style="list-style-type: decimal">Create a file named <i>hello.py</i>:</li>
-                    <div class="terminal">
-<pre>import sys
-def main(dict):
-    if 'name' in dict:
-        name = dict['name']
-    else:
-        name = "stranger"
-    greeting = "Hello " + name + "!"
-    print(greeting)
-    return {"greeting": greeting}</pre>
-                    </div>
-                    <li style="list-style-type: decimal">Create an action called <i>helloPy</i> using <i>hello.py</i>:</li>
-                    <div class="terminal">
-<pre>wsk action create helloPy hello.py</pre>
-                    </div>
-                    <div class="terminal">
-<pre>ok: created action helloPy</pre>
-                    </div>
-                    <li style="list-style-type: decimal">Invoke the <i>helloPy</i> action using command-line parameters:</li>
-                    <div class="terminal">
-<pre>wsk action invoke helloPy --blocking --param name World</pre>
-                    </div>
-                    <div class="terminal">
-<pre>{
-    "greeting": "Hello World!"
-}</pre>
-                    </div>
-                    <li style="list-style-type: decimal">Deploy using <i>wskdeploy</i>:
-                        <p></p>
-                        <ol>
-                            <li>Create <i>manifest.yaml</i> with the following YAML content:</li>
-                            <div class="terminal">
-<pre>packages:
-    helloworld:
-        actions:
-            helloPy:
-                function: hello.py</pre>
-                            </div>
-                            Or
-                            <p></p>
-                            <div class="terminal">
-<pre>packages:
-    helloworld:
-        actions:
-            helloPy:
-                code: |
-                    import sys
-                    def main(dict):
-                        if 'name' in dict:
-                            name = dict['name']
-                        else:
-                            name = "stranger"
-                        greeting = "Hello " + name + "!"
-                        print(greeting)
-                        return {"greeting": greeting}
-                runtime: python:2</pre>
-                            </div>
-                            <li>Run deployment with <i>wskdeploy</i>:</li>
-                            <div class="terminal">
-<pre>wskdeploy -m manifest.yaml</pre>
-                            </div>
-                        </ol>
-                </ol>
-                <a class="indexable" id="python-runtime"></a>
-                <h5>OpenWhisk Runtime for Python</h5>
-                <p>
-                    OpenWhisk supports <strong>Python 2</strong> and <strong>Python 3</strong> runtimes where Python 2 being default pick by wsk CLI and Whisk Deploy.
-                    If you wish to learn more about Python runtime along with
-                    the libraries that are supported or "built-in" by default, please visit
-                    <a href="https://github.com/apache/incubator-openwhisk-runtime-python/blob/master/README.md">Python Runtime GitHub Repository</a>.
-                </p>
-                <a class="indexable" id="python-additional-resources"></a>
-                <h5>Additional Resources</h5>
-                <p>
-                    <ul>
-                        <li><a href="http://jamesthom.as/blog/2017/04/27/python-packages-in-openwhisk/">Using External Python Libraries in OpenWhisk</a></li>
-                        <li><a href="https://www.slideshare.net/CodeOps/openwhisk-by-example-auto-retweeting-example-in-python">Auto Retweeting Example in Python</a></li>
-                    </ul>
-                </p>
-            </div>
-        </main>
-
-        <!-- Here we are starting with writing actions in python -->
-        <main id="doc">
-            <div class="content">
-                <a class="indexable" id="go"></a>
-                <h4>Go</h4>
-                <p></p>
-                <a class="indexable" id="go-actions"></a>
-                <h5>Creating And Invoking Go actions</h5>
-                <p>
-                    Let's look at how to write a sample hello world action in Go. You can visit
-                    <a href="https://github.com/apache/incubator-openwhisk/blob/master/docs/actions-go.md#creating-and-invoking-go-actions">Creating and Invoking Go actions</a>
-                    page for further details.
-                </p>
-                <p>
-                    <strong>Note:</strong> We will be using <i>wsk</i> CLI in this section. If you don't have it installed and configured,
-                    please refer to the section on <a href="#wsk-cli">Configure the wsk CLI</a> to configure it.
-                </p>
-                <ol>
-                    <li style="list-style-type: decimal">Create a file named <i>hello.go</i>:</li>
-                    <div class="terminal">
-<pre>package main
-
-import "encoding/json"
-import "fmt"
-import "os"
-
-func main() {
-    //program receives one argument: the JSON object as a string
-    arg := os.Args[1]
-
-    // unmarshal the string to a JSON object
-    var obj map[string]interface{}
-    json.Unmarshal([]byte(arg), &obj)
-
-    // can optionally log to stdout (or stderr)
-    fmt.Println("hello Go action")
-
-    name, ok := obj["name"].(string)
-    if !ok { name = "Stranger" }
-
-    // last line of stdout is the result JSON object as a string
-    msg := map[string]string{"msg": ("Hello, " + name + "!")}
-    res, _ := json.Marshal(msg)
-    fmt.Println(string(res))
-}</pre>
-                    </div>
-                    <li style="list-style-type: decimal">Create an executable called <i>exec</i> using <i>hello.go</i>:</li>
-                    <div class="terminal">
-<pre>GOOS=linux GOARCH=amd64 go build -o exec
-zip exec.zip exec</pre>
-                    </div>
-                    <li style="list-style-type: decimal">Create an action <i>helloGo</i>:</li>
-                    <div class="terminal">
-<pre>wsk action create helloGo --native exec.zip</pre>
-                    </div>
-                    <li style="list-style-type: decimal">Invoke an action <i>helloGo</i>:</li>
-                    <div class="terminal">
-<pre>wsk action invoke helloGo -r -p name gopher</pre>
-                    </div>
-                    <div class="terminal">
-<pre>{
-    "msg": "Hello, gopher!"
-}</pre>
-                    </div>
-                </ol>
-                <a class="indexable" id="go-runtime"></a>
-                <h5>OpenWhisk Runtime for Go</h5>
-                <p>
-                    If you wish to learn more about Go runtime along with
-                    the libraries that are supported or "built-in" by default, please visit
-                    <a href="https://github.com/apache/incubator-openwhisk-runtime-go/blob/master/README.md">Go Runtime GitHub Repository</a>.
-                </p>
-                <a class="indexable" id="go-additional-resources"></a>
-                <h5>Additional Resources</h5>
-                <p>
-                    <ul>
-                        <li><a href="http://jamesthom.as/blog/2017/01/17/openwhisk-and-go/">Running Go Binaries on OpenWhisk</a></li>
-                        <li><a href="https://www.slideshare.net/MicheleSciabarr/openwhisk-go-runtime">OpenWhisk Go Runtime</a></li>
-                    </ul>
-                </p>
-            </div>
-        </main>
-
-        <!-- Here we are starting with writing actions in Java -->
-        <main id="doc">
-            <div class="content">
-                <a class="indexable" id="java"></a>
-                <h4>Java</h4>
-                <p></p>
-                <a class="indexable" id="java-actions"></a>
-                <h5>Creating and Invoking Java actions</h5>
-                <p>
-                    Let's look at how to write a sample hello world action in Java. You can visit
-                    <a href="https://github.com/apache/incubator-openwhisk/blob/master/docs/actions-java.md#creating-and-invoking-java-actions">Creating and Invoking Java actions</a>
-                    page for further details.
-                </p>
-                <p>
-                    <strong>Note:</strong> We will be using <i>wsk</i> CLI in this section. If you don't have it installed and configured,
-                    please refer to the section on <a href="#wsk-cli">Configure the wsk CLI</a> to configure it.
-                </p>
-                <ol>
-                    <li style="list-style-type: decimal">Create a file named <i>Hello.java</i>:</li>
-                    <div class="terminal">
-<pre>package hello;
-
-import com.google.gson.JsonObject;
-
-public class Hello {
-    public static JsonObject main(JsonObject args)
-        String name;
-
-        try {
-            name = args.getAsJsonPrimitive("name").getAsString();
-        } catch(Exception e) {
-            name = "stranger";
-        }
-
-        JsonObject response = new JsonObject();
-        response.addProperty("greeting", "Hello " + name + "!");
-        return response;
-    }
-}</pre>
-                    </div>
-                    <li style="list-style-type: decimal">Compile <i>Hello.Java</i> into a JAR file <i>hello.jar</i> as follows</li>
-                    <div class="terminal">
-<pre>javac Hello.java
-jar cvf hello.jar Hello.class</pre>
-                    </div>
-                    <li style="list-style-type: decimal">Create an action called <i>helloJava</i> using <i>hello.jar</i>:</li>
-                    <div class="terminal">
-<pre>wsk action create helloJava hello.jar --main Hello</pre>
-                    </div>
-                    <div class="terminal">
-<pre>ok: created action helloJava</pre>
-                    </div>
-                    <li style="list-style-type: decimal">Invoke an action <i>helloJava</i>:</li>
-                    <div class="terminal">
-<pre>wsk action invoke helloJava --blocking --result</pre>
-                    </div>
-                    <div class="terminal">
-<pre>{
-"greeting": "Hello stranger!"
-}</pre>
-                    </div>
-                </ol>
-                <a class="indexable" id="java-runtime"></a>
-                <h5>OpenWhisk Runtime for Java</h5>
-                <p>
-                    OpenWhisk supports <strong>Java 8</strong> runtime.
-                    If you wish to learn more about NodeJS runtime along with
-                    the libraries that are supported or "built-in" by default, please visit
-                    <a href="https://github.com/apache/incubator-openwhisk-runtime-java/blob/master/README.md">Java Runtime GitHub Repository</a>.
-                </p>
-                <a class="indexable" id="java-additional-resources"></a>
-                <h5>Additional Resources</h5>
-                <p>
-                    <ul>
-                        <li><a href="https://www.ibm.com/blogs/bluemix/2017/02/building-openwhisk-actions-java-gradle/">Building OpenWhisk actions with Java and Gradle</a></li>
-                    </ul>
-                </p>
-            </div>
-        </main>
-
-        <!--main id="doc">
-            <div class="content">
-                <h4 id="docker">Docker</h4>
-                <p></p>
-                <h5 id="docker_actions">Creating and Invoking Docker actions</h5>
-                <p>
-                    OpenWhisk provides a base image for Docker actions called openwhisk/dockerskeleton. This image is based on Alpine Linux 3.4 and includes Python v2.7.12 but not much else. (For reference, the image is based on python:2.7.12-alpine).
-                    From this base image, you can create and run an OpenWhisk action:
-                    Let's look at how to write a sample hello world action in Docker. You can visit
-                    <a href="https://github.com/apache/incubator-openwhisk/blob/master/docs/actions-docker.md#creating-and-invoking-docker-actions">Creating and Invoking Docker actions</a>
-                    page for further details.
-                </p>
-                <h5 id="docker-runtime">OpenWhisk Runtime for Docker</h5>
-                <p>
-
-                </p>
-                <h5 id="docker-other-resources">Other Resources</h5>
-                <p>
-                    <ul>
-                        <li><a href="http://jamesthom.as/blog/2017/01/16/openwhisk-docker-actions/">OpenWhisk Docker Actions</a></li>
-                        <li><a href="https://www.ibm.com/blogs/bluemix/2017/01/docker-bluemix-openwhisk/">Understanding and using Docker actions in IBM Bluemix OpenWhisk</a></li>
-                    </ul>
-                </p>
-            </div>
-        </main-->
-
-        <main id="doc">
-            <div class="content">
-                <a class="indexable" id="php"></a>
-                <h4 id="php">PHP</h4>
-                <p></p>
-                <a class="indexable" id="php-actions"></a>
-                <h5>Creating and Invoking PHP actions</h5>
-                <p>
-                    Let's look at how to write a sample hello world action in PHP. You can visit
-                    <a href="https://github.com/apache/incubator-openwhisk/blob/master/docs/actions-php.md#creating-and-invoking-php-actions">Creating and Invoking PHP actions</a>
-                    page for further details.
-                </p>
-                <p>
-                    <strong>Note:</strong> We will be using <i>wsk</i> CLI in this section. If you don't have it installed and configured,
-                    please refer to the section on <a href="#wsk-cli">Configure the wsk CLI</a> to configure it.
-                </p>
-                <ol>
-                    <li style="list-style-type: decimal">Create a file named <i>hello.php</i>:</li>
-                    <div class="terminal">
-<pre>&lt;?php
-function main(array $args) : array
-{
-    $name = $args["name"] ?? "stranger";
-    $greeting = "Hello $name!";
-    echo $greeting;
-    return ["greeting" => $greeting];
-}</pre>
-                    </div>
-                    <li style="list-style-type: decimal">Create an action called <i>helloPHP</i> using <i>hello.php</i>:</li>
-                    <div class="terminal">
-<pre>wsk action create helloPHP hello.php</pre>
-                    </div>
-                    <div class="terminal">
-<pre>ok: created action helloPHP</pre>
-                    </div>
-                    <li style="list-style-type: decimal">Invoke an action <i>helloPHP</i>:</li>
-                    <div class="terminal">
-<pre>wsk action invoke helloPHP --blocking --result --param name World</pre>
-                    </div>
-                    <div class="terminal">
-<pre>{
-    "greeting": "Hello World!"
-}</pre>
-                    </div>
-                    <li style="list-style-type: decimal">Deploy using <i>wskdeploy</i>:
-                    <p></p>
-                    <ol>
-                        <li>Create <i>manifest.yaml</i> with the following YAML content:</li>
-                        <div class="terminal">
-<pre>packages:
-    helloworld:
-        actions:
-            helloPHP:
-                function: hello.php</pre>
-                        </div>
-                        Or
-                        <p></p>
-                        <div class="terminal">
-<pre>packages:
-    helloworld:
-        actions:
-            helloPHP:
-                code: |
-                    &lt;?php
-                    function main(array $args) : array
-                    {
-                        $name = $args["name"] ?? "stranger";
-                        $greeting = "Hello $name!";
-                        echo $greeting;
-                        return ["greeting" => $greeting];
-                    }
-                runtime: php:7.1</pre>
-                        </div>
-                        <li>Run deployment with <i>wskdeploy</i>:</li>
-                        <div class="terminal">
-<pre>wskdeploy -m manifest.yaml</pre>
-                        </div>
-                    </ol>
-                </ol>
-                <a class="indexable" id="php-runtime"></a>
-                <h5>OpenWhisk Runtime for PHP</h5>
-                <p>
-                    OpenWhisk supports <strong>PHP 7.2</strong> and <strong>PHP 7.1</strong> runtimes where PHP 7.2 being default pick by wsk CLI and Whisk Deploy.
-                    If you wish to learn more about PHP runtime, please visit
-                    <a href="https://github.com/apache/incubator-openwhisk-runtime-php/blob/master/README.md">PHP Runtime GitHub Repository</a>.
-                </p>
-                <a class="indexable" id="php-additional-resources"></a>
-                <h5>Additional Resources</h5>
-                <p>
-                    <ul>
-                        <li><a href="https://akrabat.com/getting-started-with-serverless-php/">Getting Started with Serverless PHP</a></li>
-                        <li><a href="https://lornajane.net/posts/2018/handle-webhooks-with-serverless-php">Handle Webhooks with Serverless PHP on OpenWhisk</a></li>
-                    </ul>
-                </p>
-            </div>
-        </main>
-
-        <!--main id="doc">
-            <div class="content">
-                <a class="indexable" id="swift"></a>
-                <h4>Swift</h4>
-                <p></p>
-                <a class="indexable" id="swift-actions"></a>
-                <h5>Creating and Invoking Swift actions</h5>
-                <p>
-                    Let's look at how to write a sample hello world action in Swift.
-                </p>
-                <p>
-                    <strong>Note:</strong> We will be using <i>wsk</i> CLI in this section. If you don't have it installed and configured,
-                    please refer to the section on <a href="#wsk-cli">Configure the wsk CLI</a> to configure it.
-                </p>
-                <a class="indexable" id="swift-runtime"></a>
-                <h5>OpenWhisk Runtime for Swift</h5>
-                <p></p>
-                <a class="indexable" id="swift-additional-resources"></a>
-                <h5>Additional Resources</h5>
-                <p></p>
-            </div>
-        </main-->
-
-        <!-- Managing Actions with OpenWhisk Packages -->
-        <main id="doc">
-            <div class="content">
-                <a class="indexable" id="managing_actions_with_openwhisk_packages"></a>
-                <h4>Managing Actions with OpenWhisk Packages</h4>
-                <p>
-                    <strong>What is a package?</strong> In OpenWhisk, you can use packages to bundle together a set of related actions, and share them with others.
-                    OpenWhisk comes with a list of packages
-                    You can get more details on OpenWhisk packages
-                    <a href="https://github.com/apache/incubator-openwhisk/blob/master/docs/packages.md#using-and-creating-openwhisk-packages">here</a>.
-                </p>
-                <p>
-                    <strong>Does OpenWhisk comes with any pre-installed packages?</strong>
-                    OpenWhisk comes with a list of pre-installed public packages which can be used by anyone.
-                    OpenWhisk has created a dedicated shared namespace <strong>/whisk.system</strong> for all the public packages.
-                </p>
-                <p>
-                    <strong>Which all packages are available under /whisk.system?</strong>
-                    You can get a list of packages available in shared namespace by using wsk CLI:
-                </p>
-                <ul>
-                    <li>Get a list of packages:</li>
-                    <div class="terminal">
-                        <pre>wsk package list /whisk.system</pre>
-                    </div>
-                    <li>Get a list of entities in a package:</li>
-                    <div class="terminal">
-                        <pre>wsk package get --summary /whisk.system/&lt;package-name&gt;</pre>
-                    </div>
-                </ul>
-                <p>
-                    <strong>How do I invoke an action from a public package?</strong>
-                    There are two way to invoke an action from a package,
-                    (1) Invoking an action directly from a package
-                    (2) Creating a package binding and then invoking an action in the binding.
-                </p>
-                <ul>
-                    <li>Invoking an action from a public package:</li>
-                    <ul>
-                        <li style="list-style: circle">Get a description of the /whisk.system/samples/greeting action:</li>
-                        <div class="terminal">
-                            <pre>wsk action get --summary /whisk.system/samples/greeting</pre>
-                        </div>
-                        <div class="terminal">
-                            <pre>action /whisk.system/samples/greeting: Returns a friendly greeting
-                                (parameters: name, place)</pre>
-                        </div>
-                        <li style="list-style: circle">Invoking action in a package:</li>
-                        <div class="terminal">
-                            <pre>wsk action invoke --result /whisk.system/samples/greeting</pre>
-                        </div>
-                        <div class="terminal">
-                            <pre>{
-                                "payload": "Hello, stranger from somewhere!"
-                            }</pre>
-                        </div>
-                        <li style="list-style: circle">Invoke the action with parameters:</li>
-                        <div class="terminal">
-                            <pre>wsk action invoke --result /whisk.system/samples/greeting --param name Bernie --param place Vermont</pre>
-                        </div>
-                        <div class="terminal">
-                            <pre>{
-                                "payload": "Hello, Bernie from Vermont!"
-                            }</pre>
-                        </div>
-                    </ul>
-                    <li>Creating package binding and invoking action from the binding:</li>
-                    <ul>
-                        <li style="list-style: circle">Creating and using package bindings:</li>
-                        <div class="terminal">
-                            <pre>wsk package bind /whisk.system/samples valhallaSamples --param place Valhalla</pre>
-                        </div>
-                        <div class="terminal">
-                            <pre>ok: created binding valhallaSamples</pre>
-                        </div>
-                        <li style="list-style: circle">Invoke an action in the package binding:</li>
-                        <div class="terminal">
-                            <pre>wsk action invoke --result valhallaSamples/greeting --param name Odin</pre>
-                        </div>
-                        <div class="terminal">
-                            <pre>{
-                                "payload": "Hello, Odin from Valhalla!"
-                            }</pre>
-                        </div>
-                    </ul>
-                </ul>
-                <p>
-                    <strong>Where do I get more information on packages?</strong>
-                    Please read
-                    <a href="https://github.com/apache/incubator-openwhisk/blob/master/docs/packages.md#using-and-creating-openwhisk-packages">OpenWhisk Packages</a>
-                    for further details.
-                </p>
-        </div>
-    </main>
-    <main id="doc">
-        <div class="content">
-            <a class="indexable" id="connecting_actions_to_event_sources"></a>
-            <h4>Connecting Actions to Event Sources</h4>
-            <p>
-                <strong>Why do I need to connect actions to event sources?</strong>
-                OpenWhisk is based on event-driven architecture in which actions/functions should be connected
-                to external/internal event sources such as message queues, database changes, webhooks, etc. When these
-                events happen, functions/actions are automatically invoked without explicitly invoking them
-                unlike we saw before in <a href="#creating-and-invoking-actions">Creating And Invoking Actions</a>.
-                Now, events from these internal/external event sources are channeled through a trigger.
-            </p>
-            <p>
-                <strong>What is a trigger?</strong>
-                Triggers are the class of events like published messages, document uploads to a website, GitHub commits, etc that are emitted by event sources.
-            </p>
-            <p>
-                <strong>How to create and fire triggers?</strong>
-                <ul>
-                    <li >Create a trigger to send user location updates:</li>
-                    <div class="terminal">
-                        <pre>wsk trigger create locationUpdate</pre>
-                    </div>
-                    <li>Check you have created the trigger by listing the set of triggers:</li>
-                    <div class="terminal">
-                        <pre>wsk trigger list</pre>
-                    </div>
-                    <div class="terminal">
-<pre>triggers
-/someNamespace/locationUpdate                            private</pre>
-                    </div>
-                    <li>Fire the trigger by specifying its name and parameters:</li>
-                    <div class="terminal">
-<pre>wsk trigger fire locationUpdate --param name Bob --param place NYC</pre>
-                    </div>
-                    <div class="terminal">
-<pre>ok: triggered locationUpdate</pre>
-                    </div>
-                    <p>
-                        Firing a trigger like this currently does not do anything. We need to associate this trigger with an action.
-                        This kind of association is called a rule.
-                    </p>
-                </ul>
-            </p>
-            <p>
-                <strong>What are the rules?</strong>
-                Rules are used to associate a trigger with an action. After this kind of association is created, each time
-                a trigger event is fired, the action is invoked.
-                <ul>
-                    <li>Please make sure you have the <i>hello</i> action created. If not, you can follow instruction in the section
-                    <a href="#nodejs-actions">above</a> with the following <i>hello.js</i>.</li>
-                    <div class="terminal">
-<pre>
-function main(params) {
-    return {payload: 'Hello, ' + params.name + ' from ' + params.place};
-}</pre>
-                    </div>
-                    <div class="terminal">
-<pre>wsk action create hello hello.js</pre>
-                    </div>
-                    <div class="terminal">
-<pre>wsk action invoke --result hello --param name Bernie --param place Vermont</pre>
-                    </div>
-                    <div class="terminal">
-<pre>{
-    "payload": "Hello, Bernie from Vermont"
-}</pre>
-                    </div>
-                    <li>Create the rule:</li>
-                    <div class="terminal">
-<pre>wsk rule create myRule locationUpdate hello</pre>
-                    </div>
-                    <div class="terminal">
-<pre>ok: created rule myRule</pre>
-                    </div>
-                    <li>Fire the <i>locationUpdate</i> trigger:</li>
-                    <div class="terminal">
-<pre>wsk trigger fire locationUpdate --param name Bob --param place NYC</pre>
-                    </div>
-                    <div class="terminal">
-<pre>ok: triggered /_/locationUpdate with id abcd...</pre>
-                    </div>
-                    <li>Verify that the action was invoked by checking the activations list:</li>
-                    <div class="terminal">
-<pre>wsk activation list --limit 2</pre>
-                    </div>
-                    <div class="terminal">
-<pre>activations
-1234.... hello
-abcd.... locationUpdate
-</pre>
-                    </div>
-                    <li>Retrieving the trigger activation record:</li>
-                    <div class="terminal">
-<pre>wsk activation result 1234....</pre>
-                    </div>
-                    <div class="terminal">
-<pre>{
-    "payload": "Hello, Bob from NYC"
-}</pre>
-                    </div>
-                    You can see that the hello action received the event payload and returned the expected string.
-                </ul>
-            </p>
-            <p>
-                Please read
-                <a href="https://github.com/apache/incubator-openwhisk/blob/master/docs/triggers_rules.md#creating-triggers-and-rules">Creating Triggers and Rules</a>
-                for further details.
-            </p>
-        </div>
-    </main>
-
-    <main id="doc">
-        <div class="content">
-            <a class="indexable" id="using_openwhisk_enabled_services"></a>
-            <h4>Using OpenWhisk Enabled Services</h4>
-            <p></p>
-            <p>
-                OpenWhisk offers a catalog of packages which gives you can easy way to enhance your application with
-                useful capabilities, and to access external services in the ecosystem.
-                Examples of external services which are OpenWhisk-enabled include Slack, GitHub, Alarms, etc.
-            </p>
-            <p>
-                The catalog is available as packages under <i>/whisk.system</i> namespace.
-                Using the following command, you can get a list of packages under <i>/whisk.system:</i></li>
-                <div class="terminal">
-<pre>wsk package list /whisk.system</pre>
-                </div>
-                <div class="terminal">
-<pre>packages
-/whisk.system/alarms                                shared
-/whisk.system/system                                shared
-/whisk.system/utils                                 shared
-/whisk.system/samples                               shared
-/whisk.system/slack                                 shared
-/whisk.system/github                                shared
-...
-</pre>
-                </div>
-            </p>
-            <p>
-                Each of the packages under
-                <a href="https://github.com/apache/incubator-openwhisk-catalog#openwhisk-catalog">OpenWhisk Catalog</a>
-                is hosted in a GitHub repo.
-                Please refer to these package repositories for further details:
-                <ul>
-                    <li>
-                        <a href="https://github.com/apache/incubator-openwhisk-package-alarms/blob/master/README.md">incubator-openwhisk-package-alarm</a>
-                        is an Apache OpenWhisk alarm package that can be used to create periodic, time-based alarms.
-                    </li>
-                    <li>
-                        <a href="https://github.com/apache/incubator-openwhisk-package-cloudant/blob/master/README.md">incubator-openwhisk-package-cloudant</a>
-                        enables you to work with a Cloudant database.
-                    </li>
-                    <li>
-                        <a href="https://github.com/apache/incubator-openwhisk-package-kafka/blob/master/README.md">incubator-openwhisk-package-kafka</a>
-                        allows you to communicate with Kafka or Message Hub instances for publishing and consuming messages
-                        using native high performance Kafka API.
-                    </li>
-                    <li>
-                        <a href="https://github.com/apache/incubator-openwhisk-package-rss/blob/master/README.md">incubator-openwhisk-package-rss</a>
-                        allows users to subscribe to RSS/ATOM feeds and receive events when a new feed item is available.
-                    </li>
-                    <li>
-                        <a href="https://github.com/apache/incubator-openwhisk-package-deploy/blob/master/README.md">incubator-openwhisk-package-deploy</a>
-                        offers a convenient way for you to describe and deploy any part of the OpenWhisk programming model using a Manifest file written in YAML.
-                    </li>
-                    <li>
-                        <a href="https://github.com/apache/incubator-openwhisk-package-jira/blob/master/README.md">incubator-openwhisk-package-jira</a>
-                        includes actions that interact with JIRA software software development tool used for issue tracking, and project management functions.
-                    </li>
-                    <li>
-                        <a href="https://github.com/apache/incubator-openwhisk-package-template/blob/master/README.md">incubator-openwhisk-package-template</a>
-                        is a template for Openwhisk Packages, it can be used to build, test and integrate new packages.
-                    </li>
-                </ul>
-            </p>
-        </div>
-    </main>
-
-    <main id="doc">
-        <div class="content">
-            <a class="indexable" id="sample_openwhisk_applications"></a>
-            <h4>Sample OpenWhisk Applications</h4>
-            <p></p>
-            <h5>GitHub Slack Bot</h5>
-            <p style="padding-left: 2em;">
-                <a href="https://github.com/apache/incubator-openwhisk-GitHubSlackBot/blob/master/README.md">incubator-openwhisk-GitHubSlackBot</a>
-                demonstrates integration of GitHub Pull Request management with Slack and using Alarms.
-            </p>
-
-            <h5>Serverless Message Archiver To Object Storage (MATOS) Sample Application</h5>
-            <p style="padding-left: 2em;">
-                <a href="https://github.com/apache/incubator-openwhisk-sample-matos/blob/master/README.md">incubator-openwhisk-sample-matos</a>
-                demonstrates an implementation of a simple pipeline that reads messages from a Message Hub topic and archives them in batches into an Object Storage folder.
-            </p>
-
-            <h5>Slackbot for OpenWhisk:</h5>
-            <p style="padding-left: 2em;">
-                <a href="https://github.com/apache/incubator-openwhisk-sample-slackbot/blob/master/README.md">incubator-openwhisk-sample-slackbot</a>
-                a proof-of-concept Slackbot to invoke OpenWhisk actions.
-            </p>
-
-            <h5>openwhisk-slackinvite:</h5>
-            <p style="padding-left: 2em;">
-                <a href="https://github.com/apache/incubator-openwhisk-slackinvite/blob/master/README.md">incubator-openwhisk-slackinvite</a>
-                implements invitations for Apache OpenWhisk Slack Community.
-            </p>
-        </div>
-    </main>
-
-    <main id="doc">
-        <div class="content">
-            <a class="indexable" id="tutorial_and_workshop"></a>
-            <h4>Tutorial and Workshop</h4>
-            <p></p>
-            <h5>OpenWhisk Tutorial</h5>
-            <p style="padding-left: 2em;">
-                <a href="https://github.com/apache/incubator-openwhisk-tutorial/blob/master/README.md">incubator-openwhisk-tutorial</a>
-                contains an interactive tutorials for the OpenWhisk CLI.
-            </p>
-
-            <h5>OpenWhisk Workshop</h5>
-            <p style="padding-left: 2em;">
-                <a href="https://github.com/apache/incubator-openwhisk-workshop/blob/master/README.md">incubator-openwhisk-workshop</a>
-                provides a series of exercises to help you understand how to use OpenWhisk to build serverless applications.
-            </p>
-        </div>
-    </main>
-
-    <main id="doc">
-        <div class="content">
-            <a class="indexable" id="development_tools"></a>
-            <h4>Development Tools</h4>
-            <p></p>
-            <h5>The OpenWhisk Debugger</h5>
-            <p style="padding-left: 2em;">
-                <a href="https://github.com/apache/incubator-openwhisk-debugger/blob/master/client/README.md">incubator-openwhisk-debugger</a>
-                supports debugging OpenWhisk actions. The debugger will arrange things so that the actions you wish to debug will be offloaded from the main OpenWhisk servers
-                and instead run locally on your laptop. You can then, from within the debugger, inspect and modify values.
-            </p>
-        </div>
-    </main>
-
-    <!-- Contributors Section -->
-    <main id="doc">
-        <div class="content">
-            <a class="indexable" id="contributors"></a>
-            <h2>Contributors</h2>
-            <p>This section lists a number of resources for OpenWhisk Contributors:</p>
-            <ul>
-                <li><a href="https://cwiki.apache.org/confluence/display/OPENWHISK/OpenWhisk+Project+Wiki#OpenWhiskProjectWiki-how-to-contribute">How to contribute?</li>
-                <li><a href="https://cwiki.apache.org/confluence/display/OPENWHISK/OpenWhisk+Project+Wiki#OpenWhiskProjectWiki-becoming-a-contributor">How do I become a Contributor or Committer?</li>
-                <li><a href="https://cwiki.apache.org/confluence/display/OPENWHISK/Proposals">Proposals (Designs)</a></li>
-                <li><a href="https://cwiki.apache.org/confluence/display/OPENWHISK/Presentations%2C+Meeting+Notes+and+Transcripts">Meeting Notes and Transcripts</a></li>
-                <li><a href="https://cwiki.apache.org/confluence/display/OPENWHISK/Processes">Processes</a></li>
-                <li><a href="https://cwiki.apache.org/confluence/display/OPENWHISK/Project+Status">Project Status</a></li>
-                <li><a href="https://github.com/apache/incubator-openwhisk/issues">Report Bugs or Request Features</a></li>
-                <li><a href="https://github.com/apache/incubator-openwhisk-release#apache-openwhisk-project-release-management">Project Release Management</a></li>
-            </ul>
-        </div>
-    </main>
-
-    <!-- Other Resources Section -->
-    <main id="doc">
-        <div class="content">
-            <a class="indexable" id="other-resources"></a>
-            <h2>Other Resources</h2>
-            <ul>
-                <li><a href="events.html">Events</a> - list of past OpenWhisk events</li>
-                <li><a href="https://github.com/apache/incubator-openwhisk-external-resources#awesome-openwhisk--">Awesome OpenWhisk</a>
-                    - list of OpenWhisk resources and tips including articles, books, videos, presentations, podcasts, etc.</li>
-            </ul>
-        </div>
-    </main>
-</section>
-</div>
diff --git a/_layouts/downloads.html b/_layouts/downloads.html
index cd2c510..7fdd2b6 100644
--- a/_layouts/downloads.html
+++ b/_layouts/downloads.html
@@ -1,82 +1,19 @@
 ---
 layout: default
 ---
-<!--
-# Licensed to the Apache Software Foundation (ASF) under one or more contributor
-# license agreements; and to You under the Apache License, Version 2.0.
--->
-<div id="whiskIndexedLayout">
-
-    <!-- Community Index -->
-    <div id="whiskIndex">
-        <ul>
-            <li><a href="#downloads">Downloads</a></li>
-
-            <!-- Versioning -->
-            <li><a href="#versioning">Versioning</a></li>
-
-            <!-- Downloads -->
-            <li class="collapsible-toggle"><a href="#releases">Releases</a></li>
-            <ul class="collapse-content">
-                <li><a href="#verifying">Verifying</a></li>
-                <li><a href="#keys">Keys</a></li>
-                <li><a href="#versions">Versions</a></li>
-            </ul>
-        </ul>
+<section class="site-section site-section--gray">
+  <div class="main-content">
+    <h1 class="main-content__title main-content__title--no-margin">{{ page.title }}</h1>
+    <p class="main-content__lede">
+      {{ page.lede }}
+    </p>
+  </div>
+</section>
+
+<section class="site-section">
+  <div class="main-content">
+    <div class="main-content__body-content">
+      {{ content }}
     </div>
-
-    <section id="whiskNodes">
-
-        <div class="content">
-          <a class="indexable" id="downloads"></a>
-          <h2>Downloads</h2>
-          <div class="collapsible-content">
-            <p>This page contains links to the official project source code downloads by release.</p>
-          </div>
-        </div>
-
-        <main id="doc">
-            <div class="content">
-                <a class="indexable" id="versioning"></a>
-                <h3>Versioning</h3>
-                <p>Apache OpenWhisk uses semantic versioning. Version numbers use the form <code>major.minor.incremental-build</code> and are incremented as follows:</p>
-                    <ul>
-                        <li><em>major version</em>: for incompatible API changes.</li>
-                        <li><em>minor version</em>: for new functionality added in a backward-compatible manner.</li>
-                        <li><em>incremental version</em>: for forward-compatible bug fixes.</li>
-                        <li><em>build</em>: optional postfix to distinguish intermediate builds.</li>
-                    </ul>
-            </div>
-        </main>
-
-        <main id="doc">
-            <div class="content">
-                <a class="indexable" id="releases"></a>
-                <h3>Releases</h3>
-                <a class="indexable" id="verifying"></a>
-                <h4>Verifying</h4>
-                <p>As an Apache project, all downloaded files are signed by a project Release Manager and can be verified following these instructions:</p>
-                <ul>
-                    <li><a href="https://www.apache.org/info/verification">How to verify downloaded files</a></li>
-                </ul>
-
-                <a class="indexable" id="keys"></a>
-                <h4>Keys</h4>
-                <p>You can access the <a href="https://www.apache.org/dist/incubator/openwhisk/KEYS">Release Keys</a> to verify the release artifacts.</p>
-
-                <a class="indexable" id="versions"></a>
-                <h4>Versions</h4>
-                <p>The following release versions are available:</p>
-                <div style="padding-top:10px;">
-                    <h5>0.9.0-incubating (2018-07-17)</h5>
-                    <ul>
-                        <li><em>source code</em>: <a href="https://www.apache.org/dyn/closer.lua?filename=incubator/openwhisk/apache-openwhisk-0.9.0-incubating/openwhisk-0.9.0-incubating-sources.tar.gz&action=download">openwhisk-0.9.0-incubating-sources.tar.gz</a></li>
-                        <li><em>SHA-512 checksum</em>: <a href="https://www.apache.org/dist/incubator/openwhisk/apache-openwhisk-0.9.0-incubating/openwhisk-0.9.0-incubating-sources.tar.gz.sha512">openwhisk-0.9.0-incubating-sources.tar.gz.sha512</a></li>
-                        <li><em>PGP signature</em>: <a href="https://www.apache.org/dist/incubator/openwhisk/apache-openwhisk-0.9.0-incubating/openwhisk-0.9.0-incubating-sources.tar.gz.asc">openwhisk-0.9.0-incubating-sources.tar.gz.asc</a></li>
-                    </ul>
-                </div>
-            </div>
-        </main>
-
-    </section>
-</div>
+  </div>
+</section>
diff --git a/_layouts/events.html b/_layouts/events.html
index 6908b7b..4c59141 100644
--- a/_layouts/events.html
+++ b/_layouts/events.html
@@ -1,26 +1,19 @@
 ---
 layout: default
 ---
-<section id="whiskHeader" class="light-text bot-bar">
-  <main>
-      <div>
-      </div>
-  </main>
+<section class="site-section site-section--gray">
+  <div class="main-content">
+    <h1 class="main-content__title main-content__title--no-margin">{{ page.title }}</h1>
+    <p class="main-content__lede">
+      {{ page.lede }}
+    </p>
+  </div>
 </section>
 
-<section id="whiskNodes">
-  <main id="doc">
-    <div class="content">
-      <h2>{{ page.title }}</h2>
-      <p>
-        This event archive is maintained here to refer to the list of past events and access its content.
-      </p>
-    </div>
-  </main>
-  
-  <main id="doc">
-    <div class="content">
+<section class="site-section">
+  <div class="main-content">
+    <div class="main-content__events">
       {{ content }}
     </div>
-  </main>
+  </div>
 </section>
diff --git a/_layouts/home.html b/_layouts/home.html
index 2850beb..f1f9e12 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -1,136 +1,230 @@
 ---
 layout: default
 ---
-<!--
-# Licensed to the Apache Software Foundation (ASF) under one or more contributor
-# license agreements; and to You under the Apache License, Version 2.0.
--->
-<section id="whiskHeader" class="light-text bot-bar">
-    <main>
-        <div>
-            <h1>Open Source Serverless Cloud Platform</h1>
-            <h5>Executes functions in response to events at any scale</h5>
-        </div>
-    </main>
+
+<section class="site-section site-section--gradient">
+  <div class="main-cta">
+    <div class="main-cta__lede">
+      <p class="main-cta__text">
+        <strong class="main-cta__strong">Apache OpenWhisk</strong> (Incubating) is a
+        <a class="main-cta__link"
+           href="{{ site.github.url }}/serverless">serverless</a>,
+        <strong class="main-cta__strong">open source</strong> cloud platform
+        that executes functions in
+        <strong class="main-cta__strong">response to events</strong> at any
+        scale.
+      </p>
+      <a class="main-cta__button u-button"
+         href="https://github.com/apache/incubator-openwhisk/tree/master/docs#getting-started-with-openwhisk">
+        Get Started
+      </a>
+    </div>
+    <div class="main-cta__graphic main-cta__graphic--stick-to-top">
+      <img class="main-cta__illustration"
+           src="{{ site.github.url }}/images/illustration-openwhisk.svg"
+           alt="Illustration: How Apache OpenWhisk Works">
+    </div>
+  </div>
 </section>
 
-<section id="whiskNodes">
-    <main>
-        <div class="content">
-            <h4>What is Apache OpenWhisk?</h4>
-            <p>
-                Apache OpenWhisk (Incubating) is an open source, distributed <a href="https://en.wikipedia.org/wiki/Serverless_computing" style="font-weight:bold">Serverless</a> platform that executes functions (<span style="font-family:Times New Roman,Georgia,Serif">fx</span>) in response to events at any scale. OpenWhisk manages the infrastructure, servers and scaling using Docker containers so you can focus on building amazing and efficient applications.
-            </p>
-            <p>
-                The OpenWhisk platform supports a programming model in which developers write functional logic (called <a href="https://github.com/apache/incubator-openwhisk/blob/master/docs/actions.md"><span style="font-weight:bold">Actions</span></a>), in any supported programming language, that can be dynamically scheduled and run in response to associated events (via <a href="https://github.com/apache/incubator-openwhisk/blob/master/docs/triggers_rules.md"><span style="font-weight:bo [...]
-            </p>
-            <a class="button" href="{{ site.github.url }}/documentation.html#openwhisk_deployment">Create Your Local Playground</a>
-        </div>
-        <div class="image-wrapper">
-            <img src="{{ site.github.url }}/images/elements/OW-Abstract Architecture Diagram.png" alt="Events trigger the Apache OpenWhisk platform to run Actions or functions in various supported languages."/>
-        </div>
-    </main>
+<section class="site-section site-section--blue">
+  <div class="where-to-start">
+    <div class="where-to-start__animation">
+      <img class="where-to-start__image"
+           src="{{ site.github.url }}/images/apache-openwhisk-action-animation.gif"
+           alt="Get started with Apache OpenWhisk">
+    </div>
+    <div class="where-to-start__text">
+      <h2 class="where-to-start__heading">
+        Where to start.
+      </h2>
+      <p class="where-to-start__lede">
+        With Apache OpenWhisk you can easily create actions, test, connect to other
+        actions or debug them. Use the
+        <a class="where-to-start__link"
+           href="https://github.com/apache/incubator-openwhisk/blob/master/docs/cli.md#openwhisk-cli">
+          Apache OpenWhisk CLI
+        </a>,
+        target your Apache OpenWhisk instance, and run your first action in seconds.
+      </p>
+    </div>
+  </div>
+</section>
 
-    <main>
-        <div class="image-wrapper">
-            <img src="{{ site.github.url }}/images/deployments/OW-Deployments.png" alt="Apache OpenWhisk can deploy on your favorite Cloud container framework."/>
-        </div>
-        <div class="content">
-            <h4>Deploys anywhere</h4>
-            <p>
-                Since Apache OpenWhisk builds its components using containers it easily supports many deployment options both locally and within Cloud infrastructures. Options include many of today's popular Container frameworks such as <a style="font-weight:bold" href="https://github.com/apache/incubator-openwhisk-deploy-kube/blob/master/README.md">Kubernetes</a>, <a style="font-weight:bold" href="https://github.com/apache/incubator-openwhisk-deploy-mesos/blob/master/README.md">Mesos</a [...]
-            </p>
-        </div>
-    </main>
+<!--
+<section class="site-section site-section--ultralight-blue">
+  <div class="main-content main-content--center">
+    <h2 class="main-content__heading">
+      Video Title
+    </h2>
+    <div class="main-content__video u-embed-container">
+      <iframe width="560" height="315"
+              src="https://www.youtube.com/embed/enk45wEQHzI"
+              frameborder="0" allowfullscreen></iframe>
+    </div>
+  </div>
+</section>
+-->
 
-    <main>
-        <div class="content">
-            <h4>Write functions in any language</h4>
-            <!-- Possible text addition: "bundle larger or complex dependencies, and tailor the runtime environment to suite your needs."" -->
-            <p>
-                Work with what you know and love. Code in your favorite languages such as
-                <b><a href="https://github.com/apache/incubator-openwhisk-runtime-nodejs">NodeJS</a></b>,
-                <b><a href="https://github.com/apache/incubator-openwhisk-runtime-swift">Swift</a></b>,
-                <b><a href="https://github.com/apache/incubator-openwhisk-runtime-java">Java</a></b>,
-                <b><a href="https://github.com/apache/incubator-openwhisk-runtime-go">Go</a></b>,
-                <b><a href="https://github.com/apache/incubator-openwhisk-runtime-java">Scala</a></b>,
-                <b><a href="https://github.com/apache/incubator-openwhisk-runtime-python">Python</a></b>,
-                <b><a href="https://github.com/apache/incubator-openwhisk-runtime-php">PHP</a></b>.  If you need languages or libraries the current "out-of-the-box" runtimes do not support, you can create and customize your own executables as Zip Actions which run on the <b><a href="https://github.com/apache/incubator-openwhisk-runtime-docker/blob/master/README.md">Docker</a></b> runtime by using the <a href="https://github.com/apache/incubator-openwhisk-runtime-docker/blob/master/sdk/do [...]
-            </p>
-            <a class="button" href="{{ site.github.url }}/documentation.html#nodejs">Create Your First Action</a>
-        </div>
-        <div class="image-wrapper">
-                <img src="{{ site.github.url }}/images/runtimes/OW-Runtimes.png" alt="Node Runtime"/>
-        </div>
-    </main>
+<section class="site-section">
+  <div class="quotes quotes--compact">
+    <blockquote id="quote1" class="quotes__quote">
+      <div class="quotes__text quotes__text--compact">
+        <p>
+          “Thanks to serverless computing we can go even further. The new world
+          needs to be asynchronous and elastic by design, and OpenWhisk provides
+          the features that we need.”
+        </p>
+        <p class="quotes__attribution quotes__attribution--compact">
+          – Luis Enriquez,
+            Head of Platform Engineering &amp; Architecture at Santander Group
+        </p>
+      </div>
+    </blockquote>
+  </div>
+</section>
 
-    <main>
-        <div class="image-wrapper">
-            <img src="{{ site.github.url }}/images/elements/illustration-integrators.png" alt="Apache OpenWhisk benefits for package creators"/>
-        </div>
-        <div class="content">
-            <h4>Integrate easily with many popular services</h4>
-            <p>
-                With Apache OpenWhisk you can easily create actions, test, connect to other
-                actions or debug them. Use the
-                <a href="documentation.html#using-openwhisk">wsk CLI</a>,
-                target your Apache OpenWhisk instance, and run your first action in seconds.
-            </p>
-            <p>
-                Apache OpenWhisk makes it simple for thousands of developers to
-                integrate with your service. Make it easy for developers to perform
-                actions when something happens in your service, or to send data into
-                your service when things happen somewhere else.
-            </p>
-        </div>
-    </main>
+<section class="site-section site-section--gray site-section--vertical-padding">
+  <ul class="why-are-we-here">
+    <li class="why-are-we-here__card">
+      <a class="why-are-we-here__section-link why-are-we-here__section-link--developers"
+         href="{{ site.github.url }}#developers">
+        How do I use Apache OpenWhisk?
+      </a>
+    </li>
+    <li class="why-are-we-here__card">
+      <a class="why-are-we-here__section-link why-are-we-here__section-link--service-integrations"
+         href="{{ site.github.url }}#service-integrations">
+        How do I integrate my service with Apache OpenWhisk?
+      </a>
+    </li>
+    <li class="why-are-we-here__card">
+      <a class="why-are-we-here__section-link why-are-we-here__section-link--contributors"
+         href="{{ site.github.url }}#contributors">
+        How can I contribute to Apache OpenWhisk?
+      </a>
+    </li>
+  </ul>
+</section>
 
-    <main>
-        <div class="content">
-            <h4>Combine your functions into rich compositions</h4>
-            <p>
-                Code in different languages like JavaScript/NodeJS, Swift, Python,
-                Java or run custom logic by packaging code with Docker.
-                Invoke your code synchronously, asynchronously, or on a schedule.
-                Use higher-level programming constructs like sequences to declaratively
-                chain together multiple actions.
-                Use parameter binding to avoid hardcoding service credentials in your code.
-                And also, debug your code in realtime using variety of
-                <a href="documentation.html/#development_tools">Development Tools</a>.
-            </p>
+<section class="site-section site-section--vertical-padding"
+         id="developers">
+  <div class="persona">
+    <div class="persona__text">
+      <h2 class="persona__heading">Focus only on your code.</h2>
+      <p class="persona__lede">
+        As a developer there's no need to manage the servers that run your code.
+        Apache OpenWhisk operates and scales your application for you.
+        Spend your time innovating, not configuring infrastructure. Plus,
+        you only pay for what your app uses and needs at that moment.
+      </p>
+      <div class="persona__columns persona__columns--more-top-margin">
+        <div class="persona__column">
+          <h3 class="persona__sub-heading">
+            Fine-grained resource consumption
+          </h3>
+          <img class="persona__benefit-image"
+               src="{{ site.github.url }}/images/illustration-cost-effective.svg"
+               alt="Apache OpenWhisk is cost-effective for developers">
+          <p class="persona__benefit-text">
+            Pay only for the actual resources your actions use, down to the
+            millisecond. When an action is not running, it’s not in memory, so
+            you don’t pay for idle resources.
+          </p>
         </div>
-        <div class="image-wrapper">
-            <img src="{{ site.github.url }}/images/elements/illustration-developers-flexible.png" alt="Apache OpenWhisk is integrates with many popular languages and apps"/>
+        <div class="persona__column">
+          <h3 class="persona__sub-heading">
+            Use any language, any service
+          </h3>
+          <img class="persona__benefit-image"
+               src="{{ site.github.url }}/images/illustration-languages-and-integrations.svg"
+               alt="Apache OpenWhisk is integrates with many popular languages and apps">
+          <p class="persona__benefit-text">
+            Work with what you know and love. Integrate popular services. Code in your
+            favorite languages. All the pieces connect and are easy to extend.
+          </p>
         </div>
-    </main>
+      </div>
+    </div>
+    <div class="persona__cta">
+      <img class="persona__illustration"
+           src="{{ site.github.url }}/images/persona-developers.svg"
+           alt="Developers">
+      <a class="persona__button u-button u-button--secondary"
+         href="{{ github.site.url }}/developers">
+        Read More
+      </a>
+    </div>
+  </div>
+</section>
 
-    <main>
-        <div class="image-wrapper">
-            <img src="{{ site.github.url }}/images/elements/illustration-cost-effective.png" alt="Apache OpenWhisk scaling and utilization">
+<section class="site-section site-section--gray site-section--vertical-padding"
+         id="service-integrations">
+  <div class="persona">
+    <div class="persona__text">
+      <div class="persona__columns">
+        <div class="persona__column">
+          <img class="persona__benefit-image"
+               src="{{ site.github.url }}/images/illustration-integrators.svg"
+               alt="Apache OpenWhisk benefits for package creators">
         </div>
-        <div class="content">
-              <h4>Scaling Per-Request &amp; Optimal Utilization</h4>
-              <p>
-                  Run your action ten thousand times in a fraction of a second, or once
-                  a week. Action instances scale to meet demand as needed, then disappear.
-                  Enjoy optimal utilization where you don't pay for idle resources.
-              </p>
+        <div class="persona__column">
+          <h2 class="persona__heading">Plug your service into Apache OpenWhisk.</h2>
+          <p class="persona__benefit-text">
+            Apache OpenWhisk makes it simple for thousands of developers to
+            integrate with your service. Make it easy for developers to perform
+            actions when something happens in your service, or to send data into
+            your service when things happen somewhere else.
+          </p>
+          <p class="persona__benefit-text">
+            Become part of a thriving, open source ecosystem. Get your service
+            in the hands of more developers, and make it easier than ever for
+            other providers to integrate with your services.
+          </p>
         </div>
-    </main>
+      </div>
+    </div>
+    <div class="persona__cta">
+      <img class="persona__illustration"
+           src="{{ site.github.url }}/images/persona-integrators.svg"
+           alt="Developers">
+      <a class="persona__button u-button u-button--secondary"
+         href="{{ github.site.url }}/developers">
+        Read More
+      </a>
+    </div>
+  </div>
+</section>
 
-    <main>
-        <div class="content">
-            <h4>Join a vibrant open source community</h4>
-            <p>
-                Play a critical part in building game-changing cloud technology.
-                Share your actions and triggers with the community, add your service to
-                the Apache OpenWhisk ecosystem, or join the development effort to
-                make Apache OpenWhisk even better.
-            </p>
-            <a class="button" href="{{ site.github.url }}/community.html">Join the OpenWhisk Community</a>
+<section class="site-section site-section--vertical-padding"
+         id="contributors">
+  <div class="persona">
+    <div class="persona__text">
+      <div class="persona__columns">
+        <div class="persona__column">
+          <img class="persona__benefit-image"
+               src="{{ site.github.url }}/images/illustration-contributors.svg"
+               alt="Apache OpenWhisk benefits for open source contributors">
         </div>
-        <div class="image-wrapper">
-            <img style="max-height=174px; max-width:174px" src="{{ site.github.url }}/images/logo/SupportApache-small.png" alt="The Apache OpenWhisk project needs the support of contributors in all areas."/>
+        <div class="persona__column">
+          <h2 class="persona__heading">Join a vibrant open source community.</h2>
+          <p class="persona__benefit-text">
+            Play a critical part in building game-changing cloud technology.
+            Share your actions and triggers with the community, add your service to
+            the Apache OpenWhisk ecosystem, or join the development effort to
+            make Apache OpenWhisk even better.
+          </p>
         </div>
-    </main>
+      </div>
+    </div>
+    <div class="persona__cta">
+      <img class="persona__illustration"
+           src="{{ site.github.url }}/images/persona-contributors.svg"
+           alt="Developers">
+      <a class="persona__button u-button u-button--secondary"
+         href="{{ github.site.url }}/contributors">
+        Read More
+      </a>
+    </div>
+  </div>
 </section>
diff --git a/_layouts/page.html b/_layouts/page.html
new file mode 100644
index 0000000..b850c68
--- /dev/null
+++ b/_layouts/page.html
@@ -0,0 +1,22 @@
+---
+layout: default
+---
+<section class="site-section">
+  <div class="main-content">
+    {% if page.image %}
+      {% assign maybe_protocol = page.image | slice: 0, 4 %}
+      {% if maybe_protocol == 'http' %}
+        {% assign image_url = page.image %}
+      {% else %}
+        {% assign image_url = site.github.url | append: page.image %}
+      {% endif %}
+      <img class="main-content__image main-content__image--float-right"
+           src="{{ image_url }}"
+           alt="{{ page.title }}">
+    {% endif %}
+    <h1 class="main-content__title main-content__title--no-margin">{{ page.title }}</h1>
+    <div class="main-content__body-content">
+      {{ content }}
+    </div>
+  </div>
+</section>
diff --git a/_layouts/slack.html b/_layouts/slack.html
index fabb3ac..48a6be6 100644
--- a/_layouts/slack.html
+++ b/_layouts/slack.html
@@ -10,44 +10,45 @@ layout: default
 <script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
 <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
   crossorigin="anonymous"></script>
-
-<section id="whiskHeader" class="light-text bot-bar">
-    <main>
+<section>
+  <div class="main-content">
+    <div class="main-content__columns">
+      <div class="main-content__column">
+        <div><img src="https://s23.postimg.org/oy3kv2uxn/skitch.png" alt="OpenWhisk plus Slack" style="height: 60px;"> </div>
         <div>
+          <h3>Already a Team member?</h3>
+          <p>click here: <a href="https://openwhisk-team.slack.com/"><b>openwhisk-team.slack.com</b></a></p>
         </div>
-    </main>
-</section>
-
-<section id="whiskNodes">
-    <main id="doc">
-        <div class="content">
-            <h3>Already a Team member?</h3>
-            <p>click here: <a href="https://openwhisk-team.slack.com/"><b>openwhisk-team.slack.com</b></a></p>
-            <h3>If not, join us!</h3>
-            <p>Join the OpenWhisk Community to discuss the project in real-time.</p>
-            <ul style="text-align: left">
-                <li><strong>Talk</strong> to the core devs and the OpenWhisk community.</li>
-                <li><strong>Learn</strong> from others and ask questions.</li>
-                <li><strong>Share</strong> your work and demos.</li>
-            </ul>
-            <form>
-                <div>
-                    <label for="exampleInputEmail2">Email:</label>
-                    <input class="form-control" id="inputEmail" placeholder="jane.doe@example.com" required="" type="email">
-                </div>
-                <button type="button" class="btn btn-primary" style="margin:5px;">Send invitation</button>
-            </form>
-            <p></p>
-            <p>We are a friendly, respectful and inclusive community!</p>
-            <a href="https://openwhisk-team.slack.com/"></a>
-            <p>
-                <i>Code for Slack invite (this page) is on github:</i><br><i> </i><i>
-                <a href="https://github.com/openwhisk/openwhisk-slackinvite" target="blank">https://github.com/openwhisk/openwhisk-slackinvite</a></i>
-            </p>
+        <div>
+          <h3>If not, join us!</h3>
+          <p>Join the OpenWhisk Community to discuss the project in real-time.
+          </p>
+          <ul style="text-align: left">
+            <li><strong>Talk</strong> to the core devs and the OpenWhisk community.
+            </li>
+            <li><strong>Learn</strong> from others and ask questions.</li>
+            <li><strong>Share</strong> your work and demos.</li>
+          </ul>
+          <form>
+            <div> <label for="exampleInputEmail2">Email:</label>
+              <input class="form-control" id="inputEmail" placeholder="jane.doe@example.com" required="" type="email"> </div>
+            <button type="button" class="btn btn-primary" style="margin:
+            5px;">Send invitation</button>
+          </form>
         </div>
-    </main>
+        <div>
+          <p>We are a friendly, respectful and inclusive community!</p>
+        </div>
+        <div><a href="https://openwhisk-team.slack.com/"> </a>
+          <p><i>Code for Slack invite (this page) is on github:</i><br>
+            <i> </i><i><a
+              href="https://github.com/openwhisk/openwhisk-slackinvite"
+              target="blank">https://github.com/openwhisk/openwhisk-slackinvite</a></i></p>
+        </div>
+      </div>
+    </div>
+  </div>
 </section>
-
 <script type="text/javascript">
   $(document).ready(function () {
     var btn = $("button");
diff --git a/_layouts/supporters.html b/_layouts/supporters.html
new file mode 100644
index 0000000..49a79cf
--- /dev/null
+++ b/_layouts/supporters.html
@@ -0,0 +1,153 @@
+---
+layout: default
+---
+<section class="site-section site-section--gray">
+  <div class="main-content">
+    <h1 class="main-content__title main-content__title--no-margin">{{ page.title }}</h1>
+    <div class="main-content__body-content main-content__body-content--supporters">
+      {{ content }}
+    </div>
+  </div>
+</section>
+
+<section class="site-section">
+  <div class="main-content">
+    <div class="main-content__columns">
+      <div class="main-content__column main-content__column--3-across main-content__column--gray-light">
+        <a href="https://www.abilisense.com/" target="_blank">
+          <img class="main-content__image main-content__image--no-margin"
+               src="{{ site.github.url }}/images/supporter/abilisense.png"
+               srcset="{{ site.github.url }}/images/supporter/abilisense.png 1x,
+                       {{ site.github.url }}/images/supporter/abilisense@2x.png 2x"
+               alt="Abilisense supports Apache Openwhisk">
+        </a>
+      </div>
+      <div class="main-content__column main-content__column--3-across main-content__column--gray-light">
+        <a href="https://www.adobe.io/" target="_blank">
+          <img class="main-content__image main-content__image--no-margin"
+               src="{{ site.github.url }}/images/supporter/adobe.png"
+               srcset="{{ site.github.url }}/images/supporter/adobe.png 1x,
+                       {{ site.github.url }}/images/supporter/adobe@2x.png 2x"
+               alt="Adobe supports Apache OpenWhisk">
+        </a>
+      </div>
+      <div class="main-content__column main-content__column--3-across main-content__column--gray-light">
+        <a href="http://advisorconnect.co/" target="_blank">
+          <img class="main-content__image main-content__image--no-margin"
+               src="{{ site.github.url }}/images/supporter/advisorconnect.png"
+               srcset="{{ site.github.url }}/images/supporter/advisorconnect.png 1x,
+                       {{ site.github.url }}/images/supporter/advisorconnect@2x.png 2x"
+               alt="Advisor Connect supports Apache OpenWhisk">
+        </a>
+      </div>
+      <div class="main-content__column main-content__column--3-across main-content__column--gray-light">
+        <a href="https://www.altoros.com/" target="_blank">
+          <img class="main-content__image main-content__image--no-margin"
+               src="{{ site.github.url }}/images/supporter/altoros.png"
+               srcset="{{ site.github.url }}/images/supporter/altoros.png 1x,
+                       {{ site.github.url }}/images/supporter/altoros@2x.png 2x"
+               alt="Altoros supports Apache OpenWhisk">
+        </a>
+      </div>
+      <div class="main-content__column main-content__column--3-across main-content__column--gray-light">
+        <a href="https://www.apache.org/" target="_blank">
+          <img class="main-content__image main-content__image--no-margin"
+               src="{{ site.github.url }}/images/supporter/apache.png"
+               srcset="{{ site.github.url }}/images/supporter/apache.png 1x,
+                       {{ site.github.url }}/images/supporter/apache@2x.png 2x"
+               alt="Apache OpenWhisk is part of the Apache Incubator">
+        </a>
+      </div>
+      <div class="main-content__column main-content__column--3-across main-content__column--gray-light">
+        <a href="http://articoolo.com/" target="_blank">
+          <img class="main-content__image main-content__image--no-margin"
+               src="{{ site.github.url }}/images/supporter/articoolo.png"
+               srcset="{{ site.github.url }}/images/supporter/articoolo.png 1x,
+                       {{ site.github.url }}/images/supporter/articoolo@2x.png 2x"
+               alt="Articoolo supports Apache OpenWhisk">
+        </a>
+      </div>
+      <div class="main-content__column main-content__column--3-across main-content__column--gray-light">
+        <a href="http://bigvu.tv/" target="_blank">
+          <img class="main-content__image main-content__image--no-margin"
+               src="{{ site.github.url }}/images/supporter/bigvu.png"
+               srcset="{{ site.github.url }}/images/supporter/bigvu.png 1x,
+                       {{ site.github.url }}/images/supporter/bigvu@2x.png 2x"
+               alt="BigVU supports Apache OpenWhisk">
+        </a>
+      </div>
+      <div class="main-content__column main-content__column--3-across main-content__column--gray-light">
+        <a href="https://greenq.gq/" target="_blank">
+          <img class="main-content__image main-content__image--no-margin"
+               src="{{ site.github.url }}/images/supporter/greenq.png"
+               srcset="{{ site.github.url }}/images/supporter/greenq.png 1x,
+                       {{ site.github.url }}/images/supporter/greenq@2x.png 2x"
+               alt="GreenQ supports Apache OpenWhisk">
+        </a>
+      </div>
+      <div class="main-content__column main-content__column--3-across main-content__column--gray-light">
+        <a href="https://www.mashape.com/" target="_blank">
+          <img class="main-content__image main-content__image--no-margin"
+               src="{{ site.github.url }}/images/supporter/kong.png"
+               srcset="{{ site.github.url }}/images/supporter/kong.png 1x,
+                       {{ site.github.url }}/images/supporter/kong@2x.png 2x"
+               alt="Kong supports Apache OpenWhisk">
+        </a>
+      </div>
+      <div class="main-content__column main-content__column--3-across main-content__column--gray-light">
+        <a href="https://www.magentiq.com/" target="_blank">
+          <img class="main-content__image main-content__image--no-margin"
+               src="{{ site.github.url }}/images/supporter/magentiq.png"
+               srcset="{{ site.github.url }}/images/supporter/magentiq.png 1x,
+                       {{ site.github.url }}/images/supporter/magentiq@2x.png 2x"
+               alt="Magentiq Eye supports Apache OpenWhisk">
+        </a>
+      </div>
+      <div class="main-content__column main-content__column--3-across main-content__column--gray-light">
+        <a href="http://www.nepente.io/en/" target="_blank">
+          <img class="main-content__image main-content__image--no-margin"
+               src="{{ site.github.url }}/images/supporter/nepente.png"
+               srcset="{{ site.github.url }}/images/supporter/nepente.png 1x,
+                       {{ site.github.url }}/images/supporter/nepente@2x.png 2x"
+               alt="Nepente supports Apache OpenWhisk">
+        </a>
+      </div>
+      <div class="main-content__column main-content__column--3-across main-content__column--gray-light">
+        <a href="https://www.neuroapplied.com/" target="_blank">
+          <img class="main-content__image main-content__image--no-margin"
+               src="{{ site.github.url }}/images/supporter/neuroapplied.png"
+               srcset="{{ site.github.url }}/images/supporter/neuroapplied.png 1x,
+                       {{ site.github.url }}/images/supporter/neuroapplied@2x.png 2x"
+               alt="NeuroApplied supports Apache OpenWhisk">
+        </a>
+      </div>
+      <div class="main-content__column main-content__column--3-across main-content__column--gray-light">
+        <a href="https://www.redhat.com/en" target="_blank">
+          <img class="main-content__image main-content__image--no-margin"
+               src="{{ site.github.url }}/images/supporter/redhat.png"
+               srcset="{{ site.github.url }}/images/supporter/redhat.png 1x,
+                       {{ site.github.url }}/images/supporter/redhat@2x.png 2x"
+               alt="RedHat supports Apache OpenWhisk">
+        </a>
+      </div>
+      <div class="main-content__column main-content__column--3-across main-content__column--gray-light">
+        <a href="http://www.sitespirit.nl/" target="_blank">
+          <img class="main-content__image main-content__image--no-margin"
+               src="{{ site.github.url }}/images/supporter/sitespirit.png"
+               srcset="{{ site.github.url }}/images/supporter/sitespirit.png 1x,
+                       {{ site.github.url }}/images/supporter/sitespirit@2x.png 2x"
+               alt="SiteSpirit supports Apache OpenWhisk">
+        </a>
+      </div>
+      <div class="main-content__column main-content__column--3-across main-content__column--gray-light">
+          <a href="https://wso2.com/" target="_blank">
+            <img class="main-content__image main-content__image--no-margin"
+                 src="{{ site.github.url }}/images/supporter/wso2.png"
+                 srcset="{{ site.github.url }}/images/supporter/wso2.png 1x,
+                         {{ site.github.url }}/images/supporter/wso2@2x.png 2x"
+                 alt="WSO2 supports Apache OpenWhisk">
+          </a>
+      </div>
+    </div>
+  </div>
+</section>
diff --git a/_plugins/remote_markdown.rb b/_plugins/remote_markdown.rb
deleted file mode 100644
index 389c93c..0000000
--- a/_plugins/remote_markdown.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# "THE BEER-WARE LICENSE" (Revision 42):
-# <robin.hahling@gw-computing.net> wrote this file. As long as you retain this
-# notice you can do whatever you want with this stuff. If we meet some day, and
-# you think this stuff is worth it, you can buy me a beer in return.
-# Robin Hahling
-
-require 'net/http'
-
-module Jekyll
-  # Remotely fetch a markdown file.
-  class RemoteMarkdownTag < Liquid::Tag
-    def initialize(tag_name, text, tokens)
-      super
-
-      text.strip!
-      check_protocol(text)
-      uri = URI(text)
-
-      #check_extension(uri.path)
-
-      res = Net::HTTP.get_response(uri)
-      fail 'resource unavailable' unless res.is_a?(Net::HTTPSuccess)
-
-      body = res.body.force_encoding("UTF-8")
-      body.sub! '/<head>(.*)<\/head>/', ''
-      @content = body
-    end
-
-    def render(_context)
-      @content
-    end
-
-    private
-
-    def check_protocol(text)
-      error_message = "remote_markdown: invalid URI given #{text}"
-      fail error_message unless text =~ URI.regexp(%w(http https ftp ftps))
-    end
-
-    def check_extension(path)
-      mdexts = %w(.markdown .mkdown .mkdn .mkd .md)
-      error_message = "remote_markdown: URI file extension not in #{mdexts}"
-      fail error_message unless mdexts.include?(File.extname(path))
-    end
-  end
-end
-
-Liquid::Template.register_tag('remote_markdown', Jekyll::RemoteMarkdownTag)
diff --git a/_scss/_base.scss b/_scss/_base.scss
deleted file mode 100644
index 56f5a22..0000000
--- a/_scss/_base.scss
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * Base stylesheet for small form factors
- */
-
-body {
-    background-color: $color-white;
-}
-
-section, header {
-    padding-left: $full-width-paddingX;
-    padding-right: $full-width-paddingX;
-
-    main {
-        width: $main-width;
-        // !Important.  Home page scrolls horz. without this width constraint (affected by SVG <img> issues)
-        max-width: $media-size-max-width;;
-    }
-}
-
-section, header, footer {
-    main {
-        position: relative;
-        margin: auto;
-    }
-}
-
-section {
-    position: relative;
-    background-color: $color-white;
-}
-
-footer {
-    width: 100%;
-    background-color: $color-blue-dark;
-    padding: $whisk-footer-base-padding-base
-}
-
-// Note: options: white-space: normal|nowrap|pre|pre-line|pre-wrap
-// Note: non-std. options:  white-space: -moz-pre-wrap | -o-pre-wrap;
-pre {
-    white-space: pre;
-    display: inline;
-    margin: 0px;
-}
-
-.header {
-  display: table;
-  background-color: $color-header-bg;
-  position: fixed;
-  z-index: 8888;
-  top: 0;
-  width: 100%;
-  height: $header-height;
-  padding-bottom: 20px;
-
-  // Assure that menu items have white foreground and proper spacing
-  a {
-    color: $color-header-fg;
-    // TODO: explore moving this to an outer div
-    padding: 4px;
-
-    // TODO: explore turning text links into buttons as well
-    border: 2px solid $color-header-icon-border;
-    border-radius: 4px;
-  }
-}
-
-// Note: ideally, we should use table-cell, but using an anchor to display
-// the logo has implication on layout we should look at later
-// Note: the use if !important may be superfluous
-// Note: use of a fixed .PNG seems to be more reliable than .SVG
-// where different browsers tend to stretch SVG despite layout properties
-.header-section-logo {
-    display: table-cell;
-    position: relative;
-    width: $logo-width !important;
-    height: $logo-height !important;
-    border: 0px;
-    padding: 0px;
-    background-color: $color-header-bg-section-logo;
-    background-image: url(/images/apache-openwhisk.png);
-    background-size: $logo-width $logo-height !important;
-    background-repeat: no-repeat;
-    border: none !important;
-    background-position: 50% 50%;
-}
-
-.header-section-text-links {
-    display: table-row-group;
-    background: $color-header-bg-section-menu-text;
-    width: 33%;
-    min-width: 280px;
-    color: white;
-    text-align: center;
-    vertical-align: middle;
-}
-
-// TODO: explore min-width had no effect for some reason...
-.header-section-social-icons {
-    display: table-footer-group;
-    background-color: $color-header-bg-section-menu-icons;
-    width: 33%;
-    vertical-align: middle;
-}
-
-// TODO: change row (div) height to have no padding/margin top and bottom
-.header-row-text-links {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: nowrap;
-    justify-content: center;
-    font-size: 14px;
-    font-weight: 500;
-    letter-spacing: 0.5px;
-}
-
-.header-row-social-icons {
-    display: flex;
-    flex-direction: row-reverse;
-    justify-content: center;
-    padding-left: 10px;
-    padding-right: 10px;
-}
-
-.header-button-icon {
-    flex: 0 0 auto;
-    background-color: $color-header-icon-bg;
-    border: 1px solid $color-header-icon-border;
-    border-radius: 4px;
-    align: center;
-    height: 36px;
-    width: 36px;
-    margin-right: 4px;
-}
-
-.header-text-link {
-    flex: 0 0 auto;
-    background-color: $color-header-icon-bg;
-    margin: 3px;
-}
-
-.header-icon-image {
-   background: $color-header-icon-bg-image;
-   width: 26px;
-   padding: 0px;
-}
-
-// TODO: move sizes to variables.
-.terminal {
-    background: $color-terminal-bg;
-    color: $color-terminal-fg;
-    border: 1px solid $color-terminal-border;
-    font-family: $font-family-code;
-    font-weight: 300;
-    font-size: 14px;
-    line-height: 140%;
-    // top right bottom left
-    padding: 4px 4px 4px 8px;
-    width: 700px;
-    margin-bottom: 10px;
-}
-
-// Header is only shown on the "home" page
-// TODO: add padding to title/tag line for small media
-#whiskHeader {
-    background-color: $color-blue-dark;
-    color: $color-white;
-    text-align: center;
-    padding-top: $whisk-header-base-padding-top;
-    padding-left: 10px;
-    padding-right: 10px;
-    padding-bottom: 10px;
-    margin-bottom: $whisk-nodes-padding-base-Y;
-
-    h1 {
-        font-size: $header-base-h1-font-size;
-        font-weight: $header-base-h1-font-weight;
-        font-style: $header-base-h1-font-style;
-        line-height: $header-base-h1-line-height;
-        margin-bottom: 12px;
-    }
-    h5 {
-        font-size: $header-base-h5-font-size;
-        font-weight: $header-base-h5-font-weight;
-        font-style: $header-base-h5-font-style;
-        line-height: $header-base-h5-line-height;
-        margin-bottom: 4px;
-    }
-
-    h1, h5 {
-        color: $color-white;
-    }
-}
-
-#whiskNodes {
-    // Note: pad only the bottom for each "node" (so we do not double up)
-    padding-bottom: $whisk-nodes-padding-base-Y;
-    padding-left: $whisk-nodes-padding-base-X;
-    padding-right: $whisk-nodes-padding-base-X;
-
-    main {
-        display: table;
-        background: $color-bg-base-main;
-        margin-bottom: $whisk-nodes-padding-base-Y;
-    }
-    .content {
-        background: $color-bg-base-content;
-        // Provide for space around content's text
-        padding: $whisk-nodes-main-content-padding-base;
-        // TODO: ????
-        height: 100%;
-
-        // Provide a space between image and content when vertical
-        margin-top: 20px;
-    }
-    .image-wrapper {
-        background: $color-bg-base-image-wrapper;
-        display: table-header-group;
-
-        // NOTE: margin ONLY works in horz. layout and has no impact in vert. layout
-        // margin: (top right bottom left)
-        margin: $main-image-wrapper-margin-base;
-
-        // NOTE: SVG files and the <img> tags do not work well together
-        // Important! without this style, the image will not stretch and display properly
-        img {
-            background: $color-bg-base-img;
-            display: block;
-            width: 100%;
-            height: 100%;
-        }
-    }
-
-    h3 {
-        margin-bottom: $whisk-nodes-h3-margin-bottom;
-    }
-}
-
-#doc {
-    position: relative;
-    overflow: hidden;
-    // TODO: evaluate this value's effect
-    padding-top: 10px;
-    text-align: left;
-}
-
-/*
- * Supporter logos
- */
-
-.flow-columns {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-    margin-bottom: 10px;
-}
-
-.flow-item-container {
-    width: 260px;
-    background: $color-blue-gray-light;
-    margin: 10px;
-}
-
-.flow-item-image {
-    border-image-width: 0px;
-    max-width: 240px;
-    width: 240px;
-}
-
-/*
- * Expandable/Collapsible
- */
-
-.collapsible-toggle {
-    color: $color-menu-collapsible-fg;
-    background-color: $color-menu-collapsible-bg;
-    border: 1px solid $color-menuitem-collapsible-border;
-    cursor: pointer;  // finger shown to let ppl know you can click it
-    width: 100%;
-    outline: none;
-    padding-left: 10px;
-}
-
-.collapsible-toggle:hover {
-    background-color: $color-menu-collapsible-hover-bg;
-}
-
-.collapse-content {
-    padding: 0 18px;
-    display: none;
-    overflow: hidden;
-    background-color: white;
-}
-
-/*
- * Index
- */
-
-// Need to create custom anchors that are aware of our fixed header
-// (i.e., position below it on click)
-a.indexable {
-    display: block;
-    position: relative;
-    // TODO: make a variable
-    top: -100px;
-    visibility: hidden;
-}
-
-#whiskIndexedLayout {
-    display: table;
-    padding-top: $whisk-header-base-padding-top;
-
-    #whiskIndex {
-        vertical-align: top;
-        // position menu relative to header
-        display: float;
-        position: fixed;
-        top: $index-menu-top-offset;
-        left: $index-menu-left-offset;
-        width: $index-menu-width;
-        border: $index-border;
-        z-index: 6888;
-    }
-
-    #whiskNodes {
-       display: table-cell;
-       // Note: we do NOT make left padding for Index in for the 'base' media size (width too small)
-    }
-}
-
-#whiskIndex {
-    // Note: we will turn this off for small/base media, allow other profiles to turn on.
-    display: none;
-    background-color: $color-index-bg;
-    color: $color-index-fg;
-    width: $index-menu-width;
-    // Pad the overall index <ul> (and not all the nested <ul>s)
-    padding: 10px;
-
-    ul {
-        background-color: $color-index-list-bg;
-        font-size: $index-menu-font-size;
-        font-weight: 500;
-
-        //list-style-type: square;
-        //list-style-position: inside;
-        //list-style-image: url('abc.png')
-        //list-style: square inside url("abc.png");
-        list-style-type: none;
-        list-style-position: inside;
-
-        // Override <ul> defaults:
-        // default margin: 16px (top and bottom)
-        // TODO: make variables
-        margin: 0px;
-        padding-left: 10px;
-        padding-right: 0px;
-        padding-top: 2px;
-        padding-bottom: 2px;
-    }
-
-    li {
-        background-color: $color-index-item-bg;
-        border: $index-item-border;
-        font-size: $index-menu-font-size;
-        font-weight: 500;
-        // TODO: make variables
-        padding-left: 4px;
-        padding-top: 2px;
-        padding-bottom: 2px;
-        margin-left: 4px;
-    }
-
-    a {
-        color: $color-index-fg;
-        text-decoration: none;
-    }
-
-    a:visited {color:$color-index-fg;}
-    a:hover {color: $color-index-fg;}
-    a:active {color: $color-index-fg;}
-}
diff --git a/_scss/_desktop.scss b/_scss/_desktop.scss
deleted file mode 100644
index 77fae35..0000000
--- a/_scss/_desktop.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-@media screen and (min-width: $media-size-desktop-start) {
-
-    #whiskNodes{
-        main {
-            background: $color-bg-desktop-main;
-
-            .content {
-                width: $main-content-width-desktop;
-            }
-            .image-wrapper {
-                // Note: the image-wrapper will automatically consume the remaining % (i.e., 40%)
-                // Do NOT set any values here or image scaling will be impacted.
-            }
-        }
-    }
-}
diff --git a/_scss/_reset.scss b/_scss/_reset.scss
deleted file mode 100644
index 965a595..0000000
--- a/_scss/_reset.scss
+++ /dev/null
@@ -1,45 +0,0 @@
-html, body {
-    margin: 0;
-    padding: 0;
-}
-
-input, button {
-    outline: none;
-}
-
-button {
-    cursor: pointer;
-}
-
-a {
-    text-decoration: none;
-}
-
-// TODO: Explore removing these values
-.clear {
-    display: block;
-    clear: both;
-}
-
-//mixins
-@mixin fullScreen {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100vw;
-    height: 100vh;
-}
-
-@mixin pureCenter($left: 50%, $top: 50%) {
-    position: absolute;
-    top: $top;
-    left: $left;
-    transform: translate(-50%, -50%);
-}
-
-@mixin maintain-aspect-ratio($width-factor: 16, $height-factor: 9, $target-width: 80vw, $target-height: 80vh) {
-    width: $target-width;
-    height: $target-width * $height-factor / $width-factor;
-    max-width: $target-height * $width-factor / $height-factor;
-    max-height: $target-height;
-}
diff --git a/_scss/_skin.scss b/_scss/_skin.scss
deleted file mode 100644
index 3d070c0..0000000
--- a/_scss/_skin.scss
+++ /dev/null
@@ -1,104 +0,0 @@
-
-* {
-    box-sizing: border-box;
-    font-family: $font-family-default;
-    background: none;
-    border: 0
-}
-
-body {
-    font-family: $font-family-default;
-}
-
-strong {
-    //color: $color-blue-dark;
-}
-
-h1, h2, h3, h4, h5 {
-    font-weight: $font-weight-bold;
-    //color: $color-blue-dark;
-    margin: 0;
-}
-
-h1 {
-    font-size: $h1-font-size;
-    line-height: $h1-line-height;
-}
-
-h2 {
-    font-size: $h2-font-size;
-    line-height: $h2-line-height;
-}
-
-h3 {
-    font-size: $h3-font-size;
-    line-height: $h3-line-height;
-}
-
-h4 {
-    font-size: $h4-font-size;
-    line-height: $h4-line-height;
-}
-
-h5 {
-    font-size: $h5-font-size;
-    line-height: $h5-line-height;
-}
-
-p, ul, ol, li {
-    font-size: $p-font-size;
-    font-weight: $p-font-weight;
-    line-height: $p-line-height;
-    color: $color-blue-dark-text;
-}
-
-.light-text {
-    clear: both;
-    color: $color-fg-base-light-text;
-    // TODO: make vars.
-    font-size: 11px;
-    font-weight: 300;
-    line-height: 18px;
-}
-
-a {color: $color-anchors }
-a:visited { color: $color-anchors; }
-a:hover {color: $color-anchors;}
-a:active {color: $color-anchors;}
-
-a.button {
-    color: white;
-}
-
-.button {
-    color: $color-white;
-    background-color: $color-blue-dark;
-    border: solid 1px #d0d0d0;
-    border-bottom: solid 3px #b2b1b1;
-    border-radius: 6px;
-    padding: 0 20px;
-    box-shadow: inset 0 0 0 1px #f5f5f5;
-    display: inline-block;
-    font-size: 13px;
-    font-family: $font-family-default;
-    font-weight: 300;
-    line-height: 40px;
-    position: relative;
-    text-align: center;
-    text-decoration: none;
-    text-shadow: 0 1px 0 #fafafa;
-}
-
-.button:hover {
-    background: $color-blue-hover;
-    border: solid 1px #c2c2c2;
-    border-bottom: solid 3px #b2b1b1;
-    box-shadow: inset 0 0 0 1px #efefef;
-}
-
-.button:active {
-    background: #dfdfdf;
-    border: solid 1px #959595;
-    box-shadow: inset 0 10px 15px 0 #c4c4c4;
-    top:2px;
-}
diff --git a/_scss/_tablet.scss b/_scss/_tablet.scss
deleted file mode 100644
index b86e704..0000000
--- a/_scss/_tablet.scss
+++ /dev/null
@@ -1,92 +0,0 @@
-@media screen and (min-width: $media-size-tablet-start) {
-    .header {
-        // TODO: make variables
-        height: $header-height;
-        padding-bottom: 0px;
-        background-position: 10px center;
-        background-size: contain;
-    }
-    .header-section-logo {
-        display: block;
-    }
-    .header-section-text-links {
-        display: table-cell;
-    }
-
-    .header-section-social-icons {
-        display: table-cell;
-    }
-
-    footer {
-        padding: $whisk-footer-base-padding-tablet;
-    }
-
-    #whiskHeader {
-        padding-top: $whisk-header-tablet-padding-top;
-        h1 {
-            font-size: $header-tablet-h1-font-size;
-            font-weight: $header-tablet-h1-font-weight;
-            font-style: $header-tablet-h1-font-style;
-            line-height: $header-tablet-h1-line-height;
-        }
-        h5 {
-            font-size: $header-tablet-h5-font-size;
-            font-weight: $header-tablet-h5-font-weight;
-            font-style: $header-tablet-h5-font-style;
-            line-height: $header-tablet-h5-line-height;
-        }
-
-    }
-
-    // "Turn on" left index in this profile, as we have width to support it
-    #whiskIndexedLayout {
-        padding-top: $whisk-header-tablet-padding-top;
-        // Show the index area
-        #whiskIndex {
-            display: block;
-        }
-
-        // Make room on left for the Index
-        #whiskNodes {
-            display: table-cell;
-            // NOTE: margin does not work here, must use left padding
-            padding-left: $index-menu-width;
-        }
-    }
-
-    #whiskNodes {
-
-        padding-left: $whisk-nodes-padding-tablet-X;
-        padding-right: $whisk-nodes-padding-tablet-X;
-
-        main {
-            clear: both;
-            display: table;
-            background: $color-bg-tablet-main;
-            position: relative;
-
-            .content {
-                display: table-cell;
-                vertical-align: top;
-                position: relative;
-                width: $main-content-width-tablet;
-                padding: $whisk-nodes-main-content-padding-tablet;
-
-                // No top margin needed when content & image-wrapper are horz.
-                margin-top: 0px;
-            }
-            .image-wrapper {
-                // Alter to a 'block' display to get side-by-side layout
-                display: block;
-                position: relative;
-
-                // Note: we have a border in side-by-side layout, but do not in vertical layout.
-                border: $color-bg-tablet-image-wrapper-border;
-            }
-        }
-        h3 {
-            text-align: left;
-            margin-bottom: 18px;
-        }
-    }
-}
diff --git a/_scss/_variables.scss b/_scss/_variables.scss
deleted file mode 100644
index 222628b..0000000
--- a/_scss/_variables.scss
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Layout: Responsive media thresholds
- */
-
-$media-size-tablet-start: 920px;
-$media-size-desktop-start: 1000px;
-$media-size-max-width: 1280px;
-
-// Adjust this value to control spacing around "whiskNodes" sections
-// TODO: only use -Y on "bottom" of each section, rename to "bottom"
-$whisk-nodes-padding-base-Y: 20px;
-$whisk-nodes-padding-base-X: 10px;
-$whisk-nodes-padding-tablet-X: 20px;
-
-// padding: (top, right, bottom, left)
-$whisk-nodes-main-content-padding-base: 10px 10px 10px 10px;
-$whisk-nodes-main-content-padding-tablet: 10px 20px 10px 20px;
-
-// TODO: see if we can eliminate this special case
-$whisk-nodes-h3-margin-bottom: 30px;
-
-/*
- * Layout: Main Content
- */
-
-$main-width: 100%;
-
-// Max width of <main> content elements, overrides 100% in _base.scss
-// Note: the 'image-wrapper' will automatically consume the remaining % for horizontal (block) layout
-$main-content-width-desktop: 60%;
-$main-content-width-tablet: 50%;
-
-// margin: (top, right, bottom, left)
-$main-image-wrapper-margin-base: 10px 10px 10px 10px;
-
-/*
- * Layout: Header
- */
-
-$header-height: 80px;
-
-// Allow for a fixed top banner on all content pages
-$whisk-header-base-padding-top: 168px;
-$whisk-header-tablet-padding-top: $header-height;
-
-/*
- * Layout: Footer
- */
-
-// padding (top-bottom, left-right)
-$whisk-footer-base-padding-base: 20px 20px;
-$whisk-footer-base-padding-tablet: 20px 20px;
-
-/*
- * Layout: Body
- */
-
-$full-width-paddingX: 10px;
-
-/*
- * Layout: Logo
- */
-
-// Note: this is the actual size of the .PNG file which has built-in spacing
-// so we do not need to add any margins/padding/borders.
-$logo-width: 320px;
-$logo-height: 80px;
-
-/*
- * Theme Colors
- */
-
-$color-blue-light: #ebf1f9;
-$color-blue-medium: #88addd;
-$color-blue-dark: #29558f;
-$color-blue-black: #0b1828;
-$color-blue-hover: transparentize($color-blue-dark, 0.94);
-$color-blue-gray-light: #eff2f5;
-$color-blue-gray-medium: #455973;
-$color-blue-gray-dark: #131920;
-$color-blue-gray-light-text: #9da6ab;
-$color-blue-dark-text: #00091a;
-$color-white: #fff;
-
-/*
- * Logo Colors
- */
-
-$color-logo-deeper-steel-blue: #325c80;
-$color-logo-deeper-sky-blue: #5aaafa;
-$color-logo-deeper-sea-green: #008571;
-$color-logo-deeper-aquamarine: #6eedd8;
-
-/*
- * Layout Colors
- */
-
-$color-fg-base-light-text: ghostwhite;
-$color-bg-base-main: white;
-$color-bg-base-image-wrapper: white;
-$color-bg-base-content: ghostwhite;
-$color-bg-base-img: transparent;
-$color-bg-tablet-main: white;
-$color-bg-desktop-main: white;
-
-$color-header-bg: $color-blue-dark;
-$color-header-bg-section-logo: transparent;
-$color-header-bg-section-menu-text: transparent;
-$color-header-bg-section-menu-icons: transparent;
-$color-header-fg: white;
-$color-header-icon-bg: $color-blue-gray-medium;
-$color-header-icon-border: white;
-$color-header-icon-bg-image: transparent;
-
-$color-bg-tablet-image-wrapper-border: 8px solid white;
-
-$color-anchors: #2955d7;
-
-/*
- * Layout Colors (DEBUG)
- */
-/*
-$color-fg-base-light-text: ghostwhite;
-$color-bg-base-main: red;
-$color-bg-base-content: ghostwhite;
-$color-bg-base-image-wrapper: green;
-$color-bg-base-img: yellow;
-$color-bg-tablet-main: magenta;
-$color-bg-desktop-main: darkviolet;
-
-$color-header-bg: gold;
-$color-header-bg-section-logo: darkred;
-$color-header-bg-section-menu-text: forestgreen;
-$color-header-bg-section-menu-icons: midnightblue;
-$color-header-fg: white;
-$color-header-icon-bg: slategray;
-$color-header-icon-border: pink;
-$color-header-icon-bg-image: orange;
-
-$color-bg-tablet-image-wrapper-border: 8px solid $color-logo-deeper-aquamarine;
-*/
-
-/*
- * Fonts
- */
-
-$font-family-default: 'Roboto', sans-serif;
-$font-family-code: "Courier New", Courier, monospace;
-$font-size-default: 14px;
-$font-weight-default: 300;
-$font-weight-bold: 500;
-$line-height-default: 22px;
-
-/*
- * Text
- */
-
-$h1-font-size: 32px;
-$h1-line-height: normal;
-
-$h2-font-size: 28px;
-$h2-line-height: normal;
-
-$h3-font-size: 24px;
-$h3-line-height: 32px;
-
-$h4-font-size: 20px;
-$h4-line-height: 28px;
-
-$h5-font-size: 16px;
-$h5-line-height: 28px;
-
-$p-font-size: $font-size-default;
-$p-font-weight: $font-weight-default;
-$p-line-height: $line-height-default;
-
-/*
- * Header
- */
-
-$header-tablet-h1-font-size: 36px;
-$header-tablet-h1-font-weight: 300;
-$header-tablet-h1-font-style: normal;
-$header-tablet-h1-line-height: 44px;
-
-$header-tablet-h5-font-size: 16px;
-$header-tablet-h5-font-weight: 300;
-$header-tablet-h5-font-style: normal;
-$header-tablet-h5-line-height: 28px;
-
-$header-base-h1-font-size: 32px;
-$header-base-h1-font-weight: $header-tablet-h1-font-weight;
-$header-base-h1-font-style: $header-tablet-h1-font-style;
-$header-base-h1-line-height: 42px;
-
-$header-base-h5-font-size: 14px;
-$header-base-h5-font-weight: $header-tablet-h5-font-weight;
-$header-base-h5-font-style: $header-tablet-h5-font-style;
-$header-base-h5-line-height: $header-tablet-h5-line-height;
-
-/*
- * Index
- */
-
-$index-menu-width: 200px;
-
-// position menu relative to header
-$index-menu-top-offset: $header-height + 18px;
-$index-menu-left-offset: 0px;
-$index-menu-font-size: 10pt;
-
-$color-index-bg: $color-white;
-$color-index-fg: $color-blue-gray-dark;
-$color-index-border: transparent;
-$color-index-list-bg: transparent;
-$color-index-list-border: transparent;
-$color-index-item-bg: transparent;
-$color-index-item-border: transparent;
-
-$index-border: 0px solid $color-index-list-border;
-$index-item-border: 0px solid $color-index-item-border;
-
-/*
- * Expandable/Collapsible (WIP)
- */
-
-$color-menu-collapsible-fg: white;
-$color-menu-collapsible-bg: $color-blue-dark;
-$color-menu-collapsible-hover-bg: $color-blue-gray-medium;
-$color-menuitem-collapsible-border: 1px solid transparent;
-
-/*
- * Terminal
- */
-
-$color-terminal-border: $color-blue-gray-light;
-$color-terminal-bg: #001a33;
-$color-terminal-fg: white;
diff --git a/_scss/block/_main-content.scss b/_scss/block/_main-content.scss
new file mode 100644
index 0000000..76764ea
--- /dev/null
+++ b/_scss/block/_main-content.scss
@@ -0,0 +1,204 @@
+.main-content {
+  max-width: 90%;
+  margin-left: auto;
+  margin-right: auto;
+  padding: 3.5rem 0;
+
+  &--center {
+    text-align: center;
+  }
+
+  @media (min-width: $breakpoint-lg) {
+    max-width: $max-width-lg;
+  }
+
+  &--narrower {
+    @media (min-width: 660px) {
+      max-width: 600px;
+    }
+  }
+
+  &__columns {
+    @media (min-width: $breakpoint-md) {
+      @supports (display: flex) {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        margin-bottom: -3.25rem;
+
+        &--reverse {
+          flex-direction: row-reverse;
+        }
+
+        &--vertical-center {
+          align-items: center;
+        }
+      }
+    }
+  }
+
+  &__column {
+    & + & {
+      margin-top: 2rem;
+    }
+
+    @media (min-width: $breakpoint-md) {
+      @supports (display: flex) {
+        flex: 1;
+        max-width: 48%;
+        margin-bottom: 3.25rem;
+        margin-top: 0;
+
+        & + & {
+          margin-top: 0;
+        }
+
+        &--3-across {
+          max-width: 30%;
+          min-width: 261px;
+        }
+      }
+    }
+
+    &--gray-light {
+      background-color: $color-gray-light;
+    }
+
+    &--centered {
+      text-align: center;
+    }
+  }
+
+  /*
+   * Stuff gets weird in here, because this is where we have to style
+   * Mardown-generated user content.
+   */
+  &__body-content {
+    &--supporters {
+      margin-top: 0.75rem;
+      font-size: 1.125rem;
+    }
+
+    h2 {
+      font-size: 1.75rem;
+    }
+
+    h3 {
+      font-size: 1.5rem;
+    }
+
+    h4 {
+      font-size: 1.25rem;
+    }
+
+    > p:first-child {
+      color: $color-gray-dark;
+      font-size: 1.125rem;
+    }
+
+    /* Nested selectors AND an ID? I’m so sorry... */
+    #markdown-toc {
+      padding-left: 1.25rem;
+
+      a {
+        color: $color-blue-dark-text;
+        font-size: 1.125rem;
+        text-decoration: none;
+
+        &:hover,
+        &:active,
+        &:focus {
+          text-decoration: underline;
+        }
+      }
+    }
+  }
+
+  /* Oh god, there’s more?! */
+  &__events {
+    h2 {
+      color: $color-blue-dark-text;
+      font-size: 1.125rem;
+    }
+
+    h3 {
+      margin-top: 3rem;
+      color: $color-gray-light-text;
+      font-size: 0.875rem;
+      font-weight: $font-weight-bold;
+    }
+
+    h2 + h3 {
+      margin-top: 0.75rem;
+    }
+
+    ul {
+      list-style: none;
+      padding: 0;
+    }
+
+    li {
+      border-bottom: 1px solid transparentize($color-gray-medium, 0.75);
+      font-size: 1.125rem;
+      padding: 1rem 0;
+
+      &:last-child {
+        border-bottom: 0;
+      }
+    }
+  }
+
+  &__title {
+    &:not(:first-child) {
+      margin-top: 0;
+    }
+  }
+
+  &__lede {
+    font-family: $font-family-heading;
+    font-size: 1.75rem;
+  }
+
+  &__text {
+    &--no-top-margin {
+      margin-top: 0;
+    }
+  }
+
+  &__image {
+    display: block;
+    margin: 0 auto 1.5rem;
+
+    @media (min-width: $breakpoint-md) {
+      margin-bottom: 0;
+    }
+
+    &--float-right {
+      @media (min-width: $breakpoint-md) {
+        float: right;
+        margin: 0 0 1rem 3rem;
+      }
+    }
+
+    &--side-by-side {
+      @media (min-width: $breakpoint-md) {
+        display: inline-block;
+        margin-left: auto;
+        margin-right: auto;
+        padding-left: 50px;
+        height: 150px;
+      }
+    }
+  }
+
+  &__video {
+    max-width: 780px;
+    margin-left: auto;
+    margin-right: auto;
+  }
+
+  &__button {
+    width: 100%;
+    max-width: 300px;
+  }
+}
diff --git a/_scss/block/_main-cta.scss b/_scss/block/_main-cta.scss
new file mode 100644
index 0000000..2280f62
--- /dev/null
+++ b/_scss/block/_main-cta.scss
@@ -0,0 +1,107 @@
+.main-cta {
+  max-width: 90%;
+  margin-left: auto;
+  margin-right: auto;
+
+  @media (min-width: 600px) {
+    @supports (display: flex) {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+    }
+  }
+
+  @media (min-width: $breakpoint-lg) {
+    max-width: $max-width-lg;
+  }
+
+  &__graphic {
+    display: none;
+    margin: 1rem 0;
+
+    @supports (display: flex) {
+      flex: 2;
+    }
+
+    &--persona {
+      @media (min-width: 600px) {
+        display: block;
+      }
+
+      @supports (display: flex) {
+        flex: 1;
+      }
+    }
+
+    @media (min-width: 600px) {
+      display: block;
+    }
+
+    @media (min-width: $breakpoint-lg) {
+      margin-top: -0.5rem;
+    }
+  }
+
+  &__illustration {
+    &--overhang {
+      margin: 1rem;
+      margin-right: 0;
+
+      @media (min-width: $breakpoint-lg) {
+        margin-bottom: -5rem;
+      }
+    }
+
+    &--with-min-width {
+      width: 25vw;
+
+      @media (min-width: $breakpoint-lg) {
+        width: 260px;
+      }
+    }
+  }
+
+  &__lede {
+    padding: 2rem 0;
+    color: $color-blue-dark-text;
+    font-family: $font-family-heading;
+    font-size: 1.75rem;
+    line-height: 1.375;
+    text-align: center;
+
+    @media (min-width: 600px) {
+      font-size: 1.25rem;
+      text-align: left;
+
+      @supports (display: flex) {
+        flex: 2;
+      }
+    }
+
+    @media (min-width: $breakpoint-md) {
+      font-size: 1.75rem;
+      text-align: left;
+    }
+
+    &--padded {
+      @media (min-width: $breakpoint-md) {
+        padding-left: 4rem;
+        padding-right: 5rem;
+      }
+    }
+  }
+
+  &__strong {
+    color: inherit;
+    font-weight: $font-weight-bold;
+  }
+
+  &__link {
+    display: inline-block;
+    margin-top: 0;
+    color: inherit;
+    border-bottom: 1px dotted $color-blue-dark-text;
+    line-height: 1;
+    text-decoration: none;
+  }
+}
diff --git a/_scss/block/_persona.scss b/_scss/block/_persona.scss
new file mode 100644
index 0000000..461bfe1
--- /dev/null
+++ b/_scss/block/_persona.scss
@@ -0,0 +1,93 @@
+.persona {
+  max-width: 90%;
+  margin-left: auto;
+  margin-right: auto;
+
+  @media (min-width: $breakpoint-md) {
+    @supports (display: flex) {
+      display: flex;
+      justify-content: space-between;
+    }
+  }
+
+  @media (min-width: $breakpoint-lg) {
+    max-width: $max-width-lg;
+  }
+
+  &__heading {
+    margin-top: 0;
+  }
+
+  &__text {
+    @media (min-width: $breakpoint-md) {
+      @supports (display: flex) {
+        flex: 4;
+        order: 2;
+      }
+    }
+  }
+
+  &__lede {
+    margin-top: 0.5rem;
+  }
+
+  &__columns {
+    @media (min-width: $breakpoint-sm) {
+      @supports (display: flex) {
+        display: flex;
+        justify-content: space-between;
+      }
+    }
+
+    &--more-top-margin {
+      margin-top: 3.75rem;
+    }
+  }
+
+  &__column {
+    &:not(:first-child) {
+      margin-top: 3rem;
+    }
+
+    @media (min-width: $breakpoint-sm) {
+      @supports (display: flex) {
+        flex: 1;
+        max-width: 45%;
+
+        &:not(:first-child) {
+          margin-top: 0;
+        }
+      }
+    }
+  }
+
+  &__benefit-image {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+  }
+
+  &__cta {
+    @media (min-width: $breakpoint-md) {
+      @supports (display: flex) {
+        flex: 1;
+        order: 1;
+        margin-right: 5rem;
+      }
+    }
+  }
+
+  &__illustration {
+    display: none;
+    margin-left: auto;
+    margin-right: auto;
+
+    @media (min-width: $breakpoint-md) {
+      display: block;
+    }
+  }
+
+  &__button {
+    display: block;
+  }
+}
diff --git a/_scss/block/_quotes.scss b/_scss/block/_quotes.scss
new file mode 100644
index 0000000..22de020
--- /dev/null
+++ b/_scss/block/_quotes.scss
@@ -0,0 +1,135 @@
+.quotes {
+  max-width: 90%;
+  margin-left: auto;
+  margin-right: auto;
+  padding: 3rem 0 5rem;
+
+  @at-root .no-js & {
+    height: auto;
+    padding-bottom: 4.5rem;
+  }
+
+  @media (min-width: $breakpoint-md) {
+    padding: 4.5rem 0 7rem;
+  }
+
+  @media (min-width: $breakpoint-lg) {
+    max-width: $max-width-lg;
+  }
+
+  &--js-fader {
+    position: relative;
+    height: 21rem;
+
+    @media (min-width: $breakpoint-md) {
+      height: 27rem;
+    }
+  }
+
+  &--compact {
+    padding: 3.75rem 0;
+  }
+
+  &__quote {
+    width: 100%;
+    margin-top: 0;
+    border: 0;
+    padding: 0;
+    text-align: center;
+
+    &--js-fader {
+      position: absolute;
+      top: 46%;
+      left: 50%;
+      opacity: 0;
+      transform: translate(-50%, -50%);
+      transition: 200ms opacity linear;
+    }
+
+    @at-root .no-js & {
+      position: static;
+      opacity: 1;
+      transform: none;
+
+      &:not(:first-child) {
+        margin-top: 3rem;
+      }
+    }
+
+    &--active {
+      opacity: 1;
+    }
+  }
+
+  &__text {
+    color: $color-blue-dark-text;
+    font-family: $font-family-heading;
+    font-size: 1.375rem;
+    font-weight: $font-weight-black;
+    line-height: 1.25;
+
+    @media (min-width: $breakpoint-md) {
+      font-size: 2.25rem;
+    }
+
+    &--compact {
+      font-size: 1.375rem;
+      font-weight: $font-weight-bold;
+    }
+  }
+
+  &__attribution {
+    color: $color-gray-medium;
+    font-size: 1rem;
+    font-weight: $font-weight-default;
+
+    @media (min-width: $breakpoint-md) {
+      font-size: 1.75rem;
+    }
+
+    &--compact {
+      font-size: 1rem;
+    }
+  }
+
+  &__nav {
+    position: absolute;
+    bottom: 1rem;
+    left: 50%;
+    transform: translateX(-50%);
+    text-align: center;
+
+    @media (min-width: $breakpoint-md) {
+      bottom: 3.25rem;
+    }
+  }
+
+  @at-root .no-js &__nav {
+    display: none;
+  }
+
+  &__nav-link {
+    display: inline-block;
+    width: 1rem;
+    height: 1rem;
+    margin: 0 0.5rem;
+    overflow: hidden;
+    text-indent: -9999px;
+
+    &::before {
+      content: '';
+      display: block;
+      width: 1rem;
+      height: 1rem;
+      background: $color-blue-dark-text;
+      border: 2px solid $color-blue-dark-text;
+      border-radius: 50%;
+      text-indent: 0;
+      transition: 200ms background linear;
+    }
+
+    &--active::before {
+      background: $color-white;
+    }
+  }
+}
diff --git a/_scss/block/_site-footer.scss b/_scss/block/_site-footer.scss
new file mode 100644
index 0000000..f7b879c
--- /dev/null
+++ b/_scss/block/_site-footer.scss
@@ -0,0 +1,36 @@
+.site-footer {
+  margin-top: 0;
+  padding: 0.5rem 0;
+  background-color: $color-blue-dark;
+
+  @media (min-width: $breakpoint-sm) {
+    padding: 0;
+  }
+
+  &__site-disclaimer {
+    @media (min-width: $breakpoint-sm) {
+      @supports (display: flex) {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+      }
+    }
+
+    max-width: $max-width-lg;
+    margin-left: auto;
+    margin-right: auto;
+    padding-bottom: 10px;
+    text-align: center;
+    color: $color-white;
+    background-color: $color-blue-dark;
+    font-size: 0.70rem;
+    font-style: italic;
+    line-height: 1.25;
+
+    &--compact {
+      font-size: 0.50rem;
+      font-weight: $font-weight-bold;
+    }
+  }
+
+}
diff --git a/_scss/block/_site-header.scss b/_scss/block/_site-header.scss
new file mode 100644
index 0000000..92a0400
--- /dev/null
+++ b/_scss/block/_site-header.scss
@@ -0,0 +1,30 @@
+.site-header {
+  margin-top: 0;
+  background-color: $color-white;
+  border-bottom: 1px solid $color-gray-light;
+
+  &__nav {
+    margin-top: 0;
+
+    &--secondary {
+      display: none;
+      background-color: $color-blue-dark;
+
+      @media (min-width: $breakpoint-sm) {
+        display: block;
+      }
+    }
+  }
+
+  @supports (display: flex) {
+    display: flex;
+    flex-direction: column;
+
+    &__nav {
+      flex: 1;
+
+      &--primary { order: 2; }
+      &--secondary { order: 1; }
+    }
+  }
+}
diff --git a/_scss/block/_site-nav.scss b/_scss/block/_site-nav.scss
new file mode 100644
index 0000000..349a1cb
--- /dev/null
+++ b/_scss/block/_site-nav.scss
@@ -0,0 +1,159 @@
+.site-nav {
+  max-width: $max-width-lg;
+  margin: 0 auto;
+  color: $color-blue-dark;
+  font-family: $font-family-heading;
+  font-size: 0.75rem;
+  font-weight: $font-weight-black;
+
+  @media (min-width: $breakpoint-sm) {
+    @supports (display: flex) {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+    }
+  }
+
+  &--social {
+    justify-content: flex-end;
+    padding: 0.125rem 0;
+  }
+
+  &--footer {
+    color: $color-blue-light;
+    text-align: center;
+  }
+
+  &--main {
+    line-height: 2;
+    text-align: center;
+  }
+
+  &__group {
+    display: block;
+    margin-top: 0.75rem;
+    vertical-align: bottom;
+
+    @media (min-width: $breakpoint-sm) {
+      display: inline;
+      margin-top: 0;
+    }
+  }
+
+  &__group  &__item {
+    width: 28px;
+  }
+
+  &__item {
+    display: inline-block;
+    margin-top: 0;
+    padding: 0.25rem;
+    color: inherit;
+    text-decoration: none;
+    vertical-align: middle;
+
+    &:first-child {
+      margin-left: 0;
+    }
+
+    &--main {
+      padding: 0.5rem 0.25rem;
+      line-height: 1.5rem;
+
+      @media (min-width: $breakpoint-sm) {
+        padding: 0.5rem;
+      }
+    }
+
+    &--logo {
+      display: inline-block;
+      max-width: 88px;
+      margin-right: auto;
+      padding: 0.5rem 0.25rem 0.375rem;
+      border-right: 1px solid $color-gray-light;
+      line-height: 1.5;
+
+      @media (min-width: 400px) {
+        max-width: initial;
+        padding-left: 0.75rem;
+        padding-right: 0.75rem;
+      }
+    }
+
+    &--margin-left-auto {
+      margin-left: auto;
+    }
+
+    &--hide-on-small {
+      display: none;
+
+      @media (min-width: $breakpoint-md) {
+        display: block;
+      }
+    }
+
+    // Encapsulates the entire dropdown nav item.
+    &--dropdown {
+      position: relative;
+      display: inline-block;
+      background-color: $color-white;
+      margin: 0;
+      padding: 0;
+
+      // The top level nav item.
+      &-link {
+        padding: 0.5rem 0.25rem;
+        line-height: 1.5rem;
+
+        @media (min-width: $breakpoint-sm) {
+          padding: 0.5rem;
+        }
+
+        cursor: pointer;
+      }
+
+      // The widget that contains the array of links.
+      &-container {
+        display: none;
+        position: absolute;
+        min-width: 160px;
+        margin: 0;
+        padding: 0;
+        //box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
+        z-index: 1;
+      }
+
+      // Same as above, but on hover.
+      &:hover &-container {
+        display: block;
+        background-color: $color-white;
+      }
+
+      // Each of the dropdown links.
+      &-item {
+        color: $color-blue-dark;
+        text-align: left;
+        padding: 4px 4px 4px 10px;
+        text-decoration: none;
+        display: block;
+      }
+    }
+
+    &:hover,
+    &:active,
+    &:focus {
+      background-color: $color-blue-hover;
+      outline: 0;
+    }
+  }
+
+  &--social &__item {
+    width: 28px;
+  }
+
+  &__image {
+    display: inline-block;
+    width: 100%;
+    height: auto;
+  }
+}
diff --git a/_scss/block/_site-section.scss b/_scss/block/_site-section.scss
new file mode 100644
index 0000000..0c6c222
--- /dev/null
+++ b/_scss/block/_site-section.scss
@@ -0,0 +1,37 @@
+.site-section {
+  margin-top: 0;
+
+  &--vertical-padding {
+    padding-bottom: 4.5rem;
+    padding-top: 4.5rem;
+  }
+
+  &--gradient {
+    background-image:
+      linear-gradient(
+        -70deg,
+        $color-gradient-start 20%,
+        $color-gradient-end
+      );
+  }
+
+  &--ultralight-blue {
+    background-color: $color-blue-ultralight;
+  }
+
+  &--light-blue {
+    background-color: $color-blue-ultralight;
+  }
+
+  &--medium-blue {
+    background-color: $color-blue-medium;
+  }
+
+  &--blue {
+    background-color: $color-blue-dark-text;
+  }
+
+  &--gray {
+    background-color: $color-gray-light;
+  }
+}
diff --git a/_scss/block/_where-to-start.scss b/_scss/block/_where-to-start.scss
new file mode 100644
index 0000000..5d02285
--- /dev/null
+++ b/_scss/block/_where-to-start.scss
@@ -0,0 +1,55 @@
+.where-to-start {
+  max-width: 90%;
+  margin-left: auto;
+  margin-right: auto;
+  padding: 2.375rem 0;
+
+  @media (min-width: $breakpoint-md) {
+    @supports (display: flex) {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+
+      &__animation {
+        flex: 2;
+        max-width: 60%;
+      }
+    }
+  }
+
+  @media (min-width: $breakpoint-lg) {
+    max-width: $max-width-lg;
+  }
+
+  &__text {
+    color: $color-white;
+    font-size: 0.875rem;
+
+    @media (min-width: $breakpoint-md) {
+      @supports (display: flex) {
+        flex: 1;
+        max-width: calc(40% - 3.125rem);
+        margin-top: 0;
+      }
+    }
+  }
+
+  &__heading {
+    color: inherit;
+    font-size: 1.75rem;
+  }
+
+  &__lede {
+    margin-top: 0.5rem;
+  }
+
+  &__link {
+    display: inline-block;
+    margin-top: 0;
+    border-bottom: 1px dotted $color-white;
+    color: inherit;
+    font-weight: $font-weight-black;
+    line-height: 1;
+    text-decoration: none;
+  }
+}
diff --git a/_scss/block/_why-are-we-here.scss b/_scss/block/_why-are-we-here.scss
new file mode 100644
index 0000000..9dfe566
--- /dev/null
+++ b/_scss/block/_why-are-we-here.scss
@@ -0,0 +1,109 @@
+.why-are-we-here {
+  max-width: 90%;
+  margin-left: auto;
+  margin-right: auto;
+  list-style: none;
+  padding: 0;
+
+  @media (min-width: $breakpoint-md) {
+    @supports (display: flex) {
+      display: flex;
+      justify-content: space-between;
+    }
+  }
+
+  @media (min-width: 880px) {
+    max-width: 800px;
+  }
+
+  &__card {
+    position: relative;
+    margin-top: 0;
+  }
+
+  &__section-link {
+    display: block;
+    margin-top: 1.5rem;
+    padding: 1rem;
+    background: $color-white;
+    border: 5px solid transparent;
+    color: $color-blue-dark-text;
+    font-size: 1.125rem;
+    font-weight: $font-weight-black;
+    line-height: 1.25rem;
+    text-align: center;
+    text-decoration: none;
+    transition: 150ms all linear;
+    z-index: 2;
+
+    @media (min-width: $breakpoint-md) {
+      min-height: 8.5rem;
+      width: 225px;
+      margin-top: 12rem;
+      padding-top: 3rem;
+
+      @supports (display: flex) {
+        flex: 1;
+      }
+
+      &::before,
+      &::after {
+        content: '';
+        position: absolute;
+        left: 0;
+        width: 100%;
+        background-position: center;
+        background-repeat: no-repeat;
+        background-size: contain;
+      }
+
+      &::before {
+        height: 14rem;
+        top: 0.25rem;
+        transition: 250ms top ease-in-out;
+        z-index: 3;
+      }
+
+      &::after {
+        background-image: url(../images/icon-chevron-down.svg);
+        bottom: 0;
+        height: 1.125rem;
+        opacity: 0;
+        transition: 150ms all ease-in-out;
+        z-index: 0;
+      }
+
+      &--developers::before {
+        background-image: url(../images/persona-developer-torso.svg);
+      }
+
+      &--service-integrations::before {
+        background-image: url(../images/persona-integrator-torso.svg);
+      }
+
+      &--contributors::before {
+        background-image: url(../images/persona-contributor-torso.svg);
+      }
+    }
+
+    @media (min-width: $breakpoint-lg) {
+      width: 250px;
+    }
+
+    &:hover,
+    &:active,
+    &:focus {
+      border-color: $color-blue-dark-text;
+      outline: 0;
+
+      &::before {
+        top: 0;
+      }
+
+      &::after {
+        bottom: -2.25rem;
+        opacity: 1;
+      }
+    }
+  }
+}
diff --git a/_scss/config/_reset.scss b/_scss/config/_reset.scss
new file mode 100644
index 0000000..53a9b52
--- /dev/null
+++ b/_scss/config/_reset.scss
@@ -0,0 +1,33 @@
+html,
+body,
+*,
+::before,
+::after {
+  margin: 0;
+  box-sizing: border-box;
+  text-rendering: optimizeLegibility;
+  -webkit-font-smoothing: antialiased;
+}
+
+html,
+body {
+  margin-top: 0;
+  color: $color-gray-medium;
+  font-family: $font-family-default;
+  font-size: 14px;
+  font-weight: $font-weight-default;
+  line-height: 1.5;
+
+  @media (min-width: $breakpoint-md) {
+    font-size: 16px;
+  }
+}
+
+* + * {
+  margin-top: 1rem;
+}
+
+img {
+  max-width: 100%;
+  height: auto;
+}
diff --git a/_scss/config/_typography.scss b/_scss/config/_typography.scss
new file mode 100644
index 0000000..5814264
--- /dev/null
+++ b/_scss/config/_typography.scss
@@ -0,0 +1,63 @@
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  color: $color-gray-dark;
+  font-family: $font-family-heading;
+  font-weight: $font-weight-black;
+}
+
+h1,
+h2 {
+  color: $color-blue-dark;
+  font-size: 1.75rem;
+  line-height: 1;
+
+  @media (min-width: $max-width-lg) {
+    font-size: 2.25rem;
+  }
+
+  &:not(:first-child) {
+    margin-top: 2rem;
+  }
+}
+
+h3 {
+  color: $color-blue-dark;
+  font-size: 1.5rem;
+  line-height: 1.125;
+
+  &:not(:first-child) {
+    margin-top: 1.5rem;
+  }
+}
+
+blockquote {
+  margin: 3rem 0;
+  border-left: 4px solid $color-green-light;
+  padding-left: 1.25rem;
+  color: $color-gray-dark;
+  font-size: 1.125rem;
+
+  > p:last-child {
+    margin-top: 0;
+
+    > strong:only-child {
+      display: block;
+      color: $color-gray-medium;
+      font-size: 0.875rem;
+      font-weight: $font-weight-default;
+      text-align: right;
+    }
+  }
+}
+
+li {
+  margin-top: 0.25rem;
+}
+
+strong {
+  color: $color-gray-dark;
+}
diff --git a/_scss/config/_variables.scss b/_scss/config/_variables.scss
new file mode 100644
index 0000000..d7711db
--- /dev/null
+++ b/_scss/config/_variables.scss
@@ -0,0 +1,38 @@
+/*
+ * # Sizing
+ */
+$max-width-lg: 940px;
+
+/*
+ * # Colors
+ */
+$color-blue-ultralight: #dcf0ff;
+$color-blue-light: #90e5fd;
+$color-blue-medium: #5aaafa;
+$color-blue-dark-text: #29648f;
+$color-blue-dark: #29558f;
+$color-blue-hover: transparentize($color-blue-dark, 0.94);
+$color-gray-light: #f0f8fd;
+$color-gray-light-text: #9da6ab;
+$color-gray-medium: #3b667d;
+$color-gray-dark: #152934;
+$color-green-light: #6eedd8;
+$color-white: #fff;
+$color-gradient-start: #ccdaff;
+$color-gradient-end: #00fff7;
+
+/*
+ * # Fonts
+ */
+$font-family-heading: 'Lato', sans-serif;
+$font-family-default: sans-serif;
+$font-weight-default: 300;
+$font-weight-bold: 700;
+$font-weight-black: 900;
+
+/*
+ * # Responsive
+ */
+$breakpoint-sm: 480px;
+$breakpoint-md: 768px;
+$breakpoint-lg: 980px;
diff --git a/_scss/util/_button.scss b/_scss/util/_button.scss
new file mode 100644
index 0000000..8dbfe88
--- /dev/null
+++ b/_scss/util/_button.scss
@@ -0,0 +1,45 @@
+.u-button {
+  display: inline-block;
+  padding: 0 0.75rem;
+  background: transparent;
+  border: 2px solid $color-blue-dark;
+  color: $color-blue-dark;
+  font-family: $font-family-heading;
+  font-size: 1.125rem;
+  font-weight: $font-weight-bold;
+  line-height: 2.5;
+  text-align: center;
+  text-decoration: none;
+  transition: 150ms all linear;
+
+  &:hover,
+  &:focus,
+  &:active {
+    background-color: transparentize($color-white, 0.125);
+    outline: 0;
+  }
+
+  &--secondary {
+    background-color: transparentize($color-blue-dark-text, 0.93);
+    border-color: transparent;
+
+    &:hover,
+    &:focus,
+    &:active {
+      border-color: $color-blue-dark-text;
+    }
+  }
+
+  &--light {
+    border-color: $color-white;
+    border-width: 5px;
+    color: $color-white;
+
+    &:hover,
+    &:focus,
+    &:active {
+      background-color: transparentize($color-white, 0.75);
+      outline: 0;
+    }
+  }
+}
diff --git a/_scss/util/_embed-container.scss b/_scss/util/_embed-container.scss
new file mode 100644
index 0000000..ad2837d
--- /dev/null
+++ b/_scss/util/_embed-container.scss
@@ -0,0 +1,17 @@
+.u-embed-container {
+  position: relative;
+  max-width: 100%;
+  height: auto;
+  padding-bottom: 56.25%;
+  overflow: hidden;
+
+  iframe,
+  object,
+  embed {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+  }
+}
diff --git a/_scss/util/_typography.scss b/_scss/util/_typography.scss
new file mode 100644
index 0000000..1f6cae3
--- /dev/null
+++ b/_scss/util/_typography.scss
@@ -0,0 +1,5 @@
+.u-align {
+  &--left { text-align: left; }
+  &--center { text-align: center; }
+  &--right { text-align: right; }
+}
diff --git a/about.md b/about.md
new file mode 100644
index 0000000..53f6a94
--- /dev/null
+++ b/about.md
@@ -0,0 +1,14 @@
+---
+layout: about
+title: What Is Apache OpenWhisk?
+youtube_video_id: enk45wEQHzI
+---
+
+Apache OpenWhisk is a [serverless]({{ site.github.url }}/serverless), open
+source cloud platform that allows you to execute code in response to events at any scale. OpenWhisk handles the infrastructure and servers so you can focus on building amazing things.
+
+Apache OpenWhisk allows [developers]({{ site.github.url }}/developers) to focus on writing value-adding code instead of burning hours on architecture and server management. Write in your preferred language to combine custom code with plug-and-play packages from our rich ecosystem of supporter services, and go live in hours instead of weeks.
+
+[Package creators]({{ site.github.url }}/package-creators) can easily add their service to Apache OpenWhisk’s growing ecosystem to eliminate the need to build in-house solutions for third-party integrations, reach a broader community of developers, and increase adoption of their products and services.
+
+The Apache OpenWhisk community is driven by [open source contributors]({{ site.github.url }}/contributors) who are advancing this bleeding-edge technology, growing their skillsets, and pushing the boundaries of serverless technology.
diff --git a/community.md b/community.md
deleted file mode 100644
index bd01389..0000000
--- a/community.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-title: Community
-layout: community
----
-<!--
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
--->
-
-# OpenWhisk Community
-
-This markdown is not used.
-
-To update content, make changes in `_layouts/community.html`.
diff --git a/contact.md b/contact.md
new file mode 100644
index 0000000..5cf76b6
--- /dev/null
+++ b/contact.md
@@ -0,0 +1,23 @@
+---
+title: Contact
+seo_title: Contact — Apache OpenWhisk
+---
+
+The Dev Mailing List is where we discuss the development of Apache OpenWhisk. It is _not_ a place for technical support; if you're looking for help on a project, check out the [`#openwhisk` tag on Stack Overflow](http://stackoverflow.com/questions/tagged/openwhisk).
+
+### How to join the Apache OpenWhisk mailing list.
+
+**NOTE:** Make sure you add a subject line to the subscribe/unsubscribe messages. Empty emails are ignored.
+
+To subscribe to the list, send a message to:<br>
+<dev-subscribe@openwhisk.incubator.apache.org>
+
+To remove your address from the list, send a message to:<br>
+<dev-unsubscribe@openwhisk.incubator.apache.org>
+
+To create a new thread, send a message to:<br>
+<dev@openwhisk.incubator.apache.org>
+
+To comment on a thread, reply to the message.
+
+To see existing messages, [check out the archive](http://mail-archives.apache.org/mod_mbox/incubator-openwhisk-dev/).
diff --git a/contributors.md b/contributors.md
new file mode 100644
index 0000000..e139be6
--- /dev/null
+++ b/contributors.md
@@ -0,0 +1,6 @@
+---
+title: Open-Source Contributors
+layout: contributors
+---
+
+This text is not used. To update content, make changes in `_layouts/contributors.html`.
diff --git a/css/main.scss b/css/main.scss
index b64e714..068cd45 100644
--- a/css/main.scss
+++ b/css/main.scss
@@ -2,10 +2,30 @@
 # This has to be here so Jekyll knows to process this as SCSS.
 ---
 
-@import "variables";
-@import "reset";
-@import "skin";
+/*
+ * # Configuration & Global Styles
+ */
+@import "config/variables";
+@import "config/reset";
+@import "config/typography";
 
-@import "base";
-@import "tablet";
-@import "desktop";
+/*
+ * Utilities
+ */
+@import "util/button";
+@import "util/embed-container";
+@import "util/typography";
+
+/*
+ * Blocks
+ */
+@import "block/main-content";
+@import "block/main-cta";
+@import "block/persona";
+@import "block/quotes";
+@import "block/site-footer";
+@import "block/site-header";
+@import "block/site-nav";
+@import "block/site-section";
+@import "block/where-to-start";
+@import "block/why-are-we-here";
diff --git a/developers.md b/developers.md
new file mode 100644
index 0000000..639185e
--- /dev/null
+++ b/developers.md
@@ -0,0 +1,6 @@
+---
+title: Developers
+layout: developers
+---
+
+This text is not used. To update content, make changes in `_layouts/developers.html`.
diff --git a/documentation.md b/documentation.md
deleted file mode 100644
index a472d3b..0000000
--- a/documentation.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-title: Documentation
-layout: documentation
----
-<!--
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
--->
-
-This text is not used. To update content, make changes in `_layouts/documentation.html`.
diff --git a/downloads.md b/downloads.md
index 8984085..60a64cb 100644
--- a/downloads.md
+++ b/downloads.md
@@ -4,8 +4,28 @@ title: Apache OpenWhisk Downloads
 lede: Information on and links to source code downloads by release
 ---
 
-# OpenWhisk Downloads
+## Downloading source code
 
-This markdown is not used.
+You can download the source code package for a release from the links in the Releases section.
 
-To update content, make changes in `_layouts/downloads.html`.
+### Versioning
+
+Apache OpenWhisk uses semantic versioning. Version numbers use the form ```major.minor.incremental-build``` and are incremented as follows:
+
+- ```major version``` for incompatible API changes.
+- ```minor version``` for new functionality added in a backward-compatible manner.
+- ```incremental version``` for forward-compatible bug fixes.
+- ```build``` optional postfix to distinguish intermediate builds.
+
+### Releases
+
+Access the [Release Keys](https://www.apache.org/dist/incubator/openwhisk/KEYS) to verify the releases.
+
+#### 0.9.0-incubating (2018-07-17)
+
+Official Source code download:
+- [openwhisk-0.9.0-incubating-sources.tar.gz](https://www.apache.org/dyn/closer.lua?filename=incubator/openwhisk/apache-openwhisk-0.9.0-incubating/openwhisk-0.9.0-incubating-sources.tar.gz&action=download)
+
+SHA-512 and PGP signature:
+- [openwhisk-0.9.0-incubating-sources.tar.gz.asc](https://www.apache.org/dist/incubator/openwhisk/apache-openwhisk-0.9.0-incubating/openwhisk-0.9.0-incubating-sources.tar.gz.asc)
+- [openwhisk-0.9.0-incubating-sources.tar.gz.sha512](https://www.apache.org/dist/incubator/openwhisk/apache-openwhisk-0.9.0-incubating/openwhisk-0.9.0-incubating-sources.tar.gz.sha512)
diff --git a/events.md b/events.md
index bb04e8d..8c87891 100644
--- a/events.md
+++ b/events.md
@@ -1,91 +1,86 @@
 ---
 layout: events
-title: OpenWhisk Events Archive
-lede: This is the list of historic events
+title: Apache OpenWhisk Events
+lede: Presentations at conferences, meetups, and other events.
 ---
-<!--
-# Licensed to the Apache Software Foundation (ASF) under one or more contributor
-# license agreements; and to You under the Apache License, Version 2.0.
--->
 
-### March 2018
-
-- [**IBM Think**](https://www.ibm.com/events/think/), March 19th–22rd, Las Vegas, USA<br/>Several talks on OpenWhisk and IBM Cloud Functions.
-- [**Voxxed Days Bristol**](https://voxxeddays.com/bristol/), March 15th, Bristol, UK<br/>James Thomas gave a talk about "Microservices Without Servers."
+The Apache Software Foundation does not endorse listed events. [Get in touch with us to suggest event listings](/social).
 
+## Upcoming Events
 
 ### February 2018
-
-- [**ServerlessConf Boston Meetup**](https://www.meetup.com/Serverless-Boston/events/245915761/), February 7th, Boston, US<br/>Paul Castro presented on Apache OpenWhisk.
-- [**ServerlessConf NYC Meetup**](https://www.meetup.com/Serverless-NYC/events/245972003/), February 15th, NY, US<br/>Daniel Krook presented on Apache OpenWhisk using IBM Cloud Functions.
+- [**ServerlessConf Boston Meetup**](https://www.meetup.com/Serverless-Boston/events/245915761/), February 7th, Boston, US<br/>Paul Castro will be presenting on Apache OpenWhisk.
+- [**ServerlessConf NYC Meetup**](https://www.meetup.com/Serverless-NYC/events/245972003/), February 15th, NY, US<br/>Daniel Krook will be presenting on Apache OpenWhisk using IBM Cloud Functions.
 - [**Serverlessconf Paris**](http://paris.serverlessconf.io/), February 14th-15th, Paris, France<br/>A workshop and talk on OpenWhisk and IBM Cloud Functions.
 - [**JeffConf Hamburg**](https://hamburg.jeffconf.com/), February 15th-16th, Hamburg, Germany<br/>Several OpenWhisk members in attendance.
-- [**DevNexus Atlanta**](https://devnexus.com/speakers/), February 21st-23rd, Atlanta, US<br/>Raymond Camden provided "A general introduction to serverless with Apache OpenWhisk."
+- [**DevNexus Atlanta**](https://devnexus.com/speakers/), February 21st-23rd, Atlanta, US<br/>Raymond Camden will provide "A general introduction to serverless with Apache OpenWhisk."
 
+### March 2018
+- [**IBM Think**](https://www.ibm.com/events/think/), March 19th–22rd, Las Vegas, USA<br/>Several talks on OpenWhisk and IBM Cloud Functions.
+- [**Voxxed Days Bristol**](https://voxxeddays.com/bristol/), March 15th, Bristol, UK<br/>James Thomas will talk about "Microservices Without Servers."
 
-### January 2018
+## Past Events
 
+### January 2018
 - [**CodeMash**](https://akrabat.com/talks/serverless-apis-codemash/), January 9th-12th, Sandusky, US<br/>Rob Allen spoke about how to "Build a Delightful API with Serverless Technology."
 
-
 ### November 2017
 
 - [**µCon London**](https://skillsmatter.com/conferences/8549-con-2017-the-microservices-conference), November 6th-7th 2017, London, UK<br/>Rob Allen will give a talk on building serverless APIs in Swift
-- [**Devoxx Morocco**](https://devoxx.ma/), November 14th-16th 2017, Casablanca, Morocco<br/>James Thomas gave a talk on building serverless applications with OpenWhisk
-- [**UA Mobile**](http://uamobile.org/topics/serverless-swift-apache-openwhisk), November 25th 2017, Kiev, Ukraine<br/>James Thomas gave a talk on building mobile APIs with Swift on OpenWhisk
-
+- [**Devoxx Morocco**](https://devoxx.ma/), November 14th-16th 2017, Casablanca, Morocco<br/>James Thomas will give a talk on building serverless applications with OpenWhisk
+- [**UA Mobile**](http://uamobile.org/topics/serverless-swift-apache-openwhisk), November 25th 2017, Kiev, Ukraine<br/>James Thomas will give a talk on building mobile APIs with Swift on OpenWhisk
 
 ### October 2017
 
-- [**TopConf Duesseldorf**](https://www.topconf.com/conference//duesseldorf-2017/talk/microservices-without-servers/), October 4th-6th 2017, Cologne, Germany<br/>James Thomas gave a talk on building serverless applications using OpenWhisk
-- [**NCDevCon**](http://ncdevcon.com/) Carlos Santana gave a talk on using OpenWhisk with Websites.
+- [**TopConf Duesseldorf**](https://www.topconf.com/conference//duesseldorf-2017/talk/microservices-without-servers/), October 4th-6th 2017, Cologne, Germany<br/>James Thomas will give a talk on building serverless applications using OpenWhisk
+- [**NCDevCon**](http://ncdevcon.com/) Carlos Santana will give a talk on using OpenWhisk with Websites.
 - [**ServerlessConf**](https://nyc.serverlessconf.io/agenda) October 8th-11th, NY, US<br/> Several talks on OpenWhisk
-- [**ServerlessConf NYC Meetup**](https://www.meetup.com/Serverless-NYC/events/243399016/?_cookie-check=QsFBwgKfBvP1vKyC) October 12th, NY, US<br/> Daniel Krook (IBM) and Dragos Dascalita Haut (Adobe) presented on Apache OpenWhisk
-- [**Nordic APIs Summit**](https://nordicapis.com/?post_type=sessions&p=6682), October 10th-11th 2017, Stockholm, Sweden<br/>James Thomas gave a talk on building serverless APIs using OpenWhisk and Swift
-- [**Going Serverless**](http://certifiedfreshevents.com/events/going-serverless/), October 20th 2017, Online Webinar<br/>James Thomas gave a talk on building multi-provider serverless applications with The Serverless Framework and OpenWhisk
-- [**BristolJS October**](https://www.meetup.com/BristolJS/events/242690371/), October 25th 2017, Bristol, England<br/>James Thomas gave a talk on serverless Node.js applications with OpenWhisk
-
+- [**ServerlessConf NYC Meetup**](https://www.meetup.com/Serverless-NYC/events/243399016/?_cookie-check=QsFBwgKfBvP1vKyC) October 12th, NY, US<br/> Daniel Krook (IBM) and Dragos Dascalita Haut (Adobe) will be presenting on Apache OpenWhisk
+- [**Nordic APIs Summit**](https://nordicapis.com/?post_type=sessions&p=6682), October 10th-11th 2017, Stockholm, Sweden<br/>James Thomas will give a talk on building serverless APIs using OpenWhisk and Swift
+- [**Going Serverless**](http://certifiedfreshevents.com/events/going-serverless/), October 20th 2017, Online Webinar<br/>James Thomas will give a talk on building multi-provider serverless applications with The Serverless Framework and OpenWhisk
+- [**BristolJS October**](https://www.meetup.com/BristolJS/events/242690371/), October 25th 2017, Bristol, England<br/>James Thomas will give a talk on serverless Node.js applications with OpenWhisk
 
 ### September 2017
 
-- [**APIDays Zurich**](http://www.apidays.io/events/zurich-2017), September 26th-27th 2017, Zurich, Switzerland<br/>Rob Allen gave a talk on building serverless APIs in Swift
-- [**Pixels Camp**](https://pixels.camp/jthomas), September 28th-30th 2017, Lisbon, Portugal<br/>James Thomas gave a talk on building serverless applications using OpenWhisk
-- [**SwiftConf Europe**](https://swiftconf.com/), September 6th-7th 2017, Cologne, Germany<br/>James Thomas gave a talk on Serverless Swift APIs using OpenWhisk
+- [**APIDays Zurich**](http://www.apidays.io/events/zurich-2017), September 26th-27th 2017, Zurich, Switzerland<br/>Rob Allen will give a talk on building serverless APIs in Swift
+- [**Pixels Camp**](https://pixels.camp/jthomas), September 28th-30th 2017, Lisbon, Portugal<br/>James Thomas will give a talk on building serverless applications using OpenWhisk
 
+### September 2017
 
-### June 2017
+- [**SwiftConf Europe**](https://swiftconf.com/), September 6th-7th 2017, Cologne, Germany<br/>James Thomas will give a talk on Serverless Swift APIs using OpenWhisk
 
-- <a name="2017-06-21" href="#2017-06-21">**OpenWhisk Meetup Austin, TX**</a>, June 21st 2017, Austin, TX<br>[Carlos Santana](https://twitter.com/csantanapr) gave a talk, with demos, and discussion of latest features.
-- [**Acadiana Software Group**](https://www.facebook.com/events/1920692501553535/), June 14th 2017, Lafayette, USA<br/>Raymond Camden gave a talk on OpenWhisk
+### June 2017
 
+- <a name="2017-06-21" href="#2017-06-21">**OpenWhisk Meetup Austin, TX**</a>, June 21st 2017, Austin, TX<br>[Carlos Santana](https://twitter.com/csantanapr) will give a talk, show demos, discuss latest features.<br>6:30PM - 8:00PM<br>IBM Bldg 908 Room: Texas Star<br>11501 BURNET RD<br>AUSTIN, TX 78758-3400, US
+- [**Acadiana Software Group**](https://www.facebook.com/events/1920692501553535/), June 14th 2017, Lafayette, USA<br/>Raymond Camden will give a talk on OpenWhisk
 
 ### May 2017
 
-- [**Meetup Serverless Amsterdam**](https://serverless.amsterdam/workshop-going-serverless-with-openwhisk.html), May 29th 2017, Amsterdam, Netherlands<br/>Andreas Nauerz and Markus Thömmes gave a talk with a hands-on workshop on OpenWhisk
-- [**Meetup Triangle CocoaHeads**](https://www.meetup.com/nscoderrtp/events/239925683/), May 25th 2017, Raleigh, USA<br>[Carlos Santana](https://twitter.com/csantanapr) gave a talk on OpenWhisk and Swift at the Triangle Cocoa - Mac and iOS Development Meetup
-- [**ApacheCon North America**](http://events.linuxfoundation.org/events/apachecon-north-america), May 16th-18th 2017, Miami, USA<br/>Carlos Santana and Matt Rutkowski gave talks on Apache OpenWhisk
-- [**Codemotion Amsterdam**](http://amsterdam2017.codemotionworld.com/), May 16th-17th 2017, Amsterdam, Netherlands<br/>James Thomas gave a talk on building serverless applications using OpenWhisk
-- [**Meetup Triangle Bluemix**](https://www.meetup.com/rtpbluemix/events/238926973/), May 11th 2017, NCSU Centennial Campus, Raleigh, NC USA<br/>IBM Development team contributing to OpenWhisk provided an overview and live demos using Bluemix.
-- [**Meetup Serverless Berlin**](https://www.meetup.com/eBay-Europe-Technology/events/239295491/), May 4th 2017, Berlin, Germany<br/>Andreas Nauerz and Jeremias Werner gave a talk and ran a hands-on workshop on OpenWhisk
+- [**Meetup Serverless Amsterdam**](https://serverless.amsterdam/workshop-going-serverless-with-openwhisk.html), May 29th 2017, Amsterdam, Netherlands<br/>Andreas Nauerz and Markus Thömmes will give a talk and run a hands-on workshop on OpenWhisk
+- [**Meetup Triangle CocoaHeads**](https://www.meetup.com/nscoderrtp/events/239925683/), May 25th 2017, Raleigh, USA<br>[Carlos Santana](https://twitter.com/csantanapr) will give a talk on OpenWhisk and Swift at the Triangle Cocoa - Mac and iOS Development Meetup
+- [**ApacheCon North America**](http://events.linuxfoundation.org/events/apachecon-north-america), May 16th-18th 2017, Miami, USA<br/>Carlos Santana and Matt Rutkowski will give talks on OpenWhisk
+- [**Codemotion Amsterdam**](http://amsterdam2017.codemotionworld.com/), May 16th-17th 2017, Amsterdam, Netherlands<br/>James Thomas will give a talk on building serverless applications using OpenWhisk
+- [**Meetup Triangle Bluemix**](https://www.meetup.com/rtpbluemix/events/238926973/), May 11th 2017, NCSU Centennial Campus, Raleigh, NC USA<br/>IBM Development team contributing to OpenWhisk will give overview and live demos using Bluemix.
+- [**Meetup Serverless Berlin**](https://www.meetup.com/eBay-Europe-Technology/events/239295491/), May 4th 2017, Berlin, Germany<br/>Andreas Nauerz and Jeremias Werner will give a talk and run a hands-on workshop on OpenWhisk
 
 
 ### April 2017
 
-- [**ServerlessConf Austin**](http://austin.serverlessconf.io/), April 27th-28th 2017, Austin, USA<br/>OpenWhisk team attended
-- [**ServerlessConf Austin**](https://medium.com/openwhisk/openwhisk-workshop-at-the-serverless-conference-in-austin-sign-up-now-c2b88f5bac9d#.73xz9bl16), April 26th 2017, Austin, USA<br/>Andreas Nauerz et al ran a hands-on workshop on OpenWhisk
-- [**Into the Box**](https://www.intothebox.org/), April 26th-28th 2017, The Woodlands, USA<br/>Raymond Camden gave a talk on OpenWhisk
-- [**Meetup TRI REST**](https://www.meetup.com/TRI-REST/events/238345148/?from=ref), April 26th 2017, Raleigh, USA<br/>Carlos Santana gave a talk on OpenWhisk
-- [**Meetup Serverless Hamburg**](https://www.meetup.com/Serverless-Hamburg/events/238520956/), April 10th 2017, Hamburg, Germany<br/>Andreas Nauerz and Xin Cai gave a talk and run a hands-on workshop on OpenWhisk
-- [**Meetup Serverless Boston**](https://www.meetup.com/Serverless-Boston/events/237480548/), April 5th 2017, Boston, USA<br/>Paul Castro and Perry Cheng gave a talk on OpenWhisk
-- [**O'Reilly Software Architecture Conference**](https://conferences.oreilly.com/software-architecture/sa-ny/public/schedule/grid/public/2017-04-05), April 5th 2017, New York, USA<br/>Daniel Krook gave a keynote with other talks on OpenWhisk by Ioana Baldini and Rodric Rabbah
-
+- [**ServerlessConf Austin**](http://austin.serverlessconf.io/), April 27th-28th 2017, Austin, USA<br/>OpenWhisk team will attend
+- [**ServerlessConf Austin**](https://medium.com/openwhisk/openwhisk-workshop-at-the-serverless-conference-in-austin-sign-up-now-c2b88f5bac9d#.73xz9bl16), April 26th 2017, Austin, USA<br/>Andreas Nauerz et al will run a hands-on workshop on OpenWhisk
+- [**Into the Box**](https://www.intothebox.org/), April 26th-28th 2017, The Woodlands, USA<br/>Raymond Camden will give a talk on OpenWhisk
+- [**Meetup TRI REST**](https://www.meetup.com/TRI-REST/events/238345148/?from=ref), April 26th 2017, Raleigh, USA<br/>Carlos Santana will give a talk on OpenWhisk
+- [**Meetup Serverless Hamburg**](https://www.meetup.com/Serverless-Hamburg/events/238520956/), April 10th 2017, Hamburg, Germany<br/>Andreas Nauerz and Xin Cai will give a talk and run a hands-on workshop on OpenWhisk
+- [**Meetup Serverless Boston**](https://www.meetup.com/Serverless-Boston/events/237480548/), April 5th 2017, Boston, USA<br/>Paul Castro and Perry Cheng will give a talk on OpenWhisk
+- [**O'Reilly Software Architecture Conference**](https://conferences.oreilly.com/software-architecture/sa-ny/public/schedule/grid/public/2017-04-05), April 5th 2017, New York, USA<br/>Daniel Krook will give a keynote and Ioana Baldini and Rodric Rabbah talks on OpenWhisk
 
 ### March 2017
 
 - [**Meetup Serverless Vienna**](https://www.meetup.com/Serverless-Vienna/events/238392790/), March 28th 2017, Vienna, Austria<br/>Coding on various Serverless systems, incl OpenWhisk.
-- [**CloudNativeCon and KubeCon Europe**](http://events.linuxfoundation.org/events/cloudnativecon-and-kubecon-europe), March 29th–30th 2017, Berlin, Germany<br/>Daniel Krook gave an OpenWhisk demo at the IBM booth and was available for questions
-- [**Devoxx US**](https://devoxx.us/), March 21st–23rd 2017, Las Vegas, USA<br/>OpenWhisk team attended
-- [**IBM InterConnect**](http://www.ibm.com/cloud-computing/us/en/interconnect/), March 19th–23rd 2017, Las Vegas, USA<br/>OpenWhisk team attended
+- [**CloudNativeCon and KubeCon Europe**](http://events.linuxfoundation.org/events/cloudnativecon-and-kubecon-europe), March 29th–30th 2017, Berlin, Germany<br/>Daniel Krook will give an OpenWhisk demo at the IBM booth, and will be on hand to answer any questions
+- [**Devoxx US**](https://devoxx.us/), March 21st–23rd 2017, Las Vegas, USA<br/>OpenWhisk team will attend
+
+- [**IBM InterConnect**](http://www.ibm.com/cloud-computing/us/en/interconnect/), March 19th–23rd 2017, Las Vegas, USA<br/>OpenWhisk team will attend
 <details><summary><strong>Ask Me Anything</strong></summary>
 <ul>
 <li><a href="https://myibm.ibm.com/events/interconnect/all-sessions/session/7291A" target="_blank">7291A: Bluemix OpenWhisk: Ask Me Anything Expert Station</a><br/>
@@ -205,30 +200,26 @@ Wednesday, 9:00 AM-9:45 AM; Meet the Experts Forum # 1; Kalonji Bankole (IBM)</l
 <li><strong>9002: Event-driven and Serverless Computing with IBM Bluemix OpenWhisk: Learn the basics now!</strong><br/>
 Monday-Thursday drop-in; Mandalay Bay North, South Seas E&F; Andreas Nauerz (IBM)</li>
 </ul>
-</details>
+</details> 
 
-- [**JS Remote Conf**](https://devchat.tv/conferences/js-remote-conf-2017), March 15th-16th 2017, Virtual<br/>James Thomas gave a talk on OpenWhisk and Serverless
+- [**JS Remote Conf**](https://devchat.tv/conferences/js-remote-conf-2017), March 15th-16th 2017, Virtual<br/>James Thomas will give a talk on OpenWhisk and Serverless
 - [**ForwardJS**](https://forwardjs.com/), March 1st 2017, San Francisco, USA<br/>Raymond Camden will give a talk on OpenWhisk
 
-
 ### February 2017
 
 - [**TopConf Linz**](http://topconf.com/linz-2017/), February 28th-March 2nd 2017, Linz, Austria<br/>James Thomas gave a talk on building serverless applications using OpenWhisk
 - [**London Serverless**](https://www.twitch.tv/videos/119142073), February 1st 2017, London, UK<br/>James Thomas gave a talk on building OpenWhisk apps with The Serverless Framework
 
-
 ### December 2016
 
 - [**Build a cloud native app with OpenWhisk**](https://developer.ibm.com/tv/build-a-cloud-native-app-with-openwhisk-event-registration/), December 14th 2016, Virtual<br/>Daniel Krook presented an overview of serverless architectures and dive into the OpenWhisk programming model
 
-
 ### November 2016
 
 - [**GOTO Berlin**](https://gotocon.com/berlin-2016/), November 14th-15th 2016, Berlin, Germany<br/>Andreas Nauerz & Simon Moser gave a talk on OpenWhisk
 - [**CloudNativeCon 2016**](https://cnkc16.sched.org/event/8K4c), November 8th 2016, Seattle, USA<br/>Daniel Krook highlighted OpenWhisk in his keynote
 - [**ContainerDays NYC 2016**](http://dynamicinfradays.org/events/2016-nyc/), November 3rd-4th 2016, New York, USA<br/>Rodric Rabbah and Philippe Suter gave a talk on OpenWhisk
-
-
+  
 ### October 2016
 
 - [**ServerlessConf London**](http://london.serverlessconf.io/), October 26th-28th 2016, London, UK<br/>Andreas Nauerz et al gave a talk on OpenWhisk
@@ -239,10 +230,9 @@ Monday-Thursday drop-in; Mandalay Bay North, South Seas E&F; Andreas Nauerz (IBM
 - [**Serverless Seattle Meetup**](http://www.meetup.com/Serverless-Seattle/events/233807991/), October 12th 2016, Seattle, USA<br/>Megan Kostick gave a talk on OpenWhisk
 - [**New York City Bluemix Meetup**](http://www.meetup.com/nyc-bluemix/events/233968352/), October 12th 2016, New York, USA<br/>Daniel Krook gave a talk on OpenWhisk
 
-
 ### September 2016
 
-- [**ServerlessConf Tokyo**](http://tokyo.serverlessconf.io/), September 30th–October 1st 2016, Tokyo, Japan<br/>Andreas Nauerz & Markus Thömmes gave a talk on OpenWhisk
+- [**ServerlessConf Tokyo**](http://tokyo.serverlessconf.io/), September 30th–October 1st 2016, Tokyo, Japan<br/>Andreas Nauerz & Markus Thömmes gave a talk on OpenWhisk  
 - [**Voxxed Days**](https://belgrade.voxxeddays.com/), September 28th-30th 2016, Belgrade, Serbia<br/>James Thomas gave a talk on OpenWhisk
 - [**CloudFoundry Summit**](https://www.cloudfoundry.org/community/summits/program/about/?summitId=11993/), September 26th-28th 2016, Frankfurt, Germany<br/>Andreas Nauerz & Andrei Yurkovich gave a talk on OpenWhisk
 - [**Codemotion Warsaw**](http://warsaw2016.codemotionworld.com/), September 15th-16th 2016, Warsaw, Poland<br/>Andreas Nauerz gave a talk on OpenWhisk
@@ -250,7 +240,6 @@ Monday-Thursday drop-in; Mandalay Bay North, South Seas E&F; Andreas Nauerz (IBM
 - [**Serverless New York City Meetup**](http://www.meetup.com/Serverless-NYC/events/233736279/), September 15th 2016, New York, USA<br/>Philippe Suter gave a talk on OpenWhisk
 - [**JDay**](http://www.jday.com.ua/), September 3rd 2016, Lviv, Ukraine<br/>James Thomas gave a talk on OpenWhisk
 
-
 ### July 2016
 
 - [**Bluemix and IBM Cloud Meetup**](http://www.irishdev.com/Home/Events/1191-Bluemix-and-IBM-Cloud-Meetup.html), July 27th 2016, Dublin, Ireland<br/>Emmanuel Vregille gave a talk on OpenWhisk
@@ -258,12 +247,10 @@ Monday-Thursday drop-in; Mandalay Bay North, South Seas E&F; Andreas Nauerz (IBM
 - [**Serverless Meetups London**](http://www.meetup.com/Serverless-London/), July 5th 2016, London, UK<br/>Nick O’Leary and James Thomas gave a talk on OpenWhisk
 - [**Serverless Meetup Sydney**](http://www.meetup.com/Sydney-Serverless-Meetup-Group/events/232020422/), July 5th 2016, Sydney, Australia<br/>Iwan Winoto gave a talk on OpenWhisk
 
-
 ### June 2016
 
 - [**Bluemix Developers in Cambridge Meetup**](http://www.meetup.com/Bluemix-Developers-in-Cambridge/events/231783149/), June 23rd 2016, Cambridge, USA<br/>Vatche Ishakia gave a talk on OpenWhisk
-- [**Silicon Valley Cloud Foundry User Group Meetup**](http://www.meetup.com/CloudFoundry/events/231791789/), June 14th 2016, Sunnyvale, USA<br/>Animesh Singh & Altoros gave a talk on OpenWhisk
-
+- [**Silicon Valley Cloud Foundry User Group Meetup**](http://www.meetup.com/CloudFoundry/events/231791789/), June 14th 2016, Sunnyvale, USA<br/>Animesh Singh & Altoros gave a talk on OpenWhisk  
 
 ### May 2016
 
@@ -272,8 +259,7 @@ Monday-Thursday drop-in; Mandalay Bay North, South Seas E&F; Andreas Nauerz (IBM
 - [**Cloud Foundry Unconference**](http://www.meetup.com/CloudFoundry/events/227086817/), May 22nd 2016, Santa Clara, USA<br/>Animesh Singh gave a talk on OpenWhisk
 - [**OSCON Austin**](http://conferences.oreilly.com/oscon/open-source-us), May 18th-19th 2016, Austin, USA<br/>Daniel Krook gave a talk on OpenWhisk
 - [**Hursley Summit**](https://www-950.ibm.com/events/wwe/grp/grp004.nsf/v17_events?openform&lp=2016_hursley_landing_page&locale=en_US), May 16th-18th 2016, Hursley, UK<br/>Andreas Nauerz gave a talk on OpenWhisk
-- [**Codemotion Amsterdam**](http://amsterdam2016.codemotionworld.com/), May 9th-12th 2016, Amsterdam, Netherlands<br/>Andreas Nauerz gave a talk on OpenWhisk
-
+- [**Codemotion Amsterdam**](http://amsterdam2016.codemotionworld.com/), May 9th-12th 2016, Amsterdam, Netherlands<br/>Andreas Nauerz gave a talk on OpenWhisk  
 
 ### April 2016
 
diff --git a/faq.md b/faq.md
new file mode 100644
index 0000000..218fb23
--- /dev/null
+++ b/faq.md
@@ -0,0 +1,70 @@
+---
+title: Frequently Asked Questions
+seo_title: Apache OpenWhisk Frequently Asked Questions
+---
+
+- TOC:
+{:toc}
+
+### What is event-driven programming and serverless computing?
+
+Event-driven programming follows a paradigm in which the flow of an application is determined by events such as user actions, sensor outputs, or messages from other applications or services.
+
+Serverless computing refers to a model where the existence of servers is simply hidden from developers. I.e. that even though servers still exist developers are relieved from the need to care about their operation. Learn more [here]({{ site.github.url }}/serverless).
+
+### What problems does OpenWhisk solve? What can you do with OpenWhisk?
+
+OpenWhisk abstracts away all infrastructure and operational concerns, allowing developers to solely focus on coding. As part of that abstraction you no longer need to worry about peak projections or capacity planning as OpenWhisk scales on demand based on the volume and velocity of your events’ requests. It allows you to solve your problems with simple solutions.
+
+### How is it open?
+
+OpenWhisk has been made available as open source to encourage others to participate to accelerate its development and to help generating a powerful ecosystem of event providers and consumers.
+
+### Which offerings are available?
+
+OpenWhisk is available – currently as experimental offering – for IBM Bluemix that can be found [here](https://console.ng.bluemix.net/openwhisk/) as well as open source offering that can be found [here](https://github.com/openwhisk/openwhisk).
+
+### Can I enable my own services for OpenWhisk?
+
+Absolutely, we even encourage you to do so. Packages represent the concept allowing you to enable your own services; learn more [here](https://github.com/openwhisk/openwhisk/blob/master/docs/packages.md).
+
+### Which programming languages/runtimes does OpenWhisk support?
+
+Currently, OpenWhisk supports JavaScript, Swift, Python or PHP function, a Java method, any binary-compatible executable including Go programs; more languages will be supported soon. Additionally OpenWhisk can run any custom code put in a Docker container.
+
+### When should I use OpenWhisk versus VMs, Containers, or Cloud Foundry apps?
+
+While VMs still provide you with maximum flexibility and control by allowing you to pick whatever CPU, memory, or storage you want, OpenWhisk makes it easy to get started. Despite that, if you want to scale on demand and don’t care about having access to your infrastructure to change configurations OpenWhisk may be a great choice. Learn more [here](https://www.ibm.com/blogs/bluemix/2015/08/bluemix-instant-runtimes-containers-or-virtual-machines/).
+
+### Where can I go to learn more?
+
+We have a collection of blog posts available [on Medium](https://medium.com/openwhisk).
+
+### Are there videos, demos, or sample code that I can have a look at?
+
+Absolutely. Videos can be found [on YouTube](https://www.youtube.com/channel/UCbzgShnQk8F43NKsvEYA1SA). We also have a collection of [resources on GitHub](https://github.com/openwhisk/awesome-openwhisk/) to help get you started.
+
+### Who are the OpenWhisk open source supporters?
+
+Check out our [supporters page]({{ site.github.url }}/supporters) for information about Apache OpenWhisk supporters.
+
+### How do I get involved?
+
+If you are interested in contributing to our OpenWhisk project itself, or interested in providing services, [join our mailing list]({{ site.github.url }}/contact) and [learn more about how you can become a contributor]({{ site.github.url }}/contributors).
+
+### How do I report a problem with this site or suggest an improvement for its content?
+
+You can [submit an issue to the GitHub repository](https://github.com/openwhisk/openwhisk.github.io/issues) for this site. You can also [submit a pull request if you have signed the Apache ICLA](https://github.com/openwhisk/openwhisk.github.io/blob/master/CONTRIBUTING.md).
+
+### Need another question answered?
+
+For questions, hints and tips for developing in Apache OpenWhisk:
+
+- [Join the Dev Mailing List]({{ site.github.url }}/contact)
+- [Apache OpenWhisk on GitHub](https://github.com/search?q=org%3Aapache+openwhisk)
+- [Posts tagged with #openwhisk on StackOverflow](http://stackoverflow.com/questions/tagged/openwhisk)
+- [Apache OpenWhisk on Medium](https://medium.com/openwhisk)
+- [@openwhisk on Twitter](https://twitter.com/openwhisk)
+- [Video resources on YouTube](https://www.youtube.com/channel/UCbzgShnQk8F43NKsvEYA1SA)
+- [Presentations on SlideShare](http://www.slideshare.net/OpenWhisk)
+- [OpenWhisk on Slack](http://slack.openwhisk.org/)
diff --git a/images/README.md b/images/README.md
deleted file mode 100644
index eb92d2a..0000000
--- a/images/README.md
+++ /dev/null
@@ -1,176 +0,0 @@
-<!--
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
--->
-
-# Website design elements
-
-## Logo
-<table cellspacing="8">
-<tbody>
-<tr>
-<td><img src="logo/apache-openwhisk-logo-only.svg"></td>
-<td>logo/apache-openwhisk-logo-only.svg</td>
-<td> 88x80 px. (unscaled)</td>
-</tr>
-</tbody>
-</table>
-
-<table cellspacing="8">
-<tbody>
-<tr>
-<th width="100px">Sample</th>
-<th>Hex</th>
-<th>RGB</th>
-<th>Description</th>
-<th>Closest <a href="http://people.csail.mit.edu/jaffer/Color/rgb.txt">Unix</a></th>
-<th><a href="http://chir.ag/projects/name-that-color/">Name that color</a></th>
-<th><a href="http://www.color-blindness.com/color-name-hue/">Color Name Hue</a></th>
-</tr>
-<tr>
-<td><img src="https://via.placeholder.com/40x40/325c80/325c80"></td>
-<td style="font-family: Lucida Console;">#325c80</td>
-<td>50,92,128</td>
-<td>Logo Deeper Steel Blue</td>
-<td>SteelBlue4</td>
-<td><a href="http://chir.ag/projects/name-that-color/#325C80">Chambray</a></td>
-<td>St Tropaz</td>
-</tr>
-<tr>
-<td><img src="https://via.placeholder.com/40x40/5aaafa/5aaafa"></td>
-<td style="font-family: Lucida Console;">#5aaafa</td>
-<td>210,64,98</td>
-<td>Logo Deeper Sky Blue</td>
-<td>SteelBlue2</td>
-<td><a href="http://chir.ag/projects/name-that-color/#5AAAFA">Malibu</a></td>
-<td>Maya Blue</td>
-</tr>
-<tr>
-<td><img src="https://via.placeholder.com/40x40/008571/008571"></td>
-<td>#008571</td>
-<td>0,133,113</td>
-<td>Logo Deeper Sea Green</td>
-<td>turquoise4</td>
-<td><a href="http://chir.ag/projects/name-that-color/#008571">Deep Sea</a></td>
-<td>Observatory</td>
-</tr>
-<tr>
-<td><img src="https://via.placeholder.com/40x40/6eedd8/6eedd8"></td>
-<td style="font-family: Lucida Console;">#6eedd8</td>
-<td>110,237,216 </td>
-<td>Logo Deeper Aquamarine</td>
-<td>aquamarine2</td>
-<td><a href="http://chir.ag/projects/name-that-color/#6EEDD8">Spray</a></td>
-<td>Turquoise Blue</td>
-</tr>
-</tbody>
-</table>
-
-## Page Themes
-<table cellspacing="8">
-<tbody>
-<tr>
-<th width="100px">Sample</th>
-<th>Hex</th>
-<th>RGB</th>
-<th>CSS name</th>
-<th>Description</th>
-<th>Closest <a href="http://people.csail.mit.edu/jaffer/Color/rgb.txt">Unix</a></th>
-</tr>
-<!--
--- Blues
--->
-<tr>
-<td><img src="https://via.placeholder.com/40x40/ebf1f9/ebf1f9" alt="" /></td>
-<td style="font-family: Lucida Console;">#ebf1f9</td>
-<td>&nbsp;</td>
-<td>$color-blue-light</td>
-<td>&nbsp;</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td><img src="https://via.placeholder.com/40x40/88addd/88addd" alt="" /></td>
-<td style="font-family: Lucida Console;">#88addd</td>
-<td>&nbsp;</td>
-<td>$color-blue-medium</td>
-<td>&nbsp;</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td><img src="https://via.placeholder.com/40x40/29558f/29558f" alt="" /></td>
-<td style="font-family: Lucida Console;">#29558f</td>
-<td>&nbsp;</td>
-<td>$color-blue-dark</td>
-<td>&nbsp;</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td><img src="https://via.placeholder.com/40x40/0b1828/0b1828" alt="" /></td>
-<td style="font-family: Lucida Console;">#0b1828</td>
-<td>&nbsp;</td>
-<td>$color-blue-black</td>
-<td>&nbsp;</td>
-<td>&nbsp;</td>
-</tr>
-<!--
--- Gray-blues
--->
-<tr>
-<td><img src="https://via.placeholder.com/40x40/eff2f5/eff2f5" alt="" /></td>
-<td style="font-family: Lucida Console;">#eff2f5</td>
-<td>&nbsp;</td>
-<td>$color-blue-gray-light</td>
-<td>&nbsp;</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td><img src="https://via.placeholder.com/40x40/afbdcf/afbdcf" alt="" /></td>
-<td style="font-family: Lucida Console;">#afbdcf</td>
-<td>&nbsp;</td>
-<td>$color-blue-gray-medium</td>
-<td>&nbsp;</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td><img src="https://via.placeholder.com/40x40/455973/455973" alt="" /></td>
-<td style="font-family: Lucida Console;">#455973</td>
-<td>&nbsp;</td>
-<td>$color-blue-gray-dark</td>
-<td>&nbsp;</td>
-<td>&nbsp;</td>
-</tr>
-<!--
--- Text
--->
-<tr>
-<td><img src="https://via.placeholder.com/40x40/f0f2f5/f0f2f5" alt="" /></td>
-<td style="font-family: Lucida Console;">#f0f2f5</td>
-<td>&nbsp;</td>
-<td>$color-blue-gray-light-text</td>
-<td>&nbsp;</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td><img src="https://via.placeholder.com/40x40/233c5c/233c5c" alt="" /></td>
-<td style="font-family: Lucida Console;">#233c5c</td>
-<td>&nbsp;</td>
-<td>$color-blue-dark-text</td>
-<td>&nbsp;</td>
-<td>&nbsp;</td>
-</tr>
-</tbody>
-</table>
diff --git a/images/apache-incubator-egg-logo.png b/images/apache-incubator-egg-logo.png
new file mode 100644
index 0000000..c04e70d
Binary files /dev/null and b/images/apache-incubator-egg-logo.png differ
diff --git a/images/apache-incubator-new-sm.png b/images/apache-incubator-new-sm.png
new file mode 100644
index 0000000..738f650
Binary files /dev/null and b/images/apache-incubator-new-sm.png differ
diff --git a/images/apache-incubator-new.png b/images/apache-incubator-new.png
new file mode 100644
index 0000000..390f625
Binary files /dev/null and b/images/apache-incubator-new.png differ
diff --git a/images/apache-incubator-new.svg b/images/apache-incubator-new.svg
new file mode 100644
index 0000000..3aaec71
--- /dev/null
+++ b/images/apache-incubator-new.svg
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="1000px" height="1000px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
+<rect x="0.04" y="-0.04" fill-rule="evenodd" clip-rule="evenodd" fill="#E4E2E1" width="1000" height="1000"/>
+<rect x="200.04" y="199.96" fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" width="600" height="600"/>
+<polygon fill-rule="evenodd" clip-rule="evenodd" points="709.219,458.14 730.434,458.14 730.434,460.142 711.434,460.142 
+	711.434,471.942 728.517,471.942 728.517,473.944 711.434,473.944 711.434,485.958 730.646,485.958 730.646,487.96 709.219,487.96 
+	"/>
+<polygon fill-rule="evenodd" clip-rule="evenodd" points="641.057,458.14 643.272,458.14 643.272,471.985 662.357,471.985 
+	662.357,458.14 664.572,458.14 664.572,487.96 662.357,487.96 662.357,473.987 643.272,473.987 643.272,487.96 641.057,487.96 "/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.338,488.472c-2.131,0-4.104-0.398-5.922-1.193
+	c-1.817-0.795-3.387-1.882-4.707-3.259c-1.321-1.377-2.351-3.003-3.089-4.878c-0.738-1.874-1.107-3.876-1.107-6.006v-0.085
+	c0-2.102,0.376-4.089,1.129-5.964c0.752-1.875,1.788-3.515,3.109-4.92c1.32-1.406,2.89-2.513,4.707-3.323
+	c1.818-0.81,3.806-1.214,5.965-1.214c1.335,0,2.542,0.114,3.62,0.341c1.08,0.228,2.081,0.554,3.004,0.98
+	c0.923,0.426,1.789,0.93,2.599,1.512c0.81,0.583,1.598,1.229,2.364,1.938l-1.576,1.619c-0.653-0.625-1.335-1.207-2.045-1.747
+	s-1.47-1.001-2.279-1.384c-0.809-0.384-1.689-0.688-2.641-0.916c-0.952-0.228-1.981-0.341-3.089-0.341
+	c-1.789,0-3.451,0.341-4.984,1.022s-2.861,1.626-3.983,2.833c-1.121,1.207-2.002,2.621-2.641,4.239
+	c-0.64,1.619-0.959,3.365-0.959,5.24v0.085c0,1.875,0.327,3.628,0.98,5.261s1.54,3.053,2.662,4.26s2.449,2.158,3.982,2.854
+	c1.534,0.696,3.196,1.044,4.985,1.044c2.158,0,4.032-0.397,5.623-1.193c1.59-0.795,3.138-1.945,4.644-3.45l1.491,1.448
+	c-0.796,0.767-1.612,1.47-2.45,2.109s-1.732,1.186-2.684,1.64s-1.98,0.81-3.089,1.065
+	C589.851,488.344,588.644,488.472,587.338,488.472z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M515.726,457.927h2.13l13.888,30.033h-2.428l-3.792-8.35H507.93l-3.792,8.35h-2.3
+	L515.726,457.927L515.726,457.927z M524.586,477.608l-7.838-17.253l-7.881,17.253H524.586z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M440.151,458.14h10.821c1.647,0,3.145,0.206,4.494,0.618
+	c1.349,0.412,2.514,1.008,3.493,1.789c0.98,0.781,1.74,1.732,2.279,2.854c0.54,1.122,0.81,2.407,0.81,3.855v0.085
+	c0,1.562-0.313,2.939-0.937,4.132c-0.625,1.193-1.47,2.187-2.535,2.982c-1.065,0.795-2.3,1.392-3.706,1.789
+	c-1.406,0.398-2.889,0.597-4.452,0.597h-8.051v11.119h-2.215V458.14L440.151,458.14z M450.546,474.839
+	c1.392,0,2.655-0.17,3.792-0.511c1.136-0.348,2.108-0.838,2.918-1.484c0.81-0.639,1.441-1.42,1.896-2.336
+	c0.454-0.909,0.682-1.924,0.682-3.039v-0.085c0-1.2-0.22-2.251-0.661-3.153c-0.44-0.895-1.058-1.647-1.853-2.25
+	c-0.795-0.597-1.747-1.051-2.854-1.371c-1.107-0.312-2.329-0.468-3.663-0.468h-8.435v14.697H450.546z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M382.044,457.927h2.13l13.888,30.033h-2.428l-3.792-8.35h-17.594l-3.792,8.35
+	h-2.301L382.044,457.927L382.044,457.927z M390.905,477.608l-7.839-17.253l-7.881,17.253H390.905z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M734.67,515.706c0,7.213-3.147,11.758-9.443,13.634l11.445,15.886h-9.382
+	l-10.444-14.697h-9.693v14.697h-7.38V501.51h16.261c6.671,0,11.444,1.126,14.322,3.377
+	C733.231,507.139,734.67,510.745,734.67,515.706L734.67,515.706z M716.346,523.837c4.169,0,7.005-0.646,8.506-1.939
+	c1.501-1.292,2.251-3.366,2.251-6.223c0-2.855-0.771-4.815-2.313-5.878c-1.543-1.064-4.295-1.596-8.256-1.596h-9.381v15.636H716.346
+	z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M685.538,539.19c-4.419,4.315-9.881,6.473-16.386,6.473
+	c-6.504,0-11.966-2.157-16.385-6.473c-4.42-4.315-6.63-9.694-6.63-16.136s2.21-11.82,6.63-16.136
+	c4.419-4.314,9.881-6.473,16.385-6.473c6.505,0,11.967,2.158,16.386,6.473c4.42,4.315,6.63,9.694,6.63,16.136
+	S689.958,534.875,685.538,539.19L685.538,539.19z M680.129,511.829c-2.981-3.086-6.64-4.628-10.977-4.628
+	c-4.336,0-7.994,1.542-10.976,4.628c-2.98,3.085-4.472,6.827-4.472,11.226s1.491,8.141,4.472,11.227
+	c2.981,3.085,6.64,4.628,10.976,4.628c4.337,0,7.995-1.543,10.977-4.628c2.98-3.086,4.471-6.828,4.471-11.227
+	S683.109,514.914,680.129,511.829z"/>
+<polygon fill-rule="evenodd" clip-rule="evenodd" points="630.591,508.264 630.591,545.226 623.211,545.226 623.211,508.264 
+	609.952,508.264 609.952,501.51 643.849,501.51 643.849,508.264 "/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M579.02,535.281l-4.378,9.944h-7.88l19.263-43.716h7.88l19.263,43.716h-7.88
+	l-4.379-9.944H579.02L579.02,535.281z M597.906,528.464l-7.942-18.011l-7.942,18.011H597.906z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M550.026,545.226h-19.138V501.51H547.9c2.96,0,5.514,0.354,7.661,1.063
+	c2.146,0.709,3.741,1.668,4.784,2.878c2.001,2.251,3.002,4.795,3.002,7.63c0,3.418-1.084,5.962-3.253,7.63
+	c-0.792,0.584-1.334,0.948-1.626,1.094c-0.292,0.146-0.813,0.386-1.563,0.72c2.71,0.584,4.868,1.803,6.474,3.658
+	c1.604,1.855,2.407,4.159,2.407,6.911c0,3.043-1.042,5.732-3.127,8.067C560.199,543.87,555.988,545.226,550.026,545.226
+	L550.026,545.226z M538.269,538.408h11.57c2.71,0,4.784-0.427,6.223-1.281c1.438-0.855,2.157-2.471,2.157-4.848
+	c0-3.877-3.105-5.815-9.318-5.815h-10.632V538.408L538.269,538.408z M538.269,519.646h9.381c5.337,0,8.005-1.813,8.005-5.441
+	c0-2.084-0.646-3.585-1.938-4.503c-1.292-0.917-3.294-1.376-6.004-1.376h-9.443V519.646z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M494.39,535.219c2.001,2.335,4.711,3.502,8.13,3.502s6.129-1.167,8.13-3.502
+	c2.002-2.335,3.002-5.504,3.002-9.506V501.51h7.38v24.516c0,6.296-1.729,11.143-5.19,14.541c-3.461,3.397-7.901,5.097-13.321,5.097
+	s-9.861-1.699-13.321-5.097c-3.461-3.398-5.191-8.245-5.191-14.541V501.51h7.38v24.203
+	C491.388,529.715,492.389,532.884,494.39,535.219z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M460.206,538.533c2.543,0,4.732-0.427,6.567-1.281
+	c1.834-0.855,3.752-2.221,5.753-4.097l4.753,4.878c-4.628,5.128-10.247,7.692-16.854,7.692c-6.609,0-12.091-2.126-16.448-6.379
+	s-6.536-9.632-6.536-16.136s2.22-11.924,6.661-16.26c4.44-4.337,10.048-6.505,16.823-6.505c6.775,0,12.435,2.502,16.979,7.505
+	l-4.69,5.129c-2.084-2.002-4.055-3.398-5.91-4.19c-1.855-0.792-4.034-1.188-6.536-1.188c-4.419,0-8.13,1.428-11.132,4.284
+	c-3.002,2.855-4.503,6.504-4.503,10.944s1.491,8.151,4.472,11.132C452.586,537.043,456.12,538.533,460.206,538.533z"/>
+<polygon fill-rule="evenodd" clip-rule="evenodd" points="422.456,501.51 429.836,501.51 429.836,545.226 421.831,545.226 
+	397.065,513.33 397.065,545.226 389.686,545.226 389.686,501.51 397.065,501.51 422.456,534.155 "/>
+<rect x="371.887" y="501.51" fill-rule="evenodd" clip-rule="evenodd" width="7.379" height="43.716"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="298.3716" y1="547.5273" x2="313.0645" y2="470.1827">
+	<stop  offset="0" style="stop-color:#1A1853"/>
+	<stop  offset="0.5" style="stop-color:#CA2026"/>
+	<stop  offset="1" style="stop-color:#F8991D"/>
+</linearGradient>
+<path fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_1_)" d="M308.331,459.957c-0.003-0.324-0.008-0.649-0.016-0.978
+	c0.067,0.107,0.256,0.435,0.569,0.978H308.331L308.331,459.957z M296.568,494.187c-3.432,6.382-5.389,13.041-5.889,19.971
+	c-0.445,6.171,0.222,11.492,2.021,15.953c0.246,0.607,0.484,1.168,0.722,1.688c-1.422-1.006-2.779-2.055-4.073-3.149
+	c-0.109-0.086-0.188-0.122-0.238-0.109c1.699,2.717,3.816,5.179,6.354,7.387c0.392,0.342,1.046,0.504,1.207,1.007
+	c0.459,1.443-0.789,14.4,3.219,17.419c2.549,1.918,13.815-0.494,17.293-1.617c18.147-5.861,32.222-22.622,30.128-46.777
+	c-2.296-26.491-19.748-53.431-37.154-59.906c-4.705-1.751-5.749-1.591-10.635,0.499c-16.984,7.263-33.667,33.549-35.908,59.407
+	c-2.153,24.846,12.797,41.868,31.693,47.252c0.511,0.146,1.005,0.28,1.485,0.407c-0.487-1.007-0.885-2.148-1.208-3.356
+	c-19.792-5.886-30.863-23.434-29.076-44.051c1.708-19.71,14.918-48.76,34.154-56.987c4.021-1.718,4.402-1.963,8.479-0.446
+	c19.745,7.344,33.537,37.397,35.273,57.434c1.857,21.422-10.222,39.447-31.112,44.609c-2.101,0.519-3.923,0.862-5.629,1.033
+	c-5.413,0.543-7.295,1.501-8.288-4.136c-2.187-12.433-0.534-34.932,4.876-43.565c0.043-0.627,0.007,0.521-0.4,1.501
+	c-0.188,0.44-0.309,0.709-0.362,0.847c-3.24,7.422-5.048,28.953-3.506,33.042c-0.446-1.465,0.353-4.55,1.51-5.183l0.663-0.464
+	c3.628-2.613,5.973-6.718,8.595-11.917c-0.045-0.072-0.13-0.063-0.252,0.025c-1.224,1.023-2.486,1.942-3.783,2.755
+	c2.953-3.102,5.531-7.062,7.741-11.886c-0.06-0.088-0.162-0.072-0.308,0.042c-0.872,0.787-1.76,1.528-2.667,2.224
+	c3.708-6.714,6.974-14.491,7.316-23.379c0.169-5.753-0.883-11.296-3.159-16.59c-0.785-1.81-1.88-3.973-3.292-6.525
+	c-2.087-3.763-3.215-5.801-3.395-6.097c0.093,8.157-1.346,14.788-4.315,19.84c-0.766,1.341-2.125,3.296-4.089,5.859
+	C298.735,490.638,297.397,492.617,296.568,494.187z"/>
+</svg>
diff --git a/images/apache-incubator-ring-new.jpg b/images/apache-incubator-ring-new.jpg
new file mode 100644
index 0000000..340fc68
Binary files /dev/null and b/images/apache-incubator-ring-new.jpg differ
diff --git a/images/apache-incubator-ring-openwhisk-sm.png b/images/apache-incubator-ring-openwhisk-sm.png
new file mode 100644
index 0000000..cc832b1
Binary files /dev/null and b/images/apache-incubator-ring-openwhisk-sm.png differ
diff --git a/images/apache-incubator-ring-openwhisk.png b/images/apache-incubator-ring-openwhisk.png
new file mode 100644
index 0000000..cf41141
Binary files /dev/null and b/images/apache-incubator-ring-openwhisk.png differ
diff --git a/images/apache-openwhisk-test.png b/images/apache-openwhisk-test.png
deleted file mode 100644
index 121e546..0000000
Binary files a/images/apache-openwhisk-test.png and /dev/null differ
diff --git a/images/apache-openwhisk.jpg b/images/apache-openwhisk.jpg
new file mode 100644
index 0000000..0700161
Binary files /dev/null and b/images/apache-openwhisk.jpg differ
diff --git a/images/apache-openwhisk.png b/images/apache-openwhisk.png
deleted file mode 100644
index af45972..0000000
Binary files a/images/apache-openwhisk.png and /dev/null differ
diff --git a/images/apache-openwhisk.svg b/images/apache-openwhisk.svg
index 4450b0b..6328243 100644
--- a/images/apache-openwhisk.svg
+++ b/images/apache-openwhisk.svg
@@ -1,454 +1,24 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="320"
-   height="80"
-   viewBox="0 0 320 80"
-   version="1.1"
-   id="svg4829"
-   sodipodi:docname="apache-openwhisk.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   inkscape:export-filename="/Users/Matt/openwhisk/release/openwhisk-website/images/apache-openwhisk.png"
-   inkscape:export-xdpi="300"
-   inkscape:export-ydpi="300">
-  <metadata
-     id="metadata4833">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>logo/apache-openwhisk</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1623"
-     inkscape:window-height="941"
-     id="namedview4831"
-     showgrid="false"
-     showguides="false"
-     inkscape:zoom="2"
-     inkscape:cx="138.20691"
-     inkscape:cy="21.32511"
-     inkscape:window-x="40"
-     inkscape:window-y="30"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg4829"
-     inkscape:pagecheckerboard="true"
-     borderlayer="false"
-     viewbox-width="10"
-     viewbox-height="21"
-     scale-x="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4835" />
-  </sodipodi:namedview>
-  <!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
-  <title
-     id="title4812">logo/apache-openwhisk</title>
-  <desc
-     id="desc4814">Created with Sketch.</desc>
-  <rect
-     style="display:none;fill:#502d16;fill-opacity:1;stroke:none;stroke-opacity:1"
-     id="rect316"
-     width="320"
-     height="80"
-     x="0"
-     y="0"
-     inkscape:label="bg"
-     inkscape:export-xdpi="72"
-     inkscape:export-ydpi="72" />
-  <defs
-     id="defs4816">
-    <color-profile
-       name="Adobe-RGB--1998-"
-       xlink:href="/System/Library/ColorSync/Profiles/AdobeRGB1998.icc"
-       id="color-profile137" />
-    <filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter4902">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4892" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite4894" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="2"
-         result="blur"
-         id="feGaussianBlur4896" />
-      <feOffset
-         dx="6"
-         dy="6"
-         result="offset"
-         id="feOffset4898" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="fbSourceGraphic"
-         id="feComposite4900" />
-      <feColorMatrix
-         result="fbSourceGraphicAlpha"
-         in="fbSourceGraphic"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
-         id="feColorMatrix4988" />
-      <feFlood
-         id="feFlood4990"
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         in="fbSourceGraphic" />
-      <feComposite
-         in2="fbSourceGraphic"
-         id="feComposite4992"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur4994"
-         in="composite1"
-         stdDeviation="1"
-         result="blur" />
-      <feOffset
-         id="feOffset4996"
-         dx="6"
-         dy="6"
-         result="offset" />
-      <feComposite
-         in2="offset"
-         id="feComposite4998"
-         in="fbSourceGraphic"
-         operator="over"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         result="fbSourceGraphicAlpha"
-         in="fbSourceGraphic"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
-         id="feColorMatrix5000" />
-      <feFlood
-         id="feFlood5002"
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         in="fbSourceGraphic" />
-      <feComposite
-         in2="fbSourceGraphic"
-         id="feComposite5004"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur5006"
-         in="composite1"
-         stdDeviation="1"
-         result="blur" />
-      <feOffset
-         id="feOffset5008"
-         dx="6"
-         dy="6"
-         result="offset" />
-      <feComposite
-         in2="offset"
-         id="feComposite5010"
-         in="fbSourceGraphic"
-         operator="over"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         result="fbSourceGraphicAlpha"
-         in="fbSourceGraphic"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
-         id="feColorMatrix5012" />
-      <feFlood
-         id="feFlood5014"
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         in="fbSourceGraphic" />
-      <feComposite
-         in2="fbSourceGraphic"
-         id="feComposite5016"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur5018"
-         in="composite1"
-         stdDeviation="1"
-         result="blur" />
-      <feOffset
-         id="feOffset5020"
-         dx="6"
-         dy="6"
-         result="offset" />
-      <feComposite
-         in2="offset"
-         id="feComposite5022"
-         in="fbSourceGraphic"
-         operator="over"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         result="fbSourceGraphicAlpha"
-         in="fbSourceGraphic"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
-         id="feColorMatrix5024" />
-      <feFlood
-         id="feFlood5026"
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         in="fbSourceGraphic" />
-      <feComposite
-         in2="fbSourceGraphic"
-         id="feComposite5028"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur5030"
-         in="composite1"
-         stdDeviation="1"
-         result="blur" />
-      <feOffset
-         id="feOffset5032"
-         dx="6"
-         dy="6"
-         result="offset" />
-      <feComposite
-         in2="offset"
-         id="feComposite5034"
-         in="fbSourceGraphic"
-         operator="over"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         result="fbSourceGraphicAlpha"
-         in="fbSourceGraphic"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
-         id="feColorMatrix5036" />
-      <feFlood
-         id="feFlood5038"
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         in="fbSourceGraphic" />
-      <feComposite
-         in2="fbSourceGraphic"
-         id="feComposite5040"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur5042"
-         in="composite1"
-         stdDeviation="1"
-         result="blur" />
-      <feOffset
-         id="feOffset5044"
-         dx="6"
-         dy="6"
-         result="offset" />
-      <feComposite
-         in2="offset"
-         id="feComposite5046"
-         in="fbSourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter4342">
-      <feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(255,255,255)"
-         result="flood"
-         id="feFlood4332" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite4334" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="0.2"
-         result="blur"
-         id="feGaussianBlur4336" />
-      <feOffset
-         dx="1.38778e-16"
-         dy="1.38778e-16"
-         result="offset"
-         id="feOffset4338" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="fbSourceGraphic"
-         id="feComposite4340" />
-      <feColorMatrix
-         result="fbSourceGraphicAlpha"
-         in="fbSourceGraphic"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
-         id="feColorMatrix4344" />
-      <feFlood
-         id="feFlood4346"
-         flood-opacity="0.933333"
-         flood-color="rgb(255,255,255)"
-         result="flood"
-         in="fbSourceGraphic" />
-      <feComposite
-         in2="fbSourceGraphic"
-         id="feComposite4348"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur4350"
-         in="composite1"
-         stdDeviation="0.2"
-         result="blur" />
-      <feOffset
-         id="feOffset4352"
-         dx="1.38778e-16"
-         dy="1.38778e-16"
-         result="offset" />
-      <feComposite
-         in2="offset"
-         id="feComposite4354"
-         in="fbSourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
-  </defs>
-  <g
-     id="Symbols"
-     style="display:inline;fill:none;fill-rule:evenodd;stroke:none;stroke-width:1"
-     transform="translate(0,99.98738)"
-     inkscape:label="Composite">
-    <g
-       aria-label="APACHE"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
-       id="text3766"
-       transform="translate(-270.24264,-30.292893)"
-       inkscape:label="APACHE">
-      <path
-         d="m 376.92412,-44.191035 h -5.55989 l -1.2487,3.463542 h -1.80469 l 5.06771,-13.270833 h 1.53125 l 5.07682,13.270833 h -1.79557 z m -5.03125,-1.440104 h 4.51172 l -2.26041,-6.207031 z"
-         id="path3790"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 383.52308,-45.922806 v 5.195313 h -1.75 v -13.270833 h 4.89453 q 2.17839,0 3.40886,1.111979 1.23958,1.111979 1.23958,2.94401 0,1.932292 -1.21224,2.980469 -1.20312,1.039062 -3.45443,1.039062 z m 0,-1.430989 h 3.14453 q 1.40365,0 2.15104,-0.65625 0.7474,-0.665365 0.7474,-1.914063 0,-1.184895 -0.7474,-1.895833 -0.74739,-0.710937 -2.05078,-0.738281 h -3.24479 z"
-         id="path3792"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 399.63766,-44.191035 h -5.55989 l -1.2487,3.463542 h -1.80469 l 5.06771,-13.270833 h 1.53125 l 5.07682,13.270833 h -1.79557 z m -5.03125,-1.440104 h 4.51172 l -2.26041,-6.207031 z"
-         id="path3794"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 414.13897,-44.938431 q -0.2461,2.105469 -1.5586,3.253906 -1.30338,1.139323 -3.47265,1.139323 -2.35157,0 -3.77344,-1.686197 -1.41276,-1.686198 -1.41276,-4.511719 v -1.276042 q 0,-1.85026 0.65625,-3.253906 0.66536,-1.403646 1.8776,-2.151041 1.21224,-0.756511 2.80729,-0.756511 2.11459,0 3.39063,1.184896 1.27604,1.175781 1.48568,3.263021 h -1.75912 q -0.22786,-1.585938 -0.99349,-2.296875 -0.75651,-0.710938 -2.1237,-0.710938 -1.67708,0 -2.63411,1.239584 -0.94792,1.239583 -0.9479 [...]
-         id="path3796"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 426.71709,-40.727493 h -1.75911 v -6.134115 h -6.69011 v 6.134115 h -1.75 v -13.270833 h 1.75 v 5.705729 h 6.69011 v -5.705729 h 1.75911 z"
-         id="path3798"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 437.32646,-46.861608 h -5.7513 v 4.703125 h 6.68099 v 1.43099 h -8.43099 v -13.270833 h 8.33985 v 1.440104 h -6.58985 v 4.265625 h 5.7513 z"
-         id="path3800"
-         inkscape:connector-curvature="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="117px" height="21px" viewBox="0 0 117 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
+    <title>apache-openwhisk</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Menu" transform="translate(-268.000000, -33.000000)">
+            <g id="apache-openwhisk" transform="translate(268.000000, 33.000000)">
+                <g id="Group-23">
+                    <polygon id="Fill-1" fill="#008571" points="25.2758696 -0.000123046875 15.5374551 0.002953125 25.2704439 17.2264395 30.1426654 8.61192773"></polygon>
+                    <polygon id="Fill-2" fill="#6EEDD8" points="15.537636 0.00313769531 10.7582532 8.61334277 20.4055143 8.60877604"></polygon>
+                    <polygon id="Fill-3" fill="#325C80" points="0 11.0757568 4.82037648 19.6878076 14.4659522 19.6841162 4.82580212 2.46124512"></polygon>
+                    <polygon id="Fill-4" fill="#5AAAFA" points="9.64569633 11.077418 14.4660728 19.6845469 19.2912721 11.0743418"></polygon>
+                </g>
+                <text id="TM" font-family="Lato-Medium, Lato" font-size="4" font-weight="400" fill="#29558F">
+                    <tspan x="111" y="11">TM</tspan>
+                </text>
+                <path d="M48.349,13.4725735 C48.349,14.2239106 48.2300012,14.9134037 47.992,15.5410735 C47.7539988,16.1687433 47.4180022,16.7089046 46.984,17.1615735 C46.5499978,17.6142424 46.028503,17.9654056 45.4195,18.2150735 C44.810497,18.4647414 44.137337,18.5895735 43.4,18.5895735 C42.662663,18.5895735 41.9906697,18.4647414 41.384,18.2150735 C40.7773303,17.9654056 40.2570022,17.6142424 39.823,17.1615735 C39.3889978,16.7089046 39.0530012,16.1687433 38.815,15.5410735 C38.5769988,14.9 [...]
+                <path d="M42.29,4.1275 L41.5445,2.178 C41.4908331,2.04499933 41.4371669,1.87700101 41.3835,1.674 C41.3578332,1.77433383 41.3315835,1.86766623 41.30475,1.954 C41.2779165,2.04033376 41.2516668,2.11733299 41.226,2.185 L40.484,4.1275 L42.29,4.1275 Z M43.7635,6 L43.1895,6 C43.1241663,6 43.0705002,5.98366683 43.0285,5.951 C42.9864998,5.91833317 42.9561668,5.87633359 42.9375,5.825 L42.493,4.6595 L40.2775,4.6595 L39.833,5.825 C39.8166666,5.86933355 39.7863336,5.90958315 39.742,5. [...]
+            </g>
+        </g>
     </g>
-    <g
-       aria-label="OpenWhisk"
-       style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:42.66666794px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto, Medium';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none"
-       id="text3762"
-       transform="translate(-270.24264,-30.292893)"
-       inkscape:label="OpenWhisk">
-      <path
-         d="m 392.51881,-19.393603 q 0,4.458333 -1.54167,7.833333 -1.54166,3.3541671 -4.41666,5.1666671 -2.85417,1.7916667 -6.58334,1.7916667 -3.6875,0 -6.58333,-1.7916667 -2.875,-1.8125 -4.45833,-5.1458331 -1.5625,-3.333334 -1.58334,-7.687501 v -1.708333 q 0,-4.4375 1.5625,-7.833334 1.58334,-3.395833 4.4375,-5.1875 2.875,-1.8125 6.58334,-1.8125 3.70833,0 6.5625,1.791667 2.875,1.770833 4.4375,5.125 1.5625,3.333334 1.58333,7.770834 z m -5.27083,-1.583334 q 0,-5.041666 -1.91667,-7.729167 - [...]
-         id="path3771"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 417.06048,-16.06027 q 0,5.229167 -2.375,8.3541671 -2.375,3.1041667 -6.375,3.1041667 -3.70834,0 -5.9375,-2.4375 V 3.6480641 h -5.0625 V -27.56027 h 4.66666 l 0.20834,2.291667 q 2.22916,-2.708334 6.0625,-2.708334 4.125,0 6.45833,3.083334 2.35417,3.0625 2.35417,8.520833 z m -5.04167,-0.4375 q 0,-3.375 -1.35417,-5.354167 -1.33333,-1.979166 -3.83333,-1.979166 -3.10417,0 -4.45833,2.5625 v 10 q 1.375,2.625 4.5,2.625 2.41666,0 3.77083,-1.9375 1.375,-1.958333 1.375,-5.916667 z"
-         id="path3773"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 431.24798,-4.6019362 q -4.8125,0 -7.8125,-3.0208334 -2.97917,-3.0416664 -2.97917,-8.0833334 v -0.625 q 0,-3.375 1.29167,-6.020834 1.3125,-2.666666 3.66666,-4.145833 2.35417,-1.479167 5.25,-1.479167 4.60417,0 7.10417,2.9375 2.52083,2.9375 2.52083,8.3125 v 2.041667 h -14.72916 q 0.22916,2.791667 1.85416,4.416667 1.64584,1.625 4.125,1.625 3.47917,0 5.66667,-2.8125 l 2.72917,2.6041667 q -1.35417,2.0208334 -3.625,3.1458334 -2.25,1.1041667 -5.0625,1.1041667 z m -0.60417,-19.31250 [...]
-         id="path3775"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 448.93548,-27.56027 0.14583,2.604167 q 2.5,-3.020834 6.5625,-3.020834 7.04167,0 7.16667,8.0625 v 14.8958342 h -5.0625 V -19.62277 q 0,-2.145833 -0.9375,-3.166667 -0.91667,-1.041666 -3.02083,-1.041666 -3.0625,0 -4.5625,2.770833 v 16.0416672 h -5.0625 V -27.56027 Z"
-         id="path3777"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 492.26881,-12.518603 4.66667,-22.833334 h 5.22917 l -7,30.3333342 h -5.04167 l -5.77083,-22.1458342 -5.89584,22.1458342 h -5.0625 l -7,-30.3333342 h 5.22917 l 4.70833,22.791667 5.79167,-22.791667 h 4.41667 z"
-         id="path3779"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 510.56048,-25.101937 q 2.47916,-2.875 6.27083,-2.875 7.20833,0 7.3125,8.229167 v 14.7291672 h -5.0625 V -19.56027 q 0,-2.333333 -1.02083,-3.291667 -1,-0.979166 -2.95834,-0.979166 -3.04166,0 -4.54166,2.708333 v 16.1041672 h -5.0625 V -37.018604 h 5.0625 z"
-         id="path3781"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 534.62298,-5.0186028 h -5.0625 V -27.56027 h 5.0625 z m -5.375,-28.3958342 q 0,-1.166667 0.72917,-1.9375 0.75,-0.770833 2.125,-0.770833 1.375,0 2.125,0.770833 0.75,0.770833 0.75,1.9375 0,1.145833 -0.75,1.916667 -0.75,0.75 -2.125,0.75 -1.375,0 -2.125,-0.75 -0.72917,-0.770834 -0.72917,-1.916667 z"
-         id="path3783"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 552.78965,-11.143603 q 0,-1.354167 -1.125,-2.0625 -1.10416,-0.708333 -3.6875,-1.25 -2.58333,-0.541667 -4.3125,-1.375 -3.79166,-1.833334 -3.79166,-5.3125 0,-2.916667 2.45833,-4.875 2.45833,-1.958334 6.25,-1.958334 4.04167,0 6.52083,2 2.5,2 2.5,5.1875 h -5.0625 q 0,-1.458333 -1.08333,-2.416666 -1.08333,-0.979167 -2.875,-0.979167 -1.66667,0 -2.72917,0.770833 -1.04166,0.770834 -1.04166,2.0625 0,1.166667 0.97916,1.8125 0.97917,0.645834 3.95834,1.3125 2.97916,0.645834 4.66666,1.5 [...]
-         id="path3785"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 569.47715,-14.68527 -2.25,2.3125 v 7.3541672 h -5.0625 V -37.018604 h 5.0625 v 18.458334 l 1.58334,-1.979167 6.22916,-7.020833 h 6.08334 l -8.375,9.395833 9.27083,13.1458342 h -5.85417 z"
-         id="path3787"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       id="logo/apache-openwhisk"
-       transform="matrix(2.4119277,0,0,3.1894433,10.43614,-95.75773)">
-      <g
-         id="Group-23">
-        <polygon
-           id="Fill-1"
-           points="25.27587,-0.00012304688 15.537455,0.002953125 25.270444,17.22644 30.142665,8.6119277 "
-           style="fill:#008571"
-           transform="translate(-0.62024743,1.175636)" />
-        <polygon
-           id="Fill-2"
-           points="20.405514,8.608776 15.537636,0.0031376953 10.758253,8.6133428 "
-           style="fill:#6eedd8"
-           transform="translate(-0.62024743,1.175636)" />
-        <polygon
-           id="Fill-3"
-           points="0,11.075757 4.8203765,19.687808 14.465952,19.684116 4.8258021,2.4612451 "
-           style="fill:#325c80;filter:url(#filter4342)"
-           transform="translate(-0.62024743,1.175636)" />
-        <polygon
-           id="Fill-4"
-           points="19.291272,11.074342 9.6456963,11.077418 14.466073,19.684547 "
-           style="fill:#5aaafa"
-           transform="translate(-0.62024743,1.175636)" />
-      </g>
-    </g>
-  </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/images/apache-openwhisk@2x.jpg b/images/apache-openwhisk@2x.jpg
new file mode 100644
index 0000000..2a7b5da
Binary files /dev/null and b/images/apache-openwhisk@2x.jpg differ
diff --git a/images/arrow-down.svg b/images/arrow-down.svg
deleted file mode 100644
index 4f2e263..0000000
--- a/images/arrow-down.svg
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="481.728px" height="481.728px" viewBox="0 0 481.728 481.728" style="enable-background:new 0 0 481.728 481.728;"
-	 xml:space="preserve">
-<g>
-	<g>
-		<path d="M10.467,146.592l198.857,252.903c17.417,30.532,45.661,30.532,63.085,0l198.839-252.867
-			c3.886-5.532,8.072-15.41,8.923-22.118c2.735-21.738,4.908-65.178-21.444-65.178H23.013c-26.353,0-24.192,43.415-21.463,65.147
-			C2.395,131.188,6.587,141.06,10.467,146.592z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
diff --git a/images/arrow-right.svg b/images/arrow-right.svg
deleted file mode 100644
index 74f4ef6..0000000
--- a/images/arrow-right.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="552.611px" height="552.611px" viewBox="0 0 552.611 552.611" style="enable-background:new 0 0 552.611 552.611;"
-	 xml:space="preserve">
-<g>
-	<g>
-		<path d="M486.413,221.412L122.347,12.916c-52.938-30.318-95.852-5.44-95.852,55.563v415.652c0,61.004,42.914,85.882,95.852,55.563
-			l364.066-208.49C539.351,300.887,539.351,251.731,486.413,221.412z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
diff --git a/images/deployments/OW-Deployments.png b/images/deployments/OW-Deployments.png
deleted file mode 100644
index e387fcb..0000000
Binary files a/images/deployments/OW-Deployments.png and /dev/null differ
diff --git a/images/deployments/OW-Deployments.pptx b/images/deployments/OW-Deployments.pptx
deleted file mode 100644
index f17d49f..0000000
Binary files a/images/deployments/OW-Deployments.pptx and /dev/null differ
diff --git a/images/deployments/logo-docker-compose-notext.png b/images/deployments/logo-docker-compose-notext.png
deleted file mode 100644
index 9bc5eb2..0000000
Binary files a/images/deployments/logo-docker-compose-notext.png and /dev/null differ
diff --git a/images/deployments/logo-docker-compose-text.png b/images/deployments/logo-docker-compose-text.png
deleted file mode 100644
index f00e09b..0000000
Binary files a/images/deployments/logo-docker-compose-text.png and /dev/null differ
diff --git a/images/deployments/logo-docker-compose-text.svg b/images/deployments/logo-docker-compose-text.svg
deleted file mode 100644
index 133fd21..0000000
--- a/images/deployments/logo-docker-compose-text.svg
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="4.6861639in"
-   height="2.6773963in"
-   viewBox="0 0 119.02857 68.005867"
-   version="1.1"
-   id="svg1410"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   sodipodi:docname="logo-docker-compose-text.svg"
-   inkscape:export-filename="/Users/Matt/openwhisk/release/openwhisk-website/images/deployments/logo-docker-compose-text.png"
-   inkscape:export-xdpi="3000"
-   inkscape:export-ydpi="3000">
-  <defs
-     id="defs1404">
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath2181">
-      <rect
-         style="fill:#325c80;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1"
-         id="rect2183"
-         width="54.927811"
-         height="68.005867"
-         x="45.54388"
-         y="54.594818" />
-    </clipPath>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.1127104"
-     inkscape:cx="121.67587"
-     inkscape:cy="63.358841"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:pagecheckerboard="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1680"
-     inkscape:window-height="964"
-     inkscape:window-x="25"
-     inkscape:window-y="44"
-     inkscape:window-maximized="0"
-     units="in" />
-  <metadata
-     id="metadata1407">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-44.354967,-54.832601)">
-    <image
-       y="52.58419"
-       x="40.788223"
-       id="image2166"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADbCAYAAAAoGt6rAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAABYlAAAWJQFJUiTwAAAAB3RJTUUH3wkPBxAoAPfaUwAAIABJREFUeNrsnXd8HNW597/nzMw2 rXqXZVu23CvG3TRTTK8XSCVACAQChIRAuCn3vaTeBBJKGiQ3hEDKTXKpoZlisMHYuPfeZVmyJKuX 7XPO+8espJW0Kzu5IcH2/vzxR9rd2dnR7Pmdpz8PpJFGGmmkkUYaaaSRRhpppJFGGmmkkUYaaaSR RhpppJFGGmmkkcbfi+nTZw76+qzpp6ZvUhonH6ZMmdrz+1fvvcdbXj70jKysrC8XFhZ+Nz8vb8G/ XXrJsO7XR1UMP67+NpH+etNIxK69OxlTOXbQY9at3MapsycwduxYdu7cCWBlZuV/eu [...]
-       preserveAspectRatio="none"
-       height="70.967621"
-       width="64.810608"
-       clip-path="url(#clipPath2181)"
-       transform="translate(-1.1889138,0.23778275)" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-       x="101.15201"
-       y="87.171028"
-       id="text2171"><tspan
-         sodipodi:role="line"
-         id="tspan2169"
-         x="101.15201"
-         y="87.171028"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.11111069px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332">docker</tspan><tspan
-         sodipodi:role="line"
-         x="101.15201"
-         y="104.80991"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.69999981px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332"
-         id="tspan2173"><tspan
-   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.11111069px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
-   id="tspan21">compos</tspan>e</tspan></text>
-  </g>
-</svg>
diff --git a/images/deployments/logo-kubernetes-notext.png b/images/deployments/logo-kubernetes-notext.png
deleted file mode 100644
index d513829..0000000
Binary files a/images/deployments/logo-kubernetes-notext.png and /dev/null differ
diff --git a/images/deployments/logo-kubernetes-notext.svg b/images/deployments/logo-kubernetes-notext.svg
deleted file mode 100644
index 1b00f1f..0000000
--- a/images/deployments/logo-kubernetes-notext.svg
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="198.35141mm"
-   height="192.45596mm"
-   viewBox="0 0 198.35141 192.45596"
-   version="1.1"
-   id="svg2520"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   sodipodi:docname="logo-kubernetes-notext.svg">
-  <defs
-     id="defs2514" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.0324628"
-     inkscape:cx="285.73023"
-     inkscape:cy="363.69749"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:pagecheckerboard="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="964"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata2517">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-221.3481,-137.27202)">
-    <g
-       id="g2602"
-       style="display:inline"
-       inkscape:label="Kubernetes logo"
-       inkscape:export-xdpi="25.605967"
-       inkscape:export-ydpi="25.605967">
-      <ellipse
-         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.27519625;stroke-opacity:1"
-         id="path18"
-         cx="321.03491"
-         cy="239.65109"
-         rx="81.492043"
-         ry="77.776199"
-         inkscape:label="white background" />
-      <path
-         style="display:inline;fill:#316ce5;stroke-width:0.05509761"
-         d="m 280.85352,329.67288 c -0.16667,-0.0204 -0.24105,-0.044 -0.16529,-0.0524 0.0758,-0.008 -0.085,-0.0499 -0.3573,-0.0924 -3.1469,-0.49019 -6.02231,-2.10099 -8.0344,-4.50085 -0.28416,-0.33893 -10.96361,-13.60826 -23.7321,-29.48739 -12.76849,-15.87913 -23.48563,-29.20587 -23.81587,-29.61497 -1.52516,-1.88939 -2.40899,-3.60726 -2.87725,-5.5924 -0.41484,-1.75871 -0.46256,-3.69472 -0.13338,-5.41189 0.16657,-0.86895 17.04428,-74.24274 17.26802,-75.07062 0.61127,-2.26183 1.84271,-4.32 [...]
-         id="path2604"
-         inkscape:connector-curvature="0"
-         inkscape:label="blue foreground" />
-    </g>
-  </g>
-</svg>
diff --git a/images/deployments/logo-kubernetes-text.png b/images/deployments/logo-kubernetes-text.png
deleted file mode 100644
index 8b65992..0000000
Binary files a/images/deployments/logo-kubernetes-text.png and /dev/null differ
diff --git a/images/deployments/logo-kubernetes-text.svg b/images/deployments/logo-kubernetes-text.svg
deleted file mode 100644
index 87e6976..0000000
--- a/images/deployments/logo-kubernetes-text.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="169.48636mm"
-   height="52.262974mm"
-   viewBox="0 0 169.48636 52.262973"
-   version="1.1"
-   id="svg2520"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   sodipodi:docname="logo-kubernetes-text.svg">
-  <defs
-     id="defs2514">
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath146">
-      <rect
-         style="fill:#325c80;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1"
-         id="rect148"
-         width="78.800171"
-         height="27.010019"
-         x="184.18977"
-         y="151.36804" />
-    </clipPath>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.0324628"
-     inkscape:cx="237.03169"
-     inkscape:cy="-25.722029"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:pagecheckerboard="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="964"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata2517">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-229.62017,-174.4311)">
-    <g
-       id="g2602"
-       style="display:inline"
-       inkscape:label="Kubernetes logo"
-       inkscape:export-xdpi="25.605967"
-       inkscape:export-ydpi="25.605967"
-       transform="matrix(0.27158127,0,0,0.27158127,169.48672,137.15038)">
-      <ellipse
-         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.27519625;stroke-opacity:1"
-         id="path18"
-         cx="321.03491"
-         cy="239.65109"
-         rx="81.492043"
-         ry="77.776199"
-         inkscape:label="white background" />
-      <path
-         style="display:inline;fill:#316ce5;stroke-width:0.05509761"
-         d="m 280.85352,329.67288 c -0.16667,-0.0204 -0.24105,-0.044 -0.16529,-0.0524 0.0758,-0.008 -0.085,-0.0499 -0.3573,-0.0924 -3.1469,-0.49019 -6.02231,-2.10099 -8.0344,-4.50085 -0.28416,-0.33893 -10.96361,-13.60826 -23.7321,-29.48739 -12.76849,-15.87913 -23.48563,-29.20587 -23.81587,-29.61497 -1.52516,-1.88939 -2.40899,-3.60726 -2.87725,-5.5924 -0.41484,-1.75871 -0.46256,-3.69472 -0.13338,-5.41189 0.16657,-0.86895 17.04428,-74.24274 17.26802,-75.07062 0.61127,-2.26183 1.84271,-4.32 [...]
-         id="path2604"
-         inkscape:connector-curvature="0"
-         inkscape:label="blue foreground" />
-    </g>
-    <path
-       style="fill:#000000;stroke-width:0.38453016"
-       d="m 289.84146,200.79053 c 0,-7.60387 0.004,-7.64702 0.86519,-7.87761 2.21412,-0.59337 2.21106,-0.59901 2.21106,4.06914 v 4.3115 l 1.83972,-1.81206 c 1.6353,-1.61071 2.02919,-1.81205 3.54487,-1.81205 h 1.70513 l -2.27872,2.30274 -2.27873,2.30277 1.18052,1.25414 c 1.27628,1.35587 3.20875,4.13338 3.20875,4.61191 0,0.1624 -0.68384,0.29528 -1.51964,0.29528 -1.35465,0 -1.64206,-0.17746 -2.64696,-1.63426 -0.62003,-0.89883 -1.49353,-1.96389 -1.94113,-2.36678 l -0.81381,-0.73253 v 2.36678 [...]
-       id="path150"
-       inkscape:connector-curvature="0"
-       inkscape:label="Kubernetes Text" />
-  </g>
-</svg>
diff --git a/images/elements/OW-Abstract Architecture Diagram.png b/images/elements/OW-Abstract Architecture Diagram.png
deleted file mode 100644
index 8007c7f..0000000
Binary files a/images/elements/OW-Abstract Architecture Diagram.png and /dev/null differ
diff --git a/images/elements/OW-Abstract Architecture Diagram.pptx b/images/elements/OW-Abstract Architecture Diagram.pptx
deleted file mode 100644
index beb7916..0000000
Binary files a/images/elements/OW-Abstract Architecture Diagram.pptx and /dev/null differ
diff --git a/images/elements/drawing-8-sided-cog.svg b/images/elements/drawing-8-sided-cog.svg
deleted file mode 100644
index 0d60da2..0000000
--- a/images/elements/drawing-8-sided-cog.svg
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="60.060417mm"
-   height="60.325001mm"
-   viewBox="0 0 60.060417 60.325001"
-   version="1.1"
-   id="svg8983"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   sodipodi:docname="drawing-8-sided-cog-.svg"
-   inkscape:export-filename="/Users/Matt/openwhisk/release/openwhisk-website/images/elements/drawing-cog-gray.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96">
-  <defs
-     id="defs8977" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.56862745"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="105.5"
-     inkscape:cy="74.000001"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:pagecheckerboard="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1680"
-     inkscape:window-height="961"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata8980">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="8-sided cog"
-     id="layer1"
-     transform="translate(-0.96385121,-235.84346)"
-     inkscape:groupmode="layer"
-     style="opacity:1">
-    <path
-       inkscape:label="light aquamarine"
-       style="display:inline;opacity:1;fill:#6aeffa;fill-opacity:1;stroke:#acacac;stroke-width:0.26458335;stroke-opacity:1"
-       d="m 28.943539,295.70742 c 1.055026,-0.0502 2.781432,-0.0502 3.836458,0 1.055026,0.0502 0.191823,0.0913 -1.918229,0.0913 -2.110052,0 -2.973255,-0.0411 -1.918229,-0.0913 z m -1.367994,-0.65525 c -0.05549,-0.18641 -0.494298,-1.93017 -0.975123,-3.87503 -0.780714,-3.15788 -0.946252,-3.56503 -1.547586,-3.80634 -0.370348,-0.14862 -1.66706,-0.73026 -2.881582,-1.29253 -1.214522,-0.56227 -2.405147,-1.02212 -2.645833,-1.02188 -0.240686,2.3e-4 -1.866361,0.89197 -3.612611,1.98164 -1.74625,1.0 [...]
-       id="path9323"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path9321"
-       d="m 28.943539,295.70742 c 1.055026,-0.0502 2.781432,-0.0502 3.836458,0 1.055026,0.0502 0.191823,0.0913 -1.918229,0.0913 -2.110052,0 -2.973255,-0.0411 -1.918229,-0.0913 z m -1.367994,-0.65525 c -0.05549,-0.18641 -0.494298,-1.93017 -0.975123,-3.87503 -0.780714,-3.15788 -0.946252,-3.56503 -1.547586,-3.80634 -0.370348,-0.14862 -1.66706,-0.73026 -2.881582,-1.29253 -1.214522,-0.56227 -2.405147,-1.02212 -2.645833,-1.02188 -0.240686,2.3e-4 -1.866361,0.89197 -3.612611,1.98164 -1.74625,1.0 [...]
-       style="display:inline;opacity:1;fill:#6eedd8;fill-opacity:1;stroke:#acacac;stroke-width:0.26458335;stroke-opacity:1"
-       inkscape:label="deep aquamarine" />
-    <path
-       style="display:inline;opacity:1;fill:#acacac;fill-opacity:1;stroke:#acacac;stroke-width:0.26458335;stroke-opacity:1"
-       d="m 28.943539,295.70742 c 1.055026,-0.0502 2.781432,-0.0502 3.836458,0 1.055026,0.0502 0.191823,0.0913 -1.918229,0.0913 -2.110052,0 -2.973255,-0.0411 -1.918229,-0.0913 z m -1.367994,-0.65525 c -0.05549,-0.18641 -0.494298,-1.93017 -0.975123,-3.87503 -0.780714,-3.15788 -0.946252,-3.56503 -1.547586,-3.80634 -0.370348,-0.14862 -1.66706,-0.73026 -2.881582,-1.29253 -1.214522,-0.56227 -2.405147,-1.02212 -2.645833,-1.02188 -0.240686,2.3e-4 -1.866361,0.89197 -3.612611,1.98164 -1.74625,1.0 [...]
-       id="path9219"
-       inkscape:connector-curvature="0"
-       inkscape:label="medium gray" />
-  </g>
-</svg>
diff --git a/images/elements/drawing-cog-lt-aquamarine.png b/images/elements/drawing-cog-lt-aquamarine.png
deleted file mode 100644
index 9089651..0000000
Binary files a/images/elements/drawing-cog-lt-aquamarine.png and /dev/null differ
diff --git a/images/elements/drawing-cog-med-gray.png b/images/elements/drawing-cog-med-gray.png
deleted file mode 100644
index dfd4cac..0000000
Binary files a/images/elements/drawing-cog-med-gray.png and /dev/null differ
diff --git a/images/elements/drawing-events-data.png b/images/elements/drawing-events-data.png
deleted file mode 100644
index 73d377f..0000000
Binary files a/images/elements/drawing-events-data.png and /dev/null differ
diff --git a/images/elements/drawing-events-data.svg b/images/elements/drawing-events-data.svg
deleted file mode 100644
index 2d03561..0000000
--- a/images/elements/drawing-events-data.svg
+++ /dev/null
@@ -1,317 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="185.18349"
-   height="176.79234"
-   viewBox="0 0 185.18348 176.79234"
-   version="1.1"
-   id="svg13"
-   sodipodi:docname="drawing-events-data.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   inkscape:export-filename="/Users/Matt/openwhisk/release/openwhisk-website/images/elements/drawing-events-data.png"
-   inkscape:export-xdpi="3000"
-   inkscape:export-ydpi="3000">
-  <metadata
-     id="metadata17">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>icon-slack</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1509"
-     inkscape:window-height="925"
-     id="namedview15"
-     showgrid="false"
-     inkscape:pagecheckerboard="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="4.093823"
-     inkscape:cx="100.38351"
-     inkscape:cy="90.602165"
-     inkscape:window-x="86"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="layer1"
-     units="px" />
-  <!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
-  <title
-     id="title2">icon-slack</title>
-  <desc
-     id="desc4">Created with Sketch.</desc>
-  <ellipse
-     style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922"
-     id="path1170"
-     cx="90.38575"
-     cy="86.190178"
-     inkscape:label="background circle"
-     rx="89.155853"
-     ry="84.960281"
-     inkscape:export-xdpi="96"
-     inkscape:export-ydpi="96" />
-  <defs
-     id="defs6" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="icons"
-     style="display:inline">
-    <g
-       id="g2519"
-       transform="matrix(0.1566537,0,0,0.15019254,82.842991,18.277773)"
-       inkscape:label="cloud data"
-       style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1">
-      <g
-         id="g2462"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1">
-        <g
-           id="g2460"
-           style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1">
-          <path
-             id="path2458"
-             d="M 415.81,246.993 C 445.527,178.82 427.188,135.468 412.314,114.587 389.653,82.9 348.431,65.515 312.263,72.475 249.302,84.489 222.477,127.141 222.477,215.21 v 73.545 l -36.804,-36.804 c -6.198,-6.198 -16.273,-6.198 -22.47,0 -6.198,6.198 -6.198,16.273 0,22.47 l 63.946,63.915 c 3.21,3.21 7.437,4.672 11.632,4.577 4.195,0.127 8.422,-1.367 11.632,-4.577 l 64.232,-64.201 c 6.198,-6.198 6.198,-16.304 0,-22.502 -6.166,-6.198 -16.273,-6.198 -22.47,0 l -37.916,37.916 V 215.21 c 0,-91 [...]
-             style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-      <g
-         id="g2464"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2466"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2468"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2470"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2472"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2474"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2476"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2478"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2480"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2482"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2484"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2486"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2488"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2490"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2492"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-    </g>
-    <g
-       id="g2754"
-       transform="matrix(0.1919277,0,0,0.1919277,19.612708,43.513017)"
-       style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1"
-       inkscape:label="Network storage">
-      <g
-         id="g2695"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1">
-        <path
-           id="path2687"
-           d="M 254.5,108 H 38.5 C 17.271,108 0,125.271 0,146.5 0,167.729 17.271,185 38.5,185 h 144.007 c 6.449,-12.326 19.357,-20.762 34.206,-20.762 3.249,0 6.469,0.408 9.598,1.215 l 5.585,-2.604 c 0.322,-1.499 0.738,-2.962 1.23,-4.388 -4.879,-1.79 -8.376,-6.469 -8.376,-11.96 0,-7.03 5.72,-12.75 12.75,-12.75 4.29,0 8.085,2.137 10.396,5.395 6.235,-4.265 13.743,-6.746 21.725,-6.746 8.523,0 16.405,2.783 22.797,7.48 C 289.27,121.796 273.47,108 254.5,108 Z m -173,48.5 h -35 c -5.514,0 -10,-4 [...]
-           inkscape:connector-curvature="0"
-           style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-        <path
-           id="path2689"
-           d="m 235.421,249.065 c -4.59,-0.758 -8.352,-3.967 -9.899,-8.24 l -0.616,-0.295 c -2.689,0.587 -5.437,0.883 -8.192,0.883 -21.277,0 -38.587,-17.31 -38.587,-38.586 0,-1.635 0.114,-3.244 0.313,-4.826 H 38.5 C 17.271,198 0,215.271 0,236.5 0,257.729 17.271,275 38.5,275 h 216 c 4.967,0 9.713,-0.956 14.077,-2.677 -14.533,-0.875 -27.425,-10.09 -33.156,-23.258 z M 81.5,246.5 h -35 c -5.514,0 -10,-4.486 -10,-10 0,-5.514 4.486,-10 10,-10 h 35 c 5.514,0 10,4.486 10,10 0,5.514 -4.486,10 -10,10 z"
-           inkscape:connector-curvature="0"
-           style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-        <path
-           id="path2691"
-           d="m 38.5,95 h 216 C 275.728,95 293,77.729 293,56.5 293,35.271 275.728,18 254.5,18 H 38.5 C 17.271,18 0,35.271 0,56.5 0,77.729 17.271,95 38.5,95 Z m 199,-51.25 c 7.03,0 12.75,5.72 12.75,12.75 0,7.03 -5.72,12.75 -12.75,12.75 -7.03,0 -12.75,-5.72 -12.75,-12.75 0,-7.03 5.72,-12.75 12.75,-12.75 z m -191,2.75 h 35 c 5.514,0 10,4.486 10,10 0,5.514 -4.486,10 -10,10 h -35 c -5.514,0 -10,-4.486 -10,-10 0,-5.514 4.486,-10 10,-10 z"
-           inkscape:connector-curvature="0"
-           style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-        <path
-           id="path2693"
-           d="m 270.585,215.227 c -5.9,0 -11.156,2.773 -14.563,7.073 l -23.025,-11.039 c 1.298,-2.535 2.046,-5.398 2.046,-8.436 0,-2.74 -0.611,-5.335 -1.68,-7.679 l 23.126,-10.787 c 3.344,3.219 7.878,5.212 12.875,5.212 10.249,0 18.587,-8.337 18.587,-18.586 0,-10.249 -8.338,-18.587 -18.587,-18.587 -10.249,0 -18.587,8.338 -18.587,18.587 0,1.63 0.232,3.204 0.628,4.712 l -24.809,11.571 c -2.92,-1.91 -6.4,-3.031 -10.142,-3.031 -10.249,0 -18.586,8.338 -18.586,18.588 0,10.249 8.337,18.586 18.58 [...]
-           inkscape:connector-curvature="0"
-           style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      </g>
-      <g
-         id="g2697"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2699"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2701"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2703"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2705"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2707"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2709"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2711"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2713"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2715"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2717"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2719"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2721"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2723"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g2725"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-    </g>
-    <g
-       id="g3098"
-       transform="matrix(0.10037617,0,0,0.10788538,74.503183,100.70719)"
-       inkscape:label="security"
-       style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1">
-      <g
-         id="g3035"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1">
-        <g
-           id="g3033"
-           style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1">
-          <g
-             id="g3031"
-             style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1">
-            <circle
-               id="circle3019"
-               r="42.362999"
-               cy="129.34599"
-               cx="129.55"
-               style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-            <circle
-               id="circle3021"
-               r="42.362999"
-               cy="129.34599"
-               cx="255.99899"
-               style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-            <path
-               id="path3023"
-               d="m 382.458,339.787 c -16,0 -29.923,8.872 -37.131,21.963 h -52.195 c -16.12,-29.277 -58.164,-29.236 -74.26,0 h -40.064 l 65.399,-65.372 c 32.096,9.289 61.72,-20.504 52.485,-52.463 l 73.93,-73.899 c 3.758,1.092 7.726,1.689 11.836,1.689 23.395,0 42.363,-18.966 42.363,-42.363 0,-23.397 -18.969,-42.362 -42.364,-42.362 -23.397,0 -42.363,18.966 -42.363,42.363 0,4.103 0.594,8.066 1.684,11.818 l -73.9,73.87 c -31.933,-9.312 -61.926,20.295 -52.543,52.522 l -73.953,73.923 c -27.176 [...]
-               inkscape:connector-curvature="0"
-               style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-            <circle
-               id="circle3025"
-               r="42.362999"
-               cy="255.69901"
-               cx="129.55"
-               style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-            <circle
-               id="circle3027"
-               r="42.362999"
-               cy="255.69901"
-               cx="382.461"
-               style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-            <path
-               id="path3029"
-               d="M 471.201,0 H 40.799 C 18.302,0 0,18.302 0,40.799 V 471.201 C 0,493.698 18.302,512 40.799,512 H 471.201 C 493.698,512 512,493.698 512,471.201 V 40.799 C 512,18.302 493.698,0 471.201,0 Z m 0,471.201 H 40.799 V 40.799 h 430.402 l 0.026,430.401 c 0,0 -0.008,0.001 -0.026,0.001 z"
-               inkscape:connector-curvature="0"
-               style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-          </g>
-        </g>
-      </g>
-      <g
-         id="g3037"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g3039"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g3041"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g3043"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g3045"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g3047"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g3049"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g3051"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g3053"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g3055"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g3057"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g3059"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g3061"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g3063"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g3065"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-    </g>
-  </g>
-</svg>
diff --git a/images/elements/drawing-events-devices.png b/images/elements/drawing-events-devices.png
deleted file mode 100644
index 007eecc..0000000
Binary files a/images/elements/drawing-events-devices.png and /dev/null differ
diff --git a/images/elements/drawing-events-devices.svg b/images/elements/drawing-events-devices.svg
deleted file mode 100644
index 179225f..0000000
--- a/images/elements/drawing-events-devices.svg
+++ /dev/null
@@ -1,451 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="185.18349"
-   height="176.79234"
-   viewBox="0 0 185.18348 176.79234"
-   version="1.1"
-   id="svg13"
-   sodipodi:docname="drawing-events-devices.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <metadata
-     id="metadata17">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>icon-slack</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1509"
-     inkscape:window-height="925"
-     id="namedview15"
-     showgrid="false"
-     inkscape:pagecheckerboard="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="4.093823"
-     inkscape:cx="108.23977"
-     inkscape:cy="80.831347"
-     inkscape:window-x="86"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg13"
-     units="px" />
-  <!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
-  <title
-     id="title2">icon-slack</title>
-  <desc
-     id="desc4">Created with Sketch.</desc>
-  <ellipse
-     style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922"
-     id="path1170"
-     cx="90.38575"
-     cy="86.190178"
-     inkscape:label="background circle"
-     rx="89.155853"
-     ry="84.960281"
-     inkscape:export-xdpi="96"
-     inkscape:export-ydpi="96" />
-  <defs
-     id="defs6" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="icons"
-     style="display:inline">
-    <g
-       id="g239"
-       transform="matrix(0.64078506,0,0,0.64078506,20.570808,78.579894)"
-       inkscape:label="mobile"
-       style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1">
-      <g
-         id="g176"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1">
-        <g
-           id="g174"
-           style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1">
-          <path
-             id="path160"
-             d="M 69.351,0 H 26.086 c -4.212,0 -7.635,3.423 -7.635,7.635 v 80.168 c 0,4.213 3.423,7.635 7.635,7.635 h 43.265 c 4.213,0 7.636,-3.422 7.636,-7.635 V 7.635 C 76.987,3.423 73.564,0 69.351,0 Z M 40.72,6.973 c 0,-1.044 0.84,-1.884 1.884,-1.884 h 10.23 c 1.043,0 1.885,0.84 1.885,1.884 v 0.051 c 0,1.043 -0.842,1.883 -1.885,1.883 h -10.23 c -1.044,0 -1.884,-0.84 -1.884,-1.883 z m 6.999,85.601 c -2.278,0 -4.136,-1.856 -4.136,-4.135 0,-2.277 1.858,-4.136 4.136,-4.136 2.277,0 4.134,1 [...]
-             inkscape:connector-curvature="0"
-             style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-          <path
-             id="path162"
-             d="m 33.085,48.354 h 6.363 c 0.35,0 0.636,-0.284 0.636,-0.636 v -5.727 c 0,-0.702 -0.57,-1.272 -1.273,-1.272 h -5.09 c -0.702,0 -1.272,0.57 -1.272,1.272 v 5.727 c -10e-4,0.352 0.285,0.636 0.636,0.636 z"
-             inkscape:connector-curvature="0"
-             style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-          <path
-             id="path164"
-             d="m 55.99,48.354 h 6.363 c 0.35,0 0.636,-0.284 0.636,-0.636 V 26.722 c 0,-0.702 -0.569,-1.272 -1.272,-1.272 h -5.09 c -0.701,0 -1.271,0.571 -1.271,1.272 v 20.997 c -0.003,0.351 0.282,0.635 0.634,0.635 z"
-             inkscape:connector-curvature="0"
-             style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-          <path
-             id="path166"
-             d="M 44.537,48.354 H 50.9 c 0.35,0 0.636,-0.284 0.636,-0.636 V 33.085 c 0,-0.702 -0.569,-1.273 -1.272,-1.273 h -5.09 c -0.702,0 -1.272,0.571 -1.272,1.273 v 14.634 c -10e-4,0.351 0.285,0.635 0.635,0.635 z"
-             inkscape:connector-curvature="0"
-             style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-          <path
-             id="path168"
-             d="m 64.274,72.533 h -33.11 c -0.696,0 -1.26,0.563 -1.26,1.26 v 0.025 c 0,0.695 0.564,1.26 1.26,1.26 h 33.11 c 0.696,0 1.26,-0.564 1.26,-1.26 v -0.025 c 0,-0.696 -0.564,-1.26 -1.26,-1.26 z"
-             inkscape:connector-curvature="0"
-             style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-          <path
-             id="path170"
-             d="m 64.274,57.263 h -33.11 c -0.696,0 -1.26,0.563 -1.26,1.261 v 0.023 c 0,0.695 0.564,1.26 1.26,1.26 h 33.11 c 0.696,0 1.26,-0.564 1.26,-1.26 v -0.023 c 0,-0.698 -0.564,-1.261 -1.26,-1.261 z"
-             inkscape:connector-curvature="0"
-             style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-          <path
-             id="path172"
-             d="m 64.274,64.898 h -33.11 c -0.696,0 -1.26,0.563 -1.26,1.26 v 0.024 c 0,0.696 0.564,1.261 1.26,1.261 h 33.11 c 0.696,0 1.26,-0.564 1.26,-1.261 v -0.024 c 0,-0.696 -0.564,-1.26 -1.26,-1.26 z"
-             inkscape:connector-curvature="0"
-             style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-        </g>
-      </g>
-      <g
-         id="g178"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g180"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g182"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g184"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g186"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g188"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g190"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g192"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g194"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g196"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g198"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g200"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g202"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g204"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g206"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-    </g>
-    <g
-       id="g1335"
-       transform="matrix(0.15874332,0,0,0.15874332,51.464269,7.8898318)"
-       inkscape:label="drone"
-       style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-      <path
-         id="path1184"
-         d="m 277.984,226.868 h -51.846 c -1.804,4.017 -4.356,8.586 -7.373,13.044 -0.969,1.449 -1.189,3.245 -0.614,4.876 0.583,1.631 1.89,2.875 3.552,3.387 9.295,2.812 19.787,4.293 30.358,4.293 10.563,0 21.063,-1.481 30.358,-4.293 1.654,-0.504 2.97,-1.757 3.553,-3.387 0.575,-1.631 0.347,-3.434 -0.614,-4.876 -3.018,-4.458 -5.57,-9.027 -7.374,-13.044 z"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-      <ellipse
-         id="ellipse1186"
-         ry="41.889"
-         rx="100.061"
-         cy="147.658"
-         cx="252.062"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path1188"
-         d="m 352.122,147.658 c 0,23.142 -44.804,41.889 -100.061,41.889 C 196.804,189.547 152,170.792 152,147.658"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path1190"
-         d="m 215.725,138.206 c 0,15.368 -12.438,27.829 -27.829,27.829 -15.344,0 -125.605,-12.461 -125.605,-27.829 0,-15.352 110.261,-27.813 125.605,-27.813 15.392,-0.001 27.829,12.46 27.829,27.813 z"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path1192"
-         d="m 187.896,110.392 c 15.392,0 27.829,12.461 27.829,27.813"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-      <g
-         id="g1198"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-        <path
-           id="path1194"
-           d="m 215.725,138.206 c 0,15.368 17.904,48.065 2.536,48.065 -15.368,0 -155.978,-32.69 -155.978,-48.065"
-           style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path1196"
-           d="m 90.01,144.751 c 0,8.862 -7.176,16.03 -16.022,16.03 v 0 c -8.862,0 -15.998,-7.168 -15.998,-16.03 v -14.336 c 0,-8.846 7.136,-16.014 15.998,-16.014 v 0 c 8.846,0 16.022,7.168 16.022,16.014 z"
-           style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           inkscape:connector-curvature="0" />
-      </g>
-      <path
-         id="path1200"
-         d="m 90.01,128.95 c 0,8.846 -7.176,16.014 -16.022,16.014 v 0 c -8.862,0 -15.998,-7.168 -15.998,-16.014 v -14.336 c 0,-8.846 7.136,-16.03 15.998,-16.03 v 0 c 8.846,0 16.022,7.184 16.022,16.03 z"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path1202"
-         d="m 58.478,114.606 c 1.694,7.018 7.971,12.233 15.51,12.233 7.538,0 13.808,-5.215 15.518,-12.233 -1.709,-7.003 -7.979,-12.233 -15.518,-12.233 -7.538,0 -13.816,5.239 -15.51,12.233 z"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-      <ellipse
-         id="ellipse1204"
-         ry="11.705"
-         rx="73.980003"
-         cy="101.854"
-         cx="73.980003"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <ellipse
-         id="ellipse1206"
-         ry="11.705"
-         rx="41.102001"
-         cy="101.854"
-         cx="73.987999"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path1208"
-         d="m 147.495,101.854 c 0,1.142 -0.906,2.048 -2.056,2.048 H 2.521 c -1.126,0 -2.04,-0.906 -2.04,-2.048 v 0 c 0,-1.142 0.914,-2.064 2.04,-2.064 H 145.44 c 1.142,0 2.055,0.929 2.055,2.064 z"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path1210"
-         d="m 90.277,87.644 c 0,4.695 6.294,8.523 1.56,8.523 H 56.123 c -4.71,0 1.575,-3.828 1.575,-8.523 v 0 c 0,-4.742 3.828,-8.554 8.539,-8.554 h 15.486 c 4.718,-0.001 8.554,3.812 8.554,8.554 z"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path1212"
-         d="m 288.398,138.206 c 0,15.368 12.438,27.829 27.821,27.829 15.352,0 125.613,-12.461 125.613,-27.829 0,-15.352 -110.261,-27.813 -125.613,-27.813 -15.384,-0.001 -27.821,12.46 -27.821,27.813 z"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path1214"
-         d="m 316.227,110.392 c -15.384,0 -27.821,12.461 -27.821,27.813"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-      <g
-         id="g1220"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-        <path
-           id="path1216"
-           d="m 288.398,138.206 c 0,15.368 -17.904,48.065 -2.536,48.065 15.368,0 155.979,-32.689 155.979,-48.065"
-           style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path1218"
-           d="m 414.113,144.751 c 0,8.862 7.176,16.03 16.022,16.03 v 0 c 8.854,0 16.006,-7.168 16.006,-16.03 v -14.336 c 0,-8.846 -7.152,-16.014 -16.006,-16.014 v 0 c -8.846,0 -16.022,7.168 -16.022,16.014 z"
-           style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           inkscape:connector-curvature="0" />
-      </g>
-      <path
-         id="path1222"
-         d="m 414.113,128.95 c 0,8.846 7.176,16.014 16.022,16.014 v 0 c 8.854,0 16.006,-7.168 16.006,-16.014 v -14.336 c 0,-8.846 -7.152,-16.03 -16.006,-16.03 v 0 c -8.846,0 -16.022,7.184 -16.022,16.03 z"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path1224"
-         d="m 445.645,114.606 c -1.694,7.018 -7.979,12.233 -15.51,12.233 -7.538,0 -13.816,-5.215 -15.525,-12.233 1.709,-7.003 7.987,-12.233 15.525,-12.233 7.53,0.008 13.816,5.239 15.51,12.233 z"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-      <ellipse
-         id="ellipse1226"
-         ry="11.705"
-         rx="73.987999"
-         cy="101.854"
-         cx="430.159"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <ellipse
-         id="ellipse1228"
-         ry="11.705"
-         rx="41.102001"
-         cy="101.854"
-         cx="430.159"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path1230"
-         d="m 356.628,101.854 c 0,1.142 0.906,2.048 2.056,2.048 h 142.919 c 1.126,0 2.04,-0.906 2.04,-2.048 v 0 c 0,-1.142 -0.914,-2.064 -2.04,-2.064 H 358.684 c -1.143,0 -2.056,0.929 -2.056,2.064 z"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path1232"
-         d="m 413.846,87.644 c 0,4.695 -6.294,8.523 -1.56,8.523 H 448 c 4.71,0 -1.575,-3.828 -1.575,-8.523 v 0 c 0,-4.742 -3.828,-8.554 -8.539,-8.554 H 422.4 c -4.71,-0.001 -8.554,3.812 -8.554,8.554 z"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path1234"
-         d="m 299.402,151.714 h -15.265 c -2.316,0 -4.521,1.032 -6.018,2.796 -2.135,2.521 -11.902,6.262 -26.065,6.262 -14.171,0 -23.914,-3.742 -26.049,-6.262 -1.504,-1.772 -3.702,-2.796 -6.026,-2.796 h -15.258 c -4.356,0 -7.877,3.521 -7.877,7.877 v 16.14 c 0,2.001 0.772,3.938 2.135,5.404 3.009,3.182 7.176,4.506 11.201,5.782 7.704,2.434 8.539,3.434 8.539,6.294 0,6.412 -6.081,19.952 -14.816,32.91 -1.386,2.08 -1.717,4.695 -0.874,7.05 0.843,2.355 2.749,4.167 5.136,4.892 13.438,4.064 28.617,6 [...]
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-      <g
-         id="g1242"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-        <path
-           id="path1236"
-           d="m 268.138,119.38 c 0,0.819 -0.662,1.481 -1.481,1.481 h -29.2 c -0.819,0 -1.481,-0.662 -1.481,-1.481 v 0 c 0,-0.819 0.662,-1.481 1.481,-1.481 h 29.2 c 0.82,0 1.481,0.661 1.481,1.481 z"
-           style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path1238"
-           d="m 268.138,128.241 c 0,0.819 -0.662,1.481 -1.481,1.481 h -29.2 c -0.819,0 -1.481,-0.662 -1.481,-1.481 v 0 c 0,-0.819 0.662,-1.481 1.481,-1.481 h 29.2 c 0.82,0 1.481,0.662 1.481,1.481 z"
-           style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path1240"
-           d="m 268.138,137.103 c 0,0.819 -0.662,1.481 -1.481,1.481 h -29.2 c -0.819,0 -1.481,-0.662 -1.481,-1.481 v 0 c 0,-0.819 0.662,-1.481 1.481,-1.481 h 29.2 c 0.82,0 1.481,0.662 1.481,1.481 z"
-           style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           inkscape:connector-curvature="0" />
-      </g>
-      <path
-         id="path1244"
-         d="m 86.158,339.437 c 4.687,-4.695 12.312,-4.695 17.014,0 82.085,82.109 215.67,82.109 297.779,0 4.695,-4.695 12.304,-4.695 16.998,0 4.71,4.71 4.71,12.32 0,17.014 -91.475,91.475 -240.325,91.475 -331.792,0 -4.694,-4.686 -4.694,-12.303 0.001,-17.014 z"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path1246"
-         d="m 130.812,299.359 c 3.434,-3.434 9.019,-3.434 12.446,0 59.983,59.983 157.617,59.983 217.6,0 3.434,-3.434 9.003,-3.434 12.43,0 3.427,3.434 3.434,9.003 0,12.43 -66.844,66.844 -175.616,66.859 -242.467,0 -3.428,-3.426 -3.435,-8.995 -0.009,-12.43 z"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path1248"
-         d="m 169.819,264.378 c 2.324,-2.339 6.097,-2.339 8.428,0 40.692,40.692 106.921,40.692 147.614,-0.016 2.332,-2.324 6.105,-2.324 8.436,0.016 2.332,2.324 2.332,6.089 0,8.428 -45.347,45.34 -119.131,45.355 -164.486,0 -2.324,-2.339 -2.324,-6.104 0.008,-8.428 z"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-      <g
-         id="g1250"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <g
-         id="g1252"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <g
-         id="g1254"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <g
-         id="g1256"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <g
-         id="g1258"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <g
-         id="g1260"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <g
-         id="g1262"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <g
-         id="g1264"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <g
-         id="g1266"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <g
-         id="g1268"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <g
-         id="g1270"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <g
-         id="g1272"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <g
-         id="g1274"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <g
-         id="g1276"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <g
-         id="g1278"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.00214732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-    <g
-       id="g1466"
-       transform="matrix(0.34734782,0,0,0.34734782,87.91507,80.374006)"
-       inkscape:label="medical"
-       style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1">
-      <path
-         id="path1411"
-         d="M 184.814,38.511 H 15.343 C 6.869,38.511 0,45.38 0,53.854 v 80.034 c 0,8.473 6.869,15.343 15.343,15.343 h 17.882 v 2.476 c 0,5.49 4.45,9.94 9.939,9.94 h 8.262 c 5.489,0 9.94,-4.45 9.94,-9.94 v -2.476 h 77.427 v 2.476 c 0,5.49 4.45,9.94 9.939,9.94 h 8.262 c 5.489,0 9.939,-4.45 9.939,-9.94 v -2.476 h 17.882 c 8.474,0 15.343,-6.869 15.343,-15.343 V 53.854 c -10e-4,-8.474 -6.87,-15.343 -15.344,-15.343 z m -51.411,15.344 c 0,-2.209 1.791,-4 4,-4 h 14.952 c 2.209,0 4,1.791 4,4 v 0. [...]
-         inkscape:connector-curvature="0"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g1413"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g1415"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g1417"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g1419"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g1421"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g1423"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g1425"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g1427"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g1429"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g1431"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g1433"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g1435"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g1437"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g1439"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-      <g
-         id="g1441"
-         style="fill:#7f7f7e;fill-opacity:1;stroke:#7f7f7f;stroke-opacity:1" />
-    </g>
-  </g>
-</svg>
diff --git a/images/elements/drawing-events-sensors.png b/images/elements/drawing-events-sensors.png
deleted file mode 100644
index fc9ed49..0000000
Binary files a/images/elements/drawing-events-sensors.png and /dev/null differ
diff --git a/images/elements/drawing-events-sensors.svg b/images/elements/drawing-events-sensors.svg
deleted file mode 100644
index 39edde1..0000000
--- a/images/elements/drawing-events-sensors.svg
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="185.18349"
-   height="176.79234"
-   viewBox="0 0 185.18348 176.79234"
-   version="1.1"
-   id="svg13"
-   sodipodi:docname="drawing-events-sensors.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <metadata
-     id="metadata17">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>icon-slack</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1509"
-     inkscape:window-height="925"
-     id="namedview15"
-     showgrid="false"
-     inkscape:pagecheckerboard="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="4.093823"
-     inkscape:cx="90.263615"
-     inkscape:cy="90.602165"
-     inkscape:window-x="86"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg13"
-     units="px" />
-  <!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
-  <title
-     id="title2">icon-slack</title>
-  <desc
-     id="desc4">Created with Sketch.</desc>
-  <ellipse
-     style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922"
-     id="path1170"
-     cx="90.38575"
-     cy="86.190178"
-     inkscape:label="background circle"
-     rx="89.155853"
-     ry="84.960281"
-     inkscape:export-xdpi="96"
-     inkscape:export-ydpi="96" />
-  <g
-     id="g1547"
-     transform="matrix(1.4311043,0,0,1.3931337,-10.139018,-40.408329)"
-     inkscape:label="speedometer">
-    <path
-       inkscape:label="casing"
-       sodipodi:nodetypes="sssssssccsccscscscccscsccccssscccccssccccscccccscc"
-       inkscape:connector-curvature="0"
-       id="path1483"
-       d="M 64.832901,142.10836 C 52.939272,139.17155 44.940756,127.04832 47.56094,115.92953 c 1.049959,-4.45552 2.828485,-7.58921 6.216346,-10.95295 5.166467,-5.12968 10.933455,-7.337755 18.024165,-6.901126 11.256173,0.693128 19.862532,8.425556 21.769263,19.558706 1.08521,6.33637 -1.758823,13.92274 -7.062016,18.83773 -5.589741,5.18056 -14.324049,7.45179 -21.675797,5.63647 z m 18.22815,-14.15612 h 6.467615 l 0.445186,-1.12968 c 0.244851,-0.62132 0.536968,-2.00774 0.64915,-3.08093 l 0.203 [...]
-       style="display:inline;fill:#7c7c7c;fill-opacity:1;stroke:#7c7c7c;stroke-width:0.40793237;stroke-opacity:0.49803922" />
-    <path
-       inkscape:label="base"
-       sodipodi:nodetypes="ccccscccsccssccccscsc"
-       inkscape:connector-curvature="0"
-       id="path1473"
-       d="m 68.038654,141.11648 c -0.334202,-0.22942 -1.191514,-0.41997 -1.905135,-0.42343 -2.292423,-0.0111 -7.793664,-2.65032 -10.430516,-5.00401 -1.798594,-1.60546 -4.516433,-5.16231 -4.194238,-5.48904 0.08637,-0.0876 3.381077,-0.18302 7.321562,-0.21206 l 7.16452,-0.0528 1.174739,1.30426 c 0.974656,1.08212 1.485118,1.30902 2.997073,1.3322 1.991051,0.0305 4.353492,-1.29132 4.353492,-2.43588 0,-0.45922 0.25348,-0.56724 0.911461,-0.38843 0.501303,0.13623 3.782561,0.25022 7.291684,0.25331 [...]
-       style="display:inline;fill:#7c7c7c;fill-opacity:1;stroke:#7c7c7c;stroke-width:0.40793237;stroke-opacity:0.49803922" />
-    <rect
-       inkscape:label="needle"
-       transform="rotate(34.008708)"
-       ry="0.14642107"
-       y="48.833908"
-       x="127.77502"
-       height="14.262481"
-       width="1.7390838"
-       id="rect1491"
-       style="display:inline;fill:#7c7c7c;fill-opacity:1;stroke:#7c7c7c;stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.77619048" />
-    <ellipse
-       inkscape:label="pin"
-       ry="3.5356529"
-       rx="3.956593"
-       cy="128.52791"
-       cx="70.270836"
-       id="path1499"
-       style="display:inline;fill:#7c7c7c;fill-opacity:1;stroke:#7c7c7c;stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
-  <g
-     id="g1725"
-     inkscape:label="maintenance"
-     style="fill:#7f7f7f;fill-opacity:0.49803922"
-     transform="matrix(1.2655942,0,0,1.3019793,-32.521243,-36.743233)">
-    <path
-       style="fill:#7f7f7f;fill-opacity:0.49803922;stroke-width:0.07618435"
-       d="m 105.43637,96.376297 c -0.51434,-0.512225 -0.93472,-0.964997 -0.93418,-1.006159 5.4e-4,-0.04116 0.2843,-0.509912 0.63057,-1.041666 0.34628,-0.531755 1.45224,-2.240328 2.4577,-3.796829 1.00545,-1.556502 1.90315,-2.909526 1.99489,-3.006722 0.13733,-0.145498 0.41874,-0.227225 1.59294,-0.462608 0.78438,-0.157239 1.44098,-0.299831 1.45912,-0.316869 0.67161,-0.630989 17.01024,-16.872487 17.01024,-16.90912 0,-0.02956 -0.46805,-0.519654 -1.04012,-1.089093 -0.80138,-0.797708 -1.02954,- [...]
-       id="path1739"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#7f7f7f;fill-opacity:0.49803922;stroke-width:0.07618435"
-       d="m 105.46366,96.327445 c -0.67366,-0.671033 -0.8949,-0.937581 -0.85784,-1.03353 0.0275,-0.07111 0.92056,-1.46675 1.98466,-3.101419 1.06409,-1.634668 2.17294,-3.343863 2.46412,-3.79821 0.29117,-0.454346 0.59819,-0.870745 0.68227,-0.925331 0.0841,-0.05458 0.76549,-0.217163 1.51424,-0.361284 l 1.36138,-0.262039 0.61857,-0.597139 c 1.61097,-1.555163 16.49302,-16.366899 16.49302,-16.415095 0,-0.0302 -0.46433,-0.515265 -1.03184,-1.077934 -0.56752,-0.562668 -1.03185,-1.068846 -1.03185, [...]
-       id="path1737"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#7f7f7f;fill-opacity:0.49803922;stroke-width:0.07618435"
-       d="m 105.54119,96.35841 c -0.48791,-0.484294 -0.88498,-0.938702 -0.88238,-1.009793 0.003,-0.07109 0.16598,-0.376756 0.36306,-0.679256 0.19708,-0.3025 0.59636,-0.917586 0.8873,-1.366858 2.7471,-4.242141 3.60681,-5.549489 3.7455,-5.695727 0.1306,-0.137698 0.44077,-0.227353 1.60042,-0.462602 l 1.43842,-0.291803 8.57208,-8.51641 8.57207,-8.516409 -1.05041,-1.045599 c -0.57774,-0.575079 -1.05042,-1.100484 -1.05042,-1.167566 0,-0.06708 2.77738,-2.890664 6.17196,-6.274627 5.72213,-5.7042 [...]
-       id="path1735"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#7f7f7f;fill-opacity:0.49803922;stroke-width:0.07618435"
-       d="m 105.50183,96.28944 c -0.64413,-0.641769 -0.85655,-0.899805 -0.81956,-0.995561 0.0275,-0.07109 0.92054,-1.466714 1.98464,-3.101383 1.06409,-1.634668 2.17292,-3.342825 2.46407,-3.795903 0.29114,-0.453078 0.58097,-0.851019 0.64405,-0.884314 0.0631,-0.03329 0.66502,-0.168387 1.33763,-0.300205 0.67261,-0.131818 1.32611,-0.272313 1.45223,-0.312211 0.15406,-0.04874 3.01943,-2.854098 8.73246,-8.549574 4.67674,-4.662367 8.50317,-8.501386 8.50317,-8.531151 0,-0.02977 -0.46433,-0.518646 [...]
-       id="path1733"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#7f7f7f;fill-opacity:0.49803922;stroke-width:0.07618435"
-       d="m 105.55551,96.271113 c -0.80348,-0.794095 -0.88609,-0.900382 -0.80984,-1.041931 0.0467,-0.0867 0.30671,-0.495037 0.5778,-0.907422 0.27109,-0.412386 1.04947,-1.609302 1.72974,-2.659813 0.68027,-1.050511 1.5108,-2.333042 1.84561,-2.850069 0.91999,-1.420671 0.70034,-1.271192 2.35249,-1.600988 0.78818,-0.157332 1.44752,-0.29922 1.46521,-0.315306 0.3189,-0.289938 17.16043,-17.046783 17.16043,-17.074139 0,-0.02141 -0.48734,-0.52398 -1.08298,-1.11681 l -1.08299,-1.077872 3.67524,-3.7 [...]
-       id="path1731"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#7f7f7f;fill-opacity:0.49803922;stroke-width:0.07618435"
-       d="m 105.53175,96.242661 -0.83945,-0.837147 0.18504,-0.320886 c 0.10178,-0.176488 0.56782,-0.901801 1.03566,-1.611808 0.46784,-0.710007 1.49653,-2.290711 2.28599,-3.512674 0.78945,-1.221963 1.48049,-2.266577 1.53563,-2.321363 0.0878,-0.08718 1.02543,-0.30463 2.52454,-0.585439 l 0.45859,-0.0859 8.5796,-8.51702 c 4.71878,-4.68436 8.5796,-8.56804 8.5796,-8.630401 0,-0.06236 -0.47043,-0.581649 -1.04539,-1.153975 l -1.04539,-1.040592 1.91881,-1.959886 c 1.05535,-1.077936 3.83882,-3.861 [...]
-       id="path1729"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#7f7f7f;fill-opacity:0.49803922;stroke-width:0.07618435"
-       d="m 105.57251,96.201156 -0.80132,-0.802075 0.16861,-0.291061 c 0.12298,-0.212295 4.12538,-6.388424 4.79707,-7.40238 0.0505,-0.07625 0.57828,-0.215287 1.55628,-0.409987 l 1.47984,-0.294605 8.5902,-8.534157 c 4.7246,-4.693786 8.59019,-8.585028 8.59019,-8.647205 0,-0.06218 -0.47249,-0.583371 -1.04998,-1.158209 l -1.04998,-1.04516 1.18339,-1.195952 c 5.40917,-5.466626 11.01999,-10.993034 11.38788,-11.216573 0.66132,-0.40182 1.31203,-0.588649 2.06369,-0.592511 0.76627,-0.0039 1.31489, [...]
-       id="path1727"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     id="g1367"
-     transform="matrix(1.7967082,0,0,1.422092,-200.86103,-40.696342)"
-     inkscape:label="thermometer"
-     style="display:inline">
-    <path
-       inkscape:label="casing"
-       inkscape:connector-curvature="0"
-       id="path1307"
-       d="m 139.95992,95.588822 c -2.54869,-0.349702 -4.74053,-1.915811 -5.89992,-4.215593 -0.69452,-1.377667 -0.93953,-3.253612 -0.62893,-4.815459 0.25159,-1.265107 0.96105,-2.653892 1.83236,-3.586873 0.38247,-0.409548 0.8541,-0.852718 1.04805,-0.984822 l 0.35266,-0.240187 6.9e-4,-15.84179 c 4e-4,-10.286287 0.036,-16.029272 0.10132,-16.376405 0.14997,-0.796685 0.56426,-1.559564 1.18327,-2.178908 2.4534,-2.45475 6.61257,-1.003158 7.05962,2.46389 0.0475,0.368043 0.0881,7.703578 0.0902,16. [...]
-       style="fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0.09925094;stroke-opacity:1" />
-    <ellipse
-       inkscape:label="bulb"
-       ry="3.4117851"
-       rx="3.5316355"
-       cx="140.83557"
-       cy="88.151482"
-       id="path1354"
-       style="fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.47898996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99523806" />
-    <rect
-       inkscape:label="stem"
-       y="58.867226"
-       x="140.58427"
-       height="24.81065"
-       width="0.35955057"
-       id="rect1362"
-       style="fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:1.93787956;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99523806" />
-  </g>
-  <defs
-     id="defs6" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="icons"
-     style="display:inline" />
-</svg>
diff --git a/images/elements/drawing-events-social.png b/images/elements/drawing-events-social.png
deleted file mode 100644
index dc88bee..0000000
Binary files a/images/elements/drawing-events-social.png and /dev/null differ
diff --git a/images/elements/drawing-events-social.svg b/images/elements/drawing-events-social.svg
deleted file mode 100644
index f8d3301..0000000
--- a/images/elements/drawing-events-social.svg
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="185.18349"
-   height="176.79234"
-   viewBox="0 0 185.18348 176.79234"
-   version="1.1"
-   id="svg13"
-   sodipodi:docname="drawing-events-social.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <metadata
-     id="metadata17">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>icon-slack</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1509"
-     inkscape:window-height="925"
-     id="namedview15"
-     showgrid="false"
-     inkscape:pagecheckerboard="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="1"
-     inkscape:cx="-7.1319238"
-     inkscape:cy="162.2208"
-     inkscape:window-x="183"
-     inkscape:window-y="23"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg13"
-     units="px" />
-  <!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
-  <title
-     id="title2">icon-slack</title>
-  <desc
-     id="desc4">Created with Sketch.</desc>
-  <ellipse
-     style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-opacity:0.49803922;stroke-miterlimit:4;stroke-dasharray:none"
-     id="path1170"
-     cx="92.591743"
-     cy="88.396172"
-     inkscape:label="background circle"
-     rx="89.155853"
-     ry="84.960281" />
-  <defs
-     id="defs6" />
-  <g
-     id="g1189"
-     inkscape:label="logos"
-     transform="matrix(5.8251476,0,0,5.8251476,27.350639,17.464915)">
-    <g
-       inkscape:label="Slack logo"
-       transform="translate(-0.54994,10.441119)"
-       style="fill:#7f7f7f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1"
-       id="Symbols">
-      <g
-         style="fill:#7f7f7f;fill-opacity:1"
-         transform="translate(-1167,-6)"
-         id="Menu">
-        <g
-           style="fill:#7f7f7f;fill-opacity:1"
-           id="Group-36">
-          <g
-             style="fill:#7f7f7f;fill-opacity:1"
-             transform="translate(1049,6)"
-             id="Group-34">
-            <path
-               style="fill:#7f7f7f;fill-opacity:1"
-               inkscape:connector-curvature="0"
-               id="icon-slack"
-               d="m 126.4078,7.882913 -0.7973,-2.3943043 -2.35332,0.8132174 0.797,2.3790869 z m 4.77534,-0.1141304 c 0,0.4866522 -0.25047,0.8287391 -0.70612,0.9882174 l -1.30585,0.4486087 0.42495,1.2694353 c 0.038,0.11413 0.0532,0.235565 0.0532,0.356999 0,0.600479 -0.48605,1.102653 -1.08547,1.102653 -0.47814,0 -0.90339,-0.296739 -1.05538,-0.752652 l -0.41765,-1.2545223 -2.35332,0.8059133 0.41765,1.246609 c 0.038,0.113826 0.0605,0.235565 0.0605,0.357304 0,0.592869 -0.48604,1.102348 -1.093 [...]
-          </g>
-        </g>
-      </g>
-    </g>
-    <g
-       inkscape:label="Twitter logo"
-       transform="translate(3.935162,-0.2503478)"
-       style="fill:#7f7f7f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1"
-       id="Symbols-7">
-      <g
-         style="fill:#7f7f7f;fill-opacity:1"
-         id="Menu-9"
-         transform="translate(-1120,-8)">
-        <g
-           style="fill:#7f7f7f;fill-opacity:1"
-           id="Group-36-3">
-          <g
-             style="fill:#7f7f7f;fill-opacity:1"
-             id="Group-34-8"
-             transform="translate(1049,6)">
-            <path
-               style="fill:#7f7f7f;fill-opacity:1"
-               inkscape:connector-curvature="0"
-               d="m 82.004724,4.675087 c 0.0076,0.1065217 0.0076,0.2127391 0.0076,0.3192608 0,3.2458696 -2.467611,6.9856962 -6.976975,6.9856962 -1.389437,0 -2.680084,-0.402653 -3.765554,-1.102348 0.197276,0.02283 0.387255,0.03043 0.59213,0.03043 1.146263,0 2.201639,-0.387434 3.044238,-1.0490865 -1.07787,-0.022522 -1.981567,-0.7295218 -2.292526,-1.7025218 0.15168,0.022826 0.303664,0.037739 0.462943,0.037739 0.220377,0 0.44045,-0.030131 0.645324,-0.083391 C 72.598439,7.882913 71.755536,6.8 [...]
-               id="icon-twitter" />
-          </g>
-        </g>
-      </g>
-    </g>
-    <g
-       inkscape:label="GitHub logo"
-       transform="translate(13.255063,6.2835697)"
-       style="fill:#7f7f7f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1"
-       id="Symbols-0">
-      <g
-         style="fill:#7f7f7f;fill-opacity:1"
-         id="Menu-5"
-         transform="translate(-1049,-7)">
-        <g
-           style="fill:#7f7f7f;fill-opacity:1"
-           id="Group-36-2">
-          <g
-             style="fill:#7f7f7f;fill-opacity:1"
-             id="Group-34-2"
-             transform="translate(1049,6)">
-            <path
-               style="fill:#7f7f7f;fill-opacity:1"
-               inkscape:connector-curvature="0"
-               d="m 4.2058818,10.808426 c -0.068393,0.01522 -0.113988,0.06087 -0.1063888,0.114131 0.0076,0.04565 0.068393,0.07609 0.1367856,0.06087 0.068393,-0.01522 0.1139879,-0.06087 0.1060847,-0.106522 -0.0073,-0.04565 -0.068089,-0.07578 -0.1364815,-0.06848 m -0.4328503,0.06087 c -0.068089,0 -0.1212831,0.03804 -0.1212831,0.0837 0,0.05296 0.053194,0.091 0.1291863,0.0837 0.068089,0 0.1212832,-0.03804 0.1212832,-0.0837 0,-0.05326 -0.060794,-0.091 -0.1291864,-0.0837 m -0.4477446,-0.07578  [...]
-               id="icon-github" />
-          </g>
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/images/elements/drawing-satellite-dish.png b/images/elements/drawing-satellite-dish.png
deleted file mode 100644
index cfaaa66..0000000
Binary files a/images/elements/drawing-satellite-dish.png and /dev/null differ
diff --git a/images/elements/drawing-satellite-dish.svg b/images/elements/drawing-satellite-dish.svg
deleted file mode 100644
index ec18a21..0000000
--- a/images/elements/drawing-satellite-dish.svg
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="33.854946mm"
-   height="40.217831mm"
-   viewBox="0 0 33.854946 40.217831"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   sodipodi:docname="drawing-satellite-dish.svg"
-   enable-background="new">
-  <defs
-     id="defs2">
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath924">
-      <rect
-         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.26458332;stroke-opacity:0.8"
-         id="rect926"
-         width="33.708839"
-         height="40.022179"
-         x="166.24661"
-         y="213.6862" />
-    </clipPath>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter1385">
-      <feBlend
-         inkscape:collect="always"
-         mode="lighten"
-         in2="BackgroundImage"
-         id="feBlend1387" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4.9406467"
-     inkscape:cx="63.97785"
-     inkscape:cy="76.002196"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:pagecheckerboard="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="964"
-     inkscape:window-x="21"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="dish"
-     id="layer1"
-     transform="translate(-182.93666,-219.4011)"
-     style="display:inline;filter:url(#filter1385)">
-    <path
-       style="display:inline;fill:#7f7f7f;fill-opacity:1;stroke:none;stroke-width:0.35277778;stroke-opacity:0.49803922"
-       d="m 204.14044,258.63139 c -0.41636,-0.30445 -0.58707,-0.80651 -0.50839,-1.49513 0.10257,-0.89769 0.2983,-1.06575 1.45931,-1.2529 0.73747,-0.11888 1.49021,-0.3655 1.67275,-0.54804 0.50213,-0.50213 1.16125,-4.20112 0.91412,-5.13005 -0.49164,-1.84803 -0.72437,-1.90618 -2.92976,-0.73208 -5.71727,3.04376 -13.15044,2.66563 -18.7505,-0.95386 -1.19867,-0.77475 -2.17941,-1.56821 -2.17941,-1.76325 0,-0.19504 2.46062,-2.92525 5.46805,-6.06712 3.00744,-3.14187 5.46279,-5.96231 5.45634,-6.267 [...]
-       id="path1044"
-       inkscape:connector-curvature="0"
-       inkscape:label="gray - 127" />
-    <path
-       style="display:inline;fill:#5aaafa;fill-opacity:1;stroke:none;stroke-width:0.35277778;stroke-opacity:1"
-       d="m 203.64467,258.66643 c -1.13257,-1.13257 -0.0489,-3.10445 1.70612,-3.10445 1.18682,0 1.50787,-0.48238 2.05972,-3.0948 0.30283,-1.4336 0.29227,-2.04025 -0.046,-2.64584 -0.24143,-0.43216 -0.46759,-0.84083 -0.50257,-0.90815 -0.035,-0.0673 -1.06686,0.36604 -2.29306,0.96302 -1.32033,0.64281 -3.52132,1.3066 -5.39754,1.62782 -2.8541,0.48865 -3.45675,0.48832 -6.0806,-0.003 -1.60188,-0.30016 -3.64364,-0.85915 -4.53724,-1.24219 -1.90686,-0.81738 -4.61488,-2.69433 -4.87851,-3.38135 -0.11 [...]
-       id="path1046"
-       inkscape:connector-curvature="0"
-       inkscape:label="blue - 5aaafa" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path1395"
-       d="m 208.23078,249.84698 c -0.23283,-0.23283 -0.42333,-0.66071 -0.42333,-0.95083 0,-0.82636 1.80942,-2.50639 2.69942,-2.50639 1.39799,0 2.0595,2.24624 0.97955,3.32619 -0.65447,0.65447 -2.65181,0.73486 -3.25564,0.13103 z"
-       style="display:inline;fill:#325c80;fill-opacity:1;stroke:none;stroke-width:0.35277778;stroke-opacity:0.49803922"
-       inkscape:label="joint" />
-  </g>
-</svg>
diff --git a/images/elements/function-of-x-notation.png b/images/elements/function-of-x-notation.png
deleted file mode 100644
index 065be19..0000000
Binary files a/images/elements/function-of-x-notation.png and /dev/null differ
diff --git a/images/elements/function-of-x-notation.svg b/images/elements/function-of-x-notation.svg
deleted file mode 100644
index b74b848..0000000
--- a/images/elements/function-of-x-notation.svg
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="35mm"
-   height="24mm"
-   viewBox="0 0 35 24"
-   version="1.1"
-   id="svg8"
-   sodipodi:docname="function-of-x-notation.svg"
-   inkscape:export-filename="/Users/Matt/openwhisk/release/openwhisk-website/images/function-of-x-notation.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="75.340551"
-     inkscape:cy="36.619648"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:pagecheckerboard="true"
-     borderlayer="false"
-     inkscape:showpageshadow="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="961"
-     inkscape:window-x="2"
-     inkscape:window-y="8"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-273)">
-    <text
-       xml:space="preserve"
-       style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.57777786px;line-height:1.25;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-       x="4.602797"
-       y="290.47858"
-       id="text233"><tspan
-         sodipodi:role="line"
-         id="tspan231"
-         x="4.602797"
-         y="290.47858"
-         style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.57777786px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#666666;stroke-width:0.26458332">f(x)</tspan></text>
-  </g>
-</svg>
diff --git a/images/elements/illustration-cost-effective.png b/images/elements/illustration-cost-effective.png
deleted file mode 100644
index e47f7dd..0000000
Binary files a/images/elements/illustration-cost-effective.png and /dev/null differ
diff --git a/images/elements/illustration-developers-flexible.png b/images/elements/illustration-developers-flexible.png
deleted file mode 100644
index 189e5ab..0000000
Binary files a/images/elements/illustration-developers-flexible.png and /dev/null differ
diff --git a/images/elements/illustration-integrators.png b/images/elements/illustration-integrators.png
deleted file mode 100644
index d9c8ddb..0000000
Binary files a/images/elements/illustration-integrators.png and /dev/null differ
diff --git a/images/elements/unused/globe2.svg b/images/elements/unused/globe2.svg
deleted file mode 100644
index 85854ab..0000000
--- a/images/elements/unused/globe2.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" ?><svg enable-background="new 0 0 500 500" id="Layer_1" version="1.1" viewBox="0 0 500 500" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g><ellipse cx="258.977" cy="264.016" fill="#4384EC" rx="196.695" ry="196.695" transform="matrix(0.6604 -0.7509 0.7509 0.6604 -110.3035 284.1465)"/><path d="M388.867,116.308c-19.107-16.803-40.558-29.232-63.128-37.366c2.593,2.06,5.149,4.194,7.664,6.405   c81.576,71.737,89.553,196.0 [...]
\ No newline at end of file
diff --git a/images/elements/unused/gps2.svg b/images/elements/unused/gps2.svg
deleted file mode 100644
index 48dbb01..0000000
--- a/images/elements/unused/gps2.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 294 294" style="enable-background:new 0 0 294 294;" xml:space="preserve">
-<path d="M189,204.75c0-17.782,14.468-32.25,32.25-32.25c4.44,0,8.673,0.902,12.526,2.533c3.061-9.126,4.724-18.889,4.724-29.033
-	c0-25.392-10.4-48.398-27.16-64.992l-32.908,39.489c5.664,6.968,9.068,15.844,9.068,25.503c0,22.332-18.168,40.5-40.5,40.5
-	s-40.5-18.168-40.5-40.5s18.168-40.5,40.5-40.5c7.267,0,14.086,1.933,19.989,5.298l32.871-39.445
-	C184.921,60.744,166.676,54.5,147,54.5c-25.138,0-47.94,10.192-64.494,26.658C86.232,85.388,88.5,90.933,88.5,97
-	c0,13.233-10.767,24-24,24c-1.839,0-3.627-0.215-5.348-0.608C56.778,128.521,55.5,137.114,55.5,146c0,50.453,41.047,91.5,91.5,91.5
-	c17.678,0,34.198-5.045,48.205-13.762C191.308,218.407,189,211.844,189,204.75z M100.25,203c-8.685,0-15.75-7.065-15.75-15.75
-	s7.065-15.75,15.75-15.75S116,178.565,116,187.25S108.935,203,100.25,203z M152.762,151.302l15.775-18.93
-	c2.505,3.945,3.964,8.618,3.964,13.628c0,14.061-11.439,25.5-25.5,25.5s-25.5-11.439-25.5-25.5s11.439-25.5,25.5-25.5
-	c3.604,0,7.034,0.756,10.145,2.111l-15.906,19.088c-2.651,3.183-2.222,7.912,0.96,10.563c1.402,1.169,3.104,1.738,4.798,1.738
-	C149.145,154,151.278,153.081,152.762,151.302z M147,0C65.944,0,0,65.944,0,147s65.944,147,147,147s147-65.944,147-147
-	S228.056,0,147,0z M221.25,237c-5.024,0-9.782-1.156-14.025-3.214C190.084,245.583,169.336,252.5,147,252.5
-	c-58.725,0-106.5-47.775-106.5-106.5c0-11.791,1.93-23.138,5.483-33.748C42.559,108.103,40.5,102.787,40.5,97
-	c0-13.233,10.767-24,24-24c1.577,0,3.118,0.157,4.612,0.449C88.567,52.577,116.283,39.5,147,39.5
-	c23.324,0,44.917,7.543,62.479,20.309l14.259-17.111c2.652-3.181,7.383-3.61,10.563-0.96c3.182,2.651,3.611,7.381,0.96,10.563
-	l-14.294,17.153C241.014,88.832,253.5,115.983,253.5,146c0,13.561-2.553,26.536-7.195,38.476c4.495,5.544,7.195,12.599,7.195,20.274
-	C253.5,222.532,239.032,237,221.25,237z"/>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
diff --git a/images/elements/unused/location.svg b/images/elements/unused/location.svg
deleted file mode 100644
index 6a26c38..0000000
--- a/images/elements/unused/location.svg
+++ /dev/null
@@ -1,1235 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="msapplication-config" content="none"/>
-<link rel="shortcut icon" href="https://media.flaticon.com/img/favicon.png">
-<link rel="apple-touch-icon-precomposed" sizes="57x57" href="https://media.flaticon.com/img/apple-icon-57x57-precomposed.png" />
-<link rel="apple-touch-icon-precomposed" sizes="60x60" href="https://media.flaticon.com/img/apple-icon-60x60-precomposed.png" />
-<link rel="apple-touch-icon-precomposed" sizes="72x72" href="https://media.flaticon.com/img/apple-icon-72x72-precomposed.png" />
-<link rel="apple-touch-icon-precomposed" sizes="76x76" href="https://media.flaticon.com/img/apple-icon-76x76-precomposed.png" />
-<link rel="apple-touch-icon-precomposed" sizes="114x114" href="https://media.flaticon.com/img/apple-icon-114x114-precomposed.png" />
-<link rel="apple-touch-icon-precomposed" sizes="120x120" href="https://media.flaticon.com/img/apple-icon-120x120-precomposed.png" />
-<link rel="apple-touch-icon-precomposed" sizes="144x144" href="https://media.flaticon.com/img/apple-icon-144x144-precomposed.png" />
-<link rel="apple-touch-icon-precomposed" sizes="152x152" href="https://media.flaticon.com/img/apple-icon-152x152-precomposed.png" />
-
-<link rel="chrome-webstore-item" href="https://chrome.google.com/webstore/detail/nkhjnpgcnmdpeikbeegmibjcfjpamjnp">
-
-<title>Download limit reached - Flaticon, The largest database of free vector icons</title>
-
-
-
-
-
-
-<link href='https://media.flaticon.com/css/base.css?key=2017012401' rel='stylesheet' type='text/css'/>
-<!--[if lt IE 10]>
-<script>var ie = true;</script>
-<link rel="stylesheet" type="text/css" href="https://media.flaticon.com/css/ie.css">
-<![endif]-->
-
-
-<script>
-
-    var STATIC_URL        = 'https://image.flaticon.com/';
-    var ACCOUNTS_BASE_URL = 'https://profile.flaticon.com/';
-    var ACCOUNTS_API_KEY  = 'aHR0cDovL3d3dy5mbGF0aWNvbi5jb20=';
-    var FACEBOOK_APP_ID   = '579360525479711';
-    var GOOGLE_CLIENT_ID  = '544984668822-l66ipmg9o5lpalcntjckr651vbo72tcv.apps.googleusercontent.com';
-    var GOOGLE_API_KEY    = 'AIzaSyCkyUw3UxCwg618Bknm9vdoWnYWji4lQSM';
-    var LANGUAGE          = 'english';
-    var language          = 'english';
-    var LANGUAGE_SHORT    = 'en';
-    var URL_LOG           = 'URL_LOG';
-    var RE_CAPTCHA_KEY    = '6LdrxggTAAAAAEsVEMxap24sSkGS1nI3SsOigFyF';
-    var RE_CAPTCHA_SECRET = '6LdrxggTAAAAANBFArNBHFs8wDnZL5q51hkRPpls';
-    var SPONSOR_BASE_URL  = 'http://go.flaticon.com/';
-    var APP_URL           = 'http://www.flaticon.com/';
-
-    var ACTIVE_AX_DETAIL  = 0;
-    var url_pre_ax_detail;
-
-    
-    (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', 'UA-42742855-1', 'auto', {'allowLinker': true});
-    ga('send', 'pageview');
-
-    // Sending ClientId to Shutterstock iframes
-    var clientId = undefined;
-    var iframeQueue = [];
-    function sendClientId() {
-        while (iframeQueue.length>0) {
-            var iframe = iframeQueue.pop();
-            // Extract domain from iframe src
-            var parser = document.createElement('a');
-            parser.href = iframe.src;
-            var target = parser.protocol+'//'+parser.hostname;
-            iframe.contentWindow.postMessage(clientId, target);
-        }
-    }
-    function askForClientId(element) {
-        iframeQueue.push(element);
-        if (clientId) {
-            sendClientId();
-        }
-    }
-    ga(function (tracker) {
-        clientId = tracker.get('clientId');
-        sendClientId();
-    });
-
-    if (window.performance && document.addEventListener && window.addEventListener) {
-        document.addEventListener('DOMContentLoaded', function () {
-            ga('send', 'timing', 'performance', 'DOMContentLoaded', Math.round(performance.now()) /* TODO: 'Highwinds CDN' | 'Edgecast CDN' | 'OVH' */);
-        });
-    }
-
-    function ga_logged_in_callback(data) {
-        var userType = !data.status ? 'guest' : (data.premium ? 'premium' : 'registered');
-        ga('set', 'dimension1', userType);
-        if (data.id) {
-            ga('set', 'userId', data.id);
-        }
-    }
-
-    function logged_in_callback(data) {
-        ga_logged_in_callback(data);
-    }
-
-    (function(e,b){if(!b.__SV){var a,f,i,g;window.mixpanel=b;b._i=[];b.init=function(a,e,d){function f(b,h){var a=h.split(".");2==a.length&&(b=b[a[0]],h=a[1]);b[h]=function(){b.push([h].concat(Array.prototype.slice.call(arguments,0)))}}var c=b;"undefined"!==typeof d?c=b[d]=[]:d="mixpanel";c.people=c.people||[];c.toString=function(b){var a="mixpanel";"mixpanel"!==d&&(a+="."+d);b||(a+=" (stub)");return a};c.people.toString=function(){return c.toString(1)+".people (stub)"};i="disable time_e [...]
-</script>
-</head>
-<body class="">
-	<section id="viewport" class="viewport">
-		
-<header id="header" class="body-header">
-	<div class="row">
-		<div class="popover popover-right main-menu">
-			<div class="popover-container">
-				<button id="button-main-menu" class="button--header popover-button nostyle" onclick="ga('send', 'event', 'Navbar', 'Click' ,'Menu')">
-					<span></span>
-					<span></span>
-					<span></span>
-				</button>
-
-				<div class="popover-content">
-					<a id="link-menu-home" class="btn btn-outline btn-gray fullwidth text-center" title="Home" href="http://www.flaticon.com"><i class="flaticon-home"></i> Home</a>
-					<ul class="explore">
-						<li><a id="link-menu-packs" title="Browse our packs to get a consistent style in your designs" href="http://www.flaticon.com/packs" title="Packs">Packs</a></li>
-												<li><a id="link-menu-authors" title="Know the artists who make your life easier" href="http://www.flaticon.com/authors" title="Authors">Authors</a></li>
-						<li><a id="link-menu-categories" title="Surf around our categories" href="http://www.flaticon.com/categories" title="Categories">Categories</a></li>
-						<li><a id="link-menu-top-icons" title="Top icons last 24h" href="http://www.flaticon.com/most-downloaded">Top icons</a></li>
-						<li><a id="link-menu-latest-icons" title="Browser the latest icons added to our database" href="http://www.flaticon.com/latest-icons" title="Latest icons">Latest icons</a></li>
-						<li><a id="link-menu-premium" title="Top premium icon packs" href="http://www.flaticon.com/premium-icons" title="Top premium icon packs">Premium icons</a></li>
-					</ul>
-					<a id="link-menu-plans" class="btn btn-gray fullwidth text-center fi-not-premium" title="Join premium" href="https://profile.flaticon.com/premium?lang=en" title="Premium plans" onclick="ga('send', 'event', 'Navbar', 'Click', 'Premium Plans'); mixpanel.register({'source': 'navbar', 'website': 'flaticon'});">Premium plans</a>
-					<hr class="fi-premium">
-					<ul class="general-links">
-						<li><a id="link-menu-apps" title="Flaticon App for macOS" href="http://www.flaticon.com/apps" title="Apps">Apps</a></li>
-						<li><a href="http://support.flaticon.com/hc/en-us/categories/200466151-General-questions" title="Support">Support</a></li>
-						<li><a href="https://profile.flaticon.com/support" title="Contact">Contact</a></li>
-						<li><a href="http://www.flaticon.com/about" title="About us">About us</a></li>
-						<li><a href="https://join.flaticon.com" title="Become a creator">Become a creator</a></li>
-					</ul>
-				</div>
-			</div>
-		</div>
-
-		<a href="http://www.flaticon.com/" class="logo" id="logo" title="Flaticon - The largest database of free icons" onclick="ga('send', 'event', 'Navbar', 'Click', 'Home')">
-			<i class="logo-wrapper">
-				<img src="https://media.freepik.com/flaticon/img/flaticon-logo.svg" title="Flaticon logo" width="187" height="34">
-			</i>
-		</a>
-
-				<section class="search-holder">
-			<form action="http://www.flaticon.com/search" method="get" class="main_search_bar">
-				<input type="search" name="word" placeholder="Search icons" class="autocomplete" value="" autofocus>
-									<div class="type-selector">
-						<label>
-							<input type="radio" name="search-type" value="icons" data-type="icons" checked>
-							<span class="btn nostyle">Icons</span>
-						</label>
-						<label>
-							<input type="radio" name="search-type" value="packs" data-type="packs" data-url="http://www.flaticon.com/icon-packs">
-							<span class="btn nostyle">Packs</span>
-						</label>
-					</div>
-
-					<script>
-						var search_type = localStorage.getItem("search-type");
-						if (search_type)
-						{
-							document.querySelector(".search-holder .type-selector input[name=search-type][value='"+search_type+"']").checked = true;
-						}
-					</script>
-
-									<button type="submit" class="flaticon-magnifier nostyle"></button>
-			</form>
-		</section>
-				<div id="gr_user_menu" style="margin-left: auto;">
-			<div id="gr_not-connected" class="login-link gr_not-connected tooltip tooltip--bottom-right">
-				<a href="https://profile.flaticon.com/login" class="tooltip__trigger tooltip__trigger--always"><i class="flaticon-user"></i></a>
-				<div class="tooltip__content tooltip__content--permanent dropdown-login gr_not-connected">
-					<div class="content">
-						<a title="Login and enjoy all we have for you!" href="https://profile.flaticon.com/login" onclick="ga('send', 'event', 'Navbar', 'Click', 'Login')">Login</a>
-						<span>or</span>
-						<a title="Register and be part of us!" href="https://profile.flaticon.com/register" onclick="ga('send', 'event', 'Navbar', 'Click', 'Register')">register</a>
-					</div>
-				</div>
-			</div>
-
-			<div id="gr_connected" class="popover popover-user gr_connected">
-				<div class="popover-container">
-					<button class="button--header avatar popover-button nostyle" id="gr_user_menu_avatar">
-						<img src="" alt="You look great!" onerror="set_default_avatar(this)">
-					</button>
-					<ul class="popover-content">
-						<li><a id="link-profile-home" title="See and edit your profile" href="https://profile.flaticon.com/me"><i class="flaticon-user pull-right"></i>Profile</a></li>
-						<li><a id="link-profile-subscriptions" title="Your subscriptions" href="https://profile.flaticon.com/my_subscriptions"><i class="flaticon-premium pull-right"></i>My Subscriptions</a></li>
-						<li><a id="link-profile-downloads" title="See your download history" href="https://profile.flaticon.com/my_downloads"><i class="flaticon-download pull-right"></i>My Downloads</a></li>
-						<li><a id="link-profile-collections" title="See your collections" href="https://profile.flaticon.com/my_collections"><i class="flaticon-heart pull-right"></i>My collections</a></li>
-						<li><a title="Logout, we will miss you!" href="javascript:gr.auth.logout()" id="logout_link"><i class="flaticon-cancel pull-right gr_logout_button"></i>Logout</a></li>
-					</ul>
-				</div>
-			</div>
-		</div>
-
-			</div>
-</header>
-
-<script>
-	var DEFAULT_AVATAR = 'https://image.flaticon.com/img/default_avatar.png';
-	function set_default_avatar(elem)
-	{
-		elem.src = DEFAULT_AVATAR;
-	}
-
-	if (parseInt(localStorage.pageview || 0, 10) < 3){
-		var login_link = document.getElementById("gr_not-connected");
-		login_link.classList.add("dropdown-active");
-		localStorage.pageview = parseInt(localStorage.pageview || 0, 10) + 1;
-		setTimeout(function() {
-			var login_link = document.getElementById("gr_not-connected");
-			if (login_link) {
-				login_link.classList.remove('dropdown-active');
-			}
-		}, 4000);
-	}
-
-	</script>
-
-		<!-- Start Piktab banner -->
-<style>
-	.topbar {
-		background: #3B2551;
-		color: #fff;
-		border-bottom: 1px solid #2c1642;
-		height: 0;
-		-webkit-transition: height 300ms cubic-bezier(0.165, 0.84, 0.44, 1);
-		-moz-transition: height 300ms cubic-bezier(0.165, 0.84, 0.44, 1);
-		transition: height 300ms cubic-bezier(0.165, 0.84, 0.44, 1);
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		width: 100%;
-		z-index: 9999;
-		height: 0;
-		overflow: hidden;
-	}
-	.topbar-visible .topbar {
-		height: 100px;
-	}
-	header {
-		-moz-webkit-transition: top 300ms cubic-bezier(0.165, 0.84, 0.44, 1);
-		-moz-transition: top 300ms cubic-bezier(0.165, 0.84, 0.44, 1);
-		transition: top 300ms cubic-bezier(0.165, 0.84, 0.44, 1);
-	}
-	.topbar .container {
-		max-width: 1200px;
-		margin: auto;
-		position: relative;
-		height: 100px;
-	}
-	.topbar .screen {
-		width: 648px;
-		height: 100px;
-		background: #ccc;
-		border-radius: 8px 8px 0 0;
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		background: url(https://image.flaticon.com/img/piktab/screen.png) no-repeat;
-		background-size: cover;
-	}
-	.topbar .text {
-		width: 580px;
-		height: 100%;
-		padding-left: 40px;
-		position: absolute;
-		top: 0;
-		right: 50px;
-		height: 100%;
-		background-image: -moz-linear-gradient(to left,rgba(59, 37, 81, 0.9) 90%,transparent);
-		background-image: -webkit-linear-gradient(to left,rgba(59, 37, 81, 0.9) 90%,transparent);
-		background-image: linear-gradient(to left,rgba(59, 37, 81, 0.9) 90%,transparent);
-	}
-	.topbar .text p {
-		font-size: 18px;
-		float: left;
-		width: 320px;
-		font-weight: bold;
-		margin-top: 26px;
-	}
-	.topbar .text p small a {
-		font-size: 12px;
-		color: #ccc;
-	}
-	.topbar .text p small a:hover {
-		text-decoration: underline;
-	}
-	.topbar .text .install {
-		font-weight: bold;
-		background: #fff;
-		border: none;
-		border-radius: 4px;
-		font-size: 24px;
-		width: 200px;
-		height: 60px;
-		line-height: 60px;
-		cursor: pointer;
-		margin-left: 10px;
-		float: left;
-		margin-top: 20px;
-		padding: 0;
-		text-align: center;
-	}
-	.topbar .text .install:hover {
-		background-color: #e8e8e8;
-	}
-	.topbar .close {
-		width: 24px;
-		height: 24px;
-		display: block;
-		position: absolute;
-		top: 50%;
-		right: 10px;
-		margin-top: -12px;
-		background-color: rgba(255,255,255,0.5);
-		color: #fff;
-		border-radius: 50%;
-		border: none;
-		font-size: 22px;
-		padding: 0;
-		outline: none;
-		line-height: 24px;
-		cursor: pointer;
-	}
-	.topbar .close:hover {
-		background-color: #fff;
-		color: #3B2551;
-	}
-
-	@media screen and (max-width: 768px)
-	{
-		.topbar {
-			display: none;
-		}
-	}
-</style>
-
-<div class="topbar" id="topbar">
-	<div class="container">
-		<div class="screen"></div>
-		<div class="text">
-			<p>Open a new tab and discover free graphic resources every day.<small><a href="http://www.piktab.com" target="_blank" onclick="closePiktabBar(); ga('send', 'event', 'Piktab banner', 'More Info');"> More info</a></small></p>
-			<a class="install btn" id="piktab_install_btn" href="http://www.piktab.com" target="_blank" onclick="closePiktabBar(); ga('send', 'event', 'Piktab banner', 'Install');">Install Piktab</a>
-		</div>
-		<button class="close" id="close-topbar">&times;</button>
-	</div>
-</div>
-
-<script type="text/javascript">
-	function closePiktabBar(){
-		if (document.body.classList.contains('topbar-visible')) {
-			document.body.classList.remove('topbar-visible');
-
-			var piktab_cookie = Cookie.get("piktab_topbar");
-
-			if (piktab_cookie.length)
-			{
-				piktab_cookie = piktab_cookie.split("|");
-				piktab_cookie[2] = 3;
-				Cookie.set("piktab_topbar", piktab_cookie.join("|"), 60);
-			}
-		}
-	}
-
-	document.getElementById('close-topbar').addEventListener('click', closePiktabBar);
-
-	document.addEventListener("DOMContentLoaded", function(){
-		// Piktab topbar
-		var piktab_cookie = Cookie.get("piktab_topbar");
-
-		var today = new Date();
-		if (piktab_cookie.length)
-		{
-			piktab_cookie = piktab_cookie.split("|");
-			var first_display = new Date(piktab_cookie[0]);
-			var last_display  = new Date(piktab_cookie[1]);
-			var display_times = parseInt(piktab_cookie[2], 10);
-
-			var timeDiff      = Math.abs(last_display.getTime() - first_display.getTime());
-			var diffDays      = Math.ceil(timeDiff / (1000 * 3600 * 24));
-			display_times = today.toDateString() != last_display.toDateString() ? 0 : display_times;
-
-			if (diffDays < 3 && display_times < 3)
-			{
-				document.body.classList.add("topbar-visible");
-
-				first_display.setTime(first_display.getTime() + 60)
-				timeDiff      = Math.abs(first_display.getTime() - today.getTime());
-				diffDays      = Math.ceil(timeDiff / (1000 * 3600 * 24));
-
-				display_times++;
-				Cookie.set("piktab_topbar", [first_display.toDateString(), today.toDateString(), display_times].join("|"), 60);
-			}
-		}
-		else
-		{
-			document.body.classList.add("topbar-visible");
-			Cookie.set("piktab_topbar",[today.toDateString(), today.toDateString(), 1].join("|"), 60);
-		}
-
-		setTimeout(function(){
-			document.body.classList.remove('topbar-visible');
-		}, 10000);
-	});
-
-	</script>
-<!-- End Piktab banner -->
-		
-		<script type="text/javascript">
-	document.addEventListener("DOMContentLoaded", function(event) {
-		// Send track to mixpanel
-		mixpanel.register({"landing": "downloads-limit"});
-		if (gr.auth.me && gr.auth.me.status) {
-			mixpanel.register_once({'user_type': 'existing', 'source': 'downloads-limit', 'website': 'flaticon'});
-
-			mixpanel.register({'user_id': gr.auth.me.id, 'user_login': gr.auth.me.login, 'user_lang': 'en'});
-			mixpanel.alias(gr.auth.me.id);
-			mixpanel.people.set({'id': gr.auth.me.id, 'first_name': gr.auth.me.login});
-
-			mixpanel.track("view_login");
-			mixpanel.track("send_email");
-			mixpanel.track("confirm_login");
-		}
-	});
-</script>
-
-<div class="download-limit">
-
-		<div class="limit30">
-			<div class="limit-container">
-				<h1>Wait a second</h1>
-			</div>
-		</div>
-
-		<div class="limit-text">
-			<div class="intro text-center">
-				<h2>To avoid a misuse of Flaticon, we have limited the number of downloads per user</h2>
-				<div class="alert">
-					<i class="flaticon-exclamation"></i>
-					<p class="text-center">Don't you think you are using this content inappropriately? Do you see this message frequently? Please contact our <a href="http://support.flaticon.com">support team</a>.</p>
-				</div>
-				<a href="#" onclick="javascript:window.history.back();" class="btn">Try again</a>
-			</div>
-			<div class="other">
-				<span>Any question?</span>
-				<a href="http://support.flaticon.com/hc/en-us/articles/213303205" class="btn" target="_blank"><i class="flaticon-help"></i> Support</a>
-			</div>
-		</div>
-
-		
-</div>
-		
-<footer id="footer" class="body-footer" style="width: 100%;">
-	<div class="wrapper">
-		<div class="col-12 omega">
-			<a href="http://www.flaticon.com" class="logo" title="Flaticon - The largest database of free icons"><img src="https://media.freepik.com/flaticon/img/flaticon-logo-footer.svg" title="Flaticon logo"></a>
-
-			<div class="links-terms">
-				<a href="http://www.flaticon.com/terms-of-use" title="Terms & conditions">Terms &amp; conditions</a>
-				<a href="http://www.flaticon.com/privacy-policy" title="Privacy policy">Privacy policy</a>
-				<a href="http://www.flaticon.com/copyright" title="Copyrights Notification">Copyrights Notification</a>
-			</div>
-			<ul class="share">
-				<li><a href="https://www.facebook.com/theflaticon" class="flaticon-facebook bg-facebook" title="Facebook" target="_blank"></a></li>
-				<li><a href="https://twitter.com/theflaticon" class="flaticon-twitter bg-twitter" title="Twitter" target="_blank"></a></li>
-				<li><a href="https://plus.google.com/+Flaticon" class="flaticon-google bg-google" title="Google+" target="_blank"></a></li>
-				<li><a href="http://www.pinterest.com/flaticon" class="flaticon-pinterest bg-pinterest" title="Pinterest" target="_blank"></a></li>
-			</ul>
-		</div><!-- .col-12 -->
-		<nav>
-			<div class="col-4">
-				<ul>
-					<li><span>Help</span></li>
-					<li><a href="http://www.flaticon.com/collections" title="Flaticon Collections">Flaticon Collections</a></li>
-					<li><a href="http://support.flaticon.com/hc/en-us/categories/200466151-General-questions" title="Support">Support</a></li>
-					<li><a href="https://profile.flaticon.com/support" title="Contact">Contact</a></li>
-					<li><a href="http://www.flaticon.com/about" title="About us">About us</a></li>
-					<li><a href="https://join.flaticon.com" title="Become a creator">Become a creator</a></li>
-					<li><a href="https://profile.flaticon.com/premium?lang=en" title="Premium plans" onclick="ga('send', 'event', 'Footer', 'Go to premium', 'Link');mixpanel.register({'source': 'footer', 'website': 'flaticon'});">Premium plans</a></li>
-									</ul>
-			</div><!-- .col-4 -->
-
-			<div class="col-4">
-				<ul>
-					<li><span>APPs</span></li>
-					<li><a title="Mac OS X app" href="http://www.flaticon.com/apps/mac-osx-app">Mac OS X</a></li>
-										<li><a title="Font-face generator" href="http://www.flaticon.com/font-face">@font-face generator</a></li>
-				</ul>
-			</div><!-- .col-4 -->
-
-			<div class="col-4 omega">
-				<ul>
-					<li><span>Content</span></li>
-					<li><a href="http://www.flaticon.com/categories" title="Categories">Categories</a></li>
-					<li><a href="http://www.flaticon.com/packs" title="Packs">Packs</a></li>
-					<li><a href="http://www.flaticon.com/authors" title="Authors">Authors</a></li>
-					<li><a href="http://www.flaticon.com/most-downloaded" title="Top icons">Top icons</a></li>
-					<li><a href="http://www.flaticon.com/latest-icons" title="Latest icons">Latest icons</a></li>
-					<li><a href="http://www.flaticon.com/tags" title="Most searched tags">Tags</a></li>
-				</ul>
-			</div><!-- .col-4 -->
-		</nav>
-
-		<p class="copyright">
-			Flaticon is a project by <a href="http://www.freepik.com/" target="_blank">Freepik</a><br>
-			&copy; 2013-2017 Graphic Resources S.L. All rights reserved.
-		</p>
-
-	</div><!-- .wrapper -->
-</footer>
-		<script id="tpl-icon" type="text/x-handlebars-template">
-
-	<li class="icon{{#if page}} init page-handler{{/if}} {{#isPersonalIcon premium}} personal-icon{{/isPersonalIcon}}"
-	data-id="{{id}}"
-	data-name="{{keyword}}"
-	data-color="{{color}}"
-	data-premium="{{premium}}"
-	data-pack="{{pack_slug}}"
-	data-search="{{dataSearch}}"
-	{{#if page}} data-page="{{page}}"{{/if}}>
-	<img src="{{png}}" srcset="{{retinaImage}} 4x">
-	<div class="overlay" aria-hidden="true">
-		<button class="flaticon-collections_add"></button>
-		<a href="{{slug}}" class="flaticon-eye link-icon-detail" title="{{description}}"></a>
-	</div>
-	{{#specialItem premium selection}}
-		{{#if premium}}
-			<a href="#" class="modal-trigger flaticon-premium premium" data-modal="modal-selection" target="_blank"></a>
-			<a href="#" class="modal-trigger what-is" data-modal="modal-selection" target="_blank">What is this?</a>
-		{{else}}			
-			<a href="#" class="modal-trigger flaticon-selection" data-modal="modal-selection" target="_blank"></a>
-			<a href="#" class="modal-trigger what-is" data-modal="modal-selection" target="_blank">What is this?</a>
-		{{/if}}
-	{{/specialItem}}
-
-</li>
-</script>
-<script id="tpl-collection" type="text/x-handlebars-template">
-	<section class="collection{{#if active}} expanded {{setHeight}}{{/if}}{{#unless status}} locked{{/unless}}" data-order="{{order}}" data-color="{{color}}" data-bookmark="{{bookmark_id}}">
-
-		<header class="collection-header">
-			<span class="collection-name">{{name}}</span>
-			<span class="badge badge-gray">{{icons}}</span>
-			{{#if status}}
-			<button class="flaticon-pencil nostyle"></button>
-			<div class="edit-name">
-				<input type="text" class="collection-name-input" value="{{name}}" data-original="{{name}}" maxlength="100">
-				<button class="flaticon-disk nostyle"></button>
-			</div>
-			{{else}}
-			{{/if}}
-
-			<div class="locked-options pull-right">
-				<button class="nostyle" data-bookmark="{{bookmark_id}}"><i class="flaticon-bin"></i></button>
-				<i class="flaticon-lock success"></i>
-			</div>
-		</header>
-		<div class="collection-content">
-			{{#if status}}
-			<nav class="collection-options">
-				<ul>
-					
-					<li class="simptip-position-bottom simptip-movable" data-tooltip="Change color of icons">
-						<div class="popover">
-							<div class="popover-container">
-								<button class="collection_color_button popover-button">
-									<i class="flaticon-paint"></i>
-								</button>
-								<div class="popover-content">
-									<span class="checkbox-group simptip-position-top simptip-movable" data-tooltip="If checked, all icons color,&#10;including the customized ones, will change.">
-										<input type="checkbox" id="color-lock">
-										<label for="color-lock" class="fake-checkbox"></label>
-										<label for="color-lock" class="text">Recolor all the icons</label>
-									</span>
-									<ul class="color-selector">
-										<li><button class="green" data-color="91DC5A"></button></li>
-										<li><button class="blue" data-color="006DF0"></button></li>
-										<li><button class="purple" data-color="933EC5"></button></li>
-										<li><button class="yellow" data-color="FFDA44"></button></li>
-										<li><button class="red" data-color="D80027"></button></li>
-										<li><button class="white" data-color="FFFFFF"></button></li>
-										<li><button class="black" data-color="000000"></button></li>
-									</ul>
-									<div class="col-cpicker" onload="Widget.createCollectionCPicker"></div>
-								</div>
-							</div>
-						</div>
-					</li>					
-					<li class="simptip-position-bottom simptip-movable" data-tooltip="Edit icons properties"><button class="flaticon-pencil"></button></li>
-					<li class="simptip-position-bottom simptip-movable" data-tooltip="Duplicate collection"><button class="flaticon-duplicate" data-bookmark="{{bookmark_id}}" onclick="Collection.duplicate()"></button></li>
-					<li class="share_li_option simptip-position-bottom simptip-movable" data-tooltip="Share your collection!">
-						<div class="popover">
-							<div class="popover-container">
-								<button class="popover-button flaticon-share"></button>
-								<div class="popover-content">
-									<input class="selectInput" type="text" value="http://www.flaticon.com/collections/{{shareUrl}}" readonly onclick="this.select()">
-									<ul>
-										<li><button class="bg-twitter collection_share_button" data-type="twitter"><i class="flaticon-twitter"></i></button></li>
-										<li><button class="bg-facebook collection_share_button" data-type="facebook"><i class="flaticon-facebook"></i></button></li>
-										<li><button class="bg-google collection_share_button" data-type="google"><i class="flaticon-google"></i></button></li>
-									</ul>
-								</div>
-							</div>
-						</div>
-					</li>
-					<li class="simptip-position-bottom simptip-movable" data-tooltip="Delete"><button class="flaticon-bin" data-bookmark="{{bookmark_id}}"></button></li>
-				</ul>
-			</nav>
-			<header class="header-edit">
-				<b>Edit mode</b>
-				<button class="btn-small btn-pill pull-right btn-back"><i class="flaticon-arrow_left"></i> Back</button>
-			</header>
-			{{/if}}
-			<a class="btn{{#if status}} hidden{{/if}} upgrade_btn" href="https://profile.flaticon.com/premium?lang=en" onclick="ga('send', 'event', 'Collection', 'Go to premium', 'Collection locked'); mixpanel.register({'source': 'collection-locked', 'website': 'flaticon'});">Upgrade to unlock this collection</a>
-
-			<span class="icons-limit icons-collection-noregister"><a href="https://profile.flaticon.com/register">Register to get up to 256 icons</a></span>
-			<span class="icons-limit max-icons-collection" data-message="You have reach the limit of 256 icons, get premium and get unlimited collections">Max limit reached: 256 icon per collection</span>
-
-			<div class="overlay-drop" data-bookmark="{{bookmark_id}}" ondragleave="Collection.dragEnd(event)" ondrop="Collection.drop(event);return false;">
-				<div class="drop">
-					<i class="flaticon-upload"></i>
-					<span>Drop to upload</span>
-				</div>
-				<div class="upgrade">
-					<p>You can upload only <span class="danger">3</span> icons per collection as a free user. Upgrade to upload unlimited icons.</p>
-					<a href="https://profile.flaticon.com/premium?lang=en" class="btn fullwidth">Upgrade</a>
-					<p>or</p>
-					<button class="btn btn-gray btn-small">continue</button>
-				</div>
-				<div class="register">
-					<p>You can't upload icons as an anonymous user. <a href="https://profile.flaticon.com/login" class="text-link">Login</a> or <a href="https://profile.flaticon.com/register" class="text-link">register</a> to upload icons.</p>										
-					<p>or</p>
-					<button class="btn btn-gray btn-small">continue</button>
-				</div>
-			</div>
-			
-			<form name="uploadFileCollection-{{bookmark_id}}"  id="uploadFileCollection-{{bookmark_id}}"> 
-				<input id="fileCollection-{{bookmark_id}}" class="fileCollection hidden" type="file" name="fileCollection-{{bookmark_id}}[]" accept=".svg" required="" >
-			</form>
-
-			<ul class="collection_icons_list icons" ondragover="Collection.dragOver()" >
-				<li class="icon-upload simptip-position-right simptip-movable" data-bookmark="{{bookmark_id}}"  ondragover="Collection.dragOver(event); return false;">
-					<label data-bookmark="{{bookmark_id}}"  >
-						<span>Upload SVG</span>						
-					</label>
-				</li>
-			</ul>
-
-			<div class="empty-collection" ondragover="Collection.dragOver(event); return false;">
-				<ul>
-					<li class="icon-upload simptip-position-bottom simptip-movable" >
-						<label>
-							<span>Upload SVG</span>						
-						</label>
-					</li>
-				</ul>				
-
-				<img src="https://media.flaticon.com/img/cactus.svg" class="cactus" alt="Empty collection">
-				<div class="bola-container">
-					<img src="https://media.flaticon.com/img/tumble.svg" class="bola">
-				</div>
-				<p>Hey cowboy! This looks like a desert. Add some icons to start using this collection or drop here your own SVG file..</p>
-
-			</div>
-			{{#if status}}
-			<div class="download-wrapper">
-				<div class="download-holder">
-					<button class="fullwidth" disabled>Download collection <i class="flaticon-download"></i></button>
-				</div>
-				<div class="collection-download">
-					<header class="header-download">
-						<b>Download:<br>Choose a format</b>
-						<button class="nostyle">×</button>
-					</header>
-					<div class="download-files">
-						<ul class="download">
-							<li class="simptip-position-top simptip-movable" data-tooltip="Download in PNG and use the icons
-in websites, Powerpoint, Word,
-Keynote and all commons apps." >
-								<a class="btn fullwidth" data-format="png">PNG</a>
-							</li>
-							<li class="customize">
-								<span>Select a size (in pixels).</span>
-								<ul class="size">
-									<li><button class="btn btn-small download-button" data-format="png" data-size="16">16</button></li>
-									<li><button class="btn btn-small download-button" data-format="png" data-size="24">24</button></li>
-									<li><button class="btn btn-small download-button" data-format="png" data-size="32">32</button></li>
-									<li><button class="btn btn-small download-button" data-format="png" data-size="64">64</button></li>
-									<li><button class="btn btn-small download-button" data-format="png" data-size="128">128</button></li>
-									<li><button class="btn btn-small download-button" data-format="png" data-size="256">256</button></li>
-									<li><button class="btn btn-small download-button" data-format="png" data-size="512">512</button></li>
-								</ul>
-							</li>
-							<li class="simptip-position-top simptip-movable" data-tooltip="Download in SVG and use the icons
-in websites, Adobe Illustrator, Sketch,
-Corel draw and all Vector design apps.">
-								<button class="btn fullwidth download-button" data-format="svg">SVG</button>
-							</li>
-							<li class="simptip-position-top simptip-movable" data-tooltip="Download in EPS and use the icons
-in websites, Adobe Illustrator, Sketch,
-Corel draw and all Vector design apps.">
-								<button class="btn fullwidth download-button" data-format="eps">EPS</button>
-							</li>
-							<li class="simptip-position-top simptip-movable" data-tooltip="Download in PSD and use the icons
-with Adobe Photoshop.">
-								<button class="btn fullwidth download-button" data-format="psd">PSD</button>
-							</li>
-							<li class="simptip-position-top simptip-movable extra-info" data-tooltip="Download as Iconfont and use
-the icons in your web,
-which is fully customizable with only CSS.">
-								<button class="btn fullwidth btn-outline download-button" data-format="iconfont">Iconfont</button>
-								<a class="help_link" href="/iconfonts" target="_blank"><i class="flaticon-question"></i></a>
-							</li>
-							<li class="simptip-position-top simptip-movable extra-info" data-tooltip="Download as SVG sprite and use
-the icons in your web,
-which is fully customizable with only CSS.">
-								<button class="btn fullwidth btn-outline download-button" data-format="svg-sprite">SVG sprite</button>
-								<a class="help_link" href="/svg-sprites" target="_blank"><i class="flaticon-question"></i></a>
-							</li>
-							<li class="simptip-position-top simptip-movable" data-tooltip="Download your collection
-in all available formats
-PNG, EPS, SVG, PSD and Iconfont.">
-								<button class="btn fullwidth btn-gray download-button" data-format="all">All formats</button>
-							</li>
-							<li>
-								<label class="report btn btn-warning warning btn-small btn-outline" for="modal-report-collection"><i class="flaticon-exclamation"></i> Problems downloading?</label>
-							</li>
-						</ul>
-						<form id="download-collection-form" name="download-collection-form" method="post" >
-							<input type="hidden" name="downC_type" id="downC_type" />
-							<input type="hidden" name="downC_bookmark_id" id="downC_bookmark_id" />
-							<input type="hidden" name="downC_bookmark_name" id="downC_bookmark_name" />
-							<input type="hidden" name="downC_user_id" id="downC_user_id" />
-							<input type="hidden" name="downC_format" id="downC_format" />
-							<input type="hidden" name="downC_size" id="downC_size" />
-							<input type="hidden" name="downC_color" id="downC_color" />
-							<input type="hidden" name="downC_icons" id="downC_icons" />
-						</form>
-					</div>
-				</div>
-			</div>
-			{{/if}}
-		</div>
-	</section>
-</script>
-<script id="tpl-collection-icon" type="text/x-handlebars-template">
-	<li class="icon collectionIcon selected {{iconLocked}}" data-id="{{id}}" data-name="{{name}}" data-color="{{color}}"  data-premium="{{premium}}" aria-haspopup="true" > 
-		<img src="https://media.flaticon.com/img/loader.gif" data-src="{{icoImg}}" class="collectionIconImage" onload="Widget.renderSVG(this)" data-premium="{{premium}}">
-		<div class="overlay" aria-hidden="true">
-			<button class="flaticon-collections_remove"></button>
-			<a href="http://www.flaticon.com/icon/{{id}}" class="flaticon-eye" title="{{name}}"></a>
-		</div>
-		<div class="edit">
-			<input class="collection-icon-rename" type="text" value="{{name}}" data-original="{{name}}">
-			{{#isColor color}}
-			<button class="popover-button nostyle icon-color-button"><i class="flaticon-paint"></i></button>
-			{{/isColor}}
-			<button class="nostyle danger flaticon-bin collection-icon-delete"></button>
-			{{#isColor color}}
-			<div class="popover">
-				<div class="popover-container">
-					<div class="popover-content">
-						<ul class="color-selector">
-							<li><button class="green" data-color="91DC5A"></button></li>
-							<li><button class="blue" data-color="006DF0"></button></li>
-							<li><button class="purple" data-color="933EC5"></button></li>
-							<li><button class="yellow" data-color="FFDA44"></button></li>
-							<li><button class="red" data-color="D80027"></button></li>
-							<li><button class="white" data-color="FFFFFF"></button></li>
-							<li><button class="black" data-color="000000"></button></li>
-						</ul>
-						<div class="icon-cpicker"></div>
-					</div>
-				</div>
-			</div>
-			{{/isColor}}
-		</div>
-		<i class="flaticon-lock danger"></i>
-	</li>
-</script>
-<script id="tpl-author-box" type="text/x-handlebars-template">
-	<article class="box{{#if page}} init page-handler{{/if}}" {{#if page}} data-page="{{page}}"{{/if}} data-id="{{id}}" data-name="{{name}}">
-		<div class="popover popover-top author-links">
-			<div class="popover-container">
-				<button class="popover-button nostyle"><i class="flaticon-link"></i></button>
-				<ul class="popover-content">
-					{{#if website}} <li><a href="{{website}}" target="_blank"><i class="flaticon-link"></i></a></li>{{/if}}
-					{{#if facebook}} <li><a href="{{facebook}}" target="_blank"><i class="flaticon-facebook facebook"></i></a></li>{{/if}}
-					{{#if twitter}} <li><a href="{{twitter}}" target="_blank"><i class="flaticon-twitter twitter"></i></a></li>{{/if}}
-					{{#if gplus}} <li><a href="{{gplus}}" target="_blank"><i class="flaticon-google google"></i></a></li>{{/if}}
-				</ul>
-			</div>
-		</div>
-		<a href="{{link}}">
-			<div class="img-holder">
-				<img src="{{background}}" alt="{{name}}" title="{{name}}" class="img-bg" width="298" height="182">
-				<img src="{{image}}" alt="{{name}}" title="{{name}}" class="img-author" width="100" height="100">
-			</div>
-			<footer>
-				<span class="name">{{name}}</span>
-				<span class="badge pull-right">{{icons}} icons</span>
-			</footer>
-		</a>
-	</article>
-</script>
-<script id="tpl-pack-box" type="text/x-handlebars-template">
-	<article class="box{{#if page}} init page-handler{{/if}}{{#if premium}} box-premium{{/if}}" {{#if page}} data-page="{{page}}"{{/if}}data-id="{{id}}" data-name="{{description}}">
-		<a href="{{link}}" title="{{description}}">
-
-			{{#if premium}}
-				<span class="badge-license premium"><i class="flaticon-premium premium"></i></span>
-			{{ else }}
-				{{#if selection}}
-					<span class="badge-license"><i class="flaticon-selection"></i></span>
-				{{/if}}
-			{{/if}}
-
-			<div class="img-holder">
-				<img src="{{image}}" alt="{{description}}" class="img-bg" width="300" height="282">
-			</div>
-
-			<footer class="bg-{{colors}}">
-
-
-				<span class="name">{{description}}</span>
-				<span class="badge pull-right">{{pack_items}} icons</span>
-			</footer>
-		</a>
-	</article>
-</script>
-<script id="tpl-collection-limit-box" type="text/x-handlebars-template">
-	<article class="box" data-bookmark="{{bookmark_id}}">
-		<span>
-			<i class="flaticon-success"></i>
-		</span>
-		<div class="img-holder">
-			{{{collectionLimitIcons}}}
-		</div>
-		<footer>
-			<span class="name">{{name}}</span>
-			<span class="badge pull-right">{{count}} icons</span>
-		</footer>
-	</article>
-</script>
-<script id="tpl-packs-related" type="text/x-handlebars-template">
-	<li class="search-pack-result box-container">
-		<div class="box-scroll">
-			{{{packs}}}
-		</div>
-	</li>
-</script>
-<script id="tpl-pack-style" type="text/x-handlebars-template">
-	<li><a href="{{link}}" data-pack="{{id}}">{{pack}}</a></li>
-</script>
-<script id="tpl-style-selector" type="text/x-handlebars-template">
-	<li class="{{selected}}"><a href="{{link}}" class="{{class}} simptip-position-bottom simptip-movable" data-pack="{{pack}}" data-tooltip="{{name}}" data-name="{{name}}" data-style="{{style}}"></a></li>
-</script>
-<script id="tpl-pack-box-style" type="text/x-handlebars-template">
-	<article class="box{{#if page}} init page-handler{{/if}}" {{#if page}} data-page="{{page}}"{{/if}}data-id="{{id}}" data-name="{{description}}">
-		<a href="{{link}}" title="{{description}}">
-			<div class="img-holder">
-				<img src="{{image}}" alt="{{description}}" class="img-bg" width="298" height="255">
-			</div>
-
-			<footer class="bg-{{colors}}">
-				{{#if selection}}
-				<span class="simptip-position-top simptip-movable" data-tooltip="Flaticon Selection">
-					<i class="flaticon-selection"></i>
-				</span>
... 7178 lines suppressed ...


Mime
View raw message