new getting started
diff --git a/getting-started/index.html b/getting-started/index.html
index f72d5a0..d175429 100644
--- a/getting-started/index.html
+++ b/getting-started/index.html
@@ -149,9 +149,10 @@
   <div class="tab-content">
     <div id="tab1" class="tab-pane fade in active">
 
-    <!-- START_EXISTING_REPOSITORIES -->
+
+    <!-- START_CUSTOM_WORKSPACE -->
    <div class="block">
-     <h2>Workspaces for Existing Repositories</h2>
+     <h2>Create Your Own Workspace</h2>
    </div>
 
    <div class="row">
@@ -168,31 +169,18 @@
          <a href="http://beta.codenvy.com/site/login" class="btn-green">Create a free account</a>
        </div>
      </div> <!-- /.col -->
+   </div> <!-- /.row -->
+   <!-- END_CUSTOM_WORKSPACE -->
 
-     <div class="col-md-4 col-sm-6">
-       <div class="border media">
-         <div class="media-left">
-           <img src="images/2i2ikikl4kif87l9.png" alt="Logo for Angular 2">
-         </div>
-         <div class="media-body">
-           <h4>Angular 2</h4>
-           <p class="small" style="height: 50px;">Angular 2 QuickStart - source from the documentation</p>
-         </div>
-         <a href="http://beta.codenvy.com/f?id=2i2ikikl4kif87l9" class="btn-gray80">Launch Workspace</a>
-       </div>
-     </div> <!-- /.col -->
-     <div class="col-md-4 col-sm-6">
-       <div class="border media">
-         <div class="media-left">
-           <img src="images/tdwv5klhq3zcuowr.png" alt="Logo for cfpio">
-         </div>
-         <div class="media-body">
-           <h4>cfpio</h4>
-           <p class="small" style="height: 50px;">call for paper</p>
-         </div>
-         <a href="http://beta.codenvy.com/f?id=tdwv5klhq3zcuowr" class="btn-gray80">Launch Workspace</a>
-       </div>
-     </div> <!-- /.col -->
+
+
+
+    <!-- START_CONTRIBUTION_REPOSITORIES -->
+   <div class="block">
+     <h2>Contribute to a Project</h2>
+   </div>
+
+   <div class="row">
      <div class="col-md-4 col-sm-6">
        <div class="border media">
          <div class="media-left">
@@ -200,7 +188,7 @@
          </div>
          <div class="media-body">
            <h4>Elasticsearch</h4>
-           <p class="small" style="height: 50px;">Open Source, Distributed, RESTful Search Engine</p>
+           <p class="small" style="height: 50px;">Open source, distributed, RESTful search engine.</p>
          </div>
          <a href="http://beta.codenvy.com/f?id=7pabc2kl40gb6yep" class="btn-gray80">Launch Workspace</a>
        </div>
@@ -211,8 +199,8 @@
            <img src="images/zia672875qiibfzv.png" alt="Logo for Generator Alfresco">
          </div>
          <div class="media-body">
-           <h4>Generator Alfresco</h4>
-           <p class="small" style="height: 50px;">A Yeoman generator</p>
+           <h4>Alfresco</h4>
+           <p class="small" style="height: 50px;">Open-source content management.</p>
          </div>
          <a href="http://beta.codenvy.com/f?id=zia672875qiibfzv" class="btn-gray80">Launch Workspace</a>
        </div>
@@ -220,35 +208,11 @@
      <div class="col-md-4 col-sm-6">
        <div class="border media">
          <div class="media-left">
-           <img src="images/xc7ga4dx6qrgb8ii.png" alt="Logo for ISTEX">
-         </div>
-         <div class="media-body">
-           <h4>ISTEX</h4>
-           <p class="small" style="height: 50px;">API demo</p>
-         </div>
-         <a href="http://beta.codenvy.com/f?id=xc7ga4dx6qrgb8ii" class="btn-gray80">Launch Workspace</a>
-       </div>
-     </div> <!-- /.col -->
-     <div class="col-md-4 col-sm-6">
-       <div class="border media">
-         <div class="media-left">
-           <img src="images/ir9mnlkdt6hxm0z9.png" alt="Logo for ISTEX">
-         </div>
-         <div class="media-body">
-           <h4>ISTEX</h4>
-           <p class="small" style="height: 50px;">API faker</p>
-         </div>
-         <a href="http://beta.codenvy.com/f?id=ir9mnlkdt6hxm0z9" class="btn-gray80">Launch Workspace</a>
-       </div>
-     </div> <!-- /.col -->
-     <div class="col-md-4 col-sm-6">
-       <div class="border media">
-         <div class="media-left">
            <img src="images/rp0k4m6gh6rzifmi.png" alt="Logo for Javaslang">
          </div>
          <div class="media-body">
            <h4>Javaslang</h4>
