diff --git a/xtext/project-info/plan.xml b/xtext/project-info/plan.xml
index 6b37407..449d3c1 100644
--- a/xtext/project-info/plan.xml
+++ b/xtext/project-info/plan.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <?xml-stylesheet type="text/xsl" href="http://www.eclipse.org/projects/project-plan.xsl"?>
-<plan plan-format="1.0" xmlns="http://www.eclipse.org/project/plan" xmlns:html="http://www.w3.org/1999/xhtml" name="TMF Xtext">
-  <release projectid="modeling.tmf.xtext" version="Galileo"/>
+<plan plan-format="1.0" xmlns="http://www.eclipse.org/project/plan" xmlns:html="http://www.w3.org/1999/xhtml" name="Xtext">
+  <release projectid="modeling.tmf.xtext" version="Helios"/>
   <introduction>
     <html:div>
       <html:p>
-     This document lays out the feature and API set for the first release of TMF Xtext project,version 0.7.0.  
+     This document lays out the feature and API set for the next version of the Xtext (version 0.8.0).  
      This project plan inherits from the Modeling Project Plan, which should be referenced when consulting this individual project plan.
       </html:p>
     </html:div>
@@ -15,8 +15,7 @@
 The release deliverables have the same form as is found in most Eclipse projects, namely:
       <html:p>
         <html:ul>
-         <html:li>TMF Xtext source code release, available as versions tagged "R0_7" in the project's CVS repository.</html:li>
-		 <html:li>TMF Xtext SDK (includes runtime and tooling components, with sources, examples, and documentation) (downloadable and update site).</html:li>
+         <html:li>TMF Xtext SDK (includes runtime and tooling components, with sources, examples, and documentation) (downloadable and update site).</html:li>
 		 <html:li>TMF Xtext runtime binary distribution (downloadable and update site).</html:li>
 		 <html:li>TMF Xtext tests (downloadable and update site)</html:li>
         </html:ul>
@@ -30,34 +29,34 @@
       that is, until the final 3.5 release of the Platform, upon which Xtext and other projects will release simultaneously. 
       As Xtext is dependent upon the EMF, and other projects, which are scheduled to release milestones within 1 week of Platform milestones, 
       Xtext will deliver its milestones within the following week. 
-      It is anticipated that Xtext will synchronize its release milestones with the Galileo release schedule.
+      It is anticipated that Xtext will synchronize its release milestones with the Helios release schedule.
       </html:div>
     </preamble>
-      <milestone date="10/01/2008" milestone="M2"></milestone>
-      <milestone date="11/12/2008" milestone="M3"></milestone>
-      <milestone date="12/29/2008" milestone="M4"></milestone>
-      <milestone date="02/06/2009" milestone="M5"></milestone>
-      <milestone date="03/18/2009" milestone="M6"><html:p>API freeze</html:p></milestone>
-      <milestone date="05/05/2009" milestone="M7"></milestone>
-      <milestone date="05/19/2009" milestone="RC1"></milestone>
+      <milestone date="10/02/2008" milestone="M2"></milestone>
+      <milestone date="11/13/2008" milestone="M3"></milestone>
+      <milestone date="12/25/2008" milestone="M4"></milestone>
+      <milestone date="02/12/2009" milestone="M5"></milestone>
+      <milestone date="03/26/2009" milestone="M6"><html:p>API freeze</html:p></milestone>
+      <milestone date="05/14/2009" milestone="M7"></milestone>
+ <!--     <milestone date="05/19/2009" milestone="RC1"></milestone>
       <milestone date="05/26/2009" milestone="RC2"></milestone>
       <milestone date="06/02/2009" milestone="RC3"></milestone>
       <milestone date="06/09/2009" milestone="RC4"></milestone>
       <milestone date="06/16/2009" milestone="RC5"></milestone>
-      <milestone date="06/28/2009" milestone="0.7.0"></milestone>
+      <milestone date="06/28/2009" milestone="0.7.0"></milestone>  -->
   </release_milestones>
   <target_environments>
     <html:div>
 In order to remain current, each Eclipse release targets reasonably current versions of the underlying operating environments.
 The Xtext project depends upon on the Platform and other projects, which are mostly "pure" Java. 
