style using CSS

33 files changed, 1235 insertions, 2422 deletions

diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/.classpath b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/.classpath
index 8a638c2ab..1c98a2d18 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/.classpath
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/.classpath
@@ -4,7 +4,6 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src-xml"/>
-	<classpathentry kind="src" path="src-js"/>
 	<classpathentry kind="src" path="src-groovy"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src-groovy/groovy/Groovy-highlight.css b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src-groovy/groovy/Groovy-highlight.css
new file mode 100644
index 000000000..65fcc044c
--- /dev/null
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src-groovy/groovy/Groovy-highlight.css
@@ -0,0 +1,50 @@
+.groovy_default {
+	-fx-fill: rgb(0, 0, 0);
+}
+
+.groovy_operator {
+	-fx-fill: rgb(0, 0, 0);
+}
+
+.groovy_bracket {
+	-fx-fill: rgb(0, 0, 0);
+}
+
+.groovy_keyword_return {
+	-fx-fill: rgb(127, 0, 85);
+	-fx-font-weight: bold;
+}
+
+.groovy_keyword_type {
+	-fx-fill: rgb(127, 0, 85);
+	-fx-font-weight: bold;
+}
+
+.groovy_keyword {
+	-fx-fill: rgb(127, 0, 85);
+	-fx-font-weight: bold;
+}
+
+.groovy_doc_default {
+	-fx-fill: rgb(63, 95, 191);
+}
+
+.groovy_single_line_comment {
+	-fx-fill: rgb(63, 127, 95);
+}
+
+.groovy_multi_line_comment {
+	-fx-fill: rgb(63, 127, 95);
+}
+
+.groovy_string {
+	-fx-fill: rgb(42, 0, 255);
+}
+
+.groovy_var_interpolation {
+	-fx-fill: rgb(255, 0, 0);
+}
+
+.groovy_char {
+	-fx-fill: rgb(42, 0, 255);
+}
\ No newline at end of file
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src-groovy/groovy/groovy.hsl b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src-groovy/groovy/groovy.hsl
index 893a29dd3..3a9ed35df 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src-groovy/groovy/groovy.hsl
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src-groovy/groovy/groovy.hsl
@@ -1,4 +1,4 @@
-JS {
+Groovy {
 	partition __dftl_partition_content_type
 	partition __groovy_javadoc
 	partition __groovy_multiline_comment
@@ -6,13 +6,13 @@ JS {
 	partition __groovy_string
 	partition __groovy_character
 	rule-damager __dftl_partition_content_type {
-		default token groovy_default { fgcolor : rgb(0, 0, 0) }
-		token groovy_string { fgcolor : rgb(42, 0, 255) }
-		token groovy_operator { fgcolor : rgb(0, 0, 0) }
-		token groovy_bracket { fgcolor : rgb(0, 0, 0) }
-		token groovy_keyword_return { fgcolor : rgb(127, 0, 85) }
-		token groovy_keyword_type { fgcolor : rgb(127, 0, 85) }
-		token groovy_keyword { fgcolor : rgb(127, 0, 85) }
+		default token groovy_default
+		token groovy_string
+		token groovy_operator
+		token groovy_bracket 
+		token groovy_keyword_return 
+		token groovy_keyword_type 
+		token groovy_keyword 
 		keywords groovy_keyword_return [ "return" ]
 		keywords groovy_keyword_type [ "boolean", "byte", "char", "short", "int", "long", "double", "float" ]
 		keywords groovy_keyword [ 
@@ -34,24 +34,24 @@ JS {
 		character-rule groovy_bracket [ '(', ')', '{', '}', '[', ']' ]
 	}
 	rule-damager __groovy_javadoc {
-		default token groovy_doc_default { fgcolor : rgb( 63, 95, 191 ) }
+		default token groovy_doc_default 
 		//TODO not fully ported
 	}
 	rule-damager __groovy_singleline_comment {
-		default token groovy_single_line_comment { fgcolor : rgb(63, 127, 95) }
+		default token groovy_single_line_comment 
 		//TODO not fully ported
 	}
 	rule-damager __groovy_multiline_comment {
-		default token groovy_multi_line_comment { fgcolor : rgb(63, 127, 95) }
+		default token groovy_multi_line_comment 
 		//TODO not fully ported
 	}
 	rule-damager __groovy_string {
-		default token groovy_string { fgcolor : rgb(42, 0, 255) }
-		token groovy_variable { fgcolor : rgb(255, 0, 0) }
-		javascript-rule groovy_variable "groovy-string-variable-rule.js"
+		default token groovy_string 
+		token groovy_var_interpolation 
+		javascript-rule groovy_var_interpolation "groovy-string-variable-rule.js"
 	}
 	rule-damager __groovy_character {
-		default token groovy_char { fgcolor : rgb(42, 0, 255) }
+		default token groovy_char 
 	}
 	java-like-partitioner {
 		singlelinedoc __groovy_singleline_comment
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src-js/js/js.hsl b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src-js/js/js.hsl
deleted file mode 100644
index c2f1a1609..000000000
--- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src-js/js/js.hsl
+++ /dev/null
@@ -1,49 +0,0 @@
-JS {
-	partition __dftl_partition_content_type
-	partition __javascript_javadoc
-	partition __javascript_multiline_comment
-	partition __javascript_singleline_comment
-	partition __javascript_string
-	partition __javascript_character
-	rule-damager __dftl_partition_content_type {
-		default token javascript_default { fgcolor : rgb(0, 0, 0) }
-		token javascript_string { fgcolor : rgb(42, 0, 255) }
-		token javascript_operator { fgcolor : rgb(0, 0, 0) }
-		token javascript_bracket { fgcolor : rgb(0, 0, 0) }
-		token javascript_keyword_return { fgcolor : rgb(127, 0, 85) }
-		token javascript_keyword { fgcolor : rgb(127, 0, 85) }
-		keywords javascript_keyword_return [ "return" ]
-		keywords javascript_keyword [ 
-			"break",	"case",		"catch",	"continue",	"debugger",
-	    	"default",	"delete",	"do",		"else",		"finally",
-	    	"for",		"function",	"if",		"in",		"instanceof",
-	    	"new",		"switch",	"this",		"throw",	"try",		
-	    	"typeof",	"var",		"void",		"while",	"with"]
-		single-line javascript_string "'" => "'" escaped by "\\"
-		whitespace-rule javascript_default javawhitespace
-		character-rule javascript_operator [ ';', '.', '=', '/', '\\', '+', '-', '*', '<', '>', ':', '?', '!', ',', '|', '&', '^', '%', '~' ]
-		character-rule javascript_bracket [ '(', ')', '{', '}', '[', ']' ]
-	}
-	rule-damager __javascript_javadoc {
-		default token java_doc_default { fgcolor : rgb( 63, 95, 191 ) }
-		//TODO not fully ported
-	}
-	rule-damager __javascript_singleline_comment {
-		default token java_single_line_comment { fgcolor : rgb(63, 127, 95) }
-		//TODO not fully ported
-	}
-	rule-damager __javascript_multiline_comment {
-		default token java_multi_line_comment { fgcolor : rgb(63, 127, 95) }
-		//TODO not fully ported
-	}
-	rule-damager __javascript_string {
-		
-	}
-	java-like-partitioner {
-		singlelinedoc __javascript_singleline_comment
-		multilinedoc __javascript_multiline_comment
-		javadoc __javascript_javadoc
-		char __javascript_character
-		string __javascript_string
-	}
-} for "text/xml"
\ No newline at end of file
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src-xml/xml/XML-highlight.css b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src-xml/xml/XML-highlight.css
new file mode 100644
index 000000000..5afa4b982
--- /dev/null
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src-xml/xml/XML-highlight.css
@@ -0,0 +1,15 @@
+.default_tagtoken {
+	-fx-fill: rgb(0, 0, 128);
+}
+
+.xml_string {
+	-fx-fill: rgb(0, 128, 0);
+}
+
+.default_xmltoken {
+	-fx-fill: rgb(0, 0, 0);
+}
+
+.proc_instruction {
+	-fx-fill: rgb(128, 128, 128);
+}
\ No newline at end of file
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src-xml/xml/xml-comment-damager.js b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src-xml/xml/xml-comment-damager.js
index c9ab0a2a6..93f7880bf 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src-xml/xml/xml-comment-damager.js
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src-xml/xml/xml-comment-damager.js
@@ -61,6 +61,7 @@ var f = function() {
 		createPresentation : function(presentation, region) {
 			presentation.addStyleRange( 
 				new StyleRange(
+					"xml_comment",
 					region.getOffset(),
 					region.getLength(),
 					Color.rgb(128, 0, 0),
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src-xml/xml/xml.hsl b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src-xml/xml/xml.hsl
index 518617497..35b280942 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src-xml/xml/xml.hsl
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src-xml/xml/xml.hsl
@@ -1,17 +1,17 @@
-XML2 {
+XML {
 	partition __dftl_partition_content_type
 	partition __xml_comment
 	partition __xml_tag
 	rule-damager __xml_tag {
-		default token default_tagtoken { fgcolor : rgb(0, 0, 128) }
-		token xml_string { fgcolor : rgb(0, 128, 0) }
+		default token default_tagtoken
+		token xml_string
 		single-line xml_string "\"" => "\"" escaped by '\\'
 		single-line xml_string "'"  => "'" escaped by '\\'
 		whitespace-rule [" ", "\t", "\n", "\r"]	
 	}
 	rule-damager __dftl_partition_content_type {
-		default token default_xmltoken { fgcolor : rgb(0, 0, 0) }
-		token proc_instruction { fgcolor : rgb(128, 128, 128) }
+		default token default_xmltoken
+		token proc_instruction 
 		single-line proc_instruction "<?" => "?>"
 		whitespace-rule [" ", "\t", "\n", "\r"]
 	}
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/HSLConfiguration.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/HSLConfiguration.java
index 44c9b13f5..102af60cf 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/HSLConfiguration.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/HSLConfiguration.java
@@ -1,12 +1,15 @@
 package org.eclipse.fx.code.compensator.editor.hsl;
 
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URL;
 
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 
+import org.eclipse.emf.common.util.URI;
 import org.eclipse.fx.code.compensator.editor.hsl.internal.JavaScriptHelper;
 import org.eclipse.fx.code.compensator.hsl.hSL.Damager;
 import org.eclipse.fx.code.compensator.hsl.hSL.JSDamager;
@@ -49,4 +52,32 @@ public class HSLConfiguration extends SourceViewerConfiguration {
 
 		return reconciler;
 	}
+	
+	@Override
+	public URL getDefaultStylesheet() {
+		URI uri = model.eResource().getURI();
+		uri = uri.trimSegments(1);
+		uri = uri.appendSegment(model.getName()+"-highlight.css");
+		
+		if( uri.isPlatform() ) {
+			System.err.println(cl.getResource(getPluginPath(uri)));
+			return cl.getResource(getPluginPath(uri));
+		} else {
+			try {
+				return new File(uri.toFileString()).toURI().toURL();
+			} catch (MalformedURLException e) {
+				return null;
+			}
+		}		
+	}
+	
+	private static String getPluginPath(URI uri) {
+		String[] parts = uri.segments();
+		StringBuffer b = new StringBuffer(parts[2]);
+		
+		for( int i = 3; i < parts.length; i++ ) {
+			b.append("/" + parts[i]);
+		}
+		return b.toString();
+	}
 }
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/HSLRuleScanner.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/HSLRuleScanner.java
index f5dc16da4..f4c37155a 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/HSLRuleScanner.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/HSLRuleScanner.java
@@ -9,7 +9,6 @@ import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
 import javafx.scene.text.FontPosture;
 import javafx.scene.text.FontWeight;
-import netscape.javascript.JSObject;
 
 import org.eclipse.fx.code.compensator.editor.hsl.internal.JavaScriptHelper;
 import org.eclipse.fx.code.compensator.hsl.hSL.FontType;
@@ -42,7 +41,12 @@ public class HSLRuleScanner extends RuleBasedScanner {
 		Token defaultToken = null;
 		Map<String, IToken> tokenMap = new HashMap<String, IToken>();
 		for( ScannerToken st : scanner.getTokens() ) {
-			Token token = new Token(new TextAttribute(createColor(st.getFgColor()), createColor(st.getFgColor()), 0, createFont(st.getFont())));
+			Token token = new Token(new TextAttribute(st.getName()));
+//			if( "default_tagtoken".equals(st.getName()) ) {
+//				token = new Token(new TextAttribute(st.getName(),Color.rgb(255, 0, 0)));
+//			} else if( "xml_string".equals(st.getName()) ) {
+//				token = new Token(new TextAttribute(st.getName(),Color.rgb(0, 255, 0)));
+//			}
 			if( st.isDefault() ) {
 				defaultToken = token;
 				setDefaultReturnToken(token);
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/internal/JavaScriptHelper.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/internal/JavaScriptHelper.java
index 5843fb971..8d62ac6c4 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/internal/JavaScriptHelper.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/internal/JavaScriptHelper.java
@@ -30,7 +30,7 @@ public class JavaScriptHelper {
 		
 		ScriptEngineManager mgr = new ScriptEngineManager();
 		ScriptEngine engine = mgr.getEngineByName("nashorn");
-		System.err.println(" ======================> " + uri);
+//		System.err.println(" ======================> " + uri);
 		try( InputStreamReader reader = new InputStreamReader(uri.isPlatform() ? cl.getResourceAsStream(getPluginPath(uri)) : new FileInputStream(new File(uri.toFileString()))) ) {
 			return (O) engine.eval(reader);
 		} catch (IOException e) {
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/.project b/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/.project
index 91ed6a18a..4f11ada91 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/.project
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/.project
@@ -6,6 +6,11 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
@@ -29,5 +34,6 @@
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 	</natures>
 </projectDescription>
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/css/highlight.css b/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/css/highlight.css
new file mode 100644
index 000000000..599e0b1b6
--- /dev/null
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/css/highlight.css
@@ -0,0 +1,53 @@
+.java_string {
+	-fx-fill: rgb(42, 0, 255);
+}
+
+.java_default {
+	-fx-fill: rgb(0,0,0);
+}
+
+.java_annotation {
+	-fx-fill: rgb(200, 200, 200);
+}
+
+.java_keyword {
+	-fx-fill: rgb(127, 0, 85);
+	-fx-font-weight: bold;
+}
+
+.java_operator {
+	-fx-fill: rgb(0,0,0);
+}
+
+.java_bracket {
+	-fx-fill: rgb(0,0,0);
+}
+
+.java_keyword_return {
+	-fx-fill: rgb(127, 0, 85);
+	-fx-font-weight: bold;
+}
+
+.java_comment_task_tag {
+	-fx-fill: rgb(127, 159, 191);
+}
+
+.java_doc_link {
+	-fx-fill: rgb(63, 63, 191);
+}
+
+.java_doc_default {
+	-fx-fill: rgb(63, 95, 191);
+}
+
+.java_multi_line_comment {
+	-fx-fill: rgb(63, 127, 95);
+}
+
+.java_single_line_comment {
+	-fx-fill: rgb(63, 127, 95);
+}
+
+.java_doc_tag {
+	-fx-fill: rgb(127, 127, 159);
+}
\ No newline at end of file
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/JavaSourceConfiguration.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/JavaSourceConfiguration.java
index 971ffe7a0..2647e88e1 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/JavaSourceConfiguration.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/JavaSourceConfiguration.java
@@ -10,6 +10,8 @@
 *******************************************************************************/
 package org.eclipse.fx.code.compensator.editor.java;
 
+import java.net.URL;
+
 import org.eclipse.fx.code.compensator.editor.java.scanner.IJavaColorConstants;
 import org.eclipse.fx.code.compensator.editor.java.scanner.IJavaPartitions;
 import org.eclipse.fx.code.compensator.editor.java.scanner.JavaCodeScanner;
@@ -101,4 +103,9 @@ public class JavaSourceConfiguration extends SourceViewerConfiguration {
 	private ITokenScanner getCodeScanner() {
 		return fCodeScanner;
 	}
+	
+	@Override
+	public URL getDefaultStylesheet() {
+		return getClass().getClassLoader().getResource("css/highlight.css");
+	}
 }
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/scanner/AbstractJavaScanner.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/scanner/AbstractJavaScanner.java
index 8583e581a..d691eccc2 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/scanner/AbstractJavaScanner.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/scanner/AbstractJavaScanner.java
@@ -12,8 +12,6 @@ package org.eclipse.fx.code.compensator.editor.java.scanner;
 
 import java.util.List;
 
-import javafx.scene.paint.Color;
-
 import org.eclipse.jface.text.TextAttribute;
 import org.eclipse.jface.text.rules.BufferedRuleBasedScanner;
 import org.eclipse.jface.text.rules.IRule;
@@ -42,31 +40,31 @@ public abstract class AbstractJavaScanner extends BufferedRuleBasedScanner {
 	protected Token getToken(String key) {
 		switch (key) {
 		case IJavaColorConstants.JAVA_STRING:
-			return new Token(new TextAttribute(Color.rgb(42, 0, 255)));
+			return new Token(new TextAttribute(IJavaColorConstants.JAVA_STRING));
 		case IJavaColorConstants.JAVA_DEFAULT:
-			return new Token(new TextAttribute(Color.rgb(0,0,0)));
+			return new Token(new TextAttribute(IJavaColorConstants.JAVA_DEFAULT));
 		case IJavaColorConstants.ANNOTATION:
-			return new Token(new TextAttribute(Color.rgb(200, 200, 200)));
+			return new Token(new TextAttribute(IJavaColorConstants.ANNOTATION));
 		case IJavaColorConstants.JAVA_KEYWORD:
-			return new Token(new TextAttribute(Color.rgb(127, 0, 85)));
+			return new Token(new TextAttribute(IJavaColorConstants.JAVA_KEYWORD));
 		case IJavaColorConstants.JAVA_OPERATOR:
-			return new Token(new TextAttribute(Color.rgb(0, 0, 0)));
+			return new Token(new TextAttribute(IJavaColorConstants.JAVA_OPERATOR));
 		case IJavaColorConstants.JAVA_BRACKET:
-			return new Token(new TextAttribute(Color.rgb(0, 0, 0)));
+			return new Token(new TextAttribute(IJavaColorConstants.JAVA_BRACKET));
 		case IJavaColorConstants.JAVA_KEYWORD_RETURN:
-			return new Token(new TextAttribute(Color.rgb(127, 0, 85)));
+			return new Token(new TextAttribute(IJavaColorConstants.JAVA_KEYWORD_RETURN));
 		case IJavaColorConstants.TASK_TAG:
-			return new Token(new TextAttribute(Color.rgb(127, 159, 191)));
+			return new Token(new TextAttribute(IJavaColorConstants.TASK_TAG));
 		case IJavaColorConstants.JAVADOC_LINK:
-			return new Token(new TextAttribute(Color.rgb(63, 63, 191)));
+			return new Token(new TextAttribute(IJavaColorConstants.JAVADOC_LINK));
 		case IJavaColorConstants.JAVADOC_DEFAULT:
-			return new Token(new TextAttribute(Color.rgb(63, 95, 191)));
+			return new Token(new TextAttribute(IJavaColorConstants.JAVADOC_DEFAULT));
 		case IJavaColorConstants.JAVA_MULTI_LINE_COMMENT:
-			return new Token(new TextAttribute(Color.rgb(63, 127, 95)));
+			return new Token(new TextAttribute(IJavaColorConstants.JAVA_MULTI_LINE_COMMENT));
 		case IJavaColorConstants.JAVA_SINGLE_LINE_COMMENT:
-			return new Token(new TextAttribute(Color.rgb(63, 127, 95)));
+			return new Token(new TextAttribute(IJavaColorConstants.JAVA_SINGLE_LINE_COMMENT));
 		case IJavaColorConstants.JAVADOC_TAG:
-			return new Token(new TextAttribute(Color.rgb(127, 127, 159)));
+			return new Token(new TextAttribute(IJavaColorConstants.JAVADOC_TAG));
 		default:
 			throw new IllegalStateException("Unknown key '"+ key+"'");
 		}
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.js/css/highlight.css b/experimental/compensator/org.eclipse.fx.code.compensator.editor.js/css/highlight.css
new file mode 100644
index 000000000..599e0b1b6
--- /dev/null
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.js/css/highlight.css
@@ -0,0 +1,53 @@
+.java_string {
+	-fx-fill: rgb(42, 0, 255);
+}
+
+.java_default {
+	-fx-fill: rgb(0,0,0);
+}
+
+.java_annotation {
+	-fx-fill: rgb(200, 200, 200);
+}
+
+.java_keyword {
+	-fx-fill: rgb(127, 0, 85);
+	-fx-font-weight: bold;
+}
+
+.java_operator {
+	-fx-fill: rgb(0,0,0);
+}
+
+.java_bracket {
+	-fx-fill: rgb(0,0,0);
+}
+
+.java_keyword_return {
+	-fx-fill: rgb(127, 0, 85);
+	-fx-font-weight: bold;
+}
+
+.java_comment_task_tag {
+	-fx-fill: rgb(127, 159, 191);
+}
+
+.java_doc_link {
+	-fx-fill: rgb(63, 63, 191);
+}
+
+.java_doc_default {
+	-fx-fill: rgb(63, 95, 191);
+}
+
+.java_multi_line_comment {
+	-fx-fill: rgb(63, 127, 95);
+}
+
+.java_single_line_comment {
+	-fx-fill: rgb(63, 127, 95);
+}
+
+.java_doc_tag {
+	-fx-fill: rgb(127, 127, 159);
+}
\ No newline at end of file
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.js/src/org/eclipse/fx/code/compensator/editor/js/JavaScriptSourceConfiguration.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.js/src/org/eclipse/fx/code/compensator/editor/js/JavaScriptSourceConfiguration.java
index 2c8bdbe41..8f61550a9 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.js/src/org/eclipse/fx/code/compensator/editor/js/JavaScriptSourceConfiguration.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.js/src/org/eclipse/fx/code/compensator/editor/js/JavaScriptSourceConfiguration.java
@@ -10,6 +10,8 @@
 *******************************************************************************/
 package org.eclipse.fx.code.compensator.editor.js;
 
+import java.net.URL;
+
 import org.eclipse.fx.code.compensator.editor.js.scanner.IJavaScriptColorConstants;
 import org.eclipse.fx.code.compensator.editor.js.scanner.IJavaScriptPartitions;
 import org.eclipse.fx.code.compensator.editor.js.scanner.JavaScriptCodeScanner;
@@ -101,4 +103,9 @@ public class JavaScriptSourceConfiguration extends SourceViewerConfiguration {
 	private ITokenScanner getCodeScanner() {
 		return fCodeScanner;
 	}
+	
+	@Override
+	public URL getDefaultStylesheet() {
+		return getClass().getClassLoader().getResource("css/highlight.css");
+	}
 }
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.js/src/org/eclipse/fx/code/compensator/editor/js/scanner/AbstractJavaScriptScanner.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.js/src/org/eclipse/fx/code/compensator/editor/js/scanner/AbstractJavaScriptScanner.java
index af730cee4..3c2975835 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.js/src/org/eclipse/fx/code/compensator/editor/js/scanner/AbstractJavaScriptScanner.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.js/src/org/eclipse/fx/code/compensator/editor/js/scanner/AbstractJavaScriptScanner.java
@@ -42,31 +42,31 @@ public abstract class AbstractJavaScriptScanner extends BufferedRuleBasedScanner
 	protected Token getToken(String key) {
 		switch (key) {
 		case IJavaScriptColorConstants.JAVA_STRING:
-			return new Token(new TextAttribute(Color.rgb(42, 0, 255)));
+			return new Token(new TextAttribute(IJavaScriptColorConstants.JAVA_STRING));
 		case IJavaScriptColorConstants.JAVA_DEFAULT:
-			return new Token(new TextAttribute(Color.rgb(0,0,0)));
+			return new Token(new TextAttribute(IJavaScriptColorConstants.JAVA_DEFAULT));
 		case IJavaScriptColorConstants.ANNOTATION:
-			return new Token(new TextAttribute(Color.rgb(200, 200, 200)));
+			return new Token(new TextAttribute(IJavaScriptColorConstants.ANNOTATION));
 		case IJavaScriptColorConstants.JAVA_KEYWORD:
-			return new Token(new TextAttribute(Color.rgb(127, 0, 85)));
+			return new Token(new TextAttribute(IJavaScriptColorConstants.JAVA_KEYWORD));
 		case IJavaScriptColorConstants.JAVA_OPERATOR:
-			return new Token(new TextAttribute(Color.rgb(0, 0, 0)));
+			return new Token(new TextAttribute(IJavaScriptColorConstants.JAVA_OPERATOR));
 		case IJavaScriptColorConstants.JAVA_BRACKET:
-			return new Token(new TextAttribute(Color.rgb(0, 0, 0)));
+			return new Token(new TextAttribute(IJavaScriptColorConstants.JAVA_BRACKET));
 		case IJavaScriptColorConstants.JAVA_KEYWORD_RETURN:
-			return new Token(new TextAttribute(Color.rgb(127, 0, 85)));
+			return new Token(new TextAttribute(IJavaScriptColorConstants.JAVA_KEYWORD_RETURN));
 		case IJavaScriptColorConstants.TASK_TAG:
-			return new Token(new TextAttribute(Color.rgb(127, 159, 191)));
+			return new Token(new TextAttribute(IJavaScriptColorConstants.TASK_TAG));
 		case IJavaScriptColorConstants.JAVADOC_LINK:
-			return new Token(new TextAttribute(Color.rgb(63, 63, 191)));
+			return new Token(new TextAttribute(IJavaScriptColorConstants.JAVADOC_LINK));
 		case IJavaScriptColorConstants.JAVADOC_DEFAULT:
-			return new Token(new TextAttribute(Color.rgb(63, 95, 191)));
+			return new Token(new TextAttribute(IJavaScriptColorConstants.JAVADOC_DEFAULT));
 		case IJavaScriptColorConstants.JAVA_MULTI_LINE_COMMENT:
-			return new Token(new TextAttribute(Color.rgb(63, 127, 95)));
+			return new Token(new TextAttribute(IJavaScriptColorConstants.JAVA_MULTI_LINE_COMMENT));
 		case IJavaScriptColorConstants.JAVA_SINGLE_LINE_COMMENT:
-			return new Token(new TextAttribute(Color.rgb(63, 127, 95)));
+			return new Token(new TextAttribute(IJavaScriptColorConstants.JAVA_SINGLE_LINE_COMMENT));
 		case IJavaScriptColorConstants.JAVADOC_TAG:
-			return new Token(new TextAttribute(Color.rgb(127, 127, 159)));
+			return new Token(new TextAttribute(IJavaScriptColorConstants.JAVADOC_TAG));
 		default:
 			throw new IllegalStateException("Unknown key '"+ key+"'");
 		}
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor/src/org/eclipse/fx/code/compensator/editor/services/HSLConfiguration.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor/src/org/eclipse/fx/code/compensator/editor/services/HSLConfiguration.java
deleted file mode 100644
index f331331a9..000000000
--- a/experimental/compensator/org.eclipse.fx.code.compensator.editor/src/org/eclipse/fx/code/compensator/editor/services/HSLConfiguration.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.eclipse.fx.code.compensator.editor.services;
-
-import org.eclipse.emf.common.util.URI;
-
-public interface HSLConfiguration {
-	public URI getHSLURI();
-}
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/model/generated/HSL.ecore b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/model/generated/HSL.ecore
index b67a97f96..161b52aa0 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/model/generated/HSL.ecore
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/model/generated/HSL.ecore
@@ -49,11 +49,6 @@
   <eClassifiers xsi:type="ecore:EClass" name="ScannerToken">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="default" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="fgColor" eType="#//Color"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="bgColor" eType="#//Color"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="font" eType="#//Font" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="KeywordGroup">
     <eStructuralFeatures xsi:type="ecore:EReference" name="token" eType="#//ScannerToken"/>
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/model/generated/HSL.genmodel b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/model/generated/HSL.genmodel
index 44db6b72d..ad6c7e07e 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/model/generated/HSL.genmodel
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/model/generated/HSL.genmodel
@@ -51,9 +51,6 @@
     <genClasses ecoreClass="HSL.ecore#//ScannerToken">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute HSL.ecore#//ScannerToken/default"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute HSL.ecore#//ScannerToken/name"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference HSL.ecore#//ScannerToken/fgColor"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference HSL.ecore#//ScannerToken/bgColor"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference HSL.ecore#//ScannerToken/font"/>
     </genClasses>
     <genClasses ecoreClass="HSL.ecore#//KeywordGroup">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference HSL.ecore#//KeywordGroup/token"/>
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/HSL.xtextbin b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/HSL.xtextbin
index 5793e7c0c..fdb08b8d3 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/HSL.xtextbin
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/HSL.xtextbin
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/HSLPackage.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/HSLPackage.java
index f60cdb7ba..54dd59acf 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/HSLPackage.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/HSLPackage.java
@@ -437,40 +437,13 @@ public interface HSLPackage extends EPackage
   int SCANNER_TOKEN__NAME = 1;
 
   /**
-   * The feature id for the '<em><b>Fg Color</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SCANNER_TOKEN__FG_COLOR = 2;
-
-  /**
-   * The feature id for the '<em><b>Bg Color</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SCANNER_TOKEN__BG_COLOR = 3;
-
-  /**
-   * The feature id for the '<em><b>Font</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SCANNER_TOKEN__FONT = 4;
-
-  /**
    * The number of structural features of the '<em>Scanner Token</em>' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int SCANNER_TOKEN_FEATURE_COUNT = 5;
+  int SCANNER_TOKEN_FEATURE_COUNT = 2;
 
   /**
    * The meta object id for the '{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.KeywordGroupImpl <em>Keyword Group</em>}' class.
@@ -1422,39 +1395,6 @@ public interface HSLPackage extends EPackage
   EAttribute getScannerToken_Name();
 
   /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.fx.code.compensator.hsl.hSL.ScannerToken#getFgColor <em>Fg Color</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Fg Color</em>'.
-   * @see org.eclipse.fx.code.compensator.hsl.hSL.ScannerToken#getFgColor()
-   * @see #getScannerToken()
-   * @generated
-   */
-  EReference getScannerToken_FgColor();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.fx.code.compensator.hsl.hSL.ScannerToken#getBgColor <em>Bg Color</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Bg Color</em>'.
-   * @see org.eclipse.fx.code.compensator.hsl.hSL.ScannerToken#getBgColor()
-   * @see #getScannerToken()
-   * @generated
-   */
-  EReference getScannerToken_BgColor();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.fx.code.compensator.hsl.hSL.ScannerToken#getFont <em>Font</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Font</em>'.
-   * @see org.eclipse.fx.code.compensator.hsl.hSL.ScannerToken#getFont()
-   * @see #getScannerToken()
-   * @generated
-   */
-  EReference getScannerToken_Font();
-
-  /**
    * Returns the meta object for class '{@link org.eclipse.fx.code.compensator.hsl.hSL.KeywordGroup <em>Keyword Group</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
@@ -2250,30 +2190,6 @@ public interface HSLPackage extends EPackage
     EAttribute SCANNER_TOKEN__NAME = eINSTANCE.getScannerToken_Name();
 
     /**
-     * The meta object literal for the '<em><b>Fg Color</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference SCANNER_TOKEN__FG_COLOR = eINSTANCE.getScannerToken_FgColor();
-
-    /**
-     * The meta object literal for the '<em><b>Bg Color</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference SCANNER_TOKEN__BG_COLOR = eINSTANCE.getScannerToken_BgColor();
-
-    /**
-     * The meta object literal for the '<em><b>Font</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference SCANNER_TOKEN__FONT = eINSTANCE.getScannerToken_Font();
-
-    /**
      * The meta object literal for the '{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.KeywordGroupImpl <em>Keyword Group</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/ScannerToken.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/ScannerToken.java
index 050ad1680..8e0170c19 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/ScannerToken.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/ScannerToken.java
@@ -14,9 +14,6 @@ import org.eclipse.emf.ecore.EObject;
  * <ul>
  *   <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.ScannerToken#isDefault <em>Default</em>}</li>
  *   <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.ScannerToken#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.ScannerToken#getFgColor <em>Fg Color</em>}</li>
- *   <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.ScannerToken#getBgColor <em>Bg Color</em>}</li>
- *   <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.ScannerToken#getFont <em>Font</em>}</li>
  * </ul>
  * </p>
  *
@@ -78,82 +75,4 @@ public interface ScannerToken extends EObject
    */
   void setName(String value);
 
-  /**
-   * Returns the value of the '<em><b>Fg Color</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Fg Color</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Fg Color</em>' containment reference.
-   * @see #setFgColor(Color)
-   * @see org.eclipse.fx.code.compensator.hsl.hSL.HSLPackage#getScannerToken_FgColor()
-   * @model containment="true"
-   * @generated
-   */
-  Color getFgColor();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.fx.code.compensator.hsl.hSL.ScannerToken#getFgColor <em>Fg Color</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Fg Color</em>' containment reference.
-   * @see #getFgColor()
-   * @generated
-   */
-  void setFgColor(Color value);
-
-  /**
-   * Returns the value of the '<em><b>Bg Color</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Bg Color</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Bg Color</em>' containment reference.
-   * @see #setBgColor(Color)
-   * @see org.eclipse.fx.code.compensator.hsl.hSL.HSLPackage#getScannerToken_BgColor()
-   * @model containment="true"
-   * @generated
-   */
-  Color getBgColor();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.fx.code.compensator.hsl.hSL.ScannerToken#getBgColor <em>Bg Color</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Bg Color</em>' containment reference.
-   * @see #getBgColor()
-   * @generated
-   */
-  void setBgColor(Color value);
-
-  /**
-   * Returns the value of the '<em><b>Font</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Font</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Font</em>' containment reference.
-   * @see #setFont(Font)
-   * @see org.eclipse.fx.code.compensator.hsl.hSL.HSLPackage#getScannerToken_Font()
-   * @model containment="true"
-   * @generated
-   */
-  Font getFont();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.fx.code.compensator.hsl.hSL.ScannerToken#getFont <em>Font</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Font</em>' containment reference.
-   * @see #getFont()
-   * @generated
-   */
-  void setFont(Font value);
-
 } // ScannerToken
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/HSLPackageImpl.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/HSLPackageImpl.java
index d19b43efa..81028670a 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/HSLPackageImpl.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/HSLPackageImpl.java
@@ -597,36 +597,6 @@ public class HSLPackageImpl extends EPackageImpl implements HSLPackage
    * <!-- end-user-doc -->
    * @generated
    */
-  public EReference getScannerToken_FgColor()
-  {
-    return (EReference)scannerTokenEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getScannerToken_BgColor()
-  {
-    return (EReference)scannerTokenEClass.getEStructuralFeatures().get(3);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getScannerToken_Font()
-  {
-    return (EReference)scannerTokenEClass.getEStructuralFeatures().get(4);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
   public EClass getKeywordGroup()
   {
     return keywordGroupEClass;
@@ -1171,9 +1141,6 @@ public class HSLPackageImpl extends EPackageImpl implements HSLPackage
     scannerTokenEClass = createEClass(SCANNER_TOKEN);
     createEAttribute(scannerTokenEClass, SCANNER_TOKEN__DEFAULT);
     createEAttribute(scannerTokenEClass, SCANNER_TOKEN__NAME);
-    createEReference(scannerTokenEClass, SCANNER_TOKEN__FG_COLOR);
-    createEReference(scannerTokenEClass, SCANNER_TOKEN__BG_COLOR);
-    createEReference(scannerTokenEClass, SCANNER_TOKEN__FONT);
 
     keywordGroupEClass = createEClass(KEYWORD_GROUP);
     createEReference(keywordGroupEClass, KEYWORD_GROUP__TOKEN);
@@ -1325,9 +1292,6 @@ public class HSLPackageImpl extends EPackageImpl implements HSLPackage
     initEClass(scannerTokenEClass, ScannerToken.class, "ScannerToken", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getScannerToken_Default(), ecorePackage.getEBoolean(), "default", null, 0, 1, ScannerToken.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getScannerToken_Name(), ecorePackage.getEString(), "name", null, 0, 1, ScannerToken.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getScannerToken_FgColor(), this.getColor(), null, "fgColor", null, 0, 1, ScannerToken.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getScannerToken_BgColor(), this.getColor(), null, "bgColor", null, 0, 1, ScannerToken.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getScannerToken_Font(), this.getFont(), null, "font", null, 0, 1, ScannerToken.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(keywordGroupEClass, KeywordGroup.class, "KeywordGroup", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEReference(getKeywordGroup_Token(), this.getScannerToken(), null, "token", null, 0, 1, KeywordGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/ScannerTokenImpl.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/ScannerTokenImpl.java
index a0385b380..a2c2cceb2 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/ScannerTokenImpl.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/ScannerTokenImpl.java
@@ -3,16 +3,12 @@
 package org.eclipse.fx.code.compensator.hsl.hSL.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
 
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
-import org.eclipse.fx.code.compensator.hsl.hSL.Color;
-import org.eclipse.fx.code.compensator.hsl.hSL.Font;
 import org.eclipse.fx.code.compensator.hsl.hSL.HSLPackage;
 import org.eclipse.fx.code.compensator.hsl.hSL.ScannerToken;
 
@@ -25,9 +21,6 @@ import org.eclipse.fx.code.compensator.hsl.hSL.ScannerToken;
  * <ul>
  *   <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.ScannerTokenImpl#isDefault <em>Default</em>}</li>
  *   <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.ScannerTokenImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.ScannerTokenImpl#getFgColor <em>Fg Color</em>}</li>
- *   <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.ScannerTokenImpl#getBgColor <em>Bg Color</em>}</li>
- *   <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.ScannerTokenImpl#getFont <em>Font</em>}</li>
  * </ul>
  * </p>
  *
@@ -76,36 +69,6 @@ public class ScannerTokenImpl extends MinimalEObjectImpl.Container implements Sc
   protected String name = NAME_EDEFAULT;
 
   /**
-   * The cached value of the '{@link #getFgColor() <em>Fg Color</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getFgColor()
-   * @generated
-   * @ordered
-   */
-  protected Color fgColor;
-
-  /**
-   * The cached value of the '{@link #getBgColor() <em>Bg Color</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getBgColor()
-   * @generated
-   * @ordered
-   */
-  protected Color bgColor;
-
-  /**
-   * The cached value of the '{@link #getFont() <em>Font</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getFont()
-   * @generated
-   * @ordered
-   */
-  protected Font font;
-
-  /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
@@ -177,170 +140,6 @@ public class ScannerTokenImpl extends MinimalEObjectImpl.Container implements Sc
    * <!-- end-user-doc -->
    * @generated
    */
-  public Color getFgColor()
-  {
-    return fgColor;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetFgColor(Color newFgColor, NotificationChain msgs)
-  {
-    Color oldFgColor = fgColor;
-    fgColor = newFgColor;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HSLPackage.SCANNER_TOKEN__FG_COLOR, oldFgColor, newFgColor);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setFgColor(Color newFgColor)
-  {
-    if (newFgColor != fgColor)
-    {
-      NotificationChain msgs = null;
-      if (fgColor != null)
-        msgs = ((InternalEObject)fgColor).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HSLPackage.SCANNER_TOKEN__FG_COLOR, null, msgs);
-      if (newFgColor != null)
-        msgs = ((InternalEObject)newFgColor).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HSLPackage.SCANNER_TOKEN__FG_COLOR, null, msgs);
-      msgs = basicSetFgColor(newFgColor, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, HSLPackage.SCANNER_TOKEN__FG_COLOR, newFgColor, newFgColor));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Color getBgColor()
-  {
-    return bgColor;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetBgColor(Color newBgColor, NotificationChain msgs)
-  {
-    Color oldBgColor = bgColor;
-    bgColor = newBgColor;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HSLPackage.SCANNER_TOKEN__BG_COLOR, oldBgColor, newBgColor);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setBgColor(Color newBgColor)
-  {
-    if (newBgColor != bgColor)
-    {
-      NotificationChain msgs = null;
-      if (bgColor != null)
-        msgs = ((InternalEObject)bgColor).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HSLPackage.SCANNER_TOKEN__BG_COLOR, null, msgs);
-      if (newBgColor != null)
-        msgs = ((InternalEObject)newBgColor).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HSLPackage.SCANNER_TOKEN__BG_COLOR, null, msgs);
-      msgs = basicSetBgColor(newBgColor, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, HSLPackage.SCANNER_TOKEN__BG_COLOR, newBgColor, newBgColor));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Font getFont()
-  {
-    return font;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetFont(Font newFont, NotificationChain msgs)
-  {
-    Font oldFont = font;
-    font = newFont;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HSLPackage.SCANNER_TOKEN__FONT, oldFont, newFont);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setFont(Font newFont)
-  {
-    if (newFont != font)
-    {
-      NotificationChain msgs = null;
-      if (font != null)
-        msgs = ((InternalEObject)font).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HSLPackage.SCANNER_TOKEN__FONT, null, msgs);
-      if (newFont != null)
-        msgs = ((InternalEObject)newFont).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HSLPackage.SCANNER_TOKEN__FONT, null, msgs);
-      msgs = basicSetFont(newFont, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, HSLPackage.SCANNER_TOKEN__FONT, newFont, newFont));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case HSLPackage.SCANNER_TOKEN__FG_COLOR:
-        return basicSetFgColor(null, msgs);
-      case HSLPackage.SCANNER_TOKEN__BG_COLOR:
-        return basicSetBgColor(null, msgs);
-      case HSLPackage.SCANNER_TOKEN__FONT:
-        return basicSetFont(null, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
   @Override
   public Object eGet(int featureID, boolean resolve, boolean coreType)
   {
@@ -350,12 +149,6 @@ public class ScannerTokenImpl extends MinimalEObjectImpl.Container implements Sc
         return isDefault();
       case HSLPackage.SCANNER_TOKEN__NAME:
         return getName();
-      case HSLPackage.SCANNER_TOKEN__FG_COLOR:
-        return getFgColor();
-      case HSLPackage.SCANNER_TOKEN__BG_COLOR:
-        return getBgColor();
-      case HSLPackage.SCANNER_TOKEN__FONT:
-        return getFont();
     }
     return super.eGet(featureID, resolve, coreType);
   }
@@ -376,15 +169,6 @@ public class ScannerTokenImpl extends MinimalEObjectImpl.Container implements Sc
       case HSLPackage.SCANNER_TOKEN__NAME:
         setName((String)newValue);
         return;
-      case HSLPackage.SCANNER_TOKEN__FG_COLOR:
-        setFgColor((Color)newValue);
-        return;
-      case HSLPackage.SCANNER_TOKEN__BG_COLOR:
-        setBgColor((Color)newValue);
-        return;
-      case HSLPackage.SCANNER_TOKEN__FONT:
-        setFont((Font)newValue);
-        return;
     }
     super.eSet(featureID, newValue);
   }
@@ -405,15 +189,6 @@ public class ScannerTokenImpl extends MinimalEObjectImpl.Container implements Sc
       case HSLPackage.SCANNER_TOKEN__NAME:
         setName(NAME_EDEFAULT);
         return;
-      case HSLPackage.SCANNER_TOKEN__FG_COLOR:
-        setFgColor((Color)null);
-        return;
-      case HSLPackage.SCANNER_TOKEN__BG_COLOR:
-        setBgColor((Color)null);
-        return;
-      case HSLPackage.SCANNER_TOKEN__FONT:
-        setFont((Font)null);
-        return;
     }
     super.eUnset(featureID);
   }
@@ -432,12 +207,6 @@ public class ScannerTokenImpl extends MinimalEObjectImpl.Container implements Sc
         return default_ != DEFAULT_EDEFAULT;
       case HSLPackage.SCANNER_TOKEN__NAME:
         return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case HSLPackage.SCANNER_TOKEN__FG_COLOR:
-        return fgColor != null;
-      case HSLPackage.SCANNER_TOKEN__BG_COLOR:
-        return bgColor != null;
-      case HSLPackage.SCANNER_TOKEN__FONT:
-        return font != null;
     }
     return super.eIsSet(featureID);
   }
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g
index 5782d33f7..8de81d1d4 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g
@@ -739,93 +739,7 @@ ruleScannerToken returns [EObject current=null]
 	    }
 
 )
-)(	otherlv_3='{' 
-    {
-    	newLeafNode(otherlv_3, grammarAccess.getScannerTokenAccess().getLeftCurlyBracketKeyword_3_0());
-    }
-(	otherlv_4='fgcolor' 
-    {
-    	newLeafNode(otherlv_4, grammarAccess.getScannerTokenAccess().getFgcolorKeyword_3_1_0());
-    }
-	otherlv_5=':' 
-    {
-    	newLeafNode(otherlv_5, grammarAccess.getScannerTokenAccess().getColonKeyword_3_1_1());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getScannerTokenAccess().getFgColorColorParserRuleCall_3_1_2_0()); 
-	    }
-		lv_fgColor_6_0=ruleColor		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getScannerTokenRule());
-	        }
-       		set(
-       			$current, 
-       			"fgColor",
-        		lv_fgColor_6_0, 
-        		"Color");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))?(	otherlv_7='bgcolor' 
-    {
-    	newLeafNode(otherlv_7, grammarAccess.getScannerTokenAccess().getBgcolorKeyword_3_2_0());
-    }
-	otherlv_8=':' 
-    {
-    	newLeafNode(otherlv_8, grammarAccess.getScannerTokenAccess().getColonKeyword_3_2_1());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getScannerTokenAccess().getBgColorColorParserRuleCall_3_2_2_0()); 
-	    }
-		lv_bgColor_9_0=ruleColor		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getScannerTokenRule());
-	        }
-       		set(
-       			$current, 
-       			"bgColor",
-        		lv_bgColor_9_0, 
-        		"Color");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))?(	otherlv_10='font' 
-    {
-    	newLeafNode(otherlv_10, grammarAccess.getScannerTokenAccess().getFontKeyword_3_3_0());
-    }
-	otherlv_11=':' 
-    {
-    	newLeafNode(otherlv_11, grammarAccess.getScannerTokenAccess().getColonKeyword_3_3_1());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getScannerTokenAccess().getFontFontParserRuleCall_3_3_2_0()); 
-	    }
-		lv_font_12_0=ruleFont		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getScannerTokenRule());
-	        }
-       		set(
-       			$current, 
-       			"font",
-        		lv_font_12_0, 
-        		"Font");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))?	otherlv_13='}' 
-    {
-    	newLeafNode(otherlv_13, grammarAccess.getScannerTokenAccess().getRightCurlyBracketKeyword_3_4());
-    }
-)?)
+))
 ;
 
 
@@ -1834,34 +1748,6 @@ ruleScannerWhitespaceRule returns [EObject current=null]
 
 
 
-// Entry rule entryRuleColor
-entryRuleColor returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getColorRule()); }
-	 iv_ruleColor=ruleColor 
-	 { $current=$iv_ruleColor.current; } 
-	 EOF 
-;
-
-// Rule Color
-ruleColor returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-
-    { 
-        newCompositeNode(grammarAccess.getColorAccess().getRGBColorParserRuleCall()); 
-    }
-    this_RGBColor_0=ruleRGBColor
-    { 
-        $current = $this_RGBColor_0.current; 
-        afterParserOrEnumRuleCall();
-    }
-
-;
-
-
-
 
 
 // Entry rule entryRuleRGBColor