-           <p class="small" style="height: 50px;">A functional library for Java 8+</p>
+           <p class="small" style="height: 50px;">A functional library for Java 8+.</p>
          </div>
          <a href="http://beta.codenvy.com/f?id=rp0k4m6gh6rzifmi" class="btn-gray80">Launch Workspace</a>
        </div>
@@ -260,7 +224,7 @@
          </div>
          <div class="media-body">
            <h4>Sourcegraph</h4>
-           <p class="small" style="height: 50px;">Code Intelligence for Teams.</p>
+           <p class="small" style="height: 50px;">Code intelligence for development teams.</p>
          </div>
          <a href="http://beta.codenvy.com/f?id=lse9alc1que84k1y" class="btn-gray80">Launch Workspace</a>
        </div>
@@ -268,35 +232,11 @@
      <div class="col-md-4 col-sm-6">
        <div class="border media">
          <div class="media-left">
-           <img src="images/9fq0busbm3tz7i8c.png" alt="Logo for Spring Rest Guide">
-         </div>
-         <div class="media-body">
-           <h4>Spring Rest Guide</h4>
-           <p class="small" style="height: 50px;">Learn how to create a RESTful web service with Spring</p>
-         </div>
-         <a href="http://beta.codenvy.com/f?id=9fq0busbm3tz7i8c" class="btn-gray80">Launch Workspace</a>
-       </div>
-     </div> <!-- /.col -->
-     <div class="col-md-4 col-sm-6">
-       <div class="border media">
-         <div class="media-left">
-           <img src="images/07xzbw8pq5wn02y5.png" alt="Logo for TomEE">
-         </div>
-         <div class="media-body">
-           <h4>TomEE</h4>
-           <p class="small" style="height: 50px;">JAX-RS Angular starter</p>
-         </div>
-         <a href="http://beta.codenvy.com/f?id=07xzbw8pq5wn02y5" class="btn-gray80">Launch Workspace</a>
-       </div>
-     </div> <!-- /.col -->
-     <div class="col-md-4 col-sm-6">
-       <div class="border media">
-         <div class="media-left">
            <img src="images/suloomuf7cvcfghn.png" alt="Logo for TomEE">
          </div>
          <div class="media-body">
            <h4>TomEE</h4>
-           <p class="small" style="height: 50px;">Moviefun</p>
+           <p class="small" style="height: 50px;">Tomcat-based Java EE application server.</p>
          </div>
          <a href="http://beta.codenvy.com/f?id=suloomuf7cvcfghn" class="btn-gray80">Launch Workspace</a>
        </div>
@@ -304,56 +244,93 @@
      <div class="col-md-4 col-sm-6">
        <div class="border media">
          <div class="media-left">
-           <img src="images/lemf30nh52rvsx42.png" alt="Logo for TomEE">
+           <img src="images/tdwv5klhq3zcuowr.png" alt="Logo for cfpio">
          </div>
          <div class="media-body">
-           <h4>TomEE</h4>
-           <p class="small" style="height: 50px;">Simple Stateless Example</p>
+           <h4>cfp.io</h4>
+           <p class="small" style="height: 50px;">Simplify requesting papers for conferences.</p>
          </div>
-         <a href="http://beta.codenvy.com/f?id=lemf30nh52rvsx42" class="btn-gray80">Launch Workspace</a>
+         <a href="http://beta.codenvy.com/f?id=tdwv5klhq3zcuowr" class="btn-gray80">Launch Workspace</a>
        </div>
      </div> <!-- /.col -->
-     <div class="col-md-4 col-sm-6">
-       <div class="border media">
-         <div class="media-left">
-           <img src="images/ej6koycnt4maubns.png" alt="Logo for Vaadin">
-         </div>
-         <div class="media-body">
-           <h4>Vaadin</h4>
-           <p class="small" style="height: 50px;">Address Book Demo</p>
-         </div>
-         <a href="http://beta.codenvy.com/f?id=ej6koycnt4maubns" class="btn-gray80">Launch Workspace</a>
-       </div>
-     </div> <!-- /.col -->
-     <div class="col-md-4 col-sm-6">
-       <div class="border media">
-         <div class="media-left">
-           <img src="images/9skz1321dxbqpj5j.png" alt="Logo for Vert.x verticle">
-         </div>
-         <div class="media-body">
-           <h4>Vert.x verticle</h4>
-           <p class="small" style="height: 50px;">Tool-kit for building reactive applications on the JVM</p>
-         </div>
-         <a href="http://beta.codenvy.com/f?id=9skz1321dxbqpj5j" class="btn-gray80">Launch Workspace</a>
-       </div>
-     </div> <!-- /.col -->
-
    </div><!-- /.row -->