-The 3.5 release of the Eclipse Platform Project is written and compiled against version 1.4 of the Java Platform APIs, 
+The 3.6 release of the Eclipse Platform Project is written and compiled against version 1.4 of the Java Platform APIs, 
 and targeted to run on version 1.4 of the Java Runtime Environment, Standard Edition. 
 Xtext will target the same Java version as EMF, which currently requires Java 5.
-Eclipse Platform SDK 3.5 will be tested and validated on a number of reference platforms. 
+Eclipse Platform SDK 3.6 will be tested and validated on a number of reference platforms. 
 Xtext will be tested and validated against a subset of those listed for the platform. 
 Those available will be presented on the project download site.
     </html:div>
-    <internationalization>
+<!--    <internationalization>
       <html:div>
 The Eclipse Platform is designed as the basis for internationalized products. 
        The user interface elements provided by the Eclipse SDK components, including dialogs and error messages, are externalized. 
@@ -65,17 +64,17 @@
        As a result, the Xtext project will provide English strings in its default bundles and be localized to a subset of those locales offered by the Platform. 
        This plan will be updated to indicate which locales will be provided and the time frame for availability.
       </html:div>
-    </internationalization>
+    </internationalization> -->
   </target_environments>
   <compatibility_with_previous_releases>
     <html:div>
-Compatibility of Galileo Release: The Xtext project will be developed in 
+Compatibility of Helios Release: The Xtext project will be developed in 
 parallel, and released simultaneously, with the following projects.
       <html:ul>
-        <html:li>Eclipse Platform SDK version 3.5</html:li>
-        <html:li>Eclipse Modeling Framework (EMF) version 2.5</html:li>
-        <html:li>M2T Xpand version 0.7</html:li>
-        <html:li>EMFT MWE version 0.7</html:li>
+        <html:li>Eclipse Platform SDK version 3.6</html:li>
+        <html:li>Eclipse Modeling Framework (EMF) version 2.6</html:li>
+        <html:li>M2T Xpand version 0.8</html:li>
+        <html:li>EMFT MWE version 0.8</html:li>
       </html:ul>
     </html:div>
   </compatibility_with_previous_releases>
@@ -90,50 +89,61 @@
 more detailed information on each.
       </html:div>
     </preamble>
-    <theme name="Core Features">
+    - Usability
+-- UI Quality & Features
+-- API Quality
+-- Documentatio Quality
+- Performance & Scalability
+- Increase Applicability
+-- Base Language
+-- Grammar Features
+-Clean Code
+    
+    <theme name="Usability">
     <description>
         <html:div>
-          As this is the first release of Xtext under the textual modeling framework, we focus a lot on core concepts
-          and features.
+          In the Helios release we want to focus on further improving quality of UI, API and documentation.
+          Xtext needs to be understandable, reliable and consumable.
         </html:div>
     </description>
-      <committed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Core&amp;classification=Modeling&amp;product=TMF&amp;component=Xtext&amp;version=0.7.0&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=galileo&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=galileo-" />
-      <proposed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Core&amp;classification=Modeling&amp;product=TMF&amp;component=Xtext&amp;version=unspecified&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=galileo&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=galileo-" />
-      <deferred bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Core&amp;classification=Modeling&amp;product=TMF&amp;component=Xtext&amp;field0-0-0=flagtypes.name&amp;type0-0-0=equals&amp;value0-0-0=galileo-" />
+      <committed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Usability&amp;classification=Modeling&amp;product=TMF&amp;component=Xtext&amp;version=0.7.0&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=galileo&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=galileo-" />
+      <proposed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Usability&amp;classification=Modeling&amp;product=TMF&amp;component=Xtext&amp;version=unspecified&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=galileo&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=galileo-" />
+      <deferred bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Usability&amp;classification=Modeling&amp;product=TMF&amp;component=Xtext&amp;field0-0-0=flagtypes.name&amp;type0-0-0=equals&amp;value0-0-0=galileo-" />
     </theme>
-    <theme name="Extensibility">
+    <theme name="Increase Applicability">
       <description>
         <html:div>
           One of our guiding principles is "make common things easier and rare things possible" suggests that we focus on extensibility as well as
-          on simplicity with regards to all kinds of API.
+          on simplicity with regards to all kinds of API. In Helios we want to allow Xtext to be used in more situations by providing an easy to reuse base language. 
         </html:div>
       </description>