@@ -1959,79 +1845,6 @@ ruleRGBColor returns [EObject current=null]
 
 
 
-// Entry rule entryRuleFont
-entryRuleFont returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getFontRule()); }
-	 iv_ruleFont=ruleFont 
-	 { $current=$iv_ruleFont.current; } 
-	 EOF 
-;
-
-// Rule Font
-ruleFont returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		lv_name_0_0=RULE_ID
-		{
-			newLeafNode(lv_name_0_0, grammarAccess.getFontAccess().getNameIDTerminalRuleCall_0_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getFontRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"name",
-        		lv_name_0_0, 
-        		"ID");
-	    }
-
-)
-)(
-(
-		lv_size_1_0=RULE_INT
-		{
-			newLeafNode(lv_size_1_0, grammarAccess.getFontAccess().getSizeINTTerminalRuleCall_1_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getFontRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"size",
-        		lv_size_1_0, 
-        		"INT");
-	    }
-
-)
-)(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getFontAccess().getAttributesFontTypeEnumRuleCall_2_0()); 
-	    }
-		lv_attributes_2_0=ruleFontType		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getFontRule());
-	        }
-       		add(
-       			$current, 
-       			"attributes",
-        		lv_attributes_2_0, 
-        		"FontType");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)*)
-;
-
-
-
 
 
 // Rule FontType
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.tokens b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.tokens
index f33a71939..3d22664d5 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.tokens
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.tokens
@@ -1,4 +1,3 @@
-T__50=50
 T__19=19
 T__15=15
 T__16=16
@@ -8,7 +7,6 @@ T__11=11
 T__12=12
 T__13=13
 T__14=14
-T__51=51
 RULE_ID=4
 T__26=26
 T__27=27
@@ -36,8 +34,6 @@ T__31=31
 T__32=32
 RULE_WS=9
 RULE_ANY_OTHER=10
-T__48=48
-T__49=49
 T__44=44
 T__45=45
 T__46=46
@@ -46,44 +42,40 @@ T__40=40
 T__41=41
 T__42=42
 T__43=43
-'escaped'=38
-'underline'=50
-')'=47
+'escaped'=34
+'underline'=46
+')'=43
 'rule-damager'=24
-'italic'=49
-'fgcolor'=27
+'italic'=45
 'string'=20
-'=>'=37
+'=>'=33
 'java-like-partitioner'=15
-'bgcolor'=29
-']'=34
+']'=30
 'singlelinedoc'=16
 'js-partitioner'=22
-'['=32
-':'=28
-'multi-line'=40
-'javawhitespace'=44
-'bold'=48
-'javascript-rule'=42
-'since'=35
+'['=28
+'multi-line'=36
+'javawhitespace'=40
+'bold'=44
+'javascript-rule'=38
+'since'=31
 'js-damager'=23
-','=33
-'keywords'=31
-'character-rule'=41
+','=29
+'keywords'=27
+'character-rule'=37
 'partition'=14
 'token'=26
-'('=46
+'('=42
 'multilinedoc'=17
-'font'=30
 'for'=13
 '}'=12
 '{'=11
-'strike-through'=51
+'strike-through'=47
 'rule-partitioner'=21
-'whitespace-rule'=43
+'whitespace-rule'=39
 'char'=19
