[Bug 273] Generating code for user-defined DataTypes (structs)

This resolves the problem by adding 'topTypedefinitions' to the model in
the intermediate representation (xtumlrt), translating such definitions
from UML to xtumlrt, and updating the Collector in CppCodeGenerator to
add generators for those user type definitions at the top-level and
package-level.

It remains to be decided whether those should also be generated if they
are referenced by a model element, but do not appear inside a package or
at the model level.

Also adds a key binding to trigger the generator: Ctrl + r g, when the
Composite structure diagram view is active.

Change-Id: I4ac523d0126a3b34348f43be96e072e45ebdab85
Signed-off-by: Ernesto Posse <eposse@gmail.com>
diff --git a/codegen/org.eclipse.papyrusrt.codegen.cpp/src/org/eclipse/papyrusrt/codegen/cpp/CppCodeGenerator.java b/codegen/org.eclipse.papyrusrt.codegen.cpp/src/org/eclipse/papyrusrt/codegen/cpp/CppCodeGenerator.java
index 86e2838..89719b3 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.cpp/src/org/eclipse/papyrusrt/codegen/cpp/CppCodeGenerator.java
+++ b/codegen/org.eclipse.papyrusrt.codegen.cpp/src/org/eclipse/papyrusrt/codegen/cpp/CppCodeGenerator.java
@@ -30,6 +30,7 @@
 import org.eclipse.papyrusrt.xtumlrt.common.Protocol;
 import org.eclipse.papyrusrt.xtumlrt.common.StateMachine;
 import org.eclipse.papyrusrt.xtumlrt.common.StructType;
+import org.eclipse.papyrusrt.xtumlrt.common.TypeDefinition;
 import org.eclipse.papyrusrt.xtumlrt.common.util.CommonSwitch;
 import org.eclipse.papyrusrt.xtumlrt.platformcppmodel.CppInclude;
 import org.eclipse.papyrusrt.xtumlrt.platformcppmodel.GenerationProperties;
@@ -248,7 +249,9 @@
                 doSwitch( element );
             for (Protocol element : model.getTopProtocols())
                 doSwitch( element );
-            for( Package element : model.getRootPackages() )
+            for (TypeDefinition element : model.getTopTypedefinitions())
+                doSwitch( element );
+            for (Package element : model.getRootPackages())
                 doSwitch( element );
 
             return true;
@@ -262,7 +265,9 @@
                 doSwitch( element );
             for (Protocol element : packge.getProtocols())
                 doSwitch( element );
-            for( Package element : packge.getPackages() )
+            for (TypeDefinition element : packge.getTypedefinitions())
+                doSwitch( element );
+            for (Package element : packge.getPackages())
                 doSwitch( element );
 
             return true;
@@ -293,6 +298,13 @@
         }
 
         @Override
+        public Boolean caseTypeDefinition( TypeDefinition typedef )
+        {
+            if (!toBeGenerated( typedef)) return true;
+            return doSwitch( typedef.getType() );
+        }
+
+        @Override
         public Boolean caseStructType( StructType struct )
         {
             if (!toBeGenerated( struct )) return true;
diff --git a/codegen/org.eclipse.papyrusrt.codegen.papyrus/plugin.xml b/codegen/org.eclipse.papyrusrt.codegen.papyrus/plugin.xml
index e8c0be9..bc2faf6 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.papyrus/plugin.xml
+++ b/codegen/org.eclipse.papyrusrt.codegen.papyrus/plugin.xml
@@ -42,4 +42,14 @@
           </dependsOn>
        </service>
     </extension>
+
+    <extension
+          point="org.eclipse.ui.bindings">
+       <key
+             commandId="org.eclipse.papyrusrt.codegen.papyrus.codegen"
+             contextId="org.eclipse.papyrus.uml.diagram.composite.ui.diagramContext"
+             schemeId="org.eclipse.papyrusrt.codegen.papyrus.keys"
+             sequence="CTRL+R G">
+       </key>
+    </extension>
 </plugin>
diff --git a/codegen/org.eclipse.papyrusrt.codegen.xtumlrt.trans/src/org/eclipse/papyrusrt/codegen/xtumlrt/trans/UML2xtumlrtModelTranslator.xtend b/codegen/org.eclipse.papyrusrt.codegen.xtumlrt.trans/src/org/eclipse/papyrusrt/codegen/xtumlrt/trans/UML2xtumlrtModelTranslator.xtend
index 702ea9d..0e24ea7 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.xtumlrt.trans/src/org/eclipse/papyrusrt/codegen/xtumlrt/trans/UML2xtumlrtModelTranslator.xtend
+++ b/codegen/org.eclipse.papyrusrt.codegen.xtumlrt.trans/src/org/eclipse/papyrusrt/codegen/xtumlrt/trans/UML2xtumlrtModelTranslator.xtend
@@ -54,6 +54,7 @@
 import org.eclipse.papyrusrt.xtumlrt.common.StructMember
 import org.eclipse.papyrusrt.xtumlrt.common.StructType
 import org.eclipse.papyrusrt.xtumlrt.common.Type
+import org.eclipse.papyrusrt.xtumlrt.common.TypeDefinition
 import org.eclipse.papyrusrt.xtumlrt.common.VisibilityKind
 import org.eclipse.papyrusrt.xtumlrt.umlrt.PortRegistration
 import org.eclipse.papyrusrt.xtumlrt.umlrt.RTPassiveClass
@@ -331,6 +332,8 @@
                 topEntities.addIfNotPresent( translate(element) as Entity )
             else if (element.isProtocolContainer)
                 topProtocols.addIfNotPresent( translate(element) as Protocol )
+            else if (element instanceof org.eclipse.uml2.uml.DataType)
+                topTypedefinitions.addIfNotPresent( translateTypeDefinition(element) )
             else if (element instanceof org.eclipse.uml2.uml.Package)
                 rootPackages.addIfNotPresent( translate(element) as Package )
         }
@@ -351,6 +354,8 @@
                 entities.addIfNotPresent( translate(element) as Entity )
             else if (element.isProtocolContainer)
                 protocols.addIfNotPresent( translate(element) as Protocol )
+            else if (element instanceof org.eclipse.uml2.uml.DataType)
+                typedefinitions.addIfNotPresent( translateTypeDefinition(element) )
             else if (element instanceof org.eclipse.uml2.uml.Package)
                 packages.addIfNotPresent( translate(element) as Package )
         }
@@ -756,6 +761,14 @@
         // Do not translate unknown types
     }
 