-      <committed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Extensibility&amp;classification=Modeling&amp;product=TMF&amp;component=Xtext&amp;version=0.7.0&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=galileo&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=galileo-" />
-      <proposed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Extensibility&amp;classification=Modeling&amp;product=TMF&amp;component=Xtext&amp;version=unspecified&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=galileo&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=galileo-" />
-  	  <deferred bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Extensibility&amp;classification=Modeling&amp;product=TMF&amp;component=Xtext&amp;field0-0-0=flagtypes.name&amp;type0-0-0=equals&amp;value0-0-0=galileo-" />
+      <committed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Applicability&amp;classification=Modeling&amp;product=TMF&amp;component=Xtext&amp;version=0.7.0&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=galileo&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=galileo-" />
+      <proposed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Applicability&amp;classification=Modeling&amp;product=TMF&amp;component=Xtext&amp;version=unspecified&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=galileo&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=galileo-" />
+  	  <deferred bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Applicability&amp;classification=Modeling&amp;product=TMF&amp;component=Xtext&amp;field0-0-0=flagtypes.name&amp;type0-0-0=equals&amp;value0-0-0=galileo-" />
     </theme>
-    <theme name="Performance / Scalability">
+    <theme name="Performance & Scalability">
     <description>
         <html:div>
-          Performance and scalability improvements are one of the main reasons, 
-          why we decided to reimplement Xtext as opposed to built upon the existing code from openArchitectureWare 4.3.
+          Performance and scalability needs to be further enforced.
         </html:div>
     </description>
       <committed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Scalability&amp;classification=Modeling&amp;product=TMF&amp;component=Xtext&amp;version=0.7.0&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=galileo&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=galileo-" />
       <proposed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Scalability&amp;classification=Modeling&amp;product=TMF&amp;component=Xtext&amp;version=unspecified&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=galileo&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=galileo-" />
   	<deferred bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Scalability&amp;classification=Modeling&amp;product=TMF&amp;component=Xtext&amp;field0-0-0=flagtypes.name&amp;type0-0-0=equals&amp;value0-0-0=galileo-" />
     </theme>
-    <theme name="UI">
+    <theme name="Clean Code">
       <description>
         <html:div>
-          Having nice tool support for Xtext based domain-specific langauge is of course one of the main requirements.
+          Keeping the quality of code high is key for long lasting software systems.
+          We want to further keep our code clean, which means doing things like removing dead code, cleaning up / rewriting code we do no longer understand, 
+          avoiding redundancy, etc..
         </html:div>
     </description>
-      <committed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=UI&amp;classification=Modeling&amp;product=TMF&amp;component=Xtext&amp;version=0.7.0&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=galileo&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=galileo-" />
-      <proposed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=UI&amp;classification=Modeling&amp;product=TMF&amp;component=Xtext&amp;version=unspecified&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=galileo&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=galileo-" />
-      <deferred bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=UI&amp;classification=Modeling&amp;product=TMF&amp;component=Xtext&amp;field0-0-0=flagtypes.name&amp;type0-0-0=equals&amp;value0-0-0=galileo-" />
+      <committed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Clean&amp;classification=Modeling&amp;product=TMF&amp;component=Xtext&amp;version=0.7.0&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=galileo&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=galileo-" />
+      <proposed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Clean&amp;classification=Modeling&amp;product=TMF&amp;component=Xtext&amp;version=unspecified&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=galileo&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=galileo-" />
+      <deferred bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Clean&amp;classification=Modeling&amp;product=TMF&amp;component=Xtext&amp;field0-0-0=flagtypes.name&amp;type0-0-0=equals&amp;value0-0-0=galileo-" />
     </theme>
-    <theme name="Documentation">
+<!--    <theme name="Documentation">
       <description>
         <html:div>
           Documentation is a very important asset of every framework. 
@@ -153,7 +163,7 @@
       <committed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Samples&amp;classification=Modeling&amp;product=TMF&amp;component=Xtext&amp;version=0.7.0&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=galileo&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=galileo-" />
       <proposed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Samples&amp;classification=Modeling&amp;product=TMF&amp;component=Xtext&amp;version=unspecified&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=galileo&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=galileo-" />
       <deferred bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Samples&amp;classification=Modeling&amp;product=TMF&amp;component=Xtext&amp;field0-0-0=flagtypes.name&amp;type0-0-0=equals&amp;value0-0-0=galileo-" />
-    </theme>
+    </theme>  -->
   </themes_and_priorities>
   <appendix name="Legal Notices">
     <html:div>