-'by'=39
-'rgb'=45
-'single-line'=36
+'by'=35
+'rgb'=41
+'single-line'=32
 'default'=25
 'javadoc'=18
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSLLexer.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSLLexer.java
index 7e31c36e0..82a4b607a 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSLLexer.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSLLexer.java
@@ -12,7 +12,6 @@ import java.util.ArrayList;
 
 @SuppressWarnings("all")
 public class InternalHSLLexer extends Lexer {
-    public static final int T__50=50;
     public static final int T__19=19;
     public static final int T__15=15;
     public static final int T__16=16;
@@ -22,7 +21,6 @@ public class InternalHSLLexer extends Lexer {
     public static final int T__12=12;
     public static final int T__13=13;
     public static final int T__14=14;
-    public static final int T__51=51;
     public static final int RULE_ID=4;
     public static final int T__26=26;
     public static final int T__27=27;
@@ -51,8 +49,6 @@ public class InternalHSLLexer extends Lexer {
     public static final int T__32=32;
     public static final int RULE_WS=9;
     public static final int RULE_ANY_OTHER=10;
-    public static final int T__48=48;
-    public static final int T__49=49;
     public static final int T__44=44;
     public static final int T__45=45;
     public static final int T__46=46;
@@ -414,10 +410,10 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:27:7: ( 'fgcolor' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:27:9: 'fgcolor'
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:27:7: ( 'keywords' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:27:9: 'keywords'
             {
-            match("fgcolor"); 
+            match("keywords"); 
 
 
             }
@@ -435,10 +431,10 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:28:7: ( ':' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:28:9: ':'
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:28:7: ( '[' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:28:9: '['
             {
-            match(':'); 
+            match('['); 
 
             }
 
@@ -455,11 +451,10 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:29:7: ( 'bgcolor' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:29:9: 'bgcolor'
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:29:7: ( ',' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:29:9: ','
             {
-            match("bgcolor"); 
-
+            match(','); 
 
             }
 
@@ -476,11 +471,10 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:30:7: ( 'font' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:30:9: 'font'
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:30:7: ( ']' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:30:9: ']'
             {
-            match("font"); 
-
+            match(']'); 
 
             }
 
@@ -497,10 +491,10 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:31:7: ( 'keywords' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:31:9: 'keywords'
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:31:7: ( 'since' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:31:9: 'since'
             {
-            match("keywords"); 
+            match("since"); 
 
 
             }
@@ -518,10 +512,11 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:32:7: ( '[' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:32:9: '['
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:32:7: ( 'single-line' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:32:9: 'single-line'
             {
-            match('['); 
+            match("single-line"); 
+
 
             }
 
@@ -538,10 +533,11 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:33:7: ( ',' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:33:9: ','
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:33:7: ( '=>' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:33:9: '=>'
             {
-            match(','); 
+            match("=>"); 
+
 
             }
 
@@ -558,10 +554,11 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:34:7: ( ']' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:34:9: ']'
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:34:7: ( 'escaped' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:34:9: 'escaped'
             {
-            match(']'); 
+            match("escaped"); 
+
 
             }
 
@@ -578,10 +575,10 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:35:7: ( 'since' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:35:9: 'since'
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:35:7: ( 'by' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:35:9: 'by'
             {
-            match("since"); 
+            match("by"); 
 
 
             }
@@ -599,10 +596,10 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:36:7: ( 'single-line' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:36:9: 'single-line'
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:36:7: ( 'multi-line' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:36:9: 'multi-line'
             {
-            match("single-line"); 
+            match("multi-line"); 
 
 
             }
@@ -620,10 +617,10 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:37:7: ( '=>' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:37:9: '=>'
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:37:7: ( 'character-rule' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:37:9: 'character-rule'
             {
-            match("=>"); 
+            match("character-rule"); 
 
 
             }
@@ -641,10 +638,10 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:38:7: ( 'escaped' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:38:9: 'escaped'
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:38:7: ( 'javascript-rule' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:38:9: 'javascript-rule'
             {
-            match("escaped"); 
+            match("javascript-rule"); 
 
 
             }
@@ -662,10 +659,10 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:39:7: ( 'by' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:39:9: 'by'
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:39:7: ( 'whitespace-rule' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:39:9: 'whitespace-rule'
             {
-            match("by"); 
+            match("whitespace-rule"); 
 
 
             }
@@ -683,10 +680,10 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:40:7: ( 'multi-line' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:40:9: 'multi-line'
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:40:7: ( 'javawhitespace' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:40:9: 'javawhitespace'
             {
-            match("multi-line"); 
+            match("javawhitespace"); 
 
 
             }
@@ -704,10 +701,10 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:41:7: ( 'character-rule' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:41:9: 'character-rule'
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:41:7: ( 'rgb' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:41:9: 'rgb'
             {
-            match("character-rule"); 
+            match("rgb"); 
 
 
             }
@@ -725,11 +722,10 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:42:7: ( 'javascript-rule' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:42:9: 'javascript-rule'
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:42:7: ( '(' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:42:9: '('
             {
-            match("javascript-rule"); 
-
+            match('('); 
 
             }
 
@@ -746,11 +742,10 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:43:7: ( 'whitespace-rule' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:43:9: 'whitespace-rule'
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:43:7: ( ')' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:43:9: ')'
             {
-            match("whitespace-rule"); 
-
+            match(')'); 
 
             }
 
@@ -767,10 +762,10 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:44:7: ( 'javawhitespace' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:44:9: 'javawhitespace'
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:44:7: ( 'bold' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:44:9: 'bold'
             {
-            match("javawhitespace"); 
+            match("bold"); 
 
 
             }
@@ -788,10 +783,10 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = T__45;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:45:7: ( 'rgb' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:45:9: 'rgb'
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:45:7: ( 'italic' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:45:9: 'italic'
             {
-            match("rgb"); 
+            match("italic"); 
 
 
             }
@@ -809,10 +804,11 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = T__46;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:46:7: ( '(' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:46:9: '('
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:46:7: ( 'underline' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:46:9: 'underline'
             {
-            match('('); 
+            match("underline"); 
+
 
             }
 
@@ -829,91 +825,8 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = T__47;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:47:7: ( ')' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:47:9: ')'
-            {
-            match(')'); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__47"
-
-    // $ANTLR start "T__48"
-    public final void mT__48() throws RecognitionException {
-        try {
-            int _type = T__48;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:48:7: ( 'bold' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:48:9: 'bold'
-            {
-            match("bold"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__48"
-
-    // $ANTLR start "T__49"
-    public final void mT__49() throws RecognitionException {
-        try {
-            int _type = T__49;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:49:7: ( 'italic' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:49:9: 'italic'
-            {
-            match("italic"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__49"
-
-    // $ANTLR start "T__50"
-    public final void mT__50() throws RecognitionException {
-        try {
-            int _type = T__50;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:50:7: ( 'underline' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:50:9: 'underline'
-            {
-            match("underline"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__50"
-
-    // $ANTLR start "T__51"
-    public final void mT__51() throws RecognitionException {
-        try {
-            int _type = T__51;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:51:7: ( 'strike-through' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:51:9: 'strike-through'
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:47:7: ( 'strike-through' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:47:9: 'strike-through'
             {
             match("strike-through"); 
 
@@ -926,17 +839,17 @@ public class InternalHSLLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end "T__51"
+    // $ANTLR end "T__47"
 
     // $ANTLR start "RULE_ID"
     public final void mRULE_ID() throws RecognitionException {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2068:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2068:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1881:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1881:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2068:11: ( '^' )?
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1881:11: ( '^' )?
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -945,7 +858,7 @@ public class InternalHSLLexer extends Lexer {
             }
             switch (alt1) {
                 case 1 :
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2068:11: '^'
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1881:11: '^'
                     {
                     match('^'); 
 
@@ -963,7 +876,7 @@ public class InternalHSLLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2068:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1881:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop2:
             do {
                 int alt2=2;
@@ -1012,10 +925,10 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2070:10: ( ( '0' .. '9' )+ )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2070:12: ( '0' .. '9' )+
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1883:10: ( ( '0' .. '9' )+ )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1883:12: ( '0' .. '9' )+
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2070:12: ( '0' .. '9' )+
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1883:12: ( '0' .. '9' )+
             int cnt3=0;
             loop3:
             do {
@@ -1029,7 +942,7 @@ public class InternalHSLLexer extends Lexer {
 
                 switch (alt3) {
             	case 1 :
-            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2070:13: '0' .. '9'
+            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1883:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1061,10 +974,10 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2072:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2072:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1885:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1885:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2072:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1885:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -1082,10 +995,10 @@ public class InternalHSLLexer extends Lexer {
             }
             switch (alt6) {
                 case 1 :
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2072:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1885:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2072:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1885:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop4:
                     do {
                         int alt4=3;
@@ -1101,7 +1014,7 @@ public class InternalHSLLexer extends Lexer {
 
                         switch (alt4) {
                     	case 1 :
-                    	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2072:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
+                    	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1885:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
                     	    {
                     	    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') ) {
@@ -1117,7 +1030,7 @@ public class InternalHSLLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2072:66: ~ ( ( '\\\\' | '\"' ) )
+                    	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1885:66: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1142,10 +1055,10 @@ public class InternalHSLLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2072:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1885:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2072:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1885:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop5:
                     do {
                         int alt5=3;
@@ -1161,7 +1074,7 @@ public class InternalHSLLexer extends Lexer {
 
                         switch (alt5) {
                     	case 1 :
-                    	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2072:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
+                    	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1885:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
                     	    {
                     	    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') ) {
@@ -1177,7 +1090,7 @@ public class InternalHSLLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2072:137: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1885:137: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1220,12 +1133,12 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2074:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2074:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1887:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1887:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2074:24: ( options {greedy=false; } : . )*
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1887:24: ( options {greedy=false; } : . )*
             loop7:
             do {
                 int alt7=2;
@@ -1250,7 +1163,7 @@ public class InternalHSLLexer extends Lexer {
 
                 switch (alt7) {
             	case 1 :
-            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2074:52: .
+            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1887:52: .
             	    {
             	    matchAny(); 
 
@@ -1280,12 +1193,12 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2076:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2076:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1889:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1889:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2076:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1889:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop8:
             do {
                 int alt8=2;
@@ -1298,7 +1211,7 @@ public class InternalHSLLexer extends Lexer {
 
                 switch (alt8) {
             	case 1 :
-            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2076:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1889:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -1318,7 +1231,7 @@ public class InternalHSLLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2076:40: ( ( '\\r' )? '\\n' )?
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1889:40: ( ( '\\r' )? '\\n' )?
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -1327,9 +1240,9 @@ public class InternalHSLLexer extends Lexer {
             }
             switch (alt10) {
                 case 1 :
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2076:41: ( '\\r' )? '\\n'
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1889:41: ( '\\r' )? '\\n'
                     {
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2076:41: ( '\\r' )?
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1889:41: ( '\\r' )?
                     int alt9=2;
                     int LA9_0 = input.LA(1);
 
@@ -1338,7 +1251,7 @@ public class InternalHSLLexer extends Lexer {
                     }
                     switch (alt9) {
                         case 1 :
-                            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2076:41: '\\r'
+                            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1889:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1370,10 +1283,10 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2078:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2078:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1891:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1891:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2078:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1891:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt11=0;
             loop11:
             do {
@@ -1427,8 +1340,8 @@ public class InternalHSLLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2080:16: ( . )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2080:18: .
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1893:16: ( . )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1893:18: .
             {
             matchAny(); 
 
@@ -1443,8 +1356,8 @@ public class InternalHSLLexer extends Lexer {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
-        int alt12=48;
+        // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        int alt12=44;
         alt12 = dfa12.predict(input);
         switch (alt12) {
             case 1 :
@@ -1707,77 +1620,49 @@ public class InternalHSLLexer extends Lexer {
                 }
                 break;
             case 38 :
-                // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:232: T__48
-                {
-                mT__48(); 
-
-                }
-                break;
-            case 39 :
-                // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:238: T__49
-                {
-                mT__49(); 
-
-                }
-                break;
-            case 40 :
-                // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:244: T__50
-                {
-                mT__50(); 
-
-                }
-                break;
-            case 41 :
-                // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:250: T__51
-                {
-                mT__51(); 
-
-                }
-                break;
-            case 42 :
-                // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:256: RULE_ID
+                // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:232: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
-            case 43 :
-                // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:264: RULE_INT
+            case 39 :
+                // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:240: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
-            case 44 :
-                // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:273: RULE_STRING
+            case 40 :
+                // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:249: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
-            case 45 :
-                // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:285: RULE_ML_COMMENT
+            case 41 :
+                // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:261: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
-            case 46 :
-                // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:301: RULE_SL_COMMENT
+            case 42 :
+                // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:277: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
-            case 47 :
-                // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:317: RULE_WS
+            case 43 :
+                // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:293: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
-            case 48 :
-                // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:325: RULE_ANY_OTHER
+            case 44 :
+                // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:301: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -1791,298 +1676,274 @@ public class InternalHSLLexer extends Lexer {
 
     protected DFA12 dfa12 = new DFA12(this);
     static final String DFA12_eotS =
-        "\3\uffff\11\45\1\uffff\2\45\3\uffff\1\40\2\45\2\uffff\2\45\1\40"+
-        "\2\uffff\3\40\4\uffff\2\45\1\uffff\13\45\1\uffff\1\45\1\124\2\45"+
-        "\4\uffff\2\45\2\uffff\2\45\5\uffff\1\133\4\45\1\uffff\5\45\1\150"+
-        "\3\45\1\uffff\6\45\1\uffff\1\162\3\45\2\uffff\4\45\1\177\1\45\1"+
-        "\uffff\3\45\1\u0084\5\45\1\uffff\2\45\1\uffff\4\45\1\u0090\4\45"+
-        "\2\uffff\1\45\1\u0099\1\45\1\uffff\13\45\1\uffff\1\u00a7\2\45\1"+
-        "\uffff\1\45\2\uffff\1\45\1\uffff\4\45\1\u00b0\1\45\1\u00b2\1\45"+
-        "\1\u00b4\3\45\3\uffff\2\45\1\u00ba\1\u00bb\1\45\1\u00bd\1\45\1\uffff"+
-        "\1\45\1\uffff\1\45\1\uffff\5\45\2\uffff\1\u00c6\1\uffff\2\45\1\u00c9"+
-        "\5\45\1\uffff\1\45\1\u00d0\1\uffff\4\45\1\uffff\1\45\2\uffff\3\45"+
-        "\1\uffff\2\45\1\u00db\1\45\1\u00dd\1\uffff\1\u00de\2\uffff";
+        "\3\uffff\12\43\3\uffff\1\37\3\43\2\uffff\2\43\1\37\2\uffff\3\37"+
+        "\4\uffff\1\43\1\uffff\14\43\4\uffff\1\43\1\117\2\43\2\uffff\2\43"+
+        "\5\uffff\1\124\2\43\1\uffff\5\43\1\137\4\43\1\uffff\4\43\1\uffff"+
+        "\2\43\2\uffff\4\43\1\163\1\43\1\uffff\4\43\1\171\4\43\1\uffff\4"+
+        "\43\1\u0082\4\43\2\uffff\1\43\1\u008b\2\43\1\uffff\10\43\1\uffff"+
+        "\1\u0097\2\43\1\uffff\1\43\2\uffff\1\43\1\uffff\3\43\1\u009f\2\43"+
+        "\1\u00a2\3\43\3\uffff\2\43\1\u00a8\1\43\1\u00aa\1\43\1\uffff\2\43"+
+        "\1\uffff\5\43\1\uffff\1\u00b3\1\uffff\2\43\1\u00b6\5\43\1\uffff"+
+        "\1\43\1\u00bd\1\uffff\4\43\1\uffff\1\43\2\uffff\3\43\1\uffff\2\43"+
+        "\1\u00c8\1\43\1\u00ca\1\uffff\1\u00cb\2\uffff";
     static final String DFA12_eofS =
-        "\u00df\uffff";
+        "\u00cc\uffff";
     static final String DFA12_minS =
-        "\1\0\2\uffff\1\147\2\141\1\151\1\165\1\150\1\147\1\145\1\157\1\uffff"+
-        "\1\147\1\145\3\uffff\1\76\1\163\1\150\2\uffff\1\164\1\156\1\101"+
-        "\2\uffff\2\0\1\52\4\uffff\1\156\1\143\1\uffff\1\162\1\166\1\55\1"+
-        "\156\1\162\1\154\1\141\1\154\1\142\1\146\1\153\1\uffff\1\143\1\60"+
-        "\1\154\1\171\4\uffff\1\143\1\151\2\uffff\1\141\1\144\5\uffff\1\60"+
-        "\1\164\1\157\1\164\1\141\1\144\1\143\1\151\1\164\1\162\1\145\1\60"+
-        "\1\141\1\145\1\157\1\uffff\1\144\1\167\1\141\1\164\1\154\1\145\1"+
-        "\uffff\1\60\1\154\1\151\1\55\2\uffff\1\154\1\145\1\153\1\151\1\60"+
-        "\1\55\1\uffff\1\165\1\156\1\154\1\60\1\157\1\160\1\145\1\151\1\162"+
-        "\1\uffff\1\157\1\164\1\uffff\1\157\1\143\1\150\1\145\1\60\1\147"+
-        "\1\145\1\55\1\143\1\uffff\1\144\1\154\1\60\1\157\1\uffff\1\162\1"+
-        "\145\1\163\1\143\1\154\1\162\1\151\1\143\1\162\1\151\1\55\1\uffff"+
-        "\1\60\1\55\1\151\1\uffff\1\164\2\uffff\1\164\1\uffff\1\162\2\144"+
-        "\1\160\1\60\1\151\1\60\1\157\1\60\1\151\1\164\1\151\3\uffff\1\156"+
-        "\1\145\2\60\1\163\1\60\1\141\1\uffff\1\156\1\uffff\1\156\1\uffff"+
-        "\1\160\1\145\1\156\1\145\1\162\2\uffff\1\60\1\uffff\1\143\1\145"+
-        "\1\60\1\164\1\163\1\145\1\144\1\55\1\uffff\1\145\1\60\1\uffff\1"+
-        "\55\1\160\1\144\1\157\1\uffff\1\55\2\uffff\1\141\1\157\1\143\1\uffff"+
-        "\2\143\1\60\1\145\1\60\1\uffff\1\60\2\uffff";
+        "\1\0\2\uffff\1\157\2\141\1\151\1\165\1\150\1\147\1\145\1\157\1\145"+
+        "\3\uffff\1\76\1\163\1\157\1\150\2\uffff\1\164\1\156\1\101\2\uffff"+
+        "\2\0\1\52\4\uffff\1\162\1\uffff\1\162\1\166\1\55\1\156\1\162\1\154"+
+        "\1\141\1\154\1\142\1\146\1\153\1\171\4\uffff\1\143\1\60\1\154\1"+
+        "\151\2\uffff\1\141\1\144\5\uffff\1\60\1\164\1\141\1\144\1\143\1"+
+        "\151\1\164\1\162\1\145\1\60\1\141\1\145\1\167\1\141\1\uffff\1\144"+
+        "\1\164\1\154\1\145\1\uffff\1\151\1\55\2\uffff\1\154\1\145\1\153"+
+        "\1\151\1\60\1\55\1\uffff\1\165\1\156\1\157\1\160\1\60\1\145\1\151"+
+        "\1\162\1\164\1\uffff\1\157\1\143\1\150\1\145\1\60\1\147\1\145\1"+
+        "\55\1\143\1\uffff\1\144\1\154\1\60\1\162\1\145\1\uffff\1\163\1\143"+
+        "\1\154\1\151\1\143\1\162\1\151\1\55\1\uffff\1\60\1\55\1\151\1\uffff"+
+        "\1\164\2\uffff\1\164\1\uffff\2\144\1\160\1\60\1\151\1\157\1\60\1"+
+        "\151\1\164\1\151\3\uffff\1\156\1\145\1\60\1\163\1\60\1\141\1\uffff"+
+        "\2\156\1\uffff\1\160\1\145\1\156\1\145\1\162\1\uffff\1\60\1\uffff"+
+        "\1\143\1\145\1\60\1\164\1\163\1\145\1\144\1\55\1\uffff\1\145\1\60"+
+        "\1\uffff\1\55\1\160\1\144\1\157\1\uffff\1\55\2\uffff\1\141\1\157"+
+        "\1\143\1\uffff\2\143\1\60\1\145\1\60\1\uffff\1\60\2\uffff";
     static final String DFA12_maxS =
         "\1\uffff\2\uffff\1\157\1\141\1\163\1\164\1\165\1\150\1\165\1\145"+
-        "\1\157\1\uffff\1\171\1\145\3\uffff\1\76\1\163\1\150\2\uffff\1\164"+
-        "\1\156\1\172\2\uffff\2\uffff\1\57\4\uffff\1\162\1\143\1\uffff\1"+
-        "\162\1\166\1\55\1\156\1\162\1\154\1\141\1\154\1\142\1\146\1\153"+
-        "\1\uffff\1\143\1\172\1\154\1\171\4\uffff\1\143\1\151\2\uffff\1\141"+
-        "\1\144\5\uffff\1\172\1\164\1\157\1\164\1\141\1\160\1\147\1\151\1"+
-        "\164\1\162\1\145\1\172\1\141\1\145\1\157\1\uffff\1\144\1\167\1\141"+
-        "\1\164\1\154\1\145\1\uffff\1\172\1\154\1\151\1\167\2\uffff\1\154"+
-        "\1\145\1\156\1\151\1\172\1\55\1\uffff\1\165\1\156\1\154\1\172\1"+
-        "\157\1\160\1\145\1\151\1\162\1\uffff\1\157\1\164\1\uffff\1\157\1"+
-        "\143\1\150\1\145\1\172\1\147\1\145\1\154\1\143\1\uffff\1\160\1\154"+
-        "\1\172\1\157\1\uffff\1\162\1\145\1\163\1\143\1\154\1\162\1\151\1"+
-        "\143\1\162\1\151\1\154\1\uffff\1\172\1\55\1\151\1\uffff\1\164\2"+
-        "\uffff\1\164\1\uffff\1\162\2\144\1\160\1\172\1\151\1\172\1\157\1"+
-        "\172\1\151\1\164\1\151\3\uffff\1\156\1\145\2\172\1\163\1\172\1\141"+
-        "\1\uffff\1\156\1\uffff\1\156\1\uffff\1\160\1\145\1\156\1\145\1\162"+
-        "\2\uffff\1\172\1\uffff\1\143\1\145\1\172\1\164\1\163\1\145\1\144"+
-        "\1\55\1\uffff\1\145\1\172\1\uffff\1\55\1\160\1\144\1\157\1\uffff"+
-        "\1\55\2\uffff\1\141\1\157\1\143\1\uffff\2\143\1\172\1\145\1\172"+
-        "\1\uffff\1\172\2\uffff";
+        "\1\157\1\145\3\uffff\1\76\1\163\1\171\1\150\2\uffff\1\164\1\156"+
+        "\1\172\2\uffff\2\uffff\1\57\4\uffff\1\162\1\uffff\1\162\1\166\1"+
+        "\55\1\156\1\162\1\154\1\141\1\154\1\142\1\146\1\153\1\171\4\uffff"+
+        "\1\143\1\172\1\154\1\151\2\uffff\1\141\1\144\5\uffff\1\172\1\164"+
+        "\1\141\1\160\1\147\1\151\1\164\1\162\1\145\1\172\1\141\1\145\1\167"+
+        "\1\141\1\uffff\1\144\1\164\1\154\1\145\1\uffff\1\151\1\167\2\uffff"+
+        "\1\154\1\145\1\156\1\151\1\172\1\55\1\uffff\1\165\1\156\1\157\1"+
+        "\160\1\172\1\145\1\151\1\162\1\164\1\uffff\1\157\1\143\1\150\1\145"+
+        "\1\172\1\147\1\145\1\154\1\143\1\uffff\1\160\1\154\1\172\1\162\1"+
+        "\145\1\uffff\1\163\1\143\1\154\1\151\1\143\1\162\1\151\1\154\1\uffff"+
+        "\1\172\1\55\1\151\1\uffff\1\164\2\uffff\1\164\1\uffff\2\144\1\160"+
+        "\1\172\1\151\1\157\1\172\1\151\1\164\1\151\3\uffff\1\156\1\145\1"+
+        "\172\1\163\1\172\1\141\1\uffff\2\156\1\uffff\1\160\1\145\1\156\1"+
+        "\145\1\162\1\uffff\1\172\1\uffff\1\143\1\145\1\172\1\164\1\163\1"+
+        "\145\1\144\1\55\1\uffff\1\145\1\172\1\uffff\1\55\1\160\1\144\1\157"+
+        "\1\uffff\1\55\2\uffff\1\141\1\157\1\143\1\uffff\2\143\1\172\1\145"+
+        "\1\172\1\uffff\1\172\2\uffff";
     static final String DFA12_acceptS =
-        "\1\uffff\1\1\1\2\11\uffff\1\22\2\uffff\1\26\1\27\1\30\3\uffff\1"+
-        "\44\1\45\3\uffff\1\52\1\53\3\uffff\1\57\1\60\1\1\1\2\2\uffff\1\52"+
-        "\13\uffff\1\22\4\uffff\1\26\1\27\1\30\1\33\2\uffff\1\44\1\45\2\uffff"+
-        "\1\53\1\54\1\55\1\56\1\57\17\uffff\1\35\6\uffff\1\3\4\uffff\1\14"+
-        "\1\15\6\uffff\1\43\11\uffff\1\24\2\uffff\1\5\11\uffff\1\11\4\uffff"+
-        "\1\46\13\uffff\1\31\3\uffff\1\36\1\uffff\1\13\1\16\1\uffff\1\20"+
-        "\14\uffff\1\32\1\12\1\51\7\uffff\1\47\1\uffff\1\21\1\uffff\1\10"+
-        "\5\uffff\1\17\1\23\1\uffff\1\34\10\uffff\1\25\2\uffff\1\4\4\uffff"+
-        "\1\37\1\uffff\1\50\1\40\3\uffff\1\41\5\uffff\1\7\1\uffff\1\6\1\42";
+        "\1\uffff\1\1\1\2\12\uffff\1\22\1\23\1\24\4\uffff\1\40\1\41\3\uffff"+
+        "\1\46\1\47\3\uffff\1\53\1\54\1\1\1\2\1\uffff\1\46\14\uffff\1\22"+
+        "\1\23\1\24\1\27\4\uffff\1\40\1\41\2\uffff\1\47\1\50\1\51\1\52\1"+
+        "\53\16\uffff\1\31\4\uffff\1\3\2\uffff\1\14\1\15\6\uffff\1\37\11"+
+        "\uffff\1\5\11\uffff\1\11\5\uffff\1\42\10\uffff\1\25\3\uffff\1\32"+
+        "\1\uffff\1\13\1\16\1\uffff\1\20\12\uffff\1\26\1\12\1\45\6\uffff"+
+        "\1\43\2\uffff\1\10\5\uffff\1\17\1\uffff\1\30\10\uffff\1\21\2\uffff"+
+        "\1\4\4\uffff\1\33\1\uffff\1\44\1\34\3\uffff\1\35\5\uffff\1\7\1\uffff"+
+        "\1\6\1\36";
     static final String DFA12_specialS =
-        "\1\1\33\uffff\1\0\1\2\u00c1\uffff}>";
+        "\1\1\32\uffff\1\0\1\2\u00af\uffff}>";
     static final String[] DFA12_transitionS = {
-            "\11\40\2\37\2\40\1\37\22\40\1\37\1\40\1\34\4\40\1\35\1\25\1"+
-            "\26\2\40\1\20\2\40\1\36\12\33\1\14\2\40\1\22\3\40\32\32\1\17"+
-            "\1\40\1\21\1\31\1\32\1\40\1\32\1\15\1\10\1\12\1\23\1\3\2\32"+
-            "\1\27\1\5\1\16\1\32\1\7\2\32\1\4\1\32\1\11\1\6\1\13\1\30\1\32"+
-            "\1\24\3\32\1\1\1\40\1\2\uff82\40",
+            "\11\37\2\36\2\37\1\36\22\37\1\36\1\37\1\33\4\37\1\34\1\24\1"+
+            "\25\2\37\1\16\2\37\1\35\12\32\3\37\1\20\3\37\32\31\1\15\1\37"+
+            "\1\17\1\30\1\31\1\37\1\31\1\22\1\10\1\12\1\21\1\3\2\31\1\26"+
+            "\1\5\1\14\1\31\1\7\2\31\1\4\1\31\1\11\1\6\1\13\1\27\1\31\1\23"+
+            "\3\31\1\1\1\37\1\2\uff82\37",
             "",
             "",
-            "\1\44\7\uffff\1\43",
-            "\1\46",
-            "\1\47\21\uffff\1\50",
-            "\1\51\12\uffff\1\52",
-            "\1\53",
-            "\1\54",
-            "\1\56\15\uffff\1\55",
+            "\1\42",
+            "\1\44",
+            "\1\45\21\uffff\1\46",
+            "\1\47\12\uffff\1\50",
+            "\1\51",
+            "\1\52",
+            "\1\54\15\uffff\1\53",
+            "\1\55",
+            "\1\56",
             "\1\57",
-            "\1\60",
             "",
-            "\1\62\7\uffff\1\64\11\uffff\1\63",
-            "\1\65",
             "",
             "",
+            "\1\63",
+            "\1\64",
+            "\1\66\11\uffff\1\65",
+            "\1\67",
+            "",
             "",
-            "\1\71",
             "\1\72",
             "\1\73",
+            "\32\43\4\uffff\1\43\1\uffff\32\43",
             "",
             "",
-            "\1\76",
-            "\1\77",
-            "\32\45\4\uffff\1\45\1\uffff\32\45",
-            "",
+            "\0\75",
+            "\0\75",
+            "\1\76\4\uffff\1\77",
             "",
-            "\0\101",
-            "\0\101",
-            "\1\102\4\uffff\1\103",
             "",
             "",
             "",
+            "\1\101",
             "",
-            "\1\106\3\uffff\1\105",
+            "\1\102",
+            "\1\103",
+            "\1\104",
+            "\1\105",
+            "\1\106",
             "\1\107",
-            "",
             "\1\110",
             "\1\111",
             "\1\112",
             "\1\113",
             "\1\114",
             "\1\115",
-            "\1\116",
-            "\1\117",
-            "\1\120",
-            "\1\121",
-            "\1\122",
-            "",
-            "\1\123",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "\1\125",
-            "\1\126",
             "",
             "",
             "",
             "",
-            "\1\127",
-            "\1\130",
+            "\1\116",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+            "\1\120",
+            "\1\121",
             "",
             "",
-            "\1\131",
-            "\1\132",
+            "\1\122",
+            "\1\123",
             "",
             "",
             "",
             "",
             "",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+            "\1\125",
+            "\1\126",
+            "\1\130\13\uffff\1\127",
+            "\1\132\3\uffff\1\131",
+            "\1\133",
             "\1\134",
             "\1\135",
             "\1\136",
-            "\1\137",
-            "\1\141\13\uffff\1\140",
-            "\1\143\3\uffff\1\142",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+            "\1\140",
+            "\1\141",
+            "\1\142",
+            "\1\143",
+            "",
             "\1\144",
             "\1\145",
             "\1\146",
             "\1\147",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "\1\151",
-            "\1\152",
-            "\1\153",
             "",
-            "\1\154",
+            "\1\150",
+            "\1\151\66\uffff\1\152\16\uffff\1\153\3\uffff\1\154",
+            "",
+            "",
             "\1\155",
             "\1\156",
-            "\1\157",
-            "\1\160",
+            "\1\160\2\uffff\1\157",
             "\1\161",
-            "",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "\1\163",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\1\162\31\43",
             "\1\164",
-            "\1\165\66\uffff\1\166\16\uffff\1\167\3\uffff\1\170",
-            "",
             "",
-            "\1\171",
+            "\1\165",
+            "\1\166",
+            "\1\167",
+            "\1\170",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
             "\1\172",
-            "\1\174\2\uffff\1\173",
+            "\1\173",
+            "\1\174",
             "\1\175",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\1\176\31\45",
-            "\1\u0080",
             "",
+            "\1\176",
+            "\1\177",
+            "\1\u0080",
             "\1\u0081",
-            "\1\u0082",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
             "\1\u0083",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "\1\u0085",
-            "\1\u0086",
+            "\1\u0084",
+            "\1\u0086\76\uffff\1\u0085",
             "\1\u0087",
-            "\1\u0088",
-            "\1\u0089",
             "",
+            "\1\u0089\13\uffff\1\u0088",
             "\1\u008a",
-            "\1\u008b",
-            "",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
             "\1\u008c",
             "\1\u008d",
+            "",
             "\1\u008e",
             "\1\u008f",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
+            "\1\u0090",
             "\1\u0091",
             "\1\u0092",
-            "\1\u0094\76\uffff\1\u0093",
-            "\1\u0095",
+            "\1\u0093",
+            "\1\u0094",
+            "\1\u0096\76\uffff\1\u0095",
             "",
-            "\1\u0097\13\uffff\1\u0096",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
             "\1\u0098",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
+            "\1\u0099",
+            "",
             "\1\u009a",
             "",
+            "",
             "\1\u009b",
+            "",
             "\1\u009c",
             "\1\u009d",
             "\1\u009e",
-            "\1\u009f",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
             "\1\u00a0",
             "\1\u00a1",
-            "\1\u00a2",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
             "\1\u00a3",
             "\1\u00a4",
-            "\1\u00a6\76\uffff\1\u00a5",
-            "",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "\1\u00a8",
-            "\1\u00a9",
+            "\1\u00a5",
             "",
-            "\1\u00aa",
             "",
             "",
+            "\1\u00a6",
+            "\1\u00a7",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+            "\1\u00a9",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
             "\1\u00ab",
             "",
             "\1\u00ac",
             "\1\u00ad",
+            "",
             "\1\u00ae",
             "\1\u00af",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
+            "\1\u00b0",
             "\1\u00b1",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "\1\u00b3",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "\1\u00b5",
-            "\1\u00b6",
-            "\1\u00b7",
-            "",
+            "\1\u00b2",
             "",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
             "",
+            "\1\u00b4",
+            "\1\u00b5",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+            "\1\u00b7",
             "\1\u00b8",
             "\1\u00b9",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
+            "\1\u00ba",
+            "\1\u00bb",
+            "",
             "\1\u00bc",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "\1\u00be",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
             "",
+            "\1\u00be",
             "\1\u00bf",
-            "",
             "\1\u00c0",
-            "",
             "\1\u00c1",
+            "",
             "\1\u00c2",
+            "",
+            "",
             "\1\u00c3",
             "\1\u00c4",
             "\1\u00c5",
             "",
-            "",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "",
+            "\1\u00c6",
             "\1\u00c7",
-            "\1\u00c8",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "\1\u00ca",
-            "\1\u00cb",
-            "\1\u00cc",
-            "\1\u00cd",
-            "\1\u00ce",
-            "",
-            "\1\u00cf",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "",
-            "\1\u00d1",
-            "\1\u00d2",
-            "\1\u00d3",
-            "\1\u00d4",
-            "",
-            "\1\u00d5",
-            "",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+            "\1\u00c9",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
             "",
-            "\1\u00d6",
-            "\1\u00d7",
-            "\1\u00d8",
-            "",
-            "\1\u00d9",
-            "\1\u00da",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "\1\u00dc",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
             "",
             ""
     };
@@ -2117,19 +1978,19 @@ public class InternalHSLLexer extends Lexer {
             this.transition = DFA12_transition;
         }
         public String getDescription() {
-            return "1:1: Tokens : ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
+            return "1:1: Tokens : ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             IntStream input = _input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA12_28 = input.LA(1);
+                        int LA12_27 = input.LA(1);
 
                         s = -1;
-                        if ( ((LA12_28>='\u0000' && LA12_28<='\uFFFF')) ) {s = 65;}
+                        if ( ((LA12_27>='\u0000' && LA12_27<='\uFFFF')) ) {s = 61;}
 
-                        else s = 32;
+                        else s = 31;
 
                         if ( s>=0 ) return s;
                         break;
@@ -2159,57 +2020,55 @@ public class InternalHSLLexer extends Lexer {
 
                         else if ( (LA12_0=='t') ) {s = 11;}
 
-                        else if ( (LA12_0==':') ) {s = 12;}
+                        else if ( (LA12_0=='k') ) {s = 12;}
 
-                        else if ( (LA12_0=='b') ) {s = 13;}
+                        else if ( (LA12_0=='[') ) {s = 13;}
 
-                        else if ( (LA12_0=='k') ) {s = 14;}
+                        else if ( (LA12_0==',') ) {s = 14;}
 
-                        else if ( (LA12_0=='[') ) {s = 15;}
+                        else if ( (LA12_0==']') ) {s = 15;}
 
-                        else if ( (LA12_0==',') ) {s = 16;}
+                        else if ( (LA12_0=='=') ) {s = 16;}
 
-                        else if ( (LA12_0==']') ) {s = 17;}
+                        else if ( (LA12_0=='e') ) {s = 17;}
 
-                        else if ( (LA12_0=='=') ) {s = 18;}
+                        else if ( (LA12_0=='b') ) {s = 18;}
 
-                        else if ( (LA12_0=='e') ) {s = 19;}
+                        else if ( (LA12_0=='w') ) {s = 19;}
 
-                        else if ( (LA12_0=='w') ) {s = 20;}
+                        else if ( (LA12_0=='(') ) {s = 20;}
 
-                        else if ( (LA12_0=='(') ) {s = 21;}
+                        else if ( (LA12_0==')') ) {s = 21;}
 
-                        else if ( (LA12_0==')') ) {s = 22;}
+                        else if ( (LA12_0=='i') ) {s = 22;}
 
-                        else if ( (LA12_0=='i') ) {s = 23;}
+                        else if ( (LA12_0=='u') ) {s = 23;}
 
-                        else if ( (LA12_0=='u') ) {s = 24;}
+                        else if ( (LA12_0=='^') ) {s = 24;}
 
-                        else if ( (LA12_0=='^') ) {s = 25;}
+                        else if ( ((LA12_0>='A' && LA12_0<='Z')||LA12_0=='_'||LA12_0=='a'||(LA12_0>='g' && LA12_0<='h')||LA12_0=='l'||(LA12_0>='n' && LA12_0<='o')||LA12_0=='q'||LA12_0=='v'||(LA12_0>='x' && LA12_0<='z')) ) {s = 25;}
 
-                        else if ( ((LA12_0>='A' && LA12_0<='Z')||LA12_0=='_'||LA12_0=='a'||(LA12_0>='g' && LA12_0<='h')||LA12_0=='l'||(LA12_0>='n' && LA12_0<='o')||LA12_0=='q'||LA12_0=='v'||(LA12_0>='x' && LA12_0<='z')) ) {s = 26;}
+                        else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 26;}
 
-                        else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 27;}
+                        else if ( (LA12_0=='\"') ) {s = 27;}
 
-                        else if ( (LA12_0=='\"') ) {s = 28;}
+                        else if ( (LA12_0=='\'') ) {s = 28;}
 
-                        else if ( (LA12_0=='\'') ) {s = 29;}
+                        else if ( (LA12_0=='/') ) {s = 29;}
 
-                        else if ( (LA12_0=='/') ) {s = 30;}
+                        else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {s = 30;}
 
-                        else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {s = 31;}
-
-                        else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='*' && LA12_0<='+')||(LA12_0>='-' && LA12_0<='.')||(LA12_0>=';' && LA12_0<='<')||(LA12_0>='>' && LA12_0<='@')||LA12_0=='\\'||LA12_0=='`'||LA12_0=='|'||(LA12_0>='~' && LA12_0<='\uFFFF')) ) {s = 32;}
+                        else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='*' && LA12_0<='+')||(LA12_0>='-' && LA12_0<='.')||(LA12_0>=':' && LA12_0<='<')||(LA12_0>='>' && LA12_0<='@')||LA12_0=='\\'||LA12_0=='`'||LA12_0=='|'||(LA12_0>='~' && LA12_0<='\uFFFF')) ) {s = 31;}
 
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA12_29 = input.LA(1);
+                        int LA12_28 = input.LA(1);
 
                         s = -1;
-                        if ( ((LA12_29>='\u0000' && LA12_29<='\uFFFF')) ) {s = 65;}
+                        if ( ((LA12_28>='\u0000' && LA12_28<='\uFFFF')) ) {s = 61;}
 
-                        else s = 32;
+                        else s = 31;
 
                         if ( s>=0 ) return s;
                         break;
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSLParser.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSLParser.java
index 9cdb2c761..3be43cae1 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSLParser.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSLParser.java
@@ -22,9 +22,8 @@ import java.util.ArrayList;
 @SuppressWarnings("all")
 public class InternalHSLParser extends AbstractInternalAntlrParser {
     public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'{'", "'}'", "'for'", "'partition'", "'java-like-partitioner'", "'singlelinedoc'", "'multilinedoc'", "'javadoc'", "'char'", "'string'", "'rule-partitioner'", "'js-partitioner'", "'js-damager'", "'rule-damager'", "'default'", "'token'", "'fgcolor'", "':'", "'bgcolor'", "'font'", "'keywords'", "'['", "','", "']'", "'since'", "'single-line'", "'=>'", "'escaped'", "'by'", "'multi-line'", "'character-rule'", "'javascript-rule'", "'whitespace-rule'", "'javawhitespace'", "'rgb'", "'('", "')'", "'bold'", "'italic'", "'underline'", "'strike-through'"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'{'", "'}'", "'for'", "'partition'", "'java-like-partitioner'", "'singlelinedoc'", "'multilinedoc'", "'javadoc'", "'char'", "'string'", "'rule-partitioner'", "'js-partitioner'", "'js-damager'", "'rule-damager'", "'default'", "'token'", "'keywords'", "'['", "','", "']'", "'since'", "'single-line'", "'=>'", "'escaped'", "'by'", "'multi-line'", "'character-rule'", "'javascript-rule'", "'whitespace-rule'", "'javawhitespace'", "'rgb'", "'('", "')'", "'bold'", "'italic'", "'underline'", "'strike-through'"
     };
-    public static final int T__50=50;
     public static final int T__19=19;
     public static final int T__15=15;
     public static final int T__16=16;
@@ -34,7 +33,6 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
     public static final int T__12=12;
     public static final int T__13=13;
     public static final int T__14=14;
-    public static final int T__51=51;
     public static final int RULE_ID=4;
     public static final int T__26=26;
     public static final int T__27=27;
@@ -63,8 +61,6 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
     public static final int T__32=32;
     public static final int RULE_WS=9;
     public static final int RULE_ANY_OTHER=10;
-    public static final int T__48=48;
-    public static final int T__49=49;
     public static final int T__44=44;
     public static final int T__45=45;
     public static final int T__46=46;
@@ -969,7 +965,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
                 int alt5=2;
                 int LA5_0 = input.LA(1);
 
-                if ( (LA5_0==36||LA5_0==40||LA5_0==42) ) {
+                if ( (LA5_0==32||LA5_0==36||LA5_0==38) ) {
                     alt5=1;
                 }
 
@@ -1538,7 +1534,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
                 int alt8=2;
                 int LA8_0 = input.LA(1);
 
-                if ( (LA8_0==31) ) {
+                if ( (LA8_0==27) ) {
                     alt8=1;
                 }
 
@@ -1587,7 +1583,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
                 int alt9=2;
                 int LA9_0 = input.LA(1);
 
-                if ( (LA9_0==36||(LA9_0>=40 && LA9_0<=43)) ) {
+                if ( (LA9_0==32||(LA9_0>=36 && LA9_0<=39)) ) {
                     alt9=1;
                 }
 
@@ -1691,36 +1687,22 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleScannerToken"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:701:1: ruleScannerToken returns [EObject current=null] : ( ( (lv_default_0_0= 'default' ) )? otherlv_1= 'token' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '{' (otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) ) )? (otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) ) )? (otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) ) )? otherlv_13= '}' )? ) ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:701:1: ruleScannerToken returns [EObject current=null] : ( ( (lv_default_0_0= 'default' ) )? otherlv_1= 'token' ( (lv_name_2_0= RULE_ID ) ) ) ;
     public final EObject ruleScannerToken() throws RecognitionException {
         EObject current = null;
 
         Token lv_default_0_0=null;
         Token otherlv_1=null;
         Token lv_name_2_0=null;
-        Token otherlv_3=null;
-        Token otherlv_4=null;
-        Token otherlv_5=null;
-        Token otherlv_7=null;
-        Token otherlv_8=null;
-        Token otherlv_10=null;
-        Token otherlv_11=null;
-        Token otherlv_13=null;
-        EObject lv_fgColor_6_0 = null;
-
-        EObject lv_bgColor_9_0 = null;
-
-        EObject lv_font_12_0 = null;
-
 
          enterRule(); 
             
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:704:28: ( ( ( (lv_default_0_0= 'default' ) )? otherlv_1= 'token' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '{' (otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) ) )? (otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) ) )? (otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) ) )? otherlv_13= '}' )? ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:705:1: ( ( (lv_default_0_0= 'default' ) )? otherlv_1= 'token' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '{' (otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) ) )? (otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) ) )? (otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) ) )? otherlv_13= '}' )? )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:704:28: ( ( ( (lv_default_0_0= 'default' ) )? otherlv_1= 'token' ( (lv_name_2_0= RULE_ID ) ) ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:705:1: ( ( (lv_default_0_0= 'default' ) )? otherlv_1= 'token' ( (lv_name_2_0= RULE_ID ) ) )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:705:1: ( ( (lv_default_0_0= 'default' ) )? otherlv_1= 'token' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '{' (otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) ) )? (otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) ) )? (otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) ) )? otherlv_13= '}' )? )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:705:2: ( (lv_default_0_0= 'default' ) )? otherlv_1= 'token' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '{' (otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) ) )? (otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) ) )? (otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) ) )? otherlv_13= '}' )?
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:705:1: ( ( (lv_default_0_0= 'default' ) )? otherlv_1= 'token' ( (lv_name_2_0= RULE_ID ) ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:705:2: ( (lv_default_0_0= 'default' ) )? otherlv_1= 'token' ( (lv_name_2_0= RULE_ID ) )
             {
             // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:705:2: ( (lv_default_0_0= 'default' ) )?
             int alt10=2;
@@ -1785,199 +1767,6 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:742:2: (otherlv_3= '{' (otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) ) )? (otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) ) )? (otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) ) )? otherlv_13= '}' )?
-            int alt14=2;
-            int LA14_0 = input.LA(1);
-
-            if ( (LA14_0==11) ) {
-                alt14=1;
-            }
-            switch (alt14) {
-                case 1 :
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:742:4: otherlv_3= '{' (otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) ) )? (otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) ) )? (otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) ) )? otherlv_13= '}'
-                    {
-                    otherlv_3=(Token)match(input,11,FOLLOW_11_in_ruleScannerToken1595); 
-
-                        	newLeafNode(otherlv_3, grammarAccess.getScannerTokenAccess().getLeftCurlyBracketKeyword_3_0());
-                        
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:746:1: (otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) ) )?
-                    int alt11=2;
-                    int LA11_0 = input.LA(1);
-
-                    if ( (LA11_0==27) ) {
-                        alt11=1;
-                    }
-                    switch (alt11) {
-                        case 1 :
-                            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:746:3: otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) )
-                            {
-                            otherlv_4=(Token)match(input,27,FOLLOW_27_in_ruleScannerToken1608); 
-
-                                	newLeafNode(otherlv_4, grammarAccess.getScannerTokenAccess().getFgcolorKeyword_3_1_0());
-                                
-                            otherlv_5=(Token)match(input,28,FOLLOW_28_in_ruleScannerToken1620); 
-
-                                	newLeafNode(otherlv_5, grammarAccess.getScannerTokenAccess().getColonKeyword_3_1_1());
-                                
-                            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:754:1: ( (lv_fgColor_6_0= ruleColor ) )
-                            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:755:1: (lv_fgColor_6_0= ruleColor )
-                            {
-                            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:755:1: (lv_fgColor_6_0= ruleColor )
-                            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:756:3: lv_fgColor_6_0= ruleColor
-                            {
-                             
-                            	        newCompositeNode(grammarAccess.getScannerTokenAccess().getFgColorColorParserRuleCall_3_1_2_0()); 
-                            	    
-                            pushFollow(FOLLOW_ruleColor_in_ruleScannerToken1641);
-                            lv_fgColor_6_0=ruleColor();
-
-                            state._fsp--;
-
-
-                            	        if (current==null) {
-                            	            current = createModelElementForParent(grammarAccess.getScannerTokenRule());
-                            	        }
-                                   		set(
-                                   			current, 
-                                   			"fgColor",
-                                    		lv_fgColor_6_0, 
-                                    		"Color");
-                            	        afterParserOrEnumRuleCall();
-                            	    
-
-                            }
-
-
-                            }
-
-
-                            }
-                            break;
-
-                    }
-
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:772:4: (otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) ) )?
-                    int alt12=2;
-                    int LA12_0 = input.LA(1);
-
-                    if ( (LA12_0==29) ) {
-                        alt12=1;
-                    }
-                    switch (alt12) {
-                        case 1 :
-                            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:772:6: otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) )
-                            {
-                            otherlv_7=(Token)match(input,29,FOLLOW_29_in_ruleScannerToken1656); 
-
-                                	newLeafNode(otherlv_7, grammarAccess.getScannerTokenAccess().getBgcolorKeyword_3_2_0());
-                                
-                            otherlv_8=(Token)match(input,28,FOLLOW_28_in_ruleScannerToken1668); 
-
-                                	newLeafNode(otherlv_8, grammarAccess.getScannerTokenAccess().getColonKeyword_3_2_1());
-                                
-                            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:780:1: ( (lv_bgColor_9_0= ruleColor ) )
-                            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:781:1: (lv_bgColor_9_0= ruleColor )
-                            {
-                            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:781:1: (lv_bgColor_9_0= ruleColor )
-                            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:782:3: lv_bgColor_9_0= ruleColor
-                            {
-                             
-                            	        newCompositeNode(grammarAccess.getScannerTokenAccess().getBgColorColorParserRuleCall_3_2_2_0()); 
-                            	    
-                            pushFollow(FOLLOW_ruleColor_in_ruleScannerToken1689);
-                            lv_bgColor_9_0=ruleColor();
-
-                            state._fsp--;
-
-
-                            	        if (current==null) {
-                            	            current = createModelElementForParent(grammarAccess.getScannerTokenRule());
-                            	        }
-                                   		set(
-                                   			current, 
-                                   			"bgColor",
-                                    		lv_bgColor_9_0, 
-                                    		"Color");
-                            	        afterParserOrEnumRuleCall();
-                            	    
-
-                            }
-
-
-                            }
-
-
-                            }
-                            break;
-
-                    }
-
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:798:4: (otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) ) )?
-                    int alt13=2;
-                    int LA13_0 = input.LA(1);
-
-                    if ( (LA13_0==30) ) {
-                        alt13=1;
-                    }
-                    switch (alt13) {
-                        case 1 :
-                            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:798:6: otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) )
-                            {
-                            otherlv_10=(Token)match(input,30,FOLLOW_30_in_ruleScannerToken1704); 
-
-                                	newLeafNode(otherlv_10, grammarAccess.getScannerTokenAccess().getFontKeyword_3_3_0());
-                                
-                            otherlv_11=(Token)match(input,28,FOLLOW_28_in_ruleScannerToken1716); 
-
-                                	newLeafNode(otherlv_11, grammarAccess.getScannerTokenAccess().getColonKeyword_3_3_1());
-                                
-                            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:806:1: ( (lv_font_12_0= ruleFont ) )
-                            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:807:1: (lv_font_12_0= ruleFont )
-                            {
-                            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:807:1: (lv_font_12_0= ruleFont )
-                            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:808:3: lv_font_12_0= ruleFont
-                            {
-                             
-                            	        newCompositeNode(grammarAccess.getScannerTokenAccess().getFontFontParserRuleCall_3_3_2_0()); 
-                            	    
-                            pushFollow(FOLLOW_ruleFont_in_ruleScannerToken1737);
-                            lv_font_12_0=ruleFont();
-
-                            state._fsp--;
-
-
-                            	        if (current==null) {
-                            	            current = createModelElementForParent(grammarAccess.getScannerTokenRule());
-                            	        }
-                                   		set(
-                                   			current, 
-                                   			"font",
-                                    		lv_font_12_0, 
-                                    		"Font");
-                            	        afterParserOrEnumRuleCall();
-                            	    
-
-                            }
-
-
-                            }
-
-
-                            }
-                            break;
-
-                    }
-
-                    otherlv_13=(Token)match(input,12,FOLLOW_12_in_ruleScannerToken1751); 
-
-                        	newLeafNode(otherlv_13, grammarAccess.getScannerTokenAccess().getRightCurlyBracketKeyword_3_4());
-                        
-
-                    }
-                    break;
-
-            }
-
 
             }
 
@@ -1999,7 +1788,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleKeywordGroup"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:836:1: entryRuleKeywordGroup returns [EObject current=null] : iv_ruleKeywordGroup= ruleKeywordGroup EOF ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:750:1: entryRuleKeywordGroup returns [EObject current=null] : iv_ruleKeywordGroup= ruleKeywordGroup EOF ;
     public final EObject entryRuleKeywordGroup() throws RecognitionException {
         EObject current = null;
 
@@ -2007,17 +1796,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:837:2: (iv_ruleKeywordGroup= ruleKeywordGroup EOF )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:838:2: iv_ruleKeywordGroup= ruleKeywordGroup EOF
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:751:2: (iv_ruleKeywordGroup= ruleKeywordGroup EOF )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:752:2: iv_ruleKeywordGroup= ruleKeywordGroup EOF
             {
              newCompositeNode(grammarAccess.getKeywordGroupRule()); 
-            pushFollow(FOLLOW_ruleKeywordGroup_in_entryRuleKeywordGroup1789);
+            pushFollow(FOLLOW_ruleKeywordGroup_in_entryRuleKeywordGroup1618);
             iv_ruleKeywordGroup=ruleKeywordGroup();
 
             state._fsp--;
 
              current =iv_ruleKeywordGroup; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleKeywordGroup1799); 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleKeywordGroup1628); 
 
             }
 
@@ -2035,7 +1824,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleKeywordGroup"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:845:1: ruleKeywordGroup returns [EObject current=null] : (otherlv_0= 'keywords' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_keywords_3_0= ruleKeyword ) ) (otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) ) )* otherlv_6= ']' ) ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:759:1: ruleKeywordGroup returns [EObject current=null] : (otherlv_0= 'keywords' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_keywords_3_0= ruleKeyword ) ) (otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) ) )* otherlv_6= ']' ) ;
     public final EObject ruleKeywordGroup() throws RecognitionException {
         EObject current = null;
 
@@ -2052,28 +1841,28 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:848:28: ( (otherlv_0= 'keywords' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_keywords_3_0= ruleKeyword ) ) (otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) ) )* otherlv_6= ']' ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:849:1: (otherlv_0= 'keywords' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_keywords_3_0= ruleKeyword ) ) (otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) ) )* otherlv_6= ']' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:762:28: ( (otherlv_0= 'keywords' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_keywords_3_0= ruleKeyword ) ) (otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) ) )* otherlv_6= ']' ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:763:1: (otherlv_0= 'keywords' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_keywords_3_0= ruleKeyword ) ) (otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) ) )* otherlv_6= ']' )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:849:1: (otherlv_0= 'keywords' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_keywords_3_0= ruleKeyword ) ) (otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) ) )* otherlv_6= ']' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:849:3: otherlv_0= 'keywords' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_keywords_3_0= ruleKeyword ) ) (otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) ) )* otherlv_6= ']'
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:763:1: (otherlv_0= 'keywords' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_keywords_3_0= ruleKeyword ) ) (otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) ) )* otherlv_6= ']' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:763:3: otherlv_0= 'keywords' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_keywords_3_0= ruleKeyword ) ) (otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) ) )* otherlv_6= ']'
             {
-            otherlv_0=(Token)match(input,31,FOLLOW_31_in_ruleKeywordGroup1836); 
+            otherlv_0=(Token)match(input,27,FOLLOW_27_in_ruleKeywordGroup1665); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getKeywordGroupAccess().getKeywordsKeyword_0());
                 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:853:1: ( (otherlv_1= RULE_ID ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:854:1: (otherlv_1= RULE_ID )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:767:1: ( (otherlv_1= RULE_ID ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:768:1: (otherlv_1= RULE_ID )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:854:1: (otherlv_1= RULE_ID )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:855:3: otherlv_1= RULE_ID
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:768:1: (otherlv_1= RULE_ID )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:769:3: otherlv_1= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getKeywordGroupRule());
             	        }
                     
-            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleKeywordGroup1856); 
+            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleKeywordGroup1685); 
 
             		newLeafNode(otherlv_1, grammarAccess.getKeywordGroupAccess().getTokenScannerTokenCrossReference_1_0()); 
             	
@@ -2083,20 +1872,20 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,32,FOLLOW_32_in_ruleKeywordGroup1868); 
+            otherlv_2=(Token)match(input,28,FOLLOW_28_in_ruleKeywordGroup1697); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getKeywordGroupAccess().getLeftSquareBracketKeyword_2());
                 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:870:1: ( (lv_keywords_3_0= ruleKeyword ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:871:1: (lv_keywords_3_0= ruleKeyword )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:784:1: ( (lv_keywords_3_0= ruleKeyword ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:785:1: (lv_keywords_3_0= ruleKeyword )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:871:1: (lv_keywords_3_0= ruleKeyword )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:872:3: lv_keywords_3_0= ruleKeyword
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:785:1: (lv_keywords_3_0= ruleKeyword )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:786:3: lv_keywords_3_0= ruleKeyword
             {
              
             	        newCompositeNode(grammarAccess.getKeywordGroupAccess().getKeywordsKeywordParserRuleCall_3_0()); 
             	    
-            pushFollow(FOLLOW_ruleKeyword_in_ruleKeywordGroup1889);
+            pushFollow(FOLLOW_ruleKeyword_in_ruleKeywordGroup1718);
             lv_keywords_3_0=ruleKeyword();
 
             state._fsp--;
@@ -2118,35 +1907,35 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:888:2: (otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) ) )*
-            loop15:
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:802:2: (otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) ) )*
+            loop11:
             do {
-                int alt15=2;
-                int LA15_0 = input.LA(1);
+                int alt11=2;
+                int LA11_0 = input.LA(1);
 
-                if ( (LA15_0==33) ) {
-                    alt15=1;
+                if ( (LA11_0==29) ) {
+                    alt11=1;
                 }
 
 
-                switch (alt15) {
+                switch (alt11) {
             	case 1 :
-            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:888:4: otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) )
+            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:802:4: otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) )
             	    {
-            	    otherlv_4=(Token)match(input,33,FOLLOW_33_in_ruleKeywordGroup1902); 
+            	    otherlv_4=(Token)match(input,29,FOLLOW_29_in_ruleKeywordGroup1731); 
 
             	        	newLeafNode(otherlv_4, grammarAccess.getKeywordGroupAccess().getCommaKeyword_4_0());
             	        
-            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:892:1: ( (lv_keywords_5_0= ruleKeyword ) )
-            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:893:1: (lv_keywords_5_0= ruleKeyword )
+            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:806:1: ( (lv_keywords_5_0= ruleKeyword ) )
+            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:807:1: (lv_keywords_5_0= ruleKeyword )
             	    {
-            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:893:1: (lv_keywords_5_0= ruleKeyword )
-            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:894:3: lv_keywords_5_0= ruleKeyword
+            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:807:1: (lv_keywords_5_0= ruleKeyword )
+            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:808:3: lv_keywords_5_0= ruleKeyword
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getKeywordGroupAccess().getKeywordsKeywordParserRuleCall_4_1_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleKeyword_in_ruleKeywordGroup1923);
+            	    pushFollow(FOLLOW_ruleKeyword_in_ruleKeywordGroup1752);
             	    lv_keywords_5_0=ruleKeyword();
 
             	    state._fsp--;
@@ -2173,11 +1962,11 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop15;
+            	    break loop11;
                 }
             } while (true);
 
-            otherlv_6=(Token)match(input,34,FOLLOW_34_in_ruleKeywordGroup1937); 
+            otherlv_6=(Token)match(input,30,FOLLOW_30_in_ruleKeywordGroup1766); 
 
                 	newLeafNode(otherlv_6, grammarAccess.getKeywordGroupAccess().getRightSquareBracketKeyword_5());
                 
@@ -2202,7 +1991,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleKeyword"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:922:1: entryRuleKeyword returns [EObject current=null] : iv_ruleKeyword= ruleKeyword EOF ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:836:1: entryRuleKeyword returns [EObject current=null] : iv_ruleKeyword= ruleKeyword EOF ;
     public final EObject entryRuleKeyword() throws RecognitionException {
         EObject current = null;
 
@@ -2210,17 +1999,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:923:2: (iv_ruleKeyword= ruleKeyword EOF )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:924:2: iv_ruleKeyword= ruleKeyword EOF
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:837:2: (iv_ruleKeyword= ruleKeyword EOF )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:838:2: iv_ruleKeyword= ruleKeyword EOF
             {
              newCompositeNode(grammarAccess.getKeywordRule()); 
-            pushFollow(FOLLOW_ruleKeyword_in_entryRuleKeyword1973);
+            pushFollow(FOLLOW_ruleKeyword_in_entryRuleKeyword1802);
             iv_ruleKeyword=ruleKeyword();
 
             state._fsp--;
 
              current =iv_ruleKeyword; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleKeyword1983); 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleKeyword1812); 
 
             }
 
@@ -2238,7 +2027,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleKeyword"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:931:1: ruleKeyword returns [EObject current=null] : ( ( (lv_name_0_0= RULE_STRING ) ) (otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) ) )? ) ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:845:1: ruleKeyword returns [EObject current=null] : ( ( (lv_name_0_0= RULE_STRING ) ) (otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) ) )? ) ;
     public final EObject ruleKeyword() throws RecognitionException {
         EObject current = null;
 
@@ -2249,19 +2038,19 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:934:28: ( ( ( (lv_name_0_0= RULE_STRING ) ) (otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) ) )? ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:935:1: ( ( (lv_name_0_0= RULE_STRING ) ) (otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) ) )? )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:848:28: ( ( ( (lv_name_0_0= RULE_STRING ) ) (otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) ) )? ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:849:1: ( ( (lv_name_0_0= RULE_STRING ) ) (otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) ) )? )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:935:1: ( ( (lv_name_0_0= RULE_STRING ) ) (otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) ) )? )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:935:2: ( (lv_name_0_0= RULE_STRING ) ) (otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) ) )?
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:849:1: ( ( (lv_name_0_0= RULE_STRING ) ) (otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) ) )? )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:849:2: ( (lv_name_0_0= RULE_STRING ) ) (otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) ) )?
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:935:2: ( (lv_name_0_0= RULE_STRING ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:936:1: (lv_name_0_0= RULE_STRING )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:849:2: ( (lv_name_0_0= RULE_STRING ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:850:1: (lv_name_0_0= RULE_STRING )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:936:1: (lv_name_0_0= RULE_STRING )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:937:3: lv_name_0_0= RULE_STRING
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:850:1: (lv_name_0_0= RULE_STRING )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:851:3: lv_name_0_0= RULE_STRING
             {
-            lv_name_0_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleKeyword2025); 
+            lv_name_0_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleKeyword1854); 
 
             			newLeafNode(lv_name_0_0, grammarAccess.getKeywordAccess().getNameSTRINGTerminalRuleCall_0_0()); 
             		
@@ -2281,28 +2070,28 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:953:2: (otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) ) )?
-            int alt16=2;
-            int LA16_0 = input.LA(1);
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:867:2: (otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) ) )?
+            int alt12=2;
+            int LA12_0 = input.LA(1);
 
-            if ( (LA16_0==35) ) {
-                alt16=1;
+            if ( (LA12_0==31) ) {
+                alt12=1;
             }
-            switch (alt16) {
+            switch (alt12) {
                 case 1 :
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:953:4: otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:867:4: otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) )
                     {
-                    otherlv_1=(Token)match(input,35,FOLLOW_35_in_ruleKeyword2043); 
+                    otherlv_1=(Token)match(input,31,FOLLOW_31_in_ruleKeyword1872); 
 
                         	newLeafNode(otherlv_1, grammarAccess.getKeywordAccess().getSinceKeyword_1_0());
                         
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:957:1: ( (lv_version_2_0= RULE_STRING ) )
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:958:1: (lv_version_2_0= RULE_STRING )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:871:1: ( (lv_version_2_0= RULE_STRING ) )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:872:1: (lv_version_2_0= RULE_STRING )
                     {
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:958:1: (lv_version_2_0= RULE_STRING )
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:959:3: lv_version_2_0= RULE_STRING
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:872:1: (lv_version_2_0= RULE_STRING )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:873:3: lv_version_2_0= RULE_STRING
                     {
-                    lv_version_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleKeyword2060); 
+                    lv_version_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleKeyword1889); 
 
                     			newLeafNode(lv_version_2_0, grammarAccess.getKeywordAccess().getVersionSTRINGTerminalRuleCall_1_1_0()); 
                     		
@@ -2349,7 +2138,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleScannerRule"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:983:1: entryRuleScannerRule returns [EObject current=null] : iv_ruleScannerRule= ruleScannerRule EOF ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:897:1: entryRuleScannerRule returns [EObject current=null] : iv_ruleScannerRule= ruleScannerRule EOF ;
     public final EObject entryRuleScannerRule() throws RecognitionException {
         EObject current = null;
 
@@ -2357,17 +2146,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:984:2: (iv_ruleScannerRule= ruleScannerRule EOF )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:985:2: iv_ruleScannerRule= ruleScannerRule EOF
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:898:2: (iv_ruleScannerRule= ruleScannerRule EOF )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:899:2: iv_ruleScannerRule= ruleScannerRule EOF
             {
              newCompositeNode(grammarAccess.getScannerRuleRule()); 
-            pushFollow(FOLLOW_ruleScannerRule_in_entryRuleScannerRule2103);
+            pushFollow(FOLLOW_ruleScannerRule_in_entryRuleScannerRule1932);
             iv_ruleScannerRule=ruleScannerRule();
 
             state._fsp--;
 
              current =iv_ruleScannerRule; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleScannerRule2113); 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleScannerRule1942); 
 
             }
 
@@ -2385,7 +2174,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleScannerRule"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:992:1: ruleScannerRule returns [EObject current=null] : (this_ScannerSingleLineRule_0= ruleScannerSingleLineRule | this_ScannerMultiLineRule_1= ruleScannerMultiLineRule | this_ScannerCharacterRule_2= ruleScannerCharacterRule | this_ScannerJSRule_3= ruleScannerJSRule | this_ScannerWhitespaceRule_4= ruleScannerWhitespaceRule ) ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:906:1: ruleScannerRule returns [EObject current=null] : (this_ScannerSingleLineRule_0= ruleScannerSingleLineRule | this_ScannerMultiLineRule_1= ruleScannerMultiLineRule | this_ScannerCharacterRule_2= ruleScannerCharacterRule | this_ScannerJSRule_3= ruleScannerJSRule | this_ScannerWhitespaceRule_4= ruleScannerWhitespaceRule ) ;
     public final EObject ruleScannerRule() throws RecognitionException {
         EObject current = null;
 
@@ -2403,52 +2192,52 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:995:28: ( (this_ScannerSingleLineRule_0= ruleScannerSingleLineRule | this_ScannerMultiLineRule_1= ruleScannerMultiLineRule | this_ScannerCharacterRule_2= ruleScannerCharacterRule | this_ScannerJSRule_3= ruleScannerJSRule | this_ScannerWhitespaceRule_4= ruleScannerWhitespaceRule ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:996:1: (this_ScannerSingleLineRule_0= ruleScannerSingleLineRule | this_ScannerMultiLineRule_1= ruleScannerMultiLineRule | this_ScannerCharacterRule_2= ruleScannerCharacterRule | this_ScannerJSRule_3= ruleScannerJSRule | this_ScannerWhitespaceRule_4= ruleScannerWhitespaceRule )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:909:28: ( (this_ScannerSingleLineRule_0= ruleScannerSingleLineRule | this_ScannerMultiLineRule_1= ruleScannerMultiLineRule | this_ScannerCharacterRule_2= ruleScannerCharacterRule | this_ScannerJSRule_3= ruleScannerJSRule | this_ScannerWhitespaceRule_4= ruleScannerWhitespaceRule ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:910:1: (this_ScannerSingleLineRule_0= ruleScannerSingleLineRule | this_ScannerMultiLineRule_1= ruleScannerMultiLineRule | this_ScannerCharacterRule_2= ruleScannerCharacterRule | this_ScannerJSRule_3= ruleScannerJSRule | this_ScannerWhitespaceRule_4= ruleScannerWhitespaceRule )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:996:1: (this_ScannerSingleLineRule_0= ruleScannerSingleLineRule | this_ScannerMultiLineRule_1= ruleScannerMultiLineRule | this_ScannerCharacterRule_2= ruleScannerCharacterRule | this_ScannerJSRule_3= ruleScannerJSRule | this_ScannerWhitespaceRule_4= ruleScannerWhitespaceRule )
-            int alt17=5;
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:910:1: (this_ScannerSingleLineRule_0= ruleScannerSingleLineRule | this_ScannerMultiLineRule_1= ruleScannerMultiLineRule | this_ScannerCharacterRule_2= ruleScannerCharacterRule | this_ScannerJSRule_3= ruleScannerJSRule | this_ScannerWhitespaceRule_4= ruleScannerWhitespaceRule )
+            int alt13=5;
             switch ( input.LA(1) ) {
-            case 36:
+            case 32:
                 {
-                alt17=1;
+                alt13=1;
                 }
                 break;
-            case 40:
+            case 36:
                 {
-                alt17=2;
+                alt13=2;
                 }
                 break;
-            case 41:
+            case 37:
                 {
-                alt17=3;
+                alt13=3;
                 }
                 break;
-            case 42:
+            case 38:
                 {
-                alt17=4;
+                alt13=4;
                 }
                 break;
-            case 43:
+            case 39:
                 {
-                alt17=5;
+                alt13=5;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("", 17, 0, input);
+                    new NoViableAltException("", 13, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt17) {
+            switch (alt13) {
                 case 1 :
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:997:5: this_ScannerSingleLineRule_0= ruleScannerSingleLineRule
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:911:5: this_ScannerSingleLineRule_0= ruleScannerSingleLineRule
                     {
                      
                             newCompositeNode(grammarAccess.getScannerRuleAccess().getScannerSingleLineRuleParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleScannerSingleLineRule_in_ruleScannerRule2160);
+                    pushFollow(FOLLOW_ruleScannerSingleLineRule_in_ruleScannerRule1989);
                     this_ScannerSingleLineRule_0=ruleScannerSingleLineRule();
 
                     state._fsp--;
@@ -2461,12 +2250,12 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1007:5: this_ScannerMultiLineRule_1= ruleScannerMultiLineRule
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:921:5: this_ScannerMultiLineRule_1= ruleScannerMultiLineRule
                     {
                      
                             newCompositeNode(grammarAccess.getScannerRuleAccess().getScannerMultiLineRuleParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleScannerMultiLineRule_in_ruleScannerRule2187);
+                    pushFollow(FOLLOW_ruleScannerMultiLineRule_in_ruleScannerRule2016);
                     this_ScannerMultiLineRule_1=ruleScannerMultiLineRule();
 
                     state._fsp--;
@@ -2479,12 +2268,12 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1017:5: this_ScannerCharacterRule_2= ruleScannerCharacterRule
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:931:5: this_ScannerCharacterRule_2= ruleScannerCharacterRule
                     {
                      
                             newCompositeNode(grammarAccess.getScannerRuleAccess().getScannerCharacterRuleParserRuleCall_2()); 
                         
-                    pushFollow(FOLLOW_ruleScannerCharacterRule_in_ruleScannerRule2214);
+                    pushFollow(FOLLOW_ruleScannerCharacterRule_in_ruleScannerRule2043);
                     this_ScannerCharacterRule_2=ruleScannerCharacterRule();
 
                     state._fsp--;
@@ -2497,12 +2286,12 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1027:5: this_ScannerJSRule_3= ruleScannerJSRule
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:941:5: this_ScannerJSRule_3= ruleScannerJSRule
                     {
                      
                             newCompositeNode(grammarAccess.getScannerRuleAccess().getScannerJSRuleParserRuleCall_3()); 
                         
-                    pushFollow(FOLLOW_ruleScannerJSRule_in_ruleScannerRule2241);
+                    pushFollow(FOLLOW_ruleScannerJSRule_in_ruleScannerRule2070);
                     this_ScannerJSRule_3=ruleScannerJSRule();
 
                     state._fsp--;
@@ -2515,12 +2304,12 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 5 :
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1037:5: this_ScannerWhitespaceRule_4= ruleScannerWhitespaceRule
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:951:5: this_ScannerWhitespaceRule_4= ruleScannerWhitespaceRule
                     {
                      
                             newCompositeNode(grammarAccess.getScannerRuleAccess().getScannerWhitespaceRuleParserRuleCall_4()); 
                         
-                    pushFollow(FOLLOW_ruleScannerWhitespaceRule_in_ruleScannerRule2268);
+                    pushFollow(FOLLOW_ruleScannerWhitespaceRule_in_ruleScannerRule2097);
                     this_ScannerWhitespaceRule_4=ruleScannerWhitespaceRule();
 
                     state._fsp--;
@@ -2553,7 +2342,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleParitionRule"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1053:1: entryRuleParitionRule returns [EObject current=null] : iv_ruleParitionRule= ruleParitionRule EOF ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:967:1: entryRuleParitionRule returns [EObject current=null] : iv_ruleParitionRule= ruleParitionRule EOF ;
     public final EObject entryRuleParitionRule() throws RecognitionException {
         EObject current = null;
 
@@ -2561,17 +2350,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1054:2: (iv_ruleParitionRule= ruleParitionRule EOF )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1055:2: iv_ruleParitionRule= ruleParitionRule EOF
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:968:2: (iv_ruleParitionRule= ruleParitionRule EOF )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:969:2: iv_ruleParitionRule= ruleParitionRule EOF
             {
              newCompositeNode(grammarAccess.getParitionRuleRule()); 
-            pushFollow(FOLLOW_ruleParitionRule_in_entryRuleParitionRule2303);
+            pushFollow(FOLLOW_ruleParitionRule_in_entryRuleParitionRule2132);
             iv_ruleParitionRule=ruleParitionRule();
 
             state._fsp--;
 
              current =iv_ruleParitionRule; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleParitionRule2313); 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleParitionRule2142); 
 
             }
 
@@ -2589,7 +2378,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleParitionRule"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1062:1: ruleParitionRule returns [EObject current=null] : (this_PartitionSingleLineRule_0= rulePartitionSingleLineRule | this_PartitionMultiLineRule_1= rulePartitionMultiLineRule | this_PartitionJSRule_2= rulePartitionJSRule ) ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:976:1: ruleParitionRule returns [EObject current=null] : (this_PartitionSingleLineRule_0= rulePartitionSingleLineRule | this_PartitionMultiLineRule_1= rulePartitionMultiLineRule | this_PartitionJSRule_2= rulePartitionJSRule ) ;
     public final EObject ruleParitionRule() throws RecognitionException {
         EObject current = null;
 
@@ -2603,42 +2392,42 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1065:28: ( (this_PartitionSingleLineRule_0= rulePartitionSingleLineRule | this_PartitionMultiLineRule_1= rulePartitionMultiLineRule | this_PartitionJSRule_2= rulePartitionJSRule ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1066:1: (this_PartitionSingleLineRule_0= rulePartitionSingleLineRule | this_PartitionMultiLineRule_1= rulePartitionMultiLineRule | this_PartitionJSRule_2= rulePartitionJSRule )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:979:28: ( (this_PartitionSingleLineRule_0= rulePartitionSingleLineRule | this_PartitionMultiLineRule_1= rulePartitionMultiLineRule | this_PartitionJSRule_2= rulePartitionJSRule ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:980:1: (this_PartitionSingleLineRule_0= rulePartitionSingleLineRule | this_PartitionMultiLineRule_1= rulePartitionMultiLineRule | this_PartitionJSRule_2= rulePartitionJSRule )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1066:1: (this_PartitionSingleLineRule_0= rulePartitionSingleLineRule | this_PartitionMultiLineRule_1= rulePartitionMultiLineRule | this_PartitionJSRule_2= rulePartitionJSRule )
-            int alt18=3;
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:980:1: (this_PartitionSingleLineRule_0= rulePartitionSingleLineRule | this_PartitionMultiLineRule_1= rulePartitionMultiLineRule | this_PartitionJSRule_2= rulePartitionJSRule )
+            int alt14=3;
             switch ( input.LA(1) ) {
-            case 36:
+            case 32:
                 {
-                alt18=1;
+                alt14=1;
                 }
                 break;
-            case 40:
+            case 36:
                 {
-                alt18=2;
+                alt14=2;
                 }
                 break;
-            case 42:
+            case 38:
                 {
-                alt18=3;
+                alt14=3;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("", 18, 0, input);
+                    new NoViableAltException("", 14, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt18) {
+            switch (alt14) {
                 case 1 :
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1067:5: this_PartitionSingleLineRule_0= rulePartitionSingleLineRule
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:981:5: this_PartitionSingleLineRule_0= rulePartitionSingleLineRule
                     {
                      
                             newCompositeNode(grammarAccess.getParitionRuleAccess().getPartitionSingleLineRuleParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_rulePartitionSingleLineRule_in_ruleParitionRule2360);
+                    pushFollow(FOLLOW_rulePartitionSingleLineRule_in_ruleParitionRule2189);
                     this_PartitionSingleLineRule_0=rulePartitionSingleLineRule();
 
                     state._fsp--;
@@ -2651,12 +2440,12 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1077:5: this_PartitionMultiLineRule_1= rulePartitionMultiLineRule
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:991:5: this_PartitionMultiLineRule_1= rulePartitionMultiLineRule
                     {
                      
                             newCompositeNode(grammarAccess.getParitionRuleAccess().getPartitionMultiLineRuleParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_rulePartitionMultiLineRule_in_ruleParitionRule2387);
+                    pushFollow(FOLLOW_rulePartitionMultiLineRule_in_ruleParitionRule2216);
                     this_PartitionMultiLineRule_1=rulePartitionMultiLineRule();
 
                     state._fsp--;
@@ -2669,12 +2458,12 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1087:5: this_PartitionJSRule_2= rulePartitionJSRule
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1001:5: this_PartitionJSRule_2= rulePartitionJSRule
                     {
                      
                             newCompositeNode(grammarAccess.getParitionRuleAccess().getPartitionJSRuleParserRuleCall_2()); 
                         
-                    pushFollow(FOLLOW_rulePartitionJSRule_in_ruleParitionRule2414);
+                    pushFollow(FOLLOW_rulePartitionJSRule_in_ruleParitionRule2243);
                     this_PartitionJSRule_2=rulePartitionJSRule();
 
                     state._fsp--;
@@ -2707,7 +2496,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleScannerSingleLineRule"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1103:1: entryRuleScannerSingleLineRule returns [EObject current=null] : iv_ruleScannerSingleLineRule= ruleScannerSingleLineRule EOF ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1017:1: entryRuleScannerSingleLineRule returns [EObject current=null] : iv_ruleScannerSingleLineRule= ruleScannerSingleLineRule EOF ;
     public final EObject entryRuleScannerSingleLineRule() throws RecognitionException {
         EObject current = null;
 
@@ -2715,17 +2504,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1104:2: (iv_ruleScannerSingleLineRule= ruleScannerSingleLineRule EOF )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1105:2: iv_ruleScannerSingleLineRule= ruleScannerSingleLineRule EOF
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1018:2: (iv_ruleScannerSingleLineRule= ruleScannerSingleLineRule EOF )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1019:2: iv_ruleScannerSingleLineRule= ruleScannerSingleLineRule EOF
             {
              newCompositeNode(grammarAccess.getScannerSingleLineRuleRule()); 
-            pushFollow(FOLLOW_ruleScannerSingleLineRule_in_entryRuleScannerSingleLineRule2449);
+            pushFollow(FOLLOW_ruleScannerSingleLineRule_in_entryRuleScannerSingleLineRule2278);
             iv_ruleScannerSingleLineRule=ruleScannerSingleLineRule();
 
             state._fsp--;
 
              current =iv_ruleScannerSingleLineRule; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleScannerSingleLineRule2459); 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleScannerSingleLineRule2288); 
 
             }
 
@@ -2743,7 +2532,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleScannerSingleLineRule"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1112:1: ruleScannerSingleLineRule returns [EObject current=null] : (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1026:1: ruleScannerSingleLineRule returns [EObject current=null] : (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) ;
     public final EObject ruleScannerSingleLineRule() throws RecognitionException {
         EObject current = null;
 
@@ -2759,28 +2548,28 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1115:28: ( (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1116:1: (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1029:28: ( (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1030:1: (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1116:1: (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1116:3: otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )?
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1030:1: (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1030:3: otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )?
             {
-            otherlv_0=(Token)match(input,36,FOLLOW_36_in_ruleScannerSingleLineRule2496); 
+            otherlv_0=(Token)match(input,32,FOLLOW_32_in_ruleScannerSingleLineRule2325); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getScannerSingleLineRuleAccess().getSingleLineKeyword_0());
                 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1120:1: ( (otherlv_1= RULE_ID ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1121:1: (otherlv_1= RULE_ID )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1034:1: ( (otherlv_1= RULE_ID ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1035:1: (otherlv_1= RULE_ID )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1121:1: (otherlv_1= RULE_ID )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1122:3: otherlv_1= RULE_ID
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1035:1: (otherlv_1= RULE_ID )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1036:3: otherlv_1= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getScannerSingleLineRuleRule());
             	        }
                     
-            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleScannerSingleLineRule2516); 
+            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleScannerSingleLineRule2345); 
 
             		newLeafNode(otherlv_1, grammarAccess.getScannerSingleLineRuleAccess().getTokenScannerTokenCrossReference_1_0()); 
             	
@@ -2790,13 +2579,13 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1133:2: ( (lv_startSeq_2_0= RULE_STRING ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1134:1: (lv_startSeq_2_0= RULE_STRING )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1047:2: ( (lv_startSeq_2_0= RULE_STRING ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1048:1: (lv_startSeq_2_0= RULE_STRING )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1134:1: (lv_startSeq_2_0= RULE_STRING )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1135:3: lv_startSeq_2_0= RULE_STRING
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1048:1: (lv_startSeq_2_0= RULE_STRING )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1049:3: lv_startSeq_2_0= RULE_STRING
             {
-            lv_startSeq_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerSingleLineRule2533); 
+            lv_startSeq_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerSingleLineRule2362); 
 
             			newLeafNode(lv_startSeq_2_0, grammarAccess.getScannerSingleLineRuleAccess().getStartSeqSTRINGTerminalRuleCall_2_0()); 
             		
@@ -2816,17 +2605,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,37,FOLLOW_37_in_ruleScannerSingleLineRule2550); 
+            otherlv_3=(Token)match(input,33,FOLLOW_33_in_ruleScannerSingleLineRule2379); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getScannerSingleLineRuleAccess().getEqualsSignGreaterThanSignKeyword_3());
                 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1155:1: ( (lv_endSeq_4_0= RULE_STRING ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1156:1: (lv_endSeq_4_0= RULE_STRING )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1069:1: ( (lv_endSeq_4_0= RULE_STRING ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1070:1: (lv_endSeq_4_0= RULE_STRING )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1156:1: (lv_endSeq_4_0= RULE_STRING )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1157:3: lv_endSeq_4_0= RULE_STRING
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1070:1: (lv_endSeq_4_0= RULE_STRING )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1071:3: lv_endSeq_4_0= RULE_STRING
             {
-            lv_endSeq_4_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerSingleLineRule2567); 
+            lv_endSeq_4_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerSingleLineRule2396); 
 
             			newLeafNode(lv_endSeq_4_0, grammarAccess.getScannerSingleLineRuleAccess().getEndSeqSTRINGTerminalRuleCall_4_0()); 
             		
@@ -2846,32 +2635,32 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1173:2: (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )?
-            int alt19=2;
-            int LA19_0 = input.LA(1);
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1087:2: (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )?
+            int alt15=2;
+            int LA15_0 = input.LA(1);
 
-            if ( (LA19_0==38) ) {
-                alt19=1;
+            if ( (LA15_0==34) ) {
+                alt15=1;
             }
-            switch (alt19) {
+            switch (alt15) {
                 case 1 :
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1173:4: otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1087:4: otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) )
                     {
-                    otherlv_5=(Token)match(input,38,FOLLOW_38_in_ruleScannerSingleLineRule2585); 
+                    otherlv_5=(Token)match(input,34,FOLLOW_34_in_ruleScannerSingleLineRule2414); 
 
                         	newLeafNode(otherlv_5, grammarAccess.getScannerSingleLineRuleAccess().getEscapedKeyword_5_0());
                         
-                    otherlv_6=(Token)match(input,39,FOLLOW_39_in_ruleScannerSingleLineRule2597); 
+                    otherlv_6=(Token)match(input,35,FOLLOW_35_in_ruleScannerSingleLineRule2426); 
 
                         	newLeafNode(otherlv_6, grammarAccess.getScannerSingleLineRuleAccess().getByKeyword_5_1());
                         
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1181:1: ( (lv_escapeSeq_7_0= RULE_STRING ) )
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1182:1: (lv_escapeSeq_7_0= RULE_STRING )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1095:1: ( (lv_escapeSeq_7_0= RULE_STRING ) )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1096:1: (lv_escapeSeq_7_0= RULE_STRING )
                     {
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1182:1: (lv_escapeSeq_7_0= RULE_STRING )
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1183:3: lv_escapeSeq_7_0= RULE_STRING
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1096:1: (lv_escapeSeq_7_0= RULE_STRING )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1097:3: lv_escapeSeq_7_0= RULE_STRING
                     {
-                    lv_escapeSeq_7_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerSingleLineRule2614); 
+                    lv_escapeSeq_7_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerSingleLineRule2443); 
 
                     			newLeafNode(lv_escapeSeq_7_0, grammarAccess.getScannerSingleLineRuleAccess().getEscapeSeqSTRINGTerminalRuleCall_5_2_0()); 
                     		
@@ -2918,7 +2707,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRulePartitionSingleLineRule"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1207:1: entryRulePartitionSingleLineRule returns [EObject current=null] : iv_rulePartitionSingleLineRule= rulePartitionSingleLineRule EOF ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1121:1: entryRulePartitionSingleLineRule returns [EObject current=null] : iv_rulePartitionSingleLineRule= rulePartitionSingleLineRule EOF ;
     public final EObject entryRulePartitionSingleLineRule() throws RecognitionException {
         EObject current = null;
 
@@ -2926,17 +2715,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1208:2: (iv_rulePartitionSingleLineRule= rulePartitionSingleLineRule EOF )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1209:2: iv_rulePartitionSingleLineRule= rulePartitionSingleLineRule EOF
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1122:2: (iv_rulePartitionSingleLineRule= rulePartitionSingleLineRule EOF )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1123:2: iv_rulePartitionSingleLineRule= rulePartitionSingleLineRule EOF
             {
              newCompositeNode(grammarAccess.getPartitionSingleLineRuleRule()); 
-            pushFollow(FOLLOW_rulePartitionSingleLineRule_in_entryRulePartitionSingleLineRule2657);
+            pushFollow(FOLLOW_rulePartitionSingleLineRule_in_entryRulePartitionSingleLineRule2486);
             iv_rulePartitionSingleLineRule=rulePartitionSingleLineRule();
 
             state._fsp--;
 
              current =iv_rulePartitionSingleLineRule; 
-            match(input,EOF,FOLLOW_EOF_in_entryRulePartitionSingleLineRule2667); 
+            match(input,EOF,FOLLOW_EOF_in_entryRulePartitionSingleLineRule2496); 
 
             }
 
@@ -2954,7 +2743,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "rulePartitionSingleLineRule"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1216:1: rulePartitionSingleLineRule returns [EObject current=null] : (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1130:1: rulePartitionSingleLineRule returns [EObject current=null] : (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) ;
     public final EObject rulePartitionSingleLineRule() throws RecognitionException {
         EObject current = null;
 
@@ -2970,28 +2759,28 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1219:28: ( (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1220:1: (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1133:28: ( (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1134:1: (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1220:1: (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1220:3: otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )?
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1134:1: (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1134:3: otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )?
             {
-            otherlv_0=(Token)match(input,36,FOLLOW_36_in_rulePartitionSingleLineRule2704); 
+            otherlv_0=(Token)match(input,32,FOLLOW_32_in_rulePartitionSingleLineRule2533); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getPartitionSingleLineRuleAccess().getSingleLineKeyword_0());
                 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1224:1: ( (otherlv_1= RULE_ID ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1225:1: (otherlv_1= RULE_ID )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1138:1: ( (otherlv_1= RULE_ID ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1139:1: (otherlv_1= RULE_ID )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1225:1: (otherlv_1= RULE_ID )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1226:3: otherlv_1= RULE_ID
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1139:1: (otherlv_1= RULE_ID )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1140:3: otherlv_1= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getPartitionSingleLineRuleRule());
             	        }
                     
-            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_rulePartitionSingleLineRule2724); 
+            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_rulePartitionSingleLineRule2553); 
 
             		newLeafNode(otherlv_1, grammarAccess.getPartitionSingleLineRuleAccess().getParitionPartitionCrossReference_1_0()); 
             	
@@ -3001,13 +2790,13 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1237:2: ( (lv_startSeq_2_0= RULE_STRING ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1238:1: (lv_startSeq_2_0= RULE_STRING )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1151:2: ( (lv_startSeq_2_0= RULE_STRING ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1152:1: (lv_startSeq_2_0= RULE_STRING )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1238:1: (lv_startSeq_2_0= RULE_STRING )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1239:3: lv_startSeq_2_0= RULE_STRING
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1152:1: (lv_startSeq_2_0= RULE_STRING )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1153:3: lv_startSeq_2_0= RULE_STRING
             {
-            lv_startSeq_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionSingleLineRule2741); 
+            lv_startSeq_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionSingleLineRule2570); 
 
             			newLeafNode(lv_startSeq_2_0, grammarAccess.getPartitionSingleLineRuleAccess().getStartSeqSTRINGTerminalRuleCall_2_0()); 
             		
@@ -3027,17 +2816,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,37,FOLLOW_37_in_rulePartitionSingleLineRule2758); 
+            otherlv_3=(Token)match(input,33,FOLLOW_33_in_rulePartitionSingleLineRule2587); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getPartitionSingleLineRuleAccess().getEqualsSignGreaterThanSignKeyword_3());
                 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1259:1: ( (lv_endSeq_4_0= RULE_STRING ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1260:1: (lv_endSeq_4_0= RULE_STRING )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1173:1: ( (lv_endSeq_4_0= RULE_STRING ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1174:1: (lv_endSeq_4_0= RULE_STRING )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1260:1: (lv_endSeq_4_0= RULE_STRING )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1261:3: lv_endSeq_4_0= RULE_STRING
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1174:1: (lv_endSeq_4_0= RULE_STRING )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1175:3: lv_endSeq_4_0= RULE_STRING
             {
-            lv_endSeq_4_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionSingleLineRule2775); 
+            lv_endSeq_4_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionSingleLineRule2604); 
 
             			newLeafNode(lv_endSeq_4_0, grammarAccess.getPartitionSingleLineRuleAccess().getEndSeqSTRINGTerminalRuleCall_4_0()); 
             		
@@ -3057,32 +2846,32 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1277:2: (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )?
-            int alt20=2;
-            int LA20_0 = input.LA(1);
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1191:2: (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )?
+            int alt16=2;
+            int LA16_0 = input.LA(1);
 
-            if ( (LA20_0==38) ) {
-                alt20=1;
+            if ( (LA16_0==34) ) {
+                alt16=1;
             }
-            switch (alt20) {
+            switch (alt16) {
                 case 1 :
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1277:4: otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1191:4: otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) )
                     {
-                    otherlv_5=(Token)match(input,38,FOLLOW_38_in_rulePartitionSingleLineRule2793); 
+                    otherlv_5=(Token)match(input,34,FOLLOW_34_in_rulePartitionSingleLineRule2622); 
 
                         	newLeafNode(otherlv_5, grammarAccess.getPartitionSingleLineRuleAccess().getEscapedKeyword_5_0());
                         
-                    otherlv_6=(Token)match(input,39,FOLLOW_39_in_rulePartitionSingleLineRule2805); 
+                    otherlv_6=(Token)match(input,35,FOLLOW_35_in_rulePartitionSingleLineRule2634); 
 
                         	newLeafNode(otherlv_6, grammarAccess.getPartitionSingleLineRuleAccess().getByKeyword_5_1());
                         
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1285:1: ( (lv_escapeSeq_7_0= RULE_STRING ) )
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1286:1: (lv_escapeSeq_7_0= RULE_STRING )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1199:1: ( (lv_escapeSeq_7_0= RULE_STRING ) )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1200:1: (lv_escapeSeq_7_0= RULE_STRING )
                     {
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1286:1: (lv_escapeSeq_7_0= RULE_STRING )
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1287:3: lv_escapeSeq_7_0= RULE_STRING
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1200:1: (lv_escapeSeq_7_0= RULE_STRING )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1201:3: lv_escapeSeq_7_0= RULE_STRING
                     {
-                    lv_escapeSeq_7_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionSingleLineRule2822); 
+                    lv_escapeSeq_7_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionSingleLineRule2651); 
 
                     			newLeafNode(lv_escapeSeq_7_0, grammarAccess.getPartitionSingleLineRuleAccess().getEscapeSeqSTRINGTerminalRuleCall_5_2_0()); 
                     		
@@ -3129,7 +2918,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleScannerMultiLineRule"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1311:1: entryRuleScannerMultiLineRule returns [EObject current=null] : iv_ruleScannerMultiLineRule= ruleScannerMultiLineRule EOF ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1225:1: entryRuleScannerMultiLineRule returns [EObject current=null] : iv_ruleScannerMultiLineRule= ruleScannerMultiLineRule EOF ;
     public final EObject entryRuleScannerMultiLineRule() throws RecognitionException {
         EObject current = null;
 
@@ -3137,17 +2926,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1312:2: (iv_ruleScannerMultiLineRule= ruleScannerMultiLineRule EOF )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1313:2: iv_ruleScannerMultiLineRule= ruleScannerMultiLineRule EOF
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1226:2: (iv_ruleScannerMultiLineRule= ruleScannerMultiLineRule EOF )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1227:2: iv_ruleScannerMultiLineRule= ruleScannerMultiLineRule EOF
             {
              newCompositeNode(grammarAccess.getScannerMultiLineRuleRule()); 
-            pushFollow(FOLLOW_ruleScannerMultiLineRule_in_entryRuleScannerMultiLineRule2865);
+            pushFollow(FOLLOW_ruleScannerMultiLineRule_in_entryRuleScannerMultiLineRule2694);
             iv_ruleScannerMultiLineRule=ruleScannerMultiLineRule();
 
             state._fsp--;
 
              current =iv_ruleScannerMultiLineRule; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleScannerMultiLineRule2875); 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleScannerMultiLineRule2704); 
 
             }
 
@@ -3165,7 +2954,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleScannerMultiLineRule"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1320:1: ruleScannerMultiLineRule returns [EObject current=null] : (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1234:1: ruleScannerMultiLineRule returns [EObject current=null] : (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) ;
     public final EObject ruleScannerMultiLineRule() throws RecognitionException {
         EObject current = null;
 
@@ -3181,28 +2970,28 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1323:28: ( (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1324:1: (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1237:28: ( (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1238:1: (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1324:1: (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1324:3: otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )?
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1238:1: (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1238:3: otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )?
             {
-            otherlv_0=(Token)match(input,40,FOLLOW_40_in_ruleScannerMultiLineRule2912); 
+            otherlv_0=(Token)match(input,36,FOLLOW_36_in_ruleScannerMultiLineRule2741); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getScannerMultiLineRuleAccess().getMultiLineKeyword_0());
                 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1328:1: ( (otherlv_1= RULE_ID ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1329:1: (otherlv_1= RULE_ID )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1242:1: ( (otherlv_1= RULE_ID ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1243:1: (otherlv_1= RULE_ID )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1329:1: (otherlv_1= RULE_ID )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1330:3: otherlv_1= RULE_ID
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1243:1: (otherlv_1= RULE_ID )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1244:3: otherlv_1= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getScannerMultiLineRuleRule());
             	        }
                     
-            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleScannerMultiLineRule2932); 
+            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleScannerMultiLineRule2761); 
 
             		newLeafNode(otherlv_1, grammarAccess.getScannerMultiLineRuleAccess().getTokenScannerTokenCrossReference_1_0()); 
             	
@@ -3212,13 +3001,13 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1341:2: ( (lv_startSeq_2_0= RULE_STRING ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1342:1: (lv_startSeq_2_0= RULE_STRING )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1255:2: ( (lv_startSeq_2_0= RULE_STRING ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1256:1: (lv_startSeq_2_0= RULE_STRING )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1342:1: (lv_startSeq_2_0= RULE_STRING )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1343:3: lv_startSeq_2_0= RULE_STRING
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1256:1: (lv_startSeq_2_0= RULE_STRING )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1257:3: lv_startSeq_2_0= RULE_STRING
             {
-            lv_startSeq_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerMultiLineRule2949); 
+            lv_startSeq_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerMultiLineRule2778); 
 
             			newLeafNode(lv_startSeq_2_0, grammarAccess.getScannerMultiLineRuleAccess().getStartSeqSTRINGTerminalRuleCall_2_0()); 
             		
@@ -3238,17 +3027,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,37,FOLLOW_37_in_ruleScannerMultiLineRule2966); 
+            otherlv_3=(Token)match(input,33,FOLLOW_33_in_ruleScannerMultiLineRule2795); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getScannerMultiLineRuleAccess().getEqualsSignGreaterThanSignKeyword_3());
                 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1363:1: ( (lv_endSeq_4_0= RULE_STRING ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1364:1: (lv_endSeq_4_0= RULE_STRING )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1277:1: ( (lv_endSeq_4_0= RULE_STRING ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1278:1: (lv_endSeq_4_0= RULE_STRING )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1364:1: (lv_endSeq_4_0= RULE_STRING )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1365:3: lv_endSeq_4_0= RULE_STRING
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1278:1: (lv_endSeq_4_0= RULE_STRING )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1279:3: lv_endSeq_4_0= RULE_STRING
             {
-            lv_endSeq_4_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerMultiLineRule2983); 
+            lv_endSeq_4_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerMultiLineRule2812); 
 
             			newLeafNode(lv_endSeq_4_0, grammarAccess.getScannerMultiLineRuleAccess().getEndSeqSTRINGTerminalRuleCall_4_0()); 
             		
@@ -3268,32 +3057,32 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1381:2: (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )?
-            int alt21=2;
-            int LA21_0 = input.LA(1);
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1295:2: (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )?
+            int alt17=2;
+            int LA17_0 = input.LA(1);
 
-            if ( (LA21_0==38) ) {
-                alt21=1;
+            if ( (LA17_0==34) ) {
+                alt17=1;
             }
-            switch (alt21) {
+            switch (alt17) {
                 case 1 :
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1381:4: otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1295:4: otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) )
                     {
-                    otherlv_5=(Token)match(input,38,FOLLOW_38_in_ruleScannerMultiLineRule3001); 
+                    otherlv_5=(Token)match(input,34,FOLLOW_34_in_ruleScannerMultiLineRule2830); 
 
                         	newLeafNode(otherlv_5, grammarAccess.getScannerMultiLineRuleAccess().getEscapedKeyword_5_0());
                         
-                    otherlv_6=(Token)match(input,39,FOLLOW_39_in_ruleScannerMultiLineRule3013); 
+                    otherlv_6=(Token)match(input,35,FOLLOW_35_in_ruleScannerMultiLineRule2842); 
 
                         	newLeafNode(otherlv_6, grammarAccess.getScannerMultiLineRuleAccess().getByKeyword_5_1());
                         
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1389:1: ( (lv_escapeSeq_7_0= RULE_STRING ) )
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1390:1: (lv_escapeSeq_7_0= RULE_STRING )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1303:1: ( (lv_escapeSeq_7_0= RULE_STRING ) )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1304:1: (lv_escapeSeq_7_0= RULE_STRING )
                     {
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1390:1: (lv_escapeSeq_7_0= RULE_STRING )
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1391:3: lv_escapeSeq_7_0= RULE_STRING
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1304:1: (lv_escapeSeq_7_0= RULE_STRING )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1305:3: lv_escapeSeq_7_0= RULE_STRING
                     {
-                    lv_escapeSeq_7_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerMultiLineRule3030); 
+                    lv_escapeSeq_7_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerMultiLineRule2859); 
 
                     			newLeafNode(lv_escapeSeq_7_0, grammarAccess.getScannerMultiLineRuleAccess().getEscapeSeqSTRINGTerminalRuleCall_5_2_0()); 
                     		
@@ -3340,7 +3129,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRulePartitionMultiLineRule"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1415:1: entryRulePartitionMultiLineRule returns [EObject current=null] : iv_rulePartitionMultiLineRule= rulePartitionMultiLineRule EOF ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1329:1: entryRulePartitionMultiLineRule returns [EObject current=null] : iv_rulePartitionMultiLineRule= rulePartitionMultiLineRule EOF ;
     public final EObject entryRulePartitionMultiLineRule() throws RecognitionException {
         EObject current = null;
 
@@ -3348,17 +3137,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1416:2: (iv_rulePartitionMultiLineRule= rulePartitionMultiLineRule EOF )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1417:2: iv_rulePartitionMultiLineRule= rulePartitionMultiLineRule EOF
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1330:2: (iv_rulePartitionMultiLineRule= rulePartitionMultiLineRule EOF )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1331:2: iv_rulePartitionMultiLineRule= rulePartitionMultiLineRule EOF
             {
              newCompositeNode(grammarAccess.getPartitionMultiLineRuleRule()); 
-            pushFollow(FOLLOW_rulePartitionMultiLineRule_in_entryRulePartitionMultiLineRule3073);
+            pushFollow(FOLLOW_rulePartitionMultiLineRule_in_entryRulePartitionMultiLineRule2902);
             iv_rulePartitionMultiLineRule=rulePartitionMultiLineRule();
 
             state._fsp--;
 
              current =iv_rulePartitionMultiLineRule; 
-            match(input,EOF,FOLLOW_EOF_in_entryRulePartitionMultiLineRule3083); 
+            match(input,EOF,FOLLOW_EOF_in_entryRulePartitionMultiLineRule2912); 
 
             }
 
@@ -3376,7 +3165,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "rulePartitionMultiLineRule"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1424:1: rulePartitionMultiLineRule returns [EObject current=null] : (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1338:1: rulePartitionMultiLineRule returns [EObject current=null] : (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) ;
     public final EObject rulePartitionMultiLineRule() throws RecognitionException {
         EObject current = null;
 
@@ -3392,28 +3181,28 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1427:28: ( (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1428:1: (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1341:28: ( (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1342:1: (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1428:1: (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1428:3: otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )?
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1342:1: (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1342:3: otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )?
             {
-            otherlv_0=(Token)match(input,40,FOLLOW_40_in_rulePartitionMultiLineRule3120); 
+            otherlv_0=(Token)match(input,36,FOLLOW_36_in_rulePartitionMultiLineRule2949); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getPartitionMultiLineRuleAccess().getMultiLineKeyword_0());
                 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1432:1: ( (otherlv_1= RULE_ID ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1433:1: (otherlv_1= RULE_ID )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1346:1: ( (otherlv_1= RULE_ID ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1347:1: (otherlv_1= RULE_ID )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1433:1: (otherlv_1= RULE_ID )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1434:3: otherlv_1= RULE_ID
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1347:1: (otherlv_1= RULE_ID )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1348:3: otherlv_1= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getPartitionMultiLineRuleRule());
             	        }
                     
-            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_rulePartitionMultiLineRule3140); 
+            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_rulePartitionMultiLineRule2969); 
 
             		newLeafNode(otherlv_1, grammarAccess.getPartitionMultiLineRuleAccess().getParitionPartitionCrossReference_1_0()); 
             	
@@ -3423,13 +3212,13 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1445:2: ( (lv_startSeq_2_0= RULE_STRING ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1446:1: (lv_startSeq_2_0= RULE_STRING )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1359:2: ( (lv_startSeq_2_0= RULE_STRING ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1360:1: (lv_startSeq_2_0= RULE_STRING )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1446:1: (lv_startSeq_2_0= RULE_STRING )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1447:3: lv_startSeq_2_0= RULE_STRING
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1360:1: (lv_startSeq_2_0= RULE_STRING )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1361:3: lv_startSeq_2_0= RULE_STRING
             {
-            lv_startSeq_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionMultiLineRule3157); 
+            lv_startSeq_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionMultiLineRule2986); 
 
             			newLeafNode(lv_startSeq_2_0, grammarAccess.getPartitionMultiLineRuleAccess().getStartSeqSTRINGTerminalRuleCall_2_0()); 
             		
@@ -3449,17 +3238,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,37,FOLLOW_37_in_rulePartitionMultiLineRule3174); 
+            otherlv_3=(Token)match(input,33,FOLLOW_33_in_rulePartitionMultiLineRule3003); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getPartitionMultiLineRuleAccess().getEqualsSignGreaterThanSignKeyword_3());
                 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1467:1: ( (lv_endSeq_4_0= RULE_STRING ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1468:1: (lv_endSeq_4_0= RULE_STRING )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1381:1: ( (lv_endSeq_4_0= RULE_STRING ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1382:1: (lv_endSeq_4_0= RULE_STRING )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1468:1: (lv_endSeq_4_0= RULE_STRING )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1469:3: lv_endSeq_4_0= RULE_STRING
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1382:1: (lv_endSeq_4_0= RULE_STRING )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1383:3: lv_endSeq_4_0= RULE_STRING
             {
-            lv_endSeq_4_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionMultiLineRule3191); 
+            lv_endSeq_4_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionMultiLineRule3020); 
 
             			newLeafNode(lv_endSeq_4_0, grammarAccess.getPartitionMultiLineRuleAccess().getEndSeqSTRINGTerminalRuleCall_4_0()); 
             		
@@ -3479,32 +3268,32 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1485:2: (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )?
-            int alt22=2;
-            int LA22_0 = input.LA(1);
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1399:2: (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )?
+            int alt18=2;
+            int LA18_0 = input.LA(1);
 
-            if ( (LA22_0==38) ) {
-                alt22=1;
+            if ( (LA18_0==34) ) {
+                alt18=1;
             }
-            switch (alt22) {
+            switch (alt18) {
                 case 1 :
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1485:4: otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1399:4: otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) )
                     {
-                    otherlv_5=(Token)match(input,38,FOLLOW_38_in_rulePartitionMultiLineRule3209); 
+                    otherlv_5=(Token)match(input,34,FOLLOW_34_in_rulePartitionMultiLineRule3038); 
 
                         	newLeafNode(otherlv_5, grammarAccess.getPartitionMultiLineRuleAccess().getEscapedKeyword_5_0());
                         
-                    otherlv_6=(Token)match(input,39,FOLLOW_39_in_rulePartitionMultiLineRule3221); 
+                    otherlv_6=(Token)match(input,35,FOLLOW_35_in_rulePartitionMultiLineRule3050); 
 
                         	newLeafNode(otherlv_6, grammarAccess.getPartitionMultiLineRuleAccess().getByKeyword_5_1());
                         
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1493:1: ( (lv_escapeSeq_7_0= RULE_STRING ) )
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1494:1: (lv_escapeSeq_7_0= RULE_STRING )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1407:1: ( (lv_escapeSeq_7_0= RULE_STRING ) )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1408:1: (lv_escapeSeq_7_0= RULE_STRING )
                     {
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1494:1: (lv_escapeSeq_7_0= RULE_STRING )
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1495:3: lv_escapeSeq_7_0= RULE_STRING
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1408:1: (lv_escapeSeq_7_0= RULE_STRING )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1409:3: lv_escapeSeq_7_0= RULE_STRING
                     {
-                    lv_escapeSeq_7_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionMultiLineRule3238); 
+                    lv_escapeSeq_7_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionMultiLineRule3067); 
 
                     			newLeafNode(lv_escapeSeq_7_0, grammarAccess.getPartitionMultiLineRuleAccess().getEscapeSeqSTRINGTerminalRuleCall_5_2_0()); 
                     		
@@ -3551,7 +3340,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleScannerCharacterRule"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1519:1: entryRuleScannerCharacterRule returns [EObject current=null] : iv_ruleScannerCharacterRule= ruleScannerCharacterRule EOF ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1433:1: entryRuleScannerCharacterRule returns [EObject current=null] : iv_ruleScannerCharacterRule= ruleScannerCharacterRule EOF ;
     public final EObject entryRuleScannerCharacterRule() throws RecognitionException {
         EObject current = null;
 
@@ -3559,17 +3348,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1520:2: (iv_ruleScannerCharacterRule= ruleScannerCharacterRule EOF )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1521:2: iv_ruleScannerCharacterRule= ruleScannerCharacterRule EOF
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1434:2: (iv_ruleScannerCharacterRule= ruleScannerCharacterRule EOF )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1435:2: iv_ruleScannerCharacterRule= ruleScannerCharacterRule EOF
             {
              newCompositeNode(grammarAccess.getScannerCharacterRuleRule()); 
-            pushFollow(FOLLOW_ruleScannerCharacterRule_in_entryRuleScannerCharacterRule3281);
+            pushFollow(FOLLOW_ruleScannerCharacterRule_in_entryRuleScannerCharacterRule3110);
             iv_ruleScannerCharacterRule=ruleScannerCharacterRule();
 
             state._fsp--;
 
              current =iv_ruleScannerCharacterRule; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleScannerCharacterRule3291); 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleScannerCharacterRule3120); 
 
             }
 
@@ -3587,7 +3376,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleScannerCharacterRule"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1528:1: ruleScannerCharacterRule returns [EObject current=null] : (otherlv_0= 'character-rule' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1442:1: ruleScannerCharacterRule returns [EObject current=null] : (otherlv_0= 'character-rule' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) ;
     public final EObject ruleScannerCharacterRule() throws RecognitionException {
         EObject current = null;
 
@@ -3602,28 +3391,28 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1531:28: ( (otherlv_0= 'character-rule' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1532:1: (otherlv_0= 'character-rule' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1445:28: ( (otherlv_0= 'character-rule' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1446:1: (otherlv_0= 'character-rule' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1532:1: (otherlv_0= 'character-rule' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1532:3: otherlv_0= 'character-rule' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']'
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1446:1: (otherlv_0= 'character-rule' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1446:3: otherlv_0= 'character-rule' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']'
             {
-            otherlv_0=(Token)match(input,41,FOLLOW_41_in_ruleScannerCharacterRule3328); 
+            otherlv_0=(Token)match(input,37,FOLLOW_37_in_ruleScannerCharacterRule3157); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getScannerCharacterRuleAccess().getCharacterRuleKeyword_0());
                 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1536:1: ( (otherlv_1= RULE_ID ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1537:1: (otherlv_1= RULE_ID )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1450:1: ( (otherlv_1= RULE_ID ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1451:1: (otherlv_1= RULE_ID )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1537:1: (otherlv_1= RULE_ID )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1538:3: otherlv_1= RULE_ID
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1451:1: (otherlv_1= RULE_ID )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1452:3: otherlv_1= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getScannerCharacterRuleRule());
             	        }
                     
-            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleScannerCharacterRule3348); 
+            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleScannerCharacterRule3177); 
 
             		newLeafNode(otherlv_1, grammarAccess.getScannerCharacterRuleAccess().getTokenScannerTokenCrossReference_1_0()); 
             	
@@ -3633,17 +3422,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,32,FOLLOW_32_in_ruleScannerCharacterRule3360); 
+            otherlv_2=(Token)match(input,28,FOLLOW_28_in_ruleScannerCharacterRule3189); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getScannerCharacterRuleAccess().getLeftSquareBracketKeyword_2());
                 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1553:1: ( (lv_characters_3_0= RULE_STRING ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1554:1: (lv_characters_3_0= RULE_STRING )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1467:1: ( (lv_characters_3_0= RULE_STRING ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1468:1: (lv_characters_3_0= RULE_STRING )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1554:1: (lv_characters_3_0= RULE_STRING )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1555:3: lv_characters_3_0= RULE_STRING
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1468:1: (lv_characters_3_0= RULE_STRING )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1469:3: lv_characters_3_0= RULE_STRING
             {
-            lv_characters_3_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerCharacterRule3377); 
+            lv_characters_3_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerCharacterRule3206); 
 
             			newLeafNode(lv_characters_3_0, grammarAccess.getScannerCharacterRuleAccess().getCharactersSTRINGTerminalRuleCall_3_0()); 
             		
@@ -3663,32 +3452,32 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1571:2: (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )*
-            loop23:
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1485:2: (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )*
+            loop19:
             do {
-                int alt23=2;
-                int LA23_0 = input.LA(1);
+                int alt19=2;
+                int LA19_0 = input.LA(1);
 
-                if ( (LA23_0==33) ) {
-                    alt23=1;
+                if ( (LA19_0==29) ) {
+                    alt19=1;
                 }
 
 
-                switch (alt23) {
+                switch (alt19) {
             	case 1 :
-            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1571:4: otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) )
+            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1485:4: otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) )
             	    {
-            	    otherlv_4=(Token)match(input,33,FOLLOW_33_in_ruleScannerCharacterRule3395); 
+            	    otherlv_4=(Token)match(input,29,FOLLOW_29_in_ruleScannerCharacterRule3224); 
 
             	        	newLeafNode(otherlv_4, grammarAccess.getScannerCharacterRuleAccess().getCommaKeyword_4_0());
             	        
-            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1575:1: ( (lv_characters_5_0= RULE_STRING ) )
-            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1576:1: (lv_characters_5_0= RULE_STRING )
+            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1489:1: ( (lv_characters_5_0= RULE_STRING ) )
+            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1490:1: (lv_characters_5_0= RULE_STRING )
             	    {
-            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1576:1: (lv_characters_5_0= RULE_STRING )
-            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1577:3: lv_characters_5_0= RULE_STRING
+            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1490:1: (lv_characters_5_0= RULE_STRING )
+            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1491:3: lv_characters_5_0= RULE_STRING
             	    {
-            	    lv_characters_5_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerCharacterRule3412); 
+            	    lv_characters_5_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerCharacterRule3241); 
 
             	    			newLeafNode(lv_characters_5_0, grammarAccess.getScannerCharacterRuleAccess().getCharactersSTRINGTerminalRuleCall_4_1_0()); 
             	    		
@@ -3713,11 +3502,11 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop23;
+            	    break loop19;
                 }
             } while (true);
 
-            otherlv_6=(Token)match(input,34,FOLLOW_34_in_ruleScannerCharacterRule3431); 
+            otherlv_6=(Token)match(input,30,FOLLOW_30_in_ruleScannerCharacterRule3260); 
 
                 	newLeafNode(otherlv_6, grammarAccess.getScannerCharacterRuleAccess().getRightSquareBracketKeyword_5());
                 
@@ -3742,7 +3531,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleScannerJSRule"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1605:1: entryRuleScannerJSRule returns [EObject current=null] : iv_ruleScannerJSRule= ruleScannerJSRule EOF ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1519:1: entryRuleScannerJSRule returns [EObject current=null] : iv_ruleScannerJSRule= ruleScannerJSRule EOF ;
     public final EObject entryRuleScannerJSRule() throws RecognitionException {
         EObject current = null;
 
@@ -3750,17 +3539,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1606:2: (iv_ruleScannerJSRule= ruleScannerJSRule EOF )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1607:2: iv_ruleScannerJSRule= ruleScannerJSRule EOF
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1520:2: (iv_ruleScannerJSRule= ruleScannerJSRule EOF )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1521:2: iv_ruleScannerJSRule= ruleScannerJSRule EOF
             {
              newCompositeNode(grammarAccess.getScannerJSRuleRule()); 
-            pushFollow(FOLLOW_ruleScannerJSRule_in_entryRuleScannerJSRule3467);
+            pushFollow(FOLLOW_ruleScannerJSRule_in_entryRuleScannerJSRule3296);
             iv_ruleScannerJSRule=ruleScannerJSRule();
 
             state._fsp--;
 
              current =iv_ruleScannerJSRule; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleScannerJSRule3477); 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleScannerJSRule3306); 
 
             }
 
@@ -3778,7 +3567,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleScannerJSRule"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1614:1: ruleScannerJSRule returns [EObject current=null] : (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1528:1: ruleScannerJSRule returns [EObject current=null] : (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) ;
     public final EObject ruleScannerJSRule() throws RecognitionException {
         EObject current = null;
 
@@ -3789,28 +3578,28 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1617:28: ( (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1618:1: (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1531:28: ( (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1532:1: (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1618:1: (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1618:3: otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1532:1: (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1532:3: otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) )
             {
-            otherlv_0=(Token)match(input,42,FOLLOW_42_in_ruleScannerJSRule3514); 
+            otherlv_0=(Token)match(input,38,FOLLOW_38_in_ruleScannerJSRule3343); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getScannerJSRuleAccess().getJavascriptRuleKeyword_0());
                 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1622:1: ( (otherlv_1= RULE_ID ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1623:1: (otherlv_1= RULE_ID )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1536:1: ( (otherlv_1= RULE_ID ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1537:1: (otherlv_1= RULE_ID )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1623:1: (otherlv_1= RULE_ID )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1624:3: otherlv_1= RULE_ID
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1537:1: (otherlv_1= RULE_ID )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1538:3: otherlv_1= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getScannerJSRuleRule());
             	        }
                     
-            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleScannerJSRule3534); 
+            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleScannerJSRule3363); 
 
             		newLeafNode(otherlv_1, grammarAccess.getScannerJSRuleAccess().getTokenScannerTokenCrossReference_1_0()); 
             	
@@ -3820,13 +3609,13 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1635:2: ( (lv_fileURI_2_0= RULE_STRING ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1636:1: (lv_fileURI_2_0= RULE_STRING )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1549:2: ( (lv_fileURI_2_0= RULE_STRING ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1550:1: (lv_fileURI_2_0= RULE_STRING )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1636:1: (lv_fileURI_2_0= RULE_STRING )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1637:3: lv_fileURI_2_0= RULE_STRING
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1550:1: (lv_fileURI_2_0= RULE_STRING )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1551:3: lv_fileURI_2_0= RULE_STRING
             {
-            lv_fileURI_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerJSRule3551); 
+            lv_fileURI_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerJSRule3380); 
 
             			newLeafNode(lv_fileURI_2_0, grammarAccess.getScannerJSRuleAccess().getFileURISTRINGTerminalRuleCall_2_0()); 
             		
@@ -3867,7 +3656,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRulePartitionJSRule"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1661:1: entryRulePartitionJSRule returns [EObject current=null] : iv_rulePartitionJSRule= rulePartitionJSRule EOF ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1575:1: entryRulePartitionJSRule returns [EObject current=null] : iv_rulePartitionJSRule= rulePartitionJSRule EOF ;
     public final EObject entryRulePartitionJSRule() throws RecognitionException {
         EObject current = null;
 
@@ -3875,17 +3664,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1662:2: (iv_rulePartitionJSRule= rulePartitionJSRule EOF )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1663:2: iv_rulePartitionJSRule= rulePartitionJSRule EOF
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1576:2: (iv_rulePartitionJSRule= rulePartitionJSRule EOF )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1577:2: iv_rulePartitionJSRule= rulePartitionJSRule EOF
             {
              newCompositeNode(grammarAccess.getPartitionJSRuleRule()); 
-            pushFollow(FOLLOW_rulePartitionJSRule_in_entryRulePartitionJSRule3592);
+            pushFollow(FOLLOW_rulePartitionJSRule_in_entryRulePartitionJSRule3421);
             iv_rulePartitionJSRule=rulePartitionJSRule();
 
             state._fsp--;
 
              current =iv_rulePartitionJSRule; 
-            match(input,EOF,FOLLOW_EOF_in_entryRulePartitionJSRule3602); 
+            match(input,EOF,FOLLOW_EOF_in_entryRulePartitionJSRule3431); 
 
             }
 
@@ -3903,7 +3692,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "rulePartitionJSRule"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1670:1: rulePartitionJSRule returns [EObject current=null] : (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1584:1: rulePartitionJSRule returns [EObject current=null] : (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) ;
     public final EObject rulePartitionJSRule() throws RecognitionException {
         EObject current = null;
 
@@ -3914,28 +3703,28 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1673:28: ( (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1674:1: (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1587:28: ( (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1588:1: (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1674:1: (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1674:3: otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1588:1: (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1588:3: otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) )
             {
-            otherlv_0=(Token)match(input,42,FOLLOW_42_in_rulePartitionJSRule3639); 
+            otherlv_0=(Token)match(input,38,FOLLOW_38_in_rulePartitionJSRule3468); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getPartitionJSRuleAccess().getJavascriptRuleKeyword_0());
                 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1678:1: ( (otherlv_1= RULE_ID ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1679:1: (otherlv_1= RULE_ID )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1592:1: ( (otherlv_1= RULE_ID ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1593:1: (otherlv_1= RULE_ID )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1679:1: (otherlv_1= RULE_ID )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1680:3: otherlv_1= RULE_ID
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1593:1: (otherlv_1= RULE_ID )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1594:3: otherlv_1= RULE_ID
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getPartitionJSRuleRule());
             	        }
                     
-            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_rulePartitionJSRule3659); 
+            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_rulePartitionJSRule3488); 
 
             		newLeafNode(otherlv_1, grammarAccess.getPartitionJSRuleAccess().getTokenPartitionCrossReference_1_0()); 
             	
@@ -3945,13 +3734,13 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1691:2: ( (lv_fileURI_2_0= RULE_STRING ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1692:1: (lv_fileURI_2_0= RULE_STRING )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1605:2: ( (lv_fileURI_2_0= RULE_STRING ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1606:1: (lv_fileURI_2_0= RULE_STRING )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1692:1: (lv_fileURI_2_0= RULE_STRING )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1693:3: lv_fileURI_2_0= RULE_STRING
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1606:1: (lv_fileURI_2_0= RULE_STRING )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1607:3: lv_fileURI_2_0= RULE_STRING
             {
-            lv_fileURI_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionJSRule3676); 
+            lv_fileURI_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionJSRule3505); 
 
             			newLeafNode(lv_fileURI_2_0, grammarAccess.getPartitionJSRuleAccess().getFileURISTRINGTerminalRuleCall_2_0()); 
             		
@@ -3992,7 +3781,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleScannerWhitespaceRule"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1717:1: entryRuleScannerWhitespaceRule returns [EObject current=null] : iv_ruleScannerWhitespaceRule= ruleScannerWhitespaceRule EOF ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1631:1: entryRuleScannerWhitespaceRule returns [EObject current=null] : iv_ruleScannerWhitespaceRule= ruleScannerWhitespaceRule EOF ;
     public final EObject entryRuleScannerWhitespaceRule() throws RecognitionException {
         EObject current = null;
 
@@ -4000,17 +3789,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1718:2: (iv_ruleScannerWhitespaceRule= ruleScannerWhitespaceRule EOF )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1719:2: iv_ruleScannerWhitespaceRule= ruleScannerWhitespaceRule EOF
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1632:2: (iv_ruleScannerWhitespaceRule= ruleScannerWhitespaceRule EOF )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1633:2: iv_ruleScannerWhitespaceRule= ruleScannerWhitespaceRule EOF
             {
              newCompositeNode(grammarAccess.getScannerWhitespaceRuleRule()); 
-            pushFollow(FOLLOW_ruleScannerWhitespaceRule_in_entryRuleScannerWhitespaceRule3717);
+            pushFollow(FOLLOW_ruleScannerWhitespaceRule_in_entryRuleScannerWhitespaceRule3546);
             iv_ruleScannerWhitespaceRule=ruleScannerWhitespaceRule();
 
             state._fsp--;
 
              current =iv_ruleScannerWhitespaceRule; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleScannerWhitespaceRule3727); 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleScannerWhitespaceRule3556); 
 
             }
 
@@ -4028,7 +3817,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleScannerWhitespaceRule"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1726:1: ruleScannerWhitespaceRule returns [EObject current=null] : (otherlv_0= 'whitespace-rule' ( (otherlv_1= RULE_ID ) )? ( (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) | ( (lv_javawhitespace_7_0= 'javawhitespace' ) ) | ( (lv_fileURI_8_0= RULE_STRING ) ) ) ) ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1640:1: ruleScannerWhitespaceRule returns [EObject current=null] : (otherlv_0= 'whitespace-rule' ( (otherlv_1= RULE_ID ) )? ( (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) | ( (lv_javawhitespace_7_0= 'javawhitespace' ) ) | ( (lv_fileURI_8_0= RULE_STRING ) ) ) ) ;
     public final EObject ruleScannerWhitespaceRule() throws RecognitionException {
         EObject current = null;
 
@@ -4045,36 +3834,36 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1729:28: ( (otherlv_0= 'whitespace-rule' ( (otherlv_1= RULE_ID ) )? ( (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) | ( (lv_javawhitespace_7_0= 'javawhitespace' ) ) | ( (lv_fileURI_8_0= RULE_STRING ) ) ) ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1730:1: (otherlv_0= 'whitespace-rule' ( (otherlv_1= RULE_ID ) )? ( (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) | ( (lv_javawhitespace_7_0= 'javawhitespace' ) ) | ( (lv_fileURI_8_0= RULE_STRING ) ) ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1643:28: ( (otherlv_0= 'whitespace-rule' ( (otherlv_1= RULE_ID ) )? ( (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) | ( (lv_javawhitespace_7_0= 'javawhitespace' ) ) | ( (lv_fileURI_8_0= RULE_STRING ) ) ) ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1644:1: (otherlv_0= 'whitespace-rule' ( (otherlv_1= RULE_ID ) )? ( (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) | ( (lv_javawhitespace_7_0= 'javawhitespace' ) ) | ( (lv_fileURI_8_0= RULE_STRING ) ) ) )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1730:1: (otherlv_0= 'whitespace-rule' ( (otherlv_1= RULE_ID ) )? ( (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) | ( (lv_javawhitespace_7_0= 'javawhitespace' ) ) | ( (lv_fileURI_8_0= RULE_STRING ) ) ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1730:3: otherlv_0= 'whitespace-rule' ( (otherlv_1= RULE_ID ) )? ( (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) | ( (lv_javawhitespace_7_0= 'javawhitespace' ) ) | ( (lv_fileURI_8_0= RULE_STRING ) ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1644:1: (otherlv_0= 'whitespace-rule' ( (otherlv_1= RULE_ID ) )? ( (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) | ( (lv_javawhitespace_7_0= 'javawhitespace' ) ) | ( (lv_fileURI_8_0= RULE_STRING ) ) ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1644:3: otherlv_0= 'whitespace-rule' ( (otherlv_1= RULE_ID ) )? ( (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) | ( (lv_javawhitespace_7_0= 'javawhitespace' ) ) | ( (lv_fileURI_8_0= RULE_STRING ) ) )
             {
-            otherlv_0=(Token)match(input,43,FOLLOW_43_in_ruleScannerWhitespaceRule3764); 
+            otherlv_0=(Token)match(input,39,FOLLOW_39_in_ruleScannerWhitespaceRule3593); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getScannerWhitespaceRuleAccess().getWhitespaceRuleKeyword_0());
                 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1734:1: ( (otherlv_1= RULE_ID ) )?
-            int alt24=2;
-            int LA24_0 = input.LA(1);
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1648:1: ( (otherlv_1= RULE_ID ) )?
+            int alt20=2;
+            int LA20_0 = input.LA(1);
 
-            if ( (LA24_0==RULE_ID) ) {
-                alt24=1;
+            if ( (LA20_0==RULE_ID) ) {
+                alt20=1;
             }
-            switch (alt24) {
+            switch (alt20) {
                 case 1 :
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1735:1: (otherlv_1= RULE_ID )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1649:1: (otherlv_1= RULE_ID )
                     {
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1735:1: (otherlv_1= RULE_ID )
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1736:3: otherlv_1= RULE_ID
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1649:1: (otherlv_1= RULE_ID )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1650:3: otherlv_1= RULE_ID
                     {
 
                     			if (current==null) {
                     	            current = createModelElement(grammarAccess.getScannerWhitespaceRuleRule());
                     	        }
                             
-                    otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleScannerWhitespaceRule3784); 
+                    otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleScannerWhitespaceRule3613); 
 
                     		newLeafNode(otherlv_1, grammarAccess.getScannerWhitespaceRuleAccess().getTokenScannerTokenCrossReference_1_0()); 
                     	
@@ -4087,49 +3876,49 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1747:3: ( (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) | ( (lv_javawhitespace_7_0= 'javawhitespace' ) ) | ( (lv_fileURI_8_0= RULE_STRING ) ) )
-            int alt26=3;
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1661:3: ( (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) | ( (lv_javawhitespace_7_0= 'javawhitespace' ) ) | ( (lv_fileURI_8_0= RULE_STRING ) ) )
+            int alt22=3;
             switch ( input.LA(1) ) {
-            case 32:
+            case 28:
                 {
-                alt26=1;
+                alt22=1;
                 }
                 break;
-            case 44:
+            case 40:
                 {
-                alt26=2;
+                alt22=2;
                 }
                 break;
             case RULE_STRING:
                 {
-                alt26=3;
+                alt22=3;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("", 26, 0, input);
+                    new NoViableAltException("", 22, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt26) {
+            switch (alt22) {
                 case 1 :
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1747:4: (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1661:4: (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' )
                     {
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1747:4: (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' )
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1747:6: otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']'
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1661:4: (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1661:6: otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']'
                     {
-                    otherlv_2=(Token)match(input,32,FOLLOW_32_in_ruleScannerWhitespaceRule3799); 
+                    otherlv_2=(Token)match(input,28,FOLLOW_28_in_ruleScannerWhitespaceRule3628); 
 
                         	newLeafNode(otherlv_2, grammarAccess.getScannerWhitespaceRuleAccess().getLeftSquareBracketKeyword_2_0_0());
                         
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1751:1: ( (lv_characters_3_0= RULE_STRING ) )
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1752:1: (lv_characters_3_0= RULE_STRING )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1665:1: ( (lv_characters_3_0= RULE_STRING ) )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1666:1: (lv_characters_3_0= RULE_STRING )
                     {
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1752:1: (lv_characters_3_0= RULE_STRING )
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1753:3: lv_characters_3_0= RULE_STRING
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1666:1: (lv_characters_3_0= RULE_STRING )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1667:3: lv_characters_3_0= RULE_STRING
                     {
-                    lv_characters_3_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerWhitespaceRule3816); 
+                    lv_characters_3_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerWhitespaceRule3645); 
 
                     			newLeafNode(lv_characters_3_0, grammarAccess.getScannerWhitespaceRuleAccess().getCharactersSTRINGTerminalRuleCall_2_0_1_0()); 
                     		
@@ -4149,32 +3938,32 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1769:2: (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )*
-                    loop25:
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1683:2: (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )*
+                    loop21:
                     do {
-                        int alt25=2;
-                        int LA25_0 = input.LA(1);
+                        int alt21=2;
+                        int LA21_0 = input.LA(1);
 
-                        if ( (LA25_0==33) ) {
-                            alt25=1;
+                        if ( (LA21_0==29) ) {
+                            alt21=1;
                         }
 
 
-                        switch (alt25) {
+                        switch (alt21) {
                     	case 1 :
-                    	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1769:4: otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) )
+                    	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1683:4: otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,33,FOLLOW_33_in_ruleScannerWhitespaceRule3834); 
+                    	    otherlv_4=(Token)match(input,29,FOLLOW_29_in_ruleScannerWhitespaceRule3663); 
 
                     	        	newLeafNode(otherlv_4, grammarAccess.getScannerWhitespaceRuleAccess().getCommaKeyword_2_0_2_0());
                     	        
-                    	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1773:1: ( (lv_characters_5_0= RULE_STRING ) )
-                    	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1774:1: (lv_characters_5_0= RULE_STRING )
+                    	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1687:1: ( (lv_characters_5_0= RULE_STRING ) )
+                    	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1688:1: (lv_characters_5_0= RULE_STRING )
                     	    {
-                    	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1774:1: (lv_characters_5_0= RULE_STRING )
-                    	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1775:3: lv_characters_5_0= RULE_STRING
+                    	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1688:1: (lv_characters_5_0= RULE_STRING )
+                    	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1689:3: lv_characters_5_0= RULE_STRING
                     	    {
-                    	    lv_characters_5_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerWhitespaceRule3851); 
+                    	    lv_characters_5_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerWhitespaceRule3680); 
 
                     	    			newLeafNode(lv_characters_5_0, grammarAccess.getScannerWhitespaceRuleAccess().getCharactersSTRINGTerminalRuleCall_2_0_2_1_0()); 
                     	    		
@@ -4199,11 +3988,11 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop25;
+                    	    break loop21;
                         }
                     } while (true);
 
-                    otherlv_6=(Token)match(input,34,FOLLOW_34_in_ruleScannerWhitespaceRule3870); 
+                    otherlv_6=(Token)match(input,30,FOLLOW_30_in_ruleScannerWhitespaceRule3699); 
 
                         	newLeafNode(otherlv_6, grammarAccess.getScannerWhitespaceRuleAccess().getRightSquareBracketKeyword_2_0_3());
                         
@@ -4214,15 +4003,15 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1796:6: ( (lv_javawhitespace_7_0= 'javawhitespace' ) )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1710:6: ( (lv_javawhitespace_7_0= 'javawhitespace' ) )
                     {
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1796:6: ( (lv_javawhitespace_7_0= 'javawhitespace' ) )
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1797:1: (lv_javawhitespace_7_0= 'javawhitespace' )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1710:6: ( (lv_javawhitespace_7_0= 'javawhitespace' ) )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1711:1: (lv_javawhitespace_7_0= 'javawhitespace' )
                     {
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1797:1: (lv_javawhitespace_7_0= 'javawhitespace' )
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1798:3: lv_javawhitespace_7_0= 'javawhitespace'
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1711:1: (lv_javawhitespace_7_0= 'javawhitespace' )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1712:3: lv_javawhitespace_7_0= 'javawhitespace'
                     {
-                    lv_javawhitespace_7_0=(Token)match(input,44,FOLLOW_44_in_ruleScannerWhitespaceRule3895); 
+                    lv_javawhitespace_7_0=(Token)match(input,40,FOLLOW_40_in_ruleScannerWhitespaceRule3724); 
 
                             newLeafNode(lv_javawhitespace_7_0, grammarAccess.getScannerWhitespaceRuleAccess().getJavawhitespaceJavawhitespaceKeyword_2_1_0());
                         
@@ -4242,15 +4031,15 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1812:6: ( (lv_fileURI_8_0= RULE_STRING ) )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1726:6: ( (lv_fileURI_8_0= RULE_STRING ) )
                     {
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1812:6: ( (lv_fileURI_8_0= RULE_STRING ) )
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1813:1: (lv_fileURI_8_0= RULE_STRING )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1726:6: ( (lv_fileURI_8_0= RULE_STRING ) )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1727:1: (lv_fileURI_8_0= RULE_STRING )
                     {
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1813:1: (lv_fileURI_8_0= RULE_STRING )
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1814:3: lv_fileURI_8_0= RULE_STRING
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1727:1: (lv_fileURI_8_0= RULE_STRING )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1728:3: lv_fileURI_8_0= RULE_STRING
                     {
-                    lv_fileURI_8_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerWhitespaceRule3931); 
+                    lv_fileURI_8_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerWhitespaceRule3760); 
 
                     			newLeafNode(lv_fileURI_8_0, grammarAccess.getScannerWhitespaceRuleAccess().getFileURISTRINGTerminalRuleCall_2_2_0()); 
                     		
@@ -4296,87 +4085,8 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
     // $ANTLR end "ruleScannerWhitespaceRule"
 
 
-    // $ANTLR start "entryRuleColor"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1838:1: entryRuleColor returns [EObject current=null] : iv_ruleColor= ruleColor EOF ;
-    public final EObject entryRuleColor() throws RecognitionException {
-        EObject current = null;
-
-        EObject iv_ruleColor = null;
-
-
-        try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1839:2: (iv_ruleColor= ruleColor EOF )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1840:2: iv_ruleColor= ruleColor EOF
-            {
-             newCompositeNode(grammarAccess.getColorRule()); 
-            pushFollow(FOLLOW_ruleColor_in_entryRuleColor3973);
-            iv_ruleColor=ruleColor();
-
-            state._fsp--;
-
-             current =iv_ruleColor; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleColor3983); 
-
-            }
-
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "entryRuleColor"
-
-
-    // $ANTLR start "ruleColor"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1847:1: ruleColor returns [EObject current=null] : this_RGBColor_0= ruleRGBColor ;
-    public final EObject ruleColor() throws RecognitionException {
-        EObject current = null;
-
-        EObject this_RGBColor_0 = null;
-
-
-         enterRule(); 
-            
-        try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1850:28: (this_RGBColor_0= ruleRGBColor )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1852:5: this_RGBColor_0= ruleRGBColor
-            {
-             
-                    newCompositeNode(grammarAccess.getColorAccess().getRGBColorParserRuleCall()); 
-                
-            pushFollow(FOLLOW_ruleRGBColor_in_ruleColor4029);
-            this_RGBColor_0=ruleRGBColor();
-
-            state._fsp--;
-
-             
-                    current = this_RGBColor_0; 
-                    afterParserOrEnumRuleCall();
-                
-
-            }
-
-             leaveRule(); 
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleColor"
-
-
     // $ANTLR start "entryRuleRGBColor"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1868:1: entryRuleRGBColor returns [EObject current=null] : iv_ruleRGBColor= ruleRGBColor EOF ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1754:1: entryRuleRGBColor returns [EObject current=null] : iv_ruleRGBColor= ruleRGBColor EOF ;
     public final EObject entryRuleRGBColor() throws RecognitionException {
         EObject current = null;
 
@@ -4384,17 +4094,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1869:2: (iv_ruleRGBColor= ruleRGBColor EOF )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1870:2: iv_ruleRGBColor= ruleRGBColor EOF
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1755:2: (iv_ruleRGBColor= ruleRGBColor EOF )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1756:2: iv_ruleRGBColor= ruleRGBColor EOF
             {
              newCompositeNode(grammarAccess.getRGBColorRule()); 
-            pushFollow(FOLLOW_ruleRGBColor_in_entryRuleRGBColor4063);
+            pushFollow(FOLLOW_ruleRGBColor_in_entryRuleRGBColor3804);
             iv_ruleRGBColor=ruleRGBColor();
 
             state._fsp--;
 
              current =iv_ruleRGBColor; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRGBColor4073); 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleRGBColor3814); 
 
             }
 
@@ -4412,7 +4122,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRGBColor"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1877:1: ruleRGBColor returns [EObject current=null] : (otherlv_0= 'rgb' otherlv_1= '(' ( (lv_r_2_0= RULE_INT ) ) otherlv_3= ',' ( (lv_g_4_0= RULE_INT ) ) otherlv_5= ',' ( (lv_b_6_0= RULE_INT ) ) otherlv_7= ')' ) ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1763:1: ruleRGBColor returns [EObject current=null] : (otherlv_0= 'rgb' otherlv_1= '(' ( (lv_r_2_0= RULE_INT ) ) otherlv_3= ',' ( (lv_g_4_0= RULE_INT ) ) otherlv_5= ',' ( (lv_b_6_0= RULE_INT ) ) otherlv_7= ')' ) ;
     public final EObject ruleRGBColor() throws RecognitionException {
         EObject current = null;
 
@@ -4428,27 +4138,27 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1880:28: ( (otherlv_0= 'rgb' otherlv_1= '(' ( (lv_r_2_0= RULE_INT ) ) otherlv_3= ',' ( (lv_g_4_0= RULE_INT ) ) otherlv_5= ',' ( (lv_b_6_0= RULE_INT ) ) otherlv_7= ')' ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1881:1: (otherlv_0= 'rgb' otherlv_1= '(' ( (lv_r_2_0= RULE_INT ) ) otherlv_3= ',' ( (lv_g_4_0= RULE_INT ) ) otherlv_5= ',' ( (lv_b_6_0= RULE_INT ) ) otherlv_7= ')' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1766:28: ( (otherlv_0= 'rgb' otherlv_1= '(' ( (lv_r_2_0= RULE_INT ) ) otherlv_3= ',' ( (lv_g_4_0= RULE_INT ) ) otherlv_5= ',' ( (lv_b_6_0= RULE_INT ) ) otherlv_7= ')' ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1767:1: (otherlv_0= 'rgb' otherlv_1= '(' ( (lv_r_2_0= RULE_INT ) ) otherlv_3= ',' ( (lv_g_4_0= RULE_INT ) ) otherlv_5= ',' ( (lv_b_6_0= RULE_INT ) ) otherlv_7= ')' )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1881:1: (otherlv_0= 'rgb' otherlv_1= '(' ( (lv_r_2_0= RULE_INT ) ) otherlv_3= ',' ( (lv_g_4_0= RULE_INT ) ) otherlv_5= ',' ( (lv_b_6_0= RULE_INT ) ) otherlv_7= ')' )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1881:3: otherlv_0= 'rgb' otherlv_1= '(' ( (lv_r_2_0= RULE_INT ) ) otherlv_3= ',' ( (lv_g_4_0= RULE_INT ) ) otherlv_5= ',' ( (lv_b_6_0= RULE_INT ) ) otherlv_7= ')'
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1767:1: (otherlv_0= 'rgb' otherlv_1= '(' ( (lv_r_2_0= RULE_INT ) ) otherlv_3= ',' ( (lv_g_4_0= RULE_INT ) ) otherlv_5= ',' ( (lv_b_6_0= RULE_INT ) ) otherlv_7= ')' )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1767:3: otherlv_0= 'rgb' otherlv_1= '(' ( (lv_r_2_0= RULE_INT ) ) otherlv_3= ',' ( (lv_g_4_0= RULE_INT ) ) otherlv_5= ',' ( (lv_b_6_0= RULE_INT ) ) otherlv_7= ')'
             {
-            otherlv_0=(Token)match(input,45,FOLLOW_45_in_ruleRGBColor4110); 
+            otherlv_0=(Token)match(input,41,FOLLOW_41_in_ruleRGBColor3851); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getRGBColorAccess().getRgbKeyword_0());
                 
-            otherlv_1=(Token)match(input,46,FOLLOW_46_in_ruleRGBColor4122); 
+            otherlv_1=(Token)match(input,42,FOLLOW_42_in_ruleRGBColor3863); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getRGBColorAccess().getLeftParenthesisKeyword_1());
                 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1889:1: ( (lv_r_2_0= RULE_INT ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1890:1: (lv_r_2_0= RULE_INT )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1775:1: ( (lv_r_2_0= RULE_INT ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1776:1: (lv_r_2_0= RULE_INT )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1890:1: (lv_r_2_0= RULE_INT )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1891:3: lv_r_2_0= RULE_INT
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1776:1: (lv_r_2_0= RULE_INT )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1777:3: lv_r_2_0= RULE_INT
             {
-            lv_r_2_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleRGBColor4139); 
+            lv_r_2_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleRGBColor3880); 
 
             			newLeafNode(lv_r_2_0, grammarAccess.getRGBColorAccess().getRINTTerminalRuleCall_2_0()); 
             		
@@ -4468,17 +4178,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,33,FOLLOW_33_in_ruleRGBColor4156); 
+            otherlv_3=(Token)match(input,29,FOLLOW_29_in_ruleRGBColor3897); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getRGBColorAccess().getCommaKeyword_3());
                 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1911:1: ( (lv_g_4_0= RULE_INT ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1912:1: (lv_g_4_0= RULE_INT )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1797:1: ( (lv_g_4_0= RULE_INT ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1798:1: (lv_g_4_0= RULE_INT )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1912:1: (lv_g_4_0= RULE_INT )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1913:3: lv_g_4_0= RULE_INT
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1798:1: (lv_g_4_0= RULE_INT )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1799:3: lv_g_4_0= RULE_INT
             {
-            lv_g_4_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleRGBColor4173); 
+            lv_g_4_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleRGBColor3914); 
 
             			newLeafNode(lv_g_4_0, grammarAccess.getRGBColorAccess().getGINTTerminalRuleCall_4_0()); 
             		
@@ -4498,17 +4208,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_5=(Token)match(input,33,FOLLOW_33_in_ruleRGBColor4190); 
+            otherlv_5=(Token)match(input,29,FOLLOW_29_in_ruleRGBColor3931); 
 
                 	newLeafNode(otherlv_5, grammarAccess.getRGBColorAccess().getCommaKeyword_5());
                 
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1933:1: ( (lv_b_6_0= RULE_INT ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1934:1: (lv_b_6_0= RULE_INT )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1819:1: ( (lv_b_6_0= RULE_INT ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1820:1: (lv_b_6_0= RULE_INT )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1934:1: (lv_b_6_0= RULE_INT )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1935:3: lv_b_6_0= RULE_INT
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1820:1: (lv_b_6_0= RULE_INT )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1821:3: lv_b_6_0= RULE_INT
             {
-            lv_b_6_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleRGBColor4207); 
+            lv_b_6_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleRGBColor3948); 
 
             			newLeafNode(lv_b_6_0, grammarAccess.getRGBColorAccess().getBINTTerminalRuleCall_6_0()); 
             		
@@ -4528,7 +4238,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_7=(Token)match(input,47,FOLLOW_47_in_ruleRGBColor4224); 
+            otherlv_7=(Token)match(input,43,FOLLOW_43_in_ruleRGBColor3965); 
 
                 	newLeafNode(otherlv_7, grammarAccess.getRGBColorAccess().getRightParenthesisKeyword_7());
                 
@@ -4552,184 +4262,8 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
     // $ANTLR end "ruleRGBColor"
 
 
-    // $ANTLR start "entryRuleFont"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1963:1: entryRuleFont returns [EObject current=null] : iv_ruleFont= ruleFont EOF ;
-    public final EObject entryRuleFont() throws RecognitionException {
-        EObject current = null;
-
-        EObject iv_ruleFont = null;
-
-
-        try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1964:2: (iv_ruleFont= ruleFont EOF )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1965:2: iv_ruleFont= ruleFont EOF
-            {
-             newCompositeNode(grammarAccess.getFontRule()); 
-            pushFollow(FOLLOW_ruleFont_in_entryRuleFont4260);
-            iv_ruleFont=ruleFont();
-
-            state._fsp--;
-
-             current =iv_ruleFont; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFont4270); 
-
-            }
-
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "entryRuleFont"
-
-
-    // $ANTLR start "ruleFont"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1972:1: ruleFont returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) ( (lv_size_1_0= RULE_INT ) ) ( (lv_attributes_2_0= ruleFontType ) )* ) ;
-    public final EObject ruleFont() throws RecognitionException {
-        EObject current = null;
-
-        Token lv_name_0_0=null;
-        Token lv_size_1_0=null;
-        Enumerator lv_attributes_2_0 = null;
-
-
-         enterRule(); 
-            
-        try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1975:28: ( ( ( (lv_name_0_0= RULE_ID ) ) ( (lv_size_1_0= RULE_INT ) ) ( (lv_attributes_2_0= ruleFontType ) )* ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1976:1: ( ( (lv_name_0_0= RULE_ID ) ) ( (lv_size_1_0= RULE_INT ) ) ( (lv_attributes_2_0= ruleFontType ) )* )
-            {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1976:1: ( ( (lv_name_0_0= RULE_ID ) ) ( (lv_size_1_0= RULE_INT ) ) ( (lv_attributes_2_0= ruleFontType ) )* )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1976:2: ( (lv_name_0_0= RULE_ID ) ) ( (lv_size_1_0= RULE_INT ) ) ( (lv_attributes_2_0= ruleFontType ) )*
-            {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1976:2: ( (lv_name_0_0= RULE_ID ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1977:1: (lv_name_0_0= RULE_ID )
-            {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1977:1: (lv_name_0_0= RULE_ID )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1978:3: lv_name_0_0= RULE_ID
-            {
-            lv_name_0_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFont4312); 
-
-            			newLeafNode(lv_name_0_0, grammarAccess.getFontAccess().getNameIDTerminalRuleCall_0_0()); 
-            		
-
-            	        if (current==null) {
-            	            current = createModelElement(grammarAccess.getFontRule());
-            	        }
-                   		setWithLastConsumed(
-                   			current, 
-                   			"name",
-                    		lv_name_0_0, 
-                    		"ID");
-            	    
-
-            }
-
-
-            }
-
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1994:2: ( (lv_size_1_0= RULE_INT ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1995:1: (lv_size_1_0= RULE_INT )
-            {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1995:1: (lv_size_1_0= RULE_INT )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1996:3: lv_size_1_0= RULE_INT
-            {
-            lv_size_1_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleFont4334); 
-
-            			newLeafNode(lv_size_1_0, grammarAccess.getFontAccess().getSizeINTTerminalRuleCall_1_0()); 
-            		
-
-            	        if (current==null) {
-            	            current = createModelElement(grammarAccess.getFontRule());
-            	        }
-                   		setWithLastConsumed(
-                   			current, 
-                   			"size",
-                    		lv_size_1_0, 
-                    		"INT");
-            	    
-
-            }
-
-
-            }
-
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2012:2: ( (lv_attributes_2_0= ruleFontType ) )*
-            loop27:
-            do {
-                int alt27=2;
-                int LA27_0 = input.LA(1);
-
-                if ( ((LA27_0>=48 && LA27_0<=51)) ) {
-                    alt27=1;
-                }
-
-
-                switch (alt27) {
-            	case 1 :
-            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2013:1: (lv_attributes_2_0= ruleFontType )
-            	    {
-            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2013:1: (lv_attributes_2_0= ruleFontType )
-            	    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2014:3: lv_attributes_2_0= ruleFontType
-            	    {
-            	     
-            	    	        newCompositeNode(grammarAccess.getFontAccess().getAttributesFontTypeEnumRuleCall_2_0()); 
-            	    	    
-            	    pushFollow(FOLLOW_ruleFontType_in_ruleFont4360);
-            	    lv_attributes_2_0=ruleFontType();
-
-            	    state._fsp--;
-
-
-            	    	        if (current==null) {
-            	    	            current = createModelElementForParent(grammarAccess.getFontRule());
-            	    	        }
-            	           		add(
-            	           			current, 
-            	           			"attributes",
-            	            		lv_attributes_2_0, 
-            	            		"FontType");
-            	    	        afterParserOrEnumRuleCall();
-            	    	    
-
-            	    }
-
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop27;
-                }
-            } while (true);
-
-
-            }
-
-
-            }
-
-             leaveRule(); 
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleFont"
-
-
     // $ANTLR start "ruleFontType"
-    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2038:1: ruleFontType returns [Enumerator current=null] : ( (enumLiteral_0= 'bold' ) | (enumLiteral_1= 'italic' ) | (enumLiteral_2= 'underline' ) | (enumLiteral_3= 'strike-through' ) ) ;
+    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1851:1: ruleFontType returns [Enumerator current=null] : ( (enumLiteral_0= 'bold' ) | (enumLiteral_1= 'italic' ) | (enumLiteral_2= 'underline' ) | (enumLiteral_3= 'strike-through' ) ) ;
     public final Enumerator ruleFontType() throws RecognitionException {
         Enumerator current = null;
 
@@ -4740,47 +4274,47 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
 
          enterRule(); 
         try {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2040:28: ( ( (enumLiteral_0= 'bold' ) | (enumLiteral_1= 'italic' ) | (enumLiteral_2= 'underline' ) | (enumLiteral_3= 'strike-through' ) ) )
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2041:1: ( (enumLiteral_0= 'bold' ) | (enumLiteral_1= 'italic' ) | (enumLiteral_2= 'underline' ) | (enumLiteral_3= 'strike-through' ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1853:28: ( ( (enumLiteral_0= 'bold' ) | (enumLiteral_1= 'italic' ) | (enumLiteral_2= 'underline' ) | (enumLiteral_3= 'strike-through' ) ) )
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1854:1: ( (enumLiteral_0= 'bold' ) | (enumLiteral_1= 'italic' ) | (enumLiteral_2= 'underline' ) | (enumLiteral_3= 'strike-through' ) )
             {
-            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2041:1: ( (enumLiteral_0= 'bold' ) | (enumLiteral_1= 'italic' ) | (enumLiteral_2= 'underline' ) | (enumLiteral_3= 'strike-through' ) )
-            int alt28=4;
+            // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1854:1: ( (enumLiteral_0= 'bold' ) | (enumLiteral_1= 'italic' ) | (enumLiteral_2= 'underline' ) | (enumLiteral_3= 'strike-through' ) )
+            int alt23=4;
             switch ( input.LA(1) ) {
-            case 48:
+            case 44:
                 {
-                alt28=1;
+                alt23=1;
                 }
                 break;
-            case 49:
+            case 45:
                 {
-                alt28=2;
+                alt23=2;
                 }
                 break;
-            case 50:
+            case 46:
                 {
-                alt28=3;
+                alt23=3;
                 }
                 break;
-            case 51:
+            case 47:
                 {
-                alt28=4;
+                alt23=4;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("", 28, 0, input);
+                    new NoViableAltException("", 23, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt28) {
+            switch (alt23) {
                 case 1 :
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2041:2: (enumLiteral_0= 'bold' )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1854:2: (enumLiteral_0= 'bold' )
                     {
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2041:2: (enumLiteral_0= 'bold' )
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2041:4: enumLiteral_0= 'bold'
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1854:2: (enumLiteral_0= 'bold' )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1854:4: enumLiteral_0= 'bold'
                     {
-                    enumLiteral_0=(Token)match(input,48,FOLLOW_48_in_ruleFontType4411); 
+                    enumLiteral_0=(Token)match(input,44,FOLLOW_44_in_ruleFontType4017); 
 
                             current = grammarAccess.getFontTypeAccess().getBoldEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_0, grammarAccess.getFontTypeAccess().getBoldEnumLiteralDeclaration_0()); 
@@ -4792,12 +4326,12 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2047:6: (enumLiteral_1= 'italic' )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1860:6: (enumLiteral_1= 'italic' )
                     {
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2047:6: (enumLiteral_1= 'italic' )
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2047:8: enumLiteral_1= 'italic'
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1860:6: (enumLiteral_1= 'italic' )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1860:8: enumLiteral_1= 'italic'
                     {
-                    enumLiteral_1=(Token)match(input,49,FOLLOW_49_in_ruleFontType4428); 
+                    enumLiteral_1=(Token)match(input,45,FOLLOW_45_in_ruleFontType4034); 
 
                             current = grammarAccess.getFontTypeAccess().getItalicEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_1, grammarAccess.getFontTypeAccess().getItalicEnumLiteralDeclaration_1()); 
@@ -4809,12 +4343,12 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2053:6: (enumLiteral_2= 'underline' )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1866:6: (enumLiteral_2= 'underline' )
                     {
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2053:6: (enumLiteral_2= 'underline' )
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2053:8: enumLiteral_2= 'underline'
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1866:6: (enumLiteral_2= 'underline' )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1866:8: enumLiteral_2= 'underline'
                     {
-                    enumLiteral_2=(Token)match(input,50,FOLLOW_50_in_ruleFontType4445); 
+                    enumLiteral_2=(Token)match(input,46,FOLLOW_46_in_ruleFontType4051); 
 
                             current = grammarAccess.getFontTypeAccess().getUnderlineEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_2, grammarAccess.getFontTypeAccess().getUnderlineEnumLiteralDeclaration_2()); 
@@ -4826,12 +4360,12 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2059:6: (enumLiteral_3= 'strike-through' )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1872:6: (enumLiteral_3= 'strike-through' )
                     {
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2059:6: (enumLiteral_3= 'strike-through' )
-                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:2059:8: enumLiteral_3= 'strike-through'
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1872:6: (enumLiteral_3= 'strike-through' )
+                    // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1872:8: enumLiteral_3= 'strike-through'
                     {
-                    enumLiteral_3=(Token)match(input,51,FOLLOW_51_in_ruleFontType4462); 
+                    enumLiteral_3=(Token)match(input,47,FOLLOW_47_in_ruleFontType4068); 
 
                             current = grammarAccess.getFontTypeAccess().getStrike_throughEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_3, grammarAccess.getFontTypeAccess().getStrike_throughEnumLiteralDeclaration_3()); 
@@ -4903,8 +4437,8 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
     public static final BitSet FOLLOW_ruleRulePartitioner_in_entryRuleRulePartitioner810 = new BitSet(new long[]{0x0000000000000000L});
     public static final BitSet FOLLOW_EOF_in_entryRuleRulePartitioner820 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_21_in_ruleRulePartitioner857 = new BitSet(new long[]{0x0000000000000800L});
-    public static final BitSet FOLLOW_11_in_ruleRulePartitioner869 = new BitSet(new long[]{0x0000051000000000L});
-    public static final BitSet FOLLOW_ruleParitionRule_in_ruleRulePartitioner890 = new BitSet(new long[]{0x0000051000001000L});
+    public static final BitSet FOLLOW_11_in_ruleRulePartitioner869 = new BitSet(new long[]{0x0000005100000000L});
+    public static final BitSet FOLLOW_ruleParitionRule_in_ruleRulePartitioner890 = new BitSet(new long[]{0x0000005100001000L});
     public static final BitSet FOLLOW_12_in_ruleRulePartitioner903 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_ruleJSParitioner_in_entryRuleJSParitioner939 = new BitSet(new long[]{0x0000000000000000L});
     public static final BitSet FOLLOW_EOF_in_entryRuleJSParitioner949 = new BitSet(new long[]{0x0000000000000002L});
@@ -4923,144 +4457,125 @@ public class InternalHSLParser extends AbstractInternalAntlrParser {
     public static final BitSet FOLLOW_EOF_in_entryRuleRuleDamager1298 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_24_in_ruleRuleDamager1335 = new BitSet(new long[]{0x0000000000000010L});
     public static final BitSet FOLLOW_RULE_ID_in_ruleRuleDamager1355 = new BitSet(new long[]{0x0000000000000800L});
-    public static final BitSet FOLLOW_11_in_ruleRuleDamager1367 = new BitSet(new long[]{0x00000F1086001000L});
-    public static final BitSet FOLLOW_ruleScannerToken_in_ruleRuleDamager1388 = new BitSet(new long[]{0x00000F1086001000L});
-    public static final BitSet FOLLOW_ruleKeywordGroup_in_ruleRuleDamager1410 = new BitSet(new long[]{0x00000F1080001000L});
-    public static final BitSet FOLLOW_ruleScannerRule_in_ruleRuleDamager1432 = new BitSet(new long[]{0x00000F1000001000L});
+    public static final BitSet FOLLOW_11_in_ruleRuleDamager1367 = new BitSet(new long[]{0x000000F10E001000L});
+    public static final BitSet FOLLOW_ruleScannerToken_in_ruleRuleDamager1388 = new BitSet(new long[]{0x000000F10E001000L});
+    public static final BitSet FOLLOW_ruleKeywordGroup_in_ruleRuleDamager1410 = new BitSet(new long[]{0x000000F108001000L});
+    public static final BitSet FOLLOW_ruleScannerRule_in_ruleRuleDamager1432 = new BitSet(new long[]{0x000000F100001000L});
     public static final BitSet FOLLOW_12_in_ruleRuleDamager1445 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_ruleScannerToken_in_entryRuleScannerToken1481 = new BitSet(new long[]{0x0000000000000000L});
     public static final BitSet FOLLOW_EOF_in_entryRuleScannerToken1491 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_25_in_ruleScannerToken1534 = new BitSet(new long[]{0x0000000004000000L});
     public static final BitSet FOLLOW_26_in_ruleScannerToken1560 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleScannerToken1577 = new BitSet(new long[]{0x0000000000000802L});
-    public static final BitSet FOLLOW_11_in_ruleScannerToken1595 = new BitSet(new long[]{0x0000000068001000L});
-    public static final BitSet FOLLOW_27_in_ruleScannerToken1608 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_28_in_ruleScannerToken1620 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_ruleColor_in_ruleScannerToken1641 = new BitSet(new long[]{0x0000000060001000L});
-    public static final BitSet FOLLOW_29_in_ruleScannerToken1656 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_28_in_ruleScannerToken1668 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_ruleColor_in_ruleScannerToken1689 = new BitSet(new long[]{0x0000000040001000L});
-    public static final BitSet FOLLOW_30_in_ruleScannerToken1704 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_28_in_ruleScannerToken1716 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFont_in_ruleScannerToken1737 = new BitSet(new long[]{0x0000000000001000L});
-    public static final BitSet FOLLOW_12_in_ruleScannerToken1751 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleKeywordGroup_in_entryRuleKeywordGroup1789 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleKeywordGroup1799 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_ruleKeywordGroup1836 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleKeywordGroup1856 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_32_in_ruleKeywordGroup1868 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_ruleKeyword_in_ruleKeywordGroup1889 = new BitSet(new long[]{0x0000000600000000L});
-    public static final BitSet FOLLOW_33_in_ruleKeywordGroup1902 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_ruleKeyword_in_ruleKeywordGroup1923 = new BitSet(new long[]{0x0000000600000000L});
-    public static final BitSet FOLLOW_34_in_ruleKeywordGroup1937 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleKeyword_in_entryRuleKeyword1973 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleKeyword1983 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleKeyword2025 = new BitSet(new long[]{0x0000000800000002L});
-    public static final BitSet FOLLOW_35_in_ruleKeyword2043 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleKeyword2060 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScannerRule_in_entryRuleScannerRule2103 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleScannerRule2113 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScannerSingleLineRule_in_ruleScannerRule2160 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScannerMultiLineRule_in_ruleScannerRule2187 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScannerCharacterRule_in_ruleScannerRule2214 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScannerJSRule_in_ruleScannerRule2241 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScannerWhitespaceRule_in_ruleScannerRule2268 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleParitionRule_in_entryRuleParitionRule2303 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleParitionRule2313 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePartitionSingleLineRule_in_ruleParitionRule2360 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePartitionMultiLineRule_in_ruleParitionRule2387 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePartitionJSRule_in_ruleParitionRule2414 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScannerSingleLineRule_in_entryRuleScannerSingleLineRule2449 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleScannerSingleLineRule2459 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_ruleScannerSingleLineRule2496 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleScannerSingleLineRule2516 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerSingleLineRule2533 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_37_in_ruleScannerSingleLineRule2550 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerSingleLineRule2567 = new BitSet(new long[]{0x0000004000000002L});
-    public static final BitSet FOLLOW_38_in_ruleScannerSingleLineRule2585 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_39_in_ruleScannerSingleLineRule2597 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerSingleLineRule2614 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePartitionSingleLineRule_in_entryRulePartitionSingleLineRule2657 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePartitionSingleLineRule2667 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rulePartitionSingleLineRule2704 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_rulePartitionSingleLineRule2724 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionSingleLineRule2741 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_37_in_rulePartitionSingleLineRule2758 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionSingleLineRule2775 = new BitSet(new long[]{0x0000004000000002L});
-    public static final BitSet FOLLOW_38_in_rulePartitionSingleLineRule2793 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_39_in_rulePartitionSingleLineRule2805 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionSingleLineRule2822 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScannerMultiLineRule_in_entryRuleScannerMultiLineRule2865 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleScannerMultiLineRule2875 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_ruleScannerMultiLineRule2912 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleScannerMultiLineRule2932 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerMultiLineRule2949 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_37_in_ruleScannerMultiLineRule2966 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerMultiLineRule2983 = new BitSet(new long[]{0x0000004000000002L});
-    public static final BitSet FOLLOW_38_in_ruleScannerMultiLineRule3001 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_39_in_ruleScannerMultiLineRule3013 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerMultiLineRule3030 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePartitionMultiLineRule_in_entryRulePartitionMultiLineRule3073 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePartitionMultiLineRule3083 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_rulePartitionMultiLineRule3120 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_rulePartitionMultiLineRule3140 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionMultiLineRule3157 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_37_in_rulePartitionMultiLineRule3174 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionMultiLineRule3191 = new BitSet(new long[]{0x0000004000000002L});
-    public static final BitSet FOLLOW_38_in_rulePartitionMultiLineRule3209 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_39_in_rulePartitionMultiLineRule3221 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionMultiLineRule3238 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScannerCharacterRule_in_entryRuleScannerCharacterRule3281 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleScannerCharacterRule3291 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_ruleScannerCharacterRule3328 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleScannerCharacterRule3348 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_32_in_ruleScannerCharacterRule3360 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerCharacterRule3377 = new BitSet(new long[]{0x0000000600000000L});
-    public static final BitSet FOLLOW_33_in_ruleScannerCharacterRule3395 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerCharacterRule3412 = new BitSet(new long[]{0x0000000600000000L});
-    public static final BitSet FOLLOW_34_in_ruleScannerCharacterRule3431 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScannerJSRule_in_entryRuleScannerJSRule3467 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleScannerJSRule3477 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_ruleScannerJSRule3514 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleScannerJSRule3534 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerJSRule3551 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePartitionJSRule_in_entryRulePartitionJSRule3592 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePartitionJSRule3602 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rulePartitionJSRule3639 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_rulePartitionJSRule3659 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionJSRule3676 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScannerWhitespaceRule_in_entryRuleScannerWhitespaceRule3717 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleScannerWhitespaceRule3727 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_ruleScannerWhitespaceRule3764 = new BitSet(new long[]{0x0000100100000030L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleScannerWhitespaceRule3784 = new BitSet(new long[]{0x0000100100000020L});
-    public static final BitSet FOLLOW_32_in_ruleScannerWhitespaceRule3799 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerWhitespaceRule3816 = new BitSet(new long[]{0x0000000600000000L});
-    public static final BitSet FOLLOW_33_in_ruleScannerWhitespaceRule3834 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerWhitespaceRule3851 = new BitSet(new long[]{0x0000000600000000L});
-    public static final BitSet FOLLOW_34_in_ruleScannerWhitespaceRule3870 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_ruleScannerWhitespaceRule3895 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerWhitespaceRule3931 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleColor_in_entryRuleColor3973 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleColor3983 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRGBColor_in_ruleColor4029 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRGBColor_in_entryRuleRGBColor4063 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRGBColor4073 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_ruleRGBColor4110 = new BitSet(new long[]{0x0000400000000000L});
-    public static final BitSet FOLLOW_46_in_ruleRGBColor4122 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleRGBColor4139 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_ruleRGBColor4156 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleRGBColor4173 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_ruleRGBColor4190 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleRGBColor4207 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_47_in_ruleRGBColor4224 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFont_in_entryRuleFont4260 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFont4270 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleFont4312 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleFont4334 = new BitSet(new long[]{0x000F000000000002L});
-    public static final BitSet FOLLOW_ruleFontType_in_ruleFont4360 = new BitSet(new long[]{0x000F000000000002L});
-    public static final BitSet FOLLOW_48_in_ruleFontType4411 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_ruleFontType4428 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_50_in_ruleFontType4445 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_ruleFontType4462 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_ID_in_ruleScannerToken1577 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleKeywordGroup_in_entryRuleKeywordGroup1618 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleKeywordGroup1628 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_27_in_ruleKeywordGroup1665 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_RULE_ID_in_ruleKeywordGroup1685 = new BitSet(new long[]{0x0000000010000000L});
+    public static final BitSet FOLLOW_28_in_ruleKeywordGroup1697 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_ruleKeyword_in_ruleKeywordGroup1718 = new BitSet(new long[]{0x0000000060000000L});
+    public static final BitSet FOLLOW_29_in_ruleKeywordGroup1731 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_ruleKeyword_in_ruleKeywordGroup1752 = new BitSet(new long[]{0x0000000060000000L});
+    public static final BitSet FOLLOW_30_in_ruleKeywordGroup1766 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleKeyword_in_entryRuleKeyword1802 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleKeyword1812 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_STRING_in_ruleKeyword1854 = new BitSet(new long[]{0x0000000080000002L});
+    public static final BitSet FOLLOW_31_in_ruleKeyword1872 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_RULE_STRING_in_ruleKeyword1889 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleScannerRule_in_entryRuleScannerRule1932 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleScannerRule1942 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleScannerSingleLineRule_in_ruleScannerRule1989 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleScannerMultiLineRule_in_ruleScannerRule2016 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleScannerCharacterRule_in_ruleScannerRule2043 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleScannerJSRule_in_ruleScannerRule2070 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleScannerWhitespaceRule_in_ruleScannerRule2097 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleParitionRule_in_entryRuleParitionRule2132 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleParitionRule2142 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rulePartitionSingleLineRule_in_ruleParitionRule2189 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rulePartitionMultiLineRule_in_ruleParitionRule2216 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rulePartitionJSRule_in_ruleParitionRule2243 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleScannerSingleLineRule_in_entryRuleScannerSingleLineRule2278 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleScannerSingleLineRule2288 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_32_in_ruleScannerSingleLineRule2325 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_RULE_ID_in_ruleScannerSingleLineRule2345 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerSingleLineRule2362 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_33_in_ruleScannerSingleLineRule2379 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerSingleLineRule2396 = new BitSet(new long[]{0x0000000400000002L});
+    public static final BitSet FOLLOW_34_in_ruleScannerSingleLineRule2414 = new BitSet(new long[]{0x0000000800000000L});
+    public static final BitSet FOLLOW_35_in_ruleScannerSingleLineRule2426 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerSingleLineRule2443 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rulePartitionSingleLineRule_in_entryRulePartitionSingleLineRule2486 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRulePartitionSingleLineRule2496 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_32_in_rulePartitionSingleLineRule2533 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_RULE_ID_in_rulePartitionSingleLineRule2553 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionSingleLineRule2570 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_33_in_rulePartitionSingleLineRule2587 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionSingleLineRule2604 = new BitSet(new long[]{0x0000000400000002L});
+    public static final BitSet FOLLOW_34_in_rulePartitionSingleLineRule2622 = new BitSet(new long[]{0x0000000800000000L});
+    public static final BitSet FOLLOW_35_in_rulePartitionSingleLineRule2634 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionSingleLineRule2651 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleScannerMultiLineRule_in_entryRuleScannerMultiLineRule2694 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleScannerMultiLineRule2704 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_36_in_ruleScannerMultiLineRule2741 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_RULE_ID_in_ruleScannerMultiLineRule2761 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerMultiLineRule2778 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_33_in_ruleScannerMultiLineRule2795 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerMultiLineRule2812 = new BitSet(new long[]{0x0000000400000002L});
+    public static final BitSet FOLLOW_34_in_ruleScannerMultiLineRule2830 = new BitSet(new long[]{0x0000000800000000L});
+    public static final BitSet FOLLOW_35_in_ruleScannerMultiLineRule2842 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerMultiLineRule2859 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rulePartitionMultiLineRule_in_entryRulePartitionMultiLineRule2902 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRulePartitionMultiLineRule2912 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_36_in_rulePartitionMultiLineRule2949 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_RULE_ID_in_rulePartitionMultiLineRule2969 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionMultiLineRule2986 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_33_in_rulePartitionMultiLineRule3003 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionMultiLineRule3020 = new BitSet(new long[]{0x0000000400000002L});
+    public static final BitSet FOLLOW_34_in_rulePartitionMultiLineRule3038 = new BitSet(new long[]{0x0000000800000000L});
+    public static final BitSet FOLLOW_35_in_rulePartitionMultiLineRule3050 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionMultiLineRule3067 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleScannerCharacterRule_in_entryRuleScannerCharacterRule3110 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleScannerCharacterRule3120 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_37_in_ruleScannerCharacterRule3157 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_RULE_ID_in_ruleScannerCharacterRule3177 = new BitSet(new long[]{0x0000000010000000L});
+    public static final BitSet FOLLOW_28_in_ruleScannerCharacterRule3189 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerCharacterRule3206 = new BitSet(new long[]{0x0000000060000000L});
+    public static final BitSet FOLLOW_29_in_ruleScannerCharacterRule3224 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerCharacterRule3241 = new BitSet(new long[]{0x0000000060000000L});
+    public static final BitSet FOLLOW_30_in_ruleScannerCharacterRule3260 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleScannerJSRule_in_entryRuleScannerJSRule3296 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleScannerJSRule3306 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_38_in_ruleScannerJSRule3343 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_RULE_ID_in_ruleScannerJSRule3363 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerJSRule3380 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rulePartitionJSRule_in_entryRulePartitionJSRule3421 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRulePartitionJSRule3431 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_38_in_rulePartitionJSRule3468 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_RULE_ID_in_rulePartitionJSRule3488 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionJSRule3505 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleScannerWhitespaceRule_in_entryRuleScannerWhitespaceRule3546 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleScannerWhitespaceRule3556 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_39_in_ruleScannerWhitespaceRule3593 = new BitSet(new long[]{0x0000010010000030L});
+    public static final BitSet FOLLOW_RULE_ID_in_ruleScannerWhitespaceRule3613 = new BitSet(new long[]{0x0000010010000020L});
+    public static final BitSet FOLLOW_28_in_ruleScannerWhitespaceRule3628 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerWhitespaceRule3645 = new BitSet(new long[]{0x0000000060000000L});
+    public static final BitSet FOLLOW_29_in_ruleScannerWhitespaceRule3663 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerWhitespaceRule3680 = new BitSet(new long[]{0x0000000060000000L});
+    public static final BitSet FOLLOW_30_in_ruleScannerWhitespaceRule3699 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_40_in_ruleScannerWhitespaceRule3724 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerWhitespaceRule3760 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleRGBColor_in_entryRuleRGBColor3804 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleRGBColor3814 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_41_in_ruleRGBColor3851 = new BitSet(new long[]{0x0000040000000000L});
+    public static final BitSet FOLLOW_42_in_ruleRGBColor3863 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_RULE_INT_in_ruleRGBColor3880 = new BitSet(new long[]{0x0000000020000000L});
+    public static final BitSet FOLLOW_29_in_ruleRGBColor3897 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_RULE_INT_in_ruleRGBColor3914 = new BitSet(new long[]{0x0000000020000000L});
+    public static final BitSet FOLLOW_29_in_ruleRGBColor3931 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_RULE_INT_in_ruleRGBColor3948 = new BitSet(new long[]{0x0000080000000000L});
+    public static final BitSet FOLLOW_43_in_ruleRGBColor3965 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_44_in_ruleFontType4017 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_45_in_ruleFontType4034 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_46_in_ruleFontType4051 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_47_in_ruleFontType4068 = new BitSet(new long[]{0x0000000000000002L});
 
 }
\ No newline at end of file
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/serializer/HSLSemanticSequencer.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/serializer/HSLSemanticSequencer.java
index 62ac52cb5..765bc5e02 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/serializer/HSLSemanticSequencer.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/serializer/HSLSemanticSequencer.java
@@ -428,7 +428,7 @@ public class HSLSemanticSequencer extends AbstractDelegatingSemanticSequencer {
 	
 	/**
 	 * Constraint:
-	 *     (default?='default'? name=ID (fgColor=Color? bgColor=Color? font=Font?)?)
+	 *     (default?='default'? name=ID)
 	 */
 	protected void sequence_ScannerToken(EObject context, ScannerToken semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/serializer/HSLSyntacticSequencer.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/serializer/HSLSyntacticSequencer.java
index 12b6f8509..9fc6f3068 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/serializer/HSLSyntacticSequencer.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/serializer/HSLSyntacticSequencer.java
@@ -8,9 +8,6 @@ import org.eclipse.xtext.IGrammarAccess;
 import org.eclipse.xtext.RuleCall;
 import org.eclipse.xtext.nodemodel.INode;
 import org.eclipse.xtext.serializer.analysis.GrammarAlias.AbstractElementAlias;
-import org.eclipse.xtext.serializer.analysis.GrammarAlias.GroupAlias;
-import org.eclipse.xtext.serializer.analysis.GrammarAlias.TokenAlias;
-import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynNavigable;
 import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynTransition;
 import org.eclipse.xtext.serializer.sequencer.AbstractSyntacticSequencer;
 
@@ -18,12 +15,10 @@ import org.eclipse.xtext.serializer.sequencer.AbstractSyntacticSequencer;
 public class HSLSyntacticSequencer extends AbstractSyntacticSequencer {
 
 	protected HSLGrammarAccess grammarAccess;
-	protected AbstractElementAlias match_ScannerToken___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_4__q;
 	
 	@Inject
 	protected void init(IGrammarAccess access) {
 		grammarAccess = (HSLGrammarAccess) access;
-		match_ScannerToken___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_4__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getScannerTokenAccess().getLeftCurlyBracketKeyword_3_0()), new TokenAlias(false, false, grammarAccess.getScannerTokenAccess().getRightCurlyBracketKeyword_3_4()));
 	}
 	
 	@Override
@@ -38,18 +33,8 @@ public class HSLSyntacticSequencer extends AbstractSyntacticSequencer {
 		List<INode> transitionNodes = collectNodes(fromNode, toNode);
 		for (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) {
 			List<INode> syntaxNodes = getNodesFor(transitionNodes, syntax);
-			if(match_ScannerToken___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_4__q.equals(syntax))
-				emit_ScannerToken___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_4__q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else acceptNodes(getLastNavigableState(), syntaxNodes);
+			acceptNodes(getLastNavigableState(), syntaxNodes);
 		}
 	}
 
-	/**
-	 * Syntax:
-	 *     ('{' '}')?
-	 */
-	protected void emit_ScannerToken___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_4__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-	
 }
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/services/HSLGrammarAccess.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/services/HSLGrammarAccess.java
index 0ee6a15ae..69a7e8d10 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/services/HSLGrammarAccess.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/services/HSLGrammarAccess.java
@@ -418,32 +418,12 @@ public class HSLGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cTokenKeyword_1 = (Keyword)cGroup.eContents().get(1);
 		private final Assignment cNameAssignment_2 = (Assignment)cGroup.eContents().get(2);
 		private final RuleCall cNameIDTerminalRuleCall_2_0 = (RuleCall)cNameAssignment_2.eContents().get(0);
-		private final Group cGroup_3 = (Group)cGroup.eContents().get(3);
-		private final Keyword cLeftCurlyBracketKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0);
-		private final Group cGroup_3_1 = (Group)cGroup_3.eContents().get(1);
-		private final Keyword cFgcolorKeyword_3_1_0 = (Keyword)cGroup_3_1.eContents().get(0);
-		private final Keyword cColonKeyword_3_1_1 = (Keyword)cGroup_3_1.eContents().get(1);
-		private final Assignment cFgColorAssignment_3_1_2 = (Assignment)cGroup_3_1.eContents().get(2);
-		private final RuleCall cFgColorColorParserRuleCall_3_1_2_0 = (RuleCall)cFgColorAssignment_3_1_2.eContents().get(0);
-		private final Group cGroup_3_2 = (Group)cGroup_3.eContents().get(2);
-		private final Keyword cBgcolorKeyword_3_2_0 = (Keyword)cGroup_3_2.eContents().get(0);
-		private final Keyword cColonKeyword_3_2_1 = (Keyword)cGroup_3_2.eContents().get(1);
-		private final Assignment cBgColorAssignment_3_2_2 = (Assignment)cGroup_3_2.eContents().get(2);
-		private final RuleCall cBgColorColorParserRuleCall_3_2_2_0 = (RuleCall)cBgColorAssignment_3_2_2.eContents().get(0);
-		private final Group cGroup_3_3 = (Group)cGroup_3.eContents().get(3);
-		private final Keyword cFontKeyword_3_3_0 = (Keyword)cGroup_3_3.eContents().get(0);
-		private final Keyword cColonKeyword_3_3_1 = (Keyword)cGroup_3_3.eContents().get(1);
-		private final Assignment cFontAssignment_3_3_2 = (Assignment)cGroup_3_3.eContents().get(2);
-		private final RuleCall cFontFontParserRuleCall_3_3_2_0 = (RuleCall)cFontAssignment_3_3_2.eContents().get(0);
-		private final Keyword cRightCurlyBracketKeyword_3_4 = (Keyword)cGroup_3.eContents().get(4);
 		
 		//ScannerToken:
-		//	default?="default"? "token" name=ID ("{" ("fgcolor" ":" fgColor=Color)? ("bgcolor" ":" bgColor=Color)? ("font" ":"
-		//	font=Font)? "}")?;
+		//	default?="default"? "token" name=ID;
 		public ParserRule getRule() { return rule; }
 
-		//default?="default"? "token" name=ID ("{" ("fgcolor" ":" fgColor=Color)? ("bgcolor" ":" bgColor=Color)? ("font" ":"
-		//font=Font)? "}")?
+		//default?="default"? "token" name=ID
 		public Group getGroup() { return cGroup; }
 
 		//default?="default"?
@@ -460,60 +440,6 @@ public class HSLGrammarAccess extends AbstractGrammarElementFinder {
 
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_2_0() { return cNameIDTerminalRuleCall_2_0; }
-
-		//("{" ("fgcolor" ":" fgColor=Color)? ("bgcolor" ":" bgColor=Color)? ("font" ":" font=Font)? "}")?
-		public Group getGroup_3() { return cGroup_3; }
-
-		//"{"
-		public Keyword getLeftCurlyBracketKeyword_3_0() { return cLeftCurlyBracketKeyword_3_0; }
-
-		//("fgcolor" ":" fgColor=Color)?
-		public Group getGroup_3_1() { return cGroup_3_1; }
-
-		//"fgcolor"
-		public Keyword getFgcolorKeyword_3_1_0() { return cFgcolorKeyword_3_1_0; }
-
-		//":"
-		public Keyword getColonKeyword_3_1_1() { return cColonKeyword_3_1_1; }
-
-		//fgColor=Color
-		public Assignment getFgColorAssignment_3_1_2() { return cFgColorAssignment_3_1_2; }
-
-		//Color
-		public RuleCall getFgColorColorParserRuleCall_3_1_2_0() { return cFgColorColorParserRuleCall_3_1_2_0; }
-
-		//("bgcolor" ":" bgColor=Color)?
-		public Group getGroup_3_2() { return cGroup_3_2; }
-
-		//"bgcolor"
-		public Keyword getBgcolorKeyword_3_2_0() { return cBgcolorKeyword_3_2_0; }
-
-		//":"
-		public Keyword getColonKeyword_3_2_1() { return cColonKeyword_3_2_1; }
-
-		//bgColor=Color
-		public Assignment getBgColorAssignment_3_2_2() { return cBgColorAssignment_3_2_2; }
-
-		//Color
-		public RuleCall getBgColorColorParserRuleCall_3_2_2_0() { return cBgColorColorParserRuleCall_3_2_2_0; }
-
-		//("font" ":" font=Font)?
-		public Group getGroup_3_3() { return cGroup_3_3; }
-
-		//"font"
-		public Keyword getFontKeyword_3_3_0() { return cFontKeyword_3_3_0; }
-
-		//":"
-		public Keyword getColonKeyword_3_3_1() { return cColonKeyword_3_3_1; }
-
-		//font=Font
-		public Assignment getFontAssignment_3_3_2() { return cFontAssignment_3_3_2; }
-
-		//Font
-		public RuleCall getFontFontParserRuleCall_3_3_2_0() { return cFontFontParserRuleCall_3_3_2_0; }
-
-		//"}"
-		public Keyword getRightCurlyBracketKeyword_3_4() { return cRightCurlyBracketKeyword_3_4; }
 	}
 
 	public class KeywordGroupElements extends AbstractParserRuleElementFinder {
@@ -1465,8 +1391,7 @@ public class HSLGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//ScannerToken:
-	//	default?="default"? "token" name=ID ("{" ("fgcolor" ":" fgColor=Color)? ("bgcolor" ":" bgColor=Color)? ("font" ":"
-	//	font=Font)? "}")?;
+	//	default?="default"? "token" name=ID;
 	public ScannerTokenElements getScannerTokenAccess() {
 		return (pScannerToken != null) ? pScannerToken : (pScannerToken = new ScannerTokenElements());
 	}
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src/org/eclipse/fx/code/compensator/hsl/HSL.xtext b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src/org/eclipse/fx/code/compensator/hsl/HSL.xtext
index 86de326a7..ece5b626a 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src/org/eclipse/fx/code/compensator/hsl/HSL.xtext
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src/org/eclipse/fx/code/compensator/hsl/HSL.xtext
@@ -55,11 +55,7 @@ RuleDamager:
 ;
 
 ScannerToken:
-	default?='default'? 'token' name=ID ('{' 
-		('fgcolor' ':' fgColor=Color)? 
-		('bgcolor' ':' bgColor=Color)? 
-		('font' ':' font=Font)?
-	'}')?
+	default?='default'? 'token' name=ID
 ;
 
 KeywordGroup: