Bug 447936 - [xtext] Unable to create the selected preference page.

234 files changed, 1296 insertions, 2442 deletions

diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext.tests/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.css.cssext.tests/META-INF/MANIFEST.MF
index a06629ba4..7c26782b1 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext.tests/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,9 @@ Require-Bundle: org.eclipse.fx.ide.css.cssext,
  org.eclipse.fx.ide.css.cssext.ui,

  org.eclipse.core.runtime,

  org.eclipse.xtext.junit4,

- org.eclipse.ui.workbench;resolution:=optional

+ org.eclipse.ui.workbench;resolution:=optional,

+ org.eclipse.xtext.xbase.lib,

+ org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional

 Import-Package: org.apache.log4j,

  org.junit;version="4.5.0",

  org.junit.runner;version="4.5.0",

diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext.tests/src-gen/org/eclipse/fx/ide/css/cssext/CssExtDslInjectorProvider.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext.tests/src-gen/org/eclipse/fx/ide/css/cssext/CssExtDslInjectorProvider.java
index 1c0b3c937..a84a00cb9 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext.tests/src-gen/org/eclipse/fx/ide/css/cssext/CssExtDslInjectorProvider.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext.tests/src-gen/org/eclipse/fx/ide/css/cssext/CssExtDslInjectorProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.css.cssext;
 
 import org.eclipse.xtext.junit4.GlobalRegistries;
@@ -20,6 +20,7 @@ public class CssExtDslInjectorProvider implements IInjectorProvider, IRegistryCo
 		GlobalRegistries.initializeDefaults();
 	}
 