+    protected def
+    create CommonFactory.eINSTANCE.createTypeDefinition
+    translateTypeDefinition( org.eclipse.uml2.uml.DataType dataType )
+    {
+        type = translate( dataType ) as Type
+    }
+
+
     /**
      * @param stateMachine  - A {@link org.eclipse.uml2.uml.StateMachine}
      * @return A {@link StateMachine}
diff --git a/codegen/org.eclipse.papyrusrt.xtumlrt.common.model/model/common.ecore b/codegen/org.eclipse.papyrusrt.xtumlrt.common.model/model/common.ecore
index 1afd2d3..96528fc 100644
--- a/codegen/org.eclipse.papyrusrt.xtumlrt.common.model/model/common.ecore
+++ b/codegen/org.eclipse.papyrusrt.xtumlrt.common.model/model/common.ecore
@@ -100,6 +100,8 @@
         eType="#//Entity" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="topProtocols" upperBound="-1"
         eType="#//Protocol" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="topTypedefinitions" upperBound="-1"
+        eType="#//TypeDefinition" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="MultiplicityElement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="unique" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
diff --git a/codegen/org.eclipse.papyrusrt.xtumlrt.common.model/model/common.genmodel b/codegen/org.eclipse.papyrusrt.xtumlrt.common.model/model/common.genmodel
index e215d09..0fd6a6c 100644
--- a/codegen/org.eclipse.papyrusrt.xtumlrt.common.model/model/common.genmodel
+++ b/codegen/org.eclipse.papyrusrt.xtumlrt.common.model/model/common.genmodel
@@ -94,6 +94,7 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference common.ecore#//Model/rootPackages"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference common.ecore#//Model/topEntities"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference common.ecore#//Model/topProtocols"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference common.ecore#//Model/topTypedefinitions"/>

     </genClasses>

     <genClasses ecoreClass="common.ecore#//MultiplicityElement">

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute common.ecore#//MultiplicityElement/unique"/>

diff --git a/codegen/org.eclipse.papyrusrt.xtumlrt.common.model/model/representations.aird b/codegen/org.eclipse.papyrusrt.xtumlrt.common.model/model/representations.aird
index e386536..5e3b1ec 100644
--- a/codegen/org.eclipse.papyrusrt.xtumlrt.common.model/model/representations.aird
+++ b/codegen/org.eclipse.papyrusrt.xtumlrt.common.model/model/representations.aird
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<viewpoint:DAnalysis xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style" xmi:id="_8PzooK3lEeSuH7f2GGufnw" selectedViews="_8dHr4K3lEeSuH7f2GGufnw _8fiGsK3lEeSuH7f2GGufnw _8fqCgK3lEeSuH7f2GGufnw _8hIpMK3lEeSuH7f2GGufnw" version="10.0.0.201412231738">
+<viewpoint:DAnalysis xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style" xmi:id="_8PzooK3lEeSuH7f2GGufnw" selectedViews="_8dHr4K3lEeSuH7f2GGufnw _8fiGsK3lEeSuH7f2GGufnw _8fqCgK3lEeSuH7f2GGufnw _8hIpMK3lEeSuH7f2GGufnw" version="10.0.10.201502231700">
   <models xmi:type="ecore:EPackage" href="common.ecore#/"/>
   <models xmi:type="ecore:EPackage" href="http://www.eclipse.org/emf/2002/Ecore#/"/>
   <models xmi:type="ecore:EPackage" href="structure.ecore#/"/>
@@ -223,6 +223,9 @@
           <children xmi:type="notation:Node" xmi:id="_McVvZK3rEeSuH7f2GGufnw" type="2003" element="_MZ9w0K3rEeSuH7f2GGufnw">
             <children xmi:type="notation:Node" xmi:id="_McWWcK3rEeSuH7f2GGufnw" type="5007"/>
             <children xmi:type="notation:Node" xmi:id="_McWWca3rEeSuH7f2GGufnw" type="7004">
+              <children xmi:type="notation:Node" xmi:id="_REeYgNyYEeSavKYvIj4uEg" type="3010" element="_RBTIsNyYEeSavKYvIj4uEg">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_REeYgdyYEeSavKYvIj4uEg"/>
+              </children>
               <children xmi:type="notation:Node" xmi:id="_REdxcNyYEeSavKYvIj4uEg" type="3010" element="_RBUW0NyYEeSavKYvIj4uEg">
                 <layoutConstraint xmi:type="notation:Location" xmi:id="_REdxcdyYEeSavKYvIj4uEg"/>
               </children>
@@ -230,9 +233,6 @@
                 <styles xmi:type="notation:FontStyle" xmi:id="_d_jxAsNUEeS2b7b-DU5jjw"/>
                 <layoutConstraint xmi:type="notation:Location" xmi:id="_Mcp4c63rEeSuH7f2GGufnw"/>
               </children>
-              <children xmi:type="notation:Node" xmi:id="_REeYgNyYEeSavKYvIj4uEg" type="3010" element="_RBTIsNyYEeSavKYvIj4uEg">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_REeYgdyYEeSavKYvIj4uEg"/>
-              </children>
               <children xmi:type="notation:Node" xmi:id="_Mcp4dK3rEeSuH7f2GGufnw" type="3010" element="_Ma5k9K3rEeSuH7f2GGufnw">
                 <styles xmi:type="notation:FontStyle" xmi:id="_d_jxA8NUEeS2b7b-DU5jjw"/>
                 <layoutConstraint xmi:type="notation:Location" xmi:id="_Mcp4da3rEeSuH7f2GGufnw"/>
@@ -2123,11 +2123,27 @@
             <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RFXwYNyYEeSavKYvIj4uEg" id="(0.5,0.5)"/>
             <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RFXwYdyYEeSavKYvIj4uEg" id="(0.5,0.5)"/>
           </edges>
+          <edges xmi:type="notation:Edge" xmi:id="_oam2kPW0EeScDf7MYTU8VA" type="4001" element="_oYkPMPW0EeScDf7MYTU8VA" source="_Q3wtYLhVEeSH9PQiHQ6eWw" target="_VYagALhTEeSH9PQiHQ6eWw">
+            <children xmi:type="notation:Node" xmi:id="_obAfMPW0EeScDf7MYTU8VA" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_obAfMfW0EeScDf7MYTU8VA" y="-10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_obCUYPW0EeScDf7MYTU8VA" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_obCUYfW0EeScDf7MYTU8VA" y="10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_obC7cPW0EeScDf7MYTU8VA" type="6003">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_obC7cfW0EeScDf7MYTU8VA" y="10"/>
+            </children>
+            <styles xmi:type="notation:ConnectorStyle" xmi:id="_oam2kfW0EeScDf7MYTU8VA" routing="Rectilinear"/>
+            <styles xmi:type="notation:FontStyle" xmi:id="_oam2kvW0EeScDf7MYTU8VA" fontColor="7490599" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/>
+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oam2k_W0EeScDf7MYTU8VA" points="[0, 18, 251, -189]$[-289, 18, -38, -189]$[-289, 181, -38, -26]"/>
+            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_obHz8PW0EeScDf7MYTU8VA" id="(0.0,0.5454545454545454)"/>
+            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_obHz8fW0EeScDf7MYTU8VA" id="(1.0,0.2727272727272727)"/>
+          </edges>
         </data>
       </ownedAnnotationEntries>
       <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_MbHAUK3rEeSuH7f2GGufnw" source="DANNOTATION_CUSTOMIZATION_KEY">
         <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_MbHAUa3rEeSuH7f2GGufnw">
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F1r8kM2JEeSBhbbM5x_3mA" sizeComputationExpression="1" routingStyle="manhattan">
+          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F1r8kM2JEeSBhbbM5x_3mA" routingStyle="manhattan">
             <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F1r8kc2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false" labelExpression="service:render">
               <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -2136,25 +2152,7 @@
               <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
             </endLabelStyleDescription>
           </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F1u_4M2JEeSBhbbM5x_3mA" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F1u_4c2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F1u_4s2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F1xcIM2JEeSBhbbM5x_3mA" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F1xcIc2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F1xcIs2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
+          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
             <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F1zRUc2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
               <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -2163,97 +2161,7 @@
               <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
             </endLabelStyleDescription>
           </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F11GgM2JEeSBhbbM5x_3mA" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F11Ggc2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F11Ggs2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F127sM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F127sc2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F127ss2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F14w4M2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F14w4c2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F14w4s2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F15_AM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F15_Ac2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F15_As2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F170MM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F170Mc2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F170Ms2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F19pYM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F19pYc2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F19pYs2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2AFoM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2AFoc2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2AFos2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2B60M2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2B60c2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2B60s2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2DwAM2JEeSBhbbM5x_3mA" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2DwAc2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2DwAs2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2FlMM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2FlMc2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2FlMs2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2HaYM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
+          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2HaYM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
             <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2HaYc2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false" labelExpression="service:render">
               <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -2262,61 +2170,7 @@
               <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
             </endLabelStyleDescription>
           </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2JPkM2JEeSBhbbM5x_3mA" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2JPkc2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2JPks2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2Lr0M2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2Lr0c2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2Lr0s2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2M58M2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2M58c2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2M58s2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2OIEM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2OIEc2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2OIEs2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2QkUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2QkUc2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2QkUs2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2RycM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2Rycc2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2Rycs2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2SZgM2JEeSBhbbM5x_3mA" sizeComputationExpression="1" routingStyle="manhattan">
+          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2SZgM2JEeSBhbbM5x_3mA" routingStyle="manhattan">
             <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2SZgc2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
               <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
@@ -2325,627 +2179,6 @@
               <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
             </endLabelStyleDescription>
           </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2TnoM2JEeSBhbbM5x_3mA" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2Tnoc2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2Tnos2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2Vc0M2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2Vc0c2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2Vc0s2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2Wq8M2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2Wq8c2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2Wq8s2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2YgIM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2YgIc2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2YgIs2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2ZuQM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2ZuQc2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2ZuQs2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2a8YM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2a8Yc2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2a8Ys2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2cKgM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2cKgc2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2cKgs2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2dYoM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2dYoc2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2dYos2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2emwM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2emwc2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2emws2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2f04M2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2f04c2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2f04s2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2hDAM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2hDAc2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2hDAs2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2iRIM2JEeSBhbbM5x_3mA" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2iRIc2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2iRIs2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2jfQM2JEeSBhbbM5x_3mA" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2jfQc2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2jfQs2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2kGUM2JEeSBhbbM5x_3mA" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2kGUc2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2kGUs2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2lUcM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2lUcc2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2lUcs2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2nJoM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2nJoc2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2nJos2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2o-0M2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2o-0c2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2o-0s2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2qM8M2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2qM8c2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2qM8s2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2rbEM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2rbEc2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2rbEs2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2spMM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2spMc2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2spMs2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2w6oM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2w6oc2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2w6os2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2yIwM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2yIwc2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2yIws2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F2zW4M2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F2zW4c2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F2zW4s2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F21MEM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F21MEc2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F21MEs2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_F22aMM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_F22aMc2JEeSBhbbM5x_3mA" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_F22aMs2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_RCrowdyYEeSavKYvIj4uEg" sourceArrow="FillDiamond" sizeComputationExpression="1" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_RCrowtyYEeSavKYvIj4uEg" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_RCrow9yYEeSavKYvIj4uEg" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <cache xmi:type="diagram:DiagramElementMapping2ModelElement" xmi:id="_MbHAUq3rEeSuH7f2GGufnw">
-            <key xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_DHgMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Attribute/type"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_DHgcGsEeS6WJHyXZkBTg" key="_MbGZRq3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_DHhcGsEeS6WJHyXZkBTg" value="_F1r8kM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_EVoMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//CapsulePart/type"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_EVocGsEeS6WJHyXZkBTg" key="_MbHnZq3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_EVpcGsEeS6WJHyXZkBTg" value="_F1u_4M2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_E8sMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//OperationSignature/returnType"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_E8scGsEeS6WJHyXZkBTg" key="_MbI1hq3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_E8tcGsEeS6WJHyXZkBTg" value="_F1xcIM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_FjwMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//OperationSignature/parameters"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_FjwcGsEeS6WJHyXZkBTg" key="_MbKDoK3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_FjxcGsEeS6WJHyXZkBTg" value="_F1zRUM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_Gx4MGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Port/type"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_Gx4cGsEeS6WJHyXZkBTg" key="_MbKqsK3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_Gx5cGsEeS6WJHyXZkBTg" value="_F11GgM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_HY8MGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Entity/attributes"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_HY8cGsEeS6WJHyXZkBTg" key="_MbLRxq3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_HY9cGsEeS6WJHyXZkBTg" value="_F127sM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_IAAMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Entity/operations"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_IAAcGsEeS6WJHyXZkBTg" key="_MbL43K3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_IABcGsEeS6WJHyXZkBTg" value="_F14w4M2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_InFcGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Entity/behaviour"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_JOIMGsEeS6WJHyXZkBTg" key="_MbNG8K3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_JOJMGsEeS6WJHyXZkBTg" value="_F15_AM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_J1MMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Protocol/protocolBehaviourFeatures"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_J1McGsEeS6WJHyXZkBTg" key="_MbNuAK3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_J1NcGsEeS6WJHyXZkBTg" value="_F170MM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_LDUMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Capsule/parts"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_LDUcGsEeS6WJHyXZkBTg" key="_MbOVF63rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_LDVcGsEeS6WJHyXZkBTg" value="_F19pYM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_LqYMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Capsule/ports"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_LqYcGsEeS6WJHyXZkBTg" key="_MbO8LK3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_LqZcGsEeS6WJHyXZkBTg" value="_F2AFoM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_MRcMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Capsule/connectors"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_MRccGsEeS6WJHyXZkBTg" key="_MbPjPK3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_M4gsGsEeS6WJHyXZkBTg" value="_F2B60M2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_NfkMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Parameter/type"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_NfkcGsEeS6WJHyXZkBTg" key="_MbQKTK3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_NflcGsEeS6WJHyXZkBTg" value="_F2DwAM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_OGoMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Signal/parameters"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_OGocGsEeS6WJHyXZkBTg" key="_MbQxXK3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_OGpcGsEeS6WJHyXZkBTg" value="_F2FlMM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_PUwMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Connector/ends"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_PUwcGsEeS6WJHyXZkBTg" key="_MbRYbK3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_PUxcGsEeS6WJHyXZkBTg" value="_F2HaYM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_P70MGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//ConnectorEnd/role"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_P70cGsEeS6WJHyXZkBTg" key="_MbSmgK3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_Qi48GsEeS6WJHyXZkBTg" value="_F2JPkM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_RJ8MGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Package/protocols"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_RxAMGsEeS6WJHyXZkBTg" key="_MbVCyq3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_RxBMGsEeS6WJHyXZkBTg" value="_F2Lr0M2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_SYEMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Package/entities"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_SYEcGsEeS6WJHyXZkBTg" key="_HzYAYLCBEeS2zc2JFFVtPw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_SYFcGsEeS6WJHyXZkBTg" value="_F2M58M2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_TmMMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Package/typedefinitions"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_TmMcGsEeS6WJHyXZkBTg" key="_VYOSwLhTEeSH9PQiHQ6eWw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_TmNcGsEeS6WJHyXZkBTg" value="_F2OIEM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_U0UMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Operation/body"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_U0UcGsEeS6WJHyXZkBTg" key="_MbWQ4K3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_VbY8GsEeS6WJHyXZkBTg" value="_F2QkUM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_WCcMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//StateMachine/top"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_WCccGsEeS6WJHyXZkBTg" key="_MbW3963rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_WCdcGsEeS6WJHyXZkBTg" value="_F2RycM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_WpgMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Vertex/incomingTransitions"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_WpgcGsEeS6WJHyXZkBTg" key="_MbYGEK3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_XQk8GsEeS6WJHyXZkBTg" value="_F2SZgM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_X3oMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Vertex/outgoingTransitions"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_X3ocGsEeS6WJHyXZkBTg" key="_MbYtIK3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_X3pcGsEeS6WJHyXZkBTg" value="_F2TnoM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_YesMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//State/entryAction"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_YescGsEeS6WJHyXZkBTg" key="_MbZUMK3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_YetcGsEeS6WJHyXZkBTg" value="_F2Vc0M2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_Zs0MGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//State/exitAction"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_Zs0cGsEeS6WJHyXZkBTg" key="_MbZ7S63rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_aT4MGsEeS6WJHyXZkBTg" value="_F2Wq8M2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_a68MGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//State/exitPoints"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_a68cGsEeS6WJHyXZkBTg" key="_MbbJYK3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_a69cGsEeS6WJHyXZkBTg" value="_F2YgIM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_cJEMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//State/entryPoints"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_cJEcGsEeS6WJHyXZkBTg" key="_MbbwcK3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_cJFcGsEeS6WJHyXZkBTg" value="_F2ZuQM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_cwIMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//CompositeState/initial"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_cwIcGsEeS6WJHyXZkBTg" key="_MbcXh63rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_cwJcGsEeS6WJHyXZkBTg" value="_F2a8YM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_dXMMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//CompositeState/deepHistory"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_dXMcGsEeS6WJHyXZkBTg" key="_MbdloK3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_dXNcGsEeS6WJHyXZkBTg" value="_F2cKgM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_elUMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//CompositeState/junctionPoints"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_elUcGsEeS6WJHyXZkBTg" key="_MbeMtq3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_elVcGsEeS6WJHyXZkBTg" value="_F2dYoM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_fMYMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//CompositeState/choicePoints"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_fMYcGsEeS6WJHyXZkBTg" key="_Mbfa0K3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_fMZcGsEeS6WJHyXZkBTg" value="_F2emwM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_fzcMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//CompositeState/substates"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_gagMGsEeS6WJHyXZkBTg" key="_Mbgo8K3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_gahMGsEeS6WJHyXZkBTg" value="_F2f04M2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_hBkMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//CompositeState/transitions"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_hBkcGsEeS6WJHyXZkBTg" key="_MbhQDK3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_hBlcGsEeS6WJHyXZkBTg" value="_F2hDAM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_hooMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//CompositeState/vertices"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_hoocGsEeS6WJHyXZkBTg" key="_ouqgQLCCEeS2zc2JFFVtPw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_hopcGsEeS6WJHyXZkBTg" value="_F2iRIM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_i2wMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Transition/sourceVertex"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_i2wcGsEeS6WJHyXZkBTg" key="_MbieIK3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_jd08GsEeS6WJHyXZkBTg" value="_F2jfQM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_kE4MGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Transition/targetVertex"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_kE4cGsEeS6WJHyXZkBTg" key="_MbjFOq3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_kE5cGsEeS6WJHyXZkBTg" value="_F2kGUM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_kr8MGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Transition/triggers"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_lTAMGsEeS6WJHyXZkBTg" key="_MbkTUK3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_lTBMGsEeS6WJHyXZkBTg" value="_F2lUcM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_l6EMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Transition/guard"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_l6EcGsEeS6WJHyXZkBTg" key="_MblhcK3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_l6FcGsEeS6WJHyXZkBTg" value="_F2nJoM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_mhIMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Transition/actionChain"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_mhIcGsEeS6WJHyXZkBTg" key="_MbmvkK3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_mhJcGsEeS6WJHyXZkBTg" value="_F2o-0M2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_nvQMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Guard/body"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_nvQcGsEeS6WJHyXZkBTg" key="_Mbn9sK3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_oWU8GsEeS6WJHyXZkBTg" value="_F2qM8M2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_o9YMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//ActionChain/actions"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_o9YcGsEeS6WJHyXZkBTg" key="_MbokzK3rEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_o9ZcGsEeS6WJHyXZkBTg" value="_F2rbEM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_qLgMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//StructType/structMembers"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_qLgcGsEeS6WJHyXZkBTg" key="_9cnOMLhSEeSH9PQiHQ6eWw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_qLhcGsEeS6WJHyXZkBTg" value="_F2spMM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_rZoMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Model/localScopeTemporaryTypes"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_rZocGsEeS6WJHyXZkBTg" key="_UCXoMLhVEeSH9PQiHQ6eWw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_rZpcGsEeS6WJHyXZkBTg" value="_F2w6oM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_sAsMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Model/rootPackages"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_sAscGsEeS6WJHyXZkBTg" key="_X9gBALhVEeSH9PQiHQ6eWw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_vEA8GsEeS6WJHyXZkBTg" value="_F2yIwM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_w5MMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Model/topEntities"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_w5McGsEeS6WJHyXZkBTg" key="_eGpJgLhVEeSH9PQiHQ6eWw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_w5NcGsEeS6WJHyXZkBTg" value="_F2zW4M2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_yHUMGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Model/topProtocols"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_yHUcGsEeS6WJHyXZkBTg" key="_TA7dUL0LEeSl6a8pTlra3w">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_yHVcGsEeS6WJHyXZkBTg" value="_F21MEM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_E_yuYcGsEeS6WJHyXZkBTg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Annotation/parameters"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_E_yuYsGsEeS6WJHyXZkBTg" key="_E_yuYMGsEeS6WJHyXZkBTg">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_E_yuZsGsEeS6WJHyXZkBTg" value="_F22aMM2JEeSBhbbM5x_3mA">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_RCrBsNyYEeSavKYvIj4uEg">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Package/packages"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_RCrowNyYEeSavKYvIj4uEg" key="_RCqaoNyYEeSavKYvIj4uEg">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_RCroxNyYEeSavKYvIj4uEg" value="_RCrowdyYEeSavKYvIj4uEg">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-          </cache>
         </data>
       </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_MZugQK3rEeSuH7f2GGufnw" name="RedefinableElement" tooltipText="" outgoingEdges="_MbFLIK3rEeSuH7f2GGufnw _VfLu8LkaEeS1iuOpNDUtkg" incomingEdges="_MbFLIK3rEeSuH7f2GGufnw _MbuEUK3rEeSuH7f2GGufnw _Yr4OkLCBEeS2zc2JFFVtPw _lGeuELCBEeS2zc2JFFVtPw _mC1ooLCBEeS2zc2JFFVtPw _n5tDoLCBEeS2zc2JFFVtPw _qj0ggLCBEeS2zc2JFFVtPw _sC8J4LCBEeS2zc2JFFVtPw" width="12" height="10">
@@ -2954,12 +2187,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZvHUK3rEeSuH7f2GGufnw" labelFormat="italic" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZvHUa3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZvHUK3rEeSuH7f2GGufnw" labelFormat="italic" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZvHUq3rEeSuH7f2GGufnw" red="125" green="125" blue="125"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZvHU63rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZvHVK3rEeSuH7f2GGufnw" red="228" green="228" blue="228"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -2969,12 +2198,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_XjQA4L0qEeSQw4jKJk8vcg" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_XjQA4b0qEeSQw4jKJk8vcg"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_XjQA4L0qEeSQw4jKJk8vcg" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_XjQA4r0qEeSQw4jKJk8vcg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_XjQA470qEeSQw4jKJk8vcg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_XjQA5L0qEeSQw4jKJk8vcg" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -2984,22 +2209,15 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_JARdgLxXEeSl6a8pTlra3w" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_JARdgbxXEeSl6a8pTlra3w"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_JARdgLxXEeSl6a8pTlra3w" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_JARdgrxXEeSl6a8pTlra3w"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_JARdg7xXEeSl6a8pTlra3w" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_JARdhLxXEeSl6a8pTlra3w" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_MazeUK3rEeSuH7f2GGufnw" name="visibility : VisibilityKind = PUBLIC" tooltipText="">
+        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_MazeUK3rEeSuH7f2GGufnw" name="Invalid feature as name" tooltipText="">
           <target xmi:type="ecore:EAttribute" href="common.ecore#//Attribute/visibility"/>
           <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//Attribute/visibility"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Ma0FYK3rEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma0FYa3rEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma0FYq3rEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Ma0FY63rEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
@@ -3007,10 +2225,7 @@
           <target xmi:type="ecore:EAttribute" href="common.ecore#//Attribute/default"/>
           <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//Attribute/default"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_JApQ8LxXEeSl6a8pTlra3w" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_JApQ8bxXEeSl6a8pTlra3w"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_JApQ8rxXEeSl6a8pTlra3w"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_JApQ87xXEeSl6a8pTlra3w"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
@@ -3018,36 +2233,26 @@
           <target xmi:type="ecore:EAttribute" href="common.ecore#//Attribute/static"/>
           <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//Attribute/static"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_GfHikL0LEeSl6a8pTlra3w" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_GfHikb0LEeSl6a8pTlra3w"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_GfHikr0LEeSl6a8pTlra3w"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_GfHik70LEeSl6a8pTlra3w"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_MZw8ha3rEeSuH7f2GGufnw" name="VisibilityKind" tooltipText="">
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_MZw8ha3rEeSuH7f2GGufnw" name="VisibilityKind" tooltipText="" width="12" height="10">
         <target xmi:type="ecore:EEnum" href="common.ecore#//VisibilityKind"/>
         <semanticElements xmi:type="ecore:EEnum" href="common.ecore#//VisibilityKind"/>
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZyKoK3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZyKoa3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZyKoK3rEeSuH7f2GGufnw" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZyKoq3rEeSuH7f2GGufnw" red="125" green="125" blue="125"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZyKo63rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZyKpK3rEeSuH7f2GGufnw" red="221" green="236" blue="202"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"/>
         <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_Ma92YK3rEeSuH7f2GGufnw" name="PUBLIC" tooltipText="">
           <target xmi:type="ecore:EEnumLiteral" href="common.ecore#//VisibilityKind/PUBLIC"/>
           <semanticElements xmi:type="ecore:EEnumLiteral" href="common.ecore#//VisibilityKind/PUBLIC"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Ma92Ya3rEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma92Yq3rEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma92Y63rEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Ma92ZK3rEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
         </ownedElements>
@@ -3055,10 +2260,7 @@
           <target xmi:type="ecore:EEnumLiteral" href="common.ecore#//VisibilityKind/PROTECTED"/>
           <semanticElements xmi:type="ecore:EEnumLiteral" href="common.ecore#//VisibilityKind/PROTECTED"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Ma-dca3rEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma-dcq3rEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma-dc63rEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Ma-ddK3rEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
         </ownedElements>
@@ -3066,10 +2268,7 @@
           <target xmi:type="ecore:EEnumLiteral" href="common.ecore#//VisibilityKind/PRIVATE"/>
           <semanticElements xmi:type="ecore:EEnumLiteral" href="common.ecore#//VisibilityKind/PRIVATE"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Ma-ddq3rEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma-dd63rEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma-deK3rEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Ma-dea3rEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
         </ownedElements>
@@ -3080,22 +2279,15 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZyxsK3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZyxsa3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZyxsK3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZyxsq3rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZyxs63rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZyxtK3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_Ma0scK3rEeSuH7f2GGufnw" name="kind : CapsuleKind = FIXED" tooltipText="">
+        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_Ma0scK3rEeSuH7f2GGufnw" name="Invalid feature as name" tooltipText="">
           <target xmi:type="ecore:EAttribute" href="common.ecore#//CapsulePart/kind"/>
           <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//CapsulePart/kind"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Ma0sca3rEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma0scq3rEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma0sc63rEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Ma0sdK3rEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
@@ -3106,12 +2298,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZzYwa3rEeSuH7f2GGufnw" labelFormat="italic" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_interface.gif" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZzYwq3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZzYwa3rEeSuH7f2GGufnw" labelFormat="italic" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_interface.gif" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.0/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZzYw63rEeSuH7f2GGufnw" red="125" green="125" blue="125"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZzYxK3rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZzYxa3rEeSuH7f2GGufnw" red="228" green="228" blue="228"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -3121,22 +2309,15 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_5Z_FILxWEeSl6a8pTlra3w" labelFormat="italic" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_5Z_FIbxWEeSl6a8pTlra3w"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_5Z_FILxWEeSl6a8pTlra3w" labelFormat="italic" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_5Z_FIrxWEeSl6a8pTlra3w" red="125" green="125" blue="125"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_5Z_FI7xWEeSl6a8pTlra3w" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_5Z_FJLxWEeSl6a8pTlra3w" red="228" green="228" blue="228"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_utcGILuWEeSl6a8pTlra3w" name="visibility : VisibilityKind = PUBLIC" tooltipText="">
+        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_utcGILuWEeSl6a8pTlra3w" name="Invalid feature as name" tooltipText="">
           <target xmi:type="ecore:EAttribute" href="common.ecore#//OperationSignature/visibility"/>
           <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//OperationSignature/visibility"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_utdUQLuWEeSl6a8pTlra3w" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_utdUQbuWEeSl6a8pTlra3w"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_utdUQruWEeSl6a8pTlra3w"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_utdUQ7uWEeSl6a8pTlra3w"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
@@ -3144,10 +2325,7 @@
           <target xmi:type="ecore:EAttribute" href="common.ecore#//OperationSignature/static"/>
           <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//OperationSignature/static"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_5aW4kLxWEeSl6a8pTlra3w" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_5aW4kbxWEeSl6a8pTlra3w"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_5aW4krxWEeSl6a8pTlra3w"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_5aW4k7xWEeSl6a8pTlra3w"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
@@ -3158,33 +2336,23 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZ0m4a3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ0m4q3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZ0m4a3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ0m463rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ0m5K3rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ0m5a3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
         <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_Ma16kK3rEeSuH7f2GGufnw" name="conjugate : EBoolean = false" tooltipText="">
           <target xmi:type="ecore:EAttribute" href="common.ecore#//Port/conjugate"/>
           <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//Port/conjugate"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Ma16ka3rEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma16kq3rEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma16k63rEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Ma16lK3rEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_RBLM4NyYEeSavKYvIj4uEg" name="visibility : VisibilityKind = PUBLIC" tooltipText="">
+        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_RBLM4NyYEeSavKYvIj4uEg" name="Invalid feature as name" tooltipText="">
           <target xmi:type="ecore:EAttribute" href="common.ecore#//Port/visibility"/>
           <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//Port/visibility"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_RBNCENyYEeSavKYvIj4uEg" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_RBNCEdyYEeSavKYvIj4uEg"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_RBNCEtyYEeSavKYvIj4uEg"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_RBNCE9yYEeSavKYvIj4uEg"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
@@ -3195,12 +2363,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZ11AK3rEeSuH7f2GGufnw" labelFormat="italic" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ11Aa3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZ11AK3rEeSuH7f2GGufnw" labelFormat="italic" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ11Aq3rEeSuH7f2GGufnw" red="125" green="125" blue="125"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ11A63rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ11BK3rEeSuH7f2GGufnw" red="228" green="228" blue="228"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -3210,12 +2374,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZ2cEK3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ2cEa3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZ2cEK3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ2cEq3rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ2cE63rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ2cFK3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -3225,12 +2385,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZ3qMK3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ3qMa3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZ3qMK3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ3qMq3rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ3qM63rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ3qNK3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -3240,22 +2396,15 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZ44UK3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ44Ua3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZ44UK3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ44Uq3rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ44U63rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ44VK3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_Ma2hpK3rEeSuH7f2GGufnw" name="direction : DirectionKind = IN" tooltipText="">
+        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_Ma2hpK3rEeSuH7f2GGufnw" name="Invalid feature as name" tooltipText="">
           <target xmi:type="ecore:EAttribute" href="common.ecore#//Parameter/direction"/>
           <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//Parameter/direction"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Ma3IsK3rEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma3Isa3rEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma3Isq3rEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Ma3Is63rEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
@@ -3266,37 +2415,26 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZ6GcK3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ6Gca3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZ6GcK3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ6Gcq3rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ6Gc63rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ6GdK3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_MZ7UkK3rEeSuH7f2GGufnw" name="CapsuleKind" tooltipText="">
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_MZ7UkK3rEeSuH7f2GGufnw" name="CapsuleKind" tooltipText="" width="12" height="10">
         <target xmi:type="ecore:EEnum" href="common.ecore#//CapsuleKind"/>
         <semanticElements xmi:type="ecore:EEnum" href="common.ecore#//CapsuleKind"/>
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZ7Uka3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ7Ukq3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZ7Uka3rEeSuH7f2GGufnw" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ7Uk63rEeSuH7f2GGufnw" red="125" green="125" blue="125"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ7UlK3rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ7Ula3rEeSuH7f2GGufnw" red="221" green="236" blue="202"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"/>
         <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_Ma_EgK3rEeSuH7f2GGufnw" name="FIXED" tooltipText="">
           <target xmi:type="ecore:EEnumLiteral" href="common.ecore#//CapsuleKind/FIXED"/>
           <semanticElements xmi:type="ecore:EEnumLiteral" href="common.ecore#//CapsuleKind/FIXED"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Ma_Ega3rEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma_Egq3rEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma_Eg63rEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Ma_EhK3rEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
         </ownedElements>
@@ -3304,10 +2442,7 @@
           <target xmi:type="ecore:EEnumLiteral" href="common.ecore#//CapsuleKind/OPTIONAL"/>
           <semanticElements xmi:type="ecore:EEnumLiteral" href="common.ecore#//CapsuleKind/OPTIONAL"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Ma_rka3rEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma_rkq3rEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma_rk63rEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Ma_rlK3rEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
         </ownedElements>
@@ -3315,10 +2450,7 @@
           <target xmi:type="ecore:EEnumLiteral" href="common.ecore#//CapsuleKind/PLUGIN"/>
           <semanticElements xmi:type="ecore:EEnumLiteral" href="common.ecore#//CapsuleKind/PLUGIN"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Ma_rlq3rEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma_rl63rEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma_rmK3rEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Ma_rma3rEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
         </ownedElements>
@@ -3329,12 +2461,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZ77oa3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ77oq3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZ77oa3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ77o63rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ77pK3rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ77pa3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -3344,12 +2472,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZ8isa3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ8isq3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZ8isa3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ8is63rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ8itK3rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ8ita3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -3359,12 +2483,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZ9Jwa3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ9Jwq3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZ9Jwa3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ9Jw63rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ9JxK3rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ9Jxa3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -3374,81 +2494,58 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZ-X4K3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ-X4a3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZ-X4K3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ-X4q3rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ-X463rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ-X5K3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_RBUW0NyYEeSavKYvIj4uEg" name="ordered : EBoolean = false" tooltipText="">
-          <target xmi:type="ecore:EAttribute" href="common.ecore#//MultiplicityElement/ordered"/>
-          <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//MultiplicityElement/ordered"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_RBU94NyYEeSavKYvIj4uEg" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_RBU94dyYEeSavKYvIj4uEg"/>
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_RBU94tyYEeSavKYvIj4uEg"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_RBU949yYEeSavKYvIj4uEg"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-        </ownedElements>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_Ma495K3rEeSuH7f2GGufnw" name="lowerBound : EInt = 0" tooltipText="">
-          <target xmi:type="ecore:EAttribute" href="common.ecore#//MultiplicityElement/lowerBound"/>
-          <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//MultiplicityElement/lowerBound"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Ma5k8K3rEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma5k8a3rEeSuH7f2GGufnw"/>
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma5k8q3rEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Ma5k863rEeSuH7f2GGufnw"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-        </ownedElements>
         <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_RBTIsNyYEeSavKYvIj4uEg" name="unique : EBoolean = false" tooltipText="">
           <target xmi:type="ecore:EAttribute" href="common.ecore#//MultiplicityElement/unique"/>
           <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//MultiplicityElement/unique"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_RBTvwNyYEeSavKYvIj4uEg" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_RBTvwdyYEeSavKYvIj4uEg"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_RBTvwtyYEeSavKYvIj4uEg"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_RBTvw9yYEeSavKYvIj4uEg"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_Ma5k9K3rEeSuH7f2GGufnw" name="upperBound : EInt = 0" tooltipText="">
+        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_RBUW0NyYEeSavKYvIj4uEg" name="ordered : EBoolean = false" tooltipText="">
+          <target xmi:type="ecore:EAttribute" href="common.ecore#//MultiplicityElement/ordered"/>
+          <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//MultiplicityElement/ordered"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_RBU94NyYEeSavKYvIj4uEg" labelAlignment="LEFT">
+            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+          </ownedStyle>
+          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+        </ownedElements>
+        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_Ma495K3rEeSuH7f2GGufnw" name="lowerBound : EInt = " tooltipText="">
+          <target xmi:type="ecore:EAttribute" href="common.ecore#//MultiplicityElement/lowerBound"/>
+          <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//MultiplicityElement/lowerBound"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Ma5k8K3rEeSuH7f2GGufnw" labelAlignment="LEFT">
+            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+          </ownedStyle>
+          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+        </ownedElements>
+        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_Ma5k9K3rEeSuH7f2GGufnw" name="upperBound : EInt = " tooltipText="">
           <target xmi:type="ecore:EAttribute" href="common.ecore#//MultiplicityElement/upperBound"/>
           <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//MultiplicityElement/upperBound"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Ma5k9a3rEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma5k9q3rEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma5k963rEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Ma5k-K3rEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_MZ-X5a3rEeSuH7f2GGufnw" name="DirectionKind" tooltipText="">
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_MZ-X5a3rEeSuH7f2GGufnw" name="DirectionKind" tooltipText="" width="12" height="10">
         <target xmi:type="ecore:EEnum" href="common.ecore#//DirectionKind"/>
         <semanticElements xmi:type="ecore:EEnum" href="common.ecore#//DirectionKind"/>
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZ-X5q3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ-X563rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZ-X5q3rEeSuH7f2GGufnw" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ-X6K3rEeSuH7f2GGufnw" red="125" green="125" blue="125"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ-X6a3rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ-X6q3rEeSuH7f2GGufnw" red="221" green="236" blue="202"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"/>
         <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_MbASoK3rEeSuH7f2GGufnw" name="IN" tooltipText="">
           <target xmi:type="ecore:EEnumLiteral" href="common.ecore#//DirectionKind/IN"/>
           <semanticElements xmi:type="ecore:EEnumLiteral" href="common.ecore#//DirectionKind/IN"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MbASoa3rEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MbASoq3rEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MbASo63rEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_MbASpK3rEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
         </ownedElements>
@@ -3456,10 +2553,7 @@
           <target xmi:type="ecore:EEnumLiteral" href="common.ecore#//DirectionKind/OUT"/>
           <semanticElements xmi:type="ecore:EEnumLiteral" href="common.ecore#//DirectionKind/OUT"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MbA5sa3rEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MbA5sq3rEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MbA5s63rEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_MbA5tK3rEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
         </ownedElements>
@@ -3467,10 +2561,7 @@
           <target xmi:type="ecore:EEnumLiteral" href="common.ecore#//DirectionKind/IN_OUT"/>
           <semanticElements xmi:type="ecore:EEnumLiteral" href="common.ecore#//DirectionKind/IN_OUT"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MbA5tq3rEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MbA5t63rEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MbA5uK3rEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_MbA5ua3rEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
         </ownedElements>
@@ -3481,22 +2572,15 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZ--8a3rEeSuH7f2GGufnw" labelFormat="italic" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ--8q3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MZ--8a3rEeSuH7f2GGufnw" labelFormat="italic" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ--863rEeSuH7f2GGufnw" red="125" green="125" blue="125"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ--9K3rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MZ--9a3rEeSuH7f2GGufnw" red="228" green="228" blue="228"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
         <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_Ma6MAK3rEeSuH7f2GGufnw" name="kind : ProtocolBehaviourFeatureKind = IN" tooltipText="">
           <target xmi:type="ecore:EAttribute" href="common.ecore#//ProtocolBehaviourFeature/kind"/>
           <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//ProtocolBehaviourFeature/kind"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Ma6MAa3rEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma6MAq3rEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma6MA63rEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Ma6MBK3rEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
@@ -3507,37 +2591,26 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaANEK3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaANEa3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaANEK3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaANEq3rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaANE63rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaANFK3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_MaA0IK3rEeSuH7f2GGufnw" name="ProtocolBehaviourFeatureKind" tooltipText="">
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_MaA0IK3rEeSuH7f2GGufnw" name="ProtocolBehaviourFeatureKind" tooltipText="" width="12" height="10">
         <target xmi:type="ecore:EEnum" href="common.ecore#//ProtocolBehaviourFeatureKind"/>
         <semanticElements xmi:type="ecore:EEnum" href="common.ecore#//ProtocolBehaviourFeatureKind"/>
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaA0Ia3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaA0Iq3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaA0Ia3rEeSuH7f2GGufnw" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaA0I63rEeSuH7f2GGufnw" red="125" green="125" blue="125"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaA0JK3rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaA0Ja3rEeSuH7f2GGufnw" red="221" green="236" blue="202"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"/>
         <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_MbBgwK3rEeSuH7f2GGufnw" name="IN" tooltipText="">
           <target xmi:type="ecore:EEnumLiteral" href="common.ecore#//ProtocolBehaviourFeatureKind/IN"/>
           <semanticElements xmi:type="ecore:EEnumLiteral" href="common.ecore#//ProtocolBehaviourFeatureKind/IN"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MbBgwa3rEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MbBgwq3rEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MbBgw63rEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_MbBgxK3rEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
         </ownedElements>
@@ -3545,10 +2618,7 @@
           <target xmi:type="ecore:EEnumLiteral" href="common.ecore#//ProtocolBehaviourFeatureKind/OUT"/>
           <semanticElements xmi:type="ecore:EEnumLiteral" href="common.ecore#//ProtocolBehaviourFeatureKind/OUT"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MbBgxq3rEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MbBgx63rEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MbBgyK3rEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_MbBgya3rEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
         </ownedElements>
@@ -3556,10 +2626,7 @@
           <target xmi:type="ecore:EEnumLiteral" href="common.ecore#//ProtocolBehaviourFeatureKind/INOUT"/>
           <semanticElements xmi:type="ecore:EEnumLiteral" href="common.ecore#//ProtocolBehaviourFeatureKind/INOUT"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MbCH0a3rEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MbCH0q3rEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MbCH063rEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_MbCH1K3rEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
         </ownedElements>
@@ -3570,12 +2637,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaCCQK3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaCCQa3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaCCQK3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaCCQq3rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaCCQ63rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaCCRK3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -3585,12 +2648,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaCpUa3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaDQYK3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaCpUa3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaDQYa3rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaDQYq3rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaDQY63rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -3600,12 +2659,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaD3cK3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaD3ca3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaD3cK3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaD3cq3rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaD3c63rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaD3dK3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -3615,12 +2670,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaEega3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaEegq3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaEega3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaEeg63rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaEehK3rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaFFkK3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -3630,12 +2681,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaFsoK3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaFsoa3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaFsoK3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaFsoq3rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaFso63rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaFspK3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -3645,12 +2692,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaG6wK3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaG6wa3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaG6wK3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaG6wq3rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaG6w63rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaG6xK3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -3660,12 +2703,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaHh0a3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaHh0q3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaHh0a3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaHh063rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaHh1K3rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaHh1a3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -3675,12 +2714,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaJXAK3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaJXAa3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaJXAK3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaJXAq3rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaJXA63rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaJXBK3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -3690,12 +2725,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaJ-Ea3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaJ-Eq3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaJ-Ea3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaJ-E63rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaJ-FK3rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaJ-Fa3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -3705,12 +2736,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaLMMa3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaLMMq3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaLMMa3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaLMM63rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaLMNK3rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaLMNa3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -3720,12 +2747,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaMaUK3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaMaUa3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaMaUK3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaMaUq3rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaMaU63rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaMaVK3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -3735,12 +2758,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaNocK3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaNoca3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaNocK3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaNocq3rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaNoc63rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaNodK3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -3750,12 +2769,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaOPgK3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaOPga3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaOPgK3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaOPgq3rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaOPg63rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaOPhK3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -3765,12 +2780,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaO2ka3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaO2kq3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaO2ka3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaO2k63rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaO2lK3rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaO2la3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -3780,12 +2791,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaQEsK3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaQEsa3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaQEsK3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaQEsq3rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaQEs63rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaQEtK3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -3795,12 +2802,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaQrwa3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaQrwq3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaQrwa3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaQrw63rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaQrxK3rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaQrxa3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -3810,22 +2813,15 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaR54K3rEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MaR54a3rEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MaR54K3rEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_MaR54q3rEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaR5463rEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_MaR55K3rEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
         <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_Ma8BMK3rEeSuH7f2GGufnw" name="source : EString" tooltipText="">
           <target xmi:type="ecore:EAttribute" href="common.ecore#//ActionCode/source"/>
           <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//ActionCode/source"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Ma8BMa3rEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma8BMq3rEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Ma8BM63rEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Ma8BNK3rEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
@@ -3833,16 +2829,13 @@
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbFLIK3rEeSuH7f2GGufnw" name="[0..1] redefines" sourceNode="_MZugQK3rEeSuH7f2GGufnw" targetNode="_MZugQK3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//RedefinableElement/redefines"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//RedefinableElement/redefines"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_MbGZQK3rEeSuH7f2GGufnw" routingStyle="manhattan">
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_MbGZQK3rEeSuH7f2GGufnw" routingStyle="manhattan" strokeColor="0,0,0">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_MbGZQa3rEeSuH7f2GGufnw"/>
           <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_MbGZQq3rEeSuH7f2GGufnw" showIcon="false">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MbGZQ63rEeSuH7f2GGufnw"/>
           </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_MbGZRK3rEeSuH7f2GGufnw" showIcon="false">
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_MbGZRK3rEeSuH7f2GGufnw" showIcon="false" labelColor="39,76,114">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MbGZRa3rEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
           </endLabelStyle>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
@@ -3850,550 +2843,360 @@
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbGZRq3rEeSuH7f2GGufnw" name="[1..1] type" sourceNode="_MZwVda3rEeSuH7f2GGufnw" targetNode="_MZzYwK3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Attribute/type"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Attribute/type"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F1tKsM2JEeSBhbbM5x_3mA" description="_F1r8kM2JEeSBhbbM5x_3mA" routingStyle="manhattan">
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F1tKsM2JEeSBhbbM5x_3mA" description="_F1r8kM2JEeSBhbbM5x_3mA" routingStyle="manhattan" strokeColor="0,0,0">
           <customFeatures>routingStyle</customFeatures>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F1tKsc2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F1tKss2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F1tKs82JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F1tKtM2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F1tKtc2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F1tKss2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F1tKtM2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbHnZq3rEeSuH7f2GGufnw" name="[1..1] type" sourceNode="_MZyKpa3rEeSuH7f2GGufnw" targetNode="_MZ3DIK3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//CapsulePart/type"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//CapsulePart/type"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F1vm8M2JEeSBhbbM5x_3mA" description="_F1u_4M2JEeSBhbbM5x_3mA" routingStyle="manhattan">
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F1vm8M2JEeSBhbbM5x_3mA" description="_F1r8kM2JEeSBhbbM5x_3mA" routingStyle="manhattan" strokeColor="0,0,0">
           <customFeatures>routingStyle</customFeatures>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F1vm8c2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F1vm8s2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F1vm882JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F1vm9M2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F1vm9c2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F1vm8s2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F1vm9M2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbI1hq3rEeSuH7f2GGufnw" name="[1..1] returnType" sourceNode="_MZz_0K3rEeSuH7f2GGufnw" targetNode="_MZzYwK3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//OperationSignature/returnType"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//OperationSignature/returnType"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F1xcI82JEeSBhbbM5x_3mA" description="_F1xcIM2JEeSBhbbM5x_3mA" routingStyle="manhattan">
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F1xcI82JEeSBhbbM5x_3mA" description="_F1r8kM2JEeSBhbbM5x_3mA" routingStyle="manhattan" strokeColor="0,0,0">
           <customFeatures>routingStyle</customFeatures>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F1xcJM2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F1xcJc2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F1xcJs2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F1xcJ82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F1xcKM2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F1xcJc2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F1xcJ82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbKDoK3rEeSuH7f2GGufnw" name="[0..*] parameters" sourceNode="_MZz_0K3rEeSuH7f2GGufnw" targetNode="_MZ4RQK3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//OperationSignature/parameters"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//OperationSignature/parameters"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F1zRU82JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F1zRU82JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
           <customFeatures>routingStyle</customFeatures>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F1zRVM2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F1zRVc2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F1zRVs2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F1zRV82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F1zRWM2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F1zRVc2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F1zRV82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbKqsK3rEeSuH7f2GGufnw" name="[1..1] type" sourceNode="_MZ0m4K3rEeSuH7f2GGufnw" targetNode="_MZ11Ba3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Port/type"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Port/type"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F11tkM2JEeSBhbbM5x_3mA" description="_F11GgM2JEeSBhbbM5x_3mA" routingStyle="manhattan">
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F11tkM2JEeSBhbbM5x_3mA" description="_F1r8kM2JEeSBhbbM5x_3mA" routingStyle="manhattan" strokeColor="0,0,0">
           <customFeatures>routingStyle</customFeatures>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F11tkc2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F11tks2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F11tk82JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F11tlM2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F11tlc2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F11tks2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F11tlM2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbLRxq3rEeSuH7f2GGufnw" name="[0..*] attributes" sourceNode="_MZ1N8K3rEeSuH7f2GGufnw" targetNode="_MZwVda3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Entity/attributes"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Entity/attributes"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F127s82JEeSBhbbM5x_3mA" description="_F127sM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F127s82JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
           <customFeatures>routingStyle</customFeatures>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F127tM2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F127tc2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F127ts2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F127t82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F127uM2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F127tc2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F127t82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbL43K3rEeSuH7f2GGufnw" name="[0..*] operations" sourceNode="_MZ1N8K3rEeSuH7f2GGufnw" targetNode="_MZ_mAK3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Entity/operations"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Entity/operations"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F14w482JEeSBhbbM5x_3mA" description="_F14w4M2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F14w482JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
           <customFeatures>routingStyle</customFeatures>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F14w5M2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F14w5c2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F14w5s2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F14w582JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F14w6M2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F14w5c2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F14w582JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbNG8K3rEeSuH7f2GGufnw" name="[0..1] behaviour" sourceNode="_MZ1N8K3rEeSuH7f2GGufnw" targetNode="_MaBbMK3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Entity/behaviour"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Entity/behaviour"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F15_A82JEeSBhbbM5x_3mA" description="_F15_AM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F15_A82JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
           <customFeatures>routingStyle</customFeatures>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F15_BM2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F15_Bc2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F15_Bs2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F15_B82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F15_CM2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F15_Bc2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F15_B82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbNuAK3rEeSuH7f2GGufnw" name="[0..*] protocolBehaviourFeatures" sourceNode="_MZ11Ba3rEeSuH7f2GGufnw" targetNode="_MZ--8K3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Protocol/protocolBehaviourFeatures"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Protocol/protocolBehaviourFeatures"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F170M82JEeSBhbbM5x_3mA" description="_F170MM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F170M82JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
           <customFeatures>routingStyle</customFeatures>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F170NM2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F170Nc2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F170Ns2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F170N82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F170OM2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F170Nc2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F170N82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbOVF63rEeSuH7f2GGufnw" name="[0..*] parts" sourceNode="_MZ3DIK3rEeSuH7f2GGufnw" targetNode="_MZyKpa3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Capsule/parts"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Capsule/parts"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F1-QcM2JEeSBhbbM5x_3mA" description="_F19pYM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F1-QcM2JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
           <customFeatures>routingStyle</customFeatures>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F1-Qcc2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F1-Qcs2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F1-Qc82JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F1-QdM2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F1-Qdc2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F1-Qcs2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F1-QdM2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbO8LK3rEeSuH7f2GGufnw" name="[0..*] ports" sourceNode="_MZ3DIK3rEeSuH7f2GGufnw" targetNode="_MZ0m4K3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Capsule/ports"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Capsule/ports"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2AssM2JEeSBhbbM5x_3mA" description="_F2AFoM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2AssM2JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
           <customFeatures>routingStyle</customFeatures>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2Assc2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2Asss2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2Ass82JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2AstM2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2Astc2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2Asss2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2AstM2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbPjPK3rEeSuH7f2GGufnw" name="[0..*] connectors" sourceNode="_MZ3DIK3rEeSuH7f2GGufnw" targetNode="_MZ77oK3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Capsule/connectors"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Capsule/connectors"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2Ch4M2JEeSBhbbM5x_3mA" description="_F2B60M2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2Ch4M2JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
           <customFeatures>routingStyle</customFeatures>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2Ch4c2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2Ch4s2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2Ch482JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2Ch5M2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2Ch5c2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2Ch4s2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2Ch5M2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbQKTK3rEeSuH7f2GGufnw" name="[1..1] type" sourceNode="_MZ4RQK3rEeSuH7f2GGufnw" targetNode="_MZzYwK3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Parameter/type"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Parameter/type"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2DwA82JEeSBhbbM5x_3mA" description="_F2DwAM2JEeSBhbbM5x_3mA" routingStyle="manhattan">
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2DwA82JEeSBhbbM5x_3mA" description="_F1r8kM2JEeSBhbbM5x_3mA" routingStyle="manhattan" strokeColor="0,0,0">
           <customFeatures>routingStyle</customFeatures>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2DwBM2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2DwBc2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2DwBs2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2DwB82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2DwCM2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2DwBc2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2DwB82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbQxXK3rEeSuH7f2GGufnw" name="[0..*] parameters" sourceNode="_MZ5fYK3rEeSuH7f2GGufnw" targetNode="_MZ4RQK3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Signal/parameters"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Signal/parameters"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2GMQM2JEeSBhbbM5x_3mA" description="_F2FlMM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2GMQM2JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
           <customFeatures>routingStyle</customFeatures>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2GMQc2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2GMQs2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2GMQ82JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2GMRM2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2GMRc2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2GMQs2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2GMRM2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbRYbK3rEeSuH7f2GGufnw" name="[2..2] ends" sourceNode="_MZ77oK3rEeSuH7f2GGufnw" targetNode="_MZ8isK3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Connector/ends"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Connector/ends"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2IBcM2JEeSBhbbM5x_3mA" description="_F2HaYM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2IBcM2JEeSBhbbM5x_3mA" description="_F2HaYM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
           <customFeatures>routingStyle</customFeatures>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2IBcc2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2IBcs2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2IBc82JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2IBdM2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2IBdc2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2IBcs2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2IBdM2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbSmgK3rEeSuH7f2GGufnw" name="[1..1] role" sourceNode="_MZ8isK3rEeSuH7f2GGufnw" targetNode="_MZ0m4K3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//ConnectorEnd/role"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//ConnectorEnd/role"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2JPk82JEeSBhbbM5x_3mA" description="_F2JPkM2JEeSBhbbM5x_3mA" routingStyle="manhattan">
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2JPk82JEeSBhbbM5x_3mA" description="_F1r8kM2JEeSBhbbM5x_3mA" routingStyle="manhattan" strokeColor="0,0,0">
           <customFeatures>routingStyle</customFeatures>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2JPlM2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2JPlc2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2JPls2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2J2oM2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2J2oc2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2JPlc2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2J2oM2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbVCyq3rEeSuH7f2GGufnw" name="[0..*] protocols" sourceNode="_MZ9JwK3rEeSuH7f2GGufnw" targetNode="_MZ11Ba3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Package/protocols"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Package/protocols"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2Lr082JEeSBhbbM5x_3mA" description="_F2Lr0M2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2Lr082JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
           <customFeatures>routingStyle</customFeatures>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2Lr1M2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2Lr1c2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2Lr1s2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2Lr182JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2Lr2M2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2Lr1c2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2Lr182JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbWQ4K3rEeSuH7f2GGufnw" name="[1..1] body" sourceNode="_MZ_mAK3rEeSuH7f2GGufnw" targetNode="_MaRS0K3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Operation/body"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Operation/body"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2QkU82JEeSBhbbM5x_3mA" description="_F2QkUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2QkU82JEeSBhbbM5x_3mA" description="_F2HaYM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
           <customFeatures>routingStyle</customFeatures>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2QkVM2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2QkVc2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2QkVs2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2QkV82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2QkWM2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2QkVc2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2QkV82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbW3963rEeSuH7f2GGufnw" name="[1..1] top" sourceNode="_MaBbMK3rEeSuH7f2GGufnw" targetNode="_MaDQZK3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//StateMachine/top"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//StateMachine/top"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2Ryc82JEeSBhbbM5x_3mA" description="_F2RycM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2RydM2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2Rydc2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2Ryds2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2Ryd82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2RyeM2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2Ryc82JEeSBhbbM5x_3mA" description="_F2HaYM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2Rydc2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2Ryd82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbYGEK3rEeSuH7f2GGufnw" name="[0..*] /incomingTransitions" sourceNode="_MaFFka3rEeSuH7f2GGufnw" targetNode="_MaHh0K3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Vertex/incomingTransitions"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Vertex/incomingTransitions"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2TAkM2JEeSBhbbM5x_3mA" description="_F2SZgM2JEeSBhbbM5x_3mA" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2TAkc2JEeSBhbbM5x_3mA" red="114" green="159" blue="207"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2TAks2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2TAk82JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2TAlM2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2TAlc2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2TAkM2JEeSBhbbM5x_3mA" description="_F2SZgM2JEeSBhbbM5x_3mA" routingStyle="manhattan" strokeColor="114,159,207">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2TAks2JEeSBhbbM5x_3mA" showIcon="false" labelColor="39,76,114"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2TAlM2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbYtIK3rEeSuH7f2GGufnw" name="[0..*] /outgoingTransitions" sourceNode="_MaFFka3rEeSuH7f2GGufnw" targetNode="_MaHh0K3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Vertex/outgoingTransitions"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Vertex/outgoingTransitions"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2Tno82JEeSBhbbM5x_3mA" description="_F2TnoM2JEeSBhbbM5x_3mA" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2TnpM2JEeSBhbbM5x_3mA" red="114" green="159" blue="207"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2Tnpc2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2Tnps2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2Tnp82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2TnqM2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2Tno82JEeSBhbbM5x_3mA" description="_F2SZgM2JEeSBhbbM5x_3mA" routingStyle="manhattan" strokeColor="114,159,207">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2Tnpc2JEeSBhbbM5x_3mA" showIcon="false" labelColor="39,76,114"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2Tnp82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbZUMK3rEeSuH7f2GGufnw" name="[0..1] entryAction" sourceNode="_MaEegK3rEeSuH7f2GGufnw" targetNode="_MaRS0K3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//State/entryAction"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//State/entryAction"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2Vc082JEeSBhbbM5x_3mA" description="_F2Vc0M2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2Vc1M2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2Vc1c2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2Vc1s2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2Vc182JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2Vc2M2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2Vc082JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2Vc1c2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2Vc182JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbZ7S63rEeSuH7f2GGufnw" name="[0..1] exitAction" sourceNode="_MaEegK3rEeSuH7f2GGufnw" targetNode="_MaRS0K3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//State/exitAction"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//State/exitAction"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2Wq882JEeSBhbbM5x_3mA" description="_F2Wq8M2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2Wq9M2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2Wq9c2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2Wq9s2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2Wq982JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2Wq-M2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2Wq882JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2Wq9c2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2Wq982JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbbJYK3rEeSuH7f2GGufnw" name="[0..*] exitPoints" sourceNode="_MaEegK3rEeSuH7f2GGufnw" targetNode="_MaNBYK3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//State/exitPoints"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//State/exitPoints"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2YgI82JEeSBhbbM5x_3mA" description="_F2YgIM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2YgJM2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2YgJc2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2YgJs2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2YgJ82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2YgKM2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2YgI82JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2YgJc2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2YgJ82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbbwcK3rEeSuH7f2GGufnw" name="[0..*] entryPoints" sourceNode="_MaEegK3rEeSuH7f2GGufnw" targetNode="_MaLzQK3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//State/entryPoints"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//State/entryPoints"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2ZuQ82JEeSBhbbM5x_3mA" description="_F2ZuQM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2ZuRM2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2ZuRc2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2ZuRs2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2ZuR82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2ZuSM2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2ZuQ82JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2ZuRc2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2ZuR82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbcXh63rEeSuH7f2GGufnw" name="[0..1] initial" sourceNode="_MaDQZK3rEeSuH7f2GGufnw" targetNode="_MaNoda3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//CompositeState/initial"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//CompositeState/initial"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2a8Y82JEeSBhbbM5x_3mA" description="_F2a8YM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2a8ZM2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2a8Zc2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2a8Zs2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2a8Z82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2a8aM2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2a8Y82JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2a8Zc2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2a8Z82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbdloK3rEeSuH7f2GGufnw" name="[0..1] deepHistory" sourceNode="_MaDQZK3rEeSuH7f2GGufnw" targetNode="_MaO2kK3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//CompositeState/deepHistory"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//CompositeState/deepHistory"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2cKg82JEeSBhbbM5x_3mA" description="_F2cKgM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2cKhM2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2cKhc2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2cKhs2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2cKh82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2cKiM2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2cKg82JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2cKhc2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2cKh82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbeMtq3rEeSuH7f2GGufnw" name="[0..*] junctionPoints" sourceNode="_MaDQZK3rEeSuH7f2GGufnw" targetNode="_MaPdoK3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//CompositeState/junctionPoints"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//CompositeState/junctionPoints"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2d_sM2JEeSBhbbM5x_3mA" description="_F2dYoM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2d_sc2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2d_ss2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2d_s82JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2d_tM2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2d_tc2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2d_sM2JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2d_ss2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2d_tM2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_Mbfa0K3rEeSuH7f2GGufnw" name="[0..*] choicePoints" sourceNode="_MaDQZK3rEeSuH7f2GGufnw" targetNode="_MaQrwK3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//CompositeState/choicePoints"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//CompositeState/choicePoints"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2fN0M2JEeSBhbbM5x_3mA" description="_F2emwM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2fN0c2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2fN0s2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2fN082JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2fN1M2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2fN1c2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2fN0M2JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2fN0s2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2fN1M2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_Mbgo8K3rEeSuH7f2GGufnw" name="[0..*] substates" sourceNode="_MaDQZK3rEeSuH7f2GGufnw" targetNode="_MaEegK3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//CompositeState/substates"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//CompositeState/substates"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2f0482JEeSBhbbM5x_3mA" description="_F2f04M2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2f05M2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2f05c2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2f05s2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2f0582JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2gb8M2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2f0482JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2f05c2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2f0582JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbhQDK3rEeSuH7f2GGufnw" name="[0..*] transitions" sourceNode="_MaDQZK3rEeSuH7f2GGufnw" targetNode="_MaHh0K3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//CompositeState/transitions"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//CompositeState/transitions"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2hDA82JEeSBhbbM5x_3mA" description="_F2hDAM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2hDBM2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2hDBc2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2hDBs2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2hDB82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2hDCM2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2hDA82JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2hDBc2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2hDB82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbieIK3rEeSuH7f2GGufnw" name="[1..1] sourceVertex" sourceNode="_MaHh0K3rEeSuH7f2GGufnw" targetNode="_MaFFka3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Transition/sourceVertex"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Transition/sourceVertex"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2jfQ82JEeSBhbbM5x_3mA" description="_F2jfQM2JEeSBhbbM5x_3mA" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2jfRM2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2jfRc2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2jfRs2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2jfR82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2jfSM2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2jfQ82JEeSBhbbM5x_3mA" description="_F1r8kM2JEeSBhbbM5x_3mA" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2jfRc2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2jfR82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbjFOq3rEeSuH7f2GGufnw" name="[1..1] targetVertex" sourceNode="_MaHh0K3rEeSuH7f2GGufnw" targetNode="_MaFFka3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Transition/targetVertex"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Transition/targetVertex"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2ktYM2JEeSBhbbM5x_3mA" description="_F2kGUM2JEeSBhbbM5x_3mA" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2ktYc2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2ktYs2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2ktY82JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2ktZM2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2ktZc2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2ktYM2JEeSBhbbM5x_3mA" description="_F1r8kM2JEeSBhbbM5x_3mA" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2ktYs2JEeSBhbbM5x_3mA" labelFormat="bold" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2ktZM2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbkTUK3rEeSuH7f2GGufnw" name="[0..*] triggers" sourceNode="_MaHh0K3rEeSuH7f2GGufnw" targetNode="_MaII4K3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Transition/triggers"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Transition/triggers"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2l7gM2JEeSBhbbM5x_3mA" description="_F2lUcM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2l7gc2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2l7gs2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2l7g82JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2l7hM2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2l7hc2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2l7gM2JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2l7gs2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2l7hM2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MblhcK3rEeSuH7f2GGufnw" name="[0..1] guard" sourceNode="_MaHh0K3rEeSuH7f2GGufnw" targetNode="_MaJ-EK3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Transition/guard"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Transition/guard"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2nJo82JEeSBhbbM5x_3mA" description="_F2nJoM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2nJpM2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2nJpc2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2nJps2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2nJp82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2nJqM2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2nJo82JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2nJpc2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2nJp82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbmvkK3rEeSuH7f2GGufnw" name="[0..1] actionChain" sourceNode="_MaHh0K3rEeSuH7f2GGufnw" targetNode="_MaLMMK3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Transition/actionChain"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Transition/actionChain"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2o-082JEeSBhbbM5x_3mA" description="_F2o-0M2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2o-1M2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2o-1c2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2o-1s2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2o-182JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2o-2M2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2o-082JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2o-1c2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2o-182JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_Mbn9sK3rEeSuH7f2GGufnw" name="[0..1] body" sourceNode="_MaJ-EK3rEeSuH7f2GGufnw" targetNode="_MaRS0K3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Guard/body"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Guard/body"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2qM882JEeSBhbbM5x_3mA" description="_F2qM8M2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2qM9M2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2qM9c2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2qM9s2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2qM982JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2qM-M2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2qM882JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2qM9c2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2qM982JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MbokzK3rEeSuH7f2GGufnw" name="[0..*] actions" sourceNode="_MaLMMK3rEeSuH7f2GGufnw" targetNode="_MaRS0K3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//ActionChain/actions"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//ActionChain/actions"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2rbE82JEeSBhbbM5x_3mA" description="_F2rbEM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2rbFM2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2rbFc2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2rbFs2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2rbF82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2rbGM2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2rbE82JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2rbFc2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2rbF82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -4404,13 +3207,8 @@
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_XkDSIL0qEeSQw4jKJk8vcg" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="manhattan">
           <customFeatures>routingStyle</customFeatures>
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_XkDSIb0qEeSQw4jKJk8vcg" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_XkDSIr0qEeSQw4jKJk8vcg" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_XkDSI70qEeSQw4jKJk8vcg"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_XkDSJL0qEeSQw4jKJk8vcg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_XkDSJb0qEeSQw4jKJk8vcg"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_XkDSIr0qEeSQw4jKJk8vcg" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_XkDSJL0qEeSQw4jKJk8vcg" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -4421,13 +3219,8 @@
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_JB-GoLxXEeSl6a8pTlra3w" targetArrow="InputClosedArrow" routingStyle="manhattan">
           <customFeatures>routingStyle</customFeatures>
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_JB-GobxXEeSl6a8pTlra3w" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_JB-GorxXEeSl6a8pTlra3w" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_JB-Go7xXEeSl6a8pTlra3w"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_JB-GpLxXEeSl6a8pTlra3w" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_JB-GpbxXEeSl6a8pTlra3w"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_JB-GorxXEeSl6a8pTlra3w" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_JB-GpLxXEeSl6a8pTlra3w" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -4436,13 +3229,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//Protocol/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_MburYK3rEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_MburYa3rEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_MburYq3rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MburY63rEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_MburZK3rEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MburZa3rEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_MburYq3rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_MburZK3rEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -4453,13 +3241,8 @@
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_MbvScK3rEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="manhattan">
           <customFeatures>routingStyle</customFeatures>
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_MbvSca3rEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_MbvScq3rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MbvSc63rEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_MbvSdK3rEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_MbvSda3rEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_MbvScq3rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_MbvSdK3rEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -4469,13 +3252,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//Parameter/@eGenericSuperTypes.1"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_MbxusK3rEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_Mbxusa3rEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Mbxusq3rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Mbxus63rEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_MbxutK3rEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Mbxuta3rEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Mbxusq3rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_MbxutK3rEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -4485,13 +3263,8 @@
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Mbzj4K3rEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="manhattan">
           <customFeatures>routingStyle</customFeatures>
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_Mbzj4a3rEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Mbzj4q3rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Mbzj463rEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Mbzj5K3rEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Mbzj5a3rEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Mbzj4q3rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Mbzj5K3rEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -4502,13 +3275,8 @@
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Mb1ZEK3rEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="manhattan">
           <customFeatures>routingStyle</customFeatures>
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb1ZEa3rEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Mb1ZEq3rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb1ZE63rEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Mb1ZFK3rEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb1ZFa3rEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Mb1ZEq3rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Mb1ZFK3rEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -4517,13 +3285,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//SimpleState/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Mb2AIK3rEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb2AIa3rEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Mb2AIq3rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb2AI63rEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Mb2AJK3rEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb2AJa3rEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Mb2AIq3rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Mb2AJK3rEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -4532,13 +3295,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//CompositeState/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Mb2nMK3rEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb2nMa3rEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Mb2nMq3rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb2nM63rEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Mb2nNK3rEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb2nNa3rEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Mb2nMq3rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Mb2nNK3rEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -4548,13 +3306,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//State/@eGenericSuperTypes.1"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Mb3OQa3rEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb3OQq3rEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Mb3OQ63rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb3ORK3rEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Mb3ORa3rEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb3ORq3rEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Mb3OQ63rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Mb3ORa3rEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -4563,13 +3316,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//Pseudostate/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Mb4cYK3rEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb4cYa3rEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Mb4cYq3rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb4cY63rEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Mb4cZK3rEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb4cZa3rEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Mb4cYq3rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Mb4cZK3rEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -4578,13 +3326,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//EntryPoint/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Mb5DcK3rEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb5Dca3rEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Mb5Dcq3rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb5Dc63rEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Mb5DdK3rEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb5Dda3rEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Mb5Dcq3rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Mb5DdK3rEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -4593,13 +3336,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//ExitPoint/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Mb5qgK3rEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb5qga3rEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Mb5qgq3rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb5qg63rEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Mb5qhK3rEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb5qha3rEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Mb5qgq3rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Mb5qhK3rEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -4608,13 +3346,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//InitialPoint/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Mb6RkK3rEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb6Rka3rEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Mb6Rkq3rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb6Rk63rEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Mb6RlK3rEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb6Rla3rEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Mb6Rkq3rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Mb6RlK3rEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -4623,13 +3356,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//DeepHistory/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Mb64oa3rEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb64oq3rEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Mb64o63rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb64pK3rEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Mb64pa3rEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb64pq3rEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Mb64o63rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Mb64pa3rEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -4638,13 +3366,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//JunctionPoint/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Mb7fsa3rEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb7fsq3rEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Mb7fs63rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb7ftK3rEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Mb7fta3rEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb7ftq3rEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Mb7fs63rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Mb7fta3rEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -4653,13 +3376,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//ChoicePoint/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Mb8Gwa3rEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb8Gwq3rEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Mb8Gw63rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb8GxK3rEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Mb8Gxa3rEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Mb8Gxq3rEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Mb8Gw63rEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Mb8Gxa3rEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -4668,27 +3386,17 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//Entity/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_CEmVILCAEeS2zc2JFFVtPw" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_CEmVIbCAEeS2zc2JFFVtPw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_CEmVIrCAEeS2zc2JFFVtPw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_CEmVI7CAEeS2zc2JFFVtPw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_CEmVJLCAEeS2zc2JFFVtPw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_CEmVJbCAEeS2zc2JFFVtPw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_CEmVIrCAEeS2zc2JFFVtPw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_CEmVJLCAEeS2zc2JFFVtPw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_HzYAYLCBEeS2zc2JFFVtPw" name="[0..*] entities" sourceNode="_MZ9JwK3rEeSuH7f2GGufnw" targetNode="_MZ1N8K3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Package/entities"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Package/entities"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2M5882JEeSBhbbM5x_3mA" description="_F2M58M2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2M59M2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2M59c2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2M59s2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2M5982JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2M5-M2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2M5882JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2M59c2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2M5982JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -4698,13 +3406,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//Capsule/@eGenericSuperTypes.1"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Yr41oLCBEeS2zc2JFFVtPw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_Yr41obCBEeS2zc2JFFVtPw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Yr41orCBEeS2zc2JFFVtPw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Yr41o7CBEeS2zc2JFFVtPw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Yr41pLCBEeS2zc2JFFVtPw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Yr41pbCBEeS2zc2JFFVtPw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Yr41orCBEeS2zc2JFFVtPw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Yr41pLCBEeS2zc2JFFVtPw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -4714,13 +3417,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//CapsulePart/@eGenericSuperTypes.1"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_lGfVILCBEeS2zc2JFFVtPw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_lGfVIbCBEeS2zc2JFFVtPw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_lGfVIrCBEeS2zc2JFFVtPw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_lGfVI7CBEeS2zc2JFFVtPw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_lGfVJLCBEeS2zc2JFFVtPw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_lGfVJbCBEeS2zc2JFFVtPw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_lGfVIrCBEeS2zc2JFFVtPw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_lGfVJLCBEeS2zc2JFFVtPw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -4730,13 +3428,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//Port/@eGenericSuperTypes.1"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_mC1oobCBEeS2zc2JFFVtPw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_mC1oorCBEeS2zc2JFFVtPw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_mC1oo7CBEeS2zc2JFFVtPw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_mC1opLCBEeS2zc2JFFVtPw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_mC1opbCBEeS2zc2JFFVtPw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_mC1oprCBEeS2zc2JFFVtPw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_mC1oo7CBEeS2zc2JFFVtPw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_mC1opbCBEeS2zc2JFFVtPw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -4745,13 +3438,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//Transition/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_n5tqsLCBEeS2zc2JFFVtPw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_n5tqsbCBEeS2zc2JFFVtPw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_n5tqsrCBEeS2zc2JFFVtPw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_n5tqs7CBEeS2zc2JFFVtPw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_n5tqtLCBEeS2zc2JFFVtPw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_n5tqtbCBEeS2zc2JFFVtPw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_n5tqsrCBEeS2zc2JFFVtPw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_n5tqtLCBEeS2zc2JFFVtPw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -4761,13 +3449,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//State/@eGenericSuperTypes.1"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_qj1HkLCBEeS2zc2JFFVtPw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_qj1HkbCBEeS2zc2JFFVtPw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_qj1HkrCBEeS2zc2JFFVtPw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_qj1Hk7CBEeS2zc2JFFVtPw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_qj1HlLCBEeS2zc2JFFVtPw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_qj1HlbCBEeS2zc2JFFVtPw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_qj1HkrCBEeS2zc2JFFVtPw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_qj1HlLCBEeS2zc2JFFVtPw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -4776,27 +3459,17 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//StateMachine/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_sC8w8LCBEeS2zc2JFFVtPw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_sC8w8bCBEeS2zc2JFFVtPw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_sC8w8rCBEeS2zc2JFFVtPw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_sC8w87CBEeS2zc2JFFVtPw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_sC8w9LCBEeS2zc2JFFVtPw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_sC8w9bCBEeS2zc2JFFVtPw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_sC8w8rCBEeS2zc2JFFVtPw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_sC8w9LCBEeS2zc2JFFVtPw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_ouqgQLCCEeS2zc2JFFVtPw" name="[0..*] /vertices" sourceNode="_MaDQZK3rEeSuH7f2GGufnw" targetNode="_MaFFka3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//CompositeState/vertices"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//CompositeState/vertices"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2iRI82JEeSBhbbM5x_3mA" description="_F2iRIM2JEeSBhbbM5x_3mA" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2iRJM2JEeSBhbbM5x_3mA" red="114" green="159" blue="207"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2iRJc2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2iRJs2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2iRJ82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2iRKM2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2iRI82JEeSBhbbM5x_3mA" description="_F2SZgM2JEeSBhbbM5x_3mA" routingStyle="manhattan" strokeColor="114,159,207">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2iRJc2JEeSBhbbM5x_3mA" showIcon="false" labelColor="39,76,114"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2iRJ82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -4806,12 +3479,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6EifILhSEeSH9PQiHQ6eWw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_6EifIbhSEeSH9PQiHQ6eWw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_6EifILhSEeSH9PQiHQ6eWw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_6EifIrhSEeSH9PQiHQ6eWw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6EifI7hSEeSH9PQiHQ6eWw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_6EifJLhSEeSH9PQiHQ6eWw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -4821,42 +3490,30 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7Wt4sLhSEeSH9PQiHQ6eWw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7Wt4sbhSEeSH9PQiHQ6eWw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7Wt4sLhSEeSH9PQiHQ6eWw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7Wt4srhSEeSH9PQiHQ6eWw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_7Wt4s7hSEeSH9PQiHQ6eWw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_7Wt4tLhSEeSH9PQiHQ6eWw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_9cnOMLhSEeSH9PQiHQ6eWw" name="[0..*] structMembers" sourceNode="_6Eh4ELhSEeSH9PQiHQ6eWw" targetNode="_7WtRoLhSEeSH9PQiHQ6eWw">
         <target xmi:type="ecore:EReference" href="common.ecore#//StructType/structMembers"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//StructType/structMembers"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2spM82JEeSBhbbM5x_3mA" description="_F2spMM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2spNM2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2spNc2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2spNs2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2spN82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2spOM2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2spM82JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2spNc2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2spN82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_DdgZoLhTEeSH9PQiHQ6eWw" name="[0..1] type" sourceNode="_7WtRoLhSEeSH9PQiHQ6eWw" targetNode="_MZzYwK3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//StructMember/type"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//StructMember/type"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_DdhAsLhTEeSH9PQiHQ6eWw" routingStyle="manhattan">
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_DdhAsLhTEeSH9PQiHQ6eWw" routingStyle="manhattan" strokeColor="0,0,0">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_DdhAsbhTEeSH9PQiHQ6eWw"/>
           <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_DdhAsrhTEeSH9PQiHQ6eWw" showIcon="false">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_DdhAs7hTEeSH9PQiHQ6eWw"/>
           </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_DdhAtLhTEeSH9PQiHQ6eWw" showIcon="false">
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_DdhAtLhTEeSH9PQiHQ6eWw" showIcon="false" labelColor="39,76,114">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_DdhAtbhTEeSH9PQiHQ6eWw" red="39" green="76" blue="114"/>
           </endLabelStyle>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
@@ -4866,116 +3523,80 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//StructType/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_HXBo4LhTEeSH9PQiHQ6eWw" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_HXBo4bhTEeSH9PQiHQ6eWw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_HXBo4rhTEeSH9PQiHQ6eWw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_HXBo47hTEeSH9PQiHQ6eWw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_HXBo5LhTEeSH9PQiHQ6eWw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_HXBo5bhTEeSH9PQiHQ6eWw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_HXBo4rhTEeSH9PQiHQ6eWw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_HXBo5LhTEeSH9PQiHQ6eWw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_VXyN4LhTEeSH9PQiHQ6eWw" name="TypeDefinition" tooltipText="" outgoingEdges="_VYSkMLhTEeSH9PQiHQ6eWw _0uGCBrkaEeS1iuOpNDUtkg" incomingEdges="_VYOSwLhTEeSH9PQiHQ6eWw" width="12" height="10">
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_VXyN4LhTEeSH9PQiHQ6eWw" name="TypeDefinition" tooltipText="" outgoingEdges="_VYSkMLhTEeSH9PQiHQ6eWw _0uGCBrkaEeS1iuOpNDUtkg" incomingEdges="_VYOSwLhTEeSH9PQiHQ6eWw _oYkPMPW0EeScDf7MYTU8VA" width="12" height="10">
         <target xmi:type="ecore:EClass" href="common.ecore#//TypeDefinition"/>
         <semanticElements xmi:type="ecore:EClass" href="common.ecore#//TypeDefinition"/>
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_VXy08LhTEeSH9PQiHQ6eWw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VXy08bhTEeSH9PQiHQ6eWw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_VXy08LhTEeSH9PQiHQ6eWw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_VXy08rhTEeSH9PQiHQ6eWw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_VXy087hTEeSH9PQiHQ6eWw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_VXy09LhTEeSH9PQiHQ6eWw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_VYOSwLhTEeSH9PQiHQ6eWw" name="[0..*] typedefinitions" sourceNode="_MZ9JwK3rEeSuH7f2GGufnw" targetNode="_VXyN4LhTEeSH9PQiHQ6eWw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Package/typedefinitions"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Package/typedefinitions"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2OIE82JEeSBhbbM5x_3mA" description="_F2OIEM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2OIFM2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2OIFc2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2OIFs2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2OIF82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2OIGM2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2OIE82JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2OIFc2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2OIF82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_VYSkMLhTEeSH9PQiHQ6eWw" name="[0..1] type" sourceNode="_VXyN4LhTEeSH9PQiHQ6eWw" targetNode="_MZzYwK3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//TypeDefinition/type"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//TypeDefinition/type"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_VYTLQLhTEeSH9PQiHQ6eWw" routingStyle="manhattan">
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_VYTLQLhTEeSH9PQiHQ6eWw" routingStyle="manhattan" strokeColor="0,0,0">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_VYTLQbhTEeSH9PQiHQ6eWw"/>
           <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_VYTLQrhTEeSH9PQiHQ6eWw" showIcon="false">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VYTLQ7hTEeSH9PQiHQ6eWw"/>
           </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_VYTLRLhTEeSH9PQiHQ6eWw" showIcon="false">
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_VYTLRLhTEeSH9PQiHQ6eWw" showIcon="false" labelColor="39,76,114">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VYTLRbhTEeSH9PQiHQ6eWw" red="39" green="76" blue="114"/>
           </endLabelStyle>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_Q3BGgLhVEeSH9PQiHQ6eWw" name="Model" tooltipText="" outgoingEdges="_UCXoMLhVEeSH9PQiHQ6eWw _X9gBALhVEeSH9PQiHQ6eWw _eGpJgLhVEeSH9PQiHQ6eWw _VfROgLkaEeS1iuOpNDUtkg _TA7dUL0LEeSl6a8pTlra3w" width="12" height="10">
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_Q3BGgLhVEeSH9PQiHQ6eWw" name="Model" tooltipText="" outgoingEdges="_UCXoMLhVEeSH9PQiHQ6eWw _X9gBALhVEeSH9PQiHQ6eWw _eGpJgLhVEeSH9PQiHQ6eWw _VfROgLkaEeS1iuOpNDUtkg _TA7dUL0LEeSl6a8pTlra3w _oYkPMPW0EeScDf7MYTU8VA" width="12" height="10">
         <target xmi:type="ecore:EClass" href="common.ecore#//Model"/>
         <semanticElements xmi:type="ecore:EClass" href="common.ecore#//Model"/>
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Q3BtkLhVEeSH9PQiHQ6eWw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Q3BtkbhVEeSH9PQiHQ6eWw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Q3BtkLhVEeSH9PQiHQ6eWw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Q3BtkrhVEeSH9PQiHQ6eWw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Q3Btk7hVEeSH9PQiHQ6eWw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Q3BtlLhVEeSH9PQiHQ6eWw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_UCXoMLhVEeSH9PQiHQ6eWw" name="[0..*] localScopeTemporaryTypes" sourceNode="_Q3BGgLhVEeSH9PQiHQ6eWw" targetNode="_MZzYwK3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Model/localScopeTemporaryTypes"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Model/localScopeTemporaryTypes"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2w6o82JEeSBhbbM5x_3mA" description="_F2w6oM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2w6pM2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2w6pc2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2w6ps2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2w6p82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2w6qM2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2w6o82JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2w6pc2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2w6p82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_X9gBALhVEeSH9PQiHQ6eWw" name="[0..*] rootPackages" sourceNode="_Q3BGgLhVEeSH9PQiHQ6eWw" targetNode="_MZ9JwK3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Model/rootPackages"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Model/rootPackages"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2yIw82JEeSBhbbM5x_3mA" description="_F2yIwM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2yIxM2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2yIxc2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2yIxs2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2yIx82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2yIyM2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2yIw82JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2yIxc2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2yIx82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_eGpJgLhVEeSH9PQiHQ6eWw" name="[0..*] topEntities" sourceNode="_Q3BGgLhVEeSH9PQiHQ6eWw" targetNode="_MZ1N8K3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Model/topEntities"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Model/topEntities"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2zW482JEeSBhbbM5x_3mA" description="_F2zW4M2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F2zW5M2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2zW5c2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2zW5s2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2zW582JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F2zW6M2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F2zW482JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F2zW5c2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F2zW582JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -4985,22 +3606,15 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_D47xULkXEeSYMdh17YlJbg" labelFormat="italic" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_D47xUbkXEeSYMdh17YlJbg"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_D47xULkXEeSYMdh17YlJbg" labelFormat="italic" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_D47xUrkXEeSYMdh17YlJbg" red="125" green="125" blue="125"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_D47xU7kXEeSYMdh17YlJbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_D47xVLkXEeSYMdh17YlJbg" red="228" green="228" blue="228"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
         <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_8MKS4LkWEeSYMdh17YlJbg" name="name : EString" tooltipText="">
           <target xmi:type="ecore:EAttribute" href="common.ecore#//NamedElement/name"/>
           <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//NamedElement/name"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_90cfULkWEeSYMdh17YlJbg" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_90cfUbkWEeSYMdh17YlJbg"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_90cfUrkWEeSYMdh17YlJbg"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_90cfU7kWEeSYMdh17YlJbg"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
@@ -5008,10 +3622,7 @@
           <target xmi:type="ecore:EAttribute" href="common.ecore#//NamedElement/description"/>
           <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//NamedElement/description"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_D5E7QLkXEeSYMdh17YlJbg" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_D5E7QbkXEeSYMdh17YlJbg"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_D5E7QrkXEeSYMdh17YlJbg"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_D5E7Q7kXEeSYMdh17YlJbg"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
@@ -5019,16 +3630,13 @@
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_J0nsoLkXEeSYMdh17YlJbg" name="[0..1] partWithPort" sourceNode="_MZ8isK3rEeSuH7f2GGufnw" targetNode="_MZyKpa3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//ConnectorEnd/partWithPort"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//ConnectorEnd/partWithPort"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_J0oTsLkXEeSYMdh17YlJbg" routingStyle="manhattan">
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_J0oTsLkXEeSYMdh17YlJbg" routingStyle="manhattan" strokeColor="0,0,0">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_J0oTsbkXEeSYMdh17YlJbg"/>
           <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_J0oTsrkXEeSYMdh17YlJbg" showIcon="false">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_J0oTs7kXEeSYMdh17YlJbg"/>
           </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_J0oTtLkXEeSYMdh17YlJbg" showIcon="false">
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_J0oTtLkXEeSYMdh17YlJbg" showIcon="false" labelColor="39,76,114">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_J0oTtbkXEeSYMdh17YlJbg" red="39" green="76" blue="114"/>
           </endLabelStyle>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
@@ -5038,13 +3646,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//RedefinableElement/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_VfMWALkaEeS1iuOpNDUtkg" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_VfMWAbkaEeS1iuOpNDUtkg" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_VfMWArkaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VfMWA7kaEeS1iuOpNDUtkg"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_VfMWBLkaEeS1iuOpNDUtkg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VfMWBbkaEeS1iuOpNDUtkg"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_VfMWArkaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_VfMWBLkaEeS1iuOpNDUtkg" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -5054,13 +3657,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//Attribute/@eGenericSuperTypes.1"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_JB_UwLxXEeSl6a8pTlra3w" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_JB_UwbxXEeSl6a8pTlra3w" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_JB_UwrxXEeSl6a8pTlra3w" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_JB_Uw7xXEeSl6a8pTlra3w"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_JB_UxLxXEeSl6a8pTlra3w" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_JB_UxbxXEeSl6a8pTlra3w"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_JB_UwrxXEeSl6a8pTlra3w" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_JB_UxLxXEeSl6a8pTlra3w" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -5070,13 +3668,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//Parameter/@eGenericSuperTypes.1"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_VfNkIbkaEeS1iuOpNDUtkg" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_VfNkIrkaEeS1iuOpNDUtkg" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_VfNkI7kaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VfNkJLkaEeS1iuOpNDUtkg"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_VfNkJbkaEeS1iuOpNDUtkg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VfNkJrkaEeS1iuOpNDUtkg"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_VfNkI7kaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_VfNkJbkaEeS1iuOpNDUtkg" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -5085,13 +3678,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//Connector/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_VfOLMbkaEeS1iuOpNDUtkg" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_VfOLMrkaEeS1iuOpNDUtkg" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_VfOLM7kaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VfOLNLkaEeS1iuOpNDUtkg"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_VfOLNbkaEeS1iuOpNDUtkg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VfOLNrkaEeS1iuOpNDUtkg"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_VfOLM7kaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_VfOLNbkaEeS1iuOpNDUtkg" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -5100,13 +3688,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//Package/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_VfOyQLkaEeS1iuOpNDUtkg" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_VfOyQbkaEeS1iuOpNDUtkg" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_VfOyQrkaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VfOyQ7kaEeS1iuOpNDUtkg"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_VfOyRLkaEeS1iuOpNDUtkg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VfOyRbkaEeS1iuOpNDUtkg"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_VfOyQrkaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_VfOyRLkaEeS1iuOpNDUtkg" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -5115,13 +3698,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//ProtocolBehaviourFeature/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_VfOyR7kaEeS1iuOpNDUtkg" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_VfOySLkaEeS1iuOpNDUtkg" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_VfOySbkaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VfOySrkaEeS1iuOpNDUtkg"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_VfOyS7kaEeS1iuOpNDUtkg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VfOyTLkaEeS1iuOpNDUtkg"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_VfOySbkaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_VfOyS7kaEeS1iuOpNDUtkg" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -5131,13 +3709,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//Operation/@eGenericSuperTypes.1"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_VfPZUbkaEeS1iuOpNDUtkg" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_VfPZUrkaEeS1iuOpNDUtkg" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_VfPZU7kaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VfPZVLkaEeS1iuOpNDUtkg"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_VfPZVbkaEeS1iuOpNDUtkg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VfPZVrkaEeS1iuOpNDUtkg"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_VfPZU7kaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_VfPZVbkaEeS1iuOpNDUtkg" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -5146,13 +3719,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//Vertex/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_VfQAYLkaEeS1iuOpNDUtkg" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_VfQAYbkaEeS1iuOpNDUtkg" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_VfQAYrkaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VfQAY7kaEeS1iuOpNDUtkg"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_VfQAZLkaEeS1iuOpNDUtkg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VfQAZbkaEeS1iuOpNDUtkg"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_VfQAYrkaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_VfQAZLkaEeS1iuOpNDUtkg" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -5161,13 +3729,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//Guard/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_VfQncLkaEeS1iuOpNDUtkg" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_VfQncbkaEeS1iuOpNDUtkg" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_VfQncrkaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VfQnc7kaEeS1iuOpNDUtkg"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_VfQndLkaEeS1iuOpNDUtkg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VfQndbkaEeS1iuOpNDUtkg"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_VfQncrkaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_VfQndLkaEeS1iuOpNDUtkg" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -5176,13 +3739,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//ActionChain/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_VfQnd7kaEeS1iuOpNDUtkg" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_VfQneLkaEeS1iuOpNDUtkg" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_VfQnebkaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VfQnerkaEeS1iuOpNDUtkg"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_VfQne7kaEeS1iuOpNDUtkg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VfQnfLkaEeS1iuOpNDUtkg"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_VfQnebkaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_VfQne7kaEeS1iuOpNDUtkg" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -5191,13 +3749,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//Model/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_VfROgbkaEeS1iuOpNDUtkg" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_VfROgrkaEeS1iuOpNDUtkg" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_VfROg7kaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VfROhLkaEeS1iuOpNDUtkg"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_VfROhbkaEeS1iuOpNDUtkg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VfROhrkaEeS1iuOpNDUtkg"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_VfROg7kaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_VfROhbkaEeS1iuOpNDUtkg" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -5206,13 +3759,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//Type/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_0uEz4bkaEeS1iuOpNDUtkg" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_0uEz4rkaEeS1iuOpNDUtkg" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_0uEz47kaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0uEz5LkaEeS1iuOpNDUtkg"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_0uEz5bkaEeS1iuOpNDUtkg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0uEz5rkaEeS1iuOpNDUtkg"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_0uEz47kaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_0uEz5bkaEeS1iuOpNDUtkg" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -5221,13 +3769,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//Trigger/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_0uFa8bkaEeS1iuOpNDUtkg" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_0uFa8rkaEeS1iuOpNDUtkg" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_0uFa87kaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0uFa9LkaEeS1iuOpNDUtkg"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_0uFa9bkaEeS1iuOpNDUtkg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0uFa9rkaEeS1iuOpNDUtkg"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_0uFa87kaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_0uFa9bkaEeS1iuOpNDUtkg" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -5236,13 +3779,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//StructMember/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_0uGCALkaEeS1iuOpNDUtkg" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_0uGCAbkaEeS1iuOpNDUtkg" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_0uGCArkaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0uGCA7kaEeS1iuOpNDUtkg"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_0uGCBLkaEeS1iuOpNDUtkg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0uGCBbkaEeS1iuOpNDUtkg"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_0uGCArkaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_0uGCBLkaEeS1iuOpNDUtkg" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -5251,27 +3789,17 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//TypeDefinition/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_0uGCB7kaEeS1iuOpNDUtkg" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_0uGCCLkaEeS1iuOpNDUtkg" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_0uGCCbkaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0uGCCrkaEeS1iuOpNDUtkg"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_0uGCC7kaEeS1iuOpNDUtkg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_0uGCDLkaEeS1iuOpNDUtkg"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_0uGCCbkaEeS1iuOpNDUtkg" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_0uGCC7kaEeS1iuOpNDUtkg" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_TA7dUL0LEeSl6a8pTlra3w" name="[0..*] topProtocols" sourceNode="_Q3BGgLhVEeSH9PQiHQ6eWw" targetNode="_MZ11Ba3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Model/topProtocols"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Model/topProtocols"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F21ME82JEeSBhbbM5x_3mA" description="_F21MEM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F21MFM2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F21MFc2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F21MFs2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F21MF82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F21MGM2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F21ME82JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F21MFc2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F21MF82JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -5281,13 +3809,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//PrimitiveType/@eGenericSuperTypes.1"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_aRE5Eb0qEeSQw4jKJk8vcg" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_aRE5Er0qEeSQw4jKJk8vcg" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_aRE5E70qEeSQw4jKJk8vcg" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_aRE5FL0qEeSQw4jKJk8vcg"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_aRE5Fb0qEeSQw4jKJk8vcg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_aRE5Fr0qEeSQw4jKJk8vcg"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_aRE5E70qEeSQw4jKJk8vcg" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_aRE5Fb0qEeSQw4jKJk8vcg" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -5297,12 +3820,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_E-oQwMGsEeS6WJHyXZkBTg" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_E-oQwcGsEeS6WJHyXZkBTg"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_E-oQwMGsEeS6WJHyXZkBTg" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_E-oQwsGsEeS6WJHyXZkBTg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_E-oQw8GsEeS6WJHyXZkBTg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_E-oQxMGsEeS6WJHyXZkBTg" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -5312,22 +3831,15 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ANh5QMGsEeS6WJHyXZkBTg" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ANh5QcGsEeS6WJHyXZkBTg"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ANh5QMGsEeS6WJHyXZkBTg" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ANh5QsGsEeS6WJHyXZkBTg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_ANh5Q8GsEeS6WJHyXZkBTg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_ANh5RMGsEeS6WJHyXZkBTg" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
         <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_AOhXwMGsEeS6WJHyXZkBTg" name="value : EString" tooltipText="">
           <target xmi:type="ecore:EAttribute" href="common.ecore#//AnnotationParameter/value"/>
           <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//AnnotationParameter/value"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_AOh-0MGsEeS6WJHyXZkBTg" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_AOh-0cGsEeS6WJHyXZkBTg"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_AOh-0sGsEeS6WJHyXZkBTg"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_AOh-08GsEeS6WJHyXZkBTg"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
@@ -5337,13 +3849,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//Annotation/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FASdoMGsEeS6WJHyXZkBTg" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_FASdocGsEeS6WJHyXZkBTg" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_FASdosGsEeS6WJHyXZkBTg" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FASdo8GsEeS6WJHyXZkBTg"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FASdpMGsEeS6WJHyXZkBTg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FASdpcGsEeS6WJHyXZkBTg"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_FASdosGsEeS6WJHyXZkBTg" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FASdpMGsEeS6WJHyXZkBTg" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -5352,43 +3859,30 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//AnnotationParameter/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_APjSgMGsEeS6WJHyXZkBTg" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_APjSgcGsEeS6WJHyXZkBTg" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_APjSgsGsEeS6WJHyXZkBTg" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_APjSg8GsEeS6WJHyXZkBTg"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_APjShMGsEeS6WJHyXZkBTg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_APjShcGsEeS6WJHyXZkBTg"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_APjSgsGsEeS6WJHyXZkBTg" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_APjShMGsEeS6WJHyXZkBTg" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_E_yuYMGsEeS6WJHyXZkBTg" name="[0..*] parameters" sourceNode="_ANdn0MGsEeS6WJHyXZkBTg" targetNode="_ANhSMMGsEeS6WJHyXZkBTg">
         <target xmi:type="ecore:EReference" href="common.ecore#//Annotation/parameters"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Annotation/parameters"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F23BQM2JEeSBhbbM5x_3mA" description="_F22aMM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F23BQc2JEeSBhbbM5x_3mA"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F23BQs2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F23BQ82JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F23BRM2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F23BRc2JEeSBhbbM5x_3mA" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F23BQM2JEeSBhbbM5x_3mA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F23BQs2JEeSBhbbM5x_3mA" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_F23BRM2JEeSBhbbM5x_3mA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_fcSNoMNUEeS2b7b-DU5jjw" name="[0..*] annotations" sourceNode="_3r-sQLkWEeSYMdh17YlJbg" targetNode="_ANdn0MGsEeS6WJHyXZkBTg">
         <target xmi:type="ecore:EReference" href="common.ecore#//NamedElement/annotations"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//NamedElement/annotations"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_fcUC0MNUEeS2b7b-DU5jjw" routingStyle="manhattan">
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_fcUC0MNUEeS2b7b-DU5jjw" routingStyle="manhattan" strokeColor="0,0,0">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_fcUC0cNUEeS2b7b-DU5jjw"/>
           <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_fcUC0sNUEeS2b7b-DU5jjw" showIcon="false">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fcUC08NUEeS2b7b-DU5jjw"/>
           </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_fcUC1MNUEeS2b7b-DU5jjw" showIcon="false">
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_fcUC1MNUEeS2b7b-DU5jjw" showIcon="false" labelColor="39,76,114">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fcUC1cNUEeS2b7b-DU5jjw" red="39" green="76" blue="114"/>
           </endLabelStyle>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
@@ -5398,13 +3892,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//ActionCode/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_F3n2QM2JEeSBhbbM5x_3mA" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_F3n2Qc2JEeSBhbbM5x_3mA" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_F3n2Qs2JEeSBhbbM5x_3mA" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F3n2Q82JEeSBhbbM5x_3mA"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F3n2RM2JEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_F3n2Rc2JEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_F3n2Qs2JEeSBhbbM5x_3mA" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_F3n2RM2JEeSBhbbM5x_3mA" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -5414,13 +3903,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//Port/@eGenericSuperTypes.1"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_4fP1AM2KEeSBhbbM5x_3mA" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_4fP1Ac2KEeSBhbbM5x_3mA" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_4fP1As2KEeSBhbbM5x_3mA" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4fP1A82KEeSBhbbM5x_3mA"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_4fP1BM2KEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_4fP1Bc2KEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_4fP1As2KEeSBhbbM5x_3mA" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_4fP1BM2KEeSBhbbM5x_3mA" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -5430,28 +3914,33 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//CapsulePart/@eGenericSuperTypes.1"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_9DxwIM2KEeSBhbbM5x_3mA" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_9DxwIc2KEeSBhbbM5x_3mA" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_9DxwIs2KEeSBhbbM5x_3mA" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9DxwI82KEeSBhbbM5x_3mA"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_9DxwJM2KEeSBhbbM5x_3mA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9DxwJc2KEeSBhbbM5x_3mA"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_9DxwIs2KEeSBhbbM5x_3mA" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_9DxwJM2KEeSBhbbM5x_3mA" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_RCqaoNyYEeSavKYvIj4uEg" name="[0..*] packages" sourceNode="_MZ9JwK3rEeSuH7f2GGufnw" targetNode="_MZ9JwK3rEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Package/packages"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Package/packages"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_RCsP0NyYEeSavKYvIj4uEg" description="_RCrowdyYEeSavKYvIj4uEg" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_RCsP0dyYEeSavKYvIj4uEg"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_RCsP0NyYEeSavKYvIj4uEg" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
           <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_RCsP0tyYEeSavKYvIj4uEg" showIcon="false">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_RCsP09yYEeSavKYvIj4uEg"/>
           </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_RCsP1NyYEeSavKYvIj4uEg" showIcon="false">
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_RCsP1NyYEeSavKYvIj4uEg" showIcon="false" labelColor="39,76,114">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_RCsP1dyYEeSavKYvIj4uEg" red="39" green="76" blue="114"/>
+          </endLabelStyle>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_oYkPMPW0EeScDf7MYTU8VA" name="[0..*] topTypedefinitions" sourceNode="_Q3BGgLhVEeSH9PQiHQ6eWw" targetNode="_VXyN4LhTEeSH9PQiHQ6eWw">
+        <target xmi:type="ecore:EReference" href="common.ecore#//Model/topTypedefinitions"/>
+        <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Model/topTypedefinitions"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_oYmEYPW0EeScDf7MYTU8VA" description="_F1zRUM2JEeSBhbbM5x_3mA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_oYmEYfW0EeScDf7MYTU8VA" showIcon="false">
+            <customFeatures>labelSize</customFeatures>
+          </centerLabelStyle>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_oYmEYvW0EeScDf7MYTU8VA" showIcon="false" labelColor="39,76,114">
+            <customFeatures>labelSize</customFeatures>
           </endLabelStyle>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
@@ -6064,96 +4553,6 @@
               <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
             </endLabelStyleDescription>
           </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_T9kS4q3wEeSuH7f2GGufnw" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_T9kS463wEeSuH7f2GGufnw" labelFormat="bold" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_T9kS5K3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_T9k58q3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_T9k5863wEeSuH7f2GGufnw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_T9k59K3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_T9lhAq3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_T9lhA63wEeSuH7f2GGufnw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_T9lhBK3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_T9mIEq3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_T9mIE63wEeSuH7f2GGufnw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_T9mIFK3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_T9nWMq3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_T9nWM63wEeSuH7f2GGufnw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_T9nWNK3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_T9n9Qq3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_T9n9Q63wEeSuH7f2GGufnw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_T9n9RK3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_T9okUq3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_T9okU63wEeSuH7f2GGufnw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_T9okVK3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_T9pLZK3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_T9pLZa3wEeSuH7f2GGufnw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_T9pLZq3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_T9pyea3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_T9pyeq3wEeSuH7f2GGufnw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_T9pye63wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_T9qZiK3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_T9qZia3wEeSuH7f2GGufnw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_T9qZiq3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
           <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_T9rAmK3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
             <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_T9rAma3wEeSuH7f2GGufnw" showIcon="false" labelExpression="service:render">
@@ -6163,15 +4562,6 @@
               <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
             </endLabelStyleDescription>
           </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_T9rnqK3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_T9rnqa3wEeSuH7f2GGufnw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_T9rnqq3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
           <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_wNqBYLCCEeS2zc2JFFVtPw" sourceArrow="FillDiamond" routingStyle="manhattan">
             <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_wNqBYbCCEeS2zc2JFFVtPw" showIcon="false" labelExpression="service:render">
@@ -6190,154 +4580,6 @@
               <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
             </endLabelStyleDescription>
           </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_2s4HkrCCEeS2zc2JFFVtPw" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_2s4Hk7CCEeS2zc2JFFVtPw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_2s4HlLCCEeS2zc2JFFVtPw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <cache xmi:type="diagram:DiagramElementMapping2ModelElement" xmi:id="_n9HR4q3tEeSuH7f2GGufnw">
-            <key xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T9idsK3wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//StateMachine/top"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T9idsa3wEeSuH7f2GGufnw" key="_uQX_sK3tEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T9idta3wEeSuH7f2GGufnw" value="_T9idsq3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T9jr0K3wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Transition/sourceVertex"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T9jr0a3wEeSuH7f2GGufnw" key="_n9Gq0K3tEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T9jr1a3wEeSuH7f2GGufnw" value="_T9jr0q3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T9kS4K3wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Transition/targetVertex"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T9kS4a3wEeSuH7f2GGufnw" key="_n9IgCq3tEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T9kS5a3wEeSuH7f2GGufnw" value="_T9kS4q3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T9k58K3wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Transition/triggers"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T9k58a3wEeSuH7f2GGufnw" key="_X8Fo0K3uEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T9k59a3wEeSuH7f2GGufnw" value="_T9k58q3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T9lhAK3wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Transition/guard"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T9lhAa3wEeSuH7f2GGufnw" key="_YZhLsK3uEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T9lhBa3wEeSuH7f2GGufnw" value="_T9lhAq3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T9mIEK3wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Transition/actionChain"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T9mIEa3wEeSuH7f2GGufnw" key="_Y_gNoK3uEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T9mIFa3wEeSuH7f2GGufnw" value="_T9mIEq3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T9nWMK3wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//State/exitPoints"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T9nWMa3wEeSuH7f2GGufnw" key="__JiVMK3tEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T9nWNa3wEeSuH7f2GGufnw" value="_T9nWMq3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T9n9QK3wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//State/entryPoints"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T9n9Qa3wEeSuH7f2GGufnw" key="_-Y3GMK3tEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T9n9Ra3wEeSuH7f2GGufnw" value="_T9n9Qq3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T9okUK3wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//CompositeState/initial"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T9okUa3wEeSuH7f2GGufnw" key="_AJFtsK3uEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T9okVa3wEeSuH7f2GGufnw" value="_T9okUq3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T9pLYq3wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//CompositeState/deepHistory"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T9pLY63wEeSuH7f2GGufnw" key="_DlIWwK3uEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T9pycK3wEeSuH7f2GGufnw" value="_T9pLZK3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T9pyd63wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//CompositeState/junctionPoints"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T9pyeK3wEeSuH7f2GGufnw" key="_DlI90K3uEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T9pyfK3wEeSuH7f2GGufnw" value="_T9pyea3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T9qZhq3wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//CompositeState/choicePoints"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T9qZh63wEeSuH7f2GGufnw" key="_DlJk4K3uEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T9qZi63wEeSuH7f2GGufnw" value="_T9qZiK3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T9rAlq3wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//CompositeState/substates"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T9rAl63wEeSuH7f2GGufnw" key="_uQYmzK3tEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T9rAm63wEeSuH7f2GGufnw" value="_T9rAmK3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T9rnpq3wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//CompositeState/transitions"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T9rnp63wEeSuH7f2GGufnw" key="_uQZN3K3tEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T9rnq63wEeSuH7f2GGufnw" value="_T9rnqK3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_ovoJkbCCEeS2zc2JFFVtPw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//CompositeState/vertices"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_ovoJkrCCEeS2zc2JFFVtPw" key="_ovoJkLCCEeS2zc2JFFVtPw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_ovoJlrCCEeS2zc2JFFVtPw" value="_wNqBYLCCEeS2zc2JFFVtPw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_1WYOsLCCEeS2zc2JFFVtPw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Vertex/incomingTransitions"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_1WY1wLCCEeS2zc2JFFVtPw" key="_n9JuIK3tEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_1WY1xLCCEeS2zc2JFFVtPw" value="_1WY1wbCCEeS2zc2JFFVtPw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_2s4HkLCCEeS2zc2JFFVtPw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Vertex/outgoingTransitions"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_2s4HkbCCEeS2zc2JFFVtPw" key="_n9JuJ63tEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_2s4HlbCCEeS2zc2JFFVtPw" value="_2s4HkrCCEeS2zc2JFFVtPw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-          </cache>
         </data>
       </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_lilJIK3tEeSuH7f2GGufnw" name="StateMachine" tooltipText="" outgoingEdges="_uQX_sK3tEeSuH7f2GGufnw" width="12" height="10">
@@ -6346,12 +4588,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_lilwMK3tEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_lilwMa3tEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_lilwMK3tEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_lilwMq3tEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_lilwM63tEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_lilwNK3tEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -6361,12 +4599,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_myQoUK3tEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_myQoUa3tEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_myQoUK3tEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_myQoUq3tEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_myQoU63tEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_myQoVK3tEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -6376,68 +4610,44 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_n9ByUK3tEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_n9ByUa3tEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_n9ByUK3tEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_n9ByUq3tEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_n9ByU63tEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_n9ByVK3tEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_n9Gq0K3tEeSuH7f2GGufnw" name="[1..1] sourceVertex" sourceNode="_myQBQK3tEeSuH7f2GGufnw" targetNode="_n9BLQK3tEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Transition/sourceVertex"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Transition/sourceVertex"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9jr1q3wEeSuH7f2GGufnw" description="_T9jr0q3wEeSuH7f2GGufnw" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T9jr163wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9jr2K3wEeSuH7f2GGufnw" labelFormat="bold" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9jr2a3wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9jr2q3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9jr263wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9jr1q3wEeSuH7f2GGufnw" description="_T9jr0q3wEeSuH7f2GGufnw" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9jr2K3wEeSuH7f2GGufnw" labelFormat="bold" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9jr2q3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_n9IgCq3tEeSuH7f2GGufnw" name="[1..1] targetVertex" sourceNode="_myQBQK3tEeSuH7f2GGufnw" targetNode="_n9BLQK3tEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Transition/targetVertex"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Transition/targetVertex"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9kS5q3wEeSuH7f2GGufnw" description="_T9kS4q3wEeSuH7f2GGufnw" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T9kS563wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9kS6K3wEeSuH7f2GGufnw" labelFormat="bold" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9kS6a3wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9kS6q3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9kS663wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9kS5q3wEeSuH7f2GGufnw" description="_T9jr0q3wEeSuH7f2GGufnw" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9kS6K3wEeSuH7f2GGufnw" labelFormat="bold" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9kS6q3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_n9JuIK3tEeSuH7f2GGufnw" name="[0..*] /incomingTransitions" sourceNode="_n9BLQK3tEeSuH7f2GGufnw" targetNode="_myQBQK3tEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Vertex/incomingTransitions"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Vertex/incomingTransitions"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_1WY1xbCCEeS2zc2JFFVtPw" description="_1WY1wbCCEeS2zc2JFFVtPw" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_1WY1xrCCEeS2zc2JFFVtPw" red="114" green="159" blue="207"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_1WY1x7CCEeS2zc2JFFVtPw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_1WY1yLCCEeS2zc2JFFVtPw" red="39" green="76" blue="114"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_1WY1ybCCEeS2zc2JFFVtPw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_1WY1yrCCEeS2zc2JFFVtPw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_1WY1xbCCEeS2zc2JFFVtPw" description="_1WY1wbCCEeS2zc2JFFVtPw" routingStyle="manhattan" strokeColor="114,159,207">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_1WY1x7CCEeS2zc2JFFVtPw" showIcon="false" labelColor="39,76,114"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_1WY1ybCCEeS2zc2JFFVtPw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_n9JuJ63tEeSuH7f2GGufnw" name="[0..*] /outgoingTransitions" sourceNode="_n9BLQK3tEeSuH7f2GGufnw" targetNode="_myQBQK3tEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Vertex/outgoingTransitions"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Vertex/outgoingTransitions"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_2s4HlrCCEeS2zc2JFFVtPw" description="_2s4HkrCCEeS2zc2JFFVtPw" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_2s4Hl7CCEeS2zc2JFFVtPw" red="114" green="159" blue="207"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_2s4HmLCCEeS2zc2JFFVtPw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2s4HmbCCEeS2zc2JFFVtPw" red="39" green="76" blue="114"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_2s4HmrCCEeS2zc2JFFVtPw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_2s4Hm7CCEeS2zc2JFFVtPw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_2s4HlrCCEeS2zc2JFFVtPw" description="_1WY1wbCCEeS2zc2JFFVtPw" routingStyle="manhattan" strokeColor="114,159,207">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_2s4HmLCCEeS2zc2JFFVtPw" showIcon="false" labelColor="39,76,114"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_2s4HmrCCEeS2zc2JFFVtPw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -6447,12 +4657,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_rfU0YK3tEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rfU0Ya3tEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_rfU0YK3tEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_rfU0Yq3tEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_rfU0Y63tEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_rfU0ZK3tEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -6462,25 +4668,16 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//State/@eGenericSuperTypes.1"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_rfbiEK3tEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_rfbiEa3tEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_rfbiEq3tEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rfbiE63tEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_rfbiFK3tEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rfbiFa3tEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_rfbiEq3tEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_rfbiFK3tEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_s-SFsK3tEeSuH7f2GGufnw" name="SimpleState" tooltipText="" outgoingEdges="_s-aBgK3tEeSuH7f2GGufnw" width="12" height="10">
         <target xmi:type="ecore:EClass" href="common.ecore#//SimpleState"/>
         <semanticElements xmi:type="ecore:EClass" href="common.ecore#//SimpleState"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_s-SswK3tEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_s-Sswa3tEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_s-SswK3tEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_s-Sswq3tEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_s-Ssw63tEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_s-SsxK3tEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -6489,67 +4686,43 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//SimpleState/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_s-aBga3tEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_s-aBgq3tEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_s-aBg63tEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_s-aBhK3tEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_s-aBha3tEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_s-aBhq3tEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_s-aBg63tEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_s-aBha3tEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_uQQq8K3tEeSuH7f2GGufnw" name="CompositeState" tooltipText="" outgoingEdges="_uQYmzK3tEeSuH7f2GGufnw _uQZN3K3tEeSuH7f2GGufnw _uQab8K3tEeSuH7f2GGufnw _AJFtsK3uEeSuH7f2GGufnw _DlIWwK3uEeSuH7f2GGufnw _DlI90K3uEeSuH7f2GGufnw _DlJk4K3uEeSuH7f2GGufnw _ovoJkLCCEeS2zc2JFFVtPw" incomingEdges="_uQX_sK3tEeSuH7f2GGufnw" width="12" height="10">
         <target xmi:type="ecore:EClass" href="common.ecore#//CompositeState"/>
         <semanticElements xmi:type="ecore:EClass" href="common.ecore#//CompositeState"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_uQRSAK3tEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uQRSAa3tEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_uQRSAK3tEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_uQRSAq3tEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_uQRSA63tEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_uQRSBK3tEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_uQX_sK3tEeSuH7f2GGufnw" name="[1..1] top" sourceNode="_lilJIK3tEeSuH7f2GGufnw" targetNode="_uQQq8K3tEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//StateMachine/top"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//StateMachine/top"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9jEwK3wEeSuH7f2GGufnw" description="_T9idsq3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T9jEwa3wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9jEwq3wEeSuH7f2GGufnw" labelFormat="bold" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9jEw63wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9jExK3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9jExa3wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9jEwK3wEeSuH7f2GGufnw" description="_T9idsq3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9jEwq3wEeSuH7f2GGufnw" labelFormat="bold" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9jExK3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_uQYmzK3tEeSuH7f2GGufnw" name="[0..*] substates" sourceNode="_uQQq8K3tEeSuH7f2GGufnw" targetNode="_rfUNUK3tEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//CompositeState/substates"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//CompositeState/substates"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9rnoK3wEeSuH7f2GGufnw" description="_T9rAmK3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T9rnoa3wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9rnoq3wEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9rno63wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9rnpK3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9rnpa3wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9rnoK3wEeSuH7f2GGufnw" description="_T9rAmK3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9rnoq3wEeSuH7f2GGufnw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9rnpK3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_uQZN3K3tEeSuH7f2GGufnw" name="[0..*] transitions" sourceNode="_uQQq8K3tEeSuH7f2GGufnw" targetNode="_myQBQK3tEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//CompositeState/transitions"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//CompositeState/transitions"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9sOsK3wEeSuH7f2GGufnw" description="_T9rnqK3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T9sOsa3wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9sOsq3wEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9sOs63wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9sOtK3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9sOta3wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9sOsK3wEeSuH7f2GGufnw" description="_T9rAmK3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9sOsq3wEeSuH7f2GGufnw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9sOtK3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -6558,13 +4731,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//CompositeState/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_uQab8a3tEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_uQab8q3tEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_uQab863tEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uQab9K3tEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_uQab9a3tEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_uQab9q3tEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_uQab863tEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_uQab9a3tEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -6574,12 +4742,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_8VGesK3tEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_8VGesa3tEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_8VGesK3tEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_8VGesq3tEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_8VGes63tEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_8VGetK3tEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -6588,39 +4752,25 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//Pseudostate/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_8VPooa3tEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_8VPooq3tEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_8VPoo63tEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_8VPopK3tEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_8VPopa3tEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_8VPopq3tEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_8VPoo63tEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_8VPopa3tEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_-YtVMK3tEeSuH7f2GGufnw" name="EntryPoint" tooltipText="" outgoingEdges="_-Y5icK3tEeSuH7f2GGufnw" incomingEdges="_-Y3GMK3tEeSuH7f2GGufnw" width="12" height="10">
         <target xmi:type="ecore:EClass" href="common.ecore#//EntryPoint"/>
         <semanticElements xmi:type="ecore:EClass" href="common.ecore#//EntryPoint"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_-Yt8QK3tEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_-Yt8Qa3tEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_-Yt8QK3tEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_-Yt8Qq3tEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_-Yt8Q63tEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_-Yt8RK3tEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_-Y3GMK3tEeSuH7f2GGufnw" name="[0..*] entryPoints" sourceNode="_rfUNUK3tEeSuH7f2GGufnw" targetNode="_-YtVMK3tEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//State/entryPoints"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//State/entryPoints"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9n9Rq3wEeSuH7f2GGufnw" description="_T9n9Qq3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T9n9R63wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9n9SK3wEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9n9Sa3wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9n9Sq3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9n9S63wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9n9Rq3wEeSuH7f2GGufnw" description="_T9rAmK3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9n9SK3wEeSuH7f2GGufnw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9n9Sq3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -6629,39 +4779,25 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//EntryPoint/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_-Y6JgK3tEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_-Y6Jga3tEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_-Y6Jgq3tEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_-Y6Jg63tEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_-Y6JhK3tEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_-Y6Jha3tEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_-Y6Jgq3tEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_-Y6JhK3tEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="__JZLQK3tEeSuH7f2GGufnw" name="ExitPoint" tooltipText="" outgoingEdges="__JkKYK3tEeSuH7f2GGufnw" incomingEdges="__JiVMK3tEeSuH7f2GGufnw" width="12" height="10">
         <target xmi:type="ecore:EClass" href="common.ecore#//ExitPoint"/>
         <semanticElements xmi:type="ecore:EClass" href="common.ecore#//ExitPoint"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="__JZLQa3tEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="__JZLQq3tEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="__JZLQa3tEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="__JZLQ63tEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="__JZLRK3tEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="__JZLRa3tEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="__JiVMK3tEeSuH7f2GGufnw" name="[0..*] exitPoints" sourceNode="_rfUNUK3tEeSuH7f2GGufnw" targetNode="__JZLQK3tEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//State/exitPoints"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//State/exitPoints"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9nWNq3wEeSuH7f2GGufnw" description="_T9nWMq3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T9nWN63wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9nWOK3wEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9nWOa3wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9nWOq3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9nWO63wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9nWNq3wEeSuH7f2GGufnw" description="_T9rAmK3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9nWOK3wEeSuH7f2GGufnw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9nWOq3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -6670,13 +4806,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//ExitPoint/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="__JkxcK3tEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="__Jkxca3tEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="__Jkxcq3tEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="__Jkxc63tEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="__JkxdK3tEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="__Jkxda3tEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="__Jkxcq3tEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="__JkxdK3tEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -6686,26 +4817,17 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_AI5gcK3uEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_AI5gca3uEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_AI5gcK3uEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_AI5gcq3uEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_AI5gc63uEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_AI5gdK3uEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_AJFtsK3uEeSuH7f2GGufnw" name="[0..1] initial" sourceNode="_uQQq8K3tEeSuH7f2GGufnw" targetNode="_AI45YK3uEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//CompositeState/initial"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//CompositeState/initial"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9okVq3wEeSuH7f2GGufnw" description="_T9okUq3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T9okV63wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9okWK3wEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9okWa3wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9pLYK3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9pLYa3wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9okVq3wEeSuH7f2GGufnw" description="_T9rAmK3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9okWK3wEeSuH7f2GGufnw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9pLYK3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -6714,13 +4836,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//InitialPoint/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_AJIJ8a3uEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_AJIJ8q3uEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_AJIJ863uEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_AJIJ9K3uEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_AJIJ9a3uEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_AJIJ9q3uEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_AJIJ863uEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_AJIJ9a3uEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -6730,12 +4847,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Dk8JgK3uEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Dk8Jga3uEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Dk8JgK3uEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Dk8Jgq3uEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Dk8Jg63uEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Dk8JhK3uEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -6745,12 +4858,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Dk8wka3uEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Dk8wkq3uEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Dk8wka3uEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Dk8wk63uEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Dk8wlK3uEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Dk8wla3uEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -6760,54 +4869,35 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Dk9Xoa3uEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Dk9Xoq3uEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Dk9Xoa3uEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Dk9Xo63uEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Dk9XpK3uEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Dk9Xpa3uEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_DlIWwK3uEeSuH7f2GGufnw" name="[0..1] deepHistory" sourceNode="_uQQq8K3tEeSuH7f2GGufnw" targetNode="_Dk7icK3uEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//CompositeState/deepHistory"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//CompositeState/deepHistory"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9pyca3wEeSuH7f2GGufnw" description="_T9pLZK3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T9pycq3wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9pyc63wEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9pydK3wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9pyda3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9pydq3wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9pyca3wEeSuH7f2GGufnw" description="_T9rAmK3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9pyc63wEeSuH7f2GGufnw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9pyda3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_DlI90K3uEeSuH7f2GGufnw" name="[0..*] junctionPoints" sourceNode="_uQQq8K3tEeSuH7f2GGufnw" targetNode="_Dk8wkK3uEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//CompositeState/junctionPoints"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//CompositeState/junctionPoints"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9qZgK3wEeSuH7f2GGufnw" description="_T9pyea3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T9qZga3wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9qZgq3wEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9qZg63wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9qZhK3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9qZha3wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9qZgK3wEeSuH7f2GGufnw" description="_T9rAmK3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9qZgq3wEeSuH7f2GGufnw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9qZhK3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_DlJk4K3uEeSuH7f2GGufnw" name="[0..1] choicePoints" sourceNode="_uQQq8K3tEeSuH7f2GGufnw" targetNode="_Dk9XoK3uEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//CompositeState/choicePoints"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//CompositeState/choicePoints"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9rAkK3wEeSuH7f2GGufnw" description="_T9qZiK3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T9rAka3wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9rAkq3wEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9rAk63wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9rAlK3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9rAla3wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9rAkK3wEeSuH7f2GGufnw" description="_T9rAmK3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9rAkq3wEeSuH7f2GGufnw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9rAlK3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -6816,13 +4906,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//DeepHistory/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_DlLaEa3uEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_DlLaEq3uEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_DlLaE63uEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_DlLaFK3uEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_DlLaFa3uEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_DlLaFq3uEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_DlLaE63uEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_DlLaFa3uEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -6831,13 +4916,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//JunctionPoint/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_DlMBIK3uEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_DlMBIa3uEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_DlMBIq3uEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_DlMBI63uEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_DlMBJK3uEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_DlMBJa3uEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_DlMBIq3uEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_DlMBJK3uEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -6846,13 +4926,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//ChoicePoint/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_DlMBJ63uEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_DlMBKK3uEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_DlMBKa3uEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_DlMBKq3uEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_DlMBK63uEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_DlMBLK3uEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_DlMBKa3uEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_DlMBK63uEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -6862,26 +4937,17 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_X740gK3uEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_X740ga3uEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_X740gK3uEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_X740gq3uEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_X740g63uEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_X740hK3uEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_X8Fo0K3uEeSuH7f2GGufnw" name="[0..*] triggers" sourceNode="_myQBQK3tEeSuH7f2GGufnw" targetNode="_X74NcK3uEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Transition/triggers"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Transition/triggers"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9k59q3wEeSuH7f2GGufnw" description="_T9k58q3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T9k5963wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9k5-K3wEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9k5-a3wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9k5-q3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9k5-63wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9k59q3wEeSuH7f2GGufnw" description="_T9rAmK3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9k5-K3wEeSuH7f2GGufnw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9k5-q3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -6891,26 +4957,17 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_YZUXYK3uEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_YZUXYa3uEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_YZUXYK3uEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_YZUXYq3uEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_YZUXY63uEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_YZUXZK3uEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_YZhLsK3uEeSuH7f2GGufnw" name="[0..1] guard" sourceNode="_myQBQK3tEeSuH7f2GGufnw" targetNode="_YZTwUK3uEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Transition/guard"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Transition/guard"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9lhBq3wEeSuH7f2GGufnw" description="_T9lhAq3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T9lhB63wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9lhCK3wEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9lhCa3wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9lhCq3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9lhC63wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9lhBq3wEeSuH7f2GGufnw" description="_T9rAmK3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9lhCK3wEeSuH7f2GGufnw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9lhCq3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -6920,40 +4977,26 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Y_IaMK3uEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Y_IaMa3uEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Y_IaMK3uEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Y_IaMq3uEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Y_IaM63uEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Y_IaNK3uEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_Y_gNoK3uEeSuH7f2GGufnw" name="[0..1] actionChain" sourceNode="_myQBQK3tEeSuH7f2GGufnw" targetNode="_Y_HzIK3uEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Transition/actionChain"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Transition/actionChain"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9mIFq3wEeSuH7f2GGufnw" description="_T9mIEq3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T9mIF63wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9mIGK3wEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9mIGa3wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9mIGq3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T9mIG63wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T9mIFq3wEeSuH7f2GGufnw" description="_T9rAmK3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T9mIGK3wEeSuH7f2GGufnw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T9mIGq3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_ovoJkLCCEeS2zc2JFFVtPw" name="[0..*] /vertices" sourceNode="_uQQq8K3tEeSuH7f2GGufnw" targetNode="_n9BLQK3tEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//CompositeState/vertices"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//CompositeState/vertices"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_wNqBY7CCEeS2zc2JFFVtPw" description="_wNqBYLCCEeS2zc2JFFVtPw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_wNqBZLCCEeS2zc2JFFVtPw" red="114" green="159" blue="207"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_wNqBZbCCEeS2zc2JFFVtPw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_wNqBZrCCEeS2zc2JFFVtPw" red="39" green="76" blue="114"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_wNqBZ7CCEeS2zc2JFFVtPw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_wNqBaLCCEeS2zc2JFFVtPw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_wNqBY7CCEeS2zc2JFFVtPw" description="_wNqBYLCCEeS2zc2JFFVtPw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="114,159,207">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_wNqBZbCCEeS2zc2JFFVtPw" showIcon="false" labelColor="39,76,114"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_wNqBZ7CCEeS2zc2JFFVtPw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -7727,42 +5770,6 @@
               <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
             </endLabelStyleDescription>
           </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_T-PoUa3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_T-PoUq3wEeSuH7f2GGufnw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_T-PoU63wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_T-Rdgq3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_T-Rdg63wEeSuH7f2GGufnw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_T-RdhK3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_T-SEkq3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_T-SEk63wEeSuH7f2GGufnw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_T-SElK3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_T-Sroq3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_T-Sro63wEeSuH7f2GGufnw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_T-SrpK3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
           <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_T-TSsa3wEeSuH7f2GGufnw" routingStyle="manhattan">
             <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_T-TSsq3wEeSuH7f2GGufnw" labelFormat="bold" showIcon="false" labelExpression="service:render">
@@ -7772,329 +5779,6 @@
               <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
             </endLabelStyleDescription>
           </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_T-T5wa3wEeSuH7f2GGufnw" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_T-T5wq3wEeSuH7f2GGufnw" labelFormat="bold" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_T-T5w63wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_T-T5za3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_T-T5zq3wEeSuH7f2GGufnw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_T-T5z63wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_T-Ug2K3wEeSuH7f2GGufnw" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_T-Ug2a3wEeSuH7f2GGufnw" labelFormat="bold" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_T-Ug2q3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_T-VH4q3wEeSuH7f2GGufnw" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_T-VH463wEeSuH7f2GGufnw" labelFormat="bold" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_T-VH5K3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_T-Vu9q3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_T-Vu963wEeSuH7f2GGufnw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_T-Vu-K3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_T-WWCK3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_T-WWCa3wEeSuH7f2GGufnw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_T-WWCq3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_T-W9Ga3wEeSuH7f2GGufnw" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_T-W9Gq3wEeSuH7f2GGufnw" labelFormat="bold" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_T-W9G63wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_T-XkKa3wEeSuH7f2GGufnw" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_T-XkKq3wEeSuH7f2GGufnw" labelFormat="bold" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_T-XkK63wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_H1MlUrCBEeS2zc2JFFVtPw" sourceArrow="FillDiamond" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_H1MlU7CBEeS2zc2JFFVtPw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_H1MlVLCBEeS2zc2JFFVtPw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_AgrCQ7CWEeS2zc2JFFVtPw" sourceArrow="FillDiamond" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_AgrCRLCWEeS2zc2JFFVtPw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_AgrCRbCWEeS2zc2JFFVtPw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_AgrpU7CWEeS2zc2JFFVtPw" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_AgrpVLCWEeS2zc2JFFVtPw" labelFormat="bold" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_AgrpVbCWEeS2zc2JFFVtPw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_oymn07hTEeSH9PQiHQ6eWw" sourceArrow="FillDiamond" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_oymn1LhTEeSH9PQiHQ6eWw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_oymn1bhTEeSH9PQiHQ6eWw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_1RSWELhTEeSH9PQiHQ6eWw" sourceArrow="FillDiamond" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_1RSWEbhTEeSH9PQiHQ6eWw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_1RSWErhTEeSH9PQiHQ6eWw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_VZIxYrhWEeSH9PQiHQ6eWw" sourceArrow="FillDiamond" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_VZIxY7hWEeSH9PQiHQ6eWw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_VZIxZLhWEeSH9PQiHQ6eWw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_VZIxb7hWEeSH9PQiHQ6eWw" sourceArrow="FillDiamond" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_VZIxcLhWEeSH9PQiHQ6eWw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_VZIxcbhWEeSH9PQiHQ6eWw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_w4pagrhWEeSH9PQiHQ6eWw" sourceArrow="FillDiamond" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_w4pag7hWEeSH9PQiHQ6eWw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_w4pahLhWEeSH9PQiHQ6eWw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <cache xmi:type="diagram:DiagramElementMapping2ModelElement" xmi:id="_55jz4K3uEeSuH7f2GGufnw">
-            <key xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T-NzIK3wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Entity/attributes"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T-OaMK3wEeSuH7f2GGufnw" key="_91-mIK3uEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T-OaNK3wEeSuH7f2GGufnw" value="_T-OaMa3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T-PBQK3wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Entity/operations"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T-PoUK3wEeSuH7f2GGufnw" key="_KohrkK3vEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T-PoVK3wEeSuH7f2GGufnw" value="_T-PoUa3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T-RdgK3wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Package/protocols"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T-Rdga3wEeSuH7f2GGufnw" key="_Xa4jwK3vEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T-Rdha3wEeSuH7f2GGufnw" value="_T-Rdgq3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T-SEkK3wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Capsule/ports"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T-SEka3wEeSuH7f2GGufnw" key="_VYLsMK3vEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T-SEla3wEeSuH7f2GGufnw" value="_T-SEkq3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T-SroK3wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Capsule/connectors"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T-Sroa3wEeSuH7f2GGufnw" key="_dkGkwK3vEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T-Srpa3wEeSuH7f2GGufnw" value="_T-Sroq3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T-SrrK3wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Attribute/type"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T-TSsK3wEeSuH7f2GGufnw" key="_91-mLa3uEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T-TStK3wEeSuH7f2GGufnw" value="_T-TSsa3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T-TSu63wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//OperationSignature/returnType"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T-T5wK3wEeSuH7f2GGufnw" key="_IJJfEK3vEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T-T5xK3wEeSuH7f2GGufnw" value="_T-T5wa3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T-T5y63wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//OperationSignature/parameters"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T-T5zK3wEeSuH7f2GGufnw" key="_JkteIK3vEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T-T50K3wEeSuH7f2GGufnw" value="_T-T5za3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T-Ug1q3wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Parameter/type"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T-Ug163wEeSuH7f2GGufnw" key="_JkuFNq3vEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T-Ug263wEeSuH7f2GGufnw" value="_T-Ug2K3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T-VH4K3wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Port/type"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T-VH4a3wEeSuH7f2GGufnw" key="_Xa5K3K3vEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T-VH5a3wEeSuH7f2GGufnw" value="_T-VH4q3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T-Vu9K3wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Protocol/protocolBehaviourFeatures"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T-Vu9a3wEeSuH7f2GGufnw" key="_ZyGSwK3vEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T-Vu-a3wEeSuH7f2GGufnw" value="_T-Vu9q3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T-WWBq3wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Signal/parameters"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T-WWB63wEeSuH7f2GGufnw" key="_buaOcK3vEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T-W9EK3wEeSuH7f2GGufnw" value="_T-WWCK3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T-W9F63wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Connector/ends"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T-W9GK3wEeSuH7f2GGufnw" key="_eUAXsK3vEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T-XkIK3wEeSuH7f2GGufnw" value="_T-W9Ga3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_T-XkJ63wEeSuH7f2GGufnw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//ConnectorEnd/role"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_T-XkKK3wEeSuH7f2GGufnw" key="_eUA-wK3vEeSuH7f2GGufnw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_T-XkLK3wEeSuH7f2GGufnw" value="_T-XkKa3wEeSuH7f2GGufnw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_H1MlULCBEeS2zc2JFFVtPw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Package/entities"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_H1MlUbCBEeS2zc2JFFVtPw" key="_H1L-QLCBEeS2zc2JFFVtPw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_H1MlVbCBEeS2zc2JFFVtPw" value="_H1MlUrCBEeS2zc2JFFVtPw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_AgrCQbCWEeS2zc2JFFVtPw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Capsule/parts"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_AgrCQrCWEeS2zc2JFFVtPw" key="_AgrCQLCWEeS2zc2JFFVtPw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_AgrCRrCWEeS2zc2JFFVtPw" value="_AgrCQ7CWEeS2zc2JFFVtPw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_AgrpUbCWEeS2zc2JFFVtPw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//CapsulePart/type"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_AgrpUrCWEeS2zc2JFFVtPw" key="_AgrpULCWEeS2zc2JFFVtPw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_AgrpVrCWEeS2zc2JFFVtPw" value="_AgrpU7CWEeS2zc2JFFVtPw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_oymn0bhTEeSH9PQiHQ6eWw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//StructType/structMembers"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_oymn0rhTEeSH9PQiHQ6eWw" key="_oymn0LhTEeSH9PQiHQ6eWw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_oymn1rhTEeSH9PQiHQ6eWw" value="_oymn07hTEeSH9PQiHQ6eWw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_1RRvAbhTEeSH9PQiHQ6eWw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Package/typedefinitions"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_1RRvArhTEeSH9PQiHQ6eWw" key="_1RRvALhTEeSH9PQiHQ6eWw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_1RSWE7hTEeSH9PQiHQ6eWw" value="_1RSWELhTEeSH9PQiHQ6eWw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_VZIKULhWEeSH9PQiHQ6eWw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Model/localScopeTemporaryTypes"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_w4pagbhWEeSH9PQiHQ6eWw" key="_w4pagLhWEeSH9PQiHQ6eWw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_w4pahbhWEeSH9PQiHQ6eWw" value="_w4pagrhWEeSH9PQiHQ6eWw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_VZIxYLhWEeSH9PQiHQ6eWw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Model/rootPackages"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_VZIxYbhWEeSH9PQiHQ6eWw" key="_VZIKXLhWEeSH9PQiHQ6eWw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_VZIxZbhWEeSH9PQiHQ6eWw" value="_VZIxYrhWEeSH9PQiHQ6eWw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-            <value xmi:type="diagram:ModelElement2ViewVariable" xmi:id="_VZIxbbhWEeSH9PQiHQ6eWw">
-              <key xmi:type="ecore:EReference" href="common.ecore#//Model/topEntities"/>
-              <value xmi:type="diagram:ViewVariable2ContainerVariable" xmi:id="_VZIxbrhWEeSH9PQiHQ6eWw" key="_VZIxbLhWEeSH9PQiHQ6eWw">
-                <value xmi:type="diagram:ContainerVariable2StyleDescription" xmi:id="_VZJYcLhWEeSH9PQiHQ6eWw" value="_VZIxb7hWEeSH9PQiHQ6eWw">
-                  <key xmi:type="ecore:EPackage" href="common.ecore#/"/>
-                </value>
-              </value>
-            </value>
-          </cache>
         </data>
       </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_28ovwK3uEeSuH7f2GGufnw" name="Type" tooltipText="" incomingEdges="_91-mLa3uEeSuH7f2GGufnw __mXlsK3uEeSuH7f2GGufnw _IJJfEK3vEeSuH7f2GGufnw _JkuFNq3vEeSuH7f2GGufnw _CGZr8LCAEeS2zc2JFFVtPw _lGQ48LhTEeSH9PQiHQ6eWw _oynO4LhTEeSH9PQiHQ6eWw _1RSWGrhTEeSH9PQiHQ6eWw _w4pagLhWEeSH9PQiHQ6eWw" width="12" height="10">
@@ -8103,12 +5787,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_28pW0K3uEeSuH7f2GGufnw" labelFormat="italic" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_interface.gif" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_28pW0a3uEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_28pW0K3uEeSuH7f2GGufnw" labelFormat="italic" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_interface.gif" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.0/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_28pW0q3uEeSuH7f2GGufnw" red="125" green="125" blue="125"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_28pW063uEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_28pW1K3uEeSuH7f2GGufnw" red="228" green="228" blue="228"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -8118,12 +5798,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_5M0CoK3uEeSuH7f2GGufnw" labelFormat="italic" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_5M0Coa3uEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_5M0CoK3uEeSuH7f2GGufnw" labelFormat="italic" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_5M0Coq3uEeSuH7f2GGufnw" red="125" green="125" blue="125"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_5M0Co63uEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_5M0CpK3uEeSuH7f2GGufnw" red="228" green="228" blue="228"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -8133,24 +5809,16 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_55eUUK3uEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_55eUUa3uEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_55eUUK3uEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_55eUUq3uEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_55eUU63uEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_55eUVK3uEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_87Ww8K3uEeSuH7f2GGufnw" name="Capsule" tooltipText="" outgoingEdges="_87eFsK3uEeSuH7f2GGufnw _VYLsMK3vEeSuH7f2GGufnw _dkGkwK3vEeSuH7f2GGufnw _AgrCQLCWEeS2zc2JFFVtPw" incomingEdges="_AgrpULCWEeS2zc2JFFVtPw _VZIxbLhWEeSH9PQiHQ6eWw" width="12" height="10">
         <target xmi:type="ecore:EClass" href="common.ecore#//Capsule"/>
         <semanticElements xmi:type="ecore:EClass" href="common.ecore#//Capsule"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_87Ww8a3uEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_87Ww8q3uEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_87Ww8a3uEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_87Ww863uEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_87Ww9K3uEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_87Ww9a3uEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -8160,13 +5828,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//Capsule/@eGenericSuperTypes.1"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_87eFsa3uEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_87eFsq3uEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_87eFs63uEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_87eFtK3uEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_87eFta3uEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_87eFtq3uEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_87eFs63uEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_87eFta3uEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -8176,22 +5839,15 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_913RYK3uEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_913RYa3uEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_913RYK3uEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_913RYq3uEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_913RY63uEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_913RZK3uEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
         <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_918J4K3uEeSuH7f2GGufnw" name="visibility : VIsibilityKind = PUBLIC" tooltipText="">
           <target xmi:type="ecore:EAttribute" href="common.ecore#//Attribute/visibility"/>
           <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//Attribute/visibility"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_918J4a3uEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_918J4q3uEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_918J463uEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_918J5K3uEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
@@ -8199,28 +5855,18 @@
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_91-mIK3uEeSuH7f2GGufnw" name="[0..*] attributes" sourceNode="_5MzbkK3uEeSuH7f2GGufnw" targetNode="_912qUK3uEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Entity/attributes"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Entity/attributes"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-OaNa3wEeSuH7f2GGufnw" description="_T-OaMa3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T-OaNq3wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-OaN63wEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-OaOK3wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-OaOa3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-OaOq3wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-OaNa3wEeSuH7f2GGufnw" description="_T-OaMa3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-OaN63wEeSuH7f2GGufnw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-OaOa3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_91-mLa3uEeSuH7f2GGufnw" name="[1..1] type" sourceNode="_912qUK3uEeSuH7f2GGufnw" targetNode="_28ovwK3uEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Attribute/type"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Attribute/type"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-TSta3wEeSuH7f2GGufnw" description="_T-TSsa3wEeSuH7f2GGufnw" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T-TStq3wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-TSt63wEeSuH7f2GGufnw" labelFormat="bold" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-TSuK3wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-TSua3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-TSuq3wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-TSta3wEeSuH7f2GGufnw" description="_T-TSsa3wEeSuH7f2GGufnw" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-TSt63wEeSuH7f2GGufnw" labelFormat="bold" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-TSua3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -8230,12 +5876,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="__mPp4a3uEeSuH7f2GGufnw" labelFormat="italic" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_interface.gif" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="__mPp4q3uEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="__mPp4a3uEeSuH7f2GGufnw" labelFormat="italic" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_interface.gif" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.0/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="__mPp463uEeSuH7f2GGufnw" red="125" green="125" blue="125"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="__mPp5K3uEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="__mPp5a3uEeSuH7f2GGufnw" red="228" green="228" blue="228"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -8244,13 +5886,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//PrimitiveType/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="__mXlsa3uEeSuH7f2GGufnw" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="__mXlsq3uEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="__mXls63uEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="__mXltK3uEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="__mXlta3uEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="__mXltq3uEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="__mXls63uEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="__mXlta3uEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -8260,22 +5897,15 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Fe4RMK3vEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Fe4RMa3vEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Fe4RMK3vEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Fe4RMq3vEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Fe4RM63vEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Fe4RNK3vEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
         <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_Fe-X0K3vEeSuH7f2GGufnw" name="isUnique : EBoolean = false" tooltipText="">
           <target xmi:type="ecore:EAttribute" href="common.ecore#//MultiplicityElement/isUnique"/>
           <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//MultiplicityElement/isUnique"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Fe-X0a3vEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Fe-X0q3vEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Fe-X063vEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Fe-X1K3vEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
@@ -8283,10 +5913,7 @@
           <target xmi:type="ecore:EAttribute" href="common.ecore#//MultiplicityElement/isOrdered"/>
           <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//MultiplicityElement/isOrdered"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Fe--4a3vEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Fe--4q3vEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Fe--463vEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Fe--5K3vEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
@@ -8294,10 +5921,7 @@
           <target xmi:type="ecore:EAttribute" href="common.ecore#//MultiplicityElement/lowerBound"/>
           <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//MultiplicityElement/lowerBound"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Fe--5q3vEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Fe--563vEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Fe--6K3vEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Fe--6a3vEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
@@ -8305,10 +5929,7 @@
           <target xmi:type="ecore:EAttribute" href="common.ecore#//MultiplicityElement/upperBound"/>
           <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//MultiplicityElement/upperBound"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Fe_l8K3vEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Fe_l8a3vEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Fe_l8q3vEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Fe_l863vEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
@@ -8319,13 +5940,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//Attribute/@eGenericSuperTypes.1"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FfCpQK3vEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_FfCpQa3vEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_FfCpQq3vEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FfCpQ63vEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FfCpRK3vEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_FfCpRa3vEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_FfCpQq3vEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FfCpRK3vEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -8335,26 +5951,17 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_IJA8MK3vEeSuH7f2GGufnw" labelFormat="italic" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_IJA8Ma3vEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_IJA8MK3vEeSuH7f2GGufnw" labelFormat="italic" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_IJA8Mq3vEeSuH7f2GGufnw" red="125" green="125" blue="125"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_IJA8M63vEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_IJA8NK3vEeSuH7f2GGufnw" red="228" green="228" blue="228"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_IJJfEK3vEeSuH7f2GGufnw" name="[1..1] returnType" sourceNode="_IJAVIK3vEeSuH7f2GGufnw" targetNode="_28ovwK3uEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//OperationSignature/returnType"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//OperationSignature/returnType"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-T5xa3wEeSuH7f2GGufnw" description="_T-T5wa3wEeSuH7f2GGufnw" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T-T5xq3wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-T5x63wEeSuH7f2GGufnw" labelFormat="bold" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-T5yK3wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-T5ya3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-T5yq3wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-T5xa3wEeSuH7f2GGufnw" description="_T-TSsa3wEeSuH7f2GGufnw" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-T5x63wEeSuH7f2GGufnw" labelFormat="bold" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-T5ya3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -8364,22 +5971,15 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Jkgp0K3vEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Jkgp0a3vEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Jkgp0K3vEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Jkgp0q3vEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Jkgp063vEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Jkgp1K3vEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
         <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_Jkqa0K3vEeSuH7f2GGufnw" name="direction : DirectionKind = IN" tooltipText="">
           <target xmi:type="ecore:EAttribute" href="common.ecore#//Parameter/direction"/>
           <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//Parameter/direction"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_JkrB4K3vEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_JkrB4a3vEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_JkrB4q3vEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_JkrB463vEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
@@ -8387,28 +5987,18 @@
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_JkteIK3vEeSuH7f2GGufnw" name="[0..*] parameters" sourceNode="_IJAVIK3vEeSuH7f2GGufnw" targetNode="_JkgCwK3vEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//OperationSignature/parameters"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//OperationSignature/parameters"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-Ug0K3wEeSuH7f2GGufnw" description="_T-T5za3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T-Ug0a3wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-Ug0q3wEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-Ug063wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-Ug1K3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-Ug1a3wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-Ug0K3wEeSuH7f2GGufnw" description="_T-OaMa3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-Ug0q3wEeSuH7f2GGufnw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-Ug1K3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_JkuFNq3vEeSuH7f2GGufnw" name="[1..1] type" sourceNode="_JkgCwK3vEeSuH7f2GGufnw" targetNode="_28ovwK3uEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Parameter/type"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Parameter/type"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-Ug3K3wEeSuH7f2GGufnw" description="_T-Ug2K3wEeSuH7f2GGufnw" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T-Ug3a3wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-Ug3q3wEeSuH7f2GGufnw" labelFormat="bold" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-Ug363wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-Ug4K3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-Ug4a3wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-Ug3K3wEeSuH7f2GGufnw" description="_T-TSsa3wEeSuH7f2GGufnw" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-Ug3q3wEeSuH7f2GGufnw" labelFormat="bold" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-Ug4K3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -8418,13 +6008,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//Parameter/@eGenericSuperTypes.1"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_JkwhcK3vEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_Jkwhca3vEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Jkwhcq3vEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Jkwhc63vEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_JkwhdK3vEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Jkwhda3vEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Jkwhcq3vEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_JkwhdK3vEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -8434,26 +6019,17 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_KoYhoK3vEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_KoYhoa3vEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_KoYhoK3vEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_KoYhoq3vEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_KoYho63vEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_KoYhpK3vEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_KohrkK3vEeSuH7f2GGufnw" name="[0..*] operations" sourceNode="_5MzbkK3uEeSuH7f2GGufnw" targetNode="_KoX6kK3vEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Entity/operations"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Entity/operations"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-PoVa3wEeSuH7f2GGufnw" description="_T-PoUa3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T-PoVq3wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-PoV63wEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-PoWK3wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-PoWa3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-PoWq3wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-PoVa3wEeSuH7f2GGufnw" description="_T-OaMa3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-PoV63wEeSuH7f2GGufnw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-PoWa3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -8463,13 +6039,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//Operation/@eGenericSuperTypes.1"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Kojgwa3vEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_Kojgwq3vEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Kojgw63vEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_KojgxK3vEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Kojgxa3vEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Kojgxq3vEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Kojgw63vEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Kojgxa3vEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -8479,31 +6050,21 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_VYBUIK3vEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VYBUIa3vEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_VYBUIK3vEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_VYBUIq3vEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_VYBUI63vEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_VYBUJK3vEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
         <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_VYIo4K3vEeSuH7f2GGufnw" name="conjugate : EBoolean = false" tooltipText="">
           <target xmi:type="ecore:EAttribute" href="common.ecore#//Port/conjugate"/>
           <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//Port/conjugate"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_VYIo4a3vEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VYIo4q3vEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_VYIo463vEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_VYIo5K3vEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
         <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_VYIo5a3vEeSuH7f2GGufnw" name="multiplicity : EInt = 1" tooltipText="">
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_VYIo5q3vEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VYIo563vEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_VYIo6K3vEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_VYIo6a3vEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
@@ -8511,14 +6072,9 @@
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_VYLsMK3vEeSuH7f2GGufnw" name="[0..*] ports" sourceNode="_87Ww8K3uEeSuH7f2GGufnw" targetNode="_VYAtEK3vEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Capsule/ports"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Capsule/ports"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-SElq3wEeSuH7f2GGufnw" description="_T-SEkq3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T-SEl63wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-SEmK3wEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-SEma3wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-SEmq3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-SEm63wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-SElq3wEeSuH7f2GGufnw" description="_T-OaMa3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-SEmK3wEeSuH7f2GGufnw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-SEmq3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -8528,40 +6084,26 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_XarIYK3vEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_XarIYa3vEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_XarIYK3vEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_XarIYq3vEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_XarIY63vEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_XarIZK3vEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_Xa4jwK3vEeSuH7f2GGufnw" name="[0..*] protocols" sourceNode="_55dtQK3uEeSuH7f2GGufnw" targetNode="_XaqhUK3vEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Package/protocols"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Package/protocols"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-Rdhq3wEeSuH7f2GGufnw" description="_T-Rdgq3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T-Rdh63wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-RdiK3wEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-Rdia3wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-Rdiq3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-Rdi63wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-Rdhq3wEeSuH7f2GGufnw" description="_T-OaMa3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-RdiK3wEeSuH7f2GGufnw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-Rdiq3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_Xa5K3K3vEeSuH7f2GGufnw" name="[1..1] type" sourceNode="_VYAtEK3vEeSuH7f2GGufnw" targetNode="_XaqhUK3vEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Port/type"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Port/type"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-VH5q3wEeSuH7f2GGufnw" description="_T-VH4q3wEeSuH7f2GGufnw" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T-VH563wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-Vu8K3wEeSuH7f2GGufnw" labelFormat="bold" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-Vu8a3wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-Vu8q3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-Vu863wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-VH5q3wEeSuH7f2GGufnw" description="_T-TSsa3wEeSuH7f2GGufnw" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-Vu8K3wEeSuH7f2GGufnw" labelFormat="bold" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-Vu8q3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -8571,22 +6113,15 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Zxz-4a3vEeSuH7f2GGufnw" labelFormat="italic" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zxz-4q3vEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Zxz-4a3vEeSuH7f2GGufnw" labelFormat="italic" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zxz-463vEeSuH7f2GGufnw" red="125" green="125" blue="125"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Zxz-5K3vEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Zxz-5a3vEeSuH7f2GGufnw" red="228" green="228" blue="228"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
         <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_Zx_lEK3vEeSuH7f2GGufnw" name="kind : ProtocolBehaviourFeatureKind = IN" tooltipText="">
           <target xmi:type="ecore:EAttribute" href="common.ecore#//ProtocolBehaviourFeature/kind"/>
           <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//ProtocolBehaviourFeature/kind"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZyAMIK3vEeSuH7f2GGufnw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZyAMIa3vEeSuH7f2GGufnw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZyAMIq3vEeSuH7f2GGufnw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_ZyAMI63vEeSuH7f2GGufnw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
@@ -8594,40 +6129,26 @@
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_ZyGSwK3vEeSuH7f2GGufnw" name="[0..*] protocolBehaviourFeature" sourceNode="_XaqhUK3vEeSuH7f2GGufnw" targetNode="_Zxz-4K3vEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Protocol/protocolBehaviourFeatures"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Protocol/protocolBehaviourFeatures"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-WWAK3wEeSuH7f2GGufnw" description="_T-Vu9q3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T-WWAa3wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-WWAq3wEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-WWA63wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-WWBK3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-WWBa3wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-WWAK3wEeSuH7f2GGufnw" description="_T-OaMa3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-WWAq3wEeSuH7f2GGufnw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-WWBK3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_buMMAK3vEeSuH7f2GGufnw" name="Signal" tooltipText="" outgoingEdges="_buaOcK3vEeSuH7f2GGufnw _bucqsK3vEeSuH7f2GGufnw" width="12" height="10">
         <target xmi:type="ecore:EClass" href="common.ecore#//Signal"/>
         <semanticElements xmi:type="ecore:EClass" href="common.ecore#//Signal"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_buMMAa3vEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_buMMAq3vEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_buMMAa3vEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_buMMA63vEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_buMMBK3vEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_buMMBa3vEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_buaOcK3vEeSuH7f2GGufnw" name="[0..*] parameters" sourceNode="_buMMAK3vEeSuH7f2GGufnw" targetNode="_JkgCwK3vEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Signal/parameters"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Signal/parameters"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-W9Ea3wEeSuH7f2GGufnw" description="_T-WWCK3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T-W9Eq3wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-W9E63wEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-W9FK3wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-W9Fa3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-W9Fq3wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-W9Ea3wEeSuH7f2GGufnw" description="_T-OaMa3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-W9E63wEeSuH7f2GGufnw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-W9Fa3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -8636,13 +6157,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//Signal/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bucqsa3vEeSuH7f2GGufnw" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_bucqsq3vEeSuH7f2GGufnw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_bucqs63vEeSuH7f2GGufnw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bucqtK3vEeSuH7f2GGufnw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bucqta3vEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_bucqtq3vEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_bucqs63vEeSuH7f2GGufnw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bucqta3vEeSuH7f2GGufnw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -8652,26 +6168,17 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_dj2GEa3vEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_dj2GEq3vEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_dj2GEa3vEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_dj2GE63vEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_dj2GFK3vEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_dj2GFa3vEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_dkGkwK3vEeSuH7f2GGufnw" name="[0..*] connectors" sourceNode="_87Ww8K3uEeSuH7f2GGufnw" targetNode="_dj2GEK3vEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Capsule/connectors"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Capsule/connectors"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-Srpq3wEeSuH7f2GGufnw" description="_T-Sroq3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T-Srp63wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-SrqK3wEeSuH7f2GGufnw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-Srqa3wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-Srqq3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-Srq63wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-Srpq3wEeSuH7f2GGufnw" description="_T-OaMa3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-SrqK3wEeSuH7f2GGufnw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-Srqq3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -8681,40 +6188,26 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_eTuD0a3vEeSuH7f2GGufnw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_eTuD0q3vEeSuH7f2GGufnw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_eTuD0a3vEeSuH7f2GGufnw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_eTuD063vEeSuH7f2GGufnw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_eTuD1K3vEeSuH7f2GGufnw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_eTuD1a3vEeSuH7f2GGufnw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_eUAXsK3vEeSuH7f2GGufnw" name="[2..2] ends" sourceNode="_dj2GEK3vEeSuH7f2GGufnw" targetNode="_eTuD0K3vEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Connector/ends"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Connector/ends"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-XkIa3wEeSuH7f2GGufnw" description="_T-W9Ga3wEeSuH7f2GGufnw" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T-XkIq3wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-XkI63wEeSuH7f2GGufnw" labelFormat="bold" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-XkJK3wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-XkJa3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-XkJq3wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-XkIa3wEeSuH7f2GGufnw" description="_T-TSsa3wEeSuH7f2GGufnw" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-XkI63wEeSuH7f2GGufnw" labelFormat="bold" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-XkJa3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_eUA-wK3vEeSuH7f2GGufnw" name="[1..1] role" sourceNode="_eTuD0K3vEeSuH7f2GGufnw" targetNode="_VYAtEK3vEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//ConnectorEnd/role"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//ConnectorEnd/role"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-YLMK3wEeSuH7f2GGufnw" description="_T-XkKa3wEeSuH7f2GGufnw" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_T-YLMa3wEeSuH7f2GGufnw"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-YLMq3wEeSuH7f2GGufnw" labelFormat="bold" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-YLM63wEeSuH7f2GGufnw"/>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-YLNK3wEeSuH7f2GGufnw" labelSize="6" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_T-YLNa3wEeSuH7f2GGufnw" red="39" green="76" blue="114"/>
-          </endLabelStyle>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_T-YLMK3wEeSuH7f2GGufnw" description="_T-TSsa3wEeSuH7f2GGufnw" routingStyle="manhattan" strokeColor="0,0,0">
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_T-YLMq3wEeSuH7f2GGufnw" labelFormat="bold" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_T-YLNK3wEeSuH7f2GGufnw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </ownedDiagramElements>
@@ -8723,28 +6216,20 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//Entity/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_CGZr8bCAEeS2zc2JFFVtPw" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_CGZr8rCAEeS2zc2JFFVtPw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_CGZr87CAEeS2zc2JFFVtPw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_CGZr9LCAEeS2zc2JFFVtPw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_CGZr9bCAEeS2zc2JFFVtPw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_CGZr9rCAEeS2zc2JFFVtPw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_CGZr87CAEeS2zc2JFFVtPw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_CGZr9bCAEeS2zc2JFFVtPw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_H1L-QLCBEeS2zc2JFFVtPw" name="[0..*] entities" sourceNode="_55dtQK3uEeSuH7f2GGufnw" targetNode="_5MzbkK3uEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Package/entities"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Package/entities"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_H1MlVrCBEeS2zc2JFFVtPw" description="_H1MlUrCBEeS2zc2JFFVtPw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_H1MlV7CBEeS2zc2JFFVtPw"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_H1MlVrCBEeS2zc2JFFVtPw" description="_T-OaMa3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
           <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_H1MlWLCBEeS2zc2JFFVtPw" showIcon="false">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_H1MlWbCBEeS2zc2JFFVtPw"/>
           </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_H1MlWrCBEeS2zc2JFFVtPw" showIcon="false">
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_H1MlWrCBEeS2zc2JFFVtPw" showIcon="false" labelColor="39,76,114">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_H1MlW7CBEeS2zc2JFFVtPw" red="39" green="76" blue="114"/>
           </endLabelStyle>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
@@ -8755,22 +6240,15 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_AgTO0LCWEeS2zc2JFFVtPw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_AgTO0bCWEeS2zc2JFFVtPw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_AgTO0LCWEeS2zc2JFFVtPw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_AgTO0rCWEeS2zc2JFFVtPw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_AgTO07CWEeS2zc2JFFVtPw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_AgTO1LCWEeS2zc2JFFVtPw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
         <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_Agk7oLCWEeS2zc2JFFVtPw" name="kind : CapsuleKind = FIXED" tooltipText="">
           <target xmi:type="ecore:EAttribute" href="common.ecore#//CapsulePart/kind"/>
           <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//CapsulePart/kind"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Agk7obCWEeS2zc2JFFVtPw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Agk7orCWEeS2zc2JFFVtPw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Agk7o7CWEeS2zc2JFFVtPw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Agk7pLCWEeS2zc2JFFVtPw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
@@ -8778,10 +6256,7 @@
           <target xmi:type="ecore:EAttribute" href="common.ecore#//CapsulePart/multiplicity"/>
           <semanticElements xmi:type="ecore:EAttribute" href="common.ecore#//CapsulePart/multiplicity"/>
           <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_AglisbCWEeS2zc2JFFVtPw" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_AglisrCWEeS2zc2JFFVtPw"/>
             <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Aglis7CWEeS2zc2JFFVtPw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_AglitLCWEeS2zc2JFFVtPw"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
         </ownedElements>
@@ -8789,15 +6264,12 @@
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_AgrCQLCWEeS2zc2JFFVtPw" name="[0..*] parts" sourceNode="_87Ww8K3uEeSuH7f2GGufnw" targetNode="_AgSnwLCWEeS2zc2JFFVtPw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Capsule/parts"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Capsule/parts"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_AgrCR7CWEeS2zc2JFFVtPw" description="_AgrCQ7CWEeS2zc2JFFVtPw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_AgrCSLCWEeS2zc2JFFVtPw"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_AgrCR7CWEeS2zc2JFFVtPw" description="_T-OaMa3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
           <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_AgrCSbCWEeS2zc2JFFVtPw" showIcon="false">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_AgrCSrCWEeS2zc2JFFVtPw"/>
           </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_AgrCS7CWEeS2zc2JFFVtPw" showIcon="false">
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_AgrCS7CWEeS2zc2JFFVtPw" showIcon="false" labelColor="39,76,114">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_AgrCTLCWEeS2zc2JFFVtPw" red="39" green="76" blue="114"/>
           </endLabelStyle>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
@@ -8805,15 +6277,12 @@
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_AgrpULCWEeS2zc2JFFVtPw" name="[1..1] type" sourceNode="_AgSnwLCWEeS2zc2JFFVtPw" targetNode="_87Ww8K3uEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//CapsulePart/type"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//CapsulePart/type"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_AgrpV7CWEeS2zc2JFFVtPw" description="_AgrpU7CWEeS2zc2JFFVtPw" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_AgrpWLCWEeS2zc2JFFVtPw"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_AgrpV7CWEeS2zc2JFFVtPw" description="_T-TSsa3wEeSuH7f2GGufnw" routingStyle="manhattan" strokeColor="0,0,0">
           <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_AgrpWbCWEeS2zc2JFFVtPw" labelFormat="bold" showIcon="false">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_AgrpWrCWEeS2zc2JFFVtPw"/>
           </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_AgrpW7CWEeS2zc2JFFVtPw" showIcon="false">
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_AgrpW7CWEeS2zc2JFFVtPw" showIcon="false" labelColor="39,76,114">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_AgrpXLCWEeS2zc2JFFVtPw" red="39" green="76" blue="114"/>
           </endLabelStyle>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
@@ -8824,12 +6293,8 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_lF33YLhTEeSH9PQiHQ6eWw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_lF33YbhTEeSH9PQiHQ6eWw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_lF33YLhTEeSH9PQiHQ6eWw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_lF33YrhTEeSH9PQiHQ6eWw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_lF33Y7hTEeSH9PQiHQ6eWw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_lF33ZLhTEeSH9PQiHQ6eWw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
@@ -8838,13 +6303,8 @@
         <semanticElements xmi:type="ecore:EGenericType" href="common.ecore#//StructType/@eGenericSuperTypes.0"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_lGQ48bhTEeSH9PQiHQ6eWw" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_lGQ48rhTEeSH9PQiHQ6eWw" red="136" green="136" blue="136"/>
-          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_lGQ487hTEeSH9PQiHQ6eWw" labelFormat="italic" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_lGQ49LhTEeSH9PQiHQ6eWw"/>
-          </beginLabelStyle>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_lGQ49bhTEeSH9PQiHQ6eWw" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_lGQ49rhTEeSH9PQiHQ6eWw"/>
-          </centerLabelStyle>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_lGQ487hTEeSH9PQiHQ6eWw" labelFormat="italic" showIcon="false"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_lGQ49bhTEeSH9PQiHQ6eWw" showIcon="false"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
       </ownedDiagramElements>
@@ -8854,27 +6314,20 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_oyR3sbhTEeSH9PQiHQ6eWw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_oyR3srhTEeSH9PQiHQ6eWw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_oyR3sbhTEeSH9PQiHQ6eWw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_oyR3s7hTEeSH9PQiHQ6eWw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_oyR3tLhTEeSH9PQiHQ6eWw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_oyR3tbhTEeSH9PQiHQ6eWw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_oymn0LhTEeSH9PQiHQ6eWw" name="[0..*] structMembers" sourceNode="_lF3QULhTEeSH9PQiHQ6eWw" targetNode="_oyR3sLhTEeSH9PQiHQ6eWw">
         <target xmi:type="ecore:EReference" href="common.ecore#//StructType/structMembers"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//StructType/structMembers"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_oymn17hTEeSH9PQiHQ6eWw" description="_oymn07hTEeSH9PQiHQ6eWw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_oymn2LhTEeSH9PQiHQ6eWw"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_oymn17hTEeSH9PQiHQ6eWw" description="_T-OaMa3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
           <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_oymn2bhTEeSH9PQiHQ6eWw" showIcon="false">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_oymn2rhTEeSH9PQiHQ6eWw"/>
           </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_oymn27hTEeSH9PQiHQ6eWw" showIcon="false">
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_oymn27hTEeSH9PQiHQ6eWw" showIcon="false" labelColor="39,76,114">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_oymn3LhTEeSH9PQiHQ6eWw" red="39" green="76" blue="114"/>
           </endLabelStyle>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
@@ -8882,16 +6335,13 @@
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_oynO4LhTEeSH9PQiHQ6eWw" name="[0..1] type" sourceNode="_oyR3sLhTEeSH9PQiHQ6eWw" targetNode="_28ovwK3uEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//StructMember/type"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//StructMember/type"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_oynO4bhTEeSH9PQiHQ6eWw" routingStyle="manhattan">
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_oynO4bhTEeSH9PQiHQ6eWw" routingStyle="manhattan" strokeColor="0,0,0">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_oynO4rhTEeSH9PQiHQ6eWw"/>
           <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_oynO47hTEeSH9PQiHQ6eWw" showIcon="false">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_oynO5LhTEeSH9PQiHQ6eWw"/>
           </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_oynO5bhTEeSH9PQiHQ6eWw" showIcon="false">
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_oynO5bhTEeSH9PQiHQ6eWw" showIcon="false" labelColor="39,76,114">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_oynO5rhTEeSH9PQiHQ6eWw" red="39" green="76" blue="114"/>
           </endLabelStyle>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
@@ -8902,27 +6352,20 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_1Q-0ELhTEeSH9PQiHQ6eWw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_1Q-0EbhTEeSH9PQiHQ6eWw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_1Q-0ELhTEeSH9PQiHQ6eWw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_1Q-0ErhTEeSH9PQiHQ6eWw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_1Q-0E7hTEeSH9PQiHQ6eWw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_1Q-0FLhTEeSH9PQiHQ6eWw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_1RRvALhTEeSH9PQiHQ6eWw" name="[0..*] typedefinitions" sourceNode="_55dtQK3uEeSuH7f2GGufnw" targetNode="_1Q-NALhTEeSH9PQiHQ6eWw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Package/typedefinitions"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Package/typedefinitions"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_1RSWFLhTEeSH9PQiHQ6eWw" description="_1RSWELhTEeSH9PQiHQ6eWw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_1RSWFbhTEeSH9PQiHQ6eWw"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_1RSWFLhTEeSH9PQiHQ6eWw" description="_T-OaMa3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
           <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_1RSWFrhTEeSH9PQiHQ6eWw" showIcon="false">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_1RSWF7hTEeSH9PQiHQ6eWw"/>
           </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_1RSWGLhTEeSH9PQiHQ6eWw" showIcon="false">
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_1RSWGLhTEeSH9PQiHQ6eWw" showIcon="false" labelColor="39,76,114">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_1RSWGbhTEeSH9PQiHQ6eWw" red="39" green="76" blue="114"/>
           </endLabelStyle>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
@@ -8930,16 +6373,13 @@
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_1RSWGrhTEeSH9PQiHQ6eWw" name="[0..1] type" sourceNode="_1Q-NALhTEeSH9PQiHQ6eWw" targetNode="_28ovwK3uEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//TypeDefinition/type"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//TypeDefinition/type"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_1RSWG7hTEeSH9PQiHQ6eWw" routingStyle="manhattan">
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_1RSWG7hTEeSH9PQiHQ6eWw" routingStyle="manhattan" strokeColor="0,0,0">
           <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_1RSWHLhTEeSH9PQiHQ6eWw"/>
           <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_1RSWHbhTEeSH9PQiHQ6eWw" showIcon="false">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_1RSWHrhTEeSH9PQiHQ6eWw"/>
           </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_1RSWH7hTEeSH9PQiHQ6eWw" showIcon="false">
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_1RSWH7hTEeSH9PQiHQ6eWw" showIcon="false" labelColor="39,76,114">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_1RSWILhTEeSH9PQiHQ6eWw" red="39" green="76" blue="114"/>
           </endLabelStyle>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
@@ -8950,27 +6390,20 @@
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_VYuhsLhWEeSH9PQiHQ6eWw" backgroundStyle="Liquid">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VYuhsbhWEeSH9PQiHQ6eWw"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_VYuhsLhWEeSH9PQiHQ6eWw" backgroundStyle="Liquid" foregroundColor="255,252,216">
           <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_VYuhsrhWEeSH9PQiHQ6eWw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_VYuhs7hWEeSH9PQiHQ6eWw" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_VYuhtLhWEeSH9PQiHQ6eWw" red="255" green="252" blue="216"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_VZIKXLhWEeSH9PQiHQ6eWw" name="[0..*] rootPackages" sourceNode="_VYt6oLhWEeSH9PQiHQ6eWw" targetNode="_55dtQK3uEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Model/rootPackages"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Model/rootPackages"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_VZIxZrhWEeSH9PQiHQ6eWw" description="_VZIxYrhWEeSH9PQiHQ6eWw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_VZIxZ7hWEeSH9PQiHQ6eWw"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_VZIxZrhWEeSH9PQiHQ6eWw" description="_T-OaMa3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
           <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_VZIxaLhWEeSH9PQiHQ6eWw" showIcon="false">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VZIxabhWEeSH9PQiHQ6eWw"/>
           </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_VZIxarhWEeSH9PQiHQ6eWw" showIcon="false">
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_VZIxarhWEeSH9PQiHQ6eWw" showIcon="false" labelColor="39,76,114">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VZIxa7hWEeSH9PQiHQ6eWw" red="39" green="76" blue="114"/>
           </endLabelStyle>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
@@ -8978,15 +6411,12 @@
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_VZIxbLhWEeSH9PQiHQ6eWw" name="[0..*] topCapsules" sourceNode="_VYt6oLhWEeSH9PQiHQ6eWw" targetNode="_87Ww8K3uEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Model/topEntities"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Model/topEntities"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_VZJYcbhWEeSH9PQiHQ6eWw" description="_VZIxb7hWEeSH9PQiHQ6eWw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_VZJYcrhWEeSH9PQiHQ6eWw"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_VZJYcbhWEeSH9PQiHQ6eWw" description="_T-OaMa3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
           <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_VZJYc7hWEeSH9PQiHQ6eWw" showIcon="false">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VZJYdLhWEeSH9PQiHQ6eWw"/>
           </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_VZJYdbhWEeSH9PQiHQ6eWw" showIcon="false">
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_VZJYdbhWEeSH9PQiHQ6eWw" showIcon="false" labelColor="39,76,114">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_VZJYdrhWEeSH9PQiHQ6eWw" red="39" green="76" blue="114"/>
           </endLabelStyle>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
@@ -8994,15 +6424,12 @@
       <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_w4pagLhWEeSH9PQiHQ6eWw" name="[0..*] localScopeTemporaryTypes" sourceNode="_VYt6oLhWEeSH9PQiHQ6eWw" targetNode="_28ovwK3uEeSuH7f2GGufnw">
         <target xmi:type="ecore:EReference" href="common.ecore#//Model/localScopeTemporaryTypes"/>
         <semanticElements xmi:type="ecore:EReference" href="common.ecore#//Model/localScopeTemporaryTypes"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_w4pahrhWEeSH9PQiHQ6eWw" description="_w4pagrhWEeSH9PQiHQ6eWw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_w4pah7hWEeSH9PQiHQ6eWw"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_w4pahrhWEeSH9PQiHQ6eWw" description="_T-OaMa3wEeSuH7f2GGufnw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
           <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_w4paiLhWEeSH9PQiHQ6eWw" showIcon="false">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_w4paibhWEeSH9PQiHQ6eWw"/>
           </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_w4pairhWEeSH9PQiHQ6eWw" showIcon="false">
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_w4pairhWEeSH9PQiHQ6eWw" showIcon="false" labelColor="39,76,114">
             <customFeatures>labelSize</customFeatures>
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_w4pai7hWEeSH9PQiHQ6eWw" red="39" green="76" blue="114"/>
           </endLabelStyle>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>