diff --git a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/.project b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/.project
index a1bc3d1..364226f 100644
--- a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/.project
+++ b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/.project
@@ -1,28 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.polarsys.esf.core.diagram.esfarchitectureconcepts</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.polarsys.esf.core.diagram.esfarchitectureconcepts</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<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/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/style/architectureConceptsDiagramStyle.css b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/style/architectureConceptsDiagramStyle.css
index 223cd0d..8c0e486 100644
--- a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/style/architectureConceptsDiagramStyle.css
+++ b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/style/architectureConceptsDiagramStyle.css
@@ -1,62 +1,63 @@
-
-/************************************* SBLOCK *******************************************/
-[appliedStereotypes~="ESFArchitectureConcepts::SBlock"]{
-	maintainSymbolRatio:true;
-	followSVGSymbol:false;
-	fillColor:#FFFF71;
-	transparency:0;
-	displayBorder:true;
-	displayName:true;
-	maskLabel:name;
-}
-
-/************************************* SPART *******************************************/
-[appliedStereotypes~="ESFArchitectureConcepts::SPart"]{
-	maintainSymbolRatio:true;
-	followSVGSymbol:false;
-	fillColor:#00E1FF;
-	transparency:0;
-	displayBorder:true;
-	displayName:true;
-	maskLabel:name;
-}
-
-/************************************* SPORT *******************************************/
-[appliedStereotypes~="ESFArchitectureConcepts::SPort"][sDirection=IN]{
-	shapeVisibility: true;
-    shapeDirection: 4;
-    displayName:true;
-    maskLabel:name;
-    svgFile: url("platform:/plugin/org.polarsys.esf.core.common.ui/src/main/resources/svg/profile/esfarchitectureconcepts/shape_input_sport.svg");
-}
-
-[appliedStereotypes~="ESFArchitectureConcepts::SPort"][sDirection=OUT]{
-	shapeVisibility: true;
-    shapeDirection: 4;
-    displayName:true;
-    maskLabel:name;
-    svgFile: url("platform:/plugin/org.polarsys.esf.core.common.ui/src/main/resources/svg/profile/esfarchitectureconcepts/shape_output_sport.svg");
-}
-
-[appliedStereotypes~="ESFArchitectureConcepts::SPort"][sDirection=INOUT]{
-    shapeVisibility: true;
-    shapeDirection: 4;
-    displayName:true;
-    maskLabel:name;
-    svgFile: url("platform:/plugin/org.polarsys.esf.core.common.ui/src/main/resources/svg/profile/esfarchitectureconcepts/shape_inoutput_sport.svg");
-}
-
-Port > Label { 
-	maskLabel: name;
-}
-
-/************************************* SCONNECTOR *******************************************/
-[appliedStereotypes~="ESFArchitectureConcepts::SConnector"]{
-	lineStyle: solid;
-	lineWidth:3;
-	lineColor: blue;
-}
-
-[appliedStereotypes~="ESFArchitectureConcepts::SConnector"] > Label {
-	visible:false;
+
+/************************************* SBLOCK *******************************************/
+[appliedStereotypes~="ESFArchitectureConcepts::SBlock"]{
+	maintainSymbolRatio:true;
+	followSVGSymbol:false;
+	fillColor:#FFFF71;
+	transparency:0;
+	displayBorder:true;
+	displayName:true;
+	maskLabel:name;
+	canonical:true;
+}
+
+/************************************* SPART *******************************************/
+[appliedStereotypes~="ESFArchitectureConcepts::SPart"]{
+	maintainSymbolRatio:true;
+	followSVGSymbol:false;
+	fillColor:#00E1FF;
+	transparency:0;
+	displayBorder:true;
+	displayName:true;
+	maskLabel:name;
+}
+
+/************************************* SPORT *******************************************/
+[appliedStereotypes~="ESFArchitectureConcepts::SPort"][sDirection=IN]{
+	shapeVisibility: true;
+    shapeDirection: 4;
+    displayName:true;
+    maskLabel:name;
+    svgFile: url("platform:/plugin/org.polarsys.esf.core.common.ui/src/main/resources/svg/profile/esfarchitectureconcepts/shape_input_sport.svg");
+}
+
+[appliedStereotypes~="ESFArchitectureConcepts::SPort"][sDirection=OUT]{
+	shapeVisibility: true;
+    shapeDirection: 4;
+    displayName:true;
+    maskLabel:name;
+    svgFile: url("platform:/plugin/org.polarsys.esf.core.common.ui/src/main/resources/svg/profile/esfarchitectureconcepts/shape_output_sport.svg");
+}
+
+[appliedStereotypes~="ESFArchitectureConcepts::SPort"][sDirection=INOUT]{
+    shapeVisibility: true;
+    shapeDirection: 4;
+    displayName:true;
+    maskLabel:name;
+    svgFile: url("platform:/plugin/org.polarsys.esf.core.common.ui/src/main/resources/svg/profile/esfarchitectureconcepts/shape_inoutput_sport.svg");
+}
+
+Port > Label { 
+	maskLabel: name;
+}
+
+/************************************* SCONNECTOR *******************************************/
+[appliedStereotypes~="ESFArchitectureConcepts::SConnector"]{
+	lineStyle: solid;
+	lineWidth:3;
+	lineColor: blue;
+}
+
+[appliedStereotypes~="ESFArchitectureConcepts::SConnector"] > Label {
+	visible:false;
 }
\ No newline at end of file