-<!-- END_EXISTING_REPOSITORIES -->
-     <!-- START_CODENVY_SAMPLES -->
+  <!-- END_CONTRIBUTION_REPOS -->
+
+
+  <!-- START_RUN_SAMPLES -->
    <div class="block">
-     <h2>Workspaces with Codenvy Sample Projects</h2>
+     <h2>Run a Tutorial / Sample</h2>
    </div>
 
    <div class="row">
      <div class="col-md-4 col-sm-6">
        <div class="border media">
          <div class="media-left">
+           <img src="images/omriatu352kkthua.png" alt="Logo for Java + Maven">
+         </div>
+         <div class="media-body">
+           <h4>Java + Maven</h4>
+           <p class="small" style="height: 50px;">Hello world console app with auto-build and run.</p>
+         </div>
+         <a href="http://beta.codenvy.com/f?id=omriatu352kkthua" class="btn-gray80">Launch Workspace</a>
+       </div>
+     </div> <!-- /.col -->
+     <div class="col-md-4 col-sm-6">
+       <div class="border media">
+         <div class="media-left">
+           <img src="images/5use7stej9bi9mxd.png" alt="Logo for Java + Gradle">
+         </div>
+         <div class="media-body">
+           <h4>Java + Gradle</h4>
+           <p class="small" style="height: 50px;">Hello world console app with auto-build and run.</p>
+         </div>
+         <a href="http://beta.codenvy.com/f?id=5use7stej9bi9mxd" class="btn-gray80">Launch Workspace</a>
+       </div>
+     </div> <!-- /.col -->
+     <div class="col-md-4 col-sm-6">
+       <div class="border media">
+         <div class="media-left">
+           <img src="images/af9r928owfulum17.png" alt="Logo for Node.js">
+         </div>
+         <div class="media-body">
+           <h4>Node.js</h4>
+           <p class="small" style="height: 50px;">Hello world web app with auto-build and run.</p>
+         </div>
+         <a href="http://beta.codenvy.com/f?id=af9r928owfulum17" class="btn-gray80">Launch Workspace</a>
+       </div>
+     </div> <!-- /.col -->
+     <div class="col-md-4 col-sm-6">
+       <div class="border media">
+         <div class="media-left">
+           <img src="images/21w2nx87yto2xi1z.png" alt="Logo for C++">
+         </div>
+         <div class="media-body">
+           <h4>C++</h4>
+           <p class="small" style="height: 50px;">Hello world console app with auto-build and run.</p>
+         </div>
+         <a href="http://beta.codenvy.com/f?id=21w2nx87yto2xi1z" class="btn-gray80">Launch Workspace</a>
+       </div>
+     </div> <!-- /.col -->
+     <div class="col-md-4 col-sm-6">
+       <div class="border media">
+         <div class="media-left">
+           <img src="images/5ayat0naxlljn3p2.png" alt="Logo for PHP">
+         </div>
+         <div class="media-body">
+           <h4>PHP</h4>
+           <p class="small" style="height: 50px;">Hello world web app with auto-build and run.</p>
+         </div>
+         <a href="http://beta.codenvy.com/f?id=5ayat0naxlljn3p2" class="btn-gray80">Launch Workspace</a>
+       </div>
+     </div> <!-- /.col -->
+     <div class="col-md-4 col-sm-6">
+       <div class="border media">
+         <div class="media-left">
            <img src="images/mo97t9pkaijr7q1c.png" alt="Logo for .NET">
          </div>
          <div class="media-body">
            <h4>.NET</h4>
-           <p class="small" style="height: 50px;">GitHub console app; Mono</p>
+           <p class="small" style="height: 50px;">Hello world console app on Linux with Mono.</p>
          </div>
          <a href="http://beta.codenvy.com/f?id=mo97t9pkaijr7q1c" class="btn-gray80">Launch Workspace</a>
        </div>
@@ -365,7 +342,7 @@
          </div>
          <div class="media-body">
            <h4>ASP.NET</h4>
-           <p class="small" style="height: 50px;">GitHub web app; Mono</p>
+           <p class="small" style="height: 50px;">Hello world web app on Linux with Mono.</p>
          </div>
          <a href="http://beta.codenvy.com/f?id=m9ylnmjtmzvmq99i" class="btn-gray80">Launch Workspace</a>
        </div>