+	@Override
 	public Injector getInjector()
 	{
 		if (injector == null) {
@@ -34,10 +35,12 @@ public class CssExtDslInjectorProvider implements IInjectorProvider, IRegistryCo
 	    return new CssExtDslStandaloneSetup().createInjectorAndDoEMFRegistration();
 	}
 
+	@Override
 	public void restoreRegistry() {
 		stateBeforeInjectorCreation.restoreGlobalState();
 	}
 
+	@Override
 	public void setupRegistry() {
 		getInjector();
 		stateAfterInjectorCreation.restoreGlobalState();
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext.tests/src-gen/org/eclipse/fx/ide/css/cssext/CssExtDslUiInjectorProvider.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext.tests/src-gen/org/eclipse/fx/ide/css/cssext/CssExtDslUiInjectorProvider.java
index 5f6b83ce1..449cb7840 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext.tests/src-gen/org/eclipse/fx/ide/css/cssext/CssExtDslUiInjectorProvider.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext.tests/src-gen/org/eclipse/fx/ide/css/cssext/CssExtDslUiInjectorProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.css.cssext;
 
 import org.eclipse.xtext.junit4.IInjectorProvider;
@@ -9,6 +9,7 @@ import com.google.inject.Injector;
 
 public class CssExtDslUiInjectorProvider implements IInjectorProvider {
 	
+	@Override
 	public Injector getInjector() {
 		return org.eclipse.fx.ide.css.cssext.ui.internal.CssExtDslActivator.getInstance().getInjector("org.eclipse.fx.ide.css.cssext.CssExtDsl");
 	}
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/META-INF/MANIFEST.MF
index 614fe6c56..2dbb3513f 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/META-INF/MANIFEST.MF
@@ -1,54 +1,38 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.fx.ide.css.cssext.ui
-Bundle-Vendor: Eclipse.org
-Bundle-Version: 2.0.0.qualifier
-Bundle-SymbolicName: org.eclipse.fx.ide.css.cssext.ui;singleton:=true
-Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.fx.ide.css.cssext;visibility:=reexport,
- org.eclipse.xtext.ui,
- org.eclipse.ui.editors;bundle-version="3.5.0",
- org.eclipse.ui.ide;bundle-version="3.5.0",
- org.eclipse.xtext.ui.shared,
- org.eclipse.ui,
- org.eclipse.xtext.builder,
- org.antlr.runtime,
- org.eclipse.xtext.common.types.ui,
- org.eclipse.xtext.ui.codetemplates.ui,
- org.eclipse.fx.core;bundle-version="0.9.0",
- org.eclipse.fx.core.guice;bundle-version="0.9.0",
- org.eclipse.fx.ide.css.ui;bundle-version="0.9.0",
- org.eclipse.jdt.core;bundle-version="3.7.3",
- org.eclipse.core.databinding.observable,
- org.eclipse.core.databinding.beans,
- org.eclipse.jface.databinding,
- org.eclipse.core.databinding;bundle-version="1.4.1",
- org.eclipse.core.databinding.property;bundle-version="1.4.200",
- org.eclipse.jdt.annotation;bundle-version="2.0.100";resolution:=optional
-Import-Package: org.apache.log4j,
- org.eclipse.core.filesystem,
- org.eclipse.fx.osgi.util
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.fx.ide.css.cssext.ui;x-internal:=true;
-  uses:="org.eclipse.core.resources,
-   org.eclipse.ui.plugin,
-   org.osgi.framework,
-   org.eclipse.xtext.ui,
-   org.eclipse.xtext.ui.guice,
-   com.google.inject",
- org.eclipse.fx.ide.css.cssext.ui.contentassist;x-internal:=true;
-  uses:="org.eclipse.xtext,
-   org.eclipse.emf.ecore,
-   org.eclipse.xtext.common.ui.contentassist,
-   org.eclipse.xtext.ui.editor.contentassist",
- org.eclipse.fx.ide.css.cssext.ui.contentassist.antlr;x-internal:=true;
-  uses:="org.eclipse.xtext,
-   org.eclipse.fx.ide.css.cssext.services,
-   org.eclipse.fx.ide.css.cssext.ui.contentassist.antlr.internal,
-   org.eclipse.xtext.ui.editor.contentassist.antlr.internal,
-   org.eclipse.xtext.ui.codetemplates.ui.partialEditing,
-   org.eclipse.xtext.ui.editor.contentassist.antlr",
- org.eclipse.fx.ide.css.cssext.ui.internal;x-internal:=true;uses:="org.eclipse.ui.plugin,org.osgi.framework,com.google.inject"
-Bundle-Activator: org.eclipse.fx.ide.css.cssext.ui.internal.CssExtDslActivator
-Service-Component: OSGI-INF/cssExtProvider.xml,
- OSGI-INF/ColorProposalContributor.xml
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: org.eclipse.fx.ide.css.cssext.ui

+Bundle-Vendor: Eclipse.org

+Bundle-Version: 2.0.0.qualifier

+Bundle-SymbolicName: org.eclipse.fx.ide.css.cssext.ui;singleton:=true

+Bundle-ActivationPolicy: lazy

+Require-Bundle: org.eclipse.fx.ide.css.cssext;visibility:=reexport,

+ org.eclipse.xtext.ui,

+ org.eclipse.ui.editors;bundle-version="3.5.0",

+ org.eclipse.ui.ide;bundle-version="3.5.0",

+ org.eclipse.xtext.ui.shared,

+ org.eclipse.ui,

+ org.eclipse.xtext.builder,

+ org.antlr.runtime,

+ org.eclipse.xtext.common.types.ui,

+ org.eclipse.xtext.ui.codetemplates.ui,

+ org.eclipse.fx.core;bundle-version="0.9.0",

+ org.eclipse.fx.core.guice;bundle-version="0.9.0",

+ org.eclipse.fx.ide.css.ui;bundle-version="0.9.0",

+ org.eclipse.jdt.core;bundle-version="3.7.3",

+ org.eclipse.core.databinding.observable,

+ org.eclipse.core.databinding.beans,

+ org.eclipse.jface.databinding,

+ org.eclipse.core.databinding;bundle-version="1.4.1",

+ org.eclipse.core.databinding.property;bundle-version="1.4.200",

+ org.eclipse.jdt.annotation;bundle-version="2.0.100";resolution:=optional

+Import-Package: org.apache.log4j,

+ org.eclipse.core.filesystem,

+ org.eclipse.fx.osgi.util

+Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Export-Package: org.eclipse.fx.ide.css.cssext.ui;x-internal:=true; uses:="org.eclipse.core.resources,  org.eclipse.ui.plugin,  org.osgi.framework,  org.eclipse.xtext.ui,  org.eclipse.xtext.ui.guice,  com.google.inject",

+ org.eclipse.fx.ide.css.cssext.ui.contentassist;x-internal:=true; uses:="org.eclipse.xtext,  org.eclipse.emf.ecore,  org.eclipse.xtext.common.ui.contentassist,  org.eclipse.xtext.ui.editor.contentassist",

+ org.eclipse.fx.ide.css.cssext.ui.contentassist.antlr;x-internal:=true; uses:="org.eclipse.xtext,  org.eclipse.fx.ide.css.cssext.services,  org.eclipse.fx.ide.css.cssext.ui.contentassist.antlr.internal,  org.eclipse.xtext.ui.editor.contentassist.antlr.internal,  org.eclipse.xtext.ui.codetemplates.ui.partialEditing,  org.eclipse.xtext.ui.editor.contentassist.antlr",

+ org.eclipse.fx.ide.css.cssext.ui.internal;x-internal:=true;uses:="org.eclipse.ui.plugin,org.osgi.framework,com.google.inject",

+ org.eclipse.fx.ide.css.cssext.ui.quickfix

+Bundle-Activator: org.eclipse.fx.ide.css.cssext.ui.internal.CssExtDslActivator

+Service-Component: OSGI-INF/cssExtProvider.xml,OSGI-INF/ColorProposalContributor.xml

diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/plugin.xml_gen b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/plugin.xml_gen
index ca249368e..0c3fa146d 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/plugin.xml_gen
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/plugin.xml_gen
@@ -33,7 +33,27 @@
                     definitionId="org.eclipse.fx.ide.css.cssext.CssExtDsl.Editor.opened">
             </reference>
          </activeWhen>
-      </handler>
+      	</handler>
+      	<!-- copy qualified name -->
+        <handler
+            class="org.eclipse.fx.ide.css.cssext.ui.CssExtDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedNameHandler"
+            commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName">
+            <activeWhen>
+				<reference definitionId="org.eclipse.fx.ide.css.cssext.CssExtDsl.Editor.opened" />
+            </activeWhen>
+        </handler>
+        <handler
+            class="org.eclipse.fx.ide.css.cssext.ui.CssExtDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedNameHandler"
+            commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName">
+            <activeWhen>
+            	<and>
+            		<reference definitionId="org.eclipse.fx.ide.css.cssext.CssExtDsl.XtextEditor.opened" />
+	                <iterate>
+						<adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+					</iterate>
+				</and>
+            </activeWhen>
+        </handler>
     </extension>
     <extension point="org.eclipse.core.expressions.definitions">
         <definition id="org.eclipse.fx.ide.css.cssext.CssExtDsl.Editor.opened">
@@ -46,6 +66,16 @@
                 </with>        
             </and>
         </definition>
+        <definition id="org.eclipse.fx.ide.css.cssext.CssExtDsl.XtextEditor.opened">
+            <and>
+                <reference definitionId="isXtextEditorActive"/>
+                <with variable="activeEditor">
+                    <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName" 
+                        value="org.eclipse.fx.ide.css.cssext.CssExtDsl" 
+                        forcePluginActivation="true"/>
+                </with>        
+            </and>
+        </definition>
     </extension>
     <extension
             point="org.eclipse.ui.preferencePages">
@@ -96,6 +126,19 @@
             id="org.eclipse.fx.ide.css.cssext.CssExtDsl.validate"
             name="Validate">
       </command>
+      <!-- copy qualified name -->
+      <command
+            id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+            categoryId="org.eclipse.ui.category.edit"
+            description="Copy the qualified name for the selected element"
+            name="Copy Qualified Name">
+      </command>
+      <command
+            id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
+            categoryId="org.eclipse.ui.category.edit"
+            description="Copy the qualified name for the selected element"
+            name="Copy Qualified Name">
+      </command>
     </extension>
     <extension point="org.eclipse.ui.menus">
         <menuContribution
@@ -111,6 +154,36 @@
             </visibleWhen>
          </command>  
          </menuContribution>
+         <!-- copy qualified name -->
+         <menuContribution locationURI="popup:#TextEditorContext?after=copy">
+         	<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName" 
+         		style="push" tooltip="Copy Qualified Name">
+            	<visibleWhen checkEnabled="false">
+                	<reference definitionId="org.eclipse.fx.ide.css.cssext.CssExtDsl.Editor.opened" />
+            	</visibleWhen>
+         	</command>  
+         </menuContribution>
+         <menuContribution locationURI="menu:edit?after=copy">
+         	<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+            	style="push" tooltip="Copy Qualified Name">
+            	<visibleWhen checkEnabled="false">
+                	<reference definitionId="org.eclipse.fx.ide.css.cssext.CssExtDsl.Editor.opened" />
+            	</visibleWhen>
+         	</command>  
+         </menuContribution>
+         <menuContribution locationURI="popup:org.eclipse.xtext.ui.outline?after=additions">
+			<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName" 
+				style="push" tooltip="Copy Qualified Name">
+         		<visibleWhen checkEnabled="false">
+	            	<and>
+	            		<reference definitionId="org.eclipse.fx.ide.css.cssext.CssExtDsl.XtextEditor.opened" />
+						<iterate>
+							<adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+						</iterate>
+					</and>
+				</visibleWhen>
+			</command>
+         </menuContribution>
     </extension>
     <extension point="org.eclipse.ui.menus">
 		<menuContribution locationURI="popup:#TextEditorContext?endof=group.find">
@@ -177,7 +250,9 @@
    <extension
          point="org.eclipse.xtext.builder.participant">
       <participant
-            class="org.eclipse.fx.ide.css.cssext.ui.CssExtDslExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant">
+            class="org.eclipse.fx.ide.css.cssext.ui.CssExtDslExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant"
+            fileExtensions="cssext"
+            >
       </participant>
    </extension>
    <extension
@@ -204,6 +279,27 @@
 	        <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
         </page>
     </extension>
+    <extension point="org.eclipse.ui.menus">
+		<menuContribution locationURI="popup:#TextEditorContext?after=xtext.ui.openDeclaration">
+			<command
+				commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand"
+				id="org.eclipse.fx.ide.css.cssext.CssExtDsl.OpenGeneratedCode"
+				style="push">
+					<visibleWhen checkEnabled="false">
+						<reference definitionId="org.eclipse.fx.ide.css.cssext.CssExtDsl.Editor.opened" />
+					</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+	<extension point="org.eclipse.ui.handlers">
+		<handler
+			class="org.eclipse.fx.ide.css.cssext.ui.CssExtDslExecutableExtensionFactory:org.eclipse.xtext.ui.generator.trace.OpenGeneratedFileHandler"
+			commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand">
+				<activeWhen>
+					<reference definitionId="org.eclipse.fx.ide.css.cssext.CssExtDsl.Editor.opened" />
+				</activeWhen>
+		</handler>
+	</extension>
 
 	<!-- Quick Outline -->
 	<extension
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/AbstractCssExtDslUiModule.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/AbstractCssExtDslUiModule.java
index ce9729edb..80555fa48 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/AbstractCssExtDslUiModule.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/AbstractCssExtDslUiModule.java
@@ -4,14 +4,13 @@
  */
 package org.eclipse.fx.ide.css.cssext.ui;
 
-import org.eclipse.xtext.ui.DefaultUiModule;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 /**
  * Manual modifications go to {org.eclipse.fx.ide.css.cssext.ui.CssExtDslUiModule}
  */
 @SuppressWarnings("all")
-public abstract class AbstractCssExtDslUiModule extends DefaultUiModule {
+public abstract class AbstractCssExtDslUiModule extends org.eclipse.xtext.common.types.ui.DefaultCommonTypesUiModule {
 	
 	public AbstractCssExtDslUiModule(AbstractUIPlugin plugin) {
 		super(plugin);
@@ -54,8 +53,13 @@ public abstract class AbstractCssExtDslUiModule extends DefaultUiModule {
 	}
 
 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+	public Class<? extends org.eclipse.xtext.generator.IContextualOutputConfigurationProvider> bindIContextualOutputConfigurationProvider() {
+		return org.eclipse.xtext.builder.EclipseOutputConfigurationProvider.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
 	public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.builder.impl.PersistentDataAwareDirtyResource.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.builder.builderState.IBuilderState.class);
+		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.builder.builderState.IBuilderState.class);
 	}
 
 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
@@ -129,60 +133,10 @@ public abstract class AbstractCssExtDslUiModule extends DefaultUiModule {
 	}
 
 	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public java.lang.ClassLoader bindClassLoaderToInstance() {
-		return getClass().getClassLoader();
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.access.IJvmTypeProvider.Factory> bindIJvmTypeProvider$Factory() {
-		return org.eclipse.xtext.common.types.access.jdt.JdtTypeProviderFactory.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.xtext.AbstractTypeScopeProvider> bindAbstractTypeScopeProvider() {
-		return org.eclipse.xtext.common.types.xtext.ui.JdtBasedSimpleTypeScopeProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.xtext.ui.ITypesProposalProvider> bindITypesProposalProvider() {
-		return org.eclipse.xtext.common.types.xtext.ui.JdtTypesProposalProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.access.jdt.IJavaProjectProvider> bindIJavaProjectProvider() {
-		return org.eclipse.xtext.common.types.xtext.ui.XtextResourceSetBasedProjectProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.hyperlinking.IHyperlinkHelper> bindIHyperlinkHelper() {
-		return org.eclipse.xtext.common.types.xtext.ui.TypeAwareHyperlinkHelper.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
 	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.PrefixMatcher> bindPrefixMatcher() {
 		return org.eclipse.xtext.ui.editor.contentassist.FQNPrefixMatcher.class;
 	}
 
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.AbstractJavaBasedContentProposalProvider.ReferenceProposalCreator> bindAbstractJavaBasedContentProposalProvider$ReferenceProposalCreator() {
-		return org.eclipse.xtext.common.types.xtext.ui.TypeAwareReferenceProposalCreator.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.IValidationJobScheduler> bindIValidationJobScheduler() {
-		return org.eclipse.xtext.common.types.xtext.ui.JdtValidationJobScheduler.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.refactoring.impl.RefactoringResourceSetProvider> bindRefactoringResourceSetProvider() {
-		return org.eclipse.xtext.common.types.ui.refactoring.JvmRefactoringResourceSetProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.ui.query.IJavaSearchParticipation> bindIJavaSearchParticipation() {
-		return org.eclipse.xtext.common.types.ui.query.IJavaSearchParticipation.Yes.class;
-	}
-
 	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment
 	public com.google.inject.Provider<org.eclipse.xtext.ui.codetemplates.ui.preferences.TemplatesLanguageConfiguration> provideTemplatesLanguageConfiguration() {
 		return org.eclipse.xtext.ui.codetemplates.ui.AccessibleCodetemplatesActivator.getTemplatesLanguageConfigurationProvider();
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/AbstractCssExtDslProposalProvider.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/AbstractCssExtDslProposalProvider.java
index 15d962373..69411ad9b 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/AbstractCssExtDslProposalProvider.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/AbstractCssExtDslProposalProvider.java
@@ -1,21 +1,20 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.css.cssext.ui.contentassist;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.*;
-import org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider;
 import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor;
 import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
 
 /**
- * Represents a generated, default implementation of interface {@link IProposalProvider}.
+ * Represents a generated, default implementation of superclass {@link org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider}.
  * Methods are dynamically dispatched on the first parameter, i.e., you can override them 
  * with a more concrete subtype. 
  */
 @SuppressWarnings("all")
-public class AbstractCssExtDslProposalProvider extends TerminalsProposalProvider {
+public class AbstractCssExtDslProposalProvider extends org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider {
 		
 	public void completeCssExtension_Imports(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/CssExtDslParser.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/CssExtDslParser.java
index 23eba95bb..85758186b 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/CssExtDslParser.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/CssExtDslParser.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.css.cssext.ui.contentassist.antlr;
 
 import java.util.Collection;
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/PartialCssExtDslContentAssistParser.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/PartialCssExtDslContentAssistParser.java
index 60fa4289b..ac16d1bf4 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/PartialCssExtDslContentAssistParser.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/PartialCssExtDslContentAssistParser.java
@@ -12,13 +12,14 @@ import org.eclipse.xtext.ui.editor.contentassist.antlr.FollowElement;
 import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
 import org.eclipse.xtext.util.PolymorphicDispatcher;
 
-/**
- * @author Sebastian Zarnekow - Initial contribution and API
+/*
+ * Template CodetemplatesGeneratorFragment.xpt
  */
 public class PartialCssExtDslContentAssistParser extends CssExtDslParser implements IPartialContentAssistParser {
 
 	private AbstractRule rule;
 
+	@Override
 	public void initializeFor(AbstractRule rule) {
 		this.rule = rule;
 	}
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.g b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.g
index fb22d0d6d..de75987fd 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.g
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.g
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 grammar InternalCssExtDsl;
 
 options {
@@ -7769,7 +7769,7 @@ RULE_DOUBLE : '-'? ('0'..'9')* '.' ('0'..'9')+;
 
 RULE_REGEX : '$' ('a'..'z'|'A'..'Z'|'0'..'9'|'-'|','|'.'|'?'|'\''|':'|'"'|'>'|'<'|'/'|'_'|'='|';'|'('|')'|'&'|'!'|'#'|'%'|'*'|'+'|'['|']'|'{'|'}')+ '$';
 
-RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
+RULE_STRING : ('"' ('\\' .|~(('\\'|'"')))* '"'|'\'' ('\\' .|~(('\\'|'\'')))* '\'');
 
 RULE_WS : (' '|'\t'|'\r'|'\n')+;
 
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.tokens b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.tokens
index 3b93778ab..26aad051c 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.tokens
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.tokens
@@ -1,35 +1,62 @@
-RULE_ID=4
-T__29=29
-T__28=28
-T__27=27
-T__26=26
-T__25=25
-T__24=24
-T__23=23
-T__22=22
+'%'=19
+'('=25
+')'=27
+'*'=15
+'+'=16
+','=18
+'->'=26
+'.'=21
+';'=30
+'<'=32
+'='=34
+'>'=33
+'?'=17
+'@INT'=41
+'@NUM'=42
+'@STRING'=43
+'@URL'=44
+'['=38
+']'=39
+'default:'=31
+'extends'=28
+'import'=20
+'package'=22
+'styleclass'=29
+'substructure'=40
+'{'=23
+'|'=35
+'||'=36
+'}'=24
+'~'=37
 RULE_ANY_OTHER=14
-T__21=21
-T__20=20
-RULE_REGEX=10
-T__19=19
-T__16=16
-T__15=15
-T__18=18
-T__17=17
+RULE_DOUBLE=8
+RULE_ID=4
 RULE_INT=7
+RULE_JDOC=6
+RULE_ML_COMMENT=12
 RULE_PSEUDO=9
-T__42=42
-T__43=43
-T__40=40
-T__41=41
-T__44=44
+RULE_REGEX=10
 RULE_SL_COMMENT=13
-RULE_DOUBLE=8
-RULE_ML_COMMENT=12
+RULE_STRING=11
+RULE_WS=5
+T__15=15
+T__16=16
+T__17=17
+T__18=18
+T__19=19
+T__20=20
+T__21=21
+T__22=22
+T__23=23
+T__24=24
+T__25=25
+T__26=26
+T__27=27
+T__28=28
+T__29=29
 T__30=30
 T__31=31
 T__32=32
-RULE_STRING=11
 T__33=33
 T__34=34
 T__35=35
@@ -37,35 +64,8 @@ T__36=36
 T__37=37
 T__38=38
 T__39=39
-RULE_WS=5
-RULE_JDOC=6
-'|'=35
-'~'=37
-'default:'=31
-'>'=33
-'||'=36
-';'=30
-'='=34
-'+'=16
-'.'=21
-')'=27
-'@URL'=44
-'styleclass'=29
-'->'=26
-'%'=19
-'import'=20
-'}'=24
-'substructure'=40
-'extends'=28
-'@INT'=41
-'{'=23
-'package'=22
-'?'=17
-'@STRING'=43
-'<'=32
-'('=25
-'*'=15
-'['=38
-','=18
-'@NUM'=42
-']'=39
+T__40=40
+T__41=41
+T__42=42
+T__43=43
+T__44=44
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDslLexer.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDslLexer.java
index 51272c5cc..55a8e5aea 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDslLexer.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDslLexer.java
@@ -12,48 +12,48 @@ import java.util.ArrayList;
 
 @SuppressWarnings("all")
 public class InternalCssExtDslLexer extends Lexer {
+    public static final int T__19=19;
+    public static final int T__15=15;
+    public static final int T__16=16;
+    public static final int T__17=17;
+    public static final int T__18=18;
     public static final int RULE_ID=4;
-    public static final int T__29=29;
-    public static final int T__28=28;
-    public static final int T__27=27;
+    public static final int RULE_PSEUDO=9;
     public static final int T__26=26;
-    public static final int T__25=25;
-    public static final int T__24=24;
-    public static final int T__23=23;
+    public static final int T__27=27;
+    public static final int T__28=28;
+    public static final int RULE_INT=7;
+    public static final int T__29=29;
     public static final int T__22=22;
-    public static final int T__21=21;
-    public static final int RULE_ANY_OTHER=14;
+    public static final int RULE_ML_COMMENT=12;
+    public static final int T__23=23;
+    public static final int T__24=24;
+    public static final int T__25=25;
     public static final int T__20=20;
-    public static final int EOF=-1;
+    public static final int T__21=21;
     public static final int RULE_REGEX=10;
-    public static final int T__19=19;
-    public static final int T__16=16;
-    public static final int T__15=15;
-    public static final int T__18=18;
-    public static final int T__17=17;
-    public static final int RULE_INT=7;
-    public static final int RULE_PSEUDO=9;
-    public static final int T__42=42;
-    public static final int T__43=43;
-    public static final int T__40=40;
-    public static final int T__41=41;
-    public static final int T__44=44;
+    public static final int RULE_STRING=11;
     public static final int RULE_SL_COMMENT=13;
+    public static final int T__37=37;
     public static final int RULE_DOUBLE=8;
-    public static final int RULE_ML_COMMENT=12;
-    public static final int T__30=30;
-    public static final int T__31=31;
-    public static final int T__32=32;
-    public static final int RULE_STRING=11;
+    public static final int T__38=38;
+    public static final int RULE_JDOC=6;
+    public static final int T__39=39;
     public static final int T__33=33;
     public static final int T__34=34;
     public static final int T__35=35;
     public static final int T__36=36;
-    public static final int T__37=37;
-    public static final int T__38=38;
-    public static final int T__39=39;
-    public static final int RULE_JDOC=6;
+    public static final int EOF=-1;
+    public static final int T__30=30;
+    public static final int T__31=31;
+    public static final int T__32=32;
     public static final int RULE_WS=5;
+    public static final int RULE_ANY_OTHER=14;
+    public static final int T__44=44;
+    public static final int T__40=40;
+    public static final int T__41=41;
+    public static final int T__42=42;
+    public static final int T__43=43;
 
     // delegates
     // delegators
@@ -1214,10 +1214,10 @@ public class InternalCssExtDslLexer extends Lexer {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.g:7772:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.g:7772:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // ../org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.g:7772:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // ../org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.g:7772:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.g:7772:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // ../org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.g:7772:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -1235,10 +1235,10 @@ public class InternalCssExtDslLexer extends Lexer {
             }
             switch (alt15) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.g:7772:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // ../org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.g:7772:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.g:7772:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // ../org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.g:7772:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop13:
                     do {
                         int alt13=3;
@@ -1254,23 +1254,15 @@ public class InternalCssExtDslLexer extends Lexer {
 
                         switch (alt13) {
                     	case 1 :
-                    	    // ../org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.g:7772:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
+                    	    // ../org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.g:7772:21: '\\\\' .
                     	    {
                     	    match('\\'); 
-                    	    if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {
-                    	        input.consume();
-
-                    	    }
-                    	    else {
-                    	        MismatchedSetException mse = new MismatchedSetException(null,input);
-                    	        recover(mse);
-                    	        throw mse;}
-
+                    	    matchAny(); 
 
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.g:7772:66: ~ ( ( '\\\\' | '\"' ) )
+                    	    // ../org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.g:7772:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1295,10 +1287,10 @@ public class InternalCssExtDslLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.g:7772:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // ../org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.g:7772:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.g:7772:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // ../org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.g:7772:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop14:
                     do {
                         int alt14=3;
@@ -1314,23 +1306,15 @@ public class InternalCssExtDslLexer extends Lexer {
 
                         switch (alt14) {
                     	case 1 :
-                    	    // ../org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.g:7772:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
+                    	    // ../org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.g:7772:54: '\\\\' .
                     	    {
                     	    match('\\'); 
-                    	    if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {
-                    	        input.consume();
-
-                    	    }
-                    	    else {
-                    	        MismatchedSetException mse = new MismatchedSetException(null,input);
-                    	        recover(mse);
-                    	        throw mse;}
-
+                    	    matchAny(); 
 
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.g:7772:137: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // ../org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDsl.g:7772:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1745,48 +1729,19 @@ public class InternalCssExtDslLexer extends Lexer {
 
     protected DFA17 dfa17 = new DFA17(this);
     static final String DFA17_eotS =
-        "\6\uffff\1\51\1\52\1\51\3\uffff\1\51\1\uffff\2\51\1\uffff\1\51\3"+
-        "\uffff\1\74\3\uffff\2\42\1\uffff\1\42\1\107\3\42\7\uffff\1\51\3"+
-        "\uffff\1\51\4\uffff\1\51\1\uffff\3\51\1\uffff\1\51\20\uffff\1\107"+
-        "\3\uffff\6\51\2\uffff\14\51\1\146\5\51\1\uffff\1\154\1\155\3\51"+
-        "\2\uffff\2\51\1\uffff\2\51\1\165\1\51\1\uffff\1\51\1\170\1\uffff";
+        "\6\uffff\1\51\1\52\1\51\3\uffff\1\51\1\uffff\2\51\1\uffff\1\51\3\uffff\1\74\3\uffff\2\42\1\uffff\1\42\1\110\3\42\7\uffff\1\51\3\uffff\1\51\4\uffff\1\51\1\uffff\3\51\1\uffff\1\51\17\uffff\1\110\4\uffff\6\51\2\uffff\14\51\1\146\5\51\1\uffff\1\154\1\155\3\51\2\uffff\2\51\1\uffff\2\51\1\165\1\51\1\uffff\1\51\1\170\1\uffff";
     static final String DFA17_eofS =
         "\171\uffff";
     static final String DFA17_minS =
-        "\1\0\5\uffff\1\155\1\60\1\141\3\uffff\1\56\1\uffff\1\170\1\164\1"+
-        "\uffff\1\145\3\uffff\1\174\3\uffff\1\111\1\0\1\uffff\1\52\1\56\1"+
-        "\41\2\0\7\uffff\1\160\3\uffff\1\143\4\uffff\1\56\1\uffff\1\164\1"+
-        "\171\1\142\1\uffff\1\146\15\uffff\1\0\2\uffff\1\56\3\uffff\1\157"+
-        "\1\153\1\145\1\154\1\163\1\141\2\uffff\1\162\1\141\1\156\1\145\1"+
-        "\164\1\165\1\164\1\147\1\144\1\143\1\162\1\154\1\55\1\145\1\163"+
-        "\1\154\1\165\1\164\1\uffff\2\55\1\141\1\143\1\72\2\uffff\1\163\1"+
-        "\164\1\uffff\1\163\1\165\1\55\1\162\1\uffff\1\145\1\55\1\uffff";
+        "\1\0\5\uffff\1\155\1\60\1\141\3\uffff\1\56\1\uffff\1\170\1\164\1\uffff\1\145\3\uffff\1\174\3\uffff\1\111\1\0\1\uffff\1\52\1\56\1\41\2\0\7\uffff\1\160\3\uffff\1\143\4\uffff\1\56\1\uffff\1\164\1\171\1\142\1\uffff\1\146\15\uffff\1\0\1\uffff\1\56\4\uffff\1\157\1\153\1\145\1\154\1\163\1\141\2\uffff\1\162\1\141\1\156\1\145\1\164\1\165\1\164\1\147\1\144\1\143\1\162\1\154\1\55\1\145\1\163\1\154\1\165\1\164\1\uffff\2\55\1\141\1\143\1\72\2\uffff\1\163\1\164\1\uffff\1\163\1\165\1\55\1\162\1\uffff\1\145\1\55\1\uffff";
     static final String DFA17_maxS =
-        "\1\uffff\5\uffff\1\155\1\71\1\141\3\uffff\1\76\1\uffff\1\170\1\165"+
-        "\1\uffff\1\145\3\uffff\1\174\3\uffff\1\125\1\uffff\1\uffff\1\57"+
-        "\1\71\1\175\2\uffff\7\uffff\1\160\3\uffff\1\143\4\uffff\1\71\1\uffff"+
-        "\1\164\1\171\1\142\1\uffff\1\146\15\uffff\1\uffff\2\uffff\1\71\3"+
-        "\uffff\1\157\1\153\1\145\1\154\1\163\1\141\2\uffff\1\162\1\141\1"+
-        "\156\1\145\1\164\1\165\1\164\1\147\1\144\1\143\1\162\1\154\1\172"+
-        "\1\145\1\163\1\154\1\165\1\164\1\uffff\2\172\1\141\1\143\1\72\2"+
-        "\uffff\1\163\1\164\1\uffff\1\163\1\165\1\172\1\162\1\uffff\1\145"+
-        "\1\172\1\uffff";
+        "\1\uffff\5\uffff\1\155\1\71\1\141\3\uffff\1\76\1\uffff\1\170\1\165\1\uffff\1\145\3\uffff\1\174\3\uffff\1\125\1\uffff\1\uffff\1\57\1\71\1\175\2\uffff\7\uffff\1\160\3\uffff\1\143\4\uffff\1\71\1\uffff\1\164\1\171\1\142\1\uffff\1\146\15\uffff\1\uffff\1\uffff\1\71\4\uffff\1\157\1\153\1\145\1\154\1\163\1\141\2\uffff\1\162\1\141\1\156\1\145\1\164\1\165\1\164\1\147\1\144\1\143\1\162\1\154\1\172\1\145\1\163\1\154\1\165\1\164\1\uffff\2\172\1\141\1\143\1\72\2\uffff\1\163\1\164\1\uffff\1\163\1\165\1\172\1\162\1\uffff\1\145\1\172\1\uffff";
     static final String DFA17_acceptS =
-        "\1\uffff\1\1\1\2\1\3\1\4\1\5\3\uffff\1\11\1\12\1\13\1\uffff\1\15"+
-        "\2\uffff\1\20\1\uffff\1\22\1\23\1\24\1\uffff\1\27\1\30\1\31\2\uffff"+
-        "\1\40\5\uffff\1\50\1\51\1\1\1\2\1\3\1\4\1\5\1\uffff\1\40\1\7\1\45"+
-        "\1\uffff\1\11\1\12\1\13\1\14\1\uffff\1\15\3\uffff\1\20\1\uffff\1"+
-        "\22\1\23\1\24\1\26\1\25\1\27\1\30\1\31\1\33\1\34\1\35\1\36\1\37"+
-        "\1\uffff\1\43\1\44\1\uffff\1\46\1\47\1\50\6\uffff\1\41\1\42\22\uffff"+
-        "\1\6\5\uffff\1\10\1\16\2\uffff\1\21\4\uffff\1\17\2\uffff\1\32";
+        "\1\uffff\1\1\1\2\1\3\1\4\1\5\3\uffff\1\11\1\12\1\13\1\uffff\1\15\2\uffff\1\20\1\uffff\1\22\1\23\1\24\1\uffff\1\27\1\30\1\31\2\uffff\1\40\5\uffff\1\50\1\51\1\1\1\2\1\3\1\4\1\5\1\uffff\1\40\1\7\1\45\1\uffff\1\11\1\12\1\13\1\14\1\uffff\1\15\3\uffff\1\20\1\uffff\1\22\1\23\1\24\1\26\1\25\1\27\1\30\1\31\1\33\1\34\1\35\1\36\1\37\1\uffff\1\43\1\uffff\1\44\1\46\1\47\1\50\6\uffff\1\41\1\42\22\uffff\1\6\5\uffff\1\10\1\16\2\uffff\1\21\4\uffff\1\17\2\uffff\1\32";
     static final String DFA17_specialS =
-        "\1\4\31\uffff\1\2\4\uffff\1\0\1\3\44\uffff\1\1\63\uffff}>";
+        "\1\2\31\uffff\1\3\4\uffff\1\0\1\4\44\uffff\1\1\63\uffff}>";
     static final String[] DFA17_transitionS = {
-            "\11\42\2\41\2\42\1\41\22\42\1\41\1\42\1\37\1\42\1\36\1\5\1\42"+
-            "\1\40\1\13\1\15\1\1\1\2\1\4\1\14\1\7\1\34\12\35\1\32\1\20\1"+
-            "\22\1\24\1\23\1\3\1\31\32\33\1\27\1\42\1\30\1\42\1\33\1\42\3"+
-            "\33\1\21\1\16\3\33\1\6\6\33\1\10\2\33\1\17\7\33\1\11\1\25\1"+
-            "\12\1\26\uff81\42",
+            "\11\42\2\41\2\42\1\41\22\42\1\41\1\42\1\37\1\42\1\36\1\5\1\42\1\40\1\13\1\15\1\1\1\2\1\4\1\14\1\7\1\34\12\35\1\32\1\20\1\22\1\24\1\23\1\3\1\31\32\33\1\27\1\42\1\30\1\42\1\33\1\42\3\33\1\21\1\16\3\33\1\6\6\33\1\10\2\33\1\17\7\33\1\11\1\25\1\12\1\26\uff81\42",
             "",
             "",
             "",
@@ -1815,9 +1770,8 @@ public class InternalCssExtDslLexer extends Lexer {
             "\40\104\1\uffff\uffdf\104",
             "",
             "\1\105\4\uffff\1\106",
-            "\1\53\1\uffff\12\110",
-            "\3\111\1\uffff\33\111\1\uffff\33\111\1\uffff\1\111\1\uffff"+
-            "\1\111\1\uffff\33\111\1\uffff\1\111",
+            "\1\53\1\uffff\12\107",
+            "\3\111\1\uffff\33\111\1\uffff\33\111\1\uffff\1\111\1\uffff\1\111\1\uffff\33\111\1\uffff\1\111",
             "\0\112",
             "\0\112",
             "",
@@ -1858,8 +1812,8 @@ public class InternalCssExtDslLexer extends Lexer {
             "",
             "\52\123\1\122\uffd5\123",
             "",
+            "\1\53\1\uffff\12\107",
             "",
-            "\1\53\1\uffff\12\110",
             "",
             "",
             "",
@@ -1967,26 +1921,6 @@ public class InternalCssExtDslLexer extends Lexer {
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA17_26 = input.LA(1);
-
-                        s = -1;
-                        if ( ((LA17_26>='\u0000' && LA17_26<='\u001F')||(LA17_26>='!' && LA17_26<='\uFFFF')) ) {s = 68;}
-
-                        else s = 34;
-
-                        if ( s>=0 ) return s;
-                        break;
-                    case 3 : 
-                        int LA17_32 = input.LA(1);
-
-                        s = -1;
-                        if ( ((LA17_32>='\u0000' && LA17_32<='\uFFFF')) ) {s = 74;}
-
-                        else s = 34;
-
-                        if ( s>=0 ) return s;
-                        break;
-                    case 4 : 
                         int LA17_0 = input.LA(1);
 
                         s = -1;
@@ -2060,6 +1994,26 @@ public class InternalCssExtDslLexer extends Lexer {
 
                         if ( s>=0 ) return s;
                         break;
+                    case 3 : 
+                        int LA17_26 = input.LA(1);
+
+                        s = -1;
+                        if ( ((LA17_26>='\u0000' && LA17_26<='\u001F')||(LA17_26>='!' && LA17_26<='\uFFFF')) ) {s = 68;}
+
+                        else s = 34;
+
+                        if ( s>=0 ) return s;
+                        break;
+                    case 4 : 
+                        int LA17_32 = input.LA(1);
+
+                        s = -1;
+                        if ( ((LA17_32>='\u0000' && LA17_32<='\uFFFF')) ) {s = 74;}
+
+                        else s = 34;
+
+                        if ( s>=0 ) return s;
+                        break;
             }
             NoViableAltException nvae =
                 new NoViableAltException(getDescription(), 17, _s, input);
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDslParser.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDslParser.java
index d307487a4..7788eff0e 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDslParser.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/src-gen/org/eclipse/fx/ide/css/cssext/ui/contentassist/antlr/internal/InternalCssExtDslParser.java
@@ -25,48 +25,48 @@ public class InternalCssExtDslParser extends AbstractInternalContentAssistParser
     public static final String[] tokenNames = new String[] {
         "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_WS", "RULE_JDOC", "RULE_INT", "RULE_DOUBLE", "RULE_PSEUDO", "RULE_REGEX", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_ANY_OTHER", "'*'", "'+'", "'?'", "','", "'%'", "'import'", "'.'", "'package'", "'{'", "'}'", "'('", "'->'", "')'", "'extends'", "'styleclass'", "';'", "'default:'", "'<'", "'>'", "'='", "'|'", "'||'", "'~'", "'['", "']'", "'substructure'", "'@INT'", "'@NUM'", "'@STRING'", "'@URL'"
     };
+    public static final int T__19=19;
+    public static final int T__15=15;
+    public static final int T__16=16;
+    public static final int T__17=17;
+    public static final int T__18=18;
     public static final int RULE_ID=4;
-    public static final int T__29=29;
-    public static final int T__28=28;
-    public static final int T__27=27;
+    public static final int RULE_PSEUDO=9;
     public static final int T__26=26;
-    public static final int T__25=25;
-    public static final int T__24=24;
-    public static final int T__23=23;
+    public static final int T__27=27;
+    public static final int T__28=28;
+    public static final int RULE_INT=7;
+    public static final int T__29=29;
     public static final int T__22=22;
-    public static final int RULE_ANY_OTHER=14;
-    public static final int T__21=21;
+    public static final int RULE_ML_COMMENT=12;
+    public static final int T__23=23;
+    public static final int T__24=24;
+    public static final int T__25=25;
     public static final int T__20=20;
-    public static final int EOF=-1;
+    public static final int T__21=21;
     public static final int RULE_REGEX=10;
-    public static final int T__19=19;
-    public static final int T__16=16;
-    public static final int T__15=15;
-    public static final int T__18=18;
-    public static final int T__17=17;
-    public static final int RULE_INT=7;
-    public static final int RULE_PSEUDO=9;
-    public static final int T__42=42;
-    public static final int T__43=43;
-    public static final int T__40=40;
-    public static final int T__41=41;
-    public static final int T__44=44;
+    public static final int RULE_STRING=11;
     public static final int RULE_SL_COMMENT=13;
+    public static final int T__37=37;
     public static final int RULE_DOUBLE=8;
-    public static final int RULE_ML_COMMENT=12;
-    public static final int T__30=30;
-    public static final int T__31=31;
-    public static final int T__32=32;
-    public static final int RULE_STRING=11;
+    public static final int T__38=38;
+    public static final int RULE_JDOC=6;
+    public static final int T__39=39;
     public static final int T__33=33;
     public static final int T__34=34;
     public static final int T__35=35;
     public static final int T__36=36;
-    public static final int T__37=37;
-    public static final int T__38=38;
-    public static final int T__39=39;
+    public static final int EOF=-1;
+    public static final int T__30=30;
+    public static final int T__31=31;
+    public static final int T__32=32;
     public static final int RULE_WS=5;
-    public static final int RULE_JDOC=6;
+    public static final int RULE_ANY_OTHER=14;
+    public static final int T__44=44;
+    public static final int T__40=40;
+    public static final int T__41=41;
+    public static final int T__42=42;
+    public static final int T__43=43;
 
     // delegates
     // delegators
@@ -3081,9 +3081,9 @@ public class InternalCssExtDslParser extends AbstractInternalContentAssistParser
             case RULE_JDOC:
                 {
                 switch ( input.LA(2) ) {
-                case RULE_PSEUDO:
+                case 40:
                     {
-                    alt4=2;
+                    alt4=3;
                     }
                     break;
                 case RULE_ID:
@@ -3091,9 +3091,9 @@ public class InternalCssExtDslParser extends AbstractInternalContentAssistParser
                     alt4=1;
                     }
                     break;
-                case 40:
+                case RULE_PSEUDO:
                     {
-                    alt4=3;
+                    alt4=2;
                     }
                     break;
                 default:
@@ -3251,12 +3251,12 @@ public class InternalCssExtDslParser extends AbstractInternalContentAssistParser
             else if ( (LA5_0==RULE_ID) ) {
                 int LA5_2 = input.LA(2);
 
-                if ( (LA5_2==25) ) {
-                    alt5=2;
-                }
-                else if ( (LA5_2==RULE_ID||(LA5_2>=RULE_JDOC && LA5_2<=RULE_INT)||LA5_2==RULE_REGEX||(LA5_2>=15 && LA5_2<=19)||LA5_2==30||LA5_2==32||(LA5_2>=35 && LA5_2<=38)||(LA5_2>=41 && LA5_2<=44)) ) {
+                if ( (LA5_2==RULE_ID||(LA5_2>=RULE_JDOC && LA5_2<=RULE_INT)||LA5_2==RULE_REGEX||(LA5_2>=15 && LA5_2<=19)||LA5_2==30||LA5_2==32||(LA5_2>=35 && LA5_2<=38)||(LA5_2>=41 && LA5_2<=44)) ) {
                     alt5=1;
                 }
+                else if ( (LA5_2==25) ) {
+                    alt5=2;
+                }
                 else {
                     if (state.backtracking>0) {state.failed=true; return ;}
                     NoViableAltException nvae =
@@ -22286,18 +22286,18 @@ public class InternalCssExtDslParser extends AbstractInternalContentAssistParser
     static final String DFA1_maxS =
         "\2\26\1\42\1\uffff\1\4\2\uffff\1\42";
     static final String DFA1_acceptS =
-        "\3\uffff\1\2\1\uffff\1\3\1\1\1\uffff";
+        "\3\uffff\1\2\1\uffff\1\1\1\3\1\uffff";
     static final String DFA1_specialS =
         "\10\uffff}>";
     static final String[] DFA1_transitionS = {
             "\1\2\1\uffff\1\1\17\uffff\1\3",
             "\1\2\1\3\20\uffff\1\3",
-            "\1\4\1\uffff\1\5\4\uffff\2\5\4\uffff\1\6",
+            "\1\4\1\uffff\1\6\4\uffff\2\6\4\uffff\1\5",
             "",
             "\1\7",
             "",
             "",
-            "\1\4\1\uffff\1\5\4\uffff\2\5\4\uffff\1\6"
+            "\1\4\1\uffff\1\6\4\uffff\2\6\4\uffff\1\5"
     };
 
     static final short[] DFA1_eot = DFA.unpackEncodedString(DFA1_eotS);
@@ -22348,10 +22348,8 @@ public class InternalCssExtDslParser extends AbstractInternalContentAssistParser
     static final String[] DFA2_transitionS = {
             "\1\1\42\uffff\1\2\1\3\2\4",
             "\1\5\43\uffff\1\2\1\3\2\4",
-            "\4\4\2\uffff\1\4\4\uffff\5\4\5\uffff\1\6\1\uffff\1\4\2\uffff"+
-            "\3\4\2\uffff\5\4\1\uffff\4\4",
-            "\4\4\2\uffff\1\4\4\uffff\5\4\5\uffff\1\7\1\uffff\1\4\2\uffff"+
-            "\3\4\2\uffff\5\4\1\uffff\4\4",
+            "\4\4\2\uffff\1\4\4\uffff\5\4\5\uffff\1\6\1\uffff\1\4\2\uffff\3\4\2\uffff\5\4\1\uffff\4\4",
+            "\4\4\2\uffff\1\4\4\uffff\5\4\5\uffff\1\7\1\uffff\1\4\2\uffff\3\4\2\uffff\5\4\1\uffff\4\4",
             "",
             "\1\5\43\uffff\1\2\1\3\2\4",
             "",
@@ -22404,8 +22402,7 @@ public class InternalCssExtDslParser extends AbstractInternalContentAssistParser
     static final String DFA7_specialS =
         "\12\uffff}>";
     static final String[] DFA7_transitionS = {
-            "\1\4\1\uffff\1\1\1\10\2\uffff\1\7\7\uffff\2\5\14\uffff\1\2\5"+
-            "\uffff\1\3\2\uffff\4\6",
+            "\1\4\1\uffff\1\1\1\10\2\uffff\1\7\7\uffff\2\5\14\uffff\1\2\5\uffff\1\3\2\uffff\4\6",
             "\1\4\1\11\14\uffff\2\5\14\uffff\1\2\10\uffff\4\6",
             "",
             "",
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/.antlr-generator-3.2.0-patch.jar b/bundles/tooling/org.eclipse.fx.ide.css.cssext/.antlr-generator-3.2.0-patch.jar
new file mode 100644
index 000000000..90516fd7a
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/.antlr-generator-3.2.0-patch.jar
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.css.cssext/META-INF/MANIFEST.MF
index fb6fc922b..f1b39874f 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/META-INF/MANIFEST.MF
@@ -1,45 +1,46 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.fx.ide.css.cssext
-Bundle-Vendor: Eclipse.org
-Bundle-Version: 2.0.0.qualifier
-Bundle-SymbolicName: org.eclipse.fx.ide.css.cssext; singleton:=true
-Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.xtext;visibility:=reexport,
- org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,
- org.eclipse.xtext.generator;resolution:=optional,
- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
- org.eclipse.emf.codegen.ecore;resolution:=optional,
- org.eclipse.emf.mwe.utils;resolution:=optional,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.eclipse.xtext.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
- org.antlr.runtime,
- org.eclipse.xtext.common.types,
- org.eclipse.fx.core;bundle-version="0.9.0",
- org.eclipse.fx.core.guice;bundle-version="0.9.0",
- org.eclipse.fx.ide.css;bundle-version="0.9.0",
- org.eclipse.core.resources;bundle-version="3.7.0",
- org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional
-Import-Package: org.apache.log4j,
- org.eclipse.core.runtime;version="3.4.0",
- org.eclipse.xtext.xbase.lib
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.fx.ide.css.cssext;x-friends:="org.eclipse.fx.ide.css.cssext.ui",
- org.eclipse.fx.ide.css.cssext.cssExtDsl;x-friends:="org.eclipse.fx.ide.css.cssext.ui",
- org.eclipse.fx.ide.css.cssext.cssExtDsl.impl;x-friends:="org.eclipse.fx.ide.css.cssext.ui",
- org.eclipse.fx.ide.css.cssext.cssExtDsl.util;x-friends:="org.eclipse.fx.ide.css.cssext.ui",
- org.eclipse.fx.ide.css.cssext.formatting;x-friends:="org.eclipse.fx.ide.css.cssext.ui",
- org.eclipse.fx.ide.css.cssext.generator;x-friends:="org.eclipse.fx.ide.css.cssext.ui",
- org.eclipse.fx.ide.css.cssext.parseTreeConstruction;x-friends:="org.eclipse.fx.ide.css.cssext.ui",
- org.eclipse.fx.ide.css.cssext.parser;x-friends:="org.eclipse.fx.ide.css.cssext.ui",
- org.eclipse.fx.ide.css.cssext.parser.antlr;x-friends:="org.eclipse.fx.ide.css.cssext.ui",
- org.eclipse.fx.ide.css.cssext.parser.antlr.internal;x-friends:="org.eclipse.fx.ide.css.cssext.ui",
- org.eclipse.fx.ide.css.cssext.parser.result;x-friends:="org.eclipse.fx.ide.css.cssext.ui",
- org.eclipse.fx.ide.css.cssext.proposal;x-friends:="org.eclipse.fx.ide.css.cssext.ui",
- org.eclipse.fx.ide.css.cssext.scoping;x-friends:="org.eclipse.fx.ide.css.cssext.ui",
- org.eclipse.fx.ide.css.cssext.services;x-friends:="org.eclipse.fx.ide.css.cssext.ui",
- org.eclipse.fx.ide.css.cssext.validation;x-friends:="org.eclipse.fx.ide.css.cssext.ui"
-
-
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: org.eclipse.fx.ide.css.cssext

+Bundle-Vendor: Eclipse.org

+Bundle-Version: 2.0.0.qualifier

+Bundle-SymbolicName: org.eclipse.fx.ide.css.cssext; singleton:=true

+Bundle-ActivationPolicy: lazy

+Require-Bundle: org.eclipse.xtext;visibility:=reexport,

+ org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,

+ org.eclipse.xtext.generator;resolution:=optional,

+ org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,

+ org.eclipse.emf.codegen.ecore;resolution:=optional,

+ org.eclipse.emf.mwe.utils;resolution:=optional,

+ org.eclipse.emf.mwe2.launch;resolution:=optional,

+ org.eclipse.xtext.util,

+ org.eclipse.emf.ecore,

+ org.eclipse.emf.common,

+ org.antlr.runtime,

+ org.eclipse.xtext.common.types,

+ org.eclipse.fx.core;bundle-version="0.9.0",

+ org.eclipse.fx.core.guice;bundle-version="0.9.0",

+ org.eclipse.fx.ide.css;bundle-version="0.9.0",

+ org.eclipse.core.resources;bundle-version="3.7.0",

+ org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,

+ org.eclipse.xtext.xbase.lib,

+ org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional

+Import-Package: org.apache.log4j,

+ org.eclipse.core.runtime;version="3.4.0",

+ org.eclipse.xtext.xbase.lib

+Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Export-Package: org.eclipse.fx.ide.css.cssext;x-friends:="org.eclipse.fx.ide.css.cssext.ui",

+ org.eclipse.fx.ide.css.cssext.cssExtDsl;x-friends:="org.eclipse.fx.ide.css.cssext.ui",

+ org.eclipse.fx.ide.css.cssext.cssExtDsl.impl;x-friends:="org.eclipse.fx.ide.css.cssext.ui",

+ org.eclipse.fx.ide.css.cssext.cssExtDsl.util;x-friends:="org.eclipse.fx.ide.css.cssext.ui",

+ org.eclipse.fx.ide.css.cssext.formatting;x-friends:="org.eclipse.fx.ide.css.cssext.ui",

+ org.eclipse.fx.ide.css.cssext.generator;x-friends:="org.eclipse.fx.ide.css.cssext.ui",

+ org.eclipse.fx.ide.css.cssext.parseTreeConstruction;x-friends:="org.eclipse.fx.ide.css.cssext.ui",

+ org.eclipse.fx.ide.css.cssext.parser;x-friends:="org.eclipse.fx.ide.css.cssext.ui",

+ org.eclipse.fx.ide.css.cssext.parser.antlr;x-friends:="org.eclipse.fx.ide.css.cssext.ui",

+ org.eclipse.fx.ide.css.cssext.parser.antlr.internal;x-friends:="org.eclipse.fx.ide.css.cssext.ui",

+ org.eclipse.fx.ide.css.cssext.parser.result;x-friends:="org.eclipse.fx.ide.css.cssext.ui",

+ org.eclipse.fx.ide.css.cssext.proposal;x-friends:="org.eclipse.fx.ide.css.cssext.ui",

+ org.eclipse.fx.ide.css.cssext.scoping;x-friends:="org.eclipse.fx.ide.css.cssext.ui",

+ org.eclipse.fx.ide.css.cssext.services;x-friends:="org.eclipse.fx.ide.css.cssext.ui",

+ org.eclipse.fx.ide.css.cssext.validation;x-friends:="org.eclipse.fx.ide.css.cssext.ui"

+

diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/AbstractCssExtDslRuntimeModule.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/AbstractCssExtDslRuntimeModule.java
index 43c1b3100..0ebfa34f8 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/AbstractCssExtDslRuntimeModule.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/AbstractCssExtDslRuntimeModule.java
@@ -6,7 +6,6 @@ package org.eclipse.fx.ide.css.cssext;
 import java.util.Properties;
 
 import org.eclipse.xtext.Constants;
-import org.eclipse.xtext.service.DefaultRuntimeModule;
 
 import com.google.inject.Binder;
 import com.google.inject.name.Names;
@@ -14,8 +13,8 @@ import com.google.inject.name.Names;
 /**
  * Manual modifications go to {org.eclipse.fx.ide.css.cssext.CssExtDslRuntimeModule}
  */
- @SuppressWarnings("all")
-public abstract class AbstractCssExtDslRuntimeModule extends DefaultRuntimeModule {
+@SuppressWarnings("all")
+public abstract class AbstractCssExtDslRuntimeModule extends org.eclipse.xtext.common.types.DefaultCommonTypesRuntimeModule {
 
 	protected Properties properties = null;
 
@@ -35,6 +34,11 @@ public abstract class AbstractCssExtDslRuntimeModule extends DefaultRuntimeModul
 	}
 	
 	// contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
+	public java.lang.ClassLoader bindClassLoaderToInstance() {
+		return getClass().getClassLoader();
+	}
+
+	// contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
 	public Class<? extends org.eclipse.xtext.IGrammarAccess> bindIGrammarAccess() {
 		return org.eclipse.fx.ide.css.cssext.services.CssExtDslGrammarAccess.class;
 	}
@@ -120,8 +124,8 @@ public abstract class AbstractCssExtDslRuntimeModule extends DefaultRuntimeModul
 	}
 
 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
-	public void configureIResourceDescriptionsBuilderScope(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
+	public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) {
+		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
 	}
 
 	// contributed by org.eclipse.xtext.generator.generator.GeneratorFragment
@@ -135,26 +139,6 @@ public abstract class AbstractCssExtDslRuntimeModule extends DefaultRuntimeModul
 	}
 
 	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public java.lang.ClassLoader bindClassLoaderToInstance() {
-		return getClass().getClassLoader();
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public org.eclipse.xtext.common.types.TypesFactory bindTypesFactoryToInstance() {
-		return org.eclipse.xtext.common.types.TypesFactory.eINSTANCE;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.access.IJvmTypeProvider.Factory> bindIJvmTypeProvider$Factory() {
-		return org.eclipse.xtext.common.types.access.ClasspathTypeProviderFactory.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.xtext.AbstractTypeScopeProvider> bindAbstractTypeScopeProvider() {
-		return org.eclipse.xtext.common.types.xtext.ClasspathBasedTypeScopeProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
 	public Class<? extends org.eclipse.xtext.scoping.IGlobalScopeProvider> bindIGlobalScopeProvider() {
 		return org.eclipse.xtext.common.types.xtext.TypesAwareDefaultGlobalScopeProvider.class;
 	}
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/CssExtDsl.genmodel b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/CssExtDsl.genmodel
index 2456b6b8e..b45d2975a 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/CssExtDsl.genmodel
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/CssExtDsl.genmodel
@@ -3,8 +3,8 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.fx.ide.css.cssext/src-gen" editDirectory="/org.eclipse.fx.ide.css.cssext.edit/src"
     editorDirectory="/org.eclipse.fx.ide.css.cssext.editor/src" modelPluginID="org.eclipse.fx.ide.css.cssext"
     forceOverwrite="true" modelName="CssExtDsl" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.fx.ide.css.cssext.edit"
-    editorPluginID="org.eclipse.fx.ide.css.cssext.editor" runtimeVersion="2.8">
+    complianceLevel="6.0" copyrightFields="false" editPluginID="org.eclipse.fx.ide.css.cssext.edit"
+    editorPluginID="org.eclipse.fx.ide.css.cssext.editor" runtimeVersion="2.11">
   <genPackages prefix="CssExtDsl" basePackage="org.eclipse.fx.ide.css.cssext" disposableProviderFactory="true"
       ecorePackage="CssExtDsl.ecore#/">
     <genClasses ecoreClass="CssExtDsl.ecore#//CssExtension">
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/CssExtDsl.xmi b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/CssExtDsl.xmi
deleted file mode 100644
index 92385dc60..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/CssExtDsl.xmi
+++ /dev/null
@@ -1,1004 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xtext="http://www.eclipse.org/2008/Xtext">
-  <xtext:Grammar name="org.eclipse.fx.ide.css.cssext.CssExtDsl" usedGrammars="/1">
-    <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ecore">
-      <ePackage href="http://www.eclipse.org/emf/2002/Ecore#/"/>
-    </metamodelDeclarations>
-    <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="cssExtDsl">
-      <ePackage href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#/"/>
-    </metamodelDeclarations>
-    <rules xsi:type="xtext:ParserRule" name="CssExtension">
-      <type metamodel="/0/@metamodelDeclarations.1">
-        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CssExtension"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Assignment" cardinality="*" feature="imports" operator="+=">
-          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.6"/>
-        </elements>
-        <elements xsi:type="xtext:Assignment" cardinality="?" feature="packageDef" operator="=">
-          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.10"/>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:TerminalRule" name="PSEUDO">
-      <type metamodel="/0/@metamodelDeclarations.0">
-        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Keyword" value=":"/>
-        <elements xsi:type="xtext:NegatedToken">
-          <terminal xsi:type="xtext:Keyword" value=" "/>
-        </elements>
-        <elements xsi:type="xtext:RuleCall" rule="/0/@rules.2"/>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:TerminalRule" name="ID">
-      <type metamodel="/0/@metamodelDeclarations.0">
-        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Alternatives">
-          <elements xsi:type="xtext:CharacterRange">
-            <left value="a"/>
-            <right value="z"/>
-          </elements>
-          <elements xsi:type="xtext:CharacterRange">
-            <left value="A"/>
-            <right value="Z"/>
-          </elements>
-          <elements xsi:type="xtext:Keyword" value="_"/>
-          <elements xsi:type="xtext:Keyword" value="-"/>
-        </elements>
-        <elements xsi:type="xtext:Alternatives" cardinality="*">
-          <elements xsi:type="xtext:CharacterRange">
-            <left value="a"/>
-            <right value="z"/>
-          </elements>
-          <elements xsi:type="xtext:CharacterRange">
-            <left value="A"/>
-            <right value="Z"/>
-          </elements>
-          <elements xsi:type="xtext:Keyword" value="_"/>
-          <elements xsi:type="xtext:CharacterRange">
-            <left value="0"/>
-            <right value="9"/>
-          </elements>
-          <elements xsi:type="xtext:Keyword" value="-"/>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:TerminalRule" name="JDOC">
-      <type metamodel="/0/@metamodelDeclarations.0">
-        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Keyword" value="/**"/>
-        <elements xsi:type="xtext:UntilToken">
-          <terminal xsi:type="xtext:Keyword" value="*/"/>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:TerminalRule" name="ML_COMMENT">
-      <type metamodel="/0/@metamodelDeclarations.0">
-        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Keyword" value="/*"/>
-        <elements xsi:type="xtext:NegatedToken">
-          <terminal xsi:type="xtext:Keyword" value="*"/>
-        </elements>
-        <elements xsi:type="xtext:UntilToken">
-          <terminal xsi:type="xtext:Keyword" value="*/"/>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:TerminalRule" name="SL_COMMENT">
-      <type metamodel="/0/@metamodelDeclarations.0">
-        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Keyword" value="//"/>
-        <elements xsi:type="xtext:NegatedToken" cardinality="*">
-          <terminal xsi:type="xtext:Alternatives">
-            <elements xsi:type="xtext:Keyword" value="&#xA;"/>
-            <elements xsi:type="xtext:Keyword" value="&#xD;"/>
-          </terminal>
-        </elements>
-        <elements xsi:type="xtext:Group" cardinality="?">
-          <elements xsi:type="xtext:Keyword" cardinality="?" value="&#xD;"/>
-          <elements xsi:type="xtext:Keyword" value="&#xA;"/>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="Import">
-      <type metamodel="/0/@metamodelDeclarations.1">
-        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//Import"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Keyword" value="import"/>
-        <elements xsi:type="xtext:Assignment" feature="importedNamespace" operator="=">
-          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.9"/>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="ValidID">
-      <type metamodel="/0/@metamodelDeclarations.0">
-        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      </type>
-      <alternatives xsi:type="xtext:RuleCall" rule="/0/@rules.2"/>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="QualifiedName">
-      <type metamodel="/0/@metamodelDeclarations.0">
-        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:RuleCall" rule="/0/@rules.7"/>
-        <elements xsi:type="xtext:Group" cardinality="*">
-          <elements xsi:type="xtext:Keyword" predicated="true" value="."/>
-          <elements xsi:type="xtext:RuleCall" rule="/0/@rules.7"/>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="QualifiedNameWithWildCard">
-      <type metamodel="/0/@metamodelDeclarations.0">
-        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:RuleCall" rule="/0/@rules.8"/>
-        <elements xsi:type="xtext:Group" cardinality="?">
-          <elements xsi:type="xtext:Keyword" value="."/>
-          <elements xsi:type="xtext:Keyword" value="*"/>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="PackageDefinition">
-      <type metamodel="/0/@metamodelDeclarations.1">
-        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//PackageDefinition"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Group" cardinality="?">
-          <elements xsi:type="xtext:Assignment" feature="doku" operator="=">
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.11"/>
-          </elements>
-          <elements xsi:type="xtext:RuleCall" cardinality="*" rule="/1/@rules.5"/>
-        </elements>
-        <elements xsi:type="xtext:Keyword" value="package"/>
-        <elements xsi:type="xtext:Assignment" feature="name" operator="=">
-          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.8"/>
-        </elements>
-        <elements xsi:type="xtext:Keyword" value="{"/>
-        <elements xsi:type="xtext:Alternatives" cardinality="*">
-          <elements xsi:type="xtext:Assignment" feature="rules" operator="+=">
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.18"/>
-          </elements>
-          <elements xsi:type="xtext:Assignment" feature="subpackages" operator="+=">
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.10"/>
-          </elements>
-          <elements xsi:type="xtext:Assignment" feature="elements" operator="+=">
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.14"/>
-          </elements>
-        </elements>
-        <elements xsi:type="xtext:Keyword" value="}"/>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="Doku">
-      <type metamodel="/0/@metamodelDeclarations.1">
-        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//Doku"/>
-      </type>
-      <alternatives xsi:type="xtext:Assignment" feature="content" operator="=">
-        <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.3"/>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="CSSBaseType" definesHiddenTokens="true" hiddenTokens="/1/@rules.5 /0/@rules.5 /0/@rules.4">
-      <type metamodel="/0/@metamodelDeclarations.1">
-        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSRule"/>
-      </type>
-      <alternatives xsi:type="xtext:RuleCall" rule="/0/@rules.13"/>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="CSSType" definesHiddenTokens="true" hiddenTokens="/0/@rules.5 /0/@rules.4">
-      <type metamodel="/0/@metamodelDeclarations.1">
-        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSType"/>
-      </type>
-      <alternatives xsi:type="xtext:Alternatives">
-        <elements xsi:type="xtext:Group">
-          <elements xsi:type="xtext:Action">
-            <type metamodel="/0/@metamodelDeclarations.1">
-              <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSRangedIntType"/>
-            </type>
-          </elements>
-          <elements xsi:type="xtext:Group" cardinality="?">
-            <elements xsi:type="xtext:Assignment" feature="doku" operator="=">
-              <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.11"/>
-            </elements>
-            <elements xsi:type="xtext:RuleCall" cardinality="*" rule="/1/@rules.5"/>
-          </elements>
-          <elements xsi:type="xtext:Assignment" feature="type" operator="=">
-            <terminal xsi:type="xtext:Keyword" value="@INT"/>
-          </elements>
-          <elements xsi:type="xtext:Keyword" value="("/>
-          <elements xsi:type="xtext:RuleCall" cardinality="*" rule="/1/@rules.5"/>
-          <elements xsi:type="xtext:Assignment" feature="from" operator="=">
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.34"/>
-          </elements>
-          <elements xsi:type="xtext:RuleCall" cardinality="*" rule="/1/@rules.5"/>
-          <elements xsi:type="xtext:Keyword" value="->"/>
-          <elements xsi:type="xtext:RuleCall" cardinality="*" rule="/1/@rules.5"/>
-          <elements xsi:type="xtext:Assignment" feature="to" operator="=">
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.34"/>
-          </elements>
-          <elements xsi:type="xtext:RuleCall" cardinality="*" rule="/1/@rules.5"/>
-          <elements xsi:type="xtext:Keyword" value=")"/>
-        </elements>
-        <elements xsi:type="xtext:Group">
-          <elements xsi:type="xtext:Action">
-            <type metamodel="/0/@metamodelDeclarations.1">
-              <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSRangedDoubleType"/>
-            </type>
-          </elements>
-          <elements xsi:type="xtext:Group" cardinality="?">
-            <elements xsi:type="xtext:Assignment" feature="doku" operator="=">
-              <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.11"/>
-            </elements>
-            <elements xsi:type="xtext:RuleCall" cardinality="*" rule="/1/@rules.5"/>
-          </elements>
-          <elements xsi:type="xtext:Assignment" feature="type" operator="=">
-            <terminal xsi:type="xtext:Keyword" value="@NUM"/>
-          </elements>
-          <elements xsi:type="xtext:Keyword" value="("/>
-          <elements xsi:type="xtext:RuleCall" cardinality="*" rule="/1/@rules.5"/>
-          <elements xsi:type="xtext:Assignment" feature="from" operator="=">
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.35"/>
-          </elements>
-          <elements xsi:type="xtext:RuleCall" cardinality="*" rule="/1/@rules.5"/>
-          <elements xsi:type="xtext:Keyword" value="->"/>
-          <elements xsi:type="xtext:RuleCall" cardinality="*" rule="/1/@rules.5"/>
-          <elements xsi:type="xtext:Assignment" feature="to" operator="=">
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.35"/>
-          </elements>
-          <elements xsi:type="xtext:RuleCall" cardinality="*" rule="/1/@rules.5"/>
-          <elements xsi:type="xtext:Keyword" value=")"/>
-        </elements>
-        <elements xsi:type="xtext:Group">
-          <elements xsi:type="xtext:Group" cardinality="?">
-            <elements xsi:type="xtext:Assignment" feature="doku" operator="=">
-              <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.11"/>
-            </elements>
-            <elements xsi:type="xtext:RuleCall" cardinality="*" rule="/1/@rules.5"/>
-          </elements>
-          <elements xsi:type="xtext:Alternatives">
-            <elements xsi:type="xtext:Group">
-              <elements xsi:type="xtext:Assignment" feature="type" operator="=">
-                <terminal xsi:type="xtext:Keyword" value="@INT"/>
-              </elements>
-              <elements xsi:type="xtext:RuleCall" cardinality="*" rule="/1/@rules.5"/>
-            </elements>
-            <elements xsi:type="xtext:Group">
-              <elements xsi:type="xtext:Assignment" feature="type" operator="=">
-                <terminal xsi:type="xtext:Keyword" value="@NUM"/>
-              </elements>
-              <elements xsi:type="xtext:RuleCall" cardinality="*" rule="/1/@rules.5"/>
-            </elements>
-            <elements xsi:type="xtext:Group">
-              <elements xsi:type="xtext:Assignment" feature="type" operator="=">
-                <terminal xsi:type="xtext:Keyword" value="@STRING"/>
-              </elements>
-              <elements xsi:type="xtext:RuleCall" cardinality="*" rule="/1/@rules.5"/>
-            </elements>
-            <elements xsi:type="xtext:Group">
-              <elements xsi:type="xtext:Assignment" feature="type" operator="=">
-                <terminal xsi:type="xtext:Keyword" value="@URL"/>
-              </elements>
-              <elements xsi:type="xtext:RuleCall" cardinality="*" rule="/1/@rules.5"/>
-            </elements>
-          </elements>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="ElementDefinition">
-      <type metamodel="/0/@metamodelDeclarations.1">
-        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//ElementDefinition"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Action">
-          <type metamodel="/0/@metamodelDeclarations.1">
-            <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//ElementDefinition"/>
-          </type>
-        </elements>
-        <elements xsi:type="xtext:Assignment" cardinality="?" feature="doku" operator="=">
-          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.11"/>
-        </elements>
-        <elements xsi:type="xtext:Assignment" feature="name" operator="=">
-          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.8"/>
-        </elements>
-        <elements xsi:type="xtext:Group" cardinality="?">
-          <elements xsi:type="xtext:Keyword" value="extends"/>
-          <elements xsi:type="xtext:Assignment" feature="super" operator="+=">
-            <terminal xsi:type="xtext:CrossReference">
-              <type metamodel="/0/@metamodelDeclarations.1">
-                <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//ElementDefinition"/>
-              </type>
-              <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.8"/>
-            </terminal>
-          </elements>
-          <elements xsi:type="xtext:Group" cardinality="*">
-            <elements xsi:type="xtext:Keyword" value=","/>
-            <elements xsi:type="xtext:Assignment" feature="super" operator="+=">
-              <terminal xsi:type="xtext:CrossReference">
-                <type metamodel="/0/@metamodelDeclarations.1">
-                  <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//ElementDefinition"/>
-                </type>
-                <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.8"/>
-              </terminal>
-            </elements>
-          </elements>
-        </elements>
-        <elements xsi:type="xtext:Group" cardinality="?">
-          <elements xsi:type="xtext:Keyword" value="styleclass"/>
-          <elements xsi:type="xtext:Assignment" feature="styleclass" operator="=">
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.2"/>
-          </elements>
-        </elements>
-        <elements xsi:type="xtext:Keyword" value="{"/>
-        <elements xsi:type="xtext:Alternatives" cardinality="*">
-          <elements xsi:type="xtext:Assignment" feature="properties" operator="+=">
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.15"/>
-          </elements>
-          <elements xsi:type="xtext:Assignment" feature="pseudoClasses" operator="+=">
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.16"/>
-          </elements>
-          <elements xsi:type="xtext:Assignment" feature="substructures" operator="+=">
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.32"/>
-          </elements>
-        </elements>
-        <elements xsi:type="xtext:Keyword" value="}"/>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="PropertyDefinition">
-      <type metamodel="/0/@metamodelDeclarations.1">
-        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//Definition"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Action">
-          <type metamodel="/0/@metamodelDeclarations.1">
-            <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//PropertyDefinition"/>
-          </type>
-        </elements>
-        <elements xsi:type="xtext:Assignment" cardinality="?" feature="doku" operator="=">
-          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.11"/>
-        </elements>
-        <elements xsi:type="xtext:Assignment" feature="name" operator="=">
-          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.8"/>
-        </elements>
-        <elements xsi:type="xtext:Assignment" feature="rule" operator="=">
-          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.20"/>
-        </elements>
-        <elements xsi:type="xtext:Group" cardinality="?">
-          <elements xsi:type="xtext:Keyword" value="default:"/>
-          <elements xsi:type="xtext:Assignment" feature="default" operator="=">
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.30"/>
-          </elements>
-        </elements>
-        <elements xsi:type="xtext:Keyword" value=";"/>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="PseudoClassDefinition">
-      <type metamodel="/0/@metamodelDeclarations.1">
-        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//PseudoClassDefinition"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Action">
-          <type metamodel="/0/@metamodelDeclarations.1">
-            <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//PseudoClassDefinition"/>
-          </type>
-        </elements>
-        <elements xsi:type="xtext:Assignment" cardinality="?" feature="doku" operator="=">
-          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.11"/>
-        </elements>
-        <elements xsi:type="xtext:Assignment" feature="name" operator="=">
-          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.1"/>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="CSSRuleRef" definesHiddenTokens="true">
-      <type metamodel="/0/@metamodelDeclarations.1">
-        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSRuleRef"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Group" cardinality="?">
-          <elements xsi:type="xtext:Assignment" feature="doku" operator="=">
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.11"/>
-          </elements>
-          <elements xsi:type="xtext:RuleCall" cardinality="*" rule="/1/@rules.5"/>
-        </elements>
-        <elements xsi:type="xtext:Keyword" value="&lt;"/>
-        <elements xsi:type="xtext:Assignment" feature="ref" operator="=">
-          <terminal xsi:type="xtext:CrossReference">
-            <type metamodel="/0/@metamodelDeclarations.1">
-              <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//Definition"/>
-            </type>
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.8"/>
-          </terminal>
-        </elements>
-        <elements xsi:type="xtext:Keyword" value=">"/>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="CSSRuleDefinition" definesHiddenTokens="true" hiddenTokens="/1/@rules.5 /0/@rules.5 /0/@rules.4">
-      <type metamodel="/0/@metamodelDeclarations.1">
-        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//Definition"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Action">
-          <type metamodel="/0/@metamodelDeclarations.1">
-            <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSRuleDefinition"/>
-          </type>
-        </elements>
-        <elements xsi:type="xtext:Assignment" cardinality="?" feature="doku" operator="=">
-          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.11"/>
-        </elements>
-        <elements xsi:type="xtext:Assignment" feature="name" operator="=">
-          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.8"/>
-        </elements>
-        <elements xsi:type="xtext:Keyword" value="="/>
-        <elements xsi:type="xtext:Alternatives">
-          <elements xsi:type="xtext:Assignment" feature="rule" operator="=">
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.20"/>
-          </elements>
-          <elements xsi:type="xtext:Assignment" feature="func" operator="=">
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.19"/>
-          </elements>
-        </elements>
-        <elements xsi:type="xtext:Keyword" value=";"/>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="CSSRuleFunc" definesHiddenTokens="true" hiddenTokens="/0/@rules.4 /0/@rules.5">
-      <type metamodel="/0/@metamodelDeclarations.1">
-        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSRule"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Action">
-          <type metamodel="/0/@metamodelDeclarations.1">
-            <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSRuleFunc"/>
-          </type>
-        </elements>
-        <elements xsi:type="xtext:Assignment" feature="name" operator="=">
-          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.7"/>
-        </elements>
-        <elements xsi:type="xtext:Keyword" value="("/>
-        <elements xsi:type="xtext:RuleCall" cardinality="*" rule="/1/@rules.5"/>
-        <elements xsi:type="xtext:Assignment" feature="params" operator="=">
-          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.20"/>
-        </elements>
-        <elements xsi:type="xtext:Keyword" value=")"/>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="CSSRuleOr" definesHiddenTokens="true" hiddenTokens="/1/@rules.5 /0/@rules.4 /0/@rules.5">
-      <type metamodel="/0/@metamodelDeclarations.1">
-        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSRule"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:RuleCall" rule="/0/@rules.21"/>
-        <elements xsi:type="xtext:Group" cardinality="?">
-          <elements xsi:type="xtext:Action" feature="ors" operator="+=">
-            <type metamodel="/0/@metamodelDeclarations.1">
-              <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSRuleOr"/>
-            </type>
-          </elements>
-          <elements xsi:type="xtext:Group" cardinality="+">
-            <elements xsi:type="xtext:Keyword" value="|"/>
-            <elements xsi:type="xtext:Assignment" feature="ors" operator="+=">
-              <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.21"/>
-            </elements>
-          </elements>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="CSSRuleXor" definesHiddenTokens="true" hiddenTokens="/1/@rules.5 /0/@rules.5 /0/@rules.4">
-      <type metamodel="/0/@metamodelDeclarations.1">
-        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSRule"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:RuleCall" rule="/0/@rules.22"/>
-        <elements xsi:type="xtext:Group" cardinality="?">
-          <elements xsi:type="xtext:Action" feature="xors" operator="+=">
-            <type metamodel="/0/@metamodelDeclarations.1">
-              <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSRuleXor"/>
-            </type>
-          </elements>
-          <elements xsi:type="xtext:Group" cardinality="+">
-            <elements xsi:type="xtext:Keyword" value="||"/>
-            <elements xsi:type="xtext:Assignment" feature="xors" operator="+=">
-              <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.22"/>
-            </elements>
-          </elements>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="CSSRuleConcat" definesHiddenTokens="true" hiddenTokens="/1/@rules.5 /0/@rules.5 /0/@rules.4">
-      <type metamodel="/0/@metamodelDeclarations.1">
-        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSRule"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:RuleCall" rule="/0/@rules.23"/>
-        <elements xsi:type="xtext:Group" cardinality="?">
-          <elements xsi:type="xtext:Action" feature="conc" operator="+=">
-            <type metamodel="/0/@metamodelDeclarations.1">
-              <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSRuleConcat"/>
-            </type>
-          </elements>
-          <elements xsi:type="xtext:Assignment" cardinality="+" feature="conc" operator="+=">
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.23"/>
-          </elements>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="CSSRuleConcatWithoutSpace" definesHiddenTokens="true" hiddenTokens="/1/@rules.5 /0/@rules.5 /0/@rules.4">
-      <type metamodel="/0/@metamodelDeclarations.1">
-        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSRule"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:RuleCall" rule="/0/@rules.24"/>
-        <elements xsi:type="xtext:Group" cardinality="?">
-          <elements xsi:type="xtext:Action" feature="conc" operator="+=">
-            <type metamodel="/0/@metamodelDeclarations.1">
-              <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSRuleConcatWithoutSpace"/>
-            </type>
-          </elements>
-          <elements xsi:type="xtext:Group" cardinality="+">
-            <elements xsi:type="xtext:Keyword" value="~"/>
-            <elements xsi:type="xtext:Assignment" feature="conc" operator="+=">
-              <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.24"/>
-            </elements>
-          </elements>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="CSSRulePostfix" definesHiddenTokens="true" hiddenTokens="/1/@rules.5 /0/@rules.5 /0/@rules.4">
-      <type metamodel="/0/@metamodelDeclarations.1">
-        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSRule"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:RuleCall" rule="/0/@rules.26"/>
-        <elements xsi:type="xtext:Group" cardinality="?">
-          <elements xsi:type="xtext:Action" feature="rule" operator="=">
-            <type metamodel="/0/@metamodelDeclarations.1">
-              <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSRulePostfix"/>
-            </type>
-          </elements>
-          <elements xsi:type="xtext:Assignment" feature="cardinality" operator="=">
-            <terminal xsi:type="xtext:Alternatives">
-              <elements xsi:type="xtext:Keyword" value="*"/>
-              <elements xsi:type="xtext:Keyword" value="+"/>
-              <elements xsi:type="xtext:Keyword" value="?"/>
-            </terminal>
-          </elements>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="CSSRuleBracket" definesHiddenTokens="true" hiddenTokens="/1/@rules.5 /0/@rules.5 /0/@rules.4">
-      <type metamodel="/0/@metamodelDeclarations.1">
-        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSRule"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Action">
-          <type metamodel="/0/@metamodelDeclarations.1">
-            <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSRuleBracket"/>
-          </type>
-        </elements>
-        <elements xsi:type="xtext:Keyword" value="["/>
-        <elements xsi:type="xtext:Assignment" feature="inner" operator="=">
-          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.20"/>
-        </elements>
-        <elements xsi:type="xtext:Keyword" value="]"/>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="CSSRulePrimary" definesHiddenTokens="true" hiddenTokens="/0/@rules.5 /0/@rules.4">
-      <type metamodel="/0/@metamodelDeclarations.1">
-        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSRule"/>
-      </type>
-      <alternatives xsi:type="xtext:Alternatives">
-        <elements xsi:type="xtext:RuleCall" rule="/0/@rules.17"/>
-        <elements xsi:type="xtext:RuleCall" rule="/0/@rules.25"/>
-        <elements xsi:type="xtext:RuleCall" rule="/0/@rules.28"/>
-        <elements xsi:type="xtext:RuleCall" rule="/0/@rules.29"/>
-        <elements xsi:type="xtext:RuleCall" rule="/0/@rules.12"/>
-        <elements xsi:type="xtext:RuleCall" rule="/0/@rules.27"/>
-        <elements xsi:type="xtext:Group">
-          <elements xsi:type="xtext:Action">
-            <type metamodel="/0/@metamodelDeclarations.1">
-              <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSNumLiteral"/>
-            </type>
-          </elements>
-          <elements xsi:type="xtext:Assignment" feature="value" operator="=">
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.34"/>
-          </elements>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="CSSRuleRegex" definesHiddenTokens="true" hiddenTokens="/1/@rules.5 /0/@rules.5 /0/@rules.4">
-      <type metamodel="/0/@metamodelDeclarations.1">
-        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSRule"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Action">
-          <type metamodel="/0/@metamodelDeclarations.1">
-            <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSRuleRegex"/>
-          </type>
-        </elements>
-        <elements xsi:type="xtext:Assignment" feature="regex" operator="=">
-          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.36"/>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="CSSRuleLiteral">
-      <type metamodel="/0/@metamodelDeclarations.1">
-        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSRule"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Action">
-          <type metamodel="/0/@metamodelDeclarations.1">
-            <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSRuleLiteral"/>
-          </type>
-        </elements>
-        <elements xsi:type="xtext:Group" cardinality="?">
-          <elements xsi:type="xtext:Assignment" feature="doku" operator="=">
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.11"/>
-          </elements>
-          <elements xsi:type="xtext:RuleCall" cardinality="*" rule="/1/@rules.5"/>
-        </elements>
-        <elements xsi:type="xtext:Assignment" feature="value" operator="=">
-          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.2"/>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="CSSRuleSymbol">
-      <type metamodel="/0/@metamodelDeclarations.1">
-        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSRule"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Action">
-          <type metamodel="/0/@metamodelDeclarations.1">
-            <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSRuleSymbol"/>
-          </type>
-        </elements>
-        <elements xsi:type="xtext:Group" cardinality="?">
-          <elements xsi:type="xtext:Assignment" feature="doku" operator="=">
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.11"/>
-          </elements>
-          <elements xsi:type="xtext:RuleCall" cardinality="*" rule="/1/@rules.5"/>
-        </elements>
-        <elements xsi:type="xtext:Assignment" feature="symbol" operator="=">
-          <terminal xsi:type="xtext:Alternatives">
-            <elements xsi:type="xtext:Keyword" value=","/>
-            <elements xsi:type="xtext:Keyword" value="%"/>
-          </terminal>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="CSSDefaultValue">
-      <type metamodel="/0/@metamodelDeclarations.1">
-        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSDefaultValue"/>
-      </type>
-      <alternatives xsi:type="xtext:Alternatives">
-        <elements xsi:type="xtext:Group">
-          <elements xsi:type="xtext:Action">
-            <type metamodel="/0/@metamodelDeclarations.1">
-              <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//CSSDefaultValue"/>
-            </type>
-          </elements>
-          <elements xsi:type="xtext:Assignment" feature="val" operator="=">
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.28"/>
-          </elements>
-        </elements>
-        <elements xsi:type="xtext:Assignment" feature="ival" operator="=">
-          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.34"/>
-        </elements>
-        <elements xsi:type="xtext:Assignment" feature="dval" operator="=">
-          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.35"/>
-        </elements>
-        <elements xsi:type="xtext:Assignment" feature="sval" operator="=">
-          <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.2"/>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="SubstructureSelector" definesHiddenTokens="true">
-      <type metamodel="/0/@metamodelDeclarations.1">
-        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//SubstructureSelector"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Action">
-          <type metamodel="/0/@metamodelDeclarations.1">
-            <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//SubstructureSelector"/>
-          </type>
-        </elements>
-        <elements xsi:type="xtext:Assignment" feature="selectorName" operator="=">
-          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.2"/>
-        </elements>
-        <elements xsi:type="xtext:Group" cardinality="?">
-          <elements xsi:type="xtext:Keyword" value="["/>
-          <elements xsi:type="xtext:Assignment" feature="var" operator="=">
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.2"/>
-          </elements>
-          <elements xsi:type="xtext:Keyword" value="]"/>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="Substructure">
-      <type metamodel="/0/@metamodelDeclarations.1">
-        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//Substructure"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Assignment" cardinality="?" feature="doku" operator="=">
-          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.11"/>
-        </elements>
-        <elements xsi:type="xtext:Keyword" value="substructure"/>
-        <elements xsi:type="xtext:Assignment" feature="name" operator="=">
-          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.2"/>
-        </elements>
-        <elements xsi:type="xtext:Keyword" value="{"/>
-        <elements xsi:type="xtext:Assignment" cardinality="+" feature="childs" operator="+=">
-          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.33"/>
-        </elements>
-        <elements xsi:type="xtext:Keyword" value="}"/>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:ParserRule" name="SubstructureStyleclass">
-      <type metamodel="/0/@metamodelDeclarations.1">
-        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//SubstructureStyleclass"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Assignment" cardinality="?" feature="doku" operator="=">
-          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.11"/>
-        </elements>
-        <elements xsi:type="xtext:Assignment" feature="element" operator="=">
-          <terminal xsi:type="xtext:CrossReference">
-            <type metamodel="/0/@metamodelDeclarations.1">
-              <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl#//ElementDefinition"/>
-            </type>
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.8"/>
-          </terminal>
-        </elements>
-        <elements xsi:type="xtext:Keyword" value="styleclass"/>
-        <elements xsi:type="xtext:Assignment" cardinality="+" feature="selectors" operator="+=">
-          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.31"/>
-        </elements>
-        <elements xsi:type="xtext:Group" cardinality="?">
-          <elements xsi:type="xtext:Keyword" value="{"/>
-          <elements xsi:type="xtext:Assignment" cardinality="+" feature="childs" operator="+=">
-            <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.33"/>
-          </elements>
-          <elements xsi:type="xtext:Keyword" value="}"/>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:TerminalRule" name="INT">
-      <type metamodel="/0/@metamodelDeclarations.0">
-        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Keyword" cardinality="?" value="-"/>
-        <elements xsi:type="xtext:CharacterRange" cardinality="+">
-          <left value="0"/>
-          <right value="9"/>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:TerminalRule" name="DOUBLE">
-      <type metamodel="/0/@metamodelDeclarations.0">
-        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Keyword" cardinality="?" value="-"/>
-        <elements xsi:type="xtext:CharacterRange" cardinality="*">
-          <left value="0"/>
-          <right value="9"/>
-        </elements>
-        <elements xsi:type="xtext:Keyword" value="."/>
-        <elements xsi:type="xtext:CharacterRange" cardinality="+">
-          <left value="0"/>
-          <right value="9"/>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:TerminalRule" name="REGEX">
-      <type metamodel="/0/@metamodelDeclarations.0">
-        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Keyword" value="$"/>
-        <elements xsi:type="xtext:Alternatives" cardinality="+">
-          <elements xsi:type="xtext:CharacterRange">
-            <left value="a"/>
-            <right value="z"/>
-          </elements>
-          <elements xsi:type="xtext:CharacterRange">
-            <left value="A"/>
-            <right value="Z"/>
-          </elements>
-          <elements xsi:type="xtext:CharacterRange">
-            <left value="0"/>
-            <right value="9"/>
-          </elements>
-          <elements xsi:type="xtext:Keyword" value="-"/>
-          <elements xsi:type="xtext:Keyword" value=","/>
-          <elements xsi:type="xtext:Keyword" value="."/>
-          <elements xsi:type="xtext:Keyword" value="?"/>
-          <elements xsi:type="xtext:Keyword" value="'"/>
-          <elements xsi:type="xtext:Keyword" value=":"/>
-          <elements xsi:type="xtext:Keyword" value="&quot;"/>
-          <elements xsi:type="xtext:Keyword" value=">"/>
-          <elements xsi:type="xtext:Keyword" value="&lt;"/>
-          <elements xsi:type="xtext:Keyword" value="/"/>
-          <elements xsi:type="xtext:Keyword" value="_"/>
-          <elements xsi:type="xtext:Keyword" value="="/>
-          <elements xsi:type="xtext:Keyword" value=";"/>
-          <elements xsi:type="xtext:Keyword" value="("/>
-          <elements xsi:type="xtext:Keyword" value=")"/>
-          <elements xsi:type="xtext:Keyword" value="&amp;"/>
-          <elements xsi:type="xtext:Keyword" value="!"/>
-          <elements xsi:type="xtext:Keyword" value="#"/>
-          <elements xsi:type="xtext:Keyword" value="%"/>
-          <elements xsi:type="xtext:Keyword" value="*"/>
-          <elements xsi:type="xtext:Keyword" value="+"/>
-          <elements xsi:type="xtext:Keyword" value="["/>
-          <elements xsi:type="xtext:Keyword" value="]"/>
-          <elements xsi:type="xtext:Keyword" value="{"/>
-          <elements xsi:type="xtext:Keyword" value="}"/>
-        </elements>
-        <elements xsi:type="xtext:Keyword" value="$"/>
-      </alternatives>
-    </rules>
-  </xtext:Grammar>
-  <xtext:Grammar name="org.eclipse.xtext.common.Terminals" definesHiddenTokens="true" hiddenTokens="/1/@rules.5 /0/@rules.4 /0/@rules.5">
-    <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ecore">
-      <ePackage href="http://www.eclipse.org/emf/2002/Ecore#/"/>
-    </metamodelDeclarations>
-    <rules xsi:type="xtext:TerminalRule" name="ID">
-      <type metamodel="/1/@metamodelDeclarations.0">
-        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Keyword" cardinality="?" value="^"/>
-        <elements xsi:type="xtext:Alternatives">
-          <elements xsi:type="xtext:CharacterRange">
-            <left value="a"/>
-            <right value="z"/>
-          </elements>
-          <elements xsi:type="xtext:CharacterRange">
-            <left value="A"/>
-            <right value="Z"/>
-          </elements>
-          <elements xsi:type="xtext:Keyword" value="_"/>
-        </elements>
-        <elements xsi:type="xtext:Alternatives" cardinality="*">
-          <elements xsi:type="xtext:CharacterRange">
-            <left value="a"/>
-            <right value="z"/>
-          </elements>
-          <elements xsi:type="xtext:CharacterRange">
-            <left value="A"/>
-            <right value="Z"/>
-          </elements>
-          <elements xsi:type="xtext:Keyword" value="_"/>
-          <elements xsi:type="xtext:CharacterRange">
-            <left value="0"/>
-            <right value="9"/>
-          </elements>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:TerminalRule" name="INT">
-      <type metamodel="/1/@metamodelDeclarations.0">
-        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      </type>
-      <alternatives xsi:type="xtext:CharacterRange" cardinality="+">
-        <left value="0"/>
-        <right value="9"/>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:TerminalRule" name="STRING">
-      <type metamodel="/1/@metamodelDeclarations.0">
-        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      </type>
-      <alternatives xsi:type="xtext:Alternatives">
-        <elements xsi:type="xtext:Group">
-          <elements xsi:type="xtext:Keyword" value="&quot;"/>
-          <elements xsi:type="xtext:Alternatives" cardinality="*">
-            <elements xsi:type="xtext:Group">
-              <elements xsi:type="xtext:Keyword" value="\"/>
-              <elements xsi:type="xtext:Alternatives">
-                <elements xsi:type="xtext:Keyword" value="b"/>
-                <elements xsi:type="xtext:Keyword" value="t"/>
-                <elements xsi:type="xtext:Keyword" value="n"/>
-                <elements xsi:type="xtext:Keyword" value="f"/>
-                <elements xsi:type="xtext:Keyword" value="r"/>
-                <elements xsi:type="xtext:Keyword" value="u"/>
-                <elements xsi:type="xtext:Keyword" value="&quot;"/>
-                <elements xsi:type="xtext:Keyword" value="'"/>
-                <elements xsi:type="xtext:Keyword" value="\"/>
-              </elements>
-            </elements>
-            <elements xsi:type="xtext:NegatedToken">
-              <terminal xsi:type="xtext:Alternatives">
-                <elements xsi:type="xtext:Keyword" value="\"/>
-                <elements xsi:type="xtext:Keyword" value="&quot;"/>
-              </terminal>
-            </elements>
-          </elements>
-          <elements xsi:type="xtext:Keyword" value="&quot;"/>
-        </elements>
-        <elements xsi:type="xtext:Group">
-          <elements xsi:type="xtext:Keyword" value="'"/>
-          <elements xsi:type="xtext:Alternatives" cardinality="*">
-            <elements xsi:type="xtext:Group">
-              <elements xsi:type="xtext:Keyword" value="\"/>
-              <elements xsi:type="xtext:Alternatives">
-                <elements xsi:type="xtext:Keyword" value="b"/>
-                <elements xsi:type="xtext:Keyword" value="t"/>
-                <elements xsi:type="xtext:Keyword" value="n"/>
-                <elements xsi:type="xtext:Keyword" value="f"/>
-                <elements xsi:type="xtext:Keyword" value="r"/>
-                <elements xsi:type="xtext:Keyword" value="u"/>
-                <elements xsi:type="xtext:Keyword" value="&quot;"/>
-                <elements xsi:type="xtext:Keyword" value="'"/>
-                <elements xsi:type="xtext:Keyword" value="\"/>
-              </elements>
-            </elements>
-            <elements xsi:type="xtext:NegatedToken">
-              <terminal xsi:type="xtext:Alternatives">
-                <elements xsi:type="xtext:Keyword" value="\"/>
-                <elements xsi:type="xtext:Keyword" value="'"/>
-              </terminal>
-            </elements>
-          </elements>
-          <elements xsi:type="xtext:Keyword" value="'"/>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:TerminalRule" name="ML_COMMENT">
-      <type metamodel="/1/@metamodelDeclarations.0">
-        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Keyword" value="/*"/>
-        <elements xsi:type="xtext:UntilToken">
-          <terminal xsi:type="xtext:Keyword" value="*/"/>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:TerminalRule" name="SL_COMMENT">
-      <type metamodel="/1/@metamodelDeclarations.0">
-        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      </type>
-      <alternatives xsi:type="xtext:Group">
-        <elements xsi:type="xtext:Keyword" value="//"/>
-        <elements xsi:type="xtext:NegatedToken" cardinality="*">
-          <terminal xsi:type="xtext:Alternatives">
-            <elements xsi:type="xtext:Keyword" value="&#xA;"/>
-            <elements xsi:type="xtext:Keyword" value="&#xD;"/>
-          </terminal>
-        </elements>
-        <elements xsi:type="xtext:Group" cardinality="?">
-          <elements xsi:type="xtext:Keyword" cardinality="?" value="&#xD;"/>
-          <elements xsi:type="xtext:Keyword" value="&#xA;"/>
-        </elements>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:TerminalRule" name="WS">
-      <type metamodel="/1/@metamodelDeclarations.0">
-        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      </type>
-      <alternatives xsi:type="xtext:Alternatives" cardinality="+">
-        <elements xsi:type="xtext:Keyword" value=" "/>
-        <elements xsi:type="xtext:Keyword" value="&#x9;"/>
-        <elements xsi:type="xtext:Keyword" value="&#xD;"/>
-        <elements xsi:type="xtext:Keyword" value="&#xA;"/>
-      </alternatives>
-    </rules>
-    <rules xsi:type="xtext:TerminalRule" name="ANY_OTHER">
-      <type metamodel="/1/@metamodelDeclarations.0">
-        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      </type>
-      <alternatives xsi:type="xtext:Wildcard"/>
-    </rules>
-  </xtext:Grammar>
-</xmi:XMI>
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/CssExtDsl.xtextbin b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/CssExtDsl.xtextbin
new file mode 100644
index 000000000..fdf5ee6b6
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/CssExtDsl.xtextbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/CssExtDslStandaloneSetupGenerated.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/CssExtDslStandaloneSetupGenerated.java
index b8532ee21..aa5acf3ef 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/CssExtDslStandaloneSetupGenerated.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/CssExtDslStandaloneSetupGenerated.java
@@ -1,4 +1,6 @@
-
+/*
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.css.cssext;
 
 import org.eclipse.emf.ecore.EPackage;
@@ -14,6 +16,7 @@ import com.google.inject.Injector;
 @SuppressWarnings("all")
 public class CssExtDslStandaloneSetupGenerated implements ISetup {
 
+	@Override
 	public Injector createInjectorAndDoEMFRegistration() {
 		org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
 
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSDefaultValue.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSDefaultValue.java
index 342aba432..89382b730 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSDefaultValue.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSDefaultValue.java
@@ -11,13 +11,13 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSDefaultValue#getVal <em>Val</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSDefaultValue#getIval <em>Ival</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSDefaultValue#getDval <em>Dval</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSDefaultValue#getSval <em>Sval</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getCSSDefaultValue()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSNumLiteral.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSNumLiteral.java
index 97ec96c45..fdb2a9b5e 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSNumLiteral.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSNumLiteral.java
@@ -10,10 +10,10 @@ package org.eclipse.fx.ide.css.cssext.cssExtDsl;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSNumLiteral#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getCSSNumLiteral()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRangedDoubleType.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRangedDoubleType.java
index 3e26d6d2c..0c17b73d0 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRangedDoubleType.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRangedDoubleType.java
@@ -10,11 +10,11 @@ package org.eclipse.fx.ide.css.cssext.cssExtDsl;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSRangedDoubleType#getFrom <em>From</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSRangedDoubleType#getTo <em>To</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getCSSRangedDoubleType()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRangedIntType.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRangedIntType.java
index a19aedb25..3053213fe 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRangedIntType.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRangedIntType.java
@@ -10,11 +10,11 @@ package org.eclipse.fx.ide.css.cssext.cssExtDsl;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSRangedIntType#getFrom <em>From</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSRangedIntType#getTo <em>To</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getCSSRangedIntType()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleBracket.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleBracket.java
index 89e4d18b3..5bec993bf 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleBracket.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleBracket.java
@@ -10,10 +10,10 @@ package org.eclipse.fx.ide.css.cssext.cssExtDsl;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSRuleBracket#getInner <em>Inner</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getCSSRuleBracket()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleConcat.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleConcat.java
index 1bc8e3bab..39d1d9045 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleConcat.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleConcat.java
@@ -11,10 +11,10 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSRuleConcat#getConc <em>Conc</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getCSSRuleConcat()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleConcatWithoutSpace.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleConcatWithoutSpace.java
index 347a58a7f..17bab7a4b 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleConcatWithoutSpace.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleConcatWithoutSpace.java
@@ -11,10 +11,10 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSRuleConcatWithoutSpace#getConc <em>Conc</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getCSSRuleConcatWithoutSpace()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleDefinition.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleDefinition.java
index 3ea040bf3..ac7b6d79c 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleDefinition.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleDefinition.java
@@ -10,10 +10,10 @@ package org.eclipse.fx.ide.css.cssext.cssExtDsl;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSRuleDefinition#getFunc <em>Func</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getCSSRuleDefinition()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleFunc.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleFunc.java
index fbe009f16..bba8fc398 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleFunc.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleFunc.java
@@ -10,11 +10,11 @@ package org.eclipse.fx.ide.css.cssext.cssExtDsl;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSRuleFunc#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSRuleFunc#getParams <em>Params</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getCSSRuleFunc()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleLiteral.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleLiteral.java
index d55eb3af0..08fd55205 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleLiteral.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleLiteral.java
@@ -10,11 +10,11 @@ package org.eclipse.fx.ide.css.cssext.cssExtDsl;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSRuleLiteral#getDoku <em>Doku</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSRuleLiteral#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getCSSRuleLiteral()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleOr.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleOr.java
index 6d3630443..c85c2f7b5 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleOr.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleOr.java
@@ -11,10 +11,10 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSRuleOr#getOrs <em>Ors</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getCSSRuleOr()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRulePostfix.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRulePostfix.java
index 4f6738b80..683f72d25 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRulePostfix.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRulePostfix.java
@@ -10,11 +10,11 @@ package org.eclipse.fx.ide.css.cssext.cssExtDsl;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSRulePostfix#getRule <em>Rule</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSRulePostfix#getCardinality <em>Cardinality</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getCSSRulePostfix()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleRef.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleRef.java
index 68b490bb3..a01e0df0f 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleRef.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleRef.java
@@ -10,11 +10,11 @@ package org.eclipse.fx.ide.css.cssext.cssExtDsl;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSRuleRef#getDoku <em>Doku</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSRuleRef#getRef <em>Ref</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getCSSRuleRef()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleRegex.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleRegex.java
index 3a0c1541a..3fe044fc3 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleRegex.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleRegex.java
@@ -10,10 +10,10 @@ package org.eclipse.fx.ide.css.cssext.cssExtDsl;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSRuleRegex#getRegex <em>Regex</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getCSSRuleRegex()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleSymbol.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleSymbol.java
index 159f17bfc..eb0c1e99f 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleSymbol.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleSymbol.java
@@ -10,11 +10,11 @@ package org.eclipse.fx.ide.css.cssext.cssExtDsl;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSRuleSymbol#getDoku <em>Doku</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSRuleSymbol#getSymbol <em>Symbol</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getCSSRuleSymbol()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleXor.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleXor.java
index d3d45fb25..4c80fe427 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleXor.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSRuleXor.java
@@ -11,10 +11,10 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSRuleXor#getXors <em>Xors</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getCSSRuleXor()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSType.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSType.java
index f5ba0b277..c0cd66478 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSType.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CSSType.java
@@ -10,11 +10,11 @@ package org.eclipse.fx.ide.css.cssext.cssExtDsl;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSType#getDoku <em>Doku</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CSSType#getType <em>Type</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getCSSType()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CssExtension.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CssExtension.java
index 1762910c3..1938aea70 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CssExtension.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/CssExtension.java
@@ -13,11 +13,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtension#getImports <em>Imports</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtension#getPackageDef <em>Package Def</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getCssExtension()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/Definition.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/Definition.java
index 2174bd973..e9ea3b811 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/Definition.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/Definition.java
@@ -11,12 +11,12 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.Definition#getDoku <em>Doku</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.Definition#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.Definition#getRule <em>Rule</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getDefinition()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/Doku.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/Doku.java
index de3837bef..4f84ed308 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/Doku.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/Doku.java
@@ -11,10 +11,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.Doku#getContent <em>Content</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getDoku()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/ElementDefinition.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/ElementDefinition.java
index 6af61c580..0449f98a1 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/ElementDefinition.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/ElementDefinition.java
@@ -13,6 +13,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.ElementDefinition#getDoku <em>Doku</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.ElementDefinition#getName <em>Name</em>}</li>
@@ -22,7 +23,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.ElementDefinition#getPseudoClasses <em>Pseudo Classes</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.ElementDefinition#getSubstructures <em>Substructures</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getElementDefinition()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/Import.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/Import.java
index 2213991b2..18911c667 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/Import.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/Import.java
@@ -11,10 +11,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.Import#getImportedNamespace <em>Imported Namespace</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getImport()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/PackageDefinition.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/PackageDefinition.java
index 366566672..867742e98 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/PackageDefinition.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/PackageDefinition.java
@@ -13,6 +13,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.PackageDefinition#getDoku <em>Doku</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.PackageDefinition#getName <em>Name</em>}</li>
@@ -20,7 +21,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.PackageDefinition#getSubpackages <em>Subpackages</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.PackageDefinition#getElements <em>Elements</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getPackageDefinition()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/PropertyDefinition.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/PropertyDefinition.java
index a9ae5acef..b814009c9 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/PropertyDefinition.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/PropertyDefinition.java
@@ -10,10 +10,10 @@ package org.eclipse.fx.ide.css.cssext.cssExtDsl;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.PropertyDefinition#getDefault <em>Default</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getPropertyDefinition()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/PseudoClassDefinition.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/PseudoClassDefinition.java
index 25e5d90bc..f97944518 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/PseudoClassDefinition.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/PseudoClassDefinition.java
@@ -11,11 +11,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.PseudoClassDefinition#getDoku <em>Doku</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.PseudoClassDefinition#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getPseudoClassDefinition()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/Substructure.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/Substructure.java
index 641218032..294813b94 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/Substructure.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/Substructure.java
@@ -13,12 +13,12 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.Substructure#getDoku <em>Doku</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.Substructure#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.Substructure#getChilds <em>Childs</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getSubstructure()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/SubstructureSelector.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/SubstructureSelector.java
index 206226f09..ba5b81bac 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/SubstructureSelector.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/SubstructureSelector.java
@@ -11,11 +11,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.SubstructureSelector#getSelectorName <em>Selector Name</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.SubstructureSelector#getVar <em>Var</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getSubstructureSelector()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/SubstructureStyleclass.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/SubstructureStyleclass.java
index 5ae9b9cd6..370ead73d 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/SubstructureStyleclass.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/SubstructureStyleclass.java
@@ -13,13 +13,13 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.SubstructureStyleclass#getDoku <em>Doku</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.SubstructureStyleclass#getElement <em>Element</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.SubstructureStyleclass#getSelectors <em>Selectors</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.SubstructureStyleclass#getChilds <em>Childs</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage#getSubstructureStyleclass()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSDefaultValueImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSDefaultValueImpl.java
index 11f83a5d2..d9b325406 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSDefaultValueImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSDefaultValueImpl.java
@@ -21,13 +21,13 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSDefaultValueImpl#getVal <em>Val</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSDefaultValueImpl#getIval <em>Ival</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSDefaultValueImpl#getDval <em>Dval</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSDefaultValueImpl#getSval <em>Sval</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSNumLiteralImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSNumLiteralImpl.java
index 89093faad..ccf8e03f5 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSNumLiteralImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSNumLiteralImpl.java
@@ -17,10 +17,10 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSNumLiteralImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRangedDoubleTypeImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRangedDoubleTypeImpl.java
index 12188e9fe..20b666ad0 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRangedDoubleTypeImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRangedDoubleTypeImpl.java
@@ -17,11 +17,11 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSRangedDoubleTypeImpl#getFrom <em>From</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSRangedDoubleTypeImpl#getTo <em>To</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRangedIntTypeImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRangedIntTypeImpl.java
index 830f8bae4..bf9f264c0 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRangedIntTypeImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRangedIntTypeImpl.java
@@ -17,11 +17,11 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSRangedIntTypeImpl#getFrom <em>From</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSRangedIntTypeImpl#getTo <em>To</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleBracketImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleBracketImpl.java
index a7e4e527c..1151e36b1 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleBracketImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleBracketImpl.java
@@ -20,10 +20,10 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSRuleBracketImpl#getInner <em>Inner</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleConcatImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleConcatImpl.java
index 6ce9a6ee4..d3a6b5f66 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleConcatImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleConcatImpl.java
@@ -24,10 +24,10 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSRuleConcatImpl#getConc <em>Conc</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleConcatWithoutSpaceImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleConcatWithoutSpaceImpl.java
index ebbc0d9aa..7be8c7e62 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleConcatWithoutSpaceImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleConcatWithoutSpaceImpl.java
@@ -24,10 +24,10 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSRuleConcatWithoutSpaceImpl#getConc <em>Conc</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleDefinitionImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleDefinitionImpl.java
index 916509c8c..4bbb8632d 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleDefinitionImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleDefinitionImpl.java
@@ -20,10 +20,10 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSRuleDefinitionImpl#getFunc <em>Func</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleFuncImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleFuncImpl.java
index b99ec5d27..6be135e07 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleFuncImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleFuncImpl.java
@@ -20,11 +20,11 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSRuleFuncImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSRuleFuncImpl#getParams <em>Params</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleImpl.java
index 136a89759..883e525d0 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleImpl.java
@@ -13,8 +13,6 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>CSS Rule</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleLiteralImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleLiteralImpl.java
index 4c01d7430..1ebd23285 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleLiteralImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleLiteralImpl.java
@@ -20,11 +20,11 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.Doku;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSRuleLiteralImpl#getDoku <em>Doku</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSRuleLiteralImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleOrImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleOrImpl.java
index c34e9ddcb..3137e92f2 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleOrImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleOrImpl.java
@@ -24,10 +24,10 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSRuleOrImpl#getOrs <em>Ors</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRulePostfixImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRulePostfixImpl.java
index f8c69f962..2e0eb1c99 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRulePostfixImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRulePostfixImpl.java
@@ -20,11 +20,11 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSRulePostfixImpl#getRule <em>Rule</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSRulePostfixImpl#getCardinality <em>Cardinality</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleRefImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleRefImpl.java
index b051313a3..6d1e7d22c 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleRefImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleRefImpl.java
@@ -21,11 +21,11 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.Doku;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSRuleRefImpl#getDoku <em>Doku</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSRuleRefImpl#getRef <em>Ref</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleRegexImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleRegexImpl.java
index 4531a700c..d332627c7 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleRegexImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleRegexImpl.java
@@ -17,10 +17,10 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSRuleRegexImpl#getRegex <em>Regex</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleSymbolImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleSymbolImpl.java
index c76329620..54beed1d0 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleSymbolImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleSymbolImpl.java
@@ -20,11 +20,11 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.Doku;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSRuleSymbolImpl#getDoku <em>Doku</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSRuleSymbolImpl#getSymbol <em>Symbol</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleXorImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleXorImpl.java
index 48c293570..331fa9c37 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleXorImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSRuleXorImpl.java
@@ -24,10 +24,10 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.CssExtDslPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSRuleXorImpl#getXors <em>Xors</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSTypeImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSTypeImpl.java
index e5ac8ca87..020d84d0f 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSTypeImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CSSTypeImpl.java
@@ -20,11 +20,11 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.Doku;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSTypeImpl#getDoku <em>Doku</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CSSTypeImpl#getType <em>Type</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CssExtDslFactoryImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CssExtDslFactoryImpl.java
index 4d0361bcf..cc82a1da2 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CssExtDslFactoryImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CssExtDslFactoryImpl.java
@@ -30,7 +30,7 @@ public class CssExtDslFactoryImpl extends EFactoryImpl implements CssExtDslFacto
   {
     try
     {
-      CssExtDslFactory theCssExtDslFactory = (CssExtDslFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/efxclipse/ide/css/cssext/CssExtDsl"); 
+      CssExtDslFactory theCssExtDslFactory = (CssExtDslFactory)EPackage.Registry.INSTANCE.getEFactory(CssExtDslPackage.eNS_URI);
       if (theCssExtDslFactory != null)
       {
         return theCssExtDslFactory;
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CssExtensionImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CssExtensionImpl.java
index 7ccfba7ba..f2068329b 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CssExtensionImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/CssExtensionImpl.java
@@ -29,11 +29,11 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.PackageDefinition;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CssExtensionImpl#getImports <em>Imports</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.CssExtensionImpl#getPackageDef <em>Package Def</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/DefinitionImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/DefinitionImpl.java
index 160bbace8..864d1506b 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/DefinitionImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/DefinitionImpl.java
@@ -22,12 +22,12 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.Doku;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.DefinitionImpl#getDoku <em>Doku</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.DefinitionImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.DefinitionImpl#getRule <em>Rule</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/DokuImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/DokuImpl.java
index 23c905316..b713be137 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/DokuImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/DokuImpl.java
@@ -18,10 +18,10 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.Doku;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.DokuImpl#getContent <em>Content</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/ElementDefinitionImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/ElementDefinitionImpl.java
index b6a96bdcb..6e705d6a2 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/ElementDefinitionImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/ElementDefinitionImpl.java
@@ -32,6 +32,7 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.Substructure;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.ElementDefinitionImpl#getDoku <em>Doku</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.ElementDefinitionImpl#getName <em>Name</em>}</li>
@@ -41,7 +42,6 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.Substructure;
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.ElementDefinitionImpl#getPseudoClasses <em>Pseudo Classes</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.ElementDefinitionImpl#getSubstructures <em>Substructures</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/ImportImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/ImportImpl.java
index 680847a18..0994dff3d 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/ImportImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/ImportImpl.java
@@ -18,10 +18,10 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.Import;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.ImportImpl#getImportedNamespace <em>Imported Namespace</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/PackageDefinitionImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/PackageDefinitionImpl.java
index 2d0f666f1..e90d3f081 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/PackageDefinitionImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/PackageDefinitionImpl.java
@@ -30,6 +30,7 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.PackageDefinition;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.PackageDefinitionImpl#getDoku <em>Doku</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.PackageDefinitionImpl#getName <em>Name</em>}</li>
@@ -37,7 +38,6 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.PackageDefinition;
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.PackageDefinitionImpl#getSubpackages <em>Subpackages</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.PackageDefinitionImpl#getElements <em>Elements</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/PropertyDefinitionImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/PropertyDefinitionImpl.java
index 79e2a460e..26ba5908a 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/PropertyDefinitionImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/PropertyDefinitionImpl.java
@@ -20,10 +20,10 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.PropertyDefinition;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.PropertyDefinitionImpl#getDefault <em>Default</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/PseudoClassDefinitionImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/PseudoClassDefinitionImpl.java
index ebe0dc8db..117cc61b1 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/PseudoClassDefinitionImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/PseudoClassDefinitionImpl.java
@@ -21,11 +21,11 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.PseudoClassDefinition;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.PseudoClassDefinitionImpl#getDoku <em>Doku</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.PseudoClassDefinitionImpl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/SubstructureImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/SubstructureImpl.java
index 394d42091..7aabf5f29 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/SubstructureImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/SubstructureImpl.java
@@ -29,12 +29,12 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.SubstructureStyleclass;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.SubstructureImpl#getDoku <em>Doku</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.SubstructureImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.SubstructureImpl#getChilds <em>Childs</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/SubstructureSelectorImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/SubstructureSelectorImpl.java
index cf011476f..7fa02adc5 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/SubstructureSelectorImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/SubstructureSelectorImpl.java
@@ -18,11 +18,11 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.SubstructureSelector;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.SubstructureSelectorImpl#getSelectorName <em>Selector Name</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.SubstructureSelectorImpl#getVar <em>Var</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/SubstructureStyleclassImpl.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/SubstructureStyleclassImpl.java
index 8027a247b..c6abec412 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/SubstructureStyleclassImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/impl/SubstructureStyleclassImpl.java
@@ -30,13 +30,13 @@ import org.eclipse.fx.ide.css.cssext.cssExtDsl.SubstructureStyleclass;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.SubstructureStyleclassImpl#getDoku <em>Doku</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.SubstructureStyleclassImpl#getElement <em>Element</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.SubstructureStyleclassImpl#getSelectors <em>Selectors</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssext.cssExtDsl.impl.SubstructureStyleclassImpl#getChilds <em>Childs</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/util/CssExtDslAdapterFactory.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/util/CssExtDslAdapterFactory.java
index 2518acc89..b05bccaec 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/util/CssExtDslAdapterFactory.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/util/CssExtDslAdapterFactory.java
@@ -4,10 +4,12 @@ package org.eclipse.fx.ide.css.cssext.cssExtDsl.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
+
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
 import org.eclipse.emf.ecore.EObject;
+
 import org.eclipse.fx.ide.css.cssext.cssExtDsl.*;
-import org.eclipse.jdt.annotation.Nullable;
 
 /**
  * <!-- begin-user-doc -->
@@ -69,8 +71,8 @@ public class CssExtDslAdapterFactory extends AdapterFactoryImpl
    * <!-- end-user-doc -->
    * @generated
    */
-  protected CssExtDslSwitch<@Nullable Adapter> modelSwitch =
-    new CssExtDslSwitch<@Nullable Adapter>()
+  protected CssExtDslSwitch<Adapter> modelSwitch =
+    new CssExtDslSwitch<Adapter>()
     {
       @Override
       public Adapter caseCssExtension(CssExtension object)
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/util/CssExtDslSwitch.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/util/CssExtDslSwitch.java
index 00c0577ac..290515e45 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/util/CssExtDslSwitch.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/cssExtDsl/util/CssExtDslSwitch.java
@@ -4,7 +4,9 @@ package org.eclipse.fx.ide.css.cssext.cssExtDsl.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
+
 import org.eclipse.emf.ecore.util.Switch;
+
 import org.eclipse.fx.ide.css.cssext.cssExtDsl.*;
 import org.eclipse.jdt.annotation.Nullable;
 
@@ -49,7 +51,7 @@ public class CssExtDslSwitch<@Nullable T> extends Switch<T>
    * Checks whether this is a switch for the given package.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @parameter ePackage the package in question.
+   * @param ePackage the package in question.
    * @return whether this is a switch for the given package.
    * @generated
    */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parseTreeConstruction/CssExtDslParsetreeConstructor.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parseTreeConstruction/CssExtDslParsetreeConstructor.java
index b218a3972..2271cbc6c 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parseTreeConstruction/CssExtDslParsetreeConstructor.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parseTreeConstruction/CssExtDslParsetreeConstructor.java
@@ -1,19 +1,18 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.css.cssext.parseTreeConstruction;
 
 import org.eclipse.emf.ecore.*;
 import org.eclipse.xtext.*;
 import org.eclipse.xtext.parsetree.reconstr.IEObjectConsumer;
-import org.eclipse.xtext.parsetree.reconstr.impl.AbstractParseTreeConstructor;
 
 import org.eclipse.fx.ide.css.cssext.services.CssExtDslGrammarAccess;
 
 import com.google.inject.Inject;
 
 @SuppressWarnings("all")
-public class CssExtDslParsetreeConstructor extends AbstractParseTreeConstructor {
+public class CssExtDslParsetreeConstructor extends org.eclipse.xtext.parsetree.reconstr.impl.AbstractParseTreeConstructor {
 		
 	@Inject
 	private CssExtDslGrammarAccess grammarAccess;
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/CssExtDslAntlrTokenFileProvider.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/CssExtDslAntlrTokenFileProvider.java
index 4b36369d0..b3f249e24 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/CssExtDslAntlrTokenFileProvider.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/CssExtDslAntlrTokenFileProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.css.cssext.parser.antlr;
 
 import java.io.InputStream;
@@ -8,6 +8,7 @@ import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider;
 
 public class CssExtDslAntlrTokenFileProvider implements IAntlrTokenFileProvider {
 	
+	@Override
 	public InputStream getAntlrTokenFile() {
 		ClassLoader classLoader = getClass().getClassLoader();
     	return classLoader.getResourceAsStream("org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.tokens");
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/CssExtDslParser.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/CssExtDslParser.java
index 35067fdca..a3ec3cf98 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/CssExtDslParser.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/CssExtDslParser.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.css.cssext.parser.antlr;
 
 import com.google.inject.Inject;
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.g b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.g
index 102f3f5f1..d09149f59 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.g
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.g
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 grammar InternalCssExtDsl;
 
 options {
@@ -2601,7 +2601,7 @@ RULE_DOUBLE : '-'? ('0'..'9')* '.' ('0'..'9')+;
 
 RULE_REGEX : '$' ('a'..'z'|'A'..'Z'|'0'..'9'|'-'|','|'.'|'?'|'\''|':'|'"'|'>'|'<'|'/'|'_'|'='|';'|'('|')'|'&'|'!'|'#'|'%'|'*'|'+'|'['|']'|'{'|'}')+ '$';
 
-RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
+RULE_STRING : ('"' ('\\' .|~(('\\'|'"')))* '"'|'\'' ('\\' .|~(('\\'|'\'')))* '\'');
 
 RULE_WS : (' '|'\t'|'\r'|'\n')+;
 
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.tokens b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.tokens
index ce1773eaa..9aaaa693a 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.tokens
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.tokens
@@ -1,35 +1,62 @@
-RULE_ID=4
-T__29=29
-T__28=28
-T__27=27
-T__26=26
-T__25=25
-T__24=24
-T__23=23
-T__22=22
+'%'=43
+'('=22
+')'=24
+'*'=17
+'+'=39
+','=29
+'->'=23
+'.'=16
+';'=32
+'<'=33
+'='=35
+'>'=34
+'?'=40
+'@INT'=21
+'@NUM'=25
+'@STRING'=26
+'@URL'=27
+'['=41
+']'=42
+'default:'=31
+'extends'=28
+'import'=15
+'package'=18
+'styleclass'=30
+'substructure'=44
+'{'=19
+'|'=36
+'||'=37
+'}'=20
+'~'=38
 RULE_ANY_OTHER=14
-T__21=21
-T__20=20
-RULE_REGEX=10
-T__19=19
-T__16=16
-T__15=15
-T__18=18
-T__17=17
+RULE_DOUBLE=8
+RULE_ID=4
 RULE_INT=7
+RULE_JDOC=6
+RULE_ML_COMMENT=12
 RULE_PSEUDO=9
-T__42=42
-T__43=43
-T__40=40
-T__41=41
-T__44=44
+RULE_REGEX=10
 RULE_SL_COMMENT=13
-RULE_DOUBLE=8
-RULE_ML_COMMENT=12
+RULE_STRING=11
+RULE_WS=5
+T__15=15
+T__16=16
+T__17=17
+T__18=18
+T__19=19
+T__20=20
+T__21=21
+T__22=22
+T__23=23
+T__24=24
+T__25=25
+T__26=26
+T__27=27
+T__28=28
+T__29=29
 T__30=30
 T__31=31
 T__32=32
-RULE_STRING=11
 T__33=33
 T__34=34
 T__35=35
@@ -37,35 +64,8 @@ T__36=36
 T__37=37
 T__38=38
 T__39=39
-RULE_WS=5
-RULE_JDOC=6
-'|'=36
-'~'=38
-'default:'=31
-'>'=34
-'||'=37
-';'=32
-'='=35
-'+'=39
-')'=24
-'.'=16
-'@URL'=27
-'styleclass'=30
-'%'=43
-'->'=23
-'import'=15
-'}'=20
-'substructure'=44
-'extends'=28
-'@INT'=21
-'{'=19
-'package'=18
-'?'=40
-'@STRING'=26
-'<'=33
-'('=22
-'['=41
-'*'=17
-','=29
-'@NUM'=25
-']'=42
+T__40=40
+T__41=41
+T__42=42
+T__43=43
+T__44=44
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDslLexer.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDslLexer.java
index 4bbd9c220..8c976aea0 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDslLexer.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDslLexer.java
@@ -12,48 +12,48 @@ import java.util.ArrayList;
 
 @SuppressWarnings("all")
 public class InternalCssExtDslLexer extends Lexer {
+    public static final int T__19=19;
+    public static final int T__15=15;
+    public static final int T__16=16;
+    public static final int T__17=17;
+    public static final int T__18=18;
     public static final int RULE_ID=4;
-    public static final int T__29=29;
-    public static final int T__28=28;
-    public static final int T__27=27;
+    public static final int RULE_PSEUDO=9;
     public static final int T__26=26;
-    public static final int T__25=25;
-    public static final int T__24=24;
-    public static final int T__23=23;
+    public static final int T__27=27;
+    public static final int T__28=28;
+    public static final int RULE_INT=7;
+    public static final int T__29=29;
     public static final int T__22=22;
-    public static final int T__21=21;
-    public static final int RULE_ANY_OTHER=14;
+    public static final int RULE_ML_COMMENT=12;
+    public static final int T__23=23;
+    public static final int T__24=24;
+    public static final int T__25=25;
     public static final int T__20=20;
-    public static final int EOF=-1;
+    public static final int T__21=21;
     public static final int RULE_REGEX=10;
-    public static final int T__19=19;
-    public static final int T__16=16;
-    public static final int T__15=15;
-    public static final int T__18=18;
-    public static final int T__17=17;
-    public static final int RULE_INT=7;
-    public static final int RULE_PSEUDO=9;
-    public static final int T__42=42;
-    public static final int T__43=43;
-    public static final int T__40=40;
-    public static final int T__41=41;
-    public static final int T__44=44;
+    public static final int RULE_STRING=11;
     public static final int RULE_SL_COMMENT=13;
+    public static final int T__37=37;
     public static final int RULE_DOUBLE=8;
-    public static final int RULE_ML_COMMENT=12;
-    public static final int T__30=30;
-    public static final int T__31=31;
-    public static final int T__32=32;
-    public static final int RULE_STRING=11;
+    public static final int T__38=38;
+    public static final int RULE_JDOC=6;
+    public static final int T__39=39;
     public static final int T__33=33;
     public static final int T__34=34;
     public static final int T__35=35;
     public static final int T__36=36;
-    public static final int T__37=37;
-    public static final int T__38=38;
-    public static final int T__39=39;
-    public static final int RULE_JDOC=6;
+    public static final int EOF=-1;
+    public static final int T__30=30;
+    public static final int T__31=31;
+    public static final int T__32=32;
     public static final int RULE_WS=5;
+    public static final int RULE_ANY_OTHER=14;
+    public static final int T__44=44;
+    public static final int T__40=40;
+    public static final int T__41=41;
+    public static final int T__42=42;
+    public static final int T__43=43;
 
     // delegates
     // delegators
@@ -1214,10 +1214,10 @@ public class InternalCssExtDslLexer extends Lexer {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.g:2604:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.g:2604:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // ../org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.g:2604:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // ../org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.g:2604:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.g:2604:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // ../org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.g:2604:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -1235,10 +1235,10 @@ public class InternalCssExtDslLexer extends Lexer {
             }
             switch (alt15) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.g:2604:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // ../org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.g:2604:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.g:2604:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // ../org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.g:2604:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop13:
                     do {
                         int alt13=3;
@@ -1254,23 +1254,15 @@ public class InternalCssExtDslLexer extends Lexer {
 
                         switch (alt13) {
                     	case 1 :
-                    	    // ../org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.g:2604:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
+                    	    // ../org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.g:2604:21: '\\\\' .
                     	    {
                     	    match('\\'); 
-                    	    if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {
-                    	        input.consume();
-
-                    	    }
-                    	    else {
-                    	        MismatchedSetException mse = new MismatchedSetException(null,input);
-                    	        recover(mse);
-                    	        throw mse;}
-
+                    	    matchAny(); 
 
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.g:2604:66: ~ ( ( '\\\\' | '\"' ) )
+                    	    // ../org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.g:2604:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1295,10 +1287,10 @@ public class InternalCssExtDslLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.g:2604:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // ../org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.g:2604:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.g:2604:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // ../org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.g:2604:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop14:
                     do {
                         int alt14=3;
@@ -1314,23 +1306,15 @@ public class InternalCssExtDslLexer extends Lexer {
 
                         switch (alt14) {
                     	case 1 :
-                    	    // ../org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.g:2604:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
+                    	    // ../org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.g:2604:54: '\\\\' .
                     	    {
                     	    match('\\'); 
-                    	    if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {
-                    	        input.consume();
-
-                    	    }
-                    	    else {
-                    	        MismatchedSetException mse = new MismatchedSetException(null,input);
-                    	        recover(mse);
-                    	        throw mse;}
-
+                    	    matchAny(); 
 
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.g:2604:137: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // ../org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDsl.g:2604:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1745,50 +1729,19 @@ public class InternalCssExtDslLexer extends Lexer {
 
     protected DFA17 dfa17 = new DFA17(this);
     static final String DFA17_eotS =
-        "\1\uffff\1\44\1\45\1\uffff\1\44\2\uffff\1\42\1\uffff\1\44\1\uffff"+
-        "\1\44\1\uffff\2\44\4\uffff\1\75\6\uffff\1\42\1\uffff\1\42\1\107"+
-        "\3\42\2\uffff\1\44\4\uffff\1\44\10\uffff\1\44\1\uffff\1\44\1\uffff"+
-        "\3\44\20\uffff\1\107\3\uffff\6\44\2\uffff\14\44\1\146\5\44\1\uffff"+
-        "\1\154\1\155\3\44\2\uffff\2\44\1\uffff\2\44\1\165\1\44\1\uffff\1"+
-        "\44\1\170\1\uffff";
+        "\1\uffff\1\44\1\45\1\uffff\1\44\2\uffff\1\42\1\uffff\1\44\1\uffff\1\44\1\uffff\2\44\4\uffff\1\75\6\uffff\1\42\1\uffff\1\42\1\110\3\42\2\uffff\1\44\4\uffff\1\44\10\uffff\1\44\1\uffff\1\44\1\uffff\3\44\17\uffff\1\110\4\uffff\6\44\2\uffff\14\44\1\146\5\44\1\uffff\1\154\1\155\3\44\2\uffff\2\44\1\uffff\2\44\1\165\1\44\1\uffff\1\44\1\170\1\uffff";
     static final String DFA17_eofS =
         "\171\uffff";
     static final String DFA17_minS =
-        "\1\0\1\155\1\60\1\uffff\1\141\2\uffff\1\111\1\uffff\1\56\1\uffff"+
-        "\1\170\1\uffff\1\164\1\145\4\uffff\1\174\6\uffff\1\0\1\uffff\1\52"+
-        "\1\56\1\41\2\0\2\uffff\1\160\4\uffff\1\143\10\uffff\1\56\1\uffff"+
-        "\1\164\1\uffff\1\171\1\142\1\146\15\uffff\1\0\2\uffff\1\56\3\uffff"+
-        "\1\157\1\153\1\145\1\154\1\163\1\141\2\uffff\1\162\1\141\1\156\1"+
-        "\145\1\164\1\165\1\164\1\147\1\144\1\143\1\162\1\154\1\55\1\145"+
-        "\1\163\1\154\1\165\1\164\1\uffff\2\55\1\141\1\143\1\72\2\uffff\1"+
-        "\163\1\164\1\uffff\1\163\1\165\1\55\1\162\1\uffff\1\145\1\55\1\uffff";
+        "\1\0\1\155\1\60\1\uffff\1\141\2\uffff\1\111\1\uffff\1\56\1\uffff\1\170\1\uffff\1\164\1\145\4\uffff\1\174\6\uffff\1\0\1\uffff\1\52\1\56\1\41\2\0\2\uffff\1\160\4\uffff\1\143\10\uffff\1\56\1\uffff\1\164\1\uffff\1\171\1\142\1\146\15\uffff\1\0\1\uffff\1\56\4\uffff\1\157\1\153\1\145\1\154\1\163\1\141\2\uffff\1\162\1\141\1\156\1\145\1\164\1\165\1\164\1\147\1\144\1\143\1\162\1\154\1\55\1\145\1\163\1\154\1\165\1\164\1\uffff\2\55\1\141\1\143\1\72\2\uffff\1\163\1\164\1\uffff\1\163\1\165\1\55\1\162\1\uffff\1\145\1\55\1\uffff";
     static final String DFA17_maxS =
-        "\1\uffff\1\155\1\71\1\uffff\1\141\2\uffff\1\125\1\uffff\1\76\1\uffff"+
-        "\1\170\1\uffff\1\165\1\145\4\uffff\1\174\6\uffff\1\uffff\1\uffff"+
-        "\1\57\1\71\1\175\2\uffff\2\uffff\1\160\4\uffff\1\143\10\uffff\1"+
-        "\71\1\uffff\1\164\1\uffff\1\171\1\142\1\146\15\uffff\1\uffff\2\uffff"+
-        "\1\71\3\uffff\1\157\1\153\1\145\1\154\1\163\1\141\2\uffff\1\162"+
-        "\1\141\1\156\1\145\1\164\1\165\1\164\1\147\1\144\1\143\1\162\1\154"+
-        "\1\172\1\145\1\163\1\154\1\165\1\164\1\uffff\2\172\1\141\1\143\1"+
-        "\72\2\uffff\1\163\1\164\1\uffff\1\163\1\165\1\172\1\162\1\uffff"+
-        "\1\145\1\172\1\uffff";
+        "\1\uffff\1\155\1\71\1\uffff\1\141\2\uffff\1\125\1\uffff\1\76\1\uffff\1\170\1\uffff\1\165\1\145\4\uffff\1\174\6\uffff\1\uffff\1\uffff\1\57\1\71\1\175\2\uffff\2\uffff\1\160\4\uffff\1\143\10\uffff\1\71\1\uffff\1\164\1\uffff\1\171\1\142\1\146\15\uffff\1\uffff\1\uffff\1\71\4\uffff\1\157\1\153\1\145\1\154\1\163\1\141\2\uffff\1\162\1\141\1\156\1\145\1\164\1\165\1\164\1\147\1\144\1\143\1\162\1\154\1\172\1\145\1\163\1\154\1\165\1\164\1\uffff\2\172\1\141\1\143\1\72\2\uffff\1\163\1\164\1\uffff\1\163\1\165\1\172\1\162\1\uffff\1\145\1\172\1\uffff";
     static final String DFA17_acceptS =
-        "\3\uffff\1\3\1\uffff\1\5\1\6\1\uffff\1\10\1\uffff\1\12\1\uffff\1"+
-        "\17\2\uffff\1\22\1\23\1\24\1\25\1\uffff\1\30\1\31\1\32\1\33\1\34"+
-        "\1\35\1\uffff\1\40\5\uffff\1\50\1\51\1\uffff\1\40\1\2\1\45\1\3\1"+
-        "\uffff\1\5\1\6\1\7\1\13\1\14\1\15\1\10\1\11\1\uffff\1\12\1\uffff"+
-        "\1\17\3\uffff\1\22\1\23\1\24\1\25\1\27\1\26\1\30\1\31\1\32\1\33"+
-        "\1\34\1\35\1\37\1\uffff\1\43\1\44\1\uffff\1\46\1\47\1\50\6\uffff"+
-        "\1\41\1\42\22\uffff\1\1\5\uffff\1\4\1\16\2\uffff\1\21\4\uffff\1"+
-        "\20\2\uffff\1\36";
+        "\3\uffff\1\3\1\uffff\1\5\1\6\1\uffff\1\10\1\uffff\1\12\1\uffff\1\17\2\uffff\1\22\1\23\1\24\1\25\1\uffff\1\30\1\31\1\32\1\33\1\34\1\35\1\uffff\1\40\5\uffff\1\50\1\51\1\uffff\1\40\1\2\1\45\1\3\1\uffff\1\5\1\6\1\7\1\13\1\14\1\15\1\10\1\11\1\uffff\1\12\1\uffff\1\17\3\uffff\1\22\1\23\1\24\1\25\1\27\1\26\1\30\1\31\1\32\1\33\1\34\1\35\1\37\1\uffff\1\43\1\uffff\1\44\1\46\1\47\1\50\6\uffff\1\41\1\42\22\uffff\1\1\5\uffff\1\4\1\16\2\uffff\1\21\4\uffff\1\20\2\uffff\1\36";
     static final String DFA17_specialS =
-        "\1\3\31\uffff\1\2\4\uffff\1\0\1\4\44\uffff\1\1\63\uffff}>";
+        "\1\2\31\uffff\1\3\4\uffff\1\0\1\4\44\uffff\1\1\63\uffff}>";
     static final String[] DFA17_transitionS = {
-            "\11\42\2\41\2\42\1\41\22\42\1\41\1\42\1\37\1\42\1\36\1\31\1"+
-            "\42\1\40\1\10\1\12\1\3\1\25\1\14\1\11\1\2\1\34\12\35\1\32\1"+
-            "\17\1\20\1\22\1\21\1\26\1\7\32\33\1\27\1\42\1\30\1\42\1\33\1"+
-            "\42\3\33\1\16\1\13\3\33\1\1\6\33\1\4\2\33\1\15\7\33\1\5\1\23"+
-            "\1\6\1\24\uff81\42",
+            "\11\42\2\41\2\42\1\41\22\42\1\41\1\42\1\37\1\42\1\36\1\31\1\42\1\40\1\10\1\12\1\3\1\25\1\14\1\11\1\2\1\34\12\35\1\32\1\17\1\20\1\22\1\21\1\26\1\7\32\33\1\27\1\42\1\30\1\42\1\33\1\42\3\33\1\16\1\13\3\33\1\1\6\33\1\4\2\33\1\15\7\33\1\5\1\23\1\6\1\24\uff81\42",
             "\1\43",
             "\12\46",
             "",
@@ -1817,9 +1770,8 @@ public class InternalCssExtDslLexer extends Lexer {
             "\40\104\1\uffff\uffdf\104",
             "",
             "\1\105\4\uffff\1\106",
-            "\1\46\1\uffff\12\110",
-            "\3\111\1\uffff\33\111\1\uffff\33\111\1\uffff\1\111\1\uffff"+
-            "\1\111\1\uffff\33\111\1\uffff\1\111",
+            "\1\46\1\uffff\12\107",
+            "\3\111\1\uffff\33\111\1\uffff\33\111\1\uffff\1\111\1\uffff\1\111\1\uffff\33\111\1\uffff\1\111",
             "\0\112",
             "\0\112",
             "",
@@ -1860,8 +1812,8 @@ public class InternalCssExtDslLexer extends Lexer {
             "",
             "\52\123\1\122\uffd5\123",
             "",
+            "\1\46\1\uffff\12\107",
             "",
-            "\1\46\1\uffff\12\110",
             "",
             "",
             "",
@@ -1969,16 +1921,6 @@ public class InternalCssExtDslLexer extends Lexer {
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA17_26 = input.LA(1);
-
-                        s = -1;
-                        if ( ((LA17_26>='\u0000' && LA17_26<='\u001F')||(LA17_26>='!' && LA17_26<='\uFFFF')) ) {s = 68;}
-
-                        else s = 34;
-
-                        if ( s>=0 ) return s;
-                        break;
-                    case 3 : 
                         int LA17_0 = input.LA(1);
 
                         s = -1;
@@ -2052,6 +1994,16 @@ public class InternalCssExtDslLexer extends Lexer {
 
                         if ( s>=0 ) return s;
                         break;
+                    case 3 : 
+                        int LA17_26 = input.LA(1);
+
+                        s = -1;
+                        if ( ((LA17_26>='\u0000' && LA17_26<='\u001F')||(LA17_26>='!' && LA17_26<='\uFFFF')) ) {s = 68;}
+
+                        else s = 34;
+
+                        if ( s>=0 ) return s;
+                        break;
                     case 4 : 
                         int LA17_32 = input.LA(1);
 
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDslParser.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDslParser.java
index 02e96c25a..8e78b5bd7 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDslParser.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/parser/antlr/internal/InternalCssExtDslParser.java
@@ -24,48 +24,48 @@ public class InternalCssExtDslParser extends AbstractInternalAntlrParser {
     public static final String[] tokenNames = new String[] {
         "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_WS", "RULE_JDOC", "RULE_INT", "RULE_DOUBLE", "RULE_PSEUDO", "RULE_REGEX", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_ANY_OTHER", "'import'", "'.'", "'*'", "'package'", "'{'", "'}'", "'@INT'", "'('", "'->'", "')'", "'@NUM'", "'@STRING'", "'@URL'", "'extends'", "','", "'styleclass'", "'default:'", "';'", "'<'", "'>'", "'='", "'|'", "'||'", "'~'", "'+'", "'?'", "'['", "']'", "'%'", "'substructure'"
     };
+    public static final int T__19=19;
+    public static final int T__15=15;
+    public static final int T__16=16;
+    public static final int T__17=17;
+    public static final int T__18=18;
     public static final int RULE_ID=4;
-    public static final int T__29=29;
-    public static final int T__28=28;
-    public static final int T__27=27;
+    public static final int RULE_PSEUDO=9;
     public static final int T__26=26;
-    public static final int T__25=25;
-    public static final int T__24=24;
-    public static final int T__23=23;
+    public static final int T__27=27;
+    public static final int T__28=28;
+    public static final int RULE_INT=7;
+    public static final int T__29=29;
     public static final int T__22=22;
-    public static final int RULE_ANY_OTHER=14;
-    public static final int T__21=21;
+    public static final int RULE_ML_COMMENT=12;
+    public static final int T__23=23;
+    public static final int T__24=24;
+    public static final int T__25=25;
     public static final int T__20=20;
-    public static final int EOF=-1;
+    public static final int T__21=21;
     public static final int RULE_REGEX=10;
-    public static final int T__19=19;
-    public static final int T__16=16;
-    public static final int T__15=15;
-    public static final int T__18=18;
-    public static final int T__17=17;
-    public static final int RULE_INT=7;
-    public static final int RULE_PSEUDO=9;
-    public static final int T__42=42;
-    public static final int T__43=43;
-    public static final int T__40=40;
-    public static final int T__41=41;
-    public static final int T__44=44;
+    public static final int RULE_STRING=11;
     public static final int RULE_SL_COMMENT=13;
+    public static final int T__37=37;
     public static final int RULE_DOUBLE=8;
-    public static final int RULE_ML_COMMENT=12;
-    public static final int T__30=30;
-    public static final int T__31=31;
-    public static final int T__32=32;
-    public static final int RULE_STRING=11;
+    public static final int T__38=38;
+    public static final int RULE_JDOC=6;
+    public static final int T__39=39;
     public static final int T__33=33;
     public static final int T__34=34;
     public static final int T__35=35;
     public static final int T__36=36;
-    public static final int T__37=37;
-    public static final int T__38=38;
-    public static final int T__39=39;
+    public static final int EOF=-1;
+    public static final int T__30=30;
+    public static final int T__31=31;
+    public static final int T__32=32;
     public static final int RULE_WS=5;
-    public static final int RULE_JDOC=6;
+    public static final int RULE_ANY_OTHER=14;
+    public static final int T__44=44;
+    public static final int T__40=40;
+    public static final int T__41=41;
+    public static final int T__42=42;
+    public static final int T__43=43;
 
     // delegates
     // delegators
@@ -2888,11 +2888,6 @@ public class InternalCssExtDslParser extends AbstractInternalAntlrParser {
                 case RULE_JDOC:
                     {
                     switch ( input.LA(2) ) {
-                    case RULE_PSEUDO:
-                        {
-                        alt32=2;
-                        }
-                        break;
                     case RULE_ID:
                         {
                         alt32=1;
@@ -2903,6 +2898,11 @@ public class InternalCssExtDslParser extends AbstractInternalAntlrParser {
                         alt32=3;
                         }
                         break;
+                    case RULE_PSEUDO:
+                        {
+                        alt32=2;
+                        }
+                        break;
 
                     }
 
@@ -3935,12 +3935,12 @@ public class InternalCssExtDslParser extends AbstractInternalAntlrParser {
             else if ( (LA39_0==RULE_ID) ) {
                 int LA39_2 = input.LA(2);
 
-                if ( (LA39_2==22) ) {
-                    alt39=2;
-                }
-                else if ( (LA39_2==RULE_ID||(LA39_2>=RULE_JDOC && LA39_2<=RULE_INT)||LA39_2==RULE_REGEX||LA39_2==17||LA39_2==21||(LA39_2>=25 && LA39_2<=27)||LA39_2==29||(LA39_2>=32 && LA39_2<=33)||(LA39_2>=36 && LA39_2<=41)||LA39_2==43) ) {
+                if ( (LA39_2==RULE_ID||(LA39_2>=RULE_JDOC && LA39_2<=RULE_INT)||LA39_2==RULE_REGEX||LA39_2==17||LA39_2==21||(LA39_2>=25 && LA39_2<=27)||LA39_2==29||(LA39_2>=32 && LA39_2<=33)||(LA39_2>=36 && LA39_2<=41)||LA39_2==43) ) {
                     alt39=1;
                 }
+                else if ( (LA39_2==22) ) {
+                    alt39=2;
+                }
                 else {
                     if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
@@ -7520,10 +7520,8 @@ public class InternalCssExtDslParser extends AbstractInternalAntlrParser {
     static final String[] DFA27_transitionS = {
             "\1\1\16\uffff\1\2\3\uffff\1\3\2\4",
             "\1\5\17\uffff\1\2\3\uffff\1\3\2\4",
-            "\4\4\2\uffff\1\4\6\uffff\1\4\3\uffff\1\4\1\6\1\uffff\4\4\1"+
-            "\uffff\1\4\1\uffff\3\4\2\uffff\10\4",
-            "\4\4\2\uffff\1\4\6\uffff\1\4\3\uffff\1\4\1\7\1\uffff\4\4\1"+
-            "\uffff\1\4\1\uffff\3\4\2\uffff\10\4",
+            "\4\4\2\uffff\1\4\6\uffff\1\4\3\uffff\1\4\1\6\1\uffff\4\4\1\uffff\1\4\1\uffff\3\4\2\uffff\10\4",
+            "\4\4\2\uffff\1\4\6\uffff\1\4\3\uffff\1\4\1\7\1\uffff\4\4\1\uffff\1\4\1\uffff\3\4\2\uffff\10\4",
             "",
             "\1\5\17\uffff\1\2\3\uffff\1\3\2\4",
             "",
@@ -7576,10 +7574,8 @@ public class InternalCssExtDslParser extends AbstractInternalAntlrParser {
     static final String DFA51_specialS =
         "\12\uffff}>";
     static final String[] DFA51_transitionS = {
-            "\1\4\1\uffff\1\1\1\10\2\uffff\1\7\12\uffff\1\6\3\uffff\3\6\1"+
-            "\uffff\1\5\3\uffff\1\2\7\uffff\1\3\1\uffff\1\5",
-            "\1\4\1\11\17\uffff\1\6\3\uffff\3\6\1\uffff\1\5\3\uffff\1\2"+
-            "\11\uffff\1\5",
+            "\1\4\1\uffff\1\1\1\10\2\uffff\1\7\12\uffff\1\6\3\uffff\3\6\1\uffff\1\5\3\uffff\1\2\7\uffff\1\3\1\uffff\1\5",
+            "\1\4\1\11\17\uffff\1\6\3\uffff\3\6\1\uffff\1\5\3\uffff\1\2\11\uffff\1\5",
             "",
             "",
             "",
@@ -7587,8 +7583,7 @@ public class InternalCssExtDslParser extends AbstractInternalAntlrParser {
             "",
             "",
             "",
-            "\1\4\1\11\17\uffff\1\6\3\uffff\3\6\1\uffff\1\5\3\uffff\1\2"+
-            "\11\uffff\1\5"
+            "\1\4\1\11\17\uffff\1\6\3\uffff\3\6\1\uffff\1\5\3\uffff\1\2\11\uffff\1\5"
     };
 
     static final short[] DFA51_eot = DFA.unpackEncodedString(DFA51_eotS);
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/services/CssExtDslGrammarAccess.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/services/CssExtDslGrammarAccess.java
index 5ed009421..e057e412a 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/services/CssExtDslGrammarAccess.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/services/CssExtDslGrammarAccess.java
@@ -1,7 +1,6 @@
 /*
-* generated by Xtext
-*/
-
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.css.cssext.services;
 
 import com.google.inject.Singleton;
@@ -31,7 +30,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		////	rule=CSSRuleSet
 		//CssExtension:
 		//	imports+=Import* packageDef=PackageDefinition?;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//imports+=Import* packageDef=PackageDefinition?
 		public Group getGroup() { return cGroup; }
@@ -58,7 +57,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//Import:
 		//	"import" importedNamespace=QualifiedNameWithWildCard;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//"import" importedNamespace=QualifiedNameWithWildCard
 		public Group getGroup() { return cGroup; }
@@ -79,7 +78,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//ValidID:
 		//	ID;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//ID
 		public RuleCall getIDTerminalRuleCall() { return cIDTerminalRuleCall; }
@@ -95,7 +94,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//QualifiedName:
 		//	ValidID ("." ValidID)*;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//ValidID ("." ValidID)*
 		public Group getGroup() { return cGroup; }
@@ -123,7 +122,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//QualifiedNameWithWildCard:
 		//	QualifiedName ("." "*")?;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//QualifiedName ("." "*")?
 		public Group getGroup() { return cGroup; }
@@ -164,7 +163,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		//PackageDefinition:
 		//	(doku=Doku WS*)? "package" name=QualifiedName "{" (rules+=CSSRuleDefinition | subpackages+=PackageDefinition |
 		//	elements+=ElementDefinition)* "}";
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//(doku=Doku WS*)? "package" name=QualifiedName "{" (rules+=CSSRuleDefinition | subpackages+=PackageDefinition |
 		//elements+=ElementDefinition)* "}"
@@ -226,7 +225,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//Doku:
 		//	content=JDOC;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//content=JDOC
 		public Assignment getContentAssignment() { return cContentAssignment; }
@@ -241,7 +240,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//CSSBaseType returns CSSRule hidden(WS, SL_COMMENT, ML_COMMENT):
 		//	CSSType;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//CSSType
 		public RuleCall getCSSTypeParserRuleCall() { return cCSSTypeParserRuleCall; }
@@ -315,7 +314,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		//	{CSSRangedIntType} (doku=Doku WS*)? type="@INT" "(" WS* from=INT WS* "->" WS* to=INT WS* ")" | {CSSRangedDoubleType}
 		//	(doku=Doku WS*)? type="@NUM" "(" WS* from=DOUBLE WS* "->" WS* to=DOUBLE WS* ")" | (doku=Doku WS*)? (type="@INT" WS* |
 		//	type="@NUM" WS* | type="@STRING" WS* | type="@URL" WS*);
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{CSSRangedIntType} (doku=Doku WS*)? type="@INT" "(" WS* from=INT WS* "->" WS* to=INT WS* ")" | {CSSRangedDoubleType}
 		//(doku=Doku WS*)? type="@NUM" "(" WS* from=DOUBLE WS* "->" WS* to=DOUBLE WS* ")" | (doku=Doku WS*)? (type="@INT" WS* |
@@ -542,7 +541,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		//	{ElementDefinition} doku=Doku? name=QualifiedName ("extends" super+=[ElementDefinition|QualifiedName] (","
 		//	super+=[ElementDefinition|QualifiedName])*)? ("styleclass" styleclass=ID)? "{" (properties+=PropertyDefinition |
 		//	pseudoClasses+=PseudoClassDefinition | substructures+=Substructure)* "}";
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{ElementDefinition} doku=Doku? name=QualifiedName ("extends" super+=[ElementDefinition|QualifiedName] (","
 		//super+=[ElementDefinition|QualifiedName])*)? ("styleclass" styleclass=ID)? "{" (properties+=PropertyDefinition |
@@ -652,7 +651,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//PropertyDefinition returns Definition:
 		//	{PropertyDefinition} doku=Doku? name=QualifiedName rule=CSSRuleOr ("default:" default=CSSDefaultValue)? ";";
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{PropertyDefinition} doku=Doku? name=QualifiedName rule=CSSRuleOr ("default:" default=CSSDefaultValue)? ";"
 		public Group getGroup() { return cGroup; }
@@ -705,7 +704,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//PseudoClassDefinition:
 		//	{PseudoClassDefinition} doku=Doku? name=PSEUDO;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{PseudoClassDefinition} doku=Doku? name=PSEUDO
 		public Group getGroup() { return cGroup; }
@@ -741,7 +740,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//CSSRuleRef hidden():
 		//	(doku=Doku WS*)? "<" ref=[Definition|QualifiedName] ">";
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//(doku=Doku WS*)? "<" ref=[Definition|QualifiedName] ">"
 		public Group getGroup() { return cGroup; }
@@ -792,7 +791,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//CSSRuleDefinition returns Definition hidden(WS, SL_COMMENT, ML_COMMENT):
 		//	{CSSRuleDefinition} doku=Doku? name=QualifiedName "=" (rule=CSSRuleOr | func=CSSRuleFunc) ";";
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{CSSRuleDefinition} doku=Doku? name=QualifiedName "=" (rule=CSSRuleOr | func=CSSRuleFunc) ";"
 		public Group getGroup() { return cGroup; }
@@ -848,7 +847,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//CSSRuleFunc returns CSSRule hidden(ML_COMMENT, SL_COMMENT): //{CSSRuleFunc} name=ValidID '(' WS* params+=CSSRuleOr ( ',' WS* params+=CSSRuleOr)* ')' // PARAMS disabled in favor of ',' as literal
 		//	{CSSRuleFunc} name=ValidID "(" WS* params=CSSRuleOr ")";
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		////{CSSRuleFunc} name=ValidID '(' WS* params+=CSSRuleOr ( ',' WS* params+=CSSRuleOr)* ')' // PARAMS disabled in favor of ',' as literal
 		//{CSSRuleFunc} name=ValidID "(" WS* params=CSSRuleOr ")"
@@ -893,7 +892,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//CSSRuleOr returns CSSRule hidden(WS, ML_COMMENT, SL_COMMENT):
 		//	CSSRuleXor ({CSSRuleOr.ors+=current} ("|" ors+=CSSRuleXor)+)?;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//CSSRuleXor ({CSSRuleOr.ors+=current} ("|" ors+=CSSRuleXor)+)?
 		public Group getGroup() { return cGroup; }
@@ -933,7 +932,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//CSSRuleXor returns CSSRule hidden(WS, SL_COMMENT, ML_COMMENT):
 		//	CSSRuleConcat ({CSSRuleXor.xors+=current} ("||" xors+=CSSRuleConcat)+)?;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//CSSRuleConcat ({CSSRuleXor.xors+=current} ("||" xors+=CSSRuleConcat)+)?
 		public Group getGroup() { return cGroup; }
@@ -971,7 +970,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//CSSRuleConcat returns CSSRule hidden(WS, SL_COMMENT, ML_COMMENT):
 		//	CSSRuleConcatWithoutSpace ({CSSRuleConcat.conc+=current} conc+=CSSRuleConcatWithoutSpace+)?;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//CSSRuleConcatWithoutSpace ({CSSRuleConcat.conc+=current} conc+=CSSRuleConcatWithoutSpace+)?
 		public Group getGroup() { return cGroup; }
@@ -1005,7 +1004,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//CSSRuleConcatWithoutSpace returns CSSRule hidden(WS, SL_COMMENT, ML_COMMENT):
 		//	CSSRulePostfix ({CSSRuleConcatWithoutSpace.conc+=current} ("~" conc+=CSSRulePostfix)+)?;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//CSSRulePostfix ({CSSRuleConcatWithoutSpace.conc+=current} ("~" conc+=CSSRulePostfix)+)?
 		public Group getGroup() { return cGroup; }
@@ -1046,7 +1045,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//CSSRulePostfix returns CSSRule hidden(WS, SL_COMMENT, ML_COMMENT):
 		//	CSSRulePrimary ({CSSRulePostfix.rule=current} cardinality=("*" | "+" | "?"))?;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//CSSRulePrimary ({CSSRulePostfix.rule=current} cardinality=("*" | "+" | "?"))?
 		public Group getGroup() { return cGroup; }
@@ -1087,7 +1086,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//CSSRuleBracket returns CSSRule hidden(WS, SL_COMMENT, ML_COMMENT):
 		//	{CSSRuleBracket} "[" inner=CSSRuleOr "]";
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{CSSRuleBracket} "[" inner=CSSRuleOr "]"
 		public Group getGroup() { return cGroup; }
@@ -1128,7 +1127,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		//CSSRulePrimary returns CSSRule hidden(SL_COMMENT, ML_COMMENT):
 		//	CSSRuleRef | CSSRuleBracket | //	CSSRuleParenthesis |
 		//	CSSRuleLiteral | CSSRuleSymbol | CSSBaseType | CSSRuleRegex | {CSSNumLiteral} value=INT;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//CSSRuleRef | CSSRuleBracket | //	CSSRuleParenthesis |
 		//CSSRuleLiteral | CSSRuleSymbol | CSSBaseType | CSSRuleRegex | {CSSNumLiteral} value=INT
@@ -1175,7 +1174,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//CSSRuleRegex returns CSSRule hidden(WS, SL_COMMENT, ML_COMMENT):
 		//	{CSSRuleRegex} regex=REGEX;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{CSSRuleRegex} regex=REGEX
 		public Group getGroup() { return cGroup; }
@@ -1203,7 +1202,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//CSSRuleLiteral returns CSSRule:
 		//	{CSSRuleLiteral} (doku=Doku WS*)? value=ID;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{CSSRuleLiteral} (doku=Doku WS*)? value=ID
 		public Group getGroup() { return cGroup; }
@@ -1245,7 +1244,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//CSSRuleSymbol returns CSSRule:
 		//	{CSSRuleSymbol} (doku=Doku WS*)? symbol=("," | "%");
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{CSSRuleSymbol} (doku=Doku WS*)? symbol=("," | "%")
 		public Group getGroup() { return cGroup; }
@@ -1294,7 +1293,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//CSSDefaultValue:
 		//	{CSSDefaultValue} val=CSSRuleLiteral | ival=INT | dval=DOUBLE | sval=STRING;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{CSSDefaultValue} val=CSSRuleLiteral | ival=INT | dval=DOUBLE | sval=STRING
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -1344,7 +1343,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//SubstructureSelector hidden():
 		//	{SubstructureSelector} selectorName=ID ("[" var=ID "]")?;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{SubstructureSelector} selectorName=ID ("[" var=ID "]")?
 		public Group getGroup() { return cGroup; }
@@ -1389,7 +1388,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//Substructure:
 		//	doku=Doku? "substructure" name=ID "{" childs+=SubstructureStyleclass+ "}";
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//doku=Doku? "substructure" name=ID "{" childs+=SubstructureStyleclass+ "}"
 		public Group getGroup() { return cGroup; }
@@ -1442,7 +1441,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		//SubstructureStyleclass:
 		//	doku=Doku? element=[ElementDefinition|QualifiedName] "styleclass" selectors+=SubstructureSelector+ ("{"
 		//	childs+=SubstructureStyleclass+ "}")?;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//doku=Doku? element=[ElementDefinition|QualifiedName] "styleclass" selectors+=SubstructureSelector+ ("{"
 		//childs+=SubstructureStyleclass+ "}")?
@@ -1489,53 +1488,90 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	}
 	
 	
-	private CssExtensionElements pCssExtension;
-	private TerminalRule tPSEUDO;
-	private TerminalRule tID;
-	private TerminalRule tJDOC;
-	private TerminalRule tML_COMMENT;
-	private TerminalRule tSL_COMMENT;
-	private ImportElements pImport;
-	private ValidIDElements pValidID;
-	private QualifiedNameElements pQualifiedName;
-	private QualifiedNameWithWildCardElements pQualifiedNameWithWildCard;
-	private PackageDefinitionElements pPackageDefinition;
-	private DokuElements pDoku;
-	private CSSBaseTypeElements pCSSBaseType;
-	private CSSTypeElements pCSSType;
-	private ElementDefinitionElements pElementDefinition;
-	private PropertyDefinitionElements pPropertyDefinition;
-	private PseudoClassDefinitionElements pPseudoClassDefinition;
-	private CSSRuleRefElements pCSSRuleRef;
-	private CSSRuleDefinitionElements pCSSRuleDefinition;
-	private CSSRuleFuncElements pCSSRuleFunc;
-	private CSSRuleOrElements pCSSRuleOr;
-	private CSSRuleXorElements pCSSRuleXor;
-	private CSSRuleConcatElements pCSSRuleConcat;
-	private CSSRuleConcatWithoutSpaceElements pCSSRuleConcatWithoutSpace;
-	private CSSRulePostfixElements pCSSRulePostfix;
-	private CSSRuleBracketElements pCSSRuleBracket;
-	private CSSRulePrimaryElements pCSSRulePrimary;
-	private CSSRuleRegexElements pCSSRuleRegex;
-	private CSSRuleLiteralElements pCSSRuleLiteral;
-	private CSSRuleSymbolElements pCSSRuleSymbol;
-	private CSSDefaultValueElements pCSSDefaultValue;
-	private SubstructureSelectorElements pSubstructureSelector;
-	private SubstructureElements pSubstructure;
-	private SubstructureStyleclassElements pSubstructureStyleclass;
-	private TerminalRule tINT;
-	private TerminalRule tDOUBLE;
-	private TerminalRule tREGEX;
+	private final CssExtensionElements pCssExtension;
+	private final TerminalRule tPSEUDO;
+	private final TerminalRule tID;
+	private final TerminalRule tJDOC;
+	private final TerminalRule tML_COMMENT;
+	private final TerminalRule tSL_COMMENT;
+	private final ImportElements pImport;
+	private final ValidIDElements pValidID;
+	private final QualifiedNameElements pQualifiedName;
+	private final QualifiedNameWithWildCardElements pQualifiedNameWithWildCard;
+	private final PackageDefinitionElements pPackageDefinition;
+	private final DokuElements pDoku;
+	private final CSSBaseTypeElements pCSSBaseType;
+	private final CSSTypeElements pCSSType;
+	private final ElementDefinitionElements pElementDefinition;
+	private final PropertyDefinitionElements pPropertyDefinition;
+	private final PseudoClassDefinitionElements pPseudoClassDefinition;
+	private final CSSRuleRefElements pCSSRuleRef;
+	private final CSSRuleDefinitionElements pCSSRuleDefinition;
+	private final CSSRuleFuncElements pCSSRuleFunc;
+	private final CSSRuleOrElements pCSSRuleOr;
+	private final CSSRuleXorElements pCSSRuleXor;
+	private final CSSRuleConcatElements pCSSRuleConcat;
+	private final CSSRuleConcatWithoutSpaceElements pCSSRuleConcatWithoutSpace;
+	private final CSSRulePostfixElements pCSSRulePostfix;
+	private final CSSRuleBracketElements pCSSRuleBracket;
+	private final CSSRulePrimaryElements pCSSRulePrimary;
+	private final CSSRuleRegexElements pCSSRuleRegex;
+	private final CSSRuleLiteralElements pCSSRuleLiteral;
+	private final CSSRuleSymbolElements pCSSRuleSymbol;
+	private final CSSDefaultValueElements pCSSDefaultValue;
+	private final SubstructureSelectorElements pSubstructureSelector;
+	private final SubstructureElements pSubstructure;
+	private final SubstructureStyleclassElements pSubstructureStyleclass;
+	private final TerminalRule tINT;
+	private final TerminalRule tDOUBLE;
+	private final TerminalRule tREGEX;
 	
 	private final Grammar grammar;
 
-	private TerminalsGrammarAccess gaTerminals;
+	private final TerminalsGrammarAccess gaTerminals;
 
 	@Inject
 	public CssExtDslGrammarAccess(GrammarProvider grammarProvider,
 		TerminalsGrammarAccess gaTerminals) {
 		this.grammar = internalFindGrammar(grammarProvider);
 		this.gaTerminals = gaTerminals;
+		this.pCssExtension = new CssExtensionElements();
+		this.tPSEUDO = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "PSEUDO");
+		this.tID = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "ID");
+		this.tJDOC = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "JDOC");
+		this.tML_COMMENT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "ML_COMMENT");
+		this.tSL_COMMENT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "SL_COMMENT");
+		this.pImport = new ImportElements();
+		this.pValidID = new ValidIDElements();
+		this.pQualifiedName = new QualifiedNameElements();
+		this.pQualifiedNameWithWildCard = new QualifiedNameWithWildCardElements();
+		this.pPackageDefinition = new PackageDefinitionElements();
+		this.pDoku = new DokuElements();
+		this.pCSSBaseType = new CSSBaseTypeElements();
+		this.pCSSType = new CSSTypeElements();
+		this.pElementDefinition = new ElementDefinitionElements();
+		this.pPropertyDefinition = new PropertyDefinitionElements();
+		this.pPseudoClassDefinition = new PseudoClassDefinitionElements();
+		this.pCSSRuleRef = new CSSRuleRefElements();
+		this.pCSSRuleDefinition = new CSSRuleDefinitionElements();
+		this.pCSSRuleFunc = new CSSRuleFuncElements();
+		this.pCSSRuleOr = new CSSRuleOrElements();
+		this.pCSSRuleXor = new CSSRuleXorElements();
+		this.pCSSRuleConcat = new CSSRuleConcatElements();
+		this.pCSSRuleConcatWithoutSpace = new CSSRuleConcatWithoutSpaceElements();
+		this.pCSSRulePostfix = new CSSRulePostfixElements();
+		this.pCSSRuleBracket = new CSSRuleBracketElements();
+		this.pCSSRulePrimary = new CSSRulePrimaryElements();
+		this.pCSSRuleRegex = new CSSRuleRegexElements();
+		this.pCSSRuleLiteral = new CSSRuleLiteralElements();
+		this.pCSSRuleSymbol = new CSSRuleSymbolElements();
+		this.pCSSDefaultValue = new CSSDefaultValueElements();
+		this.pSubstructureSelector = new SubstructureSelectorElements();
+		this.pSubstructure = new SubstructureElements();
+		this.pSubstructureStyleclass = new SubstructureStyleclassElements();
+		this.tINT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "INT");
+		this.tDOUBLE = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "DOUBLE");
+		this.tREGEX = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "REGEX");
 	}
 	
 	protected Grammar internalFindGrammar(GrammarProvider grammarProvider) {
@@ -1554,7 +1590,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 		return grammar;
 	}
 	
-	
+	@Override
 	public Grammar getGrammar() {
 		return grammar;
 	}
@@ -1570,7 +1606,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//CssExtension:
 	//	imports+=Import* packageDef=PackageDefinition?;
 	public CssExtensionElements getCssExtensionAccess() {
-		return (pCssExtension != null) ? pCssExtension : (pCssExtension = new CssExtensionElements());
+		return pCssExtension;
 	}
 	
 	public ParserRule getCssExtensionRule() {
@@ -1580,37 +1616,37 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//terminal PSEUDO:
 	//	":" !" " ID;
 	public TerminalRule getPSEUDORule() {
-		return (tPSEUDO != null) ? tPSEUDO : (tPSEUDO = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "PSEUDO"));
+		return tPSEUDO;
 	} 
 
 	//terminal ID:
 	//	("a".."z" | "A".."Z" | "_" | "-") ("a".."z" | "A".."Z" | "_" | "0".."9" | "-")*;
 	public TerminalRule getIDRule() {
-		return (tID != null) ? tID : (tID = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "ID"));
+		return tID;
 	} 
 
 	//terminal JDOC:
 	//	"/ **"->"* /";
 	public TerminalRule getJDOCRule() {
-		return (tJDOC != null) ? tJDOC : (tJDOC = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "JDOC"));
+		return tJDOC;
 	} 
 
 	//terminal ML_COMMENT:
 	//	"/ *" !"*"->"* /";
 	public TerminalRule getML_COMMENTRule() {
-		return (tML_COMMENT != null) ? tML_COMMENT : (tML_COMMENT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "ML_COMMENT"));
+		return tML_COMMENT;
 	} 
 
 	//terminal SL_COMMENT:
 	//	"//" !("\n" | "\r")* ("\r"? "\n")?;
 	public TerminalRule getSL_COMMENTRule() {
-		return (tSL_COMMENT != null) ? tSL_COMMENT : (tSL_COMMENT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "SL_COMMENT"));
+		return tSL_COMMENT;
 	} 
 
 	//Import:
 	//	"import" importedNamespace=QualifiedNameWithWildCard;
 	public ImportElements getImportAccess() {
-		return (pImport != null) ? pImport : (pImport = new ImportElements());
+		return pImport;
 	}
 	
 	public ParserRule getImportRule() {
@@ -1620,7 +1656,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//ValidID:
 	//	ID;
 	public ValidIDElements getValidIDAccess() {
-		return (pValidID != null) ? pValidID : (pValidID = new ValidIDElements());
+		return pValidID;
 	}
 	
 	public ParserRule getValidIDRule() {
@@ -1630,7 +1666,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//QualifiedName:
 	//	ValidID ("." ValidID)*;
 	public QualifiedNameElements getQualifiedNameAccess() {
-		return (pQualifiedName != null) ? pQualifiedName : (pQualifiedName = new QualifiedNameElements());
+		return pQualifiedName;
 	}
 	
 	public ParserRule getQualifiedNameRule() {
@@ -1640,7 +1676,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//QualifiedNameWithWildCard:
 	//	QualifiedName ("." "*")?;
 	public QualifiedNameWithWildCardElements getQualifiedNameWithWildCardAccess() {
-		return (pQualifiedNameWithWildCard != null) ? pQualifiedNameWithWildCard : (pQualifiedNameWithWildCard = new QualifiedNameWithWildCardElements());
+		return pQualifiedNameWithWildCard;
 	}
 	
 	public ParserRule getQualifiedNameWithWildCardRule() {
@@ -1651,7 +1687,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//	(doku=Doku WS*)? "package" name=QualifiedName "{" (rules+=CSSRuleDefinition | subpackages+=PackageDefinition |
 	//	elements+=ElementDefinition)* "}";
 	public PackageDefinitionElements getPackageDefinitionAccess() {
-		return (pPackageDefinition != null) ? pPackageDefinition : (pPackageDefinition = new PackageDefinitionElements());
+		return pPackageDefinition;
 	}
 	
 	public ParserRule getPackageDefinitionRule() {
@@ -1661,7 +1697,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//Doku:
 	//	content=JDOC;
 	public DokuElements getDokuAccess() {
-		return (pDoku != null) ? pDoku : (pDoku = new DokuElements());
+		return pDoku;
 	}
 	
 	public ParserRule getDokuRule() {
@@ -1671,7 +1707,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//CSSBaseType returns CSSRule hidden(WS, SL_COMMENT, ML_COMMENT):
 	//	CSSType;
 	public CSSBaseTypeElements getCSSBaseTypeAccess() {
-		return (pCSSBaseType != null) ? pCSSBaseType : (pCSSBaseType = new CSSBaseTypeElements());
+		return pCSSBaseType;
 	}
 	
 	public ParserRule getCSSBaseTypeRule() {
@@ -1683,7 +1719,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//	(doku=Doku WS*)? type="@NUM" "(" WS* from=DOUBLE WS* "->" WS* to=DOUBLE WS* ")" | (doku=Doku WS*)? (type="@INT" WS* |
 	//	type="@NUM" WS* | type="@STRING" WS* | type="@URL" WS*);
 	public CSSTypeElements getCSSTypeAccess() {
-		return (pCSSType != null) ? pCSSType : (pCSSType = new CSSTypeElements());
+		return pCSSType;
 	}
 	
 	public ParserRule getCSSTypeRule() {
@@ -1698,7 +1734,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//	super+=[ElementDefinition|QualifiedName])*)? ("styleclass" styleclass=ID)? "{" (properties+=PropertyDefinition |
 	//	pseudoClasses+=PseudoClassDefinition | substructures+=Substructure)* "}";
 	public ElementDefinitionElements getElementDefinitionAccess() {
-		return (pElementDefinition != null) ? pElementDefinition : (pElementDefinition = new ElementDefinitionElements());
+		return pElementDefinition;
 	}
 	
 	public ParserRule getElementDefinitionRule() {
@@ -1708,7 +1744,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//PropertyDefinition returns Definition:
 	//	{PropertyDefinition} doku=Doku? name=QualifiedName rule=CSSRuleOr ("default:" default=CSSDefaultValue)? ";";
 	public PropertyDefinitionElements getPropertyDefinitionAccess() {
-		return (pPropertyDefinition != null) ? pPropertyDefinition : (pPropertyDefinition = new PropertyDefinitionElements());
+		return pPropertyDefinition;
 	}
 	
 	public ParserRule getPropertyDefinitionRule() {
@@ -1718,7 +1754,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//PseudoClassDefinition:
 	//	{PseudoClassDefinition} doku=Doku? name=PSEUDO;
 	public PseudoClassDefinitionElements getPseudoClassDefinitionAccess() {
-		return (pPseudoClassDefinition != null) ? pPseudoClassDefinition : (pPseudoClassDefinition = new PseudoClassDefinitionElements());
+		return pPseudoClassDefinition;
 	}
 	
 	public ParserRule getPseudoClassDefinitionRule() {
@@ -1728,7 +1764,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//CSSRuleRef hidden():
 	//	(doku=Doku WS*)? "<" ref=[Definition|QualifiedName] ">";
 	public CSSRuleRefElements getCSSRuleRefAccess() {
-		return (pCSSRuleRef != null) ? pCSSRuleRef : (pCSSRuleRef = new CSSRuleRefElements());
+		return pCSSRuleRef;
 	}
 	
 	public ParserRule getCSSRuleRefRule() {
@@ -1738,7 +1774,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//CSSRuleDefinition returns Definition hidden(WS, SL_COMMENT, ML_COMMENT):
 	//	{CSSRuleDefinition} doku=Doku? name=QualifiedName "=" (rule=CSSRuleOr | func=CSSRuleFunc) ";";
 	public CSSRuleDefinitionElements getCSSRuleDefinitionAccess() {
-		return (pCSSRuleDefinition != null) ? pCSSRuleDefinition : (pCSSRuleDefinition = new CSSRuleDefinitionElements());
+		return pCSSRuleDefinition;
 	}
 	
 	public ParserRule getCSSRuleDefinitionRule() {
@@ -1748,7 +1784,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//CSSRuleFunc returns CSSRule hidden(ML_COMMENT, SL_COMMENT): //{CSSRuleFunc} name=ValidID '(' WS* params+=CSSRuleOr ( ',' WS* params+=CSSRuleOr)* ')' // PARAMS disabled in favor of ',' as literal
 	//	{CSSRuleFunc} name=ValidID "(" WS* params=CSSRuleOr ")";
 	public CSSRuleFuncElements getCSSRuleFuncAccess() {
-		return (pCSSRuleFunc != null) ? pCSSRuleFunc : (pCSSRuleFunc = new CSSRuleFuncElements());
+		return pCSSRuleFunc;
 	}
 	
 	public ParserRule getCSSRuleFuncRule() {
@@ -1758,7 +1794,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//CSSRuleOr returns CSSRule hidden(WS, ML_COMMENT, SL_COMMENT):
 	//	CSSRuleXor ({CSSRuleOr.ors+=current} ("|" ors+=CSSRuleXor)+)?;
 	public CSSRuleOrElements getCSSRuleOrAccess() {
-		return (pCSSRuleOr != null) ? pCSSRuleOr : (pCSSRuleOr = new CSSRuleOrElements());
+		return pCSSRuleOr;
 	}
 	
 	public ParserRule getCSSRuleOrRule() {
@@ -1768,7 +1804,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//CSSRuleXor returns CSSRule hidden(WS, SL_COMMENT, ML_COMMENT):
 	//	CSSRuleConcat ({CSSRuleXor.xors+=current} ("||" xors+=CSSRuleConcat)+)?;
 	public CSSRuleXorElements getCSSRuleXorAccess() {
-		return (pCSSRuleXor != null) ? pCSSRuleXor : (pCSSRuleXor = new CSSRuleXorElements());
+		return pCSSRuleXor;
 	}
 	
 	public ParserRule getCSSRuleXorRule() {
@@ -1778,7 +1814,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//CSSRuleConcat returns CSSRule hidden(WS, SL_COMMENT, ML_COMMENT):
 	//	CSSRuleConcatWithoutSpace ({CSSRuleConcat.conc+=current} conc+=CSSRuleConcatWithoutSpace+)?;
 	public CSSRuleConcatElements getCSSRuleConcatAccess() {
-		return (pCSSRuleConcat != null) ? pCSSRuleConcat : (pCSSRuleConcat = new CSSRuleConcatElements());
+		return pCSSRuleConcat;
 	}
 	
 	public ParserRule getCSSRuleConcatRule() {
@@ -1788,7 +1824,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//CSSRuleConcatWithoutSpace returns CSSRule hidden(WS, SL_COMMENT, ML_COMMENT):
 	//	CSSRulePostfix ({CSSRuleConcatWithoutSpace.conc+=current} ("~" conc+=CSSRulePostfix)+)?;
 	public CSSRuleConcatWithoutSpaceElements getCSSRuleConcatWithoutSpaceAccess() {
-		return (pCSSRuleConcatWithoutSpace != null) ? pCSSRuleConcatWithoutSpace : (pCSSRuleConcatWithoutSpace = new CSSRuleConcatWithoutSpaceElements());
+		return pCSSRuleConcatWithoutSpace;
 	}
 	
 	public ParserRule getCSSRuleConcatWithoutSpaceRule() {
@@ -1798,7 +1834,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//CSSRulePostfix returns CSSRule hidden(WS, SL_COMMENT, ML_COMMENT):
 	//	CSSRulePrimary ({CSSRulePostfix.rule=current} cardinality=("*" | "+" | "?"))?;
 	public CSSRulePostfixElements getCSSRulePostfixAccess() {
-		return (pCSSRulePostfix != null) ? pCSSRulePostfix : (pCSSRulePostfix = new CSSRulePostfixElements());
+		return pCSSRulePostfix;
 	}
 	
 	public ParserRule getCSSRulePostfixRule() {
@@ -1808,7 +1844,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//CSSRuleBracket returns CSSRule hidden(WS, SL_COMMENT, ML_COMMENT):
 	//	{CSSRuleBracket} "[" inner=CSSRuleOr "]";
 	public CSSRuleBracketElements getCSSRuleBracketAccess() {
-		return (pCSSRuleBracket != null) ? pCSSRuleBracket : (pCSSRuleBracket = new CSSRuleBracketElements());
+		return pCSSRuleBracket;
 	}
 	
 	public ParserRule getCSSRuleBracketRule() {
@@ -1822,7 +1858,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//	CSSRuleRef | CSSRuleBracket | //	CSSRuleParenthesis |
 	//	CSSRuleLiteral | CSSRuleSymbol | CSSBaseType | CSSRuleRegex | {CSSNumLiteral} value=INT;
 	public CSSRulePrimaryElements getCSSRulePrimaryAccess() {
-		return (pCSSRulePrimary != null) ? pCSSRulePrimary : (pCSSRulePrimary = new CSSRulePrimaryElements());
+		return pCSSRulePrimary;
 	}
 	
 	public ParserRule getCSSRulePrimaryRule() {
@@ -1832,7 +1868,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//CSSRuleRegex returns CSSRule hidden(WS, SL_COMMENT, ML_COMMENT):
 	//	{CSSRuleRegex} regex=REGEX;
 	public CSSRuleRegexElements getCSSRuleRegexAccess() {
-		return (pCSSRuleRegex != null) ? pCSSRuleRegex : (pCSSRuleRegex = new CSSRuleRegexElements());
+		return pCSSRuleRegex;
 	}
 	
 	public ParserRule getCSSRuleRegexRule() {
@@ -1842,7 +1878,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//CSSRuleLiteral returns CSSRule:
 	//	{CSSRuleLiteral} (doku=Doku WS*)? value=ID;
 	public CSSRuleLiteralElements getCSSRuleLiteralAccess() {
-		return (pCSSRuleLiteral != null) ? pCSSRuleLiteral : (pCSSRuleLiteral = new CSSRuleLiteralElements());
+		return pCSSRuleLiteral;
 	}
 	
 	public ParserRule getCSSRuleLiteralRule() {
@@ -1852,7 +1888,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//CSSRuleSymbol returns CSSRule:
 	//	{CSSRuleSymbol} (doku=Doku WS*)? symbol=("," | "%");
 	public CSSRuleSymbolElements getCSSRuleSymbolAccess() {
-		return (pCSSRuleSymbol != null) ? pCSSRuleSymbol : (pCSSRuleSymbol = new CSSRuleSymbolElements());
+		return pCSSRuleSymbol;
 	}
 	
 	public ParserRule getCSSRuleSymbolRule() {
@@ -1862,7 +1898,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//CSSDefaultValue:
 	//	{CSSDefaultValue} val=CSSRuleLiteral | ival=INT | dval=DOUBLE | sval=STRING;
 	public CSSDefaultValueElements getCSSDefaultValueAccess() {
-		return (pCSSDefaultValue != null) ? pCSSDefaultValue : (pCSSDefaultValue = new CSSDefaultValueElements());
+		return pCSSDefaultValue;
 	}
 	
 	public ParserRule getCSSDefaultValueRule() {
@@ -1872,7 +1908,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//SubstructureSelector hidden():
 	//	{SubstructureSelector} selectorName=ID ("[" var=ID "]")?;
 	public SubstructureSelectorElements getSubstructureSelectorAccess() {
-		return (pSubstructureSelector != null) ? pSubstructureSelector : (pSubstructureSelector = new SubstructureSelectorElements());
+		return pSubstructureSelector;
 	}
 	
 	public ParserRule getSubstructureSelectorRule() {
@@ -1882,7 +1918,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//Substructure:
 	//	doku=Doku? "substructure" name=ID "{" childs+=SubstructureStyleclass+ "}";
 	public SubstructureElements getSubstructureAccess() {
-		return (pSubstructure != null) ? pSubstructure : (pSubstructure = new SubstructureElements());
+		return pSubstructure;
 	}
 	
 	public ParserRule getSubstructureRule() {
@@ -1893,7 +1929,7 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//	doku=Doku? element=[ElementDefinition|QualifiedName] "styleclass" selectors+=SubstructureSelector+ ("{"
 	//	childs+=SubstructureStyleclass+ "}")?;
 	public SubstructureStyleclassElements getSubstructureStyleclassAccess() {
-		return (pSubstructureStyleclass != null) ? pSubstructureStyleclass : (pSubstructureStyleclass = new SubstructureStyleclassElements());
+		return pSubstructureStyleclass;
 	}
 	
 	public ParserRule getSubstructureStyleclassRule() {
@@ -1903,13 +1939,13 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//terminal INT returns ecore::EInt:
 	//	"-"? "0".."9"+;
 	public TerminalRule getINTRule() {
-		return (tINT != null) ? tINT : (tINT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "INT"));
+		return tINT;
 	} 
 
 	//terminal DOUBLE returns ecore::EDouble:
 	//	"-"? "0".."9"* "." "0".."9"+;
 	public TerminalRule getDOUBLERule() {
-		return (tDOUBLE != null) ? tDOUBLE : (tDOUBLE = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "DOUBLE"));
+		return tDOUBLE;
 	} 
 
 	//// TODO maybe directly return a Pattern
@@ -1917,12 +1953,12 @@ public class CssExtDslGrammarAccess extends AbstractGrammarElementFinder {
 	//	"$" ("a".."z" | "A".."Z" | "0".."9" | "-" | "," | "." | "?" | "\'" | ":" | "\"" | ">" | "<" | "/" | "_" | "=" | ";" |
 	//	"(" | ")" | "&" | "!" | "#" | "%" | "*" | "+" | "[" | "]" | "{" | "}")+ "$";
 	public TerminalRule getREGEXRule() {
-		return (tREGEX != null) ? tREGEX : (tREGEX = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "REGEX"));
+		return tREGEX;
 	} 
 
 	//terminal STRING:
-	//	"\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" |
-	//	"n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'";
+	//	"\"" ("\\" . / * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\""))* "\"" | "\'" ("\\" .
+	//	/ * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\'"))* "\'";
 	public TerminalRule getSTRINGRule() {
 		return gaTerminals.getSTRINGRule();
 	} 
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/validation/AbstractCssExtDslJavaValidator.java b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/validation/AbstractCssExtDslJavaValidator.java
index 3163e1b34..462a5580e 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/validation/AbstractCssExtDslJavaValidator.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/src-gen/org/eclipse/fx/ide/css/cssext/validation/AbstractCssExtDslJavaValidator.java
@@ -1,14 +1,16 @@
+/*
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.css.cssext.validation;
  
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.xtext.validation.AbstractDeclarativeValidator;
 import org.eclipse.xtext.validation.ComposedChecks;
 
 @ComposedChecks(validators= {org.eclipse.xtext.validation.ImportUriValidator.class, org.eclipse.xtext.validation.NamesAreUniqueValidator.class})
-public class AbstractCssExtDslJavaValidator extends AbstractDeclarativeValidator {
+public class AbstractCssExtDslJavaValidator extends org.eclipse.xtext.validation.AbstractDeclarativeValidator {
 
 	@Override
 	protected List<EPackage> getEPackages() {
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.tests/src-gen/org/eclipse/fx/ide/css/CssDslInjectorProvider.java b/bundles/tooling/org.eclipse.fx.ide.css.tests/src-gen/org/eclipse/fx/ide/css/CssDslInjectorProvider.java
index 46348c3f6..1c5d32a48 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.tests/src-gen/org/eclipse/fx/ide/css/CssDslInjectorProvider.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.tests/src-gen/org/eclipse/fx/ide/css/CssDslInjectorProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.css;
 
 import org.eclipse.xtext.junit4.GlobalRegistries;
@@ -20,6 +20,7 @@ public class CssDslInjectorProvider implements IInjectorProvider, IRegistryConfi
 		GlobalRegistries.initializeDefaults();
 	}
 
+	@Override
 	public Injector getInjector()
 	{
 		if (injector == null) {
@@ -34,10 +35,12 @@ public class CssDslInjectorProvider implements IInjectorProvider, IRegistryConfi
 	    return new CssDslStandaloneSetup().createInjectorAndDoEMFRegistration();
 	}
 
+	@Override
 	public void restoreRegistry() {
 		stateBeforeInjectorCreation.restoreGlobalState();
 	}
 
+	@Override
 	public void setupRegistry() {
 		getInjector();
 		stateAfterInjectorCreation.restoreGlobalState();
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.tests/src-gen/org/eclipse/fx/ide/css/CssDslUiInjectorProvider.java b/bundles/tooling/org.eclipse.fx.ide.css.tests/src-gen/org/eclipse/fx/ide/css/CssDslUiInjectorProvider.java
index 14cd2e75e..a855af6d4 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.tests/src-gen/org/eclipse/fx/ide/css/CssDslUiInjectorProvider.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.tests/src-gen/org/eclipse/fx/ide/css/CssDslUiInjectorProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.css;
 
 import org.eclipse.xtext.junit4.IInjectorProvider;
@@ -9,6 +9,7 @@ import com.google.inject.Injector;
 
 public class CssDslUiInjectorProvider implements IInjectorProvider {
 	
+	@Override
 	public Injector getInjector() {
 		return org.eclipse.fx.ide.css.ui.internal.CssDslActivator.getInstance().getInjector("org.eclipse.fx.ide.css.CssDsl");
 	}
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.ui/plugin.xml_gen b/bundles/tooling/org.eclipse.fx.ide.css.ui/plugin.xml_gen
index 35ec738af..9df2b57c9 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.ui/plugin.xml_gen
+++ b/bundles/tooling/org.eclipse.fx.ide.css.ui/plugin.xml_gen
@@ -361,5 +361,11 @@
             extensions="css">
     </provider>
   </extension>
+  <extension point="org.eclipse.team.core.fileTypes">
+    <fileTypes
+            extension="css"
+            type="text">
+    </fileTypes>
+  </extension>
 
 </plugin>
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.ui/src-gen/org/eclipse/fx/ide/css/ui/AbstractCssDslUiModule.java b/bundles/tooling/org.eclipse.fx.ide.css.ui/src-gen/org/eclipse/fx/ide/css/ui/AbstractCssDslUiModule.java
index ec9b4a481..cd7337fa6 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.ui/src-gen/org/eclipse/fx/ide/css/ui/AbstractCssDslUiModule.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.ui/src-gen/org/eclipse/fx/ide/css/ui/AbstractCssDslUiModule.java
@@ -4,14 +4,13 @@
  */
 package org.eclipse.fx.ide.css.ui;
 
-import org.eclipse.xtext.ui.DefaultUiModule;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 /**
  * Manual modifications go to {org.eclipse.fx.ide.css.ui.CssDslUiModule}
  */
 @SuppressWarnings("all")
-public abstract class AbstractCssDslUiModule extends DefaultUiModule {
+public abstract class AbstractCssDslUiModule extends org.eclipse.xtext.common.types.ui.DefaultCommonTypesUiModule {
 	
 	public AbstractCssDslUiModule(AbstractUIPlugin plugin) {
 		super(plugin);
@@ -54,6 +53,11 @@ public abstract class AbstractCssDslUiModule extends DefaultUiModule {
 	}
 
 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+	public Class<? extends org.eclipse.xtext.generator.IContextualOutputConfigurationProvider> bindIContextualOutputConfigurationProvider() {
+		return org.eclipse.xtext.builder.EclipseOutputConfigurationProvider.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
 	public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) {
 		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.builder.builderState.IBuilderState.class);
 	}
@@ -114,60 +118,10 @@ public abstract class AbstractCssDslUiModule extends DefaultUiModule {
 	}
 
 	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public java.lang.ClassLoader bindClassLoaderToInstance() {
-		return getClass().getClassLoader();
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.access.IJvmTypeProvider.Factory> bindIJvmTypeProvider$Factory() {
-		return org.eclipse.xtext.common.types.access.jdt.JdtTypeProviderFactory.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.xtext.AbstractTypeScopeProvider> bindAbstractTypeScopeProvider() {
-		return org.eclipse.xtext.common.types.xtext.ui.JdtBasedSimpleTypeScopeProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.xtext.ui.ITypesProposalProvider> bindITypesProposalProvider() {
-		return org.eclipse.xtext.common.types.xtext.ui.JdtTypesProposalProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.access.jdt.IJavaProjectProvider> bindIJavaProjectProvider() {
-		return org.eclipse.xtext.common.types.xtext.ui.XtextResourceSetBasedProjectProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.hyperlinking.IHyperlinkHelper> bindIHyperlinkHelper() {
-		return org.eclipse.xtext.common.types.xtext.ui.TypeAwareHyperlinkHelper.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
 	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.PrefixMatcher> bindPrefixMatcher() {
 		return org.eclipse.xtext.ui.editor.contentassist.FQNPrefixMatcher.class;
 	}
 
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.AbstractJavaBasedContentProposalProvider.ReferenceProposalCreator> bindAbstractJavaBasedContentProposalProvider$ReferenceProposalCreator() {
-		return org.eclipse.xtext.common.types.xtext.ui.TypeAwareReferenceProposalCreator.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.IValidationJobScheduler> bindIValidationJobScheduler() {
-		return org.eclipse.xtext.common.types.xtext.ui.JdtValidationJobScheduler.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.refactoring.impl.RefactoringResourceSetProvider> bindRefactoringResourceSetProvider() {
-		return org.eclipse.xtext.common.types.ui.refactoring.JvmRefactoringResourceSetProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.ui.query.IJavaSearchParticipation> bindIJavaSearchParticipation() {
-		return org.eclipse.xtext.common.types.ui.query.IJavaSearchParticipation.Yes.class;
-	}
-
 	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment
 	public com.google.inject.Provider<org.eclipse.xtext.ui.codetemplates.ui.preferences.TemplatesLanguageConfiguration> provideTemplatesLanguageConfiguration() {
 		return org.eclipse.xtext.ui.codetemplates.ui.AccessibleCodetemplatesActivator.getTemplatesLanguageConfigurationProvider();
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.ui/src-gen/org/eclipse/fx/ide/css/ui/contentassist/AbstractCssDslProposalProvider.java b/bundles/tooling/org.eclipse.fx.ide.css.ui/src-gen/org/eclipse/fx/ide/css/ui/contentassist/AbstractCssDslProposalProvider.java
index ef1bbf425..8aae21f98 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.ui/src-gen/org/eclipse/fx/ide/css/ui/contentassist/AbstractCssDslProposalProvider.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.ui/src-gen/org/eclipse/fx/ide/css/ui/contentassist/AbstractCssDslProposalProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.css.ui.contentassist;
 
 import org.eclipse.emf.ecore.EObject;
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.ui/src-gen/org/eclipse/fx/ide/css/ui/contentassist/antlr/CssDslParser.java b/bundles/tooling/org.eclipse.fx.ide.css.ui/src-gen/org/eclipse/fx/ide/css/ui/contentassist/antlr/CssDslParser.java
index 52f46b3ef..c0d226dff 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.ui/src-gen/org/eclipse/fx/ide/css/ui/contentassist/antlr/CssDslParser.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.ui/src-gen/org/eclipse/fx/ide/css/ui/contentassist/antlr/CssDslParser.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.css.ui.contentassist.antlr;
 
 import java.util.Collection;
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.ui/src-gen/org/eclipse/fx/ide/css/ui/contentassist/antlr/PartialCssDslContentAssistParser.java b/bundles/tooling/org.eclipse.fx.ide.css.ui/src-gen/org/eclipse/fx/ide/css/ui/contentassist/antlr/PartialCssDslContentAssistParser.java
index cf364eee5..32c1d6487 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.ui/src-gen/org/eclipse/fx/ide/css/ui/contentassist/antlr/PartialCssDslContentAssistParser.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css.ui/src-gen/org/eclipse/fx/ide/css/ui/contentassist/antlr/PartialCssDslContentAssistParser.java
@@ -12,14 +12,14 @@ import org.eclipse.xtext.ui.editor.contentassist.antlr.FollowElement;
 import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
 import org.eclipse.xtext.util.PolymorphicDispatcher;
 
-/**
- * @author Sebastian Zarnekow - Initial contribution and API
+/*
+ * Template CodetemplatesGeneratorFragment.xpt
  */
-@SuppressWarnings("restriction")
 public class PartialCssDslContentAssistParser extends CssDslParser implements IPartialContentAssistParser {
 
 	private AbstractRule rule;
 
+	@Override
 	public void initializeFor(AbstractRule rule) {
 		this.rule = rule;
 	}
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.ui/src-gen/org/eclipse/fx/ide/css/ui/contentassist/antlr/internal/InternalCssDsl.g b/bundles/tooling/org.eclipse.fx.ide.css.ui/src-gen/org/eclipse/fx/ide/css/ui/contentassist/antlr/internal/InternalCssDsl.g
index 4acbae056..11c512bc8 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.ui/src-gen/org/eclipse/fx/ide/css/ui/contentassist/antlr/internal/InternalCssDsl.g
+++ b/bundles/tooling/org.eclipse.fx.ide.css.ui/src-gen/org/eclipse/fx/ide/css/ui/contentassist/antlr/internal/InternalCssDsl.g
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 grammar InternalCssDsl;
 
 options {
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/AbstractCssDslRuntimeModule.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/AbstractCssDslRuntimeModule.java
index e06d138b7..83ba0e788 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/AbstractCssDslRuntimeModule.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/AbstractCssDslRuntimeModule.java
@@ -6,7 +6,6 @@ package org.eclipse.fx.ide.css;
 import java.util.Properties;
 
 import org.eclipse.xtext.Constants;
-import org.eclipse.xtext.service.DefaultRuntimeModule;
 
 import com.google.inject.Binder;
 import com.google.inject.name.Names;
@@ -14,8 +13,8 @@ import com.google.inject.name.Names;
 /**
  * Manual modifications go to {org.eclipse.fx.ide.css.CssDslRuntimeModule}
  */
- @SuppressWarnings("all")
-public abstract class AbstractCssDslRuntimeModule extends DefaultRuntimeModule {
+@SuppressWarnings("all")
+public abstract class AbstractCssDslRuntimeModule extends org.eclipse.xtext.common.types.DefaultCommonTypesRuntimeModule {
 
 	protected Properties properties = null;
 
@@ -35,6 +34,11 @@ public abstract class AbstractCssDslRuntimeModule extends DefaultRuntimeModule {
 	}
 	
 	// contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
+	public java.lang.ClassLoader bindClassLoaderToInstance() {
+		return getClass().getClassLoader();
+	}
+
+	// contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
 	public Class<? extends org.eclipse.xtext.IGrammarAccess> bindIGrammarAccess() {
 		return org.eclipse.fx.ide.css.services.CssDslGrammarAccess.class;
 	}
@@ -140,26 +144,6 @@ public abstract class AbstractCssDslRuntimeModule extends DefaultRuntimeModule {
 	}
 
 	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public java.lang.ClassLoader bindClassLoaderToInstance() {
-		return getClass().getClassLoader();
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public org.eclipse.xtext.common.types.TypesFactory bindTypesFactoryToInstance() {
-		return org.eclipse.xtext.common.types.TypesFactory.eINSTANCE;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.access.IJvmTypeProvider.Factory> bindIJvmTypeProvider$Factory() {
-		return org.eclipse.xtext.common.types.access.ClasspathTypeProviderFactory.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.xtext.AbstractTypeScopeProvider> bindAbstractTypeScopeProvider() {
-		return org.eclipse.xtext.common.types.xtext.ClasspathBasedTypeScopeProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
 	public Class<? extends org.eclipse.xtext.scoping.IGlobalScopeProvider> bindIGlobalScopeProvider() {
 		return org.eclipse.xtext.common.types.xtext.TypesAwareDefaultGlobalScopeProvider.class;
 	}
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/CssDsl.genmodel b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/CssDsl.genmodel
index d50d710fe..b2e0cc77b 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/CssDsl.genmodel
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/CssDsl.genmodel
@@ -3,8 +3,8 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.fx.ide.css/src-gen" editDirectory="/org.eclipse.fx.ide.css.edit/src"
     editorDirectory="/org.eclipse.fx.ide.css.editor/src" modelPluginID="org.eclipse.fx.ide.css"
     forceOverwrite="true" modelName="CssDsl" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.fx.ide.css.edit"
-    editorPluginID="org.eclipse.fx.ide.css.editor" runtimeVersion="2.10">
+    complianceLevel="6.0" copyrightFields="false" editPluginID="org.eclipse.fx.ide.css.edit"
+    editorPluginID="org.eclipse.fx.ide.css.editor" runtimeVersion="2.11">
   <genPackages prefix="CssDsl" basePackage="org.eclipse.fx.ide.css" disposableProviderFactory="true"
       ecorePackage="CssDsl.ecore#/">
     <genClasses ecoreClass="CssDsl.ecore#//stylesheet">
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/CssDslStandaloneSetupGenerated.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/CssDslStandaloneSetupGenerated.java
index c88665242..6290a0ea5 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/CssDslStandaloneSetupGenerated.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/CssDslStandaloneSetupGenerated.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.css;
 
 import org.eclipse.emf.ecore.EPackage;
@@ -16,6 +16,7 @@ import com.google.inject.Injector;
 @SuppressWarnings("all")
 public class CssDslStandaloneSetupGenerated implements ISetup {
 
+	@Override
 	public Injector createInjectorAndDoEMFRegistration() {
 		// register default ePackages
 		if (!Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("ecore"))
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/AttributeSelector.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/AttributeSelector.java
index 62e77ef5b..c38bb603f 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/AttributeSelector.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/AttributeSelector.java
@@ -10,12 +10,12 @@ package org.eclipse.fx.ide.css.cssDsl;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.AttributeSelector#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.AttributeSelector#getOp <em>Op</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.AttributeSelector#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getAttributeSelector()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/ClassSelector.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/ClassSelector.java
index 5306deb57..45fef9ba2 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/ClassSelector.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/ClassSelector.java
@@ -10,10 +10,10 @@ package org.eclipse.fx.ide.css.cssDsl;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.ClassSelector#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getClassSelector()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/ColorTok.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/ColorTok.java
index dbaf6efc7..49e0c6da7 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/ColorTok.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/ColorTok.java
@@ -10,10 +10,10 @@ package org.eclipse.fx.ide.css.cssDsl;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.ColorTok#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getColorTok()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/ElementSelector.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/ElementSelector.java
index 33963a7bb..9754878e3 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/ElementSelector.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/ElementSelector.java
@@ -11,10 +11,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.ElementSelector#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getElementSelector()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/FuncTok.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/FuncTok.java
index 33f13b7ef..a23d605d9 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/FuncTok.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/FuncTok.java
@@ -11,11 +11,11 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.FuncTok#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.FuncTok#getParams <em>Params</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getFuncTok()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/IdSelector.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/IdSelector.java
index 262dde38f..373ed1696 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/IdSelector.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/IdSelector.java
@@ -10,10 +10,10 @@ package org.eclipse.fx.ide.css.cssDsl;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.IdSelector#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getIdSelector()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/IdentifierTok.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/IdentifierTok.java
index e7b0dedda..790409a4e 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/IdentifierTok.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/IdentifierTok.java
@@ -10,10 +10,10 @@ package org.eclipse.fx.ide.css.cssDsl;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.IdentifierTok#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getIdentifierTok()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/NumberTok.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/NumberTok.java
index e59785f54..ddc67bfa4 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/NumberTok.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/NumberTok.java
@@ -10,10 +10,10 @@ package org.eclipse.fx.ide.css.cssDsl;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.NumberTok#getVal <em>Val</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getNumberTok()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/PseudoClassFunction.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/PseudoClassFunction.java
index be2f3d753..7f0ec3589 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/PseudoClassFunction.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/PseudoClassFunction.java
@@ -11,13 +11,13 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.PseudoClassFunction#isNot <em>Not</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.PseudoClassFunction#getParamSelector <em>Param Selector</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.PseudoClassFunction#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.PseudoClassFunction#getParams <em>Params</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getPseudoClassFunction()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/PseudoClassName.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/PseudoClassName.java
index 5e8e36bc2..a35ce33f6 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/PseudoClassName.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/PseudoClassName.java
@@ -10,10 +10,10 @@ package org.eclipse.fx.ide.css.cssDsl;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.PseudoClassName#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getPseudoClassName()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/SimpleSelectorForNegation.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/SimpleSelectorForNegation.java
index e7cf55621..432a31c80 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/SimpleSelectorForNegation.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/SimpleSelectorForNegation.java
@@ -13,12 +13,12 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.SimpleSelectorForNegation#getElement <em>Element</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.SimpleSelectorForNegation#getUniversal <em>Universal</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.SimpleSelectorForNegation#getSubSelectors <em>Sub Selectors</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getSimpleSelectorForNegation()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/StringTok.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/StringTok.java
index 505b49bbf..93da2e752 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/StringTok.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/StringTok.java
@@ -10,10 +10,10 @@ package org.eclipse.fx.ide.css.cssDsl;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.StringTok#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getStringTok()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/SymbolTok.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/SymbolTok.java
index c0c94c96a..e7bca09ea 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/SymbolTok.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/SymbolTok.java
@@ -10,10 +10,10 @@ package org.eclipse.fx.ide.css.cssDsl;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.SymbolTok#getSymbol <em>Symbol</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getSymbolTok()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/URLType.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/URLType.java
index 90c5d3c72..d92638ff5 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/URLType.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/URLType.java
@@ -10,11 +10,11 @@ package org.eclipse.fx.ide.css.cssDsl;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.URLType#getMediaList <em>Media List</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.URLType#getUrl <em>Url</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getURLType()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/UniversalSelector.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/UniversalSelector.java
index c4dc2cdd0..0e4366203 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/UniversalSelector.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/UniversalSelector.java
@@ -11,10 +11,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.UniversalSelector#getNamespace <em>Namespace</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getUniversalSelector()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/UrlTok.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/UrlTok.java
index c130e9cb0..605e0d5e8 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/UrlTok.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/UrlTok.java
@@ -10,10 +10,10 @@ package org.eclipse.fx.ide.css.cssDsl;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.UrlTok#getUrl <em>Url</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getUrlTok()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/charset.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/charset.java
index dafeacaf5..236593238 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/charset.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/charset.java
@@ -11,10 +11,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.charset#getCharset <em>Charset</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getcharset()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/css_declaration.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/css_declaration.java
index 6bfbdeb42..07b65f522 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/css_declaration.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/css_declaration.java
@@ -13,12 +13,12 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.css_declaration#getProperty <em>Property</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.css_declaration#getValueTokens <em>Value Tokens</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.css_declaration#isImportant <em>Important</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getcss_declaration()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/css_property.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/css_property.java
index edaa6735b..b82ff0b48 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/css_property.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/css_property.java
@@ -11,10 +11,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.css_property#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getcss_property()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/font_face.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/font_face.java
index 69748933e..7c394f71b 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/font_face.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/font_face.java
@@ -11,12 +11,12 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.font_face#getDeclarations <em>Declarations</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.font_face#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.font_face#getKeyframeselectors <em>Keyframeselectors</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getfont_face()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/AttributeSelectorImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/AttributeSelectorImpl.java
index 58748d764..15d90ea0f 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/AttributeSelectorImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/AttributeSelectorImpl.java
@@ -17,12 +17,12 @@ import org.eclipse.fx.ide.css.cssDsl.CssDslPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.AttributeSelectorImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.AttributeSelectorImpl#getOp <em>Op</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.AttributeSelectorImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/ClassSelectorImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/ClassSelectorImpl.java
index ec370d351..609c0cd83 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/ClassSelectorImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/ClassSelectorImpl.java
@@ -17,10 +17,10 @@ import org.eclipse.fx.ide.css.cssDsl.CssDslPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.ClassSelectorImpl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/ColorTokImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/ColorTokImpl.java
index ed7de29cb..3de757fc6 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/ColorTokImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/ColorTokImpl.java
@@ -17,10 +17,10 @@ import org.eclipse.fx.ide.css.cssDsl.CssDslPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.ColorTokImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/CssSelectorImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/CssSelectorImpl.java
index ac1c060f3..dbb7eeab4 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/CssSelectorImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/CssSelectorImpl.java
@@ -13,8 +13,6 @@ import org.eclipse.fx.ide.css.cssDsl.CssSelector;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Css Selector</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/CssTokImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/CssTokImpl.java
index f229d5162..cd36bdb01 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/CssTokImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/CssTokImpl.java
@@ -13,8 +13,6 @@ import org.eclipse.fx.ide.css.cssDsl.CssTok;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Css Tok</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/ElementSelectorImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/ElementSelectorImpl.java
index df342278e..a48959706 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/ElementSelectorImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/ElementSelectorImpl.java
@@ -18,10 +18,10 @@ import org.eclipse.fx.ide.css.cssDsl.ElementSelector;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.ElementSelectorImpl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/FuncTokImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/FuncTokImpl.java
index 7dfb7422e..812f98296 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/FuncTokImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/FuncTokImpl.java
@@ -28,11 +28,11 @@ import org.eclipse.fx.ide.css.cssDsl.IdentifierTok;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.FuncTokImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.FuncTokImpl#getParams <em>Params</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/IdSelectorImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/IdSelectorImpl.java
index 78c9e4983..d70e2e07e 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/IdSelectorImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/IdSelectorImpl.java
@@ -17,10 +17,10 @@ import org.eclipse.fx.ide.css.cssDsl.IdSelector;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.IdSelectorImpl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/IdentifierTokImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/IdentifierTokImpl.java
index 37c3b3535..d69854ed8 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/IdentifierTokImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/IdentifierTokImpl.java
@@ -17,10 +17,10 @@ import org.eclipse.fx.ide.css.cssDsl.IdentifierTok;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.IdentifierTokImpl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/NumberTokImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/NumberTokImpl.java
index 827936f0d..d01f0cfee 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/NumberTokImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/NumberTokImpl.java
@@ -17,10 +17,10 @@ import org.eclipse.fx.ide.css.cssDsl.NumberTok;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.NumberTokImpl#getVal <em>Val</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/PseudoClassFunctionImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/PseudoClassFunctionImpl.java
index 5bcf353a7..59b73d02a 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/PseudoClassFunctionImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/PseudoClassFunctionImpl.java
@@ -28,13 +28,13 @@ import org.eclipse.fx.ide.css.cssDsl.SimpleSelectorForNegation;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.PseudoClassFunctionImpl#isNot <em>Not</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.PseudoClassFunctionImpl#getParamSelector <em>Param Selector</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.PseudoClassFunctionImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.PseudoClassFunctionImpl#getParams <em>Params</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/PseudoClassImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/PseudoClassImpl.java
index 78ff226a9..df562aa0e 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/PseudoClassImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/PseudoClassImpl.java
@@ -11,8 +11,6 @@ import org.eclipse.fx.ide.css.cssDsl.PseudoClass;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Pseudo Class</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/PseudoClassNameImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/PseudoClassNameImpl.java
index c8be1eb1d..188716ad4 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/PseudoClassNameImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/PseudoClassNameImpl.java
@@ -17,10 +17,10 @@ import org.eclipse.fx.ide.css.cssDsl.PseudoClassName;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.PseudoClassNameImpl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/PseudoClassOrFuncImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/PseudoClassOrFuncImpl.java
index 483c05dd2..476b66d87 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/PseudoClassOrFuncImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/PseudoClassOrFuncImpl.java
@@ -11,8 +11,6 @@ import org.eclipse.fx.ide.css.cssDsl.PseudoClassOrFunc;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Pseudo Class Or Func</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/SimpleSelectorForNegationImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/SimpleSelectorForNegationImpl.java
index 7e186d926..377113156 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/SimpleSelectorForNegationImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/SimpleSelectorForNegationImpl.java
@@ -30,12 +30,12 @@ import org.eclipse.fx.ide.css.cssDsl.UniversalSelector;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.SimpleSelectorForNegationImpl#getElement <em>Element</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.SimpleSelectorForNegationImpl#getUniversal <em>Universal</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.SimpleSelectorForNegationImpl#getSubSelectors <em>Sub Selectors</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/StringTokImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/StringTokImpl.java
index fd7dd19be..1bf99fd4a 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/StringTokImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/StringTokImpl.java
@@ -17,10 +17,10 @@ import org.eclipse.fx.ide.css.cssDsl.StringTok;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.StringTokImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/SymbolTokImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/SymbolTokImpl.java
index caa25e83e..d37979b11 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/SymbolTokImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/SymbolTokImpl.java
@@ -17,10 +17,10 @@ import org.eclipse.fx.ide.css.cssDsl.SymbolTok;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.SymbolTokImpl#getSymbol <em>Symbol</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/URLTypeImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/URLTypeImpl.java
index 44e670007..22d8be290 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/URLTypeImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/URLTypeImpl.java
@@ -17,11 +17,11 @@ import org.eclipse.fx.ide.css.cssDsl.URLType;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.URLTypeImpl#getMediaList <em>Media List</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.URLTypeImpl#getUrl <em>Url</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/UniversalSelectorImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/UniversalSelectorImpl.java
index 3483b4cf8..e619ed65a 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/UniversalSelectorImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/UniversalSelectorImpl.java
@@ -18,10 +18,10 @@ import org.eclipse.fx.ide.css.cssDsl.UniversalSelector;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.UniversalSelectorImpl#getNamespace <em>Namespace</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/UrlTokImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/UrlTokImpl.java
index c2535ac90..1c18d1535 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/UrlTokImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/UrlTokImpl.java
@@ -20,10 +20,10 @@ import org.eclipse.fx.ide.css.cssDsl.UrlTok;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.UrlTokImpl#getUrl <em>Url</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/WSTokImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/WSTokImpl.java
index de8c55bc5..467477bf6 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/WSTokImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/WSTokImpl.java
@@ -11,8 +11,6 @@ import org.eclipse.fx.ide.css.cssDsl.WSTok;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>WS Tok</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/charsetImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/charsetImpl.java
index dbe61d933..65ced482b 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/charsetImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/charsetImpl.java
@@ -18,10 +18,10 @@ import org.eclipse.fx.ide.css.cssDsl.charset;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.charsetImpl#getCharset <em>Charset</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/css_declarationImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/css_declarationImpl.java
index 6ae40e748..1deaedd4f 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/css_declarationImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/css_declarationImpl.java
@@ -29,12 +29,12 @@ import org.eclipse.fx.ide.css.cssDsl.css_property;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.css_declarationImpl#getProperty <em>Property</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.css_declarationImpl#getValueTokens <em>Value Tokens</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.css_declarationImpl#isImportant <em>Important</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/css_propertyImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/css_propertyImpl.java
index fb185e220..51ad3f6a2 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/css_propertyImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/css_propertyImpl.java
@@ -18,10 +18,10 @@ import org.eclipse.fx.ide.css.cssDsl.css_property;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.css_propertyImpl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/font_faceImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/font_faceImpl.java
index bbd11c7b7..33b079421 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/font_faceImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/font_faceImpl.java
@@ -28,12 +28,12 @@ import org.eclipse.fx.ide.css.cssDsl.keyframe_selector;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.font_faceImpl#getDeclarations <em>Declarations</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.font_faceImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.font_faceImpl#getKeyframeselectors <em>Keyframeselectors</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/importExpressionImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/importExpressionImpl.java
index 2eb3d0ad8..1fbe0fdd1 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/importExpressionImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/importExpressionImpl.java
@@ -18,10 +18,10 @@ import org.eclipse.fx.ide.css.cssDsl.importExpression;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.importExpressionImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/keyframe_selectorImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/keyframe_selectorImpl.java
index 7946ba66a..a89a732c1 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/keyframe_selectorImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/keyframe_selectorImpl.java
@@ -28,12 +28,12 @@ import org.eclipse.fx.ide.css.cssDsl.keyframe_selector;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.keyframe_selectorImpl#getType <em>Type</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.keyframe_selectorImpl#getPercentage <em>Percentage</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.keyframe_selectorImpl#getDeclarations <em>Declarations</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/keyframesImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/keyframesImpl.java
index 4be401e43..f8475fea5 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/keyframesImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/keyframesImpl.java
@@ -13,8 +13,6 @@ import org.eclipse.fx.ide.css.cssDsl.keyframes;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>keyframes</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/mediaImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/mediaImpl.java
index 89cdef17a..183ba9646 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/mediaImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/mediaImpl.java
@@ -28,11 +28,11 @@ import org.eclipse.fx.ide.css.cssDsl.ruleset;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.mediaImpl#getMedialist <em>Medialist</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.mediaImpl#getRulesets <em>Rulesets</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/pageImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/pageImpl.java
index cd313de75..821dd5990 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/pageImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/pageImpl.java
@@ -28,11 +28,11 @@ import org.eclipse.fx.ide.css.cssDsl.page;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.pageImpl#getPseudoPage <em>Pseudo Page</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.pageImpl#getDeclarations <em>Declarations</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/rulesetImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/rulesetImpl.java
index 92e98f713..b6bc6f3d5 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/rulesetImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/rulesetImpl.java
@@ -27,11 +27,11 @@ import org.eclipse.fx.ide.css.cssDsl.selector;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.rulesetImpl#getSelectors <em>Selectors</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.rulesetImpl#getDeclarations <em>Declarations</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/selectorImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/selectorImpl.java
index 0330371e1..159a0d06c 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/selectorImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/selectorImpl.java
@@ -28,12 +28,12 @@ import org.eclipse.fx.ide.css.cssDsl.simple_selector;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.selectorImpl#getSimpleselectors <em>Simpleselectors</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.selectorImpl#getCombinator <em>Combinator</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.selectorImpl#getSelector <em>Selector</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/simple_selectorImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/simple_selectorImpl.java
index 894504b62..4d3a87c65 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/simple_selectorImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/simple_selectorImpl.java
@@ -30,12 +30,12 @@ import org.eclipse.fx.ide.css.cssDsl.simple_selector;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.simple_selectorImpl#getElement <em>Element</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.simple_selectorImpl#getUniversal <em>Universal</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.simple_selectorImpl#getSubSelectors <em>Sub Selectors</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/stylesheetImpl.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/stylesheetImpl.java
index 3e1b5f0bd..169f4001e 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/stylesheetImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/impl/stylesheetImpl.java
@@ -34,6 +34,7 @@ import org.eclipse.fx.ide.css.cssDsl.stylesheet;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.stylesheetImpl#getCharset <em>Charset</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.stylesheetImpl#getImports <em>Imports</em>}</li>
@@ -43,7 +44,6 @@ import org.eclipse.fx.ide.css.cssDsl.stylesheet;
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.stylesheetImpl#getFont_face <em>Font face</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.impl.stylesheetImpl#getKeyframes <em>Keyframes</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/importExpression.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/importExpression.java
index b3bb30fa5..d944c99a0 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/importExpression.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/importExpression.java
@@ -11,10 +11,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.importExpression#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getimportExpression()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/keyframe_selector.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/keyframe_selector.java
index 82f9c7d59..6146ca2f8 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/keyframe_selector.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/keyframe_selector.java
@@ -13,12 +13,12 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.keyframe_selector#getType <em>Type</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.keyframe_selector#getPercentage <em>Percentage</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.keyframe_selector#getDeclarations <em>Declarations</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getkeyframe_selector()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/media.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/media.java
index 588ca2d09..52e32ec2a 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/media.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/media.java
@@ -13,11 +13,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.media#getMedialist <em>Medialist</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.media#getRulesets <em>Rulesets</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getmedia()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/page.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/page.java
index ed84a6ec4..a1b32da30 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/page.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/page.java
@@ -13,11 +13,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.page#getPseudoPage <em>Pseudo Page</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.page#getDeclarations <em>Declarations</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getpage()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/ruleset.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/ruleset.java
index 91e3d672d..2803da5d3 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/ruleset.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/ruleset.java
@@ -13,11 +13,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.ruleset#getSelectors <em>Selectors</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.ruleset#getDeclarations <em>Declarations</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getruleset()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/selector.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/selector.java
index ca3623cfd..65839b788 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/selector.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/selector.java
@@ -13,12 +13,12 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.selector#getSimpleselectors <em>Simpleselectors</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.selector#getCombinator <em>Combinator</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.selector#getSelector <em>Selector</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getselector()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/simple_selector.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/simple_selector.java
index d492cc82e..86353f192 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/simple_selector.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/simple_selector.java
@@ -13,12 +13,12 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.simple_selector#getElement <em>Element</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.simple_selector#getUniversal <em>Universal</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.simple_selector#getSubSelectors <em>Sub Selectors</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getsimple_selector()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/stylesheet.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/stylesheet.java
index bb08fd74b..85224724a 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/stylesheet.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/stylesheet.java
@@ -13,6 +13,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.stylesheet#getCharset <em>Charset</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.stylesheet#getImports <em>Imports</em>}</li>
@@ -22,7 +23,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.stylesheet#getFont_face <em>Font face</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.css.cssDsl.stylesheet#getKeyframes <em>Keyframes</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.css.cssDsl.CssDslPackage#getstylesheet()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/util/CssDslAdapterFactory.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/util/CssDslAdapterFactory.java
index cd7cbe32b..dbc6ff467 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/util/CssDslAdapterFactory.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/util/CssDslAdapterFactory.java
@@ -4,10 +4,12 @@ package org.eclipse.fx.ide.css.cssDsl.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
+
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
 import org.eclipse.emf.ecore.EObject;
+
 import org.eclipse.fx.ide.css.cssDsl.*;
-import org.eclipse.jdt.annotation.Nullable;
 
 /**
  * <!-- begin-user-doc -->
@@ -69,8 +71,8 @@ public class CssDslAdapterFactory extends AdapterFactoryImpl
    * <!-- end-user-doc -->
    * @generated
    */
-  protected CssDslSwitch<@Nullable Adapter> modelSwitch =
-    new CssDslSwitch<@Nullable Adapter>()
+  protected CssDslSwitch<Adapter> modelSwitch =
+    new CssDslSwitch<Adapter>()
     {
       @Override
       public Adapter casestylesheet(stylesheet object)
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/util/CssDslSwitch.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/util/CssDslSwitch.java
index 8124c5bc0..444d43c2e 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/util/CssDslSwitch.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/cssDsl/util/CssDslSwitch.java
@@ -4,9 +4,10 @@ package org.eclipse.fx.ide.css.cssDsl.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
+
 import org.eclipse.emf.ecore.util.Switch;
+
 import org.eclipse.fx.ide.css.cssDsl.*;
-import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 
 /**
@@ -50,7 +51,7 @@ public class CssDslSwitch<@Nullable T> extends Switch<T>
    * Checks whether this is a switch for the given package.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @parameter ePackage the package in question.
+   * @param ePackage the package in question.
    * @return whether this is a switch for the given package.
    * @generated
    */
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/parser/antlr/CssDslAntlrTokenFileProvider.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/parser/antlr/CssDslAntlrTokenFileProvider.java
index a96b86cba..c5b0cb11d 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/parser/antlr/CssDslAntlrTokenFileProvider.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/parser/antlr/CssDslAntlrTokenFileProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.css.parser.antlr;
 
 import java.io.InputStream;
@@ -8,6 +8,7 @@ import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider;
 
 public class CssDslAntlrTokenFileProvider implements IAntlrTokenFileProvider {
 	
+	@Override
 	public InputStream getAntlrTokenFile() {
 		ClassLoader classLoader = getClass().getClassLoader();
     	return classLoader.getResourceAsStream("org/eclipse/fx/ide/css/parser/antlr/internal/InternalCssDsl.tokens");
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/parser/antlr/CssDslParser.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/parser/antlr/CssDslParser.java
index bdd335762..5cd734840 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/parser/antlr/CssDslParser.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/parser/antlr/CssDslParser.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.css.parser.antlr;
 
 import com.google.inject.Inject;
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/parser/antlr/internal/InternalCssDsl.g b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/parser/antlr/internal/InternalCssDsl.g
index 17c8ae78f..f4a235b97 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/parser/antlr/internal/InternalCssDsl.g
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/parser/antlr/internal/InternalCssDsl.g
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 grammar InternalCssDsl;
 
 options {
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/serializer/AbstractCssDslSemanticSequencer.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/serializer/AbstractCssDslSemanticSequencer.java
index a6d0de1d2..f7edafe55 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/serializer/AbstractCssDslSemanticSequencer.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/serializer/AbstractCssDslSemanticSequencer.java
@@ -1,3 +1,6 @@
+/*
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.css.serializer;
 
 import com.google.inject.Inject;
@@ -51,105 +54,48 @@ public abstract class AbstractCssDslSemanticSequencer extends AbstractDelegating
 	@Inject
 	private CssDslGrammarAccess grammarAccess;
 	
+	@Override
 	public void createSequence(EObject context, EObject semanticObject) {
 		if(semanticObject.eClass().getEPackage() == CssDslPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
 			case CssDslPackage.ATTRIBUTE_SELECTOR:
-				if(context == grammarAccess.getAttributeSelectorRule() ||
-				   context == grammarAccess.getSubSelectorRule() ||
-				   context == grammarAccess.getSubSelectorForNegationRule()) {
-					sequence_AttributeSelector(context, (AttributeSelector) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_AttributeSelector(context, (AttributeSelector) semanticObject); 
+				return; 
 			case CssDslPackage.CLASS_SELECTOR:
-				if(context == grammarAccess.getClassSelectorRule() ||
-				   context == grammarAccess.getSubSelectorRule() ||
-				   context == grammarAccess.getSubSelectorForNegationRule()) {
-					sequence_ClassSelector(context, (ClassSelector) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_ClassSelector(context, (ClassSelector) semanticObject); 
+				return; 
 			case CssDslPackage.COLOR_TOK:
-				if(context == grammarAccess.getColorTokRule() ||
-				   context == grammarAccess.getCssTokRule()) {
-					sequence_ColorTok(context, (ColorTok) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_ColorTok(context, (ColorTok) semanticObject); 
+				return; 
 			case CssDslPackage.ELEMENT_SELECTOR:
-				if(context == grammarAccess.getElementSelectorRule()) {
-					sequence_ElementSelector(context, (ElementSelector) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_ElementSelector(context, (ElementSelector) semanticObject); 
+				return; 
 			case CssDslPackage.FUNC_TOK:
-				if(context == grammarAccess.getCssTokRule() ||
-				   context == grammarAccess.getIdentifierOrFuncTokRule()) {
-					sequence_IdentifierOrFuncTok(context, (FuncTok) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_IdentifierOrFuncTok(context, (FuncTok) semanticObject); 
+				return; 
 			case CssDslPackage.ID_SELECTOR:
-				if(context == grammarAccess.getIdSelectorRule() ||
-				   context == grammarAccess.getSubSelectorRule() ||
-				   context == grammarAccess.getSubSelectorForNegationRule()) {
-					sequence_IdSelector(context, (IdSelector) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_IdSelector(context, (IdSelector) semanticObject); 
+				return; 
 			case CssDslPackage.IDENTIFIER_TOK:
-				if(context == grammarAccess.getCssTokRule() ||
-				   context == grammarAccess.getIdentifierOrFuncTokRule() ||
-				   context == grammarAccess.getIdentifierOrFuncTokAccess().getFuncTokNameAction_2_0()) {
-					sequence_IdentifierOrFuncTok(context, (IdentifierTok) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_IdentifierOrFuncTok(context, (IdentifierTok) semanticObject); 
+				return; 
 			case CssDslPackage.NUMBER_TOK:
-				if(context == grammarAccess.getCssTokRule() ||
-				   context == grammarAccess.getNumberTokRule()) {
-					sequence_NumberTok(context, (NumberTok) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_NumberTok(context, (NumberTok) semanticObject); 
+				return; 
 			case CssDslPackage.PSEUDO_CLASS_FUNCTION:
-				if(context == grammarAccess.getPseudoClassFunctionRule() ||
-				   context == grammarAccess.getPseudoClassOrFuncRule() ||
-				   context == grammarAccess.getSubSelectorRule()) {
-					sequence_PseudoClassFunction(context, (PseudoClassFunction) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_PseudoClassFunction(context, (PseudoClassFunction) semanticObject); 
+				return; 
 			case CssDslPackage.PSEUDO_CLASS_NAME:
-				if(context == grammarAccess.getPseudoClassRule() ||
-				   context == grammarAccess.getPseudoClassNameRule() ||
-				   context == grammarAccess.getPseudoClassOrFuncRule() ||
-				   context == grammarAccess.getSubSelectorRule() ||
-				   context == grammarAccess.getSubSelectorForNegationRule()) {
-					sequence_PseudoClassName(context, (PseudoClassName) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_PseudoClassName(context, (PseudoClassName) semanticObject); 
+				return; 
 			case CssDslPackage.SIMPLE_SELECTOR_FOR_NEGATION:
-				if(context == grammarAccess.getSimpleSelectorForNegationRule()) {
-					sequence_SimpleSelectorForNegation(context, (SimpleSelectorForNegation) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_SimpleSelectorForNegation(context, (SimpleSelectorForNegation) semanticObject); 
+				return; 
 			case CssDslPackage.STRING_TOK:
-				if(context == grammarAccess.getCssTokRule() ||
-				   context == grammarAccess.getStringTokRule()) {
-					sequence_StringTok(context, (StringTok) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_StringTok(context, (StringTok) semanticObject); 
+				return; 
 			case CssDslPackage.SYMBOL_TOK:
-				if(context == grammarAccess.getCssTokRule() ||
-				   context == grammarAccess.getSymbolTokRule()) {
-					sequence_SymbolTok(context, (SymbolTok) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_SymbolTok(context, (SymbolTok) semanticObject); 
+				return; 
 			case CssDslPackage.URL_TYPE:
 				if(context == grammarAccess.getURLTypeRule()) {
 					sequence_URLType(context, (URLType) semanticObject); 
@@ -161,43 +107,23 @@ public abstract class AbstractCssDslSemanticSequencer extends AbstractDelegating
 				}
 				else break;
 			case CssDslPackage.UNIVERSAL_SELECTOR:
-				if(context == grammarAccess.getUniversalSelectorRule()) {
-					sequence_UniversalSelector(context, (UniversalSelector) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_UniversalSelector(context, (UniversalSelector) semanticObject); 
+				return; 
 			case CssDslPackage.URL_TOK:
-				if(context == grammarAccess.getCssTokRule() ||
-				   context == grammarAccess.getUrlTokRule()) {
-					sequence_UrlTok(context, (UrlTok) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_UrlTok(context, (UrlTok) semanticObject); 
+				return; 
 			case CssDslPackage.WS_TOK:
-				if(context == grammarAccess.getCssTokRule() ||
-				   context == grammarAccess.getWSTokRule()) {
-					sequence_WSTok(context, (WSTok) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_WSTok(context, (WSTok) semanticObject); 
+				return; 
 			case CssDslPackage.CHARSET:
-				if(context == grammarAccess.getCharsetRule()) {
-					sequence_charset(context, (charset) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_charset(context, (charset) semanticObject); 
+				return; 
 			case CssDslPackage.CSS_DECLARATION:
-				if(context == grammarAccess.getCss_declarationRule()) {
-					sequence_css_declaration(context, (css_declaration) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_css_declaration(context, (css_declaration) semanticObject); 
+				return; 
 			case CssDslPackage.CSS_PROPERTY:
-				if(context == grammarAccess.getCss_propertyRule()) {
-					sequence_css_property(context, (css_property) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_css_property(context, (css_property) semanticObject); 
+				return; 
 			case CssDslPackage.FONT_FACE:
 				if(context == grammarAccess.getFont_faceRule()) {
 					sequence_font_face(context, (font_face) semanticObject); 
@@ -209,53 +135,29 @@ public abstract class AbstractCssDslSemanticSequencer extends AbstractDelegating
 				}
 				else break;
 			case CssDslPackage.IMPORT_EXPRESSION:
-				if(context == grammarAccess.getImportExpressionRule()) {
-					sequence_importExpression(context, (importExpression) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_importExpression(context, (importExpression) semanticObject); 
+				return; 
 			case CssDslPackage.KEYFRAME_SELECTOR:
-				if(context == grammarAccess.getKeyframe_selectorRule()) {
-					sequence_keyframe_selector(context, (keyframe_selector) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_keyframe_selector(context, (keyframe_selector) semanticObject); 
+				return; 
 			case CssDslPackage.MEDIA:
-				if(context == grammarAccess.getMediaRule()) {
-					sequence_media(context, (media) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_media(context, (media) semanticObject); 
+				return; 
 			case CssDslPackage.PAGE:
-				if(context == grammarAccess.getPageRule()) {
-					sequence_page(context, (page) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_page(context, (page) semanticObject); 
+				return; 
 			case CssDslPackage.RULESET:
-				if(context == grammarAccess.getRulesetRule()) {
-					sequence_ruleset(context, (ruleset) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_ruleset(context, (ruleset) semanticObject); 
+				return; 
 			case CssDslPackage.SELECTOR:
-				if(context == grammarAccess.getSelectorRule()) {
-					sequence_selector(context, (selector) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_selector(context, (selector) semanticObject); 
+				return; 
 			case CssDslPackage.SIMPLE_SELECTOR:
-				if(context == grammarAccess.getSimple_selectorRule()) {
-					sequence_simple_selector(context, (simple_selector) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_simple_selector(context, (simple_selector) semanticObject); 
+				return; 
 			case CssDslPackage.STYLESHEET:
-				if(context == grammarAccess.getStylesheetRule()) {
-					sequence_stylesheet(context, (stylesheet) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_stylesheet(context, (stylesheet) semanticObject); 
+				return; 
 			}
 		if (errorAcceptor != null) errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
 	}
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/serializer/AbstractCssDslSyntacticSequencer.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/serializer/AbstractCssDslSyntacticSequencer.java
index f50ed1df4..489885443 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/serializer/AbstractCssDslSyntacticSequencer.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/serializer/AbstractCssDslSyntacticSequencer.java
@@ -1,3 +1,6 @@
+/*
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.css.serializer;
 
 import com.google.inject.Inject;
@@ -213,184 +216,273 @@ public abstract class AbstractCssDslSyntacticSequencer extends AbstractSyntactic
 	}
 
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     COLON?
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     (rule start) COLON (ambiguity) name=Identifier
 	 */
 	protected void emit_PseudoClass_COLONTerminalRuleCall_1_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     '@charset' | '@CHARSET'
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     (rule start) (ambiguity) charset=CSSSTRING
 	 */
 	protected void emit_charset_CHARSETKeyword_0_1_or_CharsetKeyword_0_0(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     WS*
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     (rule start) (ambiguity) property=css_property
 	 */
 	protected void emit_css_declaration_WSTerminalRuleCall_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     WS*
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     property=css_property (ambiguity) COLON valueTokens+=CssTok
 	 */
 	protected void emit_css_declaration_WSTerminalRuleCall_2_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     '@font-face' | '@FONT-FACE'
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     (rule start) (ambiguity) '{' ';'* '}' (rule start)
+	 *     (rule start) (ambiguity) '{' ';'+ declarations+=css_declaration
+	 *     (rule start) (ambiguity) '{' declarations+=css_declaration
 	 */
 	protected void emit_font_face_FONTFACEKeyword_1_1_or_FontFaceKeyword_1_0(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     ';'*
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     (rule start) ('@font-face' | '@FONT-FACE') '{' (ambiguity) '}' (rule start)
+	 *     declarations+=css_declaration (ambiguity) '}' (rule end)
 	 */
 	protected void emit_font_face_SemicolonKeyword_4_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     ';'+
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     (rule start) ('@font-face' | '@FONT-FACE') '{' (ambiguity) declarations+=css_declaration
+	 *     declarations+=css_declaration (ambiguity) declarations+=css_declaration
 	 */
 	protected void emit_font_face_SemicolonKeyword_4_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     '@import' | '@IMPORT'
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     (rule start) (ambiguity) 'url(' url=ValidURL
+	 *     (rule start) (ambiguity) value=CSSSTRING
 	 */
 	protected void emit_importExpression_IMPORTKeyword_0_1_or_ImportKeyword_0_0(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     ';'*
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     declarations+=css_declaration (ambiguity) '}' (rule end)
+	 *     percentage=Num PERCENT '{' (ambiguity) '}' (rule end)
+	 *     type=Identifier '{' (ambiguity) '}' (rule end)
 	 */
 	protected void emit_keyframe_selector_SemicolonKeyword_3_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     ';'+
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     declarations+=css_declaration (ambiguity) declarations+=css_declaration
+	 *     percentage=Num PERCENT '{' (ambiguity) declarations+=css_declaration
+	 *     type=Identifier '{' (ambiguity) declarations+=css_declaration
 	 */
 	protected void emit_keyframe_selector_SemicolonKeyword_3_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     '@keyframes' | '@KEYFRAMES'
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     (rule start) (ambiguity) name=Identifier
 	 */
 	protected void emit_keyframes_KEYFRAMESKeyword_1_1_or_KeyframesKeyword_1_0(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     ';'*
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     keyframeselectors+=keyframe_selector (ambiguity) '}' (rule end)
+	 *     name=Identifier '{' (ambiguity) '}' (rule end)
 	 */
 	protected void emit_keyframes_SemicolonKeyword_5_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     ';'+
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     keyframeselectors+=keyframe_selector (ambiguity) keyframeselectors+=keyframe_selector
+	 *     name=Identifier '{' (ambiguity) keyframeselectors+=keyframe_selector
 	 */
 	protected void emit_keyframes_SemicolonKeyword_5_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     '@media' | '@MEDIA'
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     (rule start) (ambiguity) medialist=media_list
 	 */
 	protected void emit_media_MEDIAKeyword_0_1_or_MediaKeyword_0_0(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     '@page' | '@PAGE'
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     (rule start) (ambiguity) '{' ';'* '}' (rule start)
+	 *     (rule start) (ambiguity) '{' ';'+ declarations+=css_declaration
+	 *     (rule start) (ambiguity) '{' declarations+=css_declaration
+	 *     (rule start) (ambiguity) pseudoPage=pseudo_page
 	 */
 	protected void emit_page_PAGEKeyword_1_1_or_PageKeyword_1_0(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     ';'*
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     (rule start) ('@page' | '@PAGE') '{' (ambiguity) '}' (rule start)
+	 *     declarations+=css_declaration (ambiguity) '}' (rule end)
+	 *     pseudoPage=pseudo_page '{' (ambiguity) '}' (rule end)
 	 */
 	protected void emit_page_SemicolonKeyword_5_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     ';'+
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     (rule start) ('@page' | '@PAGE') '{' (ambiguity) declarations+=css_declaration
+	 *     declarations+=css_declaration (ambiguity) declarations+=css_declaration
+	 *     pseudoPage=pseudo_page '{' (ambiguity) declarations+=css_declaration
 	 */
 	protected void emit_page_SemicolonKeyword_5_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     ';'?
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     declarations+=css_declaration (ambiguity) '}' (rule end)
 	 */
 	protected void emit_ruleset_SemicolonKeyword_4_2_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     WS*
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     selectors+=selector (ambiguity) COMMA selectors+=selector
 	 */
 	protected void emit_ruleset_WSTerminalRuleCall_1_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     WS*
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     selectors+=selector (ambiguity) '{' '}' (rule end)
+	 *     selectors+=selector (ambiguity) '{' declarations+=css_declaration
 	 */
 	protected void emit_ruleset_WSTerminalRuleCall_2_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     WS*
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     combinator=combinator (ambiguity) selector=selector
 	 */
 	protected void emit_selector_WSTerminalRuleCall_1_0_1_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     WS+
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     simpleselectors+=simple_selector (ambiguity) combinator=combinator
+	 *     simpleselectors+=simple_selector (ambiguity) selector=selector
 	 */
 	protected void emit_selector_WSTerminalRuleCall_1_1_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
 	/**
-	 * Syntax:
+	 * Ambiguous syntax:
 	 *     WS*
+	 *
+	 * This ambiguous syntax occurs at:
+	 *     combinator=combinator (ambiguity) selector=selector
 	 */
 	protected void emit_selector_WSTerminalRuleCall_1_1_1_1_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/services/CssDslGrammarAccess.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/services/CssDslGrammarAccess.java
index 96b83fe2f..8446a56e5 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/services/CssDslGrammarAccess.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/services/CssDslGrammarAccess.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.css.services;
 
 import com.google.inject.Singleton;
@@ -39,7 +39,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		//stylesheet:
 		//	charset=charset? imports+=importExpression* (ruleset+=ruleset | media+=media | page+=page | font_face+=font_face |
 		//	keyframes+=keyframes)*;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//charset=charset? imports+=importExpression* (ruleset+=ruleset | media+=media | page+=page | font_face+=font_face |
 		//keyframes+=keyframes)*
@@ -103,7 +103,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//charset:
 		//	("@charset" | "@CHARSET") charset=CSSSTRING ";";
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//("@charset" | "@CHARSET") charset=CSSSTRING ";"
 		public Group getGroup() { return cGroup; }
@@ -144,7 +144,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//importExpression:
 		//	("@import" | "@IMPORT") (value=CSSSTRING | URLType mediaList=media_list?) ";";
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//("@import" | "@IMPORT") (value=CSSSTRING | URLType mediaList=media_list?) ";"
 		public Group getGroup() { return cGroup; }
@@ -204,7 +204,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		//page:
 		//	{page} ("@page" | "@PAGE") pseudoPage=pseudo_page? "{" declarations+=css_declaration? (";"
 		//	declarations+=css_declaration?)* "}";
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{page} ("@page" | "@PAGE") pseudoPage=pseudo_page? "{" declarations+=css_declaration? (";"
 		//declarations+=css_declaration?)* "}"
@@ -261,7 +261,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//pseudo_page:
 		//	COLON Identifier;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//COLON Identifier
 		public Group getGroup() { return cGroup; }
@@ -288,7 +288,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//media:
 		//	("@media" | "@MEDIA") medialist=media_list "{" rulesets+=ruleset* "}";
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//("@media" | "@MEDIA") medialist=media_list "{" rulesets+=ruleset* "}"
 		public Group getGroup() { return cGroup; }
@@ -331,7 +331,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//media_list:
 		//	medium (COMMA medium)*;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//medium (COMMA medium)*
 		public Group getGroup() { return cGroup; }
@@ -355,7 +355,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//medium:
 		//	Identifier;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//Identifier
 		public RuleCall getIdentifierParserRuleCall() { return cIdentifierParserRuleCall; }
@@ -380,7 +380,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		//font_face:
 		//	{font_face} ("@font-face" | "@FONT-FACE") "{" declarations+=css_declaration? (";" declarations+=css_declaration?)*
 		//	"}";
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{font_face} ("@font-face" | "@FONT-FACE") "{" declarations+=css_declaration? (";" declarations+=css_declaration?)* "}"
 		public Group getGroup() { return cGroup; }
@@ -443,7 +443,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		//keyframes:
 		//	{font_face} ("@keyframes" | "@KEYFRAMES") name=Identifier "{" keyframeselectors+=keyframe_selector? (";"
 		//	keyframeselectors+=keyframe_selector?)* "}";
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{font_face} ("@keyframes" | "@KEYFRAMES") name=Identifier "{" keyframeselectors+=keyframe_selector? (";"
 		//keyframeselectors+=keyframe_selector?)* "}"
@@ -514,7 +514,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		//keyframe_selector:
 		//	(type=Identifier | percentage=Num PERCENT) "{" declarations+=css_declaration? (";" declarations+=css_declaration?)*
 		//	"}";
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//(type=Identifier | percentage=Num PERCENT) "{" declarations+=css_declaration? (";" declarations+=css_declaration?)* "}"
 		public Group getGroup() { return cGroup; }
@@ -590,7 +590,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		//ruleset:
 		//	selectors+=selector (WS* COMMA selectors+=selector)* WS* "{" (declarations+=css_declaration (";"
 		//	declarations+=css_declaration)* ";"?)? "}";
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//selectors+=selector (WS* COMMA selectors+=selector)* WS* "{" (declarations+=css_declaration (";"
 		//declarations+=css_declaration)* ";"?)? "}"
@@ -676,7 +676,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		//selector hidden(ML_COMMENT):
 		//	simpleselectors+=simple_selector (combinator=combinator WS* selector=selector | WS+ (combinator=combinator WS*)?
 		//	selector=selector)?;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//simpleselectors+=simple_selector (combinator=combinator WS* selector=selector | WS+ (combinator=combinator WS*)?
 		//selector=selector)?
@@ -751,7 +751,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		//SimpleSelectorForNegation:
 		//	(element=ElementSelector | universal=UniversalSelector) subSelectors+=SubSelectorForNegation* | =>
 		//	subSelectors+=SubSelectorForNegation+;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//(element=ElementSelector | universal=UniversalSelector) subSelectors+=SubSelectorForNegation* | =>
 		//subSelectors+=SubSelectorForNegation+
@@ -798,7 +798,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//SubSelectorForNegation returns CssSelector:
 		//	IdSelector | ClassSelector | AttributeSelector | PseudoClass;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//IdSelector | ClassSelector | AttributeSelector | PseudoClass
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -832,7 +832,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//simple_selector hidden(ML_COMMENT):
 		//	(element=ElementSelector | universal=UniversalSelector) subSelectors+=SubSelector* | subSelectors+=SubSelector+;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//(element=ElementSelector | universal=UniversalSelector) subSelectors+=SubSelector* | subSelectors+=SubSelector+
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -878,7 +878,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//SubSelector returns CssSelector:
 		//	IdSelector | ClassSelector | AttributeSelector | PseudoClassOrFunc;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//IdSelector | ClassSelector | AttributeSelector | PseudoClassOrFunc
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -921,7 +921,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		//AttributeSelector returns CssSelector:
 		//	{AttributeSelector} "[" name=Identifier (op=("^=" | "$=" | "*=" | "=" | INCLUDES | DASHMATCH) value=(Identifier |
 		//	CSSSTRING))? "]";
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{AttributeSelector} "[" name=Identifier (op=("^=" | "$=" | "*=" | "=" | INCLUDES | DASHMATCH) value=(Identifier |
 		//CSSSTRING))? "]"
@@ -992,7 +992,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//ClassSelector:
 		//	{ClassSelector} "." name=Identifier;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{ClassSelector} "." name=Identifier
 		public Group getGroup() { return cGroup; }
@@ -1019,7 +1019,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//ElementSelector:
 		//	{ElementSelector} name=Identifier;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{ElementSelector} name=Identifier
 		public Group getGroup() { return cGroup; }
@@ -1044,7 +1044,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//UniversalSelector:
 		//	{UniversalSelector} namespace=css_namespace_prefix? "*";
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{UniversalSelector} namespace=css_namespace_prefix? "*"
 		public Group getGroup() { return cGroup; }
@@ -1072,7 +1072,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//IdSelector:
 		//	{IdSelector} HASHMARK name=Identifier;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{IdSelector} HASHMARK name=Identifier
 		public Group getGroup() { return cGroup; }
@@ -1100,7 +1100,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//css_namespace_prefix:
 		//	(Identifier | "*")? "|";
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//(Identifier | "*")? "|"
 		public Group getGroup() { return cGroup; }
@@ -1133,7 +1133,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//css_declaration hidden(ML_COMMENT):
 		//	WS* property=css_property WS* COLON valueTokens+=CssTok+ important?=IMPORTANT_SYM?;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//WS* property=css_property WS* COLON valueTokens+=CssTok+ important?=IMPORTANT_SYM?
 		public Group getGroup() { return cGroup; }
@@ -1175,7 +1175,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//css_property:
 		//	{css_property} name=ValidPropertyIdent;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{css_property} name=ValidPropertyIdent
 		public Group getGroup() { return cGroup; }
@@ -1196,7 +1196,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//ValidPropertyIdent:
 		//	Identifier;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//Identifier
 		public RuleCall getIdentifierParserRuleCall() { return cIdentifierParserRuleCall; }
@@ -1210,7 +1210,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//PseudoClassOrFunc:
 		//	PseudoClass | PseudoClassFunction;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//PseudoClass | PseudoClassFunction
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -1231,7 +1231,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//PseudoClass:
 		//	COLON COLON? PseudoClassName;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//COLON COLON? PseudoClassName
 		public Group getGroup() { return cGroup; }
@@ -1253,7 +1253,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//PseudoClassName:
 		//	name=Identifier;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//name=Identifier
 		public Assignment getNameAssignment() { return cNameAssignment; }
@@ -1282,7 +1282,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//PseudoClassFunction:
 		//	not?=NotFunctionCall paramSelector=SimpleSelectorForNegation ")" | COLON name=Identifier "(" params+=CssTok* ")";
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//not?=NotFunctionCall paramSelector=SimpleSelectorForNegation ")" | COLON name=Identifier "(" params+=CssTok* ")"
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -1338,7 +1338,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//NotFunctionCall hidden():
 		//	COLON "not(";
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//COLON "not("
 		public Group getGroup() { return cGroup; }
@@ -1359,7 +1359,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//combinator:
 		//	PLUS | ">" | "~";
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//PLUS | ">" | "~"
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -1382,7 +1382,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//operator:
 		//	"/" | COMMA;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//"/" | COMMA
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -1402,7 +1402,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//unary_operator:
 		//	DASH | PLUS;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//DASH | PLUS
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -1425,7 +1425,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//SymbolTok returns CssTok:
 		//	{SymbolTok} symbol=(COMMA | PERCENT);
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{SymbolTok} symbol=(COMMA | PERCENT)
 		public Group getGroup() { return cGroup; }
@@ -1454,7 +1454,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//WSTok returns CssTok:
 		//	{WSTok} WS;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{WSTok} WS
 		public Group getGroup() { return cGroup; }
@@ -1475,7 +1475,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//StringTok returns CssTok:
 		//	{StringTok} value=CSSSTRING;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{StringTok} value=CSSSTRING
 		public Group getGroup() { return cGroup; }
@@ -1502,7 +1502,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		////sign=DASH? ( ival=Integer | dval=Real)
 		//NumberTok returns CssTok hidden():
 		//	{NumberTok} val=Num;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{NumberTok} val=Num
 		public Group getGroup() { return cGroup; }
@@ -1526,7 +1526,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//UrlTok returns CssTok:
 		//	{UrlTok} url=URLType;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{UrlTok} url=URLType
 		public Group getGroup() { return cGroup; }
@@ -1550,7 +1550,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//ColorTok returns CssTok hidden():
 		//	{ColorTok} value=Hex;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{ColorTok} value=Hex
 		public Group getGroup() { return cGroup; }
@@ -1580,7 +1580,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//IdentifierOrFuncTok returns CssTok hidden(ML_COMMENT):
 		//	{IdentifierTok} name=Identifier ({FuncTok.name=current} "(" params+=CssTok+ ")")?;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//{IdentifierTok} name=Identifier ({FuncTok.name=current} "(" params+=CssTok+ ")")?
 		public Group getGroup() { return cGroup; }
@@ -1626,7 +1626,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//CssTok hidden(ML_COMMENT):
 		//	IdentifierOrFuncTok | SymbolTok | WSTok | StringTok | NumberTok | UrlTok | ColorTok;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//IdentifierOrFuncTok | SymbolTok | WSTok | StringTok | NumberTok | UrlTok | ColorTok
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -1663,7 +1663,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//URLType hidden(): //	FULLURL
 		//	"url(" url=ValidURL ")";
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		////	FULLURL
 		//"url(" url=ValidURL ")"
@@ -1711,7 +1711,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		//ValidURLSymbol:
 		//	DASH / * "'" | '(' | ')' | need to be escaped* / | "." | UNDERSCORE | "~" | COLON | "/" | "?" | HASHMARK | "[" | "]" |
 		//	"@" | "!" | "$" | "&" | "*" | PLUS | COMMA | ";" | "=" KeywordHack;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//DASH / * "'" | '(' | ')' | need to be escaped* / | "." | UNDERSCORE | "~" | COLON | "/" | "?" | HASHMARK | "[" | "]" | "@"
 		//| "!" | "$" | "&" | "*" | PLUS | COMMA | ";" | "=" KeywordHack
@@ -1791,7 +1791,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//KeywordHack:
 		//	"not" | "no" | "url" | "ur";
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//"not" | "no" | "url" | "ur"
 		public Alternatives getAlternatives() { return cAlternatives; }
@@ -1836,7 +1836,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		//ValidURL returns ecore::EString hidden():
 		//	CSSSTRING | (ValidURLSymbol | KeywordHack | ONE_HEX_LETTER | ONE_NON_HEX_LETTER | ONE_INT | "\\ " | "\\(" | "\\)" |
 		//	"\\\'" | "\\\"" | PERCENT (ONE_INT | ONE_HEX_LETTER) (ONE_INT | ONE_HEX_LETTER))+;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//CSSSTRING | (ValidURLSymbol | KeywordHack | ONE_HEX_LETTER | ONE_NON_HEX_LETTER | ONE_INT | "\\ " | "\\(" | "\\)" |
 		//"\\\'" | "\\\"" | PERCENT (ONE_INT | ONE_HEX_LETTER) (ONE_INT | ONE_HEX_LETTER))+
@@ -1925,7 +1925,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		//Identifier returns ecore::EString hidden():
 		//	DASH? (UNDERSCORE | ONE_HEX_LETTER | ONE_NON_HEX_LETTER | KeywordHack) => (UNDERSCORE | DASH | ONE_HEX_LETTER |
 		//	ONE_NON_HEX_LETTER | ONE_INT | KeywordHack)*;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//DASH? (UNDERSCORE | ONE_HEX_LETTER | ONE_NON_HEX_LETTER | KeywordHack) => (UNDERSCORE | DASH | ONE_HEX_LETTER |
 		//ONE_NON_HEX_LETTER | ONE_INT | KeywordHack)*
@@ -1992,7 +1992,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//Num returns ecore::EDouble hidden():
 		//	(PLUS | DASH)? ("." => ONE_INT+ | ONE_INT+ ("." => ONE_INT+)?);
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//(PLUS | DASH)? ("." => ONE_INT+ | ONE_INT+ ("." => ONE_INT+)?)
 		public Group getGroup() { return cGroup; }
@@ -2045,7 +2045,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//Hex returns ecore::EString:
 		//	HASHMARK => (ONE_INT | ONE_HEX_LETTER)+;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//HASHMARK => (ONE_INT | ONE_HEX_LETTER)+
 		public Group getGroup() { return cGroup; }
@@ -2221,7 +2221,7 @@ public class CssDslGrammarAccess extends AbstractGrammarElementFinder {
 		return grammar;
 	}
 	
-	
+	@Override
 	public Grammar getGrammar() {
 		return grammar;
 	}
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/validation/AbstractCssDslJavaValidator.java b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/validation/AbstractCssDslJavaValidator.java
index 15765ba4d..e9b08ee1c 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/validation/AbstractCssDslJavaValidator.java
+++ b/bundles/tooling/org.eclipse.fx.ide.css/src-gen/org/eclipse/fx/ide/css/validation/AbstractCssDslJavaValidator.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.css.validation;
  
 import java.util.ArrayList;
diff --git a/bundles/tooling/org.eclipse.fx.ide.fxgraph.ui/src-gen/org/eclipse/fx/ide/fxgraph/ui/AbstractFXGraphUiModule.java b/bundles/tooling/org.eclipse.fx.ide.fxgraph.ui/src-gen/org/eclipse/fx/ide/fxgraph/ui/AbstractFXGraphUiModule.java
index 275de942c..78b9a0b88 100644
--- a/bundles/tooling/org.eclipse.fx.ide.fxgraph.ui/src-gen/org/eclipse/fx/ide/fxgraph/ui/AbstractFXGraphUiModule.java
+++ b/bundles/tooling/org.eclipse.fx.ide.fxgraph.ui/src-gen/org/eclipse/fx/ide/fxgraph/ui/AbstractFXGraphUiModule.java
@@ -231,6 +231,11 @@ public abstract class AbstractFXGraphUiModule extends org.eclipse.xtext.xbase.ui
 	}
 
 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+	public Class<? extends org.eclipse.xtext.generator.IContextualOutputConfigurationProvider> bindIContextualOutputConfigurationProvider() {
+		return org.eclipse.xtext.builder.EclipseOutputConfigurationProvider.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
 	public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) {
 		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.builder.builderState.IBuilderState.class);
 	}
diff --git a/bundles/tooling/org.eclipse.fx.ide.fxgraph/src-gen/org/eclipse/fx/ide/fxgraph/FXGraph.genmodel b/bundles/tooling/org.eclipse.fx.ide.fxgraph/src-gen/org/eclipse/fx/ide/fxgraph/FXGraph.genmodel
index 3c08b7fa0..11605e08d 100644
--- a/bundles/tooling/org.eclipse.fx.ide.fxgraph/src-gen/org/eclipse/fx/ide/fxgraph/FXGraph.genmodel
+++ b/bundles/tooling/org.eclipse.fx.ide.fxgraph/src-gen/org/eclipse/fx/ide/fxgraph/FXGraph.genmodel
@@ -4,7 +4,7 @@
     editorDirectory="/org.eclipse.fx.ide.fxgraph.editor/src" modelPluginID="org.eclipse.fx.ide.fxgraph"
     forceOverwrite="true" modelName="FXGraph" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     complianceLevel="6.0" copyrightFields="false" editPluginID="org.eclipse.fx.ide.fxgraph.edit"
-    editorPluginID="org.eclipse.fx.ide.fxgraph.editor" runtimeVersion="2.10" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types">
+    editorPluginID="org.eclipse.fx.ide.fxgraph.editor" runtimeVersion="2.11" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types">
   <genPackages prefix="FXGraph" basePackage="org.eclipse.fx.ide.fxgraph" disposableProviderFactory="true"
       ecorePackage="FXGraph.ecore#/">
     <genClasses ecoreClass="FXGraph.ecore#//Model">
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.tests/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.l10n.tests/META-INF/MANIFEST.MF
index 7a8cf6a09..44e2bab6c 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.tests/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.tests/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.fx.ide.l10n,
  org.eclipse.core.runtime,

  org.eclipse.xtext.junit4,

  org.eclipse.ui.workbench;resolution:=optional,

- org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional

+ org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional,

+ org.eclipse.xtext.xbase.lib

 Import-Package: org.apache.log4j,

  org.junit;version="4.5.0",

  org.junit.runner;version="4.5.0",

diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.tests/src-gen/org/eclipse/fx/ide/l10n/NLSDslInjectorProvider.java b/bundles/tooling/org.eclipse.fx.ide.l10n.tests/src-gen/org/eclipse/fx/ide/l10n/NLSDslInjectorProvider.java
index 671f4b953..a54d3048d 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.tests/src-gen/org/eclipse/fx/ide/l10n/NLSDslInjectorProvider.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.tests/src-gen/org/eclipse/fx/ide/l10n/NLSDslInjectorProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.l10n;
 
 import org.eclipse.xtext.junit4.GlobalRegistries;
@@ -20,6 +20,7 @@ public class NLSDslInjectorProvider implements IInjectorProvider, IRegistryConfi
 		GlobalRegistries.initializeDefaults();
 	}
 
+	@Override
 	public Injector getInjector()
 	{
 		if (injector == null) {
@@ -34,10 +35,12 @@ public class NLSDslInjectorProvider implements IInjectorProvider, IRegistryConfi
 	    return new NLSDslStandaloneSetup().createInjectorAndDoEMFRegistration();
 	}
 
+	@Override
 	public void restoreRegistry() {
 		stateBeforeInjectorCreation.restoreGlobalState();
 	}
 
+	@Override
 	public void setupRegistry() {
 		getInjector();
 		stateAfterInjectorCreation.restoreGlobalState();
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.tests/src-gen/org/eclipse/fx/ide/l10n/NLSDslUiInjectorProvider.java b/bundles/tooling/org.eclipse.fx.ide.l10n.tests/src-gen/org/eclipse/fx/ide/l10n/NLSDslUiInjectorProvider.java
index 6c51ad4b4..713acbe1f 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.tests/src-gen/org/eclipse/fx/ide/l10n/NLSDslUiInjectorProvider.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.tests/src-gen/org/eclipse/fx/ide/l10n/NLSDslUiInjectorProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.l10n;
 
 import org.eclipse.xtext.junit4.IInjectorProvider;
@@ -9,6 +9,7 @@ import com.google.inject.Injector;
 
 public class NLSDslUiInjectorProvider implements IInjectorProvider {
 	
+	@Override
 	public Injector getInjector() {
 		return org.eclipse.fx.ide.l10n.ui.internal.NLSDslActivator.getInstance().getInjector("org.eclipse.fx.ide.l10n.NLSDsl");
 	}
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/plugin.xml_gen b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/plugin.xml_gen
index e814adef2..83ee3438e 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/plugin.xml_gen
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/plugin.xml_gen
@@ -279,6 +279,27 @@
 	        <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
         </page>
     </extension>
+    <extension point="org.eclipse.ui.menus">
+		<menuContribution locationURI="popup:#TextEditorContext?after=xtext.ui.openDeclaration">
+			<command
+				commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand"
+				id="org.eclipse.fx.ide.l10n.NLSDsl.OpenGeneratedCode"
+				style="push">
+					<visibleWhen checkEnabled="false">
+						<reference definitionId="org.eclipse.fx.ide.l10n.NLSDsl.Editor.opened" />
+					</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+	<extension point="org.eclipse.ui.handlers">
+		<handler
+			class="org.eclipse.fx.ide.l10n.ui.NLSDslExecutableExtensionFactory:org.eclipse.xtext.ui.generator.trace.OpenGeneratedFileHandler"
+			commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand">
+				<activeWhen>
+					<reference definitionId="org.eclipse.fx.ide.l10n.NLSDsl.Editor.opened" />
+				</activeWhen>
+		</handler>
+	</extension>
 
 	<!-- Quick Outline -->
 	<extension
@@ -394,5 +415,11 @@
             extensions="l10n">
     </provider>
   </extension>
+  <extension point="org.eclipse.team.core.fileTypes">
+    <fileTypes
+            extension="l10n"
+            type="text">
+    </fileTypes>
+  </extension>
 
 </plugin>
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/AbstractNLSDslUiModule.java b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/AbstractNLSDslUiModule.java
index e843c0f40..891a342d8 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/AbstractNLSDslUiModule.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/AbstractNLSDslUiModule.java
@@ -4,14 +4,13 @@
  */
 package org.eclipse.fx.ide.l10n.ui;
 
-import org.eclipse.xtext.ui.DefaultUiModule;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 /**
  * Manual modifications go to {org.eclipse.fx.ide.l10n.ui.NLSDslUiModule}
  */
 @SuppressWarnings("all")
-public abstract class AbstractNLSDslUiModule extends DefaultUiModule {
+public abstract class AbstractNLSDslUiModule extends org.eclipse.xtext.common.types.ui.DefaultCommonTypesUiModule {
 	
 	public AbstractNLSDslUiModule(AbstractUIPlugin plugin) {
 		super(plugin);
@@ -54,6 +53,11 @@ public abstract class AbstractNLSDslUiModule extends DefaultUiModule {
 	}
 
 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+	public Class<? extends org.eclipse.xtext.generator.IContextualOutputConfigurationProvider> bindIContextualOutputConfigurationProvider() {
+		return org.eclipse.xtext.builder.EclipseOutputConfigurationProvider.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
 	public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) {
 		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.builder.builderState.IBuilderState.class);
 	}
@@ -154,60 +158,10 @@ public abstract class AbstractNLSDslUiModule extends DefaultUiModule {
 	}
 
 	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public java.lang.ClassLoader bindClassLoaderToInstance() {
-		return getClass().getClassLoader();
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.access.IJvmTypeProvider.Factory> bindIJvmTypeProvider$Factory() {
-		return org.eclipse.xtext.common.types.access.jdt.JdtTypeProviderFactory.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.xtext.AbstractTypeScopeProvider> bindAbstractTypeScopeProvider() {
-		return org.eclipse.xtext.common.types.xtext.ui.JdtBasedSimpleTypeScopeProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.xtext.ui.ITypesProposalProvider> bindITypesProposalProvider() {
-		return org.eclipse.xtext.common.types.xtext.ui.JdtTypesProposalProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.access.jdt.IJavaProjectProvider> bindIJavaProjectProvider() {
-		return org.eclipse.xtext.common.types.xtext.ui.XtextResourceSetBasedProjectProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.hyperlinking.IHyperlinkHelper> bindIHyperlinkHelper() {
-		return org.eclipse.xtext.common.types.xtext.ui.TypeAwareHyperlinkHelper.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
 	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.PrefixMatcher> bindPrefixMatcher() {
 		return org.eclipse.xtext.ui.editor.contentassist.FQNPrefixMatcher.class;
 	}
 
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.AbstractJavaBasedContentProposalProvider.ReferenceProposalCreator> bindAbstractJavaBasedContentProposalProvider$ReferenceProposalCreator() {
-		return org.eclipse.xtext.common.types.xtext.ui.TypeAwareReferenceProposalCreator.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.IValidationJobScheduler> bindIValidationJobScheduler() {
-		return org.eclipse.xtext.common.types.xtext.ui.JdtValidationJobScheduler.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.refactoring.impl.RefactoringResourceSetProvider> bindRefactoringResourceSetProvider() {
-		return org.eclipse.xtext.common.types.ui.refactoring.JvmRefactoringResourceSetProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.ui.query.IJavaSearchParticipation> bindIJavaSearchParticipation() {
-		return org.eclipse.xtext.common.types.ui.query.IJavaSearchParticipation.Yes.class;
-	}
-
 	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment
 	public com.google.inject.Provider<org.eclipse.xtext.ui.codetemplates.ui.preferences.TemplatesLanguageConfiguration> provideTemplatesLanguageConfiguration() {
 		return org.eclipse.xtext.ui.codetemplates.ui.AccessibleCodetemplatesActivator.getTemplatesLanguageConfigurationProvider();
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/AbstractNLSDslProposalProvider.java b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/AbstractNLSDslProposalProvider.java
index 504bfc6d1..e190a2bb9 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/AbstractNLSDslProposalProvider.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/AbstractNLSDslProposalProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.l10n.ui.contentassist;
 
 import org.eclipse.emf.ecore.EObject;
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/NLSDslParser.java b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/NLSDslParser.java
index bf2c7c636..811dcae5c 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/NLSDslParser.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/NLSDslParser.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.l10n.ui.contentassist.antlr;
 
 import java.util.Collection;
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/PartialNLSDslContentAssistParser.java b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/PartialNLSDslContentAssistParser.java
index bcebf2067..d28fc3bb2 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/PartialNLSDslContentAssistParser.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/PartialNLSDslContentAssistParser.java
@@ -12,14 +12,14 @@ import org.eclipse.xtext.ui.editor.contentassist.antlr.FollowElement;
 import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
 import org.eclipse.xtext.util.PolymorphicDispatcher;
 
-/**
- * @author Sebastian Zarnekow - Initial contribution and API
+/*
+ * Template CodetemplatesGeneratorFragment.xpt
  */
-@SuppressWarnings("restriction")
 public class PartialNLSDslContentAssistParser extends NLSDslParser implements IPartialContentAssistParser {
 
 	private AbstractRule rule;
 
+	@Override
 	public void initializeFor(AbstractRule rule) {
 		this.rule = rule;
 	}
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g
index 4cf679d15..e1d848a19 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 grammar InternalNLSDsl;
 
 options {
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/contentassist/.NLSDslProposalProvider.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/contentassist/.NLSDslProposalProvider.xtendbin
new file mode 100644
index 000000000..fed092d22
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/contentassist/.NLSDslProposalProvider.xtendbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/edit/.StringReplacementHandler.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/edit/.StringReplacementHandler.xtendbin
new file mode 100644
index 000000000..dd5d8d42b
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/edit/.StringReplacementHandler.xtendbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingCalculator.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingCalculator.xtendbin
new file mode 100644
index 000000000..3a14a42b3
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingCalculator.xtendbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingConfiguration.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingConfiguration.xtendbin
new file mode 100644
index 000000000..700187df5
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingConfiguration.xtendbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.TokenToAttributeIdMapper.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.TokenToAttributeIdMapper.xtendbin
new file mode 100644
index 000000000..7ea7dcef9
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.TokenToAttributeIdMapper.xtendbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslDescriptionLabelProvider.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslDescriptionLabelProvider.xtendbin
new file mode 100644
index 000000000..625af0136
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslDescriptionLabelProvider.xtendbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslLabelProvider.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslLabelProvider.xtendbin
new file mode 100644
index 000000000..65439b3c1
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslLabelProvider.xtendbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/outline/.NLSDslOutlineTreeProvider.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/outline/.NLSDslOutlineTreeProvider.xtendbin
new file mode 100644
index 000000000..786fad2d0
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/outline/.NLSDslOutlineTreeProvider.xtendbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/quickfix/.NLSDslQuickfixProvider.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/quickfix/.NLSDslQuickfixProvider.xtendbin
new file mode 100644
index 000000000..fa56a7bcc
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/quickfix/.NLSDslQuickfixProvider.xtendbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.l10n/META-INF/MANIFEST.MF
index 40d4c2dd0..ce3c64126 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/META-INF/MANIFEST.MF
@@ -18,7 +18,8 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport,
  org.eclipse.xtext.xbase.lib,

  org.antlr.runtime,

  org.eclipse.xtext.common.types,

- org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional

+ org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional,

+ org.eclipse.equinox.common;bundle-version="3.7.0"

 Import-Package: org.apache.log4j

 Bundle-RequiredExecutionEnvironment: JavaSE-1.7

 Export-Package: org.eclipse.fx.ide.l10n,

diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/model/generated/NLSDsl.genmodel b/bundles/tooling/org.eclipse.fx.ide.l10n/model/generated/NLSDsl.genmodel
index 161185dd8..6259a3852 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/model/generated/NLSDsl.genmodel
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/model/generated/NLSDsl.genmodel
@@ -3,8 +3,8 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.fx.ide.l10n/src-gen" editDirectory="/org.eclipse.fx.ide.l10n.edit/src"
     editorDirectory="/org.eclipse.fx.ide.l10n.editor/src" modelPluginID="org.eclipse.fx.ide.l10n"
     forceOverwrite="true" modelName="NLSDsl" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.fx.ide.l10n.edit"
-    editorPluginID="org.eclipse.fx.ide.l10n.editor" runtimeVersion="2.10">
+    complianceLevel="6.0" copyrightFields="false" editPluginID="org.eclipse.fx.ide.l10n.edit"
+    editorPluginID="org.eclipse.fx.ide.l10n.editor" runtimeVersion="2.11">
   <genPackages prefix="NLSDsl" basePackage="org.eclipse.fx.ide.l10n" disposableProviderFactory="true"
       fileExtensions="l10n" ecorePackage="NLSDsl.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="NLSDsl.ecore#//PredefinedTypes">
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/AbstractNLSDslRuntimeModule.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/AbstractNLSDslRuntimeModule.java
index 815938335..f81407cd1 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/AbstractNLSDslRuntimeModule.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/AbstractNLSDslRuntimeModule.java
@@ -6,7 +6,6 @@ package org.eclipse.fx.ide.l10n;
 import java.util.Properties;
 
 import org.eclipse.xtext.Constants;
-import org.eclipse.xtext.service.DefaultRuntimeModule;
 
 import com.google.inject.Binder;
 import com.google.inject.name.Names;
@@ -14,8 +13,8 @@ import com.google.inject.name.Names;
 /**
  * Manual modifications go to {org.eclipse.fx.ide.l10n.NLSDslRuntimeModule}
  */
- @SuppressWarnings("all")
-public abstract class AbstractNLSDslRuntimeModule extends DefaultRuntimeModule {
+@SuppressWarnings("all")
+public abstract class AbstractNLSDslRuntimeModule extends org.eclipse.xtext.common.types.DefaultCommonTypesRuntimeModule {
 
 	protected Properties properties = null;
 
@@ -35,6 +34,11 @@ public abstract class AbstractNLSDslRuntimeModule extends DefaultRuntimeModule {
 	}
 	
 	// contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
+	public java.lang.ClassLoader bindClassLoaderToInstance() {
+		return getClass().getClassLoader();
+	}
+
+	// contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
 	public Class<? extends org.eclipse.xtext.IGrammarAccess> bindIGrammarAccess() {
 		return org.eclipse.fx.ide.l10n.services.NLSDslGrammarAccess.class;
 	}
@@ -145,26 +149,6 @@ public abstract class AbstractNLSDslRuntimeModule extends DefaultRuntimeModule {
 	}
 
 	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public java.lang.ClassLoader bindClassLoaderToInstance() {
-		return getClass().getClassLoader();
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public org.eclipse.xtext.common.types.TypesFactory bindTypesFactoryToInstance() {
-		return org.eclipse.xtext.common.types.TypesFactory.eINSTANCE;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.access.IJvmTypeProvider.Factory> bindIJvmTypeProvider$Factory() {
-		return org.eclipse.xtext.common.types.access.ClasspathTypeProviderFactory.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.xtext.AbstractTypeScopeProvider> bindAbstractTypeScopeProvider() {
-		return org.eclipse.xtext.common.types.xtext.ClasspathBasedTypeScopeProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
 	public Class<? extends org.eclipse.xtext.scoping.IGlobalScopeProvider> bindIGlobalScopeProvider() {
 		return org.eclipse.xtext.common.types.xtext.TypesAwareDefaultGlobalScopeProvider.class;
 	}
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/NLSDslStandaloneSetupGenerated.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/NLSDslStandaloneSetupGenerated.java
index 5871952c8..4c0ab7122 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/NLSDslStandaloneSetupGenerated.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/NLSDslStandaloneSetupGenerated.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.l10n;
 
 import org.eclipse.emf.ecore.EPackage;
@@ -16,6 +16,7 @@ import com.google.inject.Injector;
 @SuppressWarnings("all")
 public class NLSDslStandaloneSetupGenerated implements ISetup {
 
+	@Override
 	public Injector createInjectorAndDoEMFRegistration() {
 		org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
 
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/Message.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/Message.java
index 5c2de3291..7765000e2 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/Message.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/Message.java
@@ -11,11 +11,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.Message#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.Message#getMessage <em>Message</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.l10n.nLSDsl.NLSDslPackage#getMessage()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/MessageEntry.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/MessageEntry.java
index 392adba99..10a2b301e 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/MessageEntry.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/MessageEntry.java
@@ -13,13 +13,13 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.MessageEntry#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.MessageEntry#getParamList <em>Param List</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.MessageEntry#getMessageList <em>Message List</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.MessageEntry#getEntryRef <em>Entry Ref</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.l10n.nLSDsl.NLSDslPackage#getMessageEntry()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/MessageParam.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/MessageParam.java
index 6d1016765..db9aa95cc 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/MessageParam.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/MessageParam.java
@@ -11,11 +11,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.MessageParam#getPredefined <em>Predefined</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.MessageParam#getVar <em>Var</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.l10n.nLSDsl.NLSDslPackage#getMessageParam()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/NLS.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/NLS.java
index d12e1eafe..63def3834 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/NLS.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/NLS.java
@@ -13,11 +13,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.NLS#getPackage <em>Package</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.NLS#getBundleList <em>Bundle List</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.l10n.nLSDsl.NLSDslPackage#getNLS()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/NLSBundle.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/NLSBundle.java
index 0733fa8d4..4d12fd70b 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/NLSBundle.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/NLSBundle.java
@@ -13,13 +13,13 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.NLSBundle#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.NLSBundle#getLang <em>Lang</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.NLSBundle#getFormatterList <em>Formatter List</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.NLSBundle#getMessageEntryList <em>Message Entry List</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.l10n.nLSDsl.NLSDslPackage#getNLSBundle()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/NLSFormatter.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/NLSFormatter.java
index 66fb9cb0d..c07a250cb 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/NLSFormatter.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/NLSFormatter.java
@@ -11,11 +11,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.NLSFormatter#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.NLSFormatter#getClassRef <em>Class Ref</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.l10n.nLSDsl.NLSDslPackage#getNLSFormatter()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/PackageDeclaration.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/PackageDeclaration.java
index ece86151f..3d7c9bba8 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/PackageDeclaration.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/PackageDeclaration.java
@@ -11,10 +11,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.PackageDeclaration#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.l10n.nLSDsl.NLSDslPackage#getPackageDeclaration()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/PredefinedTypes.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/PredefinedTypes.java
index 4b932a82e..bd0594c2e 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/PredefinedTypes.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/PredefinedTypes.java
@@ -146,6 +146,8 @@ public enum PredefinedTypes implements Enumerator
    * Returns the '<em><b>Predefined Types</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static PredefinedTypes get(String literal)
@@ -165,6 +167,8 @@ public enum PredefinedTypes implements Enumerator
    * Returns the '<em><b>Predefined Types</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static PredefinedTypes getByName(String name)
@@ -184,6 +188,8 @@ public enum PredefinedTypes implements Enumerator
    * Returns the '<em><b>Predefined Types</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static PredefinedTypes get(int value)
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/RichString.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/RichString.java
index 6ad3ead98..6b09860e2 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/RichString.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/RichString.java
@@ -13,10 +13,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.RichString#getExpressions <em>Expressions</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.l10n.nLSDsl.NLSDslPackage#getRichString()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/RichStringLiteral.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/RichStringLiteral.java
index b90ac36f5..444582986 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/RichStringLiteral.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/RichStringLiteral.java
@@ -11,10 +11,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.RichStringLiteral#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.l10n.nLSDsl.NLSDslPackage#getRichStringLiteral()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/RichStringLiteralEnd.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/RichStringLiteralEnd.java
index 1cfb5c226..ab20c1d2a 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/RichStringLiteralEnd.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/RichStringLiteralEnd.java
@@ -11,10 +11,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.RichStringLiteralEnd#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.l10n.nLSDsl.NLSDslPackage#getRichStringLiteralEnd()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/RichStringLiteralInbetween.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/RichStringLiteralInbetween.java
index 0cae60a7a..8c2475c4c 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/RichStringLiteralInbetween.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/RichStringLiteralInbetween.java
@@ -11,10 +11,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.RichStringLiteralInbetween#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.l10n.nLSDsl.NLSDslPackage#getRichStringLiteralInbetween()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/RichStringLiteralStart.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/RichStringLiteralStart.java
index d276ad580..f93d2859f 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/RichStringLiteralStart.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/RichStringLiteralStart.java
@@ -11,10 +11,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.RichStringLiteralStart#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.l10n.nLSDsl.NLSDslPackage#getRichStringLiteralStart()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/RichVarPart.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/RichVarPart.java
index 26485eb25..83396b4f1 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/RichVarPart.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/RichVarPart.java
@@ -11,12 +11,12 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.RichVarPart#getKey <em>Key</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.RichVarPart#getFormat <em>Format</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.RichVarPart#getFormatterClass <em>Formatter Class</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.fx.ide.l10n.nLSDsl.NLSDslPackage#getRichVarPart()
  * @model
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/MessageEntryImpl.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/MessageEntryImpl.java
index ecf64dc6e..75261a4c0 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/MessageEntryImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/MessageEntryImpl.java
@@ -29,13 +29,13 @@ import org.eclipse.fx.ide.l10n.nLSDsl.NLSDslPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.impl.MessageEntryImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.impl.MessageEntryImpl#getParamList <em>Param List</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.impl.MessageEntryImpl#getMessageList <em>Message List</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.impl.MessageEntryImpl#getEntryRef <em>Entry Ref</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/MessageImpl.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/MessageImpl.java
index d7bc8a969..01736ea7c 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/MessageImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/MessageImpl.java
@@ -21,11 +21,11 @@ import org.eclipse.fx.ide.l10n.nLSDsl.RichString;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.impl.MessageImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.impl.MessageImpl#getMessage <em>Message</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/MessageParamImpl.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/MessageParamImpl.java
index e65aaa12e..8aa093fcd 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/MessageParamImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/MessageParamImpl.java
@@ -19,11 +19,11 @@ import org.eclipse.fx.ide.l10n.nLSDsl.PredefinedTypes;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.impl.MessageParamImpl#getPredefined <em>Predefined</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.impl.MessageParamImpl#getVar <em>Var</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/NLSBundleImpl.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/NLSBundleImpl.java
index fd1bba14b..b5e7c2426 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/NLSBundleImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/NLSBundleImpl.java
@@ -29,13 +29,13 @@ import org.eclipse.fx.ide.l10n.nLSDsl.NLSFormatter;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.impl.NLSBundleImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.impl.NLSBundleImpl#getLang <em>Lang</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.impl.NLSBundleImpl#getFormatterList <em>Formatter List</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.impl.NLSBundleImpl#getMessageEntryList <em>Message Entry List</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/NLSFormatterImpl.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/NLSFormatterImpl.java
index 89675ba52..f0e88f445 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/NLSFormatterImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/NLSFormatterImpl.java
@@ -18,11 +18,11 @@ import org.eclipse.fx.ide.l10n.nLSDsl.NLSFormatter;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.impl.NLSFormatterImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.impl.NLSFormatterImpl#getClassRef <em>Class Ref</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/NLSImpl.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/NLSImpl.java
index 69bf82746..2231a0acd 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/NLSImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/NLSImpl.java
@@ -29,11 +29,11 @@ import org.eclipse.fx.ide.l10n.nLSDsl.PackageDeclaration;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.impl.NLSImpl#getPackage <em>Package</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.impl.NLSImpl#getBundleList <em>Bundle List</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/PackageDeclarationImpl.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/PackageDeclarationImpl.java
index f9c4bc738..808c9795d 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/PackageDeclarationImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/PackageDeclarationImpl.java
@@ -18,10 +18,10 @@ import org.eclipse.fx.ide.l10n.nLSDsl.PackageDeclaration;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.impl.PackageDeclarationImpl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/RichStringImpl.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/RichStringImpl.java
index fad377f60..a8bb1c563 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/RichStringImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/RichStringImpl.java
@@ -26,10 +26,10 @@ import org.eclipse.fx.ide.l10n.nLSDsl.RichString;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.impl.RichStringImpl#getExpressions <em>Expressions</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/RichStringLiteralEndImpl.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/RichStringLiteralEndImpl.java
index f0b894b83..2d88090ff 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/RichStringLiteralEndImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/RichStringLiteralEndImpl.java
@@ -18,10 +18,10 @@ import org.eclipse.fx.ide.l10n.nLSDsl.RichStringLiteralEnd;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.impl.RichStringLiteralEndImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/RichStringLiteralImpl.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/RichStringLiteralImpl.java
index 1bbea640c..5dc581f04 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/RichStringLiteralImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/RichStringLiteralImpl.java
@@ -18,10 +18,10 @@ import org.eclipse.fx.ide.l10n.nLSDsl.RichStringLiteral;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.impl.RichStringLiteralImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/RichStringLiteralInbetweenImpl.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/RichStringLiteralInbetweenImpl.java
index 196196aa0..d442a6b3c 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/RichStringLiteralInbetweenImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/RichStringLiteralInbetweenImpl.java
@@ -18,10 +18,10 @@ import org.eclipse.fx.ide.l10n.nLSDsl.RichStringLiteralInbetween;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.impl.RichStringLiteralInbetweenImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/RichStringLiteralStartImpl.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/RichStringLiteralStartImpl.java
index ccfd89040..48199e110 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/RichStringLiteralStartImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/RichStringLiteralStartImpl.java
@@ -18,10 +18,10 @@ import org.eclipse.fx.ide.l10n.nLSDsl.RichStringLiteralStart;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.impl.RichStringLiteralStartImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/RichVarPartImpl.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/RichVarPartImpl.java
index d860b6b5c..f9dbf18b5 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/RichVarPartImpl.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/RichVarPartImpl.java
@@ -20,12 +20,12 @@ import org.eclipse.fx.ide.l10n.nLSDsl.RichVarPart;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.impl.RichVarPartImpl#getKey <em>Key</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.impl.RichVarPartImpl#getFormat <em>Format</em>}</li>
  *   <li>{@link org.eclipse.fx.ide.l10n.nLSDsl.impl.RichVarPartImpl#getFormatterClass <em>Formatter Class</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/util/NLSDslSwitch.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/util/NLSDslSwitch.java
index c7bf05577..1b18c2281 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/util/NLSDslSwitch.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/util/NLSDslSwitch.java
@@ -50,7 +50,7 @@ public class NLSDslSwitch<T> extends Switch<T>
    * Checks whether this is a switch for the given package.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @parameter ePackage the package in question.
+   * @param ePackage the package in question.
    * @return whether this is a switch for the given package.
    * @generated
    */
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/NLSDslAntlrTokenFileProvider.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/NLSDslAntlrTokenFileProvider.java
index b2d85ae6d..eac02ff81 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/NLSDslAntlrTokenFileProvider.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/NLSDslAntlrTokenFileProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.l10n.parser.antlr;
 
 import java.io.InputStream;
@@ -8,6 +8,7 @@ import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider;
 
 public class NLSDslAntlrTokenFileProvider implements IAntlrTokenFileProvider {
 	
+	@Override
 	public InputStream getAntlrTokenFile() {
 		ClassLoader classLoader = getClass().getClassLoader();
     	return classLoader.getResourceAsStream("org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.tokens");
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/NLSDslParser.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/NLSDslParser.java
index c4ff10326..d4a108281 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/NLSDslParser.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/NLSDslParser.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.l10n.parser.antlr;
 
 import com.google.inject.Inject;
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g
index b77045132..b099d729e 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 grammar InternalNLSDsl;
 
 options {
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/serializer/NLSDslSemanticSequencer.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/serializer/NLSDslSemanticSequencer.java
index 293aa16db..452aa8e9b 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/serializer/NLSDslSemanticSequencer.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/serializer/NLSDslSemanticSequencer.java
@@ -1,3 +1,6 @@
+/*
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.l10n.serializer;
 
 import com.google.inject.Inject;
@@ -35,86 +38,48 @@ public class NLSDslSemanticSequencer extends AbstractDelegatingSemanticSequencer
 	@Inject
 	private NLSDslGrammarAccess grammarAccess;
 	
+	@Override
 	public void createSequence(EObject context, EObject semanticObject) {
 		if(semanticObject.eClass().getEPackage() == NLSDslPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
 			case NLSDslPackage.MESSAGE:
-				if(context == grammarAccess.getMessageRule()) {
-					sequence_Message(context, (Message) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_Message(context, (Message) semanticObject); 
+				return; 
 			case NLSDslPackage.MESSAGE_ENTRY:
-				if(context == grammarAccess.getMessageEntryRule()) {
-					sequence_MessageEntry(context, (MessageEntry) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_MessageEntry(context, (MessageEntry) semanticObject); 
+				return; 
 			case NLSDslPackage.MESSAGE_PARAM:
-				if(context == grammarAccess.getMessageParamRule()) {
-					sequence_MessageParam(context, (MessageParam) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_MessageParam(context, (MessageParam) semanticObject); 
+				return; 
 			case NLSDslPackage.NLS:
-				if(context == grammarAccess.getNLSRule()) {
-					sequence_NLS(context, (NLS) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_NLS(context, (NLS) semanticObject); 
+				return; 
 			case NLSDslPackage.NLS_BUNDLE:
-				if(context == grammarAccess.getNLSBundleRule()) {
-					sequence_NLSBundle(context, (NLSBundle) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_NLSBundle(context, (NLSBundle) semanticObject); 
+				return; 
 			case NLSDslPackage.NLS_FORMATTER:
-				if(context == grammarAccess.getNLSFormatterRule()) {
-					sequence_NLSFormatter(context, (NLSFormatter) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_NLSFormatter(context, (NLSFormatter) semanticObject); 
+				return; 
 			case NLSDslPackage.PACKAGE_DECLARATION:
-				if(context == grammarAccess.getPackageDeclarationRule()) {
-					sequence_PackageDeclaration(context, (PackageDeclaration) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_PackageDeclaration(context, (PackageDeclaration) semanticObject); 
+				return; 
 			case NLSDslPackage.RICH_STRING:
-				if(context == grammarAccess.getRichStringRule()) {
-					sequence_RichString(context, (RichString) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_RichString(context, (RichString) semanticObject); 
+				return; 
 			case NLSDslPackage.RICH_STRING_LITERAL:
-				if(context == grammarAccess.getRichStringLiteralRule()) {
-					sequence_RichStringLiteral(context, (RichStringLiteral) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_RichStringLiteral(context, (RichStringLiteral) semanticObject); 
+				return; 
 			case NLSDslPackage.RICH_STRING_LITERAL_END:
-				if(context == grammarAccess.getRichStringLiteralEndRule()) {
-					sequence_RichStringLiteralEnd(context, (RichStringLiteralEnd) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_RichStringLiteralEnd(context, (RichStringLiteralEnd) semanticObject); 
+				return; 
 			case NLSDslPackage.RICH_STRING_LITERAL_INBETWEEN:
-				if(context == grammarAccess.getRichStringLiteralInbetweenRule()) {
-					sequence_RichStringLiteralInbetween(context, (RichStringLiteralInbetween) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_RichStringLiteralInbetween(context, (RichStringLiteralInbetween) semanticObject); 
+				return; 
 			case NLSDslPackage.RICH_STRING_LITERAL_START:
-				if(context == grammarAccess.getRichStringLiteralStartRule()) {
-					sequence_RichStringLiteralStart(context, (RichStringLiteralStart) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_RichStringLiteralStart(context, (RichStringLiteralStart) semanticObject); 
+				return; 
 			case NLSDslPackage.RICH_VAR_PART:
-				if(context == grammarAccess.getRichVarPartRule()) {
-					sequence_RichVarPart(context, (RichVarPart) semanticObject); 
-					return; 
-				}
-				else break;
+				sequence_RichVarPart(context, (RichVarPart) semanticObject); 
+				return; 
 			}
 		if (errorAcceptor != null) errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
 	}
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/serializer/NLSDslSyntacticSequencer.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/serializer/NLSDslSyntacticSequencer.java
index fc8eecc9d..c32f18d8e 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/serializer/NLSDslSyntacticSequencer.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/serializer/NLSDslSyntacticSequencer.java
@@ -1,3 +1,6 @@
+/*
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.l10n.serializer;
 
 import com.google.inject.Inject;
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/services/NLSDslGrammarAccess.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/services/NLSDslGrammarAccess.java
index 277ce57f8..50b04196b 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/services/NLSDslGrammarAccess.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/services/NLSDslGrammarAccess.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.fx.ide.l10n.services;
 
 import com.google.inject.Singleton;
@@ -30,7 +30,7 @@ public class NLSDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//NLS:
 		//	package=PackageDeclaration? "{" bundleList+=NLSBundle+ "}";
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//package=PackageDeclaration? "{" bundleList+=NLSBundle+ "}"
 		public Group getGroup() { return cGroup; }
@@ -63,7 +63,7 @@ public class NLSDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//PackageDeclaration:
 		//	"package" name=QualifiedName;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//"package" name=QualifiedName
 		public Group getGroup() { return cGroup; }
@@ -96,7 +96,7 @@ public class NLSDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//NLSBundle:
 		//	"bundle" name=ID "default" lang=ID "{" formatterList+=NLSFormatter* messageEntryList+=MessageEntry+ "}";
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//"bundle" name=ID "default" lang=ID "{" formatterList+=NLSFormatter* messageEntryList+=MessageEntry+ "}"
 		public Group getGroup() { return cGroup; }
@@ -149,7 +149,7 @@ public class NLSDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//NLSFormatter:
 		//	"formatter" name=ID classRef=QualifiedName;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//"formatter" name=ID classRef=QualifiedName
 		public Group getGroup() { return cGroup; }
@@ -204,7 +204,7 @@ public class NLSDslGrammarAccess extends AbstractGrammarElementFinder {
 		//MessageEntry:
 		//	name=ID ("(" paramList+=MessageParam ("," paramList+=MessageParam)* ")")? ("{" messageList+=Message (","
 		//	messageList+=Message)* "}" | "[" entryRef=[MessageEntry|QualifiedName] "]");
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//name=ID ("(" paramList+=MessageParam ("," paramList+=MessageParam)* ")")? ("{" messageList+=Message (","
 		//messageList+=Message)* "}" | "[" entryRef=[MessageEntry|QualifiedName] "]")
@@ -302,7 +302,7 @@ public class NLSDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//MessageParam:
 		//	predefined=PredefinedTypes var=ID;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//predefined=PredefinedTypes var=ID
 		public Group getGroup() { return cGroup; }
@@ -331,7 +331,7 @@ public class NLSDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//Message:
 		//	name=ID ":" message=RichString / *| '[' messageRef=[Message|QualifiedName] ']'* /;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//name=ID ":" message=RichString / *| '[' messageRef=[Message|QualifiedName] ']'* /
 		public Group getGroup() { return cGroup; }
@@ -373,7 +373,7 @@ public class NLSDslGrammarAccess extends AbstractGrammarElementFinder {
 		//RichString:
 		//	expressions+=RichStringLiteral | expressions+=RichStringLiteralStart expressions+=RichVarPart?
 		//	(expressions+=RichStringLiteralInbetween expressions+=RichVarPart?)* expressions+=RichStringLiteralEnd;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//expressions+=RichStringLiteral | expressions+=RichStringLiteralStart expressions+=RichVarPart?
 		//(expressions+=RichStringLiteralInbetween expressions+=RichVarPart?)* expressions+=RichStringLiteralEnd
@@ -430,7 +430,7 @@ public class NLSDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//RichStringLiteral:
 		//	value=RICH_TEXT;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//value=RICH_TEXT
 		public Assignment getValueAssignment() { return cValueAssignment; }
@@ -446,7 +446,7 @@ public class NLSDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//RichStringLiteralStart:
 		//	value=RICH_TEXT_START;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//value=RICH_TEXT_START
 		public Assignment getValueAssignment() { return cValueAssignment; }
@@ -462,7 +462,7 @@ public class NLSDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//RichStringLiteralEnd:
 		//	value=RICH_TEXT_END;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//value=RICH_TEXT_END
 		public Assignment getValueAssignment() { return cValueAssignment; }
@@ -478,7 +478,7 @@ public class NLSDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//RichStringLiteralInbetween:
 		//	value=RICH_TEXT_INBETWEEN;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//value=RICH_TEXT_INBETWEEN
 		public Assignment getValueAssignment() { return cValueAssignment; }
@@ -501,7 +501,7 @@ public class NLSDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//RichVarPart:
 		//	key=ID (format=STRING formatterClass=[NLSFormatter|QualifiedName]?)?;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//key=ID (format=STRING formatterClass=[NLSFormatter|QualifiedName]?)?
 		public Group getGroup() { return cGroup; }
@@ -537,7 +537,7 @@ public class NLSDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//ValidID:
 		//	ID;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//ID
 		public RuleCall getIDTerminalRuleCall() { return cIDTerminalRuleCall; }
@@ -553,7 +553,7 @@ public class NLSDslGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//QualifiedName:
 		//	ValidID ("." ValidID)*;
-		public ParserRule getRule() { return rule; }
+		@Override public ParserRule getRule() { return rule; }
 
 		//ValidID ("." ValidID)*
 		public Group getGroup() { return cGroup; }
@@ -686,7 +686,7 @@ public class NLSDslGrammarAccess extends AbstractGrammarElementFinder {
 		return grammar;
 	}
 	
-	
+	@Override
 	public Grammar getGrammar() {
 		return grammar;
 	}
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/formatting/.NLSDslFormatter.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/formatting/.NLSDslFormatter.xtendbin
new file mode 100644
index 000000000..cb9202cb2
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/formatting/.NLSDslFormatter.xtendbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/generator/.NLSDslGenerator.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/generator/.NLSDslGenerator.xtendbin
new file mode 100644
index 000000000..ef7f44c32
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/generator/.NLSDslGenerator.xtendbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/scoping/.NLSDslScopeProvider.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/scoping/.NLSDslScopeProvider.xtendbin
new file mode 100644
index 000000000..f432ca253
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/scoping/.NLSDslScopeProvider.xtendbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/validation/.NLSDslValidator.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/validation/.NLSDslValidator.xtendbin
new file mode 100644
index 000000000..525822e52
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/validation/.NLSDslValidator.xtendbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl.ui/src-gen/org/eclipse/fx/ide/rrobot/dsl/ui/AbstractRTaskUiModule.java b/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl.ui/src-gen/org/eclipse/fx/ide/rrobot/dsl/ui/AbstractRTaskUiModule.java
index d7d4e9c53..46ff35c39 100644
--- a/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl.ui/src-gen/org/eclipse/fx/ide/rrobot/dsl/ui/AbstractRTaskUiModule.java
+++ b/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl.ui/src-gen/org/eclipse/fx/ide/rrobot/dsl/ui/AbstractRTaskUiModule.java
@@ -103,6 +103,11 @@ public abstract class AbstractRTaskUiModule extends org.eclipse.xtext.ui.Default
 	}
 
 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+	public Class<? extends org.eclipse.xtext.generator.IContextualOutputConfigurationProvider> bindIContextualOutputConfigurationProvider() {
+		return org.eclipse.xtext.builder.EclipseOutputConfigurationProvider.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
 	public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) {
 		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.builder.builderState.IBuilderState.class);
 	}