@@ -373,71 +350,23 @@
      <div class="col-md-4 col-sm-6">
        <div class="border media">
          <div class="media-left">
-           <img src="images/21w2nx87yto2xi1z.png" alt="Logo for C++">
+           <img src="images/2i2ikikl4kif87l9.png" alt="Logo for Angular 2">
          </div>
          <div class="media-body">
-           <h4>C++</h4>
-           <p class="small" style="height: 50px;">GitHub console app; GCC; Make</p>
+           <h4>Angular 2</h4>
+           <p class="small" style="height: 50px;">Official quick start tutorial.</p>
          </div>
-         <a href="http://beta.codenvy.com/f?id=21w2nx87yto2xi1z" class="btn-gray80">Launch Workspace</a>
+         <a href="http://beta.codenvy.com/f?id=2i2ikikl4kif87l9" class="btn-gray80">Launch Workspace</a>
        </div>
      </div> <!-- /.col -->
-     <div class="col-md-4 col-sm-6">
-       <div class="border media">
-         <div class="media-left">
-           <img src="images/5use7stej9bi9mxd.png" alt="Logo for Java + Gradle">
-         </div>
-         <div class="media-body">
-           <h4>Java + Gradle</h4>
-           <p class="small" style="height: 50px;">GitHub console app; Java8; Gradle</p>
-         </div>
-         <a href="http://beta.codenvy.com/f?id=5use7stej9bi9mxd" class="btn-gray80">Launch Workspace</a>
-       </div>
-     </div> <!-- /.col -->
-     <div class="col-md-4 col-sm-6">
-       <div class="border media">
-         <div class="media-left">
-           <img src="images/omriatu352kkthua.png" alt="Logo for Java + Maven">
-         </div>
-         <div class="media-body">
-           <h4>Java + Maven</h4>
-           <p class="small" style="height: 50px;">GitHub web app; Java 8; Maven</p>
-         </div>
-         <a href="http://beta.codenvy.com/f?id=omriatu352kkthua" class="btn-gray80">Launch Workspace</a>
-       </div>
-     </div> <!-- /.col -->
-     <div class="col-md-4 col-sm-6">
-       <div class="border media">
-         <div class="media-left">
-           <img src="images/af9r928owfulum17.png" alt="Logo for Node.js">
-         </div>
-         <div class="media-body">
-           <h4>Node.js</h4>
-           <p class="small" style="height: 50px;">GitHub webapp; Grunt; Bower; Gulp; Yeoman</p>
-         </div>
-         <a href="http://beta.codenvy.com/f?id=af9r928owfulum17" class="btn-gray80">Launch Workspace</a>
-       </div>
-     </div> <!-- /.col -->
-     <div class="col-md-4 col-sm-6">
-       <div class="border media">
-         <div class="media-left">
-           <img src="images/5ayat0naxlljn3p2.png" alt="Logo for PHP">
-         </div>
-         <div class="media-body">
-           <h4>PHP</h4>
-           <p class="small" style="height: 50px;">GitHub web app; Apache; MySQL</p>
-         </div>
-         <a href="http://beta.codenvy.com/f?id=5ayat0naxlljn3p2" class="btn-gray80">Launch Workspace</a>
-       </div>
-     </div> <!-- /.col -->
-     <div class="col-md-4 col-sm-6">
+      <div class="col-md-4 col-sm-6">
        <div class="border media">
          <div class="media-left">
            <img src="images/r6p0l1sfnwm99k94.png" alt="Logo for Spring">
          </div>
          <div class="media-body">
            <h4>Spring</h4>
-           <p class="small" style="height: 50px;">GitHub PetClinic web app; Java8; Maven</p>
+           <p class="small" style="height: 50px;">Java Spring PetClinic web app example.</p>
          </div>
          <a href="http://beta.codenvy.com/f?id=r6p0l1sfnwm99k94" class="btn-gray80">Launch Workspace</a>
        </div>
@@ -449,11 +378,95 @@
          </div>
          <div class="media-body">
            <h4>Spring Boot</h4>
-           <p class="small" style="height: 50px;">GitHub console app; Java 8; Maven</p>
+           <p class="small" style="height: 50px;">Java web app example for rapid development.</p>
          </div>
          <a href="http://beta.codenvy.com/f?id=sz7uzyofb8olekkn" class="btn-gray80">Launch Workspace</a>
        </div>
      </div> <!-- /.col -->
+    <div class="col-md-4 col-sm-6">
+       <div class="border media">
+         <div class="media-left">
+           <img src="images/07xzbw8pq5wn02y5.png" alt="Logo for TomEE">
+         </div>
+         <div class="media-body">
+           <h4>TomEE</h4>
+           <p class="small" style="height: 50px;">JAX-RS and Angular web app sample.</p>
+         </div>
+         <a href="http://beta.codenvy.com/f?id=07xzbw8pq5wn02y5" class="btn-gray80">Launch Workspace</a>
+       </div>
+     </div> <!-- /.col -->
+     <div class="col-md-4 col-sm-6">
+       <div class="border media">
+         <div class="media-left">
+           <img src="images/lemf30nh52rvsx42.png" alt="Logo for TomEE">
+         </div>
+         <div class="media-body">
+           <h4>TomEE</h4>
+           <p class="small" style="height: 50px;">Stateless Java bean sample app.</p>
+         </div>
+         <a href="http://beta.codenvy.com/f?id=lemf30nh52rvsx42" class="btn-gray80">Launch Workspace</a>
+       </div>
+     </div> <!-- /.col -->
+     <div class="col-md-4 col-sm-6">
+       <div class="border media">
+         <div class="media-left">
+           <img src="images/9skz1321dxbqpj5j.png" alt="Logo for Vert.x verticle">
+         </div>
+         <div class="media-body">
+           <h4>Vert.x Verticle</h4>
+           <p class="small" style="height: 50px;">Example web app for reactive applications.</p>
+         </div>
+         <a href="http://beta.codenvy.com/f?id=9skz1321dxbqpj5j" class="btn-gray80">Launch Workspace</a>
+       </div>
+     </div> <!-- /.col -->
+     <div class="col-md-4 col-sm-6">
+       <div class="border media">
+         <div class="media-left">
+           <img src="images/9fq0busbm3tz7i8c.png" alt="Logo for Spring Rest Guide">
+         </div>
+         <div class="media-body">
+           <h4>Spring Rest</h4>
+           <p class="small" style="height: 50px;">Tutorial to create a RESTful web service.</p>
+         </div>
+         <a href="http://beta.codenvy.com/f?id=9fq0busbm3tz7i8c" class="btn-gray80">Launch Workspace</a>
+       </div>
+     </div> <!-- /.col -->
+     <div class="col-md-4 col-sm-6">
+       <div class="border media">
+         <div class="media-left">
+           <img src="images/ej6koycnt4maubns.png" alt="Logo for Vaadin">
+         </div>
+         <div class="media-body">
+           <h4>Vaadin</h4>
+           <p class="small" style="height: 50px;">Official address book UI demo.</p>
+         </div>
+         <a href="http://beta.codenvy.com/f?id=ej6koycnt4maubns" class="btn-gray80">Launch Workspace</a>
+       </div>
+     </div> <!-- /.col -->
+     <div class="col-md-4 col-sm-6">
+       <div class="border media">
+         <div class="media-left">
+           <img src="images/xc7ga4dx6qrgb8ii.png" alt="Logo for ISTEX">
+         </div>
+         <div class="media-body">
+           <h4>ISTEX</h4>
+           <p class="small" style="height: 50px;">API demo for the French digital scientific library.</p>
+         </div>
+         <a href="http://beta.codenvy.com/f?id=xc7ga4dx6qrgb8ii" class="btn-gray80">Launch Workspace</a>
+       </div>
+     </div> <!-- /.col -->
+     <div class="col-md-4 col-sm-6">
+       <div class="border media">
+         <div class="media-left">
+           <img src="images/ir9mnlkdt6hxm0z9.png" alt="Logo for ISTEX">
+         </div>
+         <div class="media-body">
+           <h4>ISTEX</h4>
+           <p class="small" style="height: 50px;">API mock for the French digital scientific library.</p>
+         </div>
+         <a href="http://beta.codenvy.com/f?id=ir9mnlkdt6hxm0z9" class="btn-gray80">Launch Workspace</a>
+       </div>
+     </div> <!-- /.col -->
      <div class="col-md-4 col-sm-6">
        <div class="border media">
          <div class="media-left">
@@ -461,13 +474,13 @@
          </div>
          <div class="media-body">
            <h4>Wildfly</h4>
-           <p class="small" style="height: 50px;">GitHub web app; Java8; Maven; Wildfly 8.2</p>
+           <p class="small" style="height: 50px;">Java hello world web app example.</p>
          </div>
          <a href="http://beta.codenvy.com/f?id=gbfcsdb76f2iy1f2" class="btn-gray80">Launch Workspace</a>
        </div>
      </div> <!-- /.col -->
    </div><!-- /.row -->
-<!-- END_CODENVY_SAMPLES -->
+<!-- END_RUN_SAMPLES -->
 
  
     </div> <!-- /#tab1